v3.0.14

CHANGELOG.md

@@ -11,6 +11,25 @@
 
 _Note: Gaps between patch versions are faulty/broken releases._
 
+## 3.0.14
+
+ * **New Feature**
+  * Add `--optional` argument to `6to5-node`.
+ * **Bug Fix**
+  * Fix bug in `asyncToGenerator` helper where it was incorrectly calling generator iterator functions.
+
+## 3.0.13
+
+ * **Bug Fix**
+  * Fix modules loose mode using `modules` instead of `es6.modules`.
+
+## 3.0.12
+
+ * **Internal**
+  * Add internal debug messages.
+ * **Bug Fix**
+  * Add `noScope` option to `traverse.clearProperties`.
+
 ## 3.0.11
 
  * **Bug Fix**
@@ -105,13 +124,13 @@ _Note: Gaps between patch versions are faulty/broken releases._
   * This shorthand has been removed from the playground.
   * `6to5/polyfill` can now only be required **once**.
   * **CLI**
-   * `--indent` option has been removed.
-   * `--include-regenerator` option has been removed.
-   * `--amd-modules-id` option has been removed, use `--module-ids` instead.
+    * `--indent` option has been removed.
+    * `--include-regenerator` option has been removed.
+    * `--amd-modules-id` option has been removed, use `--module-ids` instead.
   * **Options**
-   * `amdModuleIds` option has been removed, use `moduleIds` instead.
-   * `includeRegenerator` has been removed.
-   * `ignoreRegex` fallback has now been dropped from the require hook. `register(/foo/);`, `register({ ignoreRegex: /foo/ })` -> `register({ ignore: /foo/ })`.
+    * `amdModuleIds` option has been removed, use `moduleIds` instead.
+    * `includeRegenerator` has been removed.
+    * `ignoreRegex` fallback has now been dropped from the require hook. `register(/foo/);`, `register({ ignoreRegex: /foo/ })` -> `register({ ignore: /foo/ })`.
   * **Modules**
     * Module interop now only collapses to `module.exports` when there's a **single** export that's default.
     * Imports and exports are now illegal anywhere except the root level by default. Set `modules` to [loose mode](http://6to5.org/docs/usage/loose) to allow them everywhere.

bin/_6to5-node

@@ -19,6 +19,7 @@ program.option("-r, --experimental", "Enable experimental support for proposed E
 program.option("-g, --playground", "Enable playground support");
 program.option("-w, --whitelist [whitelist]", "Whitelist of transformers to ONLY use", util.list);
 program.option("-b, --blacklist [blacklist]", "Blacklist of transformers to NOT use", util.list);
+program.option("-o, --optional [optional]", "List of optional transformers to enable", util.list);
 
 var pkg = require("../package.json");
 program.version(pkg.version);
@@ -33,6 +34,7 @@ to5.register({
   playground:   program.playground,
   blacklist:    program.blacklist,
   whitelist:    program.whitelist,
+  optional:     program.optional,
   ignore:       program.ignore
 });
 
@@ -43,6 +45,7 @@ var _eval = function (code, filename) {
     filename: filename,
     blacklist: ["useStrict"].concat(program.blacklist || []),
     whitelist: program.whitelist,
+    optional: program.optional,
     experimental: program.experimental,
     playground: program.playground
   }).code;
@@ -61,8 +64,18 @@ if (program.eval || program.print) {
     var args = process.argv.slice(2);
 
     var i = 0;
+    var ignoreNext = false;
     _.each(args, function (arg, i2) {
-      if (arg[0] !== "-") {
+      if (ignoreNext) {
+        ignoreNext = false;
+        return;
+      }
+
+      if (arg[0] === "-") {
+        if (program[arg.slice(2)]) {
+          ignoreNext = true;
+        }
+      } else {
         i = i2;
         return false;
       }

lib/6to5/file.js

@@ -312,7 +312,7 @@ File.prototype.parse = function (code) {
 
   var opts = this.opts;
 
-  opts.allowImportExportEverywhere = this.isLoose("modules");
+  opts.allowImportExportEverywhere = this.isLoose("es6.modules");
 
   return util.parse(opts, code, function (tree) {
     self.transform(tree);
@@ -323,6 +323,8 @@ File.prototype.parse = function (code) {
 File.prototype.transform = function (ast) {
   var self = this;
 
+  util.debug(this.opts.filename);
+
   this.ast = ast;
   this.lastStatements = t.getLastStatements(ast.program);
   this.scope = new Scope(ast.program, ast, null, this);

lib/6to5/transformation/templates/async-to-generator.js

@@ -3,12 +3,12 @@
     var gen = fn.apply(this, arguments);
 
     return new Promise(function (resolve, reject) {
-      var callNext = step.bind(gen.next);
-      var callThrow = step.bind(gen.throw);
+      var callNext = step.bind(null, "next");
+      var callThrow = step.bind(null, "throw");
 
-      function step(arg) {
+      function step(key, arg) {
         try {
-          var info = this(arg);
+          var info = gen[key](arg);
           var value = info.value;
         } catch (error) {
           reject(error);

lib/6to5/transformation/transformer-pass.js

@@ -1,6 +1,7 @@
 module.exports = TransformerPass;
 
 var traverse = require("../traverse");
+var util     = require("../util");
 var _        = require("lodash");
 
 /**
@@ -60,6 +61,8 @@ var transformVisitor = {
 TransformerPass.prototype.transform = function () {
   var file = this.file;
 
+  util.debug(file.opts.filename + ": Running transformer " + this.transformer.key);
+
   this.astRun("before");
 
   var state = { file: file, handlers: this.handlers, pass: this };

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

@@ -58,7 +58,6 @@ module.exports = {
   "es6.parameters.default":                require("./es6/parameters.default"),
   "es6.parameters.rest":                   require("./es6/parameters.rest"),
 
-  // needs to be before regenerator since regenerator doesn't know how to handle destructuring patterns
   "es6.destructuring":                     require("./es6/destructuring"),
 
   // needs to be after `regenerator` due to needing `regeneratorRuntime` references

lib/6to5/traverse/index.js

@@ -110,7 +110,7 @@ TraversalContext.prototype.visitNode = function (obj, key, opts, scope, parent,
 
   var ourScope = scope;
   // we're entering a new scope so let's construct it!
-  if (t.isScope(node)) {
+  if (!opts.noScope && t.isScope(node)) {
     ourScope = new Scope(node, parent, scope);
   }
 
@@ -177,7 +177,7 @@ function traverseNode(node, opts, scope, state) {
 function traverse(parent, opts, scope, state) {
   if (!parent) return;
 
-  if (!scope) {
+  if (!opts.noScope && !scope) {
     if (parent.type !== "Program" && parent.type !== "File") {
       throw new Error("Must pass a scope unless traversing a Program/File got a " + parent.type + " node");
     }
@@ -217,7 +217,10 @@ function clearNode(node) {
   }
 }
 
-var clearVisitor = { enter: clearNode };
+var clearVisitor = {
+  noScope: true,
+  enter: clearNode
+};
 
 function clearComments(comments) {
   for (var i = 0; i < comments.length; i++) {

lib/6to5/util.js

@@ -5,6 +5,7 @@ require("./patch");
 var estraverse = require("estraverse");
 var codeFrame  = require("./helpers/code-frame");
 var traverse   = require("./traverse");
+var debug      = require("debug");
 var acorn      = require("acorn-6to5");
 var path       = require("path");
 var util       = require("util");
@@ -14,6 +15,8 @@ var _          = require("lodash");
 
 exports.inherits = util.inherits;
 
+exports.debug = debug("6to5");
+
 exports.canCompile = function (filename, altExts) {
   var exts = altExts || exports.canCompile.EXTENSIONS;
   var ext = path.extname(filename);

package.json

@@ -1,7 +1,7 @@
 {
   "name": "6to5",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "3.0.11",
+  "version": "3.0.14",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://6to5.org/",
   "repository": "6to5/6to5",
@@ -38,6 +38,7 @@
     "chokidar": "0.12.6",
     "commander": "2.6.0",
     "core-js": "^0.4.9",
+    "debug": "^2.1.1",
     "detect-indent": "3.0.0",
     "estraverse": "1.9.1",
     "esutils": "1.1.6",

packages/6to5-runtime/package.json

@@ -1,7 +1,7 @@
 {
   "name": "6to5-runtime",
   "description": "6to5 selfContained runtime",
-  "version": "3.0.10",
+  "version": "3.0.13",
   "repository": "6to5/6to5",
   "author": "Sebastian McKenzie <sebmck@gmail.com>"
 }

test/fixtures/transformation/async-to-generator/async/expected.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var _asyncToGenerator = function (fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { var callNext = step.bind(gen.next); var callThrow = step.bind(gen["throw"]); function step(arg) { try { var info = this(arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(callNext, callThrow); } } callNext(); }); }; };
+var _asyncToGenerator = function (fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { var callNext = step.bind(null, "next"); var callThrow = step.bind(null, "throw"); function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(callNext, callThrow); } } callNext(); }); }; };
 
 var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); };
 

test/fixtures/transformation/async-to-generator/expression/expected.js

@@ -1,7 +1,7 @@
 "use strict";
 
-var _asyncToGenerator = function (fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { var callNext = step.bind(gen.next); var callThrow = step.bind(gen["throw"]); function step(arg) { try { var info = this(arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(callNext, callThrow); } } callNext(); }); }; };
+var _asyncToGenerator = function (fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { var callNext = step.bind(null, "next"); var callThrow = step.bind(null, "throw"); function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(callNext, callThrow); } } callNext(); }); }; };
 
 var foo = _asyncToGenerator(function* () {
   var wat = yield bar();
-});
+});

test/fixtures/transformation/async-to-generator/statement/expected.js

@@ -1,7 +1,7 @@
 "use strict";
 
-var _asyncToGenerator = function (fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { var callNext = step.bind(gen.next); var callThrow = step.bind(gen["throw"]); function step(arg) { try { var info = this(arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(callNext, callThrow); } } callNext(); }); }; };
+var _asyncToGenerator = function (fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { var callNext = step.bind(null, "next"); var callThrow = step.bind(null, "throw"); function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(callNext, callThrow); } } callNext(); }); }; };
 
 var foo = _asyncToGenerator(function* () {
   var wat = yield bar();
-});
+});