Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix(compiler): Remove the waring for valid v-slot value #9917

Merged
merged 2 commits into from Apr 25, 2019
Merged

fix(compiler): Remove the waring for valid v-slot value #9917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05051e4
fix(compiler): Remove the waring for valid v-slot value
liximomo Apr 24, 2019
88e00f3
fix(compiler): Check syntax error for v-slot attribute value
liximomo Apr 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/compiler/error-detector.js
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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