Rename cleanAll to clean and take optional project as input

src/compiler/tsbuild.ts

@@ -256,7 +256,7 @@ namespace ts {
 
     export interface SolutionBuilder {
         build(project?: string, cancellationToken?: CancellationToken): ExitStatus;
-        cleanAllProjects(): ExitStatus;
+        clean(project?: string): ExitStatus;
 
         // Currently used for testing but can be made public if needed:
         /*@internal*/ getBuildOrder(): ReadonlyArray<ResolvedConfigFileName>;
@@ -404,7 +404,7 @@ namespace ts {
             } :
             {
                 build,
-                cleanAllProjects,
+                clean,
                 getBuildOrder,
                 getUpToDateStatusOfProject,
                 invalidateProject,
@@ -1342,10 +1342,12 @@ namespace ts {
             return priorNewestUpdateTime;
         }
 
-        function getFilesToClean(): string[] {
-            // Get the same graph for cleaning we'd use for building
-            const filesToDelete: string[] = [];
-            for (const proj of getBuildOrder()) {
+        function clean(project?: string) {
+            const buildOrder = getBuildOrderFor(project);
+            if (!buildOrder) return ExitStatus.InvalidProject_OutputsSkipped;
+
+            const filesToDelete = options.dry ? [] as string[] : undefined;
+            for (const proj of buildOrder) {
                 const resolvedPath = toResolvedConfigFilePath(proj);
                 const parsed = parseConfigFile(proj, resolvedPath);
                 if (parsed === undefined) {
@@ -1356,22 +1358,19 @@ namespace ts {
                 const outputs = getAllProjectOutputs(parsed, !host.useCaseSensitiveFileNames());
                 for (const output of outputs) {
                     if (host.fileExists(output)) {
-                        filesToDelete.push(output);
+                        if (filesToDelete) {
+                            filesToDelete.push(output);
+                        }
+                        else {
+                            host.deleteFile(output);
+                            invalidateResolvedProject(resolvedPath, ConfigFileProgramReloadLevel.None);
+                        }
                     }
                 }
             }
-            return filesToDelete;
-        }
 
-        function cleanAllProjects() {
-            const filesToDelete = getFilesToClean();
-            if (options.dry) {
+            if (filesToDelete) {
                 reportStatus(Diagnostics.A_non_dry_build_would_delete_the_following_files_Colon_0, filesToDelete.map(f => `\r\n * ${f}`).join(""));
-                return ExitStatus.Success;
-            }
-
-            for (const output of filesToDelete) {
-                host.deleteFile(output);
             }
 
             return ExitStatus.Success;
@@ -1429,7 +1428,23 @@ namespace ts {
             cacheState = undefined;
         }
 
+        function getBuildOrderFor(project: string | undefined) {
+            const resolvedProject = project && resolveProjectName(project);
+            if (resolvedProject) {
+                const projectPath = toResolvedConfigFilePath(resolvedProject);
+                const projectIndex = findIndex(
+                    getBuildOrder(),
+                    configFileName => toResolvedConfigFilePath(configFileName) === projectPath
+                );
+                if (projectIndex === -1) return undefined;
+            }
+            return resolvedProject ? createBuildOrder([resolvedProject]) : getBuildOrder();
+        }
+
         function build(project?: string, cancellationToken?: CancellationToken): ExitStatus {
+            const buildOrder = getBuildOrderFor(project);
+            if (!buildOrder) return ExitStatus.InvalidProject_OutputsSkipped;
+
             // Set initial build if not already built
             if (allProjectBuildPending) {
                 allProjectBuildPending = false;
@@ -1447,16 +1462,6 @@ namespace ts {
 
             let successfulProjects = 0;
             let errorProjects = 0;
-            const resolvedProject = project && resolveProjectName(project);
-            if (resolvedProject) {
-                const projectPath = toResolvedConfigFilePath(resolvedProject);
-                const projectIndex = findIndex(
-                    getBuildOrder(),
-                    configFileName => toResolvedConfigFilePath(configFileName) === projectPath
-                );
-                if (projectIndex === -1) return ExitStatus.InvalidProject_OutputsSkipped;
-            }
-            const buildOrder = resolvedProject ? createBuildOrder([resolvedProject]) : getBuildOrder();
             while (true) {
                 const invalidatedProject = getNextInvalidatedProject(buildOrder);
                 if (!invalidatedProject) {

src/testRunner/unittests/tsbuild/emptyFiles.ts

@@ -18,9 +18,7 @@ namespace ts {
             host.assertDiagnosticMessages([Diagnostics.The_files_list_in_config_file_0_is_empty, "/src/no-references/tsconfig.json"]);
 
             // Check for outputs to not be written.
-            for (const output of allExpectedOutputs) {
-                assert(!fs.existsSync(output), `Expect file ${output} to not exist`);
-            }
+            verifyOutputsAbsent(fs, allExpectedOutputs);
         });
 
         it("does not have empty files diagnostic when files is empty and references are provided", () => {
@@ -33,9 +31,7 @@ namespace ts {
             host.assertDiagnosticMessages(/*empty*/);
 
             // Check for outputs to be written.
-            for (const output of allExpectedOutputs) {
-                assert(fs.existsSync(output), `Expect file ${output} to exist`);
-            }
+            verifyOutputsPresent(fs, allExpectedOutputs);
         });
     });
 }

src/testRunner/unittests/tsbuild/helpers.ts

@@ -82,6 +82,18 @@ declare const console: { log(msg: any): void; };`;
         return fs;
     }
 
+    export function verifyOutputsPresent(fs: vfs.FileSystem, outputs: readonly string[]) {
+        for (const output of outputs) {
+            assert(fs.existsSync(output), `Expect file ${output} to exist`);
+        }
+    }
+
+    export function verifyOutputsAbsent(fs: vfs.FileSystem, outputs: readonly string[]) {
+        for (const output of outputs) {
+            assert.isFalse(fs.existsSync(output), `Expect file ${output} to not exist`);
+        }
+    }
+
     function generateSourceMapBaselineFiles(fs: vfs.FileSystem, mapFileNames: ReadonlyArray<string>) {
         for (const mapFile of mapFileNames) {
             if (!fs.existsSync(mapFile)) continue;

src/testRunner/unittests/tsbuild/outFile.ts

@@ -366,18 +366,14 @@ namespace ts {
             builder.build();
             host.assertDiagnosticMessages(...initialExpectedDiagnostics);
             // Verify they exist
-            for (const output of expectedOutputs) {
-                assert(fs.existsSync(output), `Expect file ${output} to exist`);
-            }
+            verifyOutputsPresent(fs, expectedOutputs);
             host.clearDiagnostics();
-            builder.cleanAllProjects();
+            builder.clean();
             host.assertDiagnosticMessages(/*none*/);
             // Verify they are gone
-            for (const output of expectedOutputs) {
-                assert(!fs.existsSync(output), `Expect file ${output} to not exist`);
-            }
+            verifyOutputsAbsent(fs, expectedOutputs);
             // Subsequent clean shouldn't throw / etc
-            builder.cleanAllProjects();
+            builder.clean();
         });
 
         it("verify buildInfo absence results in new build", () => {
@@ -392,9 +388,7 @@ namespace ts {
             builder.build();
             host.assertDiagnosticMessages(...initialExpectedDiagnostics);
             // Verify they exist
-            for (const output of expectedOutputs) {
-                assert(fs.existsSync(output), `Expect file ${output} to exist`);
-            }
+            verifyOutputsPresent(fs, expectedOutputs);
             // Delete bundle info
             host.clearDiagnostics();
             host.deleteFile(outputFiles[project.first][ext.buildinfo]);
@@ -419,10 +413,8 @@ namespace ts {
             builder.build();
             host.assertDiagnosticMessages(...initialExpectedDiagnostics);
             // Verify they exist - without tsbuildinfo for third project
-            for (const output of expectedOutputFiles.slice(0, expectedOutputFiles.length - 2)) {
-                assert(fs.existsSync(output), `Expect file ${output} to exist`);
-            }
-            assert.isFalse(fs.existsSync(outputFiles[project.third][ext.buildinfo]), `Expect file ${outputFiles[project.third][ext.buildinfo]} to not exist`);
+            verifyOutputsPresent(fs, expectedOutputFiles.slice(0, expectedOutputFiles.length - 2));
+            verifyOutputsAbsent(fs, [outputFiles[project.third][ext.buildinfo]]);
         });
 
         it("rebuilds completely when version in tsbuildinfo doesnt match ts version", () => {
@@ -496,13 +488,23 @@ namespace ts {
             const result = builder.build(sources[project.second][source.config]);
             host.assertDiagnosticMessages(/*empty*/);
             // First and Third is not built
-            for (const output of [...outputFiles[project.first], ...outputFiles[project.third]]) {
-                assert.isFalse(fs.existsSync(output), `Expect file ${output} to not exist`);
-            }
+            verifyOutputsAbsent(fs, [...outputFiles[project.first], ...outputFiles[project.third]]);
             // second is built
-            for (const output of outputFiles[project.second]) {
-                assert(fs.existsSync(output), `Expect file ${output} to exist`);
-            }
+            verifyOutputsPresent(fs, outputFiles[project.second]);
+            assert.equal(result, ExitStatus.Success);
+        });
+
+        it("cleans till project specified", () => {
+            const fs = outFileFs.shadow();
+            const host = new fakes.SolutionBuilderHost(fs);
+            const builder = createSolutionBuilder(host, { verbose: false });
+            builder.build();
+            const result = builder.clean(sources[project.second][source.config]);
+            host.assertDiagnosticMessages(/*empty*/);
+            // First and Third output for present
+            verifyOutputsPresent(fs, [...outputFiles[project.first], ...outputFiles[project.third]]);
+            // second is cleaned
+            verifyOutputsAbsent(fs, outputFiles[project.second]);
             assert.equal(result, ExitStatus.Success);
         });
 
@@ -940,9 +942,7 @@ ${internal} enum internalEnum { a, b, c }`);
                     removeFileExtension(f) + Extension.Dts + ".map",
                 ])
             ]);
-            for (const output of expectedOutputFiles) {
-                assert(fs.existsSync(output), `Expect file ${output} to exist`);
-            }
+            verifyOutputsPresent(fs, expectedOutputFiles);
         });
     });
 }

src/testRunner/unittests/tsbuild/referencesWithRootDirInParent.ts

@@ -21,9 +21,7 @@ namespace ts {
             const builder = createSolutionBuilder(host, ["/src/src/main", "/src/src/other"], {});
             builder.build();
             host.assertDiagnosticMessages(/*empty*/);
-            for (const output of allExpectedOutputs) {
-                assert(fs.existsSync(output), `Expect file ${output} to exist`);
-            }
+            verifyOutputsPresent(fs, allExpectedOutputs);
         });
 
         it("verify that it reports error for same .tsbuildinfo file because no rootDir in the base", () => {
@@ -48,12 +46,8 @@ namespace ts {
                 [Diagnostics.Building_project_0, "/src/src/main/tsconfig.json"],
                 [Diagnostics.Cannot_write_file_0_because_it_will_overwrite_tsbuildinfo_file_generated_by_referenced_project_1, "/src/dist/tsconfig.tsbuildinfo", "/src/src/other"]
             );
-            for (const output of allExpectedOutputs) {
-                assert(fs.existsSync(output), `Expect file ${output} to exist`);
-            }
-            for (const output of missingOutputs) {
-                assert.isFalse(fs.existsSync(output), `Expect file ${output} to not exist`);
-            }
+            verifyOutputsPresent(fs, allExpectedOutputs);
+            verifyOutputsAbsent(fs, missingOutputs);
         });
 
         it("verify that it reports error for same .tsbuildinfo file", () => {
@@ -84,12 +78,8 @@ namespace ts {
                 [Diagnostics.Building_project_0, "/src/src/main/tsconfig.json"],
                 [Diagnostics.Cannot_write_file_0_because_it_will_overwrite_tsbuildinfo_file_generated_by_referenced_project_1, "/src/dist/tsconfig.tsbuildinfo", "/src/src/other"]
             );
-            for (const output of allExpectedOutputs) {
-                assert(fs.existsSync(output), `Expect file ${output} to exist`);
-            }
-            for (const output of missingOutputs) {
-                assert.isFalse(fs.existsSync(output), `Expect file ${output} to not exist`);
-            }
+            verifyOutputsPresent(fs, allExpectedOutputs);
+            verifyOutputsAbsent(fs, missingOutputs);
         });
 
         it("verify that it reports no error when .tsbuildinfo differ", () => {
@@ -120,9 +110,7 @@ namespace ts {
                 [Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist, "src/src/main/tsconfig.main.json", "src/dist/a.js"],
                 [Diagnostics.Building_project_0, "/src/src/main/tsconfig.main.json"]
             );
-            for (const output of allExpectedOutputs) {
-                assert(fs.existsSync(output), `Expect file ${output} to exist`);
-            }
+            verifyOutputsPresent(fs, allExpectedOutputs);
         });
     });
 }

src/testRunner/unittests/tsbuild/resolveJsonModule.ts

@@ -23,9 +23,7 @@ namespace ts {
             host.assertDiagnosticMessages(...expectedDiagnosticMessages);
             if (!expectedDiagnosticMessages.length) {
                 // Check for outputs. Not an exhaustive list
-                for (const output of allExpectedOutputs) {
-                    assert(fs.existsSync(output), `Expect file ${output} to exist`);
-                }
+                verifyOutputsPresent(fs, allExpectedOutputs);
             }
         }
 
@@ -71,9 +69,7 @@ export default hello.hello`);
                 [Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist, configFile, "src/dist/src/index.js"],
                 [Diagnostics.Building_project_0, `/${configFile}`]
             );
-            for (const output of [...allExpectedOutputs, "/src/dist/src/index.js.map"]) {
-                assert(fs.existsSync(output), `Expect file ${output} to exist`);
-            }
+            verifyOutputsPresent(fs, [...allExpectedOutputs, "/src/dist/src/index.js.map"]);
             host.clearDiagnostics();
             builder = createSolutionBuilder(host, [configFile], { verbose: true });
             tick();
@@ -96,9 +92,7 @@ export default hello.hello`);
                 [Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist, configFile, "src/src/index.js"],
                 [Diagnostics.Building_project_0, `/${configFile}`]
             );
-            for (const output of ["/src/src/index.js", "/src/src/index.d.ts"]) {
-                assert(fs.existsSync(output), `Expect file ${output} to exist`);
-            }
+            verifyOutputsPresent(fs, ["/src/src/index.js", "/src/src/index.d.ts"]);
             host.clearDiagnostics();
             builder = createSolutionBuilder(host, [configFile], { verbose: true });
             tick();
@@ -137,7 +131,7 @@ export default hello.hello`);
                 [Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist, mainConfigFile, "src/main/index.js"],
                 [Diagnostics.Building_project_0, `/${mainConfigFile}`],
             );
-            assert(fs.existsSync(expectedOutput), `Expect file ${expectedOutput} to exist`);
+            verifyOutputsPresent(fs, [expectedOutput]);
             host.clearDiagnostics();
             builder = createSolutionBuilder(host, [configFile], { verbose: true });
             tick();