perf(language-core): drop internal component (#5532)

Author: KazariEX

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

@@ -49,13 +49,13 @@ export function generateGlobalTypes(options: VueCompilerOptions) {
 	type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
 	type __VLS_SpreadMerge<A, B> = Omit<A, keyof B> & B;
 	type __VLS_WithComponent<N0 extends string, LocalComponents, Self, N1 extends string, N2 extends string, N3 extends string> =
-		N1 extends keyof LocalComponents ? N1 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N1] } :
-		N2 extends keyof LocalComponents ? N2 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N2] } :
-		N3 extends keyof LocalComponents ? N3 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N3] } :
+		N1 extends keyof LocalComponents ? { [K in N0]: LocalComponents[N1] } :
+		N2 extends keyof LocalComponents ? { [K in N0]: LocalComponents[N2] } :
+		N3 extends keyof LocalComponents ? { [K in N0]: LocalComponents[N3] } :
 		Self extends object ? { [K in N0]: Self } :
-		N1 extends keyof __VLS_GlobalComponents ? N1 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N1] } :
-		N2 extends keyof __VLS_GlobalComponents ? N2 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N2] } :
-		N3 extends keyof __VLS_GlobalComponents ? N3 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N3] } :
+		N1 extends keyof __VLS_GlobalComponents ? { [K in N0]: __VLS_GlobalComponents[N1] } :
+		N2 extends keyof __VLS_GlobalComponents ? { [K in N0]: __VLS_GlobalComponents[N2] } :
+		N3 extends keyof __VLS_GlobalComponents ? { [K in N0]: __VLS_GlobalComponents[N3] } :
 		{};
 	type __VLS_FunctionalComponentCtx<T, K> = __VLS_PickNotAny<'__ctx' extends keyof __VLS_PickNotAny<K, {}>
 		? K extends { __ctx?: infer Ctx } ? NonNullable<Ctx> : never : any
@@ -117,6 +117,10 @@ export function generateGlobalTypes(options: VueCompilerOptions) {
 			}
 		>
 	>;
+	type __VLS_EmitsToProps<T> = __VLS_PrettifyGlobal<{
+		[K in string & keyof T as \`on\${Capitalize<K>}\`]?:
+			(...args: T[K] extends (...args: infer P) => any ? P : T[K] extends null ? any[] : never) => any;
+	}>;
 	type __VLS_ResolveEmits<
 		Comp,
 		Emits,
@@ -128,10 +132,16 @@ export function generateGlobalTypes(options: VueCompilerOptions) {
 		NormalizedEmits = __VLS_NormalizeEmits<Emits> extends infer E ? string extends keyof E ? {} : E : never,
 	> = __VLS_SpreadMerge<NormalizedEmits, TypeEmits>;
 	type __VLS_ResolveDirectives<T> = {
-		[K in Exclude<keyof T, keyof __VLS_GlobalDirectives> & string as \`v\${Capitalize<K>}\`]: T[K];
+		[K in keyof T & string as \`v\${Capitalize<K>}\`]: T[K];
 	};
 	type __VLS_PrettifyGlobal<T> = { [K in keyof T as K]: T[K]; } & {};
+	type __VLS_WithDefaultsGlobal<P, D> = {
+		[K in keyof P as K extends keyof D ? K : never]-?: P[K];
+	} & {
+		[K in keyof P as K extends keyof D ? never : K]: P[K];
+	};
 	type __VLS_UseTemplateRef<T> = Readonly<import('${lib}').ShallowRef<T | null>>;
+	type __VLS_ProxyRefs<T> = import('${lib}').ShallowUnwrapRef<T>;
 
 	function __VLS_getVForSourceType<T extends number | string | any[] | Iterable<any>>(source: T): [
 		item: T extends number ? number
@@ -153,7 +163,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/localTypes.ts

@@ -4,20 +4,11 @@ import { endOfLine } from './utils';
 export function getLocalTypesGenerator(vueCompilerOptions: VueCompilerOptions) {
 	const used = new Set<string>();
 
-	const OmitKeepDiscriminatedUnion = defineHelper(
-		`__VLS_OmitKeepDiscriminatedUnion`,
+	const WithDefaultsLocal = defineHelper(
+		`__VLS_WithDefaultsLocal`,
 		() =>
 			`
-type __VLS_OmitKeepDiscriminatedUnion<T, K extends keyof any> = T extends any
-	? Pick<T, Exclude<keyof T, K>>
-	: never;
-`.trimStart(),
-	);
-	const WithDefaults = defineHelper(
-		`__VLS_WithDefaults`,
-		() =>
-			`
-type __VLS_WithDefaults<P, D> = {
+type __VLS_WithDefaultsLocal<P, D> = {
 	[K in keyof Pick<P, keyof P>]: K extends keyof D
 		? ${PrettifyLocal.name}<P[K] & { default: D[K] }>
 		: P[K]
@@ -34,11 +25,7 @@ type __VLS_WithDefaults<P, D> = {
 			`
 type __VLS_WithSlots<T, S> = T & {
 	new(): {
-		$slots: S;${
-				vueCompilerOptions.jsxSlots
-					? `\n		$props: ${PropsChildren.name}<S>;`
-					: ''
-			}
+		$slots: S;
 	}
 };
 `.trimStart(),
@@ -80,8 +67,7 @@ type __VLS_TypePropsToOption<T> = {
 	);
 	const helpers = {
 		[PrettifyLocal.name]: PrettifyLocal,
-		[OmitKeepDiscriminatedUnion.name]: OmitKeepDiscriminatedUnion,
-		[WithDefaults.name]: WithDefaults,
+		[WithDefaultsLocal.name]: WithDefaultsLocal,
 		[WithSlots.name]: WithSlots,
 		[PropsChildren.name]: PropsChildren,
 		[TypePropsToOption.name]: TypePropsToOption,
@@ -91,17 +77,11 @@ type __VLS_TypePropsToOption<T> = {
 
 	return {
 		generate,
-		getUsedNames() {
-			return used;
-		},
 		get PrettifyLocal() {
 			return PrettifyLocal.name;
 		},
-		get OmitKeepDiscriminatedUnion() {
-			return OmitKeepDiscriminatedUnion.name;
-		},
-		get WithDefaults() {
-			return WithDefaults.name;
+		get WithDefaultsLocal() {
+			return WithDefaultsLocal.name;
 		},
 		get WithSlots() {
 			return WithSlots.name;
@@ -117,20 +97,11 @@ type __VLS_TypePropsToOption<T> = {
 		},
 	};
 
-	function* generate(names: string[]) {
-		const generated = new Set<string>();
-		while (names.length) {
-			used.clear();
-			for (const name of names) {
-				if (generated.has(name)) {
-					continue;
-				}
-				const helper = helpers[name as keyof typeof helpers]!;
-				yield helper.generate();
-				generated.add(name);
-			}
-			names = [...used].filter(name => !generated.has(name));
+	function* generate() {
+		for (const name of used) {
+			yield helpers[name]!.generate();
 		}
+		used.clear();
 	}
 
 	function defineHelper(name: string, generate: () => string) {

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

@@ -29,9 +29,18 @@ export function* generateComponent(
 		yield `(await import('${options.vueCompilerOptions.lib}')).defineComponent({${newLine}`;
 	}
 
-	const returns: Code[] = [];
+	const returns: string[] = [];
 	if (ctx.bypassDefineComponent) {
-		returns.push(...generateComponentSetupReturns(scriptSetupRanges));
+		// fill $props
+		if (scriptSetupRanges.defineProps) {
+			const name = scriptSetupRanges.defineProps.name ?? `__VLS_props`;
+			// NOTE: defineProps is inaccurate for $props
+			returns.push(name, `{} as { $props: Partial<typeof ${name}> }`);
+		}
+		// fill $emit
+		if (scriptSetupRanges.defineEmits) {
+			returns.push(`{} as { $emit: typeof ${scriptSetupRanges.defineEmits.name ?? `__VLS_emit`} }`);
+		}
 	}
 	if (scriptSetupRanges.defineExpose) {
 		returns.push(`__VLS_exposed`);
@@ -45,7 +54,7 @@ export function* generateComponent(
 	if (!ctx.bypassDefineComponent) {
 		const emitOptionCodes = [...generateEmitsOption(options, scriptSetupRanges)];
 		yield* emitOptionCodes;
-		yield* generatePropsOption(options, ctx, scriptSetup, scriptSetupRanges, !!emitOptionCodes.length, true);
+		yield* generatePropsOption(options, ctx, scriptSetup, scriptSetupRanges, !!emitOptionCodes.length);
 	}
 	if (
 		options.vueCompilerOptions.target >= 3.5
@@ -68,21 +77,7 @@ export function* generateComponent(
 	yield `})`;
 }
 
-export function* generateComponentSetupReturns(scriptSetupRanges: ScriptSetupRanges): Generator<string> {
-	// fill $props
-	if (scriptSetupRanges.defineProps) {
-		const name = scriptSetupRanges.defineProps.name ?? `__VLS_props`;
-		// NOTE: defineProps is inaccurate for $props
-		yield name;
-		yield `{} as { $props: Partial<typeof ${name}> }`;
-	}
-	// fill $emit
-	if (scriptSetupRanges.defineEmits) {
-		yield `{} as { $emit: typeof ${scriptSetupRanges.defineEmits.name ?? `__VLS_emit`} }`;
-	}
-}
-
-export function* generateEmitsOption(
+function* generateEmitsOption(
 	options: ScriptCodegenOptions,
 	scriptSetupRanges: ScriptSetupRanges,
 ): Generator<Code> {
@@ -116,18 +111,17 @@ export function* generateEmitsOption(
 	}
 }
 
-export function* generatePropsOption(
+function* generatePropsOption(
 	options: ScriptCodegenOptions,
 	ctx: ScriptCodegenContext,
 	scriptSetup: NonNullable<Sfc['scriptSetup']>,
 	scriptSetupRanges: ScriptSetupRanges,
 	hasEmitsOption: boolean,
-	inheritAttrs: boolean,
 ): Generator<Code> {
 	const getOptionCodes: (() => Code)[] = [];
 	const typeOptionCodes: Code[] = [];
 
-	if (inheritAttrs && options.templateCodegen?.inheritedAttrVars.size) {
+	if (options.templateCodegen?.inheritedAttrVars.size) {
 		let attrsType = `__VLS_InheritedAttrs`;
 		if (hasEmitsOption) {
 			attrsType = `Omit<${attrsType}, \`on\${string}\`>`;
@@ -145,7 +139,7 @@ export function* generatePropsOption(
 				const propsType = `${ctx.localTypes.TypePropsToOption}<__VLS_PublicProps>`;
 				return `{} as ` + (
 					scriptSetupRanges.withDefaults?.arg
-						? `${ctx.localTypes.WithDefaults}<${propsType}, typeof __VLS_withDefaultsArg>`
+						? `${ctx.localTypes.WithDefaultsLocal}<${propsType}, typeof __VLS_defaults>`
 						: propsType
 				);
 			});
@@ -166,7 +160,7 @@ export function* generatePropsOption(
 			options.vueCompilerOptions.target >= 3.6
 			&& scriptSetupRanges.withDefaults?.arg
 		) {
-			yield `__defaults: __VLS_withDefaultsArg,${newLine}`;
+			yield `__defaults: __VLS_defaults,${newLine}`;
 		}
 		yield `__typeProps: `;
 		yield* generateSpreadMerge(typeOptionCodes);