@appium/base-driver 9.3.2 → 9.3.4

package/build/lib/basedriver/commands/settings.d.ts

@@ -1,10 +1,6 @@
-/**
- * @template {Constraints} C
- * @param {import('./log').LogBase<C>} Base
- * @returns {SettingsBase<C>}
- */
-export function SettingsMixin<C extends Readonly<Record<string, import("@appium/types").Constraint>>>(Base: import("./log").LogBase<C>): SettingsBase<C>;
-export type Constraints = import('@appium/types').Constraints;
-export type ISettingsCommands = import('@appium/types').ISettingsCommands;
-export type SettingsBase<C extends Readonly<Record<string, import("@appium/types").Constraint>>> = import('../driver').BaseDriverBase<C, import('@appium/types').ITimeoutCommands & import('@appium/types').IEventCommands & import('@appium/types').IFindCommands & import('@appium/types').ILogCommands<C> & ISettingsCommands>;
+import { Constraints, ISettingsCommands } from '@appium/types';
+declare module '../driver' {
+    interface BaseDriver<C extends Constraints> extends ISettingsCommands {
+    }
+}
 //# sourceMappingURL=settings.d.ts.map

package/build/lib/basedriver/commands/settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../../../lib/basedriver/commands/settings.js"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,yJAqBC;0BAGY,OAAO,eAAe,EAAE,WAAW;gCACnC,OAAO,eAAe,EAAE,iBAAiB;mGAIzC,OAAO,WAAW,EAAE,cAAc,CAAC,CAAC,EAAE,OAAO,eAAe,EAAE,gBAAgB,GAAG,OAAO,eAAe,EAAE,cAAc,GAAG,OAAO,eAAe,EAAE,aAAa,GAAG,OAAO,eAAe,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,iBAAiB,CAAC"}
+{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../../../lib/basedriver/commands/settings.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAE,iBAAiB,EAAe,MAAM,eAAe,CAAC;AAG3E,OAAO,QAAQ,WAAW,CAAC;IAEzB,UAAU,UAAU,CAAC,CAAC,SAAS,WAAW,CAAE,SAAQ,iBAAiB;KAAG;CACzE"}

package/build/lib/basedriver/commands/settings.js

@@ -1,39 +1,19 @@
 "use strict";
-// @ts-check
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SettingsMixin = void 0;
-/**
- * @template {Constraints} C
- * @param {import('./log').LogBase<C>} Base
- * @returns {SettingsBase<C>}
- */
-function SettingsMixin(Base) {
-    /**
-     * @implements {ISettingsCommands}
-     */
-    class SettingsCommands extends Base {
-        async updateSettings(newSettings) {
-            if (!this.settings) {
-                this.log.errorAndThrow('Cannot update settings; settings object not found');
-            }
-            return await this.settings.update(newSettings);
+const mixin_1 = require("./mixin");
+const SettingsCommands = {
+    async updateSettings(newSettings) {
+        if (!this.settings) {
+            this.log.errorAndThrow('Cannot update settings; settings object not found');
         }
-        async getSettings() {
-            if (!this.settings) {
-                this.log.errorAndThrow('Cannot get settings; settings object not found');
-            }
-            return await this.settings.getSettings();
+        return await this.settings.update(newSettings);
+    },
+    async getSettings() {
+        if (!this.settings) {
+            this.log.errorAndThrow('Cannot get settings; settings object not found');
         }
-    }
-    return SettingsCommands;
-}
-exports.SettingsMixin = SettingsMixin;
-/**
- * @typedef {import('@appium/types').Constraints} Constraints
- * @typedef {import('@appium/types').ISettingsCommands} ISettingsCommands
- */
-/**
- * @template {Constraints} C
- * @typedef {import('../driver').BaseDriverBase<C, import('@appium/types').ITimeoutCommands & import('@appium/types').IEventCommands & import('@appium/types').IFindCommands & import('@appium/types').ILogCommands<C> & ISettingsCommands>} SettingsBase
- */
+        return this.settings.getSettings();
+    },
+};
+(0, mixin_1.mixin)(SettingsCommands);
 //# sourceMappingURL=settings.js.map

package/build/lib/basedriver/commands/settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/settings.js"],"names":[],"mappings":";AAAA,YAAY;;;AAEZ;;;;GAIG;AACH,SAAgB,aAAa,CAAC,IAAI;IAChC;;OAEG;IACH,MAAM,gBAAiB,SAAQ,IAAI;QACjC,KAAK,CAAC,cAAc,CAAC,WAAW;YAC9B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAClB,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,mDAAmD,CAAC,CAAC;aAC7E;YACD,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACjD,CAAC;QAED,KAAK,CAAC,WAAW;YACf,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAClB,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,gDAAgD,CAAC,CAAC;aAC1E;YACD,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;QAC3C,CAAC;KACF;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AArBD,sCAqBC;AAED;;;GAGG;AACH;;;GAGG"}
+{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/settings.ts"],"names":[],"mappings":";;AAEA,mCAA8B;AAO9B,MAAM,gBAAgB,GAAsB;IAC1C,KAAK,CAAC,cAAc,CAA6C,WAAyB;QACxF,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,mDAAmD,CAAC,CAAC;SAC7E;QACD,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,WAAW;QACf,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,gDAAgD,CAAC,CAAC;SAC1E;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;IACrC,CAAC;CACF,CAAC;AAEF,IAAA,aAAK,EAAC,gBAAgB,CAAC,CAAC"}

package/build/lib/basedriver/commands/timeout.d.ts

@@ -1,10 +1,6 @@
-/**
- * @template {Constraints} C
- * @param {import('../driver').BaseDriverBase<C>} Base
- * @returns {TimeoutBase<C>}
- */
-export function TimeoutMixin<C extends Readonly<Record<string, import("@appium/types").Constraint>>>(Base: import("../driver").BaseDriverBase<C, {}, {}>): TimeoutBase<C>;
-export type ITimeoutCommands = import('@appium/types').ITimeoutCommands;
-export type Constraints = import('@appium/types').Constraints;
-export type TimeoutBase<C extends Readonly<Record<string, import("@appium/types").Constraint>>> = import('../driver').BaseDriverBase<C, ITimeoutCommands>;
+import { Constraints, ITimeoutCommands } from '@appium/types';
+declare module '../driver' {
+    interface BaseDriver<C extends Constraints> extends ITimeoutCommands {
+    }
+}
 //# sourceMappingURL=timeout.d.ts.map

package/build/lib/basedriver/commands/timeout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"timeout.d.ts","sourceRoot":"","sources":["../../../../lib/basedriver/commands/timeout.js"],"names":[],"mappings":"AAWA;;;;GAIG;AACH,0KA6IC;+BAGY,OAAO,eAAe,EAAE,gBAAgB;0BACxC,OAAO,eAAe,EAAE,WAAW;kGAKnC,OAAO,WAAW,EAAE,cAAc,CAAC,CAAC,EAAE,gBAAgB,CAAC"}
+{"version":3,"file":"timeout.d.ts","sourceRoot":"","sources":["../../../../lib/basedriver/commands/timeout.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,WAAW,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAG5D,OAAO,QAAQ,WAAW,CAAC;IAEzB,UAAU,UAAU,CAAC,CAAC,SAAS,WAAW,CAAE,SAAQ,gBAAgB;KAAG;CACxE"}

package/build/lib/basedriver/commands/timeout.js

@@ -1,152 +1,130 @@
 "use strict";
-// @ts-check
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TimeoutMixin = void 0;
-/* eslint-disable no-unused-vars */
-/* eslint-disable require-await */
 const asyncbox_1 = require("asyncbox");
 const lodash_1 = __importDefault(require("lodash"));
 const support_1 = require("@appium/support");
 const protocol_1 = require("../../protocol");
+const mixin_1 = require("./mixin");
 const MIN_TIMEOUT = 0;
-/**
- * @template {Constraints} C
- * @param {import('../driver').BaseDriverBase<C>} Base
- * @returns {TimeoutBase<C>}
- */
-function TimeoutMixin(Base) {
-    /**
-     * @implements {ITimeoutCommands}
-     */
-    class TimeoutCommands extends Base {
-        async timeouts(type, ms, script, pageLoad, implicit) {
-            if (support_1.util.hasValue(type) && support_1.util.hasValue(ms)) {
-                this.log.debug(`MJSONWP timeout arguments: ${JSON.stringify({ type, ms })}}`);
-                switch (type) {
-                    case 'command':
-                        await this.newCommandTimeout(ms);
-                        return;
-                    case 'implicit':
-                        await this.implicitWaitMJSONWP(ms);
-                        return;
-                    case 'page load':
-                        await this.pageLoadTimeoutMJSONWP(ms);
-                        return;
-                    case 'script':
-                        await this.scriptTimeoutMJSONWP(ms);
-                        return;
-                    default:
-                        throw new Error(`'${type}' type is not supported for MJSONWP timeout`);
-                }
-            }
-            // Otherwise assume it is W3C protocol
-            this.log.debug(`W3C timeout argument: ${JSON.stringify({
-                script,
-                pageLoad,
-                implicit,
-            })}}`);
-            if (support_1.util.hasValue(script)) {
-                await this.scriptTimeoutW3C(script);
-            }
-            if (support_1.util.hasValue(pageLoad)) {
-                await this.pageLoadTimeoutW3C(pageLoad);
-            }
-            if (support_1.util.hasValue(implicit)) {
-                await this.implicitWaitW3C(implicit);
+const TimeoutCommands = {
+    async timeouts(type, ms, script, pageLoad, implicit) {
+        if (support_1.util.hasValue(type) && support_1.util.hasValue(ms)) {
+            this.log.debug(`MJSONWP timeout arguments: ${JSON.stringify({ type, ms })}}`);
+            switch (type) {
+                case 'command':
+                    await this.newCommandTimeout(ms);
+                    return;
+                case 'implicit':
+                    await this.implicitWaitMJSONWP(ms);
+                    return;
+                case 'page load':
+                    await this.pageLoadTimeoutMJSONWP(ms);
+                    return;
+                case 'script':
+                    await this.scriptTimeoutMJSONWP(ms);
+                    return;
+                default:
+                    throw new Error(`'${type}' type is not supported for MJSONWP timeout`);
             }
         }
-        async getTimeouts() {
-            return {
-                command: this.newCommandTimeoutMs,
-                implicit: this.implicitWaitMs,
-            };
-        }
-        // implicit
-        async implicitWaitW3C(ms) {
-            await this.implicitWait(ms);
-        }
-        async implicitWaitMJSONWP(ms) {
-            await this.implicitWait(ms);
-        }
-        async implicitWait(ms) {
-            await this.setImplicitWait(this.parseTimeoutArgument(ms));
+        // Otherwise assume it is W3C protocol
+        this.log.debug(`W3C timeout argument: ${JSON.stringify({
+            script,
+            pageLoad,
+            implicit,
+        })}}`);
+        if (support_1.util.hasValue(script)) {
+            await this.scriptTimeoutW3C(script);
         }
-        // pageLoad
-        async pageLoadTimeoutW3C(ms) {
-            throw new protocol_1.errors.NotImplementedError('Not implemented yet for pageLoad.');
+        if (support_1.util.hasValue(pageLoad)) {
+            await this.pageLoadTimeoutW3C(pageLoad);
         }
-        async pageLoadTimeoutMJSONWP(ms) {
-            throw new protocol_1.errors.NotImplementedError('Not implemented yet for pageLoad.');
+        if (support_1.util.hasValue(implicit)) {
+            await this.implicitWaitW3C(implicit);
         }
-        // script
-        async scriptTimeoutW3C(ms) {
-            throw new protocol_1.errors.NotImplementedError('Not implemented yet for script.');
-        }
-        async scriptTimeoutMJSONWP(ms) {
-            throw new protocol_1.errors.NotImplementedError('Not implemented yet for script.');
-        }
-        // command
-        async newCommandTimeout(ms) {
-            this.setNewCommandTimeout(this.parseTimeoutArgument(ms));
-        }
-        setImplicitWait(ms) {
-            // eslint-disable-line require-await
-            this.implicitWaitMs = ms;
-            this.log.debug(`Set implicit wait to ${ms}ms`);
-            if (this.managedDrivers && this.managedDrivers.length) {
-                this.log.debug('Setting implicit wait on managed drivers');
-                for (let driver of this.managedDrivers) {
-                    if (lodash_1.default.isFunction(driver.setImplicitWait)) {
-                        driver.setImplicitWait(ms);
-                    }
+    },
+    async getTimeouts() {
+        return {
+            command: this.newCommandTimeoutMs,
+            implicit: this.implicitWaitMs,
+        };
+    },
+    // implicit
+    async implicitWaitW3C(ms) {
+        await this.implicitWait(ms);
+    },
+    async implicitWaitMJSONWP(ms) {
+        await this.implicitWait(ms);
+    },
+    async implicitWait(ms) {
+        this.setImplicitWait(this.parseTimeoutArgument(ms));
+    },
+    // pageLoad
+    async pageLoadTimeoutW3C(ms) {
+        throw new protocol_1.errors.NotImplementedError('Not implemented yet for pageLoad.');
+    },
+    async pageLoadTimeoutMJSONWP(ms) {
+        throw new protocol_1.errors.NotImplementedError('Not implemented yet for pageLoad.');
+    },
+    // script
+    async scriptTimeoutW3C(ms) {
+        throw new protocol_1.errors.NotImplementedError('Not implemented yet for script.');
+    },
+    async scriptTimeoutMJSONWP(ms) {
+        throw new protocol_1.errors.NotImplementedError('Not implemented yet for script.');
+    },
+    // command
+    async newCommandTimeout(ms) {
+        this.setNewCommandTimeout(this.parseTimeoutArgument(ms));
+    },
+    setImplicitWait(ms) {
+        // eslint-disable-line require-await
+        this.implicitWaitMs = ms;
+        this.log.debug(`Set implicit wait to ${ms}ms`);
+        if (this.managedDrivers && this.managedDrivers.length) {
+            this.log.debug('Setting implicit wait on managed drivers');
+            for (const driver of this.managedDrivers) {
+                if (lodash_1.default.isFunction(driver.setImplicitWait)) {
+                    driver.setImplicitWait(ms);
                 }
             }
         }
-        setNewCommandTimeout(ms) {
-            this.newCommandTimeoutMs = ms;
-            this.log.debug(`Set new command timeout to ${ms}ms`);
-            if (this.managedDrivers && this.managedDrivers.length) {
-                this.log.debug('Setting new command timeout on managed drivers');
-                for (let driver of this.managedDrivers) {
-                    if (lodash_1.default.isFunction(driver.setNewCommandTimeout)) {
-                        driver.setNewCommandTimeout(ms);
-                    }
+    },
+    setNewCommandTimeout(ms) {
+        this.newCommandTimeoutMs = ms;
+        this.log.debug(`Set new command timeout to ${ms}ms`);
+        if (this.managedDrivers && this.managedDrivers.length) {
+            this.log.debug('Setting new command timeout on managed drivers');
+            for (const driver of this.managedDrivers) {
+                if (lodash_1.default.isFunction(driver.setNewCommandTimeout)) {
+                    driver.setNewCommandTimeout(ms);
                 }
             }
         }
-        async implicitWaitForCondition(condFn) {
-            this.log.debug(`Waiting up to ${this.implicitWaitMs} ms for condition`);
-            let wrappedCondFn = async (...args) => {
-                // reset command timeout
-                await this.clearNewCommandTimeout();
-                return await condFn(...args);
-            };
-            return await (0, asyncbox_1.waitForCondition)(wrappedCondFn, {
-                waitMs: this.implicitWaitMs,
-                intervalMs: 500,
-                logger: this.log,
-            });
+    },
+    async implicitWaitForCondition(condFn) {
+        this.log.debug(`Waiting up to ${this.implicitWaitMs} ms for condition`);
+        const wrappedCondFn = async (...args) => {
+            // reset command timeout
+            await this.clearNewCommandTimeout();
+            return await condFn(...args);
+        };
+        return await (0, asyncbox_1.waitForCondition)(wrappedCondFn, {
+            waitMs: this.implicitWaitMs,
+            intervalMs: 500,
+            logger: this.log,
+        });
+    },
+    parseTimeoutArgument(ms) {
+        const duration = parseInt(String(ms), 10);
+        if (lodash_1.default.isNaN(duration) || duration < MIN_TIMEOUT) {
+            throw new protocol_1.errors.UnknownError(`Invalid timeout value '${ms}'`);
         }
-        parseTimeoutArgument(ms) {
-            let duration = parseInt(ms, 10);
-            if (lodash_1.default.isNaN(duration) || duration < MIN_TIMEOUT) {
-                throw new protocol_1.errors.UnknownError(`Invalid timeout value '${ms}'`);
-            }
-            return duration;
-        }
-    }
-    return TimeoutCommands;
-}
-exports.TimeoutMixin = TimeoutMixin;
-/**
- * @typedef {import('@appium/types').ITimeoutCommands} ITimeoutCommands
- * @typedef {import('@appium/types').Constraints} Constraints
- */
-/**
- * @template {Constraints} C
- * @typedef {import('../driver').BaseDriverBase<C, ITimeoutCommands>} TimeoutBase
- */
+        return duration;
+    },
+};
+(0, mixin_1.mixin)(TimeoutCommands);
 //# sourceMappingURL=timeout.js.map

package/build/lib/basedriver/commands/timeout.js.map

@@ -1 +1 @@
-{"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/timeout.js"],"names":[],"mappings":";AAAA,YAAY;;;;;;AAEZ,mCAAmC;AACnC,kCAAkC;AAClC,uCAA0C;AAC1C,oDAAuB;AACvB,6CAAqC;AACrC,6CAAsC;AAEtC,MAAM,WAAW,GAAG,CAAC,CAAC;AAEtB;;;;GAIG;AACH,SAAgB,YAAY,CAAC,IAAI;IAC/B;;OAEG;IACH,MAAM,eAAgB,SAAQ,IAAI;QAChC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;YACjD,IAAI,cAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,cAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;gBAC5C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,IAAI,CAAC,SAAS,CAAC,EAAC,IAAI,EAAE,EAAE,EAAC,CAAC,GAAG,CAAC,CAAC;gBAE5E,QAAQ,IAAI,EAAE;oBACZ,KAAK,SAAS;wBACZ,MAAM,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;wBACjC,OAAO;oBACT,KAAK,UAAU;wBACb,MAAM,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;wBACnC,OAAO;oBACT,KAAK,WAAW;wBACd,MAAM,IAAI,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;wBACtC,OAAO;oBACT,KAAK,QAAQ;wBACX,MAAM,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;wBACpC,OAAO;oBACT;wBACE,MAAM,IAAI,KAAK,CAAC,IAAI,IAAI,6CAA6C,CAAC,CAAC;iBAC1E;aACF;YAED,sCAAsC;YACtC,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,yBAAyB,IAAI,CAAC,SAAS,CAAC;gBACtC,MAAM;gBACN,QAAQ;gBACR,QAAQ;aACT,CAAC,GAAG,CACN,CAAC;YACF,IAAI,cAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;gBACzB,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;aACrC;YACD,IAAI,cAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBAC3B,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;aACzC;YACD,IAAI,cAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBAC3B,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;aACtC;QACH,CAAC;QAED,KAAK,CAAC,WAAW;YACf,OAAO;gBACL,OAAO,EAAE,IAAI,CAAC,mBAAmB;gBACjC,QAAQ,EAAE,IAAI,CAAC,cAAc;aAC9B,CAAC;QACJ,CAAC;QAED,WAAW;QACX,KAAK,CAAC,eAAe,CAAC,EAAE;YACtB,MAAM,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QAC9B,CAAC;QAED,KAAK,CAAC,mBAAmB,CAAC,EAAE;YAC1B,MAAM,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QAC9B,CAAC;QAED,KAAK,CAAC,YAAY,CAAC,EAAE;YACnB,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5D,CAAC;QAED,WAAW;QACX,KAAK,CAAC,kBAAkB,CAAC,EAAE;YACzB,MAAM,IAAI,iBAAM,CAAC,mBAAmB,CAAC,mCAAmC,CAAC,CAAC;QAC5E,CAAC;QAED,KAAK,CAAC,sBAAsB,CAAC,EAAE;YAC7B,MAAM,IAAI,iBAAM,CAAC,mBAAmB,CAAC,mCAAmC,CAAC,CAAC;QAC5E,CAAC;QAED,SAAS;QACT,KAAK,CAAC,gBAAgB,CAAC,EAAE;YACvB,MAAM,IAAI,iBAAM,CAAC,mBAAmB,CAAC,iCAAiC,CAAC,CAAC;QAC1E,CAAC;QAED,KAAK,CAAC,oBAAoB,CAAC,EAAE;YAC3B,MAAM,IAAI,iBAAM,CAAC,mBAAmB,CAAC,iCAAiC,CAAC,CAAC;QAC1E,CAAC;QAED,UAAU;QACV,KAAK,CAAC,iBAAiB,CAAC,EAAE;YACxB,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3D,CAAC;QAED,eAAe,CAAC,EAAE;YAChB,oCAAoC;YACpC,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;YACzB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC;YAC/C,IAAI,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE;gBACrD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;gBAC3D,KAAK,IAAI,MAAM,IAAI,IAAI,CAAC,cAAc,EAAE;oBACtC,IAAI,gBAAC,CAAC,UAAU,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;wBACxC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;qBAC5B;iBACF;aACF;QACH,CAAC;QAED,oBAAoB,CAAC,EAAE;YACrB,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC;YAC9B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,EAAE,IAAI,CAAC,CAAC;YACrD,IAAI,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE;gBACrD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;gBACjE,KAAK,IAAI,MAAM,IAAI,IAAI,CAAC,cAAc,EAAE;oBACtC,IAAI,gBAAC,CAAC,UAAU,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE;wBAC7C,MAAM,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;qBACjC;iBACF;aACF;QACH,CAAC;QAED,KAAK,CAAC,wBAAwB,CAAC,MAAM;YACnC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,IAAI,CAAC,cAAc,mBAAmB,CAAC,CAAC;YACxE,IAAI,aAAa,GAAG,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;gBACpC,wBAAwB;gBACxB,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAEpC,OAAO,MAAM,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;YAC/B,CAAC,CAAC;YACF,OAAO,MAAM,IAAA,2BAAgB,EAAC,aAAa,EAAE;gBAC3C,MAAM,EAAE,IAAI,CAAC,cAAc;gBAC3B,UAAU,EAAE,GAAG;gBACf,MAAM,EAAE,IAAI,CAAC,GAAG;aACjB,CAAC,CAAC;QACL,CAAC;QAED,oBAAoB,CAAC,EAAE;YACrB,IAAI,QAAQ,GAAG,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAChC,IAAI,gBAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,QAAQ,GAAG,WAAW,EAAE;gBAC/C,MAAM,IAAI,iBAAM,CAAC,YAAY,CAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC;aAChE;YACD,OAAO,QAAQ,CAAC;QAClB,CAAC;KACF;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AA7ID,oCA6IC;AAED;;;GAGG;AAEH;;;GAGG"}
+{"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/timeout.ts"],"names":[],"mappings":"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"}

package/build/lib/basedriver/core.d.ts

@@ -5,22 +5,19 @@ export type EventHistory = import('@appium/types').EventHistory;
 export type AppiumLogger = import('@appium/types').AppiumLogger;
 export type StringRecord = import('@appium/types').StringRecord;
 export type BaseDriverCapConstraints = import('@appium/types').BaseDriverCapConstraints;
-export type Capabilities<C extends Readonly<Record<string, import("@appium/types").Constraint>> = typeof import("@appium/types").BASE_DESIRED_CAP_CONSTRAINTS, Extra extends void | import("@appium/types").StringRecord = void> = import('@appium/types').Capabilities<C, Extra>;
-export type W3CCapabilities<T extends import("@appium/types").StringRecord = {}> = import('@appium/types').W3CCapabilities<T>;
-export type Core<C extends Readonly<Record<string, import("@appium/types").Constraint>>> = import('@appium/types').Core<C>;
-export type DriverOpts<C extends Readonly<Record<string, import("@appium/types").Constraint>>> = import('@appium/types').DriverOpts<C>;
+export type Core<C extends import("@appium/types").Constraints, S extends StringRecord = StringRecord> = import('@appium/types').Core<C, S>;
+export type DriverOpts<C extends import("@appium/types").Constraints> = import('@appium/types').DriverOpts<C>;
 /**
- * @template {Constraints} [C=BaseDriverCapConstraints]
- * @implements {Core<C>}
+ * @template {Constraints} C
+ * @template {StringRecord} [Settings=StringRecord]
+ * @implements {Core<C, Settings>}
  */
-export class DriverCore<C extends Readonly<Record<string, import("@appium/types").Constraint>> = typeof import("@appium/types").BASE_DESIRED_CAP_CONSTRAINTS> implements Core<C> {
+export class DriverCore<C extends import("@appium/types").Constraints, Settings extends StringRecord = StringRecord> implements Core<C, Settings> {
     /**
      * Make the basedriver version available so for any driver which inherits from this package, we
      * know which version of basedriver it inherited from
      */
-    static baseVersion: any;
-    /** @type {import('@appium/types').ExecuteMethodMap<DriverCore>} */
-    static executeMethodMap: import('@appium/types').ExecuteMethodMap<DriverCore>;
+    static baseVersion: string;
     /**
      * @param {DriverOpts<C>} opts
      * @param {boolean} [shouldValidateCaps]
@@ -35,9 +32,9 @@ export class DriverCore<C extends Readonly<Record<string, import("@appium/types"
      */
     opts: import('@appium/types').DriverOpts<C>;
     /**
-     * @type {ServerArgs}
+     * @type {import('@appium/types').DriverOpts<C>}
      */
-    initialOpts: ServerArgs;
+    initialOpts: import('@appium/types').DriverOpts<C>;
     /** @type {typeof helpers} */
     helpers: typeof helpers;
     /**
@@ -77,10 +74,9 @@ export class DriverCore<C extends Readonly<Record<string, import("@appium/types"
      */
     _log: AppiumLogger;
     /**
-     * @protected
      * @type {boolean}
      */
-    protected shutdownUnexpectedly: boolean;
+    shutdownUnexpectedly: boolean;
     /**
      * @type {boolean}
      */
@@ -95,9 +91,9 @@ export class DriverCore<C extends Readonly<Record<string, import("@appium/types"
      * we set it to an empty DeviceSettings instance here to make sure that the
      * default settings are applied even if an extending driver doesn't utilize
      * the settings functionality itself
-     * @type {DeviceSettings}
+     * @type {DeviceSettings<Settings>}
      */
-    settings: DeviceSettings<any>;
+    settings: DeviceSettings<Settings>;
     get log(): import("@appium/types").AppiumLogger;
     /**
      * Set a callback handler if needed to execute a custom piece of code
@@ -114,10 +110,8 @@ export class DriverCore<C extends Readonly<Record<string, import("@appium/types"
      * specific driver sessions. This data can be later used to adjust
      * properties for driver instances running in parallel.
      * Override it in inherited driver classes if necessary.
-     *
-     * @return {Record<string,unknown>} Driver properties mapping
      */
-    get driverData(): Record<string, unknown>;
+    get driverData(): import("@appium/types").DriverData;
     /**
      * This property controls the way the `executeCommand` method
      * handles new driver commands received from the client.
@@ -226,7 +220,7 @@ export class DriverCore<C extends Readonly<Record<string, import("@appium/types"
      * @param {Driver} driver
      */
     addManagedDriver(driver: Driver): void;
-    getManagedDrivers(): import("@appium/types").Driver<typeof import("@appium/types").BASE_DESIRED_CAP_CONSTRAINTS, import("@appium/types").StringRecord, any>[];
+    getManagedDrivers(): import("@appium/types").Driver<import("@appium/types").Constraints, import("@appium/types").StringRecord<any>, import("@appium/types").StringRecord<any>, import("@appium/types").DefaultCreateSessionResult<import("@appium/types").Constraints>, void>[];
     clearNewCommandTimeout(): Promise<void>;
 }
 import helpers from "./helpers";

package/build/lib/basedriver/core.d.ts.map

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

package/build/lib/basedriver/core.js

@@ -1,6 +1,29 @@
 "use strict";
 /* eslint-disable no-unused-vars */
 /* eslint-disable require-await */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -14,14 +37,13 @@ const os_1 = __importDefault(require("os"));
 const constants_1 = require("../constants");
 const protocol_1 = require("../protocol");
 const device_settings_1 = __importDefault(require("./device-settings"));
-const helpers_1 = __importDefault(require("./helpers"));
-// for compat with running tests transpiled and in-place
-const { version: BASEDRIVER_VER } = support_1.fs.readPackageJsonFrom(__dirname);
+const helpers_1 = __importStar(require("./helpers"));
 const NEW_COMMAND_TIMEOUT_MS = 60 * 1000;
 const ON_UNEXPECTED_SHUTDOWN_EVENT = 'onUnexpectedShutdown';
 /**
- * @template {Constraints} [C=BaseDriverCapConstraints]
- * @implements {Core<C>}
+ * @template {Constraints} C
+ * @template {StringRecord} [Settings=StringRecord]
+ * @implements {Core<C, Settings>}
  */
 class DriverCore {
     /**
@@ -77,11 +99,9 @@ class DriverCore {
      * specific driver sessions. This data can be later used to adjust
      * properties for driver instances running in parallel.
      * Override it in inherited driver classes if necessary.
-     *
-     * @return {Record<string,unknown>} Driver properties mapping
      */
     get driverData() {
-        return {};
+        return /** @type {import('@appium/types').DriverData} */ ({});
     }
     /**
      * This property controls the way the `executeCommand` method
@@ -148,7 +168,7 @@ class DriverCore {
      * @returns {Core<C> | null}
      */
     driverForSession(sessionId) {
-        return this;
+        return /** @type {Core<C> | null} */ (this);
     }
     isMjsonwpProtocol() {
         return this.protocol === constants_1.PROTOCOLS.MJSONWP;
@@ -304,9 +324,7 @@ exports.DriverCore = DriverCore;
  * Make the basedriver version available so for any driver which inherits from this package, we
  * know which version of basedriver it inherited from
  */
-DriverCore.baseVersion = BASEDRIVER_VER;
-/** @type {import('@appium/types').ExecuteMethodMap<DriverCore>} */
-DriverCore.executeMethodMap = {};
+DriverCore.baseVersion = helpers_1.BASEDRIVER_VER;
 /**
  * @typedef {import('@appium/types').Driver} Driver
  * @typedef {import('@appium/types').Constraints} Constraints
@@ -316,18 +334,10 @@ DriverCore.executeMethodMap = {};
  * @typedef {import('@appium/types').StringRecord} StringRecord
  * @typedef {import('@appium/types').BaseDriverCapConstraints} BaseDriverCapConstraints
  */
-/**
- * @template {Constraints} [C=BaseDriverCapConstraints]
- * @template {StringRecord|void} [Extra=void]
- * @typedef {import('@appium/types').Capabilities<C, Extra>} Capabilities
- */
-/**
- * @template {StringRecord} [T={}]
- * @typedef {import('@appium/types').W3CCapabilities<T>} W3CCapabilities
- */
 /**
  * @template {Constraints} C
- * @typedef {import('@appium/types').Core<C>} Core
+ * @template {StringRecord} [S=StringRecord]
+ * @typedef {import('@appium/types').Core<C, S>} Core
  */
 /**
  * @template {Constraints} C

package/build/lib/basedriver/core.js.map

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