v4.5.0

bump `chalk`

CHANGELOG.md

@@ -13,6 +13,55 @@ _Note: Gaps between patch versions are faulty/broken releases._
 
 See [CHANGELOG - 6to5](CHANGELOG-6to5.md) for the pre-4.0.0 version changelog.
 
+## 4.5.0
+
+ * **New Feature**
+  * Add `.babelrc` support.
+ * **Bug Fix**
+  * Move use strict directives to the module formatter bodies.
+ * **Internal**
+  * Make default `bin/babel` behaviour to ignore non-compilable files and add a `--copy-files` flag to revert to the old behaviour.
+
+## 4.4.6
+
+ * **Bug Fix**
+  * Fix extending a class expression with no methods/only constructor. Thanks [@neVERberleRfellerER](https://github.com/neVERberleRfellerER)!
+  * Allow `MemberExpression` as a valid `left` of `ForOfStatement`.
+ * **Polish**
+  * Throw an error when people try and transpile code with the `@jsx React.DOM` pragma as it conflicts with the custom jsx constructo method detection.
+  * Crawl all comments for `@jsx` pragma.
+ * **Internal**
+  * Upgrade `chalk`.
+  * Upgrade `core-js`.
+
+## 4.4.5
+
+ * **Internal**
+  * Remove function self reference optimisation.
+
+## 4.4.4
+
+ * **Bug Fix**
+  * Handle inferred function ids to be reassigned and deopt to a slower but working equivalent.
+  * Don't unpack array patterns that have more elements than their right hand array expression.
+ * **Polish**
+  * Improve syntax highlighting in the code frame. Thanks [@lydell](https://github.com/lydell)!
+ * **Internal**
+  * Upgrade `acorn-babel`.
+
+## 4.4.3
+
+ * **Bug Fix**
+  * Fix `for...of` iterator break returns being duplicated.
+  * Only call `return` on the iterator if it exists.
+ * **Internal**
+  * Rename `selfContained` transformer to `runtime`.
+
+## 4.4.2
+
+ * **New Feature**
+  * Add `moduleId` option for specifying a custom module id.
+
 ## 4.4.0
 
  * **New Feature**

Makefile

@@ -119,5 +119,5 @@ publish-core:
 bootstrap:
 	npm install
 	git submodule update --init
-	cd vendor/regenerator; npm install
-	cd vendor/compat-table; npm install object-assign
+	cd vendor/regenerator && npm install
+	cd vendor/compat-table && npm install object-assign

README.md

@@ -9,8 +9,9 @@
 </p>
 
 <p align="center">
-  For more information view the <a href="https://babeljs.io/">documentation</a>. For
-  support visit the <a href="https://gitter.im/babel/babel">gitter room</a>.
+  For more information view the <a href="https://babeljs.io/">documentation</a>. For questions
+  and support please visit the <a href="https://gitter.im/babel/babel">gitter room</a> before
+  creating an issue.
 </p>
 
 <p align="center">

bin/_babel-node

@@ -50,7 +50,10 @@ var _eval = function (code, filename) {
     experimental: program.experimental,
     playground: program.playground
   }).code;
-  return vm.runInThisContext(code, filename);
+
+  return vm.runInThisContext(code, {
+    filename: filename
+  });
 };
 
 if (program.eval || program.print) {

bin/babel/dir.js

@@ -43,7 +43,7 @@ module.exports = function (commander, filenames, opts) {
         var src = path.join(dirname, filename);
         if (util.canCompile(filename)) {
           write(src, filename);
-        } else {
+        } else if (commander.copyFiles) {
           outputFileSync(path.join(commander.outDir, filename), fs.readFileSync(src));
         }
       });

bin/babel/index.js

@@ -28,6 +28,7 @@ commander.option("-M, --module-ids", "Insert module id in modules", false);
 commander.option("-R, --react-compat", "Makes the react transformer produce pre-v0.12 code");
 commander.option("--keep-module-id-extensions", "Keep extensions when generating module ids", false);
 commander.option("-a, --auxiliary-comment [comment]", "Comment text to prepend to all auxiliary code");
+commander.option("-D, --copy-files", "When compiling a directory copy over non-compilable files");
 
 commander.on("--help", function () {
   var outKeys = function (title, obj) {

bin/babel/util.js

@@ -1,10 +1,11 @@
-var readdir = require("fs-readdir-recursive");
-var index   = require("./index");
-var babel   = require("../../lib/babel/api/node");
-var util    = require("../../lib/babel/util");
-var path    = require("path");
-var fs      = require("fs");
-var _       = require("lodash");
+var resolveRc = require("../../lib/babel/api/register/resolve-rc");
+var readdir   = require("fs-readdir-recursive");
+var index     = require("./index");
+var babel     = require("../../lib/babel/api/node");
+var util      = require("../../lib/babel/util");
+var path      = require("path");
+var fs        = require("fs");
+var _         = require("lodash");
 
 exports.readdirFilter = function (filename) {
   return readdir(filename).filter(function (filename) {
@@ -41,6 +42,7 @@ exports.transform = function (filename, code, opts) {
 };
 
 exports.compile = function (filename, opts) {
+  resolveRc(filename, opts);
   var code = fs.readFileSync(filename, "utf8");
   return exports.transform(filename, code, opts);
 };

lib/babel/api/register/node.js

@@ -4,6 +4,7 @@ require("../../polyfill");
 
 var sourceMapSupport = require("source-map-support");
 var registerCache    = require("./cache");
+var resolveRc        = require("./resolve-rc");
 var extend           = require("lodash/object/extend");
 var babel            = require("../node");
 var each             = require("lodash/collection/each");
@@ -44,7 +45,10 @@ var mtime = function (filename) {
 var compile = function (filename) {
   var result;
 
-  var cacheKey = filename + ":" + JSON.stringify(transformOpts);
+  var opts = extend({}, transformOpts);
+  resolveRc(filename, opts);
+
+  var cacheKey = filename + ":" + JSON.stringify(opts);
 
   if (cache) {
     var cached = cache[cacheKey];
@@ -54,10 +58,10 @@ var compile = function (filename) {
   }
 
   if (!result) {
-    result = babel.transformFileSync(filename, extend({
+    result = babel.transformFileSync(filename, extend(opts, {
       sourceMap: true,
       ast:       false
-    }, transformOpts));
+    }));
   }
 
   if (cache) {

lib/babel/api/register/resolve-rc.js

@@ -0,0 +1,45 @@
+"use strict";
+
+var merge = require("lodash/object/merge");
+var path  = require("path");
+var fs    = require("fs");
+
+var cache = {};
+
+function exists(filename) {
+  var cached = cache[filename];
+  if (cached != null) return cached;
+  return cache[filename] = fs.existsSync(filename);
+}
+
+module.exports = function (loc, opts) {
+  var rel = ".babelrc";
+  opts = opts || {};
+
+  function find(start, rel) {
+    var file = path.join(start, rel);
+
+    if (exists(file)) {
+      var content = fs.readFileSync(file, "utf8");
+      var json;
+
+      try {
+        json = JSON.parse(content);
+      } catch (err) {
+        err.message = file + ": " + err.message;
+        throw err;
+      }
+
+      opts = merge(json, opts);
+    }
+
+    var up = path.dirname(start);
+    if (up !== start) { // root
+      find(up, rel);
+    }
+  }
+
+  find(loc, rel);
+
+  return opts;
+};

lib/babel/helpers/code-frame.js

@@ -1,42 +1,59 @@
-// syntax highlighting based on https://github.com/dominictarr/ansi-highlight by the fantastic Dominic Tarr
-
-var repeating = require("repeating");
-var tokenize  = require("js-tokenizer");
-var chalk     = require("chalk");
+var lineNumbers = require("line-numbers");
+var repeating   = require("repeating");
+var jsTokens    = require("js-tokens");
+var esutils     = require("esutils");
+var chalk       = require("chalk");
+var ary         = require("lodash/function/ary");
 
 var defs = {
-  string1:  "red",
-  string2:  "red",
-  punct:    ["white", "bold"],
-  curly:    "green",
-  parens:   ["blue", "bold"],
-  square:   ["yellow"],
-  name:     "white",
-  keyword:  ["cyan"],
-  number:   "magenta",
-  regexp:   "magenta",
-  comment1: "grey",
-  comment2: "grey"
+  string:      chalk.red,
+  punctuation: chalk.white.bold,
+  operator:    chalk.white.bold,
+  curly:       chalk.green,
+  parens:      chalk.blue.bold,
+  square:      chalk.yellow,
+  name:        chalk.white,
+  keyword:     chalk.cyan,
+  number:      chalk.magenta,
+  regex:       chalk.magenta,
+  comment:     chalk.grey,
+  invalid:     chalk.inverse
 };
 
-var highlight = function (text) {
-  var colorize = function (str, col) {
-    if (!col) return str;
+var newline = /\r\n|[\n\r\u2028\u2029]/;
 
-    if (Array.isArray(col)) {
-      col.forEach(function (col) {
-        str = chalk[col](str);
-      });
-    } else {
-      str = chalk[col](str);
+var highlight = function (text) {
+  var tokenType = function (match) {
+    var token = jsTokens.matchToToken(match);
+    if (token.type === "name" && esutils.keyword.isKeywordES6(token.value)) {
+      return "keyword";
     }
-    return str;
+
+    if (token.type === "punctuation") {
+      switch (token.value) {
+        case "{":
+        case "}":
+          return "curly";
+        case "(":
+        case ")":
+          return "parens";
+        case "[":
+        case "]":
+          return "square";
+      }
+    }
+
+    return token.type;
   };
 
-  return tokenize(text, true).map(function (str) {
-    var type = tokenize.type(str);
-    return colorize(str, defs[type]);
-  }).join("");
+  return text.replace(jsTokens, function (match) {
+    var type = tokenType(arguments);
+    if (type in defs) {
+      var colorize = ary(defs[type], 1);
+      return match.split(newline).map(colorize).join("\n");
+    }
+    return match;
+  });
 };
 
 module.exports = function (lines, lineNumber, colNumber) {
@@ -46,33 +63,29 @@ module.exports = function (lines, lineNumber, colNumber) {
     lines = highlight(lines);
   }
 
-  lines = lines.split(/\r\n|[\n\r\u2028\u2029]/);
+  lines = lines.split(newline);
 
   var start = Math.max(lineNumber - 3, 0);
   var end   = Math.min(lines.length, lineNumber + 3);
-  var width = (end + "").length;
 
   if (!lineNumber && !colNumber) {
     start = 0;
     end = lines.length;
   }
 
-  return "\n" + lines.slice(start, end).map(function (line, i) {
-    var curr = i + start + 1;
-
-    var gutter = curr === lineNumber ? "> " : "  ";
-
-    var sep = curr + repeating(" ", width + 1);
-    gutter += sep + "| ";
-
-    var str = gutter + line;
-
-    if (colNumber && curr === lineNumber) {
-      str += "\n";
-      str += repeating(" ", gutter.length - 2);
-      str += "|" + repeating(" ", colNumber) + "^";
+  return "\n" + lineNumbers(lines.slice(start, end), {
+    start: start + 1,
+    before: "  ",
+    after: " | ",
+    transform: function (params) {
+      if (params.number !== lineNumber) {
+        return;
+      }
+      if (colNumber) {
+        params.line += "\n" + params.before + repeating(" ", params.width) +
+                       params.after + repeating(" ", colNumber - 1) + "^";
+      }
+      params.before = params.before.replace(/^./, ">");
     }
-
-    return str;
   }).join("\n");
 };

lib/babel/transformation/file.js

@@ -60,7 +60,6 @@ File.helpers = [
   "object-destructuring-empty",
   "temporal-undefined",
   "temporal-assert-defined",
-  "tail-call",
   "self-global"
 ];
 
@@ -90,7 +89,7 @@ File.validOptions = [
   "compact",
 
   "resolveModuleSource",
-  "getModuleName",
+  "moduleId",
 
   // legacy
   "format",
@@ -139,6 +138,10 @@ File.prototype.normalizeOptions = function (opts) {
     opts.sourceRoot = slash(opts.sourceRoot);
   }
 
+  if (opts.moduleId) {
+    opts.moduleIds = true;
+  }
+
   opts.basename = path.basename(opts.filename, path.extname(opts.filename));
 
   opts.blacklist = util.arrayify(opts.blacklist);
@@ -173,7 +176,7 @@ File.prototype.normalizeOptions = function (opts) {
   }
 
   if (opts.externalHelpers) {
-    this.set("runtimeIdentifier", t.identifier("babelHelpers"));
+    this.set("helpersNamespace", t.identifier("babelHelpers"));
   }
 
   opts.blacklist = transform._ensureTransformerNames("blacklist", opts.blacklist);
@@ -330,7 +333,7 @@ File.prototype.addHelper = function (name) {
   var declar = program._declarations && program._declarations[name];
   if (declar) return declar.id;
 
-  var runtime = this.get("runtimeIdentifier");
+  var runtime = this.get("helpersNamespace");
   if (runtime) {
     name = t.identifier(t.toIdentifier(name));
     return t.memberExpression(runtime, name);

lib/babel/transformation/helpers/build-react-transformer.js

@@ -44,16 +44,19 @@ module.exports = function (exports, opts) {
   };
 
   exports.JSXAttribute = {
-    exit: function (node) {
-      var value = node.value || t.literal(true);
-
+    enter: function (node) {
+      var value = node.value;
       if (t.isLiteral(value) && isString(value.value)) {
         value.value = value.value.replace(/\n\s+/g, " ");
       }
+    },
 
+    exit: function (node) {
+      var value = node.value || t.literal(true);
       return t.inherits(t.property("init", node.name, value), node);
     }
   };
+
   exports.JSXOpeningElement = {
     exit: function (node, parent, scope, file) {
       var tagExpr = node.name;

lib/babel/transformation/helpers/name-method.js

@@ -5,15 +5,13 @@ var t    = require("../../types");
 
 var visitor = {
   enter: function (node, parent, scope, state) {
-    // check if this node is an identifier that matches the same as our function id
-    if (!t.isIdentifier(node, { name: state.id })) return;
-
-    // check if this node is the one referenced
-    if (!t.isReferenced(node, parent)) return;
+    // check if this node is a referenced identifier that matches the same as our
+    // function id
+    if (!t.isReferencedIdentifier(node, parent, { name: state.name })) return;
 
     // check that we don't have a local variable declared as that removes the need
     // for the wrapper
-    var localDeclar = scope.getBindingIdentifier(state.id);
+    var localDeclar = scope.getBindingIdentifier(state.name);
     if (localDeclar !== state.outerDeclar) return;
 
     state.selfReference = true;
@@ -21,33 +19,100 @@ var visitor = {
   }
 };
 
+var wrap = function (state, method, id, scope) {
+  if (state.selfReference) {
+    var templateName = "property-method-assignment-wrapper";
+    if (method.generator) templateName += "-generator";
+    return util.template(templateName, {
+      FUNCTION: method,
+      FUNCTION_ID: id,
+      FUNCTION_KEY: scope.generateUidIdentifier(id.name),
+      WRAPPER_KEY: scope.generateUidIdentifier(id.name + "Wrapper")
+    });
+  } else {
+    method.id = id;
+    return method;
+  }
+};
+
+var visit = function (node, name, scope) {
+  var state = {
+    selfAssignment: false,
+    selfReference:  false,
+    outerDeclar:    scope.getBindingIdentifier(name),
+    references:     [],
+    name:           name,
+  };
+
+  // check to see if we have a local binding of the id we're setting inside of
+  // the function, this is important as there are caveats associated
+
+  var bindingInfo = null; // todo: proper scope not being passed in es6/classes // scope.getOwnBindingInfo(name);
+
+  if (bindingInfo) {
+    if (bindingInfo.kind === "param") {
+      // safari will blow up in strict mode with code like:
+      //
+      //   var t = function t(t) {};
+      //
+      // with the error:
+      //
+      //   Cannot declare a parameter named 't' as it shadows the name of a
+      //   strict mode function.
+      //
+      // this isn't to the spec and they've invented this behaviour which is
+      // **extremely** annoying so we avoid setting the name if it has a param
+      // with the same id
+      state.selfReference = true;
+    } else {
+      // otherwise it's defined somewhere in scope like:
+      //
+      //   var t = function () {
+      //     var t = 2;
+      //   };
+      //
+      // so we can safely just set the id and move along as it shadows the
+      // bound function id
+    }
+  } else {
+    scope.traverse(node, visitor, state);
+  }
+
+  return state;
+};
+
 exports.property = function (node, file, scope) {
   var key = t.toComputedKey(node, node.key);
   if (!t.isLiteral(key)) return node; // we can't set a function id with this
 
-  var id = t.toIdentifier(key.value);
-  key = t.identifier(id);
-
-  var state = {
-    id: id,
-    selfReference: false,
-    outerDeclar: scope.getBindingIdentifier(id),
-  };
-
-  scope.traverse(node, visitor, state);
+  var name = t.toIdentifier(key.value);
+  var id = t.identifier(name);
 
   var method = node.value;
-
-  if (state.selfReference) {
-    var templateName = "property-method-assignment-wrapper";
-    if (method.generator) templateName += "-generator";
-    node.value = util.template(templateName, {
-      FUNCTION: method,
-      FUNCTION_ID: key,
-      FUNCTION_KEY: scope.generateUidIdentifier(id),
-      WRAPPER_KEY: scope.generateUidIdentifier(id + "Wrapper")
-    });
-  } else {
-    method.id = key;
-  }
+  var state  = visit(method, name, scope);
+  node.value = wrap(state, method, id, scope);
+};
+
+exports.bare = function (node, parent, scope) {
+  // has an `id` so we don't need to infer one
+  if (node.id) return;
+
+  var id;
+  if (t.isProperty(parent) && parent.kind === "init" && !parent.computed) {
+    // { foo: function () {} };
+    id = parent.key;
+  } else if (t.isVariableDeclarator(parent)) {
+    // var foo = function () {};
+    id = parent.id;
+  } else {
+    return;
+  }
+
+  if (!t.isIdentifier(id)) return;
+
+  var name = t.toIdentifier(id.name);
+  id = t.identifier(name);
+
+  var state = visit(node, name, scope);
+  return wrap(state, node, id, scope);
 };

lib/babel/transformation/helpers/use-strict.js

@@ -0,0 +1,21 @@
+"use strict";
+
+var t = require("../../types");
+
+exports.has = function (node) {
+  var first = node.body[0];
+  return t.isExpressionStatement(first) && t.isLiteral(first.expression, { value: "use strict" });
+};
+
+exports.wrap = function (node, callback) {
+  var useStrictNode;
+  if (exports.has(node)) {
+    useStrictNode = node.body.shift();
+  }
+
+  callback();
+
+  if (useStrictNode) {
+    node.body.unshift(useStrictNode);
+  }
+};

lib/babel/transformation/modules/_default.js

@@ -146,7 +146,7 @@ DefaultFormatter.prototype.isLocalReference = function (node, scope) {
 
 DefaultFormatter.prototype.getModuleName = function () {
   var opts = this.file.opts;
-  if (opts.getModuleName) return opts.getModuleName(opts.filename);
+  if (opts.moduleId) return opts.moduleId;
 
   var filenameRelative = opts.filenameRelative;
   var moduleName = "";

lib/babel/transformation/templates/named-func.js

@@ -1,7 +0,0 @@
-(function () {
-    function GET_OUTER_ID() {
-        return ID;
-    }
-
-    return FUNCTION;
-})()

lib/babel/transformation/templates/named-function.js

@@ -0,0 +1,7 @@
+(function () {
+  function GET_OUTER_ID() {
+    return FUNCTION_ID;
+  }
+
+  return FUNCTION;
+})()

lib/babel/transformation/transformers/deprecated.json

@@ -1 +1,3 @@
-{}
+{
+  "selfContained": "runtime"
+}

lib/babel/transformation/transformers/es6/block-scoping-tdz.js

@@ -21,7 +21,7 @@ var visitor = {
 
     if (t.isAssignmentExpression(parent) || t.isUpdateExpression(parent)) {
       if (parent._ignoreBlockScopingTDZ) return;
-      this.parentPath.replaceNode(t.sequenceExpression([assert, parent]));
+      this.parentPath.node = t.sequenceExpression([assert, parent]);
     } else {
       return t.logicalExpression("&&", assert, node);
     }

lib/babel/transformation/transformers/es6/block-scoping.js

@@ -30,7 +30,7 @@ var isLet = function (node, parent) {
 };
 
 var isLetInitable = function (node, parent) {
-  return !t.isFor(parent) || t.isFor(parent) && parent.left !== node;
+  return !t.isFor(parent) || !t.isFor(parent, { left: node });
 };
 
 var isVar = function (node, parent) {

lib/babel/transformation/transformers/es6/classes.js

@@ -65,6 +65,7 @@ function ClassTransformer(node, file, scope, isStatement) {
 ClassTransformer.prototype.run = function () {
   var superName = this.superName;
   var className = this.className;
+  var classBody = this.node.body.body;
   var file      = this.file;
 
   //
@@ -77,13 +78,21 @@ ClassTransformer.prototype.run = function () {
       className
     ]))
   ]);
-  var constructor;
 
+  var constructor;
   if (this.node.id) {
     constructor = t.functionDeclaration(className, [], constructorBody);
     body.push(constructor);
   } else {
-    constructor = t.functionExpression(null, [], constructorBody);
+    var constructorName = null;
+    // when a class has no parent and there is only a constructor or no body
+    // then the constructor is not wrapped in a closure and needs to be named
+    var containsOnlyConstructor = classBody.length === 1 && classBody[0].key.name === "constructor";
+    if (!this.hasSuper && (classBody.length === 0 || containsOnlyConstructor)) {
+      constructorName = className;
+    }
+
+    constructor = t.functionExpression(constructorName, [], constructorBody);
     body.push(t.variableDeclaration("var", [
       t.variableDeclarator(className, constructor)
     ]));

lib/babel/transformation/transformers/es6/destructuring.js

@@ -168,6 +168,7 @@ DestructuringTransformer.prototype.canUnpackArrayPattern = function (pattern, ar
 
   // pattern has less elements than the array and doesn't have a rest so some
   // elements wont be evaluated
+  if (pattern.elements.length > arr.elements.length) return;
   if (pattern.elements.length < arr.elements.length && !hasRest(pattern)) return false;
 
   // deopt on holes
@@ -418,7 +419,7 @@ exports.AssignmentExpression = function (node, parent, scope, file) {
   return t.toSequenceExpression(nodes, scope);
 };
 
-var variableDeclarationhasPattern = function (node) {
+var variableDeclarationHasPattern = function (node) {
   for (var i = 0; i < node.declarations.length; i++) {
     if (t.isPattern(node.declarations[i].id)) {
       return true;
@@ -429,7 +430,7 @@ var variableDeclarationhasPattern = function (node) {
 
 exports.VariableDeclaration = function (node, parent, scope, file) {
   if (t.isForInStatement(parent) || t.isForOfStatement(parent)) return;
-  if (!variableDeclarationhasPattern(node)) return;
+  if (!variableDeclarationHasPattern(node)) return;
 
   var nodes = [];
   var declar;

lib/babel/transformation/transformers/es6/for-of.js

@@ -53,8 +53,9 @@ var breakVisitor = {
       var ret = t.expressionStatement(
         t.callExpression(t.memberExpression(state.iteratorKey, t.identifier("return")), [])
       );
-      if (state.wrapReturn) ret = state.wrapReturn(ret);
+      ret = state.wrapReturn(ret);
 
+      this.skip();
       return [ret, node];
     }
   }
@@ -64,7 +65,7 @@ var loose = function (node, parent, scope, file) {
   var left = node.left;
   var declar, id;
 
-  if (t.isIdentifier(left) || t.isPattern(left)) {
+  if (t.isIdentifier(left) || t.isPattern(left) || t.isMemberExpression(left)) {
     // for (i of test), for ({ i } of test)
     id = left;
   } else if (t.isVariableDeclaration(left)) {
@@ -99,7 +100,13 @@ var loose = function (node, parent, scope, file) {
   scope.traverse(node, breakVisitor, {
     iteratorKey: iteratorKey,
     wrapReturn:  function (node) {
-      return t.ifStatement(t.unaryExpression("!", isArrayKey, true), node);
+      return t.ifStatement(
+        t.logicalExpression(
+          "&&",
+          t.unaryExpression("!", isArrayKey, true),
+          t.memberExpression(iteratorKey, t.identifier("return")
+        )
+      ), node);
     },
     label:       t.isLabeledStatement(parent) && parent.label.name
   });
@@ -119,7 +126,7 @@ var spec = function (node, parent, scope, file) {
   var stepKey   = scope.generateUidIdentifier("step");
   var stepValue = t.memberExpression(stepKey, t.identifier("value"));
 
-  if (t.isIdentifier(left) || t.isPattern(left)) {
+  if (t.isIdentifier(left) || t.isPattern(left) || t.isMemberExpression(left)) {
     // for (i of test), for ({ i } of test)
     declar = t.expressionStatement(t.assignmentExpression("=", left, stepValue));
   } else if (t.isVariableDeclaration(left)) {
@@ -145,6 +152,9 @@ var spec = function (node, parent, scope, file) {
 
   scope.traverse(node, breakVisitor, {
     iteratorKey: iteratorKey,
+    wrapReturn:  function (node) {
+      return t.ifStatement(t.memberExpression(iteratorKey, t.identifier("return")), node);
+    },
     label:       t.isLabeledStatement(parent) && parent.label.name
   });
 

lib/babel/transformation/transformers/es6/modules.js

@@ -5,6 +5,9 @@ var t = require("../../../types");
 exports.check = require("../internal/modules").check;
 
 exports.ImportDeclaration = function (node, parent, scope, file) {
+  // flow type
+  if (node.isType) return;
+
   var nodes = [];
 
   if (node.specifiers.length) {
@@ -24,6 +27,9 @@ exports.ImportDeclaration = function (node, parent, scope, file) {
 };
 
 exports.ExportDeclaration = function (node, parent, scope, file) {
+  // flow type
+  if (t.isTypeAlias(node.declaration)) return;
+
   var nodes = [];
   var i;
 

lib/babel/transformation/transformers/index.js

@@ -10,6 +10,9 @@ module.exports = {
   "validation.react":                      require("./validation/react"),
   "spec.blockScopedFunctions":             require("./spec/block-scoped-functions"),
 
+  // needs to be before `_aliasFunction`
+  "es6.arrowFunctions":                    require("./es6/arrow-functions"),
+
   "playground.malletOperator":             require("./playground/mallet-operator"),
   "playground.methodBinding":              require("./playground/method-binding"),
   "playground.memoizationOperator":        require("./playground/memoization-operator"),
@@ -25,9 +28,6 @@ module.exports = {
   // needs to be before `_aliasFunction`
   "es7.comprehensions":                    require("./es7/comprehensions"),
 
-  // needs to be before `_aliasFunction`
-  "es6.arrowFunctions":                    require("./es6/arrow-functions"),
-
   "es6.classes":                           require("./es6/classes"),
 
   asyncToGenerator:                        require("./other/async-to-generator"),
@@ -79,7 +79,7 @@ module.exports = {
   // needs to be after `regenerator` due to needing `regeneratorRuntime` references
   // needs to be after `es6.forOf` due to needing `Symbol.iterator` references
   // needs to be before `es6.modules` due to dynamic imports
-  selfContained:                           require("./other/self-contained"),
+  runtime:                                require("./other/runtime"),
 
   // needs to be before `_blockHoist` due to function hoisting etc
   "es6.modules":                           require("./es6/modules"),
@@ -95,6 +95,7 @@ module.exports = {
   "spec.typeofSymbol":                     require("./spec/typeof-symbol"),
   "spec.undefinedToVoid":                  require("./spec/undefined-to-void"),
 
+  _useStrict:                              require("./internal/use-strict"),
   _moduleFormatter:                        require("./internal/module-formatter"),
 
   "es3.propertyLiterals":                  require("./es3/property-literals"),

lib/babel/transformation/transformers/internal/declarations.js

@@ -1,6 +1,7 @@
 "use strict";
 
-var t = require("../../../types");
+var useStrict = require("../../helpers/use-strict");
+var t         = require("../../../types");
 
 exports.secondPass = true;
 
@@ -8,26 +9,28 @@ exports.BlockStatement =
 exports.Program = function (node, parent, scope, file) {
   if (!node._declarations) return;
 
-  var kinds = {};
-  var kind;
+  useStrict.wrap(node, function () {
+    var kinds = {};
+    var kind;
 
-  for (var i in node._declarations) {
-    var declar = node._declarations[i];
+    for (var i in node._declarations) {
+      var declar = node._declarations[i];
 
-    kind = declar.kind || "var";
-    var declarNode = t.variableDeclarator(declar.id, declar.init);
+      kind = declar.kind || "var";
+      var declarNode = t.variableDeclarator(declar.id, declar.init);
 
-    if (declar.init) {
-      node.body.unshift(file.attachAuxiliaryComment(t.variableDeclaration(kind, [declarNode])));
-    } else {
-      kinds[kind] = kinds[kind] || [];
-      kinds[kind].push(declarNode);
+      if (declar.init) {
+        node.body.unshift(file.attachAuxiliaryComment(t.variableDeclaration(kind, [declarNode])));
+      } else {
+        kinds[kind] = kinds[kind] || [];
+        kinds[kind].push(declarNode);
+      }
     }
-  }
 
-  for (kind in kinds) {
-    node.body.unshift(file.attachAuxiliaryComment(t.variableDeclaration(kind, kinds[kind])));
-  }
+    for (kind in kinds) {
+      node.body.unshift(file.attachAuxiliaryComment(t.variableDeclaration(kind, kinds[kind])));
+    }
 
-  node._declarations = null;
+    node._declarations = null;
+  });
 };

lib/babel/transformation/transformers/internal/module-formatter.js

@@ -1,9 +1,13 @@
 "use strict";
 
+var useStrict = require("../../helpers/use-strict");
+
 exports.Program = function (program, parent, scope, file) {
   if (!file.transformers["es6.modules"].canRun()) return;
 
-  program.body = file.dynamicImports.concat(program.body);
+  useStrict.wrap(program, function () {
+    program.body = file.dynamicImports.concat(program.body);
+  });
 
   if (file.moduleFormatter.transform) {
     file.moduleFormatter.transform(program);

lib/babel/transformation/transformers/internal/modules.js

@@ -24,6 +24,9 @@ exports.ImportDeclaration = resolveModuleSource;
 exports.ExportDeclaration = function (node, parent, scope) {
   resolveModuleSource.apply(null, arguments);
 
+  // flow type
+  if (node.isType) return;
+
   var declar = node.declaration;
 
   if (node.default) {

lib/babel/transformation/transformers/internal/use-strict.js

@@ -0,0 +1,9 @@
+"use strict";
+
+var t = require("../../../types");
+
+exports.Program = function (program, parent, scope, file) {
+  if (file.transformers.useStrict.canRun()) {
+    program.body.unshift(t.expressionStatement(t.literal("use strict")));
+  }
+};

lib/babel/transformation/transformers/other/react.js

@@ -8,10 +8,17 @@ var JSX_ANNOTATION_REGEX = /^\*\s*@jsx\s+([^\s]+)/;
 exports.Program = function (node, parent, scope, file) {
   var id = "React.createElement";
 
-  var comment = file.ast.comments[0];
-  if (comment) {
+  for (var i = 0; i < file.ast.comments.length; i++) {
+    var comment = file.ast.comments[i];
     var matches = JSX_ANNOTATION_REGEX.exec(comment.value);
-    if (matches) id = matches[1];
+    if (matches) {
+      id = matches[1];
+      if (id === "React.DOM") {
+        throw file.errorWithNode(comment, "The @jsx React.DOM pragma has been deprecated as of React 0.12");
+      } else {
+        break;
+      }
+    }
   }
 
   file.set("jsxIdentifier", id.split(".").map(t.identifier).reduce(function (object, property) {

lib/babel/transformation/transformers/other/runtime.js

@@ -82,7 +82,7 @@ exports.Program = function (node, parent, scope, file) {
 };
 
 exports.pre = function (file) {
-  file.setDynamic("runtimeIdentifier", function () {
+  file.setDynamic("helpersNamespace", function () {
     return file.addImport("babel-runtime/helpers", "babelHelpers");
   });
 

lib/babel/transformation/transformers/other/use-strict.js

@@ -10,10 +10,6 @@ exports.Program = function (program) {
   }
 };
 
-exports.post = function (file) {
-  file.ast.program.body.unshift(t.expressionStatement(t.literal("use strict")));
-};
-
 exports.FunctionDeclaration =
 exports.FunctionExpression = function () {
   this.skip();

lib/babel/transformation/transformers/spec/function-name.js

@@ -1,95 +1,5 @@
 "use strict";
 
-var t           = require("../../../types");
-var util        = require("../../../util");
+var nameMethod = require("../../helpers/name-method");
 
-var propertyFunctionVisitor = {
-  enter: function (node, parent, scope, state) {
-    if (t.isReferencedIdentifier(node, parent, { name: state.name }) && scope.getBindingIdentifier(node.name) === state.binding) {
-      return state.getOuter();
-    }
-  }
-};
-
-//exports.ArrowFunctionExpression =
-exports.FunctionExpression = function (node, parent, scope) {
-  // has an `id` so we don't need to infer one
-  if (node.id) return;
-
-  var id;
-  if (t.isProperty(parent) && parent.kind === "init" && !parent.computed) {
-    // { foo: function () {} };
-    id = parent.key;
-  } else if (t.isVariableDeclarator(parent)) {
-    // var foo = function () {};
-    id = parent.id;
-  } else {
-    return;
-  }
-
-  if (!t.isIdentifier(id)) return;
-
-  var name = t.toIdentifier(id.name);
-  id = t.identifier(name);
-
-  // check to see if we have a local binding of the id we're setting inside of
-  // the function, this is important as there are caveats associated
-
-  var bindingInfo = scope.getOwnBindingInfo(name);
-
-  if (bindingInfo) {
-    if (bindingInfo.type === "param") {
-      // safari will blow up in strict mode with code like:
-      //
-      //   var t = function t(t) {};
-      //
-      // with the error:
-      //
-      //   Cannot declare a parameter named 't' as it shadows the name of a
-      //   strict mode function.
-      //
-      // this isn't to the spec and they've invented this behaviour which is
-      // **extremely** annoying so we avoid setting the name if it has a param
-      // with the same id
-    } else {
-      // otherwise it's defined somewhere in scope like:
-      //
-      //   var t = function () {
-      //     var t = 2;
-      //   };
-      //
-      // so we can safely just set the id and move along as it shadows the
-      // bound function id
-      node.id = id;
-    }
-
-    return;
-  }
-
-  //
-
-  var binding = scope.getBindingIdentifier(name);
-  var outerId;
-
-  scope.traverse(node, propertyFunctionVisitor, {
-    name: name,
-    binding: binding,
-
-    getOuter: function () {
-      return t.callExpression(
-        outerId || (outerId = scope.generateUidIdentifier("getOuter")),
-        []
-      );
-    }
-  });
-
-  node.id = id;
-
-  if (outerId) {
-    return util.template("named-func", {
-      GET_OUTER_ID: outerId,
-      FUNCTION:     node,
-      ID:           id
-    });
-  }
-};
+exports.FunctionExpression = nameMethod.bare;

lib/babel/traversal/path.js

@@ -2,14 +2,12 @@
 
 module.exports = TraversalPath;
 
-/* jshint maxparams:7 */
-
 var traverse = require("./index");
 var includes = require("lodash/collection/includes");
 var Scope    = require("./scope");
 var t        = require("../types");
 
-function TraversalPath(context, parent, obj, key) {
+function TraversalPath(context, parent, container, key) {
   this.shouldRemove = false;
   this.shouldSkip   = false;
   this.shouldStop   = false;
@@ -19,14 +17,30 @@ function TraversalPath(context, parent, obj, key) {
   this.state      = this.context.state;
   this.opts       = this.context.opts;
 
-  this.key     = key;
-  this.obj     = obj;
+  this.container = container;
+  this.key       = key;
 
   this.parent = parent;
-  this.scope  = TraversalPath.getScope(this.getNode(), parent, context.scope);
   this.state  = context.state;
+
+  this.setScope();
 }
 
+TraversalPath.getScope = function (node, parent, scope) {
+  var ourScope = scope;
+
+  // we're entering a new scope so let's construct it!
+  if (t.isScope(node, parent)) {
+    ourScope = new Scope(node, parent, scope);
+  }
+
+  return ourScope;
+};
+
+TraversalPath.prototype.setScope = function () {
+  this.scope = TraversalPath.getScope(this.node, this.parent, this.context.scope);
+};
+
 TraversalPath.prototype.remove = function () {
   this.shouldRemove = true;
   this.shouldSkip   = true;
@@ -45,67 +59,48 @@ TraversalPath.prototype.flatten = function () {
   this.context.flatten();
 };
 
-TraversalPath.getScope = function (node, parent, scope) {
-  var ourScope = scope;
+Object.defineProperty(TraversalPath.prototype, "node", {
+  get: function () {
+    return this.container[this.key];
+  },
 
-  // we're entering a new scope so let's construct it!
-  if (t.isScope(node, parent)) {
-    ourScope = new Scope(node, parent, scope);
-  }
+  set: function (replacement) {
+    var isArray = Array.isArray(replacement);
 
-  return ourScope;
-};
+    // inherit comments from original node to the first replacement node
+    var inheritTo = replacement;
+    if (isArray) inheritTo = replacement[0];
+    if (inheritTo) t.inheritsComments(inheritTo, this.node);
 
-TraversalPath.prototype.maybeRemove = function () {
-  if (this.shouldRemove) {
-    this.setNode(null);
-    this.flatten();
-  }
-};
+    // replace the node
+    this.container[this.key] = replacement;
+    this.setScope();
 
-TraversalPath.prototype.setNode = function (val) {
-  return this.obj[this.key] = val;
-};
-
-TraversalPath.prototype.getNode = function () {
-  return this.obj[this.key];
-};
-
-TraversalPath.prototype.replaceNode = function (replacement) {
-  var isArray = Array.isArray(replacement);
-
-  // inherit comments from original node to the first replacement node
-  var inheritTo = replacement;
-  if (isArray) inheritTo = replacement[0];
-  if (inheritTo) t.inheritsComments(inheritTo, this.getNode());
-
-  // replace the node
-  this.setNode(replacement);
-
-  var file = this.scope && this.scope.file;
-  if (file) {
-    if (isArray) {
-      for (var i = 0; i < replacement.length; i++) {
-        file.checkNode(replacement[i], this.scope);
+    var file = this.scope && this.scope.file;
+    if (file) {
+      if (isArray) {
+        for (var i = 0; i < replacement.length; i++) {
+          file.checkNode(replacement[i], this.scope);
+        }
+      } else {
+        file.checkNode(replacement, this.scope);
       }
-    } else {
-      file.checkNode(replacement, this.scope);
-    }
-  }
-
-  // we're replacing a statement or block node with an array of statements so we better
-  // ensure that it's a block
-  if (isArray) {
-    if (includes(t.STATEMENT_OR_BLOCK_KEYS, this.key) && !t.isBlockStatement(this.obj)) {
-      t.ensureBlock(this.obj, this.key);
     }
 
-    this.flatten();
+    // we're replacing a statement or block node with an array of statements so we better
+    // ensure that it's a block
+    if (isArray) {
+      if (includes(t.STATEMENT_OR_BLOCK_KEYS, this.key) && !t.isBlockStatement(this.container)) {
+        t.ensureBlock(this.container, this.key);
+      }
+
+      this.flatten();
+    }
   }
-};
+});
 
 TraversalPath.prototype.call = function (key) {
-  var node = this.getNode();
+  var node = this.node;
   if (!node) return;
 
   var opts = this.opts;
@@ -115,18 +110,18 @@ TraversalPath.prototype.call = function (key) {
   var replacement = fn.call(this, node, this.parent, this.scope, this.state);
 
   if (replacement) {
-    this.replaceNode(replacement);
-    node = replacement;
+    this.node = replacement;
   }
 
-  this.maybeRemove();
-
-  return node;
+  if (this.shouldRemove) {
+    this.container[this.key] = null;
+    this.flatten();
+  }
 };
 
 TraversalPath.prototype.visit = function () {
   var opts = this.opts;
-  var node = this.getNode();
+  var node = this.node;
 
   // type is blacklisted
   if (opts.blacklist && opts.blacklist.indexOf(node.type) > -1) {
@@ -139,7 +134,7 @@ TraversalPath.prototype.visit = function () {
     return this.shouldStop;
   }
 
-  node = this.getNode();
+  node = this.node;
 
   if (Array.isArray(node)) {
     // traverse over these replacement nodes we purposely don't call exitNode
@@ -154,3 +149,7 @@ TraversalPath.prototype.visit = function () {
 
   return this.shouldStop;
 };
+
+TraversalPath.prototype.isReferencedIdentifier = function () {
+  return t.isReferencedIdentifier(this.node);
+};

lib/babel/types/alias-keys.json

@@ -48,7 +48,6 @@
   "AssignmentPattern": ["Pattern"],
 
   "Property":   ["UserWhitespacable"],
-  "JSXElement": ["UserWhitespacable", "Expression"],
 
   "ArrayExpression":           ["Expression"],
   "AssignmentExpression":      ["Expression"],
@@ -74,7 +73,7 @@
 
   "JSXAttribute":           ["JSX"],
   "JSXClosingElement":      ["JSX"],
-  "JSXElement":             ["JSX"],
+  "JSXElement":             ["JSX", "Expression"],
   "JSXEmptyExpression":     ["JSX"],
   "JSXExpressionContainer": ["JSX"],
   "JSXIdentifier":          ["JSX"],

package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "4.4.0",
+  "version": "4.5.0",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "repository": "babel/babel",
@@ -36,12 +36,12 @@
     "test": "make test"
   },
   "dependencies": {
-    "acorn-babel": "0.11.1-33",
+    "acorn-babel": "0.11.1-34",
     "ast-types": "~0.6.1",
-    "chalk": "^0.5.1",
+    "chalk": "^1.0.0",
     "chokidar": "^0.12.6",
     "commander": "^2.6.0",
-    "core-js": "^0.5.4",
+    "core-js": "^0.6.1",
     "debug": "^2.1.1",
     "detect-indent": "^3.0.0",
     "estraverse": "^1.9.1",
@@ -49,13 +49,14 @@
     "fs-readdir-recursive": "^0.1.0",
     "globals": "^6.2.0",
     "is-integer": "^1.0.4",
-    "js-tokenizer": "^1.3.3",
+    "js-tokens": "0.4.1",
     "leven": "^1.0.1",
+    "line-numbers": "0.2.0",
     "lodash": "^3.2.0",
     "output-file-sync": "^1.1.0",
     "path-is-absolute": "^1.0.0",
     "private": "^0.1.6",
-    "regenerator-babel": "0.8.10-2",
+    "regenerator-babel": "0.8.13-1",
     "regexpu": "^1.1.1",
     "repeating": "^1.1.2",
     "shebang-regex": "^1.0.0",

packages/babel-runtime/package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel-runtime",
   "description": "babel selfContained runtime",
-  "version": "4.3.0",
+  "version": "4.4.6",
   "repository": "babel/babel",
   "author": "Sebastian McKenzie <sebmck@gmail.com>"
 }

test/fixtures/transformation/es6-classes/super-class-anonymous/actual.js

@@ -0,0 +1,20 @@
+class TestEmpty extends (class {}) {
+}
+
+class TestConstructorOnly extends (class { constructor() {} }) {
+}
+
+class TestMethodOnly extends (class { method() {} }) {
+}
+
+class TestConstructorAndMethod extends (class {
+    constructor() {}
+    method() {}
+}) {
+}
+
+class TestMultipleMethods extends (class {
+    m1() {}
+    m2() {}
+}) {
+}

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

@@ -0,0 +1,129 @@
+"use strict";
+
+var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); };
+
+var _inherits = function (subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; };
+
+var _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } };
+
+var TestEmpty = (function (_ref) {
+    function TestEmpty() {
+        _classCallCheck(this, TestEmpty);
+
+        if (_ref != null) {
+            _ref.apply(this, arguments);
+        }
+    }
+
+    _inherits(TestEmpty, _ref);
+
+    return TestEmpty;
+})(function _class() {
+    _classCallCheck(this, _class);
+});
+
+var TestConstructorOnly = (function (_ref2) {
+    function TestConstructorOnly() {
+        _classCallCheck(this, TestConstructorOnly);
+
+        if (_ref2 != null) {
+            _ref2.apply(this, arguments);
+        }
+    }
+
+    _inherits(TestConstructorOnly, _ref2);
+
+    return TestConstructorOnly;
+})(function _class2() {
+    _classCallCheck(this, _class2);
+});
+
+var TestMethodOnly = (function (_ref3) {
+    function TestMethodOnly() {
+        _classCallCheck(this, TestMethodOnly);
+
+        if (_ref3 != null) {
+            _ref3.apply(this, arguments);
+        }
+    }
+
+    _inherits(TestMethodOnly, _ref3);
+
+    return TestMethodOnly;
+})((function () {
+    var _class3 = function () {
+        _classCallCheck(this, _class3);
+    };
+
+    _prototypeProperties(_class3, null, {
+        method: {
+            value: function method() {},
+            writable: true,
+            configurable: true
+        }
+    });
+
+    return _class3;
+})());
+
+var TestConstructorAndMethod = (function (_ref4) {
+    function TestConstructorAndMethod() {
+        _classCallCheck(this, TestConstructorAndMethod);
+
+        if (_ref4 != null) {
+            _ref4.apply(this, arguments);
+        }
+    }
+
+    _inherits(TestConstructorAndMethod, _ref4);
+
+    return TestConstructorAndMethod;
+})((function () {
+    var _class4 = function () {
+        _classCallCheck(this, _class4);
+    };
+
+    _prototypeProperties(_class4, null, {
+        method: {
+            value: function method() {},
+            writable: true,
+            configurable: true
+        }
+    });
+
+    return _class4;
+})());
+
+var TestMultipleMethods = (function (_ref5) {
+    function TestMultipleMethods() {
+        _classCallCheck(this, TestMultipleMethods);
+
+        if (_ref5 != null) {
+            _ref5.apply(this, arguments);
+        }
+    }
+
+    _inherits(TestMultipleMethods, _ref5);
+
+    return TestMultipleMethods;
+})((function () {
+    var _class5 = function () {
+        _classCallCheck(this, _class5);
+    };
+
+    _prototypeProperties(_class5, null, {
+        m1: {
+            value: function m1() {},
+            writable: true,
+            configurable: true
+        },
+        m2: {
+            value: function m2() {},
+            writable: true,
+            configurable: true
+        }
+    });
+
+    return _class5;
+})());
+

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

@@ -1 +1 @@
-var [a, [b], [c], d] = ["hello", [", ", "junk"], ["world"]];
+var [a, [b], [c]] = ["hello", [", ", "junk"], ["world"]];

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

@@ -4,4 +4,3 @@ var a = "hello";
 var _ref = [", ", "junk"];
 var b = _ref[0];
 var c = "world";
-var d;

test/fixtures/transformation/es6-for-of-loose/break/expected.js

@@ -17,7 +17,7 @@ foo: for (var _iterator = foo(), _isArray = Array.isArray(_iterator), _i = 0, _i
   var x = _ref;
 
   while (true) {
-    if (!_isArray) _iterator["return"]();
+    if (!_isArray && _iterator["return"]) _iterator["return"]();
 
     break foo;
   }
@@ -55,7 +55,7 @@ foo: for (var _iterator3 = foo(), _isArray3 = Array.isArray(_iterator3), _i3 = 0
   }
 
   var x = _ref3;
-  if (!_isArray3) _iterator3["return"]();
+  if (!_isArray3 && _iterator3["return"]) _iterator3["return"]();
 
   break foo;
 }
@@ -75,7 +75,7 @@ for (var _iterator4 = foo(), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _it
   }
 
   var x = _ref4;
-  if (!_isArray4) _iterator4["return"]();
+  if (!_isArray4 && _iterator4["return"]) _iterator4["return"]();
 
   break;
 }

test/fixtures/transformation/es6-for-of-loose/member-expression/actual.js

@@ -0,0 +1,3 @@
+for (obj.prop of arr) {
+
+}

test/fixtures/transformation/es6-for-of-loose/member-expression/expected.js

@@ -0,0 +1,12 @@
+"use strict";
+
+for (var _iterator = arr, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+  if (_isArray) {
+    if (_i >= _iterator.length) break;
+    obj.prop = _iterator[_i++];
+  } else {
+    _i = _iterator.next();
+    if (_i.done) break;
+    obj.prop = _i.value;
+  }
+}

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

@@ -6,7 +6,7 @@ foo: for (var _iterator = foo()[Symbol.iterator](), _step; !(_step = _iterator.n
   var x = _step.value;
 
   while (true) {
-    _iterator["return"]();
+    if (_iterator["return"]) _iterator["return"]();
 
     break foo;
   }
@@ -22,8 +22,7 @@ foo: for (var _iterator2 = foo()[Symbol.iterator](), _step2; !(_step2 = _iterato
 
 foo: for (var _iterator3 = foo()[Symbol.iterator](), _step3; !(_step3 = _iterator3.next()).done;) {
   var x = _step3.value;
-
-  _iterator3["return"]();
+  if (_iterator3["return"]) _iterator3["return"]();
 
   break foo;
 }
@@ -32,8 +31,7 @@ foo: for (var _iterator3 = foo()[Symbol.iterator](), _step3; !(_step3 = _iterato
 
 for (var _iterator4 = foo()[Symbol.iterator](), _step4; !(_step4 = _iterator4.next()).done;) {
   var x = _step4.value;
-
-  _iterator4["return"]();
+  if (_iterator4["return"]) _iterator4["return"]();
 
   break;
 }

test/fixtures/transformation/es6-for-of/illegal-left/actual.js

@@ -1,3 +0,0 @@
-for (foo.bar of test) {
-
-}

test/fixtures/transformation/es6-for-of/illegal-left/options.json

@@ -1,3 +0,0 @@
-{
-  "throws": "Unknown node type \"MemberExpression\" in ForStatement"
-}

test/fixtures/transformation/es6-for-of/member-expression/actual.js

@@ -0,0 +1,3 @@
+for (obj.prop of arr) {
+
+}

test/fixtures/transformation/es6-for-of/member-expression/expected.js

@@ -0,0 +1,5 @@
+"use strict";
+
+for (var _iterator = arr[Symbol.iterator](), _step; !(_step = _iterator.next()).done;) {
+  obj.prop = _step.value;
+}

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

@@ -1,6 +1,6 @@
-"use strict";
-
 define(["exports", "module"], function (exports, module) {
+  "use strict";
+
   var _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } };
 
   module.exports = foo;

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

@@ -1,6 +1,6 @@
-"use strict";
-
 define(["exports", "foo"], function (exports, _foo) {
+  "use strict";
+
   var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { "default": obj }; };
 
   var _defaults = function (obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value && value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; };

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

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

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

@@ -1,6 +1,6 @@
-"use strict";
-
 define(["exports"], function (exports) {
+  "use strict";
+
   var _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } };
 
   exports.foo7 = foo7;

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

@@ -1,3 +1,3 @@
-"use strict";
-
-define("my custom module name", ["exports"], function (exports) {});
+define("my custom module name", ["exports"], function (exports) {
+  "use strict";
+});

test/fixtures/transformation/es6-modules-amd/get-module-name-option/options.js

@@ -1,5 +0,0 @@
-exports.getModuleName = function () {
-  return "my custom module name";
-};
-
-exports.moduleIds = true;

test/fixtures/transformation/es6-modules-amd/get-module-name-option/options.json

@@ -0,0 +1,4 @@
+{
+  "moduleIds": true,
+  "moduleId": "my custom module name"
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,3 @@
-"use strict";
-
 System.register([], function (_export) {
   var _classCallCheck, _default, Foo;
 
@@ -9,6 +7,8 @@ System.register([], function (_export) {
   return {
     setters: [],
     execute: function () {
+      "use strict";
+
       _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } };
 
       _export("default", 42);

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

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

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

@@ -1,5 +1,3 @@
-"use strict";
-
 System.register([], function (_export) {
   var generator = regeneratorRuntime.mark(function generator() {
     return regeneratorRuntime.wrap(function generator$(context$1$0) {
@@ -19,6 +17,8 @@ System.register([], function (_export) {
 
   return {
     setters: [],
-    execute: function () {}
+    execute: function () {
+      "use strict";
+    }
   };
 });

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);

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

@@ -1,5 +1,3 @@
-"use strict";
-
 System.register([], function (_export) {
   var _classCallCheck, foo, foo2, foo3, foo4, foo5, foo6, foo8;
 
@@ -9,6 +7,8 @@ System.register([], function (_export) {
   return {
     setters: [],
     execute: function () {
+      "use strict";
+
       _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } };
 
       foo = _export("foo", 1);

test/fixtures/transformation/es6-modules-system/get-module-name-option/expected.js

@@ -1,8 +1,8 @@
-"use strict";
-
 System.register("my custom module name", [], function (_export) {
   return {
     setters: [],
-    execute: function () {}
+    execute: function () {
+      "use strict";
+    }
   };
 });

test/fixtures/transformation/es6-modules-system/get-module-name-option/options.js

@@ -1,5 +0,0 @@
-exports.getModuleName = function () {
-  return "my custom module name";
-};
-
-exports.moduleIds = true;

test/fixtures/transformation/es6-modules-system/get-module-name-option/options.json

@@ -0,0 +1,4 @@
+{
+  "moduleIds": true,
+  "moduleId": "my custom module name"
+}

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

@@ -1,5 +1,3 @@
-"use strict";
-
 System.register(["./evens"], function (_export) {
   var isEven, p, isOdd;
 
@@ -14,6 +12,8 @@ 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,5 +1,3 @@
-"use strict";
-
 System.register(["foo"], function (_export) {
   var foo, foo2;
   return {
@@ -7,6 +5,8 @@ System.register(["foo"], function (_export) {
       foo = _foo["default"];
       foo2 = _foo["default"];
     }],
-    execute: function () {}
+    execute: function () {
+      "use strict";
+    }
   };
 });

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 () {}
+    execute: function () {
+      "use strict";
+    }
   };
 });

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

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

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

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

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 () {}
+    execute: function () {
+      "use strict";
+    }
   };
 });

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

@@ -1,5 +1,3 @@
-"use strict";
-
 System.register(["foo", "foo-bar", "./directory/foo-bar"], function (_export) {
   var foo, foo2, bar, bar2, test2;
   return {
@@ -10,6 +8,8 @@ System.register(["foo", "foo-bar", "./directory/foo-bar"], function (_export) {
       bar2 = _foo.foo;
     }, function (_fooBar) {}, function (_directoryFooBar) {}],
     execute: function () {
+      "use strict";
+
       _export("test", test);
 
       test2 = _export("test2", 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);

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

@@ -1,5 +1,3 @@
-"use strict";
-
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports", "module"], factory);
@@ -7,6 +5,8 @@
     factory(exports, module);
   }
 })(function (exports, module) {
+  "use strict";
+
   var _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } };
 
   module.exports = foo;

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

@@ -1,5 +1,3 @@
-"use strict";
-
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports", "foo"], factory);
@@ -7,6 +5,8 @@
     factory(exports, require("foo"));
   }
 })(function (exports, _foo) {
+  "use strict";
+
   var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { "default": obj }; };
 
   var _defaults = function (obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value && value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; };

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

@@ -1,5 +1,3 @@
-"use strict";
-
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports"], factory);
@@ -7,6 +5,8 @@
     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,5 +1,3 @@
-"use strict";
-
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports"], factory);
@@ -7,6 +5,8 @@
     factory(exports);
   }
 })(function (exports) {
+  "use strict";
+
   var _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } };
 
   exports.foo7 = foo7;

test/fixtures/transformation/es6-modules-umd/get-module-name-option/expected.js

@@ -1,9 +1,9 @@
-"use strict";
-
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define("my custom module name", ["exports"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports);
   }
-})(function (exports) {});
+})(function (exports) {
+  "use strict";
+});

test/fixtures/transformation/es6-modules-umd/get-module-name-option/options.js

@@ -1,5 +0,0 @@
-exports.getModuleName = function () {
-  return "my custom module name";
-};
-
-exports.moduleIds = true;

test/fixtures/transformation/es6-modules-umd/get-module-name-option/options.json

@@ -0,0 +1,4 @@
+{
+  "moduleIds": true,
+  "moduleId": "my custom module name"
+}

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

@@ -1,5 +1,3 @@
-"use strict";
-
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports", "./evens"], factory);
@@ -7,6 +5,8 @@
     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,5 +1,3 @@
-"use strict";
-
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports", "foo"], factory);
@@ -7,6 +5,8 @@
     factory(exports, require("foo"));
   }
 })(function (exports, _foo) {
+  "use strict";
+
   var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["default"] : obj; };
 
   var foo = _interopRequire(_foo);

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

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

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

@@ -1,5 +1,3 @@
-"use strict";
-
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports", "foo"], factory);
@@ -7,6 +5,8 @@
     factory(exports, require("foo"));
   }
 })(function (exports, _foo) {
+  "use strict";
+
   var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["default"] : obj; };
 
   var foo = _interopRequire(_foo);

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

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

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

@@ -1,9 +1,9 @@
-"use strict";
-
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports", "foo", "foo-bar", "./directory/foo-bar"], factory);
   } else if (typeof exports !== "undefined") {
     factory(exports, require("foo"), require("foo-bar"), require("./directory/foo-bar"));
   }
-})(function (exports, _foo, _fooBar, _directoryFooBar) {});
+})(function (exports, _foo, _fooBar, _directoryFooBar) {
+  "use strict";
+});

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

@@ -1,5 +1,3 @@
-"use strict";
-
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define("es6-modules-umd/module-name/expected", ["exports"], factory);
@@ -7,5 +5,7 @@
     factory(exports);
   }
 })(function (exports) {
+  "use strict";
+
   foobar();
 });

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

@@ -1,5 +1,3 @@
-"use strict";
-
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(["exports", "foo", "foo-bar", "./directory/foo-bar"], factory);
@@ -7,6 +5,8 @@
     factory(exports, require("foo"), require("foo-bar"), require("./directory/foo-bar"));
   }
 })(function (exports, _foo, _fooBar, _directoryFooBar) {
+  "use strict";
+
   var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["default"] : obj; };
 
   var foo = _interopRequire(_foo);

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

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

test/fixtures/transformation/es6-parameters.default/multiple/actual.js

@@ -1,7 +1,7 @@
-var t = function (t = "foo", f = 5) {
-  return t + " bar " + f;
+var t = function (e = "foo", f = 5) {
+  return e + " bar " + f;
 };
 
-var a = function (t, f = 5) {
-  return t + " bar " + f;
+var a = function (e, f = 5) {
+  return e + " bar " + f;
 };

test/fixtures/transformation/es6-parameters.default/multiple/expected.js

@@ -1,14 +1,14 @@
 "use strict";
 
 var t = function t() {
-  var t = arguments[0] === undefined ? "foo" : arguments[0];
+  var e = arguments[0] === undefined ? "foo" : arguments[0];
   var f = arguments[1] === undefined ? 5 : arguments[1];
 
-  return t + " bar " + f;
+  return e + " bar " + f;
 };
 
-var a = function a(t) {
+var a = function a(e) {
   var f = arguments[1] === undefined ? 5 : arguments[1];
 
-  return t + " bar " + f;
+  return e + " bar " + f;
 };