feat(vscode): debug, coverage, cancel, include/exclude, tree

.gitignore

@@ -25,6 +25,8 @@ test-temp-*
 !.vscode/extensions.json
 !.vscode/launch.json
 !.vscode/tasks.json
+!.vscode/extensions/
+!.vscode/extensions/**
 .idea/
 .nx/
 .history/

.vscode/extensions/rslib-problem-matcher/package.json

@@ -0,0 +1,22 @@
+{
+  "name": "rslib-problem-matcher",
+  "version": "0.0.1",
+  "engines": {
+    "vscode": "^1.97.0"
+  },
+  "contributes": {
+    "problemMatchers": [
+      {
+        "name": "rslib-watch",
+        "background": {
+          "activeOnStart": true,
+          "beginsPattern": "build started...",
+          "endsPattern": "build complete, watching for changes..."
+        },
+        "pattern": {
+          "regexp": "build failed in"
+        }
+      }
+    ]
+  }
+}

.vscode/launch.json

@@ -15,7 +15,7 @@
         "${workspaceFolder}/packages/vscode/sample"
       ],
       "outFiles": ["${workspaceFolder}/packages/vscode/dist/**/*.js"],
-      "preLaunchTask": "npm: watch:local",
+      "preLaunchTask": "vscode dev",
       "autoAttachChildProcesses": true
     }
   ]

.vscode/settings.json

@@ -53,5 +53,10 @@
   "[less]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-  "typescript.tsdk": "node_modules/typescript/lib"
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "rstest.configFileGlobPattern": [
+    "packages/core/rstest.config.ts",
+    "packages/vscode/rstest.config.ts",
+    "e2e/rstest.config.ts"
+  ]
 }

.vscode/tasks.json

@@ -4,27 +4,42 @@
   "version": "2.0.0",
   "tasks": [
     {
+      "label": "core dev",
+      "type": "npm",
+      "script": "dev",
+      "path": "packages/core",
+      "problemMatcher": "$rslib-watch",
+      "isBackground": true,
+      "group": {
+        "kind": "build"
+      }
+    },
+    {
+      "label": "coverage-istanbul dev",
+      "type": "npm",
+      "script": "dev",
+      "path": "packages/coverage-istanbul",
+      "problemMatcher": "$rslib-watch",
+      "isBackground": true,
+      "dependsOn": ["core dev"],
+      "dependsOrder": "parallel",
+      "group": {
+        "kind": "build"
+      }
+    },
+    {
+      "label": "vscode dev",
       "type": "npm",
       "script": "watch:local",
       "path": "packages/vscode",
-      "problemMatcher": {
-        // tells vscode when the build task is running
-        "background": {
-          "activeOnStart": true,
-          "beginsPattern": "build started|building",
-          "endsPattern": "built in|build complete"
-        },
-        // although we don't care about it, pattern is required to implement problemMatcher
-        "pattern": { "regexp": "build failed in" }
-      },
+      "problemMatcher": "$rslib-watch",
       "isBackground": true,
-      "presentation": {
-        "reveal": "never"
-      },
       "group": {
         "kind": "build",
         "isDefault": true
-      }
+      },
+      "dependsOn": ["core dev", "coverage-istanbul dev"],
+      "dependsOrder": "parallel"
     }
   ]
 }

e2e/package.json

@@ -8,7 +8,7 @@
   },
   "devDependencies": {
     "@rsbuild/core": "1.6.0-beta.1",
-    "@rslib/core": "0.17.1",
+    "@rslib/core": "0.18.1",
     "@rstest/core": "workspace:*",
     "@rstest/tsconfig": "workspace:*",
     "@types/jest-image-snapshot": "^6.4.0",

e2e/reporter/index.test.ts

@@ -71,15 +71,28 @@ describe.concurrent('reporters', () => {
     });
 
     await cli.exec;
+
+    expect(cli.stdout).toContain('[custom reporter] onTestSuiteStart');
+    expect(
+      cli.stdout.match(/\[custom reporter\] onTestSuiteStart/g)?.length,
+    ).toBe(1);
+
+    expect(cli.stdout).toContain('[custom reporter] onTestSuiteResult');
+    expect(
+      cli.stdout.match(/\[custom reporter\] onTestSuiteResult/g)?.length,
+    ).toBe(1);
+
     expect(cli.stdout).toContain('[custom reporter] onTestCaseStart');
     expect(
       cli.stdout.match(/\[custom reporter\] onTestCaseStart/g)?.length,
     ).toBe(3);
+
     expect(cli.stdout).toContain('[custom reporter] onTestFileStart');
 
     expect(
       cli.stdout.match(/\[custom reporter\] onTestCaseResult/g)?.length,
     ).toBe(3);
+
     expect(cli.stdout).toContain('[custom reporter] onTestRunEnd');
   });
 

e2e/reporter/rstest.customReporterConfig.ts

@@ -4,6 +4,7 @@ import type {
   TestFileInfo,
   TestFileResult,
   TestResult,
+  TestSuiteInfo,
 } from '@rstest/core';
 import { defineConfig } from '@rstest/core';
 
@@ -14,6 +15,14 @@ class MyReporter implements Reporter {
     reporterResult.push('[custom reporter] onTestFileStart');
   }
 
+  onTestSuiteStart(_test: TestSuiteInfo) {
+    reporterResult.push('[custom reporter] onTestSuiteStart');
+  }
+
+  onTestSuiteResult(_result: TestResult) {
+    reporterResult.push('[custom reporter] onTestSuiteResult');
+  }
+
   onTestCaseStart(_test: TestCaseInfo) {
     reporterResult.push('[custom reporter] onTestCaseStart');
   }

e2e/rstest.config.ts

@@ -2,7 +2,7 @@ import { defineConfig } from '@rstest/core';
 
 export default defineConfig({
   setupFiles: ['../scripts/rstest.setup.ts'],
-  testTimeout: process.env.CI ? 10_000 : 5_000,
+  testTimeout: 10_000,
   slowTestThreshold: 2_000,
   output: {
     externals: {

packages/core/package.json

@@ -48,7 +48,7 @@
   "scripts": {
     "build": "rslib build && npx prettier ./LICENSE.md --write",
     "typecheck": "tsc --noEmit",
-    "dev": "rslib build --watch",
+    "dev": "cross-env SOURCEMAP=true rslib build --watch",
     "test": "npx rstest --globals"
   },
   "dependencies": {
@@ -65,12 +65,13 @@
     "@babel/code-frame": "^7.27.1",
     "@jridgewell/trace-mapping": "0.3.31",
     "@microsoft/api-extractor": "^7.53.3",
-    "@rslib/core": "0.17.1",
+    "@rslib/core": "0.18.1",
     "@rstest/tsconfig": "workspace:*",
     "@sinonjs/fake-timers": "^14.0.0",
     "@types/babel__code-frame": "^7.0.6",
     "@types/istanbul-reports": "^3.0.4",
     "@types/istanbul-lib-coverage": "^2.0.6",
+    "@types/istanbul-lib-report": "^3.0.3",
     "@types/jsdom": "^21.1.7",
     "@types/sinonjs__fake-timers": "^8.1.5",
     "@types/source-map-support": "^0.5.10",
@@ -82,6 +83,7 @@
     "jsdom": "^26.1.0",
     "webpack-license-plugin": "^4.5.1",
     "picocolors": "^1.1.1",
+    "pretty-format": "^30.2.0",
     "rslog": "^1.3.0",
     "source-map-support": "^0.5.21",
     "std-env": "^3.10.0",

packages/core/rslib.config.ts

@@ -14,23 +14,26 @@ export default defineConfig({
         advancedEsm: true,
       },
       dts: {
-        bundle: {
-          bundledPackages: [
-            '@types/sinonjs__fake-timers',
-            '@types/istanbul-reports',
-            '@types/istanbul-lib-report',
-            '@types/istanbul-lib-coverage',
-            '@jridgewell/trace-mapping',
-            '@vitest/expect',
-            '@vitest/snapshot',
-            '@vitest/utils',
-            '@vitest/spy',
-            'tinyrainbow',
-            '@vitest/pretty-format',
-          ],
-        },
+        bundle: process.env.SOURCEMAP
+          ? false
+          : {
+              bundledPackages: [
+                '@types/sinonjs__fake-timers',
+                '@types/istanbul-reports',
+                '@types/istanbul-lib-report',
+                '@types/istanbul-lib-coverage',
+                '@jridgewell/trace-mapping',
+                '@vitest/expect',
+                '@vitest/snapshot',
+                '@vitest/utils',
+                '@vitest/spy',
+                'tinyrainbow',
+                '@vitest/pretty-format',
+              ],
+            },
       },
       output: {
+        sourceMap: process.env.SOURCEMAP === 'true',
         externals: {
           // Temporary fix: `import * as timers from 'timers'` reassign error
           timers: 'commonjs timers',

packages/core/src/index.ts

@@ -84,4 +84,5 @@ export type {
   TestFileInfo,
   TestFileResult,
   TestResult,
+  TestSuiteInfo,
 } from './types';

packages/core/src/pool/forks.ts

@@ -82,6 +82,10 @@ export const createForksPool = (poolOptions: {
 
   const pool = new Tinypool(options);
 
+  const destroy = pool.destroy.bind(pool);
+
+  process.on('SIGTERM', destroy);
+
   return {
     name: 'forks',
     runTest: async ({ options, rpcMethods }: RunWorkerOptions) => {
@@ -100,6 +104,9 @@ export const createForksPool = (poolOptions: {
         cleanup();
       }
     },
-    close: () => pool.destroy(),
+    close: () => {
+      process.off('SIGTERM', destroy);
+      return destroy();
+    },
   };
 };

packages/core/src/pool/index.ts

@@ -7,11 +7,13 @@ import type {
   ProjectContext,
   RstestContext,
   RuntimeConfig,
+  RuntimeRPC,
   Test,
   TestCaseInfo,
   TestFileInfo,
   TestFileResult,
   TestResult,
+  TestSuiteInfo,
   UserConsoleLog,
 } from '../types';
 import {
@@ -82,7 +84,7 @@ const getRuntimeConfig = (context: ProjectContext): RuntimeConfig => {
     disableConsoleIntercept,
     testEnvironment,
     isolate,
-    coverage,
+    coverage: { ...coverage, reporters: [] }, // reporters may be functions so remove it
     snapshotFormat,
     logHeapUsage,
     bail,
@@ -204,7 +206,7 @@ export const createPool = async ({
     },
   });
 
-  const rpcMethods = {
+  const rpcMethods: Omit<RuntimeRPC, 'getAssetsByEntry'> = {
     onTestCaseStart: async (test: TestCaseInfo) => {
       context.stateManager.onTestCaseStart(test);
       Promise.all(
@@ -231,6 +233,16 @@ export const createPool = async ({
         reporters.map((reporter) => reporter.onTestFileStart?.(test)),
       );
     },
+    onTestSuiteStart: async (test: TestSuiteInfo) => {
+      await Promise.all(
+        reporters.map((reporter) => reporter.onTestSuiteStart?.(test)),
+      );
+    },
+    onTestSuiteResult: async (result: TestResult) => {
+      await Promise.all(
+        reporters.map((reporter) => reporter.onTestSuiteResult?.(result)),
+      );
+    },
     resolveSnapshotPath: (testPath: string): string => {
       const snapExtension = '.snap';
       const resolver =

packages/core/src/reporter/index.ts

@@ -37,8 +37,12 @@ export class DefaultReporter implements Reporter {
     this.rootPath = rootPath;
     this.config = config;
     this.options = options;
-    if (isTTY()) {
-      this.statusRenderer = new StatusRenderer(rootPath, testState);
+    if (isTTY() || options.logger) {
+      this.statusRenderer = new StatusRenderer(
+        rootPath,
+        testState,
+        options.logger,
+      );
     }
   }
 

packages/core/src/reporter/statusRenderer.ts

@@ -13,19 +13,26 @@ import {
   TestFileSummaryLabel,
   TestSummaryLabel,
 } from './summary';
-import { WindowRenderer } from './windowedRenderer';
+import {
+  WindowRenderer,
+  type Options as WindowRendererOptions,
+} from './windowedRenderer';
 
 export class StatusRenderer {
   private rootPath: string;
   private renderer: WindowRenderer;
   private startTime: number | undefined = undefined;
   private testState: RstestTestState;
 
-  constructor(rootPath: string, state: RstestTestState) {
+  constructor(
+    rootPath: string,
+    state: RstestTestState,
+    logger?: WindowRendererOptions['logger'],
+  ) {
     this.rootPath = rootPath;
     this.renderer = new WindowRenderer({
       getWindow: () => this.getContent(),
-      logger: {
+      logger: logger ?? {
         outputStream: process.stdout,
         errorStream: process.stderr,
         getColumns: () => {

packages/core/src/reporter/windowedRenderer.ts

@@ -24,7 +24,7 @@ const MOVE_CURSOR_ONE_ROW_UP = `${ESC}1A`;
 const SYNC_START = `${ESC}?2026h`;
 const SYNC_END = `${ESC}?2026l`;
 
-interface Options {
+export interface Options {
   logger: {
     outputStream: Writable;
     errorStream: Writable;