feat: pretty component type emit with template slots type

close #2161
vuejs · Dec 8, 2022 · c6bb0bf · c6bb0bf
1 parent 9244174
commit c6bb0bf
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/vue-language-tools/vue-language-core/src/generators/script.ts b/vue-language-tools/vue-language-core/src/generators/script.ts
@@ -37,6 +37,7 @@ export function generate(
 		DefinePropsToOptions: false,
 		mergePropDefaults: false,
 		ConstructorOverloads: false,
+		WithTemplateSlots: false,
 	};
 
 	writeScriptSrc();
@@ -118,6 +119,9 @@ export function generate(
 				codeGen.push(genConstructorOverloads('__VLS_ConstructorOverloads'));
 			}
 		}
+		if (usedTypes.WithTemplateSlots) {
+			codeGen.push(`type __VLS_WithTemplateSlots<T, S> = T & { new(): { $slots: S } };\n`);
+		}
 	}
 	function writeScriptSrc() {
 		if (!sfc.script?.src)
@@ -422,11 +426,13 @@ export function generate(
 				codeGen.push(`};\n`);
 			}
 			else {
-				codeGen.push(`return {} as typeof __VLS_publicComponent`);
 				if (htmlGen?.slotsNum) {
-					codeGen.push(` & { new (): { $slots: ReturnType<typeof __VLS_template> } }`);
+					usedTypes.WithTemplateSlots = true;
+					codeGen.push(`return {} as __VLS_WithTemplateSlots<typeof __VLS_publicComponent, ReturnType<typeof __VLS_template>>;\n`);
+				}
+				else {
+					codeGen.push(`return {} as typeof __VLS_publicComponent;\n`);
 				}
-				codeGen.push(`;\n`);
 			}
 			codeGen.push(`};\n`);
 			codeGen.push(`return {} as typeof __VLS_setup extends () => Promise<infer T> ? T : never;\n`);