Handle force build as separate upto date status

sheetalkamat · sheetalkamat · commit e6a3ee84cafa · 2022-04-19T11:35:53.000-07:00
diff --git a/src/compiler/tsbuild.ts b/src/compiler/tsbuild.ts
@@ -26,7 +26,8 @@ namespace ts {
         /**
          * Projects with no outputs (i.e. "solution" files)
          */
-        ContainerOnly
+        ContainerOnly,
+        ForceBuild,
     }
 
     export type UpToDateStatus =
@@ -40,7 +41,8 @@ namespace ts {
         | Status.UpstreamBlocked
         | Status.ComputingUpstream
         | Status.TsVersionOutOfDate
-        | Status.ContainerOnly;
+        | Status.ContainerOnly
+        | Status.ForceBuild;
 
     export namespace Status {
         /**
@@ -138,6 +140,10 @@ namespace ts {
             outOfDateOutputFileName: string;
             newerProjectName: string;
         }
+
+        export interface ForceBuild {
+            type: UpToDateStatusType.ForceBuild;
+        }
     }
 
     export function resolveConfigFileProjectName(project: string): ResolvedConfigFileName {
diff --git a/src/compiler/tsbuildPublic.ts b/src/compiler/tsbuildPublic.ts
@@ -1470,45 +1470,45 @@ namespace ts {
             }
         }
 
+        if (force) return { type: UpToDateStatusType.ForceBuild };
+
         // Collect the expected outputs of this project
         const outputs = getAllProjectOutputs(project, !host.useCaseSensitiveFileNames());
 
         // Now see if all outputs are newer than the newest input
         let oldestOutputFileName = "(none)";
         let oldestOutputFileTime = maximumDate;
         let newestDeclarationFileContentChangedTime;
-        if (!force) {
-            for (const output of outputs) {
-                // Output is missing; can stop checking
-                const outputTime = ts.getModifiedTime(host, output);
-                if (outputTime === missingFileModifiedTime) {
-                    return {
-                        type: UpToDateStatusType.OutputMissing,
-                        missingOutputFileName: output
-                    };
-                }
+        for (const output of outputs) {
+            // Output is missing; can stop checking
+            const outputTime = ts.getModifiedTime(host, output);
+            if (outputTime === missingFileModifiedTime) {
+                return {
+                    type: UpToDateStatusType.OutputMissing,
+                    missingOutputFileName: output
+                };
+            }
 
-                if (outputTime < oldestOutputFileTime) {
-                    oldestOutputFileTime = outputTime;
-                    oldestOutputFileName = output;
-                }
+            if (outputTime < oldestOutputFileTime) {
+                oldestOutputFileTime = outputTime;
+                oldestOutputFileName = output;
+            }
 
-                // If an output is older than the newest input, we can stop checking
-                if (outputTime < newestInputFileTime) {
-                    return {
-                        type: UpToDateStatusType.OutOfDateWithSelf,
-                        outOfDateOutputFileName: oldestOutputFileName,
-                        newerInputFileName: newestInputFileName
-                    };
-                }
+            // If an output is older than the newest input, we can stop checking
+            if (outputTime < newestInputFileTime) {
+                return {
+                    type: UpToDateStatusType.OutOfDateWithSelf,
+                    outOfDateOutputFileName: oldestOutputFileName,
+                    newerInputFileName: newestInputFileName
+                };
+            }
 
-                // Keep track of when the most recent time a .d.ts file was changed.
-                // In addition to file timestamps, we also keep track of when a .d.ts file
-                // had its file touched but not had its contents changed - this allows us
-                // to skip a downstream typecheck
-                if (isDeclarationFileName(output)) {
-                    newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputTime);
-                }
+            // Keep track of when the most recent time a .d.ts file was changed.
+            // In addition to file timestamps, we also keep track of when a .d.ts file
+            // had its file touched but not had its contents changed - this allows us
+            // to skip a downstream typecheck
+            if (isDeclarationFileName(output)) {
+                newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputTime);
             }
         }
 
@@ -1557,7 +1557,7 @@ namespace ts {
         );
         if (dependentPackageFileStatus) return dependentPackageFileStatus;
 
-        if (!force && !state.buildInfoChecked.has(resolvedPath)) {
+        if (!state.buildInfoChecked.has(resolvedPath)) {
             state.buildInfoChecked.set(resolvedPath, true);
             const buildInfoPath = getTsBuildInfoEmitOutputFilePath(project.options);
             if (buildInfoPath) {
@@ -2079,14 +2079,6 @@ namespace ts {
     }
 
     function reportUpToDateStatus(state: SolutionBuilderState, configFileName: string, status: UpToDateStatus) {
-        if (state.options.force && (status.type === UpToDateStatusType.UpToDate || status.type === UpToDateStatusType.UpToDateWithUpstreamTypes)) {
-            return reportStatus(
-                state,
-                Diagnostics.Project_0_is_being_forcibly_rebuilt,
-                relName(state, configFileName)
-            );
-        }
-
         switch (status.type) {
             case UpToDateStatusType.OutOfDateWithSelf:
                 return reportStatus(
@@ -2167,6 +2159,12 @@ namespace ts {
                     status.version,
                     version
                 );
+            case UpToDateStatusType.ForceBuild:
+                return reportStatus(
+                    state,
+                    Diagnostics.Project_0_is_being_forcibly_rebuilt,
+                    relName(state, configFileName)
+                );
             case UpToDateStatusType.ContainerOnly:
             // Don't report status on "solution" projects
             // falls through
diff --git a/tests/baselines/reference/tsbuild/sample1/always-builds-under-with-force-option.js b/tests/baselines/reference/tsbuild/sample1/always-builds-under-with-force-option.js
@@ -117,11 +117,8 @@ getModifiedTime:: {
  "/src/core/anotherModule.ts": 1,
  "/src/core/index.ts": 1,
  "/src/core/some_decl.d.ts": 1,
- "/src/core/tsconfig.json": 1,
  "/src/logic/index.ts": 1,
- "/src/logic/tsconfig.json": 1,
- "/src/tests/index.ts": 1,
- "/src/tests/tsconfig.json": 1
+ "/src/tests/index.ts": 1
 }
 
 setModifiedTime:: {}
@@ -430,14 +427,11 @@ getModifiedTime:: {
  "/src/core/anotherModule.ts": 1,
  "/src/core/index.ts": 1,
  "/src/core/some_decl.d.ts": 1,
- "/src/core/tsconfig.json": 1,
  "/src/core/anotherModule.d.ts": 1,
  "/src/core/index.d.ts": 1,
  "/src/logic/index.ts": 1,
- "/src/logic/tsconfig.json": 1,
  "/src/logic/index.d.ts": 1,
  "/src/tests/index.ts": 1,
- "/src/tests/tsconfig.json": 1,
  "/src/tests/index.d.ts": 1
 }
 
diff --git a/tests/baselines/reference/tsbuild/sample1/rebuilds-from-start-if-force-option-is-set.js b/tests/baselines/reference/tsbuild/sample1/rebuilds-from-start-if-force-option-is-set.js
@@ -407,14 +407,11 @@ getModifiedTime:: {
  "/src/core/anotherModule.ts": 1,
  "/src/core/index.ts": 1,
  "/src/core/some_decl.d.ts": 1,
- "/src/core/tsconfig.json": 1,
  "/src/core/anotherModule.d.ts": 1,
  "/src/core/index.d.ts": 1,
  "/src/logic/index.ts": 1,
- "/src/logic/tsconfig.json": 1,
  "/src/logic/index.d.ts": 1,
  "/src/tests/index.ts": 1,
- "/src/tests/tsconfig.json": 1,
  "/src/tests/index.d.ts": 1
 }
 
