exclude pathsBasePath from document registry cache key

Your Name · Your Name · commit 2974d938aa60 · 2026-03-10T18:34:11.000+03:00
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
@@ -959,7 +959,7 @@ function compilerOptionValueToString(value: unknown): string {
 
 /** @internal */
 export function getKeyForCompilerOptions(options: CompilerOptions, affectingOptionDeclarations: readonly CommandLineOption[]): string {
-    return affectingOptionDeclarations.map(option => compilerOptionValueToString(getCompilerOptionValue(options, option))).join("|") + `|${options.pathsBasePath}`;
+    return affectingOptionDeclarations.map(option => compilerOptionValueToString(getCompilerOptionValue(options, option))).join("|");
 }
 
 /** @internal */
@@ -1042,7 +1042,7 @@ function createCacheWithRedirects<K, V>(ownOptions: CompilerOptions | undefined,
     function getRedirectsCacheKey(options: CompilerOptions) {
         let result = optionsToRedirectsKey.get(options);
         if (!result) {
-            optionsToRedirectsKey.set(options, result = getKeyForCompilerOptions(options, moduleResolutionOptionDeclarations) as RedirectsCacheKey);
+            optionsToRedirectsKey.set(options, result = (getKeyForCompilerOptions(options, moduleResolutionOptionDeclarations) + `|${options.pathsBasePath}`) as RedirectsCacheKey);
         }
         return result;
     }
diff --git a/src/testRunner/unittests/tsserver/documentRegistry.ts b/src/testRunner/unittests/tsserver/documentRegistry.ts
@@ -123,6 +123,63 @@ describe("unittests:: tsserver:: documentRegistry:: document registry in project
     });
 });
 
+describe("unittests:: tsserver:: documentRegistry:: projects with different pathsBasePath share the same document registry bucket", () => {
+    function getProject(session: TestSession, config: File) {
+        return session.getProjectService().configuredProjects.get(config.path.toLowerCase())!;
+    }
+
+    it("shares document registry bucket for projects with same compiler options but different pathsBasePath", () => {
+        const sharedFile: File = {
+            path: "/home/src/projects/shared/utils.d.ts",
+            content: "export const util: number;",
+        };
+
+        const configA: File = {
+            path: "/home/src/projects/projectA/tsconfig.json",
+            content: jsonToReadableText({
+                compilerOptions: { paths: { "@utils": ["../shared/utils.d.ts"] } },
+                files: ["index.ts"],
+            }),
+        };
+        const indexA: File = {
+            path: "/home/src/projects/projectA/index.ts",
+            content: `import { util } from "@utils";`,
+        };
+
+        const configB: File = {
+            path: "/home/src/projects/projectB/tsconfig.json",
+            content: jsonToReadableText({
+                compilerOptions: { paths: { "@utils": ["../shared/utils.d.ts"] } },
+                files: ["index.ts"],
+            }),
+        };
+        const indexB: File = {
+            path: "/home/src/projects/projectB/index.ts",
+            content: `import { util } from "@utils";`,
+        };
+
+        const host = TestServerHost.createServerHost([sharedFile, configA, indexA, configB, indexB]);
+        const session = new TestSession(host);
+        openFilesForSession([
+            { file: indexA, projectRootPath: "/home/src/projects/projectA" },
+            { file: indexB, projectRootPath: "/home/src/projects/projectB" },
+        ], session);
+
+        const projectA = getProject(session, configA);
+        const projectB = getProject(session, configB);
+
+        // Both projects should reuse the same source file instance for the shared file
+        const sharedInfo = session.getProjectService().getScriptInfo(sharedFile.path)!;
+        const sourceFileA = projectA.getSourceFile(sharedInfo.path);
+        const sourceFileB = projectB.getSourceFile(sharedInfo.path);
+        assert.equal(sourceFileA, sourceFileB, "Both projects should share the same source file instance from the document registry");
+
+        session.logger.log("DocumentRegistry::");
+        session.logger.log(reportDocumentRegistryStats(session.getProjectService().documentRegistry).join("\n"));
+        baselineTsserverLogs("documentRegistry", "shares document registry bucket for projects with different pathsBasePath", session);
+    });
+});
+
 describe("unittests:: tsserver:: documentRegistry:: works when reusing orphan script info with different scriptKind", () => {
     it("works when reusing orphan script info with different scriptKind", () => {
         const host = TestServerHost.createServerHost({});
diff --git a/tests/baselines/reference/tsserver/documentRegistry/Caches-the-source-file-if-script-info-is-orphan,-and-orphan-script-info-changes.js b/tests/baselines/reference/tsserver/documentRegistry/Caches-the-source-file-if-script-info-is-orphan,-and-orphan-script-info-changes.js
@@ -196,7 +196,7 @@ ScriptInfos::
         /user/username/projects/myproject/tsconfig.json
 
 DocumentRegistry::
-  Key:: undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined
+  Key:: undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined
     /user/username/projects/myproject/index.ts: TS 1
     /user/username/projects/myproject/module1.d.ts: TS 1
     /home/src/tslibs/ts/lib/lib.es2025.full.d.ts: TS 1
@@ -262,7 +262,7 @@ Info seq  [hh:mm:ss:mss] 	Files (2)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 DocumentRegistry::
-  Key:: undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined
+  Key:: undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined
     /user/username/projects/myproject/index.ts: TS 1
     /home/src/tslibs/ts/lib/lib.es2025.full.d.ts: TS 1
 Info seq  [hh:mm:ss:mss] FileWatcher:: Triggered with /user/username/projects/myproject/module1.d.ts 1:: WatchInfo: /user/username/projects/myproject/module1.d.ts 500 undefined WatchType: Closed Script info
@@ -357,7 +357,7 @@ Info seq  [hh:mm:ss:mss] 	Files (3)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 DocumentRegistry::
-  Key:: undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined
+  Key:: undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined
     /user/username/projects/myproject/index.ts: TS 1
     /home/src/tslibs/ts/lib/lib.es2025.full.d.ts: TS 1
     /user/username/projects/myproject/module1.d.ts: TS 1
diff --git a/tests/baselines/reference/tsserver/documentRegistry/Caches-the-source-file-if-script-info-is-orphan.js b/tests/baselines/reference/tsserver/documentRegistry/Caches-the-source-file-if-script-info-is-orphan.js
@@ -196,7 +196,7 @@ ScriptInfos::
         /user/username/projects/myproject/tsconfig.json
 
 DocumentRegistry::
-  Key:: undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined
+  Key:: undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined
     /user/username/projects/myproject/index.ts: TS 1
     /user/username/projects/myproject/module1.d.ts: TS 1
     /home/src/tslibs/ts/lib/lib.es2025.full.d.ts: TS 1
@@ -262,7 +262,7 @@ Info seq  [hh:mm:ss:mss] 	Files (2)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 DocumentRegistry::
-  Key:: undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined
+  Key:: undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined
     /user/username/projects/myproject/index.ts: TS 1
     /home/src/tslibs/ts/lib/lib.es2025.full.d.ts: TS 1
 Before request
@@ -349,7 +349,7 @@ Info seq  [hh:mm:ss:mss] 	Files (3)
 
 Info seq  [hh:mm:ss:mss] -----------------------------------------------
 DocumentRegistry::
-  Key:: undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined
+  Key:: undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined
     /user/username/projects/myproject/index.ts: TS 1
     /home/src/tslibs/ts/lib/lib.es2025.full.d.ts: TS 1
     /user/username/projects/myproject/module1.d.ts: TS 1
diff --git a/tests/baselines/reference/tsserver/documentRegistry/shares-document-registry-bucket-for-projects-with-different-pathsBasePath.js b/tests/baselines/reference/tsserver/documentRegistry/shares-document-registry-bucket-for-projects-with-different-pathsBasePath.js

Original file line number	Diff line number	Diff line change
`@@ -959,7 +959,7 @@ function compilerOptionValueToString(value: unknown): string {`
`959`	`959`
`960`	`960`	`/** @internal */`
`961`	`961`	`export function getKeyForCompilerOptions(options: CompilerOptions, affectingOptionDeclarations: readonly CommandLineOption[]): string {`
`962`		- return affectingOptionDeclarations.map(option => compilerOptionValueToString(getCompilerOptionValue(options, option))).join("\|") + `\|${options.pathsBasePath}`;
	`962`	`+ return affectingOptionDeclarations.map(option => compilerOptionValueToString(getCompilerOptionValue(options, option))).join("\|");`
`963`	`963`	`}`
`964`	`964`
`965`	`965`	`/** @internal */`
`@@ -1042,7 +1042,7 @@ function createCacheWithRedirects<K, V>(ownOptions: CompilerOptions \| undefined,`
`1042`	`1042`	`function getRedirectsCacheKey(options: CompilerOptions) {`
`1043`	`1043`	`let result = optionsToRedirectsKey.get(options);`
`1044`	`1044`	`if (!result) {`
`1045`		`- optionsToRedirectsKey.set(options, result = getKeyForCompilerOptions(options, moduleResolutionOptionDeclarations) as RedirectsCacheKey);`
	`1045`	+ optionsToRedirectsKey.set(options, result = (getKeyForCompilerOptions(options, moduleResolutionOptionDeclarations) + `\|${options.pathsBasePath}`) as RedirectsCacheKey);
`1046`	`1046`	`}`
`1047`	`1047`	`return result;`
`1048`	`1048`	`}`