appium 3.2.1 → 3.3.0

package/build/lib/cli/utils.d.ts

@@ -1,44 +1,42 @@
-/***
+export declare const JSON_SPACES = 4;
+/**
  * Log an error to the console and exit the process.
- * @param {boolean} json - whether we should log json or text
- * @param {any} msg - error message, object, Error instance, etc.
+ *
+ * @param json - whether we should log json or text
+ * @param msg - error message, object, Error instance, etc.
  */
-export function errAndQuit(json: boolean, msg: any): void;
+export declare function errAndQuit(json: boolean, msg: unknown): never;
 /**
- * Conditionally log something to the console
- * @param {boolean} json - whether we are in json mode (and should therefore not log)
- * @param {string} msg - string to log
+ * Conditionally log something to the console.
+ *
+ * @param json - whether we are in json mode (and should therefore not log)
+ * @param msg - string to log
  */
-export function log(json: boolean, msg: string): void;
+export declare function log(json: boolean, msg: string): void;
 /**
- * Start a spinner, execute an async function, and then stop the spinner
- * @param {boolean} json - whether we are in json mode (and should therefore not log)
- * @param {string} msg - string to log
- * @param {function} fn - function to wrap with spinning
+ * Start a spinner, execute an async function, and then stop the spinner.
+ *
+ * @param json - whether we are in json mode (and should therefore not log)
+ * @param msg - string to log
+ * @param fn - function to wrap with spinning
+ * @returns result of `fn`
  */
-export function spinWith(json: boolean, msg: string, fn: Function): Promise<any>;
-export const JSON_SPACES: 4;
-export class RingBuffer {
+export declare function spinWith<T>(json: boolean, msg: string, fn: () => T | Promise<T>): Promise<T>;
+export declare class RingBuffer<T = any> {
+    private readonly size;
+    private readonly buffer;
     constructor(size?: number);
-    size: number;
-    buffer: any[];
     /**
-     * Get the current buffer contents
-     *
-     * @returns {any[]}
+     * Get the current buffer contents.
      */
-    getBuff(): any[];
+    getBuff(): T[];
     /**
-     * Remove the oldest item from the buffer
-     *
-     * @returns {void}
+     * Add an item to the buffer.
      */
-    dequeue(): void;
+    enqueue(item: T): void;
     /**
-     * Add an item to the buffer
-     *
-     * @param {any} item
+     * Remove the oldest item from the buffer.
      */
-    enqueue(item: any): void;
+    dequeue(): void;
 }
 //# sourceMappingURL=utils.d.ts.map

package/build/lib/cli/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../lib/cli/utils.js"],"names":[],"mappings":"AAMA;;;;GAIG;AACH,iCAHW,OAAO,OACP,GAAG,QAYb;AAED;;;;GAIG;AACH,0BAHW,OAAO,OACP,MAAM,QAMhB;AAED;;;;;GAKG;AACH,+BAJW,OAAO,OACP,MAAM,8BAiBhB;AAlDD,0BAA2B,CAAC,CAAC;AAoD7B;IACE,2BAGC;IAFC,aAAgB;IAChB,cAAgB;IAGlB;;;;OAIG;IACH,WAFa,GAAG,EAAE,CAIjB;IAED;;;;OAIG;IACH,WAFa,IAAI,CAIhB;IACD;;;;OAIG;IACH,cAFW,GAAG,QAOb;CACF"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../lib/cli/utils.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,WAAW,IAAI,CAAC;AAI7B;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,GAAG,KAAK,CAU7D;AAED;;;;;GAKG;AACH,wBAAgB,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAIpD;AAED;;;;;;;GAOG;AACH,wBAAsB,QAAQ,CAAC,CAAC,EAC9B,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,MAAM,EACX,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GACvB,OAAO,CAAC,CAAC,CAAC,CAaZ;AAED,qBAAa,UAAU,CAAC,CAAC,GAAG,GAAG;IAC7B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAW;gBAEtB,IAAI,SAAK;IAIrB;;OAEG;IACH,OAAO,IAAI,CAAC,EAAE;IAId;;OAEG;IACH,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI;IAOtB;;OAEG;IACH,OAAO,IAAI,IAAI;CAGhB"}

package/build/lib/cli/utils.js

@@ -10,27 +10,29 @@ exports.log = log;
 exports.spinWith = spinWith;
 const ora_1 = __importDefault(require("ora"));
 exports.JSON_SPACES = 4;
-/***
+/**
  * Log an error to the console and exit the process.
- * @param {boolean} json - whether we should log json or text
- * @param {any} msg - error message, object, Error instance, etc.
+ *
+ * @param json - whether we should log json or text
+ * @param msg - error message, object, Error instance, etc.
  */
 function errAndQuit(json, msg) {
     if (json) {
-        console.log(JSON.stringify({ error: `${msg}` }, null, exports.JSON_SPACES));
+        console.log(JSON.stringify({ error: String(msg) }, null, exports.JSON_SPACES));
     }
     else {
-        console.error(`${msg}`.red);
-        if (msg.stderr) {
-            console.error(`${msg.stderr}`.red);
+        console.error(String(msg).red);
+        if (msg?.stderr) {
+            console.error(String(msg.stderr).red);
         }
     }
     process.exit(1);
 }
 /**
- * Conditionally log something to the console
- * @param {boolean} json - whether we are in json mode (and should therefore not log)
- * @param {string} msg - string to log
+ * Conditionally log something to the console.
+ *
+ * @param json - whether we are in json mode (and should therefore not log)
+ * @param msg - string to log
  */
 function log(json, msg) {
     if (!json) {
@@ -38,19 +40,20 @@ function log(json, msg) {
     }
 }
 /**
- * Start a spinner, execute an async function, and then stop the spinner
- * @param {boolean} json - whether we are in json mode (and should therefore not log)
- * @param {string} msg - string to log
- * @param {function} fn - function to wrap with spinning
+ * Start a spinner, execute an async function, and then stop the spinner.
+ *
+ * @param json - whether we are in json mode (and should therefore not log)
+ * @param msg - string to log
+ * @param fn - function to wrap with spinning
+ * @returns result of `fn`
  */
 async function spinWith(json, msg, fn) {
     if (json) {
         return await fn();
     }
     const spinner = (0, ora_1.default)(msg).start();
-    let res;
     try {
-        res = await fn();
+        const res = await fn();
         spinner.succeed();
         return res;
     }
@@ -60,30 +63,19 @@ async function spinWith(json, msg, fn) {
     }
 }
 class RingBuffer {
+    size;
+    buffer = [];
     constructor(size = 50) {
         this.size = size;
-        this.buffer = [];
     }
     /**
-     * Get the current buffer contents
-     *
-     * @returns {any[]}
+     * Get the current buffer contents.
      */
     getBuff() {
         return this.buffer;
     }
     /**
-     * Remove the oldest item from the buffer
-     *
-     * @returns {void}
-     */
-    dequeue() {
-        this.buffer.shift();
-    }
-    /**
-     * Add an item to the buffer
-     *
-     * @param {any} item
+     * Add an item to the buffer.
      */
     enqueue(item) {
         if (this.buffer.length >= this.size) {
@@ -91,6 +83,12 @@ class RingBuffer {
         }
         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.js"],"names":[],"mappings":";AAAA,+BAA+B;;;;;;AAW/B,gCAUC;AAOD,kBAIC;AAQD,4BAcC;AApDD,8CAAsB;AAET,QAAA,WAAW,GAAG,CAAC,CAAC;AAE7B;;;;GAIG;AACH,SAAgB,UAAU,CAAC,IAAI,EAAE,GAAG;IAClC,IAAI,IAAI,EAAE,CAAC;QACT,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAC,KAAK,EAAE,GAAG,GAAG,EAAE,EAAC,EAAE,IAAI,EAAE,mBAAW,CAAC,CAAC,CAAC;IACpE,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED;;;;GAIG;AACH,SAAgB,GAAG,CAAC,IAAI,EAAE,GAAG;IAC3B,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;IAC1C,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,GAAG,CAAC;IACR,IAAI,CAAC;QACH,GAAG,GAAG,MAAM,EAAE,EAAE,CAAC;QACjB,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;IACrB,YAAY,IAAI,GAAG,EAAE;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACH,OAAO;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED;;;;OAIG;IACH,OAAO;QACL,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IACD;;;;OAIG;IACH,OAAO,CAAC,IAAI;QACV,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;CACF;AAlCD,gCAkCC"}
+{"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"}

package/build/lib/config-file.d.ts

@@ -1,3 +1,6 @@
+import { type IOutputError } from '@sidvind/better-ajv-errors';
+import type { ErrorObject } from 'ajv';
+import type { AppiumConfig, NormalizedAppiumConfig } from '@appium/types';
 /**
  * Given an array of errors and the result of loading a config file, generate a
  * helpful string for the user.
@@ -6,76 +9,39 @@
  *   _string_ of the config file.  This is only applicable if the config file
  *   was in JSON format. If present, it will associate line numbers with errors.
  * - If `errors` happens to be empty, this will throw.
- * @param {import('ajv').ErrorObject[]} errors - Non-empty array of errors. Required.
- * @param {ReadConfigFileResult['config']|any} [config] -
- * Configuration & metadata
- * @param {FormatConfigErrorsOptions} [opts]
+ *
  * @throws {TypeError} If `errors` is empty
- * @returns {string}
  */
-export function formatErrors(errors?: import("ajv").ErrorObject[], config?: ReadConfigFileResult["config"] | any, opts?: FormatConfigErrorsOptions): string;
+export declare function formatErrors(errors?: ErrorObject[], config?: ReadConfigFileResult['config'] | Record<string, unknown> | string, opts?: FormatConfigErrorsOptions): string | IOutputError[];
 /**
  * Given an optional path, read a config file. Validates the config file.
  *
  * Call {@link validate} if you already have a config object.
- * @param {string} [filepath] - Path to config file, if we have one
- * @param {ReadConfigFileOptions} [opts] - Options
  * @public
- * @returns {Promise<ReadConfigFileResult>} Contains config and filepath, if found, and any errors
+ * @returns Contains config and filepath, if found, and any errors
  */
-export function readConfigFile(filepath?: string, opts?: ReadConfigFileOptions): Promise<ReadConfigFileResult>;
+export declare function readConfigFile(filepath?: string, opts?: ReadConfigFileOptions): Promise<ReadConfigFileResult>;
 /**
  * Convert schema property names to either a) the value of the `appiumCliDest` property, if any; or b) camel-case
- * @param {AppiumConfig} config - Configuration object
- * @returns {NormalizedAppiumConfig} New object with camel-cased keys (or `dest` keys).
+ * @returns New object with camel-cased keys (or `dest` keys).
  */
-export function normalizeConfig(config: AppiumConfig): NormalizedAppiumConfig;
+export declare function normalizeConfig(config: AppiumConfig): NormalizedAppiumConfig;
 /**
  * Result of calling {@link readConfigFile}.
  */
-export type ReadConfigFileResult = {
-    /**
-     * - Validation errors
-     */
-    errors?: import("ajv").ErrorObject<string, Record<string, any>, any>[] | undefined;
-    /**
-     * - The path to the config file, if found
-     */
-    filepath?: string | undefined;
-    /**
-     * - If `true`, the config file exists but is empty
-     */
-    isEmpty?: boolean | undefined;
-    /**
-     * - The parsed configuration
-     */
-    config?: import("@appium/types").NormalizedAppiumConfig | undefined;
-    /**
-     * - Human-readable error messages and suggestions. If the `pretty` option is `true`, this will be a nice string to print.
-     */
-    reason?: string | import("@sidvind/better-ajv-errors").IOutputError[] | undefined;
-};
+export interface ReadConfigFileResult {
+    errors?: ErrorObject[];
+    filepath?: string;
+    isEmpty?: boolean;
+    config?: NormalizedAppiumConfig;
+    reason?: string | IOutputError[];
+}
 /**
  * Options for {@link readConfigFile}.
  */
-export type ReadConfigFileOptions = {
-    /**
-     * If `false`, do not use color and fancy formatting in the `reason` property of the {@link ReadConfigFileResult}. The value of `reason` is then suitable for machine-reading.
-     */
-    pretty?: boolean | undefined;
-};
-/**
- * This is an `AsyncSearcher` which is inexplicably _not_ exported by the `lilconfig` type definition.
- */
-export type LilconfigAsyncSearcher = ReturnType<typeof import("lilconfig")["lilconfig"]>;
-/**
- * The contents of an Appium config file. Generated from schema
- */
-export type AppiumConfig = import("@appium/types").AppiumConfig;
-/**
- * The contents of an Appium config file with camelcased property names (and using `appiumCliDest` value if present). Generated from {@link AppiumConfig}
- */
-export type NormalizedAppiumConfig = import("@appium/types").NormalizedAppiumConfig;
+export interface ReadConfigFileOptions {
+    pretty?: boolean;
+}
 /**
  * The string should be a raw JSON string.
  */
@@ -83,18 +49,9 @@ export type RawJson = string;
 /**
  * Options for {@link formatErrors}.
  */
-export type FormatConfigErrorsOptions = {
-    /**
-     * - Raw JSON config (as string)
-     */
-    json?: string | undefined;
-    /**
-     * - Whether to format errors as a CLI-friendly string
-     */
-    pretty?: boolean | undefined;
-    /**
-     * - Specific ID of a prop; otherwise entire schema
-     */
-    schemaId?: string | undefined;
-};
+export interface FormatConfigErrorsOptions {
+    json?: RawJson;
+    pretty?: boolean;
+    schemaId?: string;
+}
 //# sourceMappingURL=config-file.d.ts.map

package/build/lib/config-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-file.d.ts","sourceRoot":"","sources":["../../lib/config-file.js"],"names":[],"mappings":"AA0EA;;;;;;;;;;;;;;GAcG;AACH,sCAPW,OAAO,KAAK,EAAE,WAAW,EAAE,WAC3B,oBAAoB,CAAC,QAAQ,CAAC,GAAC,GAAG,SAElC,yBAAyB,GAEvB,MAAM,CAUlB;AAED;;;;;;;;GAQG;AACH,0CALW,MAAM,SACN,qBAAqB,GAEnB,OAAO,CAAC,oBAAoB,CAAC,CAwCzC;AAED;;;;GAIG;AACH,wCAHW,YAAY,GACV,sBAAsB,CAgClC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qCAoBY,UAAU,CAAC,0BAAmB,CAAC,WAAW,CAAC,CAAC;;;;2BAK5C,OAAO,eAAe,EAAE,YAAY;;;;qCAKpC,OAAO,eAAe,EAAE,sBAAsB;;;;sBAK9C,MAAM"}
+{"version":3,"file":"config-file.d.ts","sourceRoot":"","sources":["../../lib/config-file.ts"],"names":[],"mappings":"AAAA,OAAwB,EAAC,KAAK,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAC9E,OAAO,KAAK,EAAC,WAAW,EAAe,MAAM,KAAK,CAAC;AAInD,OAAO,KAAK,EAAC,YAAY,EAAE,sBAAsB,EAAC,MAAM,eAAe,CAAC;AAUxE;;;;;;;;;;GAUG;AACH,wBAAgB,YAAY,CAC1B,MAAM,GAAE,WAAW,EAAO,EAC1B,MAAM,GAAE,oBAAoB,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAW,EAC9E,IAAI,GAAE,yBAA8B,GACnC,MAAM,GAAG,YAAY,EAAE,CAQzB;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,QAAQ,CAAC,EAAE,MAAM,EACjB,IAAI,GAAE,qBAA0B,GAC/B,OAAO,CAAC,oBAAoB,CAAC,CAsC/B;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,YAAY,GAAG,sBAAsB,CAwB5E;AA0DD;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,sBAAsB,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,GAAG,YAAY,EAAE,CAAC;CAClC;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC;AAE7B;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB"}

package/build/lib/config-file.js

@@ -44,71 +44,12 @@ const lilconfig_1 = require("lilconfig");
 const lodash_1 = __importDefault(require("lodash"));
 const yaml = __importStar(require("yaml"));
 const schema_1 = require("./schema/schema");
-/**
- * lilconfig loader to handle `.yaml` files
- * @type {import('lilconfig').LoaderSync}
- */
-function yamlLoader(filepath, content) {
-    try {
-        return yaml.parse(content);
-    }
-    catch (e) {
-        throw new Error(`The YAML config at '${filepath}' cannot be loaded. Original error: ${e.message}`);
-    }
-}
 /**
  * A cache of the raw config file (a JSON string) at a filepath.
  * This is used for better error reporting.
  * Note that config files needn't be JSON, but it helps if they are.
- * @type {Map<string,RawJson>}
  */
 const rawConfig = new Map();
-/**
- * Custom JSON loader that caches the raw config file (for use with `better-ajv-errors`).
- * If it weren't for this cache, this would be unnecessary.
- * @type {import('lilconfig').LoaderSync}
- */
-function jsonLoader(filepath, content) {
-    rawConfig.set(filepath, content);
-    try {
-        return JSON.parse(content);
-    }
-    catch (e) {
-        throw new Error(`The JSON config at '${filepath}' cannot be loaded. Original error: ${e.message}`);
-    }
-}
-/**
- * Loads a config file from an explicit path
- * @param {LilconfigAsyncSearcher} lc - lilconfig instance
- * @param {string} filepath - Path to config file
- * @returns {Promise<import('lilconfig').LilconfigResult>}
- */
-async function loadConfigFile(lc, filepath) {
-    try {
-        // removing "await" will cause any rejection to _not_ be caught in this block!
-        return await lc.load(filepath);
-    }
-    catch ( /** @type {unknown} */err) {
-        if ( /** @type {NodeJS.ErrnoException} */(err).code === 'ENOENT') {
-            /** @type {NodeJS.ErrnoException} */ (err).message = `Config file not found at user-provided path: ${filepath}`;
-            throw err;
-        }
-        else if (err instanceof SyntaxError) {
-            // generally invalid JSON
-            err.message = `Config file at user-provided path ${filepath} is invalid:\n${err.message}`;
-            throw err;
-        }
-        throw err;
-    }
-}
-/**
- * Searches for a config file
- * @param {LilconfigAsyncSearcher} lc - lilconfig instance
- * @returns {Promise<import('lilconfig').LilconfigResult>}
- */
-async function searchConfigFile(lc) {
-    return await lc.search();
-}
 /**
  * Given an array of errors and the result of loading a config file, generate a
  * helpful string for the user.
@@ -117,12 +58,8 @@ async function searchConfigFile(lc) {
  *   _string_ of the config file.  This is only applicable if the config file
  *   was in JSON format. If present, it will associate line numbers with errors.
  * - If `errors` happens to be empty, this will throw.
- * @param {import('ajv').ErrorObject[]} errors - Non-empty array of errors. Required.
- * @param {ReadConfigFileResult['config']|any} [config] -
- * Configuration & metadata
- * @param {FormatConfigErrorsOptions} [opts]
+ *
  * @throws {TypeError} If `errors` is empty
- * @returns {string}
  */
 function formatErrors(errors = [], config = {}, opts = {}) {
     if (errors && !errors.length) {
@@ -130,17 +67,15 @@ function formatErrors(errors = [], config = {}, opts = {}) {
     }
     return (0, better_ajv_errors_1.default)((0, schema_1.getSchema)(opts.schemaId), config, errors, {
         json: opts.json,
-        format: 'cli',
+        format: opts.pretty === false ? 'js' : 'cli',
     });
 }
 /**
  * Given an optional path, read a config file. Validates the config file.
  *
  * Call {@link validate} if you already have a config object.
- * @param {string} [filepath] - Path to config file, if we have one
- * @param {ReadConfigFileOptions} [opts] - Options
  * @public
- * @returns {Promise<ReadConfigFileResult>} Contains config and filepath, if found, and any errors
+ * @returns Contains config and filepath, if found, and any errors
  */
 async function readConfigFile(filepath, opts = {}) {
     const lc = (0, lilconfig_1.lilconfig)('appium', {
@@ -169,7 +104,7 @@ async function readConfigFile(filepath, opts = {}) {
                 configResult = reason ? { ...result, errors, reason } : { ...result, errors };
             }
             // normalize (to camel case) all top-level property names of the config file
-            configResult.config = normalizeConfig(/** @type {AppiumConfig} */ (configResult.config));
+            configResult.config = normalizeConfig(configResult.config);
             return configResult;
         }
         finally {
@@ -181,69 +116,75 @@ async function readConfigFile(filepath, opts = {}) {
 }
 /**
  * Convert schema property names to either a) the value of the `appiumCliDest` property, if any; or b) camel-case
- * @param {AppiumConfig} config - Configuration object
- * @returns {NormalizedAppiumConfig} New object with camel-cased keys (or `dest` keys).
+ * @returns New object with camel-cased keys (or `dest` keys).
  */
 function normalizeConfig(config) {
     const schema = (0, schema_1.getSchema)();
-    /**
-     * @param {AppiumConfig} config
-     * @param {string} [section] - Keypath (lodash `_.get()` style) to section of config. If omitted, assume root Appium config schema
-     * @todo Rewrite as a loop
-     * @returns Normalized section of config
-     */
-    const normalize = (config, section) => {
-        const obj = lodash_1.default.isUndefined(section) ? config : lodash_1.default.get(config, section, config);
-        const mappedObj = lodash_1.default.mapKeys(obj, (__, prop) => lodash_1.default.get(schema, `properties.server.properties[${prop}].appiumCliDest`, lodash_1.default.camelCase(prop)));
+    const isSchemaTypeObject = (schemaObj) => Boolean(schemaObj?.properties || schemaObj?.type === 'object');
+    const normalize = (rootConfig, section) => {
+        const obj = lodash_1.default.isUndefined(section)
+            ? rootConfig
+            : lodash_1.default.get(rootConfig, section, rootConfig);
+        const mappedObj = lodash_1.default.mapKeys(obj, (_v, prop) => lodash_1.default.get(schema, `properties.server.properties[${prop}].appiumCliDest`, lodash_1.default.camelCase(prop)));
         return lodash_1.default.mapValues(mappedObj, (value, property) => {
             const nextSection = section ? `${section}.${property}` : property;
             return isSchemaTypeObject(schema.properties?.[property])
-                ? normalize(config, nextSection)
+                ? normalize(rootConfig, nextSection)
                 : value;
         });
     };
-    /**
-     * Returns `true` if the schema prop references an object, or if it's an object itself
-     * @param {import('ajv').SchemaObject|object} schema - Referencing schema object
-     */
-    const isSchemaTypeObject = (schema) => Boolean(schema?.properties || schema?.type === 'object');
     return normalize(config);
 }
 /**
- * Result of calling {@link readConfigFile}.
- * @typedef ReadConfigFileResult
- * @property {import('ajv').ErrorObject[]} [errors] - Validation errors
- * @property {string} [filepath] - The path to the config file, if found
- * @property {boolean} [isEmpty] - If `true`, the config file exists but is empty
- * @property {NormalizedAppiumConfig} [config] - The parsed configuration
- * @property {string|import('@sidvind/better-ajv-errors').IOutputError[]} [reason] - Human-readable error messages and suggestions. If the `pretty` option is `true`, this will be a nice string to print.
- */
-/**
- * Options for {@link readConfigFile}.
- * @typedef ReadConfigFileOptions
- * @property {boolean} [pretty=true] If `false`, do not use color and fancy formatting in the `reason` property of the {@link ReadConfigFileResult}. The value of `reason` is then suitable for machine-reading.
- */
-/**
- * This is an `AsyncSearcher` which is inexplicably _not_ exported by the `lilconfig` type definition.
- * @typedef {ReturnType<import('lilconfig')["lilconfig"]>} LilconfigAsyncSearcher
- */
-/**
- * The contents of an Appium config file. Generated from schema
- * @typedef {import('@appium/types').AppiumConfig} AppiumConfig
+ * lilconfig loader to handle `.yaml` files
  */
+function yamlLoader(filepath, content) {
+    try {
+        return yaml.parse(content);
+    }
+    catch (e) {
+        throw new Error(`The YAML config at '${filepath}' cannot be loaded. Original error: ${e.message}`);
+    }
+}
 /**
- * The contents of an Appium config file with camelcased property names (and using `appiumCliDest` value if present). Generated from {@link AppiumConfig}
- * @typedef {import('@appium/types').NormalizedAppiumConfig} NormalizedAppiumConfig
+ * Custom JSON loader that caches the raw config file (for use with `better-ajv-errors`).
+ * If it weren't for this cache, this would be unnecessary.
  */
+function jsonLoader(filepath, content) {
+    rawConfig.set(filepath, content);
+    try {
+        return JSON.parse(content);
+    }
+    catch (e) {
+        rawConfig.delete(filepath);
+        throw new Error(`The JSON config at '${filepath}' cannot be loaded. Original error: ${e.message}`);
+    }
+}
 /**
- * The string should be a raw JSON string.
- * @typedef {string} RawJson
+ * Loads a config file from an explicit path
  */
+async function loadConfigFile(lc, filepath) {
+    try {
+        // removing "await" will cause any rejection to _not_ be caught in this block!
+        return await lc.load(filepath);
+    }
+    catch (err) {
+        if (err.code === 'ENOENT') {
+            err.message = `Config file not found at user-provided path: ${filepath}`;
+            throw err;
+        }
+        else if (err instanceof SyntaxError) {
+            // generally invalid JSON
+            err.message = `Config file at user-provided path ${filepath} is invalid:\n${err.message}`;
+            throw err;
+        }
+        throw err;
+    }
+}
 /**
- * Options for {@link formatErrors}.
- * @typedef FormatConfigErrorsOptions
- * @property {import('./config-file').RawJson} [json] - Raw JSON config (as string)
- * @property {boolean} [pretty=true] - Whether to format errors as a CLI-friendly string
- * @property {string}  [schemaId] - Specific ID of a prop; otherwise entire schema
+ * Searches for a config file
  */
+async function searchConfigFile(lc) {
+    return await lc.search();
+}
 //# sourceMappingURL=config-file.js.map

package/build/lib/config-file.js.map

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