Move module specifiers to verifyTsBuildOutput

Author: sheetalkamat

src/harness/fakes.ts

@@ -571,6 +571,15 @@ Actual: ${JSON.stringify(actual, /*replacer*/ undefined, " ")}
 Expected: ${JSON.stringify(expected, /*replacer*/ undefined, " ")}`);
         }
 
+        assertErrors(...expectedDiagnostics: ExpectedErrorDiagnostic[]) {
+            const actual = this.diagnostics.filter(d => d.kind === DiagnosticKind.Error).map(diagnosticToText);
+            const expected = expectedDiagnostics.map(expectedDiagnosticToText);
+            assert.deepEqual(actual, expected, `Diagnostics arrays did not match:
+Actual: ${JSON.stringify(actual, /*replacer*/ undefined, " ")}
+Expected: ${JSON.stringify(expected, /*replacer*/ undefined, " ")}
+Actual All:: ${JSON.stringify(this.diagnostics.slice().map(diagnosticToText), /*replacer*/ undefined, " ")}`);
+        }
+
         printDiagnostics(header = "== Diagnostics ==") {
             const out = ts.createDiagnosticReporter(ts.sys);
             ts.sys.write(header + "\r\n");

src/testRunner/unittests/tsbuild/helpers.ts

@@ -102,7 +102,22 @@ namespace ts {
 interface ReadonlyArray<T> {}
 declare const console: { log(msg: any): void; };`;
 
-    export function loadProjectFromDisk(root: string, time?: vfs.FileSystemOptions["time"]): vfs.FileSystem {
+    export const symbolLibContent = `
+interface SymbolConstructor {
+    readonly species: symbol;
+    readonly toStringTag: symbol;
+}
+declare var Symbol: SymbolConstructor;
+interface Symbol {
+    readonly [Symbol.toStringTag]: string;
+}
+`;
+
+    export function loadProjectFromDisk(
+        root: string,
+        time?: vfs.FileSystemOptions["time"],
+        libContentToAppend?: string
+    ): vfs.FileSystem {
         const resolver = vfs.createResolver(Harness.IO);
         const fs = new vfs.FileSystem(/*ignoreCase*/ true, {
             files: {
@@ -112,10 +127,29 @@ declare const console: { log(msg: any): void; };`;
             meta: { defaultLibLocation: "/lib" },
             time
         });
+        addLibAndMakeReadonly(fs, libContentToAppend);
+        return fs;
+    }
+
+    export function loadProjectFromFiles(
+        files: vfs.FileSet,
+        time?: vfs.FileSystemOptions["time"],
+        libContentToAppend?: string
+    ): vfs.FileSystem {
+        const fs = new vfs.FileSystem(/*ignoreCase*/ true, {
+            files,
+            cwd: "/",
+            meta: { defaultLibLocation: "/lib" },
+            time
+        });
+        addLibAndMakeReadonly(fs, libContentToAppend);
+        return fs;
+    }
+
+    function addLibAndMakeReadonly(fs: vfs.FileSystem, libContentToAppend?: string) {
         fs.mkdirSync("/lib");
-        fs.writeFileSync("/lib/lib.d.ts", libContent);
+        fs.writeFileSync("/lib/lib.d.ts", libContentToAppend ? `${libContent}${libContentToAppend}` : libContent);
         fs.makeReadonly();
-        return fs;
     }
 
     export function verifyOutputsPresent(fs: vfs.FileSystem, outputs: readonly string[]) {
@@ -360,6 +394,12 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt
                             host.assertDiagnosticMessages(...(incrementalExpectedDiagnostics || emptyArray));
                         });
                     }
+                    else {
+                        // Build should pass without errors if not verifying diagnostics
+                        it(`verify no errors`, () => {
+                            host.assertErrors(/*empty*/);
+                        });
+                    }
                     it(`Generates files matching the baseline`, () => {
                         generateBaseline(newFs, proj, scenario, subScenario, fs);
                     });

src/testRunner/unittests/tsbuild/moduleSpecifiers.ts

@@ -1,8 +1,10 @@
 namespace ts {
     // https://github.com/microsoft/TypeScript/issues/31696
-    it("unittests:: tsbuild:: moduleSpecifiers:: synthesized module specifiers to referenced projects resolve correctly", () => {
-        const baseFs = vfs.createFromFileSystem(Harness.IO, /*ignoreCase*/ false, {
-            files: {
+    describe("unittests:: tsbuild:: moduleSpecifiers:: synthesized module specifiers to referenced projects resolve correctly", () => {
+        let projFs: vfs.FileSystem;
+        const { time, tick } = getTime();
+        before(() => {
+            projFs = loadProjectFromFiles({
                 "/src/common/nominal.ts": utils.dedent`
                     export declare type Nominal<T, Name extends string> = T & {
                         [Symbol.species]: Name;
@@ -71,7 +73,6 @@ namespace ts {
                             "skipLibCheck": true,
                             "rootDir": "./",
                             "outDir": "lib",
-                            "lib": ["dom", "es2015", "es2015.symbol.wellknown"]
                         }
                     }`,
                 "/tsconfig.json": utils.dedent`{
@@ -83,16 +84,23 @@ namespace ts {
                     ],
                     "include": []
                 }`
+            }, time, symbolLibContent);
+        });
+        after(() => {
+            projFs = undefined!;
+        });
+        verifyTsbuildOutput({
+            scenario: `synthesized module specifiers resolve correctly`,
+            projFs: () => projFs,
+            time,
+            tick,
+            proj: "moduleSpecifiers",
+            rootNames: ["/"],
+            lastProjectOutput: `/src/lib/index.d.ts`,
+            initialBuild: {
+                modifyFs: noop,
             },
-            cwd: "/"
+            baselineOnly: true
         });
-        const fs = baseFs.makeReadonly().shadow();
-        const sys = new fakes.System(fs, { executingFilePath: "/", newLine: "\n" });
-        const host = new fakes.SolutionBuilderHost(sys);
-        const builder = createSolutionBuilder(host, ["/tsconfig.json"], { dry: false, force: false, verbose: false });
-        builder.build();
-
-        // Prior to fixing GH31696 the import in `/lib/src/sub-project-2/index.d.ts` was `import("../../lib/src/common/nonterminal")`, which was invalid.
-        Harness.Baseline.runBaseline("tsbuild/moduleSpecifiers/initial-build/resolves-correctly.js", vfs.formatPatch(fs.diff(baseFs)));
     });
-}
+}