@appium/base-driver 10.6.0 → 10.7.0

package/build/lib/utils.js

@@ -5,7 +5,6 @@ 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.
@@ -53,19 +52,4 @@ function pick(obj, keys) {
 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

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":";;AAMA,8CAsBC;AAGD,oBAKC;AAGD,4BAMC;AAGD,oBAMC;AAGD,wBAOC;AAhED,6CAAqC;AAErC;;;GAGG;AACH,SAAgB,iBAAiB,CAC/B,MAAS,EACT,GAAG,OAAsC;IAEzC,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IACvC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;YACnB,SAAS;QACX,CAAC;QACD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAClD,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAc,CAAC,CAAC;YACxC,IAAI,cAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,cAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC9D,MAAM,CAAC,GAAc,CAAC,GAAG,iBAAiB,CACxC,QAAmC,EACnC,KAAgC,CACnB,CAAC;YAClB,CAAC;iBAAM,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC/B,MAAM,CAAC,GAAc,CAAC,GAAG,KAAmB,CAAC;YAC/C,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,wFAAwF;AACxF,SAAgB,IAAI,CAAoC,GAAM,EAAE,GAAW;IACzE,IAAI,CAAC,cAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7B,OAAO,GAAG,CAAC;IACb,CAAC;IACD,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC,CAAM,CAAC;AACjF,CAAC;AAED,4DAA4D;AAC5D,SAAgB,QAAQ,CAAoC,GAAM,EAAE,IAAuB;IACzF,IAAI,CAAC,cAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClD,OAAO,GAAG,CAAC;IACb,CAAC;IACD,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;IACjC,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAM,CAAC;AAC1F,CAAC;AAED,kEAAkE;AAClE,SAAgB,IAAI,CAClB,GAAM,EACN,IAAuB;IAEvB,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;IACjC,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAe,CAAC;AAClG,CAAC;AAED,qEAAqE;AACrE,SAAgB,MAAM,CACpB,GAAM,EACN,SAAuD;IAEvD,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,KAAmB,EAAE,GAAc,CAAC,CAAC,CAC/E,CAAC;AAClB,CAAC"}

package/lib/basedriver/capabilities.ts

@@ -5,10 +5,7 @@ import type {
   W3CCapabilities,
   StandardCapabilities,
 } from '@appium/types';
-import type {
-  KeyAsString,
-  MergeExclusive,
-} from 'type-fest';
+import type {KeyAsString, MergeExclusive} from 'type-fest';
 import {validator} from './validation';
 import {util} from '@appium/support';
 import {omit, pickBy} from '../utils';
@@ -39,22 +36,22 @@ export function mergeCaps<
   T extends Constraints,
   U extends Constraints,
   Primary extends Capabilities<T>,
-  Secondary extends Capabilities<U>
+  Secondary extends Capabilities<U>,
 >(
   primary: Primary | undefined = {} as Primary,
-  secondary: Secondary | undefined = {} as Secondary
+  secondary: Secondary | undefined = {} as Secondary,
 ): MergeExclusive<Primary, Secondary> {
-  const result = ({
+  const result = {
     ...primary,
-  }) as MergeExclusive<Primary, Secondary>;
+  } as MergeExclusive<Primary, Secondary>;
 
   for (const [name, value] of Object.entries(secondary)) {
     // Overwriting is not allowed. Primary and secondary must have different properties (w3c rule 4.4)
     if (primary[name] !== undefined) {
       throw new errors.InvalidArgumentError(
         `property '${name}' should not exist on both primary (${JSON.stringify(
-          primary
-        )}) and secondary (${JSON.stringify(secondary)}) object`
+          primary,
+        )}) and secondary (${JSON.stringify(secondary)}) object`,
       );
     }
     result[name as keyof typeof result] = value;
@@ -69,7 +66,7 @@ export function mergeCaps<
 export function validateCaps<C extends Constraints>(
   caps: Capabilities<C>,
   constraints: C | undefined = {} as C,
-  opts: ValidateCapsOpts | undefined = {}
+  opts: ValidateCapsOpts | undefined = {},
 ): Capabilities<C> {
   const {skipPresenceConstraint} = opts;
 
@@ -84,21 +81,27 @@ export function validateCaps<C extends Constraints>(
         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,
+          {
+            ...omit(constraint as Record<string, unknown>, 'presence'),
+            presence: {allowEmpty: false},
+          },
+        ];
       }
       return [key, constraint];
-    })
+    }),
   ) as C;
 
   const validationErrors = validator.validate(
     pickBy(caps, (value) => util.hasValue(value)),
-    constraints
+    constraints,
   );
 
   if (validationErrors) {
     const message: string[] = [];
     for (const [attribute, reasons] of Object.entries(validationErrors)) {
-      for (const reason of (reasons as string[])) {
+      for (const reason of reasons as string[]) {
         message.push(`'${attribute}' ${reason}`);
       }
     }
@@ -114,22 +117,20 @@ export function validateCaps<C extends Constraints>(
  * @see https://www.w3.org/TR/webdriver2/#dfn-table-of-standard-capabilities)
  */
 export const STANDARD_CAPS = Object.freeze(
-  new Set(
-    ([
-      'browserName',
-      'browserVersion',
-      'platformName',
-      'acceptInsecureCerts',
-      'pageLoadStrategy',
-      'proxy',
-      'setWindowRect',
-      'timeouts',
-      'strictFileInteractability',
-      'unhandledPromptBehavior',
-      'userAgent',
-      'webSocketUrl',
-    ]) as KeyAsString<StandardCapabilities>[]
-  )
+  new Set([
+    'browserName',
+    'browserVersion',
+    'platformName',
+    'acceptInsecureCerts',
+    'pageLoadStrategy',
+    'proxy',
+    'setWindowRect',
+    'timeouts',
+    'strictFileInteractability',
+    'unhandledPromptBehavior',
+    'userAgent',
+    'webSocketUrl',
+  ] as KeyAsString<StandardCapabilities>[]),
 );
 
 const STANDARD_CAPS_LOWER = new Set([...STANDARD_CAPS].map((cap) => cap.toLowerCase()));
@@ -147,7 +148,9 @@ export function isStandardCap(cap: string): boolean {
  * @see https://www.w3.org/TR/webdriver/#dfn-extension-capabilities
  * @internal
  */
-export function stripAppiumPrefixes<C extends Constraints>(caps: NSCapabilities<C>): Capabilities<C> {
+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 capKeys = Object.keys(caps);
@@ -156,13 +159,15 @@ export function stripAppiumPrefixes<C extends Constraints>(caps: NSCapabilities<
 
   // initialize this with the k/v pairs of the non-prefixed caps
   const strippedCaps: Record<string, unknown> = Object.fromEntries(
-    nonPrefixedCaps.map((cap) => [cap, caps[cap as keyof typeof caps]])
+    nonPrefixedCaps.map((cap) => [cap, caps[cap as keyof typeof caps]]),
   ) as Capabilities<C>;
   const badPrefixedCaps: string[] = [];
 
   // Strip out the 'appium:' prefix
   for (const prefixedCap of prefixedCaps) {
-    const strippedCapName = prefixedCap.substring(APPIUM_VENDOR_PREFIX.length) as KeyAsString<Capabilities<C>>;
+    const strippedCapName = prefixedCap.substring(APPIUM_VENDOR_PREFIX.length) as KeyAsString<
+      Capabilities<C>
+    >;
 
     // If it's standard capability that was prefixed, add it to an array of incorrectly prefixed capabilities
     if (isStandardCap(strippedCapName)) {
@@ -172,7 +177,7 @@ export function stripAppiumPrefixes<C extends Constraints>(caps: NSCapabilities<
       } else {
         log.warn(
           `Ignoring capability '${prefixedCap}=${caps[prefixedCap as keyof typeof caps]}' and ` +
-            `using capability '${strippedCapName}=${strippedCaps[strippedCapName]}'`
+            `using capability '${strippedCapName}=${strippedCaps[strippedCapName]}'`,
         );
       }
     } else {
@@ -184,8 +189,8 @@ export function stripAppiumPrefixes<C extends Constraints>(caps: NSCapabilities<
   if (badPrefixedCaps.length > 0) {
     log.warn(
       `The capabilities ${JSON.stringify(
-        badPrefixedCaps
-      )} are standard capabilities and do not require "appium:" prefix`
+        badPrefixedCaps,
+      )} are standard capabilities and do not require "appium:" prefix`,
     );
   }
   return strippedCaps as Capabilities<C>;
@@ -194,20 +199,18 @@ export function stripAppiumPrefixes<C extends Constraints>(caps: NSCapabilities<
 /**
  * Get an array of all the unprefixed caps that are being used in 'alwaysMatch' and all of the 'firstMatch' object
  */
-export function findNonPrefixedCaps<C extends Constraints>(
-  {
-    alwaysMatch = {},
-    firstMatch = []
-  }: W3CCapabilities<C>
-): string[] {
+export function findNonPrefixedCaps<C extends Constraints>({
+  alwaysMatch = {},
+  firstMatch = [],
+}: W3CCapabilities<C>): string[] {
   return util.uniq(
     [alwaysMatch, ...firstMatch].reduce<string[]>(
       (unprefixedCaps, caps) => [
         ...unprefixedCaps,
         ...Object.keys(caps).filter((cap) => !cap.includes(':') && !isStandardCap(cap)),
       ],
-      []
-    )
+      [],
+    ),
   );
 }
 
@@ -218,12 +221,12 @@ export function findNonPrefixedCaps<C extends Constraints>(
 export function parseCaps<C extends Constraints>(
   caps: W3CCapabilities<C>,
   constraints: C | undefined = {} as C,
-  shouldValidateCaps: boolean | undefined = true
+  shouldValidateCaps: boolean | undefined = true,
 ): ParsedCaps<C> {
   // If capabilities request is not an object, return error (#1.1)
   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.'
+      'The capabilities argument was not valid for the following reason(s): "capabilities" must be a JSON object.',
     );
   }
 
@@ -237,7 +240,7 @@ export function parseCaps<C extends Constraints>(
   // Reject 'firstMatch' argument if it's not an array (#3.2)
   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'
+      'The capabilities.firstMatch argument was not valid for the following reason(s): "capabilities.firstMatch" must be a JSON array or undefined',
     );
   }
 
@@ -246,7 +249,7 @@ export function parseCaps<C extends Constraints>(
   if (allFirstMatchCaps.length === 0) {
     log.warn(
       `The firstMatch array in the given capabilities has no entries. Adding an empty entry for now, ` +
-        `but it will require one or more entries as W3C spec.`
+        `but it will require one or more entries as W3C spec.`,
     );
     allFirstMatchCaps.push({});
   }
@@ -255,7 +258,7 @@ export function parseCaps<C extends Constraints>(
   const nonPrefixedCaps = findNonPrefixedCaps(caps);
   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}`
+      `All non-standard capabilities should have a vendor prefix. The following capabilities did not have one: ${nonPrefixedCaps}`,
     );
   }
 
@@ -272,7 +275,7 @@ 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 = Object.fromEntries(
-    Object.entries(constraints ?? {}).filter(([key]) => !(key in strippedRequiredCaps))
+    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)
@@ -320,13 +323,10 @@ export function parseCaps<C extends Constraints>(
 /**
  * Calls parseCaps and just returns the matchedCaps variable
  */
-export function processCapabilities<
-  C extends Constraints,
-  W3CCaps extends W3CCapabilities<C>
->(
+export function processCapabilities<C extends Constraints, W3CCaps extends W3CCapabilities<C>>(
   w3cCaps: W3CCaps,
   constraints: C | undefined = {} as C,
-  shouldValidateCaps: boolean | undefined = true
+  shouldValidateCaps: boolean | undefined = true,
 ): Capabilities<C> {
   const {matchedCaps, validationErrors} = parseCaps(w3cCaps, constraints, shouldValidateCaps);
 
@@ -336,8 +336,8 @@ export function processCapabilities<
       // 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(
-          w3cCaps
-        )}:\n ${validationErrors.join('\n')}`
+          w3cCaps,
+        )}:\n ${validationErrors.join('\n')}`,
       );
     } else {
       // Otherwise, just show the singular error message
@@ -352,7 +352,9 @@ export function processCapabilities<
  * Return a copy of a "bare" (single-level, non-W3C) capabilities object which has taken everything
  * within the 'appium:options' capability and promoted it to the top level.
  */
-export function promoteAppiumOptionsForObject<C extends Constraints>(obj: NSCapabilities<C>): NSCapabilities<C> {
+export function promoteAppiumOptionsForObject<C extends Constraints>(
+  obj: NSCapabilities<C>,
+): NSCapabilities<C> {
   const appiumOptions = obj[PREFIXED_APPIUM_OPTS_CAP];
   if (!appiumOptions) {
     return obj;
@@ -360,7 +362,7 @@ export function promoteAppiumOptionsForObject<C extends Constraints>(obj: NSCapa
 
   if (!util.isPlainObject(appiumOptions)) {
     throw new errors.SessionNotCreatedError(
-      `The ${PREFIXED_APPIUM_OPTS_CAP} capability must be an object`
+      `The ${PREFIXED_APPIUM_OPTS_CAP} capability must be an object`,
     );
   }
   if (util.isEmpty(appiumOptions)) {
@@ -368,7 +370,7 @@ export function promoteAppiumOptionsForObject<C extends Constraints>(obj: NSCapa
   }
 
   log.debug(
-    `Found ${PREFIXED_APPIUM_OPTS_CAP} capability present; will promote items inside to caps`
+    `Found ${PREFIXED_APPIUM_OPTS_CAP} capability present; will promote items inside to caps`,
   );
 
   /**
@@ -378,12 +380,12 @@ export function promoteAppiumOptionsForObject<C extends Constraints>(obj: NSCapa
   const verifyIfAcceptable = (capName: string) => {
     if (typeof capName !== 'string') {
       throw new errors.SessionNotCreatedError(
-        `Capability names in ${PREFIXED_APPIUM_OPTS_CAP} must be strings. '${capName}' is unexpected`
+        `Capability names in ${PREFIXED_APPIUM_OPTS_CAP} must be strings. '${capName}' is unexpected`,
       );
     }
     if (isStandardCap(capName)) {
       throw new errors.SessionNotCreatedError(
-        `${PREFIXED_APPIUM_OPTS_CAP} must only contain vendor-specific capabilities. '${capName}' is unexpected`
+        `${PREFIXED_APPIUM_OPTS_CAP} must only contain vendor-specific capabilities. '${capName}' is unexpected`,
       );
     }
     return capName;
@@ -391,7 +393,9 @@ export function promoteAppiumOptionsForObject<C extends Constraints>(obj: NSCapa
   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;
+    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
@@ -399,7 +403,7 @@ export function promoteAppiumOptionsForObject<C extends Constraints>(obj: NSCapa
   if (overwrittenKeys.length > 0) {
     log.warn(
       `Found capabilities inside ${PREFIXED_APPIUM_OPTS_CAP} that will overwrite ` +
-        `capabilities at the top level: ${JSON.stringify(overwrittenKeys)}`
+        `capabilities at the top level: ${JSON.stringify(overwrittenKeys)}`,
     );
   }
   const restObj = omit(obj, PREFIXED_APPIUM_OPTS_CAP) as NSCapabilities<C>;
@@ -413,7 +417,9 @@ export function promoteAppiumOptionsForObject<C extends Constraints>(obj: NSCapa
  * Return a copy of a capabilities object which has taken everything within the 'options'
  * capability and promoted it to the top level.
  */
-export function promoteAppiumOptions<C extends Constraints>(originalCaps: W3CCapabilities<C>): W3CCapabilities<C> {
+export function promoteAppiumOptions<C extends Constraints>(
+  originalCaps: W3CCapabilities<C>,
+): W3CCapabilities<C> {
   const result = {} as W3CCapabilities<C>;
   const {alwaysMatch, firstMatch} = originalCaps;
   if (util.isPlainObject(alwaysMatch)) {

package/lib/basedriver/commands/bidi.ts

@@ -45,7 +45,7 @@ const BidiCommands: IBidiCommands = {
           ? (base.message as string)
           : `${this.constructor.name} is ready to accept commands`,
     };
-  }
+  },
 };
 
 mixin(BidiCommands);

package/lib/basedriver/commands/event.ts

@@ -16,7 +16,11 @@ const EventCommands: IEventCommands = {
    * separation
    * @param event - the event name
    */
-  async logCustomEvent<C extends Constraints>(this: BaseDriver<C>, vendor: string, event: string): Promise<void> {
+  async logCustomEvent<C extends Constraints>(
+    this: BaseDriver<C>,
+    vendor: string,
+    event: string,
+  ): Promise<void> {
     this.logEvent(`${vendor}:${event}`);
   },
 
@@ -26,9 +30,10 @@ 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[]): Promise<
-    Partial<EventHistory>
-  > {
+  async getLogEvents<C extends Constraints>(
+    this: BaseDriver<C>,
+    type: string | string[],
+  ): Promise<Partial<EventHistory>> {
     if (util.isEmpty(type)) {
       return this.eventHistory;
     }
@@ -42,7 +47,7 @@ const EventCommands: IEventCommands = {
         }
         return acc;
       },
-      {}
+      {},
     ) as Record<string, number>;
   },
 };

package/lib/basedriver/commands/execute.ts

@@ -17,11 +17,11 @@ declare module '../driver' {
   interface BaseDriver<C extends Constraints> extends IExecuteCommands {}
 }
 
-const ExecuteCommands: IExecuteCommands = {
+const ExecuteCommands = {
   async executeMethod<C extends Constraints>(
     this: BaseDriver<C>,
     script: string,
-    protoArgs: readonly [StringRecord<unknown>] | readonly unknown[]
+    protoArgs: readonly [StringRecord<unknown>] | readonly unknown[],
   ) {
     const Driver = this.constructor as DriverClass<Driver<C>>;
     const commandMetadata = {...Driver.executeMethodMap?.[script]};
@@ -30,18 +30,21 @@ const ExecuteCommands: IExecuteCommands = {
       if (util.isEmpty(availableScripts)) {
         throw new errors.UnsupportedOperationError(
           `Unsupported execute method '${script}'. ` +
-          `Make sure the installed ${Driver.name} is up-to-date. ` +
-          `The current driver version does not define any execute methods.`
+            `Make sure the installed ${Driver.name} is up-to-date. ` +
+            `The current driver version does not define any execute methods.`,
         );
       }
-      const {sorted: sortedMatches, suggestion} = rankLevenshteinCandidates(script, availableScripts);
+      const {sorted: sortedMatches, suggestion} = rankLevenshteinCandidates(
+        script,
+        availableScripts,
+      );
       throw new errors.UnsupportedOperationError(
         (suggestion
           ? `Unsupported execute method '${script}', did you mean '${suggestion}'? `
           : `Unsupported execute method '${script}'. `) +
-        `Make sure the installed ${Driver.name} is up-to-date. ` +
-        `Execute methods available in the current driver version are: ` +
-        sortedMatches.join(', ')
+          `Make sure the installed ${Driver.name} is up-to-date. ` +
+          `Execute methods available in the current driver version are: ` +
+          sortedMatches.join(', '),
       );
     }
     const args = validateExecuteMethodParams(protoArgs as any[], commandMetadata.params);
@@ -49,6 +52,6 @@ const ExecuteCommands: IExecuteCommands = {
     const command = this[commandName] as DriverCommand;
     return await command.call(this, ...args);
   },
-};
+} as IExecuteCommands;
 
 mixin(ExecuteCommands);

package/lib/basedriver/commands/find.ts

@@ -5,7 +5,6 @@ import type {BaseDriver} from '../driver';
 import {mixin} from './mixin';
 
 declare module '../driver' {
-
   interface BaseDriver<C extends Constraints> extends IFindCommands {}
 }
 
@@ -14,21 +13,21 @@ async function findElOrEls<C extends Constraints>(
   strategy: string,
   selector: string,
   mult: true,
-  context?: any
+  context?: any,
 ): Promise<Element[]>;
 async function findElOrEls<C extends Constraints>(
   this: BaseDriver<C>,
   strategy: string,
   selector: string,
   mult: false,
-  context?: any
+  context?: any,
 ): Promise<Element>;
 async function findElOrEls<C extends Constraints>(
   this: BaseDriver<C>,
   strategy: string,
   selector: string,
   mult: boolean,
-  context?: any
+  context?: any,
 ): Promise<Element[] | Element> {
   throw new errors.NotImplementedError('Not implemented yet for find.');
 }
@@ -38,21 +37,21 @@ async function findElOrElsWithProcessing<C extends Constraints>(
   strategy: string,
   selector: string,
   mult: true,
-  context?: any
+  context?: any,
 ): Promise<Element[]>;
 async function findElOrElsWithProcessing<C extends Constraints>(
   this: BaseDriver<C>,
   strategy: string,
   selector: string,
   mult: false,
-  context?: any
+  context?: any,
 ): Promise<Element>;
 async function findElOrElsWithProcessing<C extends Constraints>(
   this: BaseDriver<C>,
   strategy: string,
   selector: string,
   mult: boolean,
-  context?: any
+  context?: any,
 ): Promise<Element[] | Element> {
   this.validateLocatorStrategy(strategy);
   try {
@@ -61,7 +60,8 @@ async function findElOrElsWithProcessing<C extends Constraints>(
   } catch (err) {
     if (this.opts.printPageSourceOnFindFailure) {
       const src = await this.getPageSource();
-      this.log.debug(`Error finding element${mult ? 's' : ''}: ${err.message}`);
+      const message = err instanceof Error ? err.message : String(err);
+      this.log.debug(`Error finding element${mult ? 's' : ''}: ${message}`);
       this.log.debug(`Page source requested through 'printPageSourceOnFindFailure':`);
       this.log.debug(src);
     }
@@ -71,11 +71,19 @@ async function findElOrElsWithProcessing<C extends Constraints>(
 }
 
 const FindCommands: IFindCommands = {
-  async findElement<C extends Constraints>(this: BaseDriver<C>, strategy, selector) {
+  async findElement<C extends Constraints>(
+    this: BaseDriver<C>,
+    strategy: string,
+    selector: string,
+  ) {
     return await this.findElOrElsWithProcessing(strategy, selector, false);
   },
 
-  async findElements<C extends Constraints>(this: BaseDriver<C>, strategy, selector) {
+  async findElements<C extends Constraints>(
+    this: BaseDriver<C>,
+    strategy: string,
+    selector: string,
+  ) {
     return await this.findElOrElsWithProcessing(strategy, selector, true);
   },
 
@@ -83,7 +91,7 @@ const FindCommands: IFindCommands = {
     this: BaseDriver<C>,
     strategy: string,
     selector: string,
-    elementId: string
+    elementId: string,
   ) {
     return await this.findElOrElsWithProcessing(strategy, selector, false, elementId);
   },
@@ -92,7 +100,7 @@ const FindCommands: IFindCommands = {
     this: BaseDriver<C>,
     strategy: string,
     selector: string,
-    elementId: string
+    elementId: string,
   ) {
     return await this.findElOrElsWithProcessing(strategy, selector, true, elementId);
   },

package/lib/basedriver/commands/log.ts

@@ -20,11 +20,11 @@ const LogCommands: ILogCommands = {
 
     if (!(logType in this.supportedLogTypes)) {
       const logsTypesWithDescriptions = Object.fromEntries(
-        Object.entries(this.supportedLogTypes).map(([key, value]) => [key, value.description])
+        Object.entries(this.supportedLogTypes).map(([key, value]) => [key, value.description]),
       );
       throw new Error(
         `Unsupported log type '${String(logType)}'. ` +
-          `Supported types: ${JSON.stringify(logsTypesWithDescriptions)}`
+          `Supported types: ${JSON.stringify(logsTypesWithDescriptions)}`,
       );
     }
 

package/lib/basedriver/commands/timeout.ts

@@ -13,19 +13,26 @@ declare module '../driver' {
 const MIN_TIMEOUT = 0;
 
 const TimeoutCommands: ITimeoutCommands = {
-  async timeouts<C extends Constraints>(this: BaseDriver<C>, type, ms, script, pageLoad, implicit) {
+  async timeouts<C extends Constraints>(
+    this: BaseDriver<C>,
+    type?: string,
+    ms?: number | string,
+    script?: number,
+    pageLoad?: number,
+    implicit?: number,
+  ) {
     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) {
         case 'command':
-          return void (await this.newCommandTimeout(ms));
+          return void (await this.newCommandTimeout(this.parseTimeoutArgument(ms)));
         case 'implicit':
-          return void (await this.implicitWaitW3C(ms));
+          return void (await this.implicitWaitW3C(this.parseTimeoutArgument(ms)));
         case 'page load':
-          return void (await this.pageLoadTimeoutW3C(ms));
+          return void (await this.pageLoadTimeoutW3C(this.parseTimeoutArgument(ms)));
         case 'script':
-          return void (await this.scriptTimeoutW3C(ms));
+          return void (await this.scriptTimeoutW3C(this.parseTimeoutArgument(ms)));
         default:
           throw new Error(`'${type}' type is not supported for the timeout API`);
       }
@@ -33,7 +40,9 @@ const TimeoutCommands: ITimeoutCommands = {
 
     this.log.debug(`W3C timeout argument: ${JSON.stringify({script, pageLoad, implicit})}}`);
     if ([script, pageLoad, implicit].every((value) => value == null)) {
-      throw new errors.InvalidArgumentError('W3C protocol expects any of script, pageLoad or implicit to be set');
+      throw new errors.InvalidArgumentError(
+        'W3C protocol expects any of script, pageLoad or implicit to be set',
+      );
     }
     if (util.hasValue(script)) {
       await this.scriptTimeoutW3C(script);
@@ -46,7 +55,7 @@ const TimeoutCommands: ITimeoutCommands = {
     }
   },
 
-  async getTimeouts() {
+  async getTimeouts<C extends Constraints>(this: BaseDriver<C>) {
     return {
       command: this.newCommandTimeoutMs,
       implicit: this.implicitWaitMs,
@@ -103,7 +112,7 @@ const TimeoutCommands: ITimeoutCommands = {
 
   async implicitWaitForCondition<C extends Constraints>(
     this: BaseDriver<C>,
-    condFn: (...args: any[]) => Promise<any>
+    condFn: (...args: any[]) => Promise<any>,
   ) {
     this.log.debug(`Waiting up to ${this.implicitWaitMs} ms for condition`);
     const wrappedCondFn = async (...args: any[]) => {