fix: cleanup host diagnostics in SolutionBuilder on rebuild (#62)

Author: Timeless0911

src/typescript/worker/lib/host/watch-compiler-host.ts

@@ -8,7 +8,7 @@ export function createWatchCompilerHost<TProgram extends ts.BuilderProgram>(
   createProgram?: ts.CreateProgram<TProgram>,
   reportDiagnostic?: ts.DiagnosticReporter,
   reportWatchStatus?: ts.WatchStatusReporter,
-  afterProgramCreate?: (program: TProgram) => void
+  afterProgramCreate?: (program: TProgram) => void,
 ): ts.WatchCompilerHostOfFilesAndCompilerOptions<TProgram> {
   const baseWatchCompilerHost = typescript.createWatchCompilerHost(
     parsedConfig.fileNames,
@@ -17,7 +17,7 @@ export function createWatchCompilerHost<TProgram extends ts.BuilderProgram>(
     createProgram,
     reportDiagnostic,
     reportWatchStatus,
-    parsedConfig.projectReferences
+    parsedConfig.projectReferences,
   );
 
   return {
@@ -28,24 +28,26 @@ export function createWatchCompilerHost<TProgram extends ts.BuilderProgram>(
       compilerHost?: ts.CompilerHost,
       oldProgram?: TProgram,
       configFileParsingDiagnostics?: ReadonlyArray<ts.Diagnostic>,
-      projectReferences?: ReadonlyArray<ts.ProjectReference> | undefined
+      projectReferences?: ReadonlyArray<ts.ProjectReference> | undefined,
     ): TProgram {
       return baseWatchCompilerHost.createProgram(
         rootNames,
         options,
         compilerHost,
         oldProgram,
         configFileParsingDiagnostics,
-        projectReferences
+        projectReferences,
       );
     },
     afterProgramCreate(program) {
       if (afterProgramCreate) {
         afterProgramCreate(program);
       }
     },
-    onWatchStatusChange(): void {
-      // do nothing
+    onWatchStatusChange(...args) {
+      if (reportWatchStatus) {
+        reportWatchStatus(...args);
+      }
     },
     watchFile: system.watchFile,
     watchDirectory: system.watchDirectory,

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

@@ -46,7 +46,14 @@ export function useSolutionBuilder() {
         hostDiagnostics.push(diagnostic);
         updateDiagnostics(config.configFile, hostDiagnostics);
       },
-      undefined,
+      (diagnostic) => {
+        // clean host diagnostics when rebuild start
+        // 6031: 'Starting compilation in watch mode...'
+        // 6032: 'File change detected. Starting incremental compilation...'
+        if (diagnostic.code === 6031 || diagnostic.code === 6032) {
+          hostDiagnostics = [];
+        }
+      },
       undefined,
       undefined,
       (builderProgram) => {

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

@@ -1,4 +1,5 @@
-import { dirname } from 'node:path';
+import { dirname, resolve } from 'node:path';
+import { readFile, writeFile } from 'node:fs/promises';
 import { fileURLToPath } from 'node:url';
 import { expect, test } from '@playwright/test';
 import {
@@ -191,3 +192,120 @@ test('should host diagnostics in SolutionBuilder (e.g. TS6202 for circular proje
 
   restore();
 });
+
+test('should cleanup host diagnostics in SolutionBuilder when rebuild in dev mode', async ({
+  page,
+}) => {
+  const { logs, restore } = proxyConsole();
+
+  const srcIndexPath = resolve(__dirname, 'src/index.ts');
+  const originalSrcIndex = await readFile(srcIndexPath, 'utf8');
+
+  const updateSrcIndex = async (updater: (content: string) => string) => {
+    const current = await readFile(srcIndexPath, 'utf8');
+    const next = updater(current);
+    await writeFile(srcIndexPath, next);
+  };
+
+  const rsbuild = await createRsbuild({
+    rsbuildConfig: {
+      tools: {
+        rspack: {
+          plugins: [
+            new TsCheckerRspackPlugin({
+              async: false,
+              typescript: {
+                build: true,
+              },
+            }),
+          ],
+        },
+      },
+    },
+  });
+
+  const { server, urls } = await rsbuild.startDevServer();
+
+  try {
+    await page.goto(urls[0]);
+
+    expect(logs.find((log) => log.includes('File:') && log.includes('/src/index.ts'))).toBeTruthy();
+    expect(
+      logs.find((log) =>
+        log.includes(`Argument of type 'string' is not assignable to parameter of type 'number'.`),
+      ),
+    ).toBeTruthy();
+
+    // 1) Fix TS2345 by changing src/index.ts to `const res = add(1, 2);`
+    const logLenAfterFirstCompile = logs.length;
+    await updateSrcIndex((content) =>
+      content.replace(/const\s+res\s*=\s*add\([^;]*\);/, 'const res = add(1, 2);'),
+    );
+    await expect
+      .poll(
+        () =>
+          logs
+            .slice(logLenAfterFirstCompile)
+            .some((log) =>
+              log.includes(
+                `Argument of type 'string' is not assignable to parameter of type 'number'.`,
+              ),
+            ),
+        {
+          timeout: 20_000,
+        },
+      )
+      .toBeFalsy();
+
+    // 2) Add a syntax error: `console.log('foo)` and verify `Unterminated string literal.` error appears
+    // and the previous type error doesn't re-appear in subsequent rebuild logs.
+    const logLenAfterFixTypeError = logs.length;
+    await updateSrcIndex((content) => `${content}\nconsole.log('foo)\n`);
+    await expect
+      .poll(
+        () => {
+          const nextLogs = logs.slice(logLenAfterFixTypeError);
+          const hasUnterminated = nextLogs.some((log) =>
+            log.includes('Unterminated string literal.'),
+          );
+          const hasTypeError = nextLogs.some((log) =>
+            log.includes(
+              `Argument of type 'string' is not assignable to parameter of type 'number'.`,
+            ),
+          );
+          return hasUnterminated && !hasTypeError;
+        },
+        {
+          timeout: 20_000,
+        },
+      )
+      .toBeTruthy();
+
+    // 3) Fix syntax error: `console.log('foo')` and verify the error is gone.
+    const logLenAfterUnterminated = logs.length;
+    await updateSrcIndex((content) => content.replace("console.log('foo)", "console.log('foo')"));
+    await expect
+      .poll(
+        () => {
+          const nextLogs = logs.slice(logLenAfterUnterminated);
+          const hasUnterminated = nextLogs.some((log) =>
+            log.includes('Unterminated string literal.'),
+          );
+          const hasTypeError = nextLogs.some((log) =>
+            log.includes(
+              `Argument of type 'string' is not assignable to parameter of type 'number'.`,
+            ),
+          );
+          return !hasUnterminated && !hasTypeError;
+        },
+        {
+          timeout: 20_000,
+        },
+      )
+      .toBeTruthy();
+  } finally {
+    await writeFile(srcIndexPath, originalSrcIndex);
+    restore();
+    await server.close();
+  }
+});