@rstest/core 0.5.2 → 0.5.3

package/dist/0~85.js

@@ -621,9 +621,6 @@ export const __webpack_modules__ = {
                 const results = [];
                 const errors = [];
                 let defaultStatus = 'pass';
-                hooks.onTestFileStart?.({
-                    testPath
-                });
                 const snapshotClient = getSnapshotClient();
                 await snapshotClient.setup(testPath, snapshotOptions);
                 const runTestsCase = async (test, parentHooks)=>{

package/dist/index.js

@@ -2108,7 +2108,7 @@ ${section.body}` : section.body).join("\n\n"));
         function setupCommands() {
             const cli = dist('rstest');
             cli.help();
-            cli.version("0.5.2");
+            cli.version("0.5.3");
             applyCommonOptions(cli);
             cli.command('[...filters]', 'run tests').option('-w, --watch', 'Run tests in watch mode').action(async (filters, options)=>{
                 (0, prepare.N)();
@@ -2347,7 +2347,7 @@ ${conflictProjects.map((p)=>`- ${p.configFilePath || p.config.root}`).join('\n')
             if (!npm_execpath || npm_execpath.includes('npx-cli.js') || npm_execpath.includes('.bun')) console.log();
         }
         function showRstest() {
-            _utils_logger__WEBPACK_IMPORTED_MODULE_0__.vF.greet("  Rstest v0.5.2");
+            _utils_logger__WEBPACK_IMPORTED_MODULE_0__.vF.greet("  Rstest v0.5.3");
             _utils_logger__WEBPACK_IMPORTED_MODULE_0__.vF.log('');
         }
     },
@@ -2889,6 +2889,77 @@ ${conflictProjects.map((p)=>`- ${p.configFilePath || p.config.root}`).join('\n')
         var src_config = __webpack_require__("./src/config.ts");
         var stack_trace_parser_esm = __webpack_require__("../../node_modules/.pnpm/stacktrace-parser@0.1.11/node_modules/stacktrace-parser/dist/stack-trace-parser.esm.js");
         var utils = __webpack_require__("./src/utils/index.ts");
+        var dist = __webpack_require__("../../node_modules/.pnpm/pathe@2.0.3/node_modules/pathe/dist/index.mjs");
+        const getSummaryStatusString = (tasks, name = 'tests', showTotal = true)=>{
+            if (0 === tasks.length) return utils.yW.dim(`no ${name}`);
+            const passed = tasks.filter((result)=>'pass' === result.status);
+            const failed = tasks.filter((result)=>'fail' === result.status);
+            const skipped = tasks.filter((result)=>'skip' === result.status);
+            const todo = tasks.filter((result)=>'todo' === result.status);
+            const status = [
+                failed.length ? utils.yW.bold(utils.yW.red(`${failed.length} failed`)) : null,
+                passed.length ? utils.yW.bold(utils.yW.green(`${passed.length} passed`)) : null,
+                skipped.length ? utils.yW.yellow(`${skipped.length} skipped`) : null,
+                todo.length ? utils.yW.gray(`${todo.length} todo`) : null
+            ].filter(Boolean);
+            return status.join(utils.yW.dim(' | ')) + (showTotal && status.length > 1 ? utils.yW.gray(` (${tasks.length})`) : '');
+        };
+        const printSnapshotSummaryLog = (snapshots, rootDir)=>{
+            const summary = [];
+            if (snapshots.added) summary.push(utils.yW.bold(utils.yW.green(`${snapshots.added} written`)));
+            if (snapshots.unmatched) summary.push(utils.yW.bold(utils.yW.red(`${snapshots.unmatched} failed`)));
+            if (snapshots.updated) summary.push(utils.yW.bold(utils.yW.green(`${snapshots.updated} updated `)));
+            if (snapshots.filesRemoved) if (snapshots.didUpdate) summary.push(utils.yW.bold(utils.yW.green(`${snapshots.filesRemoved} files removed `)));
+            else summary.push(utils.yW.bold(utils.yW.yellow(`${snapshots.filesRemoved} files obsolete `)));
+            const POINTER = '➜';
+            if (snapshots.filesRemovedList?.length) {
+                const [head, ...tail] = snapshots.filesRemovedList;
+                summary.push(`${utils.yW.gray(POINTER)} ${(0, utils.XJ)(rootDir, head)}`);
+                for (const key of tail)summary.push(`  ${(0, utils.XJ)(rootDir, key)}`);
+            }
+            if (snapshots.unchecked) {
+                if (snapshots.didUpdate) summary.push(utils.yW.bold(utils.yW.green(`${snapshots.unchecked} removed`)));
+                else summary.push(utils.yW.bold(utils.yW.yellow(`${snapshots.unchecked} obsolete`)));
+                for (const uncheckedFile of snapshots.uncheckedKeysByFile){
+                    summary.push(`${utils.yW.gray(POINTER)} ${(0, utils.XJ)(rootDir, uncheckedFile.filePath)}`);
+                    for (const key of uncheckedFile.keys)summary.push(`  ${key}`);
+                }
+            }
+            for (const [index, snapshot] of summary.entries()){
+                const title = 0 === index ? 'Snapshots' : '';
+                utils.vF.log(`${utils.yW.gray(title.padStart(12))} ${snapshot}`);
+            }
+        };
+        const TestFileSummaryLabel = utils.yW.gray('Test Files'.padStart(11));
+        const TestSummaryLabel = utils.yW.gray('Tests'.padStart(11));
+        const DurationLabel = utils.yW.gray('Duration'.padStart(11));
+        const printSummaryLog = ({ results, testResults, snapshotSummary, duration, rootPath })=>{
+            utils.vF.log('');
+            printSnapshotSummaryLog(snapshotSummary, rootPath);
+            utils.vF.log(`${TestFileSummaryLabel} ${getSummaryStatusString(results)}`);
+            utils.vF.log(`${TestSummaryLabel} ${getSummaryStatusString(testResults)}`);
+            utils.vF.log(`${DurationLabel} ${(0, utils.kV)(duration.totalTime)} ${utils.yW.gray(`(build ${(0, utils.kV)(duration.buildTime)}, tests ${(0, utils.kV)(duration.testTime)})`)}`);
+            utils.vF.log('');
+        };
+        const printSummaryErrorLogs = async ({ testResults, results, rootPath, getSourcemap, filterRerunTestPaths })=>{
+            const failedTests = [
+                ...results.filter((i)=>'fail' === i.status && i.errors?.length && (filterRerunTestPaths ? filterRerunTestPaths.includes(i.testPath) : true)),
+                ...testResults.filter((i)=>'fail' === i.status && (filterRerunTestPaths ? filterRerunTestPaths.includes(i.testPath) : true))
+            ];
+            if (0 === failedTests.length) return;
+            utils.vF.log('');
+            utils.vF.log(utils.yW.bold('Summary of all failing tests:'));
+            utils.vF.log('');
+            for (const test of failedTests){
+                const relativePath = dist.Ay.relative(rootPath, test.testPath);
+                const nameStr = (0, utils.fN)(test);
+                utils.vF.log(`${utils.yW.bgRed(' FAIL ')} ${(0, utils.EQ)(relativePath)} ${nameStr.length ? `${utils.yW.dim(utils.vO)} ${nameStr}` : ''}`);
+                if (test.errors) {
+                    const { printError } = await Promise.resolve().then(__webpack_require__.bind(__webpack_require__, "./src/utils/error.ts"));
+                    for (const error of test.errors)await printError(error, getSourcemap, rootPath);
+                }
+            }
+        };
         const DEFAULT_RENDER_INTERVAL_MS = 1000;
         const ESC = '\x1B[';
         const CLEAR_LINE = `${ESC}K`;
@@ -3009,7 +3080,9 @@ ${conflictProjects.map((p)=>`- ${p.configFilePath || p.config.root}`).join('\n')
         class StatusRenderer {
             rootPath;
             renderer;
-            runningModules = new Set();
+            runningModules = new Map();
+            testModules = [];
+            startTime = void 0;
             constructor(rootPath){
                 this.rootPath = rootPath;
                 this.renderer = new WindowRenderer({
@@ -3022,95 +3095,43 @@ ${conflictProjects.map((p)=>`- ${p.configFilePath || p.config.root}`).join('\n')
                 });
             }
             getContent() {
+                this.startTime ??= Date.now();
                 const summary = [];
-                for (const module of this.runningModules){
+                for (const module of this.runningModules.keys()){
                     const relativePath = (0, pathe_M_eThtNZ.b)(this.rootPath, module);
                     summary.push(`${utils.yW.bgYellow(utils.yW.bold(' RUNS '))} ${(0, utils.EQ)(relativePath)}`);
                 }
                 summary.push('');
+                if (0 === this.testModules.length) summary.push(`${TestFileSummaryLabel} ${this.runningModules.size} total`);
+                else summary.push(`${TestFileSummaryLabel} ${getSummaryStatusString(this.testModules, '', false)} ${utils.yW.dim('|')} ${this.runningModules.size + this.testModules.length} total`);
+                const testResults = Array.from(this.runningModules.values()).flat().concat(this.testModules.flatMap((mod)=>mod.results));
+                if (testResults.length) summary.push(`${TestSummaryLabel} ${getSummaryStatusString(testResults, '', false)}`);
+                summary.push(`${DurationLabel} ${(0, utils.kV)(Date.now() - this.startTime)}`);
+                summary.push('');
                 return summary;
             }
-            addRunningModule(testPath) {
-                this.runningModules.add(testPath);
+            onTestFileStart(testPath) {
+                this.runningModules.set(testPath, []);
                 this.renderer?.schedule();
             }
-            removeRunningModule(testPath) {
-                this.runningModules.delete(testPath);
+            onTestCaseResult(result) {
+                this.runningModules.set(result.testPath, [
+                    ...this.runningModules.get(result.testPath) || [],
+                    result
+                ]);
+            }
+            onTestFileResult(test) {
+                this.runningModules.delete(test.testPath);
+                this.testModules.push(test);
                 this.renderer?.schedule();
             }
             clear() {
+                this.testModules.length = 0;
                 this.runningModules.clear();
+                this.startTime = void 0;
                 this.renderer?.finish();
             }
         }
-        var dist = __webpack_require__("../../node_modules/.pnpm/pathe@2.0.3/node_modules/pathe/dist/index.mjs");
-        const getSummaryStatusString = (tasks, name = 'tests', showTotal = true)=>{
-            if (0 === tasks.length) return utils.yW.dim(`no ${name}`);
-            const passed = tasks.filter((result)=>'pass' === result.status);
-            const failed = tasks.filter((result)=>'fail' === result.status);
-            const skipped = tasks.filter((result)=>'skip' === result.status);
-            const todo = tasks.filter((result)=>'todo' === result.status);
-            const status = [
-                failed.length ? utils.yW.bold(utils.yW.red(`${failed.length} failed`)) : null,
-                passed.length ? utils.yW.bold(utils.yW.green(`${passed.length} passed`)) : null,
-                skipped.length ? utils.yW.yellow(`${skipped.length} skipped`) : null,
-                todo.length ? utils.yW.gray(`${todo.length} todo`) : null
-            ].filter(Boolean);
-            return status.join(utils.yW.dim(' | ')) + (showTotal && status.length > 1 ? utils.yW.gray(` (${tasks.length})`) : '');
-        };
-        const printSnapshotSummaryLog = (snapshots, rootDir)=>{
-            const summary = [];
-            if (snapshots.added) summary.push(utils.yW.bold(utils.yW.green(`${snapshots.added} written`)));
-            if (snapshots.unmatched) summary.push(utils.yW.bold(utils.yW.red(`${snapshots.unmatched} failed`)));
-            if (snapshots.updated) summary.push(utils.yW.bold(utils.yW.green(`${snapshots.updated} updated `)));
-            if (snapshots.filesRemoved) if (snapshots.didUpdate) summary.push(utils.yW.bold(utils.yW.green(`${snapshots.filesRemoved} files removed `)));
-            else summary.push(utils.yW.bold(utils.yW.yellow(`${snapshots.filesRemoved} files obsolete `)));
-            const POINTER = '➜';
-            if (snapshots.filesRemovedList?.length) {
-                const [head, ...tail] = snapshots.filesRemovedList;
-                summary.push(`${utils.yW.gray(POINTER)} ${(0, utils.XJ)(rootDir, head)}`);
-                for (const key of tail)summary.push(`  ${(0, utils.XJ)(rootDir, key)}`);
-            }
-            if (snapshots.unchecked) {
-                if (snapshots.didUpdate) summary.push(utils.yW.bold(utils.yW.green(`${snapshots.unchecked} removed`)));
-                else summary.push(utils.yW.bold(utils.yW.yellow(`${snapshots.unchecked} obsolete`)));
-                for (const uncheckedFile of snapshots.uncheckedKeysByFile){
-                    summary.push(`${utils.yW.gray(POINTER)} ${(0, utils.XJ)(rootDir, uncheckedFile.filePath)}`);
-                    for (const key of uncheckedFile.keys)summary.push(`  ${key}`);
-                }
-            }
-            for (const [index, snapshot] of summary.entries()){
-                const title = 0 === index ? 'Snapshots' : '';
-                utils.vF.log(`${utils.yW.gray(title.padStart(12))} ${snapshot}`);
-            }
-        };
-        const printSummaryLog = ({ results, testResults, snapshotSummary, duration, rootPath })=>{
-            utils.vF.log('');
-            printSnapshotSummaryLog(snapshotSummary, rootPath);
-            utils.vF.log(`${utils.yW.gray('Test Files'.padStart(11))} ${getSummaryStatusString(results)}`);
-            utils.vF.log(`${utils.yW.gray('Tests'.padStart(11))} ${getSummaryStatusString(testResults)}`);
-            utils.vF.log(`${utils.yW.gray('Duration'.padStart(11))} ${(0, utils.kV)(duration.totalTime)} ${utils.yW.gray(`(build ${(0, utils.kV)(duration.buildTime)}, tests ${(0, utils.kV)(duration.testTime)})`)}`);
-            utils.vF.log('');
-        };
-        const printSummaryErrorLogs = async ({ testResults, results, rootPath, getSourcemap, filterRerunTestPaths })=>{
-            const failedTests = [
-                ...results.filter((i)=>'fail' === i.status && i.errors?.length && (filterRerunTestPaths ? filterRerunTestPaths.includes(i.testPath) : true)),
-                ...testResults.filter((i)=>'fail' === i.status && (filterRerunTestPaths ? filterRerunTestPaths.includes(i.testPath) : true))
-            ];
-            if (0 === failedTests.length) return;
-            utils.vF.log('');
-            utils.vF.log(utils.yW.bold('Summary of all failing tests:'));
-            utils.vF.log('');
-            for (const test of failedTests){
-                const relativePath = dist.Ay.relative(rootPath, test.testPath);
-                const nameStr = (0, utils.fN)(test);
-                utils.vF.log(`${utils.yW.bgRed(' FAIL ')} ${(0, utils.EQ)(relativePath)} ${nameStr.length ? `${utils.yW.dim(utils.vO)} ${nameStr}` : ''}`);
-                if (test.errors) {
-                    const { printError } = await Promise.resolve().then(__webpack_require__.bind(__webpack_require__, "./src/utils/error.ts"));
-                    for (const error of test.errors)await printError(error, getSourcemap, rootPath);
-                }
-            }
-        };
         const statusStr = {
             fail: '✗',
             pass: '✓',
@@ -3132,12 +3153,11 @@ ${conflictProjects.map((p)=>`- ${p.configFilePath || p.config.root}`).join('\n')
             utils.vF.log(`  ${icon} ${nameStr}${utils.yW.gray(duration)}${retry}`);
             if (result.errors) for (const error of result.errors)console.error(utils.yW.red(`    ${error.message}`));
         };
-        const logFileTitle = (test, relativePath, slowTestThreshold, alwaysShowTime = false)=>{
+        const logFileTitle = (test, relativePath, alwaysShowTime = false)=>{
             let title = ` ${utils.yW.bold(statusColorfulStr[test.status])} ${(0, utils.EQ)(relativePath)}`;
-            const formatDuration = (duration)=>utils.yW[duration > slowTestThreshold ? 'yellow' : 'green']((0, utils.kV)(duration));
+            const formatDuration = (duration)=>utils.yW.green((0, utils.kV)(duration));
             title += ` ${utils.yW.gray(`(${test.results.length})`)}`;
-            const isTooSlow = test.duration && test.duration > slowTestThreshold;
-            if (alwaysShowTime || isTooSlow) title += ` ${formatDuration(test.duration)}`;
+            if (alwaysShowTime) title += ` ${formatDuration(test.duration)}`;
             utils.vF.log(title);
         };
         class DefaultReporter {
@@ -3152,24 +3172,21 @@ ${conflictProjects.map((p)=>`- ${p.configFilePath || p.config.root}`).join('\n')
                 if (!T) this.statusRenderer = new StatusRenderer(rootPath);
             }
             onTestFileStart(test) {
-                this.statusRenderer?.addRunningModule(test.testPath);
+                this.statusRenderer?.onTestFileStart(test.testPath);
             }
             onTestFileResult(test) {
-                this.statusRenderer?.removeRunningModule(test.testPath);
+                this.statusRenderer?.onTestFileResult(test);
                 const relativePath = (0, pathe_M_eThtNZ.b)(this.rootPath, test.testPath);
                 const { slowTestThreshold } = this.config;
-                logFileTitle(test, relativePath, slowTestThreshold);
-                const isTooSlow = test.duration && test.duration > slowTestThreshold;
-                const hasRetryCase = test.results.some((result)=>(result.retryCount || 0) > 0);
-                if ('fail' !== test.status && !isTooSlow && !hasRetryCase) return;
-                const showAllCases = isTooSlow && !test.results.some((result)=>(result.duration || 0) > slowTestThreshold);
+                logFileTitle(test, relativePath);
                 for (const result of test.results){
-                    const isSlowCase = (result.duration || 0) > slowTestThreshold;
-                    const retried = (result.retryCount || 0) > 0;
-                    if (showAllCases || 'fail' === result.status || isSlowCase || retried) logCase(result, slowTestThreshold);
+                    const isDisplayed = 'fail' === result.status || (result.duration ?? 0) > slowTestThreshold || (result.retryCount ?? 0) > 0;
+                    isDisplayed && logCase(result, slowTestThreshold);
                 }
             }
-            onTestCaseResult(_result) {}
+            onTestCaseResult(result) {
+                this.statusRenderer?.onTestCaseResult(result);
+            }
             onUserConsoleLog(log) {
                 const shouldLog = this.config.onConsoleLog?.(log.content) ?? true;
                 if (!shouldLog) return;
@@ -3397,10 +3414,10 @@ ${conflictProjects.map((p)=>`- ${p.configFilePath || p.config.root}`).join('\n')
         }
         class VerboseReporter extends DefaultReporter {
             onTestFileResult(test) {
-                this.statusRenderer?.removeRunningModule(test.testPath);
+                this.statusRenderer?.onTestFileResult(test);
                 const relativePath = (0, pathe_M_eThtNZ.b)(this.rootPath, test.testPath);
                 const { slowTestThreshold } = this.config;
-                logFileTitle(test, relativePath, slowTestThreshold, true);
+                logFileTitle(test, relativePath, true);
                 for (const result of test.results)logCase(result, slowTestThreshold);
             }
         }
@@ -3443,7 +3460,7 @@ ${conflictProjects.map((p)=>`- ${p.configFilePath || p.config.root}`).join('\n')
                 });
                 this.reporters = reporters;
                 this.snapshotManager = snapshotManager;
-                this.version = "0.5.2";
+                this.version = "0.5.3";
                 this.rootPath = rootPath;
                 this.originalConfig = userConfig;
                 this.normalizedConfig = rstestConfig;

package/dist/worker.js

@@ -8407,6 +8407,9 @@ const runInPool = async (options)=>{
         const { assetFiles, sourceMaps: sourceMapsFromAssets } = assets || await rpc.getAssetsByEntry();
         sourceMaps = sourceMapsFromAssets;
         cleanups.push(cleanup);
+        rpc.onTestFileStart?.({
+            testPath
+        });
         await loadFiles({
             rstestContext,
             distPath,
@@ -8417,9 +8420,6 @@ const runInPool = async (options)=>{
             isolate
         });
         const results = await runner.runTests(testPath, {
-            onTestFileStart: async (test)=>{
-                await rpc.onTestFileStart(test);
-            },
             onTestCaseResult: async (result)=>{
                 await rpc.onTestCaseResult(result);
             }

package/dist-types/index.d.ts

@@ -589,7 +589,7 @@ declare class DefaultReporter implements Reporter {
     });
     onTestFileStart(test: TestFileInfo): void;
     onTestFileResult(test: TestFileResult): void;
-    onTestCaseResult(_result: TestResult): void;
+    onTestCaseResult(result: TestResult): void;
     onUserConsoleLog(log: UserConsoleLog): void;
     onExit(): Promise<void>;
     onTestRunEnd({ results, testResults, duration, getSourcemap, snapshotSummary, filterRerunTestPaths, }: {
@@ -2670,10 +2670,13 @@ declare class StatusRenderer {
     private rootPath;
     private renderer;
     private runningModules;
+    private testModules;
+    private startTime;
     constructor(rootPath: string);
     getContent(): string[];
-    addRunningModule(testPath: string): void;
-    removeRunningModule(testPath: string): void;
+    onTestFileStart(testPath: string): void;
+    onTestCaseResult(result: TestResult): void;
+    onTestFileResult(test: TestFileResult): void;
     clear(): void;
 }
 

package/dist-types/worker.d.ts

@@ -498,7 +498,7 @@ declare class DefaultReporter implements Reporter {
     });
     onTestFileStart(test: TestFileInfo): void;
     onTestFileResult(test: TestFileResult): void;
-    onTestCaseResult(_result: TestResult): void;
+    onTestCaseResult(result: TestResult): void;
     onUserConsoleLog(log: UserConsoleLog): void;
     onExit(): Promise<void>;
     onTestRunEnd({ results, testResults, duration, getSourcemap, snapshotSummary, filterRerunTestPaths, }: {
@@ -2219,10 +2219,13 @@ declare class StatusRenderer {
     private rootPath;
     private renderer;
     private runningModules;
+    private testModules;
+    private startTime;
     constructor(rootPath: string);
     getContent(): string[];
-    addRunningModule(testPath: string): void;
-    removeRunningModule(testPath: string): void;
+    onTestFileStart(testPath: string): void;
+    onTestCaseResult(result: TestResult): void;
+    onTestFileResult(test: TestFileResult): void;
     clear(): void;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rstest/core",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "The Rsbuild-based test tool.",
   "bugs": {
     "url": "https://github.com/web-infra-dev/rstest/issues"