appium 2.0.0-beta.25 → 2.0.0-beta.28

package/lib/cli/args.js

@@ -1,22 +1,21 @@
-// @ts-check
 
 // @ts-ignore
 import _ from 'lodash';
-import DriverConfig from '../driver-config';
-import { APPIUM_HOME, DRIVER_TYPE, INSTALL_TYPES, PLUGIN_TYPE } from '../extension-config';
-import PluginConfig from '../plugin-config';
+import { DRIVER_TYPE, PLUGIN_TYPE, EXT_SUBCOMMAND_INSTALL, EXT_SUBCOMMAND_LIST, EXT_SUBCOMMAND_RUN, EXT_SUBCOMMAND_UNINSTALL, EXT_SUBCOMMAND_UPDATE } from '../constants';
+import { INSTALL_TYPES } from '../extension/extension-config';
 import { toParserArgs } from '../schema/cli-args';
-
 const DRIVER_EXAMPLE = 'xcuitest';
 const PLUGIN_EXAMPLE = 'find_by_image';
-const USE_ALL_PLUGINS = 'all';
+
+/**
+ * This is necessary because we pass the array into `argparse`. `argparse` is bad and mutates things. We don't want that.
+ * Bad `argparse`! Bad!
+ */
+const INSTALL_TYPES_ARRAY = [...INSTALL_TYPES];
 
 /** @type {Set<ExtensionType>} */
 const EXTENSION_TYPES = new Set([DRIVER_TYPE, PLUGIN_TYPE]);
 
-const driverConfig = DriverConfig.getInstance(APPIUM_HOME);
-const pluginConfig = PluginConfig.getInstance(APPIUM_HOME);
-
 // this set of args works for both drivers and plugins ('extensions')
 /** @type {ArgumentDefinitions} */
 const globalExtensionArgs = new Map([
@@ -32,18 +31,18 @@ const globalExtensionArgs = new Map([
 /**
  * Builds a Record of extension types to a Record of subcommands to their argument definitions
  */
-const getExtensionArgs = _.once(function getExtensionArgs () {
+const getExtensionArgs = _.memoize(function getExtensionArgs () {
   const extensionArgs = {};
   for (const type of EXTENSION_TYPES) {
     extensionArgs[type] = {
-      list: makeListArgs(type),
-      install: makeInstallArgs(type),
-      uninstall: makeUninstallArgs(type),
-      update: makeUpdateArgs(type),
-      run: makeRunArgs(type),
+      [EXT_SUBCOMMAND_LIST]: makeListArgs(type),
+      [EXT_SUBCOMMAND_INSTALL]: makeInstallArgs(type),
+      [EXT_SUBCOMMAND_UNINSTALL]: makeUninstallArgs(type),
+      [EXT_SUBCOMMAND_UPDATE]: makeUpdateArgs(type),
+      [EXT_SUBCOMMAND_RUN]: makeRunArgs(type),
     };
   }
-  return /** @type {Record<ExtensionType, Record<string,ArgumentDefinitions[]>>} */ (extensionArgs);
+  return /** @type {Record<ExtensionType, Record<import('../../types/cli').CliExtensionSubcommand,ArgumentDefinitions>>} */(extensionArgs);
 });
 
 /**
@@ -87,9 +86,9 @@ function makeInstallArgs (type) {
     [['--source'], {
       required: false,
       default: null,
-      choices: INSTALL_TYPES,
+      choices: INSTALL_TYPES_ARRAY,
       help: `Where to look for the ${type} if it is not one of Appium's verified ` +
-            `${type}s. Possible values: ${INSTALL_TYPES.join(', ')}`,
+            `${type}s. Possible values: ${INSTALL_TYPES_ARRAY.join(', ')}`,
       dest: 'installType'
     }],
     [['--package'], {
@@ -227,16 +226,12 @@ const serverArgsDisallowedInConfig = new Map([
 
 export {
   getServerArgs,
-  getExtensionArgs,
-  USE_ALL_PLUGINS,
-  driverConfig,
-  pluginConfig,
-  APPIUM_HOME
+  getExtensionArgs
 };
 
 /**
  * Alias
- * @typedef {import('../ext-config-io').ExtensionType} ExtensionType
+ * @typedef {import('../extension/manifest').ExtensionType} ExtensionType
  */
 
 /**

package/lib/cli/driver-command.js

@@ -1,31 +1,36 @@
 import _ from 'lodash';
 import ExtensionCommand from './extension-command';
-import { DRIVER_TYPE } from '../extension-config';
-import { KNOWN_DRIVERS } from '../drivers';
+import { KNOWN_DRIVERS } from '../constants';
+import '@colors/colors';
 
 const REQ_DRIVER_FIELDS = ['driverName', 'automationName', 'platformNames', 'mainClass'];
-
+/**
+ * @extends {ExtensionCommand<import('../extension/manifest').DriverType>}
+ */
 export default class DriverCommand extends ExtensionCommand {
 
+  /**
+   * @param {DriverCommandOptions} opts
+   */
   constructor ({config, json}) {
-    super({config, json, type: DRIVER_TYPE});
+    super({config, json});
     this.knownExtensions = KNOWN_DRIVERS;
   }
 
   async install ({driver, installType, packageName}) {
-    return await super.install({ext: driver, installType, packageName});
+    return await super._install({ext: driver, installType, packageName});
   }
 
   async uninstall ({driver}) {
-    return await super.uninstall({ext: driver});
+    return await super._uninstall({ext: driver});
   }
 
   async update ({driver, unsafe}) {
-    return await super.update({ext: driver, unsafe});
+    return await super._update({ext: driver, unsafe});
   }
 
   async run ({driver, scriptName}) {
-    return await super.run({ext: driver, scriptName});
+    return await super._run({ext: driver, scriptName});
   }
 
   getPostInstallText ({extName, extData}) {
@@ -47,3 +52,9 @@ export default class DriverCommand extends ExtensionCommand {
   }
 
 }
+
+/**
+ * @typedef DriverCommandOptions
+ * @property {import('../extension/extension-config').ExtensionConfig<import('../extension/manifest').DriverType>} config
+ * @property {boolean} json
+ */