v4.4.2

Links the babel logo in the readme to the home page

.editorconfig

@@ -5,6 +5,7 @@ insert_final_newline = true
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+end_of_line = lf
 
 [*.{js,json}]
 indent_style = space

.travis.yml

@@ -2,8 +2,8 @@ sudo: false
 language: node_js
 node_js:
   - "0.10"
-  - "0.11"
   - "0.12"
+  - "iojs"
 
 branches:
   except:

CHANGELOG-6to5.md

@@ -7,7 +7,7 @@
  * **Bug Fix**
   * Fix temp variables not being properly pushed inside of `while` loops.
  * **New Feature**
-  * Add `auxilaryComment`/`--auxilary-comment` option that prepends comments to auxilary helpers.
+  * Add `auxiliaryComment`/`--auxiliary-comment` option that prepends comments to auxiliary helpers.
 
 ## 3.6.5
 

CHANGELOG.md

@@ -13,6 +13,57 @@ _Note: Gaps between patch versions are faulty/broken releases._
 
 See [CHANGELOG - 6to5](CHANGELOG-6to5.md) for the pre-4.0.0 version changelog.
 
+## 4.4.2
+
+ * **New Feature**
+  * Add `moduleId` option for specifying a custom module id.
+
+## 4.4.0
+
+ * **New Feature**
+  * `/*** @jsx NAMESPACE **/` comments are now honored by the `react` transformer.
+  * `getModuleName` option.
+  * Infer function expression names. Thanks [@RReverser](https://github.com/RReverser)!
+ * **Bug Fix**
+  * Add proper control flow for tail recursion optimisation.
+ * **Internal**
+  * Remove useless `format` options and move the `format.compact` option to `format`.
+ * **Polish**
+  * Newline handling of the code generator has been heavily improved.
+  * Code generator now deopts whitespace if the input size is >100KB.
+
+## 4.3.0
+
+ * **Breaking Change**
+  * Remove `commonStandard` module formatter and make it the default behaviour of all the strict module formatters.
+
+## 4.2.1
+
+ * **Polish**
+  * Add auxiliary comment to let scoping closure flow control.
+
+## 4.2.0
+
+ * **Polish**
+  * Use an assignment instead of a define for `__esModule` in loose mode.
+ * **Internal**
+  * Add error for `eval();` usage and enable strict mode for parsing.
+
+## 4.1.0
+
+ * **New Feature**
+  * Add `BABEL_CACHE_PATH` and `BABEL_DISABLE_CACHE` environment variables.
+ * **Internal**
+  * Replace many internal util functions with modules. Thanks [@sindresorhus](https://github.com/sindresorhus)!
+
+## 4.0.2
+
+ * **Bug Fix**
+  * Fix generators not properly propagating their internal declarations.
+ * **Polish**
+  * Update setter param length error message.
+  * Use ranges on dependencies.
+
 ## 4.0.0
 
  * 6to5 is now known as Babel.

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2015 Sebastian McKenzie
+Copyright (c) 2014-2015 Sebastian McKenzie <sebmck@gmail.com>
 
 MIT License
 

Makefile

@@ -25,7 +25,7 @@ build:
 	node $(BROWSERIFY_CMD) -e lib/babel/polyfill.js >dist/polyfill.js
 	node $(UGLIFY_CMD) dist/polyfill.js >dist/polyfill.min.js
 
-	node $(BROWSERIFY_CMD) lib/babel/api/browser.js -s to5 >dist/babel.js
+	node $(BROWSERIFY_CMD) lib/babel/api/browser.js -s babel >dist/babel.js
 	node $(UGLIFY_CMD) dist/babel.js >dist/babel.min.js
 
 	node bin/babel-external-helpers >dist/external-helpers.js

README.md

@@ -1,5 +1,7 @@
 <p align="center">
-  <img alt="babel" src="https://raw.githubusercontent.com/babel/logo/master/logo.png" width="546">
+  <a href="https://babeljs.io/">
+    <img alt="babel" src="https://raw.githubusercontent.com/babel/logo/master/logo.png" width="546">
+  </a>
 </p>
 
 <p align="center">
@@ -10,3 +12,7 @@
   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>.
 </p>
+
+<p align="center">
+  For documentation and website issues please visit the <a href="https://github.com/babel/babel.github.io">babel.github.io</a> repo.
+</p>

bin/_babel-node

@@ -1,13 +1,14 @@
 #!/usr/bin/env node
 
-var commander = require("commander");
-var Module    = require("module");
-var babel     = require("../lib/babel/api/node");
-var path      = require("path");
-var repl      = require("repl");
-var util      = require("../lib/babel/util");
-var vm        = require("vm");
-var _         = require("lodash");
+var pathIsAbsolute = require("path-is-absolute");
+var commander      = require("commander");
+var Module         = require("module");
+var babel          = require("../lib/babel/api/node");
+var path           = require("path");
+var repl           = require("repl");
+var util           = require("../lib/babel/util");
+var vm             = require("vm");
+var _              = require("lodash");
 
 var program = new commander.Command("babel-node");
 
@@ -85,7 +86,7 @@ if (program.eval || program.print) {
 
     // make the filename absolute
     var filename = args[0]
-    if (!util.isAbsolute(filename)) args[0] = path.join(process.cwd(), filename);
+    if (!pathIsAbsolute(filename)) args[0] = path.join(process.cwd(), filename);
 
     // add back on node and concat the sliced args
     process.argv = ["node"].concat(args);

bin/babel-minify

@@ -1,7 +0,0 @@
-#!/usr/bin/env node
-
-var opts = require("./babel").opts;
-opts.optional = (opts.optional || []).concat("minification");
-opts.format = {
-  compact: true
-};

bin/babel/file.js

@@ -1,10 +1,10 @@
-var sourceMap = require("source-map");
-var chokidar  = require("chokidar");
-var util2     = require("../../lib/babel/util");
-var path      = require("path");
-var util      = require("./util");
-var fs        = require("fs");
-var _         = require("lodash");
+var sourceMapToComment = require("source-map-to-comment");
+var sourceMap          = require("source-map");
+var chokidar           = require("chokidar");
+var path               = require("path");
+var util               = require("./util");
+var fs                 = require("fs");
+var _                  = require("lodash");
 
 module.exports = function (commander, filenames) {
   var results = [];
@@ -42,7 +42,7 @@ module.exports = function (commander, filenames) {
     });
 
     if (commander.sourceMapsInline || (!commander.outFile && commander.sourceMaps)) {
-      code += "\n" + util2.sourceMapToComment(map);
+      code += "\n" + sourceMapToComment(map);
     }
 
     return {

bin/babel/index.js

@@ -15,6 +15,7 @@ commander.option("-r, --external-helpers", "Replace helpers with references to a
 commander.option("-e, --experimental", "Enable experimental support for proposed ES7 features");
 commander.option("-p, --playground", "Enable playground support");
 
+commander.option("-c, --compact [mode]", "When set to \"auto\" compact is `true` when the input size exceeds 100KB. (auto|true|false)", "auto");
 commander.option("-m, --modules [modules]", "Module formatter type to use [common]", "common");
 commander.option("-l, --whitelist [whitelist]", "Whitelist of transformers to ONLY use", util.list);
 commander.option("-b, --blacklist [blacklist]", "Blacklist of transformers to NOT use", util.list);
@@ -26,7 +27,7 @@ commander.option("-c, --remove-comments", "Remove comments from the compiled cod
 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, --auxilary-comment [comment]", "Comment text to prepend to all auxilary code");
+commander.option("-a, --auxiliary-comment [comment]", "Comment text to prepend to all auxiliary code");
 
 commander.on("--help", function () {
   var outKeys = function (title, obj) {
@@ -100,7 +101,7 @@ if (errors.length) {
 
 exports.opts = {
   keepModuleIdExtensions: commander.keepModuleIdExtensions,
-  auxilaryComment:        commander.auxilaryComment,
+  auxiliaryComment:       commander.auxiliaryComment,
   externalHelpers:        commander.externalHelpers,
   sourceMapName:          commander.outFile,
   experimental:           commander.experimental,
@@ -113,20 +114,16 @@ exports.opts = {
   optional:               commander.optional,
   comments:               !commander.removeComments,
   modules:                commander.modules,
+  compact:                commander.compact,
   loose:                  commander.loose
 };
 
-setTimeout(function () {
-  // this is just a hack to give `babel-minify` and other files including this
-  // time to modify `exports.opts`
+var fn;
 
-  var fn;
+if (commander.outDir) {
+  fn = require("./dir");
+} else {
+  fn = require("./file");
+}
 
-  if (commander.outDir) {
-    fn = require("./dir");
-  } else {
-    fn = require("./file");
-  }
-
-  fn(commander, filenames, exports.opts);
-}, 0);
+fn(commander, filenames, exports.opts);

bin/deprecated/6to5-minify

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-console.error("`6to5-minify` has been renamed to `babel-minify`");
-require("../babel-minify");

lib/babel/api/register/cache.js

@@ -4,7 +4,7 @@ var path = require("path");
 var os   = require("os");
 var fs   = require("fs");
 
-var FILENAME = path.join(os.tmpdir(), "babel.json");
+var FILENAME = process.env.BABEL_CACHE_PATH || path.join(os.tmpdir(), "babel.json");
 var data = {};
 
 exports.save = function () {
@@ -12,6 +12,8 @@ exports.save = function () {
 };
 
 exports.load = function () {
+  if (process.env.BABEL_DISABLE_CACHE) return;
+
   process.on("exit", exports.save);
 
   var sigint = function () {

lib/babel/generation/buffer.js

@@ -2,10 +2,11 @@
 
 module.exports = Buffer;
 
+var repeating = require("repeating");
+var trimRight = require("trim-right");
 var isBoolean = require("lodash/lang/isBoolean");
 var includes  = require("lodash/collection/includes");
 var isNumber  = require("lodash/lang/isNumber");
-var util      = require("../util");
 
 function Buffer(position, format) {
   this.position = position;
@@ -15,14 +16,14 @@ function Buffer(position, format) {
 }
 
 Buffer.prototype.get = function () {
-  return util.trimRight(this.buf);
+  return trimRight(this.buf);
 };
 
 Buffer.prototype.getIndent = function () {
   if (this.format.compact || this.format.concise) {
     return "";
   } else {
-    return util.repeat(this._indent, this.format.indent.style);
+    return repeating(this.format.indent.style, this._indent);
   }
 };
 
@@ -58,13 +59,13 @@ Buffer.prototype.keyword = function (name) {
 
 Buffer.prototype.space = function () {
   if (this.format.compact) return;
-
-  if (this.buf && !this.isLast([" ", "\n"])) {
+  if (this.buf && !this.isLast(" ") && !this.isLast("\n")) {
     this.push(" ");
   }
 };
 
 Buffer.prototype.removeLast = function (cha) {
+  if (this.format.compact) return;
   if (!this.isLast(cha)) return;
 
   this.buf = this.buf.substr(0, this.buf.length - 1);
@@ -72,7 +73,9 @@ Buffer.prototype.removeLast = function (cha) {
 };
 
 Buffer.prototype.newline = function (i, removeLast) {
-  if (this.format.compact || this.format.concise) {
+  if (this.format.compact) return;
+
+  if (this.format.concise) {
     this.space();
     return;
   }
@@ -80,11 +83,14 @@ Buffer.prototype.newline = function (i, removeLast) {
   removeLast = removeLast || false;
 
   if (isNumber(i)) {
-    if (this.endsWith("{\n")) i--;
-    if (this.endsWith(util.repeat(i, "\n"))) return;
+    i = Math.min(2, i);
 
-    while (i--) {
+    if (this.endsWith("{\n") || this.endsWith(":\n")) i--;
+    if (i <= 0) return;
+
+    while (i > 0) {
       this._newline(removeLast);
+      i--;
     }
     return;
   }
@@ -97,11 +103,13 @@ Buffer.prototype.newline = function (i, removeLast) {
 };
 
 Buffer.prototype._newline = function (removeLast) {
+  // never allow more than two lines
+  if (this.endsWith("\n\n")) return;
+
+  // remove the last newline
   if (removeLast && this.isLast("\n")) this.removeLast("\n");
 
   this.removeLast(" ");
-
-  // remove whitespace if last character was a newline
   this._removeSpacesAfterLastNewline();
   this._push("\n");
 };
@@ -109,6 +117,7 @@ Buffer.prototype._newline = function (removeLast) {
 /**
  * If buffer ends with a newline and some spaces after it, trim those spaces.
  */
+
 Buffer.prototype._removeSpacesAfterLastNewline = function () {
   var lastNewlineIndex = this.buf.lastIndexOf("\n");
   if (lastNewlineIndex === -1)
@@ -129,7 +138,7 @@ Buffer.prototype._removeSpacesAfterLastNewline = function () {
 };
 
 Buffer.prototype.push = function (str, noIndent) {
-  if (this._indent && !noIndent && str !== "\n") {
+  if (!this.format.compact && this._indent && !noIndent && str !== "\n") {
     // we have an indent level and we aren't pushing a newline
     var indent = this.getIndent();
 
@@ -137,7 +146,7 @@ Buffer.prototype.push = function (str, noIndent) {
     str = str.replace(/\n/g, "\n" + indent);
 
     // we've got a newline before us so prepend on the indentation
-    if (this.isLast("\n")) str = indent + str;
+    if (this.isLast("\n")) this._push(indent);
   }
 
   this._push(str);
@@ -149,13 +158,13 @@ Buffer.prototype._push = function (str) {
 };
 
 Buffer.prototype.endsWith = function (str) {
-  var d = this.buf.length - str.length;
-  return d >= 0 && this.buf.lastIndexOf(str) === d;
+  return this.buf.slice(-str.length) === str;
 };
 
-Buffer.prototype.isLast = function (cha, trimRight) {
+Buffer.prototype.isLast = function (cha) {
+  if (this.format.compact) return false;
+
   var buf = this.buf;
-  if (trimRight) buf = util.trimRight(buf);
   var last = buf[buf.length - 1];
 
   if (Array.isArray(cha)) {

lib/babel/generation/generators/expressions.js

@@ -1,8 +1,8 @@
 "use strict";
 
-var util     = require("../../util");
-var t        = require("../../types");
-var isNumber = require("lodash/lang/isNumber");
+var isInteger = require("is-integer");
+var isNumber  = require("lodash/lang/isNumber");
+var t         = require("../../types");
 
 exports.UnaryExpression = function (node, print) {
   var hasSpace = /[a-z]$/.test(node.operator);
@@ -46,11 +46,9 @@ exports.ConditionalExpression = function (node, print) {
 exports.NewExpression = function (node, print) {
   this.push("new ");
   print(node.callee);
-  if (node.arguments.length || this.format.parentheses) {
-    this.push("(");
-    print.list(node.arguments);
-    this.push(")");
-  }
+  this.push("(");
+  print.list(node.arguments);
+  this.push(")");
 };
 
 exports.SequenceExpression = function (node, print) {
@@ -146,7 +144,7 @@ exports.MemberExpression = function (node, print) {
     this.push("]");
   } else {
     // 5..toFixed(2);
-    if (t.isLiteral(obj) && util.isInteger(obj.value) && !SCIENTIFIC_NOTATION.test(obj.value.toString())) {
+    if (t.isLiteral(obj) && isInteger(obj.value) && !SCIENTIFIC_NOTATION.test(obj.value.toString())) {
       this.push(".");
     }
 

lib/babel/generation/generators/modules.js

@@ -62,6 +62,10 @@ exports.ImportDeclaration = function (node, print) {
 
   this.push("import ");
 
+  if (node.isType) {
+    this.push("type ");
+  }
+
   var specfiers = node.specifiers;
   if (specfiers && specfiers.length) {
     var foundImportSpecifier = false;

lib/babel/generation/generators/statements.js

@@ -1,7 +1,7 @@
 "use strict";
 
-var util = require("../../util");
-var t    = require("../../types");
+var repeating = require("repeating");
+var t         = require("../../types");
 
 exports.WithStatement = function (node, print) {
   this.keyword("with");
@@ -22,12 +22,7 @@ exports.IfStatement = function (node, print) {
 
   if (node.alternate) {
     if (this.isLast("}")) this.space();
-    this.keyword("else");
-
-    if (this.format.format && !t.isBlockStatement(node.alternate)) {
-      this.push(" ");
-    }
-
+    this.push("else ");
     print.indentOnComments(node.alternate);
   }
 };
@@ -153,7 +148,14 @@ exports.SwitchStatement = function (node, print) {
   this.push(")");
   this.space();
   this.push("{");
-  print.sequence(node.cases, { indent: true });
+
+  print.sequence(node.cases, {
+    indent: true,
+    addNewlines: function (leading, cas) {
+      if (!leading && node.cases[node.cases.length - 1] === cas) return -1;
+    }
+  });
+
   this.push("}");
 };
 
@@ -166,8 +168,10 @@ exports.SwitchCase = function (node, print) {
     this.push("default:");
   }
 
-  this.newline();
-  print.sequence(node.consequent, { indent: true });
+  if (node.consequent.length) {
+    this.newline();
+    print.sequence(node.consequent, { indent: true });
+  }
 };
 
 exports.DebuggerStatement = function () {
@@ -189,8 +193,8 @@ exports.VariableDeclaration = function (node, print, parent) {
   }
 
   var sep = ",";
-  if (hasInits) {
-    sep += "\n" + util.repeat(node.kind.length + 1);
+  if (!this.format.compact && hasInits) {
+    sep += "\n" + repeating(" ", node.kind.length + 1);
   } else {
     sep += " ";
   }

lib/babel/generation/generators/types.js

@@ -72,7 +72,7 @@ exports.ArrayPattern = function (node, print) {
       // both (all) of the holes.
       self.push(",");
     } else {
-      if (i > 0 && !self.format.compact) self.push(" ");
+      if (i > 0) self.push(" ");
       print(elem);
       if (i < len - 1) self.push(",");
     }

lib/babel/generation/index.js

@@ -9,13 +9,13 @@ module.exports.CodeGenerator = CodeGenerator;
 
 var detectIndent = require("detect-indent");
 var Whitespace   = require("./whitespace");
+var repeating    = require("repeating");
 var SourceMap    = require("./source-map");
 var Position     = require("./position");
+var messages     = require("../messages");
 var Buffer       = require("./buffer");
 var extend       = require("lodash/object/extend");
-var merge        = require("lodash/object/merge");
 var each         = require("lodash/collection/each");
-var util         = require("../util");
 var n            = require("./node");
 var t            = require("../types");
 
@@ -28,7 +28,7 @@ function CodeGenerator(ast, opts, code) {
   this.opts     = opts;
   this.ast      = ast;
 
-  this.whitespace = new Whitespace(this.tokens, this.comments);
+  this.whitespace = new Whitespace(this.tokens, this.comments, this.format);
   this.position   = new Position;
   this.map        = new SourceMap(this.position, opts, code);
   this.buffer     = new Buffer(this.position, this.format);
@@ -47,17 +47,25 @@ CodeGenerator.normalizeOptions = function (code, opts) {
     if (indent && indent !== " ") style = indent;
   }
 
-  return merge({
-    parentheses: true,
+  var format = {
     comments: opts.comments == null || opts.comments,
-    compact: false,
-    concise: false,
+    compact: opts.compact,
     indent: {
       adjustMultilineComment: true,
       style: style,
       base: 0
     }
-  }, opts.format || {});
+  };
+
+  if (format.compact === "auto") {
+    format.compact = code.length > 100000; // 100KB
+
+    if (format.compact) {
+      console.error(messages.get("codeGeneratorDeopt", opts.filename, "100KB"));
+    }
+  }
+
+  return format;
 };
 
 CodeGenerator.generators = {
@@ -115,11 +123,7 @@ CodeGenerator.prototype.buildPrint = function (parent) {
 
   print.list = function (items, opts) {
     opts = opts || {};
-
-    var sep = opts.separator || ", ";
-    if (self.format.compact) sep = ",";
-    opts.separator = sep;
-
+    opts.separator = opts.separator || ", ";
     print.join(items, opts);
   };
 
@@ -167,13 +171,14 @@ CodeGenerator.prototype.print = function (node, parent, opts) {
     } else {
       // generated node
       if (!leading) lines++; // always include at least a single line after
+      if (opts.addNewlines) lines += opts.addNewlines(leading, node) || 0;
 
       var needs = n.needsWhitespaceAfter;
       if (leading) needs = n.needsWhitespaceBefore;
-      lines += needs(node, parent);
+      if (needs(node, parent)) lines++;
 
       // generated nodes can't add starting file whitespace
-      if (!self.buffer.get()) lines = 0;
+      if (!self.buffer.buf) lines = 0;
     }
 
     self.newline(lines);
@@ -227,6 +232,7 @@ CodeGenerator.prototype.printJoin = function (print, nodes, opts) {
   each(nodes, function (node, i) {
     print(node, {
       statement: opts.statement,
+      addNewlines: opts.addNewlines,
       after: function () {
         if (opts.iterator) {
           opts.iterator(node, i);
@@ -302,6 +308,7 @@ CodeGenerator.prototype._getComments = function (key, node) {
 
 CodeGenerator.prototype._printComments = function (comments) {
   if (this.format.compact) return;
+
   if (!this.format.comments) return;
   if (!comments || !comments.length) return;
 
@@ -344,7 +351,7 @@ CodeGenerator.prototype._printComments = function (comments) {
       }
 
       var indent = Math.max(self.indentSize(), column);
-      val = val.replace(/\n/g, "\n" + util.repeat(indent));
+      val = val.replace(/\n/g, "\n" + repeating(" ", indent));
     }
 
     if (column === 0) {

lib/babel/generation/node/index.js

@@ -4,9 +4,9 @@ module.exports = Node;
 
 var whitespace = require("./whitespace");
 var parens     = require("./parentheses");
-var t          = require("../../types");
 var each       = require("lodash/collection/each");
 var some       = require("lodash/collection/some");
+var t          = require("../../types");
 
 var find = function (obj, node, parent) {
   if (!obj) return;
@@ -42,14 +42,19 @@ Node.needsWhitespace = function (node, parent, type) {
     node = node.expression;
   }
 
-  var lines = find(whitespace[type].nodes, node, parent);
-  if (lines) return lines;
+  var linesInfo = find(whitespace.nodes, node, parent);
 
-  each(find(whitespace[type].list, node, parent), function (expr) {
-    lines = Node.needsWhitespace(expr, node, type);
-    if (lines) return false;
-  });
-  return lines || 0;
+  if (!linesInfo) {
+    var items = find(whitespace.list, node, parent);
+    if (items) {
+      for (var i = 0; i < items.length; i++) {
+        linesInfo = Node.needsWhitespace(items[i], node, type);
+        if (linesInfo) break;
+      }
+    }
+  }
+
+  return (linesInfo && linesInfo[type]) || 0;
 };
 
 Node.needsWhitespaceBefore = function (node, parent) {

lib/babel/generation/node/whitespace.js

@@ -1,84 +1,159 @@
 "use strict";
 
-var t        = require("../../types");
-var each     = require("lodash/collection/each");
-var map      = require("lodash/collection/map");
-var isNumber = require("lodash/lang/isNumber");
+var isBoolean = require("lodash/lang/isBoolean");
+var each      = require("lodash/collection/each");
+var map       = require("lodash/collection/map");
+var t         = require("../../types");
 
-exports.before = {
-  nodes: {
-    Property: function (node, parent) {
-      if (parent.properties[0] === node) {
-        return 1;
-      }
-    },
+var crawl = function (node, state) {
+  state = state || {};
 
-    SpreadProperty: function (node, parent) {
-      return exports.before.nodes.Property(node, parent);
-    },
+  if (t.isMemberExpression(node)) {
+    crawl(node.object, state);
+    if (node.computed) crawl(node.property, state);
+  } else if (t.isBinary(node) || t.isAssignmentExpression(node)) {
+    crawl(node.left, state);
+    crawl(node.right, state);
+  } else if (t.isCallExpression(node)) {
+    state.hasCall = true;
+    crawl(node.callee, state);
+  } else if (t.isFunction(node)) {
+    state.hasFunction = true;
+  } else if (t.isIdentifier(node)) {
+    state.hasHelper = state.hasHelper || isHelper(node.callee);
+  }
 
-    SwitchCase: function (node, parent) {
-      if (parent.cases[0] === node) {
-        return 1;
-      }
-    },
+  return state;
+};
 
-    CallExpression: function (node) {
-      if (t.isFunction(node.callee)) {
-        return 1;
-      }
-    }
+var isHelper = function (node) {
+  if (t.isMemberExpression(node)) {
+    return isHelper(node.object) || isHelper(node.property);
+  } else if (t.isIdentifier(node)) {
+    return node.name === "require" || node.name[0] === "_";
+  } else if (t.isCallExpression(node)) {
+    return isHelper(node.callee);
+  } else if (t.isBinary(node) || t.isAssignmentExpression(node)) {
+    return (t.isIdentifier(node.left) && isHelper(node.left)) || isHelper(node.right);
+  } else {
+    return false;
   }
 };
 
-exports.after = {
-  nodes: {
-    LogicalExpression: function (node) {
-      return t.isFunction(node.left) || t.isFunction(node.right);
-    },
+var isType = function (node) {
+  return t.isLiteral(node) || t.isObjectExpression(node) || t.isArrayExpression(node) ||
+         t.isIdentifier(node) || t.isMemberExpression(node);
+};
 
-    AssignmentExpression: function (node) {
-      if (t.isFunction(node.right)) {
-        return 1;
+exports.nodes = {
+  AssignmentExpression: function (node) {
+    var state = crawl(node.right);
+    if ((state.hasCall && state.hasHelper) || state.hasFunction) {
+      return {
+        before: state.hasFunction,
+        after: true
+      };
+    }
+  },
+
+  SwitchCase: function (node, parent) {
+    return {
+      before: node.consequent.length || parent.cases[0] === node
+    };
+  },
+
+  LogicalExpression: function (node) {
+    if (t.isFunction(node.left) || t.isFunction(node.right)) {
+      return {
+        after: true
+      };
+    }
+  },
+
+  Literal: function (node) {
+    if (node.value === "use strict") {
+      return {
+        after: true
+      };
+    }
+  },
+
+  CallExpression: function (node) {
+    if (t.isFunction(node.callee) || isHelper(node)) {
+      return {
+        before: true,
+        after: true
+      };
+    }
+  },
+
+  VariableDeclaration: function (node) {
+    for (var i = 0; i < node.declarations.length; i++) {
+      var declar = node.declarations[i];
+
+      var enabled = isHelper(declar.id) && !isType(declar.init);
+      if (!enabled) {
+        var state = crawl(declar.init);
+        enabled = (isHelper(declar.init) && state.hasCall) || state.hasFunction;
+      }
+
+      if (enabled) {
+        return {
+          before: true,
+          after: true
+        };
       }
     }
   },
 
-  list: {
-    VariableDeclaration: function (node) {
-      return map(node.declarations, "init");
-    },
-
-    ArrayExpression: function (node) {
-      return node.elements;
-    },
-
-    ObjectExpression: function (node) {
-      return node.properties;
+  IfStatement: function (node) {
+    if (t.isBlockStatement(node.consequent)) {
+      return {
+        before: true,
+        after: true
+      };
     }
   }
 };
 
+exports.nodes.Property =
+exports.nodes.SpreadProperty = function (node, parent) {
+  if (parent.properties[0] === node) {
+    return {
+      before: true
+    };
+  }
+};
+
+exports.list = {
+  VariableDeclaration: function (node) {
+    return map(node.declarations, "init");
+  },
+
+  ArrayExpression: function (node) {
+    return node.elements;
+  },
+
+  ObjectExpression: function (node) {
+    return node.properties;
+  }
+};
+
 each({
-  Function: 1,
-  Class: 1,
-  For: 1,
-  ArrayExpression: { after: 1 },
-  ObjectExpression: { after: 1 },
-  SwitchStatement: 1,
-  IfStatement: { before: 1 },
-  CallExpression: { after: 1 },
-  Literal: { after: 1 }
+  Function: true,
+  Class: true,
+  Loop: true,
+  LabeledStatement: true,
+  SwitchStatement: true,
+  TryStatement: true
 }, function (amounts, type) {
-  if (isNumber(amounts)) {
+  if (isBoolean(amounts)) {
     amounts = { after: amounts, before: amounts };
   }
 
   each([type].concat(t.FLIPPED_ALIAS_KEYS[type] || []), function (type) {
-    each(amounts, function (amount, key) {
-      exports[key].nodes[type] = function () {
-        return amount;
-      };
-    });
+    exports.nodes[type] = function () {
+      return amounts;
+    };
   });
 });

lib/babel/generation/whitespace.js

@@ -13,11 +13,13 @@ var sortBy = require("lodash/collection/sortBy");
  * @param {Number} max Array length
  * @returns {Number} shiftedIndex
  */
+
 function getLookupIndex(i, base, max) {
   i += base;
 
-  if (i >= max)
+  if (i >= max) {
     i -= max;
+  }
 
   return i;
 }

lib/babel/helpers/clone.js

@@ -1,12 +0,0 @@
-"use strict";
-
-module.exports = function cloneDeep(obj) {
-  var obj2 = {};
-  if (!obj) return obj2;
-
-  for (var key in obj) {
-    obj2[key] = obj[key];
-  }
-
-  return obj2;
-};

lib/babel/helpers/code-frame.js

@@ -1,9 +1,8 @@
 // syntax highlighting based on https://github.com/dominictarr/ansi-highlight by the fantastic Dominic Tarr
 
-var supportsColor = require("supports-color");
-var tokenize      = require("js-tokenizer");
-var chalk         = require("chalk");
-var util          = require("../util");
+var repeating = require("repeating");
+var tokenize  = require("js-tokenizer");
+var chalk     = require("chalk");
 
 var defs = {
   string1:  "red",
@@ -43,7 +42,7 @@ var highlight = function (text) {
 module.exports = function (lines, lineNumber, colNumber) {
   colNumber = Math.max(colNumber, 0);
 
-  if (supportsColor) {
+  if (chalk.supportsColor) {
     lines = highlight(lines);
   }
 
@@ -63,15 +62,15 @@ module.exports = function (lines, lineNumber, colNumber) {
 
     var gutter = curr === lineNumber ? "> " : "  ";
 
-    var sep = curr + util.repeat(width + 1);
+    var sep = curr + repeating(" ", width + 1);
     gutter += sep + "| ";
 
     var str = gutter + line;
 
     if (colNumber && curr === lineNumber) {
       str += "\n";
-      str += util.repeat(gutter.length - 2);
-      str += "|" + util.repeat(colNumber) + "^";
+      str += repeating(" ", gutter.length - 2);
+      str += "|" + repeating(" ", colNumber) + "^";
     }
 
     return str;

lib/babel/helpers/levenshtein.js

@@ -1,38 +0,0 @@
-// taken from stackoverflow, it's crap i know.
-
-module.exports = function (a, b) {
-  if (a.length === 0) return b.length;
-  if (b.length === 0) return a.length;
-
-  var matrix = [];
-
-  // increment along the first column of each row
-  var i;
-  for (i = 0; i <= b.length; i++) {
-    matrix[i] = [i];
-  }
-
-  // increment each column in the first row
-  var j;
-  for (j = 0; j <= a.length; j++) {
-    matrix[0][j] = j;
-  }
-
-  // Fill in the rest of the matrix
-  for (i = 1; i <= b.length; i++) {
-    for (j = 1; j <= a.length; j++) {
-      if (b.charAt(i - 1) == a.charAt(j - 1)) {
-        matrix[i][j] = matrix[i - 1][j - 1];
-      } else {
-        matrix[i][j] = Math.min(
-          matrix[i - 1][j - 1] + 1, // substitution
-          Math.min(
-            matrix[i][j - 1] + 1, // insertion
-            matrix[i - 1][j] + 1) // deletion
-          );
-      }
-    }
-  }
-
-  return matrix[b.length][a.length];
-};

lib/babel/messages.js

@@ -9,14 +9,16 @@ exports.messages = {
   scopeDuplicateDeclaration: "Duplicate declaration $1",
   undeclaredVariable: "Reference to undeclared variable $1",
   undeclaredVariableSuggestion: "Reference to undeclared variable $1 - did you mean $2?",
-  settersInvalidParamLength: "Setters must have only one parameter",
+  settersInvalidParamLength: "Setters must have exactly one parameter",
   noAssignmentsInForHead: "No assignments allowed in for-in/of head",
   expectedMemberExpressionOrIdentifier: "Expected type MemeberExpression or Identifier",
   invalidParentForThisNode: "We don't know how to handle this node within the current parent - please open an issue",
   readOnly: "$1 is read-only",
   modulesIllegalExportName: "Illegal export $1",
   unknownForHead: "Unknown node type $1 in ForStatement",
-  didYouMean: "Did you mean $1?"
+  didYouMean: "Did you mean $1?",
+  evalInStrictMode: "eval is not allowed in strict mode",
+  codeGeneratorDeopt: "Note: The code generator has deoptimised the styling of $1 as it exceeds the max of $2."
 };
 
 exports.get = function (key) {

lib/babel/transformation/file.js

@@ -2,20 +2,21 @@
 
 module.exports = File;
 
-var SHEBANG_REGEX = /^\#\!.*/;
-
-var isFunction = require("lodash/lang/isFunction");
-var transform  = require("./index");
-var generate   = require("../generation");
-var defaults   = require("lodash/object/defaults");
-var includes   = require("lodash/collection/includes");
-var clone      = require("../helpers/clone");
-var parse      = require("../helpers/parse");
-var Scope      = require("../traversal/scope");
-var util       = require("../util");
-var path       = require("path");
-var each       = require("lodash/collection/each");
-var t          = require("../types");
+var sourceMapToComment = require("source-map-to-comment");
+var shebangRegex       = require("shebang-regex");
+var isFunction         = require("lodash/lang/isFunction");
+var transform          = require("./index");
+var generate           = require("../generation");
+var defaults           = require("lodash/object/defaults");
+var includes           = require("lodash/collection/includes");
+var assign             = require("lodash/object/assign");
+var parse              = require("../helpers/parse");
+var Scope              = require("../traversal/scope");
+var slash              = require("slash");
+var util               = require("../util");
+var path               = require("path");
+var each               = require("lodash/collection/each");
+var t                  = require("../types");
 
 function File(opts) {
   this.dynamicImportedNoDefault = [];
@@ -59,7 +60,7 @@ File.helpers = [
   "object-destructuring-empty",
   "temporal-undefined",
   "temporal-assert-defined",
-  "tail-call"
+  "self-global"
 ];
 
 File.validOptions = [
@@ -81,12 +82,17 @@ File.validOptions = [
   "keepModuleIdExtensions",
   "code",
   "ast",
-  "format",
   "playground",
   "experimental",
-  "resolveModuleSource",
   "externalHelpers",
-  "auxilaryComment",
+  "auxiliaryComment",
+  "compact",
+
+  "resolveModuleSource",
+  "moduleId",
+
+  // legacy
+  "format",
 
   // these are used by plugins
   "ignore",
@@ -96,7 +102,7 @@ File.validOptions = [
 ];
 
 File.prototype.normalizeOptions = function (opts) {
-  opts = clone(opts);
+  opts = assign({}, opts);
 
   for (var key in opts) {
     if (key[0] !== "_" && File.validOptions.indexOf(key) < 0) {
@@ -112,7 +118,6 @@ File.prototype.normalizeOptions = function (opts) {
     experimental:           false,
     reactCompat:            false,
     playground:             false,
-    whitespace:             true,
     moduleIds:              false,
     blacklist:              [],
     whitelist:              [],
@@ -121,15 +126,20 @@ File.prototype.normalizeOptions = function (opts) {
     comments:               true,
     filename:               "unknown",
     modules:                "common",
+    compact:                "auto",
     loose:                  [],
     code:                   true,
     ast:                    true
   });
 
   // normalize windows path separators to unix
-  opts.filename = util.normalisePathSeparator(opts.filename);
+  opts.filename = slash(opts.filename);
   if (opts.sourceRoot) {
-    opts.sourceRoot = util.normalisePathSeparator(opts.sourceRoot);
+    opts.sourceRoot = slash(opts.sourceRoot);
+  }
+
+  if (opts.moduleId) {
+    opts.moduleIds = true;
   }
 
   opts.basename = path.basename(opts.filename, path.extname(opts.filename));
@@ -137,6 +147,7 @@ File.prototype.normalizeOptions = function (opts) {
   opts.blacklist = util.arrayify(opts.blacklist);
   opts.whitelist = util.arrayify(opts.whitelist);
   opts.optional  = util.arrayify(opts.optional);
+  opts.compact   = util.booleanify(opts.compact);
   opts.loose     = util.arrayify(opts.loose);
 
   if (includes(opts.loose, "all") || includes(opts.loose, true)) {
@@ -175,8 +186,7 @@ File.prototype.normalizeOptions = function (opts) {
 
   if (opts.reactCompat) {
     opts.optional.push("reactCompat");
-    console.error("The reactCompat option has been moved into the optional transformer " +
-                  "`reactCompat` - backwards compatibility will be removed in v4.0.0");
+    console.error("The reactCompat option has been moved into the optional transformer `reactCompat`");
   }
 
   var ensureEnabled = function (key) {
@@ -245,12 +255,13 @@ File.prototype.getModuleFormatter = function (type) {
 };
 
 File.prototype.parseShebang = function (code) {
-  var shebangMatch = code.match(SHEBANG_REGEX);
+  var shebangMatch = shebangRegex.exec(code);
+
   if (shebangMatch) {
     this.shebang = shebangMatch[0];
 
     // remove shebang
-    code = code.replace(SHEBANG_REGEX, "");
+    code = code.replace(shebangRegex, "");
   }
 
   return code;
@@ -300,8 +311,8 @@ File.prototype.isConsequenceExpressionStatement = function (node) {
   return t.isExpressionStatement(node) && this.lastStatements.indexOf(node) >= 0;
 };
 
-File.prototype.attachAuxilaryComment = function (node) {
-  var comment = this.opts.auxilaryComment;
+File.prototype.attachAuxiliaryComment = function (node) {
+  var comment = this.opts.auxiliaryComment;
   if (comment) {
     node.leadingComments = node.leadingComments || [];
     node.leadingComments.push({
@@ -366,7 +377,7 @@ File.prototype.parse = function (code) {
   var opts = this.opts;
 
   opts.allowImportExportEverywhere = this.isLoose("es6.modules");
-  //opts.strictMode = this.transformers.useStrict.canRun();
+  opts.strictMode = this.transformers.useStrict.canRun();
 
   return parse(opts, code, function (tree) {
     self.transform(tree);
@@ -454,7 +465,7 @@ File.prototype.generate = function () {
   }
 
   if (opts.sourceMap === "inline") {
-    result.code += "\n" + util.sourceMapToComment(result.map);
+    result.code += "\n" + sourceMapToComment(result.map);
     result.map = null;
   }
 

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

@@ -73,7 +73,7 @@ module.exports = function (exports, opts) {
       };
 
       if (opts.pre) {
-        opts.pre(state);
+        opts.pre(state, file);
       }
 
       var attribs = node.attributes;
@@ -86,7 +86,7 @@ module.exports = function (exports, opts) {
       args.push(attribs);
 
       if (opts.post) {
-        opts.post(state);
+        opts.post(state, file);
       }
 
       return state.call || t.callExpression(state.callee, args);

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

@@ -1,21 +0,0 @@
-"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/index.js

@@ -41,12 +41,7 @@ transform._ensureTransformerNames = function (type, rawKeys) {
       keys = keys.concat(transform.namespaces[key]);
     } else {
       // invalid key
-      throw new ReferenceError(
-        "Unknown transformer " + key + " specified in " + type + " - " +
-        "transformer key names have been changed in 3.0.0 see " +
-        "the changelog for more info " +
-        "https://github.com/babel/babel/blob/master/CHANGELOG.md#300"
-      );
+      throw new ReferenceError("Unknown transformer " + key + " specified in " + type);
     }
   }
 

lib/babel/transformation/modules/_default.js

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

lib/babel/transformation/modules/_strict.js

@@ -4,6 +4,7 @@ var util = require("../../util");
 
 module.exports = function (Parent) {
   var Constructor = function () {
+    this.noInteropRequireImport = true;
     this.noInteropRequireExport = true;
     Parent.apply(this, arguments);
   };

lib/babel/transformation/modules/common-standard.js

@@ -1,13 +0,0 @@
-"use strict";
-
-module.exports = CommonStandardFormatter;
-
-var CommonStrictFormatter = require("./common-strict");
-var util = require("../../util");
-
-function CommonStandardFormatter() {
-  this.noInteropRequireImport = true;
-  CommonStrictFormatter.apply(this, arguments);
-}
-
-util.inherits(CommonStandardFormatter, CommonStrictFormatter);

lib/babel/transformation/modules/common.js

@@ -20,7 +20,9 @@ CommonJSFormatter.prototype.init = function () {
   scope.rename("module");
 
   if (!this.noInteropRequireImport && this.hasNonDefaultExports) {
-    file.ast.program.body.push(util.template("exports-module-declaration", true));
+    var templateName = "exports-module-declaration";
+    if (this.file.isLoose("es6.modules")) templateName += "-loose";
+    file.ast.program.body.push(util.template(templateName, true));
   }
 };
 

lib/babel/transformation/modules/index.js

@@ -1,11 +1,10 @@
 module.exports = {
-  commonStandard: require("./common-standard"),
-  commonStrict:   require("./common-strict"),
-  amdStrict:      require("./amd-strict"),
-  umdStrict:      require("./umd-strict"),
-  common:         require("./common"),
-  system:         require("./system"),
-  ignore:         require("./ignore"),
-  amd:            require("./amd"),
-  umd:            require("./umd")
+  commonStrict: require("./common-strict"),
+  amdStrict:    require("./amd-strict"),
+  umdStrict:    require("./umd-strict"),
+  common:       require("./common"),
+  system:       require("./system"),
+  ignore:       require("./ignore"),
+  amd:          require("./amd"),
+  umd:          require("./umd")
 };

lib/babel/transformation/modules/system.js

@@ -4,12 +4,11 @@ module.exports = SystemFormatter;
 
 var DefaultFormatter = require("./_default");
 var AMDFormatter     = require("./amd");
-var useStrict        = require("../helpers/use-strict");
 var util             = require("../../util");
-var t                = require("../../types");
 var last             = require("lodash/array/last");
 var each             = require("lodash/collection/each");
 var map              = require("lodash/collection/map");
+var t                = require("../../types");
 
 function SystemFormatter(file) {
   this.exportIdentifier = file.scope.generateUidIdentifier("export");
@@ -193,9 +192,5 @@ SystemFormatter.prototype.transform = function (program) {
 
   handlerBody.push(returnStatement);
 
-  if (useStrict.has(block)) {
-    handlerBody.unshift(block.body.shift());
-  }
-
   program.body = [runner];
 };

lib/babel/transformation/templates/exports-module-declaration-loose.js

@@ -0,0 +1 @@
+exports.__esModule = true;

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

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

lib/babel/transformation/templates/tail-call-body.js

@@ -1,3 +1,4 @@
 {
-  FUNCTION_ID:while (true) BLOCK
+  var AGAIN_ID = true;
+  FUNCTION_ID: while (AGAIN_ID) BLOCK
 }

lib/babel/transformation/templates/tail-call.js

@@ -1,23 +0,0 @@
-(function () {
-  function Tail(func, args, context) {
-    this.func = func;
-    this.args = args;
-    this.context = context;
-  }
-
-  Tail.prototype._isTailDescriptor = true;
-
-  var isRunning = false;
-
-  return function (func, args, context) {
-    var result = new Tail(func, args, context);
-    if (!isRunning) {
-      isRunning = true;
-      do {
-        result = result.func.apply(result.context, result.args);
-      } while (result instanceof Tail || (result && result._isTailDescriptor));
-      isRunning = false;
-    }
-    return result;
-  };
-})()

lib/babel/transformation/transformer.js

@@ -6,7 +6,7 @@ var TransformerPass = require("./transformer-pass");
 var isFunction      = require("lodash/lang/isFunction");
 var traverse        = require("../traversal");
 var isObject        = require("lodash/lang/isObject");
-var clone           = require("../helpers/clone");
+var assign          = require("lodash/object/assign");
 var each            = require("lodash/collection/each");
 
 /**
@@ -16,7 +16,7 @@ var each            = require("lodash/collection/each");
  */
 
 function Transformer(key, transformer, opts) {
-  transformer = clone(transformer);
+  transformer = assign({}, transformer);
 
   var take = function (key) {
     var val = transformer[key];

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

@@ -546,14 +546,16 @@ BlockScoping.prototype.buildHas = function (ret, call) {
 
     if (cases.length === 1) {
       var single = cases[0];
-      body.push(t.ifStatement(
+      body.push(this.file.attachAuxiliaryComment(t.ifStatement(
         t.binaryExpression("===", ret, single.test),
         single.consequent[0]
-      ));
+      )));
     } else {
-      body.push(t.switchStatement(ret, cases));
+      body.push(this.file.attachAuxiliaryComment(t.switchStatement(ret, cases)));
     }
   } else {
-    if (has.hasReturn) body.push(retCheck);
+    if (has.hasReturn) {
+      body.push(this.file.attachAuxiliaryComment(retCheck));
+    }
   }
 };

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

@@ -159,7 +159,7 @@ ClassTransformer.prototype.buildBody = function () {
       }, true);
       replaceSupers.replace();
 
-      if (node.key.name === "constructor") {
+      if ((!node.computed && t.isIdentifier(node.key, { name: "constructor" })) || t.isLiteral(node.key, { value: "constructor" })) {
         this.pushConstructor(node);
       } else {
         this.pushMethod(node);

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

@@ -41,90 +41,114 @@ DestructuringTransformer.prototype.buildVariableDeclaration = function (id, init
   return declar;
 };
 
-DestructuringTransformer.prototype.push = function (elem, parentId) {
-  if (t.isObjectPattern(elem)) {
-    this.pushObjectPattern(elem, parentId);
-  } else if (t.isArrayPattern(elem)) {
-    this.pushArrayPattern(elem, parentId);
-  } else if (t.isAssignmentPattern(elem)) {
-    this.pushAssignmentPattern(elem, parentId);
+DestructuringTransformer.prototype.push = function (id, init) {
+  if (t.isObjectPattern(id)) {
+    this.pushObjectPattern(id, init);
+  } else if (t.isArrayPattern(id)) {
+    this.pushArrayPattern(id, init);
+  } else if (t.isAssignmentPattern(id)) {
+    this.pushAssignmentPattern(id, init);
   } else {
-    this.nodes.push(this.buildVariableAssignment(elem, parentId));
+    this.nodes.push(this.buildVariableAssignment(id, init));
   }
 };
 
-DestructuringTransformer.prototype.pushAssignmentPattern = function (pattern, parentId) {
-  var tempParentId = this.scope.generateUidBasedOnNode(parentId);
+DestructuringTransformer.prototype.get = function () {
+
+};
+
+DestructuringTransformer.prototype.pushAssignmentPattern = function (pattern, valueRef) {
+  // we need to assign the current value of the assignment to avoid evaluating
+  // it more than once
+
+  var tempValueRef = this.scope.generateUidBasedOnNode(valueRef);
 
   var declar = t.variableDeclaration("var", [
-    t.variableDeclarator(tempParentId, parentId)
+    t.variableDeclarator(tempValueRef, valueRef)
   ]);
   declar._blockHoist = this.blockHoist;
   this.nodes.push(declar);
 
+  //
+
   this.nodes.push(this.buildVariableAssignment(
     pattern.left,
     t.conditionalExpression(
-      t.binaryExpression("===", tempParentId, t.identifier("undefined")),
+      t.binaryExpression("===", tempValueRef, t.identifier("undefined")),
       pattern.right,
-      tempParentId
+      tempValueRef
     )
   ));
 };
 
-DestructuringTransformer.prototype.pushObjectSpread = function (pattern, parentId, prop, i) {
+DestructuringTransformer.prototype.pushObjectSpread = function (pattern, objRef, spreadProp, spreadPropIndex) {
   // get all the keys that appear in this object before the current spread
+
   var keys = [];
-  for (var i2 = 0; i2 < pattern.properties.length; i2++) {
-    var prop2 = pattern.properties[i2];
 
-    if (i2 >= i) break;
-    if (t.isSpreadProperty(prop2)) continue;
+  for (var i = 0; i < pattern.properties.length; i++) {
+    var prop = pattern.properties[i];
 
-    var key = prop2.key;
-    if (t.isIdentifier(key)) {
-      key = t.literal(prop2.key.name);
-    }
+    // we've exceeded the index of the spread property to all properties to the
+    // right need to be ignored
+    if (i >= spreadPropIndex) break;
+
+    // ignore other spread properties
+    if (t.isSpreadProperty(prop)) continue;
+
+    var key = prop.key;
+    if (t.isIdentifier(key)) key = t.literal(prop.key.name);
     keys.push(key);
   }
+
   keys = t.arrayExpression(keys);
 
-  var value = t.callExpression(this.file.addHelper("object-without-properties"), [parentId, keys]);
-  this.nodes.push(this.buildVariableAssignment(prop.argument, value));
+  //
+
+  var value = t.callExpression(this.file.addHelper("object-without-properties"), [objRef, keys]);
+  this.nodes.push(this.buildVariableAssignment(spreadProp.argument, value));
 };
 
-DestructuringTransformer.prototype.pushObjectProperty = function (prop, parentId) {
+DestructuringTransformer.prototype.pushObjectProperty = function (prop, propRef) {
   if (t.isLiteral(prop.key)) prop.computed = true;
 
-  var pattern2   = prop.value;
-  var patternId2 = t.memberExpression(parentId, prop.key, prop.computed);
+  var pattern = prop.value;
+  var objRef  = t.memberExpression(propRef, prop.key, prop.computed);
 
-  if (t.isPattern(pattern2)) {
-    this.push(pattern2, patternId2);
+  if (t.isPattern(pattern)) {
+    this.push(pattern, objRef);
   } else {
-    this.nodes.push(this.buildVariableAssignment(pattern2, patternId2));
+    this.nodes.push(this.buildVariableAssignment(pattern, objRef));
   }
 };
 
-DestructuringTransformer.prototype.pushObjectPattern = function (pattern, parentId) {
+DestructuringTransformer.prototype.pushObjectPattern = function (pattern, objRef) {
+  // https://github.com/babel/babel/issues/681
+
   if (!pattern.properties.length) {
     this.nodes.push(t.expressionStatement(
-      t.callExpression(this.file.addHelper("object-destructuring-empty"), [parentId])
+      t.callExpression(this.file.addHelper("object-destructuring-empty"), [objRef])
     ));
   }
 
-  if (pattern.properties.length > 1 && t.isMemberExpression(parentId)) {
-    var temp = this.scope.generateUidBasedOnNode(parentId, this.file);
-    this.nodes.push(this.buildVariableDeclaration(temp, parentId));
-    parentId = temp;
+  // if we have more than one properties in this pattern and the objectRef is a
+  // member expression then we need to assign it to a temporary variable so it's
+  // only evaluated once
+
+  if (pattern.properties.length > 1 && t.isMemberExpression(objRef)) {
+    var temp = this.scope.generateUidBasedOnNode(objRef, this.file);
+    this.nodes.push(this.buildVariableDeclaration(temp, objRef));
+    objRef = temp;
   }
 
+  //
+
   for (var i = 0; i < pattern.properties.length; i++) {
     var prop = pattern.properties[i];
     if (t.isSpreadProperty(prop)) {
-      this.pushObjectSpread(pattern, parentId, prop, i);
+      this.pushObjectSpread(pattern, objRef, prop, i);
     } else {
-      this.pushObjectProperty(prop, parentId);
+      this.pushObjectProperty(prop, objRef);
     }
   }
 };
@@ -138,19 +162,69 @@ var hasRest = function (pattern) {
   return false;
 };
 
-DestructuringTransformer.prototype.pushArrayPattern = function (pattern, parentId) {
+DestructuringTransformer.prototype.canUnpackArrayPattern = function (pattern, arr) {
+  // not an array so there's no way we can deal with this
+  if (!t.isArrayExpression(arr)) return false;
+
+  // 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 && !hasRest(pattern)) return false;
+
+  // deopt on holes
+  for (var i = 0; i < pattern.elements.length; i++) {
+    if (!pattern.elements[i]) return false;
+  }
+
+  return true;
+};
+
+DestructuringTransformer.prototype.pushUnpackedArrayPattern = function (pattern, arr) {
+  for (var i = 0; i < pattern.elements.length; i++) {
+    var elem = pattern.elements[i];
+    if (t.isRestElement(elem)) {
+      this.push(elem.argument, t.arrayExpression(arr.elements.slice(i)));
+    } else {
+      this.push(elem, arr.elements[i]);
+    }
+  }
+};
+
+DestructuringTransformer.prototype.pushArrayPattern = function (pattern, arrayRef) {
   if (!pattern.elements) return;
 
-  // if we have a rest then we need all the elements
+  // optimise basic array destructuring of an array expression
+  //
+  // we can't do this to a pattern of unequal size to it's right hand
+  // array expression as then there will be values that wont be evaluated
+  //
+  // eg: var [a, b] = [1, 2];
+
+  if (this.canUnpackArrayPattern(pattern, arrayRef)) {
+    return this.pushUnpackedArrayPattern(pattern, arrayRef);
+  }
+
+  // if we have a rest then we need all the elements so don't tell
+  // `scope.toArray` to only get a certain amount
+
   var count = !hasRest(pattern) && pattern.elements.length;
 
-  var toArray = this.scope.toArray(parentId, count);
+  // so we need to ensure that the `arrayRef` is an array, `scope.toArray` will
+  // return a locally bound identifier if it's been inferred to be an array,
+  // otherwise it'll be a call to a helper that will ensure it's one
 
-  var _parentId = this.scope.generateUidBasedOnNode(parentId);
-  this.nodes.push(this.buildVariableDeclaration(_parentId, toArray));
-  parentId = _parentId;
+  var toArray = this.scope.toArray(arrayRef, count);
 
-  this.scope.assignTypeGeneric(parentId.name, "Array");
+  if (t.isIdentifier(toArray)) {
+    // we've been given an identifier so it must have been inferred to be an
+    // array
+    arrayRef = toArray;
+  } else {
+    arrayRef = this.scope.generateUidBasedOnNode(arrayRef);
+    this.nodes.push(this.buildVariableDeclaration(arrayRef, toArray));
+    this.scope.assignTypeGeneric(arrayRef.name, "Array");
+  }
+
+  //
 
   for (var i = 0; i < pattern.elements.length; i++) {
     var elem = pattern.elements[i];
@@ -158,32 +232,39 @@ DestructuringTransformer.prototype.pushArrayPattern = function (pattern, parentI
     // hole
     if (!elem) continue;
 
-    var newPatternId;
+    var elemRef;
 
     if (t.isRestElement(elem)) {
-      newPatternId = this.scope.toArray(parentId);
+      elemRef = this.scope.toArray(arrayRef);
 
       if (i > 0) {
-        newPatternId = t.callExpression(t.memberExpression(newPatternId, t.identifier("slice")), [t.literal(i)]);
+        elemRef = t.callExpression(t.memberExpression(elemRef, t.identifier("slice")), [t.literal(i)]);
       }
 
+      // set the element to the rest element argument since we've dealt with it
+      // being a rest already
       elem = elem.argument;
     } else {
-      newPatternId = t.memberExpression(parentId, t.literal(i), true);
+      elemRef = t.memberExpression(arrayRef, t.literal(i), true);
     }
 
-    this.push(elem, newPatternId);
+    this.push(elem, elemRef);
   }
 };
 
-DestructuringTransformer.prototype.init = function (pattern, parentId) {
-  if (!t.isArrayExpression(parentId) && !t.isMemberExpression(parentId) && !t.isIdentifier(parentId)) {
-    var key = this.scope.generateUidBasedOnNode(parentId);
-    this.nodes.push(this.buildVariableDeclaration(key, parentId));
-    parentId = key;
+DestructuringTransformer.prototype.init = function (pattern, ref) {
+  // trying to destructure a value that we can't evaluate more than once so we
+  // need to save it to a variable
+
+  if (!t.isArrayExpression(ref) && !t.isMemberExpression(ref) && !t.isIdentifier(ref)) {
+    var key = this.scope.generateUidBasedOnNode(ref);
+    this.nodes.push(this.buildVariableDeclaration(key, ref));
+    ref = key;
   }
 
-  this.push(pattern, parentId);
+  //
+
+  this.push(pattern, ref);
 };
 
 exports.ForInStatement =
@@ -244,7 +325,7 @@ exports.Function = function (node, parent, scope, file) {
     if (!t.isPattern(pattern)) return pattern;
 
     hasDestructuringTransformer = true;
-    var parentId = scope.generateUidIdentifier("ref");
+    var ref = scope.generateUidIdentifier("ref");
 
     var destructuring = new DestructuringTransformer({
       blockHoist: node.params.length - i,
@@ -253,9 +334,9 @@ exports.Function = function (node, parent, scope, file) {
       file:       file,
       kind:       "var",
     });
-    destructuring.init(pattern, parentId);
+    destructuring.init(pattern, ref);
 
-    return parentId;
+    return ref;
   });
 
   if (!hasDestructuringTransformer) return;

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

@@ -37,6 +37,29 @@ exports.ForOfStatement = function (node, parent, scope, file) {
   return loop;
 };
 
+var breakVisitor = {
+  enter: function (node, parent, scope, state) {
+    if (t.isLoop(node)) {
+      state.ignoreLabeless = true;
+      scope.traverse(node, breakVisitor, state);
+      state.ignoreLabeless = false;
+      return this.skip();
+    }
+
+    if (t.isBreakStatement(node)) {
+      if (!node.label && state.ignoreLabeless) return;
+      if (node.label && node.label.name !== state.label) return;
+
+      var ret = t.expressionStatement(
+        t.callExpression(t.memberExpression(state.iteratorKey, t.identifier("return")), [])
+      );
+      if (state.wrapReturn) ret = state.wrapReturn(ret);
+
+      return [ret, node];
+    }
+  }
+};
+
 var loose = function (node, parent, scope, file) {
   var left = node.left;
   var declar, id;
@@ -54,9 +77,12 @@ var loose = function (node, parent, scope, file) {
     throw file.errorWithNode(left, messages.get("unknownForHead", left.type));
   }
 
+  var iteratorKey = scope.generateUidIdentifier("iterator");
+  var isArrayKey  = scope.generateUidIdentifier("isArray");
+
   var loop = util.template("for-of-loose", {
-    LOOP_OBJECT:  scope.generateUidIdentifier("iterator"),
-    IS_ARRAY:     scope.generateUidIdentifier("isArray"),
+    LOOP_OBJECT:  iteratorKey,
+    IS_ARRAY:     isArrayKey,
     OBJECT:       node.right,
     INDEX:        scope.generateUidIdentifier("i"),
     ID:           id
@@ -68,6 +94,18 @@ var loose = function (node, parent, scope, file) {
     loop.body.body.shift();
   }
 
+  //
+
+  scope.traverse(node, breakVisitor, {
+    iteratorKey: iteratorKey,
+    wrapReturn:  function (node) {
+      return t.ifStatement(t.unaryExpression("!", isArrayKey, true), node);
+    },
+    label:       t.isLabeledStatement(parent) && parent.label.name
+  });
+
+  //
+
   return {
     declar: declar,
     loop:   loop
@@ -93,12 +131,25 @@ var spec = function (node, parent, scope, file) {
     throw file.errorWithNode(left, messages.get("unknownForHead", left.type));
   }
 
+  //
+
+  var iteratorKey = scope.generateUidIdentifier("iterator");
+
   var loop = util.template("for-of", {
-    ITERATOR_KEY: scope.generateUidIdentifier("iterator"),
+    ITERATOR_KEY: iteratorKey,
     STEP_KEY:     stepKey,
     OBJECT:       node.right
   });
 
+  //
+
+  scope.traverse(node, breakVisitor, {
+    iteratorKey: iteratorKey,
+    label:       t.isLabeledStatement(parent) && parent.label.name
+  });
+
+  //
+
   return {
     declar: declar,
     loop:   loop

lib/babel/transformation/transformers/es6/properties.computed.js

@@ -51,7 +51,7 @@ var loose = function (node, body, objId) {
     body.push(t.expressionStatement(
       t.assignmentExpression(
         "=",
-        t.memberExpression(objId, prop.key, prop.computed),
+        t.memberExpression(objId, prop.key, prop.computed || t.isLiteral(prop.key)),
         prop.value
       )
     ));

lib/babel/transformation/transformers/es6/properties.shorthand.js

@@ -1,17 +1,15 @@
 "use strict";
 
-var nameMethod = require("../../helpers/name-method");
-var t          = require("../../../types");
-var clone      = require("lodash/lang/clone");
+var clone = require("lodash/lang/clone");
+var t     = require("../../../types");
 
 exports.check = function (node) {
   return t.isProperty(node) && (node.method || node.shorthand);
 };
 
-exports.Property = function (node, parent, scope, file) {
+exports.Property = function (node) {
   if (node.method) {
     node.method = false;
-    nameMethod.property(node, file, scope);
   }
 
   if (node.shorthand) {

lib/babel/transformation/transformers/es6/tail-call.js

@@ -40,6 +40,10 @@ TailCallTransformer.prototype.getFunctionId = function () {
   return this.functionId = this.functionId || this.scope.generateUidIdentifier("function");
 };
 
+TailCallTransformer.prototype.getAgainId = function () {
+  return this.againId = this.againId || this.scope.generateUidIdentifier("again");
+};
+
 TailCallTransformer.prototype.getParams = function () {
   var params = this.params;
 
@@ -112,7 +116,12 @@ TailCallTransformer.prototype.run = function () {
     body.unshift(t.variableDeclaration("var", paramDecls));
   }
 
+  body.unshift(t.expressionStatement(
+    t.assignmentExpression("=", this.getAgainId(), t.literal(false)))
+  );
+
   node.body = util.template("tail-call-body", {
+    AGAIN_ID:      this.getAgainId(),
     THIS_ID:       this.thisId,
     ARGUMENTS_ID:  this.argumentsId,
     FUNCTION_ID:   this.getFunctionId(),
@@ -286,6 +295,9 @@ TailCallTransformer.prototype.subTransformCallExpression = function (node) {
     }
   }
 
+  body.push(t.expressionStatement(
+    t.assignmentExpression("=", this.getAgainId(), t.literal(true))
+  ));
   body.push(t.continueStatement(this.getFunctionId()));
 
   return body;

lib/babel/transformation/transformers/index.js

@@ -1,6 +1,9 @@
 module.exports = {
   useStrict:                               require("./other/use-strict"),
 
+  // this goes at the start so we only transform the original user code
+  "spec.functionName":                     require("./spec/function-name"),
+
   "validation.undeclaredVariableCheck":    require("./validation/undeclared-variable-check"),
   "validation.noForInOfAssignment":        require("./validation/no-for-in-of-assignment"),
   "validation.setters":                    require("./validation/setters"),

lib/babel/transformation/transformers/internal/block-hoist.js

@@ -1,9 +1,8 @@
 "use strict";
 
-var useStrict = require("../../helpers/use-strict");
-var groupBy   = require("lodash/collection/groupBy");
-var flatten   = require("lodash/array/flatten");
-var values    = require("lodash/object/values");
+var groupBy = require("lodash/collection/groupBy");
+var flatten = require("lodash/array/flatten");
+var values  = require("lodash/object/values");
 
 // Priority:
 //
@@ -22,15 +21,13 @@ exports.Program = {
     }
     if (!hasChange) return;
 
-    useStrict.wrap(node, function () {
-      var nodePriorities = groupBy(node.body, function (bodyNode) {
-        var priority = bodyNode._blockHoist;
-        if (priority == null) priority = 1;
-        if (priority === true) priority = 2;
-        return priority;
-      });
-
-      node.body = flatten(values(nodePriorities).reverse());
+    var nodePriorities = groupBy(node.body, function (bodyNode) {
+      var priority = bodyNode._blockHoist;
+      if (priority == null) priority = 1;
+      if (priority === true) priority = 2;
+      return priority;
     });
+
+    node.body = flatten(values(nodePriorities).reverse());
   }
 };

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

@@ -1,7 +1,6 @@
 "use strict";
 
-var useStrict = require("../../helpers/use-strict");
-var t         = require("../../../types");
+var t = require("../../../types");
 
 exports.secondPass = true;
 
@@ -12,25 +11,23 @@ exports.Program = function (node, parent, scope, file) {
   var kinds = {};
   var kind;
 
-  useStrict.wrap(node, function () {
-    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.attachAuxilaryComment(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.attachAuxilaryComment(t.variableDeclaration(kind, kinds[kind])));
-    }
-  });
+  for (kind in kinds) {
+    node.body.unshift(file.attachAuxiliaryComment(t.variableDeclaration(kind, kinds[kind])));
+  }
 
   node._declarations = null;
 };

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

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

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

@@ -3,6 +3,22 @@
 var react = require("../../helpers/react");
 var t     = require("../../../types");
 
+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) {
+    var matches = JSX_ANNOTATION_REGEX.exec(comment.value);
+    if (matches) id = matches[1];
+  }
+
+  file.set("jsxIdentifier", id.split(".").map(t.identifier).reduce(function (object, property) {
+    return t.memberExpression(object, property);
+  }));
+};
+
 require("../../helpers/build-react-transformer")(exports, {
   pre: function (state) {
     var tagName = state.tagName;
@@ -14,7 +30,7 @@ require("../../helpers/build-react-transformer")(exports, {
     }
   },
 
-  post: function (state) {
-    state.callee = t.memberExpression(t.identifier("React"), t.identifier("createElement"));
+  post: function (state, file) {
+    state.callee = file.get("jsxIdentifier");
   }
 });

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

@@ -1,14 +1,19 @@
 "use strict";
 
-var useStrict = require("../../helpers/use-strict");
-var t         = require("../../../types");
+var messages = require("../../../messages");
+var t        = require("../../../types");
 
 exports.Program = function (program) {
-  if (!useStrict.has(program)) {
-    program.body.unshift(t.expressionStatement(t.literal("use strict")));
+  var first = program.body[0];
+  if (t.isExpressionStatement(first) && t.isLiteral(first.expression, { value: "use strict" })) {
+    program.body.shift();
   }
 };
 
+exports.post = function (file) {
+  file.ast.program.body.unshift(t.expressionStatement(t.literal("use strict")));
+};
+
 exports.FunctionDeclaration =
 exports.FunctionExpression = function () {
   this.skip();
@@ -17,3 +22,9 @@ exports.FunctionExpression = function () {
 exports.ThisExpression = function () {
   return t.identifier("undefined");
 };
+
+exports.CallExpression = function (node, parent, scope, file) {
+  if (t.isIdentifier(node.callee, { name: "eval" })) {
+    throw file.errorWithNode(node, messages.get("evalInStrictMode"));
+  }
+};

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

@@ -0,0 +1,95 @@
+"use strict";
+
+var t           = require("../../../types");
+var util        = require("../../../util");
+
+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
+    });
+  }
+};

lib/babel/transformation/transformers/validation/undeclared-variable-check.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var levenshtein = require("../../../helpers/levenshtein");
+var levenshtein = require("leven");
 var messages    = require("../../../messages");
 var t           = require("../../../types");
 

lib/babel/types/alias-keys.json

@@ -19,7 +19,7 @@
   "PrivateDeclaration":  ["Statement", "Declaration"],
 
   "ArrowFunctionExpression": ["Scopable", "Function", "Expression"],
-  "FunctionDeclaration":     ["Statement", "Declaration", "Scopable", "Function"],
+  "FunctionDeclaration":     ["Scopable", "Function", "Statement", "Declaration"],
   "FunctionExpression":      ["Scopable", "Function", "Expression"],
 
   "ImportSpecifier": ["ModuleSpecifier"],
@@ -39,9 +39,9 @@
   "ClassDeclaration": ["Statement", "Declaration", "Class"],
   "ClassExpression":  ["Class", "Expression"],
 
-  "ForOfStatement": ["Statement", "For", "Scopable", "Loop"],
-  "ForInStatement": ["Statement", "For", "Scopable", "Loop"],
-  "ForStatement":   ["Statement", "For", "Scopable", "Loop"],
+  "ForOfStatement": ["Scopable", "Statement", "For", "Loop"],
+  "ForInStatement": ["Scopable", "Statement", "For", "Loop"],
+  "ForStatement":   ["Scopable", "Statement", "For", "Loop"],
 
   "ObjectPattern":     ["Pattern"],
   "ArrayPattern":      ["Pattern"],

lib/babel/util.js

@@ -5,7 +5,6 @@ require("./patch");
 var cloneDeep  = require("lodash/lang/cloneDeep");
 var contains   = require("lodash/collection/contains");
 var traverse   = require("./traversal");
-var isNumber   = require("lodash/lang/isNumber");
 var isString   = require("lodash/lang/isString");
 var isRegExp   = require("lodash/lang/isRegExp");
 var isEmpty    = require("lodash/lang/isEmpty");
@@ -30,14 +29,6 @@ exports.canCompile = function (filename, altExts) {
 
 exports.canCompile.EXTENSIONS = [".js", ".jsx", ".es6", ".es"];
 
-exports.normalisePathSeparator = function (filename) {
-  return filename.replace(/\\/g, "/");
-};
-
-exports.isInteger = function (i) {
-  return isNumber(i) && i % 1 === 0;
-};
-
 exports.resolve = function (loc) {
   try {
     return require.resolve(loc);
@@ -46,10 +37,6 @@ exports.resolve = function (loc) {
   }
 };
 
-exports.trimRight = function (str) {
-  return str.replace(/[\n\s]+$/g, "");
-};
-
 exports.list = function (val) {
   return val ? val.split(",") : [];
 };
@@ -69,17 +56,10 @@ exports.arrayify = function (val) {
   throw new TypeError("illegal type for arrayify");
 };
 
-exports.isAbsolute = function (loc) {
-  if (!loc) return false;
-  if (loc[0] === "/") return true; // unix
-  if (loc[1] === ":" && loc[2] === "\\") return true; // windows
-  return false;
-};
-
-exports.sourceMapToComment = function (map) {
-  var json = JSON.stringify(map);
-  var base64 = new Buffer(json).toString("base64");
-  return "//# sourceMappingURL=data:application/json;base64," + base64;
+exports.booleanify = function (val) {
+  if (val === "true") return true;
+  if (val === "false") return false;
+  return val;
 };
 
 var templateVisitor = {
@@ -120,17 +100,6 @@ exports.template = function (name, nodes, keepExpression) {
   }
 };
 
-exports.repeat = function (width, cha) {
-  cha = cha || " ";
-
-  var result = "";
-  for (var i = 0; i < width; i++) {
-    result += cha;
-  }
-
-  return result;
-};
-
 exports.parseTemplate = function (loc, code) {
   var ast = parse({ filename: loc }, code).program;
   return traverse.removeProperties(ast);

package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "4.0.1",
+  "version": "4.4.2",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "repository": "babel/babel",
@@ -12,11 +12,9 @@
   },
   "bin": {
     "6to5": "./bin/deprecated/6to5",
-    "6to5-minify": "./bin/deprecated/6to5-minify",
     "6to5-node": "./bin/deprecated/6to5-node",
     "6to5-runtime": "./bin/deprecated/6to5-runtime",
     "babel": "./bin/babel/index.js",
-    "babel-minify": "./bin/babel-minify",
     "babel-node": "./bin/babel-node",
     "babel-external-helpers": "./bin/babel-external-helpers"
   },
@@ -38,41 +36,46 @@
     "test": "make test"
   },
   "dependencies": {
-    "acorn-babel": "0.11.1-32",
+    "acorn-babel": "0.11.1-33",
     "ast-types": "~0.6.1",
     "chalk": "^0.5.1",
-    "chokidar": "0.12.6",
-    "commander": "2.6.0",
+    "chokidar": "^0.12.6",
+    "commander": "^2.6.0",
     "core-js": "^0.5.4",
     "debug": "^2.1.1",
-    "detect-indent": "3.0.0",
-    "estraverse": "1.9.1",
-    "esutils": "1.1.6",
-    "fs-readdir-recursive": "0.1.0",
-    "globals": "^5.1.0",
-    "js-tokenizer": "1.3.3",
-    "lodash": "3.0.0",
-    "output-file-sync": "1.1.0",
-    "private": "0.1.6",
-    "regenerator-babel": "0.8.10-1",
-    "regexpu": "1.1.0",
-    "roadrunner": "1.0.4",
-    "source-map": "0.1.43",
-    "source-map-support": "0.2.9",
-    "supports-color": "1.2.0",
-    "useragent": "^2.1.5"
+    "detect-indent": "^3.0.0",
+    "estraverse": "^1.9.1",
+    "esutils": "^1.1.6",
+    "fs-readdir-recursive": "^0.1.0",
+    "globals": "^6.2.0",
+    "is-integer": "^1.0.4",
+    "js-tokenizer": "^1.3.3",
+    "leven": "^1.0.1",
+    "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",
+    "regexpu": "^1.1.1",
+    "repeating": "^1.1.2",
+    "shebang-regex": "^1.0.0",
+    "slash": "^1.0.0",
+    "source-map": "^0.1.43",
+    "source-map-support": "^0.2.9",
+    "source-map-to-comment": "^1.0.0",
+    "trim-right": "^1.0.0"
   },
   "devDependencies": {
-    "browserify": "8.1.1",
-    "chai": "1.10.0",
-    "esvalid": "1.1.0",
-    "istanbul": "0.3.5",
-    "jscs": "1.10.0",
-    "jshint": "2.6.0",
-    "jshint-stylish": "1.0.0",
-    "matcha": "0.6.0",
-    "mocha": "2.1.0",
-    "rimraf": "2.2.8",
-    "uglify-js": "2.4.16"
+    "browserify": "^8.1.3",
+    "chai": "^2.0.0",
+    "esvalid": "^1.1.0",
+    "istanbul": "^0.3.5",
+    "jscs": "^1.11.3",
+    "jshint": "^2.6.0",
+    "jshint-stylish": "^1.0.0",
+    "matcha": "^0.6.0",
+    "mocha": "^2.1.0",
+    "rimraf": "^2.2.8",
+    "uglify-js": "^2.4.16"
   }
 }

packages/babel-runtime/package.json

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

test/fixtures/esnext/es6-object-concise/method-to-string.js

@@ -1,10 +0,0 @@
-var a = {
-  b() {
-    return b;
-  }
-};
-
-assert.ok(
-  /return b/.test(a.b.toString()),
-  'toString contains body'
-);

test/fixtures/generation/comments/2-space-multi-comment-with-space/expected.js

@@ -1,10 +1,8 @@
 function test() {
 
-
   /*
    * this is comment
    */
 
-
   var i = 20;
 }

test/fixtures/generation/comments/simple-a-lot-of-line-comment/expected.js

@@ -20,11 +20,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 function test() {}
 
-
-
 // Copyright (C) 2012 Yusuke Suzuki <utatane.tea@gmail.com>
 //
 // Redistribution and use in source and binary forms, with or without

test/fixtures/transformation/es6-arrow-functions/arguments/expected.js

@@ -2,6 +2,7 @@
 
 function one() {
   var _arguments = arguments;
+
   var inner = function () {
     return _arguments;
   };
@@ -11,12 +12,14 @@ one(1, 2);
 
 function two() {
   var _arguments = arguments;
+
   var inner = function () {
     return _arguments;
   };
 
-  var another = function () {
+  var another = function another() {
     var _arguments2 = arguments;
+
     var inner2 = function () {
       return _arguments2;
     };
@@ -28,6 +31,7 @@ two(1, 2);
 
 function three() {
   var _arguments = arguments;
+
   var fn = function () {
     return _arguments[0] + "bar";
   };
@@ -37,6 +41,7 @@ three("foo");
 
 function four() {
   var _arguments = arguments;
+
   var fn = function () {
     return _arguments[0].foo + "bar";
   };
@@ -54,7 +59,7 @@ five({ arguments: ["foo"] });
 
 function six(obj) {
   var fn = function () {
-    var fn2 = function () {
+    var fn2 = function fn2() {
       return arguments[0];
     };
     return fn2("foobar");

test/fixtures/transformation/es6-arrow-functions/default-parameters/expected.js

@@ -2,6 +2,7 @@
 
 var some = function () {
   var count = arguments[0] === undefined ? "30" : arguments[0];
+
   console.log("count", count);
 };
 

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

@@ -1,8 +1,9 @@
 "use strict";
 
 module.exports = {
-  init: function () {
+  init: function init() {
     var _this = this;
+
     return new Promise(function (resolve, reject) {
       MongoClient.connect(config.mongodb, function (err, db) {
         if (err) {

test/fixtures/transformation/es6-arrow-functions/this/expected.js

@@ -2,6 +2,7 @@
 
 function b() {
   var _this = this;
+
   var t = function (x) {
     return _this.x + x;
   };

test/fixtures/transformation/es6-block-scoping/for-break-continue-return/expected.js

@@ -20,8 +20,10 @@
     switch (_ret) {
       case "continue":
         continue;
+
       case "break":
         break;
+
       default:
         if (typeof _ret === "object") return _ret.v;
     }

test/fixtures/transformation/es6-block-scoping/hoisting/expected.js

@@ -2,9 +2,11 @@
 
 for (var _iterator = [1, 2, 3][Symbol.iterator](), _step; !(_step = _iterator.next()).done;) {
   var x;
+
   (function () {
     var i = _step.value;
     x = 5;
+
     fns.push(function () {
       return i * x;
     });

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

@@ -1,6 +1,7 @@
 "use strict";
 
 var _slice = Array.prototype.slice;
+
 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"); } };
@@ -8,6 +9,7 @@ var _classCallCheck = function (instance, Constructor) { if (!(instance instance
 var Test = (function (Foo) {
   function Test() {
     var _Foo$prototype$test, _Foo$prototype$test2;
+
     _classCallCheck(this, Test);
 
     woops["super"].test();
@@ -25,6 +27,7 @@ var Test = (function (Foo) {
 
   Test.prototype.test = function test() {
     var _Foo$prototype$test, _Foo$prototype$test2;
+
     Foo.prototype.test.call(this);
     (_Foo$prototype$test = Foo.prototype.test).call.apply(_Foo$prototype$test, [this].concat(_slice.call(arguments)));
     (_Foo$prototype$test2 = Foo.prototype.test).call.apply(_Foo$prototype$test2, [this, "test"].concat(_slice.call(arguments)));
@@ -32,10 +35,11 @@ var Test = (function (Foo) {
 
   Test.foo = function foo() {
     var _Foo$foo, _Foo$foo2;
+
     Foo.foo.call(this);
     (_Foo$foo = Foo.foo).call.apply(_Foo$foo, [this].concat(_slice.call(arguments)));
     (_Foo$foo2 = Foo.foo).call.apply(_Foo$foo2, [this, "test"].concat(_slice.call(arguments)));
   };
 
   return Test;
-})(Foo);
+})(Foo);

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

@@ -1,6 +1,7 @@
 "use strict";
 
 var _slice = Array.prototype.slice;
+
 var _prototypeProperties = function (child, staticProps, instanceProps) { if (staticProps) Object.defineProperties(child, staticProps); if (instanceProps) Object.defineProperties(child.prototype, instanceProps); };
 
 var _get = function get(object, property, receiver) { var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc && desc.writable) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } };
@@ -12,6 +13,7 @@ var _classCallCheck = function (instance, Constructor) { if (!(instance instance
 var Test = (function (Foo) {
   function Test() {
     var _get2, _get3;
+
     _classCallCheck(this, Test);
 
     woops["super"].test();
@@ -31,6 +33,7 @@ var Test = (function (Foo) {
     foo: {
       value: function foo() {
         var _get2;
+
         _get(Object.getPrototypeOf(Test), "foo", this).call(this);
         _get(Object.getPrototypeOf(Test), "foo", this).apply(this, arguments);
         (_get2 = _get(Object.getPrototypeOf(Test), "foo", this)).call.apply(_get2, [this, "test"].concat(_slice.call(arguments)));
@@ -42,6 +45,7 @@ var Test = (function (Foo) {
     test: {
       value: function test() {
         var _get2;
+
         _get(Object.getPrototypeOf(Test.prototype), "test", this).call(this);
         _get(Object.getPrototypeOf(Test.prototype), "test", this).apply(this, arguments);
         (_get2 = _get(Object.getPrototypeOf(Test.prototype), "test", this)).call.apply(_get2, [this, "test"].concat(_slice.call(arguments)));
@@ -52,4 +56,4 @@ var Test = (function (Foo) {
   });
 
   return Test;
-})(Foo);
+})(Foo);

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

@@ -1,18 +1,12 @@
 "use strict";
 
-var _ref = [1, 2];
-
-var a = _ref[0];
-var b = _ref[1];
-var _ref2 = [3, 4];
-
-var c = _ref2[0];
-var d = _ref2[1];
-var _ref3 = { e: 5, f: 6 };
-
-var e = _ref3.e;
-var f = _ref3.f;
-var _ref4 = { a: 7, b: 8 };
-
-var g = _ref4.a;
-var h = _ref4.b;
+var a = 1;
+var b = 2;
+var c = 3;
+var d = 4;
+var _ref = { e: 5, f: 6 };
+var e = _ref.e;
+var f = _ref.f;
+var _ref2 = { a: 7, b: 8 };
+var g = _ref2.a;
+var h = _ref2.b;

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

@@ -0,0 +1,9 @@
+// opt
+var [a, b] = [1, 2];
+var [[a, b]] = [[1, 2]];
+var [a, b, ...c] = [1, 2, 3, 4];
+var [[a, b, ...c]] = [[1, 2, 3, 4]];
+
+// deopt
+var [a, b] = [1, 2, 3];
+var [[a, b]] = [[1, 2, 3]];

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

@@ -0,0 +1,21 @@
+"use strict";
+
+// opt
+var a = 1;
+var b = 2;
+var a = 1;
+var b = 2;
+var a = 1;
+var b = 2;
+var c = [3, 4];
+var a = 1;
+var b = 2;
+var c = [3, 4];
+
+// deopt
+var _ref = [1, 2, 3];
+var a = _ref[0];
+var b = _ref[1];
+var _ref2 = [1, 2, 3];
+var a = _ref2[0];
+var b = _ref2[1];

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

@@ -1,14 +1,7 @@
 "use strict";
 
-var _slicedToArray = function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { var _arr = []; for (var _iterator = arr[Symbol.iterator](), _step; !(_step = _iterator.next()).done;) { _arr.push(_step.value); if (i && _arr.length === i) break; } return _arr; } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } };
-
-var _ref = ["hello", [", ", "junk"], ["world"]];
-
-var a = _ref[0];
-var _ref$1 = _slicedToArray(_ref[1], 1);
-
-var b = _ref$1[0];
-var _ref$2 = _slicedToArray(_ref[2], 1);
-
-var c = _ref$2[0];
-var d = _ref[3];
+var a = "hello";
+var _ref = [", ", "junk"];
+var b = _ref[0];
+var c = "world";
+var d;

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

@@ -1,6 +1,7 @@
 "use strict";
 
 var _temp, _temp2;
+
 var _slicedToArray = function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { var _arr = []; for (var _iterator = arr[Symbol.iterator](), _step; !(_step = _iterator.next()).done;) { _arr.push(_step.value); if (i && _arr.length === i) break; } return _arr; } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } };
 
 console.log((_temp = [123], _temp2 = _slicedToArray(_temp, 1), x = _temp2[0], _temp));

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

@@ -8,4 +8,5 @@ var _ref2 = _slicedToArray(_ref, 2);
 
 a = _ref2[0];
 b = _ref2[1];
+
 ;

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

@@ -3,11 +3,12 @@
 var _slicedToArray = function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { var _arr = []; for (var _iterator = arr[Symbol.iterator](), _step; !(_step = _iterator.next()).done;) { _arr.push(_step.value); if (i && _arr.length === i) break; } return _arr; } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } };
 
 var _ref = ["foo", "hello", [", ", "junk"], ["world"]];
-
 var a = _ref[1];
+
 var _ref$2 = _slicedToArray(_ref[2], 1);
 
 var b = _ref$2[0];
+
 var _ref$3 = _slicedToArray(_ref[3], 1);
 
 var c = _ref$3[0];

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

@@ -5,9 +5,11 @@ var _objectWithoutProperties = function (obj, keys) { var target = {}; for (var
 var x = _objectWithoutProperties(z, []);
 
 var x = z.x;
+
 var y = _objectWithoutProperties(z, ["x"]);
 
 (function (_ref) {
   var x = _ref.x;
+
   var y = _objectWithoutProperties(_ref, ["x"]);
-});
+});

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

@@ -7,5 +7,6 @@ for (var _ref in obj) {
 
   var name = _ref2[0];
   var value = _ref2[1];
+
   print("Name: " + name + ", Value: " + value);
 }

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

@@ -5,4 +5,5 @@ var _toArray = function (arr) { return Array.isArray(arr) ? arr : Array.from(arr
 var _z = _toArray(z);
 
 var x = _z[0];
+
 var y = _z.slice(1);

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

@@ -8,4 +8,5 @@ var _ref2 = _slicedToArray(_ref, 2);
 
 foo.foo = _ref2[0];
 foo.bar = _ref2[1];
+
 ;

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

@@ -6,6 +6,7 @@ var _rect$topLeft = _slicedToArray(rect.topLeft, 2);
 
 var x1 = _rect$topLeft[0];
 var y1 = _rect$topLeft[1];
+
 var _rect$bottomRight = _slicedToArray(rect.bottomRight, 2);
 
 var x2 = _rect$bottomRight[0];

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

@@ -14,22 +14,25 @@ function somethingAdvanced(_ref) {
 function unpackObject(_ref) {
   var title = _ref.title;
   var author = _ref.author;
+
   return title + " " + author;
 }
 
 console.log(unpackObject({ title: "title", author: "author" }));
 
-var unpackArray = function (_ref, _ref3) {
+var unpackArray = function unpackArray(_ref, _ref3) {
   var _ref2 = _slicedToArray(_ref, 3);
 
   var a = _ref2[0];
   var b = _ref2[1];
   var c = _ref2[2];
+
   var _ref32 = _slicedToArray(_ref3, 3);
 
   var x = _ref32[0];
   var y = _ref32[1];
   var z = _ref32[2];
+
   return a + b + c;
 };
 

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

@@ -7,6 +7,7 @@ var isSorted = function (_ref) {
 
   var x = _ref2[0];
   var y = _ref2[1];
+
   var wow = _ref2.slice(2);
 
   if (!zs.length) return true;

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

@@ -0,0 +1,29 @@
+// labels
+
+foo: for (let x of foo()) {
+  while (true) {
+    break foo;
+  }
+}
+
+foo: for (let x of foo()) {
+  while (true) {
+    break;
+  }
+}
+
+foo: for (let x of foo()) {
+  break foo;
+}
+
+// basic
+
+for (let x of foo()) {
+  break;
+}
+
+for (let x of foo()) {
+  while (true) {
+    break;
+  }
+}

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

@@ -0,0 +1,100 @@
+"use strict";
+
+// labels
+
+foo: for (var _iterator = foo(), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+  var _ref;
+
+  if (_isArray) {
+    if (_i >= _iterator.length) break;
+    _ref = _iterator[_i++];
+  } else {
+    _i = _iterator.next();
+    if (_i.done) break;
+    _ref = _i.value;
+  }
+
+  var x = _ref;
+
+  while (true) {
+    if (!_isArray) _iterator["return"]();
+
+    break foo;
+  }
+}
+
+foo: for (var _iterator2 = foo(), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+  var _ref2;
+
+  if (_isArray2) {
+    if (_i2 >= _iterator2.length) break;
+    _ref2 = _iterator2[_i2++];
+  } else {
+    _i2 = _iterator2.next();
+    if (_i2.done) break;
+    _ref2 = _i2.value;
+  }
+
+  var x = _ref2;
+
+  while (true) {
+    break;
+  }
+}
+
+foo: for (var _iterator3 = foo(), _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+  var _ref3;
+
+  if (_isArray3) {
+    if (_i3 >= _iterator3.length) break;
+    _ref3 = _iterator3[_i3++];
+  } else {
+    _i3 = _iterator3.next();
+    if (_i3.done) break;
+    _ref3 = _i3.value;
+  }
+
+  var x = _ref3;
+  if (!_isArray3) _iterator3["return"]();
+
+  break foo;
+}
+
+// basic
+
+for (var _iterator4 = foo(), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+  var _ref4;
+
+  if (_isArray4) {
+    if (_i4 >= _iterator4.length) break;
+    _ref4 = _iterator4[_i4++];
+  } else {
+    _i4 = _iterator4.next();
+    if (_i4.done) break;
+    _ref4 = _i4.value;
+  }
+
+  var x = _ref4;
+  if (!_isArray4) _iterator4["return"]();
+
+  break;
+}
+
+for (var _iterator5 = foo(), _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+  var _ref5;
+
+  if (_isArray5) {
+    if (_i5 >= _iterator5.length) break;
+    _ref5 = _iterator5[_i5++];
+  } else {
+    _i5 = _iterator5.next();
+    if (_i5.done) break;
+    _ref5 = _i5.value;
+  }
+
+  var x = _ref5;
+
+  while (true) {
+    break;
+  }
+}

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

@@ -2,6 +2,7 @@
 
 for (var _iterator = arr, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
   var _ref;
+
   if (_isArray) {
     if (_i >= _iterator.length) break;
     _ref = _iterator[_i++];
@@ -10,5 +11,6 @@ for (var _iterator = arr, _isArray = Array.isArray(_iterator), _i = 0, _iterator
     if (_i.done) break;
     _ref = _i.value;
   }
+
   var i = _ref;
-}
+}

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

@@ -2,6 +2,7 @@
 
 for (var _iterator = arr, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
   var _ref;
+
   if (_isArray) {
     if (_i >= _iterator.length) break;
     _ref = _iterator[_i++];
@@ -10,11 +11,13 @@ for (var _iterator = arr, _isArray = Array.isArray(_iterator), _i = 0, _iterator
     if (_i.done) break;
     _ref = _i.value;
   }
+
   var i = _ref;
 }
 
 for (var _iterator2 = numbers, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
   var _ref2;
+
   if (_isArray2) {
     if (_i2 >= _iterator2.length) break;
     _ref2 = _iterator2[_i2++];
@@ -23,5 +26,6 @@ for (var _iterator2 = numbers, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _
     if (_i2.done) break;
     _ref2 = _i2.value;
   }
+
   var i = _ref2;
-}
+}

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

@@ -2,6 +2,7 @@
 
 for (var _iterator = arr, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
   var _ref;
+
   if (_isArray) {
     if (_i >= _iterator.length) break;
     _ref = _iterator[_i++];
@@ -10,5 +11,6 @@ for (var _iterator = arr, _isArray = Array.isArray(_iterator), _i = 0, _iterator
     if (_i.done) break;
     _ref = _i.value;
   }
+
   var i = _ref;
-}
+}

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

@@ -0,0 +1,29 @@
+// labels
+
+foo: for (let x of foo()) {
+  while (true) {
+    break foo;
+  }
+}
+
+foo: for (let x of foo()) {
+  while (true) {
+    break;
+  }
+}
+
+foo: for (let x of foo()) {
+  break foo;
+}
+
+// basic
+
+for (let x of foo()) {
+  break;
+}
+
+for (let x of foo()) {
+  while (true) {
+    break;
+  }
+}

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

@@ -0,0 +1,47 @@
+"use strict";
+
+// labels
+
+foo: for (var _iterator = foo()[Symbol.iterator](), _step; !(_step = _iterator.next()).done;) {
+  var x = _step.value;
+
+  while (true) {
+    _iterator["return"]();
+
+    break foo;
+  }
+}
+
+foo: for (var _iterator2 = foo()[Symbol.iterator](), _step2; !(_step2 = _iterator2.next()).done;) {
+  var x = _step2.value;
+
+  while (true) {
+    break;
+  }
+}
+
+foo: for (var _iterator3 = foo()[Symbol.iterator](), _step3; !(_step3 = _iterator3.next()).done;) {
+  var x = _step3.value;
+
+  _iterator3["return"]();
+
+  break foo;
+}
+
+// basic
+
+for (var _iterator4 = foo()[Symbol.iterator](), _step4; !(_step4 = _iterator4.next()).done;) {
+  var x = _step4.value;
+
+  _iterator4["return"]();
+
+  break;
+}
+
+for (var _iterator5 = foo()[Symbol.iterator](), _step5; !(_step5 = _iterator5.next()).done;) {
+  var x = _step5.value;
+
+  while (true) {
+    break;
+  }
+}

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

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

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) {
   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 @@
-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,18 +1,19 @@
-define(["exports"], function (exports) {
-  "use strict";
+"use strict";
 
+define(["exports"], function (exports) {
   var _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } };
 
   exports.foo7 = foo7;
   var foo = exports.foo = 1;
   var foo = exports.foo = 1;
   var bar = exports.bar = 2;
-  var foo2 = exports.foo2 = function () {};
+  var foo2 = exports.foo2 = function foo2() {};
   var foo3 = exports.foo3 = undefined;
   var foo4 = exports.foo4 = 2;
   var foo5 = exports.foo5 = undefined;
   var foo6 = exports.foo6 = 3;
   function foo7() {}
+
   var foo8 = exports.foo8 = function foo8() {
     _classCallCheck(this, foo8);
   };

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

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

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 @@
-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) {