Resolutions in cache stays for lifetime..

Author: sheetalkamat

src/compiler/moduleNameResolver.ts

@@ -276,7 +276,6 @@ import {
     removeSuffix,
     resolutionExtensionIsTSOrJson,
     ResolutionMode,
-    ResolutionWithFailedLookupLocations,
     resolveConfigFileProjectName,
     ResolvedConfigFileName,
     ResolvedModuleFull,
@@ -2038,6 +2037,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
         getResolvedProjectReferenceByPath,
         forEachResolvedProjectReference,
         isSourceOfProjectReferenceRedirect,
+        getRedirectReferenceForResolution,
         getRedirectReferenceForResolutionFromSourceOfProject,
         getCompilerOptionsForFile,
         getDefaultResolutionModeForFile,
@@ -4230,7 +4230,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
                 resolveModuleNamesReusingOldState(moduleNames, file);
             Debug.assert(resolutions.length === moduleNames.length);
             const optionsForFile = getCompilerOptionsForFile(file);
-            const resolutionsInFile = createModeAwareCache<ResolutionWithFailedLookupLocations>();
+            const resolutionsInFile = createModeAwareCache<ResolvedModuleWithFailedLookupLocations>();
             (resolvedModules ??= new Map()).set(file.path, resolutionsInFile);
             for (let index = 0; index < moduleNames.length; index++) {
                 const resolution = resolutions[index].resolvedModule;

src/compiler/program.ts

@@ -4905,6 +4905,7 @@ export interface Program extends ScriptReferenceHost {
     getResolvedProjectReferenceToRedirect(fileName: string): ResolvedProjectReference | undefined;
     /** @internal */ forEachResolvedProjectReference<T>(cb: (resolvedProjectReference: ResolvedProjectReference) => T | undefined): T | undefined;
     /** @internal */ getResolvedProjectReferenceByPath(projectReferencePath: Path): ResolvedProjectReference | undefined;
+    /** @internal */ getRedirectReferenceForResolution(file: SourceFile): ResolvedProjectReference | undefined;
     /** @internal */ getRedirectReferenceForResolutionFromSourceOfProject(filePath: Path): ResolvedProjectReference | undefined;
     /** @internal */ isSourceOfProjectReferenceRedirect(fileName: string): boolean;
     /** @internal */ getCompilerOptionsForFile(file: SourceFile): CompilerOptions;
@@ -7986,6 +7987,12 @@ export const enum Extension {
     Dcts = ".d.cts",
 }
 
+/** @internal */
+export interface GlobalCacheResolutionResult {
+    resolution: ResolvedModuleWithFailedLookupLocations;
+    primary: ResolvedModuleWithFailedLookupLocations["resolvedModule"];
+}
+
 export interface ResolvedModuleWithFailedLookupLocations {
     readonly resolvedModule: ResolvedModuleFull | undefined;
     /** @internal */
@@ -8001,7 +8008,7 @@ export interface ResolvedModuleWithFailedLookupLocations {
      */
     alternateResult?: string;
     /** @internal */
-    globalCacheResolution?: ResolvedModuleWithFailedLookupLocations | false;
+    globalCacheResolution?: GlobalCacheResolutionResult | false;
 }
 
 export interface ResolvedTypeReferenceDirective {

src/compiler/resolutionCache.ts

@@ -542,7 +542,7 @@ export function createWatchProgram<T extends BuilderProgram>(host: WatchCompiler
         host.resolveLibrary.bind(host);
     compilerHost.getModuleResolutionCache = host.resolveModuleNameLiterals || host.resolveModuleNames ?
         maybeBind(host, host.getModuleResolutionCache) :
-        (() => resolutionCache.getModuleResolutionCache());
+        (() => resolutionCache.moduleResolutionCache);
     const userProvidedResolution = !!host.resolveModuleNameLiterals || !!host.resolveTypeReferenceDirectiveReferences ||
         !!host.resolveModuleNames || !!host.resolveTypeReferenceDirectives;
     // All resolutions are invalid if user provided resolutions and didnt supply hasInvalidatedResolutions

src/compiler/types.ts

@@ -842,7 +842,7 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
 
     /** @internal */
     getModuleResolutionCache(): ModuleResolutionCache | undefined {
-        return this.resolutionCache.getModuleResolutionCache();
+        return this.resolutionCache.moduleResolutionCache;
     }
 
     /** @internal */

src/compiler/watchPublic.ts

@@ -245,6 +245,7 @@ function verifyProgramStructureAndResolutionCache(
         }),
         program,
         caption,
+        userResolvedModuleNames,
     );
     verifyResolutionCache(
         resolutionCache,

src/harness/incrementalUtils.ts

@@ -225,20 +225,7 @@ Output::
 
 Reusing resolution of module 'package-b' from '/home/src/workspace/packageC/index.ts' of old program, it was successfully resolved to '/home/src/workspace/packageB/index.d.ts'.
 ======== Resolving module 'package-b' from '/home/src/workspace/packageC/package.json'. ========
-Module resolution kind is not specified, using 'Node10'.
-Loading module 'package-b' from 'node_modules' folder, target file types: TypeScript, Declaration.
-Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.
-File '/home/src/workspace/packageC/node_modules/package-b/package.json' exists according to earlier cached lookups.
-File '/home/src/workspace/packageC/node_modules/package-b.ts' does not exist.
-File '/home/src/workspace/packageC/node_modules/package-b.tsx' does not exist.
-File '/home/src/workspace/packageC/node_modules/package-b.d.ts' does not exist.
-'package.json' does not have a 'typings' field.
-'package.json' does not have a 'types' field.
-'package.json' does not have a 'main' field.
-File '/home/src/workspace/packageC/node_modules/package-b/index.ts' does not exist.
-File '/home/src/workspace/packageC/node_modules/package-b/index.tsx' does not exist.
-File '/home/src/workspace/packageC/node_modules/package-b/index.d.ts' exists - use it as a name resolution result.
-Resolving real path for '/home/src/workspace/packageC/node_modules/package-b/index.d.ts', result '/home/src/workspace/packageB/index.d.ts'.
+Resolution for module 'package-b' was found in cache from location '/home/src/workspace/packageC'.
 ======== Module name 'package-b' was successfully resolved to '/home/src/workspace/packageB/index.d.ts'. ========
 ======== Resolving module 'package-a' from '/home/src/workspace/packageC/package.json'. ========
 Module resolution kind is not specified, using 'Node10'.

src/server/project.ts

@@ -291,26 +291,7 @@ File '/user/username/package.json' does not exist according to earlier cached lo
 File '/user/package.json' does not exist according to earlier cached lookups.
 File '/package.json' does not exist according to earlier cached lookups.
 ======== Resolving module 'pkg' from '/user/username/projects/myproject/a.ts'. ========
-Explicitly specified module resolution kind: 'Node16'.
-Resolving in ESM mode with conditions 'import', 'types', 'node'.
-File '/user/username/projects/myproject/package.json' does not exist according to earlier cached lookups.
-File '/user/username/projects/package.json' does not exist according to earlier cached lookups.
-File '/user/username/package.json' does not exist according to earlier cached lookups.
-File '/user/package.json' does not exist according to earlier cached lookups.
-File '/package.json' does not exist according to earlier cached lookups.
-Loading module 'pkg' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration.
-Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.
-File '/user/username/projects/myproject/node_modules/pkg/package.json' exists according to earlier cached lookups.
-Entering conditional exports.
-Matched 'exports' condition 'import'.
-Using 'exports' subpath '.' with target './import.js'.
-File name '/user/username/projects/myproject/node_modules/pkg/import.js' has a '.js' extension - stripping it.
-File '/user/username/projects/myproject/node_modules/pkg/import.ts' does not exist.
-File '/user/username/projects/myproject/node_modules/pkg/import.tsx' does not exist.
-File '/user/username/projects/myproject/node_modules/pkg/import.d.ts' exists - use it as a name resolution result.
-Resolved under condition 'import'.
-Exiting conditional exports.
-Resolving real path for '/user/username/projects/myproject/node_modules/pkg/import.d.ts', result '/user/username/projects/myproject/node_modules/pkg/import.d.ts'.
+Resolution for module 'pkg' was found in cache from location '/user/username/projects/myproject'.
 ======== Module name 'pkg' was successfully resolved to '/user/username/projects/myproject/node_modules/pkg/import.d.ts' with Package ID 'pkg/import.d.ts@0.0.1'. ========
 File '/user/username/projects/myproject/node_modules/pkg/package.json' exists according to earlier cached lookups.
 File '/user/username/projects/myproject/package.json' does not exist according to earlier cached lookups.