appium 3.2.2 → 3.3.1

package/build/lib/cli/args.js

@@ -16,10 +16,8 @@ const PLUGIN_EXAMPLE = 'images';
  * Bad `argparse`! Bad!
  */
 const INSTALL_TYPES_ARRAY = [...extension_config_1.INSTALL_TYPES];
-/** @type {Set<ExtensionType>} */
 const EXTENSION_TYPES = new Set([constants_1.DRIVER_TYPE, constants_1.PLUGIN_TYPE]);
 // this set of args works for both drivers and plugins ('extensions')
-/** @type {ArgumentDefinitions} */
 const globalExtensionArgs = new Map([
     [
         ['--json'],
@@ -33,9 +31,11 @@ const globalExtensionArgs = new Map([
     ],
 ]);
 /**
- * Builds a Record of extension types to a Record of subcommands to their argument definitions
+ * Returns CLI argument definitions for extension commands by extension type.
+ *
+ * The result is memoized because parser setup is static across process lifetime.
  */
-const getExtensionArgs = lodash_1.default.memoize(function getExtensionArgs() {
+exports.getExtensionArgs = lodash_1.default.memoize(function getExtensionArgs() {
     const extensionArgs = {};
     for (const type of EXTENSION_TYPES) {
         extensionArgs[type] = {
@@ -47,13 +47,19 @@ const getExtensionArgs = lodash_1.default.memoize(function getExtensionArgs() {
             [constants_1.EXT_SUBCOMMAND_DOCTOR]: makeDoctorArgs(type),
         };
     }
-    return /** @type {Record<ExtensionType, Record<import('appium/types').CliExtensionSubcommand,ArgumentDefinitions>>} */ (extensionArgs);
+    return extensionArgs;
 });
-exports.getExtensionArgs = getExtensionArgs;
 /**
- * Makes the opts for the `list` subcommand for each extension type.
- * @param {ExtensionType} type
- * @returns {ArgumentDefinitions}
+ * Returns CLI argument definitions for the `server` command.
+ *
+ * This includes schema-derived options and additional CLI-only options which
+ * are intentionally disallowed in config files.
+ */
+function getServerArgs() {
+    return new Map([...(0, cli_args_1.toParserArgs)(), ...serverArgsDisallowedInConfig]);
+}
+/**
+ * Builds options for the `list` subcommand for an extension type.
  */
 function makeListArgs(type) {
     return new Map([
@@ -91,9 +97,7 @@ function makeListArgs(type) {
     ]);
 }
 /**
- * Makes the opts for the `install` subcommand for each extension type
- * @param {ExtensionType} type
- * @returns {ArgumentDefinitions}
+ * Builds options for the `install` subcommand for an extension type.
  */
 function makeInstallArgs(type) {
     return new Map([
@@ -131,9 +135,7 @@ function makeInstallArgs(type) {
     ]);
 }
 /**
- * Makes the opts for the `uninstall` subcommand for each extension type
- * @param {ExtensionType} type
- * @returns {ArgumentDefinitions}
+ * Builds options for the `uninstall` subcommand for an extension type.
  */
 function makeUninstallArgs(type) {
     return new Map([
@@ -149,9 +151,7 @@ function makeUninstallArgs(type) {
     ]);
 }
 /**
- * Makes the opts for the `doctor` subcommand for each extension type
- * @param {ExtensionType} type
- * @returns {ArgumentDefinitions}
+ * Builds options for the `doctor` subcommand for an extension type.
  */
 function makeDoctorArgs(type) {
     return new Map([
@@ -167,9 +167,7 @@ function makeDoctorArgs(type) {
     ]);
 }
 /**
- * Makes the opts for the `update` subcommand for each extension type
- * @param {ExtensionType} type
- * @returns {ArgumentDefinitions}
+ * Builds options for the `update` subcommand for an extension type.
  */
 function makeUpdateArgs(type) {
     return new Map([
@@ -196,9 +194,7 @@ function makeUpdateArgs(type) {
     ]);
 }
 /**
- * Makes the opts for the `run` subcommand for each extension type
- * @param {ExtensionType} type
- * @returns {ArgumentDefinitions}
+ * Builds options for the `run` subcommand for an extension type.
  */
 function makeRunArgs(type) {
     return new Map([
@@ -223,17 +219,8 @@ function makeRunArgs(type) {
         ],
     ]);
 }
-/**
- * Derives the options for the `server` command from the schema, and adds the arguments
- * which are disallowed in the config file.
- * @returns {ArgumentDefinitions}
- */
-function getServerArgs() {
-    return new Map([...(0, cli_args_1.toParserArgs)(), ...serverArgsDisallowedInConfig]);
-}
 /**
  * These don't make sense in the context of a config file for obvious reasons.
- * @type {ArgumentDefinitions}
  */
 const serverArgsDisallowedInConfig = new Map([
     [
@@ -286,11 +273,4 @@ const serverArgsDisallowedInConfig = new Map([
         },
     ],
 ]);
-/**
- * @typedef {import('@appium/types').ExtensionType} ExtensionType
- */
-/**
- * A tuple of argument aliases and argument options
- * @typedef {Map<[name: string]|[name: string, alias: string],import('argparse').ArgumentOptions>} ArgumentDefinitions
- */
 //# sourceMappingURL=args.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"args.js","sourceRoot":"","sources":["../../../lib/cli/args.js"],"names":[],"mappings":";;;;;;AAyTQ,sCAAa;AAzTrB,oDAAuB;AACvB,4CASsB;AACtB,oEAA4D;AAC5D,iDAAgD;AAChD,MAAM,cAAc,GAAG,UAAU,CAAC;AAClC,MAAM,cAAc,GAAG,QAAQ,CAAC;AAEhC;;;GAGG;AACH,MAAM,mBAAmB,GAAG,CAAC,GAAG,gCAAa,CAAC,CAAC;AAE/C,iCAAiC;AACjC,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,uBAAW,EAAE,uBAAW,CAAC,CAAC,CAAC;AAE5D,qEAAqE;AACrE,kCAAkC;AAClC,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAC;IAClC;QACE,CAAC,QAAQ,CAAC;QACV;YACE,QAAQ,EAAE,KAAK;YACf,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,YAAY;YACpB,IAAI,EAAE,8BAA8B;YACpC,IAAI,EAAE,MAAM;SACb;KACF;CACF,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,gBAAgB,GAAG,gBAAC,CAAC,OAAO,CAAC,SAAS,gBAAgB;IAC1D,MAAM,aAAa,GAAG,EAAE,CAAC;IACzB,KAAK,MAAM,IAAI,IAAI,eAAe,EAAE,CAAC;QACnC,aAAa,CAAC,IAAI,CAAC,GAAG;YACpB,CAAC,+BAAmB,CAAC,EAAE,YAAY,CAAC,IAAI,CAAC;YACzC,CAAC,kCAAsB,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC;YAC/C,CAAC,oCAAwB,CAAC,EAAE,iBAAiB,CAAC,IAAI,CAAC;YACnD,CAAC,iCAAqB,CAAC,EAAE,cAAc,CAAC,IAAI,CAAC;YAC7C,CAAC,8BAAkB,CAAC,EAAE,WAAW,CAAC,IAAI,CAAC;YACvC,CAAC,iCAAqB,CAAC,EAAE,cAAc,CAAC,IAAI,CAAC;SAC9C,CAAC;IACJ,CAAC;IACD,OAAO,+GAA+G,CAAC,CACrH,aAAa,CACd,CAAC;AACJ,CAAC,CAAC,CAAC;AA+PoB,4CAAgB;AA7PvC;;;;GAIG;AACH,SAAS,YAAY,CAAC,IAAI;IACxB,OAAO,IAAI,GAAG,CAAC;QACb,GAAG,mBAAmB;QACtB;YACE,CAAC,aAAa,CAAC;YACf;gBACE,QAAQ,EAAE,KAAK;gBACf,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,YAAY;gBACpB,IAAI,EAAE,uBAAuB,IAAI,GAAG;gBACpC,IAAI,EAAE,eAAe;aACtB;SACF;QACD;YACE,CAAC,WAAW,CAAC;YACb;gBACE,QAAQ,EAAE,KAAK;gBACf,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,YAAY;gBACpB,IAAI,EAAE,oCAAoC,IAAI,UAAU;gBACxD,IAAI,EAAE,aAAa;aACpB;SACF;QACD;YACE,CAAC,WAAW,CAAC;YACb;gBACE,QAAQ,EAAE,KAAK;gBACf,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,YAAY;gBACpB,IAAI,EAAE,oCAAoC,IAAI,EAAE;gBAChD,IAAI,EAAE,SAAS;aAChB;SACF;KACF,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,SAAS,eAAe,CAAC,IAAI;IAC3B,OAAO,IAAI,GAAG,CAAC;QACb,GAAG,mBAAmB;QACtB;YACE,CAAC,IAAI,CAAC;YACN;gBACE,IAAI,EAAE,KAAK;gBACX,IAAI,EACF,eAAe,IAAI,4BAA4B;oBAC/C,CAAC,IAAI,KAAK,uBAAW,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC;aAC3D;SACF;QACD;YACE,CAAC,UAAU,CAAC;YACZ;gBACE,QAAQ,EAAE,KAAK;gBACf,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,mBAAmB;gBAC5B,IAAI,EACF,yBAAyB,IAAI,yCAAyC;oBACtE,GAAG,IAAI,uBAAuB,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAChE,IAAI,EAAE,aAAa;aACpB;SACF;QACD;YACE,CAAC,WAAW,CAAC;YACb;gBACE,QAAQ,EAAE,KAAK;gBACf,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,KAAK;gBACX,IAAI,EACF,mCAAmC,IAAI,IAAI;oBAC3C,mDAAmD;gBACrD,IAAI,EAAE,aAAa;aACpB;SACF;KACF,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,SAAS,iBAAiB,CAAC,IAAI;IAC7B,OAAO,IAAI,GAAG,CAAC;QACb,GAAG,mBAAmB;QACtB;YACE,CAAC,IAAI,CAAC;YACN;gBACE,IAAI,EAAE,KAAK;gBACX,IAAI,EACF,eAAe,IAAI,8BAA8B;oBACjD,CAAC,IAAI,KAAK,uBAAW,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC;aAC3D;SACF;KACF,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,SAAS,cAAc,CAAC,IAAI;IAC1B,OAAO,IAAI,GAAG,CAAC;QACb,GAAG,mBAAmB;QACtB;YACE,CAAC,IAAI,CAAC;YACN;gBACE,IAAI,EAAE,KAAK;gBACX,IAAI,EACF,eAAe,IAAI,0CAA0C;oBAC7D,CAAC,IAAI,KAAK,uBAAW,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC;aAC3D;SACF;KACF,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,SAAS,cAAc,CAAC,IAAI;IAC1B,OAAO,IAAI,GAAG,CAAC;QACb,GAAG,mBAAmB;QACtB;YACE,CAAC,IAAI,CAAC;YACN;gBACE,IAAI,EAAE,KAAK;gBACX,IAAI,EACF,eAAe,IAAI,sDAAsD,IAAI,KAAK;oBAClF,oBAAoB,IAAI,yBAAyB,IAAI,gCAAgC;oBACrF,eAAe;oBACf,CAAC,IAAI,KAAK,uBAAW,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC;aAC3D;SACF;QACD;YACE,CAAC,UAAU,CAAC;YACZ;gBACE,QAAQ,EAAE,KAAK;gBACf,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,YAAY;gBACpB,IAAI,EACF,+EAA+E;aAClF;SACF;KACF,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,SAAS,WAAW,CAAC,IAAI;IACvB,OAAO,IAAI,GAAG,CAAC;QACb,GAAG,mBAAmB;QACtB;YACE,CAAC,IAAI,CAAC;YACN;gBACE,IAAI,EAAE,KAAK;gBACX,IAAI,EACF,eAAe,IAAI,sCAAsC;oBACzD,CAAC,IAAI,KAAK,uBAAW,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC;aAC3D;SACF;QACD;YACE,CAAC,YAAY,CAAC;YACd;gBACE,OAAO,EAAE,IAAI;gBACb,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,KAAK;gBACX,IAAI,EACF,eAAe,IAAI,iDAAiD;oBACpE,iCAAiC,IAAI,GAAG;aAC3C;SACF;KACF,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,SAAS,aAAa;IACpB,OAAO,IAAI,GAAG,CAAC,CAAC,GAAG,IAAA,uBAAY,GAAE,EAAE,GAAG,4BAA4B,CAAC,CAAC,CAAC;AACvE,CAAC;AAED;;;GAGG;AACH,MAAM,4BAA4B,GAAG,IAAI,GAAG,CAAC;IAC3C;QACE,CAAC,SAAS,CAAC;QACX;YACE,QAAQ,EAAE,KAAK;YACf,IAAI,EAAE,iBAAiB;YACvB,MAAM,EAAE,aAAa;YACrB,KAAK,EAAE,IAAI;YACX,IAAI,EAAE,OAAO;SACd;KACF;IACD;QACE,CAAC,mBAAmB,CAAC;QACrB;YACE,IAAI,EAAE,eAAe;YACrB,MAAM,EAAE,aAAa;YACrB,KAAK,EAAE,IAAI;YACX,QAAQ,EAAE,KAAK;YACf,IAAI,EAAE,2CAA2C;SAClD;KACF;IACD;QACE,CAAC,mBAAmB,CAAC;QACrB;YACE,IAAI,EAAE,eAAe;YACrB,MAAM,EAAE,aAAa;YACrB,KAAK,EAAE,IAAI;YACX,QAAQ,EAAE,KAAK;YACf,IAAI,EAAE,8DAA8D;SACrE;KACF;IACD;QACE,CAAC,eAAe,CAAC;QACjB;YACE,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,aAAa;YACrB,KAAK,EAAE,IAAI;YACX,QAAQ,EAAE,KAAK;YACf,IAAI,EAAE,gDAAgD;SACvD;KACF;IACD;QACE,CAAC,UAAU,CAAC;QACZ;YACE,IAAI,EAAE,YAAY;YAClB,IAAI,EAAE,KAAK;YACX,QAAQ,EAAE,KAAK;YACf,IAAI,EAAE,4CAA4C;SACnD;KACF;CACF,CAAC,CAAC;AAIH;;GAEG;AAEH;;;GAGG"}
+{"version":3,"file":"args.js","sourceRoot":"","sources":["../../../lib/cli/args.ts"],"names":[],"mappings":"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"}

package/build/lib/cli/driver-command.d.ts

@@ -1,121 +1,79 @@
-/**
- * @extends {ExtensionCliCommand<DriverType>}
- */
-export default class DriverCliCommand extends ExtensionCliCommand<"driver"> {
-    /**
-     * @param {import('./extension-command').ExtensionCommandOptions<DriverType>} opts
-     */
-    constructor({ config, json }: import("./extension-command").ExtensionCommandOptions<DriverType>);
+import type { ExtMetadata, ExtRecord, InstallType } from 'appium/types';
+import ExtensionCliCommand from './extension-command';
+import type { ExtensionArgs, ExtensionCommandOptions, ExtensionUpdateResult, PostInstallText, RunOutput } from './extension-command';
+import '@colors/colors';
+type DriverInstallOpts = {
+    driver: string;
+    installType: InstallType;
+    packageName?: string;
+};
+type DriverUninstallOpts = {
+    driver: string;
+};
+type DriverUpdateOpts = {
+    driver: string;
+    unsafe: boolean;
+};
+type DriverRunOptions = {
+    driver: string;
+    scriptName: string;
+    extraArgs?: string[];
+};
+type DriverDoctorOptions = {
+    driver: string;
+};
+export default class DriverCliCommand extends ExtensionCliCommand<'driver'> {
+    constructor({ config, json }: ExtensionCommandOptions<'driver'>);
     /**
      * Install a driver
      *
-     * @param {DriverInstallOpts} opts
-     * @return {Promise<ExtRecord<DriverType>>}
+     * @param opts - install options
      */
-    install({ driver, installType, packageName }: DriverInstallOpts): Promise<ExtRecord<DriverType>>;
+    install({ driver, installType, packageName }: DriverInstallOpts): Promise<ExtRecord<'driver'>>;
     /**
      * Uninstall a driver
      *
-     * @param {DriverUninstallOpts} opts
-     * @return {Promise<ExtRecord<DriverType>>}
+     * @param opts - uninstall options
      */
-    uninstall({ driver }: DriverUninstallOpts): Promise<ExtRecord<DriverType>>;
+    uninstall({ driver }: DriverUninstallOpts): Promise<ExtRecord<'driver'>>;
     /**
      * Update a driver
      *
-     * @param {DriverUpdateOpts} opts
-     * @return {Promise<import('./extension-command').ExtensionUpdateResult>}
+     * @param opts - update options
      */
-    update({ driver, unsafe }: DriverUpdateOpts): Promise<import("./extension-command").ExtensionUpdateResult>;
+    update({ driver, unsafe }: DriverUpdateOpts): Promise<ExtensionUpdateResult>;
     /**
      * Run a script from a driver
      *
-     * @param {DriverRunOptions} opts
-     * @return {Promise<import('./extension-command').RunOutput>}
+     * @param opts - script execution options
      * @throws {Error} if the script fails to run
      */
-    run({ driver, scriptName, extraArgs }: DriverRunOptions): Promise<import("./extension-command").RunOutput>;
+    run({ driver, scriptName, extraArgs }: DriverRunOptions): Promise<RunOutput>;
     /**
      * Runs doctor checks for the given driver.
      *
-     * @param {DriverDoctorOptions} opts
-     * @returns {Promise<number>} The amount of executed doctor checks.
+     * @param opts - doctor command options
+     * @returns The amount of executed doctor checks.
      * @throws {Error} If any of the mandatory Doctor checks fails.
      */
     doctor({ driver }: DriverDoctorOptions): Promise<number>;
-}
-export type ExtensionType = import("@appium/types").ExtensionType;
-export type DriverType = import("@appium/types").DriverType;
-export type ExtRecord<ExtType extends ExtensionType> = import("appium/types").ExtRecord<ExtType>;
-export type DriverCommandOptions = {
-    config: import("../extension/extension-config").ExtensionConfig<DriverType>;
-    json: boolean;
-};
-/**
- * Options for {@linkcode DriverCliCommand.install}
- */
-export type DriverInstallOpts = {
     /**
-     * - the name or spec of a driver to install
-     */
-    driver: string;
-    /**
-     * - how to install this driver. One of the INSTALL_TYPES
-     */
-    installType: InstallType;
-    /**
-     * - for git/github installs, the driver node package name
-     */
-    packageName?: string | undefined;
-};
-export type InstallType = import("appium/types").InstallType;
-/**
- * Options for {@linkcode DriverCliCommand.uninstall}
- */
-export type DriverUninstallOpts = {
-    /**
-     * - the name or spec of a driver to uninstall
-     */
-    driver: string;
-};
-/**
- * Options for {@linkcode DriverCliCommand.update}
- */
-export type DriverUpdateOpts = {
-    /**
-     * - the name of the driver to update
-     */
-    driver: string;
-    /**
-     * - if true, will perform unsafe updates past major revision boundaries
-     */
-    unsafe: boolean;
-};
-/**
- * Options for {@linkcode DriverCliCommand.run}.
- */
-export type DriverRunOptions = {
-    /**
-     * - name of the driver to run a script from
-     */
-    driver: string;
-    /**
-     * - name of the script to run
-     */
-    scriptName: string;
-    /**
-     * - arguments to pass to the script
+     * Builds the success message displayed after a driver installation.
+     *
+     * @param args - installed extension name and metadata
+     * @returns formatted success text
      */
-    extraArgs?: string[] | undefined;
-};
-/**
- * Options for {@linkcode DriverCliCommand.doctor}.
- */
-export type DriverDoctorOptions = {
+    getPostInstallText({ extName, extData }: ExtensionArgs<'driver'>): PostInstallText;
     /**
-     * - name of the driver to run doctor checks for
+     * Validates fields in `appium` field of `driverMetadata`
+     *
+     * For any `package.json` fields which a driver requires, validate the type of
+     * those fields on the `package.json` data, throwing an error if anything is
+     * amiss.
+     * @param driverMetadata - `appium` metadata from extension package
+     * @param installSpec - install spec from CLI
      */
-    driver: string;
-};
-import ExtensionCliCommand from './extension-command';
+    validateExtensionFields(driverMetadata: ExtMetadata<'driver'>, installSpec: string): void;
+}
+export {};
 //# sourceMappingURL=driver-command.d.ts.map

package/build/lib/cli/driver-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"driver-command.d.ts","sourceRoot":"","sources":["../../../lib/cli/driver-command.js"],"names":[],"mappings":"AAOA;;GAEG;AAEH;IACE;;OAEG;IACH,8BAFW,OAAO,qBAAqB,EAAE,uBAAuB,CAAC,UAAU,CAAC,EAK3E;IAED;;;;;OAKG;IACH,8CAHW,iBAAiB,GAChB,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAQzC;IAED;;;;;OAKG;IACH,sBAHW,mBAAmB,GAClB,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAIzC;IAED;;;;;OAKG;IACH,2BAHW,gBAAgB,GACf,OAAO,CAAC,OAAO,qBAAqB,EAAE,qBAAqB,CAAC,CAIvE;IAED;;;;;;OAMG;IACH,uCAJW,gBAAgB,GACf,OAAO,CAAC,OAAO,qBAAqB,EAAE,SAAS,CAAC,CAU3D;IAED;;;;;;OAMG;IACH,mBAJW,mBAAmB,GACjB,OAAO,CAAC,MAAM,CAAC,CAO3B;CAqCF;4BAGY,OAAO,eAAe,EAAE,aAAa;yBACrC,OAAO,eAAe,EAAE,UAAU;sBAIlB,OAAO,SAAtB,aAAc,IACf,OAAO,cAAc,EAAE,SAAS,CAAC,OAAO,CAAC;;YAKxC,OAAO,+BAA+B,EAAE,eAAe,CAAC,UAAU,CAAC;UACnE,OAAO;;;;;;;;;YAMP,MAAM;;;;iBACN,WAAW;;;;;;0BAKZ,OAAO,cAAc,EAAE,WAAW;;;;;;;;YAMjC,MAAM;;;;;;;;;YAMN,MAAM;;;;YACN,OAAO;;;;;;;;;YAMP,MAAM;;;;gBACN,MAAM;;;;;;;;;;;;;YAON,MAAM;;gCA3KY,qBAAqB"}
+{"version":3,"file":"driver-command.d.ts","sourceRoot":"","sources":["../../../lib/cli/driver-command.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,WAAW,EAAE,SAAS,EAAE,WAAW,EAAC,MAAM,cAAc,CAAC;AACtE,OAAO,mBAAmB,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EACV,aAAa,EACb,uBAAuB,EACvB,qBAAqB,EACrB,eAAe,EACf,SAAS,EACV,MAAM,qBAAqB,CAAC;AAE7B,OAAO,gBAAgB,CAAC;AAGxB,KAAK,iBAAiB,GAAG;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,WAAW,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AAC1F,KAAK,mBAAmB,GAAG;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,CAAC;AAC5C,KAAK,gBAAgB,GAAG;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAC,CAAC;AAC1D,KAAK,gBAAgB,GAAG;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;CAAC,CAAC;AACnF,KAAK,mBAAmB,GAAG;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,CAAC;AAE5C,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,mBAAmB,CAAC,QAAQ,CAAC;gBAC7D,EAAC,MAAM,EAAE,IAAI,EAAC,EAAE,uBAAuB,CAAC,QAAQ,CAAC;IAK7D;;;;OAIG;IACG,OAAO,CAAC,EAAC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAQlG;;;;OAIG;IACG,SAAS,CAAC,EAAC,MAAM,EAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAI5E;;;;OAIG;IACG,MAAM,CAAC,EAAC,MAAM,EAAE,MAAM,EAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAIhF;;;;;OAKG;IACG,GAAG,CAAC,EAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,CAAC;IAShF;;;;;;OAMG;IACG,MAAM,CAAC,EAAC,MAAM,EAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC;IAM5D;;;;;OAKG;IACM,kBAAkB,CAAC,EAAC,OAAO,EAAE,OAAO,EAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,GAAG,eAAe;IAQzF;;;;;;;;OAQG;IACM,uBAAuB,CAAC,cAAc,EAAE,WAAW,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI;CAanG"}

package/build/lib/cli/driver-command.js

@@ -8,13 +8,7 @@ const extension_command_1 = __importDefault(require("./extension-command"));
 const constants_1 = require("../constants");
 require("@colors/colors");
 const REQ_DRIVER_FIELDS = ['driverName', 'automationName', 'platformNames', 'mainClass'];
-/**
- * @extends {ExtensionCliCommand<DriverType>}
- */
 class DriverCliCommand extends extension_command_1.default {
-    /**
-     * @param {import('./extension-command').ExtensionCommandOptions<DriverType>} opts
-     */
     constructor({ config, json }) {
         super({ config, json });
         this.knownExtensions = constants_1.KNOWN_DRIVERS;
@@ -22,8 +16,7 @@ class DriverCliCommand extends extension_command_1.default {
     /**
      * Install a driver
      *
-     * @param {DriverInstallOpts} opts
-     * @return {Promise<ExtRecord<DriverType>>}
+     * @param opts - install options
      */
     async install({ driver, installType, packageName }) {
         return await super._install({
@@ -35,8 +28,7 @@ class DriverCliCommand extends extension_command_1.default {
     /**
      * Uninstall a driver
      *
-     * @param {DriverUninstallOpts} opts
-     * @return {Promise<ExtRecord<DriverType>>}
+     * @param opts - uninstall options
      */
     async uninstall({ driver }) {
         return await super._uninstall({ installSpec: driver });
@@ -44,8 +36,7 @@ class DriverCliCommand extends extension_command_1.default {
     /**
      * Update a driver
      *
-     * @param {DriverUpdateOpts} opts
-     * @return {Promise<import('./extension-command').ExtensionUpdateResult>}
+     * @param opts - update options
      */
     async update({ driver, unsafe }) {
         return await super._update({ installSpec: driver, unsafe });
@@ -53,8 +44,7 @@ class DriverCliCommand extends extension_command_1.default {
     /**
      * Run a script from a driver
      *
-     * @param {DriverRunOptions} opts
-     * @return {Promise<import('./extension-command').RunOutput>}
+     * @param opts - script execution options
      * @throws {Error} if the script fails to run
      */
     async run({ driver, scriptName, extraArgs }) {
@@ -68,8 +58,8 @@ class DriverCliCommand extends extension_command_1.default {
     /**
      * Runs doctor checks for the given driver.
      *
-     * @param {DriverDoctorOptions} opts
-     * @returns {Promise<number>} The amount of executed doctor checks.
+     * @param opts - doctor command options
+     * @returns The amount of executed doctor checks.
      * @throws {Error} If any of the mandatory Doctor checks fails.
      */
     async doctor({ driver }) {
@@ -78,9 +68,10 @@ class DriverCliCommand extends extension_command_1.default {
         });
     }
     /**
+     * Builds the success message displayed after a driver installation.
      *
-     * @param {import('./extension-command').ExtensionArgs} opts
-     * @returns {string}
+     * @param args - installed extension name and metadata
+     * @returns formatted success text
      */
     getPostInstallText({ extName, extData }) {
         return (`Driver ${extName}@${extData.version} successfully installed\n`.green +
@@ -93,8 +84,8 @@ class DriverCliCommand extends extension_command_1.default {
      * For any `package.json` fields which a driver requires, validate the type of
      * those fields on the `package.json` data, throwing an error if anything is
      * amiss.
-     * @param {import('appium/types').ExtMetadata<DriverType>} driverMetadata
-     * @param {string} installSpec
+     * @param driverMetadata - `appium` metadata from extension package
+     * @param installSpec - install spec from CLI
      */
     validateExtensionFields(driverMetadata, installSpec) {
         const missingFields = REQ_DRIVER_FIELDS.reduce((acc, field) => (driverMetadata[field] ? acc : [...acc, field]), []);
@@ -105,50 +96,4 @@ class DriverCliCommand extends extension_command_1.default {
     }
 }
 exports.default = DriverCliCommand;
-/**
- * @typedef {import('@appium/types').ExtensionType} ExtensionType
- * @typedef {import('@appium/types').DriverType} DriverType
- */
-/**
- * @template {ExtensionType} ExtType
- * @typedef {import('appium/types').ExtRecord<ExtType>} ExtRecord
- */
-/**
- * @typedef DriverCommandOptions
- * @property {import('../extension/extension-config').ExtensionConfig<DriverType>} config
- * @property {boolean} json
- */
-/**
- * Options for {@linkcode DriverCliCommand.install}
- * @typedef DriverInstallOpts
- * @property {string} driver - the name or spec of a driver to install
- * @property {InstallType} installType - how to install this driver. One of the INSTALL_TYPES
- * @property {string} [packageName] - for git/github installs, the driver node package name
- */
-/**
- * @typedef {import('appium/types').InstallType} InstallType
- */
-/**
- * Options for {@linkcode DriverCliCommand.uninstall}
- * @typedef DriverUninstallOpts
- * @property {string} driver - the name or spec of a driver to uninstall
- */
-/**
- * Options for {@linkcode DriverCliCommand.update}
- * @typedef DriverUpdateOpts
- * @property {string} driver - the name of the driver to update
- * @property {boolean} unsafe - if true, will perform unsafe updates past major revision boundaries
- */
-/**
- * Options for {@linkcode DriverCliCommand.run}.
- * @typedef DriverRunOptions
- * @property {string} driver - name of the driver to run a script from
- * @property {string} scriptName - name of the script to run
- * @property {string[]} [extraArgs] - arguments to pass to the script
- */
-/**
- * Options for {@linkcode DriverCliCommand.doctor}.
- * @typedef DriverDoctorOptions
- * @property {string} driver - name of the driver to run doctor checks for
- */
 //# sourceMappingURL=driver-command.js.map

package/build/lib/cli/driver-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"driver-command.js","sourceRoot":"","sources":["../../../lib/cli/driver-command.js"],"names":[],"mappings":";;;;;AAAA,oDAAuB;AACvB,4EAAsD;AACtD,4CAA2C;AAC3C,0BAAwB;AAExB,MAAM,iBAAiB,GAAG,CAAC,YAAY,EAAE,gBAAgB,EAAE,eAAe,EAAE,WAAW,CAAC,CAAC;AAEzF;;GAEG;AAEH,MAAqB,gBAAiB,SAAQ,2BAAmB;IAC/D;;OAEG;IACH,YAAY,EAAC,MAAM,EAAE,IAAI,EAAC;QACxB,KAAK,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAC;QACtB,IAAI,CAAC,eAAe,GAAG,yBAAa,CAAC;IACvC,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,OAAO,CAAC,EAAC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAC;QAC9C,OAAO,MAAM,KAAK,CAAC,QAAQ,CAAC;YAC1B,WAAW,EAAE,MAAM;YACnB,WAAW;YACX,WAAW;SACZ,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,SAAS,CAAC,EAAC,MAAM,EAAC;QACtB,OAAO,MAAM,KAAK,CAAC,UAAU,CAAC,EAAC,WAAW,EAAE,MAAM,EAAC,CAAC,CAAC;IACvD,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,MAAM,EAAC;QAC3B,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC,EAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC,CAAC;IAC5D,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAC;QACvC,OAAO,MAAM,KAAK,CAAC,IAAI,CAAC;YACtB,WAAW,EAAE,MAAM;YACnB,UAAU;YACV,SAAS;YACT,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,MAAM,CAAC,EAAC,MAAM,EAAC;QACnB,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC;YACzB,WAAW,EAAE,MAAM;SACpB,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,kBAAkB,CAAC,EAAC,OAAO,EAAE,OAAO,EAAC;QACnC,OAAO,CACL,UAAU,OAAO,IAAI,OAAO,CAAC,OAAO,2BAA2B,CAAC,KAAK;YACrE,qBAAqB,OAAO,CAAC,cAAc,CAAC,KAAK,IAAI;YACrD,oBAAoB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,CAClE,CAAC;IACJ,CAAC;IAED;;;;;;;;OAQG;IACH,uBAAuB,CAAC,cAAc,EAAE,WAAW;QACjD,MAAM,aAAa,GAAG,iBAAiB,CAAC,MAAM,CAC5C,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC,EAC/D,EAAE,CACH,CAAC;QAEF,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CACb,WAAW,WAAW,oDAAoD;gBACxE,gCAAgC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAClE,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AA3GD,mCA2GC;AAED;;;GAGG;AAEH;;;GAGG;AAEH;;;;GAIG;AAEH;;;;;;GAMG;AAEH;;GAEG;AAEH;;;;GAIG;AAEH;;;;;GAKG;AAEH;;;;;;GAMG;AAEH;;;;GAIG"}
+{"version":3,"file":"driver-command.js","sourceRoot":"","sources":["../../../lib/cli/driver-command.ts"],"names":[],"mappings":";;;;;AAAA,oDAAuB;AAEvB,4EAAsD;AAQtD,4CAA2C;AAC3C,0BAAwB;AAExB,MAAM,iBAAiB,GAAG,CAAC,YAAY,EAAE,gBAAgB,EAAE,eAAe,EAAE,WAAW,CAAC,CAAC;AAOzF,MAAqB,gBAAiB,SAAQ,2BAA6B;IACzE,YAAY,EAAC,MAAM,EAAE,IAAI,EAAoC;QAC3D,KAAK,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAC;QACtB,IAAI,CAAC,eAAe,GAAG,yBAAa,CAAC;IACvC,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,OAAO,CAAC,EAAC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAoB;QACjE,OAAO,MAAM,KAAK,CAAC,QAAQ,CAAC;YAC1B,WAAW,EAAE,MAAM;YACnB,WAAW;YACX,WAAW;SACZ,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,SAAS,CAAC,EAAC,MAAM,EAAsB;QAC3C,OAAO,MAAM,KAAK,CAAC,UAAU,CAAC,EAAC,WAAW,EAAE,MAAM,EAAC,CAAC,CAAC;IACvD,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,MAAM,EAAmB;QAC7C,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC,EAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC,CAAC;IAC5D,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAmB;QACzD,OAAO,MAAM,KAAK,CAAC,IAAI,CAAC;YACtB,WAAW,EAAE,MAAM;YACnB,UAAU;YACV,SAAS;YACT,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,MAAM,CAAC,EAAC,MAAM,EAAsB;QACxC,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC;YACzB,WAAW,EAAE,MAAM;SACpB,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACM,kBAAkB,CAAC,EAAC,OAAO,EAAE,OAAO,EAA0B;QACrE,OAAO,CACL,UAAU,OAAO,IAAI,OAAO,CAAC,OAAO,2BAA2B,CAAC,KAAK;YACrE,qBAAqB,OAAO,CAAC,cAAc,CAAC,KAAK,IAAI;YACrD,oBAAoB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,CAClE,CAAC;IACJ,CAAC;IAED;;;;;;;;OAQG;IACM,uBAAuB,CAAC,cAAqC,EAAE,WAAmB;QACzF,MAAM,aAAa,GAAG,iBAAiB,CAAC,MAAM,CAC5C,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC,EAC/D,EAAE,CACH,CAAC;QAEF,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CACb,WAAW,WAAW,oDAAoD;gBACxE,gCAAgC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAClE,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AArGD,mCAqGC"}