v2.4.7

CHANGELOG.md

@@ -2,6 +2,23 @@
 
 Gaps between patch versions are faulty/broken releases.
 
+## 2.4.7
+
+ * Upgrade `acorn-6to5`.
+
+## 2.4.6
+
+ * Move `coreAliasing` and `undefinedToVoid` transformers down to catch `moduleFormatter` transforms.
+
+## 2.4.5
+
+ * Avoid printing comments if they've already been output.
+
+## 2.4.4
+
+ * Add `module` type to browser build `<script>` handler.
+ * Fix some `MemberExpression` modifying incorrectly setting `property` to a `MemberExpression`.
+
 ## 2.4.3
 
  * Upgrade `acorn-6to5`.

doc/caveats.md

@@ -9,12 +9,15 @@ You may alternatively selectively include what you need:
 | Feature                     | Requirements                                                                                                           |
 | --------------------------- | ---------------------------------------------------------------------------------------------------------------------- |
 | Abstract References         | [experimental](experimental.md), `Symbol`                                                                              |
-| Array destructuring         | `Array.isArray`, `Array.from`                                                                                          |
+| Array destructuring         | `Array.from`                                                                                                           |
 | Async functions, Generators | [experimental](experimental.md), [regenerator runtime](https://github.com/facebook/regenerator/blob/master/runtime.js) |
-| Comprehensions              | [experimental](experimental.md), `Array.isArray`, `Array.from`                                                         |
+| Comprehensions              | [experimental](experimental.md), `Array.from`                                                                          |
 | For Of                      | `Symbol`, `prototype[Symbol.iterator]`                                                                                 |
+| Modules                     | `Object.assign`*                                                                                                       |
 | Object spread/rest          | [experimental](experimental.md), `Object.assign`                                                                       |
-| Spread                      | `Array.isArray`, `Array.from`                                                                                          |
+| Spread                      | `Array.from`                                                                                                           |
+
+*Only required for exporting a non-function `default` with additional `export`s.
 
 ## ES5
 
@@ -26,13 +29,13 @@ ES5 such as lower versions of IE then using the
 
 ## Internet Explorer
 
-### Classes (9 and below)
+### Classes (10 and below)
 
 If you're inheriting from a class then static properties are inherited from it
 via [\_\_proto\_\_](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/proto),
 this is widely supported but you may run into problems with much older browsers.
 
-**NOTE:** `__proto__` is not supported on IE <= 9 so static properties
+**NOTE:** `__proto__` is not supported in IE <= 10 so static properties
 **will not** be inherited. A possible workaround is to use `super();`:
 
 ```javascript
@@ -56,4 +59,4 @@ unfortunate as it's required to set getters and setters. Due to this if
 you plan on supporting IE8 or below then the user of getters and setters
 isn't recommended.
 
-Reference: [MDN](https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/Object/defineProperty#Internet_Explorer_8_specific_notes).
+**Reference**: [MDN](https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/Object/defineProperty#Internet_Explorer_8_specific_notes).

doc/index.md

@@ -52,7 +52,7 @@ And it doesn't end here! To see all the ways you can use 6to5, check out the
  - [Let scoping](features.md#let-scoping)
  - [Modules](features.md#modules)
  - [Numeric literals](features.md#numeric-literals)
- - [Object Rest/Spread](features.md#object-rest-spread) ([experimental](experimental.md))
+ - [Object rest/spread](features.md#object-rest-spread) ([experimental](experimental.md))
  - [Property method assignment](features.md#property-method-assignment)
  - [Property name shorthand](features.md#property-name-shorthand)
  - [React/JSX](react.md)

doc/playground.md

@@ -18,11 +18,19 @@ to5.transform("code", { playground: true });
 
  * [Memoization operator](#memoization-operator)
  * [Method binding](#method-binding)
+ * [Method binding function shorthand](#method-binding-function-shorthand)
  * [Object getter memoization](#object-getter-memoization)
  * [This shorthand](#this-shorthand)
 
 ### Memoization assignment operator
 
+The memoization assignment operator allows you to lazily set an object property.
+It checks whether there's a property defined on the object and if there isn't then
+the right hand value is set.
+
+This means that `obj.x` in the following `var x = { x: undefined }; obj.x ?= 2;`
+will still be `undefined` because it's already been defined on the object.
+
 ```javascript
 var obj = {};
 obj.x ?= 2;
@@ -42,7 +50,7 @@ var obj = {};
 obj.x ?= 2;
 ```
 
-equivalent to:
+equivalent to
 
 ```javascript
 var obj = {};
@@ -54,17 +62,25 @@ if (!Object.prototype.hasOwnProperty.call(obj, "x")) obj.x = 2;
 ```javascript
 var fn = obj#method;
 var fn = obj#method("foob");
-
-["foo", "bar"].map(#toUpperCase); // ["FOO", "BAR"]
-[1.1234, 23.53245, 3].map(#toFixed(2)); // ["1.12", "23.53", "3.00"]
 ```
 
-equivalent to:
+equivalent to
 
 ```javascript
 var fn = obj.method.bind(obj);
 var fn = obj.method.bind(obj, "foob");
+```
 
+### Method binding function shorthand
+
+```javascript
+["foo", "bar"].map(#toUpperCase); // ["FOO", "BAR"]
+[1.1234, 23.53245, 3].map(#toFixed(2)); // ["1.12", "23.53", "3.00"]
+```
+
+equivalent to
+
+```javascript
 ["foo", "bar"].map(function (val) { return val.toUpperCase(); });
 [1.1234, 23.53245, 3].map(function (val) { return val.toFixed(2); });
 ```

lib/6to5/browser.js

@@ -34,7 +34,7 @@ transform.load = function (url, callback, opts, hold) {
 
 var runScripts = function () {
   var scripts = [];
-  var types   = ["text/ecmascript-6", "text/6to5"];
+  var types   = ["text/ecmascript-6", "text/6to5", "module"];
   var index   = 0;
 
   var exec = function () {
@@ -60,8 +60,9 @@ var runScripts = function () {
     }
   };
 
-  var _scripts = global.document.getElementsByTagName("script");
-  for (var i in _scripts) {
+  var _scripts = global.document .getElementsByTagName("script");
+
+  for (var i = 0; i < _scripts.length; ++i) {
     var _script = _scripts[i];
     if (types.indexOf(_script.type) >= 0) scripts.push(_script);
   }

lib/6to5/generation/generator.js

@@ -274,14 +274,21 @@ CodeGenerator.prototype._printComments = function (comments) {
   var self = this;
 
   _.each(comments, function (comment) {
+    var skip = false;
+
     // find the original comment in the ast and set it as displayed
     _.each(self.ast.comments, function (origComment) {
       if (origComment.start === comment.start) {
+        // comment has already been output
+        if (origComment._displayed) skip = true;
+
         origComment._displayed = true;
         return false;
       }
     });
 
+    if (skip) return;
+
     // whitespace before
     self.newline(self.whitespace.getNewlinesBefore(comment));
 

lib/6to5/generation/generators/expressions.js

@@ -98,6 +98,10 @@ exports.MemberExpression = function (node, print) {
   var obj = node.object;
   print(obj);
 
+  if (!node.computed && t.isMemberExpression(node.property)) {
+    throw new TypeError("Got a MemberExpression for MemberExpression property");
+  }
+
   if (node.computed) {
     this.push("[");
     print(node.property);

lib/6to5/transformation/transform.js

@@ -83,14 +83,14 @@ _.each({
 
   _declarations:             require("./transformers/_declarations"),
 
-  coreAliasing:              require("./transformers/optional-core-aliasing"),
-  undefinedToVoid:           require("./transformers/optional-undefined-to-void"),
-
   // wrap up
   _aliasFunctions:           require("./transformers/_alias-functions"),
   _moduleFormatter:          require("./transformers/_module-formatter"),
   useStrict:                 require("./transformers/use-strict"),
 
+  coreAliasing:              require("./transformers/optional-core-aliasing"),
+  undefinedToVoid:           require("./transformers/optional-undefined-to-void"),
+
   // spec
   specPropertyLiterals:         require("./transformers/spec-property-literals"),
   specMemberExpressionLiterals: require("./transformers/spec-member-expression-literals")

lib/6to5/transformation/transformers/es6-classes.js

@@ -276,7 +276,7 @@ Class.prototype.replaceInstanceSuperReferences = function (methodNode) {
         if (callee.object.name !== "super") return;
 
         // super.test(); -> ClassName.prototype.MethodName.call(this);
-        callee.property = t.memberExpression(callee.property, t.identifier("call"));
+        t.appendToMemberExpression(callee, t.identifier("call"));
         node.arguments.unshift(t.thisExpression());
       }
     }

lib/6to5/transformation/transformers/es6-spread.js

@@ -87,13 +87,7 @@ exports.CallExpression = function (node, parent, file, scope) {
       callee.object = t.assignmentExpression("=", temp, callee.object);
     }
 
-    if (callee.computed) {
-      callee.object = t.memberExpression(callee.object, callee.property, true);
-      callee.property = t.identifier("apply");
-      callee.computed = false;
-    } else {
-      callee.property = t.memberExpression(callee.property, t.identifier("apply"));
-    }
+    t.appendToMemberExpression(callee, t.identifier("apply"));
   } else {
     node.callee = t.memberExpression(node.callee, t.identifier("apply"));
   }

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

@@ -28,9 +28,9 @@ exports.ast = {
 
           if (!t.isReferenced(obj, node)) return;
 
-          if (coreHas(obj) && _.has(core[obj.name], prop.name)) {
+          if (!node.computed && coreHas(obj) && _.has(core[obj.name], prop.name)) {
             this.stop();
-            return t.memberExpression(file._coreId, node);
+            return t.prependToMemberExpression(node, file._coreId);
           }
         } else if (t.isIdentifier(node) && !t.isMemberExpression(parent) && t.isReferenced(node, parent) && coreHas(node)) {
           // new Promise -> new _core.Promise

lib/6to5/types/index.js

@@ -64,7 +64,14 @@ _.each(t.FLIPPED_ALIAS_KEYS, function (types, type) {
   addAssert(type, is);
 });
 
-//
+/*
+ * Shallowly checks to see if the passed `node` will evaluate to a
+ * falsy. This is if `node` is a `Literal` and `value` is falsy or
+ * `node` is an `Identifier` with a name of `undefiend`.
+ *
+ * @param {Object} node
+ * @returns {Boolean}
+ */
 
 t.isFalsyExpression = function (node) {
   if (t.isLiteral(node)) {
@@ -75,7 +82,14 @@ t.isFalsyExpression = function (node) {
   return false;
 };
 
-//
+/**
+ * Turn an array of statement `nodes` into a `SequenceExpression`.
+ *
+ * Variable declarations are turned into simple assignments and their
+ * declarations hoisted to the top of the current scope.
+ *
+ * Expression statements are just resolved to their standard expression.
+ */
 
 t.toSequenceExpression = function (nodes, scope) {
   var exprs = [];
@@ -116,7 +130,41 @@ t.shallowEqual = function (actual, expected) {
   return same;
 };
 
-//
+/**
+ * Description
+ *
+ * @param {Object} member
+ * @param {Object} append
+ * @param {Boolean} [computed]
+ * @returns {Object} member
+ */
+
+t.appendToMemberExpression = function (member, append, computed) {
+  member.object   = t.memberExpression(member.object, member.property, member.computed);
+  member.property = append;
+  member.computed = !!computed;
+  return member;
+};
+
+/**
+ * Description
+ *
+ * @param {Object} member
+ * @param {Object} append
+ * @returns {Object} member
+ */
+
+t.prependToMemberExpression = function (member, append) {
+  member.object = t.memberExpression(append, member.object);
+  return member;
+};
+
+/*
+ * Description
+ *
+ * @param {Object} node
+ * @returns {Boolean}
+ */
 
 t.isDynamic = function (node) {
   if (t.isExpressionStatement(node)) {
@@ -130,7 +178,14 @@ t.isDynamic = function (node) {
   }
 };
 
-// todo: https://github.com/eventualbuddha/ast-util/blob/9bf91c5ce8/lib/index.js#L454-L507
+/**
+ * Description
+ *
+ * @param {Object} node
+ * @param {Object} parent
+ * @returns {Boolean}
+ */
+
 t.isReferenced = function (node, parent) {
   // we're a property key and we aren't computed so we aren't referenced
   if (t.isProperty(parent) && parent.key === node && !parent.computed) return false;
@@ -152,6 +207,24 @@ t.isReferenced = function (node, parent) {
   return false;
 };
 
+/**
+ * Description
+ *
+ * @param {String} name
+ * @returns {Boolean}
+ */
+
+t.isValidIdentifier = function (name) {
+  return _.isString(name) && esutils.keyword.isIdentifierName(name) && !esutils.keyword.isKeywordES6(name, true);
+};
+
+/*
+ * Description
+ *
+ * @param {String} name
+ * @returns {String}
+ */
+
 t.toIdentifier = function (name) {
   if (t.isIdentifier(name)) return name.name;
 
@@ -172,15 +245,26 @@ t.toIdentifier = function (name) {
   return name || '_';
 };
 
-t.isValidIdentifier = function (name) {
-  return _.isString(name) && esutils.keyword.isIdentifierName(name) && !esutils.keyword.isKeywordES6(name, true);
-};
+/**
+ * Description
+ *
+ * @param {Object} node
+ * @param {String} key
+ */
 
 t.ensureBlock = function (node, key) {
   key = key || "body";
   node[key] = t.toBlock(node[key], node);
 };
 
+/**
+ * Description
+ *
+ * @param {Object} node
+ * @param {Boolean} [ignore]
+ * @returns {Object|Boolean}
+ */
+
 t.toStatement = function (node, ignore) {
   if (t.isStatement(node)) {
     return node;
@@ -214,6 +298,14 @@ t.toStatement = function (node, ignore) {
   return node;
 };
 
+/**
+ * Description
+ *
+ * @param {Object} node
+ * @param {Object} parent
+ * @returns {Object}
+ */
+
 t.toBlock = function (node, parent) {
   if (t.isBlockStatement(node)) {
     return node;
@@ -234,6 +326,15 @@ t.toBlock = function (node, parent) {
   return t.blockStatement(node);
 };
 
+/*
+ * Description
+ *
+ * @param {Object} parent
+ * @param {File} file
+ * @param {Scope} scope
+ * @returns {Object}
+ */
+
 t.getUid = function (parent, file, scope) {
   var node = parent;
 
@@ -277,6 +378,15 @@ t.getUid = function (parent, file, scope) {
   return file.generateUidIdentifier(id, scope);
 };
 
+/**
+ * Description
+ *
+ * @param {Object} node
+ * @param {Boolean} [map]
+ * @param {Array} [ignoreTypes]
+ * @returns {Array|Object}
+ */
+
 t.getIds = function (node, map, ignoreTypes) {
   ignoreTypes = ignoreTypes || [];
 
@@ -327,10 +437,24 @@ t.getIds.arrays = {
   ObjectPattern: ["properties"]
 };
 
+/**
+ * Description
+ *
+ * @param {Object} node
+ * @returns {Boolean}
+ */
+
 t.isLet = function (node) {
   return t.isVariableDeclaration(node) && (node.kind !== "var" || node._let);
 };
 
+/**
+ * Description
+ *
+ * @param {Object} node
+ * @returns {Boolean}
+ */
+
 t.isVar = function (node) {
   return t.isVariableDeclaration(node, { kind: "var" }) && !node._let;
 };
@@ -339,6 +463,13 @@ t.isVar = function (node) {
 
 t.COMMENT_KEYS = ["leadingComments", "trailingComments"];
 
+/**
+ * Description
+ *
+ * @param {Object} child
+ * @returns {Object} child
+ */
+
 t.removeComments = function (child) {
   _.each(t.COMMENT_KEYS, function (key) {
     delete child[key];
@@ -346,6 +477,14 @@ t.removeComments = function (child) {
   return child;
 };
 
+/**
+ * Description
+ *
+ * @param {Object} child
+ * @param {Object} parent
+ * @returns {Object} child
+ */
+
 t.inheritsComments = function (child, parent) {
   _.each(t.COMMENT_KEYS, function (key) {
     child[key]  = _.uniq(_.compact([].concat(child[key], parent[key])));
@@ -353,7 +492,13 @@ t.inheritsComments = function (child, parent) {
   return child;
 };
 
-//
+/**
+ * Description
+ *
+ * @param {Object} child
+ * @param {Object} parent
+ * @returns {Object} child
+ */
 
 t.inherits = function (child, parent) {
   child.loc   = parent.loc;
@@ -364,10 +509,24 @@ t.inherits = function (child, parent) {
   return child;
 };
 
+/**
+ * Description
+ *
+ * @param {Object} specifier
+ * @returns {String}
+ */
+
 t.getSpecifierName = function (specifier) {
   return specifier.name || specifier.id;
 };
 
+/**
+ * Description
+ *
+ * @param {Object} specifier
+ * @returns {Boolean}
+ */
+
 t.isSpecifierDefault = function (specifier) {
   return t.isIdentifier(specifier.id) && specifier.id.name === "default";
 };

package.json

@@ -1,7 +1,7 @@
 {
   "name": "6to5",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "2.4.3",
+  "version": "2.4.7",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://github.com/6to5/6to5",
   "repository": {
@@ -35,7 +35,7 @@
     "test": "make test"
   },
   "dependencies": {
-    "acorn-6to5": "0.11.1-3",
+    "acorn-6to5": "0.11.1-4",
     "ast-types": "~0.6.1",
     "chokidar": "0.11.1",
     "commander": "2.5.0",

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

@@ -24,8 +24,8 @@ var Test = (function () {
     _Foo.call.apply(_Foo, [this].concat(_slice.call(arguments)));
     _Foo.call.apply(_Foo, [this, "test"].concat(_slice.call(arguments)));
 
-    _Foo.prototype.test.call.apply(_Foo.prototype, [this].concat(_slice.call(arguments)));
-    _Foo.prototype.test.call.apply(_Foo.prototype, [this, "test"].concat(_slice.call(arguments)));
+    _Foo.prototype.test.call.apply(_Foo.prototype.test, [this].concat(_slice.call(arguments)));
+    _Foo.prototype.test.call.apply(_Foo.prototype.test, [this, "test"].concat(_slice.call(arguments)));
   };
 
   _inherits(Test, _Foo);

test/types.js

@@ -0,0 +1,55 @@
+var assert = require("assert");
+var t      = require("../lib/6to5/types");
+
+suite("types", function () {
+  test("isFalsyExpression", function () {
+    assert.ok(t.isFalsyExpression(t.literal("")));
+    assert.ok(t.isFalsyExpression(t.literal(null)));
+    assert.ok(t.isFalsyExpression(t.literal(0)));
+    assert.ok(t.isFalsyExpression(t.identifier("undefined")));
+
+    assert.ok(!t.isFalsyExpression(t.literal("foobar")));
+    assert.ok(!t.isFalsyExpression(t.literal(5)));
+    assert.ok(!t.isFalsyExpression(t.identifier("foobar")));
+  });
+
+  test("toSequenceExpression");
+
+  test("shallowEqual");
+
+  test("appendToMemberExpression");
+
+  test("prependToMemberExpression");
+
+  test("isDynamic");
+
+  test("isReferenced");
+
+  test("isValidIdentifier");
+
+  test("toIdentifier");
+
+  test("ensureBlock");
+
+  test("toStatement");
+
+  test("toBlock");
+
+  test("getUid");
+
+  test("getIds");
+
+  test("isLet");
+
+  test("isVar");
+
+  test("removeComments");
+
+  test("inheritsComments");
+
+  test("inherits");
+
+  test("getSpecifierName");
+
+  test("isSpecifierDefault");
+});