v2.4.0

CHANGELOG.md

@@ -2,6 +2,24 @@
 
 Gaps between patch versions are faulty/broken releases.
 
+## 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.
+
+## 2.3.1
+
+ * Add `undefinedToVoid` optional transformer.
+ * Use `Object.defineProperty` for computed properties.
+
 ## 2.3.0
 
  * Upgrade `acorn-6to5`.

lib/6to5/file.js

@@ -26,7 +26,13 @@ File.declarations = [
   "sliced-to-array",
   "object-without-properties",
   "has-own",
-  "slice"
+  "slice",
+  "define-property",
+  "async-to-generator"
+];
+
+File.excludeDeclarationsFromRuntime = [
+  "async-to-generator"
 ];
 
 File.normaliseOptions = function (opts) {
@@ -94,6 +100,10 @@ File.prototype.getTransformers = function () {
   _.each(transform.transformers, function (transformer) {
     if (transformer.canRun(file)) {
       transformers.push(transformer);
+
+      if (transformer.manipulateOptions) {
+        transformer.manipulateOptions(file.opts, file);
+      }
     }
   });
 
@@ -143,6 +153,12 @@ 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));
+  this.ast.program.body.unshift(declar);
+};
+
 File.prototype.addDeclaration = function (name) {
   if (!_.contains(File.declarations, name)) {
     throw new ReferenceError("unknown declaration " + name);
@@ -155,7 +171,7 @@ File.prototype.addDeclaration = function (name) {
 
   var ref;
   var runtimeNamespace = this.opts.runtime;
-  if (runtimeNamespace) {
+  if (runtimeNamespace && !_.contains(File.excludeDeclarationsFromRuntime, name)) {
     name = t.identifier(t.toIdentifier(name));
     return t.memberExpression(t.identifier(runtimeNamespace), name);
   } else {

lib/6to5/generation/generator.js

@@ -148,6 +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);
+    if (needsParens) this.push("(");
+
     this.printLeadingComments(node, parent);
 
     newline(true);
@@ -155,11 +160,6 @@ CodeGenerator.prototype.print = function (node, parent, opts) {
     if (opts.before) opts.before();
     this.map.mark(node, "start");
 
-    // 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);
-    if (needsParens) this.push("(");
-
     this[node.type](node, this.buildPrint(node), parent);
 
     if (needsParens) this.push(")");

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

@@ -60,6 +60,10 @@ 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/generation/node/whitespace.js

@@ -55,6 +55,8 @@ _.each({
   Function: 1,
   Class: 1,
   For: 1,
+  ArrayExpression: { after: 1 },
+  ObjectExpression: { after: 1 },
   SwitchStatement: 1,
   IfStatement: { before: 1 },
   CallExpression: { after: 1 },

lib/6to5/runtime-generator.js

@@ -19,6 +19,10 @@ module.exports = function (namespace) {
   ]));
 
   _.each(File.declarations, function (name) {
+    if (_.contains(File.excludeDeclarationsFromRuntime, 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

@@ -126,7 +126,7 @@ DefaultFormatter.prototype._pushStatement = function (ref, nodes) {
 
 DefaultFormatter.prototype._hoistExport = function (declar, assign, priority) {
   if (t.isFunctionDeclaration(declar)) {
-    assign._blockHoist = priority || 1;
+    assign._blockHoist = priority || 2;
   }
 
   return assign;

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

@@ -57,6 +57,7 @@ CommonJSFormatter.prototype.importDeclaration = function (node, nodes) {
 CommonJSFormatter.prototype.exportDeclaration = function (node, nodes) {
   if (node.default) {
     var declar = node.declaration;
+    var assign;
 
     // module.exports = VALUE;
     var templateName = "exports-default-module";
@@ -64,15 +65,29 @@ CommonJSFormatter.prototype.exportDeclaration = function (node, nodes) {
     // exports = module.exports = VALUE;
     if (this.hasNonDefaultExports) templateName = "exports-default-module-override";
 
-    var assign = util.template(templateName, {
-      VALUE: this._pushStatement(declar, nodes)
-    }, true);
+    if (t.isFunction(declar) || !this.hasNonDefaultExports) {
+      assign = util.template(templateName, {
+        VALUE: this._pushStatement(declar, nodes)
+      }, true);
 
-    // hoist to the top if this default is a function
-    nodes.push(this._hoistExport(declar, assign, 2));
-  } else {
-    DefaultFormatter.prototype.exportDeclaration.apply(this, arguments);
+      // hoist to the top if this default is a function
+      nodes.push(this._hoistExport(declar, assign, 3));
+      return;
+    } else {
+      // this export isn't a function so we can't hoist it to the top so we need to set it
+      // at the very end of the file with something like:
+      //
+      //   module.exports = Object.assign(exports["default"], exports)
+      //
+
+      assign = util.template("common-export-default-assign", true);
+      assign._blockHoist = 0;
+
+      nodes.push(assign);
+    }
   }
+
+  DefaultFormatter.prototype.exportDeclaration.apply(this, arguments);
 };
 
 CommonJSFormatter.prototype.exportSpecifier = function (specifier, node, nodes) {

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/common-export-default-assign.js

@@ -0,0 +1 @@
+module.exports = Object.assign(exports["default"], exports);

lib/6to5/transformation/templates/define-property.js

@@ -0,0 +1,8 @@
+(function (obj, key, value) {
+  return Object.defineProperty(obj, key, {
+    value: value,
+    enumerable: true,
+    configurable: true,
+    writable: true
+  });
+});

lib/6to5/transformation/templates/function-return-obj.js

@@ -1,3 +0,0 @@
-(function (KEY) {
-  return KEY;
-})(OBJECT)

lib/6to5/transformation/templates/object-define-properties-closure.js

@@ -1,4 +0,0 @@
-(function (KEY) {
-  CONTENT;
-  return KEY;
-})(OBJECT);

lib/6to5/transformation/templates/object-getter-memoization.js

@@ -1,6 +0,0 @@
-Object.defineProperty(this, KEY, {
-  enumerable: true,
-  configurable: true,
-  writable: true,
-  value: VALUE
-})

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"),
@@ -81,11 +84,12 @@ _.each({
   _declarations:             require("./transformers/_declarations"),
 
   coreAliasing:              require("./transformers/optional-core-aliasing"),
+  undefinedToVoid:           require("./transformers/optional-undefined-to-void"),
 
   // wrap up
   _aliasFunctions:           require("./transformers/_alias-functions"),
-  useStrict:                 require("./transformers/use-strict"),
   _moduleFormatter:          require("./transformers/_module-formatter"),
+  useStrict:                 require("./transformers/use-strict"),
 
   // spec
   specPropertyLiterals:         require("./transformers/spec-property-literals"),

lib/6to5/transformation/transformer.js

@@ -5,11 +5,12 @@ 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.transformer       = Transformer.normalise(transformer);
+  this.optional          = !!transformer.optional;
+  this.opts              = opts || {};
+  this.key               = key;
 }
 
 Transformer.normalise = function (transformer) {

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

@@ -1,17 +1,27 @@
 var _ = require("lodash");
 
+// Priority:
+//
+//  - 0 We want this to be at the **very** bottom
+//  - 1 Default node position
+//  - 2 Priority over normal nodes
+//  - 3 We want this to be at the **very** top
+
 exports.BlockStatement =
 exports.Program = {
   exit: function (node) {
     var hasChange = false;
     for (var i in node.body) {
       var bodyNode = node.body[i];
-      if (bodyNode && bodyNode._blockHoist) hasChange = true;
+      if (bodyNode && bodyNode._blockHoist != null) hasChange = true;
     }
     if (!hasChange) return;
 
     var nodePriorities = _.groupBy(node.body, function (bodyNode) {
-      return bodyNode._blockHoist || 0;
+      var priority = bodyNode._blockHoist;
+      if (priority == null) priority = 1;
+      if (priority === true) priority = 2;
+      return priority;
     });
 
     node.body = _.flatten(_.values(nodePriorities).reverse());

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

@@ -20,14 +20,21 @@ exports.ObjectExpression = function (node, parent, file) {
 
   if (!hasAny) return;
 
-  var objId = util.getUid(parent, file);
+  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,
+    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,7 +85,8 @@ Class.prototype.run = function () {
 
   //
 
-  if (superName && t.isDynamic(superName)) {
+  if (superName) {
+    this.closure = true;
     // so we're only evaluating it once
     var superRefName = "super";
     if (className) superRefName = className.name + "Super";
@@ -95,13 +96,8 @@ Class.prototype.run = function () {
       t.variableDeclarator(superRef, superName)
     ]));
     superName = superRef;
-  }
 
-  this.superName = superName;
-
-  //
-
-  if (superName) {
+    this.superName = superName;
     body.push(t.expressionStatement(t.callExpression(file.addDeclaration("inherits"), [className, superName])));
   }
 

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

@@ -3,45 +3,95 @@ var t    = require("../../types");
 
 exports.ObjectExpression = function (node, parent, file) {
   var hasComputed = false;
+  var prop;
+  var key;
+  var i;
 
-  var computed = [];
-
-  node.properties = node.properties.filter(function (prop) {
-    if (prop.computed) {
-      hasComputed = true;
-      computed.unshift(prop);
-      return false;
-    } else {
-      return true;
-    }
-  });
+  for (i in node.properties) {
+    hasComputed = t.isProperty(node.properties[i], { computed: true });
+    if (hasComputed) break;
+  }
 
   if (!hasComputed) return;
 
   var objId = util.getUid(parent, file);
 
-  var container = util.template("function-return-obj", {
-    KEY: objId,
-    OBJECT: node
-  });
+  var body = [];
+  var container = t.functionExpression(null, [], t.blockStatement(body));
+  container._aliasFunction = true;
 
-  var containerCallee = container.callee;
-  var containerBody = containerCallee.body.body;
+  var props = node.properties;
 
-  containerCallee._aliasFunction = true;
+  // normalise key
 
-  for (var i in computed) {
-    var prop = computed[i];
-    containerBody.unshift(
-      t.expressionStatement(
-        t.assignmentExpression(
-          "=",
-          t.memberExpression(objId, prop.key, true),
-          prop.value
-        )
-      )
-    );
+  for (i in props) {
+    prop = props[i];
+    key = prop.key;
+
+    if (!prop.computed && t.isIdentifier(key)) {
+      prop.key = t.literal(key.name);
+    }
   }
 
-  return container;
+  // add all non-computed properties and `__proto__` properties to the initializer
+
+  var initProps = [];
+  var broken = false;
+
+  for (i in props) {
+    prop = props[i];
+
+    if (prop.computed) {
+      broken = true;
+    }
+
+    if (!broken || t.isLiteral(prop.key, { value: "__proto__" })) {
+      initProps.push(prop);
+      props[i] = null;
+    }
+  }
+
+  // add a simple assignment for all Symbol member expressions due to symbol polyfill limitations
+  // otherwise use Object.defineProperty
+
+  for (i in props) {
+    prop = props[i];
+    if (!prop) continue;
+
+    key = prop.key;
+    var bodyNode;
+
+    if (prop.computed && t.isMemberExpression(key) && t.isIdentifier(key.object, { name: "Symbol" })) {
+      bodyNode = t.assignmentExpression(
+        "=",
+        t.memberExpression(objId, key, true),
+        prop.value
+      );
+    } else {
+      bodyNode = t.callExpression(file.addDeclaration("define-property"), [objId, key, prop.value]);
+    }
+
+    body.push(t.expressionStatement(bodyNode));
+  }
+
+  // only one node and it's a Object.defineProperty that returns the object
+
+  if (body.length === 1) {
+    var first = body[0].expression;
+
+    if (t.isCallExpression(first)) {
+      first.arguments[0] = t.objectExpression([]);
+      return first;
+    }
+  }
+
+  //
+
+  body.unshift(t.variableDeclaration("var", [
+    t.variableDeclarator(objId, t.objectExpression(initProps))
+  ]));
+
+  body.push(t.returnStatement(objId));
+
+  return t.callExpression(container, []);
 };

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 build = function (node, file) {
   var uid = file.generateUidIdentifier("arr");
 
   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.generator = true;
+    container = t.yieldExpression(container, true);
+  }
+
   var returnStatement = body.pop();
 
   body.push(exports._build(node, function () {
@@ -76,9 +58,5 @@ exports._build = function (node, buildBody) {
 exports.ComprehensionExpression = function (node, parent, file) {
   if (node.generator) return;
 
-  if (node.blocks.length === 1) {
-    return single(node, file);
-  } else {
-    return multiple(node, file);
-  }
+  return build(node, file);
 };

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

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

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

@@ -0,0 +1,34 @@
+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) {
+  node.async = false;
+  node.generator = true;
+
+  traverse(node, {
+    enter: function (node) {
+      if (t.isFunction(node)) this.stop();
+
+      if (t.isAwaitExpression(node)) {
+        node.type = "YieldExpression";
+      }
+    }
+  });
+};
+
+exports.Function = function (node, parent, file) {
+  if (!node.async || node.generator) return;
+
+  exports._Function(node);
+
+  var id = t.identifier("Bluebird");
+  file.addImport(id, "bluebird");
+  return t.callExpression(t.memberExpression(id, t.identifier("coroutine")), [node]);
+};

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

@@ -9,9 +9,7 @@ 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) {

lib/6to5/transformation/transformers/optional-undefined-to-void.js

@@ -0,0 +1,9 @@
+var t = require("../../types");
+
+exports.optional = true;
+
+exports.Identifier = function (node, parent) {
+  if (node.name === "undefined" && t.isReferenced(node, parent)) {
+    return t.unaryExpression("void", t.literal(0), true);
+  }
+};

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

@@ -1,9 +1,8 @@
 var traverse = require("../../traverse");
-var util     = require("../../util");
 var t        = require("../../types");
 
 exports.Property =
-exports.MethodDefinition = function (node) {
+exports.MethodDefinition = function (node, parent, file) {
   if (node.kind !== "memo") return;
   node.kind = "get";
 
@@ -21,10 +20,11 @@ exports.MethodDefinition = function (node) {
       if (t.isFunction(node)) return;
 
       if (t.isReturnStatement(node) && node.argument) {
-        node.argument = t.memberExpression(util.template("object-getter-memoization", {
-          KEY: key,
-          VALUE: node.argument
-        }), key, true);
+        node.argument = t.memberExpression(t.callExpression(file.addDeclaration("define-property"), [
+          t.thisExpression(),
+          key,
+          node.argument
+        ]), key, true);
       }
     }
   });

lib/6to5/traverse/index.js

@@ -107,6 +107,11 @@ function traverse(parent, opts, scope) {
 
       if (updated) {
         parent[key] = _.flatten(parent[key]);
+
+        if (key === "body") {
+          // we can safely compact this
+          parent[key] = _.compact(parent[key]);
+        }
       }
     } else {
       handle(parent, key);

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

@@ -17,23 +17,23 @@
   "ExportDeclaration":   ["Statement", "Declaration"],
   "ImportDeclaration":   ["Statement", "Declaration"],
 
-  "ArrowFunctionExpression": ["Scope", "Function"],
+  "ArrowFunctionExpression": ["Scope", "Function", "Expression"],
   "FunctionDeclaration":     ["Statement", "Declaration", "Scope", "Function"],
-  "FunctionExpression":      ["Scope", "Function"],
+  "FunctionExpression":      ["Scope", "Function", "Expression"],
 
   "BlockStatement": ["Statement", "Scope"],
   "Program":        ["Scope"],
   "CatchClause":    ["Scope"],
 
-  "LogicalExpression": ["Binary"],
-  "BinaryExpression":  ["Binary"],
+  "LogicalExpression": ["Binary", "Expression"],
+  "BinaryExpression":  ["Binary", "Expression"],
 
-  "UnaryExpression": ["UnaryLike"],
+  "UnaryExpression": ["UnaryLike", "Expression"],
   "SpreadProperty":  ["UnaryLike"],
   "SpreadElement":   ["UnaryLike"],
 
   "ClassDeclaration": ["Statement", "Declaration", "Class"],
-  "ClassExpression":  ["Class"],
+  "ClassExpression":  ["Class", "Expression"],
 
   "ForOfStatement": ["Statement", "For", "Scope", "Loop"],
   "ForInStatement": ["Statement", "For", "Scope", "Loop"],
@@ -43,5 +43,27 @@
   "ArrayPattern":  ["Pattern"],
 
   "Property": ["UserWhitespacable"],
-  "XJSElement": ["UserWhitespacable"]
+  "XJSElement": ["UserWhitespacable", "Expression"],
+
+  "ArrayExpression": ["Expression"],
+  "AssignmentExpression": ["Expression"],
+  "AwaitExpression": ["Expression"],
+  "BindFunctionExpression": ["Expression"],
+  "BindMemberExpression": ["Expression"],
+  "CallExpression": ["Expression"],
+  "ComprehensionExpression": ["Expression"],
+  "ConditionalExpression": ["Expression"],
+  "Identifier": ["Expression"],
+  "Literal": ["Expression"],
+  "MemberExpression": ["Expression"],
+  "NewExpression": ["Expression"],
+  "ObjectExpression": ["Expression"],
+  "SequenceExpression": ["Expression"],
+  "TaggedTemplateExpression": ["Expression"],
+  "ThisExpression": ["Expression"],
+  "UpdateExpression": ["Expression"],
+  "VirtualPropertyExpression": ["Expression"],
+  "XJSEmptyExpression": ["Expression"],
+  "XJSMemberExpression": ["Expression"],
+  "YieldExpression": ["Expression"]
 }

lib/6to5/types/index.js

@@ -66,14 +66,6 @@ _.each(t.FLIPPED_ALIAS_KEYS, function (types, type) {
 
 //
 
-t.isExpression = function (node) {
-  return !t.isStatement(node);
-};
-
-addAssert("Expression", t.isExpression);
-
-//
-
 t.isFalsyExpression = function (node) {
   if (t.isLiteral(node)) {
     return !node.value;
@@ -297,19 +289,26 @@ t.isVar = function (node) {
   return t.isVariableDeclaration(node, { kind: "var" }) && !node._let;
 };
 
+//
+
+t.COMMENT_KEYS = ["leadingComments", "trailingComments"];
+
 t.removeComments = function (child) {
-  delete child.leadingComments;
-  delete child.trailingComments;
+  _.each(t.COMMENT_KEYS, function (key) {
+    delete child[key];
+  });
   return child;
 };
 
 t.inheritsComments = function (child, parent) {
-  _.each(["leadingComments", "trailingComments"], function (key) {
+  _.each(t.COMMENT_KEYS, function (key) {
     child[key]  = _.uniq(_.compact([].concat(child[key], parent[key])));
   });
   return child;
 };
 
+//
+
 t.inherits = function (child, parent) {
   child.loc   = parent.loc;
   child.end   = parent.end;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "6to5",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://github.com/6to5/6to5",
   "repository": {

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

@@ -3,8 +3,8 @@ var test = {
    * Before bracket init
    */
   ["a"]: "1",
-  [/*
-    * Inside bracket init
-    */
-  "b"]: "2"
+  [( /*
+      * Inside bracket init
+      */
+  "b")]: "2"
 }, ok = 42;

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

@@ -4,10 +4,10 @@ var test = {
    */
   ["a"]: "1",
 
-  [/*
-    * Inside bracket init
-    */
-  "b"]: "2",
+  [( /*
+      * Inside bracket init
+      */
+  "b")]: "2",
 
   ["c"
   /*
@@ -17,9 +17,9 @@ var test = {
   // Before bracket, line comment
   ["d"]: "4",
 
-  [
+  [(
   // Inside bracket, line comment
-  "e"]: "5",
+  "e")]: "5",
 
   ["f"
   // After bracket, line comment

test/fixtures/transformation/es5-property-methods-assignment/getter-and-setter/expected.js

@@ -1,17 +1,13 @@
 "use strict";
 
-var obj = (function (_obj) {
-  Object.defineProperties(_obj, {
-    foo: {
-      get: function () {
-        return 5 + 5;
-      },
-      set: function (value) {
-        this._foo = value;
-      },
-      enumerable: true
-    }
-  });
-
-  return _obj;
-})({});
+var obj = Object.defineProperties({}, {
+  foo: {
+    get: function () {
+      return 5 + 5;
+    },
+    set: function (value) {
+      this._foo = value;
+    },
+    enumerable: true
+  }
+});

test/fixtures/transformation/es5-property-methods-assignment/getter/expected.js

@@ -1,14 +1,10 @@
 "use strict";
 
-var obj = (function (_obj) {
-  Object.defineProperties(_obj, {
-    foo: {
-      get: function () {
-        return 5 + 5;
-      },
-      enumerable: true
-    }
-  });
-
-  return _obj;
-})({});
+var obj = Object.defineProperties({}, {
+  foo: {
+    get: function () {
+      return 5 + 5;
+    },
+    enumerable: true
+  }
+});

test/fixtures/transformation/es5-property-methods-assignment/setter/expected.js

@@ -1,14 +1,10 @@
 "use strict";
 
-var obj = (function (_obj) {
-  Object.defineProperties(_obj, {
-    foo: {
-      set: function (value) {
-        this._foo = value;
-      },
-      enumerable: true
-    }
-  });
-
-  return _obj;
-})({});
+var obj = Object.defineProperties({}, {
+  foo: {
+    set: function (value) {
+      this._foo = value;
+    },
+    enumerable: true
+  }
+});

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

@@ -13,29 +13,34 @@ 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 _TestSuper = Foo;
+  var Test = function Test() {
+    woops["super"].test();
+    _TestSuper.call(this);
+    _TestSuper.prototype.test.call(this);
+    foob(_TestSuper);
 
-  Foo.call.apply(Foo, [this].concat(_slice.call(arguments)));
-  Foo.call.apply(Foo, [this, "test"].concat(_slice.call(arguments)));
+    _TestSuper.call.apply(_TestSuper, [this].concat(_slice.call(arguments)));
+    _TestSuper.call.apply(_TestSuper, [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)));
-};
+    _TestSuper.prototype.test.call.apply(_TestSuper.prototype, [this].concat(_slice.call(arguments)));
+    _TestSuper.prototype.test.call.apply(_TestSuper.prototype, [this, "test"].concat(_slice.call(arguments)));
+  };
 
-_inherits(Test, Foo);
+  _inherits(Test, _TestSuper);
 
-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 () {
+    _TestSuper.prototype.test.call(this);
+    _TestSuper.prototype.test.call.apply(_TestSuper.prototype.test, [this].concat(_slice.call(arguments)));
+    _TestSuper.prototype.test.call.apply(_TestSuper.prototype.test, [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 () {
+    _TestSuper.foo.call(this);
+    _TestSuper.foo.call.apply(_TestSuper.foo, [this].concat(_slice.call(arguments)));
+    _TestSuper.foo.call.apply(_TestSuper.foo, [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 _TestSuper = Foo;
+  var Test = function Test() {
+    _TestSuper.prototype.test;
+    _TestSuper.prototype.test.whatever;
+  };
 
-_inherits(Test, Foo);
+  _inherits(Test, _TestSuper);
+
+  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 _TestSuper = Foo;
+  var Test = function Test() {
+    _TestSuper.prototype.test.whatever();
+    _TestSuper.prototype.test.call(this);
+  };
 
-_inherits(Test, Foo);
+  _inherits(Test, _TestSuper);
 
-Test.test = function () {
-  return Foo.wow.call(this);
-};
+  Test.test = function () {
+    return _TestSuper.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 _FooSuper = Bar;
+  var Foo = function Foo() {
+    this.state = "test";
+  };
 
-_inherits(Foo, Bar);
+  _inherits(Foo, _FooSuper);
+
+  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 _BaseControllerSuper = Chaplin.Controller;
+  var BaseController = function BaseController() {
+    if (_BaseControllerSuper) {
+      _BaseControllerSuper.apply(this, arguments);
+    }
+  };
 
-_inherits(BaseController, Chaplin.Controller);
+  _inherits(BaseController, _BaseControllerSuper);
 
-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 _BaseController2Super = Chaplin.Controller.Another;
+  var BaseController2 = function BaseController2() {
+    if (_BaseController2Super) {
+      _BaseController2Super.apply(this, arguments);
+    }
+  };
+
+  _inherits(BaseController2, _BaseController2Super);
+
+  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 _TestSuper = Foo;
+  var Test = function Test() {
+    if (_TestSuper) {
+      _TestSuper.apply(this, arguments);
+    }
+  };
 
-_inherits(Test, Foo);
+  _inherits(Test, _TestSuper);
+
+  return Test;
+})();

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

@@ -1,6 +1,12 @@
 "use strict";
 
-foo((function (_ref) {
-  _ref[bar] = "foobar";
-  return _ref;
-})({}));
+var _defineProperty = function (obj, key, value) {
+  return Object.defineProperty(obj, key, {
+    value: value,
+    enumerable: true,
+    configurable: true,
+    writable: true
+  });
+};
+
+foo(_defineProperty({}, bar, "foobar"));

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

@@ -1,6 +1,12 @@
 "use strict";
 
-foo = (function (_foo) {
-  _foo[bar] = "foobar";
-  return _foo;
-})({});
+var _defineProperty = function (obj, key, value) {
+  return Object.defineProperty(obj, key, {
+    value: value,
+    enumerable: true,
+    configurable: true,
+    writable: true
+  });
+};
+
+foo = _defineProperty({}, bar, "foobar");

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

@@ -0,0 +1,3 @@
+var foo = {
+  [Symbol.iterator]: "foobar"
+};

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

@@ -0,0 +1,8 @@
+"use strict";
+
+var foo = (function () {
+  var _foo = {};
+
+  _foo[Symbol.iterator] = "foobar";
+  return _foo;
+})();

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

@@ -1,9 +1,14 @@
 "use strict";
 
-var obj = (function (_obj) {
-  _obj[foobar] = function () {
-    return "foobar";
-  };
+var _defineProperty = function (obj, key, value) {
+  return Object.defineProperty(obj, key, {
+    value: value,
+    enumerable: true,
+    configurable: true,
+    writable: true
+  });
+};
 
-  return _obj;
-})({});
+var obj = _defineProperty({}, foobar, function () {
+  return "foobar";
+});

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

@@ -1,10 +1,24 @@
 "use strict";
 
-var obj = (function (_obj) {
-  _obj["x" + foo] = "heh";
-  _obj["y" + bar] = "noo";
+var _defineProperty = function (obj, key, value) {
+  return Object.defineProperty(obj, key, {
+    value: value,
+    enumerable: true,
+    configurable: true,
+    writable: true
+  });
+};
+
+var obj = (function () {
+  var _obj = {};
+
+  _defineProperty(_obj, "x" + foo, "heh");
+
+  _defineProperty(_obj, "y" + bar, "noo");
+
+  _defineProperty(_obj, "foo", "foo");
+
+  _defineProperty(_obj, "bar", "bar");
+
   return _obj;
-})({
-  foo: "foo",
-  bar: "bar"
-});
+})();

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

@@ -1,7 +1,20 @@
 "use strict";
 
-var obj = (function (_obj) {
-  _obj["x" + foo] = "heh";
-  _obj["y" + bar] = "noo";
+var _defineProperty = function (obj, key, value) {
+  return Object.defineProperty(obj, key, {
+    value: value,
+    enumerable: true,
+    configurable: true,
+    writable: true
+  });
+};
+
+var obj = (function () {
+  var _obj = {};
+
+  _defineProperty(_obj, "x" + foo, "heh");
+
+  _defineProperty(_obj, "y" + bar, "noo");
+
   return _obj;
-})({});
+})();

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

@@ -1,6 +1,12 @@
 "use strict";
 
-var obj = (function (_obj) {
-  _obj["x" + foo] = "heh";
-  return _obj;
-})({});
+var _defineProperty = function (obj, key, value) {
+  return Object.defineProperty(obj, key, {
+    value: value,
+    enumerable: true,
+    configurable: true,
+    writable: true
+  });
+};
+
+var obj = _defineProperty({}, "x" + foo, "heh");

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

@@ -1,7 +1,12 @@
 "use strict";
 
-var _this = this;
-var obj = (function (_obj) {
-  _obj["x" + _this.foo] = "heh";
-  return _obj;
-})({});
+var _defineProperty = function (obj, key, value) {
+  return Object.defineProperty(obj, key, {
+    value: value,
+    enumerable: true,
+    configurable: true,
+    writable: true
+  });
+};
+
+var obj = _defineProperty({}, "x" + this.foo, "heh");

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

@@ -1,6 +1,12 @@
 "use strict";
 
-var foo = (function (_foo) {
-  _foo[bar] = "foobar";
-  return _foo;
-})({});
+var _defineProperty = function (obj, key, value) {
+  return Object.defineProperty(obj, key, {
+    value: value,
+    enumerable: true,
+    configurable: true,
+    writable: true
+  });
+};
+
+var foo = _defineProperty({}, bar, "foobar");

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

@@ -5,6 +5,7 @@ var _slicedToArray = function (arr, i) {
     return arr;
   } else {
     var _arr = [];
+
     for (var _iterator = arr[Symbol.iterator](), _step; !(_step = _iterator.next()).done;) {
       _arr.push(_step.value);
 
@@ -28,8 +29,10 @@ var _ref4 = _slicedToArray(_ref3, 2);
 var c = _ref4[0];
 var d = _ref4[1];
 var _ref5 = { e: 5, f: 6 };
+
 var e = _ref5.e;
 var f = _ref5.f;
 var _ref6 = { a: 7, b: 8 };
+
 var g = _ref6.a;
 var h = _ref6.b;

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

@@ -5,6 +5,7 @@ var _slicedToArray = function (arr, i) {
     return arr;
   } else {
     var _arr = [];
+
     for (var _iterator = arr[Symbol.iterator](), _step; !(_step = _iterator.next()).done;) {
       _arr.push(_step.value);
 

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

@@ -6,6 +6,7 @@ var _slicedToArray = function (arr, i) {
     return arr;
   } else {
     var _arr = [];
+
     for (var _iterator = arr[Symbol.iterator](), _step; !(_step = _iterator.next()).done;) {
       _arr.push(_step.value);
 

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

@@ -5,6 +5,7 @@ var _slicedToArray = function (arr, i) {
     return arr;
   } else {
     var _arr = [];
+
     for (var _iterator = arr[Symbol.iterator](), _step; !(_step = _iterator.next()).done;) {
       _arr.push(_step.value);
 

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

@@ -5,6 +5,7 @@ var _slicedToArray = function (arr, i) {
     return arr;
   } else {
     var _arr = [];
+
     for (var _iterator = arr[Symbol.iterator](), _step; !(_step = _iterator.next()).done;) {
       _arr.push(_step.value);
 

test/fixtures/transformation/es6-destructuring/es7-object-rest/expected.js

@@ -2,6 +2,7 @@
 
 var _objectWithoutProperties = function (obj, keys) {
   var target = {};
+
   for (var i in obj) {
     if (keys.indexOf(i) >= 0) continue;
     if (!Object.prototype.hasOwnProperty.call(obj, i)) continue;

test/fixtures/transformation/es6-destructuring/for-in/expected.js

@@ -5,6 +5,7 @@ var _slicedToArray = function (arr, i) {
     return arr;
   } else {
     var _arr = [];
+
     for (var _iterator = arr[Symbol.iterator](), _step; !(_step = _iterator.next()).done;) {
       _arr.push(_step.value);
 

test/fixtures/transformation/es6-destructuring/for-of/expected.js

@@ -5,6 +5,7 @@ var _slicedToArray = function (arr, i) {
     return arr;
   } else {
     var _arr = [];
+
     for (var _iterator = arr[Symbol.iterator](), _step; !(_step = _iterator.next()).done;) {
       _arr.push(_step.value);
 

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

@@ -5,6 +5,7 @@ var _slicedToArray = function (arr, i) {
     return arr;
   } else {
     var _arr = [];
+
     for (var _iterator = arr[Symbol.iterator](), _step; !(_step = _iterator.next()).done;) {
       _arr.push(_step.value);
 

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

@@ -5,6 +5,7 @@ var _slicedToArray = function (arr, i) {
     return arr;
   } else {
     var _arr = [];
+
     for (var _iterator = arr[Symbol.iterator](), _step; !(_step = _iterator.next()).done;) {
       _arr.push(_step.value);
 

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

@@ -5,6 +5,7 @@ var _slicedToArray = function (arr, i) {
     return arr;
   } else {
     var _arr = [];
+
     for (var _iterator = arr[Symbol.iterator](), _step; !(_step = _iterator.next()).done;) {
       _arr.push(_step.value);
 

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-common/exports-default-non-function/actual.js

@@ -0,0 +1,3 @@
+export default new Cachier()
+
+export function Cachier(databaseName) {}

test/fixtures/transformation/es6-modules-common/exports-default-non-function/expected.js

@@ -0,0 +1,6 @@
+"use strict";
+
+exports.Cachier = Cachier;
+exports["default"] = new Cachier();
+function Cachier(databaseName) {}
+module.exports = Object.assign(exports["default"], exports);

test/fixtures/transformation/es6-modules-common/overview/actual.js

@@ -8,5 +8,3 @@ import {foo as bar} from "foo";
 
 export {test};
 export var test = 5;
-
-export default test;

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

@@ -18,5 +18,3 @@ var bar = require("foo").bar;
 var bar = require("foo").foo;
 exports.test = test;
 var test = exports.test = 5;
-
-exports = module.exports = test;

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;

test/fixtures/transformation/es6-modules-umd/exports-variable/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.foo7 = foo7;
   var foo = exports.foo = 1;
   var foo = exports.foo = 1;

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

@@ -1,3 +1,5 @@
+"use strict";
+
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports", "./evens"], factory);
@@ -5,8 +7,6 @@
     factory(exports, require("./evens"));
   }
 })(function (exports, _evens) {
-  "use strict";
-
   exports.nextOdd = nextOdd;
   var isEven = _evens.isEven;
   function nextOdd(n) {

test/fixtures/transformation/es6-modules-umd/imports-default/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";
-
   var _interopRequire = function (obj) {
     return obj && (obj["default"] || obj);
   };

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

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