appium 2.0.0-beta.8 → 2.0.0-rc.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (206) hide show
  1. package/LICENSE +1 -1
  2. package/README.md +149 -58
  3. package/build/lib/appium.d.ts +229 -0
  4. package/build/lib/appium.d.ts.map +1 -0
  5. package/build/lib/appium.js +678 -441
  6. package/build/lib/appium.js.map +1 -0
  7. package/build/lib/cli/args.d.ts +17 -0
  8. package/build/lib/cli/args.d.ts.map +1 -0
  9. package/build/lib/cli/args.js +263 -300
  10. package/build/lib/cli/args.js.map +1 -0
  11. package/build/lib/cli/driver-command.d.ts +102 -0
  12. package/build/lib/cli/driver-command.d.ts.map +1 -0
  13. package/build/lib/cli/driver-command.js +131 -81
  14. package/build/lib/cli/driver-command.js.map +1 -0
  15. package/build/lib/cli/extension-command.d.ts +402 -0
  16. package/build/lib/cli/extension-command.d.ts.map +1 -0
  17. package/build/lib/cli/extension-command.js +799 -383
  18. package/build/lib/cli/extension-command.js.map +1 -0
  19. package/build/lib/cli/extension.d.ts +23 -0
  20. package/build/lib/cli/extension.d.ts.map +1 -0
  21. package/build/lib/cli/extension.js +71 -60
  22. package/build/lib/cli/extension.js.map +1 -0
  23. package/build/lib/cli/parser.d.ts +84 -0
  24. package/build/lib/cli/parser.d.ts.map +1 -0
  25. package/build/lib/cli/parser.js +252 -148
  26. package/build/lib/cli/parser.js.map +1 -0
  27. package/build/lib/cli/plugin-command.d.ts +99 -0
  28. package/build/lib/cli/plugin-command.d.ts.map +1 -0
  29. package/build/lib/cli/plugin-command.js +125 -81
  30. package/build/lib/cli/plugin-command.js.map +1 -0
  31. package/build/lib/cli/utils.d.ts +29 -0
  32. package/build/lib/cli/utils.d.ts.map +1 -0
  33. package/build/lib/cli/utils.js +72 -51
  34. package/build/lib/cli/utils.js.map +1 -0
  35. package/build/lib/config-file.d.ts +100 -0
  36. package/build/lib/config-file.d.ts.map +1 -0
  37. package/build/lib/config-file.js +207 -0
  38. package/build/lib/config-file.js.map +1 -0
  39. package/build/lib/config.d.ts +49 -0
  40. package/build/lib/config.d.ts.map +1 -0
  41. package/build/lib/config.js +262 -223
  42. package/build/lib/config.js.map +1 -0
  43. package/build/lib/constants.d.ts +56 -0
  44. package/build/lib/constants.d.ts.map +1 -0
  45. package/build/lib/constants.js +73 -0
  46. package/build/lib/constants.js.map +1 -0
  47. package/build/lib/extension/driver-config.d.ts +82 -0
  48. package/build/lib/extension/driver-config.d.ts.map +1 -0
  49. package/build/lib/extension/driver-config.js +210 -0
  50. package/build/lib/extension/driver-config.js.map +1 -0
  51. package/build/lib/extension/extension-config.d.ts +270 -0
  52. package/build/lib/extension/extension-config.d.ts.map +1 -0
  53. package/build/lib/extension/extension-config.js +601 -0
  54. package/build/lib/extension/extension-config.js.map +1 -0
  55. package/build/lib/extension/index.d.ts +48 -0
  56. package/build/lib/extension/index.d.ts.map +1 -0
  57. package/build/lib/extension/index.js +105 -0
  58. package/build/lib/extension/index.js.map +1 -0
  59. package/build/lib/extension/manifest-migrations.d.ts +27 -0
  60. package/build/lib/extension/manifest-migrations.d.ts.map +1 -0
  61. package/build/lib/extension/manifest-migrations.js +134 -0
  62. package/build/lib/extension/manifest-migrations.js.map +1 -0
  63. package/build/lib/extension/manifest.d.ts +145 -0
  64. package/build/lib/extension/manifest.d.ts.map +1 -0
  65. package/build/lib/extension/manifest.js +528 -0
  66. package/build/lib/extension/manifest.js.map +1 -0
  67. package/build/lib/extension/package-changed.d.ts +11 -0
  68. package/build/lib/extension/package-changed.d.ts.map +1 -0
  69. package/build/lib/extension/package-changed.js +62 -0
  70. package/build/lib/extension/package-changed.js.map +1 -0
  71. package/build/lib/extension/plugin-config.d.ts +56 -0
  72. package/build/lib/extension/plugin-config.d.ts.map +1 -0
  73. package/build/lib/extension/plugin-config.js +102 -0
  74. package/build/lib/extension/plugin-config.js.map +1 -0
  75. package/build/lib/grid-register.d.ts +10 -0
  76. package/build/lib/grid-register.d.ts.map +1 -0
  77. package/build/lib/grid-register.js +122 -144
  78. package/build/lib/grid-register.js.map +1 -0
  79. package/build/lib/logger.d.ts +3 -0
  80. package/build/lib/logger.d.ts.map +1 -0
  81. package/build/lib/logger.js +5 -17
  82. package/build/lib/logger.js.map +1 -0
  83. package/build/lib/logsink.d.ts +4 -0
  84. package/build/lib/logsink.d.ts.map +1 -0
  85. package/build/lib/logsink.js +189 -184
  86. package/build/lib/logsink.js.map +1 -0
  87. package/build/lib/main.d.ts +62 -0
  88. package/build/lib/main.d.ts.map +1 -0
  89. package/build/lib/main.js +406 -234
  90. package/build/lib/main.js.map +1 -0
  91. package/build/lib/schema/arg-spec.d.ts +143 -0
  92. package/build/lib/schema/arg-spec.d.ts.map +1 -0
  93. package/build/lib/schema/arg-spec.js +164 -0
  94. package/build/lib/schema/arg-spec.js.map +1 -0
  95. package/build/lib/schema/cli-args.d.ts +19 -0
  96. package/build/lib/schema/cli-args.d.ts.map +1 -0
  97. package/build/lib/schema/cli-args.js +220 -0
  98. package/build/lib/schema/cli-args.js.map +1 -0
  99. package/build/lib/schema/cli-transformers.d.ts +5 -0
  100. package/build/lib/schema/cli-transformers.d.ts.map +1 -0
  101. package/build/lib/schema/cli-transformers.js +124 -0
  102. package/build/lib/schema/cli-transformers.js.map +1 -0
  103. package/build/lib/schema/index.d.ts +3 -0
  104. package/build/lib/schema/index.d.ts.map +1 -0
  105. package/build/lib/schema/index.js +19 -0
  106. package/build/lib/schema/index.js.map +1 -0
  107. package/build/lib/schema/keywords.d.ts +24 -0
  108. package/build/lib/schema/keywords.d.ts.map +1 -0
  109. package/build/lib/schema/keywords.js +128 -0
  110. package/build/lib/schema/keywords.js.map +1 -0
  111. package/build/lib/schema/schema.d.ts +260 -0
  112. package/build/lib/schema/schema.d.ts.map +1 -0
  113. package/build/lib/schema/schema.js +640 -0
  114. package/build/lib/schema/schema.js.map +1 -0
  115. package/build/lib/utils.d.ts +276 -0
  116. package/build/lib/utils.d.ts.map +1 -0
  117. package/build/lib/utils.js +373 -271
  118. package/build/lib/utils.js.map +1 -0
  119. package/build/types/cli.d.ts +134 -0
  120. package/build/types/cli.d.ts.map +1 -0
  121. package/build/types/cli.js +3 -0
  122. package/build/types/cli.js.map +1 -0
  123. package/build/types/index.d.ts +15 -0
  124. package/build/types/index.d.ts.map +1 -0
  125. package/build/types/index.js +19 -0
  126. package/build/types/index.js.map +1 -0
  127. package/build/types/manifest/base.d.ts +135 -0
  128. package/build/types/manifest/base.d.ts.map +1 -0
  129. package/build/types/manifest/base.js +3 -0
  130. package/build/types/manifest/base.js.map +1 -0
  131. package/build/types/manifest/index.d.ts +21 -0
  132. package/build/types/manifest/index.d.ts.map +1 -0
  133. package/build/types/manifest/index.js +42 -0
  134. package/build/types/manifest/index.js.map +1 -0
  135. package/build/types/manifest/v3.d.ts +139 -0
  136. package/build/types/manifest/v3.d.ts.map +1 -0
  137. package/build/types/manifest/v3.js +3 -0
  138. package/build/types/manifest/v3.js.map +1 -0
  139. package/build/types/manifest/v4.d.ts +139 -0
  140. package/build/types/manifest/v4.d.ts.map +1 -0
  141. package/build/types/manifest/v4.js +3 -0
  142. package/build/types/manifest/v4.js.map +1 -0
  143. package/driver.d.ts +1 -0
  144. package/driver.js +14 -0
  145. package/index.js +11 -0
  146. package/lib/appium.js +555 -185
  147. package/lib/cli/args.js +275 -407
  148. package/lib/cli/driver-command.js +132 -24
  149. package/lib/cli/extension-command.js +751 -272
  150. package/lib/cli/extension.js +47 -20
  151. package/lib/cli/parser.js +267 -95
  152. package/lib/cli/plugin-command.js +122 -22
  153. package/lib/cli/utils.js +24 -10
  154. package/lib/config-file.js +220 -0
  155. package/lib/config.js +243 -132
  156. package/lib/constants.js +79 -0
  157. package/lib/extension/driver-config.js +247 -0
  158. package/lib/extension/extension-config.js +709 -0
  159. package/lib/extension/index.js +116 -0
  160. package/lib/extension/manifest-migrations.js +136 -0
  161. package/lib/extension/manifest.js +580 -0
  162. package/lib/extension/package-changed.js +64 -0
  163. package/lib/extension/plugin-config.js +112 -0
  164. package/lib/grid-register.js +49 -35
  165. package/lib/logger.js +1 -2
  166. package/lib/logsink.js +59 -36
  167. package/lib/main.js +392 -104
  168. package/lib/schema/arg-spec.js +229 -0
  169. package/lib/schema/cli-args.js +241 -0
  170. package/lib/schema/cli-transformers.js +119 -0
  171. package/lib/schema/index.js +2 -0
  172. package/lib/schema/keywords.js +136 -0
  173. package/lib/schema/schema.js +725 -0
  174. package/lib/utils.js +315 -167
  175. package/package.json +84 -82
  176. package/plugin.d.ts +1 -0
  177. package/plugin.js +13 -0
  178. package/scripts/autoinstall-extensions.js +243 -0
  179. package/support.d.ts +1 -0
  180. package/support.js +13 -0
  181. package/tsconfig.json +25 -0
  182. package/types/cli.ts +193 -0
  183. package/types/index.ts +20 -0
  184. package/types/manifest/README.md +30 -0
  185. package/types/manifest/base.ts +158 -0
  186. package/types/manifest/index.ts +28 -0
  187. package/types/manifest/v3.ts +161 -0
  188. package/types/manifest/v4.ts +161 -0
  189. package/CHANGELOG.md +0 -3669
  190. package/bin/ios-webkit-debug-proxy-launcher.js +0 -71
  191. package/build/lib/cli/argparse-actions.js +0 -104
  192. package/build/lib/cli/npm.js +0 -207
  193. package/build/lib/cli/parser-helpers.js +0 -93
  194. package/build/lib/driver-config.js +0 -77
  195. package/build/lib/drivers.js +0 -99
  196. package/build/lib/extension-config.js +0 -253
  197. package/build/lib/plugin-config.js +0 -59
  198. package/build/lib/plugins.js +0 -14
  199. package/lib/cli/argparse-actions.js +0 -77
  200. package/lib/cli/npm.js +0 -183
  201. package/lib/cli/parser-helpers.js +0 -91
  202. package/lib/driver-config.js +0 -46
  203. package/lib/drivers.js +0 -84
  204. package/lib/extension-config.js +0 -209
  205. package/lib/plugin-config.js +0 -34
  206. package/lib/plugins.js +0 -10
@@ -0,0 +1,116 @@
1
+ import _ from 'lodash';
2
+ import {USE_ALL_PLUGINS} from '../constants';
3
+ import log from '../logger';
4
+ import {DriverConfig} from './driver-config';
5
+ import {Manifest} from './manifest';
6
+ import {PluginConfig} from './plugin-config';
7
+ import B from 'bluebird';
8
+
9
+ /**
10
+ * Loads extensions and creates `ExtensionConfig` instances.
11
+ *
12
+ * - Reads the manifest file, creating if necessary
13
+ * - Using the parsed extension data, creates/gets the `ExtensionConfig` subclass instances
14
+ * - Returns these instances
15
+ *
16
+ * If `appiumHome` is needed, use `resolveAppiumHome` from the `env` module in `@appium/support`.
17
+ * @param {string} appiumHome
18
+ * @returns {Promise<ExtensionConfigs>}
19
+ */
20
+ export async function loadExtensions(appiumHome) {
21
+ const manifest = Manifest.getInstance(appiumHome);
22
+ await manifest.read();
23
+ const driverConfig = DriverConfig.getInstance(manifest) ?? DriverConfig.create(manifest);
24
+ const pluginConfig = PluginConfig.getInstance(manifest) ?? PluginConfig.create(manifest);
25
+
26
+ await B.all([driverConfig.validate(), pluginConfig.validate()]);
27
+ return {driverConfig, pluginConfig};
28
+ }
29
+
30
+ /**
31
+ * Find any plugin name which has been installed, and which has been requested for activation by
32
+ * using the --use-plugins flag, and turn each one into its class, so we can send them as objects
33
+ * to the server init. We also want to send/assign them to the umbrella driver so it can use them
34
+ * to wrap command execution
35
+ *
36
+ * @param {import('./plugin-config').PluginConfig} pluginConfig - a plugin extension config
37
+ * @param {string[]} usePlugins
38
+ * @returns {PluginNameMap} Mapping of PluginClass to name
39
+ */
40
+ export function getActivePlugins(pluginConfig, usePlugins = []) {
41
+ return new Map(
42
+ _.compact(
43
+ Object.keys(pluginConfig.installedExtensions)
44
+ .filter(
45
+ (pluginName) =>
46
+ _.includes(usePlugins, pluginName) ||
47
+ (usePlugins.length === 1 && usePlugins[0] === USE_ALL_PLUGINS)
48
+ )
49
+ .map((pluginName) => {
50
+ try {
51
+ log.info(`Attempting to load plugin ${pluginName}...`);
52
+ const PluginClass = pluginConfig.require(pluginName);
53
+ return [PluginClass, pluginName];
54
+ } catch (err) {
55
+ log.error(
56
+ `Could not load plugin '${pluginName}', so it will not be available. Error ` +
57
+ `in loading the plugin was: ${err.message}`
58
+ );
59
+ log.debug(err.stack);
60
+ }
61
+ })
62
+ )
63
+ );
64
+ }
65
+
66
+ /**
67
+ * Find any driver name which has been installed, and turn each one into its class, so we can send
68
+ * them as objects to the server init in case they need to add methods/routes or update the server.
69
+ * If the --drivers flag was given, this method only loads the given drivers.
70
+ *
71
+ * @param {import('./driver-config').DriverConfig} driverConfig - a driver extension config
72
+ * @param {string[]} [useDrivers] - optional list of drivers to load
73
+ * @returns {DriverNameMap}
74
+ */
75
+ export function getActiveDrivers(driverConfig, useDrivers = []) {
76
+ return new Map(
77
+ _.compact(
78
+ Object.keys(driverConfig.installedExtensions)
79
+ .filter((driverName) => _.includes(useDrivers, driverName) || useDrivers.length === 0)
80
+ .map((driverName) => {
81
+ try {
82
+ log.info(`Attempting to load driver ${driverName}...`);
83
+ const DriverClass = driverConfig.require(driverName);
84
+ return [DriverClass, driverName];
85
+ } catch (err) {
86
+ log.error(
87
+ `Could not load driver '${driverName}', so it will not be available. Error ` +
88
+ `in loading the driver was: ${err.message}`
89
+ );
90
+ log.debug(err.stack);
91
+ }
92
+ })
93
+ )
94
+ );
95
+ }
96
+
97
+ /**
98
+ * A mapping of {@linkcode PluginClass} classes to their names.
99
+ * @typedef {Map<PluginClass,string>} PluginNameMap
100
+ */
101
+
102
+ /**
103
+ * A mapping of {@linkcode DriverClass} classes to their names.
104
+ * @typedef {Map<DriverClass,string>} DriverNameMap
105
+ */
106
+
107
+ /**
108
+ * @typedef {import('@appium/types').PluginClass} PluginClass
109
+ * @typedef {import('@appium/types').DriverClass} DriverClass
110
+ */
111
+
112
+ /**
113
+ * @typedef ExtensionConfigs
114
+ * @property {import('./driver-config').DriverConfig} driverConfig
115
+ * @property {import('./plugin-config').PluginConfig} pluginConfig
116
+ */
@@ -0,0 +1,136 @@
1
+ import {CURRENT_SCHEMA_REV, DRIVER_TYPE, PLUGIN_TYPE} from '../constants';
2
+ import log from '../logger';
3
+
4
+ /**
5
+ * This contains logic to migrate old versions of `extensions.yaml` to new versions.
6
+ *
7
+ * @module
8
+ */
9
+
10
+ /**
11
+ * Constant for v3 of the schema rev.
12
+ */
13
+ const SCHEMA_REV_3 = 3;
14
+
15
+ /**
16
+ * Constant for v4 of the schema rev.
17
+ */
18
+ const SCHEMA_REV_4 = 4;
19
+
20
+ /**
21
+ * Collection of functions to migrate from one version to another.
22
+ *
23
+ * These functions _should not actually perform the migration_; rather, they
24
+ * should return `true` if the migration should be performed. The migration
25
+ * itself will happen within {@linkcode Manifest.syncWithInstalledExtensions}; the extensions
26
+ * will be checked and the manifest file updated per the state of the filesystem.
27
+ *
28
+ * @type { {[P in keyof ManifestDataVersions]?: Migration} }
29
+ */
30
+ const Migrations = {
31
+ /**
32
+ * If `installPath` is missing from the `ExtManifest` for any extension, return `true`.
33
+ *
34
+ * We cannot easily determine the path of any given extension here, but returning `true`
35
+ * will cause the `Manifest` to sync with the filesystem, which will populate the missing field.
36
+ *
37
+ * @type {Migration}
38
+ */
39
+ [SCHEMA_REV_3]: (manifest) => {
40
+ /** @type {Array<ExtManifest<PluginType>|ExtManifest<DriverType>>} */
41
+ const allExtData = [
42
+ ...Object.values(manifest.getExtensionData(DRIVER_TYPE)),
43
+ ...Object.values(manifest.getExtensionData(PLUGIN_TYPE)),
44
+ ];
45
+ return allExtData.some((metadata) => !('installPath' in metadata));
46
+ },
47
+ /**
48
+ * Updates installed extensions to use `InstallType` of `dev` if appropriate.
49
+ *
50
+ * Previously, these types of extensions (automatically discovered) would use the default `InstallType` of `npm`, so we need
51
+ * to refresh any with this install type.
52
+ *
53
+ * This should only happen once; we do not want to re-check everything with `npm` install type
54
+ * every time.
55
+ * @type {Migration}
56
+ */
57
+ [SCHEMA_REV_4]: (manifest) => {
58
+ if (manifest.schemaRev < SCHEMA_REV_4) {
59
+ const allExtData = [
60
+ ...Object.values(manifest.getExtensionData(DRIVER_TYPE)),
61
+ ...Object.values(manifest.getExtensionData(PLUGIN_TYPE)),
62
+ ];
63
+ return allExtData.some((metadata) => metadata.installType === 'npm');
64
+ }
65
+ return false;
66
+ },
67
+ };
68
+
69
+ /**
70
+ * Set `schemaRev` to a specific version.
71
+ *
72
+ * This _does_ mutate `data` in-place, unlike functions in
73
+ * {@linkcode Migrations}.
74
+ *
75
+ * Again, returning `true` means that the manifest should be--at
76
+ * minimum--persisted to disk, since we changed it.
77
+ * @param {Readonly<Manifest>} manifest
78
+ * @param {keyof ManifestDataVersions} version
79
+ * @returns {boolean} Whether the data was modified
80
+ */
81
+ function setSchemaRev(manifest, version) {
82
+ if ((manifest.schemaRev ?? 0) < version) {
83
+ manifest.setSchemaRev(version);
84
+ return true;
85
+ }
86
+ return false;
87
+ }
88
+
89
+ /**
90
+ * Applies a series of migration functions to a manifest to update its manifest schema version.
91
+ *
92
+ * `data` is modified in-place.
93
+ *
94
+ * @param {Readonly<Manifest>} manifest
95
+ * @returns {Promise<boolean>} If `true` existing packages should be synced from disk and the manifest should be persisted.
96
+ */
97
+ export async function migrate(manifest) {
98
+ let didChange = false;
99
+ for await (const migration of Object.values(Migrations)) {
100
+ didChange = (await migration(manifest)) || didChange;
101
+ }
102
+ didChange = setSchemaRev(manifest, CURRENT_SCHEMA_REV) || didChange;
103
+ if (didChange) {
104
+ // this is not _technically_ true, since we don't actually write the file here.
105
+ log.debug(`Upgraded extension manifest to schema v${manifest.schemaRev}`);
106
+ }
107
+
108
+ return didChange;
109
+ }
110
+
111
+ /**
112
+ * A migration function. It will return `true` if a change _should be made_.
113
+ *
114
+ * A migration function should not modify `schemaRev`, as this is done automatically.
115
+ *
116
+ * Note that at the time of writing, we're not able to determine the version of the _current_ manifest file if there is no `schemaRev` prop present (and we may not want to trust it anyway).
117
+ * @callback Migration
118
+ * @param {Readonly<Manifest>} manifest - The `Manifest` instance
119
+ * @returns {boolean|Promise<boolean>} If `true`, then something changed
120
+ */
121
+
122
+ /**
123
+ * @typedef {import('appium/types').ManifestData} ManifestData
124
+ * @typedef {import('@appium/types').DriverType} DriverType
125
+ * @typedef {import('@appium/types').PluginType} PluginType
126
+ * @typedef {import('appium/types').AnyManifestDataVersion} AnyManifestDataVersion
127
+ * @typedef {import('appium/types').ManifestDataVersions} ManifestDataVersions
128
+ * @typedef {import('@appium/types').ExtensionType} ExtensionType
129
+ * @typedef {import('appium/types').ManifestV2.ManifestData} ManifestDataV2
130
+ * @typedef {import('./manifest').Manifest} Manifest
131
+ */
132
+
133
+ /**
134
+ * @template {ExtensionType} ExtType
135
+ * @typedef {import('appium/types').ExtManifest<ExtType>} ExtManifest
136
+ */