@rstest/core 0.2.2 → 0.3.1

package/dist/index.js

@@ -2181,8 +2181,8 @@ var __webpack_modules__ = {
     },
     "./src/cli/commands.ts": function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
         __webpack_require__.d(__webpack_exports__, {
-            a8: ()=>runRest,
-            QF: ()=>setupCommands
+            a: ()=>runRest,
+            Q: ()=>setupCommands
         });
         var external_events_ = __webpack_require__("events");
         function toArr(any) {
@@ -2671,61 +2671,24 @@ ${section.body}` : section.body).join("\n\n"));
         const cac = (name = "")=>new CAC(name);
         const dist = cac;
         var external_pathe_ = __webpack_require__("pathe");
-        var src_config = __webpack_require__("./src/config.ts");
         var helper = __webpack_require__("./src/utils/helper.ts");
         var logger = __webpack_require__("./src/utils/logger.ts");
         var prepare = __webpack_require__("./src/cli/prepare.ts");
         const applyCommonOptions = (cli)=>{
             cli.option('-c, --config <config>', 'Specify the configuration file, can be a relative or absolute path').option('--config-loader <loader>', 'Specify the loader to load the config file, can be `jiti` or `native`', {
                 default: 'jiti'
-            }).option('-r, --root <root>', 'Specify the project root directory, can be an absolute path or a path relative to cwd').option('--globals', 'Provide global APIs').option('--isolate', 'Run tests in an isolated environment').option('--include <include>', 'Match test files').option('--exclude <exclude>', 'Exclude files from test').option('-u, --update', 'Update snapshot files').option('--passWithNoTests', 'Allows the test suite to pass when no files are found').option('--printConsoleTrace', 'Print console traces when calling any console method').option('--disableConsoleIntercept', 'Disable console intercept').option('--slowTestThreshold <value>', 'The number of milliseconds after which a test or suite is considered slow').option('--reporter <reporter>', 'Specify the reporter to use').option('-t, --testNamePattern <value>', 'Run only tests with a name that matches the regex').option('--testEnvironment <name>', 'The environment that will be used for testing').option('--testTimeout <value>', 'Timeout of a test in milliseconds').option('--hookTimeout <value>', 'Timeout of hook in milliseconds').option('--retry <retry>', 'Number of times to retry a test if it fails').option('--maxConcurrency <value>', 'Maximum number of concurrent tests').option('--clearMocks', 'Automatically clear mock calls, instances, contexts and results before every test').option('--resetMocks', 'Automatically reset mock state before every test').option('--restoreMocks', 'Automatically restore mock state and implementation before every test').option('--unstubGlobals', 'Restores all global variables that were changed with `rstest.stubGlobal` before every test').option('--unstubEnvs', 'Restores all `process.env` values that were changed with `rstest.stubEnv` before every test');
-        };
-        async function initCli(options) {
-            const cwd = process.cwd();
-            const root = options.root ? (0, helper.FI)(cwd, options.root) : cwd;
-            const { content: config, filePath: configFilePath } = await (0, src_config.Z9)({
-                cwd: root,
-                path: options.config,
-                configLoader: options.configLoader
-            });
-            const keys = [
-                'root',
-                'globals',
-                'isolate',
-                'passWithNoTests',
-                'update',
-                'testNamePattern',
-                'testTimeout',
-                'hookTimeout',
-                'clearMocks',
-                'resetMocks',
-                'restoreMocks',
-                'unstubEnvs',
-                'unstubGlobals',
-                'retry',
-                'slowTestThreshold',
-                'maxConcurrency',
-                'printConsoleTrace',
-                'disableConsoleIntercept',
-                'testEnvironment'
-            ];
-            for (const key of keys)if (void 0 !== options[key]) config[key] = options[key];
-            if (options.exclude) config.exclude = (0, helper.bg)(options.exclude);
-            if (options.reporter) config.reporters = (0, helper.bg)(options.reporter);
-            if (options.include) config.include = (0, helper.bg)(options.include);
-            return {
-                config,
-                configFilePath: configFilePath ?? void 0
-            };
-        }
+            }).option('-r, --root <root>', 'Specify the project root directory, can be an absolute path or a path relative to cwd').option('--globals', 'Provide global APIs').option('--isolate', 'Run tests in an isolated environment').option('--include <include>', 'Match test files').option('--exclude <exclude>', 'Exclude files from test').option('-u, --update', 'Update snapshot files').option('--project <name>', 'Run only projects that match the name, can be a full name or wildcards pattern').option('--passWithNoTests', 'Allows the test suite to pass when no files are found').option('--printConsoleTrace', 'Print console traces when calling any console method').option('--disableConsoleIntercept', 'Disable console intercept').option('--slowTestThreshold <value>', 'The number of milliseconds after which a test or suite is considered slow').option('--reporter <reporter>', 'Specify the reporter to use').option('-t, --testNamePattern <value>', 'Run only tests with a name that matches the regex').option('--testEnvironment <name>', 'The environment that will be used for testing').option('--testTimeout <value>', 'Timeout of a test in milliseconds').option('--hookTimeout <value>', 'Timeout of hook in milliseconds').option('--retry <retry>', 'Number of times to retry a test if it fails').option('--maxConcurrency <value>', 'Maximum number of concurrent tests').option('--clearMocks', 'Automatically clear mock calls, instances, contexts and results before every test').option('--resetMocks', 'Automatically reset mock state before every test').option('--restoreMocks', 'Automatically restore mock state and implementation before every test').option('--unstubGlobals', 'Restores all global variables that were changed with `rstest.stubGlobal` before every test').option('--unstubEnvs', 'Restores all `process.env` values that were changed with `rstest.stubEnv` before every test');
+        };
         const runRest = async ({ options, filters, command })=>{
             let rstest;
             try {
-                const { config, configFilePath } = await initCli(options);
-                const { createRstest } = await __webpack_require__.e("698").then(__webpack_require__.bind(__webpack_require__, "./src/core/index.ts"));
+                const { initCli } = await __webpack_require__.e("223").then(__webpack_require__.bind(__webpack_require__, "./src/cli/init.ts"));
+                const { config, configFilePath, projects } = await initCli(options);
+                const { createRstest } = await __webpack_require__.e("12").then(__webpack_require__.bind(__webpack_require__, "./src/core/index.ts"));
                 rstest = createRstest({
                     config,
-                    configFilePath
+                    configFilePath,
+                    projects
                 }, command, filters.map(external_pathe_.normalize));
                 if ('watch' === command && configFilePath) {
                     const { watchFilesForRestart } = await __webpack_require__.e("967").then(__webpack_require__.bind(__webpack_require__, "./src/core/restart.ts"));
@@ -2738,15 +2701,15 @@ ${section.body}` : section.body).join("\n\n"));
                 await rstest.runTests();
             } catch (err) {
                 for (const reporter of rstest?.context.reporters || [])reporter.onExit?.();
-                logger.v.error('Failed to run Rstest.');
-                logger.v.error((0, helper.Wk)(err));
+                logger.vF.error('Failed to run Rstest.');
+                logger.vF.error((0, helper.Wk)(err));
                 process.exit(1);
             }
         };
         function setupCommands() {
             const cli = dist('rstest');
             cli.help();
-            cli.version("0.2.2");
+            cli.version("0.3.1");
             applyCommonOptions(cli);
             cli.command('[...filters]', 'run tests').option('-w, --watch', 'Run tests in watch mode').action(async (filters, options)=>{
                 (0, prepare.N)();
@@ -2779,19 +2742,21 @@ ${section.body}` : section.body).join("\n\n"));
             });
             cli.command('list [...filters]', 'lists all test files that Rstest will run').option('--filesOnly', 'only list the test files').option('--json [boolean/path]', 'print tests as JSON or write to a file').action(async (filters, options)=>{
                 try {
-                    const { config, configFilePath } = await initCli(options);
-                    const { createRstest } = await __webpack_require__.e("698").then(__webpack_require__.bind(__webpack_require__, "./src/core/index.ts"));
+                    const { initCli } = await __webpack_require__.e("223").then(__webpack_require__.bind(__webpack_require__, "./src/cli/init.ts"));
+                    const { config, configFilePath, projects } = await initCli(options);
+                    const { createRstest } = await __webpack_require__.e("12").then(__webpack_require__.bind(__webpack_require__, "./src/core/index.ts"));
                     const rstest = createRstest({
                         config,
-                        configFilePath
+                        configFilePath,
+                        projects
                     }, 'list', filters.map(external_pathe_.normalize));
                     await rstest.listTests({
                         filesOnly: options.filesOnly,
                         json: options.json
                     });
                 } catch (err) {
-                    logger.v.error('Failed to run Rstest list.');
-                    logger.v.error((0, helper.Wk)(err));
+                    logger.vF.error('Failed to run Rstest list.');
+                    logger.vF.error((0, helper.Wk)(err));
                     process.exit(1);
                 }
             });
@@ -2814,8 +2779,8 @@ ${section.body}` : section.body).join("\n\n"));
             if (!npm_execpath || npm_execpath.includes('npx-cli.js') || npm_execpath.includes('.bun')) console.log();
         }
         function showRstest() {
-            _utils_logger__WEBPACK_IMPORTED_MODULE_0__.v.greet("  Rstest v0.2.2");
-            _utils_logger__WEBPACK_IMPORTED_MODULE_0__.v.log('');
+            _utils_logger__WEBPACK_IMPORTED_MODULE_0__.vF.greet("  Rstest v0.3.1");
+            _utils_logger__WEBPACK_IMPORTED_MODULE_0__.vF.log('');
         }
     },
     "./src/config.ts": function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
@@ -3095,15 +3060,18 @@ ${section.body}` : section.body).join("\n\n"));
             XJ: ()=>formatTestPath,
             zZ: ()=>constants.zZ,
             fN: ()=>helper.fN,
-            vF: ()=>logger.v,
+            vF: ()=>logger.vF,
             vO: ()=>constants.vO,
             tG: ()=>getTestEntries,
+            FI: ()=>helper.FI,
             kv: ()=>constants.kv,
             yW: ()=>helper.yW,
             EQ: ()=>prettyTestPath,
-            _o: ()=>logger._,
+            _o: ()=>logger._o,
             pr: ()=>getSetupFiles,
             Kv: ()=>helper.Kv,
+            zz: ()=>filterProjects,
+            mT: ()=>logger.mT,
             t: ()=>constants.t,
             kV: ()=>helper.kV,
             EJ: ()=>constants.EJ,
@@ -3130,11 +3098,22 @@ ${section.body}` : section.body).join("\n\n"));
                 });
             });
         };
+        const filterProjects = (projects, options)=>{
+            if (options.project) {
+                const regexes = (0, helper.bg)(options.project).map((pattern)=>{
+                    const isNeg = pattern.startsWith('!');
+                    const escaped = (isNeg ? pattern.slice(1) : pattern).split('*').map((part)=>part.replace(/[.+?^${}()|[\]\\]/g, '\\$&')).join('.*');
+                    return new RegExp(isNeg ? `^(?!${escaped})` : `^${escaped}$`);
+                });
+                return projects.filter((proj)=>regexes.some((re)=>re.test(proj.config.name)));
+            }
+            return projects;
+        };
         const hasInSourceTestCode = (code)=>code.includes('import.meta.rstest');
         const formatTestEntryName = (name)=>name.replace(/\.*[/\\]/g, '_').replace(/\./g, '~');
-        const getTestEntries = async ({ include, exclude, root, fileFilters, includeSource })=>{
+        const getTestEntries = async ({ include, exclude, rootPath, projectRoot, fileFilters, includeSource })=>{
             const testFiles = await (0, dist.glob)(include, {
-                cwd: root,
+                cwd: projectRoot,
                 absolute: true,
                 ignore: exclude,
                 dot: true,
@@ -3142,7 +3121,7 @@ ${section.body}` : section.body).join("\n\n"));
             });
             if (includeSource?.length) {
                 const sourceFiles = await (0, dist.glob)(includeSource, {
-                    cwd: root,
+                    cwd: projectRoot,
                     absolute: true,
                     ignore: exclude,
                     dot: true,
@@ -3157,8 +3136,8 @@ ${section.body}` : section.body).join("\n\n"));
                     }
                 }));
             }
-            return Object.fromEntries(filterFiles(testFiles, fileFilters, root).map((entry)=>{
-                const relativePath = external_pathe_["default"].relative(root, entry);
+            return Object.fromEntries(filterFiles(testFiles, fileFilters, rootPath).map((entry)=>{
+                const relativePath = external_pathe_["default"].relative(rootPath, entry);
                 return [
                     formatTestEntryName(relativePath),
                     entry
@@ -3210,8 +3189,9 @@ ${section.body}` : section.body).join("\n\n"));
     },
     "./src/utils/logger.ts": function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
         __webpack_require__.d(__webpack_exports__, {
-            v: ()=>src_logger,
-            _: ()=>isDebug
+            _o: ()=>isDebug,
+            mT: ()=>clearScreen,
+            vF: ()=>src_logger
         });
         var external_node_os_ = __webpack_require__("node:os");
         var external_node_tty_ = __webpack_require__("node:tty");
@@ -3486,6 +3466,9 @@ ${section.body}` : section.body).join("\n\n"));
                 console.log(`  ${helper.yW.magenta('rstest')} ${time} ${message}`, ...args);
             }
         });
+        const clearScreen = (force = false)=>{
+            if (!isDebug() || force) console.log('\x1Bc');
+        };
     },
     "@rsbuild/core": function(module) {
         module.exports = __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__;
@@ -3546,6 +3529,7 @@ ${section.body}` : section.body).join("\n\n"));
     },
     "../../node_modules/.pnpm/tinyglobby@0.2.14/node_modules/tinyglobby/dist/index.mjs": function(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
         __webpack_require__.d(__webpack_exports__, {
+            ey: ()=>isDynamicPattern,
             glob: ()=>glob
         });
         var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("node:path");
@@ -3866,10 +3850,10 @@ var prepare = __webpack_require__("./src/cli/prepare.ts");
 async function runCLI() {
     (0, prepare.k)();
     try {
-        (0, commands.QF)();
+        (0, commands.Q)();
     } catch (err) {
-        logger.v.error('Failed to start Rstest CLI.');
-        logger.v.error(err);
+        logger.vF.error('Failed to start Rstest CLI.');
+        logger.vF.error(err);
     }
 }
 var src_config = __webpack_require__("./src/config.ts");

package/dist/worker.js

@@ -5002,7 +5002,9 @@ var __webpack_modules__ = {
                     stack: error.stack
                 };
                 if (error instanceof TestRegisterError && test?.type === 'case') errObj.message = `Can't nest describe or test inside a test. ${error.message} because it is nested within test '${test.name}'`;
-                if (error.showDiff || void 0 === error.showDiff && void 0 !== error.expected && void 0 !== error.actual) errObj.diff = diff(err.expected, err.actual);
+                if (error.showDiff || void 0 === error.showDiff && void 0 !== error.expected && void 0 !== error.actual) errObj.diff = diff(err.expected, err.actual, {
+                    expand: false
+                });
                 for (const key of [
                     'actual',
                     'expected'
@@ -5127,7 +5129,7 @@ var __webpack_modules__ = {
     },
     "./src/utils/logger.ts": function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
         __webpack_require__.d(__webpack_exports__, {
-            v: ()=>src_logger
+            vF: ()=>src_logger
         });
         var external_node_os_ = __webpack_require__("node:os");
         var external_node_tty_ = __webpack_require__("node:tty");
@@ -5641,7 +5643,7 @@ const createRequire = (filename, distPath, rstestContext, assetFiles, interopDef
                 interopDefault
             });
         } catch (err) {
-            logger.v.error(`load file ${joinedPath} failed:\n`, err instanceof Error ? err.message : err);
+            logger.vF.error(`load file ${joinedPath} failed:\n`, err instanceof Error ? err.message : err);
         }
         const resolved = _require.resolve(id);
         return _require(resolved);
@@ -5949,7 +5951,7 @@ const onExit = ()=>{
 };
 const runInPool = async (options)=>{
     isTeardown = false;
-    const { entryInfo: { distPath, testPath }, setupEntries, assetFiles, type, context: { runtimeConfig: { isolate } } } = options;
+    const { entryInfo: { distPath, testPath }, setupEntries, assetFiles, type, context: { project, runtimeConfig: { isolate } } } = options;
     const cleanups = [];
     const exit = process.exit.bind(process);
     process.exit = (code = process.exitCode || 0)=>{
@@ -5979,12 +5981,14 @@ const runInPool = async (options)=>{
         });
         const tests = await runner.collectTests();
         return {
+            project,
             testPath,
             tests,
             errors: (0, util.o9)(unhandledErrors)
         };
     } catch (err) {
         return {
+            project,
             testPath,
             tests: [],
             errors: (0, util.o9)(err)
@@ -6022,6 +6026,7 @@ const runInPool = async (options)=>{
         return results;
     } catch (err) {
         return {
+            project,
             testPath,
             status: 'fail',
             name: '',

package/dist-types/index.d.ts

@@ -16,7 +16,11 @@ declare type AfterAllListener = (ctx: SuiteContext) => MaybePromise<void>;
 
 export declare const afterEach: Rstest['afterEach'];
 
-declare type AfterEachListener = () => MaybePromise<void>;
+declare type AfterEachListener = (params: {
+    task: {
+        result: Readonly<TestResult>;
+    };
+}) => MaybePromise<void>;
 
 export declare const assert: Rstest['assert'];
 
@@ -386,12 +390,13 @@ declare class DefaultReporter implements Reporter {
     onTestCaseResult(_result: TestResult): void;
     onUserConsoleLog(log: UserConsoleLog): void;
     onExit(): Promise<void>;
-    onTestRunEnd({ results, testResults, duration, getSourcemap, snapshotSummary, }: {
+    onTestRunEnd({ results, testResults, duration, getSourcemap, snapshotSummary, filterRerunTestPaths, }: {
         results: TestFileResult[];
         testResults: TestResult[];
         duration: Duration;
         snapshotSummary: SnapshotSummary;
         getSourcemap: GetSourcemap;
+        filterRerunTestPaths?: string[];
     }): Promise<void>;
 }
 
@@ -653,6 +658,7 @@ declare class GithubActionsReporter {
         duration: Duration;
         snapshotSummary: SnapshotSummary;
         getSourcemap: GetSourcemap;
+        filterRerunTestPaths?: string[];
     }): Promise<void>;
 }
 
@@ -1561,7 +1567,7 @@ declare interface NewPlugin {
     	test: Test;
 }
 
-declare type NormalizedConfig = Required<Omit<RstestConfig, OptionalKeys | 'pool'>> & {
+declare type NormalizedConfig = Required<Omit<RstestConfig, OptionalKeys | 'pool' | 'projects'>> & {
     [key in OptionalKeys]?: RstestConfig[key];
 } & {
     pool: RstestPoolOptions;
@@ -1571,11 +1577,31 @@ declare type NormalizedProcedure<T extends Procedure> = (...args: Parameters<T>)
 
 declare type NormalizedProcedure_2<T extends Procedure_2> = (...args: Parameters<T>) => ReturnType<T>;
 
+declare type NormalizedProjectConfig = Required<Omit<RstestConfig, OptionalKeys | 'projects' | 'reporters' | 'pool'>> & {
+    [key in OptionalKeys]?: RstestConfig[key];
+};
+
 declare interface OldPlugin {
     	print: (val: unknown, print: Print, indent: Indent, options: PluginOptions, colors: Colors) => string;
     	test: Test;
 }
 
+export declare const onTestFailed: Rstest['onTestFailed'];
+
+declare type OnTestFailedHandler = (params: {
+    task: {
+        result: Readonly<TestResult>;
+    };
+}) => MaybePromise<void>;
+
+export declare const onTestFinished: Rstest['onTestFinished'];
+
+declare type OnTestFinishedHandler = (params: {
+    task: {
+        result: Readonly<TestResult>;
+    };
+}) => MaybePromise<void>;
+
 declare type OptionalKeys = 'setupFiles' | 'testNamePattern' | 'plugins' | 'source' | 'resolve' | 'output' | 'performance' | 'tools' | 'dev' | 'onConsoleLog';
 
 declare type OptionsReceived = PrettyFormatOptions;
@@ -1628,6 +1654,16 @@ declare type Procedure = (...args: any[]) => any;
 
 declare type Procedure_2 = (...args: any[]) => any;
 
+declare type ProjectConfig = Omit<RstestConfig, 'projects' | 'reporters' | 'pool' | 'isolate'>;
+
+declare type ProjectContext = {
+    name: string;
+    environmentName: string;
+    rootPath: string;
+    configFilePath?: string;
+    normalizedConfig: NormalizedProjectConfig;
+};
+
 declare type Promisify<O> = { [K in keyof O] : O[K] extends (...args: infer A) => infer R ? Promisify<O[K]> & ((...args: A) => Promise<R>) : O[K] };
 
 declare type Promisify_2<O> = {
@@ -1675,6 +1711,7 @@ export declare interface Reporter {
         duration: Duration;
         getSourcemap: GetSourcemap;
         snapshotSummary: SnapshotSummary;
+        filterRerunTestPaths?: string[];
     }) => MaybePromise<void>;
     /**
      * Called when console log is calling.
@@ -1722,6 +1759,10 @@ export declare interface RstestConfig {
      * @default process.cwd()
      */
     root?: string;
+    /**
+     * Run tests from one or more projects.
+     */
+    projects?: TestProject[];
     /**
      * Project name
      *
@@ -1887,6 +1928,10 @@ declare type RstestContext = {
     fileFilters?: string[];
     /** The config file path. */
     configFilePath?: string;
+    /**
+     * Run tests from one or more projects.
+     */
+    projects: ProjectContext[];
     /**
      * The command type.
      *
@@ -2047,6 +2092,8 @@ declare type RunnerAPI = {
     afterAll: (fn: AfterAllListener, timeout?: number) => MaybePromise<void>;
     beforeEach: (fn: BeforeEachListener, timeout?: number) => MaybePromise<void>;
     afterEach: (fn: AfterEachListener, timeout?: number) => MaybePromise<void>;
+    onTestFinished: (fn: OnTestFinishedHandler, timeout?: number) => void;
+    onTestFailed: (fn: OnTestFailedHandler, timeout?: number) => void;
 };
 
 declare type RuntimeConfig = Pick<RstestContext['normalizedConfig'], 'testTimeout' | 'testNamePattern' | 'globals' | 'passWithNoTests' | 'retry' | 'clearMocks' | 'resetMocks' | 'restoreMocks' | 'unstubEnvs' | 'unstubGlobals' | 'maxConcurrency' | 'printConsoleTrace' | 'disableConsoleIntercept' | 'testEnvironment' | 'isolate' | 'hookTimeout'>;
@@ -2276,6 +2323,8 @@ declare type TestCallbackFn<ExtraContext = object> = (context: TestContext & Ext
 
 declare type TestContext = {
     expect: RstestExpect;
+    onTestFinished: RunnerAPI['onTestFinished'];
+    onTestFailed: RunnerAPI['onTestFailed'];
 };
 
 declare interface TestEachFn {
@@ -2305,6 +2354,13 @@ declare type TestForFn<ExtraContext = object> = <T>(cases: readonly T[]) => (des
 /** The test file original path */
 declare type TestPath = string;
 
+/**
+ * A list of glob patterns or files that match your test projects.
+ *
+ * eg. ['packages/*', 'examples/node/rstest.config.ts']
+ */
+declare type TestProject = string | ProjectConfig;
+
 export declare type TestResult = {
     status: TestResultStatus;
     name: string;
@@ -2313,6 +2369,7 @@ export declare type TestResult = {
     duration?: number;
     errors?: FormattedError[];
     retryCount?: number;
+    project: string;
 };
 
 declare type TestResultStatus = 'skip' | 'pass' | 'fail' | 'todo';