@rstest/core 0.7.8 → 0.7.9

package/dist/0~9634.js

@@ -1,19 +1,24 @@
 import 'module';
 /*#__PURE__*/ import.meta.url;
 import { __webpack_require__ } from "./rslib-runtime.js";
-import "./5693.js";
+import { getTaskNameWithPrefix, bgColor } from "./2672.js";
 import { prepareRsbuild, createPool, createRsbuildServer, runGlobalTeardown, runGlobalSetup } from "./0~89.js";
-import { getTestEntries, getTaskNameWithPrefix, prettyTestPath, ROOT_SUITE_NAME, bgColor } from "./1157.js";
-import { logger_logger } from "./3278.js";
-const external_node_fs_ = __webpack_require__("node:fs");
+import { getTestEntries, prettyTestPath, ROOT_SUITE_NAME } from "./1157.js";
+import { logger as logger_logger } from "./3278.js";
+const external_node_fs_ = __webpack_require__("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);
-const collectTests = async ({ context, globTestSourceEntries })=>{
-    const { getSetupFiles } = await import("./0~6973.js").then((mod)=>({
+const collectNodeTests = async ({ context, nodeProjects, globTestSourceEntries })=>{
+    const { getSetupFiles } = await import("./6973.js").then((mod)=>({
             getSetupFiles: mod.getSetupFiles
         }));
-    const setupFiles = Object.fromEntries(context.projects.map((project)=>{
+    if (0 === nodeProjects.length) return {
+        list: [],
+        getSourceMap: async (_name)=>null,
+        close: async ()=>{}
+    };
+    const setupFiles = Object.fromEntries(nodeProjects.map((project)=>{
         const { environmentName, rootPath, normalizedConfig: { setupFiles } } = project;
         return [
             environmentName,
@@ -34,7 +39,7 @@ const collectTests = async ({ context, globTestSourceEntries })=>{
         isWatchMode: false,
         inspectedConfig: {
             ...context.normalizedConfig,
-            projects: context.projects.map((p)=>p.normalizedConfig)
+            projects: nodeProjects.map((p)=>p.normalizedConfig)
         },
         setupFiles,
         rsbuildInstance,
@@ -44,7 +49,7 @@ const collectTests = async ({ context, globTestSourceEntries })=>{
         context
     });
     const updateSnapshot = context.snapshotManager.options.updateSnapshot;
-    const returns = await Promise.all(context.projects.map(async (project)=>{
+    const returns = await Promise.all(nodeProjects.map(async (project)=>{
         const { entries, setupEntries, globalSetupEntries, getSourceMaps, getAssetFiles, assetNames } = await getRsbuildStats({
             environmentName: project.environmentName
         });
@@ -97,6 +102,20 @@ const collectTests = async ({ context, globTestSourceEntries })=>{
         }
     };
 };
+const collectBrowserTests = async ({ context, browserProjects })=>{
+    if (0 === browserProjects.length) return {
+        list: [],
+        close: async ()=>{}
+    };
+    const { loadBrowserModule } = await import("./0~1472.js").then((mod)=>({
+            loadBrowserModule: mod.loadBrowserModule
+        }));
+    const projectRoots = browserProjects.map((p)=>p.rootPath);
+    const { listBrowserTests } = await loadBrowserModule({
+        projectRoots
+    });
+    return listBrowserTests(context);
+};
 const collectTestFiles = async ({ context, globTestSourceEntries })=>{
     const list = [];
     for (const project of context.projects){
@@ -114,6 +133,35 @@ const collectTestFiles = async ({ context, globTestSourceEntries })=>{
         getSourceMap: async (_name)=>null
     };
 };
+const collectAllTests = async ({ context, globTestSourceEntries })=>{
+    const browserProjects = context.projects.filter((p)=>p.normalizedConfig.browser.enabled);
+    const nodeProjects = context.projects.filter((p)=>!p.normalizedConfig.browser.enabled);
+    const [nodeResult, browserResult] = await Promise.all([
+        collectNodeTests({
+            context,
+            nodeProjects,
+            globTestSourceEntries
+        }),
+        collectBrowserTests({
+            context,
+            browserProjects
+        })
+    ]);
+    return {
+        errors: nodeResult.errors,
+        list: [
+            ...nodeResult.list,
+            ...browserResult.list
+        ],
+        getSourceMap: nodeResult.getSourceMap,
+        close: async ()=>{
+            await Promise.all([
+                nodeResult.close(),
+                browserResult.close()
+            ]);
+        }
+    };
+};
 async function listTests(context, { filesOnly, json, printLocation, includeSuites }) {
     const { rootPath } = context;
     const testEntries = {};
@@ -134,7 +182,7 @@ async function listTests(context, { filesOnly, json, printLocation, includeSuite
     const { list, close, getSourceMap, errors = [] } = filesOnly ? await collectTestFiles({
         context,
         globTestSourceEntries
-    }) : await collectTests({
+    }) : await collectAllTests({
         context,
         globTestSourceEntries
     });

package/dist/1157.js

@@ -1,11 +1,11 @@
 import 'module';
 /*#__PURE__*/ import.meta.url;
+import * as __rspack_external_node_fs_promises_153e37e0 from "node:fs/promises";
 import { __webpack_require__ } from "./rslib-runtime.js";
 import { fileURLToPath } from "url";
 import { createRequire } from "module";
-import promises, { lstat, readdir, realpath, stat as promises_stat, writeFile } from "node:fs/promises";
-import "./5693.js";
-import { normalize, isAbsolute, posix, join, parse } from "./3278.js";
+import { castArray, parsePosix } from "./2672.js";
+import { posix } from "./3278.js";
 __webpack_require__.add({
     "../../node_modules/.pnpm/picomatch@4.0.3/node_modules/picomatch/index.js" (module, __unused_rspack_exports, __webpack_require__) {
         const pico = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.3/node_modules/picomatch/lib/picomatch.js");
@@ -1412,121 +1412,13 @@ __webpack_require__.add({
             if ('' === last) return segs[segs.length - 2];
             return last;
         };
+    },
+    "node:fs/promises" (module) {
+        module.exports = __rspack_external_node_fs_promises_153e37e0;
     }
 });
-const picocolors = __webpack_require__("../../node_modules/.pnpm/picocolors@1.1.1/node_modules/picocolors/picocolors.js");
-var picocolors_default = /*#__PURE__*/ __webpack_require__.n(picocolors);
-const formatRootStr = (rootStr, root)=>rootStr.replace('<rootDir>', normalize(root));
-function getAbsolutePath(base, filepath) {
-    return isAbsolute(filepath) ? filepath : join(base, filepath);
-}
-const parsePosix = (filePath)=>{
-    const { dir, base } = parse(filePath);
-    return {
-        dir: dir.split("/").join('/'),
-        base
-    };
-};
-const isObject = (obj)=>'[object Object]' === Object.prototype.toString.call(obj);
-const castArray = (arr)=>{
-    if (void 0 === arr) return [];
-    return Array.isArray(arr) ? arr : [
-        arr
-    ];
-};
-const isPlainObject = (obj)=>null !== obj && 'object' == typeof obj && Object.getPrototypeOf(obj) === Object.prototype;
-function formatError(error) {
-    if ('string' == typeof error || error instanceof Error) return error;
-    if (isPlainObject(error) && error.message) {
-        const e = new Error(error.name || 'unknown error');
-        e.message = error.message;
-        e.stack = error.stack;
-        return e;
-    }
-    return String(error);
-}
-const prettyTime = (milliseconds)=>{
-    if (milliseconds < 1000) return `${Math.round(milliseconds)}ms`;
-    const seconds = milliseconds / 1000;
-    const getSecond = (seconds, needDigits)=>{
-        if (!needDigits || seconds === Math.ceil(seconds)) return `${Math.round(seconds).toString()}s`;
-        const digits = seconds < 10 ? seconds >= 0.01 ? 2 : 3 : 1;
-        return `${seconds.toFixed(digits)}s`;
-    };
-    const minutes = Math.floor(seconds / 60);
-    const secondsRemainder = seconds % 60;
-    let time = '';
-    if (minutes > 0) time += `${minutes}m`;
-    if (secondsRemainder > 0) {
-        if (minutes > 0) time += ' ';
-        time += getSecond(secondsRemainder, !minutes);
-    }
-    return time;
-};
-const getTaskNames = (test)=>(test.parentNames || []).concat(test.name).filter(Boolean);
-const getTaskNameWithPrefix = (test, delimiter = ">")=>getTaskNames(test).join(` ${delimiter} `);
-const REGEXP_FLAG_PREFIX = 'RSTEST_REGEXP:';
-const wrapRegex = (value)=>`${REGEXP_FLAG_PREFIX}${value.toString()}`;
-const unwrapRegex = (value)=>{
-    if (value.startsWith(REGEXP_FLAG_PREFIX)) {
-        const regexStr = value.slice(REGEXP_FLAG_PREFIX.length);
-        const matches = regexStr.match(/^\/(.+)\/([gimuy]*)$/);
-        if (matches) {
-            const [, pattern, flags] = matches;
-            return new RegExp(pattern, flags);
-        }
-    }
-    return value;
-};
-const serializableConfig = (normalizedConfig)=>{
-    const { testNamePattern } = normalizedConfig;
-    return {
-        ...normalizedConfig,
-        testNamePattern: testNamePattern && 'string' != typeof testNamePattern ? wrapRegex(testNamePattern) : testNamePattern
-    };
-};
-const undoSerializableConfig = (normalizedConfig)=>{
-    const { testNamePattern } = normalizedConfig;
-    return {
-        ...normalizedConfig,
-        testNamePattern: testNamePattern && 'string' == typeof testNamePattern ? unwrapRegex(testNamePattern) : testNamePattern
-    };
-};
-const getNodeVersion = ()=>{
-    if ('string' == typeof process.versions?.node) {
-        const [major = 0, minor = 0, patch = 0] = process.versions.node.split('.').map(Number);
-        return {
-            major,
-            minor,
-            patch
-        };
-    }
-    return {
-        major: 0,
-        minor: 0,
-        patch: 0
-    };
-};
-const needFlagExperimentalDetectModule = ()=>{
-    const { major, minor } = getNodeVersion();
-    if (20 === major && minor >= 10) return true;
-    if (22 === major && minor < 7) return true;
-    return false;
-};
-const ADDITIONAL_NODE_BUILTINS = [
-    /^node:/,
-    'pnpapi'
-];
-const bgColor = (background, str)=>{
-    if ([
-        'bgRed',
-        'bgBlack'
-    ].includes(background)) return picocolors_default()[background](picocolors_default().white(picocolors_default().bold(str)));
-    return picocolors_default()[background](picocolors_default().blackBright(picocolors_default().bold(str)));
-};
-const isTTY = (type = 'stdout')=>('stdin' === type ? process.stdin.isTTY : process.stdout.isTTY) && !process.env.CI;
 const external_node_path_ = __webpack_require__("node:path");
-const external_node_fs_ = __webpack_require__("node:fs");
+const external_node_fs_ = __webpack_require__("fs");
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 function cleanPath(path) {
     let normalized = (0, external_node_path_.normalize)(path);
@@ -2318,6 +2210,9 @@ const globalApis = [
     'onTestFailed'
 ];
 const TS_CONFIG_FILE = 'tsconfig.json';
+const promises_ = __webpack_require__("node:fs/promises");
+const picocolors = __webpack_require__("../../node_modules/.pnpm/picocolors@1.1.1/node_modules/picocolors/picocolors.js");
+var picocolors_default = /*#__PURE__*/ __webpack_require__.n(picocolors);
 const filterFiles = (testFiles, filters, dir)=>{
     if (!filters.length) return testFiles;
     const fileFilters = 'win32' === process.platform ? filters.map((f)=>f.split(posix.sep).join('/')) : filters;
@@ -2361,7 +2256,7 @@ const getTestEntries = async ({ include, exclude, rootPath, projectRoot, fileFil
         });
         await Promise.all(sourceFiles.map(async (file)=>{
             try {
-                const code = await promises.readFile(file, 'utf-8');
+                const code = await promises_["default"].readFile(file, 'utf-8');
                 if (hasInSourceTestCode(code)) testFiles.push(file);
             } catch  {
                 return;
@@ -2385,4 +2280,4 @@ const formatTestPath = (root, testFilePath)=>{
     if (posix.isAbsolute(testPath) && testPath.includes(root)) testPath = posix.relative(root, testPath);
     return prettyTestPath(testPath);
 };
-export { ADDITIONAL_NODE_BUILTINS, DEFAULT_CONFIG_EXTENSIONS, DEFAULT_CONFIG_NAME, ROOT_SUITE_NAME, TEMP_RSTEST_OUTPUT_DIR, TEMP_RSTEST_OUTPUT_DIR_GLOB, TS_CONFIG_FILE, bgColor, castArray, filterProjects, formatError, formatRootStr, formatTestEntryName, formatTestPath, getAbsolutePath, getTaskNameWithPrefix, getTestEntries, glob, globalApis, isDynamicPattern, isObject, isTTY, lstat, needFlagExperimentalDetectModule, prettyTestPath, prettyTime, promises_stat, readdir, realpath, serializableConfig, undoSerializableConfig, writeFile };
+export { DEFAULT_CONFIG_EXTENSIONS, DEFAULT_CONFIG_NAME, ROOT_SUITE_NAME, TEMP_RSTEST_OUTPUT_DIR, TEMP_RSTEST_OUTPUT_DIR_GLOB, TS_CONFIG_FILE, filterProjects, formatTestEntryName, formatTestPath, getTestEntries, glob, globalApis, isDynamicPattern, prettyTestPath };