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

Merge branch 'master' into 3.0.0

Browse Source 
Conflicts:
	CHANGELOG.md
	lib/6to5/transformation/transform.js
This commit is contained in:
Sebastian McKenzie
2015-01-21 17:56:34 +11:00
parent 1859226e76 194c080c64
commit cfd028288f
17 changed files with 134 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/6to5/transformation/templates/array-comprehension-for-each.js
View File

@@ -1,3 +0,0 @@
ARRAY.forEach(function (KEY) {
});

6
lib/6to5/transformation/transform.js
View File

@@ -71,8 +71,9 @@ _.each({
templateLiterals: require("./transformers/es6-template-literals"),
propertyMethodAssignment: require("./transformers/es6-property-method-assignment"),
computedPropertyNames: require("./transformers/es6-computed-property-names"),
destructuring: require("./transformers/es6-destructuring"),
defaultParameters: require("./transformers/es6-default-parameters"),
restParameters: require("./transformers/es6-rest-parameters"),
destructuring: require("./transformers/es6-destructuring"),
forOf: require("./transformers/es6-for-of"),
unicodeRegex: require("./transformers/es6-unicode-regex"),
abstractReferences: require("./transformers/es7-abstract-references"),
@@ -80,11 +81,10 @@ _.each({
constants: require("./transformers/es6-constants"),
letScoping: require("./transformers/es6-let-scoping"),
blockScopingTDZ: require("./transformers/optional-block-scoping-tdz"),
generators: require("./transformers/es6-generators"),
_blockHoist: require("./transformers/_block-hoist"),
restParameters: require("./transformers/es6-rest-parameters"),
generators: require("./transformers/es6-generators"),
protoToAssign: require("./transformers/optional-proto-to-assign"),

15
lib/6to5/transformation/transformers/es6-default-parameters.js
View File

@@ -15,7 +15,7 @@ exports.Function = function (node, parent, scope, context, file) {
var iife = false;
var def;
var checkTDZ = function (ids) {
var checkTDZ = function (param, def, ids) {
var check = function (node, parent) {
if (!t.isReferencedIdentifier(node, parent)) return;
@@ -29,7 +29,10 @@ exports.Function = function (node, parent, scope, context, file) {
};
check(def, node);
traverse(def, { enter: check });
if (!t.isPattern(param)) {
traverse(def, { enter: check });
}
};
for (var i = 0; i < node.defaults.length; i++) {
@@ -42,7 +45,7 @@ exports.Function = function (node, parent, scope, context, file) {
// are to the right - ie. uninitialized parameters
var rightIds = ids.slice(i);
for (var i2 = 0; i2 < rightIds.length; i2++) {
checkTDZ(rightIds[i2]);
checkTDZ(param, def, rightIds[i2]);
}
// we're accessing a variable that's already defined within this function
@@ -66,12 +69,14 @@ exports.Function = function (node, parent, scope, context, file) {
continue;
}
body.push(util.template("default-parameter", {
var defNode = util.template("default-parameter", {
VARIABLE_NAME: node.params[i],
DEFAULT_VALUE: def,
ARGUMENT_KEY: t.literal(+i),
ARGUMENTS: argsIdentifier
}, true));
}, true);
defNode._blockHoist = node.defaults.length - i;
body.push(defNode);
}
// we need to cut off all trailing default parameters

51
lib/6to5/transformation/transformers/es6-destructuring.js
View File

@@ -8,13 +8,27 @@ var buildVariableAssign = function (opts, id, init) {
var op = opts.operator;
if (t.isMemberExpression(id)) op = "=";
var node;
if (op) {
return t.expressionStatement(t.assignmentExpression(op, id, init));
node = t.expressionStatement(t.assignmentExpression(op, id, init));
} else {
return t.variableDeclaration(opts.kind, [
node = t.variableDeclaration(opts.kind, [
t.variableDeclarator(id, init)
]);
}
node._blockHoist = opts.blockHoist;
return node;
};
var buildVariableDeclar = function (opts, id, init) {
var declar = t.variableDeclaration("var", [
t.variableDeclarator(id, init)
]);
declar._blockHoist = opts.blockHoist;
return declar;
};
var push = function (opts, nodes, elem, parentId) {
@@ -100,9 +114,7 @@ var pushArrayPattern = function (opts, nodes, pattern, parentId) {
var toArray = opts.file.toArray(parentId, !hasSpreadElement && pattern.elements.length);
var _parentId = opts.scope.generateUidBasedOnNode(parentId, opts.file);
nodes.push(t.variableDeclaration("var", [
t.variableDeclarator(_parentId, toArray)
]));
nodes.push(buildVariableDeclar(opts, _parentId, toArray));
parentId = _parentId;
for (i = 0; i < pattern.elements.length; i++) {
@@ -138,11 +150,7 @@ var pushPattern = function (opts) {
if (!t.isArrayExpression(parentId) && !t.isMemberExpression(parentId) && !t.isIdentifier(parentId)) {
var key = scope.generateUidBasedOnNode(parentId, file);
nodes.push(t.variableDeclaration("var", [
t.variableDeclarator(key, parentId)
]));
nodes.push(buildVariableDeclar(opts, key, parentId));
parentId = key;
}
@@ -181,19 +189,20 @@ exports.Function = function (node, parent, scope, context, file) {
var hasDestructuring = false;
node.params = node.params.map(function (pattern) {
node.params = node.params.map(function (pattern, i) {
if (!t.isPattern(pattern)) return pattern;
hasDestructuring = true;
var parentId = file.generateUidIdentifier("ref", scope);
pushPattern({
kind: "var",
nodes: nodes,
pattern: pattern,
id: parentId,
file: file,
scope: scope
blockHoist: node.params.length - i,
pattern: pattern,
nodes: nodes,
scope: scope,
file: file,
kind: "var",
id: parentId
});
return parentId;
@@ -294,12 +303,12 @@ exports.VariableDeclaration = function (node, parent, scope, context, file) {
var patternId = declar.init;
var pattern = declar.id;
var opts = {
kind: node.kind,
nodes: nodes,
pattern: pattern,
id: patternId,
nodes: nodes,
scope: scope,
kind: node.kind,
file: file,
scope: scope
id: patternId,
};
if (t.isPattern(pattern) && patternId) {

3
lib/6to5/transformation/transformers/es6-for-of.js
View File

@@ -30,6 +30,9 @@ exports.ForOfStatement = function (node, parent, scope, context, file) {
// push the rest of the original loop body onto our new body
block.body = block.body.concat(node.body.body);
// todo: find out why this is necessary? #538
loop._scopeInfo = node._scopeInfo;
return loop;
};

10
lib/6to5/transformation/transformers/es6-let-scoping.js
View File

@@ -117,9 +117,10 @@ LetScoping.prototype.run = function () {
*/
LetScoping.prototype.remap = function () {
var letRefs = this.letReferences;
var scope = this.scope;
var file = this.file;
var hasRemaps = false;
var letRefs = this.letReferences;
var scope = this.scope;
var file = this.file;
// alright, so since we aren't wrapping this block in a closure
// we have to check if any of our let variables collide with
@@ -136,6 +137,7 @@ LetScoping.prototype.remap = function () {
var uid = file.generateUidIdentifier(ref.name, scope).name;
ref.name = uid;
hasRemaps = true;
remaps[key] = remaps[uid] = {
node: ref,
uid: uid
@@ -143,6 +145,8 @@ LetScoping.prototype.remap = function () {
}
}
if (!hasRemaps) return;
//
var replace = function (node, parent, scope, context, remaps) {

16
lib/6to5/transformation/transformers/es6-rest-parameters.js
View File

@@ -41,6 +41,22 @@ exports.Function = function (node, parent, scope, context, file) {
);
}
// support patterns
if (t.isPattern(rest)) {
var pattern = rest;
rest = file.generateUidIdentifier("ref", scope);
// let the destructuring transformer handle this
var restDeclar = t.variableDeclaration("var", [
t.variableDeclarator(pattern, rest)
]);
// retain evaluation position
restDeclar._blockHoist = node.params.length + 1;
node.body.body.unshift(restDeclar);
}
node.body.body.unshift(
util.template("rest", {
ARGUMENTS: argsId,

2
lib/6to5/transformation/transformers/optional-undeclared-variable-check.js
View File

@@ -1,5 +1,3 @@
var t = require("../../types");
exports.optional = true;
exports.Identifier = function (node, parent, scope, context, file) {

9
lib/6to5/traverse/scope.js
View File

@@ -120,6 +120,7 @@ Scope.prototype.generateTempBasedOnNode = function (node, file) {
};
Scope.prototype.getInfo = function () {
var parent = this.parent;
var block = this.block;
if (block._scopeInfo) return block._scopeInfo;
@@ -132,6 +133,10 @@ Scope.prototype.getInfo = function () {
if (!reference) Scope.add(node, declarations);
};
if (parent && t.isBlockStatement(block) && t.isFor(parent.block)) {
return info;
}
// ForStatement - left, init
if (t.isFor(block)) {
@@ -139,6 +144,10 @@ Scope.prototype.getInfo = function () {
var node = block[key];
if (t.isBlockScoped(node)) add(node);
});
if (t.isBlockStatement(block.body)) {
block = block.body;
}
}
// Program, BlockStatement - let variables

3
lib/6to5/types/index.js
View File

@@ -487,7 +487,8 @@ t.getIds.nodes = {
MemeberExpression: ["object"],
SpreadElement: ["argument"],
Property: ["value"],
ComprehensionBlock: ["left"]
ComprehensionBlock: ["left"],
AssignmentPattern: ["left"]
};
t.getIds.arrays = {