@midscene/cli 1.9.5-beta-20260611051901.0 → 1.9.5

package/dist/lib/framework/index.js

@@ -3011,17 +3011,6 @@ var __webpack_exports__ = {};
         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();
-        return require1.resolve('@rstest/core');
-    }
     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';
@@ -3048,16 +3037,9 @@ var __webpack_exports__ = {};
                 webRuntimeOptions: options.webRuntimeOptions
             } : {}
         };
-        return `import { test } from ${toImportLiteral(options.rstestCoreImport)};
-import { defineYamlCaseTest } from ${toImportLiteral(options.frameworkImport)};
+        return `import { defineYamlCaseTest } from ${toImportLiteral(options.frameworkImport)};
 
-const testOptions = ${JSON.stringify(testOptions, null, 2)};
-
-if (defineYamlCaseTest.length >= 2) {
-  defineYamlCaseTest(test, testOptions);
-} else {
-  await defineYamlCaseTest(testOptions);
-}
+defineYamlCaseTest(${JSON.stringify(testOptions, null, 2)});
 `;
     };
     const createGeneratedBatchTestContent = (options)=>{
@@ -3066,16 +3048,9 @@ if (defineYamlCaseTest.length >= 2) {
             config: options.config,
             resultFiles: options.resultFiles
         };
-        return `import { test } from ${toImportLiteral(options.rstestCoreImport)};
-import { defineYamlBatchTest } from ${toImportLiteral(options.frameworkImport)};
+        return `import { defineYamlBatchTest } from ${toImportLiteral(options.frameworkImport)};
 
-const testOptions = ${JSON.stringify(testOptions, null, 2)};
-
-if (defineYamlBatchTest.length >= 2) {
-  defineYamlBatchTest(test, testOptions);
-} else {
-  await defineYamlBatchTest(testOptions);
-}
+defineYamlBatchTest(${JSON.stringify(testOptions, null, 2)});
 `;
     };
     const resolveDefaultFrameworkImport = (moduleDir)=>{
@@ -3096,7 +3071,6 @@ if (defineYamlBatchTest.length >= 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,
@@ -3113,7 +3087,6 @@ if (defineYamlBatchTest.length >= 2) {
             const resultFile = (0, external_node_path_.join)(resultDir, `${fileStem}.json`);
             const testModule = toVirtualModuleId(fileStem);
             virtualModules[testModule] = createGeneratedTestContent({
-                rstestCoreImport,
                 frameworkImport,
                 yamlFile,
                 resultFile,
@@ -3146,7 +3119,6 @@ if (defineYamlBatchTest.length >= 2) {
                 ],
                 virtualModules: {
                     [batchTest.testModule]: createGeneratedBatchTestContent({
-                        rstestCoreImport,
                         frameworkImport,
                         testName: batchTest.testName,
                         config: options.batchConfig,
@@ -3173,7 +3145,19 @@ if (defineYamlBatchTest.length >= 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);
+    };
+    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 formatRunError = (error)=>error.stack || `${error.name}: ${error.message}`;
     const collectRunErrors = (result)=>{
         const messages = [];
@@ -3356,6 +3340,7 @@ if (defineYamlBatchTest.length >= 2) {
         const success = printExecutionSummary(results, summaryPath);
         return success ? exitCode : 1;
     }
+    const external_rstest_core_namespaceObject = require("@rstest/core");
     var yaml_ = __webpack_require__("@midscene/core/yaml");
     const puppeteer_agent_launcher_namespaceObject = require("@midscene/web/puppeteer-agent-launcher");
     var external_lodash_merge_ = __webpack_require__("lodash.merge");
@@ -4186,13 +4171,8 @@ if (defineYamlBatchTest.length >= 2) {
             resultType: 'failed',
             error: rstest_entry_errorMessageOf(error)
         });
-    let rstestCorePromise;
-    const loadRstestTest = async ()=>{
-        if (!rstestCorePromise) rstestCorePromise = import("@rstest/core");
-        return (await rstestCorePromise).test;
-    };
-    const registerYamlCaseTest = (test, options)=>{
-        test(options.testName, async ()=>{
+    function defineYamlCaseTest(options) {
+        (0, external_rstest_core_namespaceObject.test)(options.testName, async ()=>{
             const file = (0, external_node_path_.resolve)(options.yamlFile);
             const startTime = Date.now();
             let result;
@@ -4213,26 +4193,14 @@ if (defineYamlBatchTest.length >= 2) {
                 throw error;
             }
         });
-    };
-    function defineYamlCaseTest(testOrOptions, maybeOptions) {
-        if (maybeOptions) return void registerYamlCaseTest(testOrOptions, maybeOptions);
-        return loadRstestTest().then((test)=>{
-            registerYamlCaseTest(test, testOrOptions);
-        });
     }
-    const registerYamlBatchTest = (test, options)=>{
-        test(options.testName, async ()=>{
+    function defineYamlBatchTest(options) {
+        (0, external_rstest_core_namespaceObject.test)(options.testName, async ()=>{
             await runYamlBatchInRstest({
                 config: options.config,
                 resultFiles: options.resultFiles
             });
         });
-    };
-    function defineYamlBatchTest(testOrOptions, maybeOptions) {
-        if (maybeOptions) return void registerYamlBatchTest(testOrOptions, maybeOptions);
-        return loadRstestTest().then((test)=>{
-            registerYamlBatchTest(test, testOrOptions);
-        });
     }
 })();
 exports.createRstestYamlProject = __webpack_exports__.createRstestYamlProject;