@appium/base-driver 10.5.1 → 10.6.0

package/build/lib/utils.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergePlainObjects = mergePlainObjects;
+exports.omit = omit;
+exports.omitKeys = omitKeys;
+exports.pick = pick;
+exports.pickBy = pickBy;
+exports.compileLodashTemplate = compileLodashTemplate;
+const support_1 = require("@appium/support");
+/**
+ * Deep-merge plain objects into a clone of `target`. Skips null/undefined sources.
+ * Non-plain values on a key replace the previous value (same as lodash merge for objects).
+ */
+function mergePlainObjects(target, ...sources) {
+    const result = structuredClone(target);
+    for (const source of sources) {
+        if (source == null) {
+            continue;
+        }
+        for (const [key, value] of Object.entries(source)) {
+            const existing = result[key];
+            if (support_1.util.isPlainObject(existing) && support_1.util.isPlainObject(value)) {
+                result[key] = mergePlainObjects(existing, value);
+            }
+            else if (value !== undefined) {
+                result[key] = value;
+            }
+        }
+    }
+    return result;
+}
+/** Return a shallow copy of `obj` without `key`. Non-objects are returned unchanged. */
+function omit(obj, key) {
+    if (!support_1.util.isPlainObject(obj)) {
+        return obj;
+    }
+    return Object.fromEntries(Object.entries(obj).filter(([k]) => k !== key));
+}
+/** Return a shallow copy of `obj` without any of `keys`. */
+function omitKeys(obj, keys) {
+    if (!support_1.util.isPlainObject(obj) || keys.length === 0) {
+        return obj;
+    }
+    const keysToOmit = new Set(keys);
+    return Object.fromEntries(Object.entries(obj).filter(([k]) => !keysToOmit.has(k)));
+}
+/** Return a shallow copy of `obj` containing only listed keys. */
+function pick(obj, keys) {
+    const keysToPick = new Set(keys);
+    return Object.fromEntries(Object.entries(obj).filter(([k]) => keysToPick.has(k)));
+}
+/** Return a shallow copy of `obj` whose entries pass `predicate`. */
+function pickBy(obj, predicate) {
+    return Object.fromEntries(Object.entries(obj).filter(([key, value]) => predicate(value, key)));
+}
+/** Compile a lodash-style template string (`<%= expression %>`) into a render function. */
+function compileLodashTemplate(template) {
+    const parts = [];
+    let lastIndex = 0;
+    const re = /<%=\s*([\s\S]+?)\s*%>/g;
+    let match;
+    while ((match = re.exec(template)) !== null) {
+        parts.push(JSON.stringify(template.slice(lastIndex, match.index)));
+        parts.push(`String(${match[1]})`);
+        lastIndex = match.index + match[0].length;
+    }
+    parts.push(JSON.stringify(template.slice(lastIndex)));
+    const fn = new Function('obj', `with (obj) { return ${parts.join(' + ')}; }`);
+    return (params) => fn(params);
+}
+//# sourceMappingURL=utils.js.map

package/build/lib/utils.js.map

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

package/lib/basedriver/capabilities.ts

@@ -9,9 +9,9 @@ import type {
   KeyAsString,
   MergeExclusive,
 } from 'type-fest';
-import _ from 'lodash';
 import {validator} from './validation';
 import {util} from '@appium/support';
+import {omit, pickBy} from '../utils';
 import {log} from './logger';
 import {errors} from '../protocol/errors';
 
@@ -50,7 +50,7 @@ export function mergeCaps<
 
   for (const [name, value] of Object.entries(secondary)) {
     // Overwriting is not allowed. Primary and secondary must have different properties (w3c rule 4.4)
-    if (!_.isUndefined(primary[name])) {
+    if (primary[name] !== undefined) {
       throw new errors.InvalidArgumentError(
         `property '${name}' should not exist on both primary (${JSON.stringify(
           primary
@@ -73,32 +73,31 @@ export function validateCaps<C extends Constraints>(
 ): Capabilities<C> {
   const {skipPresenceConstraint} = opts;
 
-  if (!_.isPlainObject(caps)) {
+  if (!util.isPlainObject(caps)) {
     throw new errors.InvalidArgumentError(`must be a JSON object`);
   }
 
   // Remove the 'presence' constraint if we're not checking for it
-  constraints = (
-    _.mapValues(
-      constraints,
-      skipPresenceConstraint
-        ? /** @param {Constraint} constraint */
-          (constraint) => _.omit(constraint, 'presence')
-        : /** @param {Constraint} constraint */
-          (constraint) => {
-            if (constraint.presence === true) {
-              return {..._.omit(constraint, 'presence'), presence: {allowEmpty: false}};
-            }
-            return constraint;
-          }
-    )
+  constraints = Object.fromEntries(
+    Object.entries(constraints ?? {}).map(([key, constraint]) => {
+      if (skipPresenceConstraint) {
+        return [key, omit(constraint as Record<string, unknown>, 'presence')];
+      }
+      if ((constraint as {presence?: unknown}).presence === true) {
+        return [key, {...omit(constraint as Record<string, unknown>, 'presence'), presence: {allowEmpty: false}}];
+      }
+      return [key, constraint];
+    })
   ) as C;
 
-  const validationErrors = validator.validate(_.pickBy(caps, util.hasValue), constraints);
+  const validationErrors = validator.validate(
+    pickBy(caps, (value) => util.hasValue(value)),
+    constraints
+  );
 
   if (validationErrors) {
     const message: string[] = [];
-    for (const [attribute, reasons] of _.toPairs(validationErrors)) {
+    for (const [attribute, reasons] of Object.entries(validationErrors)) {
       for (const reason of (reasons as string[])) {
         message.push(`'${attribute}' ${reason}`);
       }
@@ -151,12 +150,14 @@ export function isStandardCap(cap: string): boolean {
 export function stripAppiumPrefixes<C extends Constraints>(caps: NSCapabilities<C>): Capabilities<C> {
   // split into prefixed and non-prefixed.
   // non-prefixed should be standard caps at this point
-  const [prefixedCaps, nonPrefixedCaps] = _.partition(_.keys(caps), (cap) =>
-    String(cap).startsWith(APPIUM_VENDOR_PREFIX)
-  );
+  const capKeys = Object.keys(caps);
+  const prefixedCaps = capKeys.filter((cap) => String(cap).startsWith(APPIUM_VENDOR_PREFIX));
+  const nonPrefixedCaps = capKeys.filter((cap) => !String(cap).startsWith(APPIUM_VENDOR_PREFIX));
 
   // initialize this with the k/v pairs of the non-prefixed caps
-  const strippedCaps = (_.pick(caps, nonPrefixedCaps)) as Capabilities<C>;
+  const strippedCaps: Record<string, unknown> = Object.fromEntries(
+    nonPrefixedCaps.map((cap) => [cap, caps[cap as keyof typeof caps]])
+  ) as Capabilities<C>;
   const badPrefixedCaps: string[] = [];
 
   // Strip out the 'appium:' prefix
@@ -166,16 +167,16 @@ export function stripAppiumPrefixes<C extends Constraints>(caps: NSCapabilities<
     // If it's standard capability that was prefixed, add it to an array of incorrectly prefixed capabilities
     if (isStandardCap(strippedCapName)) {
       badPrefixedCaps.push(strippedCapName);
-      if (_.isNil(strippedCaps[strippedCapName])) {
-        strippedCaps[strippedCapName] = caps[prefixedCap];
+      if (strippedCaps[strippedCapName] == null) {
+        strippedCaps[strippedCapName] = caps[prefixedCap as keyof typeof caps];
       } else {
         log.warn(
-          `Ignoring capability '${prefixedCap}=${caps[prefixedCap]}' and ` +
+          `Ignoring capability '${prefixedCap}=${caps[prefixedCap as keyof typeof caps]}' and ` +
             `using capability '${strippedCapName}=${strippedCaps[strippedCapName]}'`
         );
       }
     } else {
-      strippedCaps[strippedCapName] = caps[prefixedCap];
+      strippedCaps[strippedCapName] = caps[prefixedCap as keyof typeof caps];
     }
   }
 
@@ -187,7 +188,7 @@ export function stripAppiumPrefixes<C extends Constraints>(caps: NSCapabilities<
       )} are standard capabilities and do not require "appium:" prefix`
     );
   }
-  return strippedCaps;
+  return strippedCaps as Capabilities<C>;
 }
 
 /**
@@ -199,16 +200,15 @@ export function findNonPrefixedCaps<C extends Constraints>(
     firstMatch = []
   }: W3CCapabilities<C>
 ): string[] {
-  return _.chain([alwaysMatch, ...firstMatch])
-    .reduce(
+  return util.uniq(
+    [alwaysMatch, ...firstMatch].reduce<string[]>(
       (unprefixedCaps, caps) => [
         ...unprefixedCaps,
         ...Object.keys(caps).filter((cap) => !cap.includes(':') && !isStandardCap(cap)),
       ],
       []
     )
-    .uniq()
-    .value();
+  );
 }
 
 /**
@@ -221,7 +221,7 @@ export function parseCaps<C extends Constraints>(
   shouldValidateCaps: boolean | undefined = true
 ): ParsedCaps<C> {
   // If capabilities request is not an object, return error (#1.1)
-  if (!_.isPlainObject(caps)) {
+  if (!util.isPlainObject(caps)) {
     throw new errors.InvalidArgumentError(
       'The capabilities argument was not valid for the following reason(s): "capabilities" must be a JSON object.'
     );
@@ -235,7 +235,7 @@ export function parseCaps<C extends Constraints>(
   } = caps;
 
   // Reject 'firstMatch' argument if it's not an array (#3.2)
-  if (!_.isArray(allFirstMatchCaps)) {
+  if (!Array.isArray(allFirstMatchCaps)) {
     throw new errors.InvalidArgumentError(
       'The capabilities.firstMatch argument was not valid for the following reason(s): "capabilities.firstMatch" must be a JSON array or undefined'
     );
@@ -253,7 +253,7 @@ export function parseCaps<C extends Constraints>(
 
   // Check for non-prefixed, non-standard capabilities and log warnings if they are found
   const nonPrefixedCaps = findNonPrefixedCaps(caps);
-  if (!_.isEmpty(nonPrefixedCaps)) {
+  if (!util.isEmpty(nonPrefixedCaps)) {
     throw new errors.InvalidArgumentError(
       `All non-standard capabilities should have a vendor prefix. The following capabilities did not have one: ${nonPrefixedCaps}`
     );
@@ -271,22 +271,24 @@ export function parseCaps<C extends Constraints>(
   }
   // Remove the 'presence' constraint for any keys that are already present in 'requiredCaps'
   // since we know that this constraint has already passed
-  const filteredConstraints = _.omitBy(constraints, (_, key) => key in strippedRequiredCaps) as C;
+  const filteredConstraints = Object.fromEntries(
+    Object.entries(constraints ?? {}).filter(([key]) => !(key in strippedRequiredCaps))
+  ) as C;
 
   // Validate all of the first match capabilities and return an array with only the valid caps (see spec #5)
   const validationErrors: string[] = [];
-  const validatedFirstMatchCaps = _.compact(
-    strippedAllFirstMatchCaps.map((firstMatchCaps) => {
+  const validatedFirstMatchCaps = strippedAllFirstMatchCaps
+    .map((firstMatchCaps) => {
       try {
         // Validate firstMatch caps
         return shouldValidateCaps
           ? validateCaps(firstMatchCaps, filteredConstraints)
           : firstMatchCaps;
       } catch (e) {
-        validationErrors.push(e.message);
+        validationErrors.push((e as Error).message);
       }
     })
-  ) as Capabilities<C>[];
+    .filter(Boolean) as Capabilities<C>[];
 
   /**
    * Try to merge requiredCaps with first match capabilities, break once it finds its first match
@@ -300,8 +302,8 @@ export function parseCaps<C extends Constraints>(
         break;
       }
     } catch (err) {
-      log.warn(err.message);
-      validationErrors.push(err.message);
+      log.warn((err as Error).message);
+      validationErrors.push((err as Error).message);
     }
   }
 
@@ -330,7 +332,7 @@ export function processCapabilities<
 
   // If we found an error throw an exception
   if (!util.hasValue(matchedCaps)) {
-    if (_.isArray(w3cCaps.firstMatch) && w3cCaps.firstMatch.length > 1) {
+    if (Array.isArray(w3cCaps.firstMatch) && w3cCaps.firstMatch.length > 1) {
       // If there was more than one 'firstMatch' cap, indicate that we couldn't find a matching capabilities set and show all the errors
       throw new errors.InvalidArgumentError(
         `Could not find matching capabilities from ${JSON.stringify(
@@ -356,12 +358,12 @@ export function promoteAppiumOptionsForObject<C extends Constraints>(obj: NSCapa
     return obj;
   }
 
-  if (!_.isPlainObject(appiumOptions)) {
+  if (!util.isPlainObject(appiumOptions)) {
     throw new errors.SessionNotCreatedError(
       `The ${PREFIXED_APPIUM_OPTS_CAP} capability must be an object`
     );
   }
-  if (_.isEmpty(appiumOptions)) {
+  if (util.isEmpty(appiumOptions)) {
     return obj;
   }
 
@@ -374,7 +376,7 @@ export function promoteAppiumOptionsForObject<C extends Constraints>(obj: NSCapa
    */
   const shouldAddVendorPrefix = (capName: string) => !capName.startsWith(APPIUM_VENDOR_PREFIX);
   const verifyIfAcceptable = (capName: string) => {
-    if (!_.isString(capName)) {
+    if (typeof capName !== 'string') {
       throw new errors.SessionNotCreatedError(
         `Capability names in ${PREFIXED_APPIUM_OPTS_CAP} must be strings. '${capName}' is unexpected`
       );
@@ -386,20 +388,23 @@ export function promoteAppiumOptionsForObject<C extends Constraints>(obj: NSCapa
     }
     return capName;
   };
-  const preprocessedOptions = _(appiumOptions)
-    .mapKeys((value, key: string) => verifyIfAcceptable(key))
-    .mapKeys((value, key: string) => (shouldAddVendorPrefix(key) ? `${APPIUM_VENDOR_PREFIX}${key}` : key))
-    .value();
+  const preprocessedOptions: Record<string, unknown> = {};
+  for (const [key, value] of Object.entries(appiumOptions as Record<string, unknown>)) {
+    const verifiedKey = verifyIfAcceptable(key);
+    const finalKey = shouldAddVendorPrefix(verifiedKey) ? `${APPIUM_VENDOR_PREFIX}${verifiedKey}` : verifiedKey;
+    preprocessedOptions[finalKey] = value;
+  }
   // warn if we are going to overwrite any keys on the base caps object
-  const overwrittenKeys = _.intersection(Object.keys(obj), Object.keys(preprocessedOptions));
+  const overwrittenKeys = Object.keys(obj).filter((key) => key in preprocessedOptions);
   if (overwrittenKeys.length > 0) {
     log.warn(
       `Found capabilities inside ${PREFIXED_APPIUM_OPTS_CAP} that will overwrite ` +
         `capabilities at the top level: ${JSON.stringify(overwrittenKeys)}`
     );
   }
-  return _.cloneDeep({
-    ..._.omit(obj, PREFIXED_APPIUM_OPTS_CAP) as NSCapabilities<C>,
+  const restObj = omit(obj, PREFIXED_APPIUM_OPTS_CAP) as NSCapabilities<C>;
+  return structuredClone({
+    ...restObj,
     ...preprocessedOptions,
   });
 }
@@ -411,12 +416,12 @@ export function promoteAppiumOptionsForObject<C extends Constraints>(obj: NSCapa
 export function promoteAppiumOptions<C extends Constraints>(originalCaps: W3CCapabilities<C>): W3CCapabilities<C> {
   const result = {} as W3CCapabilities<C>;
   const {alwaysMatch, firstMatch} = originalCaps;
-  if (_.isPlainObject(alwaysMatch)) {
+  if (util.isPlainObject(alwaysMatch)) {
     result.alwaysMatch = promoteAppiumOptionsForObject(alwaysMatch);
   } else if ('alwaysMatch' in originalCaps) {
     result.alwaysMatch = alwaysMatch;
   }
-  if (_.isArray(firstMatch)) {
+  if (Array.isArray(firstMatch)) {
     result.firstMatch = firstMatch.map(promoteAppiumOptionsForObject);
   } else if ('firstMatch' in originalCaps) {
     result.firstMatch = firstMatch;

package/lib/basedriver/commands/bidi.ts

@@ -1,7 +1,7 @@
+import {util} from '@appium/support';
 import type {Constraints, DriverStatus, IBidiCommands} from '@appium/types';
 import type {BaseDriver} from '../driver';
 import {mixin} from './mixin';
-import _ from 'lodash';
 
 declare module '../driver' {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -36,15 +36,15 @@ const BidiCommands: IBidiCommands = {
 
   async bidiStatus<C extends Constraints>(this: BaseDriver<C>): Promise<DriverStatus> {
     const result = await this.getStatus();
-    if (!_.has(result, 'ready')) {
-      //@ts-ignore This is OK
-      result.ready = true;
-    }
-    if (!_.has(result, 'message')) {
-      //@ts-ignore This is OK
-      result.message = `${this.constructor.name} is ready to accept commands`;
-    }
-    return result as DriverStatus;
+    const base: Record<string, unknown> = util.isPlainObject(result) ? {...result} : {};
+    return {
+      ...base,
+      ready: 'ready' in base ? (base.ready as boolean) : true,
+      message:
+        'message' in base
+          ? (base.message as string)
+          : `${this.constructor.name} is ready to accept commands`,
+    };
   }
 };
 

package/lib/basedriver/commands/event.ts

@@ -1,5 +1,5 @@
-import type {Constraints, IEventCommands} from '@appium/types';
-import _ from 'lodash';
+import type {Constraints, EventHistory, IEventCommands} from '@appium/types';
+import {util} from '@appium/support';
 import type {BaseDriver} from '../driver';
 import {mixin} from './mixin';
 
@@ -16,7 +16,7 @@ const EventCommands: IEventCommands = {
    * separation
    * @param event - the event name
    */
-  async logCustomEvent<C extends Constraints>(this: BaseDriver<C>, vendor: string, event: string) {
+  async logCustomEvent<C extends Constraints>(this: BaseDriver<C>, vendor: string, event: string): Promise<void> {
     this.logEvent(`${vendor}:${event}`);
   },
 
@@ -26,23 +26,24 @@ const EventCommands: IEventCommands = {
    * It returns all events if the type is not provided or empty string/array.
    * @returns the event history log object
    */
-  async getLogEvents<C extends Constraints>(this: BaseDriver<C>, type: string | string[]) {
-    if (_.isEmpty(type)) {
+  async getLogEvents<C extends Constraints>(this: BaseDriver<C>, type: string | string[]): Promise<
+    Partial<EventHistory>
+  > {
+    if (util.isEmpty(type)) {
       return this.eventHistory;
     }
 
-    const typeList = _.castArray(type);
+    const typeList = Array.isArray(type) ? type : [type];
 
-    return _.reduce(
-      this.eventHistory,
-      (acc, eventTimes, eventType) => {
+    return Object.entries(this.eventHistory).reduce<Partial<EventHistory>>(
+      (acc, [eventType, eventTimes]) => {
         if (typeList.includes(eventType)) {
           acc[eventType] = eventTimes;
         }
         return acc;
       },
       {}
-    );
+    ) as Record<string, number>;
   },
 };
 

package/lib/basedriver/commands/execute.ts

@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import {util} from '@appium/support';
 import {errors, validateExecuteMethodParams} from '../../protocol';
 import type {
   Constraints,
@@ -26,8 +26,8 @@ const ExecuteCommands: IExecuteCommands = {
     const Driver = this.constructor as DriverClass<Driver<C>>;
     const commandMetadata = {...Driver.executeMethodMap?.[script]};
     if (!commandMetadata.command) {
-      const availableScripts = _.keys(Driver.executeMethodMap);
-      if (_.isEmpty(availableScripts)) {
+      const availableScripts = Object.keys(Driver.executeMethodMap ?? {});
+      if (util.isEmpty(availableScripts)) {
         throw new errors.UnsupportedOperationError(
           `Unsupported execute method '${script}'. ` +
           `Make sure the installed ${Driver.name} is up-to-date. ` +

package/lib/basedriver/commands/log.ts

@@ -1,5 +1,4 @@
 import type {Constraints, Driver, ILogCommands} from '@appium/types';
-import _ from 'lodash';
 import type {BaseDriver} from '../driver';
 import {mixin} from './mixin';
 
@@ -20,7 +19,9 @@ const LogCommands: ILogCommands = {
     this.log.debug(`Retrieving '${String(logType)}' logs`);
 
     if (!(logType in this.supportedLogTypes)) {
-      const logsTypesWithDescriptions = _.mapValues(this.supportedLogTypes, 'description');
+      const logsTypesWithDescriptions = Object.fromEntries(
+        Object.entries(this.supportedLogTypes).map(([key, value]) => [key, value.description])
+      );
       throw new Error(
         `Unsupported log type '${String(logType)}'. ` +
           `Supported types: ${JSON.stringify(logsTypesWithDescriptions)}`

package/lib/basedriver/commands/timeout.ts

@@ -1,5 +1,4 @@
 import {waitForCondition} from 'asyncbox';
-import _ from 'lodash';
 import {util} from '@appium/support';
 import {errors} from '../../protocol';
 import type {BaseDriver} from '../driver';
@@ -15,7 +14,7 @@ const MIN_TIMEOUT = 0;
 
 const TimeoutCommands: ITimeoutCommands = {
   async timeouts<C extends Constraints>(this: BaseDriver<C>, type, ms, script, pageLoad, implicit) {
-    if (type && _.isString(type) && util.hasValue(ms)) {
+    if (type && typeof type === 'string' && util.hasValue(ms)) {
       // legacy stuff with some Appium-specific additions
       this.log.debug(`Timeout arguments: ${JSON.stringify({type, ms})}}`);
       switch (type) {
@@ -33,7 +32,7 @@ const TimeoutCommands: ITimeoutCommands = {
     }
 
     this.log.debug(`W3C timeout argument: ${JSON.stringify({script, pageLoad, implicit})}}`);
-    if ([script, pageLoad, implicit].every(_.isNil)) {
+    if ([script, pageLoad, implicit].every((value) => value == null)) {
       throw new errors.InvalidArgumentError('W3C protocol expects any of script, pageLoad or implicit to be set');
     }
     if (util.hasValue(script)) {
@@ -82,7 +81,7 @@ const TimeoutCommands: ITimeoutCommands = {
     if (this.managedDrivers?.length) {
       this.log.debug('Setting implicit wait on managed drivers');
       for (const driver of this.managedDrivers) {
-        if (_.isFunction(driver.setImplicitWait)) {
+        if (typeof driver.setImplicitWait === 'function') {
           driver.setImplicitWait(ms);
         }
       }
@@ -95,7 +94,7 @@ const TimeoutCommands: ITimeoutCommands = {
     if (this.managedDrivers?.length) {
       this.log.debug('Setting new command timeout on managed drivers');
       for (const driver of this.managedDrivers) {
-        if (_.isFunction(driver.setNewCommandTimeout)) {
+        if (typeof driver.setNewCommandTimeout === 'function') {
           driver.setNewCommandTimeout(ms);
         }
       }
@@ -122,7 +121,7 @@ const TimeoutCommands: ITimeoutCommands = {
 
   parseTimeoutArgument<C extends Constraints>(this: BaseDriver<C>, ms: number | string) {
     const duration = parseInt(String(ms), 10);
-    if (_.isNaN(duration) || duration < MIN_TIMEOUT) {
+    if (Number.isNaN(duration) || duration < MIN_TIMEOUT) {
       throw new errors.UnknownError(`Invalid timeout value '${ms}'`);
     }
     return duration;

package/lib/basedriver/core.ts

@@ -12,7 +12,7 @@ import type {
   StringRecord,
 } from '@appium/types';
 import AsyncLock from 'async-lock';
-import _ from 'lodash';
+import {util} from '@appium/support';
 import os from 'node:os';
 import {
   DEFAULT_BASE_PATH,
@@ -116,7 +116,7 @@ export class DriverCore<const C extends Constraints, Settings extends StringReco
     this.shouldValidateCaps = shouldValidateCaps;
 
     // keeping track of initial opts
-    this.initialOpts = _.cloneDeep(opts);
+    this.initialOpts = structuredClone(opts);
 
     this.sessionId = null;
     this.helpers = helpers;
@@ -166,7 +166,7 @@ export class DriverCore<const C extends Constraints, Settings extends StringReco
    * inadvertently change data outside of logEvent
    */
   get eventHistory() {
-    return _.cloneDeep(this._eventHistory);
+    return structuredClone(this._eventHistory);
   }
 
   /**
@@ -263,7 +263,7 @@ export class DriverCore<const C extends Constraints, Settings extends StringReco
   isFeatureEnabled(name: string): boolean {
     // automationName comparison is case-insensitive,
     // while feature name is case-sensitive
-    const currentAutomationName = _.toLower(this.opts.automationName);
+    const currentAutomationName = String(this.opts.automationName).toLowerCase();
 
     const parseFullName = (fullName: string) => {
       const separatorPos = fullName.indexOf(FEATURE_NAME_SEPARATOR);
@@ -279,7 +279,7 @@ export class DriverCore<const C extends Constraints, Settings extends StringReco
         );
       }
       return [
-        _.toLower(fullName.substring(0, separatorPos)),
+        fullName.substring(0, separatorPos).toLowerCase(),
         fullName.substring(separatorPos + 1)
       ];
     };
@@ -288,12 +288,12 @@ export class DriverCore<const C extends Constraints, Settings extends StringReco
       [currentAutomationName, ALL_DRIVERS_MATCH].includes(automationName) && featureName === name;
 
     // if we have explicitly denied this feature, return false immediately
-    if (!_.isEmpty(this.denyInsecure) && parseFullNames(this.denyInsecure).some(matches)) {
+    if (!util.isEmpty(this.denyInsecure) && parseFullNames(this.denyInsecure).some(matches)) {
       return false;
     }
 
     // if we specifically have allowed the feature, return true
-    if (!_.isEmpty(this.allowInsecure) && parseFullNames(this.allowInsecure).some(matches)) {
+    if (!util.isEmpty(this.allowInsecure) && parseFullNames(this.allowInsecure).some(matches)) {
       return true;
     }
 
@@ -332,7 +332,7 @@ export class DriverCore<const C extends Constraints, Settings extends StringReco
       validStrategies = validStrategies.concat(this.webLocatorStrategies);
     }
 
-    if (!_.includes(validStrategies, strategy)) {
+    if (!validStrategies.includes(strategy)) {
       throw new errors.InvalidSelectorError(
         `Locator Strategy '${strategy}' is not supported for this session`,
       );
@@ -370,17 +370,17 @@ export class DriverCore<const C extends Constraints, Settings extends StringReco
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   proxyRouteIsAvoided(sessionId: string, method: HTTPMethod, url: string, body?: any): boolean {
     for (const avoidSchema of this.getProxyAvoidList(sessionId)) {
-      if (!_.isArray(avoidSchema) || avoidSchema.length !== 2) {
+      if (!Array.isArray(avoidSchema) || avoidSchema.length !== 2) {
         throw new Error('Proxy avoidance must be a list of pairs');
       }
       const [avoidMethod, avoidPathRegex] = avoidSchema;
-      if (!_.includes(['GET', 'POST', 'DELETE'], avoidMethod)) {
+      if (!['GET', 'POST', 'DELETE'].includes(avoidMethod)) {
         throw new Error(`Unrecognized proxy avoidance method '${avoidMethod}'`);
       }
-      if (!_.isRegExp(avoidPathRegex)) {
+      if (!(avoidPathRegex instanceof RegExp)) {
         throw new Error('Proxy avoidance path must be a regular expression');
       }
-      const normalizedUrl = url.replace(new RegExp(`^${_.escapeRegExp(this.basePath)}`), '');
+      const normalizedUrl = url.replace(new RegExp(`^${util.escapeRegExp(this.basePath)}`), '');
       if (avoidMethod === method && avoidPathRegex.test(normalizedUrl)) {
         return true;
       }

package/lib/basedriver/device-settings.ts

@@ -1,6 +1,5 @@
-import _ from 'lodash';
+import {util, node} from '@appium/support';
 import {log} from './logger';
-import {node, util} from '@appium/support';
 import {errors} from '../protocol/errors';
 import type {StringRecord, IDeviceSettings, SettingsUpdateListener} from '@appium/types';
 
@@ -36,7 +35,7 @@ export class DeviceSettings<T extends StringRecord = StringRecord> implements ID
    * @param newSettings - New settings to merge (must be plain object; total size remains bounded).
    */
   async update(newSettings: T): Promise<void> {
-    if (!_.isPlainObject(newSettings)) {
+    if (!util.isPlainObject(newSettings)) {
       throw new errors.InvalidArgumentError(
         `Settings update should be called with valid JSON. Got ` +
           `${JSON.stringify(newSettings)} instead`
@@ -51,7 +50,7 @@ export class DeviceSettings<T extends StringRecord = StringRecord> implements ID
     }
 
     for (const prop in newSettings) {
-      if (!_.isUndefined(this._settings[prop])) {
+      if (this._settings[prop] !== undefined) {
         if (this._settings[prop] === newSettings[prop]) {
           log.debug(`The value of '${prop}' setting did not change. Skipping the update for it`);
           continue;