feat: set reportDiagnostic to solution builder (#58)

Author: Timeless0911

src/typescript/worker/lib/program/solution-builder.ts

@@ -12,6 +12,7 @@ let solutionBuilderHost:
   | ts.SolutionBuilderWithWatchHost<ts.SemanticDiagnosticsBuilderProgram>
   | undefined;
 let solutionBuilder: ts.SolutionBuilder<ts.SemanticDiagnosticsBuilderProgram> | undefined;
+let hostDiagnostics: ts.Diagnostic[] = [];
 
 export function useSolutionBuilder() {
   if (!solutionBuilderHost) {
@@ -25,7 +26,7 @@ export function useSolutionBuilder() {
         host,
         oldProgram,
         configFileParsingDiagnostics,
-        projectReferences
+        projectReferences,
       ) => {
         if (compilerOptions) {
           startTracingIfNeeded(compilerOptions);
@@ -36,28 +37,38 @@ export function useSolutionBuilder() {
           host,
           oldProgram,
           configFileParsingDiagnostics,
-          projectReferences
+          projectReferences,
         );
       },
-      undefined,
+      (diagnostic) => {
+        // SolutionBuilder can emit graph-level diagnostics while building the project graph
+        // (e.g. invalid/cyclic project references) — i.e. before any Program/BuilderProgram exists.
+        hostDiagnostics.push(diagnostic);
+        updateDiagnostics(config.configFile, hostDiagnostics);
+      },
       undefined,
       undefined,
       undefined,
       (builderProgram) => {
+        const programConfigFile = getConfigFilePathFromBuilderProgram(builderProgram);
+        const programDiagnostics = getDiagnosticsOfProgram(builderProgram);
+
         updateDiagnostics(
-          getConfigFilePathFromBuilderProgram(builderProgram),
-          getDiagnosticsOfProgram(builderProgram)
+          programConfigFile,
+          programConfigFile === config.configFile
+            ? [...programDiagnostics, ...hostDiagnostics]
+            : programDiagnostics,
         );
         emitTsBuildInfoIfNeeded(builderProgram);
         stopTracingIfNeeded(builderProgram);
-      }
+      },
     );
   }
   if (!solutionBuilder) {
     solutionBuilder = typescript.createSolutionBuilderWithWatch(
       solutionBuilderHost,
       [config.configFile],
-      { watch: true }
+      { watch: true },
     );
     solutionBuilder.build();
   }
@@ -68,4 +79,5 @@ export function invalidateSolutionBuilder(withHost = false) {
     solutionBuilderHost = undefined;
   }
   solutionBuilder = undefined;
+  hostDiagnostics = [];
 }

test/e2e/with-rsbuild/__fixtures__/solution-builder/a/src/index.ts

@@ -0,0 +1 @@
+export const a = 1;

test/e2e/with-rsbuild/__fixtures__/solution-builder/a/tsconfig.json

@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "composite": true,
+    "declaration": true,
+    "outDir": "./dist",
+    "target": "ES2021",
+    "module": "ES2020",
+    "moduleResolution": "node",
+    "strict": true,
+    "types": []
+  },
+  "include": [
+    "src"
+  ],
+  "references": [
+    {
+      "path": "../b"
+    }
+  ]
+}

test/e2e/with-rsbuild/__fixtures__/solution-builder/b/src/index.ts

@@ -0,0 +1 @@
+export const b = 2;

test/e2e/with-rsbuild/__fixtures__/solution-builder/b/tsconfig.json

@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "composite": true,
+    "declaration": true,
+    "outDir": "./dist",
+    "target": "ES2021",
+    "module": "ES2020",
+    "moduleResolution": "node",
+    "strict": true,
+    "types": []
+  },
+  "include": [
+    "src"
+  ],
+  "references": [
+    {
+      "path": "../a"
+    }
+  ]
+}

test/e2e/with-rsbuild/index.test.ts

@@ -165,3 +165,29 @@ test('should not throw error when the file is excluded by code', async () => {
 
   await expect(rsbuild.build()).resolves.toBeTruthy();
 });
+
+test('should host diagnostics in SolutionBuilder (e.g. TS6202 for circular project references)', async () => {
+  const { logs, restore } = proxyConsole();
+
+  const rsbuild = await createRsbuild({
+    rsbuildConfig: {
+      tools: {
+        rspack: {
+          plugins: [
+            new TsCheckerRspackPlugin({
+              typescript: {
+                build: true,
+                configFile: './tsconfig.circular.json',
+              },
+            }),
+          ],
+        },
+      },
+    },
+  });
+
+  await expect(rsbuild.build()).rejects.toThrowError('build failed!');
+  expect(logs.find((log) => log.includes('TS6202'))).toBeTruthy();
+
+  restore();
+});

test/e2e/with-rsbuild/tsconfig.circular.json

@@ -0,0 +1,11 @@
+{
+  "files": [],
+  "references": [
+    {
+      "path": "./__fixtures__/solution-builder/a"
+    },
+    {
+      "path": "./__fixtures__/solution-builder/b"
+    }
+  ]
+}