@rstest/core 0.3.0 → 0.3.1

package/dist/12.js

@@ -588,12 +588,13 @@ export const __webpack_modules__ = {
                 });
                 this.reporters = reporters;
                 this.snapshotManager = snapshotManager;
-                this.version = "0.3.0";
+                this.version = "0.3.1";
                 this.rootPath = rootPath;
                 this.originalConfig = userConfig;
                 this.normalizedConfig = rstestConfig;
                 this.projects = projects.length ? projects.map((project)=>{
                     const config = (0, src_config.wX)(project.config);
+                    config.isolate = rstestConfig.isolate;
                     return {
                         configFilePath: project.configFilePath,
                         rootPath: config.root,

package/dist/223.js

@@ -51,7 +51,7 @@ export const __webpack_modules__ = {
             };
         }
         async function resolveProjects({ config, root, options }) {
-            if (!config.projects || !config.projects.length) return [];
+            if (!config.projects) return [];
             const getDefaultProjectName = (dir)=>{
                 const pkgJsonPath = (0, pathe__WEBPACK_IMPORTED_MODULE_1__.resolve)(dir, 'package.json');
                 const name = (0, node_fs__WEBPACK_IMPORTED_MODULE_0__.existsSync)(pkgJsonPath) ? JSON.parse((0, node_fs__WEBPACK_IMPORTED_MODULE_0__.readFileSync)(pkgJsonPath, 'utf-8')).name : '';
@@ -72,8 +72,21 @@ export const __webpack_modules__ = {
                 };
                 return (0, tinyglobby__WEBPACK_IMPORTED_MODULE_4__.glob)(patterns, globOptions);
             };
-            const { projectPaths, projectPatterns } = (config.projects || []).reduce((total, p)=>{
-                const projectStr = p.replace('<rootDir>', root);
+            const formatRootStr = (rootStr)=>rootStr.replace('<rootDir>', root);
+            const { projectPaths, projectPatterns, projectConfigs } = (config.projects || []).reduce((total, p)=>{
+                if ('object' == typeof p) {
+                    const projectRoot = p.root ? formatRootStr(p.root) : root;
+                    total.projectConfigs.push({
+                        config: {
+                            root: projectRoot,
+                            name: p.name ? p.name : getDefaultProjectName(projectRoot),
+                            ...p
+                        },
+                        configFilePath: void 0
+                    });
+                    return total;
+                }
+                const projectStr = formatRootStr(p);
                 if ((0, tinyglobby__WEBPACK_IMPORTED_MODULE_4__.ey)(projectStr)) total.projectPatterns.push(projectStr);
                 else {
                     const absolutePath = (0, _utils__WEBPACK_IMPORTED_MODULE_3__.FI)(root, projectStr);
@@ -83,7 +96,8 @@ export const __webpack_modules__ = {
                 return total;
             }, {
                 projectPaths: [],
-                projectPatterns: []
+                projectPatterns: [],
+                projectConfigs: []
             });
             projectPaths.push(...await globProjects(projectPatterns));
             const projects = await Promise.all(projectPaths.map(async (project)=>{
@@ -99,7 +113,13 @@ export const __webpack_modules__ = {
                     config,
                     configFilePath
                 };
-            }));
+            })).then((projects)=>(0, _utils__WEBPACK_IMPORTED_MODULE_3__.zz)(projects.concat(projectConfigs), options));
+            if (!projects.length) {
+                let errorMsg = `No projects found, please make sure you have at least one valid project.
+${_utils__WEBPACK_IMPORTED_MODULE_3__.yW.gray('projects:')} ${JSON.stringify(config.projects, null, 2)}`;
+                if (options.project) errorMsg += `\n${_utils__WEBPACK_IMPORTED_MODULE_3__.yW.gray('projectName filter:')} ${JSON.stringify(options.project, null, 2)}`;
+                throw errorMsg;
+            }
             const names = new Set();
             projects.forEach((project)=>{
                 if (names.has(project.config.name)) {

package/dist/33.js

@@ -162,7 +162,8 @@ export const __webpack_modules__ = {
                     include,
                     exclude,
                     includeSource,
-                    root,
+                    rootPath,
+                    projectRoot: root,
                     fileFilters: context.fileFilters || []
                 });
                 entriesCache.set(name, {

package/dist/971.js

@@ -23,7 +23,8 @@ export const __webpack_modules__ = {
                 const entries = await (0, _utils__WEBPACK_IMPORTED_MODULE_3__.tG)({
                     include,
                     exclude,
-                    root,
+                    rootPath,
+                    projectRoot: root,
                     fileFilters: context.fileFilters || [],
                     includeSource
                 });

package/dist/index.js

@@ -2677,7 +2677,7 @@ ${section.body}` : section.body).join("\n\n"));
         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');
+            }).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;
@@ -2709,7 +2709,7 @@ ${section.body}` : section.body).join("\n\n"));
         function setupCommands() {
             const cli = dist('rstest');
             cli.help();
-            cli.version("0.3.0");
+            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,7 +2779,7 @@ ${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__.vF.greet("  Rstest v0.3.0");
+            _utils_logger__WEBPACK_IMPORTED_MODULE_0__.vF.greet("  Rstest v0.3.1");
             _utils_logger__WEBPACK_IMPORTED_MODULE_0__.vF.log('');
         }
     },
@@ -3070,6 +3070,7 @@ ${section.body}` : section.body).join("\n\n"));
             _o: ()=>logger._o,
             pr: ()=>getSetupFiles,
             Kv: ()=>helper.Kv,
+            zz: ()=>filterProjects,
             mT: ()=>logger.mT,
             t: ()=>constants.t,
             kV: ()=>helper.kV,
@@ -3097,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,
@@ -3109,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,
@@ -3124,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

package/dist-types/index.d.ts

@@ -1577,6 +1577,10 @@ 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;
@@ -1650,12 +1654,14 @@ 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: NormalizedConfig;
+    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] };
@@ -2353,7 +2359,7 @@ declare type TestPath = string;
  *
  * eg. ['packages/*', 'examples/node/rstest.config.ts']
  */
-declare type TestProject = string;
+declare type TestProject = string | ProjectConfig;
 
 export declare type TestResult = {
     status: TestResultStatus;

package/dist-types/worker.d.ts

@@ -1358,6 +1358,10 @@ declare type NormalizedFixtures = Record<string, NormalizedFixture>;
 
 declare type NormalizedProcedure<T extends Procedure> = (...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;
@@ -1425,12 +1429,14 @@ declare function printWithType<T>(name: string, value: T, print: (value: T) => s
 
 declare type Procedure = (...args: any[]) => any;
 
+declare type ProjectConfig = Omit<RstestConfig, 'projects' | 'reporters' | 'pool' | 'isolate'>;
+
 declare type ProjectContext = {
     name: string;
     environmentName: string;
     rootPath: string;
     configFilePath?: string;
-    normalizedConfig: NormalizedConfig;
+    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] };
@@ -2057,7 +2063,7 @@ declare type TestPath = string;
  *
  * eg. ['packages/*', 'examples/node/rstest.config.ts']
  */
-declare type TestProject = string;
+declare type TestProject = string | ProjectConfig;
 
 declare type TestResult = {
     status: TestResultStatus;

package/package.json

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