fix(compiler-core): fix variable naming conflicts using priority

vuejs · Oct 28, 2023 · fcf0c5c · fcf0c5c
1 parent edf2572
commit fcf0c5c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/packages/compiler-core/__tests__/transforms/__snapshots__/transformExpressions.spec.ts.snap b/packages/compiler-core/__tests__/transforms/__snapshots__/transformExpressions.spec.ts.snap
@@ -2,14 +2,14 @@
 
 exports[`compiler: expression transform > bindingMetadata > inline mode 1`] = `
 "(_ctx, _cache) => {
- return (_openBlock(), _createElementBlock(\\"div\\", null, _toDisplayString(__props.props) + \\" \\" + _toDisplayString(_unref(setup)) + \\" \\" + _toDisplayString(setupConst) + \\" \\" + _toDisplayString(_ctx.data) + \\" \\" + _toDisplayString(_ctx.options), 1 /* TEXT */))
+ return (_openBlock(), _createElementBlock(\\"div\\", null, _toDisplayString(__props.props) + \\" \\" + _toDisplayString(_unref(setup)) + \\" \\" + _toDisplayString(setupConst) + \\" \\" + _toDisplayString(_ctx.data) + \\" \\" + _toDisplayString(_ctx.options) + \\" \\" + _toDisplayString(isNaN.value), 1 /* TEXT */))
 }"
 `;
 
 exports[`compiler: expression transform > bindingMetadata > non-inline mode 1`] = `
 "const { toDisplayString: _toDisplayString, openBlock: _openBlock, createElementBlock: _createElementBlock } = Vue
 
 return function render(_ctx, _cache, $props, $setup, $data, $options) {
- return (_openBlock(), _createElementBlock(\\"div\\", null, _toDisplayString($props.props) + \\" \\" + _toDisplayString($setup.setup) + \\" \\" + _toDisplayString($data.data) + \\" \\" + _toDisplayString($options.options), 1 /* TEXT */))
+ return (_openBlock(), _createElementBlock(\\"div\\", null, _toDisplayString($props.props) + \\" \\" + _toDisplayString($setup.setup) + \\" \\" + _toDisplayString($data.data) + \\" \\" + _toDisplayString($options.options) + \\" \\" + _toDisplayString($setup.isNaN), 1 /* TEXT */))
 }"
 `;
diff --git a/packages/compiler-core/__tests__/transforms/transformExpressions.spec.ts b/packages/compiler-core/__tests__/transforms/transformExpressions.spec.ts
@@ -506,7 +506,8 @@ describe('compiler: expression transform', () => {
  data: BindingTypes.DATA,
  options: BindingTypes.OPTIONS,
  reactive: BindingTypes.SETUP_REACTIVE_CONST,
- literal: BindingTypes.LITERAL_CONST
+ literal: BindingTypes.LITERAL_CONST,
+ isNaN: BindingTypes.SETUP_REF
  }
 
  function compileWithBindingMetadata(
@@ -522,10 +523,11 @@ describe('compiler: expression transform', () => {
 
  test('non-inline mode', () => {
  const { code } = compileWithBindingMetadata(
- `<div>{{ props }} {{ setup }} {{ data }} {{ options }}</div>`
+ `<div>{{ props }} {{ setup }} {{ data }} {{ options }} {{ isNaN }}</div>`
  )
  expect(code).toMatch(`$props.props`)
  expect(code).toMatch(`$setup.setup`)
+ expect(code).toMatch(`$setup.isNaN`)
  expect(code).toMatch(`$data.data`)
  expect(code).toMatch(`$options.options`)
  expect(code).toMatch(`_ctx, _cache, $props, $setup, $data, $options`)
@@ -534,14 +536,15 @@ describe('compiler: expression transform', () => {
 
  test('inline mode', () => {
  const { code } = compileWithBindingMetadata(
- `<div>{{ props }} {{ setup }} {{ setupConst }} {{ data }} {{ options }}</div>`,
+ `<div>{{ props }} {{ setup }} {{ setupConst }} {{ data }} {{ options }} {{ isNaN }}</div>`,
  { inline: true }
  )
  expect(code).toMatch(`__props.props`)
  expect(code).toMatch(`_unref(setup)`)
  expect(code).toMatch(`_toDisplayString(setupConst)`)
  expect(code).toMatch(`_ctx.data`)
  expect(code).toMatch(`_ctx.options`)
+ expect(code).toMatch(`isNaN.value`)
  expect(code).toMatchSnapshot()
  })
 

diff --git a/packages/compiler-core/src/transforms/transformExpression.ts b/packages/compiler-core/src/transforms/transformExpression.ts
@@ -235,7 +235,10 @@ export function processExpression(
  }
  node.content = rewriteIdentifier(rawExp)
  } else if (!isScopeVarReference) {
- if (isLiteral) {
+ if (isAllowedGlobal && bindingMetadata[rawExp]) {
+ // #9482
+ node.content = rewriteIdentifier(rawExp)
+ } else if (isLiteral) {
  node.constType = ConstantTypes.CAN_STRINGIFY
  } else {
  node.constType = ConstantTypes.CAN_HOIST