make baselining source map optional

Author: sheetalkamat

src/testRunner/unittests/tsbuild/amdModulesWithOut.ts

@@ -77,7 +77,7 @@ namespace ts {
                     [outputFiles[project.lib][ext.buildinfo], outputFiles[project.lib][ext.js], outputFiles[project.lib][ext.dts]],
                     [outputFiles[project.app][ext.buildinfo], outputFiles[project.app][ext.js], outputFiles[project.app][ext.dts]]
                 ],
-                lastProjectOutputJs: outputFiles[project.app][ext.js],
+                lastProjectOutput: outputFiles[project.app][ext.js],
                 initialBuild: {
                     modifyFs
                 },
@@ -231,7 +231,7 @@ ${internal} export enum internalEnum { a, b, c }`);
                         [libOutputFile[ext.buildinfo], libOutputFile[ext.js], libOutputFile[ext.dts]],
                         [outputFiles[project.app][ext.buildinfo], outputFiles[project.app][ext.js], outputFiles[project.app][ext.dts]]
                     ],
-                    lastProjectOutputJs: outputFiles[project.app][ext.js],
+                    lastProjectOutput: outputFiles[project.app][ext.js],
                     initialBuild: {
                         modifyFs,
                         expectedDiagnostics: [

src/testRunner/unittests/tsbuild/helpers.ts

@@ -199,7 +199,7 @@ declare const console: { log(msg: any): void; };`;
         fs: vfs.FileSystem;
         tick: () => void;
         rootNames: ReadonlyArray<string>;
-        expectedMapFileNames: ReadonlyArray<string>;
+        expectedMapFileNames?: ReadonlyArray<string>;
         expectedBuildInfoFilesForSectionBaselines?: ReadonlyArray<BuildInfoSectionBaselineFiles>;
         modifyFs: (fs: vfs.FileSystem) => void;
     }
@@ -221,7 +221,7 @@ declare const console: { log(msg: any): void; };`;
             return originalReadFile.call(host, path);
         };
         builder.build();
-        generateSourceMapBaselineFiles(fs, expectedMapFileNames);
+        if (expectedMapFileNames) generateSourceMapBaselineFiles(fs, expectedMapFileNames);
         generateBuildInfoSectionBaselineFiles(fs, expectedBuildInfoFilesForSectionBaselines || emptyArray);
         fs.makeReadonly();
         return { fs, actualReadFileMap, host, builder };
@@ -268,9 +268,10 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt
         tick: () => void;
         proj: string;
         rootNames: ReadonlyArray<string>;
-        expectedMapFileNames: ReadonlyArray<string>;
+        /** map file names to generate baseline of */
+        expectedMapFileNames?: ReadonlyArray<string>;
         expectedBuildInfoFilesForSectionBaselines?: ReadonlyArray<BuildInfoSectionBaselineFiles>;
-        lastProjectOutputJs: string;
+        lastProjectOutput: string;
         initialBuild: BuildState;
         outputFiles?: ReadonlyArray<string>;
         incrementalDtsChangedBuild?: BuildState;
@@ -282,7 +283,7 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt
 
     export function verifyTsbuildOutput({
         scenario, projFs, time, tick, proj, rootNames, outputFiles, baselineOnly, verifyDiagnostics,
-        expectedMapFileNames, expectedBuildInfoFilesForSectionBaselines, lastProjectOutputJs,
+        expectedMapFileNames, expectedBuildInfoFilesForSectionBaselines, lastProjectOutput,
         initialBuild, incrementalDtsChangedBuild, incrementalDtsUnchangedBuild, incrementalHeaderChangedBuild
     }: VerifyTsBuildInput) {
         describe(`tsc --b ${proj}:: ${scenario}`, () => {
@@ -331,7 +332,7 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt
                     let beforeBuildTime: number;
                     let afterBuildTime: number;
                     before(() => {
-                        beforeBuildTime = fs.statSync(lastProjectOutputJs).mtimeMs;
+                        beforeBuildTime = fs.statSync(lastProjectOutput).mtimeMs;
                         tick();
                         newFs = fs.shadow();
                         tick();
@@ -343,7 +344,7 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt
                             expectedBuildInfoFilesForSectionBaselines,
                             modifyFs: incrementalModifyFs,
                         }));
-                        afterBuildTime = newFs.statSync(lastProjectOutputJs).mtimeMs;
+                        afterBuildTime = newFs.statSync(lastProjectOutput).mtimeMs;
                     });
                     after(() => {
                         newFs = undefined!;
@@ -373,7 +374,6 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt
                             fs: newFs.shadow(),
                             tick,
                             rootNames,
-                            expectedMapFileNames: emptyArray,
                             modifyFs: fs => {
                                 // Delete output files
                                 for (const outputFile of expectedOutputFiles) {

src/testRunner/unittests/tsbuild/inferredTypeFromTransitiveModule.ts

@@ -16,8 +16,7 @@ namespace ts {
             tick,
             proj: "inferredTypeFromTransitiveModule",
             rootNames: ["/src"],
-            expectedMapFileNames: emptyArray,
-            lastProjectOutputJs: `/src/obj/index.js`,
+            lastProjectOutput: `/src/obj/index.js`,
             outputFiles: [
                 "/src/obj/bar.js", "/src/obj/bar.d.ts",
                 "/src/obj/bundling.js", "/src/obj/bundling.d.ts",

src/testRunner/unittests/tsbuild/lateBoundSymbol.ts

@@ -16,8 +16,7 @@ namespace ts {
             tick,
             proj: "lateBoundSymbol",
             rootNames: ["/src/tsconfig.json"],
-            expectedMapFileNames: emptyArray,
-            lastProjectOutputJs: "/src/src/main.js",
+            lastProjectOutput: "/src/src/main.js",
             outputFiles: [
                 "/src/src/hkt.js",
                 "/src/src/main.js",

src/testRunner/unittests/tsbuild/outFile.ts

@@ -288,7 +288,7 @@ namespace ts {
                 rootNames: ["/src/third"],
                 expectedMapFileNames,
                 expectedBuildInfoFilesForSectionBaselines: expectedBuildInfoFilesForSectionBaselines || expectedTsbuildInfoFileNames,
-                lastProjectOutputJs: outputFiles[project.third][ext.js],
+                lastProjectOutput: outputFiles[project.third][ext.js],
                 initialBuild: {
                     modifyFs,
                     expectedDiagnostics: initialExpectedDiagnostics,

src/testRunner/unittests/tsbuild/sample.ts

@@ -617,7 +617,7 @@ export class cNew {}`);
                     "/src/core/index.d.ts.map",
                     "/src/logic/index.js.map"
                 ],
-                lastProjectOutputJs: "/src/tests/index.js",
+                lastProjectOutput: "/src/tests/index.js",
                 initialBuild,
                 incrementalDtsChangedBuild: {
                     modifyFs: fs => appendText(fs, "/src/core/index.ts", `
@@ -727,7 +727,7 @@ class someClass { }`),
                     "/src/core/index.d.ts.map",
                     "/src/logic/index.js.map"
                 ],
-                lastProjectOutputJs: "/src/tests/index.js",
+                lastProjectOutput: "/src/tests/index.js",
                 initialBuild,
                 incrementalDtsChangedBuild: {
                     modifyFs: fs => replaceText(fs, "/src/logic/tsconfig.json", `"declaration": true,`, `"declaration": true,
@@ -795,7 +795,7 @@ class someClass { }`),
                     "/src/core/index.d.ts.map",
                     "/src/logic/index.js.map"
                 ],
-                lastProjectOutputJs: "/src/tests/index.js",
+                lastProjectOutput: "/src/tests/index.js",
                 initialBuild: {
                     modifyFs: fs => replaceText(fs, "/src/logic/tsconfig.json", `"composite": true,`, `"composite": true,
         "tsBuildInfoFile": "ownFile.tsbuildinfo",`),
@@ -851,8 +851,7 @@ class someClass { }`),
                 tick,
                 proj: "sample1",
                 rootNames: ["/src/core"],
-                expectedMapFileNames: emptyArray,
-                lastProjectOutputJs: "/src/core/index.js",
+                lastProjectOutput: "/src/core/index.js",
                 initialBuild: {
                     modifyFs: fs => fs.writeFileSync("/src/core/tsconfig.json", `{
     "compilerOptions": {
@@ -892,8 +891,7 @@ class someClass { }`),
                 tick,
                 proj: "sample1",
                 rootNames: ["/src/core"],
-                expectedMapFileNames: emptyArray,
-                lastProjectOutputJs: "/src/core/index.js",
+                lastProjectOutput: "/src/core/index.js",
                 initialBuild: {
                     modifyFs: fs => {
                         fs.writeFileSync("/lib/lib.esnext.full.d.ts", `/// <reference no-default-lib="true"/>
@@ -942,8 +940,7 @@ class someClass { }`),
                 tick,
                 proj: "sample1",
                 rootNames: ["/src/core"],
-                expectedMapFileNames: emptyArray,
-                lastProjectOutputJs: "/src/core/index.js",
+                lastProjectOutput: "/src/core/index.js",
                 initialBuild: {
                     modifyFs: fs => fs.writeFileSync("/src/core/tsconfig.json", `{
     "compilerOptions": {
@@ -981,8 +978,7 @@ class someClass { }`),
                 tick,
                 proj: "sample1",
                 rootNames: ["/src/tests"],
-                expectedMapFileNames: emptyArray,
-                lastProjectOutputJs: "/src/tests/index.js",
+                lastProjectOutput: "/src/tests/index.js",
                 initialBuild: {
                     modifyFs: fs => fs.writeFileSync("/src/tests/tsconfig.json", `{
     "references": [