appium-uiautomator2-driver 2.42.2 → 2.43.0

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

@@ -1,2 +1,101 @@
-export type UiAutomator2Server = import('../uiautomator2').UiAutomator2Server;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @returns {Promise<import('@appium/types').Element>}
+ */
+export function active(this: import("../driver").AndroidUiautomator2Driver): Promise<import('@appium/types').Element>;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} attribute
+ * @param {string} elementId
+ * @returns {Promise<string?>}
+ */
+export function getAttribute(this: import("../driver").AndroidUiautomator2Driver, attribute: string, elementId: string): Promise<string | null>;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} elementId
+ * @returns {Promise<boolean>}
+ */
+export function elementDisplayed(this: import("../driver").AndroidUiautomator2Driver, elementId: string): Promise<boolean>;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} elementId
+ * @returns {Promise<boolean>}
+ */
+export function elementEnabled(this: import("../driver").AndroidUiautomator2Driver, elementId: string): Promise<boolean>;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} elementId
+ * @returns {Promise<boolean>}
+ */
+export function elementSelected(this: import("../driver").AndroidUiautomator2Driver, elementId: string): Promise<boolean>;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} elementId
+ * @returns {Promise<string>}
+ */
+export function getName(this: import("../driver").AndroidUiautomator2Driver, elementId: string): Promise<string>;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} elementId
+ * @returns {Promise<import('@appium/types').Position>}
+ */
+export function getLocation(this: import("../driver").AndroidUiautomator2Driver, elementId: string): Promise<import('@appium/types').Position>;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} elementId
+ * @returns {Promise<import('@appium/types').Size>}
+ */
+export function getSize(this: import("../driver").AndroidUiautomator2Driver, elementId: string): Promise<import('@appium/types').Size>;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {import('appium-android-driver').DoSetElementValueOpts} params
+ * @returns {Promise<void>}
+ */
+export function doSetElementValue(this: import("../driver").AndroidUiautomator2Driver, params: import('appium-android-driver').DoSetElementValueOpts): Promise<void>;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string|string[]} keys
+ * @param {string} elementId
+ * @returns {Promise<void>}
+ */
+export function setValueImmediate(this: import("../driver").AndroidUiautomator2Driver, keys: string | string[], elementId: string): Promise<void>;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} elementId
+ * @returns {Promise<string>}
+ */
+export function getText(this: import("../driver").AndroidUiautomator2Driver, elementId: string): Promise<string>;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} element
+ * @returns {Promise<void>}
+ */
+export function click(this: import("../driver").AndroidUiautomator2Driver, element: string): Promise<void>;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} element
+ * @returns {Promise<string>}
+ */
+export function getElementScreenshot(this: import("../driver").AndroidUiautomator2Driver, element: string): Promise<string>;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} elementId
+ * @returns {Promise<void>}
+ */
+export function clear(this: import("../driver").AndroidUiautomator2Driver, elementId: string): Promise<void>;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} elementId
+ * @returns {Promise<import('@appium/types').Rect>}
+ */
+export function getElementRect(this: import("../driver").AndroidUiautomator2Driver, elementId: string): Promise<import('@appium/types').Rect>;
+/**
+ * Sends text to the given element by replacing its previous content
+ * @this {AndroidUiautomator2Driver}
+ * @param {import('./types').ReplaceValueOptions} opts
+ * @throws {Error} If there was a faulre while setting the text
+ * @returns {Promise<void>}
+ */
+export function mobileReplaceElementValue(this: import("../driver").AndroidUiautomator2Driver, opts: import('./types').ReplaceValueOptions): Promise<void>;
+export type AndroidUiautomator2Driver = import('../driver').AndroidUiautomator2Driver;
 //# sourceMappingURL=element.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"element.d.ts","sourceRoot":"","sources":["../../../lib/commands/element.js"],"names":[],"mappings":"iCA+Oa,OAAO,iBAAiB,EAAE,kBAAkB"}
+{"version":3,"file":"element.d.ts","sourceRoot":"","sources":["../../../lib/commands/element.js"],"names":[],"mappings":"AAKA;;;GAGG;AACH,6EAFa,QAAQ,OAAO,eAAe,EAAE,OAAO,CAAC,CASpD;AAED;;;;;GAKG;AACH,6FAJW,MAAM,aACN,MAAM,GACJ,QAAQ,MAAM,QAAE,CAU5B;AAED;;;;GAIG;AACH,iGAHW,MAAM,GACJ,QAAQ,OAAO,CAAC,CAI5B;AAED;;;;GAIG;AACH,+FAHW,MAAM,GACJ,QAAQ,OAAO,CAAC,CAI5B;AAED;;;;GAIG;AACH,gGAHW,MAAM,GACJ,QAAQ,OAAO,CAAC,CAI5B;AAED;;;;GAIG;AACH,wFAHW,MAAM,GACJ,QAAQ,MAAM,CAAC,CAU3B;AAED;;;;GAIG;AACH,4FAHW,MAAM,GACJ,QAAQ,OAAO,eAAe,EAAE,QAAQ,CAAC,CAUrD;AAED;;;;GAIG;AACH,wFAHW,MAAM,GACJ,QAAQ,OAAO,eAAe,EAAE,IAAI,CAAC,CAUjD;AAED;;;;GAIG;AACH,+FAHW,OAAO,uBAAuB,EAAE,qBAAqB,GACnD,QAAQ,IAAI,CAAC,CAQzB;AAED;;;;;GAKG;AACH,6FAJW,MAAM,GAAC,MAAM,EAAE,aACf,MAAM,GACJ,QAAQ,IAAI,CAAC,CAYzB;AAED;;;;GAIG;AACH,wFAHW,MAAM,GACJ,QAAQ,MAAM,CAAC,CAU3B;AAED;;;;GAIG;AACH,oFAHW,MAAM,GACJ,QAAQ,IAAI,CAAC,CAQzB;AAED;;;;GAIG;AACH,mGAHW,MAAM,GACJ,QAAQ,MAAM,CAAC,CAU3B;AAED;;;;GAIG;AACH,sFAHW,MAAM,GACJ,QAAQ,IAAI,CAAC,CAUzB;AAED;;;;GAIG;AACH,+FAHW,MAAM,GACJ,QAAQ,OAAO,eAAe,EAAE,IAAI,CAAC,CA4BjD;AAED;;;;;;GAMG;AACH,qGAJW,OAAO,SAAS,EAAE,mBAAmB,GAEnC,QAAQ,IAAI,CAAC,CAYzB;wCAeY,OAAO,WAAW,EAAE,yBAAyB"}

package/build/lib/commands/element.js

@@ -1,15 +1,184 @@
 "use strict";
-// @ts-check
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.mobileReplaceElementValue = exports.getElementRect = exports.clear = exports.getElementScreenshot = exports.click = exports.getText = exports.setValueImmediate = exports.doSetElementValue = exports.getSize = exports.getLocation = exports.getName = exports.elementSelected = exports.elementEnabled = exports.elementDisplayed = exports.getAttribute = exports.active = void 0;
 const bluebird_1 = __importDefault(require("bluebird"));
 const lodash_1 = __importDefault(require("lodash"));
-const support_1 = require("appium/support");
 const driver_1 = require("appium/driver");
-const utils_1 = require("../utils");
-const mixins_1 = require("./mixins");
+const appium_android_driver_1 = require("appium-android-driver");
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @returns {Promise<import('@appium/types').Element>}
+ */
+async function active() {
+    return /** @type {import('@appium/types').Element} */ (await this.uiautomator2.jwproxy.command('/element/active', 'GET'));
+}
+exports.active = active;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} attribute
+ * @param {string} elementId
+ * @returns {Promise<string?>}
+ */
+async function getAttribute(attribute, elementId) {
+    return String(await this.uiautomator2.jwproxy.command(`/element/${elementId}/attribute/${attribute}`, 'GET', {}));
+}
+exports.getAttribute = getAttribute;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} elementId
+ * @returns {Promise<boolean>}
+ */
+async function elementDisplayed(elementId) {
+    return toBool(await this.getAttribute('displayed', elementId));
+}
+exports.elementDisplayed = elementDisplayed;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} elementId
+ * @returns {Promise<boolean>}
+ */
+async function elementEnabled(elementId) {
+    return toBool(await this.getAttribute('enabled', elementId));
+}
+exports.elementEnabled = elementEnabled;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} elementId
+ * @returns {Promise<boolean>}
+ */
+async function elementSelected(elementId) {
+    return toBool(await this.getAttribute('selected', elementId));
+}
+exports.elementSelected = elementSelected;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} elementId
+ * @returns {Promise<string>}
+ */
+async function getName(elementId) {
+    return /** @type {string} */ (await this.uiautomator2.jwproxy.command(`/element/${elementId}/name`, 'GET', {}));
+}
+exports.getName = getName;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} elementId
+ * @returns {Promise<import('@appium/types').Position>}
+ */
+async function getLocation(elementId) {
+    return /** @type {import('@appium/types').Position} */ (await this.uiautomator2.jwproxy.command(`/element/${elementId}/location`, 'GET', {}));
+}
+exports.getLocation = getLocation;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} elementId
+ * @returns {Promise<import('@appium/types').Size>}
+ */
+async function getSize(elementId) {
+    return /** @type {import('@appium/types').Size} */ (await this.uiautomator2.jwproxy.command(`/element/${elementId}/size`, 'GET', {}));
+}
+exports.getSize = getSize;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {import('appium-android-driver').DoSetElementValueOpts} params
+ * @returns {Promise<void>}
+ */
+async function doSetElementValue(params) {
+    await this.uiautomator2.jwproxy.command(`/element/${params.elementId}/value`, 'POST', params);
+}
+exports.doSetElementValue = doSetElementValue;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string|string[]} keys
+ * @param {string} elementId
+ * @returns {Promise<void>}
+ */
+async function setValueImmediate(keys, elementId) {
+    await this.uiautomator2.jwproxy.command(`/element/${elementId}/value`, 'POST', {
+        elementId,
+        text: lodash_1.default.isArray(keys) ? keys.join('') : keys,
+        replace: false,
+    });
+}
+exports.setValueImmediate = setValueImmediate;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} elementId
+ * @returns {Promise<string>}
+ */
+async function getText(elementId) {
+    return String(await this.uiautomator2.jwproxy.command(`/element/${elementId}/text`, 'GET', {}));
+}
+exports.getText = getText;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} element
+ * @returns {Promise<void>}
+ */
+async function click(element) {
+    await this.uiautomator2.jwproxy.command(`/element/${element}/click`, 'POST', { element });
+}
+exports.click = click;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} element
+ * @returns {Promise<string>}
+ */
+async function getElementScreenshot(element) {
+    return String(await this.uiautomator2.jwproxy.command(`/element/${element}/screenshot`, 'GET', {}));
+}
+exports.getElementScreenshot = getElementScreenshot;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} elementId
+ * @returns {Promise<void>}
+ */
+async function clear(elementId) {
+    await this.uiautomator2.jwproxy.command(`/element/${elementId}/clear`, 'POST', {
+        elementId,
+    });
+}
+exports.clear = clear;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} elementId
+ * @returns {Promise<import('@appium/types').Rect>}
+ */
+async function getElementRect(elementId) {
+    const chromedriver = /** @type {import('appium-chromedriver').default} */ (this.chromedriver);
+    if (this.isWebContext()) {
+        this.log.debug(`Detected downstream chromedriver protocol: ${chromedriver.jwproxy.downstreamProtocol}`);
+        if (chromedriver.jwproxy.downstreamProtocol === driver_1.PROTOCOLS.MJSONWP) {
+            const [{ x, y }, { width, height }] = 
+            /** @type {[import('@appium/types').Position, import('@appium/types').Size]} */ (await bluebird_1.default.all([
+                chromedriver.jwproxy.command(`/element/${elementId}/location`, 'GET'),
+                chromedriver.jwproxy.command(`/element/${elementId}/size`, 'GET'),
+            ]));
+            return { x, y, width, height };
+        }
+        return /** @type {import('@appium/types').Rect} */ (await chromedriver.jwproxy.command(`/element/${elementId}/rect`, 'GET'));
+    }
+    return /** @type {import('@appium/types').Rect} */ (await this.uiautomator2.jwproxy.command(`/element/${elementId}/rect`, 'GET'));
+}
+exports.getElementRect = getElementRect;
+/**
+ * Sends text to the given element by replacing its previous content
+ * @this {AndroidUiautomator2Driver}
+ * @param {import('./types').ReplaceValueOptions} opts
+ * @throws {Error} If there was a faulre while setting the text
+ * @returns {Promise<void>}
+ */
+async function mobileReplaceElementValue(opts) {
+    const { elementId, text } = appium_android_driver_1.utils.requireArgs(['elementId', 'text'], opts);
+    await this.uiautomator2.jwproxy.command(`/element/${elementId}/value`, 'POST', {
+        text,
+        replace: true,
+    });
+}
+exports.mobileReplaceElementValue = mobileReplaceElementValue;
+// #region Internal Helpers
 /**
  * @param {any} s
  * @returns {boolean}
@@ -17,127 +186,8 @@ const mixins_1 = require("./mixins");
 function toBool(s) {
     return lodash_1.default.isString(s) ? s.toLowerCase() === 'true' : !!s;
 }
+// #endregion
 /**
- * @type {import('./mixins').UIA2ElementMixin}
- * @satisfies {import('@appium/types').ExternalDriver}
- */
-const ElementMixin = {
-    async active() {
-        return /** @type {import('@appium/types').Element} */ (await this.uiautomator2.jwproxy.command('/element/active', 'GET'));
-    },
-    async getAttribute(attribute, elementId) {
-        return String(await this.uiautomator2.jwproxy.command(`/element/${elementId}/attribute/${attribute}`, 'GET', {}));
-    },
-    async elementDisplayed(elementId) {
-        return toBool(await this.getAttribute('displayed', elementId));
-    },
-    async elementEnabled(elementId) {
-        return toBool(await this.getAttribute('enabled', elementId));
-    },
-    async elementSelected(elementId) {
-        return toBool(await this.getAttribute('selected', elementId));
-    },
-    async getName(elementId) {
-        return /** @type {string} */ (await this.uiautomator2.jwproxy.command(`/element/${elementId}/name`, 'GET', {}));
-    },
-    async getLocation(elementId) {
-        return /** @type {import('@appium/types').Position} */ (await this.uiautomator2.jwproxy.command(`/element/${elementId}/location`, 'GET', {}));
-    },
-    async getSize(elementId) {
-        return /** @type {import('@appium/types').Size} */ (await this.uiautomator2.jwproxy.command(`/element/${elementId}/size`, 'GET', {}));
-    },
-    async touchLongClick(element, x, y, duration) {
-        let params = { element, x, y, duration };
-        await this.uiautomator2.jwproxy.command(`/touch/longclick`, 'POST', { params });
-    },
-    async touchDown(element, x, y) {
-        let params = { element, x, y };
-        await this.uiautomator2.jwproxy.command(`/touch/down`, 'POST', { params });
-    },
-    async touchUp(element, x, y) {
-        let params = { element, x, y };
-        await this.uiautomator2.jwproxy.command(`/touch/up`, 'POST', { params });
-    },
-    async touchMove(element, x, y) {
-        let params = { element, x, y };
-        await this.uiautomator2.jwproxy.command(`/touch/move`, 'POST', { params });
-    },
-    async doSetElementValue(params) {
-        await this.uiautomator2.jwproxy.command(`/element/${params.elementId}/value`, 'POST', params);
-    },
-    async setValueImmediate(keys, elementId) {
-        await this.uiautomator2.jwproxy.command(`/element/${elementId}/value`, 'POST', {
-            elementId,
-            text: lodash_1.default.isArray(keys) ? keys.join('') : keys,
-            replace: false,
-        });
-    },
-    async getText(elementId) {
-        return String(await this.uiautomator2.jwproxy.command(`/element/${elementId}/text`, 'GET', {}));
-    },
-    async click(element) {
-        await this.uiautomator2.jwproxy.command(`/element/${element}/click`, 'POST', { element });
-    },
-    async getElementScreenshot(element) {
-        return String(await this.uiautomator2.jwproxy.command(`/element/${element}/screenshot`, 'GET', {}));
-    },
-    async tap(elementId = null, x = null, y = null, count = 1) {
-        const areCoordinatesDefined = support_1.util.hasValue(x) && support_1.util.hasValue(y);
-        if (!support_1.util.hasValue(elementId) && !areCoordinatesDefined) {
-            throw new Error(`Either element id to tap or both absolute coordinates should be defined`);
-        }
-        for (let i = 0; i < count; i++) {
-            if (support_1.util.hasValue(elementId) && !areCoordinatesDefined) {
-                // we are either tapping on the default location of the element
-                // or an offset from the top left corner
-                await this.uiautomator2.jwproxy.command(`/element/${elementId}/click`, 'POST');
-            }
-            else {
-                await this.uiautomator2.jwproxy.command(`/appium/tap`, 'POST', {
-                    x,
-                    y,
-                    [driver_1.W3C_ELEMENT_KEY]: elementId,
-                });
-            }
-        }
-    },
-    async clear(elementId) {
-        await this.uiautomator2.jwproxy.command(`/element/${elementId}/clear`, 'POST', {
-            elementId,
-        });
-    },
-    async getElementRect(elementId) {
-        const chromedriver = /** @type {import('appium-chromedriver').default} */ (this.chromedriver);
-        if (this.isWebContext()) {
-            this.log.debug(`Detected downstream chromedriver protocol: ${chromedriver.jwproxy.downstreamProtocol}`);
-            if (chromedriver.jwproxy.downstreamProtocol === driver_1.PROTOCOLS.MJSONWP) {
-                const [{ x, y }, { width, height }] = 
-                /** @type {[import('@appium/types').Position, import('@appium/types').Size]} */ (await bluebird_1.default.all([
-                    chromedriver.jwproxy.command(`/element/${elementId}/location`, 'GET'),
-                    chromedriver.jwproxy.command(`/element/${elementId}/size`, 'GET'),
-                ]));
-                return { x, y, width, height };
-            }
-            return /** @type {import('@appium/types').Rect} */ (await chromedriver.jwproxy.command(`/element/${elementId}/rect`, 'GET'));
-        }
-        return /** @type {import('@appium/types').Rect} */ (await this.uiautomator2.jwproxy.command(`/element/${elementId}/rect`, 'GET'));
-    },
-    /**
-     * Sends text to the given element by replacing its previous content
-     *
-     * @param {import('./types').ReplaceValueOptions} opts
-     * @throws {Error} If there was a faulre while setting the text
-     */
-    async mobileReplaceElementValue(opts) {
-        const { elementId, text } = (0, utils_1.requireArgs)(['elementId', 'text'], opts);
-        await this.uiautomator2.jwproxy.command(`/element/${elementId}/value`, 'POST', {
-            text,
-            replace: true,
-        });
-    },
-};
-(0, mixins_1.mixin)(ElementMixin);
-/**
- * @typedef {import('../uiautomator2').UiAutomator2Server} UiAutomator2Server
+ * @typedef {import('../driver').AndroidUiautomator2Driver} AndroidUiautomator2Driver
  */
 //# sourceMappingURL=element.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"element.js","sourceRoot":"","sources":["../../../lib/commands/element.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"element.js","sourceRoot":"","sources":["../../../lib/commands/element.js"],"names":[],"mappings":";;;;;;AAAA,wDAAyB;AACzB,oDAAuB;AACvB,0CAAwC;AACxC,iEAA4C;AAE5C;;;GAGG;AACI,KAAK,UAAU,MAAM;IAC1B,OAAO,8CAA8C,CAAC,CACpD,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,iBAAiB,EACjB,KAAK,CACN,CACF,CAAC;AACJ,CAAC;AAPD,wBAOC;AAED;;;;;GAKG;AACI,KAAK,UAAU,YAAY,CAAC,SAAS,EAAE,SAAS;IACrD,OAAO,MAAM,CACX,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,YAAY,SAAS,cAAc,SAAS,EAAE,EAC9C,KAAK,EACL,EAAE,CACH,CACF,CAAC;AACJ,CAAC;AARD,oCAQC;AAED;;;;GAIG;AACI,KAAK,UAAU,gBAAgB,CAAC,SAAS;IAC9C,OAAO,MAAM,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC;AACjE,CAAC;AAFD,4CAEC;AAED;;;;GAIG;AACI,KAAK,UAAU,cAAc,CAAC,SAAS;IAC5C,OAAO,MAAM,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;AAC/D,CAAC;AAFD,wCAEC;AAED;;;;GAIG;AACI,KAAK,UAAU,eAAe,CAAC,SAAS;IAC7C,OAAO,MAAM,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC;AAChE,CAAC;AAFD,0CAEC;AAED;;;;GAIG;AACI,KAAK,UAAU,OAAO,CAAC,SAAS;IACrC,OAAO,qBAAqB,CAAC,CAC3B,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,YAAY,SAAS,OAAO,EAC5B,KAAK,EACL,EAAE,CACH,CACF,CAAC;AACJ,CAAC;AARD,0BAQC;AAED;;;;GAIG;AACI,KAAK,UAAU,WAAW,CAAC,SAAS;IACzC,OAAO,+CAA+C,CAAC,CACrD,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,YAAY,SAAS,WAAW,EAChC,KAAK,EACL,EAAE,CACH,CACF,CAAC;AACJ,CAAC;AARD,kCAQC;AAED;;;;GAIG;AACI,KAAK,UAAU,OAAO,CAAC,SAAS;IACrC,OAAO,2CAA2C,CAAC,CACjD,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,YAAY,SAAS,OAAO,EAC5B,KAAK,EACL,EAAE,CACH,CACF,CAAC;AACJ,CAAC;AARD,0BAQC;AAED;;;;GAIG;AACI,KAAK,UAAU,iBAAiB,CAAC,MAAM;IAC5C,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,YAAY,MAAM,CAAC,SAAS,QAAQ,EACpC,MAAM,EACN,MAAM,CACP,CAAC;AACJ,CAAC;AAND,8CAMC;AAED;;;;;GAKG;AACI,KAAK,UAAU,iBAAiB,CAAC,IAAI,EAAE,SAAS;IACrD,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,YAAY,SAAS,QAAQ,EAC7B,MAAM,EACN;QACE,SAAS;QACT,IAAI,EAAE,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI;QAC5C,OAAO,EAAE,KAAK;KACf,CACF,CAAC;AACJ,CAAC;AAVD,8CAUC;AAED;;;;GAIG;AACI,KAAK,UAAU,OAAO,CAAC,SAAS;IACrC,OAAO,MAAM,CACX,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,YAAY,SAAS,OAAO,EAC5B,KAAK,EACL,EAAE,CACH,CACF,CAAC;AACJ,CAAC;AARD,0BAQC;AAED;;;;GAIG;AACI,KAAK,UAAU,KAAK,CAAC,OAAO;IACjC,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,YAAY,OAAO,QAAQ,EAC3B,MAAM,EACN,EAAC,OAAO,EAAC,CACV,CAAC;AACJ,CAAC;AAND,sBAMC;AAED;;;;GAIG;AACI,KAAK,UAAU,oBAAoB,CAAC,OAAO;IAChD,OAAO,MAAM,CACX,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,YAAY,OAAO,aAAa,EAChC,KAAK,EACL,EAAE,CACH,CACF,CAAC;AACJ,CAAC;AARD,oDAQC;AAED;;;;GAIG;AACI,KAAK,UAAU,KAAK,CAAC,SAAS;IACnC,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,YAAY,SAAS,QAAQ,EAC7B,MAAM,EACN;QACE,SAAS;KACV,CACF,CAAC;AACJ,CAAC;AARD,sBAQC;AAED;;;;GAIG;AACI,KAAK,UAAU,cAAc,CAAC,SAAS;IAC5C,MAAM,YAAY,GAAG,oDAAoD,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC9F,IAAI,IAAI,CAAC,YAAY,EAAE,EAAE;QACvB,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,8CAA8C,YAAY,CAAC,OAAO,CAAC,kBAAkB,EAAE,CACxF,CAAC;QACF,IAAI,YAAY,CAAC,OAAO,CAAC,kBAAkB,KAAK,kBAAS,CAAC,OAAO,EAAE;YACjE,MAAM,CAAC,EAAC,CAAC,EAAE,CAAC,EAAC,EAAE,EAAC,KAAK,EAAE,MAAM,EAAC,CAAC;YAC7B,+EAA+E,CAAC,CAC9E,MAAM,kBAAC,CAAC,GAAG,CAAC;gBACV,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,SAAS,WAAW,EAAE,KAAK,CAAC;gBACrE,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,SAAS,OAAO,EAAE,KAAK,CAAC;aAClE,CAAC,CACH,CAAC;YACJ,OAAO,EAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAC,CAAC;SAC9B;QACD,OAAO,2CAA2C,CAAC,CACjD,MAAM,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,SAAS,OAAO,EAAE,KAAK,CAAC,CACxE,CAAC;KACH;IACD,OAAO,2CAA2C,CAAC,CACjD,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,YAAY,SAAS,OAAO,EAC5B,KAAK,CACN,CACF,CAAC;AACJ,CAAC;AA1BD,wCA0BC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,yBAAyB,CAAC,IAAI;IAClD,MAAM,EAAC,SAAS,EAAE,IAAI,EAAC,GAAG,6BAAK,CAAC,WAAW,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;IACzE,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,YAAY,SAAS,QAAQ,EAC7B,MAAM,EACN;QACE,IAAI;QACJ,OAAO,EAAE,IAAI;KACd,CACF,CAAC;AACJ,CAAC;AAVD,8DAUC;AAED,2BAA2B;AAE3B;;;GAGG;AACH,SAAS,MAAM,CAAC,CAAC;IACf,OAAO,gBAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED,aAAa;AAEb;;GAEG"}

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

@@ -0,0 +1,25 @@
+/**
+ * @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>}
+ */
+export function execute(this: AndroidUiautomator2Driver, script: string, args?: any[] | undefined): Promise<any>;
+/**
+ * @override
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} script Must be of the form `mobile: <something>`, which
+ * differs from its parent class implementation.
+ * @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';
+//# sourceMappingURL=execute.d.ts.map

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

@@ -0,0 +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"}

package/build/lib/commands/execute.js

@@ -0,0 +1,109 @@
+"use strict";
+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;
+const lodash_1 = __importDefault(require("lodash"));
+const driver_1 = require("appium/driver");
+const driver_2 = require("../driver");
+const MOBILE_SCRIPT_NAME_PREFIX = 'mobile:';
+/**
+ * @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>}
+ */
+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,
+    });
+}
+exports.execute = execute;
+/**
+ * @override
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} script Must be of the form `mobile: <something>`, which
+ * differs from its parent class implementation.
+ * @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);
+}
+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]
+ * @internal
+ * @returns {StringRecord<unknown>}
+ */
+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;
+    }
+    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;
+}
+// #endregion
+/**
+ * @typedef {import('../uiautomator2').UiAutomator2Server} UiAutomator2Server
+ * @typedef {import('appium-adb').ADB} ADB
+ */
+/**
+ * @template [T=any]
+ * @typedef {import('@appium/types').StringRecord<T>} StringRecord
+ */
+//# sourceMappingURL=execute.js.map

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

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

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

@@ -1,2 +1,12 @@
+/**
+ * @privateRemarks Overriding helpers.doFindElementOrEls functionality of appium-android-driver,
+ * this.element initialized in find.js of appium-android-drive.
+ *
+ * @this {AndroidUiautomator2Driver}
+ * @param {import('appium-android-driver').FindElementOpts} params
+ * @returns {Promise<Element | Element[]>}
+ */
+export function doFindElementOrEls(this: import("../driver").AndroidUiautomator2Driver, params: import('appium-android-driver').FindElementOpts): Promise<Element | Element[]>;
 export type Element = import('@appium/types').Element;
+export type AndroidUiautomator2Driver = import('../driver').AndroidUiautomator2Driver;
 //# sourceMappingURL=find.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../../lib/commands/find.js"],"names":[],"mappings":"sBAmDa,OAAO,eAAe,EAAE,OAAO"}
+{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../../lib/commands/find.js"],"names":[],"mappings":"AASA;;;;;;;GAOG;AACH,gGAHW,OAAO,uBAAuB,EAAE,eAAe,GAC7C,QAAQ,OAAO,GAAG,OAAO,EAAE,CAAC,CA0BxC;sBAGY,OAAO,eAAe,EAAE,OAAO;wCAC/B,OAAO,WAAW,EAAE,yBAAyB"}