Maintain libPath resolution in program

Author: sheetalkamat

src/compiler/program.ts

@@ -1469,6 +1469,8 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
     let automaticTypeDirectiveNames: string[] | undefined;
     let automaticTypeDirectiveResolutions: ModeAwareCache<ResolvedTypeReferenceDirectiveWithFailedLookupLocations>;
 
+    let resolvedLibReferences: Map<string, string> | undefined;
+
     // The below settings are to track if a .js file should be add to the program if loaded via searching under node_modules.
     // This works as imported modules are discovered recursively in a depth first manner, specifically:
     // - For each root file, findSourceFile is called.
@@ -1813,6 +1815,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
         sourceFileToPackageName,
         redirectTargetsMap,
         usesUriStyleNodeCoreModules,
+        resolvedLibReferences,
         isEmittedFile,
         getConfigFileParsingDiagnostics,
         getProjectReferences,
@@ -2481,6 +2484,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
         sourceFileToPackageName = oldProgram.sourceFileToPackageName;
         redirectTargetsMap = oldProgram.redirectTargetsMap;
         usesUriStyleNodeCoreModules = oldProgram.usesUriStyleNodeCoreModules;
+        resolvedLibReferences = oldProgram.resolvedLibReferences;
 
         return StructureIsReused.Completely;
     }
@@ -2596,7 +2600,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
             return equalityComparer(file.fileName, getDefaultLibraryFileName());
         }
         else {
-            return some(options.lib, libFileName => equalityComparer(file.fileName, pathForLibFile(libFileName)));
+            return some(options.lib, libFileName => equalityComparer(file.fileName, resolvedLibReferences!.get(libFileName)!));
         }
     }
 
@@ -3313,7 +3317,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
         const libName = toFileNameLowerCase(ref.fileName);
         const libFileName = libMap.get(libName);
         if (libFileName) {
-            return getSourceFile(pathForLibFile(libFileName));
+            return getSourceFile(resolvedLibReferences?.get(libFileName)!);
         }
     }
 
@@ -3810,6 +3814,8 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
     }
 
     function pathForLibFile(libFileName: string): string {
+        const existing = resolvedLibReferences?.get(libFileName);
+        if (existing) return existing;
         // Support resolving to lib.dom.d.ts -> @typescript/lib-dom, and
         //                      lib.dom.iterable.d.ts -> @typescript/lib-dom/iterable
         //                      lib.es2015.symbol.wellknown.d.ts -> @typescript/lib-es2015/symbol-wellknown
@@ -3823,10 +3829,11 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
         const containingDirectory = options.configFilePath ? getDirectoryPath(options.configFilePath) : currentDirectory;
         const resolveFrom = combinePaths(containingDirectory, `__lib_node_modules_lookup_${libFileName}__.ts`);
         const localOverrideModuleResult = resolveModuleName("@typescript/lib-" + path, resolveFrom, { moduleResolution: ModuleResolutionKind.Node10, traceResolution: options.traceResolution }, host, moduleResolutionCache);
-        if (localOverrideModuleResult?.resolvedModule) {
-            return localOverrideModuleResult.resolvedModule.resolvedFileName;
-        }
-        return combinePaths(defaultLibraryPath, libFileName);
+        const result = localOverrideModuleResult?.resolvedModule ?
+            localOverrideModuleResult.resolvedModule.resolvedFileName :
+            combinePaths(defaultLibraryPath, libFileName);
+        (resolvedLibReferences ??= new Map()).set(libFileName, result);
+        return result;
     }
 
     function processLibReferenceDirectives(file: SourceFile) {

src/compiler/types.ts

@@ -4825,6 +4825,11 @@ export interface Program extends ScriptReferenceHost {
      * @internal
      */
     readonly usesUriStyleNodeCoreModules: boolean;
+    /**
+     * Map from libFileName to actual resolved location of the lib
+     * @internal
+     */
+    resolvedLibReferences: Map<string, string> | undefined;
     /**
      * Is the file emitted file
      *

tests/baselines/reference/jsdocInTypeScript.trace.json

@@ -98,9 +98,6 @@
     "Directory 'node_modules' does not exist, skipping all lookups in it.",
     "Directory '/node_modules' does not exist, skipping all lookups in it.",
     "======== Module name '@typescript/lib-es2015/generator' was not resolved. ========",
-    "======== Resolving module '@typescript/lib-es2015/iterable' from '__lib_node_modules_lookup_lib.es2015.iterable.d.ts__.ts'. ========",
-    "Resolution for module '@typescript/lib-es2015/iterable' was found in cache from location '/.src'.",
-    "======== Module name '@typescript/lib-es2015/iterable' was not resolved. ========",
     "======== Resolving module '@typescript/lib-es2015/promise' from '__lib_node_modules_lookup_lib.es2015.promise.d.ts__.ts'. ========",
     "Explicitly specified module resolution kind: 'Node10'.",
     "Loading module '@typescript/lib-es2015/promise' from 'node_modules' folder, target file types: TypeScript, Declaration.",
@@ -134,9 +131,6 @@
     "Directory 'node_modules' does not exist, skipping all lookups in it.",
     "Directory '/node_modules' does not exist, skipping all lookups in it.",
     "======== Module name '@typescript/lib-es2015/reflect' was not resolved. ========",
-    "======== Resolving module '@typescript/lib-es2015/symbol' from '__lib_node_modules_lookup_lib.es2015.symbol.d.ts__.ts'. ========",
-    "Resolution for module '@typescript/lib-es2015/symbol' was found in cache from location '/.src'.",
-    "======== Module name '@typescript/lib-es2015/symbol' was not resolved. ========",
     "======== Resolving module '@typescript/lib-es2015/symbol-wellknown' from '__lib_node_modules_lookup_lib.es2015.symbol.wellknown.d.ts__.ts'. ========",
     "Explicitly specified module resolution kind: 'Node10'.",
     "Loading module '@typescript/lib-es2015/symbol-wellknown' from 'node_modules' folder, target file types: TypeScript, Declaration.",
@@ -147,8 +141,5 @@
     "Loading module '@typescript/lib-es2015/symbol-wellknown' from 'node_modules' folder, target file types: JavaScript.",
     "Directory 'node_modules' does not exist, skipping all lookups in it.",
     "Directory '/node_modules' does not exist, skipping all lookups in it.",
-    "======== Module name '@typescript/lib-es2015/symbol-wellknown' was not resolved. ========",
-    "======== Resolving module '@typescript/lib-es2015/symbol' from '__lib_node_modules_lookup_lib.es2015.symbol.d.ts__.ts'. ========",
-    "Resolution for module '@typescript/lib-es2015/symbol' was found in cache from location '/.src'.",
-    "======== Module name '@typescript/lib-es2015/symbol' was not resolved. ========"
+    "======== Module name '@typescript/lib-es2015/symbol-wellknown' was not resolved. ========"
 ]

tests/baselines/reference/libTypeScriptOverrideSimple.trace.json

@@ -53,9 +53,6 @@
     "Loading module '@typescript/lib-decorators/legacy' from 'node_modules' folder, target file types: JavaScript.",
     "Directory 'node_modules' does not exist, skipping all lookups in it.",
     "======== Module name '@typescript/lib-decorators/legacy' was not resolved. ========",
-    "======== Resolving module '@typescript/lib-dom' from '__lib_node_modules_lookup_lib.dom.d.ts__.ts'. ========",
-    "Resolution for module '@typescript/lib-dom' was found in cache from location '/.src'.",
-    "======== Module name '@typescript/lib-dom' was successfully resolved to '/node_modules/@typescript/lib-dom/index.d.ts'. ========",
     "======== Resolving module '@typescript/lib-webworker/importscripts' from '__lib_node_modules_lookup_lib.webworker.importscripts.d.ts__.ts'. ========",
     "Explicitly specified module resolution kind: 'Node10'.",
     "Loading module '@typescript/lib-webworker/importscripts' from 'node_modules' folder, target file types: TypeScript, Declaration.",

tests/baselines/reference/libTypeScriptOverrideSimpleConfig.trace.json

@@ -51,9 +51,6 @@
     "Loading module '@typescript/lib-decorators/legacy' from 'node_modules' folder, target file types: JavaScript.",
     "Directory '/node_modules' does not exist, skipping all lookups in it.",
     "======== Module name '@typescript/lib-decorators/legacy' was not resolved. ========",
-    "======== Resolving module '@typescript/lib-dom' from '/somepath/__lib_node_modules_lookup_lib.dom.d.ts__.ts'. ========",
-    "Resolution for module '@typescript/lib-dom' was found in cache from location '/somepath'.",
-    "======== Module name '@typescript/lib-dom' was successfully resolved to '/somepath/node_modules/@typescript/lib-dom/index.d.ts'. ========",
     "======== Resolving module '@typescript/lib-webworker/importscripts' from '/somepath/__lib_node_modules_lookup_lib.webworker.importscripts.d.ts__.ts'. ========",
     "Explicitly specified module resolution kind: 'Node10'.",
     "Loading module '@typescript/lib-webworker/importscripts' from 'node_modules' folder, target file types: TypeScript, Declaration.",

tests/baselines/reference/moduleResolutionWithExtensions_withPaths.trace.json

@@ -104,9 +104,6 @@
     "Scoped package detected, looking in 'typescript__lib-es2015/generator'",
     "Loading module '@typescript/lib-es2015/generator' from 'node_modules' folder, target file types: JavaScript.",
     "======== Module name '@typescript/lib-es2015/generator' was not resolved. ========",
-    "======== Resolving module '@typescript/lib-es2015/iterable' from '/__lib_node_modules_lookup_lib.es2015.iterable.d.ts__.ts'. ========",
-    "Resolution for module '@typescript/lib-es2015/iterable' was found in cache from location '/'.",
-    "======== Module name '@typescript/lib-es2015/iterable' was not resolved. ========",
     "======== Resolving module '@typescript/lib-es2015/promise' from '/__lib_node_modules_lookup_lib.es2015.promise.d.ts__.ts'. ========",
     "Explicitly specified module resolution kind: 'Node10'.",
     "Loading module '@typescript/lib-es2015/promise' from 'node_modules' folder, target file types: TypeScript, Declaration.",
@@ -128,19 +125,13 @@
     "Scoped package detected, looking in 'typescript__lib-es2015/reflect'",
     "Loading module '@typescript/lib-es2015/reflect' from 'node_modules' folder, target file types: JavaScript.",
     "======== Module name '@typescript/lib-es2015/reflect' was not resolved. ========",
-    "======== Resolving module '@typescript/lib-es2015/symbol' from '/__lib_node_modules_lookup_lib.es2015.symbol.d.ts__.ts'. ========",
-    "Resolution for module '@typescript/lib-es2015/symbol' was found in cache from location '/'.",
-    "======== Module name '@typescript/lib-es2015/symbol' was not resolved. ========",
     "======== Resolving module '@typescript/lib-es2015/symbol-wellknown' from '/__lib_node_modules_lookup_lib.es2015.symbol.wellknown.d.ts__.ts'. ========",
     "Explicitly specified module resolution kind: 'Node10'.",
     "Loading module '@typescript/lib-es2015/symbol-wellknown' from 'node_modules' folder, target file types: TypeScript, Declaration.",
     "Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
     "Scoped package detected, looking in 'typescript__lib-es2015/symbol-wellknown'",
     "Loading module '@typescript/lib-es2015/symbol-wellknown' from 'node_modules' folder, target file types: JavaScript.",
     "======== Module name '@typescript/lib-es2015/symbol-wellknown' was not resolved. ========",
-    "======== Resolving module '@typescript/lib-es2015/symbol' from '/__lib_node_modules_lookup_lib.es2015.symbol.d.ts__.ts'. ========",
-    "Resolution for module '@typescript/lib-es2015/symbol' was found in cache from location '/'.",
-    "======== Module name '@typescript/lib-es2015/symbol' was not resolved. ========",
     "======== Resolving module '@typescript/lib-dom' from '/__lib_node_modules_lookup_lib.dom.d.ts__.ts'. ========",
     "Explicitly specified module resolution kind: 'Node10'.",
     "Loading module '@typescript/lib-dom' from 'node_modules' folder, target file types: TypeScript, Declaration.",

tests/baselines/reference/tsbuild/libraryResolution/with-config-with-redirection.js

@@ -210,9 +210,6 @@ File '/home/src/projects/project1/typeroot1/sometype/package.json' does not exis
 File '/home/src/projects/project1/typeroot1/sometype/index.d.ts' exists - use it as a name resolution result.
 Resolving real path for '/home/src/projects/project1/typeroot1/sometype/index.d.ts', result '/home/src/projects/project1/typeroot1/sometype/index.d.ts'.
 ======== Type reference directive 'sometype' was successfully resolved to '/home/src/projects/project1/typeroot1/sometype/index.d.ts', primary: true. ========
-======== Resolving module '@typescript/lib-es5' from '/home/src/projects/project1/__lib_node_modules_lookup_lib.es5.d.ts__.ts'. ========
-Resolution for module '@typescript/lib-es5' was found in cache from location '/home/src/projects/project1'.
-======== Module name '@typescript/lib-es5' was successfully resolved to '/home/src/projects/node_modules/@typescript/lib-es5/index.d.ts'. ========
 ======== Resolving module '@typescript/lib-dom' from '/home/src/projects/project1/__lib_node_modules_lookup_lib.dom.d.ts__.ts'. ========
 Explicitly specified module resolution kind: 'Node10'.
 Loading module '@typescript/lib-dom' from 'node_modules' folder, target file types: TypeScript, Declaration.
@@ -227,15 +224,6 @@ File '/home/src/projects/node_modules/@typescript/lib-dom/index.tsx' does not ex
 File '/home/src/projects/node_modules/@typescript/lib-dom/index.d.ts' exists - use it as a name resolution result.
 Resolving real path for '/home/src/projects/node_modules/@typescript/lib-dom/index.d.ts', result '/home/src/projects/node_modules/@typescript/lib-dom/index.d.ts'.
 ======== Module name '@typescript/lib-dom' was successfully resolved to '/home/src/projects/node_modules/@typescript/lib-dom/index.d.ts'. ========
-======== Resolving module '@typescript/lib-webworker' from '/home/src/projects/project1/__lib_node_modules_lookup_lib.webworker.d.ts__.ts'. ========
-Resolution for module '@typescript/lib-webworker' was found in cache from location '/home/src/projects/project1'.
-======== Module name '@typescript/lib-webworker' was successfully resolved to '/home/src/projects/node_modules/@typescript/lib-webworker/index.d.ts'. ========
-======== Resolving module '@typescript/lib-scripthost' from '/home/src/projects/project1/__lib_node_modules_lookup_lib.scripthost.d.ts__.ts'. ========
-Resolution for module '@typescript/lib-scripthost' was found in cache from location '/home/src/projects/project1'.
-======== Module name '@typescript/lib-scripthost' was successfully resolved to '/home/src/projects/node_modules/@typescript/lib-scripthost/index.d.ts'. ========
-======== Resolving module '@typescript/lib-es5' from '/home/src/projects/project1/__lib_node_modules_lookup_lib.es5.d.ts__.ts'. ========
-Resolution for module '@typescript/lib-es5' was found in cache from location '/home/src/projects/project1'.
-======== Module name '@typescript/lib-es5' was successfully resolved to '/home/src/projects/node_modules/@typescript/lib-es5/index.d.ts'. ========
 node_modules/@typescript/lib-webworker/index.d.ts
   Library referenced via 'webworker' from file 'project1/file2.ts'
 node_modules/@typescript/lib-scripthost/index.d.ts

tests/baselines/reference/tsbuild/libraryResolution/with-config.js

@@ -201,9 +201,6 @@ File '/home/src/projects/project1/typeroot1/sometype/package.json' does not exis
 File '/home/src/projects/project1/typeroot1/sometype/index.d.ts' exists - use it as a name resolution result.
 Resolving real path for '/home/src/projects/project1/typeroot1/sometype/index.d.ts', result '/home/src/projects/project1/typeroot1/sometype/index.d.ts'.
 ======== Type reference directive 'sometype' was successfully resolved to '/home/src/projects/project1/typeroot1/sometype/index.d.ts', primary: true. ========
-======== Resolving module '@typescript/lib-es5' from '/home/src/projects/project1/__lib_node_modules_lookup_lib.es5.d.ts__.ts'. ========
-Resolution for module '@typescript/lib-es5' was found in cache from location '/home/src/projects/project1'.
-======== Module name '@typescript/lib-es5' was not resolved. ========
 ======== Resolving module '@typescript/lib-dom' from '/home/src/projects/project1/__lib_node_modules_lookup_lib.dom.d.ts__.ts'. ========
 Explicitly specified module resolution kind: 'Node10'.
 Loading module '@typescript/lib-dom' from 'node_modules' folder, target file types: TypeScript, Declaration.
@@ -228,15 +225,6 @@ Directory '/home/src/node_modules' does not exist, skipping all lookups in it.
 Directory '/home/node_modules' does not exist, skipping all lookups in it.
 Directory '/node_modules' does not exist, skipping all lookups in it.
 ======== Module name '@typescript/lib-dom' was not resolved. ========
-======== Resolving module '@typescript/lib-webworker' from '/home/src/projects/project1/__lib_node_modules_lookup_lib.webworker.d.ts__.ts'. ========
-Resolution for module '@typescript/lib-webworker' was found in cache from location '/home/src/projects/project1'.
-======== Module name '@typescript/lib-webworker' was not resolved. ========
-======== Resolving module '@typescript/lib-scripthost' from '/home/src/projects/project1/__lib_node_modules_lookup_lib.scripthost.d.ts__.ts'. ========
-Resolution for module '@typescript/lib-scripthost' was found in cache from location '/home/src/projects/project1'.
-======== Module name '@typescript/lib-scripthost' was not resolved. ========
-======== Resolving module '@typescript/lib-es5' from '/home/src/projects/project1/__lib_node_modules_lookup_lib.es5.d.ts__.ts'. ========
-Resolution for module '@typescript/lib-es5' was found in cache from location '/home/src/projects/project1'.
-======== Module name '@typescript/lib-es5' was not resolved. ========
 ../lib/lib.es5.d.ts
   Library referenced via 'es5' from file 'project1/file2.ts'
   Library 'lib.es5.d.ts' specified in compilerOptions