appium 2.0.0-beta.40 → 2.0.0-beta.43

package/lib/cli/args.js

@@ -1,4 +1,3 @@
-// @ts-ignore
 import _ from 'lodash';
 import {
   DRIVER_TYPE,
@@ -215,8 +214,8 @@ function makeRunArgs(type) {
         default: null,
         type: 'str',
         help:
-          `Name of the script to run from the ${type}. The script name must be cached ` +
-          `inside the "scripts" field under "appium" inside the ${type}'s "package.json" file`,
+          `Name of the script to run from the ${type}. The script name must be a key ` +
+          `inside the "appium.scripts" field inside the ${type}'s "package.json" file`,
       },
     ],
   ]);
@@ -280,8 +279,7 @@ const serverArgsDisallowedInConfig = new Map([
 export {getServerArgs, getExtensionArgs};
 
 /**
- * Alias
- * @typedef {import('../extension/manifest').ExtensionType} ExtensionType
+ * @typedef {import('@appium/types').ExtensionType} ExtensionType
  */
 
 /**

package/lib/cli/driver-command.js

@@ -33,8 +33,8 @@ export default class DriverCommand extends ExtensionCommand {
     return await super._update({installSpec: driver, unsafe});
   }
 
-  async run({driver, scriptName}) {
-    return await super._run({installSpec: driver, scriptName});
+  async run({driver, scriptName, extraArgs}) {
+    return await super._run({installSpec: driver, scriptName, extraArgs});
   }
 
   getPostInstallText({extName, extData}) {

package/lib/cli/extension-command.js

@@ -628,7 +628,7 @@ class ExtensionCommand {
    * @param {RunOptions} opts
    * @return {Promise<RunOutput>}
    */
-  async _run({installSpec, scriptName}) {
+  async _run({installSpec, scriptName, extraArgs = []}) {
     if (!this.config.isInstalled(installSpec)) {
       throw this._createFatalError(`The ${this.type} "${installSpec}" is not installed`);
     }
@@ -657,7 +657,7 @@ class ExtensionCommand {
       );
     }
 
-    const runner = new SubProcess(process.execPath, [extScripts[scriptName]], {
+    const runner = new SubProcess(process.execPath, [extScripts[scriptName], ...extraArgs], {
       cwd: this.config.getInstallPath(installSpec),
     });
 
@@ -755,6 +755,7 @@ export {ExtensionCommand};
  * @typedef RunOptions
  * @property {string} installSpec - name of the extension to run a script from
  * @property {string} scriptName - name of the script to run
+ * @property {string[]} [extraArgs] - arguments to pass to the script
  */
 
 /**

package/lib/cli/extension.js

@@ -15,9 +15,9 @@ export const commandClasses = Object.freeze(
  * Run a subcommand of the 'appium driver' type. Each subcommand has its own set of arguments which
  * can be represented as a JS object.
  *
- * @param {Object} args - JS object where the key is the parameter name (as defined in
+ * @param {import('appium/types').Args<import('appium/types').WithExtSubcommand>} args - JS object where the key is the parameter name (as defined in
  * driver-parser.js)
- * @template {import('../extension/manifest').ExtensionType} ExtType
+ * @template {ExtensionType} ExtType
  * @param {import('../extension/extension-config').ExtensionConfig<ExtType>} config - Extension config object
  */
 async function runExtensionCommand(args, config) {
@@ -30,6 +30,7 @@ async function runExtensionCommand(args, config) {
     throw new TypeError(`Cannot call ${type} command without a subcommand like 'install'`);
   }
   let {json, suppressOutput} = args;
+  json = Boolean(json);
   if (suppressOutput) {
     json = true;
   }
@@ -56,6 +57,17 @@ async function runExtensionCommand(args, config) {
 export {runExtensionCommand};
 
 /**
- * @template {import('@appium/types').ExtensionType} ExtType
- * @typedef {ExtType extends import('@appium/types').DriverType ? import('@appium/types').Class<DriverCommand> : ExtType extends import('@appium/types').PluginType ? import('@appium/types').Class<PluginCommand> : never} ExtCommand
+ * @template {ExtensionType} ExtType
+ * @typedef {ExtType extends DriverType ? Class<DriverCommand> : ExtType extends PluginType ? Class<PluginCommand> : never} ExtCommand
+ */
+
+/**
+ * @typedef {import('@appium/types').ExtensionType} ExtensionType
+ * @typedef {import('@appium/types').DriverType} DriverType
+ * @typedef {import('@appium/types').PluginType} PluginType
+ */
+
+/**
+ * @template T
+ * @typedef {import('@appium/types').Class<T>} Class
  */

package/lib/cli/parser.js

@@ -7,6 +7,8 @@ import {finalizeSchema, getArgSpec, hasArgSpec} from '../schema';
 import {rootDir} from '../config';
 import {getExtensionArgs, getServerArgs} from './args';
 
+export const EXTRA_ARGS = 'extraArgs';
+
 /**
  * If the parsed args do not contain any of these values, then we
  * will automatially inject the `server` subcommand.
@@ -97,8 +99,17 @@ class ArgParser {
     }
 
     try {
-      const parsed = this.parser.parse_args(args);
-      return ArgParser._transformParsedArgs(parsed);
+      const parsed = this.parser.parse_known_args(args);
+      const [knownArgs, unknownArgs] = parsed;
+      if (
+        unknownArgs?.length &&
+        (knownArgs.driverCommand === 'run' || knownArgs.pluginCommand === 'run')
+      ) {
+        return ArgParser._transformParsedArgs(knownArgs, unknownArgs);
+      } else if (unknownArgs?.length) {
+        throw new Error(`[ERROR] Unrecognized arguments: ${unknownArgs.join(' ')}`);
+      }
+      return ArgParser._transformParsedArgs(knownArgs);
     } catch (err) {
       if (this.debug) {
         throw err;
@@ -123,10 +134,11 @@ class ArgParser {
    *
    * E.g., `{'driver-foo-bar': baz}` becomes `{driver: {foo: {bar: 'baz'}}}`
    * @param {object} args
+   * @param {string[]} [unknownArgs]
    * @returns {object}
    */
-  static _transformParsedArgs(args) {
-    return _.reduce(
+  static _transformParsedArgs(args, unknownArgs = []) {
+    const result = _.reduce(
       args,
       (unpacked, value, key) => {
         if (!_.isUndefined(value) && hasArgSpec(key)) {
@@ -140,6 +152,8 @@ class ArgParser {
       },
       {}
     );
+    result[EXTRA_ARGS] = unknownArgs;
+    return result;
   }
 
   /**
@@ -183,7 +197,7 @@ class ArgParser {
    * @param {import('argparse').SubParser} subParsers
    */
   static _addExtensionCommandsToParser(subParsers) {
-    for (const type of [DRIVER_TYPE, PLUGIN_TYPE]) {
+    for (const type of /** @type {[DriverType, PluginType]} */ ([DRIVER_TYPE, PLUGIN_TYPE])) {
       const extParser = subParsers.add_parser(type, {
         add_help: true,
         help: `Access the ${type} management CLI commands`,
@@ -195,6 +209,9 @@ class ArgParser {
         dest: `${type}Command`,
       });
       const extensionArgs = getExtensionArgs();
+      /**
+       * @type { {command: import('appium/types').CliExtensionSubcommand, args: import('./args').ArgumentDefinitions, help: string}[] }
+       */
       const parserSpecs = [
         {
           command: 'list',
@@ -254,3 +271,8 @@ function getParser(debug) {
 }
 
 export {getParser, ArgParser};
+
+/**
+ * @typedef {import('@appium/types').DriverType} DriverType
+ * @typedef {import('@appium/types').PluginType} PluginType
+ */

package/lib/cli/plugin-command.js

@@ -33,8 +33,8 @@ export default class PluginCommand extends ExtensionCommand {
     return await super._update({installSpec: plugin, unsafe});
   }
 
-  async run({plugin, scriptName}) {
-    return await super._run({installSpec: plugin, scriptName});
+  async run({plugin, scriptName, extraArgs}) {
+    return await super._run({installSpec: plugin, scriptName, extraArgs});
   }
 
   getPostInstallText({extName, extData}) {

package/lib/config-file.js

@@ -161,7 +161,9 @@ export function normalizeConfig(config) {
 
     return _.mapValues(mappedObj, (value, property) => {
       const nextSection = section ? `${section}.${property}` : property;
-      return isSchemaTypeObject(value) ? normalize(config, nextSection) : value;
+      return isSchemaTypeObject(schema.properties?.[property])
+        ? normalize(config, nextSection)
+        : value;
     });
   };
 
@@ -169,7 +171,7 @@ export function normalizeConfig(config) {
    * 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);
+  const isSchemaTypeObject = (schema) => Boolean(schema?.properties || schema?.type === 'object');
 
   return normalize(config);
 }

package/lib/config.js

@@ -3,7 +3,6 @@ import _ from 'lodash';
 import {system, fs} from '@appium/support';
 import axios from 'axios';
 import {exec} from 'teen_process';
-import logger from './logger';
 import semver from 'semver';
 import findUp from 'find-up';
 import {getDefaultsForSchema, getAllArgSpecs} from './schema/schema';
@@ -12,6 +11,7 @@ const npmPackage = fs.readPackageJsonFrom(__dirname);
 
 const APPIUM_VER = npmPackage.version;
 const MIN_NODE_VERSION = npmPackage.engines.node;
+const MIN_NPM_VERSION = npmPackage.engines.npm;
 
 const GIT_META_ROOT = '.git';
 const GIT_BINARY = `git${system.isWindows() ? '.exe' : ''}`;
@@ -28,15 +28,27 @@ function getNodeVersion() {
   return /** @type {import('semver').SemVer} */ (semver.coerce(process.version));
 }
 
+/**
+ * Returns version of `npm`
+ * @returns {Promise<string>}
+ */
+async function getNpmVersion() {
+  const {stdout} = await exec(system.isWindows() ? 'npm.cmd' : 'npm', ['--version']);
+  return stdout.trim();
+}
+
+/**
+ * @param {boolean} [useGithubApiFallback]
+ */
 async function updateBuildInfo(useGithubApiFallback = false) {
   const sha = await getGitRev(useGithubApiFallback);
   if (!sha) {
     return;
   }
   BUILD_INFO['git-sha'] = sha;
-  const built = await getGitTimestamp(sha, useGithubApiFallback);
-  if (built) {
-    BUILD_INFO.built = built;
+  const buildTimestamp = await getGitTimestamp(sha, useGithubApiFallback);
+  if (buildTimestamp) {
+    BUILD_INFO.built = buildTimestamp;
   }
 }
 
@@ -51,6 +63,10 @@ async function findGitRoot() {
   return await findUp(GIT_META_ROOT, {cwd: rootDir, type: 'directory'});
 }
 
+/**
+ * @param {boolean} [useGithubApiFallback]
+ * @returns {Promise<string?>}
+ */
 async function getGitRev(useGithubApiFallback = false) {
   const gitRoot = await findGitRoot();
   if (gitRoot) {
@@ -66,21 +82,16 @@ async function getGitRev(useGithubApiFallback = false) {
     return null;
   }
 
+  // If the package folder is not a valid git repository
+  // then fetch the corresponding tag info from GitHub
   try {
-    const resBodyObj = (
-      await axios.get(`${GITHUB_API}/tags`, {
+    return (
+      await axios.get(`${GITHUB_API}/git/refs/tags/appium@${APPIUM_VER}`, {
         headers: {
           'User-Agent': `Appium ${APPIUM_VER}`,
         },
       })
-    ).data;
-    if (_.isArray(resBodyObj)) {
-      for (const {name, commit} of resBodyObj) {
-        if (name === `v${APPIUM_VER}` && commit && commit.sha) {
-          return commit.sha;
-        }
-      }
-    }
+    ).data?.object?.sha;
   } catch (ign) {}
   return null;
 }
@@ -106,21 +117,13 @@ async function getGitTimestamp(commitSha, useGithubApiFallback = false) {
   }
 
   try {
-    const resBodyObj = (
-      await axios.get(`${GITHUB_API}/commits/${commitSha}`, {
+    return (
+      await axios.get(`${GITHUB_API}/git/tags/${commitSha}`, {
         headers: {
           'User-Agent': `Appium ${APPIUM_VER}`,
         },
       })
-    ).data;
-    if (resBodyObj && resBodyObj.commit) {
-      if (resBodyObj.commit.committer && resBodyObj.commit.committer.date) {
-        return resBodyObj.commit.committer.date;
-      }
-      if (resBodyObj.commit.author && resBodyObj.commit.author.date) {
-        return resBodyObj.commit.author.date;
-      }
-    }
+    ).data?.tagger?.date;
   } catch (ign) {}
   return null;
 }
@@ -139,7 +142,18 @@ function getBuildInfo() {
 function checkNodeOk() {
   const version = getNodeVersion();
   if (!semver.satisfies(version, MIN_NODE_VERSION)) {
-    logger.errorAndThrow(`Node version must be ${MIN_NODE_VERSION}. Currently ${version.version}`);
+    throw new Error(
+      `Node version must be at least ${MIN_NODE_VERSION}; current is ${version.version}`
+    );
+  }
+}
+
+export async function checkNpmOk() {
+  const npmVersion = await getNpmVersion();
+  if (!semver.satisfies(npmVersion, MIN_NPM_VERSION)) {
+    throw new Error(
+      `npm version must be at least ${MIN_NPM_VERSION}; current is ${npmVersion}. Run "npm install -g npm" to upgrade.`
+    );
   }
 }
 

package/lib/extension/extension-config.js

@@ -203,11 +203,9 @@ export class ExtensionConfig {
 
     if (!_.isEmpty(errorSummaries)) {
       log.error(
-        `Appium encountered ${util.pluralize(
-          'error',
-          errorSummaries.length,
-          true
-        )} while validating ${this.configKey} found in manifest ${this.manifestPath}`
+        `Appium encountered ${util.pluralize('error', errorMap.size, true)} while validating ${
+          this.configKey
+        } found in manifest ${this.manifestPath}`
       );
       for (const summary of errorSummaries) {
         log.error(summary);
@@ -219,7 +217,7 @@ export class ExtensionConfig {
         log.warn(
           `Appium encountered ${util.pluralize(
             'warning',
-            warningSummaries.length,
+            warningMap.size,
             true
           )} while validating ${this.configKey} found in manifest ${this.manifestPath}`
         );

package/lib/main.js

@@ -19,6 +19,7 @@ import {
   showBuildInfo,
   validateTmpDir,
   warnNodeDeprecations,
+  checkNpmOk,
 } from './config';
 import {readConfigFile} from './config-file';
 import {loadExtensions, getActivePlugins, getActiveDrivers} from './extension';
@@ -37,6 +38,7 @@ const {resolveAppiumHome} = env;
 async function preflightChecks(args, throwInsteadOfExit = false) {
   try {
     checkNodeOk();
+    await checkNpmOk();
     if (args.longStacktrace) {
       require('longjohn').async_trace_limit = -1;
     }
@@ -207,20 +209,7 @@ async function init(args) {
   // 1. command line args
   // 2. config file
   // 3. defaults from config file.
-  if (!areServerCommandArgs(preConfigArgs)) {
-    // if the user has requested the 'driver' CLI, don't run the normal server,
-    // but instead pass control to the driver CLI
-    if (preConfigArgs.subcommand === DRIVER_TYPE) {
-      await runExtensionCommand(preConfigArgs, driverConfig);
-      return {};
-    }
-    if (preConfigArgs.subcommand === PLUGIN_TYPE) {
-      await runExtensionCommand(preConfigArgs, pluginConfig);
-      return {};
-    }
-    /* istanbul ignore next */
-    return {}; // should never happen
-  } else {
+  if (areServerCommandArgs(preConfigArgs)) {
     const defaults = getDefaultsForSchema(false);
 
     /** @type {ParsedArgs} */
@@ -267,6 +256,22 @@ async function init(args) {
       driverConfig,
       pluginConfig,
     });
+  } else {
+    const extensionCommandArgs = /** @type {Args<import('appium/types').WithExtSubcommand>} */ (
+      preConfigArgs
+    );
+    // if the user has requested the 'driver' CLI, don't run the normal server,
+    // but instead pass control to the driver CLI
+    if (preConfigArgs.subcommand === DRIVER_TYPE) {
+      await runExtensionCommand(extensionCommandArgs, driverConfig);
+      return {};
+    }
+    if (preConfigArgs.subcommand === PLUGIN_TYPE) {
+      await runExtensionCommand(extensionCommandArgs, pluginConfig);
+      return {};
+    }
+    /* istanbul ignore next */
+    return {}; // should never happen
   }
 }
 
@@ -299,6 +304,7 @@ async function main(args) {
   const serverUpdaters = getServerUpdaters(driverClasses, pluginClasses);
   const extraMethodMap = getExtraMethodMap(driverClasses, pluginClasses);
 
+  /** @type {import('@appium/base-driver').ServerOpts} */
   const serverOpts = {
     routeConfiguringFunction,
     port: parsedArgs.port,
@@ -307,6 +313,7 @@ async function main(args) {
     basePath: parsedArgs.basePath,
     serverUpdaters,
     extraMethodMap,
+    cliArgs: parsedArgs,
   };
   if (parsedArgs.keepAliveTimeout) {
     serverOpts.keepAliveTimeout = parsedArgs.keepAliveTimeout * 1000;

package/lib/schema/arg-spec.js

@@ -225,5 +225,5 @@ export class ArgSpec {
  */
 
 /**
- * @typedef {import('../extension/manifest').ExtensionType} ExtensionType
+ * @typedef {import('@appium/types').ExtensionType} ExtensionType
  */

package/lib/schema/schema.js

@@ -680,7 +680,7 @@ export const {isAllowedSchemaFileExtension} = AppiumSchema;
  */
 
 /**
- * @typedef {import('../extension/manifest').ExtensionType} ExtensionType
+ * @typedef {import('@appium/types').ExtensionType} ExtensionType
  */
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium",
-  "version": "2.0.0-beta.40",
+  "version": "2.0.0-beta.43",
   "description": "Automation for Apps.",
   "keywords": [
     "automation",
@@ -49,33 +49,43 @@
     "dev:docs": "npm run build:docs:assets && npm run dev:docs:en",
     "dev:docs:en": "mkdocs serve -f ./docs/mkdocs-en.yml",
     "dev:docs:ja": "mkdocs serve -f ./docs/mkdocs-ja.yml",
+    "dev:docs:zh": "mkdocs serve -f ./docs/mkdocs-zh.yml",
     "fix": "npm run lint -- --fix",
     "postinstall": "node ./scripts/autoinstall-extensions.js",
     "lint": "eslint -c ../../.eslintrc --ignore-path ../../.eslintignore .",
     "prepare": "npm run build",
-    "publish:docs": "APPIUM_DOCS_PUBLISH=1 npm run build:docs",
+    "publish:docs": "cross-env APPIUM_DOCS_PUBLISH=1 npm run build:docs",
     "test": "npm run test:unit",
-    "test:e2e": "mocha --timeout 75s --slow 30s \"./test/e2e/**/*.spec.js\"",
+    "test:e2e": "mocha --timeout 1m --slow 30s \"./test/e2e/**/*.spec.js\"",
+    "test:smoke": "cross-env APPIUM_HOME=./local_appium_home node ./index.js driver install uiautomator2 && cross-env APPIUM_HOME=./local_appium_home node ./index.js driver list",
     "test:unit": "mocha \"./test/unit/**/*.spec.js\""
   },
   "dependencies": {
-    "@appium/base-driver": "^8.5.7",
-    "@appium/base-plugin": "^1.9.2",
-    "@appium/docutils": "^0.0.7",
-    "@appium/schema": "^0.0.7",
-    "@appium/support": "^2.59.2",
-    "@appium/test-support": "^1.3.22",
-    "@babel/runtime": "7.18.3",
+    "@appium/base-driver": "^8.7.0",
+    "@appium/base-plugin": "^1.10.2",
+    "@appium/docutils": "^0.0.10",
+    "@appium/schema": "^0.0.9",
+    "@appium/support": "^2.59.5",
+    "@appium/test-support": "^1.5.0",
+    "@appium/types": "^0.4.0",
+    "@babel/runtime": "7.18.9",
     "@sidvind/better-ajv-errors": "2.0.0",
+    "@types/argparse": "2.0.10",
+    "@types/bluebird": "3.5.36",
+    "@types/fancy-log": "2.0.0",
+    "@types/semver": "7.3.10",
+    "@types/teen_process": "1.16.1",
+    "@types/wrap-ansi": "3.0.0",
     "ajv": "8.11.0",
     "ajv-formats": "2.1.1",
     "argparse": "2.0.1",
-    "async-lock": "1.3.1",
+    "async-lock": "1.3.2",
     "asyncbox": "2.9.2",
     "axios": "0.27.2",
     "bluebird": "3.7.2",
+    "cross-env": "7.0.3",
     "find-up": "5.0.0",
-    "lilconfig": "2.0.5",
+    "lilconfig": "2.0.6",
     "lodash": "4.17.21",
     "longjohn": "0.2.12",
     "npmlog": "6.0.2",
@@ -84,19 +94,19 @@
     "resolve-from": "5.0.0",
     "semver": "7.3.7",
     "source-map-support": "0.5.21",
-    "supports-color": "8.1.1",
     "teen_process": "1.16.0",
-    "winston": "3.7.2",
-    "word-wrap": "1.2.3",
+    "type-fest": "2.18.0",
+    "winston": "3.8.1",
+    "wrap-ansi": "7.0.0",
     "yaml": "2.1.1"
   },
   "engines": {
     "node": ">=14",
-    "npm": ">=6"
+    "npm": ">=8"
   },
   "publishConfig": {
     "access": "public",
     "tag": "next"
   },
-  "gitHead": "4cf2cc92d066ed32adda27e0439547290a4b71ce"
+  "gitHead": "c58f32441daba3aae9768a57d0a412fe92f4b587"
 }

package/scripts/autoinstall-extensions.js

@@ -28,11 +28,17 @@ let PLUGIN_TYPE;
 let loadExtensions;
 
 const {env, util, logger} = require('@appium/support');
+const _ = require('lodash');
+const wrap = _.partial(
+  require('wrap-ansi'),
+  _,
+  process.stderr.columns ?? process.stdout.columns ?? 25
+);
 
 const ora = require('ora');
 
 const log = (message) => {
-  console.error(`[Appium] ${message}`);
+  console.error(wrap(`[Appium] ${message}`));
 };
 
 const spinner = ora({
@@ -59,7 +65,8 @@ try {
 }
 
 async function main() {
-  if (await env.hasAppiumDependency()) {
+  // if we're doing `npm install -g appium` then we will assume we don't have a local appium.
+  if (!process.env.npm_config_global && (await env.hasAppiumDependency())) {
     log(`Found local Appium installation; skipping automatic installation of extensions.`);
     return;
   }
@@ -74,7 +81,8 @@ async function main() {
 
   if (!driverEnv && !pluginEnv) {
     spinner.succeed(
-      'No drivers or plugins to automatically install. If desired, provide arguments with comma-separated values "--drivers=<known_driver>[,known_driver...]" and/or "--plugins=<known_plugin>[,known_plugin...]" to the "npm install appium" command. The specified extensions will be installed automatically with Appium.  Note: to see the list of known extensions, run "appium <driver|plugin> list".'
+      wrap(`No drivers or plugins to automatically install. 
+      If desired, provide arguments with comma-separated values "--drivers=<known_driver>[,known_driver...]" and/or "--plugins=<known_plugin>[,known_plugin...]" to the "npm install appium" command. The specified extensions will be installed automatically with Appium.  Note: to see the list of known extensions, run "appium <driver|plugin> list".`)
     );
     return;
   }

package/test.d.ts

@@ -0,0 +1,7 @@
+export * from '@appium/test-support';
+/**
+ * @typedef {import('@appium/test-support').SessionHelpers} SessionHelpers
+ */
+/**
+ * @typedef {import('@appium/test-support').E2ESetupOpts} E2ESetupOpts
+ */

package/test.js

@@ -0,0 +1,13 @@
+'use strict';
+
+// @ts-check
+
+/**
+ * This module is here to re-export `@appium/test-support` for Appium extensions.
+ *
+ * @see https://npm.im/@appium/test-support
+ * @example
+ * const { getPort } = require('appium/test');
+ */
+
+module.exports = require('@appium/test-support');

package/types/cli.ts

@@ -1,18 +1,7 @@
 import {ServerArgs} from '@appium/types';
-import type {
-  DRIVER_TYPE as DRIVER_SUBCOMMAND,
-  EXT_SUBCOMMAND_INSTALL,
-  EXT_SUBCOMMAND_LIST,
-  EXT_SUBCOMMAND_RUN,
-  EXT_SUBCOMMAND_UNINSTALL,
-  EXT_SUBCOMMAND_UPDATE,
-  PLUGIN_TYPE as PLUGIN_SUBCOMMAND,
-  SERVER_SUBCOMMAND,
-} from '../lib/constants';
-
-export type ServerSubcommand = typeof SERVER_SUBCOMMAND;
-export type DriverSubcommand = typeof DRIVER_SUBCOMMAND;
-export type PluginSubcommand = typeof PLUGIN_SUBCOMMAND;
+export type ServerSubcommand = 'server';
+export type DriverSubcommand = 'driver';
+export type PluginSubcommand = 'plugin';
 
 /**
  * Possible subcommands for the `appium` CLI.
@@ -24,11 +13,11 @@ export type CliSubcommand = ServerSubcommand | DriverSubcommand | PluginSubcomma
  * {@linkcode PluginSubcommand}.
  */
 export type CliExtensionSubcommand =
-  | typeof EXT_SUBCOMMAND_INSTALL
-  | typeof EXT_SUBCOMMAND_LIST
-  | typeof EXT_SUBCOMMAND_RUN
-  | typeof EXT_SUBCOMMAND_UPDATE
-  | typeof EXT_SUBCOMMAND_UNINSTALL;
+  | 'install'
+  | 'list'
+  | 'run'
+  | 'uninstall'
+  | 'update';
 
 /**
  * Random stuff that may appear in the parsed args which has no equivalent in a
@@ -103,6 +92,21 @@ export interface ExtArgs extends WithExtSubcommand {
    * Subcommands of `plugin` subcommand
    */
   pluginCommand?: CliExtensionSubcommand;
+
+  /**
+   * Output JSON instead of human-readable text
+   */
+  json?: boolean;
+
+  /**
+   * Output nothing
+   */
+  suppressOutput?: boolean;
+
+  /**
+   * Extra args to pass to extension scripts
+   */
+  extraArgs?: string[];
 }
 
 /**