fix(language-core): using interface merging for GlobalComponents

packages/component-meta/lib/base.ts

@@ -142,7 +142,7 @@ export function baseCreate(
 	const fileExists = languageServiceHost.fileExists.bind(languageServiceHost);
 	const getScriptSnapshot = languageServiceHost.getScriptSnapshot.bind(languageServiceHost);
 	const globalTypesName = `${commandLine.vueOptions.lib}_${commandLine.vueOptions.target}_${commandLine.vueOptions.strictTemplates}.d.ts`;
-	const globalTypesContents = vue.generateGlobalTypes(commandLine.vueOptions.lib, commandLine.vueOptions.target, commandLine.vueOptions.strictTemplates);
+	const globalTypesContents = vue.generateGlobalTypes('global', commandLine.vueOptions.lib, commandLine.vueOptions.target, commandLine.vueOptions.strictTemplates);
 	const globalTypesSnapshot: ts.IScriptSnapshot = {
 		getText: (start, end) => globalTypesContents.substring(start, end),
 		getLength: () => globalTypesContents.length,

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

@@ -1,13 +1,23 @@
 import { getSlotsPropertyName } from '../utils/shared';
+import { endOfLine, newLine } from './common';
 
-export function generateGlobalTypes(lib: string, target: number, strictTemplates: boolean) {
+export function generateGlobalTypes(mode: 'global' | 'local', lib: string, target: number, strictTemplates: boolean) {
 	const fnPropsType = `(K extends { $props: infer Props } ? Props : any)${strictTemplates ? '' : ' & Record<string, unknown>'}`;
-	return `// @ts-nocheck
 
-const __VLS_globalComponents = { ...{} as import('${lib}').GlobalComponents };
+	let str = '';
 
-declare const __VLS_intrinsicElements: __VLS_IntrinsicElements;
-declare const __VLS_directiveBindingRestFields = { instance: null, oldValue: null, modifiers: null as any, dir: null as any };
+	if (mode === 'global') {
+		str += `// @ts-nocheck${newLine}`;
+		str += `export {}${endOfLine}`;
+		str += `declare module '${lib}' {${newLine}`;
+		str += `	export interface GlobalComponents { }${newLine}`;
+		str += `}${newLine}`;
+		str += `declare global {${newLine}`;
+	}
+
+	str += `
+const __VLS_intrinsicElements: __VLS_IntrinsicElements;
+const __VLS_directiveBindingRestFields = { instance: null, oldValue: null, modifiers: null as any, dir: null as any };
 
 type __VLS_IntrinsicElements = ${(
 			target >= 3.3
@@ -21,8 +31,8 @@ type __VLS_Element = ${(
 		)}
 type __VLS_GlobalComponents = ${(
 			target >= 3.5
-				? `void extends typeof __VLS_globalComponents ? {} : typeof __VLS_globalComponents;`
-				: `(void extends typeof __VLS_globalComponents ? {} : typeof __VLS_globalComponents) & Pick<typeof import('${lib}'), 'Transition' | 'TransitionGroup' | 'KeepAlive' | 'Suspense' | 'Teleport'>;`
+				? `import('vue').GlobalComponents;`
+				: `import('vue').GlobalComponents & Pick<typeof import('${lib}'), 'Transition' | 'TransitionGroup' | 'KeepAlive' | 'Suspense' | 'Teleport'>;`
 		)}
 type __VLS_IsAny<T> = 0 extends 1 & T ? true : false;
 type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
@@ -71,40 +81,40 @@ type __VLS_NormalizeEmits<T> = __VLS_PrettifyGlobal<
 >;
 type __VLS_PrettifyGlobal<T> = { [K in keyof T]: T[K]; } & {};
 
-declare function __VLS_getVForSourceType(source: number): [number, number, number][];
-declare function __VLS_getVForSourceType(source: string): [string, number, number][];
-declare function __VLS_getVForSourceType<T extends any[]>(source: T): [
+function __VLS_getVForSourceType(source: number): [number, number, number][];
+function __VLS_getVForSourceType(source: string): [string, number, number][];
+function __VLS_getVForSourceType<T extends any[]>(source: T): [
 	item: T[number],
 	key: number,
 	index: number,
 ][];
-declare function __VLS_getVForSourceType<T extends { [Symbol.iterator](): Iterator<any> }>(source: T): [
+function __VLS_getVForSourceType<T extends { [Symbol.iterator](): Iterator<any> }>(source: T): [
 	item: T extends { [Symbol.iterator](): Iterator<infer T1> } ? T1 : never, 
 	key: number,
 	index: undefined,
 ][];
 // #3845
-declare function __VLS_getVForSourceType<T extends number | { [Symbol.iterator](): Iterator<any> }>(source: T): [
+function __VLS_getVForSourceType<T extends number | { [Symbol.iterator](): Iterator<any> }>(source: T): [
 	item: number | (Exclude<T, number> extends { [Symbol.iterator](): Iterator<infer T1> } ? T1 : never), 
 	key: number,
 	index: undefined,
 ][];
-declare function __VLS_getVForSourceType<T>(source: T): [
+function __VLS_getVForSourceType<T>(source: T): [
 	item: T[keyof T],
 	key: keyof T,
 	index: number,
 ][];
 // @ts-ignore
-declare function __VLS_getSlotParams<T>(slot: T): Parameters<__VLS_PickNotAny<NonNullable<T>, (...args: any[]) => any>>;
+function __VLS_getSlotParams<T>(slot: T): Parameters<__VLS_PickNotAny<NonNullable<T>, (...args: any[]) => any>>;
 // @ts-ignore
-declare function __VLS_getSlotParam<T>(slot: T): Parameters<__VLS_PickNotAny<NonNullable<T>, (...args: any[]) => any>>[0];
-declare function __VLS_directiveAsFunction<T extends import('${lib}').Directive>(dir: T): T extends (...args: any) => any
+function __VLS_getSlotParam<T>(slot: T): Parameters<__VLS_PickNotAny<NonNullable<T>, (...args: any[]) => any>>[0];
+function __VLS_directiveAsFunction<T extends import('${lib}').Directive>(dir: T): T extends (...args: any) => any
 	? T | __VLS_unknownDirective
 	: NonNullable<(T & Record<string, __VLS_unknownDirective>)['created' | 'beforeMount' | 'mounted' | 'beforeUpdate' | 'updated' | 'beforeUnmount' | 'unmounted']>;
-declare function __VLS_withScope<T, K>(ctx: T, scope: K): ctx is T & K;
-declare function __VLS_makeOptional<T>(t: T): { [K in keyof T]?: T[K] };
-declare function __VLS_nonNullable<T>(t: T): T extends null | undefined ? never : T;
-declare function __VLS_asFunctionalComponent<T, K = T extends new (...args: any) => any ? InstanceType<T> : unknown>(t: T, instance?: K):
+function __VLS_withScope<T, K>(ctx: T, scope: K): ctx is T & K;
+function __VLS_makeOptional<T>(t: T): { [K in keyof T]?: T[K] };
+function __VLS_nonNullable<T>(t: T): T extends null | undefined ? never : T;
+function __VLS_asFunctionalComponent<T, K = T extends new (...args: any) => any ? InstanceType<T> : unknown>(t: T, instance?: K):
 	T extends new (...args: any) => any
 	? (props: ${fnPropsType}, ctx?: any) => __VLS_Element & { __ctx?: {
 		attrs?: any,
@@ -114,13 +124,18 @@ declare function __VLS_asFunctionalComponent<T, K = T extends new (...args: any)
 	: T extends () => any ? (props: {}, ctx?: any) => ReturnType<T>
 	: T extends (...args: any) => any ? T
 	: (_: {}${strictTemplates ? '' : ' & Record<string, unknown>'}, ctx?: any) => { __ctx?: { attrs?: any, expose?: any, slots?: any, emit?: any, props?: {}${strictTemplates ? '' : ' & Record<string, unknown>'} } };
-declare function __VLS_elementAsFunction<T>(tag: T, endTag?: T): (_: T${strictTemplates ? '' : ' & Record<string, unknown>'}) => void;
-declare function __VLS_functionalComponentArgsRest<T extends (...args: any) => any>(t: T): 2 extends Parameters<T>['length'] ? [any] : [];
-declare function __VLS_pickFunctionalComponentCtx<T, K>(comp: T, compInstance: K): NonNullable<__VLS_PickNotAny<
+function __VLS_elementAsFunction<T>(tag: T, endTag?: T): (_: T${strictTemplates ? '' : ' & Record<string, unknown>'}) => void;
+function __VLS_functionalComponentArgsRest<T extends (...args: any) => any>(t: T): 2 extends Parameters<T>['length'] ? [any] : [];
+function __VLS_pickFunctionalComponentCtx<T, K>(comp: T, compInstance: K): NonNullable<__VLS_PickNotAny<
 	'__ctx' extends keyof __VLS_PickNotAny<K, {}> ? K extends { __ctx?: infer Ctx } ? Ctx : never : any
 	, T extends (props: any, ctx: infer Ctx) => any ? Ctx : any
 >>;
-declare function __VLS_normalizeSlot<S>(s: S): S extends () => infer R ? (props: {}) => R : S;
-declare function __VLS_tryAsConstant<const T>(t: T): T;
+function __VLS_normalizeSlot<S>(s: S): S extends () => infer R ? (props: {}) => R : S;
+function __VLS_tryAsConstant<const T>(t: T): T;
 `;
+
+	if (mode === 'global') {
+		str += `}${newLine}`;
+	}
+	return str;
 };

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

@@ -143,7 +143,7 @@ export function* generateScript(options: ScriptCodegenOptions): Generator<Code,
 	}
 	yield* ctx.localTypes.generate([...ctx.localTypes.getUsedNames()]);
 	if (!options.vueCompilerOptions.__setupedGlobalTypes?.()) {
-		yield generateGlobalTypes(options.vueCompilerOptions.lib, options.vueCompilerOptions.target, options.vueCompilerOptions.strictTemplates);
+		yield generateGlobalTypes('local', options.vueCompilerOptions.lib, options.vueCompilerOptions.target, options.vueCompilerOptions.strictTemplates);
 	}
 
 	if (options.sfc.scriptSetup) {

packages/language-server/lib/initialize.ts

@@ -59,7 +59,7 @@ export function initialize(
 							const fileExists = project.typescript.languageServiceHost.fileExists.bind(project.typescript.languageServiceHost);
 							const getScriptSnapshot = project.typescript.languageServiceHost.getScriptSnapshot.bind(project.typescript.languageServiceHost);
 							const globalTypesName = `${vueCompilerOptions.lib}_${vueCompilerOptions.target}_${vueCompilerOptions.strictTemplates}.d.ts`;
-							const globalTypesContents = generateGlobalTypes(vueCompilerOptions.lib, vueCompilerOptions.target, vueCompilerOptions.strictTemplates);
+							const globalTypesContents = generateGlobalTypes('global', vueCompilerOptions.lib, vueCompilerOptions.target, vueCompilerOptions.strictTemplates);
 							const globalTypesSnapshot: ts.IScriptSnapshot = {
 								getText: (start, end) => globalTypesContents.substring(start, end),
 								getLength: () => globalTypesContents.length,

packages/tsc/index.ts

@@ -35,7 +35,7 @@ export function run(tscPath = require.resolve('typescript/lib/tsc')) {
 						dir = parentDir;
 					}
 					const globalTypesPath = path.resolve(dir, `node_modules/.vue-global-types/${vueOptions.lib}_${vueOptions.target}_${vueOptions.strictTemplates}.d.ts`);
-					const globalTypesContents = vue.generateGlobalTypes(vueOptions.lib, vueOptions.target, vueOptions.strictTemplates);
+					const globalTypesContents = vue.generateGlobalTypes('global', vueOptions.lib, vueOptions.target, vueOptions.strictTemplates);
 					ts.sys.writeFile(globalTypesPath, globalTypesContents);
 					setupedGlobalTypes = true;
 				} catch { }

packages/tsc/tests/dts.spec.ts

@@ -45,7 +45,7 @@ describe('vue-tsc-dts', () => {
 				dir = parentDir;
 			}
 			const globalTypesPath = path.resolve(dir, `node_modules/.vue-global-types/${vueOptions.lib}_${vueOptions.target}_${vueOptions.strictTemplates}.d.ts`);
-			const globalTypesContents = vue.generateGlobalTypes(vueOptions.lib, vueOptions.target, vueOptions.strictTemplates);
+			const globalTypesContents = vue.generateGlobalTypes('global', vueOptions.lib, vueOptions.target, vueOptions.strictTemplates);
 			ts.sys.writeFile(globalTypesPath, globalTypesContents);
 			setupedGlobalTypes = true;
 		} catch { }

packages/typescript-plugin/index.ts

@@ -74,7 +74,7 @@ const plugin: ts.server.PluginModuleFactory = mods => {
 						dir = parentDir;
 					}
 					const globalTypesPath = path.resolve(dir, `node_modules/.vue-global-types/${options.lib}_${options.target}_${options.strictTemplates}.d.ts`);
-					const globalTypesContents = vue.generateGlobalTypes(options.lib, options.target, options.strictTemplates);
+					const globalTypesContents = vue.generateGlobalTypes('global', options.lib, options.target, options.strictTemplates);
 					proj.writeFile(globalTypesPath, globalTypesContents);
 					setupedProjects.add(proj);
 				} catch { }