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.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(compiler-sfc): allow declaring variables after defineProps #7461

Merged
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -136,6 +136,24 @@ return () => {}
})"
`;

exports[`sfc props transform multiple variable declarations 1`] = `
"import { toDisplayString as _toDisplayString, openBlock as _openBlock, createElementBlock as _createElementBlock } from "vue"


export default {
props: ['foo'],
setup(__props) {

const bar = 'fish', hello = 'world'

return (_ctx, _cache) => {
return (_openBlock(), _createElementBlock("div", null, _toDisplayString(__props.foo) + " " + _toDisplayString(hello) + " " + _toDisplayString(bar), 1 /* TEXT */))
}
}

}"
`;

exports[`sfc props transform nested scope 1`] = `
"export default {
props: ['foo', 'bar'],
Expand Down
Expand Up @@ -28,6 +28,26 @@ describe('sfc props transform', () => {
})
})

test('multiple variable declarations', () => {
const { content, bindings } = compile(`
<script setup>
const bar = 'fish', { foo } = defineProps(['foo']), hello = 'world'
</script>
<template><div>{{ foo }} {{ hello }} {{ bar }}</div></template>
`)
expect(content).not.toMatch(`const { foo } =`)
expect(content).toMatch(`const bar = 'fish', hello = 'world'`)
expect(content).toMatch(`_toDisplayString(hello)`)
expect(content).toMatch(`_toDisplayString(bar)`)
expect(content).toMatch(`_toDisplayString(__props.foo)`)
assertCode(content)
expect(bindings).toStrictEqual({
foo: BindingTypes.PROPS,
bar: BindingTypes.SETUP_CONST,
hello: BindingTypes.SETUP_CONST
})
})

test('nested scope', () => {
const { content, bindings } = compile(`
<script setup>
Expand Down
3 changes: 1 addition & 2 deletions packages/compiler-sfc/src/compileScript.ts
Expand Up @@ -1758,8 +1758,7 @@ function walkDeclaration(
registerBinding(bindings, id, bindingType)
} else {
if (isCallOf(init, DEFINE_PROPS)) {
// skip walking props destructure
return
continue
}
if (id.type === 'ObjectPattern') {
walkObjectPattern(id, bindings, isConst, isDefineCall)
Expand Down