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-sfc): properly handle dynamic directive arguments usage check #9495

Merged
merged 6 commits into from
Nov 6, 2023
Merged

fix(compiler-sfc): properly handle dynamic directive arguments usage check #9495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c54559
fix(compiler-sfc): properly handle dynamic directive arguments usage …
edison1105 Oct 28, 2023
5c7ba77
test: add test case
edison1105 Oct 28, 2023
1f581b7
Update importUsageCheck.ts
edison1105 Oct 29, 2023
0865d01
[autofix.ci] apply automated fixes
autofix-ci[bot] Oct 29, 2023
75674d8
chore: improve code
edison1105 Nov 4, 2023
d0c6490
test: update test case
edison1105 Nov 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,14 +696,14 @@ return { get vMyDir() { return vMyDir } }

exports[`SFC compile <script setup> > dev mode import usage check > dynamic arguments 1`] = `
"import { defineComponent as _defineComponent } from 'vue'
import { FooBar, foo, bar, unused } from './x'
import { FooBar, foo, bar, unused, baz } from './x'

export default /*#__PURE__*/_defineComponent({
setup(__props, { expose: __expose }) {
__expose();


return { get FooBar() { return FooBar }, get foo() { return foo }, get bar() { return bar } }
return { get FooBar() { return FooBar }, get foo() { return foo }, get bar() { return bar }, get baz() { return baz } }
}

})"
Expand Down
5 changes: 3 additions & 2 deletions packages/compiler-sfc/__tests__/compileScript.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,18 +376,19 @@ describe('SFC compile <script setup>', () => {
test('dynamic arguments', () => {
const { content } = compile(`
<script setup lang="ts">
import { FooBar, foo, bar, unused } from './x'
import { FooBar, foo, bar, unused, baz } from './x'
</script>
<template>
<FooBar #[foo.slotName] />
<FooBar #unused />
<div :[bar.attrName]="15"></div>
<div unused="unused"></div>
<div #[\`item:\${baz.key}\`]="{ value }"></div>
</template>
`)
expect(content).toMatch(
`return { get FooBar() { return FooBar }, get foo() { return foo }, ` +
`get bar() { return bar } }`
`get bar() { return bar }, get baz() { return baz } }`
)
assertCode(content)
})
Expand Down
8 changes: 5 additions & 3 deletions packages/compiler-sfc/src/script/importUsageCheck.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,14 @@ function resolveTemplateUsageCheckString(sfc: SFCDescriptor) {
if (!isBuiltInDirective(prop.name)) {
code += `,v${capitalize(camelize(prop.name))}`
}

// process dynamic directive arguments
if (prop.arg && !(prop.arg as SimpleExpressionNode).isStatic) {
code += `,${processExp(
(prop.arg as SimpleExpressionNode).content,
prop.name
code += `,${stripStrings(
(prop.arg as SimpleExpressionNode).content
)}`
}

if (prop.exp) {
code += `,${processExp(
(prop.exp as SimpleExpressionNode).content,
Expand Down