theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(compiler-sfc): correctly remove parens used for wrapping (#3582)

Browse Source 
fix #3581
This commit is contained in:
HcySunYang 2021-05-29 04:02:31 +08:00 committed by GitHub
parent 6fbf0dd315
commit 6bfb50aff9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
View File

@ -622,9 +622,11 @@ const c = _ref(__c);
const d = _ref(__d);
const f = _ref(__f);
const g = _ref(__g);
console.log(n.value, a.value, c.value, d.value, f.value, g.value)
const { foo: __foo } = useSomthing(() => 1);
const foo = _ref(__foo);
console.log(n.value, a.value, c.value, d.value, f.value, g.value, foo.value)
return { n, a, c, d, f, g }
return { n, a, c, d, f, g, foo }
}
}"

12
packages/compiler-sfc/__tests__/compileScript.spec.ts
View File

@ -777,11 +777,13 @@ const emit = defineEmit(['a', 'b'])
test('object destructure', () => {
const { content, bindings } = compile(`<script setup>
ref: n = 1, ({ a, b: c, d = 1, e: f = 2, ...g } = useFoo())
console.log(n, a, c, d, f, g)
ref: ({ foo } = useSomthing(() => 1));
console.log(n, a, c, d, f, g, foo)
</script>`)
expect(content).toMatch(
`const n = _ref(1), { a: __a, b: __c, d: __d = 1, e: __f = 2, ...__g } = useFoo()`
)
expect(content).toMatch(`const { foo: __foo } = useSomthing(() => 1)`)
expect(content).toMatch(`\nconst a = _ref(__a);`)
expect(content).not.toMatch(`\nconst b = _ref(__b);`)
expect(content).toMatch(`\nconst c = _ref(__c);`)
@ -789,17 +791,19 @@ const emit = defineEmit(['a', 'b'])
expect(content).not.toMatch(`\nconst e = _ref(__e);`)
expect(content).toMatch(`\nconst f = _ref(__f);`)
expect(content).toMatch(`\nconst g = _ref(__g);`)
expect(content).toMatch(`\nconst foo = _ref(__foo);`)
expect(content).toMatch(
`console.log(n.value, a.value, c.value, d.value, f.value, g.value)`
`console.log(n.value, a.value, c.value, d.value, f.value, g.value, foo.value)`
)
expect(content).toMatch(`return { n, a, c, d, f, g }`)
expect(content).toMatch(`return { n, a, c, d, f, g, foo }`)
expect(bindings).toStrictEqual({
n: BindingTypes.SETUP_REF,
a: BindingTypes.SETUP_REF,
c: BindingTypes.SETUP_REF,
d: BindingTypes.SETUP_REF,
f: BindingTypes.SETUP_REF,
g: BindingTypes.SETUP_REF
g: BindingTypes.SETUP_REF,
foo: BindingTypes.SETUP_REF
})
assertCode(content)
})

2
packages/compiler-sfc/src/compileScript.ts
View File

@ -352,7 +352,7 @@ export function compileScript(
break
}
}
for (let i = left.end!; i > 0; i++) {
for (let i = right.end!; i > 0; i++) {
const char = source[i + startOffset]
if (char === ')') {
s.remove(i + startOffset, i + startOffset + 1)