appium-uiautomator2-driver 7.2.3 → 7.4.0

package/build/lib/utils/lang.js

@@ -0,0 +1,37 @@
+"use strict";
+// TODO(appium server 3.4.1+): Replace local `isEmpty` / `escapeRegExp` with imports from `appium/support`
+// once this driver declares that minimum server version.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isEmpty = isEmpty;
+exports.escapeRegExp = escapeRegExp;
+/**
+ * Returns true when the value has no elements/properties.
+ *
+ * @param value - Value to check
+ * @returns `true` if the value is empty
+ */
+function isEmpty(value) {
+    if (value == null) {
+        return true;
+    }
+    if (typeof value === 'string' || Array.isArray(value) || Buffer.isBuffer(value)) {
+        return value.length === 0;
+    }
+    if (value instanceof Map || value instanceof Set) {
+        return value.size === 0;
+    }
+    if (typeof value === 'object' || typeof value === 'function') {
+        return Object.keys(value).length === 0;
+    }
+    return true;
+}
+/**
+ * Escapes RegExp special characters in a string.
+ *
+ * @param value - Input string
+ * @returns Escaped string safe for RegExp source
+ */
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+//# sourceMappingURL=lang.js.map

package/build/lib/utils/lang.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lang.js","sourceRoot":"","sources":["../../../lib/utils/lang.ts"],"names":[],"mappings":";AAAA,0GAA0G;AAC1G,yDAAyD;;AAQzD,0BAcC;AAQD,oCAEC;AA9BD;;;;;GAKG;AACH,SAAgB,OAAO,CAAC,KAAc;IACpC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAChF,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC;IAC5B,CAAC;IACD,IAAI,KAAK,YAAY,GAAG,IAAI,KAAK,YAAY,GAAG,EAAE,CAAC;QACjD,OAAO,KAAK,CAAC,IAAI,KAAK,CAAC,CAAC;IAC1B,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE,CAAC;QAC7D,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;IACzC,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACH,SAAgB,YAAY,CAAC,KAAa;IACxC,OAAO,KAAK,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC"}

package/build/lib/utils/memoize.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Creates a memoized version of a function.
+ *
+ * @param fn - Function to memoize
+ * @param resolver - Optional cache key resolver. If omitted, the first argument is used as the cache key.
+ * @returns Memoized function with a mutable `.cache` map (compatible with lodash-style cache resets in tests).
+ */
+export declare function memoize<Fn extends (...args: any[]) => any>(fn: Fn, resolver?: (...args: Parameters<Fn>) => unknown): Fn & {
+    cache: Map<unknown, ReturnType<Fn>>;
+};
+//# sourceMappingURL=memoize.d.ts.map

package/build/lib/utils/memoize.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"memoize.d.ts","sourceRoot":"","sources":["../../../lib/utils/memoize.ts"],"names":[],"mappings":"AAGA;;;;;;GAMG;AACH,wBAAgB,OAAO,CAAC,EAAE,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EACxD,EAAE,EAAE,EAAE,EACN,QAAQ,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC,KAAK,OAAO,GAC9C,EAAE,GAAG;IAAC,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC,CAAA;CAAC,CAY5C"}

package/build/lib/utils/memoize.js

@@ -0,0 +1,26 @@
+"use strict";
+// TODO(appium server 3.4.1+): Replace local `memoize` with imports from `appium/support`
+// once this driver declares that minimum server version.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.memoize = memoize;
+/**
+ * Creates a memoized version of a function.
+ *
+ * @param fn - Function to memoize
+ * @param resolver - Optional cache key resolver. If omitted, the first argument is used as the cache key.
+ * @returns Memoized function with a mutable `.cache` map (compatible with lodash-style cache resets in tests).
+ */
+function memoize(fn, resolver) {
+    const memoizedFn = function (...args) {
+        const key = resolver ? resolver.apply(this, args) : args[0];
+        if (memoizedFn.cache.has(key)) {
+            return memoizedFn.cache.get(key);
+        }
+        const result = fn.apply(this, args);
+        memoizedFn.cache.set(key, result);
+        return result;
+    };
+    memoizedFn.cache = new Map();
+    return memoizedFn;
+}
+//# sourceMappingURL=memoize.js.map

package/build/lib/utils/memoize.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"memoize.js","sourceRoot":"","sources":["../../../lib/utils/memoize.ts"],"names":[],"mappings":";AAAA,yFAAyF;AACzF,yDAAyD;;AASzD,0BAeC;AAtBD;;;;;;GAMG;AACH,SAAgB,OAAO,CACrB,EAAM,EACN,QAA+C;IAE/C,MAAM,UAAU,GAAG,UAAyB,GAAG,IAAoB;QACjE,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC5D,IAAI,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAC9B,OAAO,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAmB,CAAC;QACrD,CAAC;QACD,MAAM,MAAM,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACpC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAClC,OAAO,MAAM,CAAC;IAChB,CAA0D,CAAC;IAC3D,UAAU,CAAC,KAAK,GAAG,IAAI,GAAG,EAA2B,CAAC;IACtD,OAAO,UAAU,CAAC;AACpB,CAAC"}

package/build/lib/utils/object.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Assigns own enumerable properties of `source` onto `target` only where `target[key] === undefined`
+ * (lodash `defaults` semantics).
+ */
+export declare function assignDefaults<T extends Record<string, unknown>>(target: T, source: Record<string, unknown>): void;
+//# sourceMappingURL=object.d.ts.map

package/build/lib/utils/object.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../../../lib/utils/object.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9D,MAAM,EAAE,CAAC,EACT,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,IAAI,CAMN"}

package/build/lib/utils/object.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assignDefaults = assignDefaults;
+/**
+ * Assigns own enumerable properties of `source` onto `target` only where `target[key] === undefined`
+ * (lodash `defaults` semantics).
+ */
+function assignDefaults(target, source) {
+    for (const key of Object.keys(source)) {
+        if (target[key] === undefined) {
+            target[key] = source[key];
+        }
+    }
+}
+//# sourceMappingURL=object.js.map

package/build/lib/utils/object.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"object.js","sourceRoot":"","sources":["../../../lib/utils/object.ts"],"names":[],"mappings":";;AAIA,wCASC;AAbD;;;GAGG;AACH,SAAgB,cAAc,CAC5B,MAAS,EACT,MAA+B;IAE/B,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACtC,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAkC,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;AACH,CAAC"}

package/lib/commands/app-management.ts

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import {errors} from 'appium/driver';
 import {APK_EXTENSION} from '../extensions';
 import type {AndroidUiautomator2Driver} from '../driver';
@@ -15,7 +14,7 @@ export async function mobileInstallMultipleApks(
   apks: string[],
   options?: InstallOptions,
 ): Promise<void> {
-  if (!_.isArray(apks) || _.isEmpty(apks)) {
+  if (!Array.isArray(apks) || apks.length === 0) {
     throw new errors.InvalidArgumentError('No apks are given to install');
   }
   const configuredApks = await Promise.all(

package/lib/commands/element.ts

@@ -1,5 +1,4 @@
 import {PROTOCOLS} from 'appium/driver';
-import _ from 'lodash';
 import type {DoSetElementValueOpts} from 'appium-android-driver';
 import type {Element as AppiumElement, Position, Rect, Size} from '@appium/types';
 import type {AndroidUiautomator2Driver} from '../driver';
@@ -130,7 +129,7 @@ export async function setValueImmediate(
 ): Promise<void> {
   await this.uiautomator2.jwproxy.command(`/element/${elementId}/value`, 'POST', {
     elementId,
-    text: _.isArray(keys) ? keys.join('') : keys,
+    text: Array.isArray(keys) ? keys.join('') : keys,
     replace: false,
   });
 }
@@ -215,5 +214,5 @@ export async function mobileReplaceElementValue(
 }
 
 function toBool(value: any): boolean {
-  return _.isString(value) ? value.toLowerCase() === 'true' : !!value;
+  return typeof value === 'string' ? value.toLowerCase() === 'true' : !!value;
 }

package/lib/commands/gestures.ts

@@ -1,6 +1,5 @@
 import {errors} from 'appium/driver';
 import {util} from 'appium/support';
-import _ from 'lodash';
 import type {Element as AppiumElement, Position} from '@appium/types';
 import type {RelativeRect} from './types';
 import type {AndroidUiautomator2Driver} from '../driver';
@@ -288,7 +287,7 @@ function toOrigin(element?: AppiumElement | string): AppiumElement | undefined {
 }
 
 function toPoint(x?: number, y?: number): Partial<Position> | undefined {
-  return _.isFinite(x) && _.isFinite(y) ? {x, y} : undefined;
+  return Number.isFinite(x) && Number.isFinite(y) ? {x, y} : undefined;
 }
 
 function toRect(
@@ -297,7 +296,7 @@ function toRect(
   width?: number,
   height?: number,
 ): RelativeRect | undefined {
-  return [left, top, width, height].some((v) => !_.isFinite(v))
+  return [left, top, width, height].some((v) => !Number.isFinite(v))
     ? undefined
     : ({left, top, width, height} as RelativeRect);
 }

package/lib/commands/keyboard.ts

@@ -1,5 +1,3 @@
-import {errors} from 'appium/driver';
-import _ from 'lodash';
 import type {AndroidUiautomator2Driver} from '../driver';
 import type {SendKeysOpts} from 'appium-android-driver';
 
@@ -81,9 +79,6 @@ export async function mobileType(
   this: AndroidUiautomator2Driver,
   text: string | number | boolean,
 ): Promise<boolean> {
-  if (_.isUndefined(text)) {
-    throw new errors.InvalidArgumentError(`The 'text' argument is mandatory`);
-  }
   return await this.settingsApp.typeUnicode(String(text));
 }
 

package/lib/commands/screenshot.ts

@@ -1,5 +1,5 @@
-import _ from 'lodash';
 import {imageUtil} from 'appium/support';
+import {isEmpty} from '../utils';
 import type {AndroidUiautomator2Driver} from '../driver';
 import type {Screenshot} from './types';
 import type {StringRecord} from '@appium/types';
@@ -94,7 +94,7 @@ export async function mobileScreenshots(
 ): Promise<StringRecord<Screenshot>> {
   const displaysInfo = await this.adb.shell(['dumpsys', 'SurfaceFlinger', '--display-id']);
   const infos = parseSurfaceFlingerDisplays(displaysInfo);
-  if (_.isEmpty(infos)) {
+  if (isEmpty(infos)) {
     this.log.debug(displaysInfo);
     throw new Error('Cannot determine the information about connected Android displays');
   }
@@ -104,7 +104,7 @@ export async function mobileScreenshots(
     (await this.adb.takeScreenshot(dispId)).toString('base64');
 
   const displayIdStr: string | null =
-    _.isNil(displayId) || displayId === '' ? null : String(displayId);
+    displayId == null || displayId === '' ? null : String(displayId);
 
   if (displayIdStr) {
     if (!infos[displayIdStr]) {
@@ -121,13 +121,13 @@ export async function mobileScreenshots(
     };
   }
 
-  const allInfos = _.values(infos).filter(
+  const allInfos = Object.values(infos).filter(
     (info): info is Partial<Screenshot> & {id: string} => !!info?.id,
   );
   const screenshots = await Promise.all(allInfos.map((info) => toB64Screenshot(info.id)));
-  for (const [info, payload] of _.zip(allInfos, screenshots) as Array<
-    [Partial<Screenshot>, string]
-  >) {
+  for (let i = 0; i < allInfos.length; i++) {
+    const info = allInfos[i];
+    const payload = screenshots[i];
     if (info && payload) {
       info.payload = payload;
     }

package/lib/commands/types.ts

@@ -1,4 +1,4 @@
-import {Rect, StringRecord} from '@appium/types';
+import type {Rect, StringRecord} from '@appium/types';
 
 export type BatteryState = -1 | 1 | 2 | 3 | 4 | 5;
 

package/lib/constraints.ts

@@ -1,4 +1,4 @@
-import {Constraints} from '@appium/types';
+import type {Constraints} from '@appium/types';
 import {commonCapConstraints} from 'appium-android-driver';
 
 const UIAUTOMATOR2_CONSTRAINTS = {

package/lib/css-converter.ts

@@ -8,9 +8,9 @@ import type {
   AstSelector,
   AstTagName,
 } from 'css-selector-parser';
-import _ from 'lodash';
 import {errors} from 'appium/driver';
 import {log} from './logger';
+import {escapeRegExp, isEmpty} from './utils';
 
 const parseCssSelector = createParser({
   syntax: {
@@ -100,7 +100,7 @@ export class CssConverter {
   private parseAttr(cssAttr: AstAttribute): string {
     const attrValueNode = cssAttr.value as {value?: string} | undefined;
     const attrValue = attrValueNode?.value;
-    if (!_.isString(attrValue) && !_.isEmpty(attrValue)) {
+    if (typeof attrValue !== 'string' && !isEmpty(attrValue)) {
       throw new Error(
         `'${cssAttr.name}=${attrValue}' is an invalid attribute. Only 'string' and empty attribute types are supported. Found '${attrValue}'`,
       );
@@ -136,14 +136,14 @@ export class CssConverter {
         if (['description', 'text'].includes(attrName)) {
           return `.${methodName}Contains("${value}")`;
         }
-        return `.${methodName}Matches("${_.escapeRegExp(value)}")`;
+        return `.${methodName}Matches("${escapeRegExp(value)}")`;
       case '^=':
         if (['description', 'text'].includes(attrName)) {
           return `.${methodName}StartsWith("${value}")`;
         }
-        return `.${methodName}Matches("^${_.escapeRegExp(value)}")`;
+        return `.${methodName}Matches("^${escapeRegExp(value)}")`;
       case '$=':
-        return `.${methodName}Matches("${_.escapeRegExp(value)}$")`;
+        return `.${methodName}Matches("${escapeRegExp(value)}$")`;
       case '~=':
         return `.${methodName}Matches("${getWordMatcherRegex(value)}")`;
       default:
@@ -155,7 +155,7 @@ export class CssConverter {
 
   private parsePseudo(cssPseudo: AstPseudoClass): string | undefined {
     const argValue = (cssPseudo.argument as {value?: string} | undefined)?.value;
-    if (!_.isString(argValue) && !_.isEmpty(argValue)) {
+    if (typeof argValue !== 'string' && !isEmpty(argValue)) {
       throw new Error(
         `'${cssPseudo.name}=${argValue}'. Unsupported css pseudo class value: '${argValue}'. Only 'string' type or empty is supported.`,
       );
@@ -226,7 +226,7 @@ export class CssConverter {
   }
 
   private parseCssObject(css: AstSelector): string {
-    if (!_.isEmpty(css.rules)) {
+    if (!isEmpty(css.rules)) {
       return this.parseCssRule(css.rules[0] as AstRule);
     }
 
@@ -247,7 +247,7 @@ function toSnakeCase(str?: string | null): string {
 
 function requireBoolean(css: AstAttribute | AstPseudoClass): 'true' | 'false' {
   const rawValue = (css as any).value?.value ?? (css as any).argument?.value;
-  const value = _.toLower(rawValue ?? 'true');
+  const value = String(rawValue ?? 'true').toLowerCase();
   if (value === 'true') {
     return 'true';
   }
@@ -275,5 +275,5 @@ function requireEntityName(cssEntity: AstAttribute | AstPseudoClass): string {
 }
 
 function getWordMatcherRegex(word: string): string {
-  return `\\b(\\w*${_.escapeRegExp(word)}\\w*)\\b`;
+  return `\\b(\\w*${escapeRegExp(word)}\\w*)\\b`;
 }