@babel/plugin-transform-destructuring
Advanced tools
Comparing version 7.21.4-esm.2 to 7.21.4-esm.3
178
lib/index.js
@@ -1,6 +0,10 @@ | ||
import { declare } from '@babel/helper-plugin-utils'; | ||
import { types } from '@babel/core'; | ||
'use strict'; | ||
Object.defineProperty(exports, '__esModule', { value: true }); | ||
var helperPluginUtils = require('@babel/helper-plugin-utils'); | ||
var core = require('@babel/core'); | ||
function isPureVoid(node) { | ||
return types.isUnaryExpression(node) && node.operator === "void" && types.isPureish(node.argument); | ||
return core.types.isUnaryExpression(node) && node.operator === "void" && core.types.isPureish(node.argument); | ||
} | ||
@@ -16,3 +20,3 @@ function unshiftForXStatementBody(statementPath, newStatements) { | ||
if (hasShadowedBlockScopedBindings) { | ||
node.body = types.blockStatement([...newStatements, node.body]); | ||
node.body = core.types.blockStatement([...newStatements, node.body]); | ||
} else { | ||
@@ -23,6 +27,6 @@ node.body.body.unshift(...newStatements); | ||
function hasArrayRest(pattern) { | ||
return pattern.elements.some(elem => types.isRestElement(elem)); | ||
return pattern.elements.some(elem => core.types.isRestElement(elem)); | ||
} | ||
function hasObjectRest(pattern) { | ||
return pattern.properties.some(prop => types.isRestElement(prop)); | ||
return pattern.properties.some(prop => core.types.isRestElement(prop)); | ||
} | ||
@@ -34,3 +38,3 @@ const STOP_TRAVERSAL = {}; | ||
} | ||
if (types.isIdentifier(node) && types.isReferenced(node, ancestors[ancestors.length - 1].node) && state.bindings[node.name]) { | ||
if (core.types.isIdentifier(node) && core.types.isReferenced(node, ancestors[ancestors.length - 1].node) && state.bindings[node.name]) { | ||
state.deopt = true; | ||
@@ -66,10 +70,10 @@ throw STOP_TRAVERSAL; | ||
getExtendsHelper() { | ||
return this.useBuiltIns ? types.memberExpression(types.identifier("Object"), types.identifier("assign")) : this.addHelper("extends"); | ||
return this.useBuiltIns ? core.types.memberExpression(core.types.identifier("Object"), core.types.identifier("assign")) : this.addHelper("extends"); | ||
} | ||
buildVariableAssignment(id, init) { | ||
let op = this.operator; | ||
if (types.isMemberExpression(id)) op = "="; | ||
if (core.types.isMemberExpression(id)) op = "="; | ||
let node; | ||
if (op) { | ||
node = types.expressionStatement(types.assignmentExpression(op, id, types.cloneNode(init) || this.scope.buildUndefinedNode())); | ||
node = core.types.expressionStatement(core.types.assignmentExpression(op, id, core.types.cloneNode(init) || this.scope.buildUndefinedNode())); | ||
} else { | ||
@@ -80,5 +84,5 @@ let nodeInit; | ||
} else { | ||
nodeInit = types.cloneNode(init); | ||
nodeInit = core.types.cloneNode(init); | ||
} | ||
node = types.variableDeclaration(this.kind, [types.variableDeclarator(id, nodeInit)]); | ||
node = core.types.variableDeclaration(this.kind, [core.types.variableDeclarator(id, nodeInit)]); | ||
} | ||
@@ -89,3 +93,3 @@ node._blockHoist = this.blockHoist; | ||
buildVariableDeclaration(id, init) { | ||
const declar = types.variableDeclaration("var", [types.variableDeclarator(types.cloneNode(id), types.cloneNode(init))]); | ||
const declar = core.types.variableDeclaration("var", [core.types.variableDeclarator(core.types.cloneNode(id), core.types.cloneNode(init))]); | ||
declar._blockHoist = this.blockHoist; | ||
@@ -95,8 +99,8 @@ return declar; | ||
push(id, _init) { | ||
const init = types.cloneNode(_init); | ||
if (types.isObjectPattern(id)) { | ||
const init = core.types.cloneNode(_init); | ||
if (core.types.isObjectPattern(id)) { | ||
this.pushObjectPattern(id, init); | ||
} else if (types.isArrayPattern(id)) { | ||
} else if (core.types.isArrayPattern(id)) { | ||
this.pushArrayPattern(id, init); | ||
} else if (types.isAssignmentPattern(id)) { | ||
} else if (core.types.isAssignmentPattern(id)) { | ||
this.pushAssignmentPattern(id, init); | ||
@@ -108,3 +112,3 @@ } else { | ||
toArray(node, count) { | ||
if (this.iterableIsArray || types.isIdentifier(node) && this.arrayRefSet.has(node.name)) { | ||
if (this.iterableIsArray || core.types.isIdentifier(node) && this.arrayRefSet.has(node.name)) { | ||
return node; | ||
@@ -125,4 +129,4 @@ } else { | ||
this.nodes.push(this.buildVariableDeclaration(tempId, valueRef)); | ||
const tempConditional = types.conditionalExpression(types.binaryExpression("===", types.cloneNode(tempId), this.scope.buildUndefinedNode()), right, types.cloneNode(tempId)); | ||
if (types.isPattern(left)) { | ||
const tempConditional = core.types.conditionalExpression(core.types.binaryExpression("===", core.types.cloneNode(tempId), this.scope.buildUndefinedNode()), right, core.types.cloneNode(tempId)); | ||
if (core.types.isPattern(left)) { | ||
let patternId; | ||
@@ -135,3 +139,3 @@ let node; | ||
patternId = tempId; | ||
node = types.expressionStatement(types.assignmentExpression("=", types.cloneNode(tempId), tempConditional)); | ||
node = core.types.expressionStatement(core.types.assignmentExpression("=", core.types.cloneNode(tempId), tempConditional)); | ||
} | ||
@@ -149,6 +153,6 @@ this.nodes.push(node); | ||
pushObjectProperty(prop, propRef) { | ||
if (types.isLiteral(prop.key)) prop.computed = true; | ||
if (core.types.isLiteral(prop.key)) prop.computed = true; | ||
const pattern = prop.value; | ||
const objRef = types.memberExpression(types.cloneNode(propRef), prop.key, prop.computed); | ||
if (types.isPattern(pattern)) { | ||
const objRef = core.types.memberExpression(core.types.cloneNode(propRef), prop.key, prop.computed); | ||
if (core.types.isPattern(pattern)) { | ||
this.push(pattern, objRef); | ||
@@ -161,3 +165,3 @@ } else { | ||
if (!pattern.properties.length) { | ||
this.nodes.push(types.expressionStatement(types.callExpression(this.addHelper("objectDestructuringEmpty"), isPureVoid(objRef) ? [] : [objRef]))); | ||
this.nodes.push(core.types.expressionStatement(core.types.callExpression(this.addHelper("objectDestructuringEmpty"), isPureVoid(objRef) ? [] : [objRef]))); | ||
return; | ||
@@ -174,3 +178,3 @@ } | ||
const prop = pattern.properties[i]; | ||
if (types.isRestElement(prop)) { | ||
if (core.types.isRestElement(prop)) { | ||
break; | ||
@@ -195,3 +199,3 @@ } | ||
const prop = pattern.properties[i]; | ||
if (types.isRestElement(prop)) { | ||
if (core.types.isRestElement(prop)) { | ||
this.pushObjectRest(pattern, objRef, prop, i); | ||
@@ -204,3 +208,3 @@ } else { | ||
canUnpackArrayPattern(pattern, arr) { | ||
if (!types.isArrayExpression(arr)) return false; | ||
if (!core.types.isArrayExpression(arr)) return false; | ||
if (pattern.elements.length > arr.elements.length) return; | ||
@@ -212,10 +216,10 @@ if (pattern.elements.length < arr.elements.length && !hasArrayRest(pattern)) { | ||
if (!elem) return false; | ||
if (types.isMemberExpression(elem)) return false; | ||
if (core.types.isMemberExpression(elem)) return false; | ||
} | ||
for (const elem of arr.elements) { | ||
if (types.isSpreadElement(elem)) return false; | ||
if (types.isCallExpression(elem)) return false; | ||
if (types.isMemberExpression(elem)) return false; | ||
if (core.types.isSpreadElement(elem)) return false; | ||
if (core.types.isCallExpression(elem)) return false; | ||
if (core.types.isMemberExpression(elem)) return false; | ||
} | ||
const bindings = types.getBindingIdentifiers(pattern); | ||
const bindings = core.types.getBindingIdentifiers(pattern); | ||
const state = { | ||
@@ -226,3 +230,3 @@ deopt: false, | ||
try { | ||
types.traverse(arr, arrayUnpackVisitor, state); | ||
core.types.traverse(arr, arrayUnpackVisitor, state); | ||
} catch (e) { | ||
@@ -237,4 +241,4 @@ if (e !== STOP_TRAVERSAL) throw e; | ||
const elem = pattern.elements[i]; | ||
if (types.isRestElement(elem)) { | ||
this.push(elem.argument, types.arrayExpression(arr.elements.slice(i).map(holeToUndefined))); | ||
if (core.types.isRestElement(elem)) { | ||
this.push(elem.argument, core.types.arrayExpression(arr.elements.slice(i).map(holeToUndefined))); | ||
} else { | ||
@@ -247,3 +251,3 @@ this.push(elem, holeToUndefined(arr.elements[i])); | ||
if (arrayRef === null) { | ||
this.nodes.push(types.expressionStatement(types.callExpression(this.addHelper("objectDestructuringEmpty"), []))); | ||
this.nodes.push(core.types.expressionStatement(core.types.callExpression(this.addHelper("objectDestructuringEmpty"), []))); | ||
return; | ||
@@ -258,3 +262,3 @@ } | ||
const toArray = this.toArray(arrayRef, count); | ||
if (types.isIdentifier(toArray)) { | ||
if (core.types.isIdentifier(toArray)) { | ||
arrayRef = toArray; | ||
@@ -270,8 +274,8 @@ } else { | ||
let elemRef; | ||
if (types.isRestElement(elem)) { | ||
if (core.types.isRestElement(elem)) { | ||
elemRef = this.toArray(arrayRef); | ||
elemRef = types.callExpression(types.memberExpression(elemRef, types.identifier("slice")), [types.numericLiteral(i)]); | ||
elemRef = core.types.callExpression(core.types.memberExpression(elemRef, core.types.identifier("slice")), [core.types.numericLiteral(i)]); | ||
this.push(elem.argument, elemRef); | ||
} else { | ||
elemRef = types.memberExpression(arrayRef, types.numericLiteral(i), true); | ||
elemRef = core.types.memberExpression(arrayRef, core.types.numericLiteral(i), true); | ||
this.push(elem, elemRef); | ||
@@ -282,6 +286,6 @@ } | ||
init(pattern, ref) { | ||
if (!types.isArrayExpression(ref) && !types.isMemberExpression(ref)) { | ||
if (!core.types.isArrayExpression(ref) && !core.types.isMemberExpression(ref)) { | ||
const memo = this.scope.maybeGenerateMemoised(ref, true); | ||
if (memo) { | ||
this.nodes.push(this.buildVariableDeclaration(memo, types.cloneNode(ref))); | ||
this.nodes.push(this.buildVariableDeclaration(memo, core.types.cloneNode(ref))); | ||
ref = memo; | ||
@@ -301,11 +305,11 @@ } | ||
const key = prop.key; | ||
if (types.isIdentifier(key) && !prop.computed) { | ||
keys.push(types.stringLiteral(key.name)); | ||
} else if (types.isTemplateLiteral(key)) { | ||
keys.push(types.cloneNode(key)); | ||
if (core.types.isIdentifier(key) && !prop.computed) { | ||
keys.push(core.types.stringLiteral(key.name)); | ||
} else if (core.types.isTemplateLiteral(key)) { | ||
keys.push(core.types.cloneNode(key)); | ||
hasTemplateLiteral = true; | ||
} else if (types.isLiteral(key)) { | ||
keys.push(types.stringLiteral(String(key.value))); | ||
} else if (types.isPrivateName(key)) ; else { | ||
keys.push(types.cloneNode(key)); | ||
} else if (core.types.isLiteral(key)) { | ||
keys.push(core.types.stringLiteral(String(key.value))); | ||
} else if (core.types.isPrivateName(key)) ; else { | ||
keys.push(core.types.cloneNode(key)); | ||
allLiteral = false; | ||
@@ -316,9 +320,9 @@ } | ||
if (keys.length === 0) { | ||
const extendsHelper = useBuiltIns ? types.memberExpression(types.identifier("Object"), types.identifier("assign")) : addHelper("extends"); | ||
value = types.callExpression(extendsHelper, [types.objectExpression([]), types.sequenceExpression([types.callExpression(addHelper("objectDestructuringEmpty"), [types.cloneNode(objRef)]), types.cloneNode(objRef)])]); | ||
const extendsHelper = useBuiltIns ? core.types.memberExpression(core.types.identifier("Object"), core.types.identifier("assign")) : addHelper("extends"); | ||
value = core.types.callExpression(extendsHelper, [core.types.objectExpression([]), core.types.sequenceExpression([core.types.callExpression(addHelper("objectDestructuringEmpty"), [core.types.cloneNode(objRef)]), core.types.cloneNode(objRef)])]); | ||
} else { | ||
let keyExpression = types.arrayExpression(keys); | ||
let keyExpression = core.types.arrayExpression(keys); | ||
if (!allLiteral) { | ||
keyExpression = types.callExpression(types.memberExpression(keyExpression, types.identifier("map")), [addHelper("toPropertyKey")]); | ||
} else if (!hasTemplateLiteral && !types.isProgram(scope.block)) { | ||
keyExpression = core.types.callExpression(core.types.memberExpression(keyExpression, core.types.identifier("map")), [addHelper("toPropertyKey")]); | ||
} else if (!hasTemplateLiteral && !core.types.isProgram(scope.block)) { | ||
const programScope = scope.getProgramParent(); | ||
@@ -331,5 +335,5 @@ const id = programScope.generateUidIdentifier("excluded"); | ||
}); | ||
keyExpression = types.cloneNode(id); | ||
keyExpression = core.types.cloneNode(id); | ||
} | ||
value = types.callExpression(addHelper(`objectWithoutProperties${objectRestNoSymbols ? "Loose" : ""}`), [types.cloneNode(objRef), keyExpression]); | ||
value = core.types.callExpression(addHelper(`objectWithoutProperties${objectRestNoSymbols ? "Loose" : ""}`), [core.types.cloneNode(objRef), keyExpression]); | ||
} | ||
@@ -361,9 +365,9 @@ return value; | ||
}); | ||
if (types.isPattern(pattern)) { | ||
if (core.types.isPattern(pattern)) { | ||
destructuring.init(pattern, patternId); | ||
if (+i !== node.declarations.length - 1) { | ||
types.inherits(nodes[nodes.length - 1], declar); | ||
core.types.inherits(nodes[nodes.length - 1], declar); | ||
} | ||
} else { | ||
nodes.push(types.inherits(destructuring.buildVariableAssignment(pattern, patternId), declar)); | ||
nodes.push(core.types.inherits(destructuring.buildVariableAssignment(pattern, patternId), declar)); | ||
} | ||
@@ -374,3 +378,3 @@ } | ||
for (const node of nodes) { | ||
if (types.isVariableDeclaration(node)) { | ||
if (core.types.isVariableDeclaration(node)) { | ||
if (tail !== null) { | ||
@@ -391,3 +395,3 @@ tail.declarations.push(...node.declarations); | ||
} | ||
if (nodesOut.length === 2 && types.isVariableDeclaration(nodesOut[0]) && types.isExpressionStatement(nodesOut[1]) && types.isCallExpression(nodesOut[1].expression) && nodesOut[0].declarations.length === 1) { | ||
if (nodesOut.length === 2 && core.types.isVariableDeclaration(nodesOut[0]) && core.types.isExpressionStatement(nodesOut[1]) && core.types.isCallExpression(nodesOut[1].expression) && nodesOut[0].declarations.length === 1) { | ||
const expr = nodesOut[1].expression; | ||
@@ -397,8 +401,8 @@ expr.arguments = [nodesOut[0].declarations[0].init]; | ||
} else { | ||
if (types.isForStatement(path.parent, { | ||
if (core.types.isForStatement(path.parent, { | ||
init: node | ||
}) && !nodesOut.some(v => types.isVariableDeclaration(v))) { | ||
}) && !nodesOut.some(v => core.types.isVariableDeclaration(v))) { | ||
for (let i = 0; i < nodesOut.length; i++) { | ||
const node = nodesOut[i]; | ||
if (types.isExpressionStatement(node)) { | ||
if (core.types.isExpressionStatement(node)) { | ||
nodesOut[i] = node.expression; | ||
@@ -436,4 +440,4 @@ } | ||
ref = scope.generateUidIdentifierBasedOnNode(node.right, "ref"); | ||
nodes.push(types.variableDeclaration("var", [types.variableDeclarator(ref, node.right)])); | ||
if (types.isArrayExpression(node.right)) { | ||
nodes.push(core.types.variableDeclaration("var", [core.types.variableDeclarator(ref, node.right)])); | ||
if (core.types.isArrayExpression(node.right)) { | ||
destructuring.arrayRefSet.add(ref.name); | ||
@@ -445,6 +449,6 @@ } | ||
if (parentPath.isArrowFunctionExpression()) { | ||
path.replaceWith(types.blockStatement([])); | ||
nodes.push(types.returnStatement(types.cloneNode(ref))); | ||
path.replaceWith(core.types.blockStatement([])); | ||
nodes.push(core.types.returnStatement(core.types.cloneNode(ref))); | ||
} else { | ||
nodes.push(types.expressionStatement(types.cloneNode(ref))); | ||
nodes.push(core.types.expressionStatement(core.types.cloneNode(ref))); | ||
} | ||
@@ -458,3 +462,3 @@ } | ||
for (const declar of node.declarations) { | ||
if (types.isPattern(declar.id)) { | ||
if (core.types.isPattern(declar.id)) { | ||
return true; | ||
@@ -465,3 +469,3 @@ } | ||
} | ||
var index = declare((api, options) => { | ||
var index = helperPluginUtils.declare((api, options) => { | ||
var _ref, _api$assumption, _ref2, _options$allowArrayLi, _ref3, _api$assumption2; | ||
@@ -484,6 +488,6 @@ api.assertVersion(7); | ||
for (const name of Object.keys(path.getOuterBindingIdentifiers())) { | ||
specifiers.push(types.exportSpecifier(types.identifier(name), types.identifier(name))); | ||
specifiers.push(core.types.exportSpecifier(core.types.identifier(name), core.types.identifier(name))); | ||
} | ||
path.replaceWith(declaration.node); | ||
path.insertAfter(types.exportNamedDeclaration(null, specifiers)); | ||
path.insertAfter(core.types.exportNamedDeclaration(null, specifiers)); | ||
path.scope.crawl(); | ||
@@ -497,5 +501,5 @@ }, | ||
const left = node.left; | ||
if (types.isPattern(left)) { | ||
if (core.types.isPattern(left)) { | ||
const temp = scope.generateUidIdentifier("ref"); | ||
node.left = types.variableDeclaration("var", [types.variableDeclarator(temp)]); | ||
node.left = core.types.variableDeclaration("var", [core.types.variableDeclarator(temp)]); | ||
path.ensureBlock(); | ||
@@ -505,5 +509,5 @@ const statementBody = path.node.body.body; | ||
if (statementBody.length === 0 && path.isCompletionRecord()) { | ||
nodes.unshift(types.expressionStatement(scope.buildUndefinedNode())); | ||
nodes.unshift(core.types.expressionStatement(scope.buildUndefinedNode())); | ||
} | ||
nodes.unshift(types.expressionStatement(types.assignmentExpression("=", left, types.cloneNode(temp)))); | ||
nodes.unshift(core.types.expressionStatement(core.types.assignmentExpression("=", left, core.types.cloneNode(temp)))); | ||
unshiftForXStatementBody(path, nodes); | ||
@@ -513,7 +517,7 @@ scope.crawl(); | ||
} | ||
if (!types.isVariableDeclaration(left)) return; | ||
if (!core.types.isVariableDeclaration(left)) return; | ||
const pattern = left.declarations[0].id; | ||
if (!types.isPattern(pattern)) return; | ||
if (!core.types.isPattern(pattern)) return; | ||
const key = scope.generateUidIdentifier("ref"); | ||
node.left = types.variableDeclaration(left.kind, [types.variableDeclarator(key, null)]); | ||
node.left = core.types.variableDeclaration(left.kind, [core.types.variableDeclarator(key, null)]); | ||
const nodes = []; | ||
@@ -539,3 +543,3 @@ const destructuring = new DestructuringTransformer({ | ||
const pattern = node.param; | ||
if (!types.isPattern(pattern)) return; | ||
if (!core.types.isPattern(pattern)) return; | ||
const ref = scope.generateUidIdentifier("ref"); | ||
@@ -559,3 +563,3 @@ node.param = ref; | ||
AssignmentExpression(path, state) { | ||
if (!types.isPattern(path.node.left)) return; | ||
if (!core.types.isPattern(path.node.left)) return; | ||
convertAssignmentExpression(path, name => state.addHelper(name), arrayLikeIsIterable, iterableIsArray, objectRestNoSymbols, useBuiltIns); | ||
@@ -568,3 +572,3 @@ }, | ||
} = path; | ||
if (types.isForXStatement(parent)) return; | ||
if (core.types.isForXStatement(parent)) return; | ||
if (!parent || !path.container) return; | ||
@@ -578,3 +582,5 @@ if (!variableDeclarationHasPattern(node)) return; | ||
export { buildObjectExcludingKeys, index as default, unshiftForXStatementBody }; | ||
exports.buildObjectExcludingKeys = buildObjectExcludingKeys; | ||
exports["default"] = index; | ||
exports.unshiftForXStatementBody = unshiftForXStatementBody; | ||
//# sourceMappingURL=index.js.map |
{ | ||
"name": "@babel/plugin-transform-destructuring", | ||
"version": "7.21.4-esm.2", | ||
"version": "7.21.4-esm.3", | ||
"description": "Compile ES2015 destructuring to ES5", | ||
@@ -20,3 +20,3 @@ "repository": { | ||
"dependencies": { | ||
"@babel/helper-plugin-utils": "7.21.4-esm.2" | ||
"@babel/helper-plugin-utils": "7.21.4-esm.3" | ||
}, | ||
@@ -27,5 +27,5 @@ "peerDependencies": { | ||
"devDependencies": { | ||
"@babel/core": "7.21.4-esm.2", | ||
"@babel/helper-plugin-test-runner": "7.21.4-esm.2", | ||
"@babel/traverse": "7.21.4-esm.2" | ||
"@babel/core": "7.21.4-esm.3", | ||
"@babel/helper-plugin-test-runner": "7.21.4-esm.3", | ||
"@babel/traverse": "7.21.4-esm.3" | ||
}, | ||
@@ -32,0 +32,0 @@ "engines": { |
Sorry, the diff of this file is not supported yet
81669
540
+ Added@babel/helper-plugin-utils@7.21.4-esm.3(transitive)
- Removed@babel/helper-plugin-utils@7.21.4-esm.2(transitive)