Modify resolution cache to update on program creation completion

microsoft · sheetalkamat · Jun 30, 2022 · Dec 9, 2022 · Jul 1, 2022 · Jul 7, 2022
commit 71ebed9c00fb80846fd6bde1e128ef322a36a7f4
diff --git a/src/compiler/builder.ts b/src/compiler/builder.ts
@@ -1426,9 +1426,7 @@ function getCacheResolutions(state: BuilderProgramState) {
     }
     const automaticTypeDirectiveNames = state.program!.getAutomaticTypeDirectiveNames();
     if (automaticTypeDirectiveNames.length) {
-        const currentDirectory = state.program!.getCurrentDirectory();
-        const containingDirectory = state.compilerOptions.configFilePath ? getDirectoryPath(state.compilerOptions.configFilePath) : currentDirectory;
-        const containingPath = toPath(containingDirectory, currentDirectory, state.program!.getCanonicalFileName);
+        const containingPath = toPath(state.program!.getAutomaticTypeDirectiveContainingFile(), state.program!.getCurrentDirectory(), state.program!.getCanonicalFileName);
         typeRefs = toPerDirectoryAndNonRelativeNameCache(state, typeRefs, getOriginalOrResolvedTypeReferenceFileName, state.program!.getAutomaticTypeDirectiveResolutions(), containingPath);
     }
     return state.cacheResolutions = { modules, typeRefs };
@@ -1439,16 +1437,16 @@ function toPerDirectoryAndNonRelativeNameCache<T>(
     perDirectoryAndNonRelativeNameCache: PerDirectoryAndNonRelativeNameCache<T> | undefined,
     getResolvedFileName: (resolved: T) => string | undefined,
     cache: ModeAwareCache<T> | undefined,
-    fOrDirPath: SourceFile | Path,
+    fOrPath: SourceFile | Path,
 ) {
     if (!cache?.size()) return perDirectoryAndNonRelativeNameCache;
     let dirPath: Path, redirectedReference: ResolvedProjectReference | undefined;
-    if (!isString(fOrDirPath)) {
-        redirectedReference = state.program!.getRedirectReferenceForResolution(fOrDirPath);
-        dirPath = getDirectoryPath(fOrDirPath.path);
+    if (!isString(fOrPath)) {
+        redirectedReference = state.program!.getRedirectReferenceForResolution(fOrPath);
+        dirPath = getDirectoryPath(fOrPath.path);
     }
     else {
-        dirPath = fOrDirPath;
+        dirPath = getDirectoryPath(fOrPath);
     }
     const mapForRedirects = perDirectoryAndNonRelativeNameCache?.perDirectory.perDirectoryMap.getMapOfCacheRedirects(redirectedReference);
     let dirCache = mapForRedirects?.get(dirPath);

diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
@@ -802,8 +802,13 @@ export interface CacheWithRedirects<K, V> {
     redirectsMap: Map<CompilerOptions, Map<K, V>>;
 }
 
+/** @internal */
+export type RedirectsCacheKey = string & { __compilerOptionsKey: any; };
+/** @internal */
+export function createRedirectsCacheKey(options: CompilerOptions) {
+    return getKeyForCompilerOptions(options, moduleResolutionOptionDeclarations) as RedirectsCacheKey;
+}
 function createCacheWithRedirects<K, V>(ownOptions: CompilerOptions | undefined): CacheWithRedirects<K, V> {
-    type RedirectsCacheKey = string & { __compilerOptionsKey: any; };
     const redirectsMap = new Map<CompilerOptions, Map<K, V>>();
     const optionsToRedirectsKey = new Map<CompilerOptions, RedirectsCacheKey>();
     const redirectsKeyToMap = new Map<RedirectsCacheKey, Map<K, V>>();
@@ -873,9 +878,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);
-        }
+        if (!result) optionsToRedirectsKey.set(options, result = createRedirectsCacheKey(options));
         return result;
     }
 }

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -1689,10 +1689,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
         automaticTypeDirectiveResolutions = createModeAwareCache();
         if (automaticTypeDirectiveNames.length) {
             tracing?.push(tracing.Phase.Program, "processTypeReferences", { count: automaticTypeDirectiveNames.length });
-            // This containingFilename needs to match with the one used in managed-side
-            const containingDirectory = options.configFilePath ? getDirectoryPath(options.configFilePath) : host.getCurrentDirectory();
-            const containingFilename = combinePaths(containingDirectory, inferredTypesContainingFile);
-            const resolutions = resolveTypeReferenceDirectiveNamesReusingOldState(automaticTypeDirectiveNames, containingFilename);
+            const resolutions = resolveTypeReferenceDirectiveNamesReusingOldState(automaticTypeDirectiveNames, getAutomaticTypeDirectiveContainingFile());
             for (let i = 0; i < automaticTypeDirectiveNames.length; i++) {
                 // under node16/nodenext module resolution, load `types`/ata include names as cjs resolution results by passing an `undefined` mode
                 automaticTypeDirectiveResolutions.set(automaticTypeDirectiveNames[i], /*mode*/ undefined, resolutions[i]);
@@ -1745,13 +1742,13 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
             if (shouldCreateNewSourceFile || !newFile || newFile.impliedNodeFormat !== oldSourceFile.impliedNodeFormat ||
                 // old file wasn't redirect but new file is
                 (oldSourceFile.resolvedPath === oldSourceFile.path && newFile.resolvedPath !== oldSourceFile.path)) {
-                host.onReleaseOldSourceFile(oldSourceFile, oldProgram.getCompilerOptions(), !!getSourceFileByPath(oldSourceFile.path));
+                host.onReleaseOldSourceFile(oldSourceFile, oldProgram.getCompilerOptions());
             }
         }
         if (!host.getParsedCommandLine) {
             oldProgram.forEachResolvedProjectReference(resolvedProjectReference => {
                 if (!getResolvedProjectReferenceByPath(resolvedProjectReference.sourceFile.path)) {
-                    host.onReleaseOldSourceFile!(resolvedProjectReference.sourceFile, oldProgram!.getCompilerOptions(), /*hasSourceFileByPath*/ false);
+                    host.onReleaseOldSourceFile!(resolvedProjectReference.sourceFile, oldProgram!.getCompilerOptions());
                 }
             });
         }
@@ -1811,6 +1808,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
         getResolvedTypeReferenceDirectives: () => resolvedTypeReferenceDirectives,
         getAutomaticTypeDirectiveNames: () => automaticTypeDirectiveNames!,
         getAutomaticTypeDirectiveResolutions: () => automaticTypeDirectiveResolutions,
+        getAutomaticTypeDirectiveContainingFile,
         isSourceFileFromExternalLibrary,
         isSourceFileDefaultLibrary,
         getSourceFileFromReference,
@@ -1865,6 +1863,12 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
 
     return program;
 
+    function getAutomaticTypeDirectiveContainingFile() {
+        // This containingFilename needs to match with the one used in managed-side
+        const containingDirectory = options.configFilePath ? getDirectoryPath(options.configFilePath) : host.getCurrentDirectory();
+        return combinePaths(containingDirectory, inferredTypesContainingFile);
+    }
+
     function addResolutionDiagnostics(resolution: ResolvedModuleWithFailedLookupLocations | ResolvedTypeReferenceDirectiveWithFailedLookupLocations) {
         if (!resolution.resolutionDiagnostics?.length) return;
         (fileProcessingDiagnostics ??= []).push({