@midscene/cli 1.13.1-beta-20260921080849.0 → 1.13.1

package/dist/lib/index.js

@@ -4592,29 +4592,26 @@ defineYamlBatchTest(test, testOptions);
             };
         }
         var external_node_url_ = __webpack_require__("node:url");
+        const error_formatter_namespaceObject = require("@midscene/shared/agent-tools/error-formatter");
         var progress_reporter = __webpack_require__("./src/framework/progress-reporter.ts");
         var rstest_contract = __webpack_require__("./src/framework/rstest-contract.ts");
-        const formatRunError = (error)=>error.stack || `${error.name}: ${error.message}`;
+        const formatRunError = (error)=>error.stack || `${error.name || 'Error'}: ${error.message}`;
         const collectRunErrors = (result)=>{
             const messages = [];
             const push = (error, label)=>{
                 const formatted = formatRunError(error);
                 messages.push(label ? `${label}: ${formatted}` : formatted);
             };
-            for (const file of result.files ?? []){
+            for (const file of result.results){
                 for (const error of file.errors ?? [])push(error, file.name || file.testPath);
                 for (const testResult of file.results ?? [])for (const error of testResult.errors ?? [])push(error, testResult.name);
             }
-            for (const error of result.unhandledErrors ?? [])push(error);
+            for (const error of result.unhandledErrors)push(error);
             return Array.from(new Set(messages));
         };
         const rstest_runner_errorMessage = (error)=>error.message || error.name || 'YAML case failed';
         const mapRunErrorsToCases = (project, result)=>{
-            const casesById = new Map(project.cases.map((item)=>[
-                    item.caseId,
-                    item
-                ]));
-            const knownCaseIds = new Set(casesById.keys());
+            const knownCaseIds = new Set(project.cases.map((item)=>item.caseId));
             const errors = new Map();
             const add = (caseId, message)=>{
                 if (knownCaseIds.has(caseId) && message && !errors.has(caseId)) errors.set(caseId, message);
@@ -4637,7 +4634,7 @@ defineYamlBatchTest(test, testOptions);
                 const value = testResult.meta?.[rstest_contract.k];
                 return Array.isArray(value) ? value.filter((item)=>'string' == typeof item) : [];
             };
-            for (const file of result.files ?? []){
+            for (const file of result.results){
                 const moduleCaseIds = findModuleCaseIds(file);
                 for (const error of file.errors ?? [])addCases(moduleCaseIds, rstest_runner_errorMessage(error));
                 for (const testResult of file.results ?? []){
@@ -4645,18 +4642,13 @@ defineYamlBatchTest(test, testOptions);
                     for (const error of testResult.errors ?? [])addCases(caseIds.length ? caseIds : moduleCaseIds, rstest_runner_errorMessage(error));
                 }
             }
-            if (1 === project.modules.length && result.unhandledErrors?.length) {
+            if (result.unhandledErrors.length) {
                 const message = rstest_runner_errorMessage(result.unhandledErrors[0]);
-                for (const caseId of project.modules[0].caseIds){
-                    const item = casesById.get(caseId);
-                    if (!errors.has(caseId) || item && !(0, external_node_fs_.existsSync)(item.resultFile)) errors.set(caseId, message);
-                }
+                for (const item of project.cases)if (!errors.has(item.caseId) && !(0, external_node_fs_.existsSync)(item.resultFile)) errors.set(item.caseId, message);
             }
             return errors;
         };
-        const recordUnreportedCaseFailures = (project, result)=>{
-            if (!project.cases.length) return;
-            const caseErrors = mapRunErrorsToCases(project, result);
+        const writePendingCaseFailures = (project, caseErrors)=>{
             for (const item of project.cases){
                 if ((0, external_node_fs_.existsSync)(item.resultFile)) continue;
                 const error = caseErrors.get(item.caseId);
@@ -4678,13 +4670,13 @@ defineYamlBatchTest(test, testOptions);
             }
         };
         async function runRstestYamlProject(options) {
-            const [{ runRstest }, { rspack }] = await Promise.all([
+            const [{ createRstest }, { rspack }] = await Promise.all([
                 import("@rstest/core/api"),
                 import((0, external_node_url_.pathToFileURL)(resolvePackageFromRstestCore('@rsbuild/core')).href)
             ]);
             const { project } = options;
             const maxConcurrency = void 0 !== project.maxConcurrency ? Math.max(1, project.maxConcurrency) : void 0;
-            const inlineConfig = {
+            const config = {
                 root: project.projectDir,
                 include: project.modules.map((item)=>item.id),
                 testEnvironment: 'node',
@@ -4715,18 +4707,31 @@ defineYamlBatchTest(test, testOptions);
                     }
                 }
             };
-            const result = await runRstest({
-                cwd: options.cwd || project.projectDir,
-                inlineConfig
-            });
-            if (!result.ok) {
-                recordUnreportedCaseFailures(project, result);
+            let result;
+            try {
+                const rstest = await createRstest({
+                    cwd: options.cwd || project.projectDir,
+                    config
+                });
+                result = await rstest.run();
+            } catch (error) {
+                const serialized = (0, error_formatter_namespaceObject.serializeError)(error);
+                writePendingCaseFailures(project, new Map(project.cases.map((item)=>[
+                        item.caseId,
+                        serialized.message
+                    ])));
+                if ('pipe' !== options.stdio) console.error(`\nYAML execution failed:\n${formatRunError(serialized)}`);
+                return 1;
+            }
+            const ok = 'pass' === result.status;
+            if (!ok) {
+                writePendingCaseFailures(project, mapRunErrorsToCases(project, result));
                 if ('pipe' !== options.stdio) {
                     const runErrors = collectRunErrors(result);
                     if (runErrors.length) console.error(`\nYAML execution failed:\n${runErrors.join('\n\n')}`);
                 }
             }
-            return result.ok ? 0 : 1;
+            return ok ? 0 : 1;
         }
         const defaultInProcessRunner = (config)=>new BatchRunner(config).run();
         async function runConfigInMainProcess(config, commandOptions) {
@@ -4808,7 +4813,9 @@ defineYamlBatchTest(test, testOptions);
         "use strict";
         var core_ = __webpack_require__("@midscene/core");
         const cli_namespaceObject = require("@midscene/shared/cli");
-        var package_namespaceObject = JSON.parse('{"rE":"1.13.1-beta-20260921080849.0"}');
+        var package_namespaceObject = {
+            rE: "1.13.1"
+        };
         var external_node_fs_ = __webpack_require__("node:fs");
         var external_node_fs_namespaceObject = /*#__PURE__*/ __webpack_require__.t(external_node_fs_, 2);
         var external_node_path_ = __webpack_require__("node:path");
@@ -10490,7 +10497,7 @@ Usage:
                     type: 'boolean',
                     description: 'Whether to dismiss the HarmonyOS keyboard after text input'
                 }
-            }).version('version', 'Show version number', "1.13.1-beta-20260921080849.0").help().epilogue(`For complete list of configuration options, please visit:
+            }).version('version', 'Show version number', "1.13.1").help().epilogue(`For complete list of configuration options, please visit:
   • Web options: https://midscenejs.com/automate-with-scripts-in-yaml#the-web-part
   • Android options: https://midscenejs.com/automate-with-scripts-in-yaml#the-android-part
   • HarmonyOS options: https://midscenejs.com/automate-with-scripts-in-yaml#the-harmony-part