refactor(typescript-plugin): explicitly annotate requests with type

Author: KazariEX

packages/language-service/lib/plugins/vue-document-drop.ts

@@ -64,14 +64,13 @@ export function create(
 							serviceScript.code.snapshot,
 						);
 						const preferences = await getUserPreferences(context, tsDocument);
-						const importPathRequest = await getImportPathForFile(
-							root.fileName,
-							incomingFileName,
-							preferences,
-						);
-						if (importPathRequest) {
-							importPath = importPathRequest;
-						}
+						importPath = (
+							await getImportPathForFile(
+								root.fileName,
+								incomingFileName,
+								preferences,
+							) ?? {}
+						).path;
 					}
 
 					if (!importPath) {

packages/typescript-plugin/lib/requests/collectExtractProps.ts

@@ -1,11 +1,17 @@
 import { isSemanticTokensEnabled, VueVirtualCode } from '@vue/language-core';
 import type { RequestContext } from './types';
 
+interface ExtractPropsInfo {
+	name: string;
+	type: string;
+	model: boolean;
+}
+
 export function collectExtractProps(
 	this: RequestContext,
 	fileName: string,
 	templateCodeRange: [number, number],
-) {
+): ExtractPropsInfo[] {
 	const { typescript: ts, languageService, language } = this;
 
 	const sourceScript = language.scripts.get(fileName);
@@ -14,11 +20,7 @@ export function collectExtractProps(
 		return [];
 	}
 
-	const result = new Map<string, {
-		name: string;
-		type: string;
-		model: boolean;
-	}>();
+	const result = new Map<string, ExtractPropsInfo>();
 	const program = languageService.getProgram()!;
 	const sourceFile = program.getSourceFile(fileName)!;
 	const checker = program.getTypeChecker();

packages/typescript-plugin/lib/requests/getComponentDirectives.ts

@@ -14,7 +14,7 @@ const builtInDirectives = new Set([
 export function getComponentDirectives(
 	this: RequestContext,
 	fileName: string,
-) {
+): string[] {
 	const { typescript: ts, language, languageService } = this;
 
 	const sourceScript = language.scripts.get(fileName);

packages/typescript-plugin/lib/requests/getComponentEvents.ts

@@ -6,7 +6,7 @@ export function getComponentEvents(
 	this: RequestContext,
 	fileName: string,
 	tag: string,
-) {
+): string[] {
 	const { typescript: ts, language, languageService } = this;
 
 	const sourceScript = language.scripts.get(fileName);

packages/typescript-plugin/lib/requests/getComponentNames.ts

@@ -5,7 +5,7 @@ import { getSelfComponentName, getVariableType } from './utils';
 export function getComponentNames(
 	this: RequestContext,
 	fileName: string,
-) {
+): string[] {
 	const { typescript: ts, language, languageService } = this;
 
 	const sourceScript = language.scripts.get(fileName);

packages/typescript-plugin/lib/requests/getComponentProps.ts

@@ -16,7 +16,7 @@ export function getComponentProps(
 	this: RequestContext,
 	fileName: string,
 	tag: string,
-) {
+): ComponentPropInfo[] {
 	const { typescript: ts, language, languageService } = this;
 
 	const sourceScript = language.scripts.get(fileName);

packages/typescript-plugin/lib/requests/getComponentSlots.ts

@@ -5,7 +5,7 @@ import { getVariableType } from './utils';
 export function getComponentSlots(
 	this: RequestContext,
 	fileName: string,
-) {
+): string[] {
 	const { typescript: ts, language, languageService } = this;
 
 	const sourceScript = language.scripts.get(fileName);
@@ -16,7 +16,7 @@ export function getComponentSlots(
 
 	const codegen = tsCodegen.get(root.sfc);
 	if (!codegen) {
-		return;
+		return [];
 	}
 
 	const assignName = codegen.getSetupSlotsAssignName() ?? `__VLS_slots`;

packages/typescript-plugin/lib/requests/getElementAttrs.ts

@@ -6,7 +6,7 @@ export function getElementAttrs(
 	this: RequestContext,
 	fileName: string,
 	tagName: string,
-) {
+): string[] {
 	const { typescript: ts, language, languageService } = this;
 
 	const sourceScript = language.scripts.get(fileName);

packages/typescript-plugin/lib/requests/getElementNames.ts

@@ -5,7 +5,7 @@ import { getVariableType } from './utils';
 export function getElementNames(
 	this: RequestContext,
 	fileName: string,
-) {
+): string[] {
 	const { typescript: ts, language, languageService } = this;
 
 	const sourceScript = language.scripts.get(fileName);

packages/typescript-plugin/lib/requests/getImportPathForFile.ts

@@ -6,13 +6,13 @@ export function getImportPathForFile(
 	fileName: string,
 	incomingFileName: string,
 	preferences: ts.UserPreferences,
-) {
+): { path?: string } {
 	const { typescript: ts, languageService, languageServiceHost } = this;
 	const program = languageService.getProgram();
 	const incomingFile = program?.getSourceFile(incomingFileName);
 	const sourceFile = program?.getSourceFile(fileName);
 	if (!program || !sourceFile || !incomingFile) {
-		return;
+		return {};
 	}
 
 	const getModuleSpecifiersWithCacheInfo: (
@@ -28,7 +28,7 @@ export function getImportPathForFile(
 		computedWithoutCache: boolean;
 	} = (ts as any).moduleSpecifiers.getModuleSpecifiersWithCacheInfo;
 	const resolutionHost = (ts as any).createModuleSpecifierResolutionHost(program, languageServiceHost);
-	const moduleSpecifiers = getModuleSpecifiersWithCacheInfo(
+	const { moduleSpecifiers } = getModuleSpecifiersWithCacheInfo(
 		(incomingFile as any).symbol,
 		program.getTypeChecker(),
 		languageServiceHost.getCompilationSettings(),
@@ -37,7 +37,7 @@ export function getImportPathForFile(
 		preferences,
 	);
 
-	for (const moduleSpecifier of moduleSpecifiers.moduleSpecifiers) {
-		return moduleSpecifier;
-	}
+	return {
+		path: moduleSpecifiers[0],
+	};
 }