fix: only export functional component type when experimentalRfc436 …

…enabled
vuejs · Oct 11, 2022 · 6db4beb · 6db4beb
1 parent b3e592a
commit 6db4beb
Showing 1 changed file with 31 additions and 19 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
@@ -242,7 +242,7 @@ export function generate(
 					0,
 					{ diagnostic: true },
 				]);
-				codeGen.push('export default ');
+				codeGen.push('export default (');
 			}
 			if (vueCompilerOptions.experimentalRfc436 && sfc.scriptSetup.generic) {
 				codeGen.push(`<${sfc.scriptSetup.generic}>`);
@@ -373,29 +373,41 @@ export function generate(
 
 			writeTemplate();
 
-			codeGen.push(`return {} as Omit<JSX.Element, 'props' | 'children'> & Omit<InstanceType<typeof __VLS_Component>, '$slots' | '$emit'>`);
-			codeGen.push(` & {\n`);
-			if (scriptSetupRanges.propsTypeArg) {
-				codeGen.push(`props: typeof __VLS_props,\n`);
-			}
-			else {
-				codeGen.push(`props: InstanceType<typeof __VLS_Component>['$props'],\n`);
-			}
-			codeGen.push(`$emit: `);
-			if (scriptSetupRanges.emitsTypeArg) {
-				addVirtualCode('scriptSetup', scriptSetupRanges.emitsTypeArg.start, scriptSetupRanges.emitsTypeArg.end);
+			if (vueCompilerOptions.experimentalRfc436) {
+				codeGen.push(`return {} as Omit<JSX.Element, 'props' | 'children'> & Omit<InstanceType<typeof __VLS_Component>, '$slots' | '$emit'>`);
+				codeGen.push(` & {\n`);
+				if (scriptSetupRanges.propsTypeArg) {
+					codeGen.push(`props: typeof __VLS_props,\n`);
+				}
+				else {
+					codeGen.push(`props: InstanceType<typeof __VLS_Component>['$props'],\n`);
+				}
+				codeGen.push(`$emit: `);
+				if (scriptSetupRanges.emitsTypeArg) {
+					addVirtualCode('scriptSetup', scriptSetupRanges.emitsTypeArg.start, scriptSetupRanges.emitsTypeArg.end);
+				}
+				else {
+					codeGen.push(`InstanceType<typeof __VLS_Component>['$emit']`);
+				}
+				codeGen.push(`,\n`);
+				if (htmlGen?.slotsNum) {
+					codeGen.push(`children: ReturnType<typeof __VLS_template>,\n`);
+				}
+				codeGen.push(`};\n`);
 			}
 			else {
-				codeGen.push(`InstanceType<typeof __VLS_Component>['$emit']`);
-			}
-			codeGen.push(`,\n`);
-			if (htmlGen?.slotsNum) {
-				codeGen.push(`children: ReturnType<typeof __VLS_template>,\n`);
+				codeGen.push(`return {} as typeof __VLS_Component`);
+				if (htmlGen?.slotsNum) {
+					codeGen.push(` & new () => { $slots: ReturnType<typeof __VLS_template> }`);
+				}
+				codeGen.push(`;\n`);
 			}
 			codeGen.push(`};\n`);
-			codeGen.push(`};\n`);
 			codeGen.push(`return {} as unknown as Awaited<ReturnType<typeof __VLS_setup>>;\n`);
-			codeGen.push(`}`);
+			codeGen.push(`})`);
+			if (!vueCompilerOptions.experimentalRfc436) {
+				codeGen.push(`({} as any)`);
+			}
 			if (scriptRanges?.exportDefault && scriptRanges.exportDefault.expression.end !== scriptRanges.exportDefault.end) {
 				addVirtualCode('script', scriptRanges.exportDefault.expression.end, scriptRanges.exportDefault.end);
 			}