@midscene/cli 1.8.8-beta-20260603024013.0 → 1.8.9

package/dist/lib/framework/index.js

@@ -2346,6 +2346,10 @@ var __webpack_modules__ = {
         "use strict";
         module.exports = require("node:path");
     },
+    "node:url" (module) {
+        "use strict";
+        module.exports = require("node:url");
+    },
     os (module) {
         "use strict";
         module.exports = require("os");
@@ -2931,15 +2935,8 @@ var __webpack_exports__ = {};
     const toPosixPath = (value)=>value.split(external_node_path_.sep).join('/');
     const toImportLiteral = (value)=>JSON.stringify(toPosixPath(value));
     const toVirtualModuleId = (fileStem)=>`virtual:midscene-yaml/${fileStem}.test.ts`;
-    const trimEdgeHyphens = (value)=>{
-        let start = 0;
-        let end = value.length;
-        while(start < end && 45 === value.charCodeAt(start))start += 1;
-        while(end > start && 45 === value.charCodeAt(end - 1))end -= 1;
-        return value.slice(start, end);
-    };
     const safeFileStem = (file, index)=>{
-        const base = trimEdgeHyphens((0, external_node_path_.basename)(file, (0, external_node_path_.extname)(file)).replace(/[^a-zA-Z0-9._-]+/g, '-'));
+        const base = (0, external_node_path_.basename)(file, (0, external_node_path_.extname)(file)).replace(/[^a-zA-Z0-9._-]+/g, '-').replace(/^-+|-+$/g, '');
         return `${String(index + 1).padStart(3, '0')}-${base || 'case'}`;
     };
     const resolveTestName = (projectDir, yamlFile)=>{
@@ -3058,7 +3055,7 @@ defineYamlBatchTest(${JSON.stringify(testOptions, null, 2)});
         };
     }
     const external_node_module_namespaceObject = require("node:module");
-    const rstest_namespaceObject = require("@midscene/shared/rstest");
+    var external_node_url_ = __webpack_require__("node:url");
     const requireFromCliEntry = ()=>{
         const entry = process.argv[1] ? (0, external_node_path_.resolve)(process.argv[1]) : (0, external_node_path_.join)(process.cwd(), 'midscene-cli.js');
         return (0, external_node_module_namespaceObject.createRequire)(entry);
@@ -3075,20 +3072,41 @@ defineYamlBatchTest(${JSON.stringify(testOptions, null, 2)});
     }
     const formatRunError = (error)=>error.stack || `${error.name}: ${error.message}`;
     async function runRstestYamlProject(options) {
+        const [{ runRstest }, { rspack }] = await Promise.all([
+            import("@rstest/core/api"),
+            import((0, external_node_url_.pathToFileURL)(resolvePackageFromRstestCore('@rsbuild/core')).href)
+        ]);
         const { project } = options;
-        const result = await (0, rstest_namespaceObject.runRstestWithVirtualModules)({
-            cwd: options.cwd || project.projectDir,
+        const maxConcurrency = void 0 !== project.maxConcurrency ? Math.max(1, project.maxConcurrency) : void 0;
+        const inlineConfig = {
             root: project.projectDir,
             include: project.include,
-            virtualModules: project.virtualModules,
-            rsbuildEntry: resolvePackageFromRstestCore('@rsbuild/core'),
+            testEnvironment: 'node',
             testTimeout: project.testTimeout,
-            maxConcurrency: project.maxConcurrency,
-            bail: project.bail,
-            reporters: []
+            ...void 0 !== maxConcurrency ? {
+                maxConcurrency
+            } : {},
+            ...void 0 !== maxConcurrency ? {
+                pool: {
+                    maxWorkers: maxConcurrency,
+                    minWorkers: maxConcurrency
+                }
+            } : {},
+            ...void 0 !== project.bail ? {
+                bail: project.bail
+            } : {},
+            reporters: [],
+            tools: {
+                rspack: (_config, { appendPlugins })=>{
+                    appendPlugins(new rspack.experiments.VirtualModulesPlugin(project.virtualModules));
+                }
+            }
+        };
+        const result = await runRstest({
+            cwd: options.cwd || project.projectDir,
+            inlineConfig
         });
-        const unhandledErrors = result.unhandledErrors ?? [];
-        if (!result.ok && 'pipe' !== options.stdio && unhandledErrors.length) console.error(unhandledErrors.map((error)=>formatRunError(error)).join('\n'));
+        if (!result.ok && 'pipe' !== options.stdio && result.unhandledErrors.length) console.error(result.unhandledErrors.map((error)=>formatRunError(error)).join('\n'));
         return result.ok ? 0 : 1;
     }
     const createCaseOptions = (config)=>{