v1.14.3

CHANGELOG.md

@@ -1,3 +1,16 @@
+# 1.14.3
+
+ * Add playground pretzel maps.
+
+# 1.14.2
+
+ * Fix `commonInterop` default export handling.
+ * Fix keyworded property key identifiers being turned into computed property key literals.
+
+# 1.14.1
+
+ * Inherit comments from `ClassDeclaration`.
+
 # 1.14.0
 
  * Add [playground](https://6to5.github.io/playground.html).

doc/playground.md

@@ -18,6 +18,7 @@ to5.transform("code", { playground: true });
 
  * [Memoization operator](#memoization-operator)
  * [Method binding](#method-binding)
+ * [Pretzel map](#pretzel-map)
 
 ### Memoization assignment operator
 
@@ -44,10 +45,10 @@ equivalent to:
 
 ```javascript
 var obj = {};
-if (Object.prototype.hasOwnProperty.call(obj, "x")) obj.x = 2;
+if (!Object.prototype.hasOwnProperty.call(obj, "x")) obj.x = 2;
 ```
 
-### Method binding expression.
+### Method binding expression
 
 ```javascript
 var fn = obj:method;
@@ -61,5 +62,16 @@ var fn = obj.method.bind(obj);
 var fn = obj.method.bind(obj, "foob");
 ```
 
-**NOTE:** Method binding can **only** be used as an **expression** and not as
-statement.
+### Pretzel map
+
+```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/generation/generators/playground.js

@@ -1,6 +1,6 @@
 var _ = require("lodash");
 
-_.each(["BindMemberExpression"], function (type) {
+_.each(["BindMemberExpression", "PretzelMapExpression"], function (type) {
   exports[type] = function () {
     throw new ReferenceError("Trying to render non-standard playground node " + JSON.stringify(type));
   };

lib/6to5/patch.js

@@ -38,6 +38,12 @@ def("BindMemberExpression")
   .field("property", or(def("Identifier"), def("Expression")))
   .field("arguments", [def("Expression")]);
 
+def("PretzelMapExpression")
+  .bases("Expression")
+  .build("callee", "arguments")
+  .field("callee", def("Expression"))
+  .field("arguments", [def("Expression")]);
+
 types.finalize();
 
 var estraverse = require("estraverse");

lib/6to5/transformation/modules/common-interop.js

@@ -3,10 +3,16 @@ module.exports = CommonJSInteropFormatter;
 var CommonJSFormatter = require("./common");
 var util              = require("../../util");
 var t                 = require("../../types");
+var _                 = require("lodash");
 
-function CommonJSInteropFormatter() {
-  this.has = false;
+function CommonJSInteropFormatter(file) {
   CommonJSFormatter.apply(this, arguments);
+
+  var has = false;
+  _.each(file.ast.program.body, function (node) {
+    if (t.isExportDeclaration(node) && !node.default) has = true;
+  });
+  this.has = has;
 }
 
 util.inherits(CommonJSInteropFormatter, CommonJSFormatter);
@@ -40,14 +46,11 @@ CommonJSInteropFormatter.prototype.export = function (node, nodes) {
     // hoist to the top if this default is a function
     nodes.push(this._hoistExport(declar, assign));
     return;
-  } else {
-    this.has = true;
   }
 
   CommonJSFormatter.prototype.export.apply(this, arguments);
 };
 
 CommonJSInteropFormatter.prototype.exportSpecifier = function () {
-  this.has = true;
   CommonJSFormatter.prototype.exportSpecifier.apply(this, arguments);
 };

lib/6to5/transformation/transform.js

@@ -59,6 +59,7 @@ _.each({
   // plyground
   methodBinding:             require("./transformers/playground-method-binding"),
   memoizationOperator:       require("./transformers/playground-memoization-operator"),
+  pretzelMap:                require("./transformers/playground-pretzel-map"),
 
   _blockHoist:               require("./transformers/_block-hoist"),
   _declarations:             require("./transformers/_declarations"),
@@ -68,7 +69,6 @@ _.each({
 
   _propertyLiterals:         require("./transformers/_property-literals"),
   _memberExpressioLiterals:  require("./transformers/_member-expression-literals"),
-  _memberExpressionKeywords: require("./transformers/_member-expression-keywords"),
   _moduleFormatter:          require("./transformers/_module-formatter")
 }, function (transformer, key) {
   transform.transformers[key] = new Transformer(key, transformer);

lib/6to5/transformation/transformers/_member-expression-keywords.js

@@ -1,10 +0,0 @@
-var esutils = require("esutils");
-var t       = require("../../types");
-
-exports.MemberExpression = function (node) {
-  var prop = node.property;
-  if (t.isIdentifier(prop) && esutils.keyword.isKeywordES6(prop.name, true)) {
-    node.property = t.literal(prop.name);
-    node.computed = true;
-  }
-};

lib/6to5/transformation/transformers/_member-expression-literals.js

@@ -1,4 +1,5 @@
-var t = require("../../types");
+var esutils = require("esutils");
+var t       = require("../../types");
 
 exports.MemberExpression = function (node) {
   var prop = node.property;
@@ -6,5 +7,8 @@ exports.MemberExpression = function (node) {
     // computed literal that is a valid identifier
     node.property = t.identifier(prop.value);
     node.computed = false;
+  } else if (!node.computed && t.isIdentifier(prop) && esutils.keyword.isKeywordES6(prop.name, true)) {
+    node.property = t.literal(prop.name);
+    node.computed = true;
   }
 };

lib/6to5/transformation/transformers/_property-literals.js

@@ -7,9 +7,8 @@ exports.Property = function (node) {
     // property key is a literal but a valid identifier
     node.key = t.identifier(key.value);
     node.computed = false;
-  } else if (t.isIdentifier(key) && esutils.keyword.isKeywordES6(key.name, true)) {
+  } else if (!node.computed && t.isIdentifier(key) && esutils.keyword.isKeywordES6(key.name, true)) {
     // property key is a keyword
     node.key = t.literal(key.name);
-    node.computed = true;
   }
 };

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

@@ -4,9 +4,13 @@ var t        = require("../../types");
 var _        = require("lodash");
 
 exports.ClassDeclaration = function (node, parent, file, scope) {
-  return t.variableDeclaration("let", [
-    t.variableDeclarator(node.id, new Class(node, file, scope).run())
+  var built = new Class(node, file, scope).run();
+
+  var declar = t.variableDeclaration("let", [
+    t.variableDeclarator(node.id, built)
   ]);
+  t.inheritsComments(declar, node);
+  return declar;
 };
 
 exports.ClassExpression = function (node, parent, file, scope) {

lib/6to5/transformation/transformers/playground-pretzel-map.js

@@ -0,0 +1,29 @@
+var t = require("../../types");
+var _ = require("lodash");
+
+exports.PretzelMapExpression = function (node, parent, file, scope) {
+  var buildCall = function (args) {
+    var param = file.generateUidIdentifier("val", scope);
+    return t.functionExpression(null, [param], t.blockStatement([
+      t.returnStatement(t.callExpression(t.memberExpression(param, node.callee), args))
+    ]));
+  };
+
+  if (_.find(node.arguments, t.isDynamic)) {
+    var argsIdName = file.generateUid("args", scope);
+    var argsId = t.identifier(argsIdName);
+    scope.push({
+      key: argsIdName,
+      id: argsId
+    });
+
+    return t.sequenceExpression([
+      t.assignmentExpression("=", argsId, t.arrayExpression(node.arguments)),
+      buildCall(node.arguments.map(function (node, i) {
+        return t.memberExpression(argsId, t.literal(i), true);
+      }))
+    ]);
+  } else {
+    return buildCall(node.arguments);
+  }
+};

lib/6to5/types/index.js

@@ -114,7 +114,9 @@ t.shallowEqual = function (actual, expected) {
 //
 
 t.isDynamic = function (node) {
-  if (t.isIdentifier(node) || t.isLiteral(node) || t.isThisExpression(node)) {
+  if (t.isParenthesizedExpression(node)) {
+    return t.isDynamic(node.expression);
+  } else if (t.isIdentifier(node) || t.isLiteral(node) || t.isThisExpression(node)) {
     return false;
   } else if (t.isMemberExpression(node)) {
     return t.isDynamic(node.object) || t.isDynamic(node.property);

lib/6to5/types/visitor-keys.json

@@ -44,6 +44,7 @@
   "ObjectExpression":          ["properties"],
   "ObjectPattern":             ["properties"],
   "ParenthesizedExpression":   ["expression"],
+  "PretzelMapExpression":      ["callee", "arguments"],
   "Program":                   ["body"],
   "Property":                  ["key", "value"],
   "ReturnStatement":           ["argument"],

package.json

@@ -1,7 +1,7 @@
 {
   "name": "6to5",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "1.14.0",
+  "version": "1.14.3",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://github.com/6to5/6to5",
   "repository": {
@@ -47,7 +47,7 @@
     "chokidar": "0.11.1",
     "source-map-support": "0.2.8",
     "esutils": "1.1.6",
-    "acorn-6to5": "0.9.1-8",
+    "acorn-6to5": "0.9.1-9",
     "estraverse": "1.8.0",
     "private": "0.1.6"
   },

test/fixtures/transformation/misc/_member-expression-keywords/actual.js

@@ -1,4 +0,0 @@
-test.catch;
-test.catch["foo"];
-test["catch"];
-test["catch"]["foo"];

test/fixtures/transformation/misc/_member-expression-keywords/expected.js

@@ -1,6 +0,0 @@
-"use strict";
-
-test["catch"];
-test["catch"].foo;
-test["catch"];
-test["catch"].foo;

test/fixtures/transformation/misc/_member-expression-literals/actual.js

@@ -1 +1,6 @@
 obj["x"] = 2;
+
+test.catch;
+test.catch["foo"];
+test["catch"];
+test["catch"]["foo"];

test/fixtures/transformation/misc/_member-expression-literals/expected.js

@@ -1,3 +1,8 @@
 "use strict";
 
 obj.x = 2;
+
+test["catch"];
+test["catch"].foo;
+test["catch"];
+test["catch"].foo;

test/fixtures/transformation/playground/pretzel-map/actual.js

@@ -0,0 +1,7 @@
+["foo", "bar"].map(:toUpperCase);
+[1.1234, 23.53245, 3].map(:toFixed(2));
+
+var get = function () {
+  return 2;
+};
+[1.1234, 23.53245, 3].map(:toFixed(get()));

test/fixtures/transformation/playground/pretzel-map/exec.js

@@ -0,0 +1,7 @@
+assert.deepEqual(["foo", "bar"].map(:toUpperCase), ["FOO", "BAR"]);
+assert.deepEqual([1.1234, 23.53245, 3].map(:toFixed(2)), ["1.12", "23.53", "3.00"]);
+
+var get = function () {
+  return 2;
+}
+assert.deepEqual([1.1234, 23.53245, 3].map(:toFixed(get())), ["1.12", "23.53", "3.00"]);

test/fixtures/transformation/playground/pretzel-map/expected.js

@@ -0,0 +1,16 @@
+"use strict";
+
+var _args;
+["foo", "bar"].map(function (_val) {
+  return _val.toUpperCase();
+});
+[1.1234, 23.53245, 3].map(function (_val2) {
+  return _val2.toFixed(2);
+});
+
+var get = function () {
+  return 2;
+};
+[1.1234, 23.53245, 3].map((_args = [get()], function (_val3) {
+  return _val3.toFixed(_args[0]);
+}));