fix(compiler): bail strigification on runtime constant expressions

This commit is contained in:
Evan You 2020-05-04 15:15:26 -04:00
parent 3c3fe88c64
commit f9a3766fd6
5 changed files with 80 additions and 3 deletions

View File

@ -195,6 +195,9 @@ export interface SimpleExpressionNode extends Node {
// an expression parsed as the params of a function will track // an expression parsed as the params of a function will track
// the identifiers declared inside the function body. // the identifiers declared inside the function body.
identifiers?: string[] identifiers?: string[]
// some expressions (e.g. transformAssetUrls import identifiers) are constant,
// but cannot be stringified because they must be first evaluated at runtime.
isRuntimeConstant?: boolean
} }
export interface InterpolationNode extends Node { export interface InterpolationNode extends Node {

View File

@ -1,4 +1,9 @@
import { compile, NodeTypes, CREATE_STATIC } from '../../src' import {
compile,
NodeTypes,
CREATE_STATIC,
createSimpleExpression
} from '../../src'
import { import {
stringifyStatic, stringifyStatic,
StringifyThresholds StringifyThresholds
@ -121,4 +126,46 @@ describe('stringify static html', () => {
] ]
}) })
}) })
test('should bail on runtime constant v-bind bindings', () => {
const { ast } = compile(
`<div><div><img src="./foo" />${repeat(
`<span class="foo">foo</span>`,
StringifyThresholds.ELEMENT_WITH_BINDING_COUNT
)}</div></div>`,
{
hoistStatic: true,
prefixIdentifiers: true,
transformHoist: stringifyStatic,
nodeTransforms: [
node => {
if (node.type === NodeTypes.ELEMENT && node.tag === 'img') {
const exp = createSimpleExpression(
'_imports_0_',
false,
node.loc,
true
)
exp.isRuntimeConstant = true
node.props[0] = {
type: NodeTypes.DIRECTIVE,
name: 'bind',
arg: createSimpleExpression('src', true),
exp,
modifiers: [],
loc: node.loc
}
}
}
]
}
)
// the expression and the tree are still hoistable
expect(ast.hoists.length).toBe(1)
// ...but the hoisted tree should not be stringified
expect(ast.hoists[0]).toMatchObject({
// if it's stringified it will be NodeTypes.CALL_EXPRESSION
type: NodeTypes.VNODE_CALL
})
})
}) })

View File

@ -47,12 +47,30 @@ export const enum StringifyThresholds {
function shouldOptimize(node: ElementNode): boolean { function shouldOptimize(node: ElementNode): boolean {
let bindingThreshold = StringifyThresholds.ELEMENT_WITH_BINDING_COUNT let bindingThreshold = StringifyThresholds.ELEMENT_WITH_BINDING_COUNT
let nodeThreshold = StringifyThresholds.NODE_COUNT let nodeThreshold = StringifyThresholds.NODE_COUNT
let bail = false
// TODO: check for cases where using innerHTML will result in different // TODO: check for cases where using innerHTML will result in different
// output compared to imperative node insertions. // output compared to imperative node insertions.
// probably only need to check for most common case // probably only need to check for most common case
// i.e. non-phrasing-content tags inside `<p>` // i.e. non-phrasing-content tags inside `<p>`
function walk(node: ElementNode) { function walk(node: ElementNode) {
// some transforms, e.g. `transformAssetUrls` in `@vue/compiler-sfc` may
// convert static attributes into a v-bind with a constnat expresion.
// Such constant bindings are eligible for hoisting but not for static
// stringification because they cannot be pre-evaluated.
for (let i = 0; i < node.props.length; i++) {
const p = node.props[i]
if (
p.type === NodeTypes.DIRECTIVE &&
p.name === 'bind' &&
p.exp &&
p.exp.type !== NodeTypes.COMPOUND_EXPRESSION &&
p.exp.isRuntimeConstant
) {
bail = true
return false
}
}
for (let i = 0; i < node.children.length; i++) { for (let i = 0; i < node.children.length; i++) {
if (--nodeThreshold === 0) { if (--nodeThreshold === 0) {
return true return true
@ -65,6 +83,9 @@ function shouldOptimize(node: ElementNode): boolean {
if (walk(child)) { if (walk(child)) {
return true return true
} }
if (bail) {
return false
}
} }
} }
return false return false

View File

@ -126,11 +126,14 @@ function getImportsExpressionExp(
} }
const name = `_imports_${importsArray.length}` const name = `_imports_${importsArray.length}`
const exp = createSimpleExpression(name, false, loc, true) const exp = createSimpleExpression(name, false, loc, true)
exp.isRuntimeConstant = true
context.imports.add({ exp, path }) context.imports.add({ exp, path })
if (hash && path) { if (hash && path) {
return context.hoist( const ret = context.hoist(
createSimpleExpression(`${name} + '${hash}'`, false, loc, true) createSimpleExpression(`${name} + '${hash}'`, false, loc, true)
) )
ret.isRuntimeConstant = true
return ret
} else { } else {
return exp return exp
} }

View File

@ -86,11 +86,14 @@ export const transformSrcset: NodeTransform = (node, context) => {
} }
}) })
const hoisted = context.hoist(compoundExpression)
hoisted.isRuntimeConstant = true
node.props[index] = { node.props[index] = {
type: NodeTypes.DIRECTIVE, type: NodeTypes.DIRECTIVE,
name: 'bind', name: 'bind',
arg: createSimpleExpression('srcset', true, attr.loc), arg: createSimpleExpression('srcset', true, attr.loc),
exp: context.hoist(compoundExpression), exp: hoisted,
modifiers: [], modifiers: [],
loc: attr.loc loc: attr.loc
} }