v5.3.3

Add license fields to packages

CHANGELOG.md

@@ -13,6 +13,17 @@ _Note: Gaps between patch versions are faulty/broken releases._
 
 See [CHANGELOG - 6to5](CHANGELOG-6to5.md) for the pre-4.0.0 version changelog.
 
+## 5.3.3
+
+ * **Bug Fix**
+  * Fix `minification.deadCodeElimination` transformer incorrectly trying to inline import declarations.
+  * Fix `minification.inlineExpression` transformer getting into an infinite loop.
+
+## 5.3.2
+
+ * **Bug Fix**
+  * Fix patterns not being considered when hoisting variables in the `es6.blockScoping` transformer.
+
 ## 5.3.1
 
  * **Bug Fix**
@@ -37,6 +48,7 @@ See [CHANGELOG - 6to5](CHANGELOG-6to5.md) for the pre-4.0.0 version changelog.
   * Properly hoist temp param declarations when doing TCO.
  * **Internal**
   * Add `--harmony_generators` flag to `$ babel-node`.
+  * Internal AST traversals have been minimised **drastically**. Transformers have been grouped together which means entire tree traversals are much fewer. Visiting nodes is now also skipped if the traversal context can detect that the handler is a noop. This sames precious cycles as it avoids constructing traversal paths and creating a new traversal context. See issues [#1472](https://github.com/babel/babel/issues/1472) and [#1486](https://github.com/babel/babel/issues/1486) for related discussion.
  * **Polish**
   * Move many `utility` transformers to `minification`.
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel-core",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "5.3.1",
+  "version": "5.3.3",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "license": "MIT",
@@ -64,7 +64,7 @@
     "user-home": "^1.1.1"
   },
   "devDependencies": {
-    "babel": "5.3.0",
+    "babel": "5.3.1",
     "browserify": "^9.0.8",
     "chai": "^2.2.0",
     "eslint": "^0.18.0",

packages/babel-cli/package.json

@@ -1,13 +1,14 @@
 {
   "name": "babel",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "5.3.0",
+  "version": "5.3.2",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
+  "license": "MIT",
   "repository": "babel/babel",
   "preferGlobal": true,
   "dependencies": {
-    "babel-core": "^5.3.0",
+    "babel-core": "^5.3.2",
     "chokidar": "^1.0.0",
     "commander": "^2.6.0",
     "convert-source-map": "^1.1.0",

packages/babel-runtime/package.json

@@ -1,7 +1,8 @@
 {
   "name": "babel-runtime",
   "description": "babel selfContained runtime",
-  "version": "5.3.0",
+  "version": "5.3.2",
+  "license": "MIT",
   "repository": "babel/babel",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "dependencies": {

src/babel/transformation/file/index.js

@@ -461,16 +461,6 @@ export default class File {
     this.path  = TraversalPath.get(null, null, ast, ast, "program", this);
     this.scope = this.path.scope;
     this.ast   = ast;
-
-    this.path.traverse({
-      enter(node, parent, scope) {
-        if (this.isScope()) {
-          for (var key in scope.bindings) {
-            scope.bindings[key].setTypeAnnotation();
-          }
-        }
-      }
-    });
   }
 
   addAst(ast) {

src/babel/transformation/templates/rest.js

@@ -1,3 +1,3 @@
-for (var LEN = ARGUMENTS.length, ARRAY = Array(ARRAY_LEN), KEY = START; KEY < LEN; KEY++) {
+for (var LEN = ARGUMENTS.length, ARRAY: ARRAY_TYPE = Array(ARRAY_LEN), KEY = START; KEY < LEN; KEY++) {
   ARRAY[ARRAY_KEY] = ARGUMENTS[KEY];
 }

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

@@ -557,9 +557,13 @@ class BlockScoping {
    */
 
   pushDeclar(node: { type: "VariableDeclaration" }): Array<Object> {
-    this.body.push(t.variableDeclaration(node.kind, node.declarations.map(function (declar) {
-      return t.variableDeclarator(declar.id);
-    })));
+    var declars = [];
+    var names = t.getBindingIdentifiers(node);
+    for (var name in names) {
+      declars.push(t.variableDeclarator(names[name]));
+    }
+
+    this.body.push(t.variableDeclaration(node.kind, declars));
 
     var replace = [];
 

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

@@ -179,7 +179,7 @@ export function VariableDeclaration(node, parent, scope, file) {
       file:  file
     });
 
-    if (t.isPattern(pattern) && patternId) {
+    if (t.isPattern(pattern)) {
       destructuring.init(pattern, patternId);
 
       if (+i !== node.declarations.length - 1) {

src/babel/transformation/transformers/es6/parameters.rest.js

@@ -56,7 +56,8 @@ var hasRest = function (node) {
 export function Func(node, parent, scope, file) {
   if (!hasRest(node)) return;
 
-  var rest = node.params.pop().argument;
+  var restParam = node.params.pop();
+  var rest = restParam.argument;
 
   var argsId = t.identifier("arguments");
 
@@ -125,13 +126,14 @@ export function Func(node, parent, scope, file) {
   }
 
   var loop = util.template("rest", {
-    ARGUMENTS: argsId,
-    ARRAY_KEY: arrKey,
-    ARRAY_LEN: arrLen,
-    START:     start,
-    ARRAY:     rest,
-    KEY:       key,
-    LEN:       len
+    ARRAY_TYPE: restParam.typeAnnotation,
+    ARGUMENTS:  argsId,
+    ARRAY_KEY:  arrKey,
+    ARRAY_LEN:  arrLen,
+    START:      start,
+    ARRAY:      rest,
+    KEY:        key,
+    LEN:        len
   });
   loop._blockHoist = node.params.length + 1;
   node.body.body.unshift(loop);

src/babel/transformation/transformers/minification/dead-code-elimination.js

@@ -22,21 +22,19 @@ export var metadata = {
   group: "builtin-setup"
 };
 
-export function Identifier(node, parent, scope) {
-  if (!this.isReferenced()) return;
-
+export function ReferencedIdentifier(node, parent, scope) {
   var binding = scope.getBinding(node.name);
   if (!binding || binding.references > 1 || !binding.constant) return;
-  if (binding.kind === "param") return;
+  if (binding.kind === "param" || binding.kind === "module") return;
 
   var replacement = binding.path.node;
   if (t.isVariableDeclarator(replacement)) {
     replacement = replacement.init;
   }
+  if (!replacement) return;
+
   t.toExpression(replacement);
-
   scope.removeBinding(node.name);
-
   binding.path.remove();
   return replacement;
 }

src/babel/transformation/transformers/minification/inline-expressions.js

@@ -5,10 +5,12 @@ export var metadata = {
   group: "builtin-setup"
 };
 
-export function Expression(node, parent, scope) {
-  var res = this.evaluate();
-  if (res.confident) return t.valueToNode(res.value);
-}
+export var Expression = {
+  exit(node, parent, scope) {
+    var res = this.evaluate();
+    if (res.confident) return t.valueToNode(res.value);
+  }
+};
 
 export function Identifier() {
   // override Expression

src/babel/transformation/transformers/other/regenerator.js

@@ -7,4 +7,5 @@ export var metadata = {
 
 export function Program(ast) {
   regenerator.transform(ast);
+  this.stop();
 }

src/babel/traversal/binding.js

@@ -69,6 +69,15 @@ export default class Binding {
     this.references++;
   }
 
+  /**
+   * Description
+   */
+
+  dereference() {
+    this.references--;
+    this.referenced = !!this.references;
+  }
+
   /**
    * Description
    */

src/babel/traversal/path/evaluation.js

@@ -92,6 +92,7 @@ export function evaluate(): { confident: boolean; value: any } {
         case "!": return !arg;
         case "+": return +arg;
         case "-": return -arg;
+        case "~": return ~arg;
       }
     }
 

src/babel/traversal/path/hoister.js

@@ -16,11 +16,13 @@ var referenceVisitor = {
         // eg. it's in a closure etc
         if (bindingInfo !== state.scope.getBinding(node.name)) return;
 
-        if (bindingInfo && bindingInfo.constant) {
-          state.bindings[node.name] = bindingInfo;
-        } else {
-          state.foundIncompatible = true;
-          this.stop();
+        if (bindingInfo) {
+          if (bindingInfo.constant) {
+            state.bindings[node.name] = bindingInfo;
+          } else {
+            state.foundIncompatible = true;
+            this.stop();
+          }
         }
       }
     }

src/babel/traversal/path/index.js

@@ -228,14 +228,16 @@ export default class TraversalPath {
         paths.push(TraversalPath.get(this, null, node, this.container, to));
       }
     }
+
+    return paths;
   }
 
   _containerInsertBefore(nodes) {
-    this._containerInsert(this.key, nodes);
+    return this._containerInsert(this.key, nodes);
   }
 
   _containerInsertAfter(nodes) {
-    this._containerInsert(this.key + 1, nodes);
+    return this._containerInsert(this.key + 1, nodes);
   }
 
   _maybePopFromStatements(nodes) {
@@ -947,7 +949,7 @@ export default class TraversalPath {
       annotation: null
     };
 
-    var type = this.node.typeAnnotation;
+    var type = this.node && this.node.typeAnnotation;
 
     if (!type) {
       info.inferred = true;
@@ -1025,36 +1027,36 @@ export default class TraversalPath {
     path = path.resolve();
     if (!path) return;
 
-    if (path.isRestElement() || path.parentPath.isRestElement() || path.isArrayExpression()) {
+    if (path.isPreviousType("RestElement") || path.parentPath.isPreviousType("RestElement") || path.isPreviousType("ArrayExpression")) {
       return t.genericTypeAnnotation(t.identifier("Array"));
     }
 
-    if (path.parentPath.isTypeCastExpression()) {
+    if (path.parentPath.isPreviousType("TypeCastExpression")) {
       return path.parentPath.node.typeAnnotation;
     }
 
-    if (path.isTypeCastExpression()) {
+    if (path.isPreviousType("TypeCastExpression")) {
       return path.node.typeAnnotation;
     }
 
-    if (path.isObjectExpression()) {
+    if (path.isPreviousType("ObjectExpression")) {
       return t.genericTypeAnnotation(t.identifier("Object"));
     }
 
-    if (path.isFunction()) {
+    if (path.isPreviousType("Function")) {
       return t.identifier("Function");
     }
 
-    if (path.isLiteral()) {
+    if (path.isPreviousType("Literal")) {
       var value = path.node.value;
       if (isString(value)) return t.stringTypeAnnotation();
       if (isNumber(value)) return t.numberTypeAnnotation();
       if (isBoolean(value)) return t.booleanTypeAnnotation();
     }
 
-    if (path.isCallExpression()) {
+    if (path.isPreviousType("CallExpression")) {
       var callee = path.get("callee").resolve();
-      if (callee && callee.isFunction()) return callee.node.returnType;
+      if (callee && callee.isPreviousType("Function")) return callee.node.returnType;
     }
   }
 

src/babel/traversal/scope.js

@@ -631,13 +631,14 @@ export default class Scope {
     var declar  = !unique && path.getData(dataKey);
 
     if (!declar) {
-      declar = t.variableDeclaration(opts.kind || "var", []);
+      declar = t.variableDeclaration(kind, []);
       declar._generated = true;
       declar._blockHoist = 2;
 
       this.file.attachAuxiliaryComment(declar);
 
-      path.get("body")[0]._containerInsertBefore([declar]);
+      var [declarPath] = path.get("body")[0]._containerInsertBefore([declar]);
+      this.registerBinding(kind, declarPath);
       if (!unique) path.setData(dataKey, declar);
     }
 

src/babel/types/validators.js

@@ -49,12 +49,27 @@ export function isReferenced(node: Object, parent: Object): boolean {
       return parent.id !== node;
 
     // no: export { foo as NODE };
+    // yes: export { NODE as foo };
+    // no: export { NODE as foo } from "foo";
     case "ExportSpecifier":
-      return parent.exported !== node;
+      if (parent.source) {
+        return false;
+      } else {
+        return parent.local === node;
+      }
+
+    // no: import NODE from "foo";
+    case "ImportDefaultSpecifier":
+      return false;
+
+    // no: import * as NODE from "foo";
+    case "ImportNamespaceSpecifier":
+      return false;
 
     // no: import { NODE as foo } from "foo";
+    // no: import { foo as NODE } from "foo";
     case "ImportSpecifier":
-      return parent.imported !== node;
+      return false;
 
     // no: class NODE {}
     case "ClassDeclaration":

test/core/fixtures/transformation/es6.block-scoping/hoisting/actual.js

@@ -1,5 +1,6 @@
 for (let i of nums) {
   var x = 5;
+  var { f } = { f: 2 };
   fns.push(function () {
     return i * x;
   });

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

@@ -8,6 +8,8 @@ try {
   var _loop = function () {
     var i = _step.value;
     x = 5;
+    var _f = { f: 2 };
+    f = _f.f;
 
     fns.push(function () {
       return i * x;
@@ -16,6 +18,7 @@ try {
 
   for (var _iterator = nums[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
     var x;
+    var f;
 
     _loop();
   }
@@ -32,4 +35,4 @@ try {
       throw _iteratorError;
     }
   }
-}
+}