diff --git a/lib/6to5/transformers/destructuring.js b/lib/6to5/transformers/destructuring.js index bdc130a0a8..7a3317692c 100644 --- a/lib/6to5/transformers/destructuring.js +++ b/lib/6to5/transformers/destructuring.js @@ -1,6 +1,7 @@ -var util = require("../util"); -var b = require("recast").types.builders; -var _ = require("lodash"); +var traverse = require("../traverse"); +var util = require("../util"); +var b = require("recast").types.builders; +var _ = require("lodash"); var buildVariableAssign = function (kind, id, init) { if (kind === false) { @@ -25,7 +26,7 @@ var pushObjectPattern = function (kind, nodes, pattern, parentId) { var pattern2 = prop.value; var patternId2 = b.memberExpression(parentId, prop.key, false); - if (util.isPattern(pattern2)) { + if (traverse.isPattern(pattern2)) { push(kind, nodes, pattern2, patternId2); } else { nodes.push(buildVariableAssign(kind, pattern2, patternId2)); @@ -67,7 +68,7 @@ exports.ForOfStatement = function (node, parent, file) { if (declar.type !== "VariableDeclaration") return; var pattern = declar.declarations[0].id; - if (!util.isPattern(pattern)) return; + if (!traverse.isPattern(pattern)) return; var key = b.identifier(file.generateUid("ref")); node.left = b.variableDeclaration(declar.kind, [ @@ -90,7 +91,7 @@ exports.Function = function (node, parent, file) { var hasDestructuring = false; node.params = node.params.map(function (pattern) { - if (!util.isPattern(pattern)) return pattern; + if (!traverse.isPattern(pattern)) return pattern; hasDestructuring = true; var parentId = b.identifier(file.generateUid("ref")); @@ -110,7 +111,7 @@ exports.ExpressionStatement = function (node, parent, file) { var expr = node.expression; if (expr.type !== "AssignmentExpression") return; - if (!util.isPattern(expr.left)) return; + if (!traverse.isPattern(expr.left)) return; var nodes = []; @@ -131,7 +132,7 @@ exports.VariableDeclaration = function (node, parent, file) { var hasPattern = false; _.each(node.declarations, function (declar) { - if (util.isPattern(declar.id)) { + if (traverse.isPattern(declar.id)) { hasPattern = true; return false; } @@ -141,7 +142,7 @@ exports.VariableDeclaration = function (node, parent, file) { _.each(node.declarations, function (declar) { var patternId = declar.init; var pattern = declar.id; - if (util.isPattern(pattern) && patternId) { + if (traverse.isPattern(pattern) && patternId) { pushPattern(node.kind, nodes, pattern, patternId, file); } else { nodes.push(buildVariableAssign(node.kind, declar.id, declar.init));