v4.7.5

Ignore assignment to Error#stack if it is readonly property

.gitignore

@@ -11,6 +11,7 @@ test/tmp
 coverage
 dist
 .package.json
+packages/babel-runtime/*.js
 packages/babel-runtime/helpers/*.js
 packages/babel-runtime/regenerator/*.js
 lib

.travis.yml

@@ -1,7 +1,6 @@
 sudo: false
 language: node_js
 node_js:
-  - "0.10"
   - "0.12"
   - "iojs"
 

CHANGELOG.md

@@ -13,6 +13,13 @@ _Note: Gaps between patch versions are faulty/broken releases._
 
 See [CHANGELOG - 6to5](CHANGELOG-6to5.md) for the pre-4.0.0 version changelog.
 
+## 4.7.5
+
+ * **Bug Fix**
+  * Don't remap` break`s to call the iterator return.
+ * **Polish**
+  * Use a different helper for computed classes for much nicer output. Also fixes a bug in symbols being non-enumerable so they wouldn't be set on the class.
+
 ## 4.7.4
 
  * **Bug Fix**

package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "4.7.4",
+  "version": "4.7.5",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "repository": "babel/babel",

packages/babel-runtime/core-js.js

@@ -1 +0,0 @@
-module.exports = require("core-js/library");

packages/babel-runtime/package.json

@@ -1,10 +1,10 @@
 {
   "name": "babel-runtime",
   "description": "babel selfContained runtime",
-  "version": "4.7.3",
+  "version": "4.7.4",
   "repository": "babel/babel",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "dependencies": {
     "core-js": "^0.6.1"
   }
-}
+}

src/babel/api/register/node.js

@@ -46,7 +46,7 @@ var compile = function (filename) {
   var opts = extend({}, transformOpts);
   resolveRc(filename, opts);
 
-  var cacheKey = `${filename}:${JSON.stringify(opts)}`;
+  var cacheKey = `${filename}:${JSON.stringify(opts)}:${babel.version}`;
 
   if (cache) {
     var cached = cache[cacheKey];

src/babel/helpers/parse.js

@@ -40,7 +40,15 @@ export default function (opts, code, callback) {
         message += frame;
       }
 
-      if (err.stack) err.stack = err.stack.replace(err.message, message);
+      if (err.stack) {
+        var newStack = err.stack.replace(err.message, message);
+        try {
+          err.stack = newStack;
+        } catch (e) {
+          // `err.stack` may be a readonly property in some environments
+        }
+      }
+
       err.message = message;
     }
 

src/babel/transformation/file.js

@@ -50,6 +50,7 @@ export default class File {
     "inherits",
     "defaults",
     "create-class",
+    "create-computed-class",
     "apply-constructor",
     "tagged-template-literal",
     "tagged-template-literal-loose",

src/babel/transformation/helpers/define-map.js

@@ -5,33 +5,40 @@ import has from "lodash/object/has";
 import t from "../../types";
 
 export function push(mutatorMap, key, kind, computed, value) {
-  var alias;
+  var alias = t.toKeyAlias({ computed }, key);
 
-  if (t.isIdentifier(key)) {
-    alias = key.name;
-    if (computed) alias = `computed:${alias}`;
-  } else if (t.isLiteral(key)) {
-    alias = String(key.value);
-  } else {
-    alias = JSON.stringify(traverse.removeProperties(t.cloneDeep(key)));
-  }
-
-  var map;
-  if (has(mutatorMap, alias)) {
-    map = mutatorMap[alias];
-  } else {
-    map = {};
-  }
+  var map = {};
+  if (has(mutatorMap, alias)) map = mutatorMap[alias];
   mutatorMap[alias] = map;
 
   map._key = key;
-  if (computed) {
-    map._computed = true;
-  }
+  if (computed) map._computed = true;
 
   map[kind] = value;
 }
 
+export function hasComputed(mutatorMap) {
+  for (var key in mutatorMap) {
+    if (mutatorMap[key]._computed) {
+      return true;
+    }
+  }
+  return false;
+}
+
+export function toComputedObjectFromClass(obj) {
+  var objExpr = t.arrayExpression([]);
+
+  for (var i = 0; i < obj.properties.length; i++) {
+    var prop = obj.properties[i];
+    var val = prop.value;
+    val.properties.unshift(t.property("init", t.identifier("key"), t.toComputedKey(prop)));
+    objExpr.elements.push(val);
+  }
+
+  return objExpr;
+}
+
 export function toClassObject(mutatorMap) {
   var objExpr = t.objectExpression([]);
 
@@ -49,6 +56,7 @@ export function toClassObject(mutatorMap) {
       var prop = t.property("init", t.identifier(key), node);
       t.inheritsComments(prop, inheritNode);
       t.removeComments(inheritNode);
+
       mapNode.properties.push(prop);
     });
 
@@ -59,35 +67,11 @@ export function toClassObject(mutatorMap) {
 }
 
 export function toDefineObject(mutatorMap) {
-  var objExpr = t.objectExpression([]);
-
   each(mutatorMap, function (map) {
-    var mapNode = t.objectExpression([]);
-
-    var propNode = t.property("init", map._key, mapNode, map._computed);
-
-    if (map.value) {
-      map.writable = t.literal(true);
-    }
-
+    if (map.value) map.writable = t.literal(true);
     map.configurable = t.literal(true);
     map.enumerable = t.literal(true);
-
-    each(map, function (node, key) {
-      if (key[0] === "_") return;
-
-      node = t.clone(node);
-      var inheritNode = node;
-      if (t.isMethodDefinition(node)) node = node.value;
-
-      var prop = t.property("init", t.identifier(key), node);
-      t.inheritsComments(prop, inheritNode);
-      t.removeComments(inheritNode);
-      mapNode.properties.push(prop);
-    });
-
-    objExpr.properties.push(propNode);
   });
 
-  return objExpr;
+  return toClassObject(mutatorMap);
 }

src/babel/transformation/templates/create-computed-class.js

@@ -0,0 +1,18 @@
+(function() {
+  function defineProperties(target, rawProps) {
+    var props = {};
+    for (var i = 0; i < rawProps.length; i ++) {
+      var prop = rawProps[i];
+      prop.configurable = true;
+      if (prop.value) prop.writable = true;
+      props[prop.key] = prop;
+    }
+    Object.defineProperties(target, props);
+  }
+
+  return function (Constructor, protoProps, staticProps) {
+    if (protoProps) defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) defineProperties(Constructor, staticProps);
+    return Constructor;
+  };
+})()

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

@@ -217,6 +217,7 @@ class ClassTransformer {
 
     var instanceProps;
     var staticProps;
+    var classHelper = "create-class";
 
     if (this.hasInstanceMutators) {
       instanceProps = defineMap.toClassObject(this.instanceMutatorMap);
@@ -227,13 +228,19 @@ class ClassTransformer {
     }
 
     if (instanceProps || staticProps) {
+      if (defineMap.hasComputed(this.instanceMutatorMap) || defineMap.hasComputed(this.staticMutatorMap)) {
+        if (instanceProps) instanceProps = defineMap.toComputedObjectFromClass(instanceProps);
+        if (staticProps) staticProps = defineMap.toComputedObjectFromClass(staticProps);
+        classHelper = "create-computed-class";
+      }
+
       instanceProps ||= t.literal(null);
 
       var args = [this.classRef, instanceProps];
       if (staticProps) args.push(staticProps);
 
       body.push(t.expressionStatement(
-        t.callExpression(this.file.addHelper("create-class"), args)
+        t.callExpression(this.file.addHelper(classHelper), args)
       ));
     }
   }

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

@@ -135,10 +135,7 @@ export function AssignmentExpression(node, parent, scope, file) {
   if (!t.isPattern(node.left)) return;
 
   var ref = scope.generateUidIdentifier("temp");
-  scope.push({
-    key: ref.name,
-    id: ref
-  });
+  scope.push({ id: ref });
 
   var nodes = [];
   nodes.push(t.assignmentExpression("=", ref, node.right));

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

@@ -39,33 +39,6 @@ export function ForOfStatement(node, parent, scope, file) {
   }
 }
 
-var breakVisitor = {
-  enter(node, parent, scope, state) {
-    if (this.isLoop()) {
-      state.ignoreLabeless = true;
-      scope.traverse(node, breakVisitor, state);
-      state.ignoreLabeless = false;
-      return this.skip();
-    }
-
-    if (this.isBreakStatement()) {
-      if (!node.label && state.ignoreLabeless) return;
-      if (node.label && node.label.name !== state.label) return;
-
-      // break statements mean something different in this context
-      if (t.isSwitchCase(parent)) return;
-
-      var ret = t.expressionStatement(
-        t.callExpression(t.memberExpression(state.iteratorKey, t.identifier("return")), [])
-      );
-      ret = state.wrapReturn(ret);
-
-      this.skip();
-      return [ret, node];
-    }
-  }
-};
-
 var loose = function (node, parent, scope, file) {
   var left = node.left;
   var declar, id;
@@ -102,23 +75,6 @@ var loose = function (node, parent, scope, file) {
 
   //
 
-  scope.traverse(node, breakVisitor, {
-    iteratorKey: iteratorKey,
-    label:       t.isLabeledStatement(parent) && parent.label.name,
-
-    wrapReturn(node) {
-      return t.ifStatement(
-        t.logicalExpression(
-          "&&",
-          t.unaryExpression("!", isArrayKey, true),
-          t.memberExpression(iteratorKey, t.identifier("return")
-        )
-      ), node);
-    }
-  });
-
-  //
-
   return {
     declar: declar,
     node:   loop,
@@ -170,17 +126,6 @@ var spec = function (node, parent, scope, file) {
 
   //
 
-  scope.traverse(node, breakVisitor, {
-    iteratorKey: iteratorKey,
-    label:       isLabeledParent && parent.label.name,
-
-    wrapReturn(node) {
-      return t.ifStatement(t.memberExpression(iteratorKey, t.identifier("return")), node);
-    }
-  });
-
-  //
-
   return {
     replaceParent: isLabeledParent,
     declar:        declar,

src/babel/transformation/transformers/es6/object-super.js

@@ -40,10 +40,7 @@ export function ObjectExpression(node, parent, scope, file) {
   }
 
   if (objectRef) {
-    scope.push({
-      id: objectRef
-    });
-
+    scope.push({ id: objectRef });
     return t.assignmentExpression("=", objectRef, node);
   }
 }

src/babel/traversal/scope.js

@@ -581,16 +581,16 @@ export default class Scope {
       block = block.body;
     }
 
-    if (t.isBlockStatement(block) || t.isProgram(block)) {
-      block._declarations ||= {};
-      block._declarations[opts.key || opts.id.name] = {
-        kind: opts.kind || "var",
-        id: opts.id,
-        init: opts.init
-      };
-    } else {
-      throw new TypeError(`cannot add a declaration here in node type ${block.type}`);
+    if (!t.isBlockStatement(block) && !t.isProgram(block)) {
+      block = this.getBlockParent().block;
     }
+
+    block._declarations ||= {};
+    block._declarations[opts.key || opts.id.name] = {
+      kind: opts.kind || "var",
+      id: opts.id,
+      init: opts.init
+    };
   }
 
   /**

src/babel/types/index.js

@@ -126,7 +126,7 @@ each(t.BUILDER_KEYS, function (keys, type) {
  * Description
  */
 
-t.toComputedKey = function (node: Object, key: Object): Object {
+t.toComputedKey = function (node: Object, key: Object = node.key): Object {
   if (!node.computed) {
     if (t.isIdentifier(key)) key = t.literal(key.name);
   }
@@ -154,7 +154,6 @@ t.toSequenceExpression = function (nodes: Array<Object>, scope: Scope): Object {
       each(node.declarations, function (declar) {
         scope.push({
           kind: node.kind,
-          key: declar.id.name,
           id: declar.id
         });
         exprs.push(t.assignmentExpression("=", declar.id, declar.init));
@@ -702,6 +701,23 @@ t.getLastStatements = function (node: Object): Array<Object> {
   return nodes;
 };
 
+/**
+ * Description
+ */
+
+t.toKeyAlias = function (node: Object, key: Object = node.key) {
+  var alias;
+  if (t.isIdentifier(key)) {
+    alias = key.name;
+  } else if (t.isLiteral(key)) {
+    alias = JSON.stringify(key.value);
+  } else {
+    alias = JSON.stringify(traverse.removeProperties(t.cloneDeep(key)));
+  }
+  if (node.computed) alias = `[${alias}]`;
+  return alias;
+};
+
 /**
  * Description
  */

test/fixtures/transformation/es6-classes/computed-methods/actual.js

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

test/fixtures/transformation/es6-classes/computed-methods/exec.js

@@ -0,0 +1,17 @@
+const sym = Symbol();
+
+class Foo {
+  [sym] () {
+    return 1;
+  }
+}
+
+class Bar extends Foo {
+  [sym] () {
+    return super[sym]() + 2;
+  }
+}
+
+let i = new Bar();
+
+assert.equal(i[sym](), 3);

test/fixtures/transformation/es6-classes/computed-methods/expected.js

@@ -0,0 +1,19 @@
+"use strict";
+
+var Foo = (function () {
+  function Foo() {
+    babelHelpers.classCallCheck(this, Foo);
+  }
+
+  babelHelpers.createComputedClass(Foo, [{
+    key: "foo",
+    value: function foo() {}
+  }, {
+    key: "foo",
+    value: function foo() {}
+  }, {
+    key: bar,
+    value: function () {}
+  }]);
+  return Foo;
+})();

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

@@ -1,29 +0,0 @@
-// 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

@@ -1,100 +0,0 @@
-"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"]) _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"]) _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"]) _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/break/actual.js

@@ -1,29 +0,0 @@
-// 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

@@ -1,140 +0,0 @@
-"use strict";
-
-// labels
-
-var _iteratorNormalCompletion = true;
-var _didIteratorError = false;
-var _iteratorError = undefined;
-
-try {
-  foo: for (var _iterator = foo()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-    var x = _step.value;
-
-    while (true) {
-      if (_iterator["return"]) _iterator["return"]();
-
-      break foo;
-    }
-  }
-} catch (err) {
-  _didIteratorError = true;
-  _iteratorError = err;
-} finally {
-  try {
-    if (!_iteratorNormalCompletion && _iterator["return"]) {
-      _iterator["return"]();
-    }
-  } finally {
-    if (_didIteratorError) {
-      throw _iteratorError;
-    }
-  }
-}
-
-var _iteratorNormalCompletion2 = true;
-var _didIteratorError2 = false;
-var _iteratorError2 = undefined;
-
-try {
-  foo: for (var _iterator2 = foo()[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-    var x = _step2.value;
-
-    while (true) {
-      break;
-    }
-  }
-} catch (err) {
-  _didIteratorError2 = true;
-  _iteratorError2 = err;
-} finally {
-  try {
-    if (!_iteratorNormalCompletion2 && _iterator2["return"]) {
-      _iterator2["return"]();
-    }
-  } finally {
-    if (_didIteratorError2) {
-      throw _iteratorError2;
-    }
-  }
-}
-
-var _iteratorNormalCompletion3 = true;
-var _didIteratorError3 = false;
-var _iteratorError3 = undefined;
-
-try {
-  foo: for (var _iterator3 = foo()[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
-    var x = _step3.value;
-    if (_iterator3["return"]) _iterator3["return"]();
-
-    break foo;
-  }
-} catch (err) {
-  _didIteratorError3 = true;
-  _iteratorError3 = err;
-} finally {
-  try {
-    if (!_iteratorNormalCompletion3 && _iterator3["return"]) {
-      _iterator3["return"]();
-    }
-  } finally {
-    if (_didIteratorError3) {
-      throw _iteratorError3;
-    }
-  }
-}
-
-// basic
-
-var _iteratorNormalCompletion4 = true;
-var _didIteratorError4 = false;
-var _iteratorError4 = undefined;
-
-try {
-  for (var _iterator4 = foo()[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
-    var x = _step4.value;
-    if (_iterator4["return"]) _iterator4["return"]();
-
-    break;
-  }
-} catch (err) {
-  _didIteratorError4 = true;
-  _iteratorError4 = err;
-} finally {
-  try {
-    if (!_iteratorNormalCompletion4 && _iterator4["return"]) {
-      _iterator4["return"]();
-    }
-  } finally {
-    if (_didIteratorError4) {
-      throw _iteratorError4;
-    }
-  }
-}
-
-var _iteratorNormalCompletion5 = true;
-var _didIteratorError5 = false;
-var _iteratorError5 = undefined;
-
-try {
-  for (var _iterator5 = foo()[Symbol.iterator](), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
-    var x = _step5.value;
-
-    while (true) {
-      break;
-    }
-  }
-} catch (err) {
-  _didIteratorError5 = true;
-  _iteratorError5 = err;
-} finally {
-  try {
-    if (!_iteratorNormalCompletion5 && _iterator5["return"]) {
-      _iterator5["return"]();
-    }
-  } finally {
-    if (_didIteratorError5) {
-      throw _iteratorError5;
-    }
-  }
-}

test/fixtures/transformation/playground/object-getter-memoization/expected.js

@@ -5,17 +5,17 @@ var Foo = (function () {
     babelHelpers.classCallCheck(this, Foo);
   }
 
-  babelHelpers.createClass(Foo, babelHelpers.defineProperty({
-    bar: {
-      get: function () {
-        return babelHelpers.defineProperty(this, "bar", complex()).bar;
-      }
+  babelHelpers.createComputedClass(Foo, [{
+    key: "bar",
+    get: function () {
+      return babelHelpers.defineProperty(this, "bar", complex()).bar;
     }
-  }, bar, {
+  }, {
+    key: bar,
     get: function () {
       return babelHelpers.defineProperty(this, bar, complex())[bar];
     }
-  }));
+  }]);
   return Foo;
 })();