move transformers into their corresponding type folder

lib/6to5/transformation/transform.js

@@ -44,65 +44,66 @@ transform.moduleFormatters = {
 };
 
 _.each({
-  specNoForInOfAssignment:   require("./transformers/spec-no-for-in-of-assignment"),
-  specSetters:               require("./transformers/spec-setters"),
-  specBlockScopedFunctions:  require("./transformers/spec-block-scoped-functions"),
+  specNoForInOfAssignment:   require("./transformers/spec/no-for-in-of-assignment"),
+  specSetters:               require("./transformers/spec/setters"),
+  specBlockScopedFunctions:  require("./transformers/spec/block-scoped-functions"),
 
-  // playground
-  malletOperator:            require("./transformers/playground-mallet-operator"),
-  methodBinding:             require("./transformers/playground-method-binding"),
-  memoizationOperator:       require("./transformers/playground-memoization-operator"),
-  objectGetterMemoization:   require("./transformers/playground-object-getter-memoization"),
+  malletOperator:            require("./transformers/playground/mallet-operator"),
+  methodBinding:             require("./transformers/playground/method-binding"),
+  memoizationOperator:       require("./transformers/playground/memoization-operator"),
+  objectGetterMemoization:   require("./transformers/playground/object-getter-memoization"),
 
-  asyncToGenerator:          require("./transformers/optional-async-to-generator"),
-  bluebirdCoroutines:        require("./transformers/optional-bluebird-coroutines"),
+  asyncToGenerator:          require("./transformers/optional/async-to-generator"),
+  bluebirdCoroutines:        require("./transformers/optional/bluebird-coroutines"),
 
-  react:                     require("./transformers/react"),
-  modules:                   require("./transformers/es6-modules"),
-  propertyNameShorthand:     require("./transformers/es6-property-name-shorthand"),
-  arrayComprehension:        require("./transformers/es7-array-comprehension"),
-  generatorComprehension:    require("./transformers/es7-generator-comprehension"),
-  arrowFunctions:            require("./transformers/es6-arrow-functions"),
-  classes:                   require("./transformers/es6-classes"),
+  react:                     require("./transformers/other/react"),
+  modules:                   require("./transformers/es6/modules"),
+  comprehensions:            require("./transformers/es7/comprehensions"),
+  arrowFunctions:            require("./transformers/es6/arrow-functions"),
+  classes:                   require("./transformers/es6/classes"),
 
-  objectSpread:              require("./transformers/es7-object-spread"),
-  exponentiationOperator:    require("./transformers/es7-exponentiation-operator"),
-  spread:                    require("./transformers/es6-spread"),
-  templateLiterals:          require("./transformers/es6-template-literals"),
-  propertyMethodAssignment:  require("./transformers/es6-property-method-assignment"),
-  computedPropertyNames:     require("./transformers/es6-computed-property-names"),
-  defaultParameters:         require("./transformers/es6-default-parameters"),
-  restParameters:            require("./transformers/es6-rest-parameters"),
-  destructuring:             require("./transformers/es6-destructuring"),
-  forOf:                     require("./transformers/es6-for-of"),
-  unicodeRegex:              require("./transformers/es6-unicode-regex"),
-  abstractReferences:        require("./transformers/es7-abstract-references"),
+  objectSpread:              require("./transformers/es7/object-spread"),
+  exponentiationOperator:    require("./transformers/es7/exponentiation-operator"),
+  spread:                    require("./transformers/es6/spread"),
+  templateLiterals:          require("./transformers/es6/template-literals"),
 
-  constants:                 require("./transformers/es6-constants"),
-  letScoping:                require("./transformers/es6-let-scoping"),
-  blockScopingTDZ:           require("./transformers/optional-block-scoping-tdz"),
+  "properties.mutators":     require("./transformers/es5/properties.mutators"),
+  "properties.shorthand":    require("./transformers/es6/properties.shorthand"),
+  "properties.computed":     require("./transformers/es6/properties.computed"),
+
+  "parameters.default":      require("./transformers/es6/parameters.default"),
+  "parameters.rest":         require("./transformers/es6/parameters.rest"),
+
+  destructuring:             require("./transformers/es6/destructuring"),
+  forOf:                     require("./transformers/es6/for-of"),
+  unicodeRegex:              require("./transformers/es6/unicode-regex"),
+  abstractReferences:        require("./transformers/es7/abstract-references"),
+
+  constants:                 require("./transformers/es6/constants"),
+  blockScoping:              require("./transformers/es6/block-scoping"),
+  blockScopingTDZ:           require("./transformers/optional/block-scoping-tdz"),
 
   _blockHoist:               require("./transformers/_block-hoist"),
 
-  generators:                require("./transformers/es6-generators"),
+  generators:                require("./transformers/es6/generators"),
 
-  protoToAssign:             require("./transformers/optional-proto-to-assign"),
+  protoToAssign:             require("./transformers/optional/proto-to-assign"),
 
   _declarations:             require("./transformers/_declarations"),
 
   // wrap up
-  useStrict:                 require("./transformers/use-strict"),
+  useStrict:                 require("./transformers/other/use-strict"),
   _aliasFunctions:           require("./transformers/_alias-functions"),
   _moduleFormatter:          require("./transformers/_module-formatter"),
 
-  typeofSymbol:              require("./transformers/optional-typeof-symbol"),
-  selfContained:             require("./transformers/optional-self-contained"),
-  undefinedToVoid:           require("./transformers/optional-undefined-to-void"),
-  undeclaredVariableCheck:   require("./transformers/optional-undeclared-variable-check"),
+  typeofSymbol:              require("./transformers/optional/typeof-symbol"),
+  selfContained:             require("./transformers/optional/self-contained"),
+  undefinedToVoid:           require("./transformers/optional/undefined-to-void"),
+  undeclaredVariableCheck:   require("./transformers/optional/undeclared-variable-check"),
 
   // spec
-  specPropertyLiterals:         require("./transformers/spec-property-literals"),
-  specMemberExpressionLiterals: require("./transformers/spec-member-expression-literals")
+  specPropertyLiterals:         require("./transformers/spec/property-literals"),
+  specMemberExpressionLiterals: require("./transformers/spec/member-expression-literals")
 }, function (transformer, key) {
   transform.transformers[key] = new Transformer(key, transformer);
 });

lib/6to5/transformation/transformers/es5/properties.mutators.js

@@ -1,7 +1,7 @@
 "use strict";
 
-var util = require("../../util");
-var t    = require("../../types");
+var util = require("../../../util");
+var t    = require("../../../types");
 
 exports.ObjectExpression = function (node) {
   var mutatorMap = {};

lib/6to5/transformation/transformers/es6/arrow-functions.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var t = require("../../types");
+var t = require("../../../types");
 
 exports.ArrowFunctionExpression = function (node) {
   t.ensureBlock(node);

lib/6to5/transformation/transformers/es6/block-scoping.js

@@ -1,8 +1,8 @@
 "use strict";
 
-var traverse = require("../../traverse");
-var util     = require("../../util");
-var t        = require("../../types");
+var traverse = require("../../../traverse");
+var util     = require("../../../util");
+var t        = require("../../../types");
 var _        = require("lodash");
 
 var isLet = function (node, parent) {

lib/6to5/transformation/transformers/es6/classes.js

@@ -1,9 +1,9 @@
 "use strict";
 
-var ReplaceSupers = require("../helpers/replace-supers");
-var nameMethod    = require("../helpers/name-method");
-var util          = require("../../util");
-var t             = require("../../types");
+var ReplaceSupers = require("../../helpers/replace-supers");
+var nameMethod    = require("../../helpers/name-method");
+var util          = require("../../../util");
+var t             = require("../../../types");
 
 exports.ClassDeclaration = function (node, parent, scope, context, file) {
   return new Class(node, file, scope, true).run();

lib/6to5/transformation/transformers/es6/constants.js

@@ -1,7 +1,7 @@
 "use strict";
 
-var traverse = require("../../traverse");
-var t        = require("../../types");
+var traverse = require("../../../traverse");
+var t        = require("../../../types");
 var _        = require("lodash");
 
 exports.Program =

lib/6to5/transformation/transformers/es6/destructuring.js

@@ -2,7 +2,7 @@
 
 // TODO: Clean up
 
-var t = require("../../types");
+var t = require("../../../types");
 
 var buildVariableAssign = function (opts, id, init) {
   var op = opts.operator;

lib/6to5/transformation/transformers/es6/for-of.js

@@ -1,7 +1,7 @@
 "use strict";
 
-var util = require("../../util");
-var t    = require("../../types");
+var util = require("../../../util");
+var t    = require("../../../types");
 
 exports.ForOfStatement = function (node, parent, scope, context, file) {
   var callback = spec;

lib/6to5/transformation/transformers/es6/modules.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var t = require("../../types");
+var t = require("../../../types");
 
 exports.ast = {
   before: function (ast, file) {

lib/6to5/transformation/transformers/es6/parameters.default.js

@@ -1,8 +1,8 @@
 "use strict";
 
-var traverse = require("../../traverse");
-var util     = require("../../util");
-var t        = require("../../types");
+var traverse = require("../../../traverse");
+var util     = require("../../../util");
+var t        = require("../../../types");
 
 exports.Function = function (node, parent, scope, context, file) {
   if (!node.defaults || !node.defaults.length) return;

lib/6to5/transformation/transformers/es6/parameters.rest.js

@@ -1,7 +1,7 @@
 "use strict";
 
-var util = require("../../util");
-var t    = require("../../types");
+var util = require("../../../util");
+var t    = require("../../../types");
 
 exports.Function = function (node, parent, scope, context, file) {
   if (!node.rest) return;

lib/6to5/transformation/transformers/es6/properties.computed.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var t = require("../../types");
+var t = require("../../../types");
 
 exports.ObjectExpression = function (node, parent, scope, context, file) {
   var hasComputed = false;
@@ -24,7 +24,7 @@ exports.ObjectExpression = function (node, parent, scope, context, file) {
   //
 
   var callback = spec;
-  if (file.isLoose("computedPropertyNames")) callback = loose;
+  if (file.isLoose("properties.computed")) callback = loose;
 
   var result = callback(node, body, objId, initProps, file);
   if (result) return result;

lib/6to5/transformation/transformers/es6/properties.shorthand.js

@@ -1,6 +1,8 @@
 "use strict";
 
-var nameMethod = require("../helpers/name-method");
+var nameMethod = require("../../helpers/name-method");
+var t          = require("../../../types");
+var _          = require("lodash");
 
 exports.Property = function (node, parent, scope, context, file) {
   if (node.method) {

lib/6to5/transformation/transformers/es6/spread.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var t = require("../../types");
+var t = require("../../../types");
 var _ = require("lodash");
 
 var getSpreadLiteral = function (spread, file) {

lib/6to5/transformation/transformers/es6/template-literals.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var t = require("../../types");
+var t = require("../../../types");
 
 var buildBinaryExpression = function (left, right) {
   return t.binaryExpression("+", left, right);

lib/6to5/transformation/transformers/es7/abstract-references.js

@@ -2,8 +2,8 @@
 
 // https://github.com/zenparsing/es-abstract-refs
 
-var util = require("../../util");
-var t    = require("../../types");
+var util = require("../../../util");
+var t    = require("../../../types");
 
 exports.experimental = true;
 

lib/6to5/transformation/transformers/es7/comprehensions.js

@@ -1,15 +1,19 @@
 "use strict";
 
-var buildComprehension = require("../helpers/build-comprehension");
-var traverse           = require("../../traverse");
-var util               = require("../../util");
-var t                  = require("../../types");
+var buildComprehension = require("../../helpers/build-comprehension");
+var traverse           = require("../../../traverse");
+var util               = require("../../../util");
+var t                  = require("../../../types");
 
 exports.experimental = true;
 
-exports.ComprehensionExpression = function (node) {
-  if (!node.generator) return;
+exports.ComprehensionExpression = function (node, parent, scope, context, file) {
+  var callback = array;
+  if (node.generator) callback = generator;
+  return callback(node, parent, scope, file);
+};
 
+var generator = function (node) {
   var body = [];
   var container = t.functionExpression(null, [], t.blockStatement(body), true);
   container._aliasFunction = true;
@@ -21,9 +25,7 @@ exports.ComprehensionExpression = function (node) {
   return t.callExpression(container, []);
 };
 
-exports.ComprehensionExpression = function (node, parent, scope, context, file) {
-  if (node.generator) return;
-
+var array = function (node, parent, scope, file) {
   var uid = scope.generateUidBasedOnNode(parent, file);
 
   var container = util.template("array-comprehension-container", {

lib/6to5/transformation/transformers/es7/exponentiation-operator.js

@@ -4,8 +4,8 @@
 
 exports.experimental = true;
 
-var build = require("../helpers/build-binary-assignment-operator-transformer");
-var t     = require("../../types");
+var build = require("../../helpers/build-binary-assignment-operator-transformer");
+var t     = require("../../../types");
 
 var MATH_POW = t.memberExpression(t.identifier("Math"), t.identifier("pow"));
 

lib/6to5/transformation/transformers/es7/object-spread.js

@@ -2,7 +2,7 @@
 
 // https://github.com/sebmarkbage/ecmascript-rest-spread
 
-var t = require("../../types");
+var t = require("../../../types");
 
 exports.experimental = true;
 

lib/6to5/transformation/transformers/optional/async-to-generator.js

@@ -1,7 +1,7 @@
 "use strict";
 
-var remapAsyncToGenerator = require("../helpers/remap-async-to-generator");
-var bluebirdCoroutines    = require("./optional-bluebird-coroutines");
+var remapAsyncToGenerator = require("../../helpers/remap-async-to-generator");
+var bluebirdCoroutines    = require("./bluebird-coroutines");
 
 exports.optional = true;
 

lib/6to5/transformation/transformers/optional/block-scoping-tdz.js

@@ -1,5 +1,5 @@
-var traverse = require("../../traverse");
-var t        = require("../../types");
+var traverse = require("../../../traverse");
+var t        = require("../../../types");
 
 exports.optional = true;
 

lib/6to5/transformation/transformers/optional/bluebird-coroutines.js

@@ -1,7 +1,7 @@
 "use strict";
 
-var remapAsyncToGenerator = require("../helpers/remap-async-to-generator");
-var t                     = require("../../types");
+var remapAsyncToGenerator = require("../../helpers/remap-async-to-generator");
+var t                     = require("../../../types");
 
 exports.manipulateOptions = function (opts) {
   opts.experimental = true;

lib/6to5/transformation/transformers/optional/proto-to-assign.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var t = require("../../types");
+var t = require("../../../types");
 var _ = require("lodash");
 
 var isProtoKey = function (node) {

lib/6to5/transformation/transformers/optional/self-contained.js

@@ -1,9 +1,9 @@
 "use strict";
 
-var traverse = require("../../traverse");
-var util     = require("../../util");
+var traverse = require("../../../traverse");
+var util     = require("../../../util");
 var core     = require("core-js/library");
-var t        = require("../../types");
+var t        = require("../../../types");
 var _        = require("lodash");
 
 var coreHas = function (node) {

lib/6to5/transformation/transformers/optional/typeof-symbol.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var t = require("../../types");
+var t = require("../../../types");
 
 exports.optional = true;
 

lib/6to5/transformation/transformers/optional/undefined-to-void.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var t = require("../../types");
+var t = require("../../../types");
 
 exports.optional = true;
 

lib/6to5/transformation/transformers/other/react.js

@@ -6,7 +6,7 @@
 // jsx
 
 var esutils = require("esutils");
-var t       = require("../../types");
+var t       = require("../../../types");
 var _       = require("lodash");
 
 exports.XJSIdentifier = function (node) {

lib/6to5/transformation/transformers/other/use-strict.js

@@ -1,7 +1,7 @@
 "use strict";
 
-var useStrict = require("../helpers/use-strict");
-var t         = require("../../types");
+var useStrict = require("../../helpers/use-strict");
+var t         = require("../../../types");
 
 exports.ast = {
   exit: function (ast) {

lib/6to5/transformation/transformers/playground/mallet-operator.js

@@ -1,7 +1,7 @@
 "use strict";
 
-var build = require("../helpers/build-conditional-assignment-operator-transformer");
-var t      = require("../../types");
+var build = require("../../helpers/build-conditional-assignment-operator-transformer");
+var t      = require("../../../types");
 
 build(exports, {
   is: function (node, file) {

lib/6to5/transformation/transformers/playground/memoization-operator.js

@@ -1,7 +1,7 @@
 "use strict";
 
-var build = require("../helpers/build-conditional-assignment-operator-transformer");
-var t     = require("../../types");
+var build = require("../../helpers/build-conditional-assignment-operator-transformer");
+var t     = require("../../../types");
 
 build(exports, {
   is: function (node) {

lib/6to5/transformation/transformers/playground/method-binding.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var t = require("../../types");
+var t = require("../../../types");
 
 exports.BindMemberExpression = function (node, parent, scope, context, file) {
   var object = node.object;

lib/6to5/transformation/transformers/playground/object-getter-memoization.js

@@ -1,7 +1,7 @@
 "use strict";
 
-var traverse = require("../../traverse");
-var t        = require("../../types");
+var traverse = require("../../../traverse");
+var t        = require("../../../types");
 
 exports.Property =
 exports.MethodDefinition = function (node, parent, scope, context, file) {

lib/6to5/transformation/transformers/spec/block-scoped-functions.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var t = require("../../types");
+var t = require("../../../types");
 
 exports.BlockStatement = function (node, parent) {
   if (t.isFunction(parent) || t.isExportDeclaration(parent)) {

lib/6to5/transformation/transformers/spec/member-expression-literals.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var t = require("../../types");
+var t = require("../../../types");
 
 exports.MemberExpression = function (node) {
   var prop = node.property;

lib/6to5/transformation/transformers/spec/no-for-in-of-assignment.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var t = require("../../types");
+var t = require("../../../types");
 
 exports.ForInStatement =
 exports.ForOfStatement = function (node, parent, scope, context, file) {

lib/6to5/transformation/transformers/spec/property-literals.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var t = require("../../types");
+var t = require("../../../types");
 
 exports.Property = function (node) {
   var key = node.key;

test/fixtures/transformation/es6-computed-property-names-loose/options.json

@@ -1,3 +0,0 @@
-{
-  "loose": ["computedPropertyNames"]
-}

test/fixtures/transformation/es6-properties.computed-loose/options.json

@@ -0,0 +1,3 @@
+{
+  "loose": ["properties.computed"]
+}