@rstest/core 0.6.4 → 0.6.5

package/dist/0~971.js

@@ -7,23 +7,7 @@ const external_node_fs_ = __webpack_require__("node:fs");
 const external_node_path_ = __webpack_require__("node:path");
 const picocolors = __webpack_require__("../../node_modules/.pnpm/picocolors@1.1.1/node_modules/picocolors/picocolors.js");
 var picocolors_default = /*#__PURE__*/ __webpack_require__.n(picocolors);
-async function listTests(context, { filesOnly, json }) {
-    const { rootPath } = context;
-    const testEntries = {};
-    const globTestSourceEntries = async (name)=>{
-        if (testEntries[name]) return testEntries[name];
-        const { include, exclude, includeSource, root } = context.projects.find((p)=>p.environmentName === name).normalizedConfig;
-        const entries = await getTestEntries({
-            include,
-            exclude: exclude.patterns,
-            rootPath,
-            projectRoot: root,
-            fileFilters: context.fileFilters || [],
-            includeSource
-        });
-        testEntries[name] = entries;
-        return entries;
-    };
+const collectTests = async ({ context, globTestSourceEntries })=>{
     const setupFiles = Object.fromEntries(context.projects.map((project)=>{
         const { environmentName, rootPath, normalizedConfig: { setupFiles } } = project;
         return [
@@ -40,7 +24,7 @@ async function listTests(context, { filesOnly, json }) {
         },
         setupFiles,
         rsbuildInstance,
-        rootPath
+        rootPath: context.rootPath
     });
     const pool = await createPool({
         context
@@ -64,7 +48,60 @@ async function listTests(context, { filesOnly, json }) {
             assetNames
         };
     }));
-    const list = returns.flatMap((r)=>r.list);
+    return {
+        list: returns.flatMap((r)=>r.list),
+        getSourceMap: async (name)=>{
+            const resource = returns.find((r)=>r.assetNames.includes(name));
+            return (await resource?.getSourceMaps([
+                name
+            ]))?.[name];
+        },
+        close: async ()=>{
+            await closeServer();
+            await pool.close();
+        }
+    };
+};
+const collectTestFiles = async ({ context, globTestSourceEntries })=>{
+    const list = [];
+    for (const project of context.projects){
+        const files = await globTestSourceEntries(project.environmentName);
+        list.push(...Object.values(files).map((testPath)=>({
+                testPath,
+                project: project.name,
+                tests: []
+            })));
+    }
+    return {
+        close: async ()=>{},
+        list,
+        getSourceMap: async (_name)=>null
+    };
+};
+async function listTests(context, { filesOnly, json }) {
+    const { rootPath } = context;
+    const testEntries = {};
+    const globTestSourceEntries = async (name)=>{
+        if (testEntries[name]) return testEntries[name];
+        const { include, exclude, includeSource, root } = context.projects.find((p)=>p.environmentName === name).normalizedConfig;
+        const entries = await getTestEntries({
+            include,
+            exclude: exclude.patterns,
+            rootPath,
+            projectRoot: root,
+            fileFilters: context.fileFilters || [],
+            includeSource
+        });
+        testEntries[name] = entries;
+        return entries;
+    };
+    const { list, close, getSourceMap } = filesOnly ? await collectTestFiles({
+        context,
+        globTestSourceEntries
+    }) : await collectTests({
+        context,
+        globTestSourceEntries
+    });
     const tests = [];
     const traverseTests = (test)=>{
         if ([
@@ -94,16 +131,12 @@ async function listTests(context, { filesOnly, json }) {
             if (file.errors?.length) {
                 src_logger.log(`${picocolors_default().bgRed(' FAIL ')} ${relativePath}`);
                 for (const error of file.errors)await printError(error, async (name)=>{
-                    const resource = returns.find((r)=>r.assetNames.includes(name));
-                    const sourceMap = (await resource?.getSourceMaps([
-                        name
-                    ]))?.[name];
+                    const sourceMap = await getSourceMap(name);
                     return sourceMap ? JSON.parse(sourceMap) : null;
                 }, rootPath);
             }
         }
-        await closeServer();
-        await pool.close();
+        await close();
         return;
     }
     for (const file of list){
@@ -132,7 +165,6 @@ async function listTests(context, { filesOnly, json }) {
         const shortPath = (0, external_node_path_.relative)(rootPath, test.file);
         src_logger.log(test.name ? `${picocolors_default().dim(`${shortPath} > `)}${test.name}` : prettyTestPath(shortPath));
     }
-    await closeServer();
-    await pool.close();
+    await close();
 }
 export { listTests };

package/dist/index.js

@@ -3,7 +3,7 @@ import 'module';
 import { __webpack_require__ } from "./rslib-runtime.js";
 import { EventEmitter } from "events";
 import { createRsbuild, loadConfig, logger, mergeRsbuildConfig } from "@rsbuild/core";
-import { basename, DEFAULT_CONFIG_EXTENSIONS, TS_CONFIG_FILE, DEFAULT_CONFIG_NAME, dirname, posix, resolve as pathe_M_eThtNZ_resolve, pathe_M_eThtNZ_relative, globalApis, formatTestPath, getAbsolutePath, filterProjects, formatRootStr, join, isDynamicPattern, glob, writeFile, castArray, src_logger, prettyTestPath, prettyTime, isDebug, isAbsolute, getTaskNameWithPrefix, formatError, normalize, TEMP_RSTEST_OUTPUT_DIR_GLOB } from "./857.js";
+import { basename, DEFAULT_CONFIG_EXTENSIONS, TS_CONFIG_FILE, isTTY, dirname, posix, resolve as pathe_M_eThtNZ_resolve, pathe_M_eThtNZ_relative, DEFAULT_CONFIG_NAME, globalApis, formatTestPath, getAbsolutePath, filterProjects, join, formatRootStr, isDynamicPattern, glob, writeFile, castArray, src_logger, prettyTestPath, prettyTime, isDebug, isAbsolute, getTaskNameWithPrefix, formatError, normalize, TEMP_RSTEST_OUTPUT_DIR_GLOB } from "./857.js";
 import { decode } from "./597.js";
 function toArr(any) {
     return null == any ? [] : Array.isArray(any) ? any : [
@@ -500,7 +500,7 @@ function prepareCli() {
     if (!npm_execpath || npm_execpath.includes('npx-cli.js') || npm_execpath.includes('.bun')) console.log();
 }
 function showRstest() {
-    src_logger.greet("  Rstest v0.6.4");
+    src_logger.greet("  Rstest v0.6.5");
     src_logger.log('');
 }
 const applyCommonOptions = (cli)=>{
@@ -544,7 +544,7 @@ const runRest = async ({ options, filters, command })=>{
 function setupCommands() {
     const cli = dist('rstest');
     cli.help();
-    cli.version("0.6.4");
+    cli.version("0.6.5");
     applyCommonOptions(cli);
     cli.command('[...filters]', 'run tests').option('-w, --watch', 'Run tests in watch mode').action(async (filters, options)=>{
         showRstest();
@@ -708,9 +708,9 @@ const createDefaultConfig = ()=>({
                 '**/__mocks__/**',
                 '**/*.d.ts',
                 '**/*.{test,spec}.[jt]s',
-                '**/*.{test,spec}.[c|m][jt]s',
+                '**/*.{test,spec}.[cm][jt]s',
                 '**/*.{test,spec}.[jt]sx',
-                '**/*.{test,spec}.[c|m][jt]sx'
+                '**/*.{test,spec}.[cm][jt]sx'
             ],
             enabled: false,
             provider: 'istanbul',
@@ -1652,7 +1652,7 @@ class DefaultReporter {
         this.rootPath = rootPath;
         this.config = config;
         this.options = options;
-        if (!T) this.statusRenderer = new StatusRenderer(rootPath);
+        if (isTTY()) this.statusRenderer = new StatusRenderer(rootPath);
     }
     onTestFileStart(test) {
         this.statusRenderer?.onTestFileStart(test.testPath);
@@ -2374,7 +2374,7 @@ class Rstest {
         });
         this.reporters = reporters;
         this.snapshotManager = snapshotManager;
-        this.version = "0.6.4";
+        this.version = "0.6.5";
         this.rootPath = rootPath;
         this.originalConfig = userConfig;
         this.normalizedConfig = rstestConfig;
@@ -2385,7 +2385,8 @@ class Rstest {
             config.coverage = rstestConfig.coverage;
             config.bail = rstestConfig.bail;
             config.source ??= {};
-            if (!config.source.tsconfigPath) {
+            if (config.source.tsconfigPath) config.source.tsconfigPath = getAbsolutePath(config.root, config.source.tsconfigPath);
+            else {
                 const tsconfigPath = join(config.root, TS_CONFIG_FILE);
                 if ((0, external_node_fs_.existsSync)(tsconfigPath)) config.source.tsconfigPath = tsconfigPath;
             }

package/package.json

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