fix(compiler-cli): Always retain prior results for all files (#61487)

atscott · thePunderWoman · commit 107180260f2a · 2025-05-21T08:56:54.000Z
This change ensures that prior results for all files are retained even when a request is made such that we only need a shim for a single file. Prior to this change, any prior results that were not part of the request were discarded. PR Close #61487
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/checker.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/checker.ts
@@ -130,6 +130,7 @@ export class TemplateTypeCheckerImpl implements TemplateTypeChecker {
   private elementTagCache = new Map<ts.ClassDeclaration, Map<string, PotentialDirective | null>>();
 
   private isComplete = false;
+  private priorResultsAdopted = false;
 
   constructor(
     private originalProgram: ts.Program,
@@ -497,30 +498,43 @@ export class TemplateTypeCheckerImpl implements TemplateTypeChecker {
     return engine;
   }
 
-  private maybeAdoptPriorResultsForFile(sf: ts.SourceFile): void {
-    const sfPath = absoluteFromSourceFile(sf);
-    if (this.state.has(sfPath)) {
-      const existingResults = this.state.get(sfPath)!;
+  private maybeAdoptPriorResults() {
+    if (this.priorResultsAdopted) {
+      return;
+    }
 
-      if (existingResults.isComplete) {
-        // All data for this file has already been generated, so no need to adopt anything.
-        return;
+    for (const sf of this.originalProgram.getSourceFiles()) {
+      if (sf.isDeclarationFile || isShim(sf)) {
+        continue;
       }
-    }
 
-    const previousResults = this.priorBuild.priorTypeCheckingResultsFor(sf);
-    if (previousResults === null || !previousResults.isComplete) {
-      return;
+      const sfPath = absoluteFromSourceFile(sf);
+      if (this.state.has(sfPath)) {
+        const existingResults = this.state.get(sfPath)!;
+
+        if (existingResults.isComplete) {
+          // All data for this file has already been generated, so no need to adopt anything.
+          continue;
+        }
+      }
+
+      const previousResults = this.priorBuild.priorTypeCheckingResultsFor(sf);
+      if (previousResults === null || !previousResults.isComplete) {
+        continue;
+      }
+
+      this.perf.eventCount(PerfEvent.ReuseTypeCheckFile);
+      this.state.set(sfPath, previousResults);
     }
 
-    this.perf.eventCount(PerfEvent.ReuseTypeCheckFile);
-    this.state.set(sfPath, previousResults);
+    this.priorResultsAdopted = true;
   }
 
   private ensureAllShimsForAllFiles(): void {
     if (this.isComplete) {
       return;
     }
+    this.maybeAdoptPriorResults();
 
     this.perf.inPhase(PerfPhase.TcbGeneration, () => {
       const host = new WholeProgramTypeCheckingHost(this);
@@ -531,8 +545,6 @@ export class TemplateTypeCheckerImpl implements TemplateTypeChecker {
           continue;
         }
 
-        this.maybeAdoptPriorResultsForFile(sf);
-
         const sfPath = absoluteFromSourceFile(sf);
         const fileData = this.getFileData(sfPath);
         if (fileData.isComplete) {
@@ -550,9 +562,9 @@ export class TemplateTypeCheckerImpl implements TemplateTypeChecker {
   }
 
   private ensureAllShimsForOneFile(sf: ts.SourceFile): void {
-    this.perf.inPhase(PerfPhase.TcbGeneration, () => {
-      this.maybeAdoptPriorResultsForFile(sf);
+    this.maybeAdoptPriorResults();
 
+    this.perf.inPhase(PerfPhase.TcbGeneration, () => {
       const sfPath = absoluteFromSourceFile(sf);
 
       const fileData = this.getFileData(sfPath);
@@ -573,12 +585,11 @@ export class TemplateTypeCheckerImpl implements TemplateTypeChecker {
   }
 
   private ensureShimForComponent(component: ts.ClassDeclaration): void {
+    this.maybeAdoptPriorResults();
+
     const sf = component.getSourceFile();
     const sfPath = absoluteFromSourceFile(sf);
     const shimPath = TypeCheckShimGenerator.shimFor(sfPath);
-
-    this.maybeAdoptPriorResultsForFile(sf);
-
     const fileData = this.getFileData(sfPath);
 
     if (fileData.shimData.has(shimPath)) {
