Lock lib replacement behind option

microsoft · Jan 8, 2025 · 73c5a6b · 73c5a6b
1 parent dd90bc2
commit 73c5a6b
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 8 deletions.
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -4065,6 +4065,17 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
         const existing = resolvedLibProcessing?.get(libFileName);
         if (existing) return existing;
 
+        if (!options.libReplacement) {
+            const result: LibResolution = {
+                resolution: {
+                    resolvedModule: undefined,
+                },
+                actual: combinePaths(defaultLibraryPath, libFileName),
+            };
+            (resolvedLibProcessing ??= new Map()).set(libFileName, result);
+            return result;
+        }
+
         if (structureIsReused !== StructureIsReused.Not && oldProgram && !hasInvalidatedLibResolutions(libFileName)) {
             const oldResolution = oldProgram.resolvedLibReferences?.get(libFileName);
             if (oldResolution) {

diff --git a/src/testRunner/unittests/helpers/libraryResolution.ts b/src/testRunner/unittests/helpers/libraryResolution.ts
@@ -21,23 +21,23 @@ function getSysForLibResolution(libRedirection?: boolean, forTsserver?: boolean)
             /// <reference lib="es5"/>
         `,
         "/home/src/workspace/projects/project1/tsconfig.json": jsonToReadableText({
-            compilerOptions: { composite: true, typeRoots: ["./typeroot1"], lib: ["es5", "dom"], traceResolution: true },
+            compilerOptions: { composite: true, typeRoots: ["./typeroot1"], lib: ["es5", "dom"], traceResolution: true, libReplacement: libRedirection },
         }),
         "/home/src/workspace/projects/project1/typeroot1/sometype/index.d.ts": `export type TheNum = "type1";`,
         "/home/src/workspace/projects/project2/utils.d.ts": `export const y = 10;`,
         "/home/src/workspace/projects/project2/index.ts": `export const y = 10`,
         "/home/src/workspace/projects/project2/tsconfig.json": jsonToReadableText({
-            compilerOptions: { composite: true, lib: ["es5", "dom"], traceResolution: true },
+            compilerOptions: { composite: true, lib: ["es5", "dom"], traceResolution: true, libReplacement: libRedirection },
         }),
         "/home/src/workspace/projects/project3/utils.d.ts": `export const y = 10;`,
         "/home/src/workspace/projects/project3/index.ts": `export const z = 10`,
         "/home/src/workspace/projects/project3/tsconfig.json": jsonToReadableText({
-            compilerOptions: { composite: true, lib: ["es5", "dom"], traceResolution: true },
+            compilerOptions: { composite: true, lib: ["es5", "dom"], traceResolution: true, libReplacement: libRedirection },
         }),
         "/home/src/workspace/projects/project4/utils.d.ts": `export const y = 10;`,
         "/home/src/workspace/projects/project4/index.ts": `export const z = 10`,
         "/home/src/workspace/projects/project4/tsconfig.json": jsonToReadableText({
-            compilerOptions: { composite: true, lib: ["esnext", "dom", "webworker"], traceResolution: true },
+            compilerOptions: { composite: true, lib: ["esnext", "dom", "webworker"], traceResolution: true, libReplacement: libRedirection },
         }),
         [getTypeScriptLibTestLocation("dom")]: "interface DOMInterface { }",
         [getTypeScriptLibTestLocation("webworker")]: "interface WebWorkerInterface { }",
@@ -71,6 +71,7 @@ function getLibResolutionEditOptions(
                                 typeRoots: ["./typeroot1", "./typeroot2"],
                                 lib: ["es5", "dom"],
                                 traceResolution: true,
+                                libReplacement: true,
                             },
                         }),
                     ),
@@ -90,6 +91,7 @@ function getLibResolutionEditOptions(
                                 typeRoots: ["./typeroot1"],
                                 lib: ["es5", "dom"],
                                 traceResolution: true,
+                                libReplacement: true,
                             },
                         }),
                     );
@@ -235,6 +237,7 @@ export function getSysForLibResolutionUnknown(): TestServerHost {
             compilerOptions: {
                 composite: true,
                 traceResolution: true,
+                libReplacement: true,
             },
         }),
         [getTypeScriptLibTestLocation("webworker")]: "interface WebWorkerInterface { }",

diff --git a/tests/cases/compiler/libTypeScriptOverrideSimple.ts b/tests/cases/compiler/libTypeScriptOverrideSimple.ts
@@ -1,4 +1,5 @@
 // @traceResolution: true
+// @libReplacement: true
 
 // @Filename: /node_modules/@typescript/lib-dom/index.d.ts
 interface ABC { abc: string }
@@ -8,4 +9,4 @@ const a: ABC = { abc: "Hello" }
 
 // This should fail because libdom has been replaced
 // by the module above ^
-window.localStorage
+window.localStorage
diff --git a/tests/cases/compiler/libTypeScriptOverrideSimpleConfig.ts b/tests/cases/compiler/libTypeScriptOverrideSimpleConfig.ts
@@ -1,4 +1,5 @@
 // @traceResolution: true
+// @libReplacement: true
 
 // @Filename: /somepath/node_modules/@typescript/lib-dom/index.d.ts
 interface ABC { abc: string }
@@ -10,4 +11,4 @@ const a: ABC = { abc: "Hello" }
 
 // This should fail because libdom has been replaced
 // by the module above ^
-window.localStorage
+window.localStorage
diff --git a/tests/cases/compiler/libTypeScriptSubfileResolving.ts b/tests/cases/compiler/libTypeScriptSubfileResolving.ts
@@ -1,4 +1,5 @@
 // @traceResolution: true
+// @libReplacement: true
 
 // @Filename: /node_modules/@typescript/lib-dom/index.d.ts
 // NOOP
@@ -10,4 +11,4 @@ const a: DOMIterable = { abc: "Hello" }
 
 // This should fail because libdom has been replaced
 // by the module above ^
-window.localStorage
+window.localStorage
diff --git a/tests/cases/compiler/libTypeScriptSubfileResolvingConfig.ts b/tests/cases/compiler/libTypeScriptSubfileResolvingConfig.ts
@@ -1,4 +1,5 @@
 // @traceResolution: true
+// @libReplacement: true
 
 // @Filename: /somepath/node_modules/@typescript/lib-dom/index.d.ts
 // NOOP
@@ -12,4 +13,4 @@ const a: DOMIterable = { abc: "Hello" }
 
 // This should fail because libdom has been replaced
 // by the module above ^
-window.localStorage
+window.localStorage