fix(typescript-plugin): resolve component type without __VLS_components

johnsoncodehk · johnsoncodehk · commit b6254ec47c61 · 2025-12-01T23:55:56.000+08:00
diff --git a/packages/language-core/lib/codegen/script/template.ts b/packages/language-core/lib/codegen/script/template.ts
@@ -153,22 +153,19 @@ function* generateBindings(
 	{ templateComponents, templateCodegen, styleCodegen, setupBindingNames }: ScriptCodegenOptions,
 	ctx: ScriptCodegenContext,
 ): Generator<Code> {
-	if (!setupBindingNames.size) {
-		return;
-	}
-	ctx.generatedTypes.add(names.Bindings);
-
-	const usedVars = new Set([
+	const testNames = new Set([
 		...templateComponents.flatMap(c => [camelize(c), capitalize(camelize(c))]),
 		...templateCodegen?.accessExternalVariables.keys() ?? [],
 		...styleCodegen?.accessExternalVariables.keys() ?? [],
 	]);
+	const exposeNames = [...setupBindingNames].filter(name => testNames.has(name));
+	if (exposeNames.length === 0) {
+		return;
+	}
+	ctx.generatedTypes.add(names.Bindings);
 
 	yield `type ${names.Bindings} = __VLS_ProxyRefs<{${newLine}`;
-	for (const bindingName of setupBindingNames) {
-		if (!usedVars.has(bindingName)) {
-			continue;
-		}
+	for (const bindingName of exposeNames) {
 		const token = Symbol(bindingName.length);
 		yield ['', undefined, 0, { __linkedToken: token }];
 		yield `${bindingName}: typeof `;
diff --git a/packages/language-core/lib/plugins/vue-tsx.ts b/packages/language-core/lib/plugins/vue-tsx.ts
@@ -96,24 +96,27 @@ function useCodegen(
 	);
 
 	const getSetupBindingNames = computedSet(() => {
-		const newNames = new Set<string>();
+		const names = new Set<string>();
 		const scriptSetupRanges = getScriptSetupRanges();
 		if (!sfc.scriptSetup || !scriptSetupRanges) {
-			return newNames;
+			return names;
 		}
 		for (const { range } of scriptSetupRanges.bindings) {
 			const name = sfc.scriptSetup.content.slice(range.start, range.end);
 			if (!getImportComponentNames().has(name)) {
-				newNames.add(name);
+				names.add(name);
 			}
 		}
 		const scriptRanges = getScriptRanges();
 		if (sfc.script && scriptRanges) {
 			for (const { range } of scriptRanges.bindings) {
-				newNames.add(sfc.script.content.slice(range.start, range.end));
+				const name = sfc.script.content.slice(range.start, range.end);
+				if (!getImportComponentNames().has(name)) {
+					names.add(name);
+				}
 			}
 		}
-		return newNames;
+		return names;
 	});
 
 	const getImportComponentNames = computedSet(() => {
@@ -130,6 +133,19 @@ function useCodegen(
 					names.add(sfc.scriptSetup.content.slice(range.start, range.end));
 				}
 			}
+			const scriptRange = getScriptRanges();
+			if (sfc.script && scriptRange) {
+				for (const { range, moduleName, isDefaultImport, isNamespace } of scriptRange.bindings) {
+					if (
+						moduleName
+						&& isDefaultImport
+						&& !isNamespace
+						&& ctx.vueCompilerOptions.extensions.some(ext => moduleName.endsWith(ext))
+					) {
+						names.add(sfc.script.content.slice(range.start, range.end));
+					}
+				}
+			}
 		}
 		return names;
 	});
@@ -259,5 +275,6 @@ function useCodegen(
 		getSetupSlotsAssignName,
 		getGeneratedScript,
 		getGeneratedTemplate,
+		getImportComponentNames,
 	};
 }
diff --git a/packages/tsc/bin/vue-tsc.js b/packages/tsc/bin/vue-tsc.js
@@ -1,3 +1,2 @@
 #!/usr/bin/env node
-// @ts-check
 require('../index.js').run();
diff --git a/packages/typescript-plugin/index.ts b/packages/typescript-plugin/index.ts
@@ -143,18 +143,18 @@ export = createLanguageServicePlugin(
 			});
 			session.addProtocolHandler('_vue:getComponentEvents', request => {
 				const [fileName, tag]: Parameters<Requests['getComponentEvents']> = request.arguments;
-				const { project } = getProject(fileName);
-				return createResponse(getComponentEvents(ts, project.getLanguageService().getProgram()!, fileName, tag));
+				const { project, virtualCode } = getProjectAndVirtualCode(fileName);
+				return createResponse(getComponentEvents(ts, project.getLanguageService().getProgram()!, virtualCode, tag));
 			});
 			session.addProtocolHandler('_vue:getComponentNames', request => {
 				const [fileName]: Parameters<Requests['getComponentNames']> = request.arguments;
-				const { project } = getProject(fileName);
-				return createResponse(getComponentNames(ts, project.getLanguageService().getProgram()!, fileName));
+				const { project, virtualCode } = getProjectAndVirtualCode(fileName);
+				return createResponse(getComponentNames(ts, project.getLanguageService().getProgram()!, virtualCode));
 			});
 			session.addProtocolHandler('_vue:getComponentProps', request => {
 				const [fileName, tag]: Parameters<Requests['getComponentProps']> = request.arguments;
-				const { project } = getProject(fileName);
-				return createResponse(getComponentProps(ts, project.getLanguageService().getProgram()!, fileName, tag));
+				const { project, virtualCode } = getProjectAndVirtualCode(fileName);
+				return createResponse(getComponentProps(ts, project.getLanguageService().getProgram()!, virtualCode, tag));
 			});
 			session.addProtocolHandler('_vue:getComponentSlots', request => {
 				const [fileName]: Parameters<Requests['getComponentSlots']> = request.arguments;
diff --git a/packages/typescript-plugin/lib/requests/getComponentDirectives.ts b/packages/typescript-plugin/lib/requests/getComponentDirectives.ts
@@ -16,7 +16,13 @@ export function getComponentDirectives(
 	program: ts.Program,
 	fileName: string,
 ): string[] {
-	const directives = getVariableType(ts, program, fileName, names.directives);
+	const sourceFile = program.getSourceFile(fileName);
+	if (!sourceFile) {
+		return [];
+	}
+
+	const checker = program.getTypeChecker();
+	const directives = getVariableType(ts, checker, sourceFile, names.directives);
 	if (!directives) {
 		return [];
 	}
diff --git a/packages/typescript-plugin/lib/requests/getComponentEvents.ts b/packages/typescript-plugin/lib/requests/getComponentEvents.ts
@@ -1,20 +1,20 @@
-import { names } from '@vue/language-core';
+import type { VueVirtualCode } from '@vue/language-core';
 import type * as ts from 'typescript';
-import { getComponentType, getVariableType } from './utils';
+import { getComponentType } from './utils';
 
 export function getComponentEvents(
 	ts: typeof import('typescript'),
 	program: ts.Program,
-	fileName: string,
+	virtualCode: VueVirtualCode,
 	tag: string,
 ): string[] {
-	const checker = program.getTypeChecker();
-	const components = getVariableType(ts, program, fileName, names.components);
-	if (!components) {
+	const sourceFile = program.getSourceFile(virtualCode.fileName);
+	if (!sourceFile) {
 		return [];
 	}
 
-	const componentType = getComponentType(ts, program, fileName, components, tag);
+	const checker = program.getTypeChecker();
+	const componentType = getComponentType(ts, checker, sourceFile, virtualCode, tag);
 	if (!componentType) {
 		return [];
 	}
@@ -28,15 +28,15 @@ export function getComponentEvents(
 	// 	}
 	// }
 
-	for (const sig of componentType.getConstructSignatures()) {
+	for (const sig of componentType.type.getConstructSignatures()) {
 		const instanceType = sig.getReturnType();
 		const emitSymbol = instanceType.getProperty('$emit');
 		if (emitSymbol) {
-			const emitType = checker.getTypeOfSymbolAtLocation(emitSymbol, components.node);
+			const emitType = checker.getTypeOfSymbolAtLocation(emitSymbol, componentType.node);
 			for (const call of emitType.getCallSignatures()) {
 				if (call.parameters.length) {
 					const eventNameParamSymbol = call.parameters[0]!;
-					const eventNameParamType = checker.getTypeOfSymbolAtLocation(eventNameParamSymbol, components.node);
+					const eventNameParamType = checker.getTypeOfSymbolAtLocation(eventNameParamSymbol, componentType.node);
 					if (eventNameParamType.isStringLiteral()) {
 						result.add(eventNameParamType.value);
 					}
diff --git a/packages/typescript-plugin/lib/requests/getComponentNames.ts b/packages/typescript-plugin/lib/requests/getComponentNames.ts
@@ -1,18 +1,27 @@
-import { names } from '@vue/language-core';
+import { names, tsCodegen, type VueVirtualCode } from '@vue/language-core';
 import type * as ts from 'typescript';
 import { getSelfComponentName, getVariableType } from './utils';
 
 export function getComponentNames(
 	ts: typeof import('typescript'),
 	program: ts.Program,
-	fileName: string,
+	{ fileName, sfc }: VueVirtualCode,
 ): string[] {
-	const componentNames = getVariableType(ts, program, fileName, names.components)
+	const sourceFile = program.getSourceFile(fileName);
+	if (!sourceFile) {
+		return [];
+	}
+
+	const checker = program.getTypeChecker();
+	const componentNames = getVariableType(ts, checker, sourceFile, names.components)
 		?.type
 		.getProperties()
 		.map(c => c.name)
 		.filter(entry => !entry.includes('$') && !entry.startsWith('_'))
 		?? [];
+
 	componentNames.push(getSelfComponentName(fileName));
-	return componentNames;
+	componentNames.push(...tsCodegen.get(sfc)?.getImportComponentNames() ?? []);
+
+	return [...new Set(componentNames)];
 }
diff --git a/packages/typescript-plugin/lib/requests/getComponentProps.ts b/packages/typescript-plugin/lib/requests/getComponentProps.ts
@@ -1,6 +1,6 @@
-import { names } from '@vue/language-core';
+import type { VueVirtualCode } from '@vue/language-core';
 import type * as ts from 'typescript';
-import { getComponentType, getVariableType } from './utils';
+import { getComponentType } from './utils';
 
 export interface ComponentPropInfo {
 	name: string;
@@ -14,38 +14,38 @@ export interface ComponentPropInfo {
 export function getComponentProps(
 	ts: typeof import('typescript'),
 	program: ts.Program,
-	fileName: string,
+	virtualCode: VueVirtualCode,
 	tag: string,
 ): ComponentPropInfo[] {
-	const components = getVariableType(ts, program, fileName, names.components);
-	if (!components) {
+	const sourceFile = program.getSourceFile(virtualCode.fileName);
+	if (!sourceFile) {
 		return [];
 	}
 
-	const componentType = getComponentType(ts, program, fileName, components, tag);
+	const checker = program.getTypeChecker();
+	const componentType = getComponentType(ts, checker, sourceFile, virtualCode, tag);
 	if (!componentType) {
 		return [];
 	}
 
 	const result = new Map<string, ComponentPropInfo>();
-	const checker = program.getTypeChecker();
 
-	for (const sig of componentType.getCallSignatures()) {
+	for (const sig of componentType.type.getCallSignatures()) {
 		if (sig.parameters.length) {
 			const propParam = sig.parameters[0]!;
-			const propsType = checker.getTypeOfSymbolAtLocation(propParam, components.node);
+			const propsType = checker.getTypeOfSymbolAtLocation(propParam, componentType.node);
 			const props = propsType.getProperties();
 			for (const prop of props) {
 				handlePropSymbol(prop);
 			}
 		}
 	}
 
-	for (const sig of componentType.getConstructSignatures()) {
+	for (const sig of componentType.type.getConstructSignatures()) {
 		const instanceType = sig.getReturnType();
 		const propsSymbol = instanceType.getProperty('$props');
 		if (propsSymbol) {
-			const propsType = checker.getTypeOfSymbolAtLocation(propsSymbol, components.node);
+			const propsType = checker.getTypeOfSymbolAtLocation(propsSymbol, componentType.node);
 			const props = propsType.getProperties();
 			for (const prop of props) {
 				handlePropSymbol(prop);
diff --git a/packages/typescript-plugin/lib/requests/getComponentSlots.ts b/packages/typescript-plugin/lib/requests/getComponentSlots.ts
@@ -12,8 +12,14 @@ export function getComponentSlots(
 		return [];
 	}
 
+	const sourceFile = program.getSourceFile(virtualCode.fileName);
+	if (!sourceFile) {
+		return [];
+	}
+
+	const checker = program.getTypeChecker();
 	const assignName = codegen.getSetupSlotsAssignName() ?? names.slots;
-	const slots = getVariableType(ts, program, virtualCode.fileName, assignName);
+	const slots = getVariableType(ts, checker, sourceFile, assignName);
 	if (!slots) {
 		return [];
 	}
diff --git a/packages/typescript-plugin/lib/requests/utils.ts b/packages/typescript-plugin/lib/requests/utils.ts

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`#!/usr/bin/env node`
`2`		`-// @ts-check`
`3`	`2`	`require('../index.js').run();`