v1.12.12

This reverts commit fdd1451d53.

CHANGELOG.md

@@ -1,3 +1,12 @@
+# 1.12.12
+
+ * Make scope tracker more reliable to handle all edgecases.
+
+# 1.12.11
+
+ * Block scope classes.
+ * Fix generation of integer `Literal`s in `MemberExpression`.
+
 # 1.12.10
 
  * Fix let scoping var hoisting.

lib/6to5/generation/generators/expressions.js

@@ -1,4 +1,5 @@
-var t = require("../../types");
+var util = require("../../util");
+var t    = require("../../types");
 
 exports.UnaryExpression = function (node, print) {
   var hasSpace = /[a-z]$/.test(node.operator);
@@ -105,6 +106,11 @@ exports.MemberExpression = function (node, print) {
     print(node.property);
     this.push("]");
   } else {
+    // 5..toFixed(2);
+    if (t.isLiteral(node.object) && util.isInteger(node.object.value)) {
+      this.push(".");
+    }
+
     this.push(".");
     print(node.property);
   }

lib/6to5/generation/node/index.js

@@ -2,8 +2,8 @@ module.exports = Node;
 
 var whitespace = require("./whitespace");
 var parens     = require("./parentheses");
-var t           = require("../../types");
-var _           = require("lodash");
+var t          = require("../../types");
+var _          = require("lodash");
 
 var find = function (obj, node, parent) {
   var result;

lib/6to5/runtime.js

@@ -5,7 +5,7 @@ var t         = require("./types");
 var _         = require("lodash");
 
 module.exports = function (namespace) {
-  namespace = t.identifier(namespace || "to5Runtime");
+  namespace = t.identifier(t.toIdentifier(namespace || "to5Runtime"));
 
   var body      = [];
   var container = t.functionExpression(null, [], t.blockStatement(body));

lib/6to5/transformation/transform.js

@@ -44,8 +44,8 @@ _.each({
   defaultParameters:        require("./transformers/default-parameters"),
   restParameters:           require("./transformers/rest-parameters"),
   destructuring:            require("./transformers/destructuring"),
-  letScoping:               require("./transformers/let-scoping"),
   forOf:                    require("./transformers/for-of"),
+  letScoping:               require("./transformers/let-scoping"),
   unicodeRegex:             require("./transformers/unicode-regex"),
 
   react:                    require("./transformers/react"),

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

@@ -4,7 +4,7 @@ var t        = require("../../types");
 var _        = require("lodash");
 
 exports.ClassDeclaration = function (node, parent, file, scope) {
-  return t.variableDeclaration("var", [
+  return t.variableDeclaration("let", [
     t.variableDeclarator(node.id, new Class(node, file, scope).run())
   ]);
 };

lib/6to5/traverse/scope.js

@@ -4,6 +4,8 @@ var traverse = require("./index");
 var t        = require("../types");
 var _        = require("lodash");
 
+var FOR_KEYS = ["left", "init"];
+
 function Scope(parent, block) {
   this.parent = parent;
   this.block  = block;
@@ -19,29 +21,59 @@ Scope.prototype.getIds = function () {
   var self = this;
   var ids  = block._scopeIds = {};
 
-  if (t.isBlockStatement(block)) {
-    _.each(block.body, function (node) {
-      if (t.isVariableDeclaration(node) && node.kind !== "var") {
-        self.add(node, ids);
-      }
-    });
-  } else if (t.isProgram(block) || t.isFunction(block)) {
-    traverse(block, function (node, parent) {
-      if (parent !== block && t.isVariableDeclaration(node) && node.kind !== "var") {
-        return;
-      }
+  // ForStatement - left, init
 
-      if (t.isDeclaration(node)) {
-        self.add(node, ids);
-      } else if (t.isFunction(node)) {
-        return false;
-      }
+  if (t.isFor(block)) {
+    _.each(FOR_KEYS, function (key) {
+      var node = block[key];
+      if (t.isLet(node)) self.add(node, ids);
     });
-  } else if (t.isCatchClause(block)) {
+
+    block = block.body;
+  }
+
+  // Program, BlockStatement - let variables
+
+  if (t.isBlockStatement(block) || t.isProgram(block)) {
+    _.each(block.body, function (node) {
+      // check for non-var `VariableDeclaration`s
+      if (t.isLet(node)) self.add(node, ids);
+    });
+  }
+
+  // CatchClause - param
+
+  if (t.isCatchClause(block)) {
     self.add(block.param, ids);
   }
 
+  // Program, Function - var variables
+
+  if (t.isProgram(block) || t.isFunction(block)) {
+    traverse(block, function (node) {
+      if (t.isFor(node)) {
+        _.each(FOR_KEYS, function (key) {
+          var declar = node[key];
+          if (t.isVar(declar)) self.add(declar, ids);
+        });
+      }
+
+      // this block is a function so we'll stop since none of the variables
+      // declared within are accessible
+      if (t.isFunction(node)) return false;
+
+      // we've ran into a declaration!
+      // we'll let the BlockStatement scope deal with `let` declarations
+      if (t.isDeclaration(node) && !t.isLet(node)) {
+        self.add(node, ids);
+      }
+    });
+  }
+
+  // Function - params
+
   if (t.isFunction(block)) {
+    this.add(block.rest, ids);
     _.each(block.params, function (param) {
       self.add(param, ids);
     });
@@ -51,6 +83,7 @@ Scope.prototype.getIds = function () {
 };
 
 Scope.prototype.add = function (node, ids) {
+  if (!node) return;
   _.merge(ids || this.ids, t.getIds(node, true));
 };
 

lib/6to5/types/alias-keys.json

@@ -35,9 +35,9 @@
   "ClassDeclaration": ["Statement", "Declaration", "Class"],
   "ClassExpression":  ["Class"],
 
-  "ForOfStatement": ["Statement", "For"],
-  "ForInStatement": ["Statement", "For"],
-  "ForStatement":   ["Statement", "For"],
+  "ForOfStatement": ["Statement", "For", "Scope"],
+  "ForInStatement": ["Statement", "For", "Scope"],
+  "ForStatement":   ["Statement", "For", "Scope"],
 
   "ObjectPattern": ["Pattern"],
   "ArrayPattern":  ["Pattern"],

lib/6to5/types/index.js

@@ -185,6 +185,14 @@ t.getIds = function (node, map, ignoreTypes) {
   return ids;
 };
 
+t.isLet = function (node) {
+  return t.isVariableDeclaration(node) && (node.kind !== "var" || node._let);
+};
+
+t.isVar = function (node) {
+  return t.isVariableDeclaration(node, { kind: "var" }) && !node._let;
+};
+
 t.getIds.nodes = {
   AssignmentExpression: "left",
   ImportSpecifier: "id",

lib/6to5/util.js

@@ -17,6 +17,10 @@ exports.canCompile = function (filename, altExts) {
   return _.contains(exts, ext);
 };
 
+exports.isInteger = function (i) {
+  return _.isNumber(i) && i % 1 === 0;
+};
+
 exports.resolve = function (loc) {
   try {
     return require.resolve(loc);
@@ -123,23 +127,17 @@ exports.template = function (name, nodes, keepExpression) {
 
   template = _.cloneDeep(template);
 
-  var inherits = false;
-  if (nodes) {
-    inherits = nodes.inherits;
-    delete nodes.inherits;
-
-    if (!_.isEmpty(nodes)) {
-      traverse(template, function (node) {
-        if (t.isIdentifier(node) && _.has(nodes, node.name)) {
-          var newNode = nodes[node.name];
-          if (_.isString(newNode)) {
-            node.name = newNode;
-          } else {
-            return newNode;
-          }
+  if (!_.isEmpty(nodes)) {
+    traverse(template, function (node) {
+      if (t.isIdentifier(node) && _.has(nodes, node.name)) {
+        var newNode = nodes[node.name];
+        if (_.isString(newNode)) {
+          node.name = newNode;
+        } else {
+          return newNode;
         }
-      });
-    }
+      }
+    });
   }
 
   var node = template.body[0];
@@ -150,10 +148,6 @@ exports.template = function (name, nodes, keepExpression) {
     if (t.isParenthesizedExpression(node)) node = node.expression;
   }
 
-  if (inherits) {
-    node = t.inherits(node, inherits);
-  }
-
   return node;
 };
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "6to5",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "1.12.10",
+  "version": "1.12.12",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://github.com/6to5/6to5",
   "repository": {

test/api.js

@@ -0,0 +1,17 @@
+var transform = require("../lib/6to5/transformation/transform");
+var assert    = require("assert");
+var File      = require("../lib/6to5/file");
+
+suite("api", function () {
+  test("{ code: false }", function () {
+    var result = transform("foo('bar');", { code: false });
+    assert.ok(!result.code);
+  });
+
+  test("addDeclaration unknown", function () {
+    var file = new File;
+    assert.throws(function () {
+      file.addDeclaration("foob");
+    }, /unknown declaration foob/);
+  });
+});

test/fixtures/transformation/let-scoping/duplicate-in-upper-scope/exec.js

@@ -0,0 +1,5 @@
+let x = [0];
+for (let x of x) {
+  assert.equal(x, 0);
+}
+assert.deepEqual(x, [0]);

test/fixtures/transformation/let-scoping/hoisting/actual.js

@@ -0,0 +1,6 @@
+for (let i of [1, 2, 3]) {
+  var x = 5;
+  fns.push(function () {
+    return i * x;
+  });
+}

test/fixtures/transformation/let-scoping/hoisting/expected.js

@@ -0,0 +1,12 @@
+"use strict";
+
+for (var _iterator = [1, 2, 3][Symbol.iterator](), _step; !(_step = _iterator.next()).done;) {
+  var x;
+  (function () {
+    var i = _step.value;
+    x = 5;
+    fns.push(function () {
+      return i * x;
+    });
+  })();
+}

test/fixtures/transformation/unicode-regex/basic/actual.js

@@ -1,4 +1,2 @@
-"use strict";
-
-var string = "foo\ud83d\udca9bar";
-var match = string.match(/foo((?:[\0-\t\x0B\f\x0E-\u2027\u202A-\uD7FF\uDC00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF]))bar/);
+var string = 'foo💩bar';
+var match = string.match(/foo(.)bar/u);

test/runtime.js

@@ -0,0 +1,15 @@
+var runtime = require("../lib/6to5/runtime");
+var assert  = require("assert");
+
+suite("runtime", function () {
+  test("default", function () {
+    var code = runtime();
+    assert.ok(!!code.match(/to5Runtime/));
+  });
+
+  test("custom", function () {
+    var code = runtime("customNamespace");
+    assert.ok(code.match(/customNamespace/));
+    assert.ok(!code.match(/to5Runtime/));
+  });
+});