8000 fix(compiler-vapor): prevent caching UpdateExpression by zhiyuanzmj · Pull Request #13346 · vuejs/core · GitHub
[go: up one dir, main page]

Skip to content

fix(compiler-vapor): prevent caching UpdateExpression #13346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Jun 20, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(compiler-vapor): prevent process UpdateExpression
  • Loading branch information
zhiyuanzmj committed May 17, 2025
commit 08396b3833ecf52cf4b2a19da0a08bb329af921b
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,25 @@ export function render(_ctx, $props, $emit, $attrs, $slots) {
return n0
}"
`;

exports[`compiler: expression > update expression 1`] = `
"import { child as _child, toDisplayString as _toDisplayString, setText as _setText, setProp as _setProp, renderEffect as _renderEffect, template as _template } from 'vue';
const t0 = _template("<div> </div>", true)

export function render(_ctx) {
const n1 = t0()
const n0 = _child(n1)
const x1 = _child(n1)
_renderEffect(() => {
const _String = String
const _foo = _ctx.foo

_setText(n0, _toDisplayString(_String(_foo.id++)) + " " + _toDisplayString(_foo) + " " + _toDisplayString(_ctx.bar))
_setText(x1, _toDisplayString(_String(_foo.id++)) + " " + _toDisplayString(_foo) + " " + _toDisplayString(_ctx.bar))
_setProp(n1, "id", _String(_foo.id++))
_setProp(n1, "foo", _foo)
_setProp(n1, "bar", _ctx.bar++)
})
return n1
}"
`;
20 changes: 18 additions & 2 deletions packages/compiler-vapor/__tests__/transforms/expression.spec.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
import { BindingTypes } from '@vue/compiler-dom'
import { transformChildren, transformText } from '../../src'
import {
transformChildren,
transformElement,
transformText,
transformVBind,
} from '../../src'
import { makeCompile } from './_utils'

const compileWithExpression = makeCompile({
nodeTransforms: [transformChildren, transformText],
nodeTransforms: [transformElement, transformChildren, transformText],
directiveTransforms: { bind: transformVBind },
})

describe('compiler: expression', () => {
Expand Down Expand Up @@ -31,4 +37,14 @@ describe('compiler: expression', () => {
expect(code).toMatchSnapshot()
expect(code).contains(`$props['bar']`)
})

test('update expression', () => {
const { code } = compileWithExpression(`
<div :id="String(foo.id++)" :foo="foo" :bar="bar++">
{{ String(foo.id++) }} {{ foo }} {{ bar }}
</div>
`)
expect(code).toMatchSnapshot()
expect(code).contains(`_String(_foo.id++)`)
})
})
39 changes: 33 additions & 6 deletions packages/compiler-vapor/src/generators/expression.ts
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,13 @@ export function processExpressions(
expressions: SimpleExpressionNode[],
): DeclarationResult {
// analyze variables
const { seenVariable, variableToExpMap, expToVariableMap, seenIdentifier } =
analyzeExpressions(expressions)
const {
seenVariable,
variableToExpMap,
expToVariableMap,
seenIdentifier,
updatedVariable,
} = analyzeExpressions(expressions)

// process repeated identifiers and member expressions
// e.g., `foo[baz]` will be transformed into `foo_baz`
Expand All @@ -255,6 +260,7 @@ export function processExpressions(
variableToExpMap,
expToVariableMap,
seenIdentifier,
updatedVariable,
)

// process duplicate expressions after identifier and member expression handling.
Expand All @@ -263,6 +269,8 @@ export function processExpressions(
context,
expressions,
varDeclarations,
updatedVariable,
expToVariableMap,
)

return genDeclarations([...varDeclarations, ...expDeclarations], context)
Expand All @@ -273,11 +281,13 @@ function analyzeExpressions(expressions: SimpleExpressionNode[]) {
const variableToExpMap = new Map<string, Set<SimpleExpressionNode>>()
const expToVariableMap = new Map<SimpleExpressionNode, string[]>()
const seenIdentifier = new Set<string>()
const updatedVariable = new Set<string>()

const registerVariable = (
name: string,
exp: SimpleExpressionNode,
isIdentifier: boolean,
parentStack: Node[] = [],
) => {
if (isIdentifier) seenIdentifier.add(name)
seenVariable[name] = (seenVariable[name] || 0) + 1
Expand All @@ -286,6 +296,8 @@ function analyzeExpressions(expressions: SimpleExpressionNode[]) {
(variableToExpMap.get(name) || new Set()).add(exp),
)
expToVariableMap.set(exp, (expToVariableMap.get(exp) || []).concat(name))
if (parentStack.some(p => p.type === 'UpdateExpression'))
updatedVariable.add(name)
}

for (const exp of expressions) {
Expand All @@ -299,14 +311,20 @@ function analyzeExpressions(expressions: SimpleExpressionNode[]) {
const memberExp = extractMemberExpression(parent, name => {
registerVariable(name, exp, true)
})
registerVariable(memberExp, exp, false)
registerVariable(memberExp, exp, false, parentStack)
} else if (!parentStack.some(isMemberExpression)) {
registerVariable(currentNode.name, exp, true)
registerVariable(currentNode.name, exp, true, parentStack)
}
})
}

return { seenVariable, seenIdentifier, variableToExpMap, expToVariableMap }
return {
seenVariable,
seenIdentifier,
variableToExpMap,
expToVariableMap,
updatedVariable,
}
}

function processRepeatedVariables(
Expand All @@ -315,9 +333,11 @@ function processRepeatedVariables(
variableToExpMap: Map<string, Set<SimpleExpressionNode>>,
expToVariableMap: Map<SimpleExpressionNode, string[]>,
seenIdentifier: Set<string>,
updatedVariable: Set<string>,
): DeclarationValue[] {
const declarations: DeclarationValue[] = []
for (const [name, exps] of variableToExpMap) {
if (updatedVariable.has(name)) continue
if (seenVariable[name] > 1 && exps.size > 0) {
const isIdentifier = seenIdentifier.has(name)
const varName = isIdentifier ? name : genVarName(name)
Expand Down Expand Up @@ -409,12 +429,19 @@ function processRepeatedExpressions(
context: CodegenContext,
expressions: SimpleExpressionNode[],
varDeclarations: DeclarationValue[],
updatedVariable: Set<string>,
expToVariableMap: Map<SimpleExpressionNode, string[]>,
): DeclarationValue[] {
const declarations: DeclarationValue[] = []
const seenExp = expressions.reduce(
(acc, exp) => {
const variables = expToVariableMap.get(exp)
// only handle expressions that are not identifiers
if (exp.ast && exp.ast.type !== 'Identifier') {
if (
exp.ast &&
exp.ast.type !== 'Identifier' &&
!(variables && variables.some(v => updatedVariable.has(v)))
) {
acc[exp.content] = (acc[exp.content] || 0) + 1
}
return acc
Expand Down
Loading
0