chore: don't deconstruct uriConverter

Author: johnsoncodehk

packages/kit/lib/createChecker.ts

@@ -112,8 +112,10 @@ function createTypeScriptCheckerWorker(
 			typescript: {
 				configFileName,
 				sys: ts.sys,
-				asFileName,
-				asUri,
+				uriConverter: {
+					asFileName,
+					asUri,
+				},
 				...createLanguageServiceHost(
 					ts,
 					ts.sys,

packages/language-server/lib/project/typescriptProject.ts

@@ -238,7 +238,7 @@ export function createTypeScriptProject(
 				server,
 				serviceEnv,
 				workspaceFolder,
-				{ asUri: uriConverter.asUri, asFileName: uriConverter.asFileName },
+				uriConverter,
 				create
 			);
 			configProjects.set(tsconfigUri, projectPromise);
@@ -259,7 +259,7 @@ export function createTypeScriptProject(
 					server,
 					serviceEnv,
 					workspaceFolder,
-					{ asUri: uriConverter.asUri, asFileName: uriConverter.asFileName },
+					uriConverter,
 					create
 				);
 			})());

packages/language-server/lib/project/typescriptProjectLs.ts

@@ -20,8 +20,10 @@ export interface ProjectExposeContext {
 	configFileName: string | undefined;
 	projectHost: TypeScriptProjectHost;
 	sys: ReturnType<typeof createSys>;
-	asUri(fileName: string): URI;
-	asFileName(scriptId: URI): string;
+	uriConverter: {
+		asUri(fileName: string): URI;
+		asFileName(uri: URI): string;
+	};
 }
 
 const fsFileSnapshots = createUriMap<[number | undefined, ts.IScriptSnapshot | undefined]>();
@@ -33,7 +35,7 @@ export async function createTypeScriptLS(
 	server: LanguageServer,
 	serviceEnv: LanguageServiceEnvironment,
 	workspaceFolder: URI,
-	{ asUri, asFileName }: {
+	uriConverter: {
 		asUri(fileName: string): URI;
 		asFileName(uri: URI): string;
 	},
@@ -45,15 +47,11 @@ export async function createTypeScriptLS(
 		}): void;
 	}>
 ): Promise<TypeScriptProjectLS> {
-
 	let parsedCommandLine: ts.ParsedCommandLine;
 	let projectVersion = 0;
 
-	const getCurrentDirectory = () => asFileName(workspaceFolder);
-	const sys = createSys(ts.sys, serviceEnv, getCurrentDirectory, {
-		asFileName,
-		asUri,
-	});
+	const getCurrentDirectory = () => uriConverter.asFileName(workspaceFolder);
+	const sys = createSys(ts.sys, serviceEnv, getCurrentDirectory, uriConverter);
 	const projectHost: TypeScriptProjectHost = {
 		getCurrentDirectory,
 		getProjectVersion() {
@@ -63,7 +61,7 @@ export async function createTypeScriptLS(
 			return rootFiles;
 		},
 		getScriptSnapshot(fileName) {
-			const uri = asUri(fileName);
+			const uri = uriConverter.asUri(fileName);
 			const documentKey = server.getSyncedDocumentKey(uri) ?? uri.toString();
 			const document = server.documents.get(documentKey);
 			askedFiles.set(uri, true);
@@ -84,8 +82,7 @@ export async function createTypeScriptLS(
 		configFileName: typeof tsconfig === 'string' ? tsconfig : undefined,
 		projectHost,
 		sys,
-		asFileName,
-		asUri,
+		uriConverter,
 	});
 	const askedFiles = createUriMap<boolean>();
 	const docOpenWatcher = server.documents.onDidOpen(({ document }) => updateFsCacheFromSyncedDocument(document));
@@ -116,7 +113,7 @@ export async function createTypeScriptLS(
 			else {
 				// fs files
 				const cache = fsFileSnapshots.get(uri);
-				const fileName = asFileName(uri);
+				const fileName = uriConverter.asFileName(uri);
 				const modifiedTime = sys.getModifiedTime?.(fileName)?.valueOf();
 				if (!cache || cache[0] !== modifiedTime) {
 					if (sys.fileExists(fileName)) {
@@ -143,13 +140,12 @@ export async function createTypeScriptLS(
 		typescript: {
 			configFileName: typeof tsconfig === 'string' ? tsconfig : undefined,
 			sys,
-			asUri,
-			asFileName,
+			uriConverter,
 			...createLanguageServiceHost(
 				ts,
 				sys,
 				language,
-				asUri,
+				s => uriConverter.asUri(s),
 				projectHost
 			),
 		},
@@ -184,7 +180,7 @@ export async function createTypeScriptLS(
 
 	function updateFsCacheFromSyncedDocument(document: SnapshotDocument) {
 		const uri = URI.parse(document.uri);
-		const fileName = asFileName(uri);
+		const fileName = uriConverter.asFileName(uri);
 		if (fsFileSnapshots.has(uri) || sys.fileExists(fileName)) {
 			const modifiedTime = sys.getModifiedTime?.(fileName);
 			fsFileSnapshots.set(uri, [modifiedTime?.valueOf(), document.getSnapshot()]);
@@ -195,7 +191,7 @@ export async function createTypeScriptLS(
 		parsedCommandLine = await createParsedCommandLine(
 			ts,
 			sys,
-			asFileName(workspaceFolder),
+			uriConverter.asFileName(workspaceFolder),
 			tsconfig,
 			languagePlugins.map(plugin => plugin.typescript?.extraFileExtensions ?? []).flat()
 		);

packages/language-server/lib/register/registerEditorFeatures.ts

@@ -55,8 +55,8 @@ export function registerEditorFeatures(server: LanguageServer) {
 		const languageService = (await server.project.getLanguageService(uri));
 		const tsProject = languageService.context.project.typescript;
 		if (tsProject?.configFileName) {
-			const { configFileName, asUri } = tsProject;
-			return { uri: asUri(configFileName).toString() };
+			const { configFileName, uriConverter } = tsProject;
+			return { uri: uriConverter.asUri(configFileName).toString() };
 		}
 	});
 	server.connection.onRequest(GetVirtualFileRequest.type, async document => {
@@ -123,7 +123,7 @@ export function registerEditorFeatures(server: LanguageServer) {
 					}
 				}
 				else {
-					const uri = tsProject.asUri(fileName);
+					const uri = tsProject.uriConverter.asUri(fileName);
 					const sourceScript = languageService.context.language.scripts.get(uri);
 					if (sourceScript?.generated) {
 						const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);

packages/monaco/worker.ts

@@ -149,13 +149,12 @@ export function createTypeScriptWorkerService<T = {}>({
 		typescript: {
 			configFileName: undefined,
 			sys,
-			asFileName: uriConverter.asFileName,
-			asUri: uriConverter.asUri,
+			uriConverter,
 			...createLanguageServiceHost(
 				ts,
 				sys,
 				language,
-				uriConverter.asUri,
+				s => uriConverter.asUri(s),
 				{
 					getCurrentDirectory() {
 						return sys.getCurrentDirectory();

packages/typescript/index.ts

@@ -20,8 +20,10 @@ declare module '@volar/language-service' {
 			};
 			languageServiceHost: ts.LanguageServiceHost;
 			getExtraServiceScript(fileName: string): TypeScriptExtraServiceScript | undefined;
-			asUri(fileName: string): URI;
-			asFileName(uri: URI): string;
+			uriConverter: {
+				asUri(fileName: string): URI;
+				asFileName(uri: URI): string;
+			};
 		};
 	}
 }