appium-adb 9.11.7 → 9.12.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [9.12.0](https://github.com/appium/appium-adb/compare/v9.11.7...v9.12.0) (2023-06-14)
+
+
+### Features
+
+* export types ([#661](https://github.com/appium/appium-adb/issues/661)) ([269f3aa](https://github.com/appium/appium-adb/commit/269f3aae28dcb0a7627a780d2130f847bdf6889d))
+
 ## [9.11.7](https://github.com/appium/appium-adb/compare/v9.11.6...v9.11.7) (2023-06-11)
 
 

package/build/index.d.ts

@@ -0,0 +1,12 @@
+/**
+ * @privateRemarks This is a `.ts` file so we can re-export types from other
+ * files; otherwise we would need to copy `@typedef`s around.
+ * @module
+ */
+import { ADB } from './lib/adb';
+export * from './lib/adb';
+export type * from './lib/mixins';
+export type * from './lib/tools';
+export type * from './lib/logcat';
+export default ADB;
+//# sourceMappingURL=index.d.ts.map

package/build/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAC,GAAG,EAAC,MAAM,WAAW,CAAC;AAI9B,cAAc,WAAW,CAAC;AAC1B,mBAAmB,cAAc,CAAC;AAClC,mBAAmB,aAAa,CAAC;AACjC,mBAAmB,cAAc,CAAC;AAClC,eAAe,GAAG,CAAC"}

package/build/index.js

@@ -1,23 +1,27 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getSdkRootFromEnv = exports.getAndroidBinaryPath = exports.default = exports.DEFAULT_ADB_PORT = exports.ADB = void 0;
-require("source-map-support/register");
-var adb = _interopRequireWildcard(require("./lib/adb"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-const {
-  ADB,
-  DEFAULT_ADB_PORT,
-  getAndroidBinaryPath,
-  getSdkRootFromEnv
-} = adb;
-exports.getSdkRootFromEnv = getSdkRootFromEnv;
-exports.getAndroidBinaryPath = getAndroidBinaryPath;
-exports.DEFAULT_ADB_PORT = DEFAULT_ADB_PORT;
-exports.ADB = ADB;
-var _default = ADB;
-exports.default = _default;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJhZGIiLCJfaW50ZXJvcFJlcXVpcmVXaWxkY2FyZCIsInJlcXVpcmUiLCJfZ2V0UmVxdWlyZVdpbGRjYXJkQ2FjaGUiLCJub2RlSW50ZXJvcCIsIldlYWtNYXAiLCJjYWNoZUJhYmVsSW50ZXJvcCIsImNhY2hlTm9kZUludGVyb3AiLCJvYmoiLCJfX2VzTW9kdWxlIiwiZGVmYXVsdCIsImNhY2hlIiwiaGFzIiwiZ2V0IiwibmV3T2JqIiwiaGFzUHJvcGVydHlEZXNjcmlwdG9yIiwiT2JqZWN0IiwiZGVmaW5lUHJvcGVydHkiLCJnZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IiLCJrZXkiLCJwcm90b3R5cGUiLCJoYXNPd25Qcm9wZXJ0eSIsImNhbGwiLCJkZXNjIiwic2V0IiwiQURCIiwiREVGQVVMVF9BREJfUE9SVCIsImdldEFuZHJvaWRCaW5hcnlQYXRoIiwiZ2V0U2RrUm9vdEZyb21FbnYiLCJleHBvcnRzIiwiX2RlZmF1bHQiXSwic291cmNlcyI6WyIuLi9pbmRleC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyIvLyB0cmFuc3BpbGU6bWFpblxuXG5pbXBvcnQgKiBhcyBhZGIgZnJvbSAnLi9saWIvYWRiJztcblxuY29uc3Qge1xuICBBREIsXG4gIERFRkFVTFRfQURCX1BPUlQsXG4gIGdldEFuZHJvaWRCaW5hcnlQYXRoLFxuICBnZXRTZGtSb290RnJvbUVudlxufSA9IGFkYjtcblxuZXhwb3J0IGRlZmF1bHQgQURCO1xuZXhwb3J0IHsgQURCLCBERUZBVUxUX0FEQl9QT1JULCBnZXRBbmRyb2lkQmluYXJ5UGF0aCwgZ2V0U2RrUm9vdEZyb21FbnYgfTtcbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7OztBQUVBLElBQUFBLEdBQUEsR0FBQUMsdUJBQUEsQ0FBQUMsT0FBQTtBQUFpQyxTQUFBQyx5QkFBQUMsV0FBQSxlQUFBQyxPQUFBLGtDQUFBQyxpQkFBQSxPQUFBRCxPQUFBLFFBQUFFLGdCQUFBLE9BQUFGLE9BQUEsWUFBQUYsd0JBQUEsWUFBQUEsQ0FBQUMsV0FBQSxXQUFBQSxXQUFBLEdBQUFHLGdCQUFBLEdBQUFELGlCQUFBLEtBQUFGLFdBQUE7QUFBQSxTQUFBSCx3QkFBQU8sR0FBQSxFQUFBSixXQUFBLFNBQUFBLFdBQUEsSUFBQUksR0FBQSxJQUFBQSxHQUFBLENBQUFDLFVBQUEsV0FBQUQsR0FBQSxRQUFBQSxHQUFBLG9CQUFBQSxHQUFBLHdCQUFBQSxHQUFBLDRCQUFBRSxPQUFBLEVBQUFGLEdBQUEsVUFBQUcsS0FBQSxHQUFBUix3QkFBQSxDQUFBQyxXQUFBLE9BQUFPLEtBQUEsSUFBQUEsS0FBQSxDQUFBQyxHQUFBLENBQUFKLEdBQUEsWUFBQUcsS0FBQSxDQUFBRSxHQUFBLENBQUFMLEdBQUEsU0FBQU0sTUFBQSxXQUFBQyxxQkFBQSxHQUFBQyxNQUFBLENBQUFDLGNBQUEsSUFBQUQsTUFBQSxDQUFBRSx3QkFBQSxXQUFBQyxHQUFBLElBQUFYLEdBQUEsUUFBQVcsR0FBQSxrQkFBQUgsTUFBQSxDQUFBSSxTQUFBLENBQUFDLGNBQUEsQ0FBQUMsSUFBQSxDQUFBZCxHQUFBLEVBQUFXLEdBQUEsU0FBQUksSUFBQSxHQUFBUixxQkFBQSxHQUFBQyxNQUFBLENBQUFFLHdCQUFBLENBQUFWLEdBQUEsRUFBQVcsR0FBQSxjQUFBSSxJQUFBLEtBQUFBLElBQUEsQ0FBQVYsR0FBQSxJQUFBVSxJQUFBLENBQUFDLEdBQUEsS0FBQVIsTUFBQSxDQUFBQyxjQUFBLENBQUFILE1BQUEsRUFBQUssR0FBQSxFQUFBSSxJQUFBLFlBQUFULE1BQUEsQ0FBQUssR0FBQSxJQUFBWCxHQUFBLENBQUFXLEdBQUEsU0FBQUwsTUFBQSxDQUFBSixPQUFBLEdBQUFGLEdBQUEsTUFBQUcsS0FBQSxJQUFBQSxLQUFBLENBQUFhLEdBQUEsQ0FBQWhCLEdBQUEsRUFBQU0sTUFBQSxZQUFBQSxNQUFBO0FBRWpDLE1BQU07RUFDSlcsR0FBRztFQUNIQyxnQkFBZ0I7RUFDaEJDLG9CQUFvQjtFQUNwQkM7QUFDRixDQUFDLEdBQUc1QixHQUFHO0FBQUM2QixPQUFBLENBQUFELGlCQUFBLEdBQUFBLGlCQUFBO0FBQUFDLE9BQUEsQ0FBQUYsb0JBQUEsR0FBQUEsb0JBQUE7QUFBQUUsT0FBQSxDQUFBSCxnQkFBQSxHQUFBQSxnQkFBQTtBQUFBRyxPQUFBLENBQUFKLEdBQUEsR0FBQUEsR0FBQTtBQUFBLElBQUFLLFFBQUEsR0FFT0wsR0FBRztBQUFBSSxPQUFBLENBQUFuQixPQUFBLEdBQUFvQixRQUFBIn0=
+/**
+ * @privateRemarks This is a `.ts` file so we can re-export types from other
+ * files; otherwise we would need to copy `@typedef`s around.
+ * @module
+ */
+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 __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const source_map_support_1 = require("source-map-support");
+const adb_1 = require("./lib/adb");
+(0, source_map_support_1.install)();
+__exportStar(require("./lib/adb"), exports);
+exports.default = adb_1.ADB;
+//# sourceMappingURL=index.js.map

package/build/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;AAEH,2DAA2C;AAC3C,mCAA8B;AAE9B,IAAA,4BAAO,GAAE,CAAC;AAEV,4CAA0B;AAI1B,kBAAe,SAAG,CAAC"}

package/build/lib/adb.d.ts

@@ -0,0 +1,70 @@
+import { getAndroidBinaryPath } from './tools';
+import { getSdkRootFromEnv } from './helpers';
+import { StringRecord } from '@appium/types';
+import type Logcat from './logcat';
+declare const DEFAULT_ADB_PORT = 5037;
+export declare const DEFAULT_OPTS: {
+    readonly sdkRoot: string | undefined;
+    readonly executable: {
+        readonly path: "adb";
+        readonly defaultArgs: readonly [];
+    };
+    readonly tmpDir: string;
+    readonly binaries: {};
+    readonly jars: {};
+    readonly adbPort: 5037;
+    readonly adbExecTimeout: 20000;
+    readonly remoteAppsCacheLimit: 10;
+    readonly allowOfflineDevices: false;
+    readonly allowDelayAdb: true;
+};
+export interface ADBOptions {
+    sdkRoot?: string;
+    udid?: string;
+    appDeviceReadyTimeout?: number;
+    useKeystore?: boolean;
+    keystorePath?: string;
+    keystorePassword?: string;
+    keyAlias?: string;
+    keyPassword?: string;
+    executable: ADBExecutable;
+    tmpDir?: string;
+    curDeviceId?: string;
+    emulatorPort?: number;
+    logcat?: Logcat;
+    binaries?: StringRecord;
+    instrumentProc?: string;
+    suppressKillServer?: boolean;
+    jars?: StringRecord;
+    adbPort?: number;
+    adbHost?: string;
+    adbExecTimeout?: number;
+    remoteAppsCacheLimit?: number;
+    buildToolsVersion?: string;
+    allowOfflineDevices?: boolean;
+    allowDelayAdb?: boolean;
+    remoteAdbHost?: string;
+    remoteAdbPort?: number;
+    clearDeviceLogsOnStart?: boolean;
+    emPort?: number;
+}
+export interface ADBExecutable {
+    path: string;
+    defaultArgs: string[];
+}
+export declare class ADB {
+    adbHost?: string;
+    adbPort?: number;
+    executable: ADBExecutable;
+    constructor(opts?: Partial<ADBOptions>);
+    /**
+     * Create a new instance of `ADB` that inherits configuration from this `ADB` instance.
+     * This avoids the need to call `ADB.createADB()` multiple times.
+     * @param opts - Additional options mapping to pass to the `ADB` constructor.
+     * @returns The resulting class instance.
+     */
+    clone(opts?: Partial<ADBOptions>): ADB;
+    static createADB(opts: Partial<ADBOptions>): Promise<ADB>;
+}
+export { DEFAULT_ADB_PORT, getAndroidBinaryPath, getSdkRootFromEnv };
+//# sourceMappingURL=adb.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"adb.d.ts","sourceRoot":"","sources":["../../lib/adb.ts"],"names":[],"mappings":"AAEA,OAAgB,EAAC,oBAAoB,EAAC,MAAM,SAAS,CAAC;AACtD,OAAO,EAA2C,iBAAiB,EAAC,MAAM,WAAW,CAAC;AAEtF,OAAO,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAC3C,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AAEnC,QAAA,MAAM,gBAAgB,OAAO,CAAC;AAC9B,eAAO,MAAM,YAAY;;;;;;;;;;;;;;CAWf,CAAC;AAEX,MAAM,WAAW,UAAU;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,aAAa,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,qBAAa,GAAG;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,UAAU,EAAE,aAAa,CAAC;gBACd,IAAI,GAAE,OAAO,CAAC,UAAU,CAAM;IAmB1C;;;;;OAKG;IACH,KAAK,CAAC,IAAI,GAAE,OAAO,CAAC,UAAU,CAAM,GAAG,GAAG;WAiB7B,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC;CAYjD;AAKD,OAAO,EAAC,gBAAgB,EAAE,oBAAoB,EAAE,iBAAiB,EAAC,CAAC"}

package/build/lib/adb.js

@@ -1,102 +1,105 @@
 "use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.DEFAULT_ADB_PORT = exports.ADB = void 0;
-Object.defineProperty(exports, "getAndroidBinaryPath", {
-  enumerable: true,
-  get: function () {
-    return _index.getAndroidBinaryPath;
-  }
-});
-Object.defineProperty(exports, "getSdkRootFromEnv", {
-  enumerable: true,
-  get: function () {
-    return _helpers.getSdkRootFromEnv;
-  }
+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;
 });
-require("source-map-support/register");
-var _lodash = _interopRequireDefault(require("lodash"));
-var _os = _interopRequireDefault(require("os"));
-var _index = _interopRequireWildcard(require("./tools/index.js"));
-var _helpers = require("./helpers");
-var _logger = _interopRequireDefault(require("./logger.js"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+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 };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSdkRootFromEnv = exports.getAndroidBinaryPath = exports.DEFAULT_ADB_PORT = exports.ADB = exports.DEFAULT_OPTS = void 0;
+const lodash_1 = __importDefault(require("lodash"));
+const node_os_1 = __importDefault(require("node:os"));
+const tools_1 = __importStar(require("./tools"));
+Object.defineProperty(exports, "getAndroidBinaryPath", { enumerable: true, get: function () { return tools_1.getAndroidBinaryPath; } });
+const helpers_1 = require("./helpers");
+Object.defineProperty(exports, "getSdkRootFromEnv", { enumerable: true, get: function () { return helpers_1.getSdkRootFromEnv; } });
+const logger_1 = __importDefault(require("./logger"));
 const DEFAULT_ADB_PORT = 5037;
 exports.DEFAULT_ADB_PORT = DEFAULT_ADB_PORT;
-const DEFAULT_OPTS = {
-  sdkRoot: (0, _helpers.getSdkRootFromEnv)() || null,
-  udid: null,
-  appDeviceReadyTimeout: null,
-  useKeystore: null,
-  keystorePath: null,
-  keystorePassword: null,
-  keyAlias: null,
-  keyPassword: null,
-  executable: {
-    path: 'adb',
-    defaultArgs: []
-  },
-  tmpDir: _os.default.tmpdir(),
-  curDeviceId: null,
-  emulatorPort: null,
-  logcat: null,
-  binaries: {},
-  instrumentProc: null,
-  suppressKillServer: null,
-  jars: {},
-  adbPort: DEFAULT_ADB_PORT,
-  adbHost: null,
-  adbExecTimeout: _helpers.DEFAULT_ADB_EXEC_TIMEOUT,
-  remoteAppsCacheLimit: 10,
-  buildToolsVersion: null,
-  allowOfflineDevices: false,
-  allowDelayAdb: true
+exports.DEFAULT_OPTS = {
+    sdkRoot: (0, helpers_1.getSdkRootFromEnv)(),
+    executable: { path: 'adb', defaultArgs: [] },
+    tmpDir: node_os_1.default.tmpdir(),
+    binaries: {},
+    jars: {},
+    adbPort: DEFAULT_ADB_PORT,
+    adbExecTimeout: helpers_1.DEFAULT_ADB_EXEC_TIMEOUT,
+    remoteAppsCacheLimit: 10,
+    allowOfflineDevices: false,
+    allowDelayAdb: true,
 };
 class ADB {
-  constructor(opts = {}) {
-    Object.assign(this, opts);
-    _lodash.default.defaultsDeep(this, _lodash.default.cloneDeep(DEFAULT_OPTS));
-    if (opts.remoteAdbHost) {
-      this.executable.defaultArgs.push('-H', opts.remoteAdbHost);
-      this.adbHost = opts.remoteAdbHost;
-    }
-    if (opts.remoteAdbPort) {
-      this.adbPort = opts.remoteAdbPort;
+    constructor(opts = {}) {
+        const options = lodash_1.default.defaultsDeep(opts, lodash_1.default.cloneDeep(exports.DEFAULT_OPTS));
+        lodash_1.default.defaultsDeep(this, options);
+        // avoid TS error by explicitly assigning
+        this.executable = options.executable;
+        if (options.remoteAdbHost) {
+            this.executable.defaultArgs.push('-H', options.remoteAdbHost);
+            this.adbHost = options.remoteAdbHost;
+        }
+        // TODO figure out why we have this option as it does not appear to be
+        // used anywhere. Probably deprecate in favor of simple opts.adbPort
+        if (options.remoteAdbPort) {
+            this.adbPort = options.remoteAdbPort;
+        }
+        this.executable.defaultArgs.push('-P', String(this.adbPort));
     }
-    this.executable.defaultArgs.push('-P', this.adbPort);
-  }
-  clone(opts = {}) {
-    const originalOptions = _lodash.default.cloneDeep(_lodash.default.pick(this, Object.keys(DEFAULT_OPTS)));
-    const cloneOptions = _lodash.default.defaultsDeep(opts, originalOptions);
-    const defaultArgs = cloneOptions.executable.defaultArgs;
-    if (cloneOptions.remoteAdbHost && defaultArgs.includes('-H')) {
-      defaultArgs.splice(defaultArgs.indexOf('-H'), 2);
+    /**
+     * Create a new instance of `ADB` that inherits configuration from this `ADB` instance.
+     * This avoids the need to call `ADB.createADB()` multiple times.
+     * @param opts - Additional options mapping to pass to the `ADB` constructor.
+     * @returns The resulting class instance.
+     */
+    clone(opts = {}) {
+        const originalOptions = lodash_1.default.cloneDeep(lodash_1.default.pick(this, Object.keys(exports.DEFAULT_OPTS)));
+        const cloneOptions = lodash_1.default.defaultsDeep(opts, originalOptions);
+        // Reset default arguments created in the constructor.
+        // Without this code, -H and -P can be injected into defaultArgs multiple times.
+        const defaultArgs = cloneOptions.executable.defaultArgs;
+        if (cloneOptions.remoteAdbHost && defaultArgs.includes('-H')) {
+            defaultArgs.splice(defaultArgs.indexOf('-H'), 2);
+        }
+        if (defaultArgs.includes('-P')) {
+            defaultArgs.splice(defaultArgs.indexOf('-P'), 2);
+        }
+        return new ADB(cloneOptions);
     }
-    if (defaultArgs.includes('-P')) {
-      defaultArgs.splice(defaultArgs.indexOf('-P'), 2);
+    static async createADB(opts) {
+        const adb = new ADB(opts);
+        adb.sdkRoot = await (0, helpers_1.requireSdkRoot)(adb.sdkRoot);
+        adb.getAdbWithCorrectAdbPath();
+        try {
+            await adb.adbExec(['start-server']);
+        }
+        catch (e) {
+            const err = e;
+            logger_1.default.warn(err.stderr || err.message);
+        }
+        return adb;
     }
-    return new ADB(cloneOptions);
-  }
 }
 exports.ADB = ADB;
-ADB.createADB = async function createADB(opts) {
-  const adb = new ADB(opts);
-  adb.sdkRoot = await (0, _helpers.requireSdkRoot)(adb.sdkRoot);
-  await adb.getAdbWithCorrectAdbPath();
-  try {
-    await adb.adbExec(['start-server']);
-  } catch (e) {
-    _logger.default.warn(e.stderr || e.message);
-  }
-  return adb;
-};
-for (const [fnName, fn] of _lodash.default.toPairs(_index.default)) {
-  ADB.prototype[fnName] = fn;
-}
-var _default = ADB;
-exports.default = _default;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["_lodash","_interopRequireDefault","require","_os","_index","_interopRequireWildcard","_helpers","_logger","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","DEFAULT_ADB_PORT","exports","DEFAULT_OPTS","sdkRoot","getSdkRootFromEnv","udid","appDeviceReadyTimeout","useKeystore","keystorePath","keystorePassword","keyAlias","keyPassword","executable","path","defaultArgs","tmpDir","os","tmpdir","curDeviceId","emulatorPort","logcat","binaries","instrumentProc","suppressKillServer","jars","adbPort","adbHost","adbExecTimeout","DEFAULT_ADB_EXEC_TIMEOUT","remoteAppsCacheLimit","buildToolsVersion","allowOfflineDevices","allowDelayAdb","ADB","constructor","opts","assign","_","defaultsDeep","cloneDeep","remoteAdbHost","push","remoteAdbPort","clone","originalOptions","pick","keys","cloneOptions","includes","splice","indexOf","createADB","adb","requireSdkRoot","getAdbWithCorrectAdbPath","adbExec","e","log","warn","stderr","message","fnName","fn","toPairs","methods","_default"],"sources":["../../lib/adb.js"],"sourcesContent":["import _ from 'lodash';\nimport os from 'os';\nimport methods, { getAndroidBinaryPath } from './tools/index.js';\nimport {\n  DEFAULT_ADB_EXEC_TIMEOUT, requireSdkRoot, getSdkRootFromEnv\n} from './helpers';\nimport log from './logger.js';\n\nconst DEFAULT_ADB_PORT = 5037;\nconst DEFAULT_OPTS = {\n  sdkRoot: getSdkRootFromEnv() || null,\n  udid: null,\n  appDeviceReadyTimeout: null,\n  useKeystore: null,\n  keystorePath: null,\n  keystorePassword: null,\n  keyAlias: null,\n  keyPassword: null,\n  executable: {path: 'adb', defaultArgs: []},\n  tmpDir: os.tmpdir(),\n  curDeviceId: null,\n  emulatorPort: null,\n  logcat: null,\n  binaries: {},\n  instrumentProc: null,\n  suppressKillServer: null,\n  jars: {},\n  adbPort: DEFAULT_ADB_PORT,\n  adbHost: null,\n  adbExecTimeout: DEFAULT_ADB_EXEC_TIMEOUT,\n  remoteAppsCacheLimit: 10,\n  buildToolsVersion: null,\n  allowOfflineDevices: false,\n  allowDelayAdb: true,\n};\n\nclass ADB {\n  constructor (opts = {}) {\n    Object.assign(this, opts);\n    _.defaultsDeep(this, _.cloneDeep(DEFAULT_OPTS));\n\n    if (opts.remoteAdbHost) {\n      this.executable.defaultArgs.push('-H', opts.remoteAdbHost);\n      this.adbHost = opts.remoteAdbHost;\n    }\n    // TODO figure out why we have this option as it does not appear to be\n    // used anywhere. Probably deprecate in favor of simple opts.adbPort\n    if (opts.remoteAdbPort) {\n      this.adbPort = opts.remoteAdbPort;\n    }\n    this.executable.defaultArgs.push('-P', this.adbPort);\n  }\n\n  /**\n   * Create a new instance of `ADB` that inherits configuration from this `ADB` instance.\n   * This avoids the need to call `ADB.createADB()` multiple times.\n   * @param {object} opts - Additional options mapping to pass to the `ADB` constructor.\n   * @returns {ADB} The resulting class instance.\n   */\n  clone (opts = {}) {\n    const originalOptions = _.cloneDeep(_.pick(this, Object.keys(DEFAULT_OPTS)));\n    const cloneOptions = _.defaultsDeep(opts, originalOptions);\n\n    // Reset default arguments created in the constructor.\n    // Without this code, -H and -P can be injected into defaultArgs multiple times.\n    const defaultArgs = cloneOptions.executable.defaultArgs;\n    if (cloneOptions.remoteAdbHost && defaultArgs.includes('-H')) {\n      defaultArgs.splice(defaultArgs.indexOf('-H'), 2);\n    }\n    if (defaultArgs.includes('-P')) {\n      defaultArgs.splice(defaultArgs.indexOf('-P'), 2);\n    }\n\n    return new ADB(cloneOptions);\n  }\n}\n\nADB.createADB = async function createADB (opts) {\n  const adb = new ADB(opts);\n  adb.sdkRoot = await requireSdkRoot(adb.sdkRoot);\n  await adb.getAdbWithCorrectAdbPath();\n  try {\n    await adb.adbExec(['start-server']);\n  } catch (e) {\n    log.warn(e.stderr || e.message);\n  }\n  return adb;\n};\n\n// add all the methods to the ADB prototype\nfor (const [fnName, fn] of _.toPairs(methods)) {\n  ADB.prototype[fnName] = fn;\n}\n\nexport default ADB;\nexport { ADB, DEFAULT_ADB_PORT, getAndroidBinaryPath, getSdkRootFromEnv };\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,OAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,GAAA,GAAAF,sBAAA,CAAAC,OAAA;AACA,IAAAE,MAAA,GAAAC,uBAAA,CAAAH,OAAA;AACA,IAAAI,QAAA,GAAAJ,OAAA;AAGA,IAAAK,OAAA,GAAAN,sBAAA,CAAAC,OAAA;AAA8B,SAAAM,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAJ,wBAAAQ,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AAE9B,MAAMW,gBAAgB,GAAG,IAAI;AAACC,OAAA,CAAAD,gBAAA,GAAAA,gBAAA;AAC9B,MAAME,YAAY,GAAG;EACnBC,OAAO,EAAE,IAAAC,0BAAiB,EAAC,CAAC,IAAI,IAAI;EACpCC,IAAI,EAAE,IAAI;EACVC,qBAAqB,EAAE,IAAI;EAC3BC,WAAW,EAAE,IAAI;EACjBC,YAAY,EAAE,IAAI;EAClBC,gBAAgB,EAAE,IAAI;EACtBC,QAAQ,EAAE,IAAI;EACdC,WAAW,EAAE,IAAI;EACjBC,UAAU,EAAE;IAACC,IAAI,EAAE,KAAK;IAAEC,WAAW,EAAE;EAAE,CAAC;EAC1CC,MAAM,EAAEC,WAAE,CAACC,MAAM,CAAC,CAAC;EACnBC,WAAW,EAAE,IAAI;EACjBC,YAAY,EAAE,IAAI;EAClBC,MAAM,EAAE,IAAI;EACZC,QAAQ,EAAE,CAAC,CAAC;EACZC,cAAc,EAAE,IAAI;EACpBC,kBAAkB,EAAE,IAAI;EACxBC,IAAI,EAAE,CAAC,CAAC;EACRC,OAAO,EAAEzB,gBAAgB;EACzB0B,OAAO,EAAE,IAAI;EACbC,cAAc,EAAEC,iCAAwB;EACxCC,oBAAoB,EAAE,EAAE;EACxBC,iBAAiB,EAAE,IAAI;EACvBC,mBAAmB,EAAE,KAAK;EAC1BC,aAAa,EAAE;AACjB,CAAC;AAED,MAAMC,GAAG,CAAC;EACRC,WAAWA,CAAEC,IAAI,GAAG,CAAC,CAAC,EAAE;IACtB5C,MAAM,CAAC6C,MAAM,CAAC,IAAI,EAAED,IAAI,CAAC;IACzBE,eAAC,CAACC,YAAY,CAAC,IAAI,EAAED,eAAC,CAACE,SAAS,CAACrC,YAAY,CAAC,CAAC;IAE/C,IAAIiC,IAAI,CAACK,aAAa,EAAE;MACtB,IAAI,CAAC5B,UAAU,CAACE,WAAW,CAAC2B,IAAI,CAAC,IAAI,EAAEN,IAAI,CAACK,aAAa,CAAC;MAC1D,IAAI,CAACd,OAAO,GAAGS,IAAI,CAACK,aAAa;IACnC;IAGA,IAAIL,IAAI,CAACO,aAAa,EAAE;MACtB,IAAI,CAACjB,OAAO,GAAGU,IAAI,CAACO,aAAa;IACnC;IACA,IAAI,CAAC9B,UAAU,CAACE,WAAW,CAAC2B,IAAI,CAAC,IAAI,EAAE,IAAI,CAAChB,OAAO,CAAC;EACtD;EAQAkB,KAAKA,CAAER,IAAI,GAAG,CAAC,CAAC,EAAE;IAChB,MAAMS,eAAe,GAAGP,eAAC,CAACE,SAAS,CAACF,eAAC,CAACQ,IAAI,CAAC,IAAI,EAAEtD,MAAM,CAACuD,IAAI,CAAC5C,YAAY,CAAC,CAAC,CAAC;IAC5E,MAAM6C,YAAY,GAAGV,eAAC,CAACC,YAAY,CAACH,IAAI,EAAES,eAAe,CAAC;IAI1D,MAAM9B,WAAW,GAAGiC,YAAY,CAACnC,UAAU,CAACE,WAAW;IACvD,IAAIiC,YAAY,CAACP,aAAa,IAAI1B,WAAW,CAACkC,QAAQ,CAAC,IAAI,CAAC,EAAE;MAC5DlC,WAAW,CAACmC,MAAM,CAACnC,WAAW,CAACoC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAClD;IACA,IAAIpC,WAAW,CAACkC,QAAQ,CAAC,IAAI,CAAC,EAAE;MAC9BlC,WAAW,CAACmC,MAAM,CAACnC,WAAW,CAACoC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAClD;IAEA,OAAO,IAAIjB,GAAG,CAACc,YAAY,CAAC;EAC9B;AACF;AAAC9C,OAAA,CAAAgC,GAAA,GAAAA,GAAA;AAEDA,GAAG,CAACkB,SAAS,GAAG,eAAeA,SAASA,CAAEhB,IAAI,EAAE;EAC9C,MAAMiB,GAAG,GAAG,IAAInB,GAAG,CAACE,IAAI,CAAC;EACzBiB,GAAG,CAACjD,OAAO,GAAG,MAAM,IAAAkD,uBAAc,EAACD,GAAG,CAACjD,OAAO,CAAC;EAC/C,MAAMiD,GAAG,CAACE,wBAAwB,CAAC,CAAC;EACpC,IAAI;IACF,MAAMF,GAAG,CAACG,OAAO,CAAC,CAAC,cAAc,CAAC,CAAC;EACrC,CAAC,CAAC,OAAOC,CAAC,EAAE;IACVC,eAAG,CAACC,IAAI,CAACF,CAAC,CAACG,MAAM,IAAIH,CAAC,CAACI,OAAO,CAAC;EACjC;EACA,OAAOR,GAAG;AACZ,CAAC;AAGD,KAAK,MAAM,CAACS,MAAM,EAAEC,EAAE,CAAC,IAAIzB,eAAC,CAAC0B,OAAO,CAACC,cAAO,CAAC,EAAE;EAC7C/B,GAAG,CAACtC,SAAS,CAACkE,MAAM,CAAC,GAAGC,EAAE;AAC5B;AAAC,IAAAG,QAAA,GAEchC,GAAG;AAAAhC,OAAA,CAAAhB,OAAA,GAAAgF,QAAA"}
+// add all the methods to the ADB prototype
+Object.assign(ADB.prototype, tools_1.default);
+//# sourceMappingURL=adb.js.map

package/build/lib/adb.js.map

@@ -1 +1 @@
-{"version":3,"file":"adb.js","names":["_lodash","_interopRequireDefault","require","_os","_index","_interopRequireWildcard","_helpers","_logger","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","DEFAULT_ADB_PORT","exports","DEFAULT_OPTS","sdkRoot","getSdkRootFromEnv","udid","appDeviceReadyTimeout","useKeystore","keystorePath","keystorePassword","keyAlias","keyPassword","executable","path","defaultArgs","tmpDir","os","tmpdir","curDeviceId","emulatorPort","logcat","binaries","instrumentProc","suppressKillServer","jars","adbPort","adbHost","adbExecTimeout","DEFAULT_ADB_EXEC_TIMEOUT","remoteAppsCacheLimit","buildToolsVersion","allowOfflineDevices","allowDelayAdb","ADB","constructor","opts","assign","_","defaultsDeep","cloneDeep","remoteAdbHost","push","remoteAdbPort","clone","originalOptions","pick","keys","cloneOptions","includes","splice","indexOf","createADB","adb","requireSdkRoot","getAdbWithCorrectAdbPath","adbExec","e","log","warn","stderr","message","fnName","fn","toPairs","methods","_default"],"sources":["../../lib/adb.js"],"sourcesContent":["import _ from 'lodash';\nimport os from 'os';\nimport methods, { getAndroidBinaryPath } from './tools/index.js';\nimport {\n  DEFAULT_ADB_EXEC_TIMEOUT, requireSdkRoot, getSdkRootFromEnv\n} from './helpers';\nimport log from './logger.js';\n\nconst DEFAULT_ADB_PORT = 5037;\nconst DEFAULT_OPTS = {\n  sdkRoot: getSdkRootFromEnv() || null,\n  udid: null,\n  appDeviceReadyTimeout: null,\n  useKeystore: null,\n  keystorePath: null,\n  keystorePassword: null,\n  keyAlias: null,\n  keyPassword: null,\n  executable: {path: 'adb', defaultArgs: []},\n  tmpDir: os.tmpdir(),\n  curDeviceId: null,\n  emulatorPort: null,\n  logcat: null,\n  binaries: {},\n  instrumentProc: null,\n  suppressKillServer: null,\n  jars: {},\n  adbPort: DEFAULT_ADB_PORT,\n  adbHost: null,\n  adbExecTimeout: DEFAULT_ADB_EXEC_TIMEOUT,\n  remoteAppsCacheLimit: 10,\n  buildToolsVersion: null,\n  allowOfflineDevices: false,\n  allowDelayAdb: true,\n};\n\nclass ADB {\n  constructor (opts = {}) {\n    Object.assign(this, opts);\n    _.defaultsDeep(this, _.cloneDeep(DEFAULT_OPTS));\n\n    if (opts.remoteAdbHost) {\n      this.executable.defaultArgs.push('-H', opts.remoteAdbHost);\n      this.adbHost = opts.remoteAdbHost;\n    }\n    // TODO figure out why we have this option as it does not appear to be\n    // used anywhere. Probably deprecate in favor of simple opts.adbPort\n    if (opts.remoteAdbPort) {\n      this.adbPort = opts.remoteAdbPort;\n    }\n    this.executable.defaultArgs.push('-P', this.adbPort);\n  }\n\n  /**\n   * Create a new instance of `ADB` that inherits configuration from this `ADB` instance.\n   * This avoids the need to call `ADB.createADB()` multiple times.\n   * @param {object} opts - Additional options mapping to pass to the `ADB` constructor.\n   * @returns {ADB} The resulting class instance.\n   */\n  clone (opts = {}) {\n    const originalOptions = _.cloneDeep(_.pick(this, Object.keys(DEFAULT_OPTS)));\n    const cloneOptions = _.defaultsDeep(opts, originalOptions);\n\n    // Reset default arguments created in the constructor.\n    // Without this code, -H and -P can be injected into defaultArgs multiple times.\n    const defaultArgs = cloneOptions.executable.defaultArgs;\n    if (cloneOptions.remoteAdbHost && defaultArgs.includes('-H')) {\n      defaultArgs.splice(defaultArgs.indexOf('-H'), 2);\n    }\n    if (defaultArgs.includes('-P')) {\n      defaultArgs.splice(defaultArgs.indexOf('-P'), 2);\n    }\n\n    return new ADB(cloneOptions);\n  }\n}\n\nADB.createADB = async function createADB (opts) {\n  const adb = new ADB(opts);\n  adb.sdkRoot = await requireSdkRoot(adb.sdkRoot);\n  await adb.getAdbWithCorrectAdbPath();\n  try {\n    await adb.adbExec(['start-server']);\n  } catch (e) {\n    log.warn(e.stderr || e.message);\n  }\n  return adb;\n};\n\n// add all the methods to the ADB prototype\nfor (const [fnName, fn] of _.toPairs(methods)) {\n  ADB.prototype[fnName] = fn;\n}\n\nexport default ADB;\nexport { ADB, DEFAULT_ADB_PORT, getAndroidBinaryPath, getSdkRootFromEnv };\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,OAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,GAAA,GAAAF,sBAAA,CAAAC,OAAA;AACA,IAAAE,MAAA,GAAAC,uBAAA,CAAAH,OAAA;AACA,IAAAI,QAAA,GAAAJ,OAAA;AAGA,IAAAK,OAAA,GAAAN,sBAAA,CAAAC,OAAA;AAA8B,SAAAM,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAJ,wBAAAQ,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AAE9B,MAAMW,gBAAgB,GAAG,IAAI;AAACC,OAAA,CAAAD,gBAAA,GAAAA,gBAAA;AAC9B,MAAME,YAAY,GAAG;EACnBC,OAAO,EAAE,IAAAC,0BAAiB,EAAC,CAAC,IAAI,IAAI;EACpCC,IAAI,EAAE,IAAI;EACVC,qBAAqB,EAAE,IAAI;EAC3BC,WAAW,EAAE,IAAI;EACjBC,YAAY,EAAE,IAAI;EAClBC,gBAAgB,EAAE,IAAI;EACtBC,QAAQ,EAAE,IAAI;EACdC,WAAW,EAAE,IAAI;EACjBC,UAAU,EAAE;IAACC,IAAI,EAAE,KAAK;IAAEC,WAAW,EAAE;EAAE,CAAC;EAC1CC,MAAM,EAAEC,WAAE,CAACC,MAAM,CAAC,CAAC;EACnBC,WAAW,EAAE,IAAI;EACjBC,YAAY,EAAE,IAAI;EAClBC,MAAM,EAAE,IAAI;EACZC,QAAQ,EAAE,CAAC,CAAC;EACZC,cAAc,EAAE,IAAI;EACpBC,kBAAkB,EAAE,IAAI;EACxBC,IAAI,EAAE,CAAC,CAAC;EACRC,OAAO,EAAEzB,gBAAgB;EACzB0B,OAAO,EAAE,IAAI;EACbC,cAAc,EAAEC,iCAAwB;EACxCC,oBAAoB,EAAE,EAAE;EACxBC,iBAAiB,EAAE,IAAI;EACvBC,mBAAmB,EAAE,KAAK;EAC1BC,aAAa,EAAE;AACjB,CAAC;AAED,MAAMC,GAAG,CAAC;EACRC,WAAWA,CAAEC,IAAI,GAAG,CAAC,CAAC,EAAE;IACtB5C,MAAM,CAAC6C,MAAM,CAAC,IAAI,EAAED,IAAI,CAAC;IACzBE,eAAC,CAACC,YAAY,CAAC,IAAI,EAAED,eAAC,CAACE,SAAS,CAACrC,YAAY,CAAC,CAAC;IAE/C,IAAIiC,IAAI,CAACK,aAAa,EAAE;MACtB,IAAI,CAAC5B,UAAU,CAACE,WAAW,CAAC2B,IAAI,CAAC,IAAI,EAAEN,IAAI,CAACK,aAAa,CAAC;MAC1D,IAAI,CAACd,OAAO,GAAGS,IAAI,CAACK,aAAa;IACnC;IAGA,IAAIL,IAAI,CAACO,aAAa,EAAE;MACtB,IAAI,CAACjB,OAAO,GAAGU,IAAI,CAACO,aAAa;IACnC;IACA,IAAI,CAAC9B,UAAU,CAACE,WAAW,CAAC2B,IAAI,CAAC,IAAI,EAAE,IAAI,CAAChB,OAAO,CAAC;EACtD;EAQAkB,KAAKA,CAAER,IAAI,GAAG,CAAC,CAAC,EAAE;IAChB,MAAMS,eAAe,GAAGP,eAAC,CAACE,SAAS,CAACF,eAAC,CAACQ,IAAI,CAAC,IAAI,EAAEtD,MAAM,CAACuD,IAAI,CAAC5C,YAAY,CAAC,CAAC,CAAC;IAC5E,MAAM6C,YAAY,GAAGV,eAAC,CAACC,YAAY,CAACH,IAAI,EAAES,eAAe,CAAC;IAI1D,MAAM9B,WAAW,GAAGiC,YAAY,CAACnC,UAAU,CAACE,WAAW;IACvD,IAAIiC,YAAY,CAACP,aAAa,IAAI1B,WAAW,CAACkC,QAAQ,CAAC,IAAI,CAAC,EAAE;MAC5DlC,WAAW,CAACmC,MAAM,CAACnC,WAAW,CAACoC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAClD;IACA,IAAIpC,WAAW,CAACkC,QAAQ,CAAC,IAAI,CAAC,EAAE;MAC9BlC,WAAW,CAACmC,MAAM,CAACnC,WAAW,CAACoC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAClD;IAEA,OAAO,IAAIjB,GAAG,CAACc,YAAY,CAAC;EAC9B;AACF;AAAC9C,OAAA,CAAAgC,GAAA,GAAAA,GAAA;AAEDA,GAAG,CAACkB,SAAS,GAAG,eAAeA,SAASA,CAAEhB,IAAI,EAAE;EAC9C,MAAMiB,GAAG,GAAG,IAAInB,GAAG,CAACE,IAAI,CAAC;EACzBiB,GAAG,CAACjD,OAAO,GAAG,MAAM,IAAAkD,uBAAc,EAACD,GAAG,CAACjD,OAAO,CAAC;EAC/C,MAAMiD,GAAG,CAACE,wBAAwB,CAAC,CAAC;EACpC,IAAI;IACF,MAAMF,GAAG,CAACG,OAAO,CAAC,CAAC,cAAc,CAAC,CAAC;EACrC,CAAC,CAAC,OAAOC,CAAC,EAAE;IACVC,eAAG,CAACC,IAAI,CAACF,CAAC,CAACG,MAAM,IAAIH,CAAC,CAACI,OAAO,CAAC;EACjC;EACA,OAAOR,GAAG;AACZ,CAAC;AAGD,KAAK,MAAM,CAACS,MAAM,EAAEC,EAAE,CAAC,IAAIzB,eAAC,CAAC0B,OAAO,CAACC,cAAO,CAAC,EAAE;EAC7C/B,GAAG,CAACtC,SAAS,CAACkE,MAAM,CAAC,GAAGC,EAAE;AAC5B;AAAC,IAAAG,QAAA,GAEchC,GAAG;AAAAhC,OAAA,CAAAhB,OAAA,GAAAgF,QAAA"}
+{"version":3,"file":"adb.js","sourceRoot":"","sources":["../../lib/adb.ts"],"names":[],"mappings":"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"}