appium-uiautomator2-driver 3.4.0 → 3.5.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [3.5.0](https://github.com/appium/appium-uiautomator2-driver/compare/v3.4.0...v3.5.0) (2024-05-12)
+
+
+### Features
+
+* Align the implementation of execute method map with other android drivers ([#780](https://github.com/appium/appium-uiautomator2-driver/issues/780)) ([d376a9b](https://github.com/appium/appium-uiautomator2-driver/commit/d376a9b344c2138fe89403640733dd489e965606))
+
 ## [3.4.0](https://github.com/appium/appium-uiautomator2-driver/compare/v3.3.0...v3.4.0) (2024-05-11)
 
 

package/build/lib/commands/execute.d.ts

@@ -1,25 +1,15 @@
 /**
- * @override
- * @privateRemarks Because the "mobile" commands (execute methods) in this
- * driver universally accept an options object, this method will _not_ call
- * into `BaseDriver.executeMethod`.
  * @this {AndroidUiautomator2Driver}
- * @param {string} script
- * @param {any[]} [args]
- * @returns {Promise<any>}
+ * @returns {import('@appium/types').StringRecord<string>}
  */
-export function execute(this: AndroidUiautomator2Driver, script: string, args?: any[] | undefined): Promise<any>;
+export function mobileCommandsMapping(this: import("../driver").AndroidUiautomator2Driver): import('@appium/types').StringRecord<string>;
 /**
  * @override
  * @this {AndroidUiautomator2Driver}
- * @param {string} script Must be of the form `mobile: <something>`, which
- * differs from its parent class implementation.
+ * @param {string} mobileCommand
  * @param {import('@appium/types').StringRecord} [opts={}]
  * @returns {Promise<any>}
  */
-export function executeMobile(this: AndroidUiautomator2Driver, script: string, opts?: import("@appium/types").StringRecord<any> | undefined): Promise<any>;
-export type UiAutomator2Server = import('../uiautomator2').UiAutomator2Server;
-export type ADB = import('appium-adb').ADB;
-export type StringRecord<T = any> = import('@appium/types').StringRecord<T>;
-import { AndroidUiautomator2Driver } from '../driver';
+export function executeMobile(this: import("../driver").AndroidUiautomator2Driver, mobileCommand: string, opts?: import("@appium/types").StringRecord<any> | undefined): Promise<any>;
+export type AndroidUiautomator2Driver = import('../driver').AndroidUiautomator2Driver;
 //# sourceMappingURL=execute.d.ts.map

package/build/lib/commands/execute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../lib/commands/execute.js"],"names":[],"mappings":"AAMA;;;;;;;;;GASG;AACH,iEAJW,MAAM,6BAEJ,QAAQ,GAAG,CAAC,CAyBxB;AAED;;;;;;;GAOG;AACH,uEALW,MAAM,iEAGJ,QAAQ,GAAG,CAAC,CAmBxB;iCA8CY,OAAO,iBAAiB,EAAE,kBAAkB;kBAC5C,OAAO,YAAY,EAAE,GAAG;oCAKxB,OAAO,eAAe,EAAE,YAAY,CAAC,CAAC,CAAC;0CApHZ,WAAW"}
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../lib/commands/execute.js"],"names":[],"mappings":"AAGA;;;GAGG;AACH,4FAFa,OAAO,eAAe,EAAE,YAAY,CAAC,MAAM,CAAC,CA8CxD;AAED;;;;;;GAMG;AACH,kGAJW,MAAM,iEAEJ,QAAQ,GAAG,CAAC,CAIxB;wCAyBY,OAAO,WAAW,EAAE,yBAAyB"}

package/build/lib/commands/execute.js

@@ -3,107 +3,79 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeMobile = exports.execute = void 0;
+exports.executeMobile = exports.mobileCommandsMapping = void 0;
 const lodash_1 = __importDefault(require("lodash"));
-const driver_1 = require("appium/driver");
-const driver_2 = require("../driver");
-const MOBILE_SCRIPT_NAME_PREFIX = 'mobile:';
+const appium_android_driver_1 = require("appium-android-driver");
 /**
- * @override
- * @privateRemarks Because the "mobile" commands (execute methods) in this
- * driver universally accept an options object, this method will _not_ call
- * into `BaseDriver.executeMethod`.
  * @this {AndroidUiautomator2Driver}
- * @param {string} script
- * @param {any[]} [args]
- * @returns {Promise<any>}
+ * @returns {import('@appium/types').StringRecord<string>}
  */
-async function execute(script, args) {
-    const mobileScriptName = toExecuteMethodName(script);
-    const isWebContext = this.isWebContext();
-    if (mobileScriptName && isWebContext || !isWebContext) {
-        if (mobileScriptName) {
-            const executeMethodArgs = preprocessExecuteMethodArgs(args);
-            this.log.info(`Executing method '${mobileScriptName}'`);
-            return await this.executeMobile(mobileScriptName, executeMethodArgs);
-        }
-        // Just pass the script name through and let it fail with a proper error message
-        return await this.executeMobile(`${script}`, {});
-    }
-    const endpoint = 
-    /** @type {import('appium-chromedriver').Chromedriver} */ (this.chromedriver).jwproxy
-        .downstreamProtocol === driver_1.PROTOCOLS.MJSONWP
-        ? '/execute'
-        : '/execute/sync';
-    return await /** @type {import('appium-chromedriver').Chromedriver} */ (this.chromedriver).jwproxy.command(endpoint, 'POST', {
-        script,
-        args,
-    });
+function mobileCommandsMapping() {
+    const commonMapping = new appium_android_driver_1.AndroidDriver().mobileCommandsMapping.call(this);
+    return {
+        ...commonMapping,
+        dragGesture: 'mobileDragGesture',
+        flingGesture: 'mobileFlingGesture',
+        doubleClickGesture: 'mobileDoubleClickGesture',
+        clickGesture: 'mobileClickGesture',
+        longClickGesture: 'mobileLongClickGesture',
+        pinchCloseGesture: 'mobilePinchCloseGesture',
+        pinchOpenGesture: 'mobilePinchOpenGesture',
+        swipeGesture: 'mobileSwipeGesture',
+        scrollGesture: 'mobileScrollGesture',
+        scrollBackTo: 'mobileScrollBackTo',
+        scroll: 'mobileScroll',
+        viewportScreenshot: 'mobileViewportScreenshot',
+        viewportRect: 'mobileViewPortRect',
+        deepLink: 'mobileDeepLink',
+        acceptAlert: 'mobileAcceptAlert',
+        dismissAlert: 'mobileDismissAlert',
+        batteryInfo: 'mobileGetBatteryInfo',
+        deviceInfo: 'mobileGetDeviceInfo',
+        openNotifications: 'openNotifications',
+        type: 'mobileType',
+        replaceElementValue: 'mobileReplaceElementValue',
+        getAppStrings: 'mobileGetAppStrings',
+        installMultipleApks: 'mobileInstallMultipleApks',
+        pressKey: 'mobilePressKey',
+        screenshots: 'mobileScreenshots',
+        scheduleAction: 'mobileScheduleAction',
+        getActionHistory: 'mobileGetActionHistory',
+        unscheduleAction: 'mobileUnscheduleAction',
+    };
 }
-exports.execute = execute;
+exports.mobileCommandsMapping = mobileCommandsMapping;
 /**
  * @override
  * @this {AndroidUiautomator2Driver}
- * @param {string} script Must be of the form `mobile: <something>`, which
- * differs from its parent class implementation.
+ * @param {string} mobileCommand
  * @param {import('@appium/types').StringRecord} [opts={}]
  * @returns {Promise<any>}
  */
-async function executeMobile(script, opts = {}) {
-    if (!(script in driver_2.AndroidUiautomator2Driver.executeMethodMap)) {
-        const commandNames = lodash_1.default.map(lodash_1.default.keys(driver_2.AndroidUiautomator2Driver.executeMethodMap), (value) => value.slice(8));
-        throw new driver_1.errors.UnknownCommandError(`Unknown mobile command "${script}". ` +
-            `Only ${commandNames.join(', ')} commands are supported.`);
-    }
-    const methodName = driver_2.AndroidUiautomator2Driver.executeMethodMap[
-    /** @type {keyof import('../execute-method-map').Uiautomator2ExecuteMethodMap} */ (script)].command;
-    return await /** @type {(opts?: any) => Promise<unknown>} */ (this[methodName])(opts);
+async function executeMobile(mobileCommand, opts = {}) {
+    return await new appium_android_driver_1.AndroidDriver().executeMobile.call(this, mobileCommand, preprocessOptions(opts));
 }
 exports.executeMobile = executeMobile;
 // #region Internal Helpers
 /**
- * Messages the arguments going into an execute method.
- * @remarks A similar method is implemented in `appium-xcuitest-driver`, but it
- * appears the methods in here handle unwrapping of `Element` objects, so we do
- * not do that here.
- * @param {readonly any[] | readonly [StringRecord] | Readonly<StringRecord>} [args]
+ * Renames the deprecated `element` key to `elementId`. Historically,
+ * all of the pre-Execute-Method-Map execute methods accepted an `element` _or_ and `elementId` param.
+ * This assigns the `element` value to `elementId` if `elementId` is not already present.
+ *
+ * @param {import('@appium/types').StringRecord} [opts={}]
  * @internal
- * @returns {StringRecord<unknown>}
+ * @returns {import('@appium/types').StringRecord|undefined}
  */
-function preprocessExecuteMethodArgs(args) {
-    if (lodash_1.default.isArray(args)) {
-        args = lodash_1.default.first(args);
-    }
-    const executeMethodArgs = /** @type {StringRecord<unknown>} */ (args ?? {});
-    /**
-     * Renames the deprecated `element` key to `elementId`.  Historically,
-     * all of the pre-Execute-Method-Map execute methods accepted an `element` _or_ and `elementId` param.
-     * This assigns the `element` value to `elementId` if `elementId` is not already present.
-     */
-    if (!('elementId' in executeMethodArgs) && 'element' in executeMethodArgs) {
-        executeMethodArgs.elementId = executeMethodArgs.element;
-        delete executeMethodArgs.element;
+function preprocessOptions(opts = {}) {
+    if (lodash_1.default.isPlainObject(opts) && !('elementId' in opts) && 'element' in opts) {
+        opts.elementId = opts.element;
+        delete opts.element;
+        this.log.debug(`Replaced the obsolete 'element' key with 'elementId'`);
     }
-    return executeMethodArgs;
-}
-/**
- * Type guard to check if a script is an execute method.
- * @param {any} script
- * @internal
- * @returns {string?}
- */
-function toExecuteMethodName(script) {
-    return lodash_1.default.startsWith(script, MOBILE_SCRIPT_NAME_PREFIX)
-        ? script.replace(new RegExp(`${MOBILE_SCRIPT_NAME_PREFIX}\\s*`), `${MOBILE_SCRIPT_NAME_PREFIX} `)
-        : null;
+    return opts;
 }
 // #endregion
 /**
- * @typedef {import('../uiautomator2').UiAutomator2Server} UiAutomator2Server
- * @typedef {import('appium-adb').ADB} ADB
- */
-/**
- * @template [T=any]
- * @typedef {import('@appium/types').StringRecord<T>} StringRecord
+ * @typedef {import('../driver').AndroidUiautomator2Driver} AndroidUiautomator2Driver
  */
 //# sourceMappingURL=execute.js.map

package/build/lib/commands/execute.js.map

@@ -1 +1 @@
-{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../lib/commands/execute.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../lib/commands/execute.js"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,iEAAoD;AAEpD;;;GAGG;AACH,SAAgB,qBAAqB;IACnC,MAAM,aAAa,GAAG,IAAI,qCAAa,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3E,OAAO;QACL,GAAG,aAAa;QAChB,WAAW,EAAE,mBAAmB;QAChC,YAAY,EAAE,oBAAoB;QAClC,kBAAkB,EAAE,0BAA0B;QAC9C,YAAY,EAAE,oBAAoB;QAClC,gBAAgB,EAAE,wBAAwB;QAC1C,iBAAiB,EAAE,yBAAyB;QAC5C,gBAAgB,EAAE,wBAAwB;QAC1C,YAAY,EAAE,oBAAoB;QAClC,aAAa,EAAE,qBAAqB;QACpC,YAAY,EAAE,oBAAoB;QAClC,MAAM,EAAE,cAAc;QACtB,kBAAkB,EAAE,0BAA0B;QAC9C,YAAY,EAAE,oBAAoB;QAElC,QAAQ,EAAE,gBAAgB;QAE1B,WAAW,EAAE,mBAAmB;QAChC,YAAY,EAAE,oBAAoB;QAElC,WAAW,EAAE,sBAAsB;QAEnC,UAAU,EAAE,qBAAqB;QAEjC,iBAAiB,EAAE,mBAAmB;QAEtC,IAAI,EAAE,YAAY;QAClB,mBAAmB,EAAE,2BAA2B;QAEhD,aAAa,EAAE,qBAAqB;QAEpC,mBAAmB,EAAE,2BAA2B;QAEhD,QAAQ,EAAE,gBAAgB;QAE1B,WAAW,EAAE,mBAAmB;QAEhC,cAAc,EAAE,sBAAsB;QACtC,gBAAgB,EAAE,wBAAwB;QAC1C,gBAAgB,EAAE,wBAAwB;KAC3C,CAAC;AACJ,CAAC;AA5CD,sDA4CC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,aAAa,CAAC,aAAa,EAAE,IAAI,GAAG,EAAE;IAC1D,OAAO,MAAM,IAAI,qCAAa,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;AACpG,CAAC;AAFD,sCAEC;AAED,2BAA2B;AAE3B;;;;;;;;GAQG;AACH,SAAS,iBAAiB,CAAC,IAAI,GAAG,EAAE;IAClC,IAAI,gBAAC,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;QACzE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;QAC9B,OAAO,IAAI,CAAC,OAAO,CAAC;QACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAC;IACzE,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,aAAa;AAEb;;GAEG"}

package/build/lib/commands/gestures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gestures.d.ts","sourceRoot":"","sources":["../../../lib/commands/gestures.js"],"names":[],"mappings":"AAIA;;;;;;;GAOG;AACH,4IAHa,QAAQ,IAAI,CAAC,CAazB;AAED;;;;;;;GAOG;AACH,oJAHa,QAAQ,IAAI,CAAC,CAczB;AAED;;;;;;GAMG;AACH,kJAHa,QAAQ,IAAI,CAAC,CAazB;AAED;;;;;;GAMG;AACH,6FAJW,OAAO,SAAS,EAAE,WAAW,GAC3B,QAAQ,IAAI,CAAC,CAezB;AAED;;;;;;;GAOG;AACH,8FAHW,OAAO,SAAS,EAAE,YAAY,GAC5B,QAAQ,OAAO,CAAC,CAgB5B;AAED;;;;;;GAMG;AACH,mGAJW,OAAO,SAAS,EAAE,YAAY,GAC5B,QAAQ,IAAI,CAAC,CAezB;AAED;;;;;;GAMG;AACH,kGAJW,OAAO,SAAS,EAAE,YAAY,GAC5B,QAAQ,IAAI,CAAC,CAezB;AAED;;;;;;GAMG;AACH,8FAJW,OAAO,SAAS,EAAE,YAAY,GAC5B,QAAQ,IAAI,CAAC,CAgBzB;AAED;;;;;;;GAOG;AACH,+FAHW,OAAO,SAAS,EAAE,oBAAoB,GACpC,QAAQ,OAAO,CAAC,CAiB5B;AAED;;;;;;;;;;;GAWG;AACH,8FAJW,OAAO,SAAS,EAAE,0BAA0B,GAC1C,QAAQ,IAAI,CAAC,CAiBzB;AAED;;;;;;;;;;;GAWG;AACH,wFAJW,OAAO,SAAS,EAAE,aAAa,GAC7B,QAAQ,IAAI,CAAC,CAwBzB;wCAwCY,OAAO,WAAW,EAAE,yBAAyB"}
+{"version":3,"file":"gestures.d.ts","sourceRoot":"","sources":["../../../lib/commands/gestures.js"],"names":[],"mappings":"AAIA;;;;;;;GAOG;AACH,4IAHa,QAAQ,IAAI,CAAC,CAazB;AAED;;;;;;;GAOG;AACH,oJAHa,QAAQ,IAAI,CAAC,CAczB;AAED;;;;;;GAMG;AACH,kJAHa,QAAQ,IAAI,CAAC,CAazB;AAED;;;;;;GAMG;AACH,6FAJW,OAAO,SAAS,EAAE,WAAW,GAC3B,QAAQ,IAAI,CAAC,CAezB;AAED;;;;;;;GAOG;AACH,8FAHW,OAAO,SAAS,EAAE,YAAY,GAC5B,QAAQ,OAAO,CAAC,CAgB5B;AAED;;;;;;GAMG;AACH,mGAJW,OAAO,SAAS,EAAE,YAAY,GAC5B,QAAQ,IAAI,CAAC,CAezB;AAED;;;;;;GAMG;AACH,kGAJW,OAAO,SAAS,EAAE,YAAY,GAC5B,QAAQ,IAAI,CAAC,CAezB;AAED;;;;;;GAMG;AACH,8FAJW,OAAO,SAAS,EAAE,YAAY,GAC5B,QAAQ,IAAI,CAAC,CAgBzB;AAED;;;;;;;GAOG;AACH,+FAHW,OAAO,SAAS,EAAE,oBAAoB,GACpC,QAAQ,OAAO,CAAC,CAiB5B;AAED;;;;;;;;;;;GAWG;AACH,8FAJW,OAAO,SAAS,EAAE,0BAA0B,GAC1C,QAAQ,IAAI,CAAC,CAiBzB;AAED;;;;;;;;;;;GAWG;AACH,wFAJW,OAAO,SAAS,EAAE,aAAa,GAC7B,QAAQ,IAAI,CAAC,CAuBzB;wCAwCY,OAAO,WAAW,EAAE,yBAAyB"}

package/build/lib/commands/gestures.js

@@ -194,13 +194,12 @@ exports.mobileScrollBackTo = mobileScrollBackTo;
  * @throws {Error} if the scrolling operation cannot be performed
  */
 async function mobileScroll(opts) {
-    const { element, elementId, // `element` is deprecated, use `elementId` instead
-    strategy, selector, maxSwipes, } = opts;
+    const { elementId, strategy, selector, maxSwipes, } = opts;
     if (!strategy || !selector) {
         throw new driver_1.errors.InvalidArgumentError(`Both strategy and selector arguments must be provided`);
     }
     await this.uiautomator2.jwproxy.command('/gestures/scroll_to', 'POST', {
-        origin: toOrigin(elementId || element),
+        origin: toOrigin(elementId),
         params: { strategy, selector, maxSwipes },
     });
 }

package/build/lib/commands/gestures.js.map

@@ -1 +1 @@
-{"version":3,"file":"gestures.js","sourceRoot":"","sources":["../../../lib/commands/gestures.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"gestures.js","sourceRoot":"","sources":["../../../lib/commands/gestures.js"],"names":[],"mappings":"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"}