@rstest/browser 0.9.10 → 0.10.1

package/src/client/entry.ts

@@ -8,11 +8,13 @@ import {
 } from '@rstest/browser-manifest';
 import type {
   CoverageMapData,
+  CurrentTaskInfo,
   RunnerHooks,
   RuntimeConfig,
   WorkerState,
 } from '@rstest/core/browser-runtime';
 import {
+  createBrowserTaskContext,
   createRstestRuntime,
   globalApis,
   setRealTimers,
@@ -146,19 +148,18 @@ const formatArg = (arg: unknown): string => {
   }
 };
 
+const getFileTaskId = (testPath: string): string => {
+  return `file:${testPath}`;
+};
+
 /**
  * Intercept console methods and forward to host via send().
  * Returns a restore function to revert console to original.
  */
 const interceptConsole = (
-  testPath: string,
+  getCurrentTask: () => CurrentTaskInfo | undefined,
   printConsoleTrace: boolean,
-  disableConsoleIntercept: boolean,
 ): (() => void) => {
-  if (disableConsoleIntercept) {
-    return () => {};
-  }
-
   const originalConsole = {
     log: console.log.bind(console),
     warn: console.warn.bind(console),
@@ -183,6 +184,7 @@ const interceptConsole = (
 
       // Format message
       const content = args.map(formatArg).join(' ');
+      const currentTask = getCurrentTask();
 
       // Send to host
       send({
@@ -190,7 +192,11 @@ const interceptConsole = (
         payload: {
           level,
           content,
-          testPath,
+          taskId: currentTask?.taskId,
+          taskName: currentTask?.taskName,
+          taskParentNames: currentTask?.taskParentNames,
+          taskType: currentTask?.taskType,
+          testPath: currentTask?.testPath ?? '',
           type: level === 'error' || level === 'warn' ? 'stderr' : 'stdout',
           trace: getConsoleTrace(),
         },
@@ -520,7 +526,9 @@ const run = async () => {
         },
       };
 
-      const runtime = await createRstestRuntime(workerState);
+      const runtime = await createRstestRuntime(workerState, {
+        taskContext: createBrowserTaskContext(),
+      });
 
       // Register global APIs if globals config is enabled
       if (runtimeConfig.globals) {
@@ -570,13 +578,32 @@ const run = async () => {
   // 2. Run tests for each file
   for (const key of testKeysToRun) {
     const testPath = toAbsolutePath(key, currentProject.projectRoot);
+    const taskStack: CurrentTaskInfo[] = [
+      {
+        taskId: getFileTaskId(testPath),
+        taskType: 'file',
+        testPath,
+      },
+    ];
+
+    // Per-file TaskContext; taskStack supplies the concurrent attribution
+    // that the single-slot fallback can't.
+    const taskContext = createBrowserTaskContext();
+
+    const shouldInterceptConsole =
+      !runtimeConfig.disableConsoleIntercept ||
+      runtimeConfig.silent === true ||
+      runtimeConfig.silent === 'passed-only';
 
     // Intercept console methods to forward logs to host
-    const restoreConsole = interceptConsole(
-      testPath,
-      runtimeConfig.printConsoleTrace ?? false,
-      runtimeConfig.disableConsoleIntercept ?? false,
-    );
+    const restoreConsole = shouldInterceptConsole
+      ? interceptConsole(
+          () => taskContext.getCurrent() ?? taskStack[taskStack.length - 1],
+          runtimeConfig.disableConsoleIntercept
+            ? false
+            : (runtimeConfig.printConsoleTrace ?? false),
+        )
+      : () => {};
 
     const workerState: WorkerState = {
       project: projectRuntime.name,
@@ -586,6 +613,7 @@ const run = async () => {
       taskId: 0,
       outputModule: false,
       environment: 'browser',
+      currentTask: taskStack[0],
       testPath,
       distPath: testPath,
       snapshotOptions: {
@@ -595,7 +623,22 @@ const run = async () => {
       },
     };
 
-    const runtime = await createRstestRuntime(workerState);
+    const syncCurrentTask = (): void => {
+      workerState.currentTask = taskStack[taskStack.length - 1];
+    };
+
+    const removeTaskFromStack = (taskId: string): void => {
+      const taskIndex = taskStack.findLastIndex(
+        (task) => task.taskId === taskId,
+      );
+      if (taskIndex < 0) {
+        return;
+      }
+      taskStack.splice(taskIndex, 1);
+      syncCurrentTask();
+    };
+
+    const runtime = await createRstestRuntime(workerState, { taskContext });
 
     // Register global APIs if globals config is enabled
     if (runtimeConfig.globals) {
@@ -611,15 +654,33 @@ const run = async () => {
         dispatchRunnerLifecycle('file-ready', test);
       },
       onTestSuiteStart: async (test) => {
+        taskStack.push({
+          taskId: test.testId,
+          taskName: test.name,
+          taskParentNames: test.parentNames,
+          taskType: 'suite',
+          testPath: test.testPath,
+        });
+        syncCurrentTask();
         dispatchRunnerLifecycle('suite-start', test);
       },
       onTestSuiteResult: async (result) => {
+        removeTaskFromStack(result.testId);
         dispatchRunnerLifecycle('suite-result', result);
       },
       onTestCaseStart: async (test) => {
+        taskStack.push({
+          taskId: test.testId,
+          taskName: test.name,
+          taskParentNames: test.parentNames,
+          taskType: 'case',
+          testPath: test.testPath,
+        });
+        syncCurrentTask();
         dispatchRunnerLifecycle('case-start', test);
       },
       onTestCaseResult: async (result) => {
+        removeTaskFromStack(result.testId);
         if (result.status === 'fail') {
           failedTestsCount++;
         }