refactor: remove __VLS_makeOptional

Author: KazariEX

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

@@ -155,7 +155,6 @@ export function generateGlobalTypes(options: VueCompilerOptions) {
 		: T extends (...args: any) => any
 			? T
 			: (arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown) => void;
-	function __VLS_makeOptional<T>(t: T): { [K in keyof T]?: T[K] };
 	function __VLS_asFunctionalComponent<T, K = T extends new (...args: any) => any ? InstanceType<T> : unknown>(t: T, instance?: K):
 		T extends new (...args: any) => any ? __VLS_FunctionalComponent<K>
 		: T extends () => any ? (props: {}, ctx?: any) => ReturnType<T>${

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

@@ -32,10 +32,16 @@ export function* generateComponent(
 	yield `setup() {${newLine}`;
 	const returns: Code[] = [];
 	if (ctx.bypassDefineComponent) {
-		yield* `const __VLS_returns = {${newLine}`;
-		yield* generateComponentSetupReturns(scriptSetupRanges);
-		yield `}${endOfLine}`;
-		returns.push(`typeof __VLS_returns`);
+		// fill $props
+		if (scriptSetupRanges.defineProps) {
+			const name = scriptSetupRanges.defineProps.name ?? `__VLS_props`;
+			// NOTE: defineProps is inaccurate for $props
+			returns.push(`typeof ${name} & { $props: Partial<typeof ${name}> }`);
+		}
+		// fill $emit
+		if (scriptSetupRanges.defineEmits) {
+			returns.push(`{ $emit: typeof ${scriptSetupRanges.defineEmits.name ?? '__VLS_emit'} }`);
+		}
 	}
 	if (scriptSetupRanges.defineExpose) {
 		returns.push(`typeof __VLS_exposed`);
@@ -73,19 +79,6 @@ export function* generateComponent(
 	yield `})`;
 }
 
-export function* generateComponentSetupReturns(scriptSetupRanges: ScriptSetupRanges): Generator<Code> {
-	// fill $props
-	if (scriptSetupRanges.defineProps) {
-		// NOTE: defineProps is inaccurate for $props
-		yield `$props: __VLS_makeOptional(${scriptSetupRanges.defineProps.name ?? `__VLS_props`}),${newLine}`;
-		yield `...${scriptSetupRanges.defineProps.name ?? `__VLS_props`},${newLine}`;
-	}
-	// fill $emit
-	if (scriptSetupRanges.defineEmits) {
-		yield `$emit: ${scriptSetupRanges.defineEmits.name ?? '__VLS_emit'},${newLine}`;
-	}
-}
-
 export function* generateEmitsOption(
 	options: ScriptCodegenOptions,
 	scriptSetupRanges: ScriptSetupRanges,