refactor(ref-transform): improve algorithm into one pass

This commit is contained in:
Evan You 2021-08-23 18:22:21 -04:00
parent 06051c4bf2
commit f1fa30adc3
4 changed files with 437 additions and 409 deletions

View File

@ -18,9 +18,7 @@ export function walkIdentifiers(
isReference: boolean, isReference: boolean,
isLocal: boolean isLocal: boolean
) => void, ) => void,
onNode?: (node: Node, parent: Node, parentStack: Node[]) => void | boolean,
includeAll = false, includeAll = false,
analyzeScope = true,
parentStack: Node[] = [], parentStack: Node[] = [],
knownIds: Record<string, number> = Object.create(null) knownIds: Record<string, number> = Object.create(null)
) { ) {
@ -41,11 +39,8 @@ export function walkIdentifiers(
) { ) {
return this.skip() return this.skip()
} }
if (onNode && onNode(node, parent!, parentStack) === false) {
return this.skip()
}
if (node.type === 'Identifier') { if (node.type === 'Identifier') {
const isLocal = analyzeScope && !!knownIds[node.name] const isLocal = !!knownIds[node.name]
const isRefed = isReferencedIdentifier(node, parent!, parentStack) const isRefed = isReferencedIdentifier(node, parent!, parentStack)
if (includeAll || (isRefed && !isLocal)) { if (includeAll || (isRefed && !isLocal)) {
onIdentifier(node, parent!, parentStack, isRefed, isLocal) onIdentifier(node, parent!, parentStack, isRefed, isLocal)
@ -56,24 +51,20 @@ export function walkIdentifiers(
) { ) {
// mark property in destructure pattern // mark property in destructure pattern
;(node as any).inPattern = true ;(node as any).inPattern = true
} else if (analyzeScope) { } else if (isFunctionType(node)) {
if (isFunctionType(node)) {
// walk function expressions and add its arguments to known identifiers // walk function expressions and add its arguments to known identifiers
// so that we don't prefix them // so that we don't prefix them
walkFunctionParams(node, id => walkFunctionParams(node, id => markScopeIdentifier(node, id, knownIds))
markScopeIdentifier(node, id, knownIds)
)
} else if (node.type === 'BlockStatement') { } else if (node.type === 'BlockStatement') {
// #3445 record block-level local variables // #3445 record block-level local variables
walkBlockDeclarations(node, id => walkBlockDeclarations(node, id =>
markScopeIdentifier(node, id, knownIds) markScopeIdentifier(node, id, knownIds)
) )
} }
}
}, },
leave(node: Node & { scopeIds?: Set<string> }, parent: Node | undefined) { leave(node: Node & { scopeIds?: Set<string> }, parent: Node | undefined) {
parent && parentStack.pop() parent && parentStack.pop()
if (analyzeScope && node !== rootExp && node.scopeIds) { if (node !== rootExp && node.scopeIds) {
for (const id of node.scopeIds) { for (const id of node.scopeIds) {
knownIds[id]-- knownIds[id]--
if (knownIds[id] === 0) { if (knownIds[id] === 0) {
@ -189,13 +180,13 @@ export function extractIdentifiers(
break break
case 'ObjectPattern': case 'ObjectPattern':
param.properties.forEach(prop => { for (const prop of param.properties) {
if (prop.type === 'RestElement') { if (prop.type === 'RestElement') {
extractIdentifiers(prop.argument, nodes) extractIdentifiers(prop.argument, nodes)
} else { } else {
extractIdentifiers(prop.value, nodes) extractIdentifiers(prop.value, nodes)
} }
}) }
break break
case 'ArrayPattern': case 'ArrayPattern':

View File

@ -282,9 +282,7 @@ export function processExpression(
ids.push(node as QualifiedId) ids.push(node as QualifiedId)
} }
}, },
undefined,
true, // invoke on ALL identifiers true, // invoke on ALL identifiers
true, // isLocal scope analysis
parentStack, parentStack,
knownIds knownIds
) )

View File

@ -1,385 +1 @@
import { export * from './refTransform'
Node,
Identifier,
BlockStatement,
CallExpression,
ObjectPattern,
VariableDeclaration,
ArrayPattern
} from '@babel/types'
import MagicString, { SourceMap } from 'magic-string'
import { walk } from 'estree-walker'
import {
isFunctionType,
isInDestructureAssignment,
isStaticProperty,
walkBlockDeclarations,
walkFunctionParams,
walkIdentifiers
} from '@vue/compiler-core'
import { parse, ParserPlugin } from '@babel/parser'
import { babelParserDefaultPlugins } from '@vue/shared'
const TO_VAR_SYMBOL = '$'
const TO_REF_SYMBOL = '$$'
const shorthands = ['ref', 'computed', 'shallowRef']
const transformCheckRE = /[^\w]\$(?:\$|ref|computed|shallowRef)?\(/
export function shouldTransform(src: string): boolean {
return transformCheckRE.test(src)
}
type Scope = Record<string, boolean>
export interface RefTransformOptions {
filename?: string
sourceMap?: boolean
parserPlugins?: ParserPlugin[]
importHelpersFrom?: string
}
export interface RefTransformResults {
code: string
map: SourceMap | null
rootVars: string[]
importedHelpers: string[]
}
export function transform(
src: string,
{
filename,
sourceMap,
parserPlugins,
importHelpersFrom = 'vue'
}: RefTransformOptions = {}
): RefTransformResults {
const plugins: ParserPlugin[] = parserPlugins || []
if (filename) {
if (/\.tsx?$/.test(filename)) {
plugins.push('typescript')
}
if (filename.endsWith('x')) {
plugins.push('jsx')
}
}
const ast = parse(src, {
sourceType: 'module',
plugins: [...new Set([...babelParserDefaultPlugins, ...plugins])]
})
const s = new MagicString(src)
const res = transformAST(ast, s)
// inject helper imports
if (res.importedHelpers.length) {
s.prepend(
`import { ${res.importedHelpers
.map(h => `${h} as _${h}`)
.join(', ')} } from '${importHelpersFrom}'\n`
)
}
return {
...res,
code: s.toString(),
map: sourceMap
? s.generateMap({
source: filename,
hires: true,
includeContent: true
})
: null
}
}
export function transformAST(
ast: Node,
s: MagicString,
offset = 0,
knownRootVars?: string[]
): {
rootVars: string[]
importedHelpers: string[]
} {
const importedHelpers = new Set<string>()
const blockStack: BlockStatement[] = []
let currentBlock: BlockStatement | null = null
const rootScope: Scope = {}
const blockToScopeMap = new WeakMap<BlockStatement, Scope>()
const excludedIds = new Set<Identifier>()
const parentStack: Node[] = []
if (knownRootVars) {
for (const key of knownRootVars) {
rootScope[key] = true
}
}
const error = (msg: string, node: Node) => {
const e = new Error(msg)
;(e as any).node = node
throw e
}
const helper = (msg: string) => {
importedHelpers.add(msg)
return `_${msg}`
}
const registerBinding = (id: Identifier, isRef = false) => {
excludedIds.add(id)
if (currentBlock) {
const currentScope = blockToScopeMap.get(currentBlock)
if (!currentScope) {
blockToScopeMap.set(currentBlock, { [id.name]: isRef })
} else {
currentScope[id.name] = isRef
}
} else {
rootScope[id.name] = isRef
}
}
const registerRefBinding = (id: Identifier) => registerBinding(id, true)
if (ast.type === 'Program') {
walkBlockDeclarations(ast, registerBinding)
}
// 1st pass: detect macro callsites and register ref bindings
;(walk as any)(ast, {
enter(node: Node, parent?: Node) {
parent && parentStack.push(parent)
if (node.type === 'BlockStatement') {
blockStack.push((currentBlock = node))
walkBlockDeclarations(node, registerBinding)
if (parent && isFunctionType(parent)) {
walkFunctionParams(parent, registerBinding)
}
return
}
const toVarCall = isToVarCall(node)
if (toVarCall) {
if (!parent || parent.type !== 'VariableDeclarator') {
return error(
`${toVarCall} can only be used as the initializer of ` +
`a variable declaration.`,
node
)
}
excludedIds.add((node as CallExpression).callee as Identifier)
const decl = parentStack[parentStack.length - 2] as VariableDeclaration
if (decl.kind !== 'let') {
error(`${toVarCall}() bindings can only be declared with let`, node)
}
if (toVarCall === TO_VAR_SYMBOL) {
// $
// remove macro
s.remove(
(node as CallExpression).callee.start! + offset,
(node as CallExpression).callee.end! + offset
)
if (parent.id.type === 'Identifier') {
// single variable
registerRefBinding(parent.id)
} else if (parent.id.type === 'ObjectPattern') {
processRefObjectPattern(parent.id, decl)
} else if (parent.id.type === 'ArrayPattern') {
processRefArrayPattern(parent.id, decl)
}
} else {
// shorthands
if (parent.id.type === 'Identifier') {
registerRefBinding(parent.id)
// replace call
s.overwrite(
node.start! + offset,
node.start! + toVarCall.length + offset,
helper(toVarCall.slice(1))
)
} else {
error(
`${toVarCall}() cannot be used with destructure patterns.`,
node
)
}
}
}
},
leave(node: Node, parent?: Node) {
parent && parentStack.pop()
if (node.type === 'BlockStatement') {
blockStack.pop()
currentBlock = blockStack[blockStack.length - 1] || null
}
}
})
function processRefObjectPattern(
pattern: ObjectPattern,
statement: VariableDeclaration
) {
for (const p of pattern.properties) {
let nameId: Identifier | undefined
if (p.type === 'ObjectProperty') {
if (p.key.start! === p.value.start!) {
// shorthand { foo } --> { foo: __foo }
nameId = p.key as Identifier
s.appendLeft(nameId.end! + offset, `: __${nameId.name}`)
if (p.value.type === 'AssignmentPattern') {
// { foo = 1 }
registerRefBinding(p.value.left as Identifier)
}
} else {
if (p.value.type === 'Identifier') {
// { foo: bar } --> { foo: __bar }
nameId = p.value
s.prependRight(nameId.start! + offset, `__`)
} else if (p.value.type === 'ObjectPattern') {
processRefObjectPattern(p.value, statement)
} else if (p.value.type === 'ArrayPattern') {
processRefArrayPattern(p.value, statement)
} else if (p.value.type === 'AssignmentPattern') {
// { foo: bar = 1 } --> { foo: __bar = 1 }
nameId = p.value.left as Identifier
s.prependRight(nameId.start! + offset, `__`)
}
}
} else {
// rest element { ...foo } --> { ...__foo }
nameId = p.argument as Identifier
s.prependRight(nameId.start! + offset, `__`)
}
if (nameId) {
registerRefBinding(nameId)
// append binding declarations after the parent statement
s.appendLeft(
statement.end! + offset,
`\nconst ${nameId.name} = ${helper('ref')}(__${nameId.name});`
)
}
}
}
function processRefArrayPattern(
pattern: ArrayPattern,
statement: VariableDeclaration
) {
for (const e of pattern.elements) {
if (!e) continue
let nameId: Identifier | undefined
if (e.type === 'Identifier') {
// [a] --> [__a]
nameId = e
} else if (e.type === 'AssignmentPattern') {
// [a = 1] --> [__a = 1]
nameId = e.left as Identifier
} else if (e.type === 'RestElement') {
// [...a] --> [...__a]
nameId = e.argument as Identifier
} else if (e.type === 'ObjectPattern') {
processRefObjectPattern(e, statement)
} else if (e.type === 'ArrayPattern') {
processRefArrayPattern(e, statement)
}
if (nameId) {
registerRefBinding(nameId)
// prefix original
s.prependRight(nameId.start! + offset, `__`)
// append binding declarations after the parent statement
s.appendLeft(
statement.end! + offset,
`\nconst ${nameId.name} = ${helper('ref')}(__${nameId.name});`
)
}
}
}
// 2nd pass: detect references to ref bindings and append .value
// also remove $$ calls
walkIdentifiers(
ast,
(id, parent, parentStack, isReferenced) => {
if (!isReferenced || excludedIds.has(id)) {
return false
}
// locate current scope
let i = parentStack.length
while (i--) {
const node = parentStack[i]
if (node.type === 'BlockStatement') {
const scope = blockToScopeMap.get(node)
if (scope && checkRefId(scope, id, parent, parentStack)) {
return
}
}
}
checkRefId(rootScope, id, parent, parentStack)
},
node => {
if (isToRefCall(node)) {
s.remove(node.callee.start! + offset, node.callee.end! + offset)
return false // skip walk
}
},
true, // invoke on ALL
false // skip scope analysis since we did it already
)
function checkRefId(
scope: Scope,
id: Identifier,
parent: Node,
parentStack: Node[]
): boolean {
if (id.name in scope) {
if (scope[id.name]) {
if (isStaticProperty(parent) && parent.shorthand) {
// let binding used in a property shorthand
// { foo } -> { foo: foo.value }
// skip for destructure patterns
if (
!(parent as any).inPattern ||
isInDestructureAssignment(parent, parentStack)
) {
s.appendLeft(id.end! + offset, `: ${id.name}.value`)
}
} else {
s.appendLeft(id.end! + offset, '.value')
}
}
return true
}
return false
}
return {
rootVars: Object.keys(rootScope).filter(key => rootScope[key]),
importedHelpers: [...importedHelpers]
}
}
function isToVarCall(node: Node): string | false {
if (node.type !== 'CallExpression' || node.callee.type !== 'Identifier') {
return false
}
const callee = node.callee.name
if (callee === TO_VAR_SYMBOL) {
return TO_VAR_SYMBOL
}
if (callee[0] === TO_VAR_SYMBOL && shorthands.includes(callee.slice(1))) {
return callee
}
return false
}
function isToRefCall(node: Node): node is CallExpression {
return (
node.type === 'CallExpression' &&
(node.callee as Identifier).name === TO_REF_SYMBOL
)
}

View File

@ -0,0 +1,423 @@
import {
Node,
Identifier,
BlockStatement,
CallExpression,
ObjectPattern,
VariableDeclaration,
ArrayPattern,
Program,
VariableDeclarator
} from '@babel/types'
import MagicString, { SourceMap } from 'magic-string'
import { walk } from 'estree-walker'
import {
extractIdentifiers,
isFunctionType,
isInDestructureAssignment,
isReferencedIdentifier,
isStaticProperty,
walkFunctionParams
} from '@vue/compiler-core'
import { parse, ParserPlugin } from '@babel/parser'
import { babelParserDefaultPlugins } from '@vue/shared'
const TO_VAR_SYMBOL = '$'
const TO_REF_SYMBOL = '$$'
const shorthands = ['ref', 'computed', 'shallowRef']
const transformCheckRE = /[^\w]\$(?:\$|ref|computed|shallowRef)?\(/
export function shouldTransform(src: string): boolean {
return transformCheckRE.test(src)
}
type Scope = Record<string, boolean>
export interface RefTransformOptions {
filename?: string
sourceMap?: boolean
parserPlugins?: ParserPlugin[]
importHelpersFrom?: string
}
export interface RefTransformResults {
code: string
map: SourceMap | null
rootVars: string[]
importedHelpers: string[]
}
export function transform(
src: string,
{
filename,
sourceMap,
parserPlugins,
importHelpersFrom = 'vue'
}: RefTransformOptions = {}
): RefTransformResults {
const plugins: ParserPlugin[] = parserPlugins || []
if (filename) {
if (/\.tsx?$/.test(filename)) {
plugins.push('typescript')
}
if (filename.endsWith('x')) {
plugins.push('jsx')
}
}
const ast = parse(src, {
sourceType: 'module',
plugins: [...new Set([...babelParserDefaultPlugins, ...plugins])]
})
const s = new MagicString(src)
const res = transformAST(ast.program, s)
// inject helper imports
if (res.importedHelpers.length) {
s.prepend(
`import { ${res.importedHelpers
.map(h => `${h} as _${h}`)
.join(', ')} } from '${importHelpersFrom}'\n`
)
}
return {
...res,
code: s.toString(),
map: sourceMap
? s.generateMap({
source: filename,
hires: true,
includeContent: true
})
: null
}
}
export function transformAST(
ast: Program,
s: MagicString,
offset = 0,
knownRootVars?: string[]
): {
rootVars: string[]
importedHelpers: string[]
} {
const importedHelpers = new Set<string>()
const rootScope: Scope = {}
const scopeStack: Scope[] = [rootScope]
let currentScope: Scope = rootScope
const excludedIds = new WeakSet<Identifier>()
const parentStack: Node[] = []
if (knownRootVars) {
for (const key of knownRootVars) {
rootScope[key] = true
}
}
function error(msg: string, node: Node) {
const e = new Error(msg)
;(e as any).node = node
throw e
}
function helper(msg: string) {
importedHelpers.add(msg)
return `_${msg}`
}
function registerBinding(id: Identifier, isRef = false) {
excludedIds.add(id)
if (currentScope) {
currentScope[id.name] = isRef
} else {
error(
'registerBinding called without active scope, something is wrong.',
id
)
}
}
const registerRefBinding = (id: Identifier) => registerBinding(id, true)
function walkScope(node: Program | BlockStatement) {
for (const stmt of node.body) {
if (stmt.type === 'VariableDeclaration') {
if (stmt.declare) continue
for (const decl of stmt.declarations) {
let toVarCall
if (decl.init && (toVarCall = isToVarCall(decl.init))) {
processRefDeclaration(
toVarCall,
decl.init as CallExpression,
decl.id,
stmt
)
} else {
for (const id of extractIdentifiers(decl.id)) {
registerBinding(id)
}
}
}
} else if (
stmt.type === 'FunctionDeclaration' ||
stmt.type === 'ClassDeclaration'
) {
if (stmt.declare || !stmt.id) continue
registerBinding(stmt.id)
}
}
}
function processRefDeclaration(
method: string,
call: CallExpression,
id: VariableDeclarator['id'],
statement: VariableDeclaration
) {
excludedIds.add(call.callee as Identifier)
if (statement.kind !== 'let') {
error(`${method}() bindings can only be declared with let`, call)
}
if (method === TO_VAR_SYMBOL) {
// $
// remove macro
s.remove(call.callee.start! + offset, call.callee.end! + offset)
if (id.type === 'Identifier') {
// single variable
registerRefBinding(id)
} else if (id.type === 'ObjectPattern') {
processRefObjectPattern(id, statement)
} else if (id.type === 'ArrayPattern') {
processRefArrayPattern(id, statement)
}
} else {
// shorthands
if (id.type === 'Identifier') {
registerRefBinding(id)
// replace call
s.overwrite(
call.start! + offset,
call.start! + method.length + offset,
helper(method.slice(1))
)
} else {
error(`${method}() cannot be used with destructure patterns.`, call)
}
}
}
function processRefObjectPattern(
pattern: ObjectPattern,
statement: VariableDeclaration
) {
for (const p of pattern.properties) {
let nameId: Identifier | undefined
if (p.type === 'ObjectProperty') {
if (p.key.start! === p.value.start!) {
// shorthand { foo } --> { foo: __foo }
nameId = p.key as Identifier
s.appendLeft(nameId.end! + offset, `: __${nameId.name}`)
if (p.value.type === 'Identifier') {
// avoid shorthand value identifier from being processed
excludedIds.add(p.value)
} else if (
p.value.type === 'AssignmentPattern' &&
p.value.left.type === 'Identifier'
) {
// { foo = 1 }
excludedIds.add(p.value.left)
}
} else {
if (p.value.type === 'Identifier') {
// { foo: bar } --> { foo: __bar }
nameId = p.value
s.prependRight(nameId.start! + offset, `__`)
} else if (p.value.type === 'ObjectPattern') {
processRefObjectPattern(p.value, statement)
} else if (p.value.type === 'ArrayPattern') {
processRefArrayPattern(p.value, statement)
} else if (p.value.type === 'AssignmentPattern') {
// { foo: bar = 1 } --> { foo: __bar = 1 }
nameId = p.value.left as Identifier
s.prependRight(nameId.start! + offset, `__`)
}
}
} else {
// rest element { ...foo } --> { ...__foo }
nameId = p.argument as Identifier
s.prependRight(nameId.start! + offset, `__`)
}
if (nameId) {
registerRefBinding(nameId)
// append binding declarations after the parent statement
s.appendLeft(
statement.end! + offset,
`\nconst ${nameId.name} = ${helper('ref')}(__${nameId.name});`
)
}
}
}
function processRefArrayPattern(
pattern: ArrayPattern,
statement: VariableDeclaration
) {
for (const e of pattern.elements) {
if (!e) continue
let nameId: Identifier | undefined
if (e.type === 'Identifier') {
// [a] --> [__a]
nameId = e
} else if (e.type === 'AssignmentPattern') {
// [a = 1] --> [__a = 1]
nameId = e.left as Identifier
} else if (e.type === 'RestElement') {
// [...a] --> [...__a]
nameId = e.argument as Identifier
} else if (e.type === 'ObjectPattern') {
processRefObjectPattern(e, statement)
} else if (e.type === 'ArrayPattern') {
processRefArrayPattern(e, statement)
}
if (nameId) {
registerRefBinding(nameId)
// prefix original
s.prependRight(nameId.start! + offset, `__`)
// append binding declarations after the parent statement
s.appendLeft(
statement.end! + offset,
`\nconst ${nameId.name} = ${helper('ref')}(__${nameId.name});`
)
}
}
}
function checkRefId(
scope: Scope,
id: Identifier,
parent: Node,
parentStack: Node[]
): boolean {
if (id.name in scope) {
if (scope[id.name]) {
if (isStaticProperty(parent) && parent.shorthand) {
// let binding used in a property shorthand
// { foo } -> { foo: foo.value }
// skip for destructure patterns
if (
!(parent as any).inPattern ||
isInDestructureAssignment(parent, parentStack)
) {
s.appendLeft(id.end! + offset, `: ${id.name}.value`)
}
} else {
s.appendLeft(id.end! + offset, '.value')
}
}
return true
}
return false
}
// check root scope first
walkScope(ast)
;(walk as any)(ast, {
enter(node: Node, parent?: Node) {
parent && parentStack.push(parent)
// function scopes
if (isFunctionType(node)) {
scopeStack.push((currentScope = {}))
walkFunctionParams(node, registerBinding)
if (node.body.type === 'BlockStatement') {
walkScope(node.body)
}
return
}
// non-function block scopes
if (node.type === 'BlockStatement' && !isFunctionType(parent!)) {
scopeStack.push((currentScope = {}))
walkScope(node)
return
}
if (
parent &&
parent.type.startsWith('TS') &&
parent.type !== 'TSAsExpression' &&
parent.type !== 'TSNonNullExpression' &&
parent.type !== 'TSTypeAssertion'
) {
return this.skip()
}
if (
node.type === 'Identifier' &&
isReferencedIdentifier(node, parent!, parentStack) &&
!excludedIds.has(node)
) {
// walk up the scope chain to check if id should be appended .value
let i = scopeStack.length
while (i--) {
if (checkRefId(scopeStack[i], node, parent!, parentStack)) {
return
}
}
}
const toVarCall = isToVarCall(node)
if (toVarCall && (!parent || parent.type !== 'VariableDeclarator')) {
return error(
`${toVarCall} can only be used as the initializer of ` +
`a variable declaration.`,
node
)
}
if (isToRefCall(node)) {
s.remove(node.callee.start! + offset, node.callee.end! + offset)
return this.skip()
}
},
leave(node: Node, parent?: Node) {
parent && parentStack.pop()
if (
(node.type === 'BlockStatement' && !isFunctionType(parent!)) ||
isFunctionType(node)
) {
scopeStack.pop()
currentScope = scopeStack[scopeStack.length - 1] || null
}
}
})
return {
rootVars: Object.keys(rootScope).filter(key => rootScope[key]),
importedHelpers: [...importedHelpers]
}
}
function isToVarCall(node: Node): string | false {
if (node.type !== 'CallExpression' || node.callee.type !== 'Identifier') {
return false
}
const callee = node.callee.name
if (callee === TO_VAR_SYMBOL) {
return TO_VAR_SYMBOL
}
if (callee[0] === TO_VAR_SYMBOL && shorthands.includes(callee.slice(1))) {
return callee
}
return false
}
function isToRefCall(node: Node): node is CallExpression {
return (
node.type === 'CallExpression' &&
(node.callee as Identifier).name === TO_REF_SYMBOL
)
}