v1.14.7

Only slice arguments when necessary - fixes #239

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.14.6
+
+ * Avoid ensuring a block on non-array node replacements.
+
 # 1.14.5
 
  * Upgrade `acorn-6to5`.

bin/_6to5-node

@@ -32,6 +32,7 @@ to5.register({
 
 var _eval = function (code, filename) {
   code = to5.transform(code, {
+    modules: "commonInterop",
     filename: filename,
     blacklist: ["useStrict"],
     experimental: commander.experimental

doc/plugins.md

@@ -8,9 +8,10 @@
  - [Gobble](https://github.com/gobblejs/gobble-6to5)
  - [Gulp](https://github.com/sindresorhus/gulp-6to5)
  - [Grunt](https://github.com/sindresorhus/grunt-6to5)
+ - [Isparta](https://github.com/douglasduteil/isparta) - Code coverage with `karma` and `instanbul` using 6to5
  - [Jade](https://github.com/Apoxx/jade-6to5)
  - [Jest](https://github.com/6to5/6to5-jest)
- - [JSXHint](https://github.com/STRML/JSXHint) (A wrapper around JSHint to allow linting of JSX files)
+ - [JSXHint](https://github.com/STRML/JSXHint) - A wrapper around JSHint to allow linting of JSX files
  - [Karma](https://github.com/shuhei/karma-6to5-preprocessor)
  - [Mocha](https://github.com/6to5/6to5-mocha)
  - [Rails](https://github.com/josh/sprockets-es6) or via [browserify-rails](https://github.com/6to5/6to5-rails)

lib/6to5/register.js

@@ -1,8 +1,10 @@
 require("./polyfill");
 
 var sourceMapSupport = require("source-map-support");
+var roadrunner       = require('roadrunner');
 var util             = require("./util");
 var to5              = require("./index");
+var fs               = require("fs");
 var _                = require("lodash");
 
 sourceMapSupport.install({
@@ -61,22 +63,38 @@ var transformOpts = {};
 var ignoreRegex   = /node_modules/;
 var onlyRegex;
 var whitelist     = [];
+var cache;
 var exts          = {};
 var maps          = {};
 var old           = require.extensions[".js"];
 
+var mtime = function (filename) {
+  return +fs.statSync(filename).mtime;
+};
+
 var loader = function (m, filename) {
   if ((ignoreRegex && ignoreRegex.test(filename)) || (onlyRegex && !onlyRegex.test(filename))) {
     return old.apply(this, arguments);
   }
 
-  var result = to5.transformFileSync(filename, _.extend({
+  var result;
+
+  if (cache && cache[filename].mtime === mtime(filename)) {
+    result = cache[filename];
+  }
+
+  result = result || to5.transformFileSync(filename, _.extend({
     whitelist: whitelist,
     blacklist: blacklist,
     sourceMap: true,
     modules:   "commonInterop"
   }, transformOpts));
 
+  if (cache) {
+    result.mtime = mtime(filename);
+    cache[filename] = result;
+  }
+
   maps[filename] = result.map;
 
   m._compile(result.code, filename);
@@ -108,5 +126,8 @@ module.exports = function (opts) {
 
   if (opts.extensions) hookExtensions(util.arrayify(opts.extensions));
 
+  if (opts.cache) cache = roadrunner.get('6to5');
+  if (opts.cache === false) cache = null;
+
   _.extend(transformOpts, opts);
 };

lib/6to5/transformation/transformers/es6-property-name-shorthand.js

@@ -1,3 +1,4 @@
 exports.Property = function (node) {
-  if (node.shorthand) node.shorthand = false;
+  if (!node.shorthand) return;
+  node.shorthand = false;
 };

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

@@ -64,7 +64,12 @@ exports.CallExpression = function (node, parent, file) {
 
   node.arguments = [];
 
-  var nodes = build(args, file);
+  var nodes;
+  if (args.length === 1 && args[0].argument.name === 'arguments') {
+    nodes = [args[0].argument];
+  } else {
+    nodes = build(args, file);
+  }
   var first = nodes.shift();
 
   if (nodes.length) {

lib/6to5/traverse/index.js

@@ -51,7 +51,7 @@ function traverse(parent, callbacks, opts) {
           updated = true;
           node = obj[key] = result;
 
-          if (_.contains(t.STATEMENT_OR_BLOCK_KEYS, key) && !t.isBlockStatement(obj)) {
+          if (_.isArray(result) && _.contains(t.STATEMENT_OR_BLOCK_KEYS, key) && !t.isBlockStatement(obj)) {
             t.ensureBlock(obj, key);
           }
         }

lib/6to5/types/index.js

@@ -116,7 +116,7 @@ t.shallowEqual = function (actual, expected) {
 //
 
 t.isDynamic = function (node) {
-  if (t.isParenthesizedExpression(node)) {
+  if (t.isParenthesizedExpression(node) || t.isExpressionStatement(node)) {
     return t.isDynamic(node.expression);
   } else if (t.isIdentifier(node) || t.isLiteral(node) || t.isThisExpression(node)) {
     return false;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "6to5",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "1.14.5",
+  "version": "1.14.7",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://github.com/6to5/6to5",
   "repository": {
@@ -35,26 +35,27 @@
     "test": "make test"
   },
   "dependencies": {
+    "acorn-6to5": "0.9.1-11",
     "ast-types": "0.6.5",
+    "chokidar": "0.11.1",
     "commander": "2.5.0",
+    "es6-shim": "0.21.0",
+    "es6-symbol": "0.1.1",
+    "estraverse": "1.8.0",
+    "esutils": "1.1.6",
     "fs-readdir-recursive": "0.1.0",
     "lodash": "2.4.1",
     "mkdirp": "0.5.0",
-    "es6-shim": "0.21.0",
-    "es6-symbol": "0.1.1",
+    "private": "0.1.6",
     "regexpu": "0.3.0",
+    "roadrunner": "^1.0.4",
     "source-map": "0.1.40",
-    "chokidar": "0.11.1",
-    "source-map-support": "0.2.8",
-    "esutils": "1.1.6",
-    "acorn-6to5": "0.9.1-11",
-    "estraverse": "1.8.0",
-    "private": "0.1.6"
+    "source-map-support": "0.2.8"
   },
   "devDependencies": {
     "istanbul": "0.3.2",
     "matcha": "0.6.0",
-    "mocha": "2.0.1",
+    "mocha": "1.21.4",
     "uglify-js": "2.4.15",
     "browserify": "6.3.2",
     "rimraf": "2.2.8",

test/fixtures/transformation/es6-spread/arguments-array/actual.js

@@ -0,0 +1,9 @@
+function foo() {
+  return bar([...arguments]);
+}
+
+function bar(one, two, three) {
+  return [one, two, three];
+}
+
+foo("foo", "bar");

test/fixtures/transformation/es6-spread/arguments-array/expected.js

@@ -0,0 +1,12 @@
+"use strict";
+
+var _slice = Array.prototype.slice;
+function foo() {
+  return bar([].concat(_slice.call(arguments)));
+}
+
+function bar(one, two, three) {
+  return [one, two, three];
+}
+
+foo("foo", "bar");

test/fixtures/transformation/es6-spread/arguments-concat/actual.js

@@ -0,0 +1,9 @@
+function foo() {
+  return bar("test", ...arguments);
+}
+
+function bar(one, two, three) {
+  return [one, two, three];
+}
+
+foo("foo", "bar");

test/fixtures/transformation/es6-spread/arguments-concat/expected.js

@@ -0,0 +1,12 @@
+"use strict";
+
+var _slice = Array.prototype.slice;
+function foo() {
+  return bar.apply(null, ["test"].concat(_slice.call(arguments)));
+}
+
+function bar(one, two, three) {
+  return [one, two, three];
+}
+
+foo("foo", "bar");

test/fixtures/transformation/es6-spread/arguments/actual.js

@@ -1,5 +1,5 @@
 function foo() {
-  return bar("test", ...arguments);
+  return bar(...arguments);
 }
 
 function bar(one, two, three) {

test/fixtures/transformation/es6-spread/arguments/expected.js

@@ -1,8 +1,7 @@
 "use strict";
 
-var _slice = Array.prototype.slice;
 function foo() {
-  return bar.apply(null, ["test"].concat(_slice.call(arguments)));
+  return bar.apply(null, arguments);
 }
 
 function bar(one, two, three) {