chore: fix types

vuejs · Jul 2, 2024 · 707bd17 · 707bd17
1 parent 7ace504
commit 707bd17
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 51 deletions.
diff --git a/packages/language-server/lib/initialize.ts b/packages/language-server/lib/initialize.ts
@@ -18,7 +18,7 @@ export function initialize(
 		createTypeScriptProject(
 			ts,
 			tsLocalized,
-			async ({ configFileName, sys, projectHost, asFileName }) => {
+			async ({ configFileName, sys, projectHost, uriConverter }) => {
 				let compilerOptions: ts.CompilerOptions;
 				let vueCompilerOptions: VueCompilerOptions;
 				if (configFileName) {
@@ -41,7 +41,7 @@ export function initialize(
 				return {
 					languagePlugins: [createVueLanguagePlugin(
 						ts,
-						asFileName,
+						s => uriConverter.asFileName(s),
 						() => projectHost.getProjectVersion?.() ?? '',
 						fileName => {
 							const fileMap = new FileMap(sys.useCaseSensitiveFileNames ?? false);

diff --git a/packages/language-service/index.ts b/packages/language-service/index.ts
@@ -70,7 +70,7 @@ export function getFullLanguageServicePlugins(ts: typeof import('typescript')):
 							context.language,
 							languageService,
 							context.project.vue.compilerOptions,
-							context.project.typescript.asUri
+							s => context.project.typescript?.uriConverter.asUri(s)
 						);
 						languageService.getCompletionsAtPosition = proxy.getCompletionsAtPosition;
 						languageService.getCompletionEntryDetails = proxy.getCompletionEntryDetails;
@@ -99,7 +99,7 @@ export function getFullLanguageServicePlugins(ts: typeof import('typescript')):
 			languageService,
 			languageServiceHost: context.project.typescript.languageServiceHost,
 			isTsPlugin: false,
-			getFileId: context.project.typescript.asUri,
+			getFileId: s => context.project.typescript!.uriConverter.asUri(s),
 		};
 		return {
 			async collectExtractProps(...args) {

diff --git a/packages/language-service/lib/plugins/vue-autoinsert-dotvalue.ts b/packages/language-service/lib/plugins/vue-autoinsert-dotvalue.ts
@@ -68,7 +68,7 @@ export function create(
 					let ast: ts.SourceFile | undefined;
 					let sourceCodeOffset = document.offsetAt(selection);
 
-					const fileName = context.project.typescript?.asFileName(sourceScript.id)
+					const fileName = context.project.typescript?.uriConverter.asFileName(sourceScript.id)
 						?? sourceScript.id.fsPath.replace(/\\/g, '/');
 
 					if (sourceScript.generated) {

diff --git a/packages/language-service/lib/plugins/vue-document-drop.ts b/packages/language-service/lib/plugins/vue-document-drop.ts
@@ -65,7 +65,7 @@ export function create(
 					const additionalEdit: vscode.WorkspaceEdit = {};
 					const code = [...forEachEmbeddedCode(vueVirtualCode)].find(code => code.id === (sfc.scriptSetup ? 'scriptsetup_raw' : 'script_raw'))!;
 					const lastImportNode = getLastImportNode(ts, script.ast);
-					const incomingFileName = context.project.typescript?.asFileName(URI.parse(importUri))
+					const incomingFileName = context.project.typescript?.uriConverter.asFileName(URI.parse(importUri))
 						?? URI.parse(importUri).fsPath.replace(/\\/g, '/');
 
 					let importPath: string | undefined;

diff --git a/packages/language-service/tests/utils/createTester.ts b/packages/language-service/tests/utils/createTester.ts
@@ -71,8 +71,10 @@ function createTester(rootUri: URI) {
 	project.typescript = {
 		configFileName: realTsConfig,
 		sys: ts.sys,
-		asFileName: uriToFileName,
-		asUri: fileNameToUri,
+		uriConverter: {
+			asFileName: uriToFileName,
+			asUri: fileNameToUri,
+		},
 		...createLanguageServiceHost(ts, ts.sys, language, fileNameToUri, projectHost),
 	};
 	project.vue = {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml