@midscene/cli 1.9.5-beta-20260611051901.0 → 1.9.5

package/dist/es/framework/index.mjs

@@ -8,6 +8,7 @@ import { getMidsceneRunSubDir } from "@midscene/shared/common";
 import { getDebug } from "@midscene/shared/logger";
 import { createRequire } from "node:module";
 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";
 import lodash_merge from "lodash.merge";
@@ -2611,20 +2612,6 @@ function printExecutionSummary(results, summaryPath) {
     else console.log('\n⚠️ Some files failed or were not executed.');
     return success;
 }
-const requireFromCliPackage = ()=>{
-    if ('undefined' != typeof __dirname) return createRequire(join(__dirname, 'index.js'));
-    const entry = process.argv[1] ? external_node_path_resolve(process.argv[1]) : join(process.cwd(), 'midscene-cli.js');
-    return createRequire(entry);
-};
-const resolvePackageFromRstestCore = (packageName)=>{
-    const require = requireFromCliPackage();
-    const rstestPackageJsonPath = require.resolve('@rstest/core/package.json');
-    return createRequire(rstestPackageJsonPath).resolve(packageName);
-};
-function resolveRstestCoreImportPath() {
-    const require = requireFromCliPackage();
-    return require.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';
@@ -2651,16 +2638,9 @@ const createGeneratedTestContent = (options)=>{
             webRuntimeOptions: options.webRuntimeOptions
         } : {}
     };
-    return `import { test } from ${toImportLiteral(options.rstestCoreImport)};
-import { defineYamlCaseTest } from ${toImportLiteral(options.frameworkImport)};
-
-const testOptions = ${JSON.stringify(testOptions, null, 2)};
+    return `import { defineYamlCaseTest } from ${toImportLiteral(options.frameworkImport)};
 
-if (defineYamlCaseTest.length >= 2) {
-  defineYamlCaseTest(test, testOptions);
-} else {
-  await defineYamlCaseTest(testOptions);
-}
+defineYamlCaseTest(${JSON.stringify(testOptions, null, 2)});
 `;
 };
 const createGeneratedBatchTestContent = (options)=>{
@@ -2669,16 +2649,9 @@ const createGeneratedBatchTestContent = (options)=>{
         config: options.config,
         resultFiles: options.resultFiles
     };
-    return `import { test } from ${toImportLiteral(options.rstestCoreImport)};
-import { defineYamlBatchTest } from ${toImportLiteral(options.frameworkImport)};
-
-const testOptions = ${JSON.stringify(testOptions, null, 2)};
+    return `import { defineYamlBatchTest } from ${toImportLiteral(options.frameworkImport)};
 
-if (defineYamlBatchTest.length >= 2) {
-  defineYamlBatchTest(test, testOptions);
-} else {
-  await defineYamlBatchTest(testOptions);
-}
+defineYamlBatchTest(${JSON.stringify(testOptions, null, 2)});
 `;
 };
 const resolveDefaultFrameworkImport = (moduleDir)=>{
@@ -2699,7 +2672,6 @@ function createRstestYamlProject(options) {
     const outputDir = options.outputDir || join(getMidsceneRunSubDir('tmp'), `rstest-yaml-${Date.now()}`);
     const resultDir = options.resultDir || join(outputDir, 'results');
     const frameworkImport = options.frameworkImport || resolveDefaultFrameworkImport();
-    const rstestCoreImport = options.rstestCoreImport || resolveRstestCoreImportPath();
     const testTimeout = options.testTimeout ?? DEFAULT_YAML_TEST_TIMEOUT;
     rmSync(outputDir, {
         recursive: true,
@@ -2716,7 +2688,6 @@ function createRstestYamlProject(options) {
         const resultFile = join(resultDir, `${fileStem}.json`);
         const testModule = toVirtualModuleId(fileStem);
         virtualModules[testModule] = createGeneratedTestContent({
-            rstestCoreImport,
             frameworkImport,
             yamlFile,
             resultFile,
@@ -2749,7 +2720,6 @@ function createRstestYamlProject(options) {
             ],
             virtualModules: {
                 [batchTest.testModule]: createGeneratedBatchTestContent({
-                    rstestCoreImport,
                     frameworkImport,
                     testName: batchTest.testName,
                     config: options.batchConfig,
@@ -2776,6 +2746,21 @@ function createRstestYamlProject(options) {
         retry: options.retry
     };
 }
+const requireFromCliPackage = ()=>{
+    if ('undefined' != typeof __dirname) return createRequire(join(__dirname, 'index.js'));
+    const entry = process.argv[1] ? external_node_path_resolve(process.argv[1]) : join(process.cwd(), 'midscene-cli.js');
+    return createRequire(entry);
+};
+const resolvePackageFromRstestCore = (packageName)=>{
+    const require = requireFromCliPackage();
+    const rstestPackageJsonPath = require.resolve('@rstest/core/package.json');
+    return createRequire(rstestPackageJsonPath).resolve(packageName);
+};
+function resolveRstestCoreImportPath() {
+    const require = requireFromCliPackage();
+    const packageJsonPath = require.resolve('@rstest/core/package.json');
+    return join(dirname(packageJsonPath), 'dist', 'index.js');
+}
 const formatRunError = (error)=>error.stack || `${error.name}: ${error.message}`;
 const collectRunErrors = (result)=>{
     const messages = [];
@@ -4108,12 +4093,7 @@ const createRuntimeFailureResult = (file, startTime, error)=>({
         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)=>{
+function defineYamlCaseTest(options) {
     test(options.testName, async ()=>{
         const file = external_node_path_resolve(options.yamlFile);
         const startTime = Date.now();
@@ -4135,26 +4115,14 @@ const registerYamlCaseTest = (test, options)=>{
             throw error;
         }
     });
-};
-function defineYamlCaseTest(testOrOptions, maybeOptions) {
-    if (maybeOptions) return void registerYamlCaseTest(testOrOptions, maybeOptions);
-    return loadRstestTest().then((test)=>{
-        registerYamlCaseTest(test, testOrOptions);
-    });
 }
-const registerYamlBatchTest = (test, options)=>{
+function defineYamlBatchTest(options) {
     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);
-    });
 }
 export { createRstestYamlProject, createYamlCaseFailure, createYamlCaseResult, defineYamlBatchTest, defineYamlCaseTest, getYamlPlayerFailure, resolveRstestCoreImportPath, resolveTestName, runFrameworkTestConfig, runRstestYamlProject, runYamlBatchInRstest, runYamlCase, runYamlCaseResult };