appium 3.3.0 → 3.3.1

package/build/lib/cli/utils.js

@@ -10,6 +10,35 @@ exports.log = log;
 exports.spinWith = spinWith;
 const ora_1 = __importDefault(require("ora"));
 exports.JSON_SPACES = 4;
+class RingBuffer {
+    size;
+    buffer = [];
+    constructor(size = 50) {
+        this.size = size;
+    }
+    /**
+     * Get the current buffer contents.
+     */
+    getBuff() {
+        return this.buffer;
+    }
+    /**
+     * Add an item to the buffer.
+     */
+    enqueue(item) {
+        if (this.buffer.length >= this.size) {
+            this.dequeue();
+        }
+        this.buffer.push(item);
+    }
+    /**
+     * Remove the oldest item from the buffer.
+     */
+    dequeue() {
+        this.buffer.shift();
+    }
+}
+exports.RingBuffer = RingBuffer;
 /**
  * Log an error to the console and exit the process.
  *
@@ -62,33 +91,4 @@ async function spinWith(json, msg, fn) {
         throw err;
     }
 }
-class RingBuffer {
-    size;
-    buffer = [];
-    constructor(size = 50) {
-        this.size = size;
-    }
-    /**
-     * Get the current buffer contents.
-     */
-    getBuff() {
-        return this.buffer;
-    }
-    /**
-     * Add an item to the buffer.
-     */
-    enqueue(item) {
-        if (this.buffer.length >= this.size) {
-            this.dequeue();
-        }
-        this.buffer.push(item);
-    }
-    /**
-     * Remove the oldest item from the buffer.
-     */
-    dequeue() {
-        this.buffer.shift();
-    }
-}
-exports.RingBuffer = RingBuffer;
 //# sourceMappingURL=utils.js.map

package/build/lib/cli/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../lib/cli/utils.ts"],"names":[],"mappings":";AAAA,+BAA+B;;;;;;AAc/B,gCAUC;AAQD,kBAIC;AAUD,4BAiBC;AA7DD,8CAAsB;AAET,QAAA,WAAW,GAAG,CAAC,CAAC;AAI7B;;;;;GAKG;AACH,SAAgB,UAAU,CAAC,IAAa,EAAE,GAAY;IACpD,IAAI,IAAI,EAAE,CAAC;QACT,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAC,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,EAAC,EAAE,IAAI,EAAE,mBAAW,CAAC,CAAC,CAAC;IACvE,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,KAAK,CAAE,MAAM,CAAC,GAAG,CAAS,CAAC,GAAG,CAAC,CAAC;QACxC,IAAK,GAAiB,EAAE,MAAM,EAAE,CAAC;YAC/B,OAAO,CAAC,KAAK,CAAE,MAAM,CAAE,GAAiB,CAAC,MAAM,CAAS,CAAC,GAAG,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;IACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED;;;;;GAKG;AACH,SAAgB,GAAG,CAAC,IAAa,EAAE,GAAW;IAC5C,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,QAAQ,CAC5B,IAAa,EACb,GAAW,EACX,EAAwB;IAExB,IAAI,IAAI,EAAE,CAAC;QACT,OAAO,MAAM,EAAE,EAAE,CAAC;IACpB,CAAC;IACD,MAAM,OAAO,GAAG,IAAA,aAAG,EAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;IACjC,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,EAAE,EAAE,CAAC;QACvB,OAAO,CAAC,OAAO,EAAE,CAAC;QAClB,OAAO,GAAG,CAAC;IACb,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,IAAI,EAAE,CAAC;QACf,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AAED,MAAa,UAAU;IACJ,IAAI,CAAS;IACb,MAAM,GAAQ,EAAE,CAAC;IAElC,YAAY,IAAI,GAAG,EAAE;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,OAAO;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,IAAO;QACb,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACpC,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,OAAO;QACL,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;CACF;AA/BD,gCA+BC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../lib/cli/utils.ts"],"names":[],"mappings":";AAAA,+BAA+B;;;;;;AA+C/B,gCAUC;AAQD,kBAIC;AAUD,4BAiBC;AA9FD,8CAAsB;AAET,QAAA,WAAW,GAAG,CAAC,CAAC;AAI7B,MAAa,UAAU;IACJ,IAAI,CAAS;IACb,MAAM,GAAQ,EAAE,CAAC;IAElC,YAAY,IAAI,GAAG,EAAE;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,OAAO;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,IAAO;QACb,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACpC,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,OAAO;QACL,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;CACF;AA/BD,gCA+BC;AAED;;;;;GAKG;AACH,SAAgB,UAAU,CAAC,IAAa,EAAE,GAAY;IACpD,IAAI,IAAI,EAAE,CAAC;QACT,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAC,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,EAAC,EAAE,IAAI,EAAE,mBAAW,CAAC,CAAC,CAAC;IACvE,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,KAAK,CAAE,MAAM,CAAC,GAAG,CAAS,CAAC,GAAG,CAAC,CAAC;QACxC,IAAK,GAAiB,EAAE,MAAM,EAAE,CAAC;YAC/B,OAAO,CAAC,KAAK,CAAE,MAAM,CAAE,GAAiB,CAAC,MAAM,CAAS,CAAC,GAAG,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;IACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED;;;;;GAKG;AACH,SAAgB,GAAG,CAAC,IAAa,EAAE,GAAW;IAC5C,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,QAAQ,CAC5B,IAAa,EACb,GAAW,EACX,EAAwB;IAExB,IAAI,IAAI,EAAE,CAAC;QACT,OAAO,MAAM,EAAE,EAAE,CAAC;IACpB,CAAC;IACD,MAAM,OAAO,GAAG,IAAA,aAAG,EAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;IACjC,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,EAAE,EAAE,CAAC;QACvB,OAAO,CAAC,OAAO,EAAE,CAAC;QAClB,OAAO,GAAG,CAAC;IACb,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,IAAI,EAAE,CAAC;QACf,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC"}

package/build/lib/doctor/doctor.d.ts

@@ -25,6 +25,8 @@ export declare class Doctor {
     private readonly checks;
     private foundIssues;
     constructor(checks?: IDoctorCheck[]);
+    private get issuesRequiredToFix();
+    private get issuesOptionalToFix();
     /**
      * Runs diagnostics, reports issues, attempts automatic fixes where supported, and returns an exit code.
      *
@@ -32,8 +34,6 @@ export declare class Doctor {
      *   {@link EXIT_CODE.HAS_MAJOR_ISSUES} when manual intervention is still required or fixes failed.
      */
     run(): Promise<DoctorExitCode>;
-    private get issuesRequiredToFix();
-    private get issuesOptionalToFix();
     /**
      * The doctor shows the report
      */

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

@@ -1 +1 @@
-{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../../lib/doctor/doctor.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,CAAC;AAGxB,OAAO,KAAK,EAAkC,YAAY,EAAC,MAAM,eAAe,CAAC;AAEjF;;GAEG;AACH,eAAO,MAAM,SAAS;;;EAGX,CAAC;AAEZ,uDAAuD;AACvD,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,OAAO,SAAS,CAAC,CAAC;AAExE;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,0CAA0C;IAC1C,KAAK,EAAE,YAAY,CAAC;IACpB,yDAAyD;IACzD,KAAK,EAAE,MAAM,CAAC;IACd,oDAAoD;IACpD,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,qBAAa,MAAM;IACjB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,WAAW,CAAgB;gBAEvB,MAAM,GAAE,YAAY,EAAO;IAWvC;;;;;OAKG;IACG,GAAG,IAAI,OAAO,CAAC,cAAc,CAAC;IAcpC,OAAO,KAAK,mBAAmB,GAE9B;IAED,OAAO,KAAK,mBAAmB,GAE9B;IAED;;OAEG;YACW,QAAQ;YAcR,kBAAkB;YAuDlB,UAAU;YA0BV,YAAY;IAkB1B,OAAO,CAAC,OAAO;IAgBf,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,aAAa;CAQtB"}
+{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../../lib/doctor/doctor.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,CAAC;AAGxB,OAAO,KAAK,EAAkC,YAAY,EAAC,MAAM,eAAe,CAAC;AAEjF;;GAEG;AACH,eAAO,MAAM,SAAS;;;EAGX,CAAC;AAEZ,uDAAuD;AACvD,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,OAAO,SAAS,CAAC,CAAC;AAExE;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,0CAA0C;IAC1C,KAAK,EAAE,YAAY,CAAC;IACpB,yDAAyD;IACzD,KAAK,EAAE,MAAM,CAAC;IACd,oDAAoD;IACpD,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,qBAAa,MAAM;IACjB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,WAAW,CAAgB;gBAEvB,MAAM,GAAE,YAAY,EAAO;IAWvC,OAAO,KAAK,mBAAmB,GAE9B;IAED,OAAO,KAAK,mBAAmB,GAE9B;IAED;;;;;OAKG;IACG,GAAG,IAAI,OAAO,CAAC,cAAc,CAAC;IAcpC;;OAEG;YACW,QAAQ;YAcR,kBAAkB;YAuDlB,UAAU;YA0BV,YAAY;IAkB1B,OAAO,CAAC,OAAO;IAgBf,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,aAAa;CAQtB"}

package/build/lib/doctor/doctor.js

@@ -28,6 +28,12 @@ class Doctor {
         });
         this.foundIssues = [];
     }
+    get issuesRequiredToFix() {
+        return this.foundIssues.filter((f) => !f.check.isOptional());
+    }
+    get issuesOptionalToFix() {
+        return this.foundIssues.filter((f) => f.check.isOptional());
+    }
     /**
      * Runs diagnostics, reports issues, attempts automatic fixes where supported, and returns an exit code.
      *
@@ -47,12 +53,6 @@ class Doctor {
         }
         return exports.EXIT_CODE.SUCCESS;
     }
-    get issuesRequiredToFix() {
-        return this.foundIssues.filter((f) => !f.check.isOptional());
-    }
-    get issuesOptionalToFix() {
-        return this.foundIssues.filter((f) => f.check.isOptional());
-    }
     /**
      * The doctor shows the report
      */

package/build/lib/doctor/doctor.js.map

@@ -1 +1 @@
-{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../lib/doctor/doctor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../lib/doctor/doctor.ts"],"names":[],"mappings":";;;;;;AAAA,0BAAwB;AACxB,oDAAuB;AACvB,6CAAqD;AAGrD;;GAEG;AACU,QAAA,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC;IACrC,OAAO,EAAE,CAAC;IACV,gBAAgB,EAAE,GAAG;CACb,CAAC,CAAC;AAiBZ,MAAa,MAAM;IACA,GAAG,CAAe;IAClB,MAAM,CAAiB;IAChC,WAAW,CAAgB;IAEnC,YAAY,SAAyB,EAAE;QACrC,IAAI,CAAC,GAAG,GAAG,gBAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM;aACR,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;aAC7B,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACb,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACnB,CAAC,CAAC,CAAC;QACL,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,IAAY,mBAAmB;QAC7B,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED,IAAY,mBAAmB;QAC7B,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,GAAG;QACP,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACtB,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;YACzB,OAAO,iBAAS,CAAC,OAAO,CAAC;QAC3B,CAAC;QACD,IAAI,MAAM,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC;YACpC,OAAO,iBAAS,CAAC,gBAAgB,CAAC;QACpC,CAAC;QACD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC;YACjC,OAAO,iBAAS,CAAC,gBAAgB,CAAC;QACpC,CAAC;QACD,OAAO,iBAAS,CAAC,OAAO,CAAC;IAC3B,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,QAAQ;QACpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;QACtD,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChC,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC;YACnC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACvC,IAAI,KAAK,EAAE,CAAC;gBACV,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,6BAA6B,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;QAC1E,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACpB,CAAC;IAEO,KAAK,CAAC,kBAAkB;QAC9B,MAAM,YAAY,GAAG,gBAAC,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;QACtF,MAAM,oBAAoB,GAAG,gBAAC,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;QAE9F,MAAM,YAAY,GAAG,KAAK,EAAE,UAAoB,EAAE,MAAqB,EAAiB,EAAE;YACxF,IAAI,gBAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBACtB,OAAO;YACT,CAAC;YAED,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE,CAAC;gBAChC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACxB,CAAC;YACD,MAAM,WAAW,GAAa,EAAE,CAAC;YACjC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,IAAI,OAAsB,CAAC;gBAC3B,IAAI,CAAC;oBACH,OAAO,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;gBACpC,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,OAAO,GAAI,CAAW,CAAC,OAAO,CAAC;gBACjC,CAAC;gBACD,IAAI,OAAO,EAAE,CAAC;oBACZ,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC;YACD,KAAK,MAAM,CAAC,IAAI,gBAAC,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;gBACpC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YAChC,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpB,CAAC,CAAC;QAEF,MAAM,YAAY,CAChB;YACE,6BAA6B;YAC7B,iFAAiF;SAClF,EACD,YAAY,CACb,CAAC;QACF,MAAM,YAAY,CAChB;YACE,+BAA+B;YAC/B,iEAAiE;SAClE,EACD,oBAAoB,CACrB,CAAC;QAEF,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAClB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gEAAgE,CAAC,CAAC;YAChF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAClB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,CAAc;QACrC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC;QAC5C,IAAI,CAAC;YACH,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QACtB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,gBAAM,CAAC,eAAe,EAAE,CAAC;gBAC1C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;gBACrC,OAAO;YACT,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;gBAC5C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;gBAC7C,OAAO;YACT,CAAC;QACH,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QACrC,IAAI,GAAG,CAAC,EAAE,EAAE,CAAC;YACX,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC;YACf,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,KAAK,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YACnD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;QACxD,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YACjD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,YAAY;QACxB,MAAM,SAAS,GAAG,gBAAC,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;QAC1E,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE,CAAC;YAC1B,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YACzB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpB,CAAC;QACD,IAAI,gBAAC,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;YACvC,uBAAuB;YACvB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,6DAA6D,CAAC,CAAC;YAC7E,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAClB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,uBAAuB;QACvB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;QAClD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,OAAO,CAAC,MAAyB,EAAE,KAAmB;QAC5D,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;YACd,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,KAAK,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;YACtD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ;YAClC,CAAC,CAAC,IAAI,QAAQ,CAAC,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;YACzC,CAAC,CAAC,IAAI,QAAQ,CAAC,GAAG,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACzC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC5B,OAAO;YACL,KAAK,EAAE,YAAY;YACnB,KAAK;SACN,CAAC;IACJ,CAAC;IAEO,eAAe;QACrB,OAAO,CACL,GAAG,cAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW;YACnF,GAAG,cAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CACpF,CAAC;IACJ,CAAC;IAEO,aAAa;QACnB,IAAI,IAAI,CAAC,mBAAmB,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,mBAAmB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;YAC7C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAClB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AA/LD,wBA+LC"}

package/build/lib/extension/driver-config.d.ts

@@ -1,82 +1,23 @@
-/**
- * @extends {ExtensionConfig<DriverType>}
- */
-export class DriverConfig extends ExtensionConfig<"driver"> {
-    /**
-     * A mapping of {@link Manifest} instances to {@link DriverConfig} instances.
-     *
-     * `Manifest` and `ExtensionConfig` have a one-to-many relationship; each `Manifest` should be associated with a `DriverConfig` and a `PluginConfig`; no more, no less.
-     *
-     * This variable tracks the `Manifest`-to-`DriverConfig` portion.
-     *
-     * @type {WeakMap<Manifest,DriverConfig>}
-     * @private
-     */
-    private static _instances;
-    /**
-     * Creates a new {@link DriverConfig} instance for a {@link Manifest} instance.
-     *
-     * @param {Manifest} manifest
-     * @throws If `manifest` already associated with a `DriverConfig`
-     * @returns {DriverConfig}
-     */
-    static create(manifest: Manifest): DriverConfig;
-    /**
-     * Returns a DriverConfig associated with a Manifest
-     * @param {Manifest} manifest
-     * @returns {DriverConfig|undefined}
-     */
-    static getInstance(manifest: Manifest): DriverConfig | undefined;
-    /**
-     * Call {@link DriverConfig.create} instead.
-     * @private
-     * @param {import('./manifest').Manifest} manifest - Manifest instance
-     */
-    private constructor();
-    /**
-     * A set of unique automation names used by drivers.
-     * @type {Set<string>}
-     */
-    knownAutomationNames: Set<string>;
-    /**
-     * Checks extensions for problems
-     */
-    validate(): Promise<import("./extension-config").ExtRecord<"driver">>;
-    /**
-     * @param {ExtManifest<DriverType>} extData
-     * @returns {import('./extension-config').ExtManifestProblem[]}
-     */
-    getConfigProblems(extData: ExtManifest<DriverType>): import("./extension-config").ExtManifestProblem[];
-    /**
-     * Given capabilities, find a matching driver within the config. Load its class and return it along with version and driver name.
-     * @template {import('@appium/types').StringRecord} C
-     * @param {C} caps
-     * @returns {Promise<MatchedDriver>}
-     */
-    findMatchingDriver<C extends import("@appium/types").StringRecord>({ automationName, platformName }: C): Promise<MatchedDriver>;
-    /**
-     * Given an automation name and platform name, find a suitable driver and return its extension data.
-     * @param {string} matchAutomationName
-     * @param {string} matchPlatformName
-     * @returns {ExtMetadata<DriverType> & import('appium/types').InternalMetadata & import('appium/types').CommonExtMetadata}
-     */
-    _getDriverBySupport(matchAutomationName: string, matchPlatformName: string): ExtMetadata<DriverType> & import("appium/types").InternalMetadata & import("appium/types").CommonExtMetadata;
-}
-export type ExtMetadata<T extends ExtensionType> = import("appium/types").ExtMetadata<T>;
-export type ExtManifest<T extends ExtensionType> = import("appium/types").ExtManifest<T>;
-export type ExtensionType = import("@appium/types").ExtensionType;
-export type ManifestData = import("appium/types").ManifestData;
-export type DriverType = import("@appium/types").DriverType;
-export type Manifest = import("./manifest").Manifest;
-export type ExtRecord<T extends ExtensionType> = import("appium/types").ExtRecord<T>;
-export type ExtName<T extends ExtensionType> = import("appium/types").ExtName<T>;
-/**
- * Return value of {@linkcode DriverConfig.findMatchingDriver}
- */
+import type { DriverClass, DriverType, StringRecord } from '@appium/types';
+import type { ExtManifest, ExtName, ExtRecord } from 'appium/types';
+import type { ExtManifestProblem } from './extension-config';
+import { ExtensionConfig } from './extension-config';
+import type { Manifest } from './manifest';
 export type MatchedDriver = {
-    driver: import("@appium/types").DriverClass;
+    driver: DriverClass;
     version: string;
     driverName: string;
 };
-import { ExtensionConfig } from './extension-config';
+export declare class DriverConfig extends ExtensionConfig<DriverType> {
+    private static readonly _instances;
+    private knownAutomationNames;
+    private constructor();
+    static create(manifest: Manifest): DriverConfig;
+    static getInstance(manifest: Manifest): DriverConfig | undefined;
+    validate(): Promise<ExtRecord<DriverType>>;
+    extensionDesc(driverName: ExtName<DriverType>, { version, automationName }: ExtManifest<DriverType>): string;
+    findMatchingDriver<C extends StringRecord>({ automationName, platformName, }: C): Promise<MatchedDriver>;
+    protected getConfigProblems(extManifest: ExtManifest<DriverType>, extName: string): ExtManifestProblem[];
+    private _getDriverBySupport;
+}
 //# sourceMappingURL=driver-config.d.ts.map

package/build/lib/extension/driver-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"driver-config.d.ts","sourceRoot":"","sources":["../../../lib/extension/driver-config.js"],"names":[],"mappings":"AAKA;;GAEG;AACH;IAOE;;;;;;;;;OASG;IACH,0BAAkC;IAalC;;;;;;OAMG;IACH,wBAJW,QAAQ,GAEN,YAAY,CAWxB;IAED;;;;OAIG;IACH,6BAHW,QAAQ,GACN,YAAY,GAAC,SAAS,CAIlC;IApCD;;;;OAIG;IACH,sBAIC;IA3BD;;;OAGG;IACH,sBAFU,GAAG,CAAC,MAAM,CAAC,CAEA;IAoDrB;;OAEG;IACH,sEAGC;IAED;;;OAGG;IACH,2BAHW,WAAW,CAAC,UAAU,CAAC,GACrB,OAAO,oBAAoB,EAAE,kBAAkB,EAAE,CA6C7D;IAWD;;;;;OAKG;IACH,mBAJoD,CAAC,SAAxC,OAAQ,eAAe,EAAE,YAAa,oCACxC,CAAC,GACC,OAAO,CAAC,aAAa,CAAC,CAuClC;IAED;;;;;OAKG;IACH,yCAJW,MAAM,qBACN,MAAM,GACJ,WAAW,CAAC,UAAU,CAAC,GAAG,OAAO,cAAc,EAAE,gBAAgB,GAAG,OAAO,cAAc,EAAE,iBAAiB,CA4BxH;CACF;wBAG4B,CAAC,SAAhB,aAAc,IACf,OAAO,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC;wBAIrB,CAAC,SAAhB,aAAc,IACf,OAAO,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC;4BAIrC,OAAO,eAAe,EAAE,aAAa;2BACrC,OAAO,cAAc,EAAE,YAAY;yBACnC,OAAO,eAAe,EAAE,UAAU;uBAClC,OAAO,YAAY,EAAE,QAAQ;sBAIb,CAAC,SAAhB,aAAc,IACf,OAAO,cAAc,EAAE,SAAS,CAAC,CAAC,CAAC;oBAInB,CAAC,SAAhB,aAAc,IACf,OAAO,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC;;;;;YAMhC,OAAO,eAAe,EAAE,WAAW;aACnC,MAAM;gBACN,MAAM;;gCAhPU,oBAAoB"}
+{"version":3,"file":"driver-config.d.ts","sourceRoot":"","sources":["../../../lib/extension/driver-config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,WAAW,EAAE,UAAU,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AACzE,OAAO,KAAK,EAAC,WAAW,EAAE,OAAO,EAAE,SAAS,EAAC,MAAM,cAAc,CAAC;AAGlE,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEzC,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,WAAW,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,qBAAa,YAAa,SAAQ,eAAe,CAAC,UAAU,CAAC;IAC3D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAyC;IAC3E,OAAO,CAAC,oBAAoB,CAAqB;IAEjD,OAAO;IAIP,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,YAAY;IAW/C,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,YAAY,GAAG,SAAS;IAI1D,QAAQ,IAAI,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAKhC,aAAa,CAC3B,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,EAC/B,EAAC,OAAO,EAAE,cAAc,EAAC,EAAE,WAAW,CAAC,UAAU,CAAC,GACjD,MAAM;IAIH,kBAAkB,CAAC,CAAC,SAAS,YAAY,EAAE,EAC/C,cAAc,EACd,YAAY,GACb,EAAE,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;cAoCV,iBAAiB,CAClC,WAAW,EAAE,WAAW,CAAC,UAAU,CAAC,EACpC,OAAO,EAAE,MAAM,GACd,kBAAkB,EAAE;IA6CvB,OAAO,CAAC,mBAAmB;CA2B5B"}

package/build/lib/extension/driver-config.js

@@ -6,44 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DriverConfig = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const constants_1 = require("../constants");
-const logger_1 = __importDefault(require("../logger"));
+const logger_1 = require("../logger");
 const extension_config_1 = require("./extension-config");
-/**
- * @extends {ExtensionConfig<DriverType>}
- */
 class DriverConfig extends extension_config_1.ExtensionConfig {
-    /**
-     * A set of unique automation names used by drivers.
-     * @type {Set<string>}
-     */
-    knownAutomationNames;
-    /**
-     * A mapping of {@link Manifest} instances to {@link DriverConfig} instances.
-     *
-     * `Manifest` and `ExtensionConfig` have a one-to-many relationship; each `Manifest` should be associated with a `DriverConfig` and a `PluginConfig`; no more, no less.
-     *
-     * This variable tracks the `Manifest`-to-`DriverConfig` portion.
-     *
-     * @type {WeakMap<Manifest,DriverConfig>}
-     * @private
-     */
     static _instances = new WeakMap();
-    /**
-     * Call {@link DriverConfig.create} instead.
-     * @private
-     * @param {import('./manifest').Manifest} manifest - Manifest instance
-     */
+    knownAutomationNames = new Set();
     constructor(manifest) {
         super(constants_1.DRIVER_TYPE, manifest);
-        this.knownAutomationNames = new Set();
     }
-    /**
-     * Creates a new {@link DriverConfig} instance for a {@link Manifest} instance.
-     *
-     * @param {Manifest} manifest
-     * @throws If `manifest` already associated with a `DriverConfig`
-     * @returns {DriverConfig}
-     */
     static create(manifest) {
         const instance = new DriverConfig(manifest);
         if (DriverConfig.getInstance(manifest)) {
@@ -52,28 +22,48 @@ class DriverConfig extends extension_config_1.ExtensionConfig {
         DriverConfig._instances.set(manifest, instance);
         return instance;
     }
-    /**
-     * Returns a DriverConfig associated with a Manifest
-     * @param {Manifest} manifest
-     * @returns {DriverConfig|undefined}
-     */
     static getInstance(manifest) {
         return DriverConfig._instances.get(manifest);
     }
-    /**
-     * Checks extensions for problems
-     */
     async validate() {
         this.knownAutomationNames.clear();
         return await super._validate(this.manifest.getExtensionData(constants_1.DRIVER_TYPE));
     }
-    /**
-     * @param {ExtManifest<DriverType>} extData
-     * @returns {import('./extension-config').ExtManifestProblem[]}
-     */
-    getConfigProblems(extData) {
+    extensionDesc(driverName, { version, automationName }) {
+        return `${String(driverName)}@${version} (automationName '${automationName}')`;
+    }
+    async findMatchingDriver({ automationName, platformName, }) {
+        if (!lodash_1.default.isString(platformName)) {
+            throw new Error('You must include a platformName capability');
+        }
+        if (!lodash_1.default.isString(automationName)) {
+            throw new Error('You must include an automationName capability');
+        }
+        logger_1.log.info(`Attempting to find matching driver for automationName ` +
+            `'${automationName}' and platformName '${platformName}'`);
+        try {
+            const { driverName, mainClass, version } = this._getDriverBySupport(automationName, platformName);
+            logger_1.log.info(`The '${driverName}' driver was installed and matched caps.`);
+            logger_1.log.info(`Will require it at ${this.getInstallPath(driverName)}`);
+            const driver = await this.requireAsync(driverName);
+            if (!driver) {
+                throw new Error(`Driver '${driverName}' did not export a class with name '${mainClass}'. Contact the author of the driver!`);
+            }
+            return { driver, version, driverName };
+        }
+        catch (err) {
+            const msg = `Could not find a driver for automationName ` +
+                `'${automationName}' and platformName '${platformName}'. ` +
+                `Have you installed a driver that supports those ` +
+                `capabilities? Run 'appium driver list --installed' to see. ` +
+                `(Lower-level error: ${err.message})`;
+            throw new Error(msg);
+        }
+    }
+    getConfigProblems(extManifest, extName) {
+        void extName;
         const problems = [];
-        const { platformNames, automationName } = extData;
+        const { platformNames, automationName } = extManifest;
         if (!lodash_1.default.isArray(platformNames)) {
             problems.push({
                 err: 'Missing or incorrect supported platformNames list.',
@@ -108,64 +98,15 @@ class DriverConfig extends extension_config_1.ExtensionConfig {
                 val: automationName,
             });
         }
-        // should we retain the name at the end of this function, once we've checked there are no problems?
         this.knownAutomationNames.add(automationName);
         return problems;
     }
-    /**
-     * @param {ExtName<DriverType>} driverName
-     * @param {ExtManifest<DriverType>} extData
-     * @returns {string}
-     */
-    extensionDesc(driverName, { version, automationName }) {
-        return `${driverName}@${version} (automationName '${automationName}')`;
-    }
-    /**
-     * Given capabilities, find a matching driver within the config. Load its class and return it along with version and driver name.
-     * @template {import('@appium/types').StringRecord} C
-     * @param {C} caps
-     * @returns {Promise<MatchedDriver>}
-     */
-    async findMatchingDriver({ automationName, platformName }) {
-        if (!lodash_1.default.isString(platformName)) {
-            throw new Error('You must include a platformName capability');
-        }
-        if (!lodash_1.default.isString(automationName)) {
-            throw new Error('You must include an automationName capability');
-        }
-        logger_1.default.info(`Attempting to find matching driver for automationName ` +
-            `'${automationName}' and platformName '${platformName}'`);
-        try {
-            const { driverName, mainClass, version } = this._getDriverBySupport(automationName, platformName);
-            logger_1.default.info(`The '${driverName}' driver was installed and matched caps.`);
-            logger_1.default.info(`Will require it at ${this.getInstallPath(driverName)}`);
-            const driver = await this.requireAsync(driverName);
-            if (!driver) {
-                throw new Error(`Driver '${driverName}' did not export a class with name '${mainClass}'. Contact the author of the driver!`);
-            }
-            return { driver, version, driverName };
-        }
-        catch (err) {
-            const msg = `Could not find a driver for automationName ` +
-                `'${automationName}' and platformName '${platformName}'. ` +
-                `Have you installed a driver that supports those ` +
-                `capabilities? Run 'appium driver list --installed' to see. ` +
-                `(Lower-level error: ${err.message})`;
-            throw new Error(msg);
-        }
-    }
-    /**
-     * Given an automation name and platform name, find a suitable driver and return its extension data.
-     * @param {string} matchAutomationName
-     * @param {string} matchPlatformName
-     * @returns {ExtMetadata<DriverType> & import('appium/types').InternalMetadata & import('appium/types').CommonExtMetadata}
-     */
     _getDriverBySupport(matchAutomationName, matchPlatformName) {
         const drivers = this.installedExtensions;
         for (const [driverName, driverData] of lodash_1.default.toPairs(drivers)) {
             const { automationName, platformNames } = driverData;
             const aNameMatches = automationName.toLowerCase() === matchAutomationName.toLowerCase();
-            const pNameMatches = lodash_1.default.includes(platformNames.map(lodash_1.default.toLower), matchPlatformName.toLowerCase());
+            const pNameMatches = lodash_1.default.includes(platformNames.map((p) => lodash_1.default.toLower(p)), matchPlatformName.toLowerCase());
             if (aNameMatches && pNameMatches) {
                 return { driverName, ...driverData };
             }
@@ -181,33 +122,4 @@ class DriverConfig extends extension_config_1.ExtensionConfig {
     }
 }
 exports.DriverConfig = DriverConfig;
-/**
- * @template {ExtensionType} T
- * @typedef {import('appium/types').ExtMetadata<T>} ExtMetadata
- */
-/**
- * @template {ExtensionType} T
- * @typedef {import('appium/types').ExtManifest<T>} ExtManifest
- */
-/**
- * @typedef {import('@appium/types').ExtensionType} ExtensionType
- * @typedef {import('appium/types').ManifestData} ManifestData
- * @typedef {import('@appium/types').DriverType} DriverType
- * @typedef {import('./manifest').Manifest} Manifest
- */
-/**
- * @template {ExtensionType} T
- * @typedef {import('appium/types').ExtRecord<T>} ExtRecord
- */
-/**
- * @template {ExtensionType} T
- * @typedef {import('appium/types').ExtName<T>} ExtName
- */
-/**
- * Return value of {@linkcode DriverConfig.findMatchingDriver}
- * @typedef MatchedDriver
- * @property {import('@appium/types').DriverClass} driver
- * @property {string} version
- * @property {string} driverName
- */
 //# sourceMappingURL=driver-config.js.map

package/build/lib/extension/driver-config.js.map

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