Verify resolutionCache incremental updates

Author: sheetalkamat

src/compiler/program.ts

@@ -1107,7 +1107,8 @@ export function getInferredLibraryNameResolveFrom(options: CompilerOptions, curr
     return combinePaths(containingDirectory, `__lib_node_modules_lookup_${libFileName}__.ts`);
 }
 
-function getLibraryNameFromLibFileName(libFileName: string) {
+/** @internal */
+export function getLibraryNameFromLibFileName(libFileName: string) {
     // 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

src/compiler/resolutionCache.ts

@@ -90,9 +90,25 @@ export interface HasInvalidatedFromResolutionCache {
  * @internal
  */
 export interface ResolutionCache {
+    resolvedModuleNames: Map<Path, ModeAwareCache<CachedResolvedModuleWithFailedLookupLocations>>;
+    resolvedTypeReferenceDirectives: Map<Path, ModeAwareCache<CachedResolvedTypeReferenceDirectiveWithFailedLookupLocations>>;
+    resolvedLibraries: Map<string, CachedResolvedModuleWithFailedLookupLocations>;
+    resolvedFileToResolution: Map<Path, Set<ResolutionWithFailedLookupLocations>>;
+    resolutionsWithFailedLookups: Set<ResolutionWithFailedLookupLocations>;
+    resolutionsWithOnlyAffectingLocations: Set<ResolutionWithFailedLookupLocations>;
+    directoryWatchesOfFailedLookups: Map<string, DirectoryWatchesOfFailedLookup>;
+    fileWatchesOfAffectingLocations: Map<string, FileWatcherOfAffectingLocation>;
     startRecordingFilesWithChangedResolutions(): void;
     finishRecordingFilesWithChangedResolutions(): Path[] | undefined;
 
+    watchFailedLookupLocationsOfExternalModuleResolutions<T extends ResolutionWithFailedLookupLocations, R extends ResolutionWithResolvedFileName>(
+        name: string,
+        resolution: T,
+        filePath: Path,
+        getResolutionWithResolvedFileName: GetResolutionWithResolvedFileName<T, R>,
+        deferWatchingNonRelativeResolution: boolean,
+    ): void;
+
     resolveModuleNameLiterals(
         moduleLiterals: readonly StringLiteralLike[],
         containingFile: string,
@@ -156,7 +172,8 @@ export interface ResolutionWithFailedLookupLocations {
     node10Result?: string;
 }
 
-interface ResolutionWithResolvedFileName {
+/** @internal */
+export interface ResolutionWithResolvedFileName {
     resolvedFileName: string | undefined;
     packageId?: PackageId;
 }
@@ -165,7 +182,8 @@ interface ResolutionWithResolvedFileName {
 export interface CachedResolvedModuleWithFailedLookupLocations extends ResolvedModuleWithFailedLookupLocations, ResolutionWithFailedLookupLocations {
 }
 
-interface CachedResolvedTypeReferenceDirectiveWithFailedLookupLocations extends ResolvedTypeReferenceDirectiveWithFailedLookupLocations, ResolutionWithFailedLookupLocations {
+/** @internal */
+export interface CachedResolvedTypeReferenceDirectiveWithFailedLookupLocations extends ResolvedTypeReferenceDirectiveWithFailedLookupLocations, ResolutionWithFailedLookupLocations {
 }
 
 /** @internal */
@@ -189,15 +207,17 @@ export interface ResolutionCacheHost extends MinimalResolutionCacheHost {
     onDiscoveredSymlink?(): void;
 }
 
-interface FileWatcherOfAffectingLocation {
+/** @internal */
+export interface FileWatcherOfAffectingLocation {
     /** watcher for the lookup */
     watcher: FileWatcher;
     resolutions: number;
     files: number;
     paths: Set<string>;
 }
 
-interface DirectoryWatchesOfFailedLookup {
+/** @internal */
+export interface DirectoryWatchesOfFailedLookup {
     /** watcher for the lookup */
     watcher: FileWatcher;
     /** ref count keeping this watch alive */
@@ -467,7 +487,8 @@ function resolveModuleNameUsingGlobalCache(
     return result;
 }
 
-type GetResolutionWithResolvedFileName<T extends ResolutionWithFailedLookupLocations = ResolutionWithFailedLookupLocations, R extends ResolutionWithResolvedFileName = ResolutionWithResolvedFileName> =
+/** @internal */
+export type GetResolutionWithResolvedFileName<T extends ResolutionWithFailedLookupLocations = ResolutionWithFailedLookupLocations, R extends ResolutionWithResolvedFileName = ResolutionWithResolvedFileName> =
     (resolution: T) => R | undefined;
 
 /** @internal */
@@ -479,7 +500,7 @@ export function createResolutionCache(resolutionHost: ResolutionCacheHost, rootD
 
     const resolutionsWithFailedLookups = new Set<ResolutionWithFailedLookupLocations>();
     const resolutionsWithOnlyAffectingLocations = new Set<ResolutionWithFailedLookupLocations>();
-    const resolvedFileToResolution = new Map<string, Set<ResolutionWithFailedLookupLocations>>();
+    const resolvedFileToResolution = new Map<Path, Set<ResolutionWithFailedLookupLocations>>();
     const impliedFormatPackageJsons = new Map<Path, readonly string[]>();
 
     let hasChangedAutomaticTypeDirectiveNames = false;
@@ -529,6 +550,15 @@ export function createResolutionCache(resolutionHost: ResolutionCacheHost, rootD
     const typeRootsWatches = new Map<string, FileWatcher>();
 
     return {
+        resolvedModuleNames,
+        resolvedTypeReferenceDirectives,
+        resolvedLibraries,
+        resolvedFileToResolution,
+        resolutionsWithFailedLookups,
+        resolutionsWithOnlyAffectingLocations,
+        directoryWatchesOfFailedLookups,
+        fileWatchesOfAffectingLocations,
+        watchFailedLookupLocationsOfExternalModuleResolutions,
         getModuleResolutionCache: () => moduleResolutionCache,
         startRecordingFilesWithChangedResolutions,
         finishRecordingFilesWithChangedResolutions,
@@ -649,7 +679,7 @@ export function createResolutionCache(resolutionHost: ResolutionCacheHost, rootD
             if (!newProgram?.resolvedLibReferences?.has(libFileName)) {
                 stopWatchFailedLookupLocationOfResolution(
                     resolution,
-                    resolutionHost.toPath(getInferredLibraryNameResolveFrom(newProgram!.getCompilerOptions(), getCurrentDirectory(), libFileName)),
+                    resolutionHost.toPath(getInferredLibraryNameResolveFrom(resolutionHost.getCompilationSettings(), getCurrentDirectory(), libFileName)),
                     getResolvedModule,
                 );
                 resolvedLibraries.delete(libFileName);