Use the hashes to verify the affecting location before using the reso…

…lution
microsoft · sheetalkamat · Jun 30, 2022 · Dec 9, 2022 · Jul 1, 2022 · Jul 7, 2022
commit 7de47805fe56a512a9594d0e5d6f6fe71940446e
diff --git a/src/compiler/builder.ts b/src/compiler/builder.ts
@@ -38,6 +38,7 @@ import {
     emitSkippedWithNoDiagnostics,
     emptyArray,
     ensurePathIsNonModuleName,
+    every,
     Extension,
     extensionFromPath,
     filterSemanticDiagnostics,
@@ -75,6 +76,7 @@ import {
     OldBuildInfoProgramHost,
     outFile,
     PackageJsonInfo,
+    PackageJsonInfoCache,
     Path,
     PerDirectoryAndNonRelativeNameCache,
     Program,
@@ -180,7 +182,7 @@ export interface ReusableBuilderProgramState extends BuilderState {
     cacheResolutions?: {
         modules: PerDirectoryAndNonRelativeNameCache<ResolvedModuleWithFailedLookupLocations> | undefined;
         typeRefs: PerDirectoryAndNonRelativeNameCache<ResolvedTypeReferenceDirectiveWithFailedLookupLocations> | undefined;
-        packageJsonCache: Map<Path, PackageJsonInfo | boolean> | undefined;
+        packageJsonCache: PackageJsonInfoCache | undefined;
     };
     resuableCacheResolutions?: {
         cache: ProgramBuildInfoCacheResolutions;
@@ -1457,11 +1459,10 @@ function getCacheResolutions(state: BuilderProgramState) {
         const containingPath = toPath(state.program!.getAutomaticTypeDirectiveContainingFile(), state.program!.getCurrentDirectory(), state.program!.getCanonicalFileName);
         typeRefs = toPerDirectoryAndNonRelativeNameCache(state, typeRefs, getOriginalOrResolvedTypeReferenceFileName, state.program!.getAutomaticTypeDirectiveResolutions(), containingPath);
     }
-    const packageJsonMap = state.program!.getModuleResolutionCache()?.getPackageJsonInfoCache().getInternalMap();
     return state.cacheResolutions = {
         modules,
         typeRefs,
-        packageJsonCache: packageJsonMap && new Map(packageJsonMap),
+        packageJsonCache: state.program!.getModuleResolutionCache()?.getPackageJsonInfoCache().clone(),
     };
 }
 
@@ -2119,6 +2120,7 @@ export function createOldBuildInfoProgram(
 ): OldBuildInfoProgram | undefined {
     if (!cacheResolutions && !resuableCacheResolutions) return undefined;
     const fileExistsMap = new Map<string, boolean>();
+    const affectingLoationsSameMap = new Map<string, boolean>();
 
     type Resolution = ResolvedModuleWithFailedLookupLocations & ResolvedTypeReferenceDirectiveWithFailedLookupLocations;
     type ResolutionEntry = [name: string, resolutionId: ProgramBuildInfoResolutionId, mode: ResolutionMode];
@@ -2128,6 +2130,7 @@ export function createOldBuildInfoProgram(
     }
     const reusableResolvedModules = intializeReusableResolutionsCache(resuableCacheResolutions?.cache.modules);
     const reusableResolvedTypeRefs = intializeReusableResolutionsCache(resuableCacheResolutions?.cache.typeRefs);
+    let decodedHashes: Map<ProgramBuildInfoAbsoluteFileId, string | undefined> | undefined;
     let resolutions: (Resolution | false)[] | undefined;
     let originalPathOrResolvedFileNames: string[] | undefined;
     let resolutionEntries: ResolutionEntry[] | undefined;
@@ -2165,6 +2168,25 @@ export function createOldBuildInfoProgram(
         return result;
     }
 
+    function affectingLocationsSame(
+        fileName: string,
+        expected: PackageJsonInfo | boolean | string | undefined
+    ): boolean {
+        let result = affectingLoationsSameMap.get(fileName);
+        if (result !== undefined) return result;
+        const packageJsonInfo = host.getPackageJsonInfo(fileName);
+        const currentText = typeof packageJsonInfo === "object" ? packageJsonInfo.contents.packageJsonText : undefined;
+        if (isString(expected)) {
+            result = !!currentText && (host.createHash ?? generateDjb2Hash)(currentText) === expected;
+        }
+        else {
+            const expectedText = typeof expected === "object" ? expected.contents.packageJsonText : undefined;
+            result = currentText === expectedText;
+        }
+        affectingLoationsSameMap.set(fileName, result);
+        return result;
+    }
+
     function getResolvedFromCache<T extends ResolvedModuleWithFailedLookupLocations | ResolvedTypeReferenceDirectiveWithFailedLookupLocations>(
         cache: PerDirectoryAndNonRelativeNameCache<T> | undefined,
         getResolvedFileName: (resolution: T) => string | undefined,
@@ -2182,7 +2204,13 @@ export function createOldBuildInfoProgram(
         if (fromCache) {
             // TODO:: symlinks
             const resolvedFileName = getResolvedFileName(fromCache);
-            return resolvedFileName && fileExists(resolvedFileName) ? fromCache : undefined;
+            return resolvedFileName && fileExists(resolvedFileName) && every(
+                fromCache.affectingLocations,
+                fileName => affectingLocationsSame(
+                    fileName,
+                    cacheResolutions!.packageJsonCache?.getPackageJsonInfo(fileName)
+                )
+            ) ? fromCache : undefined;
         }
         if (!reusableResolutionsCache) return undefined;
         if (!reusableResolutionsCache.decoded) {
@@ -2269,6 +2297,15 @@ export function createOldBuildInfoProgram(
             ));
     }
 
+    function toAffectingFileLocation(fileId: ProgramBuildInfoAbsoluteFileId) {
+        if (!decodedHashes && resuableCacheResolutions!.cache.hash) {
+            decodedHashes = arrayToMap(resuableCacheResolutions!.cache.hash, hash => isArray(hash) ? hash[0] : hash, hash => isArray(hash) ? hash[1] : undefined);
+        }
+        const hash = decodedHashes?.get(fileId);
+        const file = resuableCacheResolutions!.getProgramBuildInfoFilePathDecoder().toFileAbsolutePath(fileId);
+        return affectingLocationsSame(file, hash) ? file : undefined;
+    }
+
     function toResolution(resolutionId: ProgramBuildInfoResolutionId): Resolution | undefined {
         const existing = resolutions?.[resolutionId - 1];
         if (existing !== undefined) return existing || undefined;
@@ -2277,13 +2314,18 @@ export function createOldBuildInfoProgram(
         const resolvedFileName = resuableCacheResolutions!.getProgramBuildInfoFilePathDecoder().toFileAbsolutePath(
             resolution.resolvedModule?.resolvedFileName || resolution.resolvedTypeReferenceDirective!.resolvedFileName
         );
-        if (fileExists(resolvedFileName)) {
+        let affectingLocations: string[] | undefined;
+        if (fileExists(resolvedFileName) && every(resolution.affectingLocations, fileId => {
+            const file = toAffectingFileLocation(fileId);
+            if (file) (affectingLocations ??= []).push(file);
+            return !!file;
+        })) {
             // Type Ref doesnt need extension
             const extenstion = resolution.resolvedModule ? extensionFromPath(resolvedFileName) : undefined!;
             return resolutions[resolutionId - 1] = {
                 resolvedModule: toResolved(resolution.resolvedModule, resolvedFileName, extenstion),
                 resolvedTypeReferenceDirective: toResolved(resolution.resolvedTypeReferenceDirective, resolvedFileName, extenstion),
-                affectingLocations: resolution.affectingLocations?.map(resuableCacheResolutions!.getProgramBuildInfoFilePathDecoder().toFileAbsolutePath),
+                affectingLocations,
                 resolutionDiagnostics: resolution.resolutionDiagnostics?.length ? convertToDiagnostics(resolution.resolutionDiagnostics, /*newProgram*/ undefined!) as Diagnostic[] : undefined
             };
         }

diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
@@ -765,6 +765,7 @@ export interface PackageJsonInfoCache {
     /** @internal */ setPackageJsonInfo(packageJsonPath: string, info: PackageJsonInfo | boolean): void;
     /** @internal */ entries(): [Path, PackageJsonInfo | boolean][];
     /** @internal */ getInternalMap(): Map<Path, PackageJsonInfo | boolean> | undefined;
+    /** @internal */ clone(): PackageJsonInfoCache;
     clear(): void;
 }
 
@@ -884,9 +885,8 @@ function createCacheWithRedirects<K, V>(ownOptions: CompilerOptions | undefined)
     }
 }
 
-function createPackageJsonInfoCache(currentDirectory: string, getCanonicalFileName: (s: string) => string): PackageJsonInfoCache {
-    let cache: Map<Path, PackageJsonInfo | boolean> | undefined;
-    return { getPackageJsonInfo, setPackageJsonInfo, clear, entries, getInternalMap };
+function createPackageJsonInfoCache(currentDirectory: string, getCanonicalFileName: (s: string) => string, cache?: Map<Path, PackageJsonInfo | boolean>): PackageJsonInfoCache {
+    return { getPackageJsonInfo, setPackageJsonInfo, clear, entries, getInternalMap, clone };
     function getPackageJsonInfo(packageJsonPath: string) {
         return cache?.get(toPath(packageJsonPath, currentDirectory, getCanonicalFileName));
     }
@@ -903,6 +903,9 @@ function createPackageJsonInfoCache(currentDirectory: string, getCanonicalFileNa
     function getInternalMap() {
         return cache;
     }
+    function clone() {
+        return createPackageJsonInfoCache(currentDirectory, getCanonicalFileName, cache && new Map(cache));
+    }
 }
 
 function getOrCreateCache<K, V>(cacheWithRedirects: CacheWithRedirects<K, V>, redirectedReference: ResolvedProjectReference | undefined, key: K, create: () => V): V {

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -127,6 +127,7 @@ import {
     getNormalizedPathComponents,
     getOutputDeclarationFileName,
     getOutputPathsForBundle,
+    getPackageJsonInfo,
     getPackageScopeForPath,
     getPathFromPathComponents,
     getPositionOfLineAndCharacter,
@@ -1580,9 +1581,12 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
     let o
F438
ldProgram = typeof oldProgramOrOldBuildInfoProgramConstructor === "object" ? oldProgramOrOldBuildInfoProgramConstructor : undefined;
     let oldBuildInfoProgram: OldBuildInfoProgram | undefined;
     if (!oldProgram && typeof oldProgramOrOldBuildInfoProgramConstructor === "function") {
+        const state = getTemporaryModuleResolutionState(moduleResolutionCache?.getPackageJsonInfoCache(), host, options);
         oldBuildInfoProgram = oldProgramOrOldBuildInfoProgramConstructor({
             fileExists: fileName => host.fileExists(fileName),
             getCompilerOptions: () => options,
+            createHash: maybeBind(host, host.createHash),
+            getPackageJsonInfo: fileName => getPackageJsonInfo(getDirectoryPath(fileName), /*onlyRecordFailures*/ false, state),
         });
         if (oldBuildInfoProgram) {
             moduleResolutionCache?.setOldResolutionCache({

diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -6985,6 +6985,8 @@ export interface OldBuildInfoProgram {
 export interface OldBuildInfoProgramHost {
     fileExists(fileName: string): boolean;
     getCompilerOptions(): CompilerOptions;
+    createHash?(data: string): string;
+    getPackageJsonInfo(fileName: string): PackageJsonInfo | undefined;
 }
 
 /** @internal */

diff --git a/src/testRunner/unittests/tsbuild/cacheResolutions.ts b/src/testRunner/unittests/tsbuild/cacheResolutions.ts
@@ -47,7 +47,8 @@ describe("unittests:: tsbuild:: cacheResolutions::", () => {
                     appendText(fs, "/src/project/randomFileForImport.ts", `export const y = 10;`);
                 },
                 discrepancyExplanation: () => [
-                    `Affected locations are not checked which results in using incorrect resolution`
+                    `Clean build doesnt emit files so it doesnt have emit signatures and latestChangedDtsFile`,
+                    `Incremental build has this information from previous pass`,
                 ]
             },
             {
@@ -56,9 +57,6 @@ describe("unittests:: tsbuild:: cacheResolutions::", () => {
                     fs.writeFileSync("/src/project/node_modules/pkg1/require1.d.ts", getPkgImportContent("Require", 1));
                     appendText(fs, "/src/project/randomFileForImport.ts", `export const z = 10;`);
                 },
-                discrepancyExplanation: () => [
-                    `Affected locations are not checked which results in using incorrect resolution`
-                ]
             },
         ]
     });

diff --git a/src/testRunner/unittests/tsc/cacheResolutions.ts b/src/testRunner/unittests/tsc/cacheResolutions.ts
@@ -50,16 +50,10 @@ describe("unittests:: tsc:: cacheResolutions::", () => {
             {
                 caption: "modify package.json and that should re-resolve",
                 edit: fs => replaceText(fs, "/src/project/node_modules/pkg1/package.json", "./require.js", "./require1.js"),
-                discrepancyExplanation: () => [
-                    `Affected locations are not checked which results in using incorrect resolution`
-                ]
             },
             {
                 caption: "write file not resolved by import",
                 edit: fs => fs.writeFileSync("/src/project/node_modules/pkg1/require1.d.ts", getPkgImportContent("Require", 1)),
-                discrepancyExplanation: () => [
-                    `Affected locations are not checked which results in using incorrect resolution`
-                ]
             },
             {
                 caption: "delete file with imports",