refactor: try to use __typeEl

packages/language-core/lib/codegen/localTypes.ts

@@ -37,13 +37,6 @@ type __VLS_WithTemplateSlots<T, S> = T & {
 		${vueCompilerOptions.jsxSlots ? `$props: ${PropsChildren.name}<S>;` : ''}
 	}
 };
-`.trimStart()
-	);
-	// TODO:
-	const WithTemplateRootEl = defineHelper(
-		`__VLS_WithTemplateRootEl`,
-		() => `
-type __VLS_WithTemplateRootEl<T, E> = T;
 `.trimStart()
 	);
 	const PropsChildren = defineHelper(
@@ -92,7 +85,6 @@ type __VLS_TypePropsToOption<T> = {
 		[OmitKeepDiscriminatedUnion.name]: OmitKeepDiscriminatedUnion,
 		[WithDefaults.name]: WithDefaults,
 		[WithTemplateSlots.name]: WithTemplateSlots,
-		[WithTemplateRootEl.name]: WithTemplateRootEl,
 		[PropsChildren.name]: PropsChildren,
 		[TypePropsToOption.name]: TypePropsToOption,
 		[OmitIndexSignature.name]: OmitIndexSignature,
@@ -108,7 +100,6 @@ type __VLS_TypePropsToOption<T> = {
 		get OmitKeepDiscriminatedUnion() { return OmitKeepDiscriminatedUnion.name; },
 		get WithDefaults() { return WithDefaults.name; },
 		get WithTemplateSlots() { return WithTemplateSlots.name; },
-		get WithTemplateRootEl() { return WithTemplateRootEl.name; },
 		get PropsChildren() { return PropsChildren.name; },
 		get TypePropsToOption() { return TypePropsToOption.name; },
 		get OmitIndexSignature() { return OmitIndexSignature.name; },

packages/language-core/lib/codegen/script/component.ts

@@ -43,6 +43,9 @@ export function* generateComponent(
 	if (options.vueCompilerOptions.target >= 3.5 && scriptSetupRanges.templateRefs.length) {
 		yield `__typeRefs: {} as __VLS_TemplateResult['refs'],${newLine}`;
 	}
+	if (options.vueCompilerOptions.target >= 3.5 && options.templateCodegen?.singleRootEl) {
+		yield `__typeEl: {} as __VLS_TemplateResult['rootEl'],${newLine}`;
+	}
 	yield `})`;
 }
 

packages/language-core/lib/codegen/script/scriptSetup.ts

@@ -294,22 +294,18 @@ function* generateSetupFunction(
 	yield `type __VLS_TemplateResult = ReturnType<typeof __VLS_template>${endOfLine}`;
 
 	if (syntax) {
-		yield `const __VLS_component = `;
-		yield* generateComponent(options, ctx, scriptSetup, scriptSetupRanges);
-		yield endOfLine;
-		yield `${syntax} {} as `;
-
-		let exp = 'typeof __VLS_component';
-		if (!options.vueCompilerOptions.skipTemplateCodegen) {
-			if (options.templateCodegen?.hasSlot || scriptSetupRanges?.slots.define) {
-				exp = `${ctx.localTypes.WithTemplateSlots}<${exp}, __VLS_TemplateResult['slots']>`;
-			}
-			if (options.templateCodegen?.singleRootEl) {
-				exp = `${ctx.localTypes.WithTemplateRootEl}<${exp}, __VLS_TemplateResult['rootEl']>`;
-			}
+		if (!options.vueCompilerOptions.skipTemplateCodegen && (options.templateCodegen?.hasSlot || scriptSetupRanges?.slots.define)) {
+			yield `const __VLS_component = `;
+			yield* generateComponent(options, ctx, scriptSetup, scriptSetupRanges);
+			yield endOfLine;
+			yield `${syntax} `;
+			yield `{} as ${ctx.localTypes.WithTemplateSlots}<typeof __VLS_component, __VLS_TemplateResult['slots']>${endOfLine}`;
+		}
+		else {
+			yield `${syntax} `;
+			yield* generateComponent(options, ctx, scriptSetup, scriptSetupRanges);
+			yield endOfLine;
 		}
-		yield exp;
-		yield endOfLine;
 	}
 }
 

test-workspace/tsc/passedFixtures/vue3/rootEl/child.vue

@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import { exactType } from '../../shared';
-import Base from './base.vue';
+import Base from './temp';
 </script>
 
 <template>
 	<Base>
-		{{ exactType($el, {} as HTMLAnchorElement | undefined) }}
+		{{ exactType($el, {} as HTMLAnchorElement) }}
 	</Base>
 </template>

test-workspace/tsc/passedFixtures/vue3/rootEl/main.vue

@@ -5,6 +5,6 @@ import Child from './child.vue';
 
 <template>
 	<Child>
-		{{ exactType($el, {} as HTMLAnchorElement | undefined) }}
+		{{ exactType($el, {} as HTMLAnchorElement) }}
 	</Child>
 </template>