v1.12.14

CHANGELOG.md

@@ -1,3 +1,16 @@
+# 1.12.14
+
+ * Fix duplicate let scoping in functions.
+ * Make JSX whitespace more React-compliant.
+ * Add `_memberExpressionKeywords` transformer that turns keyword identifiers to computed literals.
+ * Upgrade `regenerator-6to5`.
+
+# 1.12.13
+
+ * Support duplicate constants within different block scopes.
+ * Fix for-head duplication testing and replacement.
+ * Support `raw` property on tagged template literals.
+
 # 1.12.12
 
  * Make scope tracker more reliable to handle all edgecases.

lib/6to5/file.js

@@ -18,7 +18,8 @@ function File(opts) {
   this.ast          = {};
 }
 
-File.declarations = ["extends", "class-props", "slice", "apply-constructor"];
+File.declarations = ["extends", "class-props", "slice", "apply-constructor",
+                     "tagged-template-literal"];
 
 File.normaliseOptions = function (opts) {
   opts = _.cloneDeep(opts || {});

lib/6to5/templates/tagged-template-literal.js

@@ -0,0 +1,4 @@
+(function (strings, raw) {
+  return Object.defineProperties(strings, { raw: { value: raw } });
+});
+

lib/6to5/transformation/transform.js

@@ -27,37 +27,38 @@ transform.moduleFormatters = {
 };
 
 _.each({
-  modules:                  require("./transformers/modules"),
-  propertyNameShorthand:    require("./transformers/property-name-shorthand"),
-  constants:                require("./transformers/constants"),
-  arrayComprehension:       require("./transformers/array-comprehension"),
-  generatorComprehension:   require("./transformers/generator-comprehension"),
-  arrowFunctions:           require("./transformers/arrow-functions"),
-  classes:                  require("./transformers/classes"),
+  modules:                   require("./transformers/modules"),
+  propertyNameShorthand:     require("./transformers/property-name-shorthand"),
+  constants:                 require("./transformers/constants"),
+  arrayComprehension:        require("./transformers/array-comprehension"),
+  generatorComprehension:    require("./transformers/generator-comprehension"),
+  arrowFunctions:            require("./transformers/arrow-functions"),
+  classes:                   require("./transformers/classes"),
 
-  _propertyLiterals:        require("./transformers/_property-literals"),
-  computedPropertyNames:    require("./transformers/computed-property-names"),
+  _propertyLiterals:         require("./transformers/_property-literals"),
+  computedPropertyNames:     require("./transformers/computed-property-names"),
 
-  spread:                   require("./transformers/spread"),
-  templateLiterals:         require("./transformers/template-literals"),
-  propertyMethodAssignment: require("./transformers/property-method-assignment"),
-  defaultParameters:        require("./transformers/default-parameters"),
-  restParameters:           require("./transformers/rest-parameters"),
-  destructuring:            require("./transformers/destructuring"),
-  forOf:                    require("./transformers/for-of"),
-  letScoping:               require("./transformers/let-scoping"),
-  unicodeRegex:             require("./transformers/unicode-regex"),
+  spread:                    require("./transformers/spread"),
+  templateLiterals:          require("./transformers/template-literals"),
+  propertyMethodAssignment:  require("./transformers/property-method-assignment"),
+  defaultParameters:         require("./transformers/default-parameters"),
+  restParameters:            require("./transformers/rest-parameters"),
+  destructuring:             require("./transformers/destructuring"),
+  forOf:                     require("./transformers/for-of"),
+  letScoping:                require("./transformers/let-scoping"),
+  unicodeRegex:              require("./transformers/unicode-regex"),
 
-  react:                    require("./transformers/react"),
+  react:                     require("./transformers/react"),
 
-  _aliasFunctions:          require("./transformers/_alias-functions"),
-  _blockHoist:              require("./transformers/_block-hoist"),
-  _declarations:            require("./transformers/_declarations"),
+  _aliasFunctions:           require("./transformers/_alias-functions"),
+  _blockHoist:               require("./transformers/_block-hoist"),
+  _declarations:             require("./transformers/_declarations"),
 
-  generators:               require("./transformers/generators"),
-  useStrict:                require("./transformers/use-strict"),
+  generators:                require("./transformers/generators"),
+  useStrict:                 require("./transformers/use-strict"),
 
-  _moduleFormatter:         require("./transformers/_module-formatter")
+  _memberExpressionKeywords: require("./transformers/_member-expression-keywords"),
+  _moduleFormatter:          require("./transformers/_module-formatter")
 }, function (transformer, key) {
   transform.transformers[key] = new Transformer(key, transformer);
 });

lib/6to5/transformation/transformers/_member-expression-keywords.js

@@ -0,0 +1,10 @@
+var esutils = require("esutils");
+var t = require("../../types");
+
+exports.MemberExpression = function (node) {
+  var prop = node.property;
+  if (t.isIdentifier(prop) && esutils.keyword.isKeywordES6(prop.name, true)) {
+    node.property = t.literal(prop.name);
+    node.computed = true;
+  }
+};

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

@@ -7,13 +7,14 @@ exports.BlockStatement =
 exports.ForInStatement =
 exports.ForOfStatement =
 exports.ForStatement = function (node, parent, file) {
-  var constants = [];
+  var constants = {};
 
-  var check = function (node, names) {
+  var check = function (node, names, parent) {
     _.each(names, function (name) {
-      if (constants.indexOf(name) >= 0) {
-        throw file.errorWithNode(node, name + " is read-only");
-      }
+      if (!_.has(constants, name)) return;
+      if (parent && t.isBlockStatement(parent) && parent !== constants[name]) return;
+
+      throw file.errorWithNode(node, name + " is read-only");
     });
   };
 
@@ -21,12 +22,12 @@ exports.ForStatement = function (node, parent, file) {
     return t.getIds(node, false, ["MemberExpression"]);
   };
 
-  _.each(node.body, function (child) {
+  _.each(node.body, function (child, parent) {
     if (child && t.isVariableDeclaration(child, { kind: "const" })) {
       _.each(child.declarations, function (declar) {
         _.each(getIds(declar), function (name) {
-          check(declar, [name]);
-          constants.push(name);
+          check(declar, [name], parent);
+          constants[name] = parent;
         });
 
         declar._ignoreConstant = true;
@@ -37,13 +38,13 @@ exports.ForStatement = function (node, parent, file) {
     }
   });
 
-  if (!constants.length) return;
+  if (_.isEmpty(constants)) return;
 
-  traverse(node, function (child) {
+  traverse(node, function (child, parent) {
     if (child._ignoreConstant) return;
 
-    if (t.isVariableDeclarator(child) || t.isDeclaration(child) || t.isAssignmentExpression(child)) {
-      check(child, getIds(child));
+    if (t.isDeclaration(child) || t.isAssignmentExpression(child)) {
+      check(child, getIds(child), parent);
     }
   });
 };

lib/6to5/transformation/transformers/let-scoping.js

@@ -74,7 +74,6 @@ function LetScoping(forParent, block, parent, file, scope) {
 
   this.letReferences = {};
   this.body          = [];
-  this.info          = this.getInfo();
 }
 
 /**
@@ -87,8 +86,10 @@ LetScoping.prototype.run = function () {
   if (block._letDone) return;
   block._letDone = true;
 
+  this.info = this.getInfo();
+
   // this is a block within a `Function` so we can safely leave it be
-  if (t.isFunction(this.parent)) return;
+  if (t.isFunction(this.parent)) return this.noClosure();
 
   // this block has no let references so let's clean up
   if (!this.info.keys.length) return this.noClosure();
@@ -145,11 +146,25 @@ LetScoping.prototype.noClosure = function () {
 
   if (_.isEmpty(replacements)) return;
 
-  traverse(block, function (node, parent) {
+  var replace = function (node, parent) {
     if (!t.isIdentifier(node)) return;
     if (!t.isReferenced(node, parent)) return;
     node.name = replacements[node.name] || node.name;
-  });
+  };
+
+  var traverseReplace = function (node, parent) {
+    replace(node, parent);
+    traverse(node, replace);
+  };
+
+  var forParent = this.forParent;
+  if (forParent) {
+    traverseReplace(forParent.right, forParent);
+    traverseReplace(forParent.test, forParent);
+    traverseReplace(forParent.update, forParent);
+  }
+
+  traverse(block, replace);
 };
 
 /**
@@ -181,10 +196,23 @@ LetScoping.prototype.getInfo = function () {
     keys:        []
   };
 
+  var duplicates = function (id, key) {
+    var has = scope.parentGet(key);
+
+    if (has && has !== id) {
+      // there's a variable with this exact name in an upper scope so we need
+      // to generate a new name
+      opts.duplicates[key] = id.name = file.generateUid(key, scope);
+    }
+  };
+
   _.each(opts.declarators, function (declar) {
     opts.declarators.push(declar);
 
-    var keys = t.getIds(declar);
+    var keys = t.getIds(declar, true);
+    _.each(keys, duplicates);
+    keys = _.keys(keys);
+
     opts.outsideKeys = opts.outsideKeys.concat(keys);
     opts.keys = opts.keys.concat(keys);
   });
@@ -193,14 +221,7 @@ LetScoping.prototype.getInfo = function () {
     if (!isLet(declar)) return;
 
     _.each(t.getIds(declar, true), function (id, key) {
-      var has = scope.parentGet(key);
-
-      if (has && has !== id) {
-        // there's a variable with this exact name in an upper scope so we need
-        // to generate a new name
-        opts.duplicates[key] = id.name = file.generateUid(key, scope);
-      }
-
+      duplicates(id, key);
       opts.keys.push(key);
     });
   });

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

@@ -106,11 +106,35 @@ exports.XJSElement = {
   exit: function (node) {
     var callExpr = node.openingElement;
 
-    var childrenToRender = node.children.filter(function(child) {
-      return !(t.isLiteral(child) && _.isString(child.value) && child.value.match(/^[ \t]*[\r\n][ \t\r\n]*$/));
-    });
+    _.each(node.children, function (child) {
+      if (t.isLiteral(child)) {
+        var lines = child.value.split(/\r\n|\n|\r/);
+
+        _.each(lines, function (line, i) {
+          var isFirstLine = i === 0;
+          var isLastLine = i === lines.length - 1;
+
+          // replace rendered whitespace tabs with spaces
+          var trimmedLine = line.replace(/\t/g, ' ');
+
+          // trim whitespace touching a newline
+          if (!isFirstLine) {
+            trimmedLine = trimmedLine.replace(/^[ ]+/, '');
+          }
+
+          // trim whitespace touching an endline
+          if (!isLastLine) {
+            trimmedLine = trimmedLine.replace(/[ ]+$/, '');
+          }
+
+          if (trimmedLine) {
+            callExpr.arguments.push(t.literal(trimmedLine));
+          }
+        });
+
+        return;
+      }
 
-    _.each(childrenToRender, function (child) {
       callExpr.arguments.push(child);
     });
 

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

@@ -5,14 +5,22 @@ var buildBinaryExpression = function (left, right) {
   return t.binaryExpression("+", left, right);
 };
 
-exports.TaggedTemplateExpression = function (node) {
+exports.TaggedTemplateExpression = function (node, parent, file) {
   var args = [];
   var quasi = node.quasi;
 
-  var strings = quasi.quasis.map(function (elem) {
-    return t.literal(elem.value.raw);
+  var strings = [];
+  var raw = [];
+
+  _.each(quasi.quasis, function (elem) {
+    strings.push(t.literal(elem.value.cooked));
+    raw.push(t.literal(elem.value.raw));
   });
-  args.push(t.arrayExpression(strings));
+
+  args.push(t.callExpression(file.addDeclaration("tagged-template-literal"), [
+    t.arrayExpression(strings),
+    t.arrayExpression(raw)
+  ]));
 
   _.each(quasi.expressions, function (expr) {
     args.push(expr);

package.json

@@ -1,7 +1,7 @@
 {
   "name": "6to5",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "1.12.12",
+  "version": "1.12.14",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://github.com/6to5/6to5",
   "repository": {
@@ -44,7 +44,7 @@
     "es6-symbol": "0.1.1",
     "regexpu": "0.3.0",
     "source-map": "0.1.40",
-    "regenerator-6to5": "https://github.com/6to5/regenerator-6to5/archive/75925940a7bb67d1ee8afec36b6d6eec072fb47c.tar.gz",
+    "regenerator-6to5": "https://github.com/6to5/regenerator-6to5/archive/a9c53518af063ffef410f826225f8ee250131932.tar.gz",
     "chokidar": "0.10.5",
     "source-map-support": "0.2.8",
     "esutils": "1.1.4",

test/_helper.js

@@ -36,8 +36,6 @@ exports.get = function (entryName) {
     if (fs.existsSync(suiteOptsLoc)) suite.options = require(suiteOptsLoc);
 
     _.each(fs.readdirSync(suite.filename), function (taskName) {
-      if (taskName[0] === ".") return;
-
       var taskDir = suite.filename + "/" + taskName;
       if (fs.statSync(taskDir).isFile()) return;
 
@@ -59,6 +57,7 @@ exports.get = function (entryName) {
 
       var test = {
         title: humanise(taskName),
+        disabled: taskName[0] === ".",
         options: taskOpts,
         exec: {
           code: readFile(execLoc),

test/fixtures/transformation/classes/accessing-super-class/expected.js

@@ -19,7 +19,7 @@ var _extends = function (child, parent) {
 
 var Test = (function (Foo) {
   var Test = function Test() {
-    woops.super.test();
+    woops["super"].test();
     Foo.call(this);
     Foo.prototype.test.call(this);
     foob(Foo);

test/fixtures/transformation/let-scoping/exec-block-scoped/exec.js

@@ -0,0 +1,6 @@
+let x = 1;
+{
+  let x = 2;
+  assert.equal(x, 2);
+}
+assert.equal(x, 1);

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

@@ -0,0 +1,10 @@
+function test () {
+  let value = "outer";
+
+  return (function () {
+    let value = "inner";
+    return value;
+  })();
+}
+
+assert(test(), "inner");

test/fixtures/transformation/let-scoping/exec-for-loop-head/exec.js

@@ -0,0 +1,5 @@
+assert.equal((function(){
+  let a = 1;
+  for (let a = 0; a < 8; a++) {}
+  return a;
+}()), 1);

test/fixtures/transformation/misc/_member-expression-keywords/actual.js

@@ -0,0 +1,4 @@
+test.catch;
+test.catch["foo"];
+test["catch"];
+test["catch"]["foo"];

test/fixtures/transformation/misc/_member-expression-keywords/expected.js

@@ -0,0 +1,6 @@
+"use strict";
+
+test["catch"];
+test["catch"]["foo"];
+test["catch"];
+test["catch"]["foo"];

test/fixtures/transformation/misc/_property-literals/actual.js

@@ -0,0 +1,6 @@
+var obj = {
+  "test": "foob",
+  "!@#$": "foob",
+  "33rd": "foob",
+  fooBar: "foob"
+};

test/fixtures/transformation/misc/_property-literals/expected.js

@@ -0,0 +1,8 @@
+"use strict";
+
+var obj = {
+  test: "foob",
+  "!@#$": "foob",
+  "33rd": "foob",
+  fooBar: "foob"
+};

test/fixtures/transformation/modules-amd/exports-default/expected.js

@@ -1,15 +1,15 @@
 define(["exports"], function (exports) {
   "use strict";
 
-  exports.default = 42;
-  exports.default = {};
-  exports.default = [];
-  exports.default = foo;
-  exports.default = function () {};
-  exports.default = function () {};
+  exports["default"] = 42;
+  exports["default"] = {};
+  exports["default"] = [];
+  exports["default"] = foo;
+  exports["default"] = function () {};
+  exports["default"] = function () {};
   function foo() {}
-  exports.default = foo;
+  exports["default"] = foo;
   var Foo = function Foo() {};
 
-  exports.default = Foo;
+  exports["default"] = Foo;
 });

test/fixtures/transformation/modules-amd/exports-from/expected.js

@@ -11,7 +11,7 @@ define(["exports", "foo"], function (exports, _foo) {
   exports.foo = _foo.foo;
   exports.bar = _foo.bar;
   exports.bar = _foo.foo;
-  exports.default = _foo.foo;
-  exports.default = _foo.foo;
+  exports["default"] = _foo.foo;
+  exports["default"] = _foo.foo;
   exports.bar = _foo.bar;
-});
+});

test/fixtures/transformation/modules-amd/exports-named/expected.js

@@ -5,7 +5,7 @@ define(["exports"], function (exports) {
   exports.foo = foo;
   exports.bar = bar;
   exports.bar = foo;
-  exports.default = foo;
-  exports.default = foo;
+  exports["default"] = foo;
+  exports["default"] = foo;
   exports.bar = bar;
-});
+});

test/fixtures/transformation/modules-amd/imports-default/expected.js

@@ -1,6 +1,6 @@
 define(["exports", "foo"], function (exports, _foo) {
   "use strict";
 
-  var foo = _foo.default;
-  var foo = _foo.default;
-});
+  var foo = _foo["default"];
+  var foo = _foo["default"];
+});

test/fixtures/transformation/modules-amd/imports-mixing/expected.js

@@ -1,6 +1,6 @@
 define(["exports", "foo"], function (exports, _foo) {
   "use strict";
 
-  var foo = _foo.default;
+  var foo = _foo["default"];
   var xyz = _foo.baz;
-});
+});

test/fixtures/transformation/modules-amd/overview/expected.js

@@ -1,12 +1,12 @@
 define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo, _fooBar, _directoryFooBar) {
   "use strict";
 
-  var foo = _foo.default;
+  var foo = _foo["default"];
   var foo = _foo;
   var bar = _foo.bar;
   var bar = _foo.foo;
   exports.test = test;
   var test = exports.test = 5;
 
-  exports.default = test;
+  exports["default"] = test;
 });

test/fixtures/transformation/modules-common/exports-default/expected.js

@@ -1,13 +1,13 @@
 "use strict";
 
-exports.default = 42;
-exports.default = {};
-exports.default = [];
-exports.default = foo;
-exports.default = function () {};
-exports.default = function () {};
+exports["default"] = 42;
+exports["default"] = {};
+exports["default"] = [];
+exports["default"] = foo;
+exports["default"] = function () {};
+exports["default"] = function () {};
 function foo() {}
-exports.default = foo;
+exports["default"] = foo;
 var Foo = function Foo() {};
 
-exports.default = Foo;
+exports["default"] = Foo;

test/fixtures/transformation/modules-common/exports-from/expected.js

@@ -10,6 +10,6 @@ exports.foo = require("foo").foo;
 exports.foo = require("foo").foo;
 exports.bar = require("foo").bar;
 exports.bar = require("foo").foo;
-exports.default = require("foo").foo;
-exports.default = require("foo").foo;
-exports.bar = require("foo").bar;
+exports["default"] = require("foo").foo;
+exports["default"] = require("foo").foo;
+exports.bar = require("foo").bar;

test/fixtures/transformation/modules-common/exports-named/expected.js

@@ -4,6 +4,6 @@ exports.foo = foo;
 exports.foo = foo;
 exports.bar = bar;
 exports.bar = foo;
-exports.default = foo;
-exports.default = foo;
-exports.bar = bar;
+exports["default"] = foo;
+exports["default"] = foo;
+exports.bar = bar;

test/fixtures/transformation/modules-common/imports-default/expected.js

@@ -1,4 +1,4 @@
 "use strict";
 
-var foo = require("foo").default;
-var foo = require("foo").default;
+var foo = require("foo")["default"];
+var foo = require("foo")["default"];

test/fixtures/transformation/modules-common/imports-mixing/expected.js

@@ -1,4 +1,4 @@
 "use strict";
 
-var foo = require("foo").default;
+var foo = require("foo")["default"];
 var xyz = require("foo").baz;

test/fixtures/transformation/modules-common/overview/expected.js

@@ -6,7 +6,7 @@ require("foo-bar");
 
 require("./directory/foo-bar");
 
-var foo = require("foo").default;
+var foo = require("foo")["default"];
 var foo = require("foo");
 
 var bar = require("foo").bar;
@@ -14,4 +14,4 @@ var bar = require("foo").foo;
 exports.test = test;
 var test = exports.test = 5;
 
-exports.default = test;
+exports["default"] = test;

test/fixtures/transformation/modules-umd/exports-default/expected.js

@@ -7,15 +7,15 @@
 })(function (exports) {
   "use strict";
 
-  exports.default = 42;
-  exports.default = {};
-  exports.default = [];
-  exports.default = foo;
-  exports.default = function () {};
-  exports.default = function () {};
+  exports["default"] = 42;
+  exports["default"] = {};
+  exports["default"] = [];
+  exports["default"] = foo;
+  exports["default"] = function () {};
+  exports["default"] = function () {};
   function foo() {}
-  exports.default = foo;
+  exports["default"] = foo;
   var Foo = function Foo() {};
 
-  exports.default = Foo;
+  exports["default"] = Foo;
 });

test/fixtures/transformation/modules-umd/exports-from/expected.js

@@ -17,7 +17,7 @@
   exports.foo = _foo.foo;
   exports.bar = _foo.bar;
   exports.bar = _foo.foo;
-  exports.default = _foo.foo;
-  exports.default = _foo.foo;
+  exports["default"] = _foo.foo;
+  exports["default"] = _foo.foo;
   exports.bar = _foo.bar;
 });

test/fixtures/transformation/modules-umd/exports-named/expected.js

@@ -11,7 +11,7 @@
   exports.foo = foo;
   exports.bar = bar;
   exports.bar = foo;
-  exports.default = foo;
-  exports.default = foo;
+  exports["default"] = foo;
+  exports["default"] = foo;
   exports.bar = bar;
-});
+});

test/fixtures/transformation/modules-umd/imports-default/expected.js

@@ -7,6 +7,6 @@
 })(function (exports, _foo) {
   "use strict";
 
-  var foo = _foo.default;
-  var foo = _foo.default;
-});
+  var foo = _foo["default"];
+  var foo = _foo["default"];
+});

test/fixtures/transformation/modules-umd/imports-mixing/expected.js

@@ -7,6 +7,6 @@
 })(function (exports, _foo) {
   "use strict";
 
-  var foo = _foo.default;
+  var foo = _foo["default"];
   var xyz = _foo.baz;
-});
+});

test/fixtures/transformation/modules-umd/overview/expected.js

@@ -7,12 +7,12 @@
 })(function (exports, _foo, _fooBar, _directoryFooBar) {
   "use strict";
 
-  var foo = _foo.default;
+  var foo = _foo["default"];
   var foo = _foo;
   var bar = _foo.bar;
   var bar = _foo.foo;
   exports.test = test;
   var test = exports.test = 5;
 
-  exports.default = test;
+  exports["default"] = test;
 });

test/fixtures/transformation/template-literals/tag/actual.js

@@ -1 +1 @@
-var foo = bar`a${ 42 }b ${_.foobar()}`;
+var foo = bar`wow\na${ 42 }b ${_.foobar()}`;

test/fixtures/transformation/template-literals/tag/expected.js

@@ -1,3 +1,11 @@
 "use strict";
 
-var foo = bar(["a", "b ", ""], 42, _.foobar());
+var _taggedTemplateLiteral = function (strings, raw) {
+  return Object.defineProperties(strings, {
+    raw: {
+      value: raw
+    }
+  });
+};
+
+var foo = bar(_taggedTemplateLiteral(["wow\na", "b ", ""], ["wow\\na", "b ", ""]), 42, _.foobar());

test/generation.js

@@ -22,7 +22,7 @@ suite("generation", function () {
 _.each(helper.get("generation"), function (testSuite) {
   suite("generation/" + testSuite.title, function () {
     _.each(testSuite.tests, function (task) {
-      test(task.title, function () {
+      test(task.title, !task.disabled && function () {
         var expect = task.expect;
         var actual = task.actual;
 

test/transformation.js

@@ -64,7 +64,7 @@ var run = function (task) {
 _.each(helper.get("transformation"), function (testSuite) {
   suite("transformation/" + testSuite.title, function () {
     _.each(testSuite.tests, function (task) {
-      test(task.title, function () {
+      test(task.title, !task.disabled && function () {
         var runTask = function () {
           run(task);
         };