v2.4.9

add code of conduct

CHANGELOG.md

@@ -2,6 +2,59 @@
 
 Gaps between patch versions are faulty/broken releases.
 
+## 2.4.9
+
+ * Upgrade `acorn-6to5`.
+ * Add optional `protoToAssign` transformer.
+ * Fix missing properties from computed property keys.
+ * Make ES7 comprehensions `let` variables.
+
+## 2.4.8
+
+ * Make `require("6to5/register")` work with browserify - [#370](https://github.com/6to5/6to5/pull/370). Thanks [@hughsk](https://github.com/hughsk)!
+
+## 2.4.7
+
+ * Upgrade `acorn-6to5`.
+
+## 2.4.6
+
+ * Move `coreAliasing` and `undefinedToVoid` transformers down to catch `moduleFormatter` transforms.
+
+## 2.4.5
+
+ * Avoid printing comments if they've already been output.
+
+## 2.4.4
+
+ * Add `module` type to browser build `<script>` handler.
+ * Fix some `MemberExpression` modifying incorrectly setting `property` to a `MemberExpression`.
+
+## 2.4.3
+
+ * Upgrade `acorn-6to5`.
+ * Add support for `FunctionDeclaration`s in `bluebirdCoroutines` and `asyncToGenerators` transformers.
+
+## 2.4.2
+
+ * Upgrade `acorn-6to5`.
+ * Better uids generated for various transformers based on parent node.
+ * Alias flat references in `coreAliasing` transformer.
+
+## 2.4.1
+
+ * Better whitespace handling of parenthesized expressions due to trailing comments.
+ * Fix `yield` inside of comprehensions.
+
+## 2.4.0
+
+ * Use a closure always for classes with a super.
+ * Always use native loops for array comprehensions.
+ * Allow `yield` inside of comprehensions.
+ * Add optional `bluebirdCoroutine` transformer.
+ * Add optional `asyncToGenerator` transformer.
+ * Move `useStrict` transformer to before `_moduleFormatter` causing `"use strict";` to always be placed the very top.
+
 ## 2.3.2
 
  * Add parens on expressions with trailing comments.

CODE_OF_CONDUCT.md

@@ -0,0 +1,13 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)

CONTRIBUTING.md

@@ -1,5 +1,7 @@
 # Contributing
 
+Before contributing, please read the [code of conduct](https://github.com/6to5/6to5/blob/master/CODE_OF_CONDUCT.md).
+
  * **General**
    * No ES6 syntax features or methods, exclusively ES5.
    * Max of five arguments for functions

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Sebastian McKenzie
+Copyright (c) 2014-2015 Sebastian McKenzie
 
 MIT License
 

README.md

@@ -11,10 +11,6 @@
     <img alt="Travis Status" src="http://img.shields.io/travis/6to5/6to5/master.svg?style=flat&amp;label=travis">
   </a>
 
-  <a href="https://ci.appveyor.com/project/sebmck/6to5">
-    <img alt="Appveyor Status" src="http://img.shields.io/appveyor/ci/sebmck/6to5.svg?style=flat&amp;label=appveyor">
-  </a>
-
   <a href="https://codeclimate.com/github/6to5/6to5">
     <img alt="Code Climate Score" src="http://img.shields.io/codeclimate/github/6to5/6to5.svg?style=flat">
   </a>

doc/caveats.md

@@ -9,12 +9,15 @@ You may alternatively selectively include what you need:
 | Feature                     | Requirements                                                                                                           |
 | --------------------------- | ---------------------------------------------------------------------------------------------------------------------- |
 | Abstract References         | [experimental](experimental.md), `Symbol`                                                                              |
-| Array destructuring         | `Array.isArray`, `Array.from`                                                                                          |
+| Array destructuring         | `Array.from`                                                                                                           |
 | Async functions, Generators | [experimental](experimental.md), [regenerator runtime](https://github.com/facebook/regenerator/blob/master/runtime.js) |
-| Comprehensions              | [experimental](experimental.md), `Array.isArray`, `Array.from`                                                         |
+| Comprehensions              | [experimental](experimental.md), `Array.from`                                                                          |
 | For Of                      | `Symbol`, `prototype[Symbol.iterator]`                                                                                 |
+| Modules                     | `Object.assign`*                                                                                                       |
 | Object spread/rest          | [experimental](experimental.md), `Object.assign`                                                                       |
-| Spread                      | `Array.isArray`, `Array.from`                                                                                          |
+| Spread                      | `Array.from`                                                                                                           |
+
+*Only required for exporting a non-function `default` with additional `export`s.
 
 ## ES5
 
@@ -26,13 +29,13 @@ ES5 such as lower versions of IE then using the
 
 ## Internet Explorer
 
-### Classes (9 and below)
+### Classes (10 and below)
 
 If you're inheriting from a class then static properties are inherited from it
 via [\_\_proto\_\_](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/proto),
 this is widely supported but you may run into problems with much older browsers.
 
-**NOTE:** `__proto__` is not supported on IE <= 9 so static properties
+**NOTE:** `__proto__` is not supported in IE <= 10 so static properties
 **will not** be inherited. A possible workaround is to use `super();`:
 
 ```javascript
@@ -56,4 +59,4 @@ unfortunate as it's required to set getters and setters. Due to this if
 you plan on supporting IE8 or below then the user of getters and setters
 isn't recommended.
 
-Reference: [MDN](https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/Object/defineProperty#Internet_Explorer_8_specific_notes).
+**Reference**: [MDN](https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/Object/defineProperty#Internet_Explorer_8_specific_notes).

doc/differences.md

@@ -49,13 +49,12 @@ var seattlers = (function() {
 }());
 ```
 
-As you can tell, it's not very pretty, unreadable even. Instead of mapping
-directly to a runtime, like other transpilers, 6to5 maps directly to the
-equivalent ES5.
+As you can tell, it's not very pretty. Instead of mapping directly to a
+runtime, like other transpilers, 6to5 maps directly to the equivalent ES5.
 
 Sometimes there are little inline functions that 6to5 needs. These are
 placed at the top of your file much like coffee-script does. If these
-are bother you then you can use the [optional runtime](optional-runtime.md).
+bother you then you can use the [optional runtime](optional-runtime.md).
 We promise that these inline functions will never be significant and will
 always be used as little as possible.
 

doc/index.md

@@ -52,7 +52,7 @@ And it doesn't end here! To see all the ways you can use 6to5, check out the
  - [Let scoping](features.md#let-scoping)
  - [Modules](features.md#modules)
  - [Numeric literals](features.md#numeric-literals)
- - [Object Rest/Spread](features.md#object-rest-spread) ([experimental](experimental.md))
+ - [Object rest/spread](features.md#object-rest-spread) ([experimental](experimental.md))
  - [Property method assignment](features.md#property-method-assignment)
  - [Property name shorthand](features.md#property-name-shorthand)
  - [React/JSX](react.md)

doc/playground.md

@@ -18,11 +18,19 @@ to5.transform("code", { playground: true });
 
  * [Memoization operator](#memoization-operator)
  * [Method binding](#method-binding)
+ * [Method binding function shorthand](#method-binding-function-shorthand)
  * [Object getter memoization](#object-getter-memoization)
  * [This shorthand](#this-shorthand)
 
 ### Memoization assignment operator
 
+The memoization assignment operator allows you to lazily set an object property.
+It checks whether there's a property defined on the object and if there isn't then
+the right hand value is set.
+
+This means that `obj.x` in the following `var x = { x: undefined }; obj.x ?= 2;`
+will still be `undefined` because it's already been defined on the object.
+
 ```javascript
 var obj = {};
 obj.x ?= 2;
@@ -42,7 +50,7 @@ var obj = {};
 obj.x ?= 2;
 ```
 
-equivalent to:
+equivalent to
 
 ```javascript
 var obj = {};
@@ -54,17 +62,25 @@ if (!Object.prototype.hasOwnProperty.call(obj, "x")) obj.x = 2;
 ```javascript
 var fn = obj#method;
 var fn = obj#method("foob");
-
-["foo", "bar"].map(#toUpperCase); // ["FOO", "BAR"]
-[1.1234, 23.53245, 3].map(#toFixed(2)); // ["1.12", "23.53", "3.00"]
 ```
 
-equivalent to:
+equivalent to
 
 ```javascript
 var fn = obj.method.bind(obj);
 var fn = obj.method.bind(obj, "foob");
+```
 
+### Method binding function shorthand
+
+```javascript
+["foo", "bar"].map(#toUpperCase); // ["FOO", "BAR"]
+[1.1234, 23.53245, 3].map(#toFixed(2)); // ["1.12", "23.53", "3.00"]
+```
+
+equivalent to
+
+```javascript
 ["foo", "bar"].map(function (val) { return val.toUpperCase(); });
 [1.1234, 23.53245, 3].map(function (val) { return val.toFixed(2); });
 ```
@@ -90,23 +106,27 @@ equivalent to
 ```javascript
 var foo = {
   get bar() {
-    if (this._barRan) return this._bar;
-    this._barRan = true;
-    return this._bar = complex();
+    return Object.defineProperty(this, "bar", {
+      value: complex(),
+      enumerable: true,
+      configurable: true,
+      writable: true
+    }).bar;
   }
 };
 
 class Foo {
   get bar() {
-    if (this._barRan) return this._bar;
-    this._barRan = true;
-    return this._bar = complex();
+    return Object.defineProperty(this, "bar", {
+      value: complex(),
+      enumerable: true,
+      configurable: true,
+      writable: true
+    }).bar;
   }
 }
 ```
 
-**NOTE:** Memoised functions will return the result of the **first** execution, regardless of arguments.
-
 ### This shorthand
 
 ```javascript

lib/6to5/browser.js

@@ -34,7 +34,7 @@ transform.load = function (url, callback, opts, hold) {
 
 var runScripts = function () {
   var scripts = [];
-  var types   = ["text/ecmascript-6", "text/6to5"];
+  var types   = ["text/ecmascript-6", "text/6to5", "module"];
   var index   = 0;
 
   var exec = function () {
@@ -60,8 +60,9 @@ var runScripts = function () {
     }
   };
 
-  var _scripts = global.document.getElementsByTagName("script");
-  for (var i in _scripts) {
+  var _scripts = global.document .getElementsByTagName("script");
+
+  for (var i = 0; i < _scripts.length; ++i) {
     var _script = _scripts[i];
     if (types.indexOf(_script.type) >= 0) scripts.push(_script);
   }

lib/6to5/file.js

@@ -10,14 +10,16 @@ var t         = require("./types");
 var _         = require("lodash");
 
 function File(opts) {
-  this.opts         = File.normaliseOptions(opts);
-  this.transformers = this.getTransformers();
-  this.uids         = {};
-  this.ast          = {};
+  this.dynamicImports = [];
+  this.opts           = File.normaliseOptions(opts);
+  this.transformers   = this.getTransformers();
+  this.uids           = {};
+  this.ast            = {};
 }
 
-File.declarations = [
+File.helpers = [
   "inherits",
+  "defaults",
   "prototype-properties",
   "apply-constructor",
   "tagged-template-literal",
@@ -27,7 +29,12 @@ File.declarations = [
   "object-without-properties",
   "has-own",
   "slice",
-  "define-property"
+  "define-property",
+  "async-to-generator"
+];
+
+File.excludeHelpersFromRuntime = [
+  "async-to-generator"
 ];
 
 File.normaliseOptions = function (opts) {
@@ -91,21 +98,30 @@ File.normaliseOptions = function (opts) {
 File.prototype.getTransformers = function () {
   var file = this;
   var transformers = [];
+  var secondPassTransformers = [];
 
   _.each(transform.transformers, function (transformer) {
     if (transformer.canRun(file)) {
       transformers.push(transformer);
+
+      if (transformer.secondPass) {
+        secondPassTransformers.push(transformer);
+      }
+
+      if (transformer.manipulateOptions) {
+        transformer.manipulateOptions(file.opts, file);
+      }
     }
   });
 
-  return transformers;
+  return transformers.concat(secondPassTransformers);
 };
 
 File.prototype.toArray = function (node, i) {
   if (t.isArrayExpression(node)) {
     return node;
   } else if (t.isIdentifier(node) && node.name === "arguments") {
-    return t.callExpression(t.memberExpression(this.addDeclaration("slice"), t.identifier("call")), [node]);
+    return t.callExpression(t.memberExpression(this.addHelper("slice"), t.identifier("call")), [node]);
   } else {
     var declarationName = "to-array";
     var args = [node];
@@ -113,7 +129,7 @@ File.prototype.toArray = function (node, i) {
       args.push(t.literal(i));
       declarationName = "sliced-to-array";
     }
-    return t.callExpression(this.addDeclaration(declarationName), args);
+    return t.callExpression(this.addHelper(declarationName), args);
   }
 };
 
@@ -144,8 +160,15 @@ File.prototype.parseShebang = function (code) {
   return code;
 };
 
-File.prototype.addDeclaration = function (name) {
-  if (!_.contains(File.declarations, name)) {
+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.addHelper = function (name) {
+  if (!_.contains(File.helpers, name)) {
     throw new ReferenceError("unknown declaration " + name);
   }
 
@@ -156,7 +179,7 @@ File.prototype.addDeclaration = function (name) {
 
   var ref;
   var runtimeNamespace = this.opts.runtime;
-  if (runtimeNamespace) {
+  if (runtimeNamespace && !_.contains(File.excludeHelpersFromRuntime, name)) {
     name = t.identifier(t.toIdentifier(name));
     return t.memberExpression(t.identifier(runtimeNamespace), name);
   } else {

lib/6to5/generation/generator.js

@@ -148,10 +148,11 @@ CodeGenerator.prototype.print = function (node, parent, opts) {
   };
 
   if (this[node.type]) {
-    // only compute if this node needs parens if our parent has been changed
-    // since acorn would've wrapped us in a ParanthesizedExpression
-    var needsParens = n.needsParens(node, parent);
+    var needsCommentParens = t.isExpression(node) && node.leadingComments && node.leadingComments.length;
+    var needsParens        = needsCommentParens || n.needsParens(node, parent);
+
     if (needsParens) this.push("(");
+    if (needsCommentParens) this.indent();
 
     this.printLeadingComments(node, parent);
 
@@ -162,6 +163,10 @@ CodeGenerator.prototype.print = function (node, parent, opts) {
 
     this[node.type](node, this.buildPrint(node), parent);
 
+    if (needsCommentParens) {
+      this.newline();
+      this.dedent();
+    }
     if (needsParens) this.push(")");
 
     this.map.mark(node, "end");
@@ -269,14 +274,21 @@ CodeGenerator.prototype._printComments = function (comments) {
   var self = this;
 
   _.each(comments, function (comment) {
+    var skip = false;
+
     // find the original comment in the ast and set it as displayed
     _.each(self.ast.comments, function (origComment) {
       if (origComment.start === comment.start) {
+        // comment has already been output
+        if (origComment._displayed) skip = true;
+
         origComment._displayed = true;
         return false;
       }
     });
 
+    if (skip) return;
+
     // whitespace before
     self.newline(self.whitespace.getNewlinesBefore(comment));
 

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

@@ -98,6 +98,10 @@ exports.MemberExpression = function (node, print) {
   var obj = node.object;
   print(obj);
 
+  if (!node.computed && t.isMemberExpression(node.property)) {
+    throw new TypeError("Got a MemberExpression for MemberExpression property");
+  }
+
   if (node.computed) {
     this.push("[");
     print(node.property);

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

@@ -60,10 +60,6 @@ Node.prototype.needsParens = function () {
 
   if (!parent) return false;
 
-  if (t.isExpression(node) && node.leadingComments && node.leadingComments.length) {
-    return true;
-  }
-
   if (t.isNewExpression(parent) && parent.callee === node) {
     return t.isCallExpression(node) || _.some(node, function (val) {
       return t.isCallExpression(val);

lib/6to5/register-browser.js

@@ -0,0 +1,4 @@
+// Required to safely use 6to5/register within a browserify codebase.
+module.exports = function () {};
+
+require("./polyfill");

lib/6to5/runtime-generator.js

@@ -18,7 +18,11 @@ module.exports = function (namespace) {
     )
   ]));
 
-  _.each(File.declarations, function (name) {
+  _.each(File.helpers, function (name) {
+    if (_.contains(File.excludeHelpersFromRuntime, name)) {
+      return false;
+    }
+
     var key = t.identifier(t.toIdentifier(name));
     body.push(t.expressionStatement(
       t.assignmentExpression("=", t.memberExpression(namespace, key), util.template(name))

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

@@ -51,7 +51,7 @@ DefaultFormatter.prototype.remapAssignments = function () {
   traverse(this.file.ast, {
     enter: function (node, parent, scope) {
       if (t.isUpdateExpression(node) && isLocalReference(node.argument, scope)) {
-        this.stop();
+        this.skip();
 
         // expand to long file assignment expression
         var assign = t.assignmentExpression(node.operator[0] + "=", node.argument, t.literal(1));
@@ -79,7 +79,7 @@ DefaultFormatter.prototype.remapAssignments = function () {
       }
 
       if (t.isAssignmentExpression(node) && isLocalReference(node.left, scope)) {
-        this.stop();
+        this.skip();
         return self.remapExportAssignment(node);
       }
     }

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

@@ -85,7 +85,7 @@ AMDFormatter.prototype.importSpecifier = function (specifier, node, nodes) {
     // import * as bar from "foo";
   } else if (t.isSpecifierDefault(specifier) && !this.noInteropRequire) {
     // import foo from "foo";
-    ref = t.callExpression(this.file.addDeclaration("interop-require"), [ref]);
+    ref = t.callExpression(this.file.addHelper("interop-require"), [ref]);
   } else {
     // import {foo} from "foo";
     ref = t.memberExpression(ref, specifier.id, false);

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

@@ -26,7 +26,7 @@ CommonJSFormatter.prototype.importSpecifier = function (specifier, node, nodes)
   if (t.isSpecifierDefault(specifier)) {
     nodes.push(t.variableDeclaration("var", [
       t.variableDeclarator(variableName,
-        t.callExpression(this.file.addDeclaration("interop-require"), [util.template("require", {
+        t.callExpression(this.file.addHelper("interop-require"), [util.template("require", {
           MODULE_NAME: node.source
         })])
       )

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

@@ -114,7 +114,7 @@ SystemFormatter.prototype.transform = function (ast) {
     enter: function (node, parent, scope) {
       if (t.isFunction(node)) {
         // nothing inside is accessible
-        return this.stop();
+        return this.skip();
       }
 
       if (t.isVariableDeclaration(node)) {
@@ -159,7 +159,7 @@ SystemFormatter.prototype.transform = function (ast) {
   // hoist up function declarations for circular references
   traverse(block, {
     enter: function (node) {
-      if (t.isFunction(node)) this.stop();
+      if (t.isFunction(node)) this.skip();
 
       if (t.isFunctionDeclaration(node) || node._blockHoist) {
         handlerBody.push(node);

lib/6to5/transformation/templates/array-expression-comprehension-filter.js

@@ -1,5 +0,0 @@
-ARRAY.filter(function (KEY) {
-  return FILTER;
-}).map(function (KEY) {
-  return STATEMENT;
-});

lib/6to5/transformation/templates/array-expression-comprehension-map.js

@@ -1,3 +0,0 @@
-ARRAY.map(function (KEY) {
-  return STATEMENT;
-});

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

@@ -0,0 +1,37 @@
+(function (fn) {
+  return function () {
+    var gen = fn.apply(this, arguments);
+
+    return new Promise(function (resolve, reject) {
+      function step(getNext) {
+        var next;
+
+        try {
+          next = getNext();
+        } catch(e) {
+          reject(e);
+          return;
+        }
+
+        if (next.done) {
+          resolve(next.value);
+          return;
+        }
+
+        Promise.resolve(next.value).then(function (v) {
+          step(function () {
+            return gen.next(v);
+          });
+        }, function (e) {
+          step(function () {
+            return gen["throw"](e);
+          });
+        });
+      }
+
+      step(function () {
+        return gen.next();
+      });
+    });
+  }
+})

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

@@ -0,0 +1,8 @@
+(function (obj, defaults) {
+  for (var key in defaults) {
+    if (obj[key] === undefined) {
+      obj[key] = defaults[key];
+    }
+  }
+  return obj;
+})

lib/6to5/transformation/templates/property-method-assignment-wrapper.js

@@ -0,0 +1,11 @@
+(function (FUNCTION_KEY) {
+  var WRAPPER_KEY = function FUNCTION_ID() {
+    return FUNCTION_KEY.apply(this, arguments);
+  };
+
+  WRAPPER_KEY.toString = function () {
+    return FUNCTION_KEY.toString();
+  };
+
+  return WRAPPER_KEY;
+})(FUNCTION)

lib/6to5/transformation/transform.js

@@ -49,6 +49,9 @@ _.each({
   memoizationOperator:       require("./transformers/playground-memoization-operator"),
   objectGetterMemoization:   require("./transformers/playground-object-getter-memoization"),
 
+  asyncToGenerator:          require("./transformers/optional-async-to-generator"),
+  bluebirdCoroutines:        require("./transformers/optional-bluebird-coroutines"),
+
   react:                     require("./transformers/react"),
   modules:                   require("./transformers/es6-modules"),
   propertyNameShorthand:     require("./transformers/es6-property-name-shorthand"),
@@ -63,7 +66,7 @@ _.each({
   exponentiationOperator:    require("./transformers/es7-exponentiation-operator"),
   spread:                    require("./transformers/es6-spread"),
   templateLiterals:          require("./transformers/es6-template-literals"),
-  propertyMethodAssignment:  require("./transformers/es5-property-method-assignment"),
+  propertyMethodAssignment:  require("./transformers/es6-property-method-assignment"),
   destructuring:             require("./transformers/es6-destructuring"),
   defaultParameters:         require("./transformers/es6-default-parameters"),
   forOf:                     require("./transformers/es6-for-of"),
@@ -78,15 +81,17 @@ _.each({
   generators:                require("./transformers/es6-generators"),
   restParameters:            require("./transformers/es6-rest-parameters"),
 
-  _declarations:             require("./transformers/_declarations"),
+  protoToAssign:             require("./transformers/optional-proto-to-assign"),
 
-  coreAliasing:              require("./transformers/optional-core-aliasing"),
-  undefinedToVoid:           require("./transformers/optional-undefined-to-void"),
+  _declarations:             require("./transformers/_declarations"),
 
   // wrap up
   _aliasFunctions:           require("./transformers/_alias-functions"),
-  useStrict:                 require("./transformers/use-strict"),
   _moduleFormatter:          require("./transformers/_module-formatter"),
+  useStrict:                 require("./transformers/use-strict"),
+
+  coreAliasing:              require("./transformers/optional-core-aliasing"),
+  undefinedToVoid:           require("./transformers/optional-undefined-to-void"),
 
   // spec
   specPropertyLiterals:         require("./transformers/spec-property-literals"),

lib/6to5/transformation/transformer.js

@@ -5,11 +5,13 @@ var t        = require("../types");
 var _        = require("lodash");
 
 function Transformer(key, transformer, opts) {
-  this.experimental = !!transformer.experimental;
-  this.transformer  = Transformer.normalise(transformer);
-  this.optional     = !!transformer.optional;
-  this.opts         = opts || {};
-  this.key          = key;
+  this.manipulateOptions = transformer.manipulateOptions;
+  this.experimental      = !!transformer.experimental;
+  this.secondPass        = !!transformer.secondPass;
+  this.transformer       = Transformer.normalise(transformer);
+  this.optional          = !!transformer.optional;
+  this.opts              = opts || {};
+  this.key               = key;
 }
 
 Transformer.normalise = function (transformer) {
@@ -40,16 +42,14 @@ Transformer.normalise = function (transformer) {
 
 Transformer.prototype.astRun = function (file, key) {
   var transformer = this.transformer;
-  var ast         = file.ast;
 
   if (transformer.ast && transformer.ast[key]) {
-    transformer.ast[key](ast, file);
+    transformer.ast[key](file.ast, file);
   }
 };
 
 Transformer.prototype.transform = function (file) {
   var transformer = this.transformer;
-  var ast         = file.ast;
 
   var build = function (exit) {
     return function (node, parent, scope) {
@@ -66,7 +66,7 @@ Transformer.prototype.transform = function (file) {
 
   this.astRun(file, "before");
 
-  traverse(ast, {
+  traverse(file.ast, {
     enter: build(),
     exit:  build(true)
   });

lib/6to5/transformation/transformers/_alias-functions.js

@@ -20,7 +20,7 @@ var go = function (getBody, node, file, scope) {
       if (!node._aliasFunction) {
         if (t.isFunction(node)) {
           // stop traversal of this node as it'll be hit again by this transformer
-          return this.stop();
+          return this.skip();
         } else {
           return;
         }
@@ -30,10 +30,10 @@ var go = function (getBody, node, file, scope) {
       traverse(node, {
         enter: function (node, parent) {
           if (t.isFunction(node) && !node._aliasFunction) {
-            return this.stop();
+            return this.skip();
           }
 
-          if (node._ignoreAliasFunctions) return this.stop();
+          if (node._ignoreAliasFunctions) return this.skip();
 
           var getId;
 
@@ -49,7 +49,7 @@ var go = function (getBody, node, file, scope) {
         }
       });
 
-      return this.stop();
+      return this.skip();
     }
   });
 

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

@@ -1,5 +1,7 @@
 var t = require("../../types");
 
+exports.secondPass = true;
+
 exports.BlockStatement =
 exports.Program = function (node) {
   var kinds = {};
@@ -22,4 +24,6 @@ exports.Program = function (node) {
   for (kind in kinds) {
     node.body.unshift(t.variableDeclaration(kind, kinds[kind]));
   }
+
+  node._declarations = null;
 };

lib/6to5/transformation/transformers/es5-property-method-assignment.js

@@ -1,40 +0,0 @@
-var util = require("../../util");
-
-exports.Property = function (node) {
-  if (node.method) node.method = false;
-};
-
-exports.ObjectExpression = function (node, parent, file) {
-  var mutatorMap = {};
-  var hasAny = false;
-
-  node.properties = node.properties.filter(function (prop) {
-    if (prop.kind === "get" || prop.kind === "set") {
-      hasAny = true;
-      util.pushMutatorMap(mutatorMap, prop.key, prop.kind, prop.value);
-      return false;
-    } else {
-      return true;
-    }
-  });
-
-  if (!hasAny) return;
-
-  if (node.properties.length) {
-    var objId = util.getUid(parent, file);
-
-    return util.template("object-define-properties-closure", {
-      KEY: objId,
-      OBJECT: node,
-      CONTENT: util.template("object-define-properties", {
-        OBJECT: objId,
-        PROPS:  util.buildDefineProperties(mutatorMap)
-      })
-    });
-  } else {
-    return util.template("object-define-properties", {
-      OBJECT: node,
-      PROPS:  util.buildDefineProperties(mutatorMap)
-    });
-  }
-};

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

@@ -21,7 +21,7 @@ exports.ClassDeclaration = function (node, parent, file, scope) {
       });
       return t.assignmentExpression("=", node.id, newNode);
     } else {
-      // likely has a PrivateDeclaration etc
+      // has a super class or PrivateDeclaration etc
       return t.variableDeclaration("let", [
         t.variableDeclarator(node.id, newNode)
       ]);
@@ -85,24 +85,18 @@ Class.prototype.run = function () {
 
   //
 
-  if (superName && t.isDynamic(superName)) {
-    // so we're only evaluating it once
-    var superRefName = "super";
-    if (className) superRefName = className.name + "Super";
+  if (superName) {
+    this.closure = true;
 
-    var superRef = file.generateUidIdentifier(superRefName, this.scope);
+    // so we're only evaluating it once
+    var superRef = this.scope.generateUidBasedOnNode(superName, this.file);
     body.unshift(t.variableDeclaration("var", [
       t.variableDeclarator(superRef, superName)
     ]));
     superName = superRef;
-  }
 
-  this.superName = superName;
-
-  //
-
-  if (superName) {
-    body.push(t.expressionStatement(t.callExpression(file.addDeclaration("inherits"), [className, superName])));
+    this.superName = superName;
+    body.push(t.expressionStatement(t.callExpression(file.addHelper("inherits"), [className, superName])));
   }
 
   this.buildBody();
@@ -181,7 +175,7 @@ Class.prototype.buildBody = function () {
     if (instanceProps) args.push(instanceProps);
 
     body.push(t.expressionStatement(
-      t.callExpression(this.file.addDeclaration("prototype-properties"), args)
+      t.callExpression(this.file.addHelper("prototype-properties"), args)
     ));
   }
 };
@@ -282,7 +276,7 @@ Class.prototype.replaceInstanceSuperReferences = function (methodNode) {
         if (callee.object.name !== "super") return;
 
         // super.test(); -> ClassName.prototype.MethodName.call(this);
-        callee.property = t.memberExpression(callee.property, t.identifier("call"));
+        t.appendToMemberExpression(callee, t.identifier("call"));
         node.arguments.unshift(t.thisExpression());
       }
     }

lib/6to5/transformation/transformers/es6-computed-property-names.js

@@ -1,7 +1,6 @@
-var util = require("../../util");
-var t    = require("../../types");
+var t = require("../../types");
 
-exports.ObjectExpression = function (node, parent, file) {
+exports.ObjectExpression = function (node, parent, file, scope) {
   var hasComputed = false;
   var prop;
   var key;
@@ -14,7 +13,7 @@ exports.ObjectExpression = function (node, parent, file) {
 
   if (!hasComputed) return;
 
-  var objId = util.getUid(parent, file);
+  var objId = scope.generateUidBasedOnNode(parent, file);
 
   var body = [];
   var container = t.functionExpression(null, [], t.blockStatement(body));
@@ -45,7 +44,7 @@ exports.ObjectExpression = function (node, parent, file) {
       broken = true;
     }
 
-    if (!broken || t.isLiteral(prop.key, { value: "__proto__" })) {
+    if (!broken || t.isLiteral(t.toComputedKey(prop, prop.key), { value: "__proto__" })) {
       initProps.push(prop);
       props[i] = null;
     }
@@ -62,13 +61,14 @@ exports.ObjectExpression = function (node, parent, file) {
     var bodyNode;
 
     if (prop.computed && t.isMemberExpression(key) && t.isIdentifier(key.object, { name: "Symbol" })) {
+      // { [Symbol.iterator]: "foo" }
       bodyNode = t.assignmentExpression(
         "=",
         t.memberExpression(objId, key, true),
         prop.value
       );
     } else {
-      bodyNode = t.callExpression(file.addDeclaration("define-property"), [objId, key, prop.value]);
+      bodyNode = t.callExpression(file.addHelper("define-property"), [objId, key, prop.value]);
     }
 
     body.push(t.expressionStatement(bodyNode));
@@ -80,7 +80,7 @@ exports.ObjectExpression = function (node, parent, file) {
     var first = body[0].expression;
 
     if (t.isCallExpression(first)) {
-      first.arguments[0] = t.objectExpression([]);
+      first.arguments[0] = t.objectExpression(initProps);
       return first;
     }
   }

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

@@ -45,7 +45,7 @@ var pushObjectPattern = function (opts, nodes, pattern, parentId) {
         }
         keys = t.arrayExpression(keys);
 
-        var value = t.callExpression(opts.file.addDeclaration("object-without-properties"), [parentId, keys]);
+        var value = t.callExpression(opts.file.addHelper("object-without-properties"), [parentId, keys]);
         nodes.push(buildVariableAssign(opts, prop.argument, value));
     } else {
       var pattern2   = prop.value;
@@ -75,7 +75,7 @@ var pushArrayPattern = function (opts, nodes, pattern, parentId) {
 
   var toArray = opts.file.toArray(parentId, !hasSpreadElement && pattern.elements.length);
 
-  var _parentId = opts.file.generateUidIdentifier("ref", opts.scope);
+  var _parentId = opts.scope.generateUidBasedOnNode(parentId, opts.file);
   nodes.push(t.variableDeclaration("var", [
     t.variableDeclarator(_parentId, toArray)
   ]));
@@ -113,7 +113,7 @@ var pushPattern = function (opts) {
   var scope = opts.scope;
 
   if (!t.isMemberExpression(parentId) && !t.isIdentifier(parentId)) {
-    var key = file.generateUidIdentifier("ref", scope);
+    var key = scope.generateUidBasedOnNode(parentId, file);
 
     nodes.push(t.variableDeclaration("var", [
       t.variableDeclarator(key, parentId)

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

@@ -280,7 +280,7 @@ LetScoping.prototype.checkLoop = function () {
       var replace;
 
       if (t.isFunction(node) || t.isLoop(node)) {
-        return this.stop();
+        return this.skip();
       }
 
       if (node && !node.label) {
@@ -329,7 +329,7 @@ LetScoping.prototype.hoistVarDeclarations = function () {
       } else if (isVar(node, parent)) {
         return self.pushDeclar(node).map(t.expressionStatement);
       } else if (t.isFunction(node)) {
-        return this.stop();
+        return this.skip();
       }
     }
   });
@@ -388,9 +388,9 @@ LetScoping.prototype.getLetReferences = function () {
           }
         });
 
-        return this.stop();
+        return this.skip();
       } else if (t.isLoop(node)) {
-        return this.stop();
+        return this.skip();
       }
     }
   });

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

@@ -1,5 +1,11 @@
 var t = require("../../types");
 
+exports.ast = {
+  before: function (ast, file) {
+    ast.program.body = file.dynamicImports.concat(ast.program.body);
+  }
+};
+
 exports.ImportDeclaration = function (node, parent, file) {
   var nodes = [];
 
@@ -11,6 +17,12 @@ exports.ImportDeclaration = function (node, parent, file) {
     file.moduleFormatter.importDeclaration(node, nodes, parent);
   }
 
+  if (nodes.length === 1) {
+    // inherit `_blockHoist`
+    // this for `_blockHoist` in File.prototype.addImport
+    nodes[0]._blockHoist = node._blockHoist;
+  }
+
   return nodes;
 };
 

lib/6to5/transformation/transformers/es6-property-method-assignment.js

@@ -0,0 +1,82 @@
+var traverse = require("../../traverse");
+var util     = require("../../util");
+var t        = require("../../types");
+
+exports.Property = function (node, parent, file, scope) {
+  if (!node.method) return;
+
+  node.method = false;
+
+  var key = t.toComputedKey(node, node.key);
+  if (!t.isLiteral(key)) return; // we can't set a function id with this
+
+  var id = t.toIdentifier(key.value);
+  key = t.identifier(id);
+
+  var selfReference = false;
+  var outerDeclar = scope.get(id, true);
+
+  traverse(node, {
+    enter: function (node, parent, scope) {
+      // check if this node is an identifier that matches the same as our function id
+      if (!t.isIdentifier(node, { name: id })) return;
+
+      // check if this node is the one referenced
+      if (!t.isReferenced(node, parent)) return;
+
+      // check that we don't have a local variable declared as that removes the need
+      // for the wrapper
+      var localDeclar = scope.get(id, true);
+      if (localDeclar !== outerDeclar) return;
+
+      selfReference = true;
+      this.stop();
+    }
+  }, scope);
+
+  if (selfReference) {
+    node.value = util.template("property-method-assignment-wrapper", {
+      FUNCTION: node.value,
+      FUNCTION_ID: key,
+      FUNCTION_KEY: file.generateUidIdentifier(id, scope),
+      WRAPPER_KEY: file.generateUidIdentifier(id + "Wrapper", scope)
+    });
+  } else {
+    node.value.id = key;
+  }
+};
+
+exports.ObjectExpression = function (node, parent, file, scope) {
+  var mutatorMap = {};
+  var hasAny = false;
+
+  node.properties = node.properties.filter(function (prop) {
+    if (prop.kind === "get" || prop.kind === "set") {
+      hasAny = true;
+      util.pushMutatorMap(mutatorMap, prop.key, prop.kind, prop.value);
+      return false;
+    } else {
+      return true;
+    }
+  });
+
+  if (!hasAny) return;
+
+  if (node.properties.length) {
+    var objId = scope.generateUidBasedOnNode(parent, file);
+
+    return util.template("object-define-properties-closure", {
+      KEY: objId,
+      OBJECT: node,
+      CONTENT: util.template("object-define-properties", {
+        OBJECT: objId,
+        PROPS:  util.buildDefineProperties(mutatorMap)
+      })
+    });
+  } else {
+    return util.template("object-define-properties", {
+      OBJECT: node,
+      PROPS:  util.buildDefineProperties(mutatorMap)
+    });
+  }
+};

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

@@ -77,23 +77,14 @@ exports.CallExpression = function (node, parent, file, scope) {
   }
 
   var callee = node.callee;
-  var temp;
 
   if (t.isMemberExpression(callee)) {
-    contextLiteral = callee.object;
-
-    if (t.isDynamic(contextLiteral)) {
-      temp = contextLiteral = scope.generateTemp(file);
+    var temp = scope.generateTempBasedOnNode(callee.object, file);
+    if (temp) {
       callee.object = t.assignmentExpression("=", temp, callee.object);
+      contextLiteral = temp;
     }
-
-    if (callee.computed) {
-      callee.object = t.memberExpression(callee.object, callee.property, true);
-      callee.property = t.identifier("apply");
-      callee.computed = false;
-    } else {
-      callee.property = t.memberExpression(callee.property, t.identifier("apply"));
-    }
+    t.appendToMemberExpression(callee, t.identifier("apply"));
   } else {
     node.callee = t.memberExpression(node.callee, t.identifier("apply"));
   }
@@ -114,5 +105,5 @@ exports.NewExpression = function (node, parent, file) {
     args = first;
   }
 
-  return t.callExpression(file.addDeclaration("apply-constructor"), [node.callee, args]);
+  return t.callExpression(file.addHelper("apply-constructor"), [node.callee, args]);
 };

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

@@ -17,7 +17,7 @@ exports.TaggedTemplateExpression = function (node, parent, file) {
     raw.push(t.literal(elem.value.raw));
   }
 
-  args.push(t.callExpression(file.addDeclaration("tagged-template-literal"), [
+  args.push(t.callExpression(file.addHelper("tagged-template-literal"), [
     t.arrayExpression(strings),
     t.arrayExpression(raw)
   ]));

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

@@ -30,10 +30,8 @@ exports.AssignmentExpression = function (node, parent, file, scope) {
 
   // we need to return `node.right`
   if (!t.isExpressionStatement(parent)) {
-    // `node.right` isn't a simple identifier so we need to reference it
-    if (t.isDynamic(value)) {
-      temp = value = scope.generateTemp(file);
-    }
+    temp = scope.generateTempBasedOnNode(node.right, file);
+    if (temp) value = temp;
   }
 
   if (node.operator !== "=") {
@@ -80,11 +78,7 @@ exports.CallExpression = function (node, parent, file, scope) {
   var callee = node.callee;
   if (!t.isVirtualPropertyExpression(callee)) return;
 
-  var temp;
-  if (t.isDynamic(callee.object)) {
-    // we need to save `callee.object` so we can call it again
-    temp = scope.generateTemp(file);
-  }
+  var temp = scope.generateTempBasedOnNode(callee.object, file);
 
   var call = util.template("abstract-expression-call", {
     PROPERTY: callee.property,

lib/6to5/transformation/transformers/es7-array-comprehension.js

@@ -1,43 +1,25 @@
-var util = require("../../util");
-var t    = require("../../types");
+var traverse = require("../../traverse");
+var util     = require("../../util");
+var t        = require("../../types");
 
 exports.experimental = true;
 
-var single = function (node, file) {
-  var block = node.blocks[0];
-
-  var templateName = "array-expression-comprehension-map";
-  if (node.filter) templateName = "array-expression-comprehension-filter";
-
-  var result = util.template(templateName, {
-    STATEMENT: node.body,
-    FILTER:    node.filter,
-    ARRAY:     file.toArray(block.right),
-    KEY:       block.left
-  });
-
-  var aliasPossibles = [result.callee.object, result];
-  for (var i in aliasPossibles) {
-    var call = aliasPossibles[i];
-    if (t.isCallExpression(call)) {
-      call.arguments[0]._aliasFunction = true;
-    }
-  }
-
-  return result;
-};
-
-var multiple = function (node, file) {
-  var uid = file.generateUidIdentifier("arr");
+var build = function (node, parent, file, scope) {
+  var uid = scope.generateUidBasedOnNode(parent, file);
 
   var container = util.template("array-comprehension-container", {
     KEY: uid
   });
-  container.callee.expression._aliasFunction = true;
+  container.callee._aliasFunction = true;
 
   var block = container.callee.body;
   var body  = block.body;
 
+  if (traverse.hasType(node, "YieldExpression", t.FUNCTION_TYPES)) {
+    container.callee.generator = true;
+    container = t.yieldExpression(container, true);
+  }
+
   var returnStatement = body.pop();
 
   body.push(exports._build(node, function () {
@@ -67,18 +49,14 @@ exports._build = function (node, buildBody) {
   }
 
   return t.forOfStatement(
-    t.variableDeclaration("var", [t.variableDeclarator(self.left)]),
+    t.variableDeclaration("let", [t.variableDeclarator(self.left)]),
     self.right,
     t.blockStatement([child])
   );
 };
 
-exports.ComprehensionExpression = function (node, parent, file) {
+exports.ComprehensionExpression = function (node, parent, file, scope) {
   if (node.generator) return;
 
-  if (node.blocks.length === 1) {
-    return single(node, file);
-  } else {
-    return multiple(node, file);
-  }
+  return build(node, parent, file, scope);
 };

lib/6to5/transformation/transformers/optional-async-to-generator.js

@@ -0,0 +1,11 @@
+var bluebirdCoroutines = require("./optional-bluebird-coroutines");
+
+exports.optional = true;
+
+exports.manipulateOptions = bluebirdCoroutines.manipulateOptions;
+
+exports.Function = function (node, parent, file) {
+  if (!node.async || node.generator) return;
+
+  return bluebirdCoroutines._Function(node, file.addHelper("async-to-generator"));
+};

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

@@ -0,0 +1,45 @@
+var traverse = require("../../traverse");
+var t        = require("../../types");
+
+exports.manipulateOptions = function (opts) {
+  opts.experimental = true;
+  opts.blacklist.push("generators");
+};
+
+exports.optional = true;
+
+exports._Function = function (node, callId) {
+  node.async = false;
+  node.generator = true;
+
+  traverse(node, {
+    enter: function (node) {
+      if (t.isFunction(node)) this.skip();
+
+      if (t.isAwaitExpression(node)) {
+        node.type = "YieldExpression";
+      }
+    }
+  });
+
+  var call = t.callExpression(callId, [node]);
+
+  if (t.isFunctionDeclaration(node)) {
+    var declar = t.variableDeclaration("var", [
+      t.variableDeclarator(node.id, call)
+    ]);
+    declar._blockHoist = true;
+    return declar;
+  } else {
+    return call;
+  }
+};
+
+exports.Function = function (node, parent, file) {
+  if (!node.async || node.generator) return;
+
+  var id = t.identifier("Bluebird");
+  file.addImport(id, "bluebird");
+
+  return exports._Function(node, t.memberExpression(id, t.identifier("coroutine")));
+};

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

@@ -4,14 +4,16 @@ var core     = require("core-js/library");
 var t        = require("../../types");
 var _        = require("lodash");
 
+var coreHas = function (node) {
+  return node.name !== "_" && _.has(core, node.name);
+};
+
 exports.optional = true;
 
 exports.ast = {
   enter: function (ast, file) {
     file._coreId = file.generateUidIdentifier("core");
-    var specifiers = [t.importSpecifier(t.identifier("default"), file._coreId)];
-    var declar = t.importDeclaration(specifiers, t.literal("core-js/library"));
-    ast.program.body.unshift(declar);
+    file.addImport(file._coreId, "core-js/library");
   },
 
   exit: function (ast, file) {
@@ -26,11 +28,13 @@ exports.ast = {
 
           if (!t.isReferenced(obj, node)) return;
 
-          var coreHasObject = obj.name !== "_" && _.has(core, obj.name);
-          if (coreHasObject && _.has(core[obj.name], prop.name)) {
-            this.stop();
-            return t.memberExpression(file._coreId, node);
+          if (!node.computed && coreHas(obj) && _.has(core[obj.name], prop.name)) {
+            this.skip();
+            return t.prependToMemberExpression(node, file._coreId);
           }
+        } else if (t.isIdentifier(node) && !t.isMemberExpression(parent) && t.isReferenced(node, parent) && coreHas(node)) {
+          // new Promise -> new _core.Promise
+          return t.memberExpression(file._coreId, node);
         } else if (t.isCallExpression(node)) {
           // arr[Symbol.iterator]() -> _core.$for.getIterator(arr)
 

lib/6to5/transformation/transformers/optional-proto-to-assign.js

@@ -0,0 +1,63 @@
+var t = require("../../types");
+var _ = require("lodash");
+
+var OBJECT_ASSIGN_MEMBER = t.memberExpression(t.identifier("Object"), t.identifier("assign"));
+
+var isProtoKey = function (node) {
+  return t.isLiteral(t.toComputedKey(node, node.key), { value: "__proto__" });
+};
+
+var isProtoAssignmentExpression = function (node) {
+  var left = node.left;
+  return t.isMemberExpression(left) && t.isLiteral(t.toComputedKey(left, left.property), { value: "__proto__" });
+};
+
+var buildDefaultsCallExpression = function (expr, ref, file) {
+  return t.expressionStatement(t.callExpression(file.addHelper("defaults"), [ref, expr.right]));
+};
+
+exports.optional = true;
+exports.secondPass = true;
+
+exports.AssignmentExpression = function (node, parent, file, scope) {
+  if (t.isExpressionStatement(parent)) return;
+  if (!isProtoAssignmentExpression(node)) return;
+
+  var nodes = [];
+  var left  = node.left.object;
+  var temp  = scope.generateTempBasedOnNode(node.left.object, file);
+
+  nodes.push(t.expressionStatement(t.assignmentExpression("=", temp, left)));
+  nodes.push(buildDefaultsCallExpression(node, temp, file));
+  if (temp) nodes.push(temp);
+
+  return t.toSequenceExpression(nodes);
+};
+
+exports.ExpressionStatement = function (node, parent, file) {
+  var expr = node.expression;
+  if (!t.isAssignmentExpression(expr, { operator: "=" })) return;
+
+  if (isProtoAssignmentExpression(expr)) {
+    return buildDefaultsCallExpression(expr, expr.left.object, file);
+  }
+};
+
+exports.ObjectExpression = function (node) {
+  var proto;
+
+  for (var i in node.properties) {
+    var prop = node.properties[i];
+
+    if (isProtoKey(prop)) {
+      proto = prop.value;
+      _.pull(node.properties, prop);
+    }
+  }
+
+  if (proto) {
+    var args = [t.objectExpression([]), proto];
+    if (node.properties.length) args.push(node);
+    return t.callExpression(OBJECT_ASSIGN_MEMBER, args);
+  }
+};

lib/6to5/transformation/transformers/playground-memoization-operator.js

@@ -10,7 +10,7 @@ var getPropRef = function (nodes, prop, file, scope) {
   if (t.isIdentifier(prop)) {
     return t.literal(prop.name);
   } else {
-    var temp = file.generateUidIdentifier("propKey", scope);
+    var temp = scope.generateUidBasedOnNode(prop, file);
     nodes.push(t.variableDeclaration("var", [
       t.variableDeclarator(temp, prop)
     ]));
@@ -19,22 +19,18 @@ var getPropRef = function (nodes, prop, file, scope) {
 };
 
 var getObjRef = function (nodes, obj, file, scope) {
-  if (t.isDynamic(obj)) {
-    var temp = file.generateUidIdentifier("obj", scope);
-    nodes.push(t.variableDeclaration("var", [
-      t.variableDeclarator(temp, obj)
-    ]));
-    return temp;
-  } else {
-    return obj;
-  }
+  var temp = scope.generateUidBasedOnNode(obj, file);
+  nodes.push(t.variableDeclaration("var", [
+    t.variableDeclarator(temp, obj)
+  ]));
+  return temp;
 };
 
 var buildHasOwn = function (obj, prop, file) {
   return t.unaryExpression(
     "!",
     t.callExpression(
-      t.memberExpression(file.addDeclaration("has-own"), t.identifier("call")),
+      t.memberExpression(file.addHelper("has-own"), t.identifier("call")),
       [obj, prop]
     ),
     true

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

@@ -1,14 +1,11 @@
 var t = require("../../types");
-var _ = require("lodash");
 
 exports.BindMemberExpression = function (node, parent, file, scope) {
   var object = node.object;
   var prop   = node.property;
 
-  var temp;
-  if (t.isDynamic(object)) {
-    temp = object = scope.generateTemp(file);
-  }
+  var temp = scope.generateTempBasedOnNode(node.object, file);
+  if (temp) object = temp;
 
   var call = t.callExpression(
     t.memberExpression(t.memberExpression(object, prop), t.identifier("bind")),
@@ -33,16 +30,12 @@ exports.BindFunctionExpression = function (node, parent, file, scope) {
     ]));
   };
 
-  if (_.find(node.arguments, t.isDynamic)) {
-    var temp = scope.generateTemp(file, "args");
+  var temp = scope.generateTemp(file, "args");
 
-    return t.sequenceExpression([
-      t.assignmentExpression("=", temp, t.arrayExpression(node.arguments)),
-      buildCall(node.arguments.map(function (node, i) {
-        return t.memberExpression(temp, t.literal(i), true);
-      }))
-    ]);
-  } else {
-    return buildCall(node.arguments);
-  }
+  return t.sequenceExpression([
+    t.assignmentExpression("=", temp, t.arrayExpression(node.arguments)),
+    buildCall(node.arguments.map(function (node, i) {
+      return t.memberExpression(temp, t.literal(i), true);
+    }))
+  ]);
 };

lib/6to5/transformation/transformers/playground-object-getter-memoization.js

@@ -20,7 +20,7 @@ exports.MethodDefinition = function (node, parent, file) {
       if (t.isFunction(node)) return;
 
       if (t.isReturnStatement(node) && node.argument) {
-        node.argument = t.memberExpression(t.callExpression(file.addDeclaration("define-property"), [
+        node.argument = t.memberExpression(t.callExpression(file.addHelper("define-property"), [
           t.thisExpression(),
           key,
           node.argument

lib/6to5/traverse/index.js

@@ -22,12 +22,14 @@ function traverse(parent, opts, scope) {
 
   opts = opts || {};
 
+  var stopped = false;
+
   for (var i in keys) {
     var key = keys[i];
     var nodes = parent[key];
     if (!nodes) continue;
 
-    var updated = false;
+    var flatten = false;
 
     var handle = function (obj, key) {
       var node = obj[key];
@@ -50,7 +52,8 @@ function traverse(parent, opts, scope) {
 
         // replace the node
         node = obj[key] = result;
-        updated = true;
+
+        if (isArray) flatten = true;
 
         // we're replacing a statement or block node with an array of statements so we better
         // ensure that it's a block
@@ -59,16 +62,20 @@ function traverse(parent, opts, scope) {
         }
       };
 
-      var stopped = false;
+      var skipped = false;
       var removed = false;
 
       var context = {
         stop: function () {
-          stopped = true;
+          skipped = stopped = true;
+        },
+
+        skip: function () {
+          skipped = true;
         },
 
         remove: function () {
-          this.stop();
+          this.skip();
           removed = true;
         }
       };
@@ -84,11 +91,11 @@ function traverse(parent, opts, scope) {
 
         if (removed) {
           obj[key] = null;
-          updated = true;
+          flatten = true;
         }
 
         // stop iteration
-        if (stopped) return;
+        if (skipped) return;
       }
 
       // traverse node
@@ -103,13 +110,20 @@ function traverse(parent, opts, scope) {
     if (_.isArray(nodes)) {
       for (i in nodes) {
         handle(nodes, i);
+        if (stopped) return;
       }
 
-      if (updated) {
+      if (flatten) {
         parent[key] = _.flatten(parent[key]);
+
+        if (key === "body") {
+          // we can safely compact this
+          parent[key] = _.compact(parent[key]);
+        }
       }
     } else {
       handle(parent, key);
+      if (stopped) return;
     }
   }
 }
@@ -156,7 +170,7 @@ traverse.hasType = function (tree, type, blacklistTypes) {
     enter: function (node) {
       if (node.type === type) {
         has = true;
-        this.stop();
+        this.skip();
       }
     }
   });

lib/6to5/traverse/scope.js

@@ -31,6 +31,13 @@ Scope.add = function (node, references) {
   _.defaults(references, t.getIds(node, true));
 };
 
+/**
+ * Description
+ *
+ * @param {File} file
+ * @param {String} [name="temp"]
+ */
+
 Scope.prototype.generateTemp = function (file, name) {
   var id = file.generateUidIdentifier(name || "temp", this);
   this.push({
@@ -40,6 +47,83 @@ Scope.prototype.generateTemp = function (file, name) {
   return id;
 };
 
+/*
+ * Description
+ *
+ * @param {Object} parent
+ * @param {File} file
+ * @param {Scope} scope
+ * @returns {Object}
+ */
+
+Scope.prototype.generateUidBasedOnNode = function (parent, file) {
+  var node = parent;
+
+  if (t.isAssignmentExpression(parent)) {
+    node = parent.left;
+  } else if (t.isVariableDeclarator(parent)) {
+    node = parent.id;
+  }
+
+  var id = "ref";
+
+  if (t.isProperty(node)) {
+    node = node.key;
+  }
+
+  if (t.isIdentifier(node)) {
+    id = node.name;
+  } else if (t.isLiteral(node)) {
+    id = node.value;
+  } else if (t.isMemberExpression(node)) {
+    var parts = [];
+
+    var add = function (node) {
+      if (t.isMemberExpression(node)) {
+        add(node.object);
+        add(node.property);
+      } else if (t.isIdentifier(node)) {
+        parts.push(node.name);
+      } else if (t.isLiteral(node)) {
+        parts.push(node.value);
+      }
+    };
+
+    add(node);
+
+    id = parts.join("$");
+  }
+
+  id = id.replace(/^_/, "");
+
+  return file.generateUidIdentifier(id, this);
+};
+
+/**
+ * Description
+ *
+ * @param {Object} node
+ * @param {File} file
+ * @returns {Object}
+ */
+
+Scope.prototype.generateTempBasedOnNode = function (node, file) {
+  if (!t.isIdentifier(node) && !t.isMemberExpression(node)) {
+    throw new TypeError("Invalid node type " + JSON.stringify(node.type) + " passed to Scope.prototype.generateTempBasedOnNode");
+  }
+
+  if (t.isIdentifier(node) && this.has(node.name, true)) {
+    return null;
+  }
+
+  var id = this.generateUidBasedOnNode(node, file);
+  this.push({
+    key: id.name,
+    id: id
+  });
+  return id;
+};
+
 Scope.prototype.getInfo = function () {
   var block = this.block;
   if (block._scopeInfo) return block._scopeInfo;
@@ -93,7 +177,7 @@ Scope.prototype.getInfo = function () {
 
         // this block is a function so we'll stop since none of the variables
         // declared within are accessible
-        if (t.isFunction(node)) return this.stop();
+        if (t.isFunction(node)) return this.skip();
 
         // function identifier doesn't belong to this scope
         if (block.id && node === block.id) return;
@@ -123,6 +207,12 @@ Scope.prototype.getInfo = function () {
   return info;
 };
 
+/**
+ * Description
+ *
+ * @param {Object} opts
+ */
+
 Scope.prototype.push = function (opts) {
   var block = this.block;
 
@@ -143,33 +233,84 @@ Scope.prototype.push = function (opts) {
   }
 };
 
+/**
+ * Description
+ *
+ * @param {Object} node
+ */
+
 Scope.prototype.add = function (node) {
   Scope.add(node, this.references);
 };
 
+/**
+ * Description
+ *
+ * @param {String} [id]
+ * @param {Boolean} [decl]
+ */
+
 Scope.prototype.get = function (id, decl) {
   return id && (this.getOwn(id, decl) || this.parentGet(id, decl));
 };
 
+/**
+ * Description
+ *
+ * @param {String} [id]
+ * @param {Boolean} [decl]
+ */
+
 Scope.prototype.getOwn = function (id, decl) {
   var refs = this.references;
   if (decl) refs = this.declarations;
   return _.has(refs, id) && refs[id];
 };
 
+/**
+ * Description
+ *
+ * @param {String} [id]
+ * @param {Boolean} [decl]
+ */
+
 Scope.prototype.parentGet = function (id, decl) {
   return this.parent && this.parent.get(id, decl);
 };
 
+/**
+ * Description
+ *
+ * @param {String} [id]
+ * @param {Boolean} [decl]
+ * @returns {Boolean}
+ */
+
 Scope.prototype.has = function (id, decl) {
   return (id && (this.hasOwn(id, decl) || this.parentHas(id, decl))) ||
          _.contains(Scope.defaultDeclarations, id);
 };
 
+/**
+ * Description
+ *
+ * @param {String} [id]
+ * @param {Boolean} [decl]
+ * @returns {Boolean}
+ */
+
 Scope.prototype.hasOwn = function (id, decl) {
   return !!this.getOwn(id, decl);
 };
 
+/**
+ * Description
+ *
+ * @param {String} [id]
+ * @param {Boolean} [decl]
+ * @returns {Boolean}
+ */
+
 Scope.prototype.parentHas = function (id, decl) {
   return this.parent && this.parent.has(id, decl);
 };

lib/6to5/types/index.js

@@ -64,7 +64,28 @@ _.each(t.FLIPPED_ALIAS_KEYS, function (types, type) {
   addAssert(type, is);
 });
 
-//
+/**
+ * Description
+ *
+ * @param {Object} node
+ * @returns {Object}
+ */
+
+t.toComputedKey = function (node, key) {
+  if (!node.computed) {
+    if (t.isIdentifier(key)) key = t.literal(key.name);
+  }
+  return key;
+};
+
+/*
+ * Shallowly checks to see if the passed `node` will evaluate to a
+ * falsy. This is if `node` is a `Literal` and `value` is falsy or
+ * `node` is an `Identifier` with a name of `undefiend`.
+ *
+ * @param {Object} node
+ * @returns {Boolean}
+ */
 
 t.isFalsyExpression = function (node) {
   if (t.isLiteral(node)) {
@@ -75,7 +96,14 @@ t.isFalsyExpression = function (node) {
   return false;
 };
 
-//
+/**
+ * Turn an array of statement `nodes` into a `SequenceExpression`.
+ *
+ * Variable declarations are turned into simple assignments and their
+ * declarations hoisted to the top of the current scope.
+ *
+ * Expression statements are just resolved to their standard expression.
+ */
 
 t.toSequenceExpression = function (nodes, scope) {
   var exprs = [];
@@ -97,7 +125,11 @@ t.toSequenceExpression = function (nodes, scope) {
     }
   });
 
-  return t.sequenceExpression(exprs);
+  if (exprs.length === 1) {
+    return exprs[0];
+  } else {
+    return t.sequenceExpression(exprs);
+  }
 };
 
 //
@@ -116,21 +148,43 @@ t.shallowEqual = function (actual, expected) {
   return same;
 };
 
-//
+/**
+ * Description
+ *
+ * @param {Object} member
+ * @param {Object} append
+ * @param {Boolean} [computed]
+ * @returns {Object} member
+ */
 
-t.isDynamic = function (node) {
-  if (t.isExpressionStatement(node)) {
-    return t.isDynamic(node.expression);
-  } else if (t.isIdentifier(node) || t.isLiteral(node) || t.isThisExpression(node)) {
-    return false;
-  } else if (t.isMemberExpression(node)) {
-    return t.isDynamic(node.object) || t.isDynamic(node.property);
-  } else {
-    return true;
-  }
+t.appendToMemberExpression = function (member, append, computed) {
+  member.object   = t.memberExpression(member.object, member.property, member.computed);
+  member.property = append;
+  member.computed = !!computed;
+  return member;
 };
 
-// todo: https://github.com/eventualbuddha/ast-util/blob/9bf91c5ce8/lib/index.js#L454-L507
+/**
+ * Description
+ *
+ * @param {Object} member
+ * @param {Object} append
+ * @returns {Object} member
+ */
+
+t.prependToMemberExpression = function (member, append) {
+  member.object = t.memberExpression(append, member.object);
+  return member;
+};
+
+/**
+ * Description
+ *
+ * @param {Object} node
+ * @param {Object} parent
+ * @returns {Boolean}
+ */
+
 t.isReferenced = function (node, parent) {
   // we're a property key and we aren't computed so we aren't referenced
   if (t.isProperty(parent) && parent.key === node && !parent.computed) return false;
@@ -152,11 +206,29 @@ t.isReferenced = function (node, parent) {
   return false;
 };
 
+/**
+ * Description
+ *
+ * @param {String} name
+ * @returns {Boolean}
+ */
+
+t.isValidIdentifier = function (name) {
+  return _.isString(name) && esutils.keyword.isIdentifierName(name) && !esutils.keyword.isKeywordES6(name, true);
+};
+
+/*
+ * Description
+ *
+ * @param {String} name
+ * @returns {String}
+ */
+
 t.toIdentifier = function (name) {
   if (t.isIdentifier(name)) return name.name;
 
   // replace all non-valid identifiers with dashes
-  name = name.replace(/[^a-zA-Z0-9]/g, "-");
+  name = name.replace(/[^a-zA-Z0-9$_]/g, "-");
 
   // remove all dashes and numbers from start of name
   name = name.replace(/^[-0-9]+/, "");
@@ -166,18 +238,32 @@ t.toIdentifier = function (name) {
     return c ? c.toUpperCase() : "";
   });
 
+  // remove underscores from start of name
+  name = name.replace(/^\_/, "");
+
   return name || '_';
 };
 
-t.isValidIdentifier = function (name) {
-  return _.isString(name) && esutils.keyword.isIdentifierName(name) && !esutils.keyword.isKeywordES6(name, true);
-};
+/**
+ * Description
+ *
+ * @param {Object} node
+ * @param {String} key
+ */
 
 t.ensureBlock = function (node, key) {
   key = key || "body";
   node[key] = t.toBlock(node[key], node);
 };
 
+/**
+ * Description
+ *
+ * @param {Object} node
+ * @param {Boolean} [ignore]
+ * @returns {Object|Boolean}
+ */
+
 t.toStatement = function (node, ignore) {
   if (t.isStatement(node)) {
     return node;
@@ -211,6 +297,14 @@ t.toStatement = function (node, ignore) {
   return node;
 };
 
+/**
+ * Description
+ *
+ * @param {Object} node
+ * @param {Object} parent
+ * @returns {Object}
+ */
+
 t.toBlock = function (node, parent) {
   if (t.isBlockStatement(node)) {
     return node;
@@ -231,6 +325,15 @@ t.toBlock = function (node, parent) {
   return t.blockStatement(node);
 };
 
+/**
+ * Description
+ *
+ * @param {Object} node
+ * @param {Boolean} [map]
+ * @param {Array} [ignoreTypes]
+ * @returns {Array|Object}
+ */
+
 t.getIds = function (node, map, ignoreTypes) {
   ignoreTypes = ignoreTypes || [];
 
@@ -281,10 +384,24 @@ t.getIds.arrays = {
   ObjectPattern: ["properties"]
 };
 
+/**
+ * Description
+ *
+ * @param {Object} node
+ * @returns {Boolean}
+ */
+
 t.isLet = function (node) {
   return t.isVariableDeclaration(node) && (node.kind !== "var" || node._let);
 };
 
+/**
+ * Description
+ *
+ * @param {Object} node
+ * @returns {Boolean}
+ */
+
 t.isVar = function (node) {
   return t.isVariableDeclaration(node, { kind: "var" }) && !node._let;
 };
@@ -293,6 +410,13 @@ t.isVar = function (node) {
 
 t.COMMENT_KEYS = ["leadingComments", "trailingComments"];
 
+/**
+ * Description
+ *
+ * @param {Object} child
+ * @returns {Object} child
+ */
+
 t.removeComments = function (child) {
   _.each(t.COMMENT_KEYS, function (key) {
     delete child[key];
@@ -300,6 +424,14 @@ t.removeComments = function (child) {
   return child;
 };
 
+/**
+ * Description
+ *
+ * @param {Object} child
+ * @param {Object} parent
+ * @returns {Object} child
+ */
+
 t.inheritsComments = function (child, parent) {
   _.each(t.COMMENT_KEYS, function (key) {
     child[key]  = _.uniq(_.compact([].concat(child[key], parent[key])));
@@ -307,7 +439,13 @@ t.inheritsComments = function (child, parent) {
   return child;
 };
 
-//
+/**
+ * Description
+ *
+ * @param {Object} child
+ * @param {Object} parent
+ * @returns {Object} child
+ */
 
 t.inherits = function (child, parent) {
   child.loc   = parent.loc;
@@ -318,10 +456,24 @@ t.inherits = function (child, parent) {
   return child;
 };
 
+/**
+ * Description
+ *
+ * @param {Object} specifier
+ * @returns {String}
+ */
+
 t.getSpecifierName = function (specifier) {
   return specifier.name || specifier.id;
 };
 
+/**
+ * Description
+ *
+ * @param {Object} specifier
+ * @returns {Boolean}
+ */
+
 t.isSpecifierDefault = function (specifier) {
   return t.isIdentifier(specifier.id) && specifier.id.name === "default";
 };

lib/6to5/util.js

@@ -52,22 +52,6 @@ exports.arrayify = function (val) {
   throw new TypeError("illegal type for arrayify");
 };
 
-exports.getUid = function (parent, file) {
-  var node;
-
-  if (t.isAssignmentExpression(parent)) {
-    node = parent.left;
-  } else if (t.isVariableDeclarator(parent)) {
-    node = parent.id;
-  }
-
-  var id = "ref";
-
-  if (t.isIdentifier(node)) id = node.name;
-
-  return file.generateUidIdentifier(id);
-};
-
 exports.isAbsolute = function (loc) {
   if (!loc) return false;
   if (loc[0] === "/") return true; // unix

package.json

@@ -1,7 +1,7 @@
 {
   "name": "6to5",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "2.3.2",
+  "version": "2.4.9",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://github.com/6to5/6to5",
   "repository": {
@@ -18,6 +18,10 @@
     "6to5-node": "./bin/6to5-node",
     "6to5-runtime": "./bin/6to5-runtime"
   },
+  "browser": {
+    "./lib/6to5/index.js": "./lib/6to5/browser.js",
+    "./lib/6to5/register.js": "./lib/6to5/register-browser.js"
+  },
   "keywords": [
     "harmony",
     "classes",
@@ -35,7 +39,7 @@
     "test": "make test"
   },
   "dependencies": {
-    "acorn-6to5": "0.11.1-1",
+    "acorn-6to5": "0.11.1-7",
     "ast-types": "~0.6.1",
     "chokidar": "0.11.1",
     "commander": "2.5.0",

test/api.js

@@ -13,10 +13,10 @@ suite("api", function () {
     assert.ok(!result.ast);
   });
 
-  test("addDeclaration unknown", function () {
+  test("addHelper unknown", function () {
     var file = new File;
     assert.throws(function () {
-      file.addDeclaration("foob");
+      file.addHelper("foob");
     }, /unknown declaration foob/);
   });
 });

test/browserify.js

@@ -0,0 +1,19 @@
+var browserify = require("browserify");
+var assert = require("assert");
+var path = require("path");
+var vm = require("vm");
+
+suite("browserify", function() {
+  test("6to5/register may be used without breaking browserify", function(done) {
+    var bundler = browserify(path.join(__dirname, "fixtures/browserify/register.js"));
+
+    bundler.bundle(function(err, bundle) {
+      if (err) return done(err);
+      assert.ok(bundle.length, "bundle output code");
+
+      // ensure that the code runs without throwing an exception
+      vm.runInNewContext(bundle, {});
+      done();
+    })
+  })
+});

test/fixtures/browserify/register.js

@@ -0,0 +1,3 @@
+require("../../../register")({
+  ignore: false
+});

test/fixtures/generation/comments/computed-property-comments-2/expected.js

@@ -6,5 +6,6 @@ var test = {
   [( /*
       * Inside bracket init
       */
-  "b")]: "2"
+    "b"
+  )]: "2"
 }, ok = 42;

test/fixtures/generation/comments/computed-property-comments/expected.js

@@ -7,7 +7,8 @@ var test = {
   [( /*
       * Inside bracket init
       */
-  "b")]: "2",
+    "b"
+  )]: "2",
 
   ["c"
   /*
@@ -18,8 +19,9 @@ var test = {
   ["d"]: "4",
 
   [(
-  // Inside bracket, line comment
-  "e")]: "5",
+    // Inside bracket, line comment
+    "e"
+  )]: "5",
 
   ["f"
   // After bracket, line comment

test/fixtures/transformation/es6-arrow-functions/nested/actual.js

@@ -1,13 +1,13 @@
 module.exports = {
-  init() {
-  return new Promise((resolve, reject) => {
-    MongoClient.connect(config.mongodb, (err, db) => {
-    if (err) {
-      return reject(err);
-    }
-    this.db = db;
-    resolve(this);
+  init: function () {
+    return new Promise((resolve, reject) => {
+      MongoClient.connect(config.mongodb, (err, db) => {
+        if (err) {
+          return reject(err);
+        }
+        this.db = db;
+        resolve(this);
+      });
     });
-  });
   }
 };

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

@@ -13,29 +13,37 @@ var _inherits = function (child, parent) {
   if (parent) child.__proto__ = parent;
 };
 
-var Test = function Test() {
-  woops["super"].test();
-  Foo.call(this);
-  Foo.prototype.test.call(this);
-  foob(Foo);
+var Test = (function () {
+  var _Foo = Foo;
+  var Test = function Test() {
+    var _Foo$prototype$test, _Foo$prototype$test2;
+    woops["super"].test();
+    _Foo.call(this);
+    _Foo.prototype.test.call(this);
+    foob(_Foo);
 
-  Foo.call.apply(Foo, [this].concat(_slice.call(arguments)));
-  Foo.call.apply(Foo, [this, "test"].concat(_slice.call(arguments)));
+    _Foo.call.apply(null, [this].concat(_slice.call(arguments)));
+    _Foo.call.apply(null, [this, "test"].concat(_slice.call(arguments)));
 
-  Foo.prototype.test.call.apply(Foo.prototype, [this].concat(_slice.call(arguments)));
-  Foo.prototype.test.call.apply(Foo.prototype, [this, "test"].concat(_slice.call(arguments)));
-};
+    (_Foo$prototype$test = _Foo.prototype.test).call.apply(_Foo$prototype$test, [this].concat(_slice.call(arguments)));
+    (_Foo$prototype$test2 = _Foo.prototype.test).call.apply(_Foo$prototype$test2, [this, "test"].concat(_slice.call(arguments)));
+  };
 
-_inherits(Test, Foo);
+  _inherits(Test, _Foo);
 
-Test.prototype.test = function () {
-  Foo.prototype.test.call(this);
-  Foo.prototype.test.call.apply(Foo.prototype.test, [this].concat(_slice.call(arguments)));
-  Foo.prototype.test.call.apply(Foo.prototype.test, [this, "test"].concat(_slice.call(arguments)));
-};
+  Test.prototype.test = function () {
+    var _Foo$prototype$test3, _Foo$prototype$test4;
+    _Foo.prototype.test.call(this);
+    (_Foo$prototype$test3 = _Foo.prototype.test).call.apply(_Foo$prototype$test3, [this].concat(_slice.call(arguments)));
+    (_Foo$prototype$test4 = _Foo.prototype.test).call.apply(_Foo$prototype$test4, [this, "test"].concat(_slice.call(arguments)));
+  };
 
-Test.foo = function () {
-  Foo.foo.call(this);
-  Foo.foo.call.apply(Foo.foo, [this].concat(_slice.call(arguments)));
-  Foo.foo.call.apply(Foo.foo, [this, "test"].concat(_slice.call(arguments)));
-};
+  Test.foo = function () {
+    var _Foo$foo, _Foo$foo2;
+    _Foo.foo.call(this);
+    (_Foo$foo = _Foo.foo).call.apply(_Foo$foo, [this].concat(_slice.call(arguments)));
+    (_Foo$foo2 = _Foo.foo).call.apply(_Foo$foo2, [this, "test"].concat(_slice.call(arguments)));
+  };
+
+  return Test;
+})();

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

@@ -12,9 +12,14 @@ var _inherits = function (child, parent) {
   if (parent) child.__proto__ = parent;
 };
 
-var Test = function Test() {
-  Foo.prototype.test;
-  Foo.prototype.test.whatever;
-};
+var Test = (function () {
+  var _Foo = Foo;
+  var Test = function Test() {
+    _Foo.prototype.test;
+    _Foo.prototype.test.whatever;
+  };
 
-_inherits(Test, Foo);
+  _inherits(Test, _Foo);
+
+  return Test;
+})();

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

@@ -12,13 +12,18 @@ var _inherits = function (child, parent) {
   if (parent) child.__proto__ = parent;
 };
 
-var Test = function Test() {
-  Foo.prototype.test.whatever();
-  Foo.prototype.test.call(this);
-};
+var Test = (function () {
+  var _Foo = Foo;
+  var Test = function Test() {
+    _Foo.prototype.test.whatever();
+    _Foo.prototype.test.call(this);
+  };
 
-_inherits(Test, Foo);
+  _inherits(Test, _Foo);
 
-Test.test = function () {
-  return Foo.wow.call(this);
-};
+  Test.test = function () {
+    return _Foo.wow.call(this);
+  };
+
+  return Test;
+})();

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

@@ -16,8 +16,13 @@ var Test = function Test() {
   this.state = "test";
 };
 
-var Foo = function Foo() {
-  this.state = "test";
-};
+var Foo = (function () {
+  var _Bar = Bar;
+  var Foo = function Foo() {
+    this.state = "test";
+  };
 
-_inherits(Foo, Bar);
+  _inherits(Foo, _Bar);
+
+  return Foo;
+})();

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

@@ -12,18 +12,28 @@ var _inherits = function (child, parent) {
   if (parent) child.__proto__ = parent;
 };
 
-var BaseController = function BaseController() {
-  if (Chaplin.Controller) {
-    Chaplin.Controller.apply(this, arguments);
-  }
-};
+var BaseController = (function () {
+  var _Chaplin$Controller = Chaplin.Controller;
+  var BaseController = function BaseController() {
+    if (_Chaplin$Controller) {
+      _Chaplin$Controller.apply(this, arguments);
+    }
+  };
 
-_inherits(BaseController, Chaplin.Controller);
+  _inherits(BaseController, _Chaplin$Controller);
 
-var BaseController2 = function BaseController2() {
-  if (Chaplin.Controller.Another) {
-    Chaplin.Controller.Another.apply(this, arguments);
-  }
-};
+  return BaseController;
+})();
 
-_inherits(BaseController2, Chaplin.Controller.Another);
+var BaseController2 = (function () {
+  var _Chaplin$Controller$Another = Chaplin.Controller.Another;
+  var BaseController2 = function BaseController2() {
+    if (_Chaplin$Controller$Another) {
+      _Chaplin$Controller$Another.apply(this, arguments);
+    }
+  };
+
+  _inherits(BaseController2, _Chaplin$Controller$Another);
+
+  return BaseController2;
+})();

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

@@ -12,10 +12,15 @@ var _inherits = function (child, parent) {
   if (parent) child.__proto__ = parent;
 };
 
-var Test = function Test() {
-  if (Foo) {
-    Foo.apply(this, arguments);
-  }
-};
+var Test = (function () {
+  var _Foo = Foo;
+  var Test = function Test() {
+    if (_Foo) {
+      _Foo.apply(this, arguments);
+    }
+  };
 
-_inherits(Test, Foo);
+  _inherits(Test, _Foo);
+
+  return Test;
+})();

test/fixtures/transformation/es6-computed-property-names/two/actual.js

@@ -0,0 +1,4 @@
+var obj = {
+  first: "first",
+  ["second"]: "second",
+};

test/fixtures/transformation/es6-computed-property-names/two/expected.js

@@ -0,0 +1,13 @@
+"use strict";
+
+var _defineProperty = function (obj, key, value) {
+  return Object.defineProperty(obj, key, {
+    value: value,
+    enumerable: true,
+    configurable: true,
+    writable: true
+  });
+};
+
+var obj = _defineProperty({
+  first: "first" }, "second", "second");

test/fixtures/transformation/es6-constants/destructuring/expected.js

@@ -24,15 +24,15 @@ var a = _ref2[0];
 var b = _ref2[1];
 var _ref3 = [3, 4];
 
-var _ref4 = _slicedToArray(_ref3, 2);
+var _ref3 = _slicedToArray(_ref3, 2);
 
-var c = _ref4[0];
-var d = _ref4[1];
-var _ref5 = { e: 5, f: 6 };
+var c = _ref3[0];
+var d = _ref3[1];
+var _ref4 = { e: 5, f: 6 };
 
-var e = _ref5.e;
-var f = _ref5.f;
-var _ref6 = { a: 7, b: 8 };
+var e = _ref4.e;
+var f = _ref4.f;
+var _ref5 = { a: 7, b: 8 };
 
-var g = _ref6.a;
-var h = _ref6.b;
+var g = _ref5.a;
+var h = _ref5.b;

test/fixtures/transformation/es6-destructuring/array/expected.js

@@ -21,10 +21,10 @@ var _ref = ["hello", [", ", "junk"], ["world"]];
 var _ref2 = _slicedToArray(_ref, 4);
 
 var a = _ref2[0];
-var _ref3 = _slicedToArray(_ref2[1], 1);
+var _ref2$1 = _slicedToArray(_ref2[1], 1);
 
-var b = _ref3[0];
-var _ref4 = _slicedToArray(_ref2[2], 1);
+var b = _ref2$1[0];
+var _ref2$2 = _slicedToArray(_ref2[2], 1);
 
-var c = _ref4[0];
+var c = _ref2$2[0];
 var d = _ref2[3];

test/fixtures/transformation/es6-destructuring/assignment-expression/expected.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var _temp, _ref;
+var _temp, _temp2;
 var _slicedToArray = function (arr, i) {
   if (Array.isArray(arr)) {
     return arr;
@@ -17,4 +17,4 @@ var _slicedToArray = function (arr, i) {
   }
 };
 
-console.log((_temp = [123], _ref = _slicedToArray(_temp, 1), x = _ref[0], _temp));
+console.log((_temp = [123], _temp2 = _slicedToArray(_temp, 1), x = _temp2[0], _temp));

test/fixtures/transformation/es6-destructuring/empty/expected.js

@@ -21,10 +21,10 @@ var _ref = ["foo", "hello", [", ", "junk"], ["world"]];
 var _ref2 = _slicedToArray(_ref, 5);
 
 var a = _ref2[1];
-var _ref3 = _slicedToArray(_ref2[2], 1);
+var _ref2$2 = _slicedToArray(_ref2[2], 1);
 
-var b = _ref3[0];
-var _ref4 = _slicedToArray(_ref2[3], 1);
+var b = _ref2$2[0];
+var _ref2$3 = _slicedToArray(_ref2[3], 1);
 
-var c = _ref4[0];
+var c = _ref2$3[0];
 var d = _ref2[4];

test/fixtures/transformation/es6-destructuring/mixed/expected.js

@@ -16,11 +16,11 @@ var _slicedToArray = function (arr, i) {
   }
 };
 
-var _ref = _slicedToArray(rect.topLeft, 2);
+var _rect$topLeft = _slicedToArray(rect.topLeft, 2);
 
-var x1 = _ref[0];
-var y1 = _ref[1];
-var _ref2 = _slicedToArray(rect.bottomRight, 2);
+var x1 = _rect$topLeft[0];
+var y1 = _rect$topLeft[1];
+var _rect$bottomRight = _slicedToArray(rect.bottomRight, 2);
 
-var x2 = _ref2[0];
-var y2 = _ref2[1];
+var x2 = _rect$bottomRight[0];
+var y2 = _rect$bottomRight[1];

test/fixtures/transformation/es6-destructuring/parameters/expected.js

@@ -31,17 +31,17 @@ function unpackObject(_ref2) {
 
 console.log(unpackObject({ title: "title", author: "author" }));
 
-var unpackArray = function (_ref3, _ref5) {
-  var _ref4 = _slicedToArray(_ref3, 3);
+var unpackArray = function (_ref3, _ref4) {
+  var _ref3 = _slicedToArray(_ref3, 3);
 
-  var a = _ref4[0];
-  var b = _ref4[1];
-  var c = _ref4[2];
-  var _ref6 = _slicedToArray(_ref5, 3);
+  var a = _ref3[0];
+  var b = _ref3[1];
+  var c = _ref3[2];
+  var _ref4 = _slicedToArray(_ref4, 3);
 
-  var x = _ref6[0];
-  var y = _ref6[1];
-  var z = _ref6[2];
+  var x = _ref4[0];
+  var y = _ref4[1];
+  var z = _ref4[2];
   return a + b + c;
 };
 

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

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

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

@@ -1,6 +1,6 @@
-define(["exports", "foo"], function (exports, _foo) {
-  "use strict";
+"use strict";
 
+define(["exports", "foo"], function (exports, _foo) {
   (function (obj) {
     for (var i in obj) {
       exports[i] = obj[i];

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

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

test/fixtures/transformation/es6-modules-amd/exports-variable/expected.js

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

test/fixtures/transformation/es6-modules-amd/hoist-function-exports/expected.js

@@ -1,6 +1,6 @@
-define(["exports", "./evens"], function (exports, _evens) {
-  "use strict";
+"use strict";
 
+define(["exports", "./evens"], function (exports, _evens) {
   exports.nextOdd = nextOdd;
   var isEven = _evens.isEven;
   function nextOdd(n) {

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

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

test/fixtures/transformation/es6-modules-amd/imports-glob/expected.js

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

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

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

test/fixtures/transformation/es6-modules-amd/imports-named/expected.js

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

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

@@ -1,3 +1,3 @@
-define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo, _fooBar, _directoryFooBar) {
-  "use strict";
-});
+"use strict";
+
+define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo, _fooBar, _directoryFooBar) {});

test/fixtures/transformation/es6-modules-amd/module-name/expected.js

@@ -1,5 +1,5 @@
-define("es6-modules-amd/module-name/expected", ["exports"], function (exports) {
-  "use strict";
+"use strict";
 
+define("es6-modules-amd/module-name/expected", ["exports"], function (exports) {
   foobar();
 });

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

@@ -1,6 +1,6 @@
-define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo, _fooBar, _directoryFooBar) {
-  "use strict";
+"use strict";
 
+define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo, _fooBar, _directoryFooBar) {
   var _interopRequire = function (obj) {
     return obj && (obj["default"] || obj);
   };

test/fixtures/transformation/es6-modules-amd/remap/expected.js

@@ -1,6 +1,6 @@
-define(["exports"], function (exports) {
-  "use strict";
+"use strict";
 
+define(["exports"], function (exports) {
   var test = exports.test = 2;
   test = exports.test = 5;
   test = exports.test += 1;

test/fixtures/transformation/es6-modules-system/exports-default/expected.js

@@ -1,3 +1,5 @@
+"use strict";
+
 System.register([], function (_export) {
   var Foo;
   _export("default", foo);
@@ -6,8 +8,6 @@ System.register([], function (_export) {
   return {
     setters: [],
     execute: function () {
-      "use strict";
-
       _export("default", 42);
 
       _export("default", {});

test/fixtures/transformation/es6-modules-system/exports-from/expected.js

@@ -1,3 +1,5 @@
+"use strict";
+
 System.register(["foo"], function (_export) {
   return {
     setters: [function (_foo) {
@@ -19,8 +21,6 @@ System.register(["foo"], function (_export) {
 
       _export("bar", _foo.bar);
     }],
-    execute: function () {
-      "use strict";
-    }
+    execute: function () {}
   };
 });

test/fixtures/transformation/es6-modules-system/exports-named/expected.js

@@ -1,9 +1,9 @@
+"use strict";
+
 System.register([], function (_export) {
   return {
     setters: [],
     execute: function () {
-      "use strict";
-
       _export("foo", foo);
 
       _export("foo", foo);
@@ -19,4 +19,4 @@ System.register([], function (_export) {
       _export("bar", bar);
     }
   };
-});
+});

test/fixtures/transformation/es6-modules-system/exports-variable/expected.js

@@ -1,3 +1,5 @@
+"use strict";
+
 System.register([], function (_export) {
   var foo, foo2, foo3, foo4, foo5, foo6, foo8;
   _export("foo7", foo7);
@@ -6,8 +8,6 @@ System.register([], function (_export) {
   return {
     setters: [],
     execute: function () {
-      "use strict";
-
       foo = _export("foo", 1);
       foo2 = _export("foo2", function () {});
       foo3 = _export("foo3", undefined);

test/fixtures/transformation/es6-modules-system/hoist-function-exports/expected.js

@@ -1,3 +1,5 @@
+"use strict";
+
 System.register(["./evens"], function (_export) {
   var isEven, p, isOdd;
   _export("nextOdd", nextOdd);
@@ -11,8 +13,6 @@ System.register(["./evens"], function (_export) {
       isEven = _evens.isEven;
     }],
     execute: function () {
-      "use strict";
-
       p = _export("p", 5);
       isOdd = _export("isOdd", (function (isEven) {
         return function (n) {

test/fixtures/transformation/es6-modules-system/imports-default/expected.js

@@ -1,3 +1,5 @@
+"use strict";
+
 System.register(["foo"], function (_export) {
   var foo, foo;
   return {
@@ -5,8 +7,6 @@ System.register(["foo"], function (_export) {
       foo = _foo["default"];
       foo = _foo["default"];
     }],
-    execute: function () {
-      "use strict";
-    }
+    execute: function () {}
   };
 });

test/fixtures/transformation/es6-modules-system/imports-glob/expected.js

@@ -1,11 +1,11 @@
+"use strict";
+
 System.register(["foo"], function (_export) {
   var foo;
   return {
     setters: [function (_foo) {
       foo = _foo;
     }],
-    execute: function () {
-      "use strict";
-    }
+    execute: function () {}
   };
 });

test/fixtures/transformation/es6-modules-system/imports-mixing/expected.js

@@ -1,3 +1,5 @@
+"use strict";
+
 System.register(["foo"], function (_export) {
   var foo, xyz;
   return {
@@ -5,8 +7,6 @@ System.register(["foo"], function (_export) {
       foo = _foo["default"];
       xyz = _foo.baz;
     }],
-    execute: function () {
-      "use strict";
-    }
+    execute: function () {}
   };
 });

test/fixtures/transformation/es6-modules-system/imports-named/expected.js

@@ -1,3 +1,5 @@
+"use strict";
+
 System.register(["foo"], function (_export) {
   var bar, bar, baz, baz, baz, xyz;
   return {
@@ -9,8 +11,6 @@ System.register(["foo"], function (_export) {
       baz = _foo.bar;
       xyz = _foo.xyz;
     }],
-    execute: function () {
-      "use strict";
-    }
+    execute: function () {}
   };
 });

test/fixtures/transformation/es6-modules-system/imports/expected.js

@@ -1,8 +1,8 @@
+"use strict";
+
 System.register(["foo", "foo-bar", "./directory/foo-bar"], function (_export) {
   return {
     setters: [function (_foo) {}, function (_fooBar) {}, function (_directoryFooBar) {}],
-    execute: function () {
-      "use strict";
-    }
+    execute: function () {}
   };
 });

test/fixtures/transformation/es6-modules-system/overview/expected.js

@@ -1,3 +1,5 @@
+"use strict";
+
 System.register(["foo", "foo-bar", "./directory/foo-bar"], function (_export) {
   var foo, foo, bar, bar, test;
   return {
@@ -8,8 +10,6 @@ System.register(["foo", "foo-bar", "./directory/foo-bar"], function (_export) {
       bar = _foo.foo;
     }, function (_fooBar) {}, function (_directoryFooBar) {}],
     execute: function () {
-      "use strict";
-
       _export("test", test);
 
       test = _export("test", 5);

test/fixtures/transformation/es6-modules-system/remap/expected.js

@@ -1,10 +1,10 @@
+"use strict";
+
 System.register([], function (_export) {
   var test;
   return {
     setters: [],
     execute: function () {
-      "use strict";
-
       test = _export("test", 2);
       _export("test", test = 5);
       _export("test", test += 1);

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

@@ -1,3 +1,5 @@
+"use strict";
+
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports"], factory);
@@ -5,8 +7,6 @@
     factory(exports);
   }
 })(function (exports) {
-  "use strict";
-
   exports["default"] = foo;
   exports["default"] = 42;
   exports["default"] = {};

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

@@ -1,3 +1,5 @@
+"use strict";
+
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports", "foo"], factory);
@@ -5,8 +7,6 @@
     factory(exports, require("foo"));
   }
 })(function (exports, _foo) {
-  "use strict";
-
   (function (obj) {
     for (var i in obj) {
       exports[i] = obj[i];

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

@@ -1,3 +1,5 @@
+"use strict";
+
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports"], factory);
@@ -5,8 +7,6 @@
     factory(exports);
   }
 })(function (exports) {
-  "use strict";
-
   exports.foo = foo;
   exports.foo = foo;
   exports.bar = bar;