appium-uiautomator2-driver 2.42.2 → 2.43.1

package/build/lib/commands/touch.js

@@ -1,50 +1,167 @@
 "use strict";
-// @ts-check
 Object.defineProperty(exports, "__esModule", { value: true });
-const mixins_1 = require("./mixins");
-/**
- * @type {import('./mixins').UIA2TouchMixin}
- * @satisfies {import('@appium/types').ExternalDriver}
- */
-const TouchMixin = {
-    async doPerformMultiAction(elementId, states) {
-        let opts;
-        if (elementId) {
-            opts = {
-                elementId,
-                actions: states,
-            };
-            await this.uiautomator2.jwproxy.command('/touch/multi/perform', 'POST', opts);
+exports.releaseActions = exports.performActions = exports.doPerformMultiAction = exports.tap = exports.touchMove = exports.touchUp = exports.touchDown = exports.touchLongClick = exports.doDrag = exports.doSwipe = void 0;
+const support_1 = require("appium/support");
+const driver_1 = require("appium/driver");
+/**
+ * @deprecated
+ * @this {AndroidUiautomator2Driver}
+ * @param {import('appium-android-driver').SwipeOpts} swipeOpts
+ * @returns {Promise<void>}
+ */
+async function doSwipe(swipeOpts) {
+    await this.uiautomator2.jwproxy.command(`/touch/perform`, 'POST', swipeOpts);
+}
+exports.doSwipe = doSwipe;
+/**
+ * @deprecated
+ * @this {AndroidUiautomator2Driver}
+ * @param {import('appium-android-driver').DragOpts} dragOpts
+ * @returns {Promise<void>}
+ */
+async function doDrag(dragOpts) {
+    await this.uiautomator2.jwproxy.command(`/touch/drag`, 'POST', dragOpts);
+}
+exports.doDrag = doDrag;
+/**
+ * @deprecated
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} element
+ * @param {number} x
+ * @param {number} y
+ * @param {number} duration
+ * @returns {Promise<void>}
+ */
+async function touchLongClick(element, x, y, duration) {
+    let params = { element, x, y, duration };
+    await this.uiautomator2.jwproxy.command(`/touch/longclick`, 'POST', { params });
+}
+exports.touchLongClick = touchLongClick;
+/**
+ * @deprecated
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} element
+ * @param {number} x
+ * @param {number} y
+ * @returns {Promise<void>}
+ */
+async function touchDown(element, x, y) {
+    let params = { element, x, y };
+    await this.uiautomator2.jwproxy.command(`/touch/down`, 'POST', { params });
+}
+exports.touchDown = touchDown;
+/**
+ * @deprecated
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} element
+ * @param {number} x
+ * @param {number} y
+ * @returns {Promise<void>}
+ */
+async function touchUp(element, x, y) {
+    let params = { element, x, y };
+    await this.uiautomator2.jwproxy.command(`/touch/up`, 'POST', { params });
+}
+exports.touchUp = touchUp;
+/**
+ * @deprecated
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} element
+ * @param {number} x
+ * @param {number} y
+ * @returns {Promise<void>}
+ */
+async function touchMove(element, x, y) {
+    let params = { element, x, y };
+    await this.uiautomator2.jwproxy.command(`/touch/move`, 'POST', { params });
+}
+exports.touchMove = touchMove;
+/**
+ * @deprecated
+ * @this {AndroidUiautomator2Driver}
+ * @param {string?} [elementId=null]
+ * @param {number?} [x=null]
+ * @param {number?} [y=null]
+ * @param {number} [count=1]
+ * @returns {Promise<void>}
+ */
+async function 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 {
-            opts = {
-                actions: states,
-            };
-            await this.uiautomator2.jwproxy.command('/touch/multi/perform', 'POST', opts);
+            await this.uiautomator2.jwproxy.command(`/appium/tap`, 'POST', {
+                x,
+                y,
+                [driver_1.W3C_ELEMENT_KEY]: elementId,
+            });
+        }
+    }
+}
+exports.tap = tap;
+/**
+ * @deprecated
+ * @this {AndroidUiautomator2Driver}
+ * @param {string} elementId
+ * @param {import('appium-android-driver').TouchState[]} states
+ * @returns {Promise<void>}
+ */
+async function doPerformMultiAction(elementId, states) {
+    let opts;
+    if (elementId) {
+        opts = {
+            elementId,
+            actions: states,
+        };
+        await this.uiautomator2.jwproxy.command('/touch/multi/perform', 'POST', opts);
+    }
+    else {
+        opts = {
+            actions: states,
+        };
+        await this.uiautomator2.jwproxy.command('/touch/multi/perform', 'POST', opts);
+    }
+}
+exports.doPerformMultiAction = doPerformMultiAction;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @param {import('@appium/types').StringRecord} actions
+ * @returns {Promise<void>}
+ */
+async function performActions(actions) {
+    this.log.debug(`Received the following W3C actions: ${JSON.stringify(actions, null, '  ')}`);
+    // This is mandatory, since Selenium API uses MOUSE as the default pointer type
+    const preprocessedActions = actions.map((action) => Object.assign({}, action, action.type === 'pointer'
+        ? {
+            parameters: {
+                pointerType: 'touch',
+            },
         }
-    },
-    async performActions(actions) {
-        this.log.debug(`Received the following W3C actions: ${JSON.stringify(actions, null, '  ')}`);
-        // This is mandatory, since Selenium API uses MOUSE as the default pointer type
-        const preprocessedActions = actions.map((action) => Object.assign({}, action, action.type === 'pointer'
-            ? {
-                parameters: {
-                    pointerType: 'touch',
-                },
-            }
-            : {}));
-        this.log.debug(`Preprocessed actions: ${JSON.stringify(preprocessedActions, null, '  ')}`);
-        await this.uiautomator2.jwproxy.command('/actions', 'POST', {
-            actions: preprocessedActions,
-        });
-    },
-    // eslint-disable-next-line require-await
-    async releaseActions() {
-        this.log.info('On this platform, releaseActions is a no-op');
-    },
-};
-(0, mixins_1.mixin)(TouchMixin);
+        : {}));
+    this.log.debug(`Preprocessed actions: ${JSON.stringify(preprocessedActions, null, '  ')}`);
+    await this.uiautomator2.jwproxy.command('/actions', 'POST', {
+        actions: preprocessedActions,
+    });
+}
+exports.performActions = performActions;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @returns {Promise<void>}
+ */
+// eslint-disable-next-line require-await
+async function releaseActions() {
+    this.log.info('On this platform, releaseActions is a no-op');
+}
+exports.releaseActions = releaseActions;
 /**
  * @typedef {import('../uiautomator2').UiAutomator2Server} UiAutomator2Server
+ * @typedef {import('../driver').AndroidUiautomator2Driver} AndroidUiautomator2Driver
  */
 //# sourceMappingURL=touch.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"touch.js","sourceRoot":"","sources":["../../../lib/commands/touch.js"],"names":[],"mappings":";AAAA,YAAY;;AAEZ,qCAA+B;AAE/B;;;GAGG;AACH,MAAM,UAAU,GAAG;IACjB,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,MAAM;QAC1C,IAAI,IAAI,CAAC;QACT,IAAI,SAAS,EAAE;YACb,IAAI,GAAG;gBACL,SAAS;gBACT,OAAO,EAAE,MAAM;aAChB,CAAC;YAEF,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,sBAAsB,EACtB,MAAM,EACN,IAAI,CACL,CAAC;SACH;aAAM;YACL,IAAI,GAAG;gBACL,OAAO,EAAE,MAAM;aAChB,CAAC;YACF,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,sBAAsB,EACtB,MAAM,EACN,IAAI,CACL,CAAC;SACH;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAAO;QAC1B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uCAAuC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7F,+EAA+E;QAC/E,MAAM,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CACjD,MAAM,CAAC,MAAM,CACX,EAAE,EACF,MAAM,EACN,MAAM,CAAC,IAAI,KAAK,SAAS;YACvB,CAAC,CAAC;gBACE,UAAU,EAAE;oBACV,WAAW,EAAE,OAAO;iBACrB;aACF;YACH,CAAC,CAAC,EAAE,CACP,CACF,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,IAAI,CAAC,SAAS,CAAC,mBAAmB,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAC3F,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,UAAU,EACV,MAAM,EACN;YACE,OAAO,EAAE,mBAAmB;SAC7B,CACF,CAAC;IACJ,CAAC;IAED,yCAAyC;IACzC,KAAK,CAAC,cAAc;QAClB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;IAC/D,CAAC;CACF,CAAC;AAEF,IAAA,cAAK,EAAC,UAAU,CAAC,CAAC;AAElB;;GAEG"}
+{"version":3,"file":"touch.js","sourceRoot":"","sources":["../../../lib/commands/touch.js"],"names":[],"mappings":"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"}

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

@@ -1,2 +1,38 @@
-export {};
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @returns {Promise<number>}
+ */
+export function getStatusBarHeight(this: import("../driver").AndroidUiautomator2Driver): Promise<number>;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @returns {Promise<string>}
+ */
+export function getDevicePixelRatio(this: import("../driver").AndroidUiautomator2Driver): Promise<string>;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @returns {Promise<import('./types').RelativeRect>}
+ */
+export function getViewPortRect(this: import("../driver").AndroidUiautomator2Driver): Promise<import('./types').RelativeRect>;
+/**
+ * Returns the viewport coordinates.
+ * @this {AndroidUiautomator2Driver}
+ * @returns {Promise<import('./types').RelativeRect>} The viewport coordinates.
+ */
+export function mobileViewPortRect(this: import("../driver").AndroidUiautomator2Driver): Promise<import('./types').RelativeRect>;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @returns {Promise<import('@appium/types').Rect>}
+ */
+export function getWindowRect(this: import("../driver").AndroidUiautomator2Driver): Promise<import('@appium/types').Rect>;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @returns {Promise<number>}
+ */
+export function getDisplayDensity(this: import("../driver").AndroidUiautomator2Driver): Promise<number>;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @returns {Promise<import('@appium/types').Size>}
+ */
+export function getWindowSize(this: import("../driver").AndroidUiautomator2Driver): Promise<import('@appium/types').Size>;
+export type AndroidUiautomator2Driver = import('../driver').AndroidUiautomator2Driver;
 //# sourceMappingURL=viewport.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"viewport.d.ts","sourceRoot":"","sources":["../../../lib/commands/viewport.js"],"names":[],"mappings":""}
+{"version":3,"file":"viewport.d.ts","sourceRoot":"","sources":["../../../lib/commands/viewport.js"],"names":[],"mappings":"AAEA;;;GAGG;AACH,yFAFa,QAAQ,MAAM,CAAC,CAS3B;AAGD;;;GAGG;AACH,0FAFa,QAAQ,MAAM,CAAC,CAQ3B;AAED;;;GAGG;AACH,sFAFa,QAAQ,OAAO,SAAS,EAAE,YAAY,CAAC,CAanD;AAED;;;;GAIG;AACH,yFAFa,QAAQ,OAAO,SAAS,EAAE,YAAY,CAAC,CAInD;AAGD;;;GAGG;AACH,oFAFa,QAAQ,OAAO,eAAe,EAAE,IAAI,CAAC,CAUjD;AAED;;;GAGG;AACH,wFAFa,QAAQ,MAAM,CAAC,CAU3B;AAED;;;GAGG;AACH,oFAFa,QAAQ,OAAO,eAAe,EAAE,IAAI,CAAC,CAUjD;wCAGY,OAAO,WAAW,EAAE,yBAAyB"}

package/build/lib/commands/viewport.js

@@ -1,39 +1,83 @@
 "use strict";
-// @ts-check
 Object.defineProperty(exports, "__esModule", { value: true });
-const support_1 = require("appium/support");
-const mixins_1 = require("./mixins");
-/**
- * @type {import('./mixins').UIA2ViewportMixin}
- * @satisfies {import('@appium/types').ExternalDriver}
- */
-const ViewportMixin = {
-    // memoized in constructor
-    async getStatusBarHeight() {
-        const { statusBar } = /** @type {{statusBar: number}} */ (await /** @type {import('../uiautomator2').UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(`/appium/device/system_bars`, 'GET', {}));
-        return statusBar;
-    },
-    // memoized in constructor
-    async getDevicePixelRatio() {
-        return String(await /** @type {import('../uiautomator2').UiAutomator2Server} */ (this.uiautomator2).jwproxy.command('/appium/device/pixel_ratio', 'GET', {}));
-    },
-    async getViewportScreenshot() {
-        const screenshot = await this.getScreenshot();
-        const rect = await this.getViewPortRect();
-        return await support_1.imageUtil.cropBase64Image(screenshot, rect);
-    },
-    async getViewPortRect() {
-        const windowSize = await this.getWindowSize();
-        const statusBarHeight = await this.getStatusBarHeight();
-        // android returns the upscaled window size, so to get the true size of the
-        // rect we have to downscale
-        return {
-            left: 0,
-            top: statusBarHeight,
-            width: windowSize.width,
-            height: windowSize.height - statusBarHeight,
-        };
-    },
-};
-(0, mixins_1.mixin)(ViewportMixin);
+exports.getWindowSize = exports.getDisplayDensity = exports.getWindowRect = exports.mobileViewPortRect = exports.getViewPortRect = exports.getDevicePixelRatio = exports.getStatusBarHeight = void 0;
+// memoized in constructor
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @returns {Promise<number>}
+ */
+async function getStatusBarHeight() {
+    const { statusBar } = /** @type {{statusBar: number}} */ (await /** @type {import('../uiautomator2').UiAutomator2Server} */ (this.uiautomator2).jwproxy.command(`/appium/device/system_bars`, 'GET', {}));
+    return statusBar;
+}
+exports.getStatusBarHeight = getStatusBarHeight;
+// memoized in constructor
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @returns {Promise<string>}
+ */
+async function getDevicePixelRatio() {
+    return String(await /** @type {import('../uiautomator2').UiAutomator2Server} */ (this.uiautomator2).jwproxy.command('/appium/device/pixel_ratio', 'GET', {}));
+}
+exports.getDevicePixelRatio = getDevicePixelRatio;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @returns {Promise<import('./types').RelativeRect>}
+ */
+async function getViewPortRect() {
+    const windowSize = await this.getWindowSize();
+    const statusBarHeight = await this.getStatusBarHeight();
+    // android returns the upscaled window size, so to get the true size of the
+    // rect we have to downscale
+    return {
+        left: 0,
+        top: statusBarHeight,
+        width: windowSize.width,
+        height: windowSize.height - statusBarHeight,
+    };
+}
+exports.getViewPortRect = getViewPortRect;
+/**
+ * Returns the viewport coordinates.
+ * @this {AndroidUiautomator2Driver}
+ * @returns {Promise<import('./types').RelativeRect>} The viewport coordinates.
+ */
+async function mobileViewPortRect() {
+    return await this.getViewPortRect();
+}
+exports.mobileViewPortRect = mobileViewPortRect;
+// For W3C
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @returns {Promise<import('@appium/types').Rect>}
+ */
+async function getWindowRect() {
+    const { width, height } = await this.getWindowSize();
+    return {
+        width,
+        height,
+        x: 0,
+        y: 0,
+    };
+}
+exports.getWindowRect = getWindowRect;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @returns {Promise<number>}
+ */
+async function getDisplayDensity() {
+    return /** @type {number} */ (await this.uiautomator2.jwproxy.command('/appium/device/display_density', 'GET', {}));
+}
+exports.getDisplayDensity = getDisplayDensity;
+/**
+ * @this {AndroidUiautomator2Driver}
+ * @returns {Promise<import('@appium/types').Size>}
+ */
+async function getWindowSize() {
+    return /** @type {import('@appium/types').Size} */ (await this.uiautomator2.jwproxy.command('/window/current/size', 'GET', {}));
+}
+exports.getWindowSize = getWindowSize;
+/**
+ * @typedef {import('../driver').AndroidUiautomator2Driver} AndroidUiautomator2Driver
+ */
 //# sourceMappingURL=viewport.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"viewport.js","sourceRoot":"","sources":["../../../lib/commands/viewport.js"],"names":[],"mappings":";AAAA,YAAY;;AAEZ,4CAAyC;AACzC,qCAA+B;AAE/B;;;GAGG;AACH,MAAM,aAAa,GAAG;IACpB,0BAA0B;IAC1B,KAAK,CAAC,kBAAkB;QACtB,MAAM,EAAC,SAAS,EAAC,GAAG,kCAAkC,CAAC,CACrD,MAAM,2DAA2D,CAAC,CAChE,IAAI,CAAC,YAAY,CAClB,CAAC,OAAO,CAAC,OAAO,CAAC,4BAA4B,EAAE,KAAK,EAAE,EAAE,CAAC,CAC3D,CAAC;QACF,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,0BAA0B;IAC1B,KAAK,CAAC,mBAAmB;QACvB,OAAO,MAAM,CACX,MAAM,2DAA2D,CAAC,CAChE,IAAI,CAAC,YAAY,CAClB,CAAC,OAAO,CAAC,OAAO,CAAC,4BAA4B,EAAE,KAAK,EAAE,EAAE,CAAC,CAC3D,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,qBAAqB;QACzB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC9C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAC1C,OAAO,MAAM,mBAAS,CAAC,eAAe,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC9C,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxD,2EAA2E;QAC3E,4BAA4B;QAC5B,OAAO;YACL,IAAI,EAAE,CAAC;YACP,GAAG,EAAE,eAAe;YACpB,KAAK,EAAE,UAAU,CAAC,KAAK;YACvB,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,eAAe;SAC5C,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC"}
+{"version":3,"file":"viewport.js","sourceRoot":"","sources":["../../../lib/commands/viewport.js"],"names":[],"mappings":";;;AACA,0BAA0B;AAC1B;;;GAGG;AACI,KAAK,UAAU,kBAAkB;IACtC,MAAM,EAAC,SAAS,EAAC,GAAG,kCAAkC,CAAC,CACrD,MAAM,2DAA2D,CAAC,CAChE,IAAI,CAAC,YAAY,CAClB,CAAC,OAAO,CAAC,OAAO,CAAC,4BAA4B,EAAE,KAAK,EAAE,EAAE,CAAC,CAC3D,CAAC;IACF,OAAO,SAAS,CAAC;AACnB,CAAC;AAPD,gDAOC;AAED,0BAA0B;AAC1B;;;GAGG;AACI,KAAK,UAAU,mBAAmB;IACvC,OAAO,MAAM,CACX,MAAM,2DAA2D,CAAC,CAChE,IAAI,CAAC,YAAY,CAClB,CAAC,OAAO,CAAC,OAAO,CAAC,4BAA4B,EAAE,KAAK,EAAE,EAAE,CAAC,CAC3D,CAAC;AACJ,CAAC;AAND,kDAMC;AAED;;;GAGG;AACI,KAAK,UAAU,eAAe;IACnC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;IAC9C,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;IACxD,2EAA2E;IAC3E,4BAA4B;IAC5B,OAAO;QACL,IAAI,EAAE,CAAC;QACP,GAAG,EAAE,eAAe;QACpB,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,eAAe;KAC5C,CAAC;AACJ,CAAC;AAXD,0CAWC;AAED;;;;GAIG;AACI,KAAK,UAAU,kBAAkB;IACtC,OAAO,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;AACtC,CAAC;AAFD,gDAEC;AAED,UAAU;AACV;;;GAGG;AACI,KAAK,UAAU,aAAa;IACjC,MAAM,EAAC,KAAK,EAAE,MAAM,EAAC,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;IACnD,OAAO;QACL,KAAK;QACL,MAAM;QACN,CAAC,EAAE,CAAC;QACJ,CAAC,EAAE,CAAC;KACL,CAAC;AACJ,CAAC;AARD,sCAQC;AAED;;;GAGG;AACI,KAAK,UAAU,iBAAiB;IACrC,OAAO,qBAAqB,CAAC,CAC3B,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,gCAAgC,EAChC,KAAK,EACL,EAAE,CACH,CACF,CAAC;AACJ,CAAC;AARD,8CAQC;AAED;;;GAGG;AACI,KAAK,UAAU,aAAa;IACjC,OAAO,2CAA2C,CAAC,CACjD,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,sBAAsB,EACtB,KAAK,EACL,EAAE,CACH,CACF,CAAC;AACJ,CAAC;AARD,sCAQC;AAED;;GAEG"}

package/build/lib/driver.d.ts

@@ -4,6 +4,21 @@ import { mjpeg } from 'appium/support';
 import { type Uiautomator2Constraints } from './constraints';
 import type { Uiautomator2Settings, Uiautomator2DeviceDetails, Uiautomator2DriverCaps, Uiautomator2DriverOpts, Uiautomator2SessionCaps, Uiautomator2StartSessionOpts, W3CUiautomator2DriverCaps } from './types';
 import { UiAutomator2Server } from './uiautomator2';
+import { mobileGetActionHistory, mobileScheduleAction, mobileUnscheduleAction } from './commands/actions';
+import { getAlertText, mobileAcceptAlert, mobileDismissAlert, postAcceptAlert, postDismissAlert } from './commands/alert';
+import { mobileInstallMultipleApks, mobileBackgroundApp } from './commands/app-management';
+import { mobileGetAppStrings } from './commands/app-strings';
+import { mobileGetBatteryInfo } from './commands/battery';
+import { active, getAttribute, elementEnabled, elementDisplayed, elementSelected, getName, getLocation, getSize, getElementRect, getElementScreenshot, getText, setValueImmediate, doSetElementValue, click, clear, mobileReplaceElementValue } from './commands/element';
+import { execute, executeMobile } from './commands/execute';
+import { doFindElementOrEls } from './commands/find';
+import { mobileClickGesture, mobileDoubleClickGesture, mobileDragGesture, mobileFlingGesture, mobileLongClickGesture, mobilePinchCloseGesture, mobilePinchOpenGesture, mobileScroll, mobileScrollBackTo, mobileScrollGesture, mobileSwipeGesture } from './commands/gestures';
+import { pressKeyCode, longPressKeyCode, mobilePressKey, mobileType, doSendKeys, keyevent } from './commands/keyboard';
+import { getPageSource, getOrientation, setOrientation, getClipboard, openNotifications, suspendChromedriverProxy, mobileGetDeviceInfo } from './commands/misc';
+import { setUrl, mobileDeepLink, back } from './commands/navigation';
+import { mobileScreenshots, mobileViewportScreenshot, getScreenshot, getViewportScreenshot } from './commands/screenshot';
+import { doSwipe, doDrag, touchDown, touchLongClick, touchMove, touchUp, tap, doPerformMultiAction, performActions, releaseActions } from './commands/touch';
+import { getStatusBarHeight, getDevicePixelRatio, getDisplayDensity, getViewPortRect, getWindowRect, getWindowSize, mobileViewPortRect } from './commands/viewport';
 declare class AndroidUiautomator2Driver extends AndroidDriver implements ExternalDriver<Uiautomator2Constraints, string, StringRecord> {
     static newMethodMap: {
         readonly '/session/:sessionId/appium/device/get_clipboard': {
@@ -118,14 +133,6 @@ declare class AndroidUiautomator2Driver extends AndroidDriver implements Externa
                 };
             };
         };
-        readonly '/session/:sessionId/touch/flick': {
-            readonly POST: {
-                readonly command: "flick";
-                readonly payloadParams: {
-                    readonly optional: readonly ["element", "xspeed", "yspeed", "xoffset", "yoffset", "speed"];
-                };
-            };
-        };
         readonly '/session/:sessionId/touch/perform': {
             readonly POST: {
                 readonly command: "performTouch";
@@ -345,21 +352,6 @@ declare class AndroidUiautomator2Driver extends AndroidDriver implements Externa
                 readonly command: "getDisplayDensity";
             };
         };
-        readonly '/session/:sessionId/appium/app/launch': {
-            readonly POST: {
-                readonly command: "launchApp";
-            };
-        };
-        readonly '/session/:sessionId/appium/app/close': {
-            readonly POST: {
-                readonly command: "closeApp";
-            };
-        };
-        readonly '/session/:sessionId/appium/app/reset': {
-            readonly POST: {
-                readonly command: "reset";
-            };
-        };
         readonly '/session/:sessionId/appium/app/background': {
             readonly POST: {
                 readonly command: "background";
@@ -921,7 +913,85 @@ declare class AndroidUiautomator2Driver extends AndroidDriver implements Externa
     getProxyAvoidList(): RouteMatcher[];
     updateSettings(settings: Uiautomator2Settings): Promise<void>;
     getSettings(): Promise<any>;
+    mobileGetActionHistory: typeof mobileGetActionHistory;
+    mobileScheduleAction: typeof mobileScheduleAction;
+    mobileUnscheduleAction: typeof mobileUnscheduleAction;
+    getAlertText: typeof getAlertText;
+    mobileAcceptAlert: typeof mobileAcceptAlert;
+    mobileDismissAlert: typeof mobileDismissAlert;
+    postAcceptAlert: typeof postAcceptAlert;
+    postDismissAlert: typeof postDismissAlert;
+    mobileInstallMultipleApks: typeof mobileInstallMultipleApks;
+    mobileBackgroundApp: typeof mobileBackgroundApp;
+    mobileGetAppStrings: typeof mobileGetAppStrings;
+    mobileGetBatteryInfo: typeof mobileGetBatteryInfo;
+    active: typeof active;
+    getAttribute: typeof getAttribute;
+    elementEnabled: typeof elementEnabled;
+    elementDisplayed: typeof elementDisplayed;
+    elementSelected: typeof elementSelected;
+    getName: typeof getName;
+    getLocation: typeof getLocation;
+    getSize: typeof getSize;
+    getElementRect: typeof getElementRect;
+    getElementScreenshot: typeof getElementScreenshot;
+    getText: typeof getText;
+    setValueImmediate: typeof setValueImmediate;
+    doSetElementValue: typeof doSetElementValue;
+    click: typeof click;
+    clear: typeof clear;
+    mobileReplaceElementValue: typeof mobileReplaceElementValue;
+    execute: typeof execute;
+    executeMobile: typeof executeMobile;
+    doFindElementOrEls: typeof doFindElementOrEls;
+    mobileClickGesture: typeof mobileClickGesture;
+    mobileDoubleClickGesture: typeof mobileDoubleClickGesture;
+    mobileDragGesture: typeof mobileDragGesture;
+    mobileFlingGesture: typeof mobileFlingGesture;
+    mobileLongClickGesture: typeof mobileLongClickGesture;
+    mobilePinchCloseGesture: typeof mobilePinchCloseGesture;
+    mobilePinchOpenGesture: typeof mobilePinchOpenGesture;
+    mobileScroll: typeof mobileScroll;
+    mobileScrollBackTo: typeof mobileScrollBackTo;
+    mobileScrollGesture: typeof mobileScrollGesture;
+    mobileSwipeGesture: typeof mobileSwipeGesture;
+    pressKeyCode: typeof pressKeyCode;
+    longPressKeyCode: typeof longPressKeyCode;
+    mobilePressKey: typeof mobilePressKey;
+    mobileType: typeof mobileType;
+    doSendKeys: typeof doSendKeys;
+    keyevent: typeof keyevent;
+    getPageSource: typeof getPageSource;
+    getOrientation: typeof getOrientation;
+    setOrientation: typeof setOrientation;
+    getClipboard: typeof getClipboard;
+    openNotifications: typeof openNotifications;
+    suspendChromedriverProxy: typeof suspendChromedriverProxy;
+    mobileGetDeviceInfo: typeof mobileGetDeviceInfo;
+    setUrl: typeof setUrl;
+    mobileDeepLink: typeof mobileDeepLink;
+    back: typeof back;
+    mobileScreenshots: typeof mobileScreenshots;
+    mobileViewportScreenshot: typeof mobileViewportScreenshot;
+    getScreenshot: typeof getScreenshot;
+    getViewportScreenshot: typeof getViewportScreenshot;
+    doSwipe: typeof doSwipe;
+    doDrag: typeof doDrag;
+    touchDown: typeof touchDown;
+    touchLongClick: typeof touchLongClick;
+    touchMove: typeof touchMove;
+    touchUp: typeof touchUp;
+    tap: typeof tap;
+    doPerformMultiAction: typeof doPerformMultiAction;
+    performActions: typeof performActions;
+    releaseActions: typeof releaseActions;
+    getStatusBarHeight: typeof getStatusBarHeight;
+    getDevicePixelRatio: typeof getDevicePixelRatio;
+    getDisplayDensity: typeof getDisplayDensity;
+    getViewPortRect: typeof getViewPortRect;
+    getWindowRect: typeof getWindowRect;
+    getWindowSize: typeof getWindowSize;
+    mobileViewPortRect: typeof mobileViewPortRect;
 }
-import './commands';
 export { AndroidUiautomator2Driver };
 //# sourceMappingURL=driver.d.ts.map

package/build/lib/driver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEV,UAAU,EACV,cAAc,EACd,WAAW,EAEX,YAAY,EACZ,mBAAmB,EACnB,YAAY,EACb,MAAM,eAAe,CAAC;AAEvB,OAAO,aAA+B,MAAM,uBAAuB,CAAC;AAGpE,OAAO,EAAK,KAAK,EAAO,MAAM,gBAAgB,CAAC;AAQ/C,OAAiC,EAAC,KAAK,uBAAuB,EAAC,MAAM,eAAe,CAAC;AAMrF,OAAO,KAAK,EACV,oBAAoB,EACpB,yBAAyB,EACzB,sBAAsB,EACtB,sBAAsB,EACtB,uBAAuB,EAEvB,4BAA4B,EAC5B,yBAAyB,EAC1B,MAAM,SAAS,CAAC;AACjB,OAAO,EAA4C,kBAAkB,EAAC,MAAM,gBAAgB,CAAC;AA6H7F,cAAM,yBACJ,SAAQ,aACR,YACE,cAAc,CACZ,uBAAuB,EACvB,MAAM,EACN,YAAY,CACb;IAEH,MAAM,CAAC,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAgB;IAEnC,MAAM,CAAC,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAoB;IAE3C,YAAY,EAAE,kBAAkB,CAAC;IAEjC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAE/B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B,WAAW,CAAC,EAAE,KAAK,CAAC,WAAW,CAAC;IAEvB,IAAI,EAAE,sBAAsB,CAAC;IAE7B,IAAI,EAAE,sBAAsB,CAAC;IAE7B,qBAAqB,EAAE,uBAAuB,CAAC;gBAE5C,IAAI,GAAE,WAA+B,EAAE,kBAAkB,UAAO;IAoCnE,mBAAmB,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,IAAI,sBAAsB;IAOjE,aAAa,CACjB,QAAQ,EAAE,yBAAyB,EACnC,QAAQ,CAAC,EAAE,yBAAyB,EACpC,QAAQ,CAAC,EAAE,yBAAyB,EACpC,UAAU,CAAC,EAAE,UAAU,EAAE,GACxB,OAAO,CAAC,GAAG,CAAC;IAyET,gBAAgB,IAAI,OAAO,CAAC,yBAAyB,CAAC;IA0B5D,IAAa,UAAU,OAGtB;IAEc,UAAU,IAAI,OAAO,CAAC,mBAAmB,CAAC,uBAAuB,CAAC,CAAC;IAO5E,kBAAkB;IAsClB,iBAAiB;IAgBjB,uBAAuB;IAUvB,sBAAsB;IAMtB,wBAAwB,CAC5B,IAAI,EAAE,4BAA4B,GACjC,OAAO,CAAC,uBAAuB,CAAC;IA0J7B,sBAAsB;IA8CtB,OAAO;IA4DP,eAAe;IAqCf,aAAa;IAiHb,eAAe;IAQf,gBAAgB;IAMtB,WAAW,CAAC,SAAS,EAAE,MAAM;IAM7B,QAAQ,CAAC,SAAS,EAAE,MAAM;IAK1B,iBAAiB;IAmBX,cAAc,CAAC,QAAQ,EAAE,oBAAoB;IAK7C,WAAW;CAQlB;AAED,OAAO,YAAY,CAAC;AAEpB,OAAO,EAAC,yBAAyB,EAAC,CAAC"}
+{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEV,UAAU,EACV,cAAc,EACd,WAAW,EAEX,YAAY,EACZ,mBAAmB,EACnB,YAAY,EACb,MAAM,eAAe,CAAC;AAEvB,OAAO,aAAsB,MAAM,uBAAuB,CAAC;AAG3D,OAAO,EAAK,KAAK,EAAO,MAAM,gBAAgB,CAAC;AAQ/C,OAAiC,EAAC,KAAK,uBAAuB,EAAC,MAAM,eAAe,CAAC;AAMrF,OAAO,KAAK,EACV,oBAAoB,EACpB,yBAAyB,EACzB,sBAAsB,EACtB,sBAAsB,EACtB,uBAAuB,EAEvB,4BAA4B,EAC5B,yBAAyB,EAC1B,MAAM,SAAS,CAAC;AACjB,OAAO,EAA4C,kBAAkB,EAAC,MAAM,gBAAgB,CAAC;AAC7F,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EACpB,sBAAsB,EACvB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,kBAAkB,EAClB,eAAe,EACf,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,yBAAyB,EACzB,mBAAmB,EACpB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,mBAAmB,EACpB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,MAAM,EACN,YAAY,EACZ,cAAc,EACd,gBAAgB,EAChB,eAAe,EACf,OAAO,EACP,WAAW,EACX,OAAO,EACP,cAAc,EACd,oBAAoB,EACpB,OAAO,EACP,iBAAiB,EACjB,iBAAiB,EACjB,KAAK,EACL,KAAK,EACL,yBAAyB,EAC1B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,OAAO,EACP,aAAa,EACd,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,kBAAkB,EACnB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,iBAAiB,EACjB,kBAAkB,EAClB,sBAAsB,EACtB,uBAAuB,EACvB,sBAAsB,EACtB,YAAY,EACZ,kBAAkB,EAClB,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,cAAc,EACd,UAAU,EACV,UAAU,EACV,QAAQ,EACT,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,aAAa,EACb,cAAc,EACd,cAAc,EACd,YAAY,EACZ,iBAAiB,EACjB,wBAAwB,EACxB,mBAAmB,EACpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,MAAM,EACN,cAAc,EACd,IAAI,EACL,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,iBAAiB,EACjB,wBAAwB,EACxB,aAAa,EACb,qBAAqB,EACtB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,OAAO,EACP,MAAM,EACN,SAAS,EACT,cAAc,EACd,SAAS,EACT,OAAO,EACP,GAAG,EACH,oBAAoB,EACpB,cAAc,EACd,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,iBAAiB,EACjB,eAAe,EACf,aAAa,EACb,aAAa,EACb,kBAAkB,EACnB,MAAM,qBAAqB,CAAC;AA2H7B,cAAM,yBACJ,SAAQ,aACR,YACE,cAAc,CACZ,uBAAuB,EACvB,MAAM,EACN,YAAY,CACb;IAEH,MAAM,CAAC,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAgB;IAEnC,MAAM,CAAC,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAoB;IAE3C,YAAY,EAAE,kBAAkB,CAAC;IAEjC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAE/B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B,WAAW,CAAC,EAAE,KAAK,CAAC,WAAW,CAAC;IAEvB,IAAI,EAAE,sBAAsB,CAAC;IAE7B,IAAI,EAAE,sBAAsB,CAAC;IAE7B,qBAAqB,EAAE,uBAAuB,CAAC;gBAE5C,IAAI,GAAE,WAA+B,EAAE,kBAAkB,UAAO;IAmCnE,mBAAmB,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,IAAI,sBAAsB;IAIjE,aAAa,CACjB,QAAQ,EAAE,yBAAyB,EACnC,QAAQ,CAAC,EAAE,yBAAyB,EACpC,QAAQ,CAAC,EAAE,yBAAyB,EACpC,UAAU,CAAC,EAAE,UAAU,EAAE,GACxB,OAAO,CAAC,GAAG,CAAC;IAyET,gBAAgB,IAAI,OAAO,CAAC,yBAAyB,CAAC;IA0B5D,IAAa,UAAU,OAGtB;IAEc,UAAU,IAAI,OAAO,CAAC,mBAAmB,CAAC,uBAAuB,CAAC,CAAC;IAO5E,kBAAkB;IAqClB,iBAAiB;IAgBjB,uBAAuB;IAUvB,sBAAsB;IAMtB,wBAAwB,CAC5B,IAAI,EAAE,4BAA4B,GACjC,OAAO,CAAC,uBAAuB,CAAC;IA0J7B,sBAAsB;IA8CtB,OAAO;IA0DP,eAAe;IAqCf,aAAa;IA+Gb,eAAe;IAOf,gBAAgB;IAMtB,WAAW,CAAC,SAAS,EAAE,MAAM;IAM7B,QAAQ,CAAC,SAAS,EAAE,MAAM;IAK1B,iBAAiB;IAmBX,cAAc,CAAC,QAAQ,EAAE,oBAAoB;IAK7C,WAAW;IASjB,sBAAsB,gCAA0B;IAChD,oBAAoB,8BAAwB;IAC5C,sBAAsB,gCAA0B;IAEhD,YAAY,sBAAgB;IAC5B,iBAAiB,2BAAqB;IACtC,kBAAkB,4BAAsB;IACxC,eAAe,yBAAmB;IAClC,gBAAgB,0BAAoB;IAEpC,yBAAyB,mCAA6B;IACtD,mBAAmB,6BAAuB;IAE1C,mBAAmB,6BAAuB;IAE1C,oBAAoB,8BAAwB;IAE5C,MAAM,gBAAU;IAChB,YAAY,sBAAgB;IAC5B,cAAc,wBAAkB;IAChC,gBAAgB,0BAAoB;IACpC,eAAe,yBAAmB;IAClC,OAAO,iBAAW;IAClB,WAAW,qBAAe;IAC1B,OAAO,iBAAW;IAClB,cAAc,wBAAkB;IAChC,oBAAoB,8BAAwB;IAC5C,OAAO,iBAAW;IAClB,iBAAiB,2BAAqB;IACtC,iBAAiB,2BAAqB;IACtC,KAAK,eAAS;IACd,KAAK,eAAS;IACd,yBAAyB,mCAA6B;IAEtD,OAAO,iBAAW;IAClB,aAAa,uBAAiB;IAE9B,kBAAkB,4BAAsB;IAExC,kBAAkB,4BAAsB;IACxC,wBAAwB,kCAA4B;IACpD,iBAAiB,2BAAqB;IACtC,kBAAkB,4BAAsB;IACxC,sBAAsB,gCAA0B;IAChD,uBAAuB,iCAA2B;IAClD,sBAAsB,gCAA0B;IAChD,YAAY,sBAAgB;IAC5B,kBAAkB,4BAAsB;IACxC,mBAAmB,6BAAuB;IAC1C,kBAAkB,4BAAsB;IAExC,YAAY,sBAAgB;IAC5B,gBAAgB,0BAAoB;IACpC,cAAc,wBAAkB;IAChC,UAAU,oBAAc;IACxB,UAAU,oBAAc;IACxB,QAAQ,kBAAY;IAEpB,aAAa,uBAAiB;IAC9B,cAAc,wBAAkB;IAChC,cAAc,wBAAkB;IAChC,YAAY,sBAAgB;IAC5B,iBAAiB,2BAAqB;IACtC,wBAAwB,kCAA4B;IACpD,mBAAmB,6BAAuB;IAE1C,MAAM,gBAAU;IAChB,cAAc,wBAAkB;IAChC,IAAI,cAAQ;IAEZ,iBAAiB,2BAAqB;IACtC,wBAAwB,kCAA4B;IACpD,aAAa,uBAAiB;IAC9B,qBAAqB,+BAAyB;IAE9C,OAAO,iBAAW;IAClB,MAAM,gBAAU;IAChB,SAAS,mBAAa;IACtB,cAAc,wBAAkB;IAChC,SAAS,mBAAa;IACtB,OAAO,iBAAW;IAClB,GAAG,aAAO;IACV,oBAAoB,8BAAwB;IAC5C,cAAc,wBAAkB;IAChC,cAAc,wBAAkB;IAEhC,kBAAkB,4BAAsB;IACxC,mBAAmB,6BAAuB;IAC1C,iBAAiB,2BAAqB;IACtC,eAAe,yBAAmB;IAClC,aAAa,uBAAiB;IAC9B,aAAa,uBAAiB;IAC9B,kBAAkB,4BAAsB;CACzC;AAED,OAAO,EAAC,yBAAyB,EAAC,CAAC"}