@midscene/cli 1.9.4 → 1.9.5-beta-20260611031026.0

package/dist/lib/index.js

@@ -3207,6 +3207,18 @@ var __webpack_modules__ = {
             else console.log('\n⚠️ Some files failed or were not executed.');
             return success;
         }
+        const external_node_module_namespaceObject = require("node:module");
+        const requireFromCliPackage = ()=>(0, external_node_module_namespaceObject.createRequire)((0, external_node_path_.join)(__dirname, 'index.js'));
+        const resolvePackageFromRstestCore = (packageName)=>{
+            const require1 = requireFromCliPackage();
+            const rstestPackageJsonPath = require1.resolve('@rstest/core/package.json');
+            return (0, external_node_module_namespaceObject.createRequire)(rstestPackageJsonPath).resolve(packageName);
+        };
+        function resolveRstestCoreImportPath() {
+            const require1 = requireFromCliPackage();
+            const packageJsonPath = require1.resolve('@rstest/core/package.json');
+            return (0, external_node_path_.join)((0, external_node_path_.dirname)(packageJsonPath), 'dist', 'index.js');
+        }
         const DEFAULT_YAML_TEST_TIMEOUT = 0;
         const RSTEST_YAML_BATCH_TEST_MODULE = 'virtual:midscene-yaml/batch.test.ts';
         const RSTEST_YAML_BATCH_TEST_NAME = 'midscene yaml batch';
@@ -3233,9 +3245,16 @@ var __webpack_modules__ = {
                     webRuntimeOptions: options.webRuntimeOptions
                 } : {}
             };
-            return `import { defineYamlCaseTest } from ${toImportLiteral(options.frameworkImport)};
+            return `import { test } from ${toImportLiteral(options.rstestCoreImport)};
+import { defineYamlCaseTest } from ${toImportLiteral(options.frameworkImport)};
 
-defineYamlCaseTest(${JSON.stringify(testOptions, null, 2)});
+const testOptions = ${JSON.stringify(testOptions, null, 2)};
+
+if (defineYamlCaseTest.length >= 2) {
+  defineYamlCaseTest(test, testOptions);
+} else {
+  defineYamlCaseTest(testOptions);
+}
 `;
         };
         const createGeneratedBatchTestContent = (options)=>{
@@ -3244,9 +3263,16 @@ defineYamlCaseTest(${JSON.stringify(testOptions, null, 2)});
                 config: options.config,
                 resultFiles: options.resultFiles
             };
-            return `import { defineYamlBatchTest } from ${toImportLiteral(options.frameworkImport)};
+            return `import { test } from ${toImportLiteral(options.rstestCoreImport)};
+import { defineYamlBatchTest } from ${toImportLiteral(options.frameworkImport)};
 
-defineYamlBatchTest(${JSON.stringify(testOptions, null, 2)});
+const testOptions = ${JSON.stringify(testOptions, null, 2)};
+
+if (defineYamlBatchTest.length >= 2) {
+  defineYamlBatchTest(test, testOptions);
+} else {
+  defineYamlBatchTest(testOptions);
+}
 `;
         };
         const resolveDefaultFrameworkImport = (moduleDir)=>{
@@ -3267,6 +3293,7 @@ defineYamlBatchTest(${JSON.stringify(testOptions, null, 2)});
             const outputDir = options.outputDir || (0, external_node_path_.join)((0, common_namespaceObject.getMidsceneRunSubDir)('tmp'), `rstest-yaml-${Date.now()}`);
             const resultDir = options.resultDir || (0, external_node_path_.join)(outputDir, 'results');
             const frameworkImport = options.frameworkImport || resolveDefaultFrameworkImport();
+            const rstestCoreImport = options.rstestCoreImport || resolveRstestCoreImportPath();
             const testTimeout = options.testTimeout ?? DEFAULT_YAML_TEST_TIMEOUT;
             (0, external_node_fs_.rmSync)(outputDir, {
                 recursive: true,
@@ -3283,6 +3310,7 @@ defineYamlBatchTest(${JSON.stringify(testOptions, null, 2)});
                 const resultFile = (0, external_node_path_.join)(resultDir, `${fileStem}.json`);
                 const testModule = toVirtualModuleId(fileStem);
                 virtualModules[testModule] = createGeneratedTestContent({
+                    rstestCoreImport,
                     frameworkImport,
                     yamlFile,
                     resultFile,
@@ -3315,6 +3343,7 @@ defineYamlBatchTest(${JSON.stringify(testOptions, null, 2)});
                     ],
                     virtualModules: {
                         [batchTest.testModule]: createGeneratedBatchTestContent({
+                            rstestCoreImport,
                             frameworkImport,
                             testName: batchTest.testName,
                             config: options.batchConfig,
@@ -3341,14 +3370,7 @@ defineYamlBatchTest(${JSON.stringify(testOptions, null, 2)});
                 retry: options.retry
             };
         }
-        const external_node_module_namespaceObject = require("node:module");
         var external_node_url_ = __webpack_require__("node:url");
-        const requireFromCliPackage = ()=>(0, external_node_module_namespaceObject.createRequire)((0, external_node_path_.join)(__dirname, 'index.js'));
-        const resolvePackageFromRstestCore = (packageName)=>{
-            const require1 = requireFromCliPackage();
-            const rstestPackageJsonPath = require1.resolve('@rstest/core/package.json');
-            return (0, external_node_module_namespaceObject.createRequire)(rstestPackageJsonPath).resolve(packageName);
-        };
         const formatRunError = (error)=>error.stack || `${error.name}: ${error.message}`;
         const collectRunErrors = (result)=>{
             const messages = [];
@@ -3531,7 +3553,6 @@ defineYamlBatchTest(${JSON.stringify(testOptions, null, 2)});
             const success = printExecutionSummary(results, summaryPath);
             return success ? exitCode : 1;
         }
-        require("@rstest/core");
         __webpack_require__("@midscene/core/yaml");
         require("@midscene/web/puppeteer-agent-launcher");
         __webpack_require__("lodash.merge");
@@ -3555,9 +3576,7 @@ defineYamlBatchTest(${JSON.stringify(testOptions, null, 2)});
         const cli_namespaceObject = require("@midscene/shared/cli");
         var main = __webpack_require__("../../node_modules/.pnpm/dotenv@16.4.5/node_modules/dotenv/lib/main.js");
         var main_default = /*#__PURE__*/ __webpack_require__.n(main);
-        var package_namespaceObject = {
-            rE: "1.9.4"
-        };
+        var package_namespaceObject = JSON.parse('{"rE":"1.9.5-beta-20260611031026.0"}');
         var logger_ = __webpack_require__("@midscene/shared/logger");
         var brace_expansion = __webpack_require__("../../node_modules/.pnpm/brace-expansion@2.0.1/node_modules/brace-expansion/index.js");
         const MAX_PATTERN_LENGTH = 65536;
@@ -11399,7 +11418,7 @@ Usage:
                     type: 'boolean',
                     description: `Turn on logging to help debug why certain keys or values are not being set as you expect, default is ${config_factory_defaultConfig.dotenvDebug}`
                 }
-            }).version('version', 'Show version number', "1.9.4").help().epilogue(`For complete list of configuration options, please visit:
+            }).version('version', 'Show version number', "1.9.5-beta-20260611031026.0").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
   • iOS options: https://midscenejs.com/automate-with-scripts-in-yaml#the-ios-part