Skip to content

Commit

Permalink
fix(compiler-core): prevent generating invalid code for v-bind with e…
Browse files Browse the repository at this point in the history
…mpty expression (#1720)
  • Loading branch information
underfin authored Jul 27, 2020
1 parent 5fbd1f4 commit d452723
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 7 deletions.
13 changes: 12 additions & 1 deletion packages/compiler-core/__tests__/transforms/vBind.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ describe('compiler: transform v-bind', () => {

test('should error if no expression', () => {
const onError = jest.fn()
parseWithVBind(`<div v-bind:arg />`, { onError })
const node = parseWithVBind(`<div v-bind:arg />`, { onError })
const props = (node.codegenNode as VNodeCall).props as ObjectExpression
expect(onError.mock.calls[0][0]).toMatchObject({
code: ErrorCodes.X_V_BIND_NO_EXPRESSION,
loc: {
Expand All @@ -97,6 +98,16 @@ describe('compiler: transform v-bind', () => {
}
}
})
expect(props.properties[0]).toMatchObject({
key: {
content: `arg`,
isStatic: true
},
value: {
content: ``,
isStatic: true
}
})
})

test('.camel modifier', () => {
Expand Down
18 changes: 12 additions & 6 deletions packages/compiler-core/src/transforms/vBind.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ import { CAMELIZE } from '../runtimeHelpers'
export const transformBind: DirectiveTransform = (dir, node, context) => {
const { exp, modifiers, loc } = dir
const arg = dir.arg!
if (!exp || (exp.type === NodeTypes.SIMPLE_EXPRESSION && !exp.content)) {
context.onError(createCompilerError(ErrorCodes.X_V_BIND_NO_EXPRESSION, loc))
}
// .prop is no longer necessary due to new patch behavior
// .sync is replaced by v-model:arg
if (modifiers.includes('camel')) {
Expand All @@ -27,9 +24,18 @@ export const transformBind: DirectiveTransform = (dir, node, context) => {
arg.children.push(`)`)
}
}

if (
!exp ||
(exp.type === NodeTypes.SIMPLE_EXPRESSION && !exp.content.trim())
) {
context.onError(createCompilerError(ErrorCodes.X_V_BIND_NO_EXPRESSION, loc))
return {
props: [createObjectProperty(arg!, createSimpleExpression('', true, loc))]
}
}

return {
props: [
createObjectProperty(arg!, exp || createSimpleExpression('', true, loc))
]
props: [createObjectProperty(arg!, exp)]
}
}

0 comments on commit d452723

Please sign in to comment.