Merge branch 'traceur'

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "vendor/traceur"]
+	path = vendor/traceur
+	url = https://github.com/google/traceur-compiler
+[submodule "vendor/regenerator"]
+	path = vendor/regenerator
+	url = https://github.com/facebook/regenerator

Makefile

@@ -6,7 +6,7 @@ MOCHA_CMD = node_modules/mocha/bin/_mocha
 
 export NODE_ENV = test
 
-.PHONY: clean test test-cov test-clean lint test-travis test-spec test-browser publish bench build
+.PHONY: clean test test-cov test-clean lint test-travis test-spec test-browser publish bench build bootstrap
 
 build:
 	mkdir -p dist
@@ -23,7 +23,7 @@ build:
 	node $(UGLIFY_CMD) dist/runtime.js >dist/runtime.min.js
 
 	rm -rf templates.json
-	
+
 clean:
 	rm -rf coverage templates.json test/tmp dist
 
@@ -81,3 +81,7 @@ publish:
 	git push --follow-tags
 
 	rm -rf templates.json browser.js runtime.js browser-polyfill.js
+
+bootstrap:
+	git submodule update --init
+	cd vendor/regenerator; npm install

doc/differences.md

@@ -78,43 +78,43 @@ that when you turn it off and use your code in a full ES6 environment
 
 ### Features
 
-|                              | 6to5 | Traceur | es6-transpiler | esnext | es6now | jstransform |
-| ---------------------------- | ---- | ------- | -------------- | ------ | ------ | ----------- |
-| Source maps                  | ✓    | ✓       | ✓              | ✓      |        | ✓           |
-| No compiler global pollution | ✓    |         | ✓              | ✓      |        | ✓           |
-| Optional runtime             | ✓    |         | ✓              |        |        | ✓           |
-| Browser compiler             | ✓    | ✓       |                | ✓      |        |             |
+|                              | 6to5 | Traceur | es6-transpiler | es6now | jstransform |
+| ---------------------------- | ---- | ------- | -------------- | ------ | ----------- |
+| Source maps                  | ✓    | ✓       | ✓              |        | ✓           |
+| No compiler global pollution | ✓    |         | ✓              |        | ✓           |
+| Optional runtime             | ✓    |         | ✓              |        | ✓           |
+| Browser compiler             | ✓    | ✓       |                |        |             |
 
 ### Language Support
 
-|                              | 6to5 | Traceur | es6-transpiler | esnext | es6now | jstransform |
-| ---------------------------- | ---- | ------- | -------------- | ------ | ------ | ----------- |
-| Abstract references          | ✓    |         |                |        |        |             |
-| Array comprehension          | ✓    | ✓       | ✓              |        |        |             |
-| Arrow functions              | ✓    | ✓       | ✓              | ✓      | ✓      | ✓           |
-| Async functions              | ✓    | ✓       |                | ✓      |        |             |
-| Async generator functions    | ✓    | ✓       |                |        |        |             |
-| Classes                      | ✓    | ✓       | ✓              | ✓      | ✓      | ✓           |
-| Computed property names      | ✓    | ✓       | ✓              | ✓      | ✓      |             |
-| Constants                    | ✓    | ✓       | ✓              |        |        |             |
-| Default parameters           | ✓    | ✓       | ✓              | ✓      | ✓      |             |
-| Destructuring                | ✓    | ✓       | ✓              | ✓      | ✓      | ✓           |
-| Exponentiation operator      | ✓    | ✓       |                |        |        |             |
-| Flow types                   | ✓    |         |                |        |        | ✓           |
-| For-of                       | ✓    | ✓       | ✓              | ✓      | ✓      |             |
-| Generators                   | ✓    | ✓       |                | ✓      |        |             |
-| Generator comprehension      | ✓    | ✓       |                |        |        |             |
-| JSX                          | ✓    |         |                |        |        |             |
-| Let scoping                  | ✓    | ✓       | ✓              |        |        |             |
-| Modules                      | ✓    | ✓       |                |        | ✓      |             |
-| Object rest/spread           | ✓    |         |                |        |        | ✓           |
-| Property method assignment   | ✓    | ✓       | ✓              | ✓      | ✓      | ✓           |
-| Property name shorthand      | ✓    | ✓       | ✓              | ✓      | ✓      | ✓           |
-| Rest parameters              | ✓    | ✓       | ✓              | ✓      | ✓      | ✓           |
-| React                        | ✓    |         |                |        |        |             |
-| Spread                       | ✓    | ✓       | ✓              | ✓      | ✓      |             |
-| Template literals            | ✓    | ✓       | ✓              | ✓      | ✓      | ✓           |
-| Unicode regex                | ✓    | ✓       | ✓              |        |        |             |
+|                              | 6to5 | Traceur | es6-transpiler | es6now | jstransform |
+| ---------------------------- | ---- | ------- | -------------- | ------ | ----------- |
+| Abstract references          | ✓    |         |                |        |             |
+| Array comprehension          | ✓    | ✓       | ✓              |        |             |
+| Arrow functions              | ✓    | ✓       | ✓              | ✓      | ✓           |
+| Async functions              | ✓    | ✓       |                |        |             |
+| Async generator functions    | ✓    | ✓       |                |        |             |
+| Classes                      | ✓    | ✓       | ✓              | ✓      | ✓           |
+| Computed property names      | ✓    | ✓       | ✓              | ✓      |             |
+| Constants                    | ✓    | ✓       | ✓              |        |             |
+| Default parameters           | ✓    | ✓       | ✓              | ✓      |             |
+| Destructuring                | ✓    | ✓       | ✓              | ✓      | ✓           |
+| Exponentiation operator      | ✓    | ✓       |                |        |             |
+| Flow types                   | ✓    |         |                |        | ✓           |
+| For-of                       | ✓    | ✓       | ✓              | ✓      |             |
+| Generators                   | ✓    | ✓       |                |        |             |
+| Generator comprehension      | ✓    | ✓       |                |        |             |
+| JSX                          | ✓    |         |                |        |             |
+| Let scoping                  | ✓    | ✓       | ✓              |        |             |
+| Modules                      | ✓    | ✓       |                | ✓      |             |
+| Object rest/spread           | ✓    |         |                |        | ✓           |
+| Property method assignment   | ✓    | ✓       | ✓              | ✓      | ✓           |
+| Property name shorthand      | ✓    | ✓       | ✓              | ✓      | ✓           |
+| Rest parameters              | ✓    | ✓       | ✓              | ✓      | ✓           |
+| React                        | ✓    |         |                |        |             |
+| Spread                       | ✓    | ✓       | ✓              | ✓      |             |
+| Template literals            | ✓    | ✓       | ✓              | ✓      | ✓           |
+| Unicode regex                | ✓    | ✓       | ✓              |        |             |
 
 ### [Traceur](https://github.com/google/traceur-compiler)
 

lib/6to5/file.js

@@ -10,11 +10,12 @@ var t         = require("./types");
 var _         = require("lodash");
 
 function File(opts) {
-  this.dynamicImports = [];
-  this.opts           = File.normaliseOptions(opts);
-  this.transformers   = this.getTransformers();
-  this.uids           = {};
-  this.ast            = {};
+  this.dynamicImports   = [];
+  this.dynamicImportIds = {};
+  this.opts             = File.normaliseOptions(opts);
+  this.transformers     = this.getTransformers();
+  this.uids             = {};
+  this.ast              = {};
 }
 
 File.helpers = [
@@ -29,12 +30,16 @@ File.helpers = [
   "object-without-properties",
   "has-own",
   "slice",
+  "bind",
   "define-property",
-  "async-to-generator"
+  "async-to-generator",
+  "interop-require-wildcard",
+  "typeof"
 ];
 
 File.excludeHelpersFromRuntime = [
-  "async-to-generator"
+  "async-to-generator",
+  "typeof"
 ];
 
 File.normaliseOptions = function (opts) {
@@ -160,11 +165,20 @@ File.prototype.parseShebang = function (code) {
   return code;
 };
 
-File.prototype.addImport = function (id, source) {
-  var specifiers = [t.importSpecifier(t.identifier("default"), id)];
-  var declar = t.importDeclaration(specifiers, t.literal(source));
-  declar._blockHoist = 3;
-  this.dynamicImports.push(declar);
+File.prototype.addImport = function (source, name) {
+  name = name || source;
+  var id = this.dynamicImportIds[name];
+
+  if (!id) {
+    id = this.dynamicImportIds[name] = this.generateUidIdentifier(name);
+
+    var specifiers = [t.importSpecifier(t.identifier("default"), id)];
+    var declar = t.importDeclaration(specifiers, t.literal(source));
+    declar._blockHoist = 3;
+    this.dynamicImports.push(declar);
+  }
+
+  return id;
 };
 
 File.prototype.addHelper = function (name) {
@@ -273,7 +287,7 @@ File.prototype.generate = function () {
 };
 
 File.prototype.generateUid = function (name, scope) {
-  name = t.toIdentifier(name);
+  name = t.toIdentifier(name).replace(/^_+/, "");
 
   scope = scope || this.scope;
 

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

@@ -1,5 +1,6 @@
 var util = require("../../util");
 var t    = require("../../types");
+var _    = require("lodash");
 
 exports.UnaryExpression = function (node, print) {
   var hasSpace = /[a-z]$/.test(node.operator);
@@ -86,6 +87,7 @@ exports.ExpressionStatement = function (node, print) {
 
 exports.BinaryExpression =
 exports.LogicalExpression =
+exports.AssignmentPattern =
 exports.AssignmentExpression = function (node, print) {
   print(node.left);
   this.push(" " + node.operator + " ");
@@ -102,7 +104,12 @@ exports.MemberExpression = function (node, print) {
     throw new TypeError("Got a MemberExpression for MemberExpression property");
   }
 
-  if (node.computed) {
+  var computed = node.computed;
+  if (t.isLiteral(node.property) && _.isNumber(node.property.value)) {
+    computed = true;
+  }
+
+  if (computed) {
     this.push("[");
     print(node.property);
     this.push("]");

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

@@ -61,9 +61,12 @@ Node.prototype.needsParens = function () {
   if (!parent) return false;
 
   if (t.isNewExpression(parent) && parent.callee === node) {
-    return t.isCallExpression(node) || _.some(node, function (val) {
+    if (t.isCallExpression(node)) return true;
+
+    var hasCall = _.some(node, function (val) {
       return t.isCallExpression(val);
     });
+    if (hasCall) return true;
   }
 
   return find(parens, node, parent);

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

@@ -13,7 +13,8 @@ _.each([
   ["<", ">", "<=", ">=", "in", "instanceof"],
   [">>", "<<", ">>>"],
   ["+", "-"],
-  ["*", "/", "%"]
+  ["*", "/", "%"],
+  ["**"]
 ], function (tier, i) {
   _.each(tier, function (op) {
     PRECEDENCE[op] = i;
@@ -35,7 +36,7 @@ exports.ObjectExpression = function (node, parent) {
 };
 
 exports.Binary = function (node, parent) {
-  if (t.isCallExpression(parent) && parent.callee === node) {
+  if ((t.isCallExpression(parent) || t.isNewExpression(parent)) && parent.callee === node) {
     return true;
   }
 

lib/6to5/patch.js

@@ -12,6 +12,12 @@ var types = require("ast-types");
 var def   = types.Type.def;
 var or    = types.Type.or;
 
+def("AssignmentPattern")
+    .bases("Pattern")
+    .build("left", "right")
+    .field("left", def("Pattern"))
+    .field("right", def("Expression"));
+
 // Acorn - Same as ImportNamespaceSpecifier but `id` is `name`
 def("ImportBatchSpecifier")
   .bases("Specifier")

lib/6to5/transformation/modules/_default.js

@@ -141,10 +141,17 @@ DefaultFormatter.prototype._exportSpecifier = function (getRef, specifier, node,
       // export * from "foo";
       nodes.push(this._exportsWildcard(getRef(), node));
     } else {
+      var ref;
+      if (t.isSpecifierDefault(specifier.id) || this.noInteropRequire) {
+        ref = t.memberExpression(getRef(), specifier.id);
+      } else {
+        ref = t.callExpression(this.file.addHelper("interop-require"), [getRef()]);
+      }
+
       // export { foo } from "test";
       nodes.push(this._exportsAssign(
         t.getSpecifierName(specifier),
-        t.memberExpression(getRef(), specifier.id),
+        ref,
         node
       ));
     }

lib/6to5/transformation/modules/common.js

@@ -32,18 +32,24 @@ CommonJSFormatter.prototype.importSpecifier = function (specifier, node, nodes)
       )
     ]));
   } else {
-    // import foo from "foo";
-
-    var templateName = "require-assign";
-
-    // import * as bar from "foo";
-    if (specifier.type !== "ImportBatchSpecifier") templateName += "-key";
-
-    nodes.push(util.template(templateName, {
-      VARIABLE_NAME: variableName,
-      MODULE_NAME:   node.source,
-      KEY:           specifier.id
-    }));
+    if (specifier.type === "ImportBatchSpecifier") {
+      // import * as bar from "foo";
+      nodes.push(t.variableDeclaration("var", [
+        t.variableDeclarator(
+          variableName,
+          t.callExpression(this.file.addHelper("interop-require-wildcard"), [
+            t.callExpression(t.identifier("require"), [node.source])
+          ])
+        )
+      ]));
+    } else {
+      // import foo from "foo";
+      nodes.push(util.template("require-assign-key", {
+        VARIABLE_NAME: variableName,
+        MODULE_NAME:   node.source,
+        KEY:           specifier.id
+      }));
+    }
   }
 };
 
@@ -65,7 +71,7 @@ CommonJSFormatter.prototype.exportDeclaration = function (node, nodes) {
     // exports = module.exports = VALUE;
     if (this.hasNonDefaultExports) templateName = "exports-default-module-override";
 
-    if (t.isFunction(declar) || !this.hasNonDefaultExports) {
+    if (t.isFunctionDeclaration(declar) || !this.hasNonDefaultExports) {
       assign = util.template(templateName, {
         VALUE: this._pushStatement(declar, nodes)
       }, true);

lib/6to5/transformation/templates/bind.js

@@ -0,0 +1 @@
+Function.prototype.bind

lib/6to5/transformation/templates/inherits.js

@@ -1,4 +1,7 @@
 (function (child, parent) {
+  if (typeof parent !== "function" && parent !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof parent);
+  }
   child.prototype = Object.create(parent && parent.prototype, {
     constructor: {
       value: child,

lib/6to5/transformation/templates/interop-require-wildcard.js

@@ -0,0 +1,3 @@
+(function (obj) {
+  return obj && obj.constructor === Object ? obj : { default: obj };
+})

lib/6to5/transformation/templates/require-assign.js

@@ -1 +0,0 @@
-var VARIABLE_NAME = require(MODULE_NAME);

lib/6to5/transformation/templates/typeof.js

@@ -0,0 +1,3 @@
+(function (obj) {
+  return obj && obj.constructor === Symbol ? "symbol" : typeof obj;
+});

lib/6to5/transformation/transform.js

@@ -89,6 +89,7 @@ _.each({
   _moduleFormatter:          require("./transformers/_module-formatter"),
   useStrict:                 require("./transformers/use-strict"),
 
+  typeofSymbol:              require("./transformers/optional-typeof-symbol"),
   coreAliasing:              require("./transformers/optional-core-aliasing"),
   undefinedToVoid:           require("./transformers/optional-undefined-to-void"),
 

lib/6to5/transformation/transformer.js

@@ -8,20 +8,25 @@ function Transformer(key, transformer, opts) {
   this.manipulateOptions = transformer.manipulateOptions;
   this.experimental      = !!transformer.experimental;
   this.secondPass        = !!transformer.secondPass;
-  this.transformer       = Transformer.normalise(transformer);
+  this.transformer       = this.normalise(transformer);
   this.optional          = !!transformer.optional;
   this.opts              = opts || {};
   this.key               = key;
 }
 
-Transformer.normalise = function (transformer) {
+Transformer.prototype.normalise = function (transformer) {
+  var self = this;
+
   if (_.isFunction(transformer)) {
     transformer = { ast: transformer };
   }
 
   _.each(transformer, function (fns, type) {
     // hidden property
-    if (type[0] === "_") return;
+    if (type[0] === "_") {
+      self[type] = fns;
+      return;
+    }
 
     if (_.isFunction(fns)) fns = { enter: fns };
 

lib/6to5/transformation/transformers/_block-hoist.js

@@ -1,4 +1,5 @@
-var _ = require("lodash");
+var useStrict = require("./use-strict");
+var _         = require("lodash");
 
 // Priority:
 //
@@ -17,13 +18,15 @@ exports.Program = {
     }
     if (!hasChange) return;
 
-    var nodePriorities = _.groupBy(node.body, function (bodyNode) {
-      var priority = bodyNode._blockHoist;
-      if (priority == null) priority = 1;
-      if (priority === true) priority = 2;
-      return priority;
-    });
+    useStrict._wrap(node, function () {
+      var nodePriorities = _.groupBy(node.body, function (bodyNode) {
+        var priority = bodyNode._blockHoist;
+        if (priority == null) priority = 1;
+        if (priority === true) priority = 2;
+        return priority;
+      });
 
-    node.body = _.flatten(_.values(nodePriorities).reverse());
+      node.body = _.flatten(_.values(nodePriorities).reverse());
+    });
   }
 };

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

@@ -1,4 +1,5 @@
-var t = require("../../types");
+var useStrict = require("./use-strict");
+var t         = require("../../types");
 
 exports.secondPass = true;
 
@@ -7,23 +8,25 @@ exports.Program = function (node) {
   var kinds = {};
   var kind;
 
-  for (var i in node._declarations) {
-    var declar = node._declarations[i];
+  useStrict._wrap(node, function () {
+    for (var i in node._declarations) {
+      var declar = node._declarations[i];
 
-    kind = declar.kind || "var";
-    var declarNode = t.variableDeclarator(declar.id, declar.init);
+      kind = declar.kind || "var";
+      var declarNode = t.variableDeclarator(declar.id, declar.init);
 
-    if (!declar.init) {
-      kinds[kind] = kinds[kind] || [];
-      kinds[kind].push(declarNode);
-    } else {
-      node.body.unshift(t.variableDeclaration(kind, [declarNode]));
+      if (!declar.init) {
+        kinds[kind] = kinds[kind] || [];
+        kinds[kind].push(declarNode);
+      } else {
+        node.body.unshift(t.variableDeclaration(kind, [declarNode]));
+      }
     }
-  }
 
-  for (kind in kinds) {
-    node.body.unshift(t.variableDeclaration(kind, kinds[kind]));
-  }
+    for (kind in kinds) {
+      node.body.unshift(t.variableDeclaration(kind, kinds[kind]));
+    }
+  });
 
   node._declarations = null;
 };

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

@@ -20,11 +20,31 @@ var push = function (opts, nodes, elem, parentId) {
     pushObjectPattern(opts, nodes, elem, parentId);
   } else if (t.isArrayPattern(elem)) {
     pushArrayPattern(opts, nodes, elem, parentId);
+  } else if (t.isAssignmentPattern(elem)) {
+    pushAssignmentPattern(opts, nodes, elem, parentId);
   } else {
     nodes.push(buildVariableAssign(opts, elem, parentId));
   }
 };
 
+var pushAssignmentPattern = function (opts, nodes, pattern, parentId) {
+  var tempParentId = opts.scope.generateUidBasedOnNode(parentId, opts.file);
+
+  nodes.push(t.variableDeclaration("var", [
+    t.variableDeclarator(tempParentId, parentId)
+  ]));
+
+  nodes.push(buildVariableAssign(
+    opts,
+    pattern.left,
+    t.conditionalExpression(
+      t.binaryExpression("===", tempParentId, t.identifier("undefined")),
+      pattern.right,
+      tempParentId
+    )
+  ));
+};
+
 var pushObjectPattern = function (opts, nodes, pattern, parentId) {
   for (var i in pattern.properties) {
     var prop = pattern.properties[i];
@@ -48,6 +68,8 @@ var pushObjectPattern = function (opts, nodes, pattern, parentId) {
         var value = t.callExpression(opts.file.addHelper("object-without-properties"), [parentId, keys]);
         nodes.push(buildVariableAssign(opts, prop.argument, value));
     } else {
+      if (t.isLiteral(prop.key)) prop.computed = true;
+
       var pattern2   = prop.value;
       var patternId2 = t.memberExpression(parentId, prop.key, prop.computed);
 
@@ -183,6 +205,24 @@ exports.Function = function (node, parent, file, scope) {
   block.body = nodes.concat(block.body);
 };
 
+exports.CatchClause = function (node, parent, file, scope) {
+  var pattern = node.param;
+  if (!t.isPattern(pattern)) return;
+
+  var ref = file.generateUidIdentifier("ref", scope);
+  node.param = ref;
+
+  var nodes = [];
+
+  push({
+    kind: "var",
+    file: file,
+    scope: scope
+  }, nodes, pattern, ref);
+
+  node.body.body = nodes.concat(node.body.body);
+};
+
 exports.ExpressionStatement = function (node, parent, file, scope) {
   var expr = node.expression;
   if (expr.type !== "AssignmentExpression") return;

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

@@ -376,7 +376,7 @@ LetScoping.prototype.getLetReferences = function () {
 
             // this scope has a variable with the same name so it couldn't belong
             // to our let scope
-            if (scope.hasOwn(node.name)) return;
+            if (scope.hasOwn(node.name, true)) return;
 
             closurify = true;
 
@@ -388,8 +388,6 @@ LetScoping.prototype.getLetReferences = function () {
           }
         });
 
-        return this.skip();
-      } else if (t.isLoop(node)) {
         return this.skip();
       }
     }

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

@@ -1,4 +1,5 @@
 var t = require("../../types");
+var _ = require("lodash");
 
 var getSpreadLiteral = function (spread, file) {
   return file.toArray(spread.argument);
@@ -98,7 +99,14 @@ exports.NewExpression = function (node, parent, file) {
   var args = node.arguments;
   if (!hasSpread(args)) return;
 
+  var nativeType = t.isIdentifier(node.callee) && _.contains(t.NATIVE_TYPES_NAMES, node.callee.name);
+
   var nodes = build(args, file);
+
+  if (nativeType) {
+    nodes.unshift(t.arrayExpression([t.literal(null)]));
+  }
+
   var first = nodes.shift();
 
   if (nodes.length) {
@@ -107,5 +115,15 @@ exports.NewExpression = function (node, parent, file) {
     args = first;
   }
 
-  return t.callExpression(file.addHelper("apply-constructor"), [node.callee, args]);
+  if (nativeType) {
+    return t.newExpression(
+      t.callExpression(
+        t.memberExpression(file.addHelper("bind"), t.identifier("apply")),
+        [node.callee, args]
+      ),
+      []
+    );
+  } else {
+    return t.callExpression(file.addHelper("apply-constructor"), [node.callee, args]);
+  }
 };

lib/6to5/transformation/transformers/optional-bluebird-coroutines.js

@@ -38,8 +38,6 @@ exports._Function = function (node, callId) {
 exports.Function = function (node, parent, file) {
   if (!node.async || node.generator) return;
 
-  var id = t.identifier("Bluebird");
-  file.addImport(id, "bluebird");
-
+  var id = file.addImport("bluebird");
   return exports._Function(node, t.memberExpression(id, t.identifier("coroutine")));
 };

lib/6to5/transformation/transformers/optional-core-aliasing.js

@@ -12,8 +12,7 @@ exports.optional = true;
 
 exports.ast = {
   enter: function (ast, file) {
-    file._coreId = file.generateUidIdentifier("core");
-    file.addImport(file._coreId, "core-js/library");
+    file._coreId = file.addImport("core-js/library", "core");
   },
 
   exit: function (ast, file) {

lib/6to5/transformation/transformers/optional-typeof-symbol.js

@@ -0,0 +1,9 @@
+var t = require("../../types");
+
+exports.optional = true;
+
+exports.UnaryExpression = function (node, parent, file) {
+  if (node.operator === "typeof") {
+    return t.callExpression(file.addHelper("typeof"), [node.argument]);
+  }
+};

lib/6to5/transformation/transformers/use-strict.js

@@ -1,14 +1,27 @@
 var t = require("../../types");
 
+exports._has = function (node) {
+  var first = node.body[0];
+  return t.isExpressionStatement(first) && t.isLiteral(first.expression, { value: "use strict" });
+};
+
+exports._wrap = function (node, callback) {
+  var useStrictNode;
+  if (exports._has(node)) {
+    useStrictNode = node.body.shift();
+  }
+
+  callback();
+
+  if (useStrictNode) {
+    node.body.unshift(useStrictNode);
+  }
+};
+
 exports.ast = {
   exit: function (ast) {
-    var body = ast.program.body;
-    var first = body[0];
-
-    var noStrict = !first || !t.isExpressionStatement(first) || !t.isLiteral(first.expression) || first.expression.value !== "use strict";
-
-    if (noStrict) {
-      body.unshift(t.expressionStatement(t.literal("use strict")));
+    if (!exports._has(ast.program)) {
+      ast.program.body.unshift(t.expressionStatement(t.literal("use strict")));
     }
   }
 };

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

@@ -39,8 +39,9 @@
   "ForInStatement": ["Statement", "For", "Scope", "Loop"],
   "ForStatement":   ["Statement", "For", "Scope", "Loop"],
 
-  "ObjectPattern": ["Pattern"],
-  "ArrayPattern":  ["Pattern"],
+  "ObjectPattern":     ["Pattern"],
+  "ArrayPattern":      ["Pattern"],
+  "AssignmentPattern": ["Pattern"],
 
   "Property": ["UserWhitespacable"],
   "XJSElement": ["UserWhitespacable", "Expression"],

lib/6to5/types/index.js

@@ -3,6 +3,10 @@ var _       = require("lodash");
 
 var t = exports;
 
+t.NATIVE_TYPES_NAMES = ["Array", "Object", "Number", "Boolean", "Date", "Array", "String"];
+
+//
+
 var addAssert = function (type, is) {
   t["assert" + type] = function (node, opts) {
     opts = opts || {};
@@ -214,7 +218,7 @@ t.isReferenced = function (node, parent) {
  */
 
 t.isValidIdentifier = function (name) {
-  return _.isString(name) && esutils.keyword.isIdentifierName(name) && !esutils.keyword.isKeywordES6(name, true);
+  return _.isString(name) && esutils.keyword.isIdentifierName(name) && !esutils.keyword.isReservedWordES6(name, true);
 };
 
 /*
@@ -227,6 +231,8 @@ t.isValidIdentifier = function (name) {
 t.toIdentifier = function (name) {
   if (t.isIdentifier(name)) return name.name;
 
+  name = name + "";
+
   // replace all non-valid identifiers with dashes
   name = name.replace(/[^a-zA-Z0-9$_]/g, "-");
 
@@ -241,6 +247,10 @@ t.toIdentifier = function (name) {
   // remove underscores from start of name
   name = name.replace(/^\_/, "");
 
+  if (!t.isValidIdentifier(name)) {
+    name = "_" + name;
+  }
+
   return name || '_';
 };
 

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

@@ -3,6 +3,7 @@
   "ArrayPattern":              ["elements"],
   "ArrowFunctionExpression":   ["params", "defaults", "rest", "body"],
   "AssignmentExpression":      ["left", "right"],
+  "AssignmentPattern":         ["left", "right"],
   "AwaitExpression":           ["argument"],
   "BinaryExpression":          ["left", "right"],
   "BindFunctionExpression":    ["callee", "arguments"],

package.json

@@ -43,7 +43,7 @@
     "ast-types": "~0.6.1",
     "chokidar": "0.11.1",
     "commander": "2.5.0",
-    "core-js": "^0.3.3",
+    "core-js": "^0.4.0",
     "estraverse": "1.8.0",
     "esutils": "1.1.6",
     "fs-readdir-recursive": "0.1.0",
@@ -51,7 +51,7 @@
     "lodash": "2.4.1",
     "mkdirp": "0.5.0",
     "private": "0.1.6",
-    "regenerator": "^0.8.2",
+    "regenerator": "^0.8.3",
     "regexpu": "0.3.0",
     "roadrunner": "^1.0.4",
     "source-map": "0.1.40",

test/_helper.js

@@ -3,7 +3,7 @@ var fs   = require("fs");
 var _    = require("lodash");
 
 var humanise = function (val) {
-  return val.replace(/-/g, " ");
+  return path.basename(val, path.extname(val)).replace(/-/g, " ");
 };
 
 var readFile = exports.readFile = function (filename) {
@@ -16,11 +16,11 @@ var readFile = exports.readFile = function (filename) {
   }
 };
 
-exports.get = function (entryName) {
+exports.get = function (entryName, entryLoc) {
   if (exports.cache[entryName]) return exports.cache[entryName];
 
   var suites = [];
-  var entryLoc = __dirname + "/fixtures/" + entryName;
+  var entryLoc = entryLoc || __dirname + "/fixtures/" + entryName;
 
   _.each(fs.readdirSync(entryLoc), function (suiteName) {
     if (suiteName[0] === ".") return;
@@ -36,8 +36,18 @@ exports.get = function (entryName) {
     var suiteOptsLoc = suite.filename + "/options.json";
     if (fs.existsSync(suiteOptsLoc)) suite.options = require(suiteOptsLoc);
 
-    _.each(fs.readdirSync(suite.filename), function (taskName) {
-      var taskDir = suite.filename + "/" + taskName;
+    if (fs.statSync(suite.filename).isFile()) {
+      push(suiteName, suite.filename);
+    } else {
+      _.each(fs.readdirSync(suite.filename), function (taskName) {
+        var taskDir = suite.filename + "/" + taskName;
+        push(taskName, taskDir);
+      });
+    }
+
+    function push(taskName, taskDir) {
+      // tracuer error tests
+      if (taskName.indexOf("Error_") >= 0) return;
 
       var actualLocAlias = suiteName + "/" + taskName + "/actual.js";
       var expectLocAlias = suiteName + "/" + taskName + "/expected.js";
@@ -49,7 +59,7 @@ exports.get = function (entryName) {
 
       if (fs.statSync(taskDir).isFile()) {
         var ext = path.extname(taskDir);
-        if (ext !== ".js") return;
+        if (ext !== ".js" && ext !== ".module.js") return;
 
         execLoc = taskDir;
       }
@@ -84,6 +94,18 @@ exports.get = function (entryName) {
         }
       };
 
+      // traceur checks
+
+      var shouldSkip = function (code) {
+        return code.indexOf("// Error:") >= 0 || code.indexOf("// Skip.") >= 0;
+      };
+
+      if (shouldSkip(test.actual.code) || shouldSkip(test.exec.code)) {
+        return;
+      } else if (test.exec.code.indexOf("// Async.") >= 0) {
+        //test.options.asyncExec = true;
+      }
+
       suite.tests.push(test);
 
       var sourceMappingsLoc = taskDir + "/source-mappings.json";
@@ -97,7 +119,7 @@ exports.get = function (entryName) {
         test.options.sourceMap = true;
         test.sourceMap = require(sourceMap);
       }
-    });
+    }
   });
 
   return exports.cache[entryName] = suites;
@@ -111,4 +133,5 @@ try {
   var cache = exports.cache = {};
   cache.transformation = exports.get("transformation");
   cache.generation     = exports.get("generation");
+  cache.esnext         = exports.get("esnext");
 }

test/_transformation-helper.js

@@ -0,0 +1,152 @@
+var genHelpers = require("./_generator-helpers");
+var transform  = require("../lib/6to5/transformation/transform");
+var sourceMap  = require("source-map");
+var Module     = require("module");
+var helper     = require("./_helper");
+var assert     = require("assert");
+var chai       = require("chai");
+var path       = require("path");
+var util       = require("../lib/6to5/util");
+var _          = require("lodash");
+
+require("../lib/6to5/polyfill");
+
+global.assertNoOwnProperties = function (obj) {
+  assert.equal(Object.getOwnPropertyNames(obj).length, 0);
+};
+
+global.assertArrayEquals = assert.deepEqual;
+global.assert = chai.assert;
+global.chai = chai;
+global.genHelpers = genHelpers;
+
+// Different Traceur generator message
+chai.assert._throw = chai.assert.throw;
+chai.assert.throw = function (fn, msg) {
+  if (msg === '"throw" on executing generator' ||
+      msg === '"next" on executing generator') {
+    msg = "Generator is already running";
+  } else if (msg === "Sent value to newborn generator") {
+    msg = /^attempt to send (.*?) to newborn generator$/;
+  }
+
+  return chai.assert._throw(fn, msg);
+};
+
+var run = function (task, done) {
+  var actual = task.actual;
+  var expect = task.expect;
+  var exec   = task.exec;
+  var opts   = task.options;
+
+  var getOpts = function (self) {
+    return _.merge({
+      filename: self.loc
+    }, opts);
+  };
+
+  var execCode = exec.code;
+  var result;
+
+  if (execCode) {
+    result = transform(execCode, getOpts(exec));
+    execCode = result.code;
+
+    try {
+      var fakeRequire = function (loc) {
+        if (loc === "../../../src/runtime/polyfills/Number.js") {
+          return Number;
+        } else if (loc === "../../../src/runtime/polyfills/Math.js") {
+          return Math;
+        } else {
+          return require(path.resolve(exec.loc, "..", loc));
+        }
+      };
+
+      var fn = new Function("require", "done", execCode);
+      fn.call(global, fakeRequire, chai.assert, done);
+    } catch (err) {
+      err.message = exec.loc + ": " + err.message;
+      err.message += util.codeFrame(execCode);
+      throw err;
+    }
+  }
+
+  var actualCode = actual.code;
+  var expectCode = expect.code;
+  if (!execCode || actualCode) {
+    result     = transform(actualCode, getOpts(actual));
+    actualCode = result.code;
+
+    chai.expect(actualCode).to.be.equal(expectCode, actual.loc + " !== " + expect.loc);
+  }
+
+  if (task.sourceMap) {
+    chai.expect(result.map).to.deep.equal(task.sourceMap);
+  }
+
+  if (task.sourceMappings) {
+    var consumer = new sourceMap.SourceMapConsumer(result.map);
+
+    _.each(task.sourceMappings, function (mapping, i) {
+      var expect = mapping.original;
+
+      var actual = consumer.originalPositionFor(mapping.generated);
+      chai.expect({ line: actual.line, column: actual.column }).to.deep.equal(expect);
+    });
+  }
+};
+
+module.exports = function (suiteOpts, taskOpts, dynamicOpts) {
+  taskOpts = taskOpts || {};
+
+  require("6to5/register")(taskOpts);
+
+  _.each(helper.get(suiteOpts.name, suiteOpts.loc), function (testSuite) {
+    if (_.contains(suiteOpts.ignoreSuites, testSuite.title)) return;
+
+    suite(suiteOpts.name + "/" + testSuite.title, function () {
+      _.each(testSuite.tests, function (task) {
+        if (_.contains(suiteOpts.ignoreTasks, task.title) || _.contains(suiteOpts.ignoreTasks, testSuite.title + "/" + task.title)) return;
+
+        var runTest = function (done) {
+          var runTask = function () {
+            try {
+              run(task, done);
+            } catch (err) {
+              if (task.options.after) task.options.after();
+              throw err;
+            }
+          };
+
+          _.extend(task.options, taskOpts);
+          if (dynamicOpts) dynamicOpts(task.options, task);
+
+          var throwMsg = task.options.throws;
+          if (throwMsg) {
+            // internal api doesn't have this option but it's best not to pollute
+            // the options object with useless options
+            delete task.options.throws;
+
+            assert.throws(runTask, function (err) {
+              return throwMsg === true || err.message.indexOf(throwMsg) >= 0;
+            });
+          } else {
+            runTask();
+          }
+        };
+
+        var callback;
+        if (task.options.asyncExec) {
+          callback = runTest;
+        } else {
+          callback = function () {
+            return runTest();
+          };
+        }
+
+        test(task.title, !task.disabled && callback);
+      });
+    });
+  });
+};

test/esnext.js

@@ -0,0 +1,5 @@
+if (!process.env.ALL_6TO5_TESTS) return;
+
+require("./_transformation-helper")({
+  name: "esnext"
+});

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

@@ -2,6 +2,9 @@
 
 var _slice = Array.prototype.slice;
 var _inherits = function (child, parent) {
+  if (typeof parent !== "function" && parent !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof parent);
+  }
   child.prototype = Object.create(parent && parent.prototype, {
     constructor: {
       value: child,

test/fixtures/transformation/es6-classes/accessing-super-properties/expected.js

@@ -1,6 +1,9 @@
 "use strict";
 
 var _inherits = function (child, parent) {
+  if (typeof parent !== "function" && parent !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof parent);
+  }
   child.prototype = Object.create(parent && parent.prototype, {
     constructor: {
       value: child,

test/fixtures/transformation/es6-classes/calling-super-properties/expected.js

@@ -1,6 +1,9 @@
 "use strict";
 
 var _inherits = function (child, parent) {
+  if (typeof parent !== "function" && parent !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof parent);
+  }
   child.prototype = Object.create(parent && parent.prototype, {
     constructor: {
       value: child,

test/fixtures/transformation/es6-classes/constructor/expected.js

@@ -1,6 +1,9 @@
 "use strict";
 
 var _inherits = function (child, parent) {
+  if (typeof parent !== "function" && parent !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof parent);
+  }
   child.prototype = Object.create(parent && parent.prototype, {
     constructor: {
       value: child,

test/fixtures/transformation/es6-classes/super-class-id-member-expression/expected.js

@@ -1,6 +1,9 @@
 "use strict";
 
 var _inherits = function (child, parent) {
+  if (typeof parent !== "function" && parent !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof parent);
+  }
   child.prototype = Object.create(parent && parent.prototype, {
     constructor: {
       value: child,

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

@@ -1,6 +1,9 @@
 "use strict";
 
 var _inherits = function (child, parent) {
+  if (typeof parent !== "function" && parent !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof parent);
+  }
   child.prototype = Object.create(parent && parent.prototype, {
     constructor: {
       value: child,