@midscene/cli 1.9.4 → 1.9.5-beta-20260611031026.0

package/dist/es/framework/index.mjs

@@ -8,7 +8,6 @@ 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";
@@ -2612,6 +2611,21 @@ 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();
+    const packageJsonPath = require.resolve('@rstest/core/package.json');
+    return join(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';
@@ -2638,9 +2652,16 @@ const createGeneratedTestContent = (options)=>{
             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)=>{
@@ -2649,9 +2670,16 @@ const createGeneratedBatchTestContent = (options)=>{
         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)};
+
+const testOptions = ${JSON.stringify(testOptions, null, 2)};
 
-defineYamlBatchTest(${JSON.stringify(testOptions, null, 2)});
+if (defineYamlBatchTest.length >= 2) {
+  defineYamlBatchTest(test, testOptions);
+} else {
+  defineYamlBatchTest(testOptions);
+}
 `;
 };
 const resolveDefaultFrameworkImport = (moduleDir)=>{
@@ -2672,6 +2700,7 @@ 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,
@@ -2688,6 +2717,7 @@ function createRstestYamlProject(options) {
         const resultFile = join(resultDir, `${fileStem}.json`);
         const testModule = toVirtualModuleId(fileStem);
         virtualModules[testModule] = createGeneratedTestContent({
+            rstestCoreImport,
             frameworkImport,
             yamlFile,
             resultFile,
@@ -2720,6 +2750,7 @@ function createRstestYamlProject(options) {
             ],
             virtualModules: {
                 [batchTest.testModule]: createGeneratedBatchTestContent({
+                    rstestCoreImport,
                     frameworkImport,
                     testName: batchTest.testName,
                     config: options.batchConfig,
@@ -2746,21 +2777,6 @@ 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 = [];
@@ -4093,7 +4109,12 @@ const createRuntimeFailureResult = (file, startTime, error)=>({
         resultType: 'failed',
         error: rstest_entry_errorMessageOf(error)
     });
-function defineYamlCaseTest(options) {
+let rstestCorePromise;
+const loadRstestTest = async ()=>{
+    if (!rstestCorePromise) rstestCorePromise = import("@rstest/core");
+    return (await rstestCorePromise).test;
+};
+const registerYamlCaseTest = (test, options)=>{
     test(options.testName, async ()=>{
         const file = external_node_path_resolve(options.yamlFile);
         const startTime = Date.now();
@@ -4115,14 +4136,26 @@ function defineYamlCaseTest(options) {
             throw error;
         }
     });
+};
+function defineYamlCaseTest(testOrOptions, maybeOptions) {
+    if (maybeOptions) return void registerYamlCaseTest(testOrOptions, maybeOptions);
+    return loadRstestTest().then((test)=>{
+        registerYamlCaseTest(test, testOrOptions);
+    });
 }
-function defineYamlBatchTest(options) {
+const registerYamlBatchTest = (test, 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 };