Merge branch 'traversers-3.0.0' of https://github.com/gaearon/6to5 into gaearon-traversers-3.0.0

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

@@ -1,6 +1,36 @@
 var traverse = require("../../../traverse");
 var t        = require("../../../types");
 
+var traverser = {
+  enter: function (node, parent, scope, context, state) {
+    if (!t.isReferencedIdentifier(node, parent)) return;
+
+    var declared = state.letRefs[node.name];
+    if (!declared) return;
+
+    // declared node is different in this scope
+    if (scope.get(node.name, true) !== declared) return;
+
+    var declaredLoc  = declared.loc;
+    var referenceLoc = node.loc;
+
+    if (!declaredLoc || !referenceLoc) return;
+
+    // does this reference appear on a line before the declaration?
+    var before = referenceLoc.start.line < declaredLoc.start.line;
+
+    if (referenceLoc.start.line === declaredLoc.start.line) {
+      // this reference appears on the same line
+      // check it appears before the declaration
+      before = referenceLoc.start.col < declaredLoc.start.col;
+    }
+
+    if (before) {
+      throw state.file.errorWithNode(node, "Temporal dead zone - accessing a variable before it's initialized");
+    }
+  }
+};
+
 exports.optional = true;
 
 exports.Loop =
@@ -11,36 +41,8 @@ exports.BlockStatement = function (node, parent, scope, context, file) {
 
   var state = {
     letRefs: letRefs,
-    file: file
+    file:    file
   };
 
-  traverse(node, {
-    enter: function (node, parent, scope, context, state) {
-      if (!t.isReferencedIdentifier(node, parent)) return;
-
-      var declared = state.letRefs[node.name];
-      if (!declared) return;
-
-      // declared node is different in this scope
-      if (scope.get(node.name, true) !== declared) return;
-
-      var declaredLoc  = declared.loc;
-      var referenceLoc = node.loc;
-
-      if (!declaredLoc || !referenceLoc) return;
-
-      // does this reference appear on a line before the declaration?
-      var before = referenceLoc.start.line < declaredLoc.start.line;
-
-      if (referenceLoc.start.line === declaredLoc.start.line) {
-        // this reference appears on the same line
-        // check it appears before the declaration
-        before = referenceLoc.start.col < declaredLoc.start.col;
-      }
-
-      if (before) {
-        throw state.file.errorWithNode(node, "Temporal dead zone - accessing a variable before it's initialized");
-      }
-    }
-  }, scope, state);
+  traverse(node, traverser, scope, state);
 };

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

@@ -19,6 +19,45 @@ var ALIASABLE_CONSTRUCTORS = [
   "WeakSet"
 ];
 
+var astTraverser = {
+  enter: function (node, parent, scope, context, file) {
+    var prop;
+
+    if (t.isMemberExpression(node) && t.isReferenced(node, parent)) {
+      // Array.from -> _core.Array.from
+      var obj = node.object;
+      prop = node.property;
+
+      if (!t.isReferenced(obj, node)) return;
+
+      if (!node.computed && coreHas(obj) && _.has(core[obj.name], prop.name)) {
+        context.skip();
+        return t.prependToMemberExpression(node, file.get("coreIdentifier"));
+      }
+    } else if (t.isReferencedIdentifier(node, parent) && !t.isMemberExpression(parent) && _.contains(ALIASABLE_CONSTRUCTORS, node.name)) {
+      // Symbol() -> _core.Symbol(); new Promise -> new _core.Promise
+      return t.memberExpression(file.get("coreIdentifier"), node);
+    } else if (t.isCallExpression(node)) {
+      // arr[Symbol.iterator]() -> _core.$for.getIterator(arr)
+
+      if (node.arguments.length) return;
+
+      var callee = node.callee;
+      if (!t.isMemberExpression(callee)) return;
+      if (!callee.computed) return;
+
+      prop = callee.property;
+      if (!t.isIdentifier(prop.object, { name: "Symbol" })) return;
+      if (!t.isIdentifier(prop.property, { name: "iterator" })) return;
+
+      return util.template("corejs-iterator", {
+        CORE_ID: file.get("coreIdentifier"),
+        VALUE:   callee.object
+      });
+    }
+  }
+};
+
 exports.optional = true;
 
 exports.ast = {
@@ -29,44 +68,7 @@ exports.ast = {
   },
 
   exit: function (ast, file) {
-    traverse(ast, {
-      enter: function (node, parent, scope, context) {
-        var prop;
-
-        if (t.isMemberExpression(node) && t.isReferenced(node, parent)) {
-          // Array.from -> _core.Array.from
-          var obj = node.object;
-          prop = node.property;
-
-          if (!t.isReferenced(obj, node)) return;
-
-          if (!node.computed && coreHas(obj) && _.has(core[obj.name], prop.name)) {
-            context.skip();
-            return t.prependToMemberExpression(node, file.get("coreIdentifier"));
-          }
-        } else if (t.isReferencedIdentifier(node, parent) && !t.isMemberExpression(parent) && _.contains(ALIASABLE_CONSTRUCTORS, node.name)) {
-          // Symbol() -> _core.Symbol(); new Promise -> new _core.Promise
-          return t.memberExpression(file.get("coreIdentifier"), node);
-        } else if (t.isCallExpression(node)) {
-          // arr[Symbol.iterator]() -> _core.$for.getIterator(arr)
-
-          if (node.arguments.length) return;
-
-          var callee = node.callee;
-          if (!t.isMemberExpression(callee)) return;
-          if (!callee.computed) return;
-
-          prop = callee.property;
-          if (!t.isIdentifier(prop.object, { name: "Symbol" })) return;
-          if (!t.isIdentifier(prop.property, { name: "iterator" })) return;
-
-          return util.template("corejs-iterator", {
-            CORE_ID: file.get("coreIdentifier"),
-            VALUE:   callee.object
-          });
-        }
-      }
-    });
+    traverse(ast, astTraverser, null, file);
   }
 };