rename es7.objectSpread transformer to es7.objectRestSpread

This commit is contained in:
Sebastian McKenzie
2015-02-04 18:35:43 +11:00
parent 37ef976515
commit 39fe737cb6
3 changed files with 18 additions and 14 deletions

View File

@@ -12,7 +12,8 @@
"generatorComprehension": "es7.comprehensions",
"arrowFunctions": "es6.arrowFunctions",
"classes": "es6.classes",
"objectSpread": "es7.objectSpread",
"objectSpread": "es7.objectRestSpread",
"es7.objectSpread": "es7.objectRestSpread",
"exponentiationOperator": "es7.exponentiationOperator",
"spread": "es6.spread",
"templateLiterals": "es6.templateLiterals",

View File

@@ -6,18 +6,21 @@ var t = require("../../../types");
exports.experimental = true;
exports.ObjectExpression = function (node, parent, scope, context, file) {
var hasSpread = false;
var i;
var prop;
for (i = 0; i < node.properties.length; i++) {
prop = node.properties[i];
if (t.isSpreadProperty(prop)) {
hasSpread = true;
break;
exports.manipulateOptions = function (opts) {
opts.whitelist.push("es6.destructuring");
};
var hasSpread = function (node) {
for (var i = 0; i < node.properties.length; i++) {
if (t.isSpreadProperty(node.properties[i])) {
return true;
}
}
if (!hasSpread) return;
return false;
};
exports.ObjectExpression = function (node, parent, scope, context, file) {
if (!hasSpread(node)) return;
var args = [];
var props = [];
@@ -28,8 +31,8 @@ exports.ObjectExpression = function (node, parent, scope, context, file) {
props = [];
};
for (i = 0; i < node.properties.length; i++) {
prop = node.properties[i];
for (var i = 0; i < node.properties.length; i++) {
var prop = node.properties[i];
if (t.isSpreadProperty(prop)) {
push();
args.push(prop.argument);

View File

@@ -27,7 +27,7 @@ module.exports = {
asyncToGenerator: require("./other/async-to-generator"),
bluebirdCoroutines: require("./other/bluebird-coroutines"),
"es7.objectSpread": require("./es7/object-spread"),
"es7.objectRestSpread": require("./es7/object-rest-spread"),
"es7.exponentiationOperator": require("./es7/exponentiation-operator"),
"es6.spread": require("./es6/spread"),
"es6.templateLiterals": require("./es6/template-literals"),