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

fix: make defineProps work when reading a property from defineProps() #3633

Merged
merged 9 commits into from
Oct 8, 2023
Merged

fix: make defineProps work when reading a property from defineProps() #3633

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
90bfb9d
tests
so1ve Oct 7, 2023
2e24091
fix
so1ve Oct 7, 2023
b5beb6b
fix test
so1ve Oct 7, 2023
5eac46e
upd test
so1ve Oct 7, 2023
2abfb60
Merge branch 'master' into pr/3633
johnsoncodehk Oct 8, 2023
ad26abd
fix: redo #3641
johnsoncodehk Oct 8, 2023
5ad19f3
Merge branch 'master' into pr/3633
johnsoncodehk Oct 8, 2023
0f268af
Merge branch 'master' into pr/3633
johnsoncodehk Oct 8, 2023
55cc6fd
Update package.json
johnsoncodehk Oct 8, 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
11 changes: 5 additions & 6 deletions packages/vue-language-core/src/generators/script.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,12 +467,11 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:

let setupCodeModifies: [() => void, number, number][] = [];
if (scriptSetupRanges.defineProps && !scriptSetupRanges.propsAssignName) {
if (scriptSetupRanges.withDefaults) {
setupCodeModifies.push([() => codes.push(`const __VLS_props = `), scriptSetupRanges.withDefaults.start, scriptSetupRanges.withDefaults.start]);
}
else {
setupCodeModifies.push([() => codes.push(`const __VLS_props = `), scriptSetupRanges.defineProps.start, scriptSetupRanges.defineProps.start]);
}
const ranges = scriptSetupRanges.withDefaults ?? scriptSetupRanges.defineProps;
codes.push(`const __VLS_props = `);
addVirtualCode('scriptSetup', ranges.start, ranges.end);
codes.push(`;\n`);
setupCodeModifies.push([() => codes.push(`__VLS_props`), ranges.start, ranges.end]);
}
if (scriptSetupRanges.defineSlots && !scriptSetupRanges.slotsAssignName) {
setupCodeModifies.push([() => codes.push(`const __VLS_slots = `), scriptSetupRanges.defineSlots.start, scriptSetupRanges.defineSlots.start]);
Expand Down
4 changes: 4 additions & 0 deletions packages/vue-test-workspace/vue-tsc/non-strict-template/#3629/main.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<script setup lang="ts">
// @ts-expect-error
so1ve marked this conversation as resolved.
Show resolved Hide resolved
const props = defineProps().foo;
</script>
Loading