From 2fd1b2a484fd888591ff4ea7a5f10006a73b1682 Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Fri, 8 May 2015 22:54:15 +0100 Subject: [PATCH] rename category metadata option to group --- src/babel/transformation/file/index.js | 8 ++++---- src/babel/transformation/index.js | 2 +- .../transformers/es3/member-expression-literals.js | 2 +- .../transformation/transformers/es3/property-literals.js | 2 +- .../transformation/transformers/es6/block-scoping.js | 2 +- .../transformation/transformers/es6/destructuring.js | 2 +- src/babel/transformation/transformers/es6/modules.js | 2 +- .../transformation/transformers/es6/spec.block-scoping.js | 2 +- src/babel/transformation/transformers/es6/tail-call.js | 2 +- .../transformation/transformers/internal/block-hoist.js | 2 +- .../transformers/internal/module-formatter.js | 2 +- src/babel/transformation/transformers/internal/modules.js | 2 +- .../transformers/internal/shadow-functions.js | 2 +- .../transformation/transformers/internal/validation.js | 2 +- .../transformers/minification/dead-code-elimination.js | 2 +- .../minification/member-expression-literals.js | 2 +- .../transformers/minification/property-literals.js | 2 +- .../transformation/transformers/other/regenerator.js | 2 +- .../transformation/transformers/other/runtime/index.js | 2 +- .../transformation/transformers/spec/function-name.js | 2 +- .../transformers/utility/inline-environment-variables.js | 2 +- .../transformers/utility/inline-expressions.js | 2 +- .../transformation/transformers/utility/remove-console.js | 2 +- .../transformers/utility/remove-debugger.js | 2 +- 24 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/babel/transformation/file/index.js b/src/babel/transformation/file/index.js index 7b2a8f1e10..27f0453ed8 100644 --- a/src/babel/transformation/file/index.js +++ b/src/babel/transformation/file/index.js @@ -242,17 +242,17 @@ export default class File { // been merged if (ignore.indexOf(pass) >= 0) continue; - var category = pass.transformer.metadata.category; + var group = pass.transformer.metadata.group; // can't merge - if (!pass.canTransform() || !category) { + if (!pass.canTransform() || !group) { stack.push(pass); continue; } var mergeStack = []; for (let pass of (_stack: Array)) { - if (pass.transformer.metadata.category === category) { + if (pass.transformer.metadata.group === group) { mergeStack.push(pass); ignore.push(pass); } @@ -263,7 +263,7 @@ export default class File { visitors.push(pass.handlers); } var visitor = traverse.visitors.merge(visitors); - var mergeTransformer = new Transformer(category, visitor); + var mergeTransformer = new Transformer(group, visitor); //console.log(mergeTransformer); stack.push(mergeTransformer.buildPass(this)); } diff --git a/src/babel/transformation/index.js b/src/babel/transformation/index.js index 5a523a4ea2..11b0780fd1 100644 --- a/src/babel/transformation/index.js +++ b/src/babel/transformation/index.js @@ -9,7 +9,7 @@ import transformers from "./transformers"; for (var key in transformers) { var transformer = transformers[key]; var metadata = transformer.metadata = transformer.metadata || {}; - metadata.category = metadata.category || "builtin-basic"; + metadata.group = metadata.group || "builtin-basic"; } pipeline.addTransformers(transformers); diff --git a/src/babel/transformation/transformers/es3/member-expression-literals.js b/src/babel/transformation/transformers/es3/member-expression-literals.js index e80f5c62d1..af026a5171 100644 --- a/src/babel/transformation/transformers/es3/member-expression-literals.js +++ b/src/babel/transformation/transformers/es3/member-expression-literals.js @@ -1,7 +1,7 @@ import * as t from "../../../types"; export var metadata = { - category: "builtin-trailing" + group: "builtin-trailing" }; export var MemberExpression = { diff --git a/src/babel/transformation/transformers/es3/property-literals.js b/src/babel/transformation/transformers/es3/property-literals.js index 9fa015e82b..ffb13ddc64 100644 --- a/src/babel/transformation/transformers/es3/property-literals.js +++ b/src/babel/transformation/transformers/es3/property-literals.js @@ -1,7 +1,7 @@ import * as t from "../../../types"; export var metadata = { - category: "builtin-trailing" + group: "builtin-trailing" }; export var Property = { diff --git a/src/babel/transformation/transformers/es6/block-scoping.js b/src/babel/transformation/transformers/es6/block-scoping.js index 515c0711e9..8d8f8a8f88 100644 --- a/src/babel/transformation/transformers/es6/block-scoping.js +++ b/src/babel/transformation/transformers/es6/block-scoping.js @@ -38,7 +38,7 @@ function standardizeLets(declars) { } export var metadata = { - category: "builtin-advanced" + group: "builtin-advanced" }; export function VariableDeclaration(node, parent, scope, file) { diff --git a/src/babel/transformation/transformers/es6/destructuring.js b/src/babel/transformation/transformers/es6/destructuring.js index 53e7b2d22b..5c779cac21 100644 --- a/src/babel/transformation/transformers/es6/destructuring.js +++ b/src/babel/transformation/transformers/es6/destructuring.js @@ -2,7 +2,7 @@ import * as messages from "../../../messages"; import * as t from "../../../types"; export var metadata = { - category: "builtin-advanced" + group: "builtin-advanced" }; export function ForOfStatement(node, parent, scope, file) { diff --git a/src/babel/transformation/transformers/es6/modules.js b/src/babel/transformation/transformers/es6/modules.js index 80772e3163..688fcf2baa 100644 --- a/src/babel/transformation/transformers/es6/modules.js +++ b/src/babel/transformation/transformers/es6/modules.js @@ -9,7 +9,7 @@ function keepBlockHoist(node, nodes) { } export var metadata = { - category: "builtin-modules" + group: "builtin-modules" }; export function ImportDeclaration(node, parent, scope, file) { diff --git a/src/babel/transformation/transformers/es6/spec.block-scoping.js b/src/babel/transformation/transformers/es6/spec.block-scoping.js index 6906b1d7c1..f7fc4ff0ab 100644 --- a/src/babel/transformation/transformers/es6/spec.block-scoping.js +++ b/src/babel/transformation/transformers/es6/spec.block-scoping.js @@ -29,7 +29,7 @@ var visitor = traverse.explode({ export var metadata = { optional: true, - category: "builtin-advanced" + group: "builtin-advanced" }; export var BlockStatement = { diff --git a/src/babel/transformation/transformers/es6/tail-call.js b/src/babel/transformation/transformers/es6/tail-call.js index e3a9482067..4da3e46365 100644 --- a/src/babel/transformation/transformers/es6/tail-call.js +++ b/src/babel/transformation/transformers/es6/tail-call.js @@ -7,7 +7,7 @@ import map from "lodash/collection/map"; import * as t from "../../../types"; export var metadata = { - category: "builtin-trailing" + group: "builtin-trailing" }; exports.Function = function (node, parent, scope, file) { diff --git a/src/babel/transformation/transformers/internal/block-hoist.js b/src/babel/transformation/transformers/internal/block-hoist.js index 2ab60a0755..934d21b1e2 100644 --- a/src/babel/transformation/transformers/internal/block-hoist.js +++ b/src/babel/transformation/transformers/internal/block-hoist.js @@ -1,7 +1,7 @@ import sortBy from "lodash/collection/sortBy"; export var metadata = { - category: "builtin-trailing" + group: "builtin-trailing" }; // Priority: diff --git a/src/babel/transformation/transformers/internal/module-formatter.js b/src/babel/transformation/transformers/internal/module-formatter.js index da48d94c6d..4235eeb4fb 100644 --- a/src/babel/transformation/transformers/internal/module-formatter.js +++ b/src/babel/transformation/transformers/internal/module-formatter.js @@ -1,7 +1,7 @@ import * as strict from "../../helpers/strict"; export var metadata = { - category: "builtin-modules" + group: "builtin-modules" }; export var Program = { diff --git a/src/babel/transformation/transformers/internal/modules.js b/src/babel/transformation/transformers/internal/modules.js index 71d51e7a25..ac64b0e455 100644 --- a/src/babel/transformation/transformers/internal/modules.js +++ b/src/babel/transformation/transformers/internal/modules.js @@ -7,7 +7,7 @@ import * as t from "../../../types"; export var metadata = { - category: "builtin-setup" + group: "builtin-setup" }; export function ImportDeclaration(node, parent, scope, file) { diff --git a/src/babel/transformation/transformers/internal/shadow-functions.js b/src/babel/transformation/transformers/internal/shadow-functions.js index d082fd1ba8..04d11f7811 100644 --- a/src/babel/transformation/transformers/internal/shadow-functions.js +++ b/src/babel/transformation/transformers/internal/shadow-functions.js @@ -86,7 +86,7 @@ function aliasFunction(getBody, path, scope) { // crawling the entire function tree export var metadata = { - category: "builtin-trailing" + group: "builtin-trailing" }; export var Program = { diff --git a/src/babel/transformation/transformers/internal/validation.js b/src/babel/transformation/transformers/internal/validation.js index 31dfabc78e..626c236fee 100644 --- a/src/babel/transformation/transformers/internal/validation.js +++ b/src/babel/transformation/transformers/internal/validation.js @@ -2,7 +2,7 @@ import * as messages from "../../../messages"; import * as t from "../../../types"; export var metadata = { - category: "builtin-setup" + group: "builtin-setup" }; export function ForOfStatement(node, parent, scope, file) { diff --git a/src/babel/transformation/transformers/minification/dead-code-elimination.js b/src/babel/transformation/transformers/minification/dead-code-elimination.js index 58524530bb..8f17b338df 100644 --- a/src/babel/transformation/transformers/minification/dead-code-elimination.js +++ b/src/babel/transformation/transformers/minification/dead-code-elimination.js @@ -19,7 +19,7 @@ function toStatements(node) { export var metadata = { optional: true, - category: "builtin-setup" + group: "builtin-setup" }; export function Identifier(node, parent, scope) { diff --git a/src/babel/transformation/transformers/minification/member-expression-literals.js b/src/babel/transformation/transformers/minification/member-expression-literals.js index 333bd02201..877a924b11 100644 --- a/src/babel/transformation/transformers/minification/member-expression-literals.js +++ b/src/babel/transformation/transformers/minification/member-expression-literals.js @@ -2,7 +2,7 @@ import * as t from "../../../types"; export var metadata = { optional: true, - category: "builtin-trailing" + group: "builtin-trailing" }; export var MemberExpression = { diff --git a/src/babel/transformation/transformers/minification/property-literals.js b/src/babel/transformation/transformers/minification/property-literals.js index 4bdc31ae59..c6cf4e7538 100644 --- a/src/babel/transformation/transformers/minification/property-literals.js +++ b/src/babel/transformation/transformers/minification/property-literals.js @@ -2,7 +2,7 @@ import * as t from "../../../types"; export var metadata = { optional: true, - category: "builtin-trailing" + group: "builtin-trailing" }; export var Property = { diff --git a/src/babel/transformation/transformers/other/regenerator.js b/src/babel/transformation/transformers/other/regenerator.js index d276ec9908..957fc6af94 100644 --- a/src/babel/transformation/transformers/other/regenerator.js +++ b/src/babel/transformation/transformers/other/regenerator.js @@ -2,7 +2,7 @@ import regenerator from "regenerator"; import * as t from "../../../types"; export var metadata = { - category: "regenerator" + group: "regenerator" }; export function Program(ast) { diff --git a/src/babel/transformation/transformers/other/runtime/index.js b/src/babel/transformation/transformers/other/runtime/index.js index 5d9a0dbc44..27dd6c7a15 100644 --- a/src/babel/transformation/transformers/other/runtime/index.js +++ b/src/babel/transformation/transformers/other/runtime/index.js @@ -11,7 +11,7 @@ const RUNTIME_MODULE_NAME = "babel-runtime"; export var metadata = { optional: true, - category: "builtin-post-modules" + group: "builtin-post-modules" }; export function pre(file) { diff --git a/src/babel/transformation/transformers/spec/function-name.js b/src/babel/transformation/transformers/spec/function-name.js index d45d2a4165..2b384fcddb 100644 --- a/src/babel/transformation/transformers/spec/function-name.js +++ b/src/babel/transformation/transformers/spec/function-name.js @@ -1,5 +1,5 @@ export var metadata = { - category: "builtin-setup" + group: "builtin-setup" }; export { diff --git a/src/babel/transformation/transformers/utility/inline-environment-variables.js b/src/babel/transformation/transformers/utility/inline-environment-variables.js index 5c00d13ccc..e40ed44d17 100644 --- a/src/babel/transformation/transformers/utility/inline-environment-variables.js +++ b/src/babel/transformation/transformers/utility/inline-environment-variables.js @@ -2,7 +2,7 @@ import * as t from "../../../types"; export var metadata = { optional: true, - category: "builtin-setup" + group: "builtin-setup" }; var match = t.buildMatchMemberExpression("process.env"); diff --git a/src/babel/transformation/transformers/utility/inline-expressions.js b/src/babel/transformation/transformers/utility/inline-expressions.js index 5fbb8de75c..858a696a90 100644 --- a/src/babel/transformation/transformers/utility/inline-expressions.js +++ b/src/babel/transformation/transformers/utility/inline-expressions.js @@ -2,7 +2,7 @@ import * as t from "../../../types"; export var metadata = { optional: true, - category: "builtin-setup" + group: "builtin-setup" }; export function Expression(node, parent, scope) { diff --git a/src/babel/transformation/transformers/utility/remove-console.js b/src/babel/transformation/transformers/utility/remove-console.js index 88106ee69a..cdbeb53a38 100644 --- a/src/babel/transformation/transformers/utility/remove-console.js +++ b/src/babel/transformation/transformers/utility/remove-console.js @@ -2,7 +2,7 @@ import * as t from "../../../types"; export var metadata = { optional: true, - category: "builtin-setup" + group: "builtin-setup" }; export function CallExpression(node, parent) { diff --git a/src/babel/transformation/transformers/utility/remove-debugger.js b/src/babel/transformation/transformers/utility/remove-debugger.js index b797c700cc..e2d8c7dbe1 100644 --- a/src/babel/transformation/transformers/utility/remove-debugger.js +++ b/src/babel/transformation/transformers/utility/remove-debugger.js @@ -2,7 +2,7 @@ import * as t from "../../../types"; export var metadata = { optional: true, - category: "builtin-setup" + group: "builtin-setup" }; export function ExpressionStatement(node) {