@midscene/cli 1.8.8-beta-20260603024013.0 → 1.8.9

package/dist/es/framework/index.mjs

@@ -4,7 +4,7 @@ import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node
 import node_path, { basename, dirname, extname, join, relative, resolve as external_node_path_resolve, sep } from "node:path";
 import { getMidsceneRunSubDir } from "@midscene/shared/common";
 import { createRequire } from "node:module";
-import { runRstestWithVirtualModules } from "@midscene/shared/rstest";
+import { pathToFileURL } from "node:url";
 import { test } from "@rstest/core";
 import { ScriptPlayer, parseYamlScript } from "@midscene/core/yaml";
 import { buildChromeArgs, defaultViewportHeight, defaultViewportWidth, puppeteerAgentForTarget } from "@midscene/web/puppeteer-agent-launcher";
@@ -2541,15 +2541,8 @@ const DEFAULT_YAML_TEST_TIMEOUT = 0;
 const toPosixPath = (value)=>value.split(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(basename(file, extname(file)).replace(/[^a-zA-Z0-9._-]+/g, '-'));
+    const base = basename(file, extname(file)).replace(/[^a-zA-Z0-9._-]+/g, '-').replace(/^-+|-+$/g, '');
     return `${String(index + 1).padStart(3, '0')}-${base || 'case'}`;
 };
 const resolveTestName = (projectDir, yamlFile)=>{
@@ -2683,20 +2676,41 @@ function resolveRstestCoreImportPath() {
 }
 const formatRunError = (error)=>error.stack || `${error.name}: ${error.message}`;
 async function runRstestYamlProject(options) {
+    const [{ runRstest }, { rspack }] = await Promise.all([
+        import("@rstest/core/api"),
+        import(pathToFileURL(resolvePackageFromRstestCore('@rsbuild/core')).href)
+    ]);
     const { project } = options;
-    const result = await 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)=>{