v2.13.7

This reverts commit 9cf1c62147.

CHANGELOG.md

@@ -11,6 +11,23 @@
 
 _Note: Gaps between patch versions are faulty/broken releases._
 
+## 2.13.7
+
+ * **Bug Fix**
+  * Don't realias variables that are already declared in optional `coreAliasing` transformer.
+
+## 2.13.6
+
+ * **Bug Fix**
+  * Add `NewExpression` as a valid parent for parentheses insertion for `ConditionalExpression`.
+
+## 2.13.5
+
+ * **Bug Fix**
+  * Allow rest parameters to be destructuring patterns.
+ * **Internal**
+  * Upgrade `kexec` to `1.1.0`.
+
 ## 2.13.4
 
  * **Bug Fix**

Makefile

@@ -65,7 +65,10 @@ test-browser:
 	node $(BROWSERIFY_CMD) -e test/_browser.js >dist/6to5-test.js
 	rm -rf templates.json tests.json
 
-	test -n "`which open`" && open test/browser.html
+	if [ -n $$BROWSER ]; then $$BROWSER test/browser.html; \
+	elif which xdg-open > /dev/null; then xdg-open 'test/browser.html'; \
+	elif which gnome-open > /dev/null; then gnome-open 'test/browser.html'; \
+	elif which open > /dev/null; then open 'test/browser.html'; fi \
 
 publish:
 	git pull --rebase

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

@@ -151,8 +151,10 @@ exports.ConditionalExpression = function (node, parent) {
     return true;
   }
 
-  if (t.isCallExpression(parent) && parent.callee === node) {
-    return true;
+  if (t.isCallExpression(parent) || t.isNewExpression(parent)) {
+    if (parent.callee === node) {
+      return true;
+    }
   }
 
   if (t.isConditionalExpression(parent) && parent.test === node) {

lib/6to5/transformation/transform.js

@@ -72,6 +72,7 @@ _.each({
   propertyMethodAssignment:  require("./transformers/es6-property-method-assignment"),
   computedPropertyNames:     require("./transformers/es6-computed-property-names"),
   defaultParameters:         require("./transformers/es6-default-parameters"),
+  restParameters:            require("./transformers/es6-rest-parameters"),
   destructuring:             require("./transformers/es6-destructuring"),
   forOf:                     require("./transformers/es6-for-of"),
   unicodeRegex:              require("./transformers/es6-unicode-regex"),
@@ -84,7 +85,6 @@ _.each({
   _blockHoist:               require("./transformers/_block-hoist"),
 
   generators:                require("./transformers/es6-generators"),
-  restParameters:            require("./transformers/es6-rest-parameters"),
 
   protoToAssign:             require("./transformers/optional-proto-to-assign"),
 

lib/6to5/transformation/transformers/es6-rest-parameters.js

@@ -41,6 +41,22 @@ exports.Function = function (node, parent, scope, context, file) {
     );
   }
 
+  // support patterns
+  if (t.isPattern(rest)) {
+    var pattern = rest;
+    rest = file.generateUidIdentifier("ref", scope);
+
+    // let the destructuring transformer handle this
+    var restDeclar = t.variableDeclaration("var", [
+      t.variableDeclarator(pattern, rest)
+    ]);
+
+    // retain evaluation position
+    restDeclar._blockHoist = node.params.length + 1;
+
+    node.body.body.unshift(restDeclar);
+  }
+
   node.body.body.unshift(
     util.template("rest", {
       ARGUMENTS: argsId,

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

@@ -42,7 +42,7 @@ exports.ast = {
             context.skip();
             return t.prependToMemberExpression(node, file._coreId);
           }
-        } else if (t.isReferencedIdentifier(node, parent) && !t.isMemberExpression(parent) && _.contains(ALIASABLE_CONSTRUCTORS, node.name)) {
+        } else if (t.isReferencedIdentifier(node, parent) && !t.isMemberExpression(parent) && _.contains(ALIASABLE_CONSTRUCTORS, node.name) && !scope.get(node.name, true)) {
           // Symbol() -> _core.Symbol(); new Promise -> new _core.Promise
           return t.memberExpression(file._coreId, node);
         } else if (t.isCallExpression(node)) {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "6to5",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "2.13.4",
+  "version": "2.13.7",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://6to5.org/",
   "repository": "6to5/6to5",
@@ -63,6 +63,6 @@
     "uglify-js": "2.4.16"
   },
   "optionalDependencies": {
-    "kexec": "0.2.0"
+    "kexec": "1.1.0"
   }
 }

test/fixtures/transformation/es6-let-scoping/.switch-break/exec.js

@@ -0,0 +1,11 @@
+if (true) {
+  const x = 1;
+  switch (x) {
+    case 1: {
+      function y() {
+        assert(x, 1);
+      };
+      break;
+    }
+  }
+}