fix: generic component prop with default type incorrect

close #2754
vuejs · May 1, 2023 · 69e2652 · 69e2652
1 parent c607626
commit 69e2652
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/packages/vue-language-core/src/generators/script.ts b/packages/vue-language-core/src/generators/script.ts
@@ -337,13 +337,11 @@ export function generate(
 
 			//#region props
 			if (
-				(scriptSetupRanges.propsRuntimeArg && scriptSetupRanges.defineProps)
+				scriptSetupRanges.propsRuntimeArg
 				|| scriptSetupRanges.defineProp.length
 			) {
-				if (scriptSetupRanges.propsRuntimeArg && scriptSetupRanges.defineProps) {
-					codes.push(`const __VLS_props = `);
-					addExtraReferenceVirtualCode('scriptSetup', scriptSetupRanges.defineProps.start, scriptSetupRanges.defineProps.end);
-					codes.push(`;\n`);
+				if (scriptSetupRanges.propsRuntimeArg) {
+					codes.push(`const __VLS_props = (new __VLS_publicComponent()).$props;\n`);
 				}
 				else if (scriptSetupRanges.defineProp.length) {
 					codes.push(`const __VLS_defaults = {\n`);

diff --git a/packages/vue-test-workspace/vue-tsc/#2754/comp.vue b/packages/vue-test-workspace/vue-tsc/#2754/comp.vue
@@ -0,0 +1,9 @@
+<script lang="ts" setup generic="Row extends unknown">
+defineProps({
+    selectAll: {
+        type: Boolean,
+        required: false,
+        default: false,
+    },
+});
+</script>
diff --git a/packages/vue-test-workspace/vue-tsc/#2754/main.vue b/packages/vue-test-workspace/vue-tsc/#2754/main.vue
@@ -0,0 +1,7 @@
+<template>
+	<Comp></Comp>
+</template>
+
+<script setup lang="ts">
+import Comp from './comp.vue';
+</script>