cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add toConsumableArray helper for spread - fixes #757

Browse Source
This commit is contained in:
Sebastian McKenzie 2015-02-12 07:37:40 +11:00
parent ae344aa23e
commit faa10df84c
21 changed files with 55 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/6to5/transformation/file.js
View File

@ -41,6 +41,7 @@ File.helpers = [
"tagged-template-literal-loose",
"interop-require",
"to-array",
"to-consumable-array",
"sliced-to-array",
"object-without-properties",
"has-own",
@ -216,19 +217,21 @@ File.prototype.debug = function (msg) {
util.debug(parts);
};
File.prototype.toArray = function (node, i) {
File.prototype.toArray = function (node, i, forceHelperName) {
if (t.isArrayExpression(node)) {
return node;
} else if (t.isIdentifier(node) && node.name === "arguments") {
return t.callExpression(t.memberExpression(this.addHelper("slice"), t.identifier("call")), [node]);
} else {
var declarationName = "to-array";
var helperName = "to-array";
var args = [node];
if (i) {
if (i === true) {
helperName = "to-consumable-array";
} else if (i) {
args.push(t.literal(i));
declarationName = "sliced-to-array";
helperName = "sliced-to-array";
}
return t.callExpression(this.addHelper(declarationName), args);
return t.callExpression(this.addHelper(helperName), args);
}
};

8
lib/6to5/transformation/templates/to-array.js
View File

@ -1,9 +1,3 @@
(function (arr) {
if (Array.isArray(arr)) {
var arr2 = [];
for (var i = 0; i < arr.length; i++) arr2.push(arr[i]);
return arr2;
} else {
return Array.from(arr);
}
return Array.isArray(arr) ? arr : Array.from(arr);
});

9
lib/6to5/transformation/templates/to-consumable-array.js Normal file
View File

@ -0,0 +1,9 @@
(function (arr) {
if (Array.isArray(arr)) {
var arr2 = [];
for (var i = 0; i < arr.length; i++) arr2.push(arr[i]);
return arr2;
} else {
return Array.from(arr);
}
});

2
lib/6to5/transformation/transformers/es6/spread.js
View File

@ -6,7 +6,7 @@ var t = require("../../../types");
exports.check = t.isSpreadElement;
var getSpreadLiteral = function (spread, file) {
return file.toArray(spread.argument);
return file.toArray(spread.argument, true);
};
var hasSpread = function (nodes) {

4
test/fixtures/transformation/es6-destructuring/spread/expected.js vendored
View File

@ -1,6 +1,6 @@
"use strict";
var _toArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
var _toArray = function (arr) { return Array.isArray(arr) ? arr : Array.from(arr); };
var isSorted = function (_ref) {
var _ref2 = _toArray(_ref);
@ -12,4 +12,4 @@ var isSorted = function (_ref) {
if (!zs.length) return true;
if (y > x) return isSorted(zs);
return false;
};
};

4
test/fixtures/transformation/es6-spread/array-literal-first/expected.js vendored
View File

@ -1,5 +1,5 @@
"use strict";
var _toArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
var _toConsumableArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
var lyrics = [].concat(_toArray(parts), ["head", "and", "toes"]);
var lyrics = [].concat(_toConsumableArray(parts), ["head", "and", "toes"]);

4
test/fixtures/transformation/es6-spread/array-literal-middle/expected.js vendored
View File

@ -1,5 +1,5 @@
"use strict";
var _toArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
var _toConsumableArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
var a = [b].concat(_toArray(c), [d]);
var a = [b].concat(_toConsumableArray(c), [d]);

4
test/fixtures/transformation/es6-spread/array-literal-multiple/expected.js vendored
View File

@ -1,5 +1,5 @@
"use strict";
var _toArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
var _toConsumableArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
var a = [b].concat(_toArray(c), [d, e], _toArray(f));
var a = [b].concat(_toConsumableArray(c), [d, e], _toConsumableArray(f));

4
test/fixtures/transformation/es6-spread/array-literals/expected.js vendored
View File

@ -1,5 +1,5 @@
"use strict";
var _toArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
var _toConsumableArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
var lyrics = ["head", "and", "toes"].concat(_toArray(parts));
var lyrics = ["head", "and", "toes"].concat(_toConsumableArray(parts));

4
test/fixtures/transformation/es6-spread/contexted-computed-method-call-multiple-args/expected.js vendored
View File

@ -1,6 +1,6 @@
"use strict";
var _obj;
var _toArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
var _toConsumableArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
(_obj = obj)[method].apply(_obj, [foo, bar].concat(_toArray(args)));
(_obj = obj)[method].apply(_obj, [foo, bar].concat(_toConsumableArray(args)));

4
test/fixtures/transformation/es6-spread/contexted-computed-method-call-single-arg/expected.js vendored
View File

@ -1,6 +1,6 @@
"use strict";
var _obj;
var _toArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
var _toConsumableArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
(_obj = obj)[method].apply(_obj, _toArray(args));
(_obj = obj)[method].apply(_obj, _toConsumableArray(args));

6
test/fixtures/transformation/es6-spread/contexted-method-call-multiple-args/expected.js vendored
View File

@ -1,7 +1,7 @@
"use strict";
var _foob, _foob$test;
var _toArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
var _toConsumableArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
(_foob = foob).add.apply(_foob, [foo, bar].concat(_toArray(numbers)));
(_foob$test = foob.test).add.apply(_foob$test, [foo, bar].concat(_toArray(numbers)));
(_foob = foob).add.apply(_foob, [foo, bar].concat(_toConsumableArray(numbers)));
(_foob$test = foob.test).add.apply(_foob$test, [foo, bar].concat(_toConsumableArray(numbers)));

6
test/fixtures/transformation/es6-spread/contexted-method-call-single-arg/expected.js vendored
View File

@ -1,7 +1,7 @@
"use strict";
var _foob, _foob$test;
var _toArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
var _toConsumableArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
(_foob = foob).add.apply(_foob, _toArray(numbers));
(_foob$test = foob.test).add.apply(_foob$test, _toArray(numbers));
(_foob = foob).add.apply(_foob, _toConsumableArray(numbers));
(_foob$test = foob.test).add.apply(_foob$test, _toConsumableArray(numbers));

4
test/fixtures/transformation/es6-spread/method-call-first/expected.js vendored
View File

@ -1,5 +1,5 @@
"use strict";
var _toArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
var _toConsumableArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
add.apply(undefined, _toArray(numbers).concat([foo, bar]));
add.apply(undefined, _toConsumableArray(numbers).concat([foo, bar]));

4
test/fixtures/transformation/es6-spread/method-call-middle/expected.js vendored
View File

@ -1,5 +1,5 @@
"use strict";
var _toArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
var _toConsumableArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
add.apply(undefined, [foo].concat(_toArray(numbers), [bar]));
add.apply(undefined, [foo].concat(_toConsumableArray(numbers), [bar]));

4
test/fixtures/transformation/es6-spread/method-call-multiple-args/expected.js vendored
View File

@ -1,5 +1,5 @@
"use strict";
var _toArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
var _toConsumableArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
add.apply(undefined, [foo, bar].concat(_toArray(numbers)));
add.apply(undefined, [foo, bar].concat(_toConsumableArray(numbers)));

4
test/fixtures/transformation/es6-spread/method-call-multiple/expected.js vendored
View File

@ -1,5 +1,5 @@
"use strict";
var _toArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
var _toConsumableArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
add.apply(undefined, [foo].concat(_toArray(numbers), [bar, what], _toArray(test)));
add.apply(undefined, [foo].concat(_toConsumableArray(numbers), [bar, what], _toConsumableArray(test)));

4
test/fixtures/transformation/es6-spread/method-call-single-arg/expected.js vendored
View File

@ -1,5 +1,5 @@
"use strict";
var _toArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
var _toConsumableArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
add.apply(undefined, _toArray(numbers));
add.apply(undefined, _toConsumableArray(numbers));

6
test/fixtures/transformation/es6-spread/new-expression/expected.js vendored
View File

@ -2,7 +2,7 @@
var _applyConstructor = function (Constructor, args) { var instance = Object.create(Constructor.prototype); var result = Constructor.apply(instance, args); return result != null && (typeof result == "object" || typeof result == "function") ? result : instance; };
var _toArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
var _toConsumableArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
_applyConstructor(Numbers, _toArray(nums));
_applyConstructor(Numbers, [1].concat(_toArray(nums)));
_applyConstructor(Numbers, _toConsumableArray(nums));
_applyConstructor(Numbers, [1].concat(_toConsumableArray(nums)));

4
test/fixtures/transformation/es6-spread/single/expected.js vendored
View File

@ -1,5 +1,5 @@
"use strict";
var _toArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
var _toConsumableArray = function (arr) { if (Array.isArray(arr)) { var arr2 = []; for (var i = 0; i < arr.length; i++) arr2.push(arr[i]); return arr2; } else { return Array.from(arr); } };
[].concat(_toArray(foo));
[].concat(_toConsumableArray(foo));

2
test/fixtures/transformation/self-contained/modules-system/expected.js vendored
View File

@ -7,7 +7,7 @@ System.register(["6to5-runtime/helpers"], function (_export) {
_to5Helpers = _to5RuntimeHelpers;
}],
execute: function () {
foo.apply(undefined, _to5Helpers.toArray(bar));
foo.apply(undefined, _to5Helpers.toConsumableArray(bar));
}
};
});