@appium/base-driver 8.7.3 → 9.0.0

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

@@ -1,59 +1,107 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.FindMixin = FindMixin;
-
-require("source-map-support/register");
-
-var _protocol = require("../../protocol");
-
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FindMixin = void 0;
+/* eslint-disable no-unused-vars */
+/* eslint-disable require-await */
+// @ts-check
+const protocol_1 = require("../../protocol");
+/**
+ * @template {Constraints} C
+ * @param {import('./event').EventBase<C>} Base
+ * @returns {FindBase<C>}
+ */
 function FindMixin(Base) {
-  class FindCommands extends Base {
-    async findElement(strategy, selector) {
-      return await this.findElOrElsWithProcessing(strategy, selector, false);
-    }
-
-    async findElements(strategy, selector) {
-      return await this.findElOrElsWithProcessing(strategy, selector, true);
-    }
-
-    async findElementFromElement(strategy, selector, elementId) {
-      return await this.findElOrElsWithProcessing(strategy, selector, false, elementId);
-    }
-
-    async findElementsFromElement(strategy, selector, elementId) {
-      return await this.findElOrElsWithProcessing(strategy, selector, true, elementId);
-    }
-
-    async findElOrEls(strategy, selector, mult, context) {
-      throw new _protocol.errors.NotImplementedError('Not implemented yet for find.');
-    }
-
-    async getPageSource() {
-      throw new _protocol.errors.NotImplementedError('Not implemented yet for find.');
-    }
-
-    async findElOrElsWithProcessing(strategy, selector, mult, context) {
-      this.validateLocatorStrategy(strategy);
-
-      try {
-        return await this.findElOrEls(strategy, selector, mult, context);
-      } catch (err) {
-        if (this.opts.printPageSourceOnFindFailure) {
-          const src = await this.getPageSource();
-          this.log.debug(`Error finding element${mult ? 's' : ''}: ${err.message}`);
-          this.log.debug(`Page source requested through 'printPageSourceOnFindFailure':`);
-          this.log.debug(src);
+    /**
+     * @implements {IFindCommands}
+     */
+    class FindCommands extends Base {
+        /**
+         *
+         * @returns {Promise<Element>}
+         */
+        async findElement(strategy, selector) {
+            return await this.findElOrElsWithProcessing(strategy, selector, false);
+        }
+        /**
+         *
+         * @returns {Promise<Element[]>}
+         */
+        async findElements(strategy, selector) {
+            return await this.findElOrElsWithProcessing(strategy, selector, true);
+        }
+        /**
+         *
+         * @returns {Promise<Element>}
+         */
+        async findElementFromElement(strategy, selector, elementId) {
+            return await this.findElOrElsWithProcessing(strategy, selector, false, elementId);
+        }
+        /**
+         *
+         * @returns {Promise<Element[]>}
+         */
+        async findElementsFromElement(strategy, selector, elementId) {
+            return await this.findElOrElsWithProcessing(strategy, selector, true, elementId);
+        }
+        /**
+         * Returns an object which adheres to the way the JSON Wire Protocol represents elements:
+         *
+         * Override this for your own driver!
+         * @template {boolean} Mult
+         * @template [Ctx=any]
+         * @param {string} strategy
+         * @param {string} selector
+         * @param {Mult} mult
+         * @param {Ctx} [context]
+         * @returns {Promise<Mult extends true ? Element[] : Element>}
+         */
+        async findElOrEls(strategy, selector, mult, context) {
+            throw new protocol_1.errors.NotImplementedError('Not implemented yet for find.');
+        }
+        /**
+         * @returns {Promise<string>}
+         */
+        async getPageSource() {
+            throw new protocol_1.errors.NotImplementedError('Not implemented yet for find.');
+        }
+        /**
+         * @template {boolean} Mult
+         * @template [Ctx=any]
+         * @param {string} strategy
+         * @param {string} selector
+         * @param {Mult} mult
+         * @param {Ctx} [context]
+         * @returns {Promise<Mult extends true ? Element[] : Element>}
+         */
+        async findElOrElsWithProcessing(strategy, selector, mult, context) {
+            this.validateLocatorStrategy(strategy);
+            try {
+                return await this.findElOrEls(strategy, selector, mult, context);
+            }
+            catch (err) {
+                if (this.opts.printPageSourceOnFindFailure) {
+                    const src = await this.getPageSource();
+                    this.log.debug(`Error finding element${mult ? 's' : ''}: ${err.message}`);
+                    this.log.debug(`Page source requested through 'printPageSourceOnFindFailure':`);
+                    this.log.debug(src);
+                }
+                // still want the error to occur
+                throw err;
+            }
         }
-
-        throw err;
-      }
     }
-
-  }
-
-  return FindCommands;
+    return FindCommands;
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJGaW5kTWl4aW4iLCJCYXNlIiwiRmluZENvbW1hbmRzIiwiZmluZEVsZW1lbnQiLCJzdHJhdGVneSIsInNlbGVjdG9yIiwiZmluZEVsT3JFbHNXaXRoUHJvY2Vzc2luZyIsImZpbmRFbGVtZW50cyIsImZpbmRFbGVtZW50RnJvbUVsZW1lbnQiLCJlbGVtZW50SWQiLCJmaW5kRWxlbWVudHNGcm9tRWxlbWVudCIsImZpbmRFbE9yRWxzIiwibXVsdCIsImNvbnRleHQiLCJlcnJvcnMiLCJOb3RJbXBsZW1lbnRlZEVycm9yIiwiZ2V0UGFnZVNvdXJjZSIsInZhbGlkYXRlTG9jYXRvclN0cmF0ZWd5IiwiZXJyIiwib3B0cyIsInByaW50UGFnZVNvdXJjZU9uRmluZEZhaWx1cmUiLCJzcmMiLCJsb2ciLCJkZWJ1ZyIsIm1lc3NhZ2UiXSwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9saWIvYmFzZWRyaXZlci9jb21tYW5kcy9maW5kLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIi8qIGVzbGludC1kaXNhYmxlIG5vLXVudXNlZC12YXJzICovXG4vKiBlc2xpbnQtZGlzYWJsZSByZXF1aXJlLWF3YWl0ICovXG4vLyBAdHMtY2hlY2tcbmltcG9ydCB7ZXJyb3JzfSBmcm9tICcuLi8uLi9wcm90b2NvbCc7XG5cbi8qKlxuICpcbiAqIEBwYXJhbSB7RXZlbnRCYXNlfSBCYXNlXG4gKiBAcmV0dXJucyB7RmluZEJhc2V9XG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBGaW5kTWl4aW4oQmFzZSkge1xuICAvKipcbiAgICogQGltcGxlbWVudHMge0lGaW5kQ29tbWFuZHN9XG4gICAqL1xuICBjbGFzcyBGaW5kQ29tbWFuZHMgZXh0ZW5kcyBCYXNlIHtcbiAgICAvKipcbiAgICAgKlxuICAgICAqIEByZXR1cm5zIHtQcm9taXNlPEVsZW1lbnQ+fVxuICAgICAqL1xuICAgIGFzeW5jIGZpbmRFbGVtZW50KHN0cmF0ZWd5LCBzZWxlY3Rvcikge1xuICAgICAgcmV0dXJuIGF3YWl0IHRoaXMuZmluZEVsT3JFbHNXaXRoUHJvY2Vzc2luZyhzdHJhdGVneSwgc2VsZWN0b3IsIGZhbHNlKTtcbiAgICB9XG5cbiAgICAvKipcbiAgICAgKlxuICAgICAqIEByZXR1cm5zIHtQcm9taXNlPEVsZW1lbnRbXT59XG4gICAgICovXG4gICAgYXN5bmMgZmluZEVsZW1lbnRzKHN0cmF0ZWd5LCBzZWxlY3Rvcikge1xuICAgICAgcmV0dXJuIGF3YWl0IHRoaXMuZmluZEVsT3JFbHNXaXRoUHJvY2Vzc2luZyhzdHJhdGVneSwgc2VsZWN0b3IsIHRydWUpO1xuICAgIH1cblxuICAgIC8qKlxuICAgICAqXG4gICAgICogQHJldHVybnMge1Byb21pc2U8RWxlbWVudD59XG4gICAgICovXG4gICAgYXN5bmMgZmluZEVsZW1lbnRGcm9tRWxlbWVudChzdHJhdGVneSwgc2VsZWN0b3IsIGVsZW1lbnRJZCkge1xuICAgICAgcmV0dXJuIGF3YWl0IHRoaXMuZmluZEVsT3JFbHNXaXRoUHJvY2Vzc2luZyhzdHJhdGVneSwgc2VsZWN0b3IsIGZhbHNlLCBlbGVtZW50SWQpO1xuICAgIH1cblxuICAgIC8qKlxuICAgICAqXG4gICAgICogQHJldHVybnMge1Byb21pc2U8RWxlbWVudFtdPn1cbiAgICAgKi9cbiAgICBhc3luYyBmaW5kRWxlbWVudHNGcm9tRWxlbWVudChzdHJhdGVneSwgc2VsZWN0b3IsIGVsZW1lbnRJZCkge1xuICAgICAgcmV0dXJuIGF3YWl0IHRoaXMuZmluZEVsT3JFbHNXaXRoUHJvY2Vzc2luZyhzdHJhdGVneSwgc2VsZWN0b3IsIHRydWUsIGVsZW1lbnRJZCk7XG4gICAgfVxuICAgIC8vIE92ZXJyaWRlIHRoZSBmb2xsb3dpbmcgZnVuY3Rpb24gZm9yIHlvdXIgb3duIGRyaXZlciwgYW5kIHRoZSByZXN0IGlzIHRha2VuXG4gICAgLy8gY2FyZSBvZiFcbiAgICAvLyBSZXR1cm5zIGFuIG9iamVjdCB3aGljaCBhZGhlcmVzIHRvIHRoZSB3YXkgdGhlIEpTT04gV2lyZSBQcm90b2NvbCByZXByZXNlbnRzIGVsZW1lbnRzOlxuICAgIC8vIHsgRUxFTUVOVDogIyB9ICAgIGVnOiB7IEVMRU1FTlQ6IDMgfSAgb3IgeyBFTEVNRU5UOiAxLjAyMyB9XG4gICAgLyoqXG4gICAgICogQHRlbXBsYXRlIHtib29sZWFufSBNdWx0XG4gICAgICogQHBhcmFtIHtzdHJpbmd9IHN0cmF0ZWd5XG4gICAgICogQHBhcmFtIHtzdHJpbmd9IHNlbGVjdG9yXG4gICAgICogQHBhcmFtIHtNdWx0fSBtdWx0XG4gICAgICogQHBhcmFtIHtzdHJpbmd9IFtjb250ZXh0XVxuICAgICAqIEByZXR1cm5zIHtQcm9taXNlPE11bHQgZXh0ZW5kcyB0cnVlID8gRWxlbWVudFtdIDogRWxlbWVudD59XG4gICAgICovXG4gICAgYXN5bmMgZmluZEVsT3JFbHMoc3RyYXRlZ3ksIHNlbGVjdG9yLCBtdWx0LCBjb250ZXh0KSB7XG4gICAgICB0aHJvdyBuZXcgZXJyb3JzLk5vdEltcGxlbWVudGVkRXJyb3IoJ05vdCBpbXBsZW1lbnRlZCB5ZXQgZm9yIGZpbmQuJyk7XG4gICAgfVxuXG4gICAgLyoqXG4gICAgICogQHJldHVybnMge1Byb21pc2U8c3RyaW5nPn1cbiAgICAgKi9cbiAgICBhc3luYyBnZXRQYWdlU291cmNlKCkge1xuICAgICAgdGhyb3cgbmV3IGVycm9ycy5Ob3RJbXBsZW1lbnRlZEVycm9yKCdOb3QgaW1wbGVtZW50ZWQgeWV0IGZvciBmaW5kLicpO1xuICAgIH1cbiAgICAvKipcbiAgICAgKiBAdGVtcGxhdGUge2Jvb2xlYW59IE11bHRcbiAgICAgKiBAcGFyYW0ge3N0cmluZ30gc3RyYXRlZ3lcbiAgICAgKiBAcGFyYW0ge3N0cmluZ30gc2VsZWN0b3JcbiAgICAgKiBAcGFyYW0ge011bHR9IG11bHRcbiAgICAgKiBAcGFyYW0ge3N0cmluZ30gW2NvbnRleHRdXG4gICAgICogQHJldHVybnMge1Byb21pc2U8TXVsdCBleHRlbmRzIHRydWUgPyBFbGVtZW50W10gOiBFbGVtZW50Pn1cbiAgICAgKi9cbiAgICBhc3luYyBmaW5kRWxPckVsc1dpdGhQcm9jZXNzaW5nKHN0cmF0ZWd5LCBzZWxlY3RvciwgbXVsdCwgY29udGV4dCkge1xuICAgICAgdGhpcy52YWxpZGF0ZUxvY2F0b3JTdHJhdGVneShzdHJhdGVneSk7XG4gICAgICB0cnkge1xuICAgICAgICByZXR1cm4gYXdhaXQgdGhpcy5maW5kRWxPckVscyhzdHJhdGVneSwgc2VsZWN0b3IsIG11bHQsIGNvbnRleHQpO1xuICAgICAgfSBjYXRjaCAoZXJyKSB7XG4gICAgICAgIGlmICh0aGlzLm9wdHMucHJpbnRQYWdlU291cmNlT25GaW5kRmFpbHVyZSkge1xuICAgICAgICAgIGNvbnN0IHNyYyA9IGF3YWl0IHRoaXMuZ2V0UGFnZVNvdXJjZSgpO1xuICAgICAgICAgIHRoaXMubG9nLmRlYnVnKGBFcnJvciBmaW5kaW5nIGVsZW1lbnQke211bHQgPyAncycgOiAnJ306ICR7ZXJyLm1lc3NhZ2V9YCk7XG4gICAgICAgICAgdGhpcy5sb2cuZGVidWcoYFBhZ2Ugc291cmNlIHJlcXVlc3RlZCB0aHJvdWdoICdwcmludFBhZ2VTb3VyY2VPbkZpbmRGYWlsdXJlJzpgKTtcbiAgICAgICAgICB0aGlzLmxvZy5kZWJ1ZyhzcmMpO1xuICAgICAgICB9XG4gICAgICAgIC8vIHN0aWxsIHdhbnQgdGhlIGVycm9yIHRvIG9jY3VyXG4gICAgICAgIHRocm93IGVycjtcbiAgICAgIH1cbiAgICB9XG4gIH1cblxuICByZXR1cm4gRmluZENvbW1hbmRzO1xufVxuXG4vKipcbiAqIEB0eXBlZGVmIHtpbXBvcnQoJ0BhcHBpdW0vdHlwZXMnKS5FbGVtZW50fSBFbGVtZW50XG4gKiBAdHlwZWRlZiB7aW1wb3J0KCdAYXBwaXVtL3R5cGVzJykuRmluZENvbW1hbmRzfSBJRmluZENvbW1hbmRzXG4gKiBAdHlwZWRlZiB7aW1wb3J0KCcuL2V2ZW50JykuRXZlbnRCYXNlfSBFdmVudEJhc2VcbiAqIEB0eXBlZGVmIHtpbXBvcnQoJy4uL2RyaXZlcicpLkJhc2VEcml2ZXJCYXNlPGltcG9ydCgnQGFwcGl1bS90eXBlcycpLlRpbWVvdXRDb21tYW5kcyAmIGltcG9ydCgnQGFwcGl1bS90eXBlcycpLkV2ZW50Q29tbWFuZHMgJiBJRmluZENvbW1hbmRzPn0gRmluZEJhc2VcbiAqL1xuIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFHQTs7QUFPTyxTQUFTQSxTQUFULENBQW1CQyxJQUFuQixFQUF5QjtFQUk5QixNQUFNQyxZQUFOLFNBQTJCRCxJQUEzQixDQUFnQztJQUtiLE1BQVhFLFdBQVcsQ0FBQ0MsUUFBRCxFQUFXQyxRQUFYLEVBQXFCO01BQ3BDLE9BQU8sTUFBTSxLQUFLQyx5QkFBTCxDQUErQkYsUUFBL0IsRUFBeUNDLFFBQXpDLEVBQW1ELEtBQW5ELENBQWI7SUFDRDs7SUFNaUIsTUFBWkUsWUFBWSxDQUFDSCxRQUFELEVBQVdDLFFBQVgsRUFBcUI7TUFDckMsT0FBTyxNQUFNLEtBQUtDLHlCQUFMLENBQStCRixRQUEvQixFQUF5Q0MsUUFBekMsRUFBbUQsSUFBbkQsQ0FBYjtJQUNEOztJQU0yQixNQUF0Qkcsc0JBQXNCLENBQUNKLFFBQUQsRUFBV0MsUUFBWCxFQUFxQkksU0FBckIsRUFBZ0M7TUFDMUQsT0FBTyxNQUFNLEtBQUtILHlCQUFMLENBQStCRixRQUEvQixFQUF5Q0MsUUFBekMsRUFBbUQsS0FBbkQsRUFBMERJLFNBQTFELENBQWI7SUFDRDs7SUFNNEIsTUFBdkJDLHVCQUF1QixDQUFDTixRQUFELEVBQVdDLFFBQVgsRUFBcUJJLFNBQXJCLEVBQWdDO01BQzNELE9BQU8sTUFBTSxLQUFLSCx5QkFBTCxDQUErQkYsUUFBL0IsRUFBeUNDLFFBQXpDLEVBQW1ELElBQW5ELEVBQXlESSxTQUF6RCxDQUFiO0lBQ0Q7O0lBYWdCLE1BQVhFLFdBQVcsQ0FBQ1AsUUFBRCxFQUFXQyxRQUFYLEVBQXFCTyxJQUFyQixFQUEyQkMsT0FBM0IsRUFBb0M7TUFDbkQsTUFBTSxJQUFJQyxnQkFBQSxDQUFPQyxtQkFBWCxDQUErQiwrQkFBL0IsQ0FBTjtJQUNEOztJQUtrQixNQUFiQyxhQUFhLEdBQUc7TUFDcEIsTUFBTSxJQUFJRixnQkFBQSxDQUFPQyxtQkFBWCxDQUErQiwrQkFBL0IsQ0FBTjtJQUNEOztJQVM4QixNQUF6QlQseUJBQXlCLENBQUNGLFFBQUQsRUFBV0MsUUFBWCxFQUFxQk8sSUFBckIsRUFBMkJDLE9BQTNCLEVBQW9DO01BQ2pFLEtBQUtJLHVCQUFMLENBQTZCYixRQUE3Qjs7TUFDQSxJQUFJO1FBQ0YsT0FBTyxNQUFNLEtBQUtPLFdBQUwsQ0FBaUJQLFFBQWpCLEVBQTJCQyxRQUEzQixFQUFxQ08sSUFBckMsRUFBMkNDLE9BQTNDLENBQWI7TUFDRCxDQUZELENBRUUsT0FBT0ssR0FBUCxFQUFZO1FBQ1osSUFBSSxLQUFLQyxJQUFMLENBQVVDLDRCQUFkLEVBQTRDO1VBQzFDLE1BQU1DLEdBQUcsR0FBRyxNQUFNLEtBQUtMLGFBQUwsRUFBbEI7VUFDQSxLQUFLTSxHQUFMLENBQVNDLEtBQVQsQ0FBZ0Isd0JBQXVCWCxJQUFJLEdBQUcsR0FBSCxHQUFTLEVBQUcsS0FBSU0sR0FBRyxDQUFDTSxPQUFRLEVBQXZFO1VBQ0EsS0FBS0YsR0FBTCxDQUFTQyxLQUFULENBQWdCLCtEQUFoQjtVQUNBLEtBQUtELEdBQUwsQ0FBU0MsS0FBVCxDQUFlRixHQUFmO1FBQ0Q7O1FBRUQsTUFBTUgsR0FBTjtNQUNEO0lBQ0Y7O0VBNUU2Qjs7RUErRWhDLE9BQU9oQixZQUFQO0FBQ0QifQ==
+exports.FindMixin = FindMixin;
+/**
+ * @typedef {import('@appium/types').Element} Element
+ * @typedef {import('@appium/types').Constraints} Constraints
+ * @typedef {import('@appium/types').IFindCommands} IFindCommands
+ * @typedef {import('@appium/types').ITimeoutCommands} ITimeoutCommands
+ * @typedef {import('@appium/types').IEventCommands} IEventCommands
+ */
+/**
+ * @template {Constraints} C
+ * @typedef {import('../driver').BaseDriverBase<C, ITimeoutCommands & IEventCommands & IFindCommands>} FindBase
+ */
+//# sourceMappingURL=find.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"find.js","names":["FindMixin","Base","FindCommands","findElement","strategy","selector","findElOrElsWithProcessing","findElements","findElementFromElement","elementId","findElementsFromElement","findElOrEls","mult","context","errors","NotImplementedError","getPageSource","validateLocatorStrategy","err","opts","printPageSourceOnFindFailure","src","log","debug","message"],"sources":["../../../../lib/basedriver/commands/find.js"],"sourcesContent":["/* eslint-disable no-unused-vars */\n/* eslint-disable require-await */\n// @ts-check\nimport {errors} from '../../protocol';\n\n/**\n *\n * @param {EventBase} Base\n * @returns {FindBase}\n */\nexport function FindMixin(Base) {\n  /**\n   * @implements {IFindCommands}\n   */\n  class FindCommands extends Base {\n    /**\n     *\n     * @returns {Promise<Element>}\n     */\n    async findElement(strategy, selector) {\n      return await this.findElOrElsWithProcessing(strategy, selector, false);\n    }\n\n    /**\n     *\n     * @returns {Promise<Element[]>}\n     */\n    async findElements(strategy, selector) {\n      return await this.findElOrElsWithProcessing(strategy, selector, true);\n    }\n\n    /**\n     *\n     * @returns {Promise<Element>}\n     */\n    async findElementFromElement(strategy, selector, elementId) {\n      return await this.findElOrElsWithProcessing(strategy, selector, false, elementId);\n    }\n\n    /**\n     *\n     * @returns {Promise<Element[]>}\n     */\n    async findElementsFromElement(strategy, selector, elementId) {\n      return await this.findElOrElsWithProcessing(strategy, selector, true, elementId);\n    }\n    // Override the following function for your own driver, and the rest is taken\n    // care of!\n    // Returns an object which adheres to the way the JSON Wire Protocol represents elements:\n    // { ELEMENT: # }    eg: { ELEMENT: 3 }  or { ELEMENT: 1.023 }\n    /**\n     * @template {boolean} Mult\n     * @param {string} strategy\n     * @param {string} selector\n     * @param {Mult} mult\n     * @param {string} [context]\n     * @returns {Promise<Mult extends true ? Element[] : Element>}\n     */\n    async findElOrEls(strategy, selector, mult, context) {\n      throw new errors.NotImplementedError('Not implemented yet for find.');\n    }\n\n    /**\n     * @returns {Promise<string>}\n     */\n    async getPageSource() {\n      throw new errors.NotImplementedError('Not implemented yet for find.');\n    }\n    /**\n     * @template {boolean} Mult\n     * @param {string} strategy\n     * @param {string} selector\n     * @param {Mult} mult\n     * @param {string} [context]\n     * @returns {Promise<Mult extends true ? Element[] : Element>}\n     */\n    async findElOrElsWithProcessing(strategy, selector, mult, context) {\n      this.validateLocatorStrategy(strategy);\n      try {\n        return await this.findElOrEls(strategy, selector, mult, context);\n      } catch (err) {\n        if (this.opts.printPageSourceOnFindFailure) {\n          const src = await this.getPageSource();\n          this.log.debug(`Error finding element${mult ? 's' : ''}: ${err.message}`);\n          this.log.debug(`Page source requested through 'printPageSourceOnFindFailure':`);\n          this.log.debug(src);\n        }\n        // still want the error to occur\n        throw err;\n      }\n    }\n  }\n\n  return FindCommands;\n}\n\n/**\n * @typedef {import('@appium/types').Element} Element\n * @typedef {import('@appium/types').FindCommands} IFindCommands\n * @typedef {import('./event').EventBase} EventBase\n * @typedef {import('../driver').BaseDriverBase<import('@appium/types').TimeoutCommands & import('@appium/types').EventCommands & IFindCommands>} FindBase\n */\n"],"mappings":";;;;;;;;;AAGA;;AAOO,SAASA,SAAT,CAAmBC,IAAnB,EAAyB;EAI9B,MAAMC,YAAN,SAA2BD,IAA3B,CAAgC;IAKb,MAAXE,WAAW,CAACC,QAAD,EAAWC,QAAX,EAAqB;MACpC,OAAO,MAAM,KAAKC,yBAAL,CAA+BF,QAA/B,EAAyCC,QAAzC,EAAmD,KAAnD,CAAb;IACD;;IAMiB,MAAZE,YAAY,CAACH,QAAD,EAAWC,QAAX,EAAqB;MACrC,OAAO,MAAM,KAAKC,yBAAL,CAA+BF,QAA/B,EAAyCC,QAAzC,EAAmD,IAAnD,CAAb;IACD;;IAM2B,MAAtBG,sBAAsB,CAACJ,QAAD,EAAWC,QAAX,EAAqBI,SAArB,EAAgC;MAC1D,OAAO,MAAM,KAAKH,yBAAL,CAA+BF,QAA/B,EAAyCC,QAAzC,EAAmD,KAAnD,EAA0DI,SAA1D,CAAb;IACD;;IAM4B,MAAvBC,uBAAuB,CAACN,QAAD,EAAWC,QAAX,EAAqBI,SAArB,EAAgC;MAC3D,OAAO,MAAM,KAAKH,yBAAL,CAA+BF,QAA/B,EAAyCC,QAAzC,EAAmD,IAAnD,EAAyDI,SAAzD,CAAb;IACD;;IAagB,MAAXE,WAAW,CAACP,QAAD,EAAWC,QAAX,EAAqBO,IAArB,EAA2BC,OAA3B,EAAoC;MACnD,MAAM,IAAIC,gBAAA,CAAOC,mBAAX,CAA+B,+BAA/B,CAAN;IACD;;IAKkB,MAAbC,aAAa,GAAG;MACpB,MAAM,IAAIF,gBAAA,CAAOC,mBAAX,CAA+B,+BAA/B,CAAN;IACD;;IAS8B,MAAzBT,yBAAyB,CAACF,QAAD,EAAWC,QAAX,EAAqBO,IAArB,EAA2BC,OAA3B,EAAoC;MACjE,KAAKI,uBAAL,CAA6Bb,QAA7B;;MACA,IAAI;QACF,OAAO,MAAM,KAAKO,WAAL,CAAiBP,QAAjB,EAA2BC,QAA3B,EAAqCO,IAArC,EAA2CC,OAA3C,CAAb;MACD,CAFD,CAEE,OAAOK,GAAP,EAAY;QACZ,IAAI,KAAKC,IAAL,CAAUC,4BAAd,EAA4C;UAC1C,MAAMC,GAAG,GAAG,MAAM,KAAKL,aAAL,EAAlB;UACA,KAAKM,GAAL,CAASC,KAAT,CAAgB,wBAAuBX,IAAI,GAAG,GAAH,GAAS,EAAG,KAAIM,GAAG,CAACM,OAAQ,EAAvE;UACA,KAAKF,GAAL,CAASC,KAAT,CAAgB,+DAAhB;UACA,KAAKD,GAAL,CAASC,KAAT,CAAeF,GAAf;QACD;;QAED,MAAMH,GAAN;MACD;IACF;;EA5E6B;;EA+EhC,OAAOhB,YAAP;AACD"}
+{"version":3,"file":"find.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/find.js"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,kCAAkC;AAClC,YAAY;AACZ,6CAAsC;AAEtC;;;;GAIG;AACH,SAAgB,SAAS,CAAC,IAAI;IAC5B;;OAEG;IACH,MAAM,YAAa,SAAQ,IAAI;QAC7B;;;WAGG;QACH,KAAK,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ;YAClC,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;QACzE,CAAC;QAED;;;WAGG;QACH,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ;YACnC,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QACxE,CAAC;QAED;;;WAGG;QACH,KAAK,CAAC,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS;YACxD,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QACpF,CAAC;QAED;;;WAGG;QACH,KAAK,CAAC,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS;YACzD,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QACnF,CAAC;QACD;;;;;;;;;;;WAWG;QACH,KAAK,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO;YACjD,MAAM,IAAI,iBAAM,CAAC,mBAAmB,CAAC,+BAA+B,CAAC,CAAC;QACxE,CAAC;QAED;;WAEG;QACH,KAAK,CAAC,aAAa;YACjB,MAAM,IAAI,iBAAM,CAAC,mBAAmB,CAAC,+BAA+B,CAAC,CAAC;QACxE,CAAC;QACD;;;;;;;;WAQG;QACH,KAAK,CAAC,yBAAyB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO;YAC/D,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;YACvC,IAAI;gBACF,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;aAClE;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,IAAI,CAAC,IAAI,CAAC,4BAA4B,EAAE;oBAC1C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;oBACvC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,wBAAwB,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;oBAC1E,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,+DAA+D,CAAC,CAAC;oBAChF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;iBACrB;gBACD,gCAAgC;gBAChC,MAAM,GAAG,CAAC;aACX;QACH,CAAC;KACF;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AArFD,8BAqFC;AAED;;;;;;GAMG;AACH;;;GAGG"}

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

@@ -1,8 +1,4 @@
-/**
- * Applies all the mixins to the `BaseDriverBase` class.
- * Returns a `BaseDriver` class.
- * @param {BaseDriverBase} Base
- */
-export function createBaseDriverClass(Base: BaseDriverBase): import("./execute").ExecuteBase;
-export type BaseDriverBase<T = {}> = import('../driver').BaseDriverBase<T>;
+export function createBaseDriverClass<C_1 extends Readonly<Record<string, import("@appium/types").Constraint>>>(Base: import("../driver").BaseDriverBase<C_1, {}, {}>): import("./execute").ExecuteBase<C_1>;
+export type BaseDriverBase<C_1 extends Readonly<Record<string, import("@appium/types").Constraint>>> = import('../driver').BaseDriverBase<C>;
+export type Constraints = import('@appium/types').Constraints;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../lib/basedriver/commands/index.js"],"names":[],"mappings":"AAUA;;;;GAIG;AACH,4CAFW,cAAc,mCAWxB;qCAIY,OAAO,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../lib/basedriver/commands/index.js"],"names":[],"mappings":"AAmCy3K,6MAAmB;uGAN/3K,OAAO,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;0BAIrC,OAAO,eAAe,EAAE,WAAW"}

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

@@ -1,34 +1,31 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createBaseDriverClass = createBaseDriverClass;
-
-require("source-map-support/register");
-
-var _event = require("./event");
-
-var _find = require("./find");
-
-var _log = require("./log");
-
-var _session = require("./session");
-
-var _settings = require("./settings");
-
-var _timeout = require("./timeout");
-
-var _execute = require("./execute");
-
-function createBaseDriverClass(Base) {
-  const WithTimeoutCommands = (0, _timeout.TimeoutMixin)(Base);
-  const WithEventCommands = (0, _event.EventMixin)(WithTimeoutCommands);
-  const WithFindCommands = (0, _find.FindMixin)(WithEventCommands);
-  const WithLogCommands = (0, _log.LogMixin)(WithFindCommands);
-  const WithSettingsCommands = (0, _settings.SettingsMixin)(WithLogCommands);
-  const WithSessionCommands = (0, _session.SessionMixin)(WithSettingsCommands);
-  const WithExecuteCommands = (0, _execute.ExecuteMixin)(WithSessionCommands);
-  return WithExecuteCommands;
-}
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJjcmVhdGVCYXNlRHJpdmVyQ2xhc3MiLCJCYXNlIiwiV2l0aFRpbWVvdXRDb21tYW5kcyIsIlRpbWVvdXRNaXhpbiIsIldpdGhFdmVudENvbW1hbmRzIiwiRXZlbnRNaXhpbiIsIldpdGhGaW5kQ29tbWFuZHMiLCJGaW5kTWl4aW4iLCJXaXRoTG9nQ29tbWFuZHMiLCJMb2dNaXhpbiIsIldpdGhTZXR0aW5nc0NvbW1hbmRzIiwiU2V0dGluZ3NNaXhpbiIsIldpdGhTZXNzaW9uQ29tbWFuZHMiLCJTZXNzaW9uTWl4aW4iLCJXaXRoRXhlY3V0ZUNvbW1hbmRzIiwiRXhlY3V0ZU1peGluIl0sInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vbGliL2Jhc2Vkcml2ZXIvY29tbWFuZHMvaW5kZXguanMiXSwic291cmNlc0NvbnRlbnQiOlsiLy8gQHRzLWNoZWNrXG5cbmltcG9ydCB7RXZlbnRNaXhpbn0gZnJvbSAnLi9ldmVudCc7XG5pbXBvcnQge0ZpbmRNaXhpbn0gZnJvbSAnLi9maW5kJztcbmltcG9ydCB7TG9nTWl4aW59IGZyb20gJy4vbG9nJztcbmltcG9ydCB7U2Vzc2lvbk1peGlufSBmcm9tICcuL3Nlc3Npb24nO1xuaW1wb3J0IHtTZXR0aW5nc01peGlufSBmcm9tICcuL3NldHRpbmdzJztcbmltcG9ydCB7VGltZW91dE1peGlufSBmcm9tICcuL3RpbWVvdXQnO1xuaW1wb3J0IHtFeGVjdXRlTWl4aW59IGZyb20gJy4vZXhlY3V0ZSc7XG5cbi8qKlxuICogQXBwbGllcyBhbGwgdGhlIG1peGlucyB0byB0aGUgYEJhc2VEcml2ZXJCYXNlYCBjbGFzcy5cbiAqIFJldHVybnMgYSBgQmFzZURyaXZlcmAgY2xhc3MuXG4gKiBAcGFyYW0ge0Jhc2VEcml2ZXJCYXNlfSBCYXNlXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBjcmVhdGVCYXNlRHJpdmVyQ2xhc3MoQmFzZSkge1xuICBjb25zdCBXaXRoVGltZW91dENvbW1hbmRzID0gVGltZW91dE1peGluKEJhc2UpO1xuICBjb25zdCBXaXRoRXZlbnRDb21tYW5kcyA9IEV2ZW50TWl4aW4oV2l0aFRpbWVvdXRDb21tYW5kcyk7XG4gIGNvbnN0IFdpdGhGaW5kQ29tbWFuZHMgPSBGaW5kTWl4aW4oV2l0aEV2ZW50Q29tbWFuZHMpO1xuICBjb25zdCBXaXRoTG9nQ29tbWFuZHMgPSBMb2dNaXhpbihXaXRoRmluZENvbW1hbmRzKTtcbiAgY29uc3QgV2l0aFNldHRpbmdzQ29tbWFuZHMgPSBTZXR0aW5nc01peGluKFdpdGhMb2dDb21tYW5kcyk7XG4gIGNvbnN0IFdpdGhTZXNzaW9uQ29tbWFuZHMgPSBTZXNzaW9uTWl4aW4oV2l0aFNldHRpbmdzQ29tbWFuZHMpO1xuICBjb25zdCBXaXRoRXhlY3V0ZUNvbW1hbmRzID0gRXhlY3V0ZU1peGluKFdpdGhTZXNzaW9uQ29tbWFuZHMpO1xuICByZXR1cm4gV2l0aEV4ZWN1dGVDb21tYW5kcztcbn1cblxuLyoqXG4gKiBAdGVtcGxhdGUgW1Q9e31dXG4gKiBAdHlwZWRlZiB7aW1wb3J0KCcuLi9kcml2ZXInKS5CYXNlRHJpdmVyQmFzZTxUPn0gQmFzZURyaXZlckJhc2VcbiAqL1xuIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFFQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFPTyxTQUFTQSxxQkFBVCxDQUErQkMsSUFBL0IsRUFBcUM7RUFDMUMsTUFBTUMsbUJBQW1CLEdBQUcsSUFBQUMscUJBQUEsRUFBYUYsSUFBYixDQUE1QjtFQUNBLE1BQU1HLGlCQUFpQixHQUFHLElBQUFDLGlCQUFBLEVBQVdILG1CQUFYLENBQTFCO0VBQ0EsTUFBTUksZ0JBQWdCLEdBQUcsSUFBQUMsZUFBQSxFQUFVSCxpQkFBVixDQUF6QjtFQUNBLE1BQU1JLGVBQWUsR0FBRyxJQUFBQyxhQUFBLEVBQVNILGdCQUFULENBQXhCO0VBQ0EsTUFBTUksb0JBQW9CLEdBQUcsSUFBQUMsdUJBQUEsRUFBY0gsZUFBZCxDQUE3QjtFQUNBLE1BQU1JLG1CQUFtQixHQUFHLElBQUFDLHFCQUFBLEVBQWFILG9CQUFiLENBQTVCO0VBQ0EsTUFBTUksbUJBQW1CLEdBQUcsSUFBQUMscUJBQUEsRUFBYUgsbUJBQWIsQ0FBNUI7RUFDQSxPQUFPRSxtQkFBUDtBQUNEIn0=
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createBaseDriverClass = void 0;
+// @ts-check
+const lodash_1 = __importDefault(require("lodash"));
+const event_1 = require("./event");
+const find_1 = require("./find");
+const log_1 = require("./log");
+const session_1 = require("./session");
+const settings_1 = require("./settings");
+const timeout_1 = require("./timeout");
+const execute_1 = require("./execute");
+/**
+ * Applies all the mixins to the `BaseDriverBase` class; returns a `BaseDriver` class definition.
+ * Each mixin is applied in the order it is listed here, and each type is a union with the previous.
+ *
+ * @template {Constraints} C
+ * @param {BaseDriverBase<C>} Base
+ */
+exports.createBaseDriverClass = lodash_1.default.flow(timeout_1.TimeoutMixin, event_1.EventMixin, find_1.FindMixin, log_1.LogMixin, settings_1.SettingsMixin, session_1.SessionMixin, execute_1.ExecuteMixin);
+/**
+ * @template {Constraints} C
+ * @typedef {import('../driver').BaseDriverBase<C>} BaseDriverBase
+ */
+/**
+ * @typedef {import('@appium/types').Constraints} Constraints
+ */
+//# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["createBaseDriverClass","Base","WithTimeoutCommands","TimeoutMixin","WithEventCommands","EventMixin","WithFindCommands","FindMixin","WithLogCommands","LogMixin","WithSettingsCommands","SettingsMixin","WithSessionCommands","SessionMixin","WithExecuteCommands","ExecuteMixin"],"sources":["../../../../lib/basedriver/commands/index.js"],"sourcesContent":["// @ts-check\n\nimport {EventMixin} from './event';\nimport {FindMixin} from './find';\nimport {LogMixin} from './log';\nimport {SessionMixin} from './session';\nimport {SettingsMixin} from './settings';\nimport {TimeoutMixin} from './timeout';\nimport {ExecuteMixin} from './execute';\n\n/**\n * Applies all the mixins to the `BaseDriverBase` class.\n * Returns a `BaseDriver` class.\n * @param {BaseDriverBase} Base\n */\nexport function createBaseDriverClass(Base) {\n  const WithTimeoutCommands = TimeoutMixin(Base);\n  const WithEventCommands = EventMixin(WithTimeoutCommands);\n  const WithFindCommands = FindMixin(WithEventCommands);\n  const WithLogCommands = LogMixin(WithFindCommands);\n  const WithSettingsCommands = SettingsMixin(WithLogCommands);\n  const WithSessionCommands = SessionMixin(WithSettingsCommands);\n  const WithExecuteCommands = ExecuteMixin(WithSessionCommands);\n  return WithExecuteCommands;\n}\n\n/**\n * @template [T={}]\n * @typedef {import('../driver').BaseDriverBase<T>} BaseDriverBase\n */\n"],"mappings":";;;;;;;;;AAEA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAOO,SAASA,qBAAT,CAA+BC,IAA/B,EAAqC;EAC1C,MAAMC,mBAAmB,GAAG,IAAAC,qBAAA,EAAaF,IAAb,CAA5B;EACA,MAAMG,iBAAiB,GAAG,IAAAC,iBAAA,EAAWH,mBAAX,CAA1B;EACA,MAAMI,gBAAgB,GAAG,IAAAC,eAAA,EAAUH,iBAAV,CAAzB;EACA,MAAMI,eAAe,GAAG,IAAAC,aAAA,EAASH,gBAAT,CAAxB;EACA,MAAMI,oBAAoB,GAAG,IAAAC,uBAAA,EAAcH,eAAd,CAA7B;EACA,MAAMI,mBAAmB,GAAG,IAAAC,qBAAA,EAAaH,oBAAb,CAA5B;EACA,MAAMI,mBAAmB,GAAG,IAAAC,qBAAA,EAAaH,mBAAb,CAA5B;EACA,OAAOE,mBAAP;AACD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/index.js"],"names":[],"mappings":";;;;;;AAAA,YAAY;AACZ,oDAAuB;AACvB,mCAAmC;AACnC,iCAAiC;AACjC,+BAA+B;AAC/B,uCAAuC;AACvC,yCAAyC;AACzC,uCAAuC;AACvC,uCAAuC;AAEvC;;;;;;GAMG;AACU,QAAA,qBAAqB,GAAG,gBAAC,CAAC,IAAI,CACzC,sBAAY,EACZ,kBAAU,EACV,gBAAS,EACT,cAAQ,EACR,wBAAa,EACb,sBAAY,EACZ,sBAAY,CACb,CAAC;AAEF;;;GAGG;AAEH;;GAEG"}

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

@@ -1,12 +1,11 @@
 /**
- *
- * @param {FindBase} Base
- * @returns {LogBase}
+ * @template {Constraints} C
+ * @param {import('./find').FindBase<C>} Base
+ * @returns {LogBase<C>}
  */
-export function LogMixin(Base: FindBase): LogBase;
-export type ILogCommands = import('@appium/types').LogCommands;
-export type Driver = import('@appium/types').Driver;
-export type FindBase = import('./find').FindBase;
-export type LogBase = import('../driver').BaseDriverBase<import('@appium/types').TimeoutCommands & import('@appium/types').EventCommands & import('@appium/types').FindCommands & ILogCommands>;
-export type LogType<T> = import('@appium/types').LogType<T>;
+export function LogMixin<C extends Readonly<Record<string, import("@appium/types").Constraint>>>(Base: import("./find").FindBase<C>): LogBase<C>;
+export type Constraints = import('@appium/types').Constraints;
+export type StringRecord = import('@appium/types').StringRecord;
+export type ILogCommands<C extends Readonly<Record<string, import("@appium/types").Constraint>>> = import('@appium/types').ILogCommands<C>;
+export type LogBase<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 & ILogCommands<C>>;
 //# sourceMappingURL=log.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../../../lib/basedriver/commands/log.js"],"names":[],"mappings":"AAKA;;;;GAIG;AACH,+BAHW,QAAQ,GACN,OAAO,CAqCnB;2BAGY,OAAO,eAAe,EAAE,WAAW;qBACnC,OAAO,eAAe,EAAE,MAAM;uBAC9B,OAAO,QAAQ,EAAE,QAAQ;sBACzB,OAAO,WAAW,EAAE,cAAc,CAAC,OAAO,eAAe,EAAE,eAAe,GAAG,OAAO,eAAe,EAAE,aAAa,GAAG,OAAO,eAAe,EAAE,YAAY,GAAG,YAAY,CAAC;yBAKzK,OAAO,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC"}
+{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../../../lib/basedriver/commands/log.js"],"names":[],"mappings":"AAKA;;;;GAIG;AACH,iJAsCC;0BAGY,OAAO,eAAe,EAAE,WAAW;2BACnC,OAAO,eAAe,EAAE,YAAY;mGAKpC,OAAO,eAAe,EAAE,YAAY,CAAC,CAAC,CAAC;8FAKvC,OAAO,WAAW,EAAE,cAAc,CAAC,CAAC,EAAE,OAAO,eAAe,EAAE,gBAAgB,GAAG,OAAO,eAAe,EAAE,cAAc,GAAG,OAAO,eAAe,EAAE,aAAa,GAAG,aAAa,CAAC,CAAC,CAAC"}

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

@@ -1,42 +1,58 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.LogMixin = LogMixin;
-
-require("source-map-support/register");
-
-var _lodash = _interopRequireDefault(require("lodash"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+/* eslint-disable require-await */
+// @ts-check
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LogMixin = void 0;
+const lodash_1 = __importDefault(require("lodash"));
+/**
+ * @template {Constraints} C
+ * @param {import('./find').FindBase<C>} Base
+ * @returns {LogBase<C>}
+ */
 function LogMixin(Base) {
-  class LogCommands extends Base {
-    constructor(...args) {
-      super(...args);
-      this.supportedLogTypes = this.supportedLogTypes ?? {};
-    }
-
-    async getLogTypes() {
-      this.log.debug('Retrieving supported log types');
-      return _lodash.default.keys(this.supportedLogTypes);
+    /**
+     * @implements {ILogCommands<C>}
+     */
+    class LogCommands extends Base {
+        constructor(...args) {
+            super(...args);
+            this.supportedLogTypes ?? (this.supportedLogTypes = {});
+        }
+        async getLogTypes() {
+            this.log.debug('Retrieving supported log types');
+            return Object.keys(this.supportedLogTypes);
+        }
+        /**
+         * @this {import('@appium/types').Driver<C>}
+         * @param {keyof typeof this.supportedLogTypes} logType
+         * @returns {Promise<import('type-fest').AsyncReturnType<typeof this.supportedLogTypes[keyof typeof this.supportedLogTypes]['getter']>>}
+         */
+        async getLog(logType) {
+            this.log.debug(`Retrieving '${String(logType)}' logs`);
+            if (!(logType in this.supportedLogTypes)) {
+                const logsTypesWithDescriptions = lodash_1.default.mapValues(this.supportedLogTypes, 'description');
+                throw new Error(`Unsupported log type '${String(logType)}'. ` +
+                    `Supported types: ${JSON.stringify(logsTypesWithDescriptions)}`);
+            }
+            return await this.supportedLogTypes[logType].getter(this);
+        }
     }
-
-    async getLog(logType) {
-      this.log.debug(`Retrieving '${logType}' logs`);
-
-      if (!(await this.getLogTypes()).includes(logType)) {
-        const logsTypesWithDescriptions = _lodash.default.mapValues(this.supportedLogTypes, 'description');
-
-        throw new Error(`Unsupported log type '${logType}'. ` + `Supported types: ${JSON.stringify(logsTypesWithDescriptions)}`);
-      }
-
-      return await this.supportedLogTypes[logType].getter(this);
-    }
-
-  }
-
-  return LogCommands;
+    return LogCommands;
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJMb2dNaXhpbiIsIkJhc2UiLCJMb2dDb21tYW5kcyIsImNvbnN0cnVjdG9yIiwiYXJncyIsInN1cHBvcnRlZExvZ1R5cGVzIiwiZ2V0TG9nVHlwZXMiLCJsb2ciLCJkZWJ1ZyIsIl8iLCJrZXlzIiwiZ2V0TG9nIiwibG9nVHlwZSIsImluY2x1ZGVzIiwibG9nc1R5cGVzV2l0aERlc2NyaXB0aW9ucyIsIm1hcFZhbHVlcyIsIkVycm9yIiwiSlNPTiIsInN0cmluZ2lmeSIsImdldHRlciJdLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2xpYi9iYXNlZHJpdmVyL2NvbW1hbmRzL2xvZy5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyIvKiBlc2xpbnQtZGlzYWJsZSByZXF1aXJlLWF3YWl0ICovXG4vLyBAdHMtY2hlY2tcblxuaW1wb3J0IF8gZnJvbSAnbG9kYXNoJztcblxuLyoqXG4gKlxuICogQHBhcmFtIHtGaW5kQmFzZX0gQmFzZVxuICogQHJldHVybnMge0xvZ0Jhc2V9XG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBMb2dNaXhpbihCYXNlKSB7XG4gIC8qKlxuICAgKiBAaW1wbGVtZW50cyB7SUxvZ0NvbW1hbmRzfVxuICAgKi9cbiAgY2xhc3MgTG9nQ29tbWFuZHMgZXh0ZW5kcyBCYXNlIHtcbiAgICBjb25zdHJ1Y3RvciguLi5hcmdzKSB7XG4gICAgICBzdXBlciguLi5hcmdzKTtcbiAgICAgIC8qKiBAdHlwZSB7UmVjb3JkPHN0cmluZywgTG9nVHlwZTxEcml2ZXI+Pn0gKi9cbiAgICAgIHRoaXMuc3VwcG9ydGVkTG9nVHlwZXMgPSB0aGlzLnN1cHBvcnRlZExvZ1R5cGVzID8/IHt9O1xuICAgIH1cblxuICAgIGFzeW5jIGdldExvZ1R5cGVzKCkge1xuICAgICAgdGhpcy5sb2cuZGVidWcoJ1JldHJpZXZpbmcgc3VwcG9ydGVkIGxvZyB0eXBlcycpO1xuICAgICAgcmV0dXJuIF8ua2V5cyh0aGlzLnN1cHBvcnRlZExvZ1R5cGVzKTtcbiAgICB9XG5cbiAgICAvKipcbiAgICAgKiBAdGhpcyB7RHJpdmVyfVxuICAgICAqIEBwYXJhbSB7c3RyaW5nfSBsb2dUeXBlXG4gICAgICovXG4gICAgYXN5bmMgZ2V0TG9nKGxvZ1R5cGUpIHtcbiAgICAgIHRoaXMubG9nLmRlYnVnKGBSZXRyaWV2aW5nICcke2xvZ1R5cGV9JyBsb2dzYCk7XG5cbiAgICAgIGlmICghKGF3YWl0IHRoaXMuZ2V0TG9nVHlwZXMoKSkuaW5jbHVkZXMobG9nVHlwZSkpIHtcbiAgICAgICAgY29uc3QgbG9nc1R5cGVzV2l0aERlc2NyaXB0aW9ucyA9IF8ubWFwVmFsdWVzKHRoaXMuc3VwcG9ydGVkTG9nVHlwZXMsICdkZXNjcmlwdGlvbicpO1xuICAgICAgICB0aHJvdyBuZXcgRXJyb3IoXG4gICAgICAgICAgYFVuc3VwcG9ydGVkIGxvZyB0eXBlICcke2xvZ1R5cGV9Jy4gYCArXG4gICAgICAgICAgICBgU3VwcG9ydGVkIHR5cGVzOiAke0pTT04uc3RyaW5naWZ5KGxvZ3NUeXBlc1dpdGhEZXNjcmlwdGlvbnMpfWBcbiAgICAgICAgKTtcbiAgICAgIH1cblxuICAgICAgcmV0dXJuIGF3YWl0IHRoaXMuc3VwcG9ydGVkTG9nVHlwZXNbbG9nVHlwZV0uZ2V0dGVyKHRoaXMpO1xuICAgIH1cbiAgfVxuICByZXR1cm4gTG9nQ29tbWFuZHM7XG59XG5cbi8qKlxuICogQHR5cGVkZWYge2ltcG9ydCgnQGFwcGl1bS90eXBlcycpLkxvZ0NvbW1hbmRzfSBJTG9nQ29tbWFuZHNcbiAqIEB0eXBlZGVmIHtpbXBvcnQoJ0BhcHBpdW0vdHlwZXMnKS5Ecml2ZXJ9IERyaXZlclxuICogQHR5cGVkZWYge2ltcG9ydCgnLi9maW5kJykuRmluZEJhc2V9IEZpbmRCYXNlXG4gKiBAdHlwZWRlZiB7aW1wb3J0KCcuLi9kcml2ZXInKS5CYXNlRHJpdmVyQmFzZTxpbXBvcnQoJ0BhcHBpdW0vdHlwZXMnKS5UaW1lb3V0Q29tbWFuZHMgJiBpbXBvcnQoJ0BhcHBpdW0vdHlwZXMnKS5FdmVudENvbW1hbmRzICYgaW1wb3J0KCdAYXBwaXVtL3R5cGVzJykuRmluZENvbW1hbmRzICYgSUxvZ0NvbW1hbmRzPn0gTG9nQmFzZVxuICovXG5cbi8qKlxuICogQHRlbXBsYXRlIFRcbiAqIEB0eXBlZGVmIHtpbXBvcnQoJ0BhcHBpdW0vdHlwZXMnKS5Mb2dUeXBlPFQ+fSBMb2dUeXBlXG4gKi9cbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBR0E7Ozs7QUFPTyxTQUFTQSxRQUFULENBQWtCQyxJQUFsQixFQUF3QjtFQUk3QixNQUFNQyxXQUFOLFNBQTBCRCxJQUExQixDQUErQjtJQUM3QkUsV0FBVyxDQUFDLEdBQUdDLElBQUosRUFBVTtNQUNuQixNQUFNLEdBQUdBLElBQVQ7TUFFQSxLQUFLQyxpQkFBTCxHQUF5QixLQUFLQSxpQkFBTCxJQUEwQixFQUFuRDtJQUNEOztJQUVnQixNQUFYQyxXQUFXLEdBQUc7TUFDbEIsS0FBS0MsR0FBTCxDQUFTQyxLQUFULENBQWUsZ0NBQWY7TUFDQSxPQUFPQyxlQUFBLENBQUVDLElBQUYsQ0FBTyxLQUFLTCxpQkFBWixDQUFQO0lBQ0Q7O0lBTVcsTUFBTk0sTUFBTSxDQUFDQyxPQUFELEVBQVU7TUFDcEIsS0FBS0wsR0FBTCxDQUFTQyxLQUFULENBQWdCLGVBQWNJLE9BQVEsUUFBdEM7O01BRUEsSUFBSSxDQUFDLENBQUMsTUFBTSxLQUFLTixXQUFMLEVBQVAsRUFBMkJPLFFBQTNCLENBQW9DRCxPQUFwQyxDQUFMLEVBQW1EO1FBQ2pELE1BQU1FLHlCQUF5QixHQUFHTCxlQUFBLENBQUVNLFNBQUYsQ0FBWSxLQUFLVixpQkFBakIsRUFBb0MsYUFBcEMsQ0FBbEM7O1FBQ0EsTUFBTSxJQUFJVyxLQUFKLENBQ0gseUJBQXdCSixPQUFRLEtBQWpDLEdBQ0csb0JBQW1CSyxJQUFJLENBQUNDLFNBQUwsQ0FBZUoseUJBQWYsQ0FBMEMsRUFGNUQsQ0FBTjtNQUlEOztNQUVELE9BQU8sTUFBTSxLQUFLVCxpQkFBTCxDQUF1Qk8sT0FBdkIsRUFBZ0NPLE1BQWhDLENBQXVDLElBQXZDLENBQWI7SUFDRDs7RUE1QjRCOztFQThCL0IsT0FBT2pCLFdBQVA7QUFDRCJ9
+exports.LogMixin = LogMixin;
+/**
+ * @typedef {import('@appium/types').Constraints} Constraints
+ * @typedef {import('@appium/types').StringRecord} StringRecord
+ */
+/**
+ * @template {Constraints} C
+ * @typedef {import('@appium/types').ILogCommands<C>} ILogCommands
+ */
+/**
+ * @template {Constraints} C
+ * @typedef {import('../driver').BaseDriverBase<C, import('@appium/types').ITimeoutCommands & import('@appium/types').IEventCommands & import('@appium/types').IFindCommands & ILogCommands<C>>} LogBase
+ */
+//# sourceMappingURL=log.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"log.js","names":["LogMixin","Base","LogCommands","constructor","args","supportedLogTypes","getLogTypes","log","debug","_","keys","getLog","logType","includes","logsTypesWithDescriptions","mapValues","Error","JSON","stringify","getter"],"sources":["../../../../lib/basedriver/commands/log.js"],"sourcesContent":["/* eslint-disable require-await */\n// @ts-check\n\nimport _ from 'lodash';\n\n/**\n *\n * @param {FindBase} Base\n * @returns {LogBase}\n */\nexport function LogMixin(Base) {\n  /**\n   * @implements {ILogCommands}\n   */\n  class LogCommands extends Base {\n    constructor(...args) {\n      super(...args);\n      /** @type {Record<string, LogType<Driver>>} */\n      this.supportedLogTypes = this.supportedLogTypes ?? {};\n    }\n\n    async getLogTypes() {\n      this.log.debug('Retrieving supported log types');\n      return _.keys(this.supportedLogTypes);\n    }\n\n    /**\n     * @this {Driver}\n     * @param {string} logType\n     */\n    async getLog(logType) {\n      this.log.debug(`Retrieving '${logType}' logs`);\n\n      if (!(await this.getLogTypes()).includes(logType)) {\n        const logsTypesWithDescriptions = _.mapValues(this.supportedLogTypes, 'description');\n        throw new Error(\n          `Unsupported log type '${logType}'. ` +\n            `Supported types: ${JSON.stringify(logsTypesWithDescriptions)}`\n        );\n      }\n\n      return await this.supportedLogTypes[logType].getter(this);\n    }\n  }\n  return LogCommands;\n}\n\n/**\n * @typedef {import('@appium/types').LogCommands} ILogCommands\n * @typedef {import('@appium/types').Driver} Driver\n * @typedef {import('./find').FindBase} FindBase\n * @typedef {import('../driver').BaseDriverBase<import('@appium/types').TimeoutCommands & import('@appium/types').EventCommands & import('@appium/types').FindCommands & ILogCommands>} LogBase\n */\n\n/**\n * @template T\n * @typedef {import('@appium/types').LogType<T>} LogType\n */\n"],"mappings":";;;;;;;;;AAGA;;;;AAOO,SAASA,QAAT,CAAkBC,IAAlB,EAAwB;EAI7B,MAAMC,WAAN,SAA0BD,IAA1B,CAA+B;IAC7BE,WAAW,CAAC,GAAGC,IAAJ,EAAU;MACnB,MAAM,GAAGA,IAAT;MAEA,KAAKC,iBAAL,GAAyB,KAAKA,iBAAL,IAA0B,EAAnD;IACD;;IAEgB,MAAXC,WAAW,GAAG;MAClB,KAAKC,GAAL,CAASC,KAAT,CAAe,gCAAf;MACA,OAAOC,eAAA,CAAEC,IAAF,CAAO,KAAKL,iBAAZ,CAAP;IACD;;IAMW,MAANM,MAAM,CAACC,OAAD,EAAU;MACpB,KAAKL,GAAL,CAASC,KAAT,CAAgB,eAAcI,OAAQ,QAAtC;;MAEA,IAAI,CAAC,CAAC,MAAM,KAAKN,WAAL,EAAP,EAA2BO,QAA3B,CAAoCD,OAApC,CAAL,EAAmD;QACjD,MAAME,yBAAyB,GAAGL,eAAA,CAAEM,SAAF,CAAY,KAAKV,iBAAjB,EAAoC,aAApC,CAAlC;;QACA,MAAM,IAAIW,KAAJ,CACH,yBAAwBJ,OAAQ,KAAjC,GACG,oBAAmBK,IAAI,CAACC,SAAL,CAAeJ,yBAAf,CAA0C,EAF5D,CAAN;MAID;;MAED,OAAO,MAAM,KAAKT,iBAAL,CAAuBO,OAAvB,EAAgCO,MAAhC,CAAuC,IAAvC,CAAb;IACD;;EA5B4B;;EA8B/B,OAAOjB,WAAP;AACD"}
+{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/log.js"],"names":[],"mappings":";AAAA,kCAAkC;AAClC,YAAY;;;;;;AAEZ,oDAAuB;AAEvB;;;;GAIG;AACH,SAAgB,QAAQ,CAAC,IAAI;IAC3B;;OAEG;IACH,MAAM,WAAY,SAAQ,IAAI;QAI5B,YAAY,GAAG,IAAI;YACjB,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;YACf,IAAI,CAAC,iBAAiB,KAAtB,IAAI,CAAC,iBAAiB,GAAK,EAAE,EAAC;QAChC,CAAC;QAED,KAAK,CAAC,WAAW;YACf,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;YACjD,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC7C,CAAC;QAED;;;;WAIG;QACH,KAAK,CAAC,MAAM,CAAC,OAAO;YAClB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAEvD,IAAI,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,iBAAiB,CAAC,EAAE;gBACxC,MAAM,yBAAyB,GAAG,gBAAC,CAAC,SAAS,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;gBACrF,MAAM,IAAI,KAAK,CACb,yBAAyB,MAAM,CAAC,OAAO,CAAC,KAAK;oBAC3C,oBAAoB,IAAI,CAAC,SAAS,CAAC,yBAAyB,CAAC,EAAE,CAClE,CAAC;aACH;YAED,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC5D,CAAC;KACF;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAtCD,4BAsCC;AAED;;;GAGG;AAEH;;;GAGG;AAEH;;;GAGG"}

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

@@ -1,11 +1,12 @@
 /**
- * @param {SettingsBase} Base
- * @returns {SessionBase}
+ * @template {Constraints} C
+ * @param {import('./settings').SettingsBase<C>} Base
+ * @returns {SessionBase<C>}
  */
-export function SessionMixin(Base: SettingsBase): SessionBase;
-export type ISessionCommands = import('@appium/types').SessionCommands;
+export function SessionMixin<C extends Readonly<Record<string, import("@appium/types").Constraint>>>(Base: import("./settings").SettingsBase<C>): SessionBase<C>;
+export type ISessionCommands = import('@appium/types').ISessionCommands;
 export type SingularSessionData = import('@appium/types').SingularSessionData;
 export type MultiSessionData = import('@appium/types').MultiSessionData;
-export type SettingsBase = import('./settings').SettingsBase;
-export type SessionBase = import('../driver').BaseDriverBase<import('@appium/types').TimeoutCommands & import('@appium/types').EventCommands & import('@appium/types').FindCommands & import('@appium/types').LogCommands & import('@appium/types').SettingsCommands & ISessionCommands>;
+export type Constraints = import('@appium/types').Constraints;
+export type SessionBase<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> & import('@appium/types').ISettingsCommands & ISessionCommands>;
 //# sourceMappingURL=session.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../../lib/basedriver/commands/session.js"],"names":[],"mappings":"AAKA;;;GAGG;AACH,mCAHW,YAAY,GACV,WAAW,CAmCvB;+BAGY,OAAO,eAAe,EAAE,eAAe;kCACvC,OAAO,eAAe,EAAE,mBAAmB;+BAC3C,OAAO,eAAe,EAAE,gBAAgB;2BACxC,OAAO,YAAY,EAAE,YAAY;0BACjC,OAAO,WAAW,EAAE,cAAc,CAAC,OAAO,eAAe,EAAE,eAAe,GAAG,OAAO,eAAe,EAAE,aAAa,GAAG,OAAO,eAAe,EAAE,YAAY,GAAG,OAAO,eAAe,EAAE,WAAW,GAAG,OAAO,eAAe,EAAE,gBAAgB,GAAG,gBAAgB,CAAC"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../../lib/basedriver/commands/session.js"],"names":[],"mappings":"AAKA;;;;GAIG;AACH,iKAiCC;+BAGY,OAAO,eAAe,EAAE,gBAAgB;kCACxC,OAAO,eAAe,EAAE,mBAAmB;+BAC3C,OAAO,eAAe,EAAE,gBAAgB;0BACxC,OAAO,eAAe,EAAE,WAAW;kGAKnC,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,OAAO,eAAe,EAAE,iBAAiB,GAAG,gBAAgB,CAAC"}

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

@@ -1,43 +1,50 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.SessionMixin = SessionMixin;
-
-require("source-map-support/register");
-
-var _lodash = _interopRequireDefault(require("lodash"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SessionMixin = void 0;
+/**
+ * @template {Constraints} C
+ * @param {import('./settings').SettingsBase<C>} Base
+ * @returns {SessionBase<C>}
+ */
 function SessionMixin(Base) {
-  class SessionCommands extends Base {
-    async getSessions() {
-      let ret = [];
-
-      if (this.sessionId) {
-        ret.push({
-          id: this.sessionId,
-          capabilities: this.caps
-        });
-      }
-
-      return ret;
-    }
-
-    async getSession() {
-      if (this.caps.eventTimings) {
-        return { ...this.caps,
-          events: this.eventHistory
-        };
-      }
-
-      return this.caps;
+    /**
+     * @implements {ISessionCommands}
+     */
+    class SessionCommands extends Base {
+        /**
+         * @returns {Promise<MultiSessionData[]>}
+         */
+        async getSessions() {
+            let ret = [];
+            if (this.sessionId) {
+                ret.push({
+                    id: this.sessionId,
+                    capabilities: this.caps,
+                });
+            }
+            return ret;
+        }
+        /**
+         * @returns {Promise<SingularSessionData>}
+         */
+        async getSession() {
+            if (this.caps.eventTimings) {
+                return { ...this.caps, events: this.eventHistory };
+            }
+            return this.caps;
+        }
     }
-
-  }
-
-  return SessionCommands;
+    return SessionCommands;
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJTZXNzaW9uTWl4aW4iLCJCYXNlIiwiU2Vzc2lvbkNvbW1hbmRzIiwiZ2V0U2Vzc2lvbnMiLCJyZXQiLCJzZXNzaW9uSWQiLCJwdXNoIiwiaWQiLCJjYXBhYmlsaXRpZXMiLCJjYXBzIiwiZ2V0U2Vzc2lvbiIsImV2ZW50VGltaW5ncyIsImV2ZW50cyIsImV2ZW50SGlzdG9yeSJdLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2xpYi9iYXNlZHJpdmVyL2NvbW1hbmRzL3Nlc3Npb24uanMiXSwic291cmNlc0NvbnRlbnQiOlsiLyogZXNsaW50LWRpc2FibGUgbm8tdW51c2VkLXZhcnMgKi9cbi8qIGVzbGludC1kaXNhYmxlIHJlcXVpcmUtYXdhaXQgKi9cbi8vIEB0cy1jaGVja1xuaW1wb3J0IF8gZnJvbSAnbG9kYXNoJztcblxuLyoqXG4gKiBAcGFyYW0ge1NldHRpbmdzQmFzZX0gQmFzZVxuICogQHJldHVybnMge1Nlc3Npb25CYXNlfVxuICovXG5leHBvcnQgZnVuY3Rpb24gU2Vzc2lvbk1peGluKEJhc2UpIHtcbiAgLyoqXG4gICAqIEBpbXBsZW1lbnRzIHtJU2Vzc2lvbkNvbW1hbmRzfVxuICAgKi9cbiAgY2xhc3MgU2Vzc2lvbkNvbW1hbmRzIGV4dGVuZHMgQmFzZSB7XG4gICAgLyoqXG4gICAgICogQHJldHVybnMge1Byb21pc2U8TXVsdGlTZXNzaW9uRGF0YVtdPn1cbiAgICAgKi9cbiAgICBhc3luYyBnZXRTZXNzaW9ucygpIHtcbiAgICAgIGxldCByZXQgPSBbXTtcblxuICAgICAgaWYgKHRoaXMuc2Vzc2lvbklkKSB7XG4gICAgICAgIHJldC5wdXNoKHtcbiAgICAgICAgICBpZDogdGhpcy5zZXNzaW9uSWQsXG4gICAgICAgICAgY2FwYWJpbGl0aWVzOiB0aGlzLmNhcHMsXG4gICAgICAgIH0pO1xuICAgICAgfVxuXG4gICAgICByZXR1cm4gcmV0O1xuICAgIH1cblxuICAgIC8qKlxuICAgICAqIEByZXR1cm5zIHtQcm9taXNlPFNpbmd1bGFyU2Vzc2lvbkRhdGE+fVxuICAgICAqL1xuICAgIGFzeW5jIGdldFNlc3Npb24oKSB7XG4gICAgICBpZiAodGhpcy5jYXBzLmV2ZW50VGltaW5ncykge1xuICAgICAgICByZXR1cm4gey4uLnRoaXMuY2FwcywgZXZlbnRzOiB0aGlzLmV2ZW50SGlzdG9yeX07XG4gICAgICB9XG4gICAgICByZXR1cm4gdGhpcy5jYXBzO1xuICAgIH1cbiAgfVxuXG4gIHJldHVybiBTZXNzaW9uQ29tbWFuZHM7XG59XG5cbi8qKlxuICogQHR5cGVkZWYge2ltcG9ydCgnQGFwcGl1bS90eXBlcycpLlNlc3Npb25Db21tYW5kc30gSVNlc3Npb25Db21tYW5kc1xuICogQHR5cGVkZWYge2ltcG9ydCgnQGFwcGl1bS90eXBlcycpLlNpbmd1bGFyU2Vzc2lvbkRhdGF9IFNpbmd1bGFyU2Vzc2lvbkRhdGFcbiAqIEB0eXBlZGVmIHtpbXBvcnQoJ0BhcHBpdW0vdHlwZXMnKS5NdWx0aVNlc3Npb25EYXRhfSBNdWx0aVNlc3Npb25EYXRhXG4gKiBAdHlwZWRlZiB7aW1wb3J0KCcuL3NldHRpbmdzJykuU2V0dGluZ3NCYXNlfSBTZXR0aW5nc0Jhc2VcbiAqIEB0eXBlZGVmIHtpbXBvcnQoJy4uL2RyaXZlcicpLkJhc2VEcml2ZXJCYXNlPGltcG9ydCgnQGFwcGl1bS90eXBlcycpLlRpbWVvdXRDb21tYW5kcyAmIGltcG9ydCgnQGFwcGl1bS90eXBlcycpLkV2ZW50Q29tbWFuZHMgJiBpbXBvcnQoJ0BhcHBpdW0vdHlwZXMnKS5GaW5kQ29tbWFuZHMgJiBpbXBvcnQoJ0BhcHBpdW0vdHlwZXMnKS5Mb2dDb21tYW5kcyAmIGltcG9ydCgnQGFwcGl1bS90eXBlcycpLlNldHRpbmdzQ29tbWFuZHMgJiBJU2Vzc2lvbkNvbW1hbmRzPn0gU2Vzc2lvbkJhc2VcbiAqL1xuIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFHQTs7OztBQU1PLFNBQVNBLFlBQVQsQ0FBc0JDLElBQXRCLEVBQTRCO0VBSWpDLE1BQU1DLGVBQU4sU0FBOEJELElBQTlCLENBQW1DO0lBSWhCLE1BQVhFLFdBQVcsR0FBRztNQUNsQixJQUFJQyxHQUFHLEdBQUcsRUFBVjs7TUFFQSxJQUFJLEtBQUtDLFNBQVQsRUFBb0I7UUFDbEJELEdBQUcsQ0FBQ0UsSUFBSixDQUFTO1VBQ1BDLEVBQUUsRUFBRSxLQUFLRixTQURGO1VBRVBHLFlBQVksRUFBRSxLQUFLQztRQUZaLENBQVQ7TUFJRDs7TUFFRCxPQUFPTCxHQUFQO0lBQ0Q7O0lBS2UsTUFBVk0sVUFBVSxHQUFHO01BQ2pCLElBQUksS0FBS0QsSUFBTCxDQUFVRSxZQUFkLEVBQTRCO1FBQzFCLE9BQU8sRUFBQyxHQUFHLEtBQUtGLElBQVQ7VUFBZUcsTUFBTSxFQUFFLEtBQUtDO1FBQTVCLENBQVA7TUFDRDs7TUFDRCxPQUFPLEtBQUtKLElBQVo7SUFDRDs7RUF6QmdDOztFQTRCbkMsT0FBT1AsZUFBUDtBQUNEIn0=
+exports.SessionMixin = SessionMixin;
+/**
+ * @typedef {import('@appium/types').ISessionCommands} ISessionCommands
+ * @typedef {import('@appium/types').SingularSessionData} SingularSessionData
+ * @typedef {import('@appium/types').MultiSessionData} MultiSessionData
+ * @typedef {import('@appium/types').Constraints} Constraints
+ */
+/**
+ * @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> & import('@appium/types').ISettingsCommands & ISessionCommands>} SessionBase
+ */
+//# sourceMappingURL=session.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"session.js","names":["SessionMixin","Base","SessionCommands","getSessions","ret","sessionId","push","id","capabilities","caps","getSession","eventTimings","events","eventHistory"],"sources":["../../../../lib/basedriver/commands/session.js"],"sourcesContent":["/* eslint-disable no-unused-vars */\n/* eslint-disable require-await */\n// @ts-check\nimport _ from 'lodash';\n\n/**\n * @param {SettingsBase} Base\n * @returns {SessionBase}\n */\nexport function SessionMixin(Base) {\n  /**\n   * @implements {ISessionCommands}\n   */\n  class SessionCommands extends Base {\n    /**\n     * @returns {Promise<MultiSessionData[]>}\n     */\n    async getSessions() {\n      let ret = [];\n\n      if (this.sessionId) {\n        ret.push({\n          id: this.sessionId,\n          capabilities: this.caps,\n        });\n      }\n\n      return ret;\n    }\n\n    /**\n     * @returns {Promise<SingularSessionData>}\n     */\n    async getSession() {\n      if (this.caps.eventTimings) {\n        return {...this.caps, events: this.eventHistory};\n      }\n      return this.caps;\n    }\n  }\n\n  return SessionCommands;\n}\n\n/**\n * @typedef {import('@appium/types').SessionCommands} ISessionCommands\n * @typedef {import('@appium/types').SingularSessionData} SingularSessionData\n * @typedef {import('@appium/types').MultiSessionData} MultiSessionData\n * @typedef {import('./settings').SettingsBase} SettingsBase\n * @typedef {import('../driver').BaseDriverBase<import('@appium/types').TimeoutCommands & import('@appium/types').EventCommands & import('@appium/types').FindCommands & import('@appium/types').LogCommands & import('@appium/types').SettingsCommands & ISessionCommands>} SessionBase\n */\n"],"mappings":";;;;;;;;;AAGA;;;;AAMO,SAASA,YAAT,CAAsBC,IAAtB,EAA4B;EAIjC,MAAMC,eAAN,SAA8BD,IAA9B,CAAmC;IAIhB,MAAXE,WAAW,GAAG;MAClB,IAAIC,GAAG,GAAG,EAAV;;MAEA,IAAI,KAAKC,SAAT,EAAoB;QAClBD,GAAG,CAACE,IAAJ,CAAS;UACPC,EAAE,EAAE,KAAKF,SADF;UAEPG,YAAY,EAAE,KAAKC;QAFZ,CAAT;MAID;;MAED,OAAOL,GAAP;IACD;;IAKe,MAAVM,UAAU,GAAG;MACjB,IAAI,KAAKD,IAAL,CAAUE,YAAd,EAA4B;QAC1B,OAAO,EAAC,GAAG,KAAKF,IAAT;UAAeG,MAAM,EAAE,KAAKC;QAA5B,CAAP;MACD;;MACD,OAAO,KAAKJ,IAAZ;IACD;;EAzBgC;;EA4BnC,OAAOP,eAAP;AACD"}
+{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/session.js"],"names":[],"mappings":";;;AAKA;;;;GAIG;AACH,SAAgB,YAAY,CAAC,IAAI;IAC/B;;OAEG;IACH,MAAM,eAAgB,SAAQ,IAAI;QAChC;;WAEG;QACH,KAAK,CAAC,WAAW;YACf,IAAI,GAAG,GAAG,EAAE,CAAC;YAEb,IAAI,IAAI,CAAC,SAAS,EAAE;gBAClB,GAAG,CAAC,IAAI,CAAC;oBACP,EAAE,EAAE,IAAI,CAAC,SAAS;oBAClB,YAAY,EAAE,IAAI,CAAC,IAAI;iBACxB,CAAC,CAAC;aACJ;YAED,OAAO,GAAG,CAAC;QACb,CAAC;QAED;;WAEG;QACH,KAAK,CAAC,UAAU;YACd,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;gBAC1B,OAAO,EAAC,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,YAAY,EAAC,CAAC;aAClD;YACD,OAAO,IAAI,CAAC,IAAI,CAAC;QACnB,CAAC;KACF;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAjCD,oCAiCC;AAED;;;;;GAKG;AAEH;;;GAGG"}

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

@@ -1,10 +1,10 @@
 /**
- *
- * @param {ReturnType<import('./log').LogMixin>} Base
- * @returns {SettingsBase}
+ * @template {Constraints} C
+ * @param {import('./log').LogBase<C>} Base
+ * @returns {SettingsBase<C>}
  */
-export function SettingsMixin(Base: ReturnType<typeof import("./log").LogMixin>): SettingsBase;
-export type ISettingsCommands = import('@appium/types').SettingsCommands;
-export type LogBase = import('./log').LogBase;
-export type SettingsBase = import('../driver').BaseDriverBase<import('@appium/types').TimeoutCommands & import('@appium/types').EventCommands & import('@appium/types').FindCommands & import('@appium/types').LogCommands & ISettingsCommands>;
+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>;
 //# sourceMappingURL=settings.d.ts.map