v1.14.4

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.14.4
+
+ * Merge pretzel maps and method binding.
+
+# 1.14.3
+
+ * Add playground pretzel maps.
+
 # 1.14.2
 
  * Fix `commonInterop` default export handling.

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
 
@@ -52,6 +53,9 @@ 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:
@@ -59,7 +63,7 @@ equivalent to:
 ```javascript
 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.
+["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", "BindFunctionExpression"], 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("BindFunctionExpression")
+  .bases("Expression")
+  .build("callee", "arguments")
+  .field("callee", def("Expression"))
+  .field("arguments", [def("Expression")]);
+
 types.finalize();
 
 var estraverse = require("estraverse");

lib/6to5/transformation/transformers/playground-method-binding.js

@@ -1,4 +1,5 @@
 var t = require("../../types");
+var _ = require("lodash");
 
 exports.BindMemberExpression = function (node, parent, file, scope) {
   var object = node.object;
@@ -28,3 +29,30 @@ exports.BindMemberExpression = function (node, parent, file, scope) {
     return call;
   }
 };
+
+exports.BindFunctionExpression = 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/visitor-keys.json

@@ -44,6 +44,7 @@
   "ObjectExpression":          ["properties"],
   "ObjectPattern":             ["properties"],
   "ParenthesizedExpression":   ["expression"],
+  "BindFunctionExpression":    ["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.2",
+  "version": "1.14.4",
   "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-10",
     "estraverse": "1.8.0",
     "private": "0.1.6"
   },

test/fixtures/transformation/playground/method-binding/actual.js

@@ -3,3 +3,11 @@ var fn = obj:method("foob");
 var fn = obj[foo]:method;
 var fn = obj.foo:method;
 var fn = obj[foo()]:method;
+
+["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/method-binding/exec.js

@@ -20,3 +20,11 @@ assert.equal(bar(), "foo bar");
 
 var zoo = obj:getZoo("foo");
 assert.equal(zoo("bar"), "foo bar foo bar");
+
+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/method-binding/expected.js

@@ -1,8 +1,22 @@
 "use strict";
 
-var _temp;
+var _temp, _args;
 var fn = obj.method.bind(obj);
 var fn = obj.method.bind(obj, "foob");
 var fn = obj[foo].method.bind(obj[foo]);
 var fn = obj.foo.method.bind(obj.foo);
 var fn = (_temp = obj[foo()], _temp.method.bind(_temp));
+
+["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]);
+}));