appium-uiautomator2-driver 7.3.0 → 7.4.0

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`;
 }

package/lib/driver.ts

@@ -15,7 +15,6 @@ import {SETTINGS_HELPER_ID} from 'io.appium.settings';
 import {BaseDriver, DeviceSettings} from 'appium/driver';
 import {fs, mjpeg, util} from 'appium/support';
 import {retryInterval} from 'asyncbox';
-import _ from 'lodash';
 import os from 'node:os';
 import path from 'node:path';
 import {checkPortStatus, findAPortNotInUse} from 'portscanner';
@@ -23,7 +22,7 @@ import type {ExecError} from 'teen_process';
 import UIAUTOMATOR2_CONSTRAINTS, {type Uiautomator2Constraints} from './constraints';
 import {APKS_EXTENSION, APK_EXTENSION} from './extensions';
 import {newMethodMap} from './method-map';
-import {signApp} from './helpers';
+import {assignDefaults, memoize, signApp} from './utils';
 import type {
   Uiautomator2Settings,
   Uiautomator2DeviceDetails,
@@ -360,7 +359,7 @@ class AndroidUiautomator2Driver
       'css selector',
       '-android uiautomator',
     ];
-    this.desiredCapConstraints = _.cloneDeep(UIAUTOMATOR2_CONSTRAINTS);
+    this.desiredCapConstraints = structuredClone(UIAUTOMATOR2_CONSTRAINTS);
     this.jwpProxyActive = false;
     this.jwpProxyAvoid = NO_PROXY;
     this._originalIme = null;
@@ -375,8 +374,8 @@ class AndroidUiautomator2Driver
     this.caps = {} as Uiautomator2DriverCaps;
     this.opts = opts as Uiautomator2DriverOpts;
     // memoize functions here, so that they are done on a per-instance basis
-    this.getStatusBarHeight = _.memoize(this.getStatusBarHeight);
-    this.getDevicePixelRatio = _.memoize(this.getDevicePixelRatio);
+    this.getStatusBarHeight = memoize(this.getStatusBarHeight);
+    this.getDevicePixelRatio = memoize(this.getDevicePixelRatio);
   }
 
   override get driverData() {
@@ -423,7 +422,7 @@ class AndroidUiautomator2Driver
         adbPort: DEFAULT_ADB_PORT,
         androidInstallTimeout: 90000,
       };
-      _.defaults(this.opts, defaultOpts);
+      assignDefaults(this.opts as Record<string, unknown>, defaultOpts);
 
       this.opts.adbPort = this.opts.adbPort || DEFAULT_ADB_PORT;
       // get device udid for this session
@@ -500,7 +499,7 @@ class AndroidUiautomator2Driver
       pixelRatio,
       statBarHeight,
       viewportRect,
-      deviceApiLevel: _.parseInt(apiVersion),
+      deviceApiLevel: Number.parseInt(String(apiVersion), 10),
       platformVersion,
       deviceManufacturer: manufacturer,
       deviceModel: model,
@@ -921,7 +920,7 @@ class AndroidUiautomator2Driver
 
     const screenRecordingStopTasks = [
       async () => {
-        if (!_.isEmpty(this._screenRecordingProperties)) {
+        if (this._screenRecordingProperties) {
           await this.stopRecordingScreen();
         }
       },
@@ -931,7 +930,7 @@ class AndroidUiautomator2Driver
         }
       },
       async () => {
-        if (!_.isEmpty(this._screenStreamingProps)) {
+        if (this._screenStreamingProps) {
           await this.mobileStopScreenStreaming();
         }
       },

package/lib/uiautomator2.ts

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import {JWProxy, errors} from 'appium/driver';
 import {sleep, waitForCondition} from 'asyncbox';
 import {
@@ -409,7 +408,7 @@ export class UiAutomator2Server {
     if (this.disableWindowAnimation) {
       cmd.push('--no-window-animation');
     }
-    if (_.isBoolean(this.disableSuppressAccessibilityService)) {
+    if (typeof this.disableSuppressAccessibilityService === 'boolean') {
       cmd.push(
         '-e',
         'DISABLE_SUPPRESS_ACCESSIBILITY_SERVICES',

package/lib/utils/index.ts

@@ -0,0 +1,4 @@
+export * from './app';
+export * from './lang';
+export * from './memoize';
+export * from './object';

package/lib/utils/lang.ts

@@ -0,0 +1,34 @@
+// TODO(appium server 3.4.1+): Replace local `isEmpty` / `escapeRegExp` with imports from `appium/support`
+// once this driver declares that minimum server version.
+
+/**
+ * Returns true when the value has no elements/properties.
+ *
+ * @param value - Value to check
+ * @returns `true` if the value is empty
+ */
+export function isEmpty(value: unknown): boolean {
+  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
+ */
+export function escapeRegExp(value: string): string {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}

package/lib/utils/memoize.ts

@@ -0,0 +1,26 @@
+// TODO(appium server 3.4.1+): Replace local `memoize` with imports from `appium/support`
+// once this driver declares that minimum server version.
+
+/**
+ * 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 function memoize<Fn extends (...args: any[]) => any>(
+  fn: Fn,
+  resolver?: (...args: Parameters<Fn>) => unknown,
+): Fn & {cache: Map<unknown, ReturnType<Fn>>} {
+  const memoizedFn = function (this: unknown, ...args: Parameters<Fn>) {
+    const key = resolver ? resolver.apply(this, args) : args[0];
+    if (memoizedFn.cache.has(key)) {
+      return memoizedFn.cache.get(key) as ReturnType<Fn>;
+    }
+    const result = fn.apply(this, args);
+    memoizedFn.cache.set(key, result);
+    return result;
+  } as unknown as Fn & {cache: Map<unknown, ReturnType<Fn>>};
+  memoizedFn.cache = new Map<unknown, ReturnType<Fn>>();
+  return memoizedFn;
+}

package/lib/utils/object.ts

@@ -0,0 +1,14 @@
+/**
+ * Assigns own enumerable properties of `source` onto `target` only where `target[key] === undefined`
+ * (lodash `defaults` semantics).
+ */
+export function assignDefaults<T extends Record<string, unknown>>(
+  target: T,
+  source: Record<string, unknown>,
+): void {
+  for (const key of Object.keys(source)) {
+    if (target[key] === undefined) {
+      (target as Record<string, unknown>)[key] = source[key];
+    }
+  }
+}

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "appium-uiautomator2-driver",
-  "version": "7.3.0",
+  "version": "7.4.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "appium-uiautomator2-driver",
-      "version": "7.3.0",
+      "version": "7.4.0",
       "license": "Apache-2.0",
       "dependencies": {
         "appium-adb": "^14.0.0",
@@ -16,7 +16,6 @@
         "axios": "^1.16.0",
         "css-selector-parser": "^3.0.0",
         "io.appium.settings": "^7.0.1",
-        "lodash": "^4.17.4",
         "portscanner": "^2.2.0",
         "teen_process": "^4.0.4"
       },
@@ -30,7 +29,6 @@
         "@semantic-release/git": "^10.0.1",
         "@types/chai": "^5.2.3",
         "@types/chai-as-promised": "^8.0.2",
-        "@types/lodash": "^4.14.194",
         "@types/mocha": "^10.0.1",
         "@types/node": "^25.0.3",
         "@types/portscanner": "^2.1.1",
@@ -107,6 +105,17 @@
         "npm": ">=10"
       }
     },
+    "node_modules/@appium/base-driver/node_modules/axios": {
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.16.0.tgz",
+      "integrity": "sha512-6hp5CwvTPlN2A31g5dxnwAX0orzM7pmCRDLnZSX772mv8WDqICwFjowHuPs04Mc8deIld1+ejhtaMn5vp6b+1w==",
+      "license": "MIT",
+      "dependencies": {
+        "follow-redirects": "^1.16.0",
+        "form-data": "^4.0.5",
+        "proxy-from-env": "^2.1.0"
+      }
+    },
     "node_modules/@appium/docutils": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/@appium/docutils/-/docutils-2.4.2.tgz",
@@ -224,6 +233,17 @@
         "npm": ">=10"
       }
     },
+    "node_modules/@appium/support/node_modules/axios": {
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.16.0.tgz",
+      "integrity": "sha512-6hp5CwvTPlN2A31g5dxnwAX0orzM7pmCRDLnZSX772mv8WDqICwFjowHuPs04Mc8deIld1+ejhtaMn5vp6b+1w==",
+      "license": "MIT",
+      "dependencies": {
+        "follow-redirects": "^1.16.0",
+        "form-data": "^4.0.5",
+        "proxy-from-env": "^2.1.0"
+      }
+    },
     "node_modules/@appium/tsconfig": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@appium/tsconfig/-/tsconfig-1.1.2.tgz",
@@ -495,6 +515,18 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
     "node_modules/ansi-regex": {
       "version": "6.2.2",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
@@ -751,13 +783,14 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.16.0.tgz",
-      "integrity": "sha512-6hp5CwvTPlN2A31g5dxnwAX0orzM7pmCRDLnZSX772mv8WDqICwFjowHuPs04Mc8deIld1+ejhtaMn5vp6b+1w==",
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.16.1.tgz",
+      "integrity": "sha512-caYkukvroVPO8KrzuJEb50Hm07KwfBZPEC3VeFHTsqWHvKTsy54hjJz9BS/cdaypROE2rH6xvm9mHX4fgWkr3A==",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.16.0",
         "form-data": "^4.0.5",
+        "https-proxy-agent": "^5.0.1",
         "proxy-from-env": "^2.1.0"
       }
     },
@@ -785,9 +818,9 @@
       }
     },
     "node_modules/bare-events": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.2.tgz",
-      "integrity": "sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==",
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.3.tgz",
+      "integrity": "sha512-HdUm8EMQBLaJvGUdidNNbqpA1kYkwNcb+MYxkxCLAPJGQzlv9J0C24h8V65Z4c5GLd/JEALDvpFCQgpLJqc0zw==",
       "license": "Apache-2.0",
       "peerDependencies": {
         "bare-abort-controller": "*"
@@ -2006,6 +2039,19 @@
       "integrity": "sha512-RJ8XvFvpPM/Dmc5SV+dC4y5PCeOhT3x1Hq0NU3rjGeg5a/CqlhZ7uudknPwZFz4aeAXDcbAyaeP7GAo9lvngtA==",
       "license": "MIT"
     },
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/iconv-lite": {
       "version": "0.7.2",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz",
@@ -3625,17 +3671,34 @@
       }
     },
     "node_modules/type-is": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz",
-      "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.1.0.tgz",
+      "integrity": "sha512-faYHw0anBbc/kWF3zFTEnxSFOAGUX9GFbOBthvDdLsIlEoWOFOtS0zgCiQYwIskL9iGXZL3kAXD8OoZ4GmMATA==",
       "license": "MIT",
       "dependencies": {
-        "content-type": "^1.0.5",
+        "content-type": "^2.0.0",
         "media-typer": "^1.1.0",
         "mime-types": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
+      }
+    },
+    "node_modules/type-is/node_modules/content-type": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-2.0.0.tgz",
+      "integrity": "sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/unicorn-magic": {

package/package.json

@@ -7,7 +7,7 @@
     "automated testing",
     "android"
   ],
-  "version": "7.3.0",
+  "version": "7.4.0",
   "bugs": {
     "url": "https://github.com/appium/appium-uiautomator2-driver/issues"
   },
@@ -63,7 +63,6 @@
     "axios": "^1.16.0",
     "css-selector-parser": "^3.0.0",
     "io.appium.settings": "^7.0.1",
-    "lodash": "^4.17.4",
     "portscanner": "^2.2.0",
     "teen_process": "^4.0.4"
   },
@@ -77,7 +76,6 @@
     "@semantic-release/git": "^10.0.1",
     "@types/chai": "^5.2.3",
     "@types/chai-as-promised": "^8.0.2",
-    "@types/lodash": "^4.14.194",
     "@types/mocha": "^10.0.1",
     "@types/node": "^25.0.3",
     "@types/portscanner": "^2.1.1",

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

@@ -1 +0,0 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../lib/helpers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,YAAY,CAAC;AAGpC;;;GAGG;AACH,wBAAsB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAcpE;AAED;;;;;GAKG;AACH,wBAAsB,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAStE"}

package/build/lib/helpers.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../lib/helpers.ts"],"names":[],"mappings":";;;;;AAQA,kCAcC;AAQD,0BASC;AAvCD,0DAA6B;AAE7B,4CAA0C;AAE1C;;;GAGG;AACI,KAAK,UAAU,WAAW,CAAC,QAAgB;IAChD,IAAI,CAAC;QACH,MAAM,YAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,YAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,gBAAM,CAAC,SAAS,EAAE,EAAE,CAAC;YACvB,0DAA0D;YAC1D,6DAA6D;YAC7D,8EAA8E;YAC9E,mBAAmB;YACnB,MAAM,YAAE,CAAC,KAAK,CAAC,MAAM,YAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;QAChD,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,OAAO,CAAC,GAAQ,EAAE,OAAe;IACrD,IAAI,CAAC,CAAC,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CACb,uBAAuB,OAAO,sBAAsB;YAClD,wEAAwE,mBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI;YACjG,0DAA0D,CAC7D,CAAC;IACJ,CAAC;IACD,MAAM,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC1B,CAAC"}