@midscene/cli 1.10.4-beta-20260710100314.0 → 1.10.4-beta-20260710115744.0

package/dist/es/index.mjs

@@ -10,7 +10,7 @@ import node_stream from "node:stream";
 import { StringDecoder } from "node:string_decoder";
 import { fileURLToPath as external_url_fileURLToPath } from "url";
 import node_process, { cwd as external_node_process_cwd } from "node:process";
-import { ScriptPlayer, interpolateEnvVars, parseYamlScript as yaml_parseYamlScript } from "@midscene/core/yaml";
+import { ScriptPlayer, interpolateEnvVars, parseYamlScript as yaml_parseYamlScript, resolveWebTarget } from "@midscene/core/yaml";
 import lodash_merge from "lodash.merge";
 import { createHash } from "node:crypto";
 import { getMidsceneRunSubDir } from "@midscene/shared/common";
@@ -3025,7 +3025,7 @@ var __webpack_modules__ = {
         module.exports = (string, columns, options)=>String(string).normalize().replace(/\r\n/g, '\n').split('\n').map((line)=>exec(line, columns, options)).join('\n');
     },
     "./src/index.ts" (__unused_rspack_module, __unused_rspack___webpack_exports__, __webpack_require__) {
-        var package_namespaceObject = JSON.parse('{"rE":"1.10.4-beta-20260710100314.0"}');
+        var package_namespaceObject = JSON.parse('{"rE":"1.10.4-beta-20260710115744.0"}');
         var brace_expansion = __webpack_require__("../../node_modules/.pnpm/brace-expansion@2.0.1/node_modules/brace-expansion/index.js");
         const MAX_PATTERN_LENGTH = 65536;
         const assertValidPattern = (pattern)=>{
@@ -10723,6 +10723,7 @@ var __webpack_modules__ = {
                 throw new Error(`Failed to parse config YAML: ${error}`);
             }
             if (!configYaml?.files || !Array.isArray(configYaml?.files)) throw new Error('Config YAML must contain a "files" array');
+            resolveWebTarget(configYaml);
             const files = await expandFilePatterns(configYaml?.files, basePath);
             if (0 === files.length) throw new Error('No YAML files found matching the patterns in "files"');
             const setup = await resolveSetupFile(configYaml.setup, basePath);
@@ -10735,7 +10736,10 @@ var __webpack_modules__ = {
                 retry: configYaml.retry ?? config_factory_defaultConfig.retry,
                 summary: configYaml.summary ?? defaultSummary,
                 shareBrowserContext: configYaml.shareBrowserContext ?? config_factory_defaultConfig.shareBrowserContext,
+                page: configYaml.page,
+                browser: configYaml.browser,
                 web: configYaml.web,
+                target: configYaml.target,
                 android: configYaml.android,
                 ios: configYaml.ios,
                 patterns: configYaml.files,
@@ -10751,14 +10755,19 @@ var __webpack_modules__ = {
         async function createConfig(configYamlPath, options) {
             const parsedConfig = await parseConfigYaml(configYamlPath);
             const globalConfig = lodash_merge({
+                page: parsedConfig.page,
+                browser: parsedConfig.browser,
                 web: parsedConfig.web,
                 android: parsedConfig.android,
                 ios: parsedConfig.ios,
                 target: parsedConfig.target
             }, {
+                page: options?.page,
+                browser: options?.browser,
                 web: options?.web,
                 android: options?.android,
-                ios: options?.ios
+                ios: options?.ios,
+                target: options?.target
             });
             const keepWindow = options?.keepWindow ?? parsedConfig.keepWindow;
             const headed = options?.headed ?? parsedConfig.headed;
@@ -10813,7 +10822,10 @@ var __webpack_modules__ = {
                 dotenvOverride: options.dotenvOverride ?? config_factory_defaultConfig.dotenvOverride,
                 dotenvDebug: options.dotenvDebug ?? config_factory_defaultConfig.dotenvDebug,
                 globalConfig: {
+                    page: options.page,
+                    browser: options.browser,
                     web: options.web,
+                    target: options.target,
                     android: options.android,
                     ios: options.ios
                 }
@@ -10886,7 +10898,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.10.4-beta-20260710100314.0").help().epilogue(`For complete list of configuration options, please visit:
+            }).version('version', 'Show version number', "1.10.4-beta-20260710115744.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
@@ -11331,9 +11343,10 @@ Examples:
             };
             const player = new ScriptPlayer(clonedYamlScript, async ()=>{
                 const freeFn = [];
-                const webTarget = clonedYamlScript.web || clonedYamlScript.target;
+                const resolvedWebTarget = resolveWebTarget(clonedYamlScript);
+                const webTarget = resolvedWebTarget?.target;
                 const targetCount = [
-                    void 0 !== webTarget,
+                    void 0 !== resolvedWebTarget,
                     void 0 !== clonedYamlScript.android,
                     void 0 !== clonedYamlScript.ios,
                     void 0 !== clonedYamlScript.harmony,
@@ -11342,17 +11355,17 @@ Examples:
                 ].filter(Boolean).length;
                 if (targetCount > 1) {
                     const specifiedTargets = [
-                        void 0 !== webTarget ? 'web' : null,
+                        resolvedWebTarget?.source ?? null,
                         void 0 !== clonedYamlScript.android ? 'android' : null,
                         void 0 !== clonedYamlScript.ios ? 'ios' : null,
                         void 0 !== clonedYamlScript.harmony ? 'harmony' : null,
                         void 0 !== clonedYamlScript.computer ? 'computer' : null,
                         void 0 !== clonedYamlScript.interface ? 'interface' : null
                     ].filter(Boolean);
-                    throw new Error(`Only one target type can be specified, but found multiple: ${specifiedTargets.join(', ')}. Please specify only one of: web, android, ios, harmony, computer, or interface.`);
+                    throw new Error(`Only one target type can be specified, but found multiple: ${specifiedTargets.join(', ')}. Please specify only one of: page, browser, web, android, ios, harmony, computer, or interface.`);
                 }
                 if (void 0 !== webTarget) {
-                    if (void 0 !== clonedYamlScript.target) console.warn("target is deprecated, please use web instead. See https://midscenejs.com/automate-with-scripts-in-yaml for more information. Sorry for the inconvenience.");
+                    if (resolvedWebTarget?.source === 'target') console.warn("target is deprecated, please use page or browser instead. See https://midscenejs.com/automate-with-scripts-in-yaml for more information. Sorry for the inconvenience.");
                     let localServer;
                     let urlToVisit;
                     if (webTarget.serve) {
@@ -11367,6 +11380,7 @@ Examples:
                         webTarget.url = urlToVisit;
                     }
                     if (webTarget.cdpEndpoint && webTarget.bridgeMode) throw new Error('cdpEndpoint and bridgeMode are mutually exclusive. Please specify only one.');
+                    if ('browser' === webTarget.mode && webTarget.bridgeMode) throw new Error('[midscene] browser mode does not support bridgeMode. Use page: or web.mode: page for bridge mode.');
                     if (webTarget.cdpEndpoint) {
                         const cdpBrowser = options?.browser ?? await puppeteer.connect({
                             browserWSEndpoint: webTarget.cdpEndpoint,
@@ -12009,9 +12023,9 @@ Examples:
                         setupContext,
                         ...fileContextList
                     ] : fileContextList;
-                    const needsBrowser = allContexts.some((ctx)=>Object.keys(ctx.executionConfig.web || ctx.executionConfig.target || {}).length > 0);
+                    const needsBrowser = allContexts.some((ctx)=>void 0 !== resolveWebTarget(ctx.executionConfig));
                     if (needsBrowser && this.config.shareBrowserContext) {
-                        const globalWebConfig = this.config.globalConfig?.web;
+                        const globalWebConfig = resolveWebTarget(this.config.globalConfig ?? {})?.target;
                         if (globalWebConfig?.cdpEndpoint) browser = await puppeteer.connect({
                             browserWSEndpoint: globalWebConfig.cdpEndpoint,
                             defaultViewport: null,
@@ -12049,7 +12063,7 @@ Examples:
                     this.results = await this.processResults(executedResults, notExecutedContexts);
                 } finally{
                     if (browser && !this.config.keepWindow) {
-                        const isCdp = !!this.config.globalConfig?.web?.cdpEndpoint;
+                        const isCdp = !!resolveWebTarget(this.config.globalConfig ?? {})?.target.cdpEndpoint;
                         if (isCdp) browser.disconnect();
                         else await browser.close();
                     }
@@ -12060,20 +12074,6 @@ Examples:
             async createFileContext(file, fileConfig, options) {
                 const { globalConfig } = this.config;
                 const clonedFileConfig = JSON.parse(JSON.stringify(fileConfig));
-                if (clonedFileConfig.target) {
-                    clonedFileConfig.web = {
-                        ...clonedFileConfig.target,
-                        ...clonedFileConfig.web
-                    };
-                    delete clonedFileConfig.target;
-                }
-                if (globalConfig?.target) {
-                    globalConfig.web = {
-                        ...globalConfig.target,
-                        ...globalConfig.web
-                    };
-                    delete globalConfig.target;
-                }
                 const executionConfig = lodash_merge(clonedFileConfig, globalConfig);
                 return {
                     file,