theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: avoid global scope parentStack

Browse Source
This commit is contained in:
Evan You 2021-01-15 16:28:55 -05:00
parent 3ea85c1168
commit fd16f2bd78
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/compiler-sfc/src/compileScript.ts
View File

@ -739,7 +739,7 @@ export function compileScript(
if (enableRefSugar && Object.keys(refBindings).length) { if (enableRefSugar && Object.keys(refBindings).length) {
for (const node of scriptSetupAst) { for (const node of scriptSetupAst) {
if (node.type !== 'ImportDeclaration') { if (node.type !== 'ImportDeclaration') {
walkIdentifiers(node, (id, parent) => { walkIdentifiers(node, (id, parent, parentStack) => {
if (refBindings[id.name] && !refIdentifiers.has(id)) { if (refBindings[id.name] && !refIdentifiers.has(id)) {
if (isStaticProperty(parent) && parent.shorthand) { if (isStaticProperty(parent) && parent.shorthand) {
// let binding used in a property shorthand // let binding used in a property shorthand
@ -1337,8 +1337,6 @@ function genRuntimeEmits(emits: Set<string>) {
: `` : ``
} }
const parentStack: Node[] = []
/** /**
* Walk an AST and find identifiers that are variable references. * Walk an AST and find identifiers that are variable references.
* This is largely the same logic with `transformExpressions` in compiler-core * This is largely the same logic with `transformExpressions` in compiler-core
@ -1347,15 +1345,19 @@ const parentStack: Node[] = []
*/ */
function walkIdentifiers( function walkIdentifiers(
root: Node, root: Node,
onIdentifier: (node: Identifier, parent: Node) => void onIdentifier: (node: Identifier, parent: Node, parentStack: Node[]) => void
) { ) {
const parentStack: Node[] = []
const knownIds: Record<string, number> = Object.create(null) const knownIds: Record<string, number> = Object.create(null)
;(walk as any)(root, { ;(walk as any)(root, {
enter(node: Node & { scopeIds?: Set<string> }, parent: Node | undefined) { enter(node: Node & { scopeIds?: Set<string> }, parent: Node | undefined) {
parent && parentStack.push(parent) parent && parentStack.push(parent)
if (node.type === 'Identifier') { if (node.type === 'Identifier') {
if (!knownIds[node.name] && isRefIdentifier(node, parent!)) { if (
onIdentifier(node, parent!) !knownIds[node.name] &&
isRefIdentifier(node, parent!, parentStack)
) {
onIdentifier(node, parent!, parentStack)
} }
} else if (isFunction(node)) { } else if (isFunction(node)) {
// walk function expressions and add its arguments to known identifiers // walk function expressions and add its arguments to known identifiers
@ -1411,7 +1413,7 @@ function walkIdentifiers(
}) })
} }
function isRefIdentifier(id: Identifier, parent: Node) { function isRefIdentifier(id: Identifier, parent: Node, parentStack: Node[]) {
// declaration id // declaration id
if ( if (
(parent.type === 'VariableDeclarator' || (parent.type === 'VariableDeclarator' ||