Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix(compiler): Remove the warning for valid v-slot value (#9917)
  • Loading branch information
liximomo authored and yyx990803 committed Apr 25, 2019
1 parent 861aea1 commit 085d188
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 2 deletions.
15 changes: 15 additions & 0 deletions src/compiler/error-detector.js
Expand Up @@ -36,6 +36,8 @@ function checkNode (node: ASTNode, warn: Function) {
const range = node.rawAttrsMap[name]
if (name === 'v-for') {
checkFor(node, `v-for="${value}"`, warn, range)
} else if (name === 'v-slot' || name[0] === '#') {
checkFunctionParameterExpression(value, `${name}="${value}"`, warn, range)
} else if (onRE.test(name)) {
checkEvent(value, `${name}="${value}"`, warn, range)
} else {
Expand Down Expand Up @@ -111,3 +113,16 @@ function checkExpression (exp: string, text: string, warn: Function, range?: Ran
}
}
}

function checkFunctionParameterExpression (exp: string, text: string, warn: Function, range?: Range) {
try {
new Function(exp, '')
} catch (e) {
warn(
`invalid function parameter expression: ${e.message} in\n\n` +
` ${exp}\n\n` +
` Raw expression: ${text.trim()}\n`,
range
)
}
}
4 changes: 2 additions & 2 deletions src/compiler/parser/index.js
Expand Up @@ -23,8 +23,8 @@ import {

export const onRE = /^@|^v-on:/
export const dirRE = process.env.VBIND_PROP_SHORTHAND
? /^v-|^@|^:|^\./
: /^v-|^@|^:/
? /^v-|^@|^:|^\.|^#/
: /^v-|^@|^:|^#/
export const forAliasRE = /([\s\S]*?)\s+(?:in|of)\s+([\s\S]*)/
export const forIteratorRE = /,([^,\}\]]*)(?:,([^,\}\]]*))?$/
const stripParensRE = /^\(|\)$/g
Expand Down
16 changes: 16 additions & 0 deletions test/unit/features/component/component-scoped-slot.spec.js
Expand Up @@ -759,6 +759,22 @@ describe('Component scoped slot', () => {
}).$mount()
expect(`Unexpected mixed usage of different slot syntaxes`).toHaveBeenWarned()
})

it('should warn invalid parameter expression', () => {
new Vue({
template: `<foo ${syntax}="1"></foo>`,
components: { Foo }
}).$mount();
expect('invalid function parameter expression').toHaveBeenWarned()
})

it('should allow destructuring props with default value', () => {
new Vue({
template: `<foo ${syntax}="{ foo = { bar: '1' } }"></foo>`,
components: { Foo }
}).$mount();
expect('invalid function parameter expression').not.toHaveBeenWarned()
})
}

// run tests for both full syntax and shorthand
Expand Down

0 comments on commit 085d188

Please sign in to comment.