refactor(language-core): wrap __VLS_InheritedAttrs with Partial at definition

Author: KazariEX

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

@@ -132,7 +132,7 @@ export function* generatePropsOption(
 	const typeOptionCodes: Code[] = [];
 
 	if (inheritAttrs && options.templateCodegen?.inheritedAttrVars.size) {
-		let attrsType = `Partial<__VLS_InheritedAttrs>`;
+		let attrsType = `__VLS_InheritedAttrs`;
 		if (hasEmitsOption) {
 			attrsType = `Omit<${attrsType}, \`on\${string}\`>`;
 		}

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

@@ -69,7 +69,7 @@ export function* generateScriptSetup(
 		}
 
 		yield `return {} as {${newLine}`
-			+ `	props: ${ctx.localTypes.PrettifyLocal}<__VLS_OwnProps & __VLS_PublicProps & Partial<__VLS_InheritedAttrs>> & __VLS_BuiltInPublicProps,${newLine}`
+			+ `	props: ${ctx.localTypes.PrettifyLocal}<__VLS_OwnProps & __VLS_PublicProps & __VLS_InheritedAttrs> & __VLS_BuiltInPublicProps,${newLine}`
 			+ `	expose(exposed: import('${options.vueCompilerOptions.lib}').ShallowUnwrapRef<${
 				scriptSetupRanges.defineExpose ? 'typeof __VLS_exposed' : '{}'
 			}>): void,${newLine}`

packages/language-core/lib/codegen/template/index.ts

@@ -113,10 +113,11 @@ function* generateInheritedAttrs(
 	options: TemplateCodegenOptions,
 	ctx: TemplateCodegenContext,
 ): Generator<Code> {
-	yield `type __VLS_InheritedAttrs = {}`;
-	for (const varName of ctx.inheritedAttrVars) {
-		yield ` & typeof ${varName}`;
-	}
+	yield `type __VLS_InheritedAttrs = ${
+		ctx.inheritedAttrVars.size
+			? `Partial<${[...ctx.inheritedAttrVars].map(name => `typeof ${name}`).join(` & `)}>`
+			: `{}`
+	}`;
 	yield endOfLine;
 
 	if (ctx.bindingAttrLocs.length) {
@@ -133,7 +134,7 @@ function* generateInheritedAttrs(
 		}
 		yield `]${endOfLine}`;
 	}
-	return `import('${options.vueCompilerOptions.lib}').ComponentPublicInstance['$attrs'] & Partial<__VLS_InheritedAttrs>`;
+	return `import('${options.vueCompilerOptions.lib}').ComponentPublicInstance['$attrs'] & __VLS_InheritedAttrs`;
 }
 
 function* generateTemplateRefs(

packages/tsc/tests/__snapshots__/dts.spec.ts.snap

@@ -61,7 +61,7 @@ exports[`vue-tsc-dts > Input: generic/component.vue, Output: generic/component.v
         foo: number;
     } & {
         title?: string;
-    }) & Partial<{}>> & import("vue").PublicProps;
+    }) & {}> & import("vue").PublicProps;
     expose(exposed: import("vue").ShallowUnwrapRef<{
         baz: number;
     }>): void;
@@ -91,7 +91,7 @@ exports[`vue-tsc-dts > Input: generic/custom-extension-component.cext, Output: g
         foo: number;
     } & {
         title?: string;
-    }) & Partial<{}>> & import("vue").PublicProps;
+    }) & {}> & import("vue").PublicProps;
     expose(exposed: import("vue").ShallowUnwrapRef<{
         baz: number;
     }>): void;

test-workspace/tsc/passedFixtures/#5106/main.vue

@@ -12,7 +12,7 @@ declare module 'vue' {
 	}
 }
 
-type AttrsExact = Record<string, unknown> & { class: string } & Partial<{}>;
+type AttrsExact = Record<string, unknown> & { class: string };
 
 const attrs = useAttrs();
 exactType(attrs, {} as AttrsExact);

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

@@ -1,3 +1,4 @@
+<!-- @fallthroughAttributes true -->
 <!-- @inferTemplateDollarAttrs true -->
 
 <script setup lang="ts">