v5.6.4

CHANGELOG.md

@@ -13,6 +13,22 @@ _Note: Gaps between patch versions are faulty/broken releases._
 
 See [CHANGELOG - 6to5](CHANGELOG-6to5.md) for the pre-4.0.0 version changelog.
 
+## 5.6.4
+
+ * **Internal**
+  * Add `ParenthesizedExpression` node type.
+
+## 5.6.3
+
+ * **Bug Fix**
+  * Fix rest parameter array allocation loop being incorrectly aliased.
+
+## 5.6.2
+
+ * **Bug Fix**
+  * Fix method key literals not turning into computed member expression in loose mode.
+  * Elect rest parameters in spread element position as candidates instead of replacing them in place.
+
 ## 5.6.0
 
  * **Bug Fix**

package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel-core",
   "description": "A compiler for writing next generation JavaScript",
-  "version": "5.6.1",
+  "version": "5.6.4",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "license": "MIT",

packages/babel-cli/package.json

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

packages/babel-runtime/package.json

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

src/babel/generation/generators/expressions.js

@@ -24,6 +24,12 @@ export function DoExpression(node, print) {
   print.plain(node.body);
 }
 
+export function ParenthesizedExpression(node, print) {
+  this.push("(");
+  print.plain(node.expression);
+  this.push(")");
+}
+
 export function UpdateExpression(node, print) {
   if (node.prefix) {
     this.push(node.operator);

src/babel/transformation/transformers/es6/arrow-functions.js

@@ -1,9 +1,6 @@
-import * as t from "../../../types";
-
 export var visitor = {
   ArrowFunctionExpression(node) {
-    t.ensureBlock(node);
-
+    this.ensureBlock();
     node.expression = false;
     node.type = "FunctionExpression";
     node.shadow = true;

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

@@ -477,7 +477,7 @@ class ClassTransformer {
 
         var classRef = this.classRef;
         if (!node.static) classRef = t.memberExpression(classRef, t.identifier("prototype"));
-        var methodName = t.memberExpression(classRef, node.key, node.computed);
+        var methodName = t.memberExpression(classRef, node.key, node.computed || t.isLiteral(node.key));
 
         var expr = t.expressionStatement(t.assignmentExpression("=", methodName, node.value));
         t.inheritsComments(expr, node);

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

@@ -18,7 +18,7 @@ export var visitor = {
         t.variableDeclarator(temp)
       ]);
 
-      t.ensureBlock(node);
+      this.ensureBlock();
 
       node.body.body.unshift(t.variableDeclaration("var", [
         t.variableDeclarator(left, temp)
@@ -48,7 +48,7 @@ export var visitor = {
 
     destructuring.init(pattern, key);
 
-    t.ensureBlock(node);
+    this.ensureBlock();
 
     var block = node.body;
     block.body = nodes.concat(block.body);
@@ -84,7 +84,7 @@ export var visitor = {
       destructuring.init(pattern, ref);
     }
 
-    t.ensureBlock(node);
+    this.ensureBlock();
 
     var block = node.body;
     block.body = nodes.concat(block.body);

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

@@ -17,7 +17,7 @@ export var visitor = {
     var block  = loop.body;
 
     // ensure that it's a block so we can take all its statements
-    t.ensureBlock(node);
+    this.ensureBlock();
 
     // add the value declaration to the new loop body
     if (declar) {

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

@@ -27,7 +27,7 @@ export var visitor = {
     if (!hasDefaults(node)) return;
 
     // ensure it's a block, useful for arrow functions
-    t.ensureBlock(node);
+    this.ensureBlock();
 
     var state = {
       iife: false,

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

@@ -42,7 +42,8 @@ var memberExpressionOptimisationVisitor = {
       if (this.parentPath.isSpreadElement() && state.offset === 0) {
         var call = this.parentPath.parentPath;
         if (call.isCallExpression() && call.node.arguments.length === 1) {
-          return state.argumentsNode;
+          state.candidates.push(this);
+          return;
         }
       }
     }
@@ -99,7 +100,6 @@ export var visitor = {
     }
 
     // check and optimise for extremely common cases
-
     var state = {
       references: [],
       offset:     node.params.length,
@@ -124,7 +124,9 @@ export var visitor = {
       if (state.candidates.length) {
         for (var candidate of (state.candidates: Array)) {
           candidate.replaceWith(argsId);
-          optimiseMemberExpression(candidate.parent, state.offset);
+          if (candidate.parentPath.isMemberExpression()) {
+            optimiseMemberExpression(candidate.parent, state.offset);
+          }
         }
       }
       return;
@@ -132,6 +134,9 @@ export var visitor = {
       state.references = state.references.concat(state.candidates);
     }
 
+    // deopt shadowed functions as transforms like regenerator may try touch the allocation loop
+    state.deopted = state.deopted || !!node.shadow;
+
     //
 
     var start = t.literal(node.params.length);
@@ -170,13 +175,13 @@ export var visitor = {
       LEN:        len
     });
 
-    if (!state.deopted) {
+    if (state.deopted) {
+      loop._blockHoist = node.params.length + 1;
+      node.body.body.unshift(loop);
+    } else {
       // perform allocation at the lowest common denominator of all references
+      loop._blockHoist = 1;
       this.getEarliestCommonAncestorFrom(state.references).getStatementParent().insertBefore(loop);
-      return;
     }
-
-    loop._blockHoist = node.params.length + 1;
-    node.body.body.unshift(loop);
   }
 };

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

@@ -150,7 +150,7 @@ class TailCallTransformer {
 
     //
 
-    var body = t.ensureBlock(node).body;
+    var body = this.path.ensureBlock().body;
 
     for (var i = 0; i < body.length; i++) {
       var bodyNode = body[i];

src/babel/traversal/path/conversion.js

@@ -22,3 +22,11 @@ export function toComputedKey(): Object {
 
   return key;
 }
+
+/**
+ * Description
+ */
+
+export function ensureBlock() {
+  return t.ensureBlock(this.node);
+}

src/babel/traversal/path/replacement.js

@@ -92,14 +92,14 @@ export function replaceWith(replacement, whateverAllowed) {
     return;
   }
 
+  if (this.isProgram() && !t.isProgram(replacement)) {
+    throw new Error("You can only replace a Program root node with another Program node");
+  }
+
   // normalise inserting an entire AST
   if (t.isProgram(replacement) && !this.isProgram()) {
     replacement = replacement.body;
     whateverAllowed = true;
-  } else {
-    if (this.isProgram()) {
-      throw new Error("You can only replace a Program root node with another Program node");
-    }
   }
 
   if (Array.isArray(replacement)) {

src/babel/types/alias-keys.json

@@ -71,6 +71,7 @@
   "MetaProperty":              ["Expression"],
   "NewExpression":             ["Expression"],
   "ObjectExpression":          ["Expression"],
+  "ParenthesizedExpression":   ["Expression"],
   "SequenceExpression":        ["Expression"],
   "TaggedTemplateExpression":  ["Expression"],
   "ThisExpression":            ["Expression"],

src/babel/types/visitor-keys.json

@@ -46,6 +46,7 @@
   "Noop":                      [],
   "ObjectExpression":          ["properties"],
   "ObjectPattern":             ["properties", "typeAnnotation"],
+  "ParenthesizedExpression":   ["expression"],
   "Program":                   ["body"],
   "Property":                  ["key", "value", "decorators"],
   "RestElement":               ["argument", "typeAnnotation"],

test/core/fixtures/transformation/es6.classes-loose/literal-key/actual.js

@@ -0,0 +1,5 @@
+class Foo {
+  "bar"() {
+
+  }
+}

test/core/fixtures/transformation/es6.classes-loose/literal-key/expected.js

@@ -0,0 +1,11 @@
+"use strict";
+
+var Foo = (function () {
+  function Foo() {
+    babelHelpers.classCallCheck(this, Foo);
+  }
+
+  Foo.prototype["bar"] = function bar() {};
+
+  return Foo;
+})();

test/core/fixtures/transformation/es6.parameters.rest/async-function/actual.js

@@ -0,0 +1,7 @@
+var fn = async (...rest) => rest;
+
+var fn = async (...rest) => {
+  if (true) {
+    rest;
+  }
+};

test/core/fixtures/transformation/es6.parameters.rest/async-function/expected.js

@@ -0,0 +1,39 @@
+"use strict";
+
+var _this = this;
+
+var fn = function fn() {
+  for (var _len = arguments.length, rest = Array(_len), _key = 0; _key < _len; _key++) {
+    rest[_key] = arguments[_key];
+  }
+
+  return regeneratorRuntime.async(function fn$(context$1$0) {
+    while (1) switch (context$1$0.prev = context$1$0.next) {
+      case 0:
+        return context$1$0.abrupt("return", rest);
+
+      case 1:
+      case "end":
+        return context$1$0.stop();
+    }
+  }, null, _this);
+};
+
+var fn = function fn() {
+  for (var _len2 = arguments.length, rest = Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+    rest[_key2] = arguments[_key2];
+  }
+
+  return regeneratorRuntime.async(function fn$(context$1$0) {
+    while (1) switch (context$1$0.prev = context$1$0.next) {
+      case 0:
+        if (true) {
+          rest;
+        }
+
+      case 1:
+      case "end":
+        return context$1$0.stop();
+    }
+  }, null, _this);
+};

test/core/fixtures/transformation/es6.parameters.rest/async-function/options.json

@@ -0,0 +1,3 @@
+{
+  "stage": 0
+}

test/core/fixtures/transformation/es6.parameters.rest/spread-optimisation/actual.js

@@ -13,3 +13,8 @@ function foo(a, ...b) {
 function foo(...b) {
   foo(1, ...b);
 }
+
+function foo(...args){
+  args.pop()
+  foo(...args);
+}

test/core/fixtures/transformation/es6.parameters.rest/spread-optimisation/expected.js

@@ -23,3 +23,12 @@ function foo() {
 
   foo.apply(undefined, [1].concat(b));
 }
+
+function foo() {
+  for (var _len3 = arguments.length, args = Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+    args[_key3] = arguments[_key3];
+  }
+
+  args.pop();
+  foo.apply(undefined, args);
+}