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

fix destructuring to support ParanthesizedExpression

Browse Source
This commit is contained in:
Sebastian McKenzie 2014-11-09 21:37:59 +11:00
parent ab2f652bdf
commit a47723c66c
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/6to5/transformation/transformers/destructuring.js
View File

@ -11,7 +11,17 @@ var buildVariableAssign = function (kind, id, init) {
} }
}; };
var get = function (node) {
if (t.isParenthesizedExpression(node)) {
return node.expression;
} else {
return node;
}
};
var push = function (kind, nodes, elem, parentId) { var push = function (kind, nodes, elem, parentId) {
elem = get(elem);
if (t.isObjectPattern(elem)) { if (t.isObjectPattern(elem)) {
pushObjectPattern(kind, nodes, elem, parentId); pushObjectPattern(kind, nodes, elem, parentId);
} else if (t.isArrayPattern(elem)) { } else if (t.isArrayPattern(elem)) {
@ -25,7 +35,7 @@ var push = function (kind, nodes, elem, parentId) {
var pushObjectPattern = function (kind, nodes, pattern, parentId) { var pushObjectPattern = function (kind, nodes, pattern, parentId) {
_.each(pattern.properties, function (prop) { _.each(pattern.properties, function (prop) {
var pattern2 = prop.value; var pattern2 = get(prop.value);
var patternId2 = t.memberExpression(parentId, prop.key); var patternId2 = t.memberExpression(parentId, prop.key);
if (t.isPattern(pattern2)) { if (t.isPattern(pattern2)) {
@ -79,7 +89,7 @@ exports.ForOfStatement = function (node, parent, file, scope) {
var declar = node.left; var declar = node.left;
if (!t.isVariableDeclaration(declar)) return; if (!t.isVariableDeclaration(declar)) return;
var pattern = declar.declarations[0].id; var pattern = get(declar.declarations[0].id);
if (!t.isPattern(pattern)) return; if (!t.isPattern(pattern)) return;
var key = t.identifier(file.generateUid("ref", scope)); var key = t.identifier(file.generateUid("ref", scope));
@ -103,7 +113,7 @@ exports.Function = function (node, parent, file, scope) {
var hasDestructuring = false; var hasDestructuring = false;
node.params = node.params.map(function (pattern) { node.params = node.params.map(function (pattern) {
if (!t.isPattern(pattern)) return pattern; if (!t.isPattern(get(pattern))) return pattern;
hasDestructuring = true; hasDestructuring = true;
var parentId = t.identifier(file.generateUid("ref", scope)); var parentId = t.identifier(file.generateUid("ref", scope));
@ -132,7 +142,8 @@ exports.ExpressionStatement = function (node, parent, file, scope) {
var expr = node.expression; var expr = node.expression;
if (expr.type !== "AssignmentExpression") return; if (expr.type !== "AssignmentExpression") return;
if (!t.isPattern(expr.left)) return; var left = get(expr.left);
if (!t.isPattern(left)) return;
var nodes = []; var nodes = [];
@ -141,7 +152,7 @@ exports.ExpressionStatement = function (node, parent, file, scope) {
t.variableDeclarator(ref, expr.right) t.variableDeclarator(ref, expr.right)
])); ]));
push(false, nodes, expr.left, ref); push(false, nodes, left, ref);
return nodes; return nodes;
}; };
@ -153,7 +164,7 @@ exports.VariableDeclaration = function (node, parent, file, scope) {
var hasPattern = false; var hasPattern = false;
_.each(node.declarations, function (declar) { _.each(node.declarations, function (declar) {
if (t.isPattern(declar.id)) { if (t.isPattern(get(declar.id))) {
hasPattern = true; hasPattern = true;
return false; return false;
} }
@ -162,7 +173,7 @@ exports.VariableDeclaration = function (node, parent, file, scope) {
_.each(node.declarations, function (declar) { _.each(node.declarations, function (declar) {
var patternId = declar.init; var patternId = declar.init;
var pattern = declar.id; var pattern = get(declar.id);
if (t.isPattern(pattern) && patternId) { if (t.isPattern(pattern) && patternId) {
pushPattern({ pushPattern({
kind: node.kind, kind: node.kind,