Make sure that incremental correctness is checked with correct writeF…

…ile so we know buildInfo was written Also baseline these so its easy to verify the changes
microsoft · sheetalkamat · Jun 8, 2022 · Apr 13, 2022 · Apr 13, 2022 · Apr 14, 2022
commit 7377470be86aa3a139b79b4d3484f75f2c9a65ec
diff --git a/src/testRunner/unittests/tsbuild/helpers.ts b/src/testRunner/unittests/tsbuild/helpers.ts
diff --git a/src/testRunner/unittests/tsbuild/noEmitOnError.ts b/src/testRunner/unittests/tsbuild/noEmitOnError.ts
@@ -8,40 +8,81 @@ namespace ts {
             projFs = undefined!;
         });
 
-        function verifyNoEmitOnError(subScenario: string, fixModifyFs: TestTscEdit["modifyFs"], modifyFs?: TestTscEdit["modifyFs"]) {
-            verifyTscWithEdits({
-                scenario: "noEmitOnError",
-                subScenario,
-                fs: () => projFs,
-                modifyFs,
-                commandLineArgs: ["--b", "/src/tsconfig.json"],
-                edits: [
-                    noChangeRun,
-                    {
-                        subScenario: "Fix error",
-                        modifyFs: fixModifyFs,
-                    },
-                    noChangeRun,
-                ],
-                baselinePrograms: true,
-                baselineIncremental: true
-            });
-        }
+        verifyTscWithEdits({
+            scenario: "noEmitOnError",
+            subScenario: "syntax errors",
+            fs: () => projFs,
+            commandLineArgs: ["--b", "/src/tsconfig.json"],
+            edits: [
+                noChangeRun,
+                {
+                    subScenario: "Fix error",
+                    modifyFs: fs => fs.writeFileSync("/src/src/main.ts", `import { A } from "../shared/types/db";
+const a = {
+    lastName: 'sdsd'
+};`, "utf-8"),
+                },
+                noChangeRun,
+            ],
+            baselinePrograms: true,
+        });
 
-        verifyNoEmitOnError(
-            "syntax errors",
-            fs => fs.writeFileSync("/src/src/main.ts", `import { A } from "../shared/types/db";
+        verifyTscWithEdits({
+            scenario: "noEmitOnError",
+            subScenario: "syntax errors with incremental",
+            fs: () => projFs,
+            commandLineArgs: ["--b", "/src/tsconfig.json", "--incremental"],
+            edits: [
+                noChangeRun,
+                {
+                    subScenario: "Fix error",
+                    modifyFs: fs => fs.writeFileSync("/src/src/main.ts", `import { A } from "../shared/types/db";
 const a = {
     lastName: 'sdsd'
-};`, "utf-8")
-        );
+};`, "utf-8"),
+                    descripencyExplaination: noChangeWithExportsDescripencyRun.descripencyExplaination,
+                },
+                noChangeWithExportsDescripencyRun,
+            ],
+            baselinePrograms: true,
+        });
 
-        verifyNoEmitOnError(
-            "semantic errors",
-            fs => fs.writeFileSync("/src/src/main.ts", `import { A } from "../shared/types/db";
+        verifyTscWithEdits({
+            scenario: "noEmitOnError",
+            subScenario: "semantic errors",
+            fs: () => projFs,
+            modifyFs: fs => fs.writeFileSync("/src/src/main.ts", `import { A } from "../shared/types/db";
+const a: string = 10;`, "utf-8"),
+            commandLineArgs: ["--b", "/src/tsconfig.json"],
+            edits: [
+                noChangeRun,
+                {
+                    subScenario: "Fix error",
+                    modifyFs: fs => fs.writeFileSync("/src/src/main.ts", `import { A } from "../shared/types/db";
 const a: string = "hello";`, "utf-8"),
-            fs => fs.writeFileSync("/src/src/main.ts", `import { A } from "../shared/types/db";
-const a: string = 10;`, "utf-8")
-        );
+                },
+                noChangeRun,
+            ],
+            baselinePrograms: true,
+        });
+
+        verifyTscWithEdits({
+            scenario: "noEmitOnError",
+            subScenario: "semantic errors with incremental",
+            fs: () => projFs,
+            modifyFs: fs => fs.writeFileSync("/src/src/main.ts", `import { A } from "../shared/types/db";
+const a: string = 10;`, "utf-8"),
+            commandLineArgs: ["--b", "/src/tsconfig.json", "--incremental"],
+            edits: [
+                noChangeWithExportsDescripencyRun,
+                {
+                    subScenario: "Fix error",
+                    modifyFs: fs => fs.writeFileSync("/src/src/main.ts", `import { A } from "../shared/types/db";
+const a: string = "hello";`, "utf-8"),
+                },
+                noChangeRun,
+            ],
+            baselinePrograms: true,
+        });
     });
 }
diff --git a/src/testRunner/unittests/tsbuild/outputPaths.ts b/src/testRunner/unittests/tsbuild/outputPaths.ts
@@ -55,16 +55,7 @@ namespace ts {
                     }
                 })
             }),
-            edits: [
-                noChangeRun,
-                {
-                    ...noChangeProject,
-                    cleanBuildDiscrepancies: () => new Map([
-                        ["/src/dist/tsconfig.tsbuildinfo", CleanBuildDescrepancy.CleanFileTextDifferent], // tsbuildinfo will have -p setting when built using -p vs no build happens incrementally because of no change.
-                        ["/src/dist/tsconfig.tsbuildinfo.readable.baseline.txt", CleanBuildDescrepancy.CleanFileTextDifferent] // tsbuildinfo will have -p setting when built using -p vs no build happens incrementally because of no change.
-                    ]),
-                }
-            ],
+            edits,
         }, ["/src/dist/src/index.js", "/src/dist/src/index.d.ts"]);
 
         verify({

diff --git a/src/testRunner/unittests/tsbuild/publicApi.ts b/src/testRunner/unittests/tsbuild/publicApi.ts
@@ -46,7 +46,7 @@ export function f22() { } // trailing`,
                 writtenFiles.add(path);
                 return originalWriteFile.call(sys, fileName, content, writeByteOrderMark);
             };
-            const { cb, getPrograms } = commandLineCallbacks(sys, /*originalReadCall*/ undefined, originalWriteFile);
+            const { cb, getPrograms } = commandLineCallbacks(sys, /*originalReadCall*/ undefined);
             const buildHost = createSolutionBuilderHost(
                 sys,
                     /*createProgram*/ undefined,

diff --git a/src/testRunner/unittests/tsbuild/resolveJsonModule.ts b/src/testRunner/unittests/tsbuild/resolveJsonModule.ts
@@ -57,7 +57,7 @@ export default hello.hello`);
             fs: () => projFs,
             commandLineArgs: ["--b", "src/tsconfig_withFiles.json", "--verbose", "--explainFiles"],
             modifyFs: fs => replaceText(fs, "src/tsconfig_withFiles.json", `"composite": true,`, `"composite": true, "sourceMap": true,`),
-            edits: noChangeOnlyRuns
+            edits: noChangeWithExportsDescripencyOnlyRuns
         });
 
         verifyTscWithEdits({
@@ -66,7 +66,7 @@ export default hello.hello`);
             fs: () => projFs,
             commandLineArgs: ["--b", "src/tsconfig_withFiles.json", "--verbose"],
             modifyFs: fs => replaceText(fs, "src/tsconfig_withFiles.json", `"outDir": "dist",`, ""),
-            edits: noChangeOnlyRuns
+            edits: noChangeWithExportsDescripencyOnlyRuns
         });
     });
 
@@ -76,7 +76,7 @@ export default hello.hello`);
             subScenario: "importing json module from project reference",
             fs: () => loadProjectFromDisk("tests/projects/importJsonFromProjectReference"),
             commandLineArgs: ["--b", "src/tsconfig.json", "--verbose", "--explainFiles"],
-            edits: noChangeOnlyRuns
+            edits: noChangeWithExportsDescripencyOnlyRuns
         });
     });
 }
diff --git a/src/testRunner/unittests/tsc/helpers.ts b/src/testRunner/unittests/tsc/helpers.ts
@@ -9,7 +9,15 @@ namespace ts {
         subScenario: "no-change-run",
         modifyFs: noop
     };
+    export const noChangeWithExportsDescripencyRun: TestTscEdit = {
+        ...noChangeRun,
+        descripencyExplaination: () => [
+            "Incremental build does not change and has .ts as signature so exports has all imported modules/referenced files",
+            "Clean build always uses d.ts for signature for testing thus does not contain non exported modules/referenced files that arent needed"
+        ]
+    };
     export const noChangeOnlyRuns = [noChangeRun];
+    export const noChangeWithExportsDescripencyOnlyRuns = [noChangeWithExportsDescripencyRun];
 
     export interface TestTscCompile extends TestTscCompileLikeBase {
         baselineSourceMap?: boolean;
@@ -30,21 +38,20 @@ namespace ts {
     export function commandLineCallbacks(
         sys: System & { writtenFiles: ReadonlyCollection<Path>; },
         originalReadCall?: System["readFile"],
-        originalWriteFile?: System["writeFile"],
     ): CommandLineCallbacks {
         let programs: CommandLineProgram[] | undefined;
 
         return {
             cb: program => {
                 if (isAnyProgram(program)) {
-                    baselineBuildInfo(program.getCompilerOptions(), sys, originalReadCall, originalWriteFile);
+                    baselineBuildInfo(program.getCompilerOptions(), sys, originalReadCall);
                     (programs || (programs = [])).push(isBuilderProgram(program) ?
                         [program.getProgram(), program] :
                         [program]
                     );
                 }
                 else {
-                    baselineBuildInfo(program.options, sys, originalReadCall, originalWriteFile);
+                    baselineBuildInfo(program.options, sys, originalReadCall);
                 }
             },
             getPrograms: () => {
@@ -120,11 +127,13 @@ ${patch ? vfs.formatPatch(patch) : ""}`
         const originalWriteFile = sys.writeFile;
         sys.writeFile = (fileName, content, writeByteOrderMark) => {
             const path = toPathWithSystem(sys, fileName);
-            assert.isFalse(writtenFiles.has(path));
+            // When buildinfo is same for two projects,
+            // it gives error and doesnt write buildinfo but because buildInfo is written for one project,
+            // readable baseline will be written two times for those two projects with same contents and is ok
+            Debug.assert(!writtenFiles.has(path) || endsWith(path, "baseline.txt"));
             writtenFiles.add(path);
             return originalWriteFile.call(sys, fileName, content, writeByteOrderMark);
         };
-        return originalWriteFile;
     }
 
     export function createSolutionBuilderHostForBaseline(sys: TscCompileSystem, versionToWrite?: string) {
@@ -153,7 +162,7 @@ ${patch ? vfs.formatPatch(patch) : ""}`
         });
 
         function commandLineCompile(sys: TscCompileSystem) {
-            const originalWriteFile = makeSystemReadyForBaseline(sys);
+            makeSystemReadyForBaseline(sys);
             actualReadFileMap = {};
             const originalReadFile = sys.readFile;
             sys.readFile = path => {
@@ -164,7 +173,7 @@ ${patch ? vfs.formatPatch(patch) : ""}`
                 return originalReadFile.call(sys, path);
             };
 
-            const result = commandLineCallbacks(sys, originalReadFile, originalWriteFile);
+            const result = commandLineCallbacks(sys, originalReadFile);
             executeCommandLine(
                 sys,
                 result.cb,

diff --git a/src/testRunner/unittests/tsc/incremental.ts b/src/testRunner/unittests/tsc/incremental.ts
@@ -90,7 +90,7 @@ namespace ts {
                     commandLineArgs: ["--incremental", "-p", "src"],
                     modifyFs,
                     edits: [
-                        noChangeRun,
+                        noChangeWithExportsDescripencyRun,
                         {
                             subScenario: "incremental-declaration-doesnt-change",
                             modifyFs: fixModifyFs
@@ -124,12 +124,12 @@ const a: string = 10;`, "utf-8"),
 
             function verifyNoEmitChanges(compilerOptions: CompilerOptions) {
                 const noChangeRunWithNoEmit: TestTscEdit = {
-                    ...noChangeRun,
+                    ...noChangeWithExportsDescripencyRun,
                     subScenario: "No Change run with noEmit",
                     commandLineArgs: ["--p", "src/project", "--noEmit"],
                 };
                 const noChangeRunWithEmit: TestTscEdit = {
-                    ...noChangeRun,
+                    ...noChangeWithExportsDescripencyRun,
                     subScenario: "No Change run with emit",
                     commandLineArgs: ["--p", "src/project"],
                 };
@@ -156,6 +156,7 @@ const a: string = 10;`, "utf-8"),
                         {
                             subScenario: "Fix error and emit",
                             modifyFs: fs => replaceText(fs, "/src/project/src/class.ts", "prop1", "prop"),
+                            descripencyExplaination: noChangeWithExportsDescripencyRun.descripencyExplaination,
                         },
                         noChangeRunWithEmit,
                         noChangeRunWithNoEmit,
@@ -164,6 +165,7 @@ const a: string = 10;`, "utf-8"),
                         {
                             subScenario: "Introduce error and emit",
                             modifyFs: fs => replaceText(fs, "/src/project/src/class.ts", "prop", "prop1"),
+                            descripencyExplaination: noChangeWithExportsDescripencyRun.descripencyExplaination,
                         },
                         noChangeRunWithEmit,
                         noChangeRunWithNoEmit,
@@ -173,6 +175,7 @@ const a: string = 10;`, "utf-8"),
                             subScenario: "Fix error and no emit",
                             commandLineArgs: ["--p", "src/project", "--noEmit"],
                             modifyFs: fs => replaceText(fs, "/src/project/src/class.ts", "prop1", "prop"),
+                            descripencyExplaination: noChangeWithExportsDescripencyRun.descripencyExplaination,
                         },
                         noChangeRunWithEmit,
                         noChangeRunWithNoEmit,
@@ -196,6 +199,7 @@ const a: string = 10;`, "utf-8"),
                         {
                             subScenario: "Fix error and no emit",
                             modifyFs: fs => replaceText(fs, "/src/project/src/class.ts", "prop1", "prop"),
+                            descripencyExplaination: noChangeWithExportsDescripencyRun.descripencyExplaination
                         },
                         noChangeRunWithEmit,
                     ],
@@ -252,7 +256,7 @@ const a: string = 10;`, "utf-8"),
             }),
             commandLineArgs: ["--p", "src/project"],
             edits: [
-                noChangeRun,
+                noChangeWithExportsDescripencyRun,
                 {
                     subScenario: "Modify main file",
                     modifyFs: fs => appendText(fs, `/src/project/src/main.ts`, `something();`),
@@ -352,11 +356,10 @@ declare global {
                 {
                     subScenario: "Add class3 to project1 and build it",
                     modifyFs: fs => fs.writeFileSync("/src/projects/project1/class3.ts", `class class3 {}`, "utf-8"),
-                    cleanBuildDiscrepancies: () => new Map<string, CleanBuildDescrepancy>([
-                        // Ts buildinfo will not be updated in incremental build so it will have semantic diagnostics cached from previous build
-                        // But in clean build because of global diagnostics, semantic diagnostics are not queried so not cached in tsbuildinfo
-                        ["/src/projects/project2/tsconfig.tsbuildinfo", CleanBuildDescrepancy.CleanFileTextDifferent]
-                    ]),
+                    descripencyExplaination: () => [
+                        "Ts buildinfo will not be updated in incremental build so it will have semantic diagnostics cached from previous build",
+                        "But in clean build because of global diagnostics, semantic diagnostics are not queried so not cached in tsbuildinfo",
+                    ],
                 },
                 {
                     subScenario: "Add output of class3",
@@ -372,11 +375,10 @@ declare global {
                 {
                     subScenario: "Delete output for class3",
                     modifyFs: fs => fs.unlinkSync("/src/projects/project1/class3.d.ts"),
-                    cleanBuildDiscrepancies: () => new Map<string, CleanBuildDescrepancy>([
-                        // Ts buildinfo willbe updated but will retain lib file errors from previous build and not others because they are emitted because of change which results in clearing their semantic diagnostics cache
-                        // But in clean build because of global diagnostics, semantic diagnostics are not queried so not cached in tsbuildinfo
-                        ["/src/projects/project2/tsconfig.tsbuildinfo", CleanBuildDescrepancy.CleanFileTextDifferent]
-                    ]),
+                    descripencyExplaination: () => [
+                        "Ts buildinfo willbe updated but will retain lib file errors from previous build and not others because they are emitted because of change which results in clearing their semantic diagnostics cache",
+                        "But in clean build because of global diagnostics, semantic diagnostics are not queried so not cached in tsbuildinfo",
+                    ],
                 },
                 {
                     subScenario: "Create output for class3",

diff --git a/...selines/reference/tsbuild/noEmitOnError/semantic-errors-with-incremental-discrepancies.js b/...selines/reference/tsbuild/noEmitOnError/semantic-errors-with-incremental-discrepancies.js
@@ -0,0 +1,10 @@
+0:: no-change-run
+Incremental build does not change and has .ts as signature so exports has all imported modules/referenced files
+Clean build always uses d.ts for signature for testing thus does not contain non exported modules/referenced files that arent needed
+Incremental and clean size of maps do not match:: exportedModulesMap:: File:: /src/dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
+Incremental: {
+  "../src/main.ts": [
+    "../shared/types/db.ts"
+  ]
+}
+Clean: {}
diff --git a/...baselines/reference/tsbuild/noEmitOnError/syntax-errors-with-incremental-discrepancies.js b/...baselines/reference/tsbuild/noEmitOnError/syntax-errors-with-incremental-discrepancies.js
@@ -0,0 +1,20 @@
+1:: Fix error
+Incremental build does not change and has .ts as signature so exports has all imported modules/referenced files
+Clean build always uses d.ts for signature for testing thus does not contain non exported modules/referenced files that arent needed
+Incremental and clean size of maps do not match:: exportedModulesMap:: File:: /src/dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
+Incremental: {
+  "../src/main.ts": [
+    "../shared/types/db.ts"
+  ]
+}
+Clean: {}
+2:: no-change-run
+Incremental build does not change and has .ts as signature so exports has all imported modules/referenced files
+Clean build always uses d.ts for signature for testing thus does not contain non exported modules/referenced files that arent needed
+Incremental and clean size of maps do not match:: exportedModulesMap:: File:: /src/dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
+Incremental: {
+  "../src/main.ts": [
+    "../shared/types/db.ts"
+  ]
+}
+Clean: {}
diff --git a/...e/tsbuild/resolveJsonModule/importing-json-module-from-project-reference-discrepancies.js b/...e/tsbuild/resolveJsonModule/importing-json-module-from-project-reference-discrepancies.js
@@ -0,0 +1,10 @@
+0:: no-change-run
+Incremental build does not change and has .ts as signature so exports has all imported modules/referenced files
+Clean build always uses d.ts for signature for testing thus does not contain non exported modules/referenced files that arent needed
+Incremental and clean size of maps do not match:: exportedModulesMap:: File:: /src/main/tsconfig.tsbuildinfo.readable.baseline.txt
+Incremental: {
+  "./index.ts": [
+    "../strings/foo.json"
+  ]
+}
+Clean: {}
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/sourcemap-discrepancies.js b/tests/baselines/reference/tsbuild/resolveJsonModule/sourcemap-discrepancies.js
@@ -0,0 +1,10 @@
+0:: no-change-run
+Incremental build does not change and has .ts as signature so exports has all imported modules/referenced files
+Clean build always uses d.ts for signature for testing thus does not contain non exported modules/referenced files that arent needed
+Incremental and clean size of maps do not match:: exportedModulesMap:: File:: /src/dist/tsconfig_withfiles.tsbuildinfo.readable.baseline.txt
+Incremental: {
+  "../src/index.ts": [
+    "../src/hello.json"
+  ]
+}
+Clean: {}