appium 2.0.0-beta.21 → 2.0.0-beta.22

package/build/test/utils-specs.js

@@ -0,0 +1,266 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+require("source-map-support/register");
+
+var _utils = require("../lib/utils");
+
+var _helpers = require("./helpers");
+
+var _lodash = _interopRequireDefault(require("lodash"));
+
+describe('utils', function () {
+  describe('parseCapsForInnerDriver()', function () {
+    it('should return an error if only JSONWP provided', function () {
+      let {
+        error,
+        protocol
+      } = (0, _utils.parseCapsForInnerDriver)(_helpers.BASE_CAPS);
+      protocol.should.equal('W3C');
+      error.message.should.match(/W3C/);
+    });
+    it('should return W3C caps unchanged if only W3C caps were provided', function () {
+      let {
+        desiredCaps,
+        processedJsonwpCapabilities,
+        processedW3CCapabilities,
+        protocol
+      } = (0, _utils.parseCapsForInnerDriver)(undefined, _helpers.W3C_CAPS);
+      desiredCaps.should.deep.equal(_helpers.BASE_CAPS);
+      should.not.exist(processedJsonwpCapabilities);
+      processedW3CCapabilities.should.deep.equal(_helpers.W3C_CAPS);
+      protocol.should.equal('W3C');
+    });
+    it('should return JSONWP and W3C caps if both were provided', function () {
+      let {
+        desiredCaps,
+        processedJsonwpCapabilities,
+        processedW3CCapabilities,
+        protocol
+      } = (0, _utils.parseCapsForInnerDriver)(_helpers.BASE_CAPS, _helpers.W3C_CAPS);
+      desiredCaps.should.deep.equal(_helpers.BASE_CAPS);
+      processedJsonwpCapabilities.should.deep.equal(_helpers.BASE_CAPS);
+      processedW3CCapabilities.should.deep.equal(_helpers.W3C_CAPS);
+      protocol.should.equal('W3C');
+    });
+    it('should include default capabilities in results', function () {
+      const defaultW3CCaps = {
+        'appium:foo': 'bar',
+        'appium:baz': 'bla'
+      };
+      const expectedDefaultCaps = {
+        foo: 'bar',
+        baz: 'bla'
+      };
+      const {
+        desiredCaps,
+        processedJsonwpCapabilities,
+        processedW3CCapabilities
+      } = (0, _utils.parseCapsForInnerDriver)(_helpers.BASE_CAPS, _helpers.W3C_CAPS, {}, defaultW3CCaps);
+      desiredCaps.should.deep.equal({ ...expectedDefaultCaps,
+        ..._helpers.BASE_CAPS
+      });
+      processedJsonwpCapabilities.should.deep.equal({ ...expectedDefaultCaps,
+        ..._helpers.BASE_CAPS
+      });
+      processedW3CCapabilities.alwaysMatch.should.deep.equal({ ...(0, _utils.insertAppiumPrefixes)(expectedDefaultCaps),
+        ...(0, _utils.insertAppiumPrefixes)(_helpers.BASE_CAPS)
+      });
+    });
+    it('should allow valid default capabilities', function () {
+      const res = (0, _utils.parseCapsForInnerDriver)(null, _helpers.W3C_CAPS, {}, {
+        'appium:foo': 'bar2'
+      });
+      res.processedW3CCapabilities.alwaysMatch['appium:foo'].should.eql('bar2');
+    });
+    it('should not allow invalid default capabilities', function () {
+      const res = (0, _utils.parseCapsForInnerDriver)(null, _helpers.W3C_CAPS, {}, {
+        foo: 'bar',
+        'appium:foo2': 'bar2'
+      });
+      res.error.should.eql({
+        jsonwpCode: 61,
+        error: 'invalid argument',
+        w3cStatus: 400,
+        _stacktrace: null
+      });
+    });
+    it('should reject if W3C caps are not passing constraints', function () {
+      const err = (0, _utils.parseCapsForInnerDriver)(undefined, _helpers.W3C_CAPS, {
+        hello: {
+          presence: true
+        }
+      }).error;
+      err.message.should.match(/'hello' can't be blank/);
+      _lodash.default.isError(err).should.be.true;
+    });
+    it('should only accept W3C caps that have passing constraints', function () {
+      let w3cCaps = { ..._helpers.W3C_CAPS,
+        firstMatch: [{
+          foo: 'bar'
+        }, {
+          'appium:hello': 'world'
+        }]
+      };
+      (0, _utils.parseCapsForInnerDriver)(_helpers.BASE_CAPS, w3cCaps, {
+        hello: {
+          presence: true
+        }
+      }).error.should.eql({
+        jsonwpCode: 61,
+        error: 'invalid argument',
+        w3cStatus: 400,
+        _stacktrace: null
+      });
+    });
+    it('should add appium prefixes to W3C caps that are not standard in W3C', function () {
+      (0, _utils.parseCapsForInnerDriver)(undefined, {
+        alwaysMatch: {
+          platformName: 'Fake',
+          propertyName: 'PROP_NAME'
+        }
+      }).error.error.should.includes('invalid argument');
+    });
+  });
+  describe('removeAppiumPrefixes()', function () {
+    it('should remove appium prefixes from cap names', function () {
+      (0, _utils.removeAppiumPrefixes)({
+        'appium:cap1': 'value1',
+        'ms:cap2': 'value2',
+        someCap: 'someCap'
+      }).should.eql({
+        'cap1': 'value1',
+        'ms:cap2': 'value2',
+        someCap: 'someCap'
+      });
+    });
+  });
+  describe('insertAppiumPrefixes()', function () {
+    it('should apply prefixes to non-standard capabilities', function () {
+      (0, _utils.insertAppiumPrefixes)({
+        someCap: 'someCap'
+      }).should.deep.equal({
+        'appium:someCap': 'someCap'
+      });
+    });
+    it('should not apply prefixes to standard capabilities', function () {
+      (0, _utils.insertAppiumPrefixes)({
+        browserName: 'BrowserName',
+        platformName: 'PlatformName'
+      }).should.deep.equal({
+        browserName: 'BrowserName',
+        platformName: 'PlatformName'
+      });
+    });
+    it('should not apply prefixes to capabilities that already have a prefix', function () {
+      (0, _utils.insertAppiumPrefixes)({
+        'appium:someCap': 'someCap',
+        'moz:someOtherCap': 'someOtherCap'
+      }).should.deep.equal({
+        'appium:someCap': 'someCap',
+        'moz:someOtherCap': 'someOtherCap'
+      });
+    });
+    it('should apply prefixes to non-prefixed, non-standard capabilities; should not apply prefixes to any other capabilities', function () {
+      (0, _utils.insertAppiumPrefixes)({
+        'appium:someCap': 'someCap',
+        'moz:someOtherCap': 'someOtherCap',
+        browserName: 'BrowserName',
+        platformName: 'PlatformName',
+        someOtherCap: 'someOtherCap',
+        yetAnotherCap: 'yetAnotherCap'
+      }).should.deep.equal({
+        'appium:someCap': 'someCap',
+        'moz:someOtherCap': 'someOtherCap',
+        browserName: 'BrowserName',
+        platformName: 'PlatformName',
+        'appium:someOtherCap': 'someOtherCap',
+        'appium:yetAnotherCap': 'yetAnotherCap'
+      });
+    });
+  });
+  describe('pullSettings()', function () {
+    it('should pull settings from caps', function () {
+      const caps = {
+        platformName: 'foo',
+        browserName: 'bar',
+        'settings[settingName]': 'baz',
+        'settings[settingName2]': 'baz2'
+      };
+      const settings = (0, _utils.pullSettings)(caps);
+      settings.should.eql({
+        settingName: 'baz',
+        settingName2: 'baz2'
+      });
+      caps.should.eql({
+        platformName: 'foo',
+        browserName: 'bar'
+      });
+    });
+    it('should pull settings dict if object values are present in caps', function () {
+      const caps = {
+        platformName: 'foo',
+        browserName: 'bar',
+        'settings[settingName]': {
+          key: 'baz'
+        }
+      };
+      const settings = (0, _utils.pullSettings)(caps);
+      settings.should.eql({
+        settingName: {
+          key: 'baz'
+        }
+      });
+      caps.should.eql({
+        platformName: 'foo',
+        browserName: 'bar'
+      });
+    });
+    it('should pull empty dict if no settings are present in caps', function () {
+      const caps = {
+        platformName: 'foo',
+        browserName: 'bar',
+        'setting[settingName]': 'baz'
+      };
+      const settings = (0, _utils.pullSettings)(caps);
+      settings.should.eql({});
+      caps.should.eql({
+        platformName: 'foo',
+        browserName: 'bar',
+        'setting[settingName]': 'baz'
+      });
+    });
+    it('should pull empty dict if caps are empty', function () {
+      const caps = {};
+      const settings = (0, _utils.pullSettings)(caps);
+      settings.should.eql({});
+      caps.should.eql({});
+    });
+  });
+  describe('ReadonlyMap', function () {
+    it('should allow writing', function () {
+      const map = new _utils.ReadonlyMap();
+      (() => map.set('foo', 'bar')).should.not.throw();
+    });
+    it('should allow reading', function () {
+      const map = new _utils.ReadonlyMap([['foo', 'bar']]);
+      (() => map.get('foo')).should.not.throw();
+    });
+    it('should not allow deletion', function () {
+      const map = new _utils.ReadonlyMap([['foo', 'bar']]);
+      (() => map.delete('foo')).should.throw();
+    });
+    it('should not allow clearing', function () {
+      const map = new _utils.ReadonlyMap([['foo', 'bar']]);
+      (() => map.clear()).should.throw();
+    });
+    it('should not allow updating', function () {
+      const map = new _utils.ReadonlyMap([['foo', 'bar']]);
+      (() => map.set('foo', 'baz')).should.throw();
+    });
+  });
+});require('source-map-support').install();
+
+
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["test/utils-specs.js"],"names":["describe","it","error","protocol","BASE_CAPS","should","equal","message","match","desiredCaps","processedJsonwpCapabilities","processedW3CCapabilities","undefined","W3C_CAPS","deep","not","exist","defaultW3CCaps","expectedDefaultCaps","foo","baz","alwaysMatch","res","eql","jsonwpCode","w3cStatus","_stacktrace","err","hello","presence","_","isError","be","true","w3cCaps","firstMatch","platformName","propertyName","includes","someCap","browserName","someOtherCap","yetAnotherCap","caps","settings","settingName","settingName2","key","map","ReadonlyMap","set","throw","get","delete","clear"],"mappings":"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","sourcesContent":["import {\n  parseCapsForInnerDriver, insertAppiumPrefixes, pullSettings,\n  removeAppiumPrefixes, ReadonlyMap\n} from '../lib/utils';\nimport { BASE_CAPS, W3C_CAPS } from './helpers';\nimport _ from 'lodash';\n\ndescribe('utils', function () {\n  describe('parseCapsForInnerDriver()', function () {\n    it('should return an error if only JSONWP provided', function () {\n      let {error, protocol} = parseCapsForInnerDriver(BASE_CAPS);\n      protocol.should.equal('W3C');\n      error.message.should.match(/W3C/);\n    });\n    it('should return W3C caps unchanged if only W3C caps were provided', function () {\n      let {desiredCaps, processedJsonwpCapabilities, processedW3CCapabilities, protocol} = parseCapsForInnerDriver(undefined, W3C_CAPS);\n      desiredCaps.should.deep.equal(BASE_CAPS);\n      should.not.exist(processedJsonwpCapabilities);\n      processedW3CCapabilities.should.deep.equal(W3C_CAPS);\n      protocol.should.equal('W3C');\n    });\n    it('should return JSONWP and W3C caps if both were provided', function () {\n      let {desiredCaps, processedJsonwpCapabilities, processedW3CCapabilities, protocol} = parseCapsForInnerDriver(BASE_CAPS, W3C_CAPS);\n      desiredCaps.should.deep.equal(BASE_CAPS);\n      processedJsonwpCapabilities.should.deep.equal(BASE_CAPS);\n      processedW3CCapabilities.should.deep.equal(W3C_CAPS);\n      protocol.should.equal('W3C');\n    });\n    it('should include default capabilities in results', function () {\n      const defaultW3CCaps = {\n        'appium:foo': 'bar',\n        'appium:baz': 'bla',\n      };\n      const expectedDefaultCaps = {\n        foo: 'bar',\n        baz: 'bla',\n      };\n      const {\n        desiredCaps,\n        processedJsonwpCapabilities,\n        processedW3CCapabilities\n      } = parseCapsForInnerDriver(BASE_CAPS, W3C_CAPS, {}, defaultW3CCaps);\n      desiredCaps.should.deep.equal({\n        ...expectedDefaultCaps,\n        ...BASE_CAPS,\n      });\n      processedJsonwpCapabilities.should.deep.equal({\n        ...expectedDefaultCaps,\n        ...BASE_CAPS\n      });\n      processedW3CCapabilities.alwaysMatch.should.deep.equal({\n        ...insertAppiumPrefixes(expectedDefaultCaps),\n        ...insertAppiumPrefixes(BASE_CAPS)\n      });\n    });\n    it('should allow valid default capabilities', function () {\n      const res = parseCapsForInnerDriver(null, W3C_CAPS, {}, {\n        'appium:foo': 'bar2',\n      });\n      res.processedW3CCapabilities.alwaysMatch['appium:foo'].should.eql('bar2');\n    });\n    it('should not allow invalid default capabilities', function () {\n      const res = parseCapsForInnerDriver(null, W3C_CAPS, {}, {\n        foo: 'bar', 'appium:foo2': 'bar2',\n      });\n      res.error.should.eql({\n        jsonwpCode: 61, error: 'invalid argument', w3cStatus: 400, _stacktrace: null\n      });\n    });\n    it('should reject if W3C caps are not passing constraints', function () {\n      const err = parseCapsForInnerDriver(undefined, W3C_CAPS, {hello: {presence: true}}).error;\n      err.message.should.match(/'hello' can't be blank/);\n      _.isError(err).should.be.true;\n\n    });\n    it('should only accept W3C caps that have passing constraints', function () {\n      let w3cCaps = {\n        ...W3C_CAPS,\n        firstMatch: [\n          {foo: 'bar'},\n          {'appium:hello': 'world'},\n        ],\n      };\n      parseCapsForInnerDriver(BASE_CAPS, w3cCaps, {hello: {presence: true}}).error.should.eql({\n        jsonwpCode: 61, error: 'invalid argument', w3cStatus: 400, _stacktrace: null\n      });\n    });\n    it('should add appium prefixes to W3C caps that are not standard in W3C', function () {\n      parseCapsForInnerDriver(undefined, {\n        alwaysMatch: {\n          platformName: 'Fake',\n          propertyName: 'PROP_NAME',\n        },\n      }).error.error.should.includes('invalid argument');\n    });\n  });\n\n  describe('removeAppiumPrefixes()', function () {\n    it('should remove appium prefixes from cap names', function () {\n      removeAppiumPrefixes({\n        'appium:cap1': 'value1',\n        'ms:cap2': 'value2',\n        someCap: 'someCap',\n      }).should.eql({\n        'cap1': 'value1',\n        'ms:cap2': 'value2',\n        someCap: 'someCap',\n      });\n    });\n  });\n\n  describe('insertAppiumPrefixes()', function () {\n    it('should apply prefixes to non-standard capabilities', function () {\n      insertAppiumPrefixes({\n        someCap: 'someCap',\n      }).should.deep.equal({\n        'appium:someCap': 'someCap',\n      });\n    });\n    it('should not apply prefixes to standard capabilities', function () {\n      insertAppiumPrefixes({\n        browserName: 'BrowserName',\n        platformName: 'PlatformName',\n      }).should.deep.equal({\n        browserName: 'BrowserName',\n        platformName: 'PlatformName',\n      });\n    });\n    it('should not apply prefixes to capabilities that already have a prefix', function () {\n      insertAppiumPrefixes({\n        'appium:someCap': 'someCap',\n        'moz:someOtherCap': 'someOtherCap',\n      }).should.deep.equal({\n        'appium:someCap': 'someCap',\n        'moz:someOtherCap': 'someOtherCap',\n      });\n    });\n    it('should apply prefixes to non-prefixed, non-standard capabilities; should not apply prefixes to any other capabilities', function () {\n      insertAppiumPrefixes({\n        'appium:someCap': 'someCap',\n        'moz:someOtherCap': 'someOtherCap',\n        browserName: 'BrowserName',\n        platformName: 'PlatformName',\n        someOtherCap: 'someOtherCap',\n        yetAnotherCap: 'yetAnotherCap',\n      }).should.deep.equal({\n        'appium:someCap': 'someCap',\n        'moz:someOtherCap': 'someOtherCap',\n        browserName: 'BrowserName',\n        platformName: 'PlatformName',\n        'appium:someOtherCap': 'someOtherCap',\n        'appium:yetAnotherCap': 'yetAnotherCap',\n      });\n    });\n  });\n\n  describe('pullSettings()', function () {\n    it('should pull settings from caps', function () {\n      const caps = {\n        platformName: 'foo',\n        browserName: 'bar',\n        'settings[settingName]': 'baz',\n        'settings[settingName2]': 'baz2',\n      };\n      const settings = pullSettings(caps);\n      settings.should.eql({\n        settingName: 'baz',\n        settingName2: 'baz2',\n      });\n      caps.should.eql({\n        platformName: 'foo',\n        browserName: 'bar',\n      });\n    });\n    it('should pull settings dict if object values are present in caps', function () {\n      const caps = {\n        platformName: 'foo',\n        browserName: 'bar',\n        'settings[settingName]': {key: 'baz'},\n      };\n      const settings = pullSettings(caps);\n      settings.should.eql({\n        settingName: {key: 'baz'},\n      });\n      caps.should.eql({\n        platformName: 'foo',\n        browserName: 'bar',\n      });\n    });\n    it('should pull empty dict if no settings are present in caps', function () {\n      const caps = {\n        platformName: 'foo',\n        browserName: 'bar',\n        'setting[settingName]': 'baz',\n      };\n      const settings = pullSettings(caps);\n      settings.should.eql({});\n      caps.should.eql({\n        platformName: 'foo',\n        browserName: 'bar',\n        'setting[settingName]': 'baz',\n      });\n    });\n    it('should pull empty dict if caps are empty', function () {\n      const caps = {};\n      const settings = pullSettings(caps);\n      settings.should.eql({});\n      caps.should.eql({});\n    });\n  });\n\n  describe('ReadonlyMap', function () {\n    it('should allow writing', function () {\n      const map = new ReadonlyMap();\n      (() => map.set('foo', 'bar')).should.not.throw();\n\n    });\n\n    it('should allow reading', function () {\n      const map = new ReadonlyMap([['foo', 'bar']]);\n      (() => map.get('foo')).should.not.throw();\n    });\n\n    it('should not allow deletion', function () {\n      const map = new ReadonlyMap([['foo', 'bar']]);\n      (() => map.delete('foo')).should.throw();\n    });\n\n    it('should not allow clearing', function () {\n      const map = new ReadonlyMap([['foo', 'bar']]);\n      (() => map.clear()).should.throw();\n    });\n\n    it('should not allow updating', function () {\n      const map = new ReadonlyMap([['foo', 'bar']]);\n      (() => map.set('foo', 'baz')).should.throw();\n    });\n  });\n});\n"],"file":"test/utils-specs.js","sourceRoot":"../.."}

package/index.js

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+
+const {asyncify} = require('asyncbox');
+
+const appium = require('./build/lib/main.js');
+
+if (require.main === module) {
+  asyncify(appium.main);
+}
+
+module.exports = appium;

package/lib/appium-config.schema.json

@@ -210,7 +210,8 @@
           "default": false,
           "description": "Disable additional security checks, so it is possible to use some advanced features, provided by drivers supporting this option. Only enable it if all the clients are in the trusted network and it's not the case if a client could potentially break out of the session sandbox. Specific features can be overridden by using \"deny-insecure\"",
           "title": "relaxed-security config",
-          "type": "boolean"
+          "type": "boolean",
+          "appiumCliDest": "relaxedSecurityEnabled"
         },
         "session-override": {
           "default": false,

package/lib/cli/parser.js

@@ -165,7 +165,10 @@ class ArgParser {
    */
   static _patchExit (parser) {
     parser.exit = (code, msg) => {
-      throw new Error(msg);
+      if (code) {
+        throw new Error(msg);
+      }
+      process.exit();
     };
   }
 

package/lib/config.js

@@ -5,9 +5,6 @@ import { exec } from 'teen_process';
 import { rootDir } from './utils';
 import logger from './logger';
 import semver from 'semver';
-import {
-  StoreDeprecatedDefaultCapabilityAction, DEFAULT_CAPS_ARG,
-} from './cli/argparse-actions';
 import findUp from 'find-up';
 import { getDefaultsFromSchema } from './schema/schema';
 
@@ -28,11 +25,6 @@ function getNodeVersion () {
   return semver.coerce(process.version);
 }
 
-function isSubClass (candidateClass, superClass) {
-  return _.isFunction(superClass) && _.isFunction(candidateClass)
-    && (candidateClass.prototype instanceof superClass || candidateClass === superClass);
-}
-
 async function updateBuildInfo (useGithubApiFallback = false) {
   const sha = await getGitRev(useGithubApiFallback);
   if (!sha) {
@@ -225,23 +217,6 @@ function getNonDefaultServerArgs (parser, args) {
   return _.pickBy(args, (__, key) => isNotDefault(key));
 }
 
-function getDeprecatedArgs (parser, args) {
-  // go through the server command line arguments and figure
-  // out which of the ones used are deprecated
-  return parser.rawArgs.reduce((acc, [[name], {dest, default: defaultValue, action}]) => {
-    if (!args[dest] || args[dest] === defaultValue) {
-      return acc;
-    }
-
-    if (action?.deprecated_for) {
-      acc[name] = action.deprecated_for;
-    } else if (isSubClass(action, StoreDeprecatedDefaultCapabilityAction)) {
-      acc[name] = DEFAULT_CAPS_ARG;
-    }
-    return acc;
-  }, {});
-}
-
 async function validateTmpDir (tmpDir) {
   try {
     await mkdirp(tmpDir);
@@ -254,6 +229,5 @@ async function validateTmpDir (tmpDir) {
 export {
   getBuildInfo, checkNodeOk, showConfig,
   warnNodeDeprecations, validateTmpDir, getNonDefaultServerArgs,
-  getGitRev, APPIUM_VER, updateBuildInfo,
-  getDeprecatedArgs
+  getGitRev, APPIUM_VER, updateBuildInfo
 };

package/lib/main.js

@@ -94,9 +94,9 @@ function logServerPort (address, port) {
 
 /**
  * Find any plugin name which has been installed, and which has been requested for activation by
- * using the --plugins flag, and turn each one into its class, so we can send them as objects to
- * the server init. We also want to send/assign them to the umbrella driver so it can use them to
- * wrap command execution
+ * using the --use-plugins flag, and turn each one into its class, so we can send them as objects
+ * to the server init. We also want to send/assign them to the umbrella driver so it can use them
+ * to wrap command execution
  *
  * @param {Object} args - argparser parsed dict
  * @param {import('./plugin-config').default} pluginConfig - a plugin extension config
@@ -335,6 +335,9 @@ async function main (args) {
   return server;
 }
 
+// NOTE: this is here for backwards compat for any scripts referencing `main.js` directly
+// (more specifically, `build/lib/main.js`)
+// the executable is now `../index.js`, so that module will typically be `require.main`.
 if (require.main === module) {
   asyncify(main);
 }

package/lib/plugin-config.js

@@ -57,7 +57,7 @@ export default class PluginConfig extends ExtensionConfig {
     }
 
     if (_.isEmpty(activeNames)) {
-      log.info('No plugins activated. Use the --plugins flag with names of plugins to activate');
+      log.info('No plugins activated. Use the --use-plugins flag with names of plugins to activate');
     }
   }
 }

package/lib/schema/appium-config-schema.js

@@ -212,6 +212,7 @@ const schema = /** @type {const} */ ({
             'Disable additional security checks, so it is possible to use some advanced features, provided by drivers supporting this option. Only enable it if all the clients are in the trusted network and it\'s not the case if a client could potentially break out of the session sandbox. Specific features can be overridden by using "deny-insecure"',
           title: 'relaxed-security config',
           type: 'boolean',
+          appiumCliDest: 'relaxedSecurityEnabled'
         },
         'session-override': {
           default: false,

package/lib/schema/arg-spec.js

@@ -216,3 +216,7 @@ export class ArgSpec {
  * @property {string} [dest]
  * @property {D} [defaultValue]
  */
+
+/**
+ * @typedef {import('../ext-config-io').ExtensionType} ExtensionType
+ */

package/lib/schema/cli-args.js

@@ -79,6 +79,20 @@ function getSchemaValidator ({ref: schemaId}, coerce = _.identity) {
   };
 }
 
+/**
+ * Determine the description for display on the CLI, given the schema.
+ * @param {AppiumJSONSchema} schema
+ * @returns {string}
+ */
+function makeDescription (schema) {
+  const {appiumCliDescription, description = '', appiumDeprecated} = schema;
+  let desc = appiumCliDescription ?? description;
+  if (appiumDeprecated) {
+    desc = `[DEPRECATED] ${desc}`;
+  }
+  return desc;
+}
+
 /**
  * Given arg `name`, a JSON schema `subSchema`, and options, return an argument definition
  * as understood by `argparse`.
@@ -93,8 +107,6 @@ function subSchemaToArgDef (subSchema, argSpec, opts = {}) {
     type,
     appiumCliAliases,
     appiumCliTransformer,
-    appiumCliDescription,
-    description,
     enum: enumValues,
   } = subSchema;
 
@@ -110,7 +122,7 @@ function subSchemaToArgDef (subSchema, argSpec, opts = {}) {
   /** @type {import('argparse').ArgumentOptions} */
   let argOpts = {
     required: false,
-    help: appiumCliDescription ?? description,
+    help: makeDescription(subSchema)
   };
 
   /**
@@ -238,7 +250,7 @@ function subSchemaToArgDef (subSchema, argSpec, opts = {}) {
  * aliases to `argparse` arguments; empty if no schema found
  */
 export function toParserArgs (opts = {}) {
-  const flattened = flattenSchema();
+  const flattened = flattenSchema().filter(({schema}) => !schema.appiumCliIgnored);
   return new Map(
     _.map(flattened, ({schema, argSpec}) =>
       subSchemaToArgDef(schema, argSpec, opts),

package/lib/schema/keywords.js

@@ -86,11 +86,26 @@ export const keywords = {
    * Flag to tell Appium to _not_ provide this property as a CLI argument.
    * @type {KeywordDefinition}
    */
-  appiumCliIgnore: {
-    keyword: 'appiumCliIgnore',
+  appiumCliIgnored: {
+    keyword: 'appiumCliIgnored',
     metaSchema: {
       type: 'boolean',
-      description: 'If `true`, Appium will not provide this property as a CLI argument.'
+      description: 'If `true`, Appium will not provide this property as a CLI argument. This is NOT the same as a "hidden" argument.',
+      enum: [true]
+    }
+  },
+
+  /**
+   * Mark this property as deprecated.
+   * @type {KeywordDefinition}
+   */
+  appiumDeprecated: {
+    keyword: 'appiumDeprecated',
+    metaSchema: {
+      type: 'boolean',
+      description: 'If `true`, this property will be displayed as "deprecated" to the user',
+      enum: [true],
+      $comment: 'JSON schema draft-2019-09 keyword `deprecated` serves the same purpose. This keyword should itself be deprecated if we move to draft-2019-09!'
     }
   }
 };
@@ -109,8 +124,9 @@ export const keywords = {
  * @property {string} [appiumCliDest]
  * @property {string} [appiumCliDescription]
  * @property {string[]} [appiumCliAliases]
- * @property {boolean} [appiumCliIgnore]
+ * @property {boolean} [appiumCliIgnored]
  * @property {AppiumCliTransformerName} [appiumCliTransformer]
+ * @property {boolean} [appiumDeprecated]
  */
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium",
-  "version": "2.0.0-beta.21",
+  "version": "2.0.0-beta.22",
   "description": "Automation for Apps.",
   "keywords": [
     "automation",
@@ -21,9 +21,8 @@
   },
   "license": "Apache-2.0",
   "author": "https://github.com/appium",
-  "main": "./build/lib/main.js",
   "bin": {
-    "appium": "./build/lib/main.js"
+    "appium": "index.js"
   },
   "directories": {
     "lib": "./lib"
@@ -31,25 +30,25 @@
   "files": [
     "bin",
     "lib",
-    "build/lib",
+    "build",
+    "index.js",
     "postinstall.js",
     "types"
   ],
   "scripts": {
     "generate-docs": "gulp transpile && node ./build/commands-yml/parse.js",
     "postinstall": "node ./postinstall.js",
-    "install-fake-driver": "node . driver install --source=local ../fake-driver",
     "upload": "gulp github-upload",
     "zip": "zip -qr appium.zip .",
     "zip-and-upload": "npm run zip && npm run upload"
   },
   "dependencies": {
-    "@appium/base-driver": "^8.2.0",
+    "@appium/base-driver": "^8.2.1",
     "@appium/base-plugin": "1.8.0",
-    "@appium/support": "^2.55.1",
+    "@appium/support": "^2.55.2",
     "@babel/runtime": "7.16.3",
     "@sidvind/better-ajv-errors": "0.9.2",
-    "ajv": "8.8.0",
+    "ajv": "8.8.1",
     "ajv-formats": "2.1.1",
     "argparse": "2.0.1",
     "async-lock": "1.3.0",
@@ -65,16 +64,12 @@
     "ora": "5.4.1",
     "resolve-from": "5.0.0",
     "semver": "7.3.5",
-    "source-map-support": "0.5.20",
+    "source-map-support": "0.5.21",
     "teen_process": "1.16.0",
     "winston": "3.3.3",
     "word-wrap": "1.2.3",
     "yaml": "1.10.2"
   },
-  "devDependencies": {
-    "@appium/fake-driver": "^3.2.0",
-    "@appium/gulp-plugins": "^5.5.5"
-  },
   "engines": {
     "node": ">=12",
     "npm": ">=6"
@@ -84,5 +79,5 @@
     "tag": "next"
   },
   "homepage": "https://appium.io",
-  "gitHead": "ec6a90a797d2dadb407922426be16efaec9def07"
+  "gitHead": "e36a70105880b845e99e2c8a958403f6253f45b6"
 }