refactor(typescript-plugin): remove unnecessary isTsPlugin and asScriptId

KazariEX · KazariEX · commit f24ca40d611c · 2025-07-24T21:04:36.000+08:00
diff --git a/packages/typescript-plugin/index.ts b/packages/typescript-plugin/index.ts
@@ -40,7 +40,6 @@ export = createLanguageServicePlugin(
 					language,
 					info.languageService,
 					vueOptions,
-					fileName => fileName,
 				);
 
 				// #3963
@@ -166,8 +165,6 @@ export = createLanguageServicePlugin(
 				languageService: service[2],
 				languageServiceHost: service[1],
 				language: service[0],
-				isTsPlugin: true,
-				asScriptId: (fileName: string) => fileName,
 			};
 		}
 	},
diff --git a/packages/typescript-plugin/lib/common.ts b/packages/typescript-plugin/lib/common.ts
@@ -4,24 +4,23 @@ import type * as ts from 'typescript';
 
 const windowsPathReg = /\\/g;
 
-export function createVueLanguageServiceProxy<T>(
+export function createVueLanguageServiceProxy(
 	ts: typeof import('typescript'),
-	language: Language<T>,
+	language: Language<string>,
 	languageService: ts.LanguageService,
 	vueOptions: VueCompilerOptions,
-	asScriptId: (fileName: string) => T,
 ) {
 	const proxyCache = new Map<string | symbol, Function | undefined>();
 	const getProxyMethod = (target: ts.LanguageService, p: string | symbol): Function | undefined => {
 		switch (p) {
 			case 'getCompletionsAtPosition':
-				return getCompletionsAtPosition(ts, language, vueOptions, asScriptId, target[p]);
+				return getCompletionsAtPosition(ts, language, vueOptions, target[p]);
 			case 'getCompletionEntryDetails':
-				return getCompletionEntryDetails(language, asScriptId, target[p]);
+				return getCompletionEntryDetails(language, target[p]);
 			case 'getCodeFixesAtPosition':
 				return getCodeFixesAtPosition(target[p]);
 			case 'getDefinitionAndBoundSpan':
-				return getDefinitionAndBoundSpan(ts, language, languageService, vueOptions, asScriptId, target[p]);
+				return getDefinitionAndBoundSpan(ts, language, languageService, vueOptions, target[p]);
 		}
 	};
 
@@ -44,11 +43,10 @@ export function createVueLanguageServiceProxy<T>(
 	});
 }
 
-function getCompletionsAtPosition<T>(
+function getCompletionsAtPosition(
 	ts: typeof import('typescript'),
-	language: Language<T>,
+	language: Language<string>,
 	vueOptions: VueCompilerOptions,
-	asScriptId: (fileName: string) => T,
 	getCompletionsAtPosition: ts.LanguageService['getCompletionsAtPosition'],
 ): ts.LanguageService['getCompletionsAtPosition'] {
 	return (filePath, position, options, formattingSettings) => {
@@ -63,7 +61,7 @@ function getCompletionsAtPosition<T>(
 			);
 
 			// filter global variables in template and styles
-			const sourceScript = language.scripts.get(asScriptId(fileName));
+			const sourceScript = language.scripts.get(fileName);
 			const root = sourceScript?.generated?.root;
 			if (root instanceof VueVirtualCode) {
 				const blocks = [
@@ -131,9 +129,8 @@ function getCompletionsAtPosition<T>(
 	};
 }
 
-function getCompletionEntryDetails<T>(
-	language: Language<T>,
-	asScriptId: (fileName: string) => T,
+function getCompletionEntryDetails(
+	language: Language<string>,
 	getCompletionEntryDetails: ts.LanguageService['getCompletionEntryDetails'],
 ): ts.LanguageService['getCompletionEntryDetails'] {
 	return (...args) => {
@@ -158,7 +155,7 @@ function getCompletionEntryDetails<T>(
 		if (args[6]?.__isAutoImport) {
 			// @ts-expect-error
 			const { fileName } = args[6].__isAutoImport;
-			const sourceScript = language.scripts.get(asScriptId(fileName));
+			const sourceScript = language.scripts.get(fileName);
 			if (sourceScript?.generated?.root instanceof VueVirtualCode) {
 				const sfc = sourceScript.generated.root.vueSfc;
 				if (!sfc?.descriptor.script && !sfc?.descriptor.scriptSetup) {
@@ -190,12 +187,11 @@ function getCodeFixesAtPosition(
 	};
 }
 
-function getDefinitionAndBoundSpan<T>(
+function getDefinitionAndBoundSpan(
 	ts: typeof import('typescript'),
-	language: Language<T>,
+	language: Language<string>,
 	languageService: ts.LanguageService,
 	vueOptions: VueCompilerOptions,
-	asScriptId: (fileName: string) => T,
 	getDefinitionAndBoundSpan: ts.LanguageService['getDefinitionAndBoundSpan'],
 ): ts.LanguageService['getDefinitionAndBoundSpan'] {
 	return (fileName, position) => {
@@ -205,7 +201,7 @@ function getDefinitionAndBoundSpan<T>(
 		}
 
 		const program = languageService.getProgram()!;
-		const sourceScript = language.scripts.get(asScriptId(fileName));
+		const sourceScript = language.scripts.get(fileName);
 		if (!sourceScript?.generated) {
 			return result;
 		}
diff --git a/packages/typescript-plugin/lib/requests/collectExtractProps.ts b/packages/typescript-plugin/lib/requests/collectExtractProps.ts
@@ -6,9 +6,9 @@ export function collectExtractProps(
 	fileName: string,
 	templateCodeRange: [number, number],
 ) {
-	const { typescript: ts, languageService, language, isTsPlugin, asScriptId } = this;
+	const { typescript: ts, languageService, language } = this;
 
-	const sourceScript = language.scripts.get(asScriptId(fileName));
+	const sourceScript = language.scripts.get(fileName);
 	if (!sourceScript?.generated) {
 		return;
 	}
@@ -41,7 +41,7 @@ export function collectExtractProps(
 			for (const map of maps) {
 				let mapped = false;
 				for (
-					const source of map.toSourceLocation(name.getEnd() - (isTsPlugin ? sourceScript.snapshot.getLength() : 0))
+					const source of map.toSourceLocation(name.getEnd() - sourceScript.snapshot.getLength())
 				) {
 					if (
 						source[0] >= sfc.template!.startTagEnd + templateCodeRange[0]
diff --git a/packages/typescript-plugin/lib/requests/getComponentDirectives.ts b/packages/typescript-plugin/lib/requests/getComponentDirectives.ts
@@ -15,8 +15,8 @@ export function getComponentDirectives(
 	this: RequestContext,
 	fileName: string,
 ) {
-	const { typescript: ts, language, languageService, asScriptId } = this;
-	const volarFile = language.scripts.get(asScriptId(fileName));
+	const { typescript: ts, language, languageService } = this;
+	const volarFile = language.scripts.get(fileName);
 	if (!(volarFile?.generated?.root instanceof VueVirtualCode)) {
 		return;
 	}
diff --git a/packages/typescript-plugin/lib/requests/getComponentEvents.ts b/packages/typescript-plugin/lib/requests/getComponentEvents.ts
@@ -7,8 +7,8 @@ export function getComponentEvents(
 	fileName: string,
 	tag: string,
 ) {
-	const { typescript: ts, language, languageService, asScriptId } = this;
-	const volarFile = language.scripts.get(asScriptId(fileName));
+	const { typescript: ts, language, languageService } = this;
+	const volarFile = language.scripts.get(fileName);
 	if (!(volarFile?.generated?.root instanceof VueVirtualCode)) {
 		return;
 	}
diff --git a/packages/typescript-plugin/lib/requests/getComponentNames.ts b/packages/typescript-plugin/lib/requests/getComponentNames.ts
@@ -7,8 +7,8 @@ export function getComponentNames(
 	this: RequestContext,
 	fileName: string,
 ) {
-	const { typescript: ts, language, languageService, asScriptId } = this;
-	const volarFile = language.scripts.get(asScriptId(fileName));
+	const { typescript: ts, language, languageService } = this;
+	const volarFile = language.scripts.get(fileName);
 	if (!(volarFile?.generated?.root instanceof VueVirtualCode)) {
 		return;
 	}
diff --git a/packages/typescript-plugin/lib/requests/getComponentProps.ts b/packages/typescript-plugin/lib/requests/getComponentProps.ts
@@ -17,8 +17,8 @@ export function getComponentProps(
 	fileName: string,
 	tag: string,
 ) {
-	const { typescript: ts, language, languageService, asScriptId } = this;
-	const volarFile = language.scripts.get(asScriptId(fileName));
+	const { typescript: ts, language, languageService } = this;
+	const volarFile = language.scripts.get(fileName);
 	if (!(volarFile?.generated?.root instanceof VueVirtualCode)) {
 		return;
 	}
diff --git a/packages/typescript-plugin/lib/requests/getComponentSlots.ts b/packages/typescript-plugin/lib/requests/getComponentSlots.ts
@@ -6,8 +6,8 @@ export function getComponentSlots(
 	this: RequestContext,
 	fileName: string,
 ) {
-	const { typescript: ts, language, languageService, asScriptId } = this;
-	const volarFile = language.scripts.get(asScriptId(fileName));
+	const { typescript: ts, language, languageService } = this;
+	const volarFile = language.scripts.get(fileName);
 	if (!(volarFile?.generated?.root instanceof VueVirtualCode)) {
 		return;
 	}
diff --git a/packages/typescript-plugin/lib/requests/getElementAttrs.ts b/packages/typescript-plugin/lib/requests/getElementAttrs.ts
@@ -7,8 +7,8 @@ export function getElementAttrs(
 	fileName: string,
 	tagName: string,
 ) {
-	const { typescript: ts, language, languageService, asScriptId } = this;
-	const volarFile = language.scripts.get(asScriptId(fileName));
+	const { typescript: ts, language, languageService } = this;
+	const volarFile = language.scripts.get(fileName);
 	if (!(volarFile?.generated?.root instanceof VueVirtualCode)) {
 		return;
 	}
diff --git a/packages/typescript-plugin/lib/requests/getElementNames.ts b/packages/typescript-plugin/lib/requests/getElementNames.ts
@@ -7,8 +7,8 @@ export function getElementNames(
 	this: RequestContext,
 	fileName: string,
 ) {
-	const { typescript: ts, language, languageService, asScriptId } = this;
-	const volarFile = language.scripts.get(asScriptId(fileName));
+	const { typescript: ts, language, languageService } = this;
+	const volarFile = language.scripts.get(fileName);
 	if (!(volarFile?.generated?.root instanceof VueVirtualCode)) {
 		return;
 	}
diff --git a/packages/typescript-plugin/lib/requests/getPropertiesAtLocation.ts b/packages/typescript-plugin/lib/requests/getPropertiesAtLocation.ts
@@ -9,10 +9,10 @@ export function getPropertiesAtLocation(
 	fileName: string,
 	position: number,
 ) {
-	const { languageService, language, typescript: ts, isTsPlugin, asScriptId } = this;
+	const { languageService, language, typescript: ts } = this;
 
 	// mapping
-	const file = language.scripts.get(asScriptId(fileName));
+	const file = language.scripts.get(fileName);
 	if (file?.generated) {
 		const virtualScript = file.generated.languagePlugin.typescript?.getServiceScript(file.generated.root);
 		if (!virtualScript) {
@@ -34,9 +34,7 @@ export function getPropertiesAtLocation(
 		if (!mapped) {
 			return;
 		}
-		if (isTsPlugin) {
-			position += file.snapshot.getLength();
-		}
+		position += file.snapshot.getLength();
 	}
 
 	const program = languageService.getProgram()!;
diff --git a/packages/typescript-plugin/lib/requests/types.ts b/packages/typescript-plugin/lib/requests/types.ts
@@ -1,11 +1,9 @@
 import type { Language } from '@vue/language-core';
 import type * as ts from 'typescript';
 
-export interface RequestContext<T = any> {
+export interface RequestContext {
 	typescript: typeof ts;
 	languageService: ts.LanguageService;
 	languageServiceHost: ts.LanguageServiceHost;
-	language: Language<T>;
-	isTsPlugin: boolean;
-	asScriptId: (fileName: string) => T;
+	language: Language<string>;
 }
