Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`cache multiple access > TSNonNullExpression 1`] = `
"import { setProp as _setProp, renderEffect as _renderEffect, template as _template } from 'vue';
const t0 = _template("<div></div>", true)

export function render(_ctx) {
const n0 = t0()
_renderEffect(() => {
const _obj = _ctx.obj
_setProp(n0, "id", _obj.foo + _obj.bar)
})
return n0
}"
`;

exports[`cache multiple access > cache variable used in both property shorthand and normal binding 1`] = `
"import { setStyle as _setStyle, setProp as _setProp, renderEffect as _renderEffect, template as _template } from 'vue';
const t0 = _template("<div></div>", true)
Expand Down
7 changes: 7 additions & 0 deletions packages/compiler-vapor/__tests__/transforms/vBind.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -836,6 +836,13 @@ describe('cache multiple access', () => {
expect(code).contains('_setProp(n0, "id", _obj?.foo + _obj?.bar)')
})

test('TSNonNullExpression', () => {
const { code } = compileWithVBind(`<div :id="obj!.foo + obj!.bar"></div>`)
expect(code).matchSnapshot()
expect(code).contains('const _obj = _ctx.obj')
expect(code).contains('_setProp(n0, "id", _obj.foo + _obj.bar)')
})

test('not cache variable only used in property shorthand', () => {
const { code } = compileWithVBind(`
<div :style="{color}" />
Expand Down
11 changes: 9 additions & 2 deletions packages/compiler-vapor/src/generators/expression.ts
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,10 @@ function processRepeatedExpressions(
const declarations: DeclarationValue[] = []
const seenExp = expressions.reduce(
(acc, exp) => {
const variables = expToVariableMap.get(exp)!.map(v => v.name)
const vars = expToVariableMap.get(exp)
if (!vars) return acc

const variables = vars.map(v => v.name)
// only handle expressions that are not identifiers
if (
exp.ast &&
Expand Down Expand Up @@ -673,13 +676,17 @@ function extractMemberExpression(
? `[${extractMemberExpression(exp.property, onIdentifier)}]`
: `.${extractMemberExpression(exp.property, NOOP)}`
return `${object}${prop}`
case 'TSNonNullExpression': // foo!.bar
return `${extractMemberExpression(exp.expression, onIdentifier)}!`
default:
return ''
}
}

const isMemberExpression = (node: Node) => {
return (
node.type === 'MemberExpression' || node.type === 'OptionalMemberExpression'
node.type === 'MemberExpression' ||
node.type === 'OptionalMemberExpression' ||
node.type === 'TSNonNullExpression'
)
}
Loading