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(reactivity-transform): add semicolon after statements #6303

Merged
merged 4 commits into from Nov 8, 2022
Merged

fix(reactivity-transform): add semicolon after statements #6303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6d8579
fix(reactivity-transform): add semicolon after statements
sxzz Jul 19, 2022
7187b6c
test: update snapshot
sxzz Jul 19, 2022
bc9202f
fix: demo2
sxzz Jul 19, 2022
365e457
test: update snapshot
sxzz Jul 19, 2022
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
6 changes: 3 additions & 3 deletions packages/compiler-sfc/__tests__/__snapshots__/compileScriptPropsTransform.spec.ts.snap
View file
Open in desktop
Expand Up @@ -6,8 +6,8 @@ exports[`sfc props transform $$() escape 1`] = `
export default {
props: ['foo'],
setup(__props) {
const __props_bar = _toRef(__props, 'bar')
const __props_foo = _toRef(__props, 'foo')
const __props_bar = _toRef(__props, 'bar');
sxzz marked this conversation as resolved.
Show resolved Hide resolved
const __props_foo = _toRef(__props, 'foo');


console.log((__props_foo))
Expand Down Expand Up @@ -160,7 +160,7 @@ export default {
props: ['foo', 'bar', 'baz'],
setup(__props) {

const rest = _createPropsRestProxy(__props, [\\"foo\\",\\"bar\\"])
const rest = _createPropsRestProxy(__props, [\\"foo\\",\\"bar\\"]);



Expand Down
2 changes: 1 addition & 1 deletion packages/compiler-sfc/src/compileScript.ts
View file
Open in desktop
Expand Up @@ -1419,7 +1419,7 @@ export function compileScript(
startOffset,
`\nconst ${propsDestructureRestId} = ${helper(
`createPropsRestProxy`
)}(__props, ${JSON.stringify(Object.keys(propsDestructuredBindings))})\n`
)}(__props, ${JSON.stringify(Object.keys(propsDestructuredBindings))});\n`
)
}
// inject temp variables for async context preservation
Expand Down
14 changes: 7 additions & 7 deletions packages/reactivity-transform/__tests__/__snapshots__/reactivityTransform.spec.ts.snap
View file
Open in desktop
Expand Up @@ -61,7 +61,7 @@ exports[`array destructure 1`] = `

let n = _ref(1), __$temp_1 = (useFoo()),
a = _toRef(__$temp_1, 0),
b = _toRef(__$temp_1, 1, 1)
b = _toRef(__$temp_1, 1, 1);
console.log(n.value, a.value, b.value)
"
`;
Expand Down Expand Up @@ -90,7 +90,7 @@ exports[`macro import alias and removal 1`] = `
let a = _ref(1)
const __$temp_1 = (useMouse()),
x = _toRef(__$temp_1, 'x'),
y = _toRef(__$temp_1, 'y')
y = _toRef(__$temp_1, 'y');
"
`;

Expand Down Expand Up @@ -130,10 +130,10 @@ exports[`nested destructure 1`] = `
"import { toRef as _toRef } from 'vue'

let __$temp_1 = (useFoo()),
b = _toRef(__$temp_1[0].a, 'b')
b = _toRef(__$temp_1[0].a, 'b');
let __$temp_2 = (useBar()),
d = _toRef(__$temp_2.c, 0),
e = _toRef(__$temp_2.c, 1)
e = _toRef(__$temp_2.c, 1);
console.log(b.value, d.value, e.value)
"
`;
Expand Down Expand Up @@ -183,9 +183,9 @@ exports[`object destructure 1`] = `
c = _toRef(__$temp_1, 'b'),
d = _toRef(__$temp_1, 'd', 1),
f = _toRef(__$temp_1, 'e', 2),
h = _toRef(__$temp_1, g)
h = _toRef(__$temp_1, g);
let __$temp_2 = (useSomething(() => 1)),
foo = _toRef(__$temp_2, 'foo');
foo = _toRef(__$temp_2, 'foo');;
console.log(n.value, a.value, c.value, d.value, f.value, h.value, foo.value)
"
`;
Expand All @@ -194,7 +194,7 @@ exports[`object destructure w/ mid-path default values 1`] = `
"import { toRef as _toRef } from 'vue'

const __$temp_1 = (useFoo()),
b = _toRef((__$temp_1.a || { b: 123 }), 'b')
b = _toRef((__$temp_1.a || { b: 123 }), 'b');
console.log(b.value)
"
`;
Expand Down
12 changes: 9 additions & 3 deletions packages/reactivity-transform/src/reactivityTransform.ts
View file
Open in desktop
Expand Up @@ -321,8 +321,8 @@ export function transformAST(
s.overwrite(pattern.start! + offset, pattern.end! + offset, tempVar)
}

let nameId: Identifier | undefined
for (const p of pattern.properties) {
let nameId: Identifier | undefined
let key: Expression | string | undefined
let defaultValue: Expression | undefined
if (p.type === 'ObjectProperty') {
Expand Down Expand Up @@ -391,6 +391,9 @@ export function transformAST(
)
}
}
if (nameId) {
s.appendLeft(call.end! + offset, ';')
}
}

function processRefArrayPattern(
Expand All @@ -405,10 +408,10 @@ export function transformAST(
s.overwrite(pattern.start! + offset, pattern.end! + offset, tempVar)
}

let nameId: Identifier | undefined
for (let i = 0; i < pattern.elements.length; i++) {
const e = pattern.elements[i]
if (!e) continue
let nameId: Identifier | undefined
let defaultValue: Expression | undefined
if (e.type === 'Identifier') {
// [a] --> [__a]
Expand Down Expand Up @@ -438,6 +441,9 @@ export function transformAST(
)
}
}
if (nameId) {
s.appendLeft(call.end! + offset, ';')
}
}

type PathSegmentAtom = Expression | string | number
Expand Down Expand Up @@ -545,7 +551,7 @@ export function transformAST(
offset,
`const __props_${publicKey} = ${helper(
`toRef`
)}(__props, '${publicKey}')\n`
)}(__props, '${publicKey}');\n`
)
}
}
Expand Down