v1.14.12

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.14.12
+
+ * Fix duplicate dynamic expressions in call spread.
+
+# 1.14.10
+
+ * Fix let scoping unneccesary override.
+
 # 1.14.6
 
  * Avoid ensuring a block on non-array node replacements.

lib/6to5/file.js

@@ -41,7 +41,8 @@ File.normaliseOptions = function (opts) {
     filename:     "unknown",
     modules:      "common",
     runtime:      false,
-    code:         true
+    code:         true,
+    ast:          true
   });
 
   // normalise windows path separators to unix
@@ -186,15 +187,18 @@ File.prototype.generate = function () {
   var opts = this.opts;
   var ast  = this.ast;
 
-  if (!opts.code) {
-    return {
-      code: "",
-      map:  null,
-      ast:  ast
-    };
-  }
+  var result = {
+    code: "",
+    map: null,
+    ast: null
+  };
 
-  var result = generate(ast, opts, this.code);
+  if (opts.ast) result.ast = ast;
+  if (!opts.code) return result;
+
+  var _result = generate(ast, opts, this.code);
+  result.code = _result.code;
+  result.map  = _result.map;
 
   if (this.shebang) {
     // add back shebang
@@ -205,8 +209,6 @@ File.prototype.generate = function () {
     result.code += "\n" + util.sourceMapToComment(result.map);
   }
 
-  result.ast = result;
-
   return result;
 };
 

lib/6to5/register.js

@@ -1,7 +1,6 @@
 require("./polyfill");
 
 var sourceMapSupport = require("source-map-support");
-var roadrunner       = require('roadrunner');
 var util             = require("./util");
 var to5              = require("./index");
 var fs               = require("fs");
@@ -90,7 +89,8 @@ var loader = function (m, filename) {
     whitelist: whitelist,
     blacklist: blacklist,
     sourceMap: true,
-    modules:   "commonInterop"
+    modules:   "commonInterop",
+    ast:       false
   }, transformOpts));
 
   if (cache) {
@@ -129,7 +129,7 @@ module.exports = function (opts) {
 
   if (opts.extensions) hookExtensions(util.arrayify(opts.extensions));
 
-  if (opts.cache) cache = roadrunner.get('6to5');
+  if (opts.cache) cache = opts.cache;
   if (opts.cache === false) cache = null;
 
   _.extend(transformOpts, opts);

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

@@ -56,7 +56,7 @@ exports.ArrayExpression = function (node, parent, file) {
   return t.callExpression(t.memberExpression(first, t.identifier("concat")), nodes);
 };
 
-exports.CallExpression = function (node, parent, file) {
+exports.CallExpression = function (node, parent, file, scope) {
   var args = node.arguments;
   if (!hasSpread(args)) return;
 
@@ -79,10 +79,16 @@ exports.CallExpression = function (node, parent, file) {
   }
 
   var callee = node.callee;
+  var temp;
 
   if (t.isMemberExpression(callee)) {
     contextLiteral = callee.object;
 
+    if (t.isDynamic(contextLiteral)) {
+      temp = contextLiteral = scope.generateTemp(file);
+      callee.object = t.assignmentExpression("=", temp, callee.object);
+    }
+
     if (callee.computed) {
       callee.object = t.memberExpression(callee.object, callee.property, true);
       callee.property = t.identifier("apply");

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

@@ -30,12 +30,7 @@ exports.AssignmentExpression = function (node, parent, file, scope) {
   if (!t.isExpressionStatement(parent)) {
     // `node.right` isn't a simple identifier so we need to reference it
     if (t.isDynamic(value)) {
-      var tempName = file.generateUid("temp");
-      temp = value = t.identifier(tempName);
-      scope.push({
-        key: tempName,
-        id: temp
-      });
+      temp = value = scope.generateTemp(file);
     }
   }
 
@@ -75,12 +70,7 @@ exports.CallExpression = function (node, parent, file, scope) {
   var temp;
   if (t.isDynamic(callee.object)) {
     // we need to save `callee.object` so we can call it again
-    var tempName = file.generateUid("temp");
-    temp = t.identifier(tempName);
-    scope.push({
-      key: tempName,
-      id: temp
-    });
+    temp = scope.generateTemp(file);
   }
 
   var call = util.template("abstract-expression-call", {

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

@@ -7,12 +7,7 @@ exports.BindMemberExpression = function (node, parent, file, scope) {
 
   var temp;
   if (t.isDynamic(object)) {
-    var tempName = file.generateUid("temp", scope);
-    temp =  object = t.identifier(tempName);
-    scope.push({
-      key: tempName,
-      id: temp
-    });
+    temp = object = scope.generateTemp(file);
   }
 
   var call = t.callExpression(
@@ -39,17 +34,12 @@ exports.BindFunctionExpression = function (node, parent, file, scope) {
   };
 
   if (_.find(node.arguments, t.isDynamic)) {
-    var argsIdName = file.generateUid("args", scope);
-    var argsId = t.identifier(argsIdName);
-    scope.push({
-      key: argsIdName,
-      id: argsId
-    });
+    var temp = scope.generateTemp(file, "args");
 
     return t.sequenceExpression([
-      t.assignmentExpression("=", argsId, t.arrayExpression(node.arguments)),
+      t.assignmentExpression("=", temp, t.arrayExpression(node.arguments)),
       buildCall(node.arguments.map(function (node, i) {
-        return t.memberExpression(argsId, t.literal(i), true);
+        return t.memberExpression(temp, t.literal(i), true);
       }))
     ]);
   } else {

lib/6to5/traverse/scope.js

@@ -23,7 +23,16 @@ function Scope(block, parent) {
 
 Scope.add = function (node, references) {
   if (!node) return;
-  _.merge(references, t.getIds(node, true));
+  _.defaults(references, t.getIds(node, true));
+};
+
+Scope.prototype.generateTemp = function (file, name) {
+    var id = file.generateUidIdentifier(name || "temp", this);
+    this.push({
+      key: id.name,
+      id: id
+    });
+    return id;
 };
 
 Scope.prototype.getReferences = function () {

lib/6to5/types/index.js

@@ -162,7 +162,7 @@ t.toIdentifier = function (name) {
     return c ? c.toUpperCase() : "";
   });
 
-  return name;
+  return name || '_';
 };
 
 t.isValidIdentifier = function (name) {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "6to5",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "1.14.8",
+  "version": "1.14.12",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://github.com/6to5/6to5",
   "repository": {
@@ -48,7 +48,6 @@
     "mkdirp": "0.5.0",
     "private": "0.1.6",
     "regexpu": "0.3.0",
-    "roadrunner": "^1.0.4",
     "source-map": "0.1.40",
     "source-map-support": "0.2.8"
   },