appium 3.5.0 → 3.5.2
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.
- package/build/lib/appium.d.ts.map +1 -1
- package/build/lib/appium.js +43 -45
- package/build/lib/appium.js.map +1 -1
- package/build/lib/bidi-commands.d.ts.map +1 -1
- package/build/lib/bidi-commands.js +34 -29
- package/build/lib/bidi-commands.js.map +1 -1
- package/build/lib/bootstrap/appium-initializer.d.ts.map +1 -1
- package/build/lib/bootstrap/appium-initializer.js +13 -13
- package/build/lib/bootstrap/appium-initializer.js.map +1 -1
- package/build/lib/bootstrap/appium-main-runner.d.ts.map +1 -1
- package/build/lib/bootstrap/appium-main-runner.js +2 -2
- package/build/lib/bootstrap/appium-main-runner.js.map +1 -1
- package/build/lib/bootstrap/config-file.d.ts.map +1 -1
- package/build/lib/bootstrap/config-file.js +11 -11
- package/build/lib/bootstrap/config-file.js.map +1 -1
- package/build/lib/bootstrap/grid-v3-register.d.ts.map +1 -1
- package/build/lib/bootstrap/grid-v3-register.js +9 -6
- package/build/lib/bootstrap/grid-v3-register.js.map +1 -1
- package/build/lib/bootstrap/main-helpers.d.ts +1 -1
- package/build/lib/bootstrap/main-helpers.d.ts.map +1 -1
- package/build/lib/bootstrap/main-helpers.js +19 -20
- package/build/lib/bootstrap/main-helpers.js.map +1 -1
- package/build/lib/bootstrap/node-helpers.d.ts +1 -1
- package/build/lib/bootstrap/node-helpers.d.ts.map +1 -1
- package/build/lib/bootstrap/node-helpers.js +7 -14
- package/build/lib/bootstrap/node-helpers.js.map +1 -1
- package/build/lib/bootstrap/startup-config.d.ts.map +1 -1
- package/build/lib/bootstrap/startup-config.js +32 -30
- package/build/lib/bootstrap/startup-config.js.map +1 -1
- package/build/lib/cli/args.d.ts +3 -2
- package/build/lib/cli/args.d.ts.map +1 -1
- package/build/lib/cli/args.js +2 -5
- package/build/lib/cli/args.js.map +1 -1
- package/build/lib/cli/driver-command.d.ts +1 -2
- package/build/lib/cli/driver-command.d.ts.map +1 -1
- package/build/lib/cli/driver-command.js +7 -8
- package/build/lib/cli/driver-command.js.map +1 -1
- package/build/lib/cli/extension-command.d.ts +2 -2
- package/build/lib/cli/extension-command.d.ts.map +1 -1
- package/build/lib/cli/extension-command.js +100 -66
- package/build/lib/cli/extension-command.js.map +1 -1
- package/build/lib/cli/extension.d.ts.map +1 -1
- package/build/lib/cli/extension.js.map +1 -1
- package/build/lib/cli/parser.d.ts.map +1 -1
- package/build/lib/cli/parser.js +21 -14
- package/build/lib/cli/parser.js.map +1 -1
- package/build/lib/cli/plugin-command.d.ts +1 -1
- package/build/lib/cli/plugin-command.d.ts.map +1 -1
- package/build/lib/cli/plugin-command.js +5 -5
- package/build/lib/cli/plugin-command.js.map +1 -1
- package/build/lib/cli/setup-command.d.ts +1 -1
- package/build/lib/cli/setup-command.d.ts.map +1 -1
- package/build/lib/cli/setup-command.js +14 -19
- package/build/lib/cli/setup-command.js.map +1 -1
- package/build/lib/cli/utils.d.ts.map +1 -1
- package/build/lib/cli/utils.js +3 -2
- package/build/lib/cli/utils.js.map +1 -1
- package/build/lib/doctor/doctor.d.ts +0 -1
- package/build/lib/doctor/doctor.d.ts.map +1 -1
- package/build/lib/doctor/doctor.js +12 -17
- package/build/lib/doctor/doctor.js.map +1 -1
- package/build/lib/extension/driver-config.d.ts.map +1 -1
- package/build/lib/extension/driver-config.js +11 -12
- package/build/lib/extension/driver-config.js.map +1 -1
- package/build/lib/extension/extension-config.d.ts.map +1 -1
- package/build/lib/extension/extension-config.js +28 -27
- package/build/lib/extension/extension-config.js.map +1 -1
- package/build/lib/extension/index.d.ts.map +1 -1
- package/build/lib/extension/index.js +13 -16
- package/build/lib/extension/index.js.map +1 -1
- package/build/lib/extension/manifest.d.ts +3 -2
- package/build/lib/extension/manifest.d.ts.map +1 -1
- package/build/lib/extension/manifest.js +19 -22
- package/build/lib/extension/manifest.js.map +1 -1
- package/build/lib/extension/plugin-config.d.ts.map +1 -1
- package/build/lib/extension/plugin-config.js +7 -9
- package/build/lib/extension/plugin-config.js.map +1 -1
- package/build/lib/helpers/build.d.ts +0 -1
- package/build/lib/helpers/build.d.ts.map +1 -1
- package/build/lib/helpers/build.js +2 -4
- package/build/lib/helpers/build.js.map +1 -1
- package/build/lib/helpers/capability.d.ts.map +1 -1
- package/build/lib/helpers/capability.js +27 -22
- package/build/lib/helpers/capability.js.map +1 -1
- package/build/lib/helpers/network.d.ts.map +1 -1
- package/build/lib/helpers/network.js +4 -3
- package/build/lib/helpers/network.js.map +1 -1
- package/build/lib/insecure-features.d.ts.map +1 -1
- package/build/lib/insecure-features.js +9 -13
- package/build/lib/insecure-features.js.map +1 -1
- package/build/lib/inspector-commands.d.ts.map +1 -1
- package/build/lib/inspector-commands.js +29 -28
- package/build/lib/inspector-commands.js.map +1 -1
- package/build/lib/logsink.d.ts.map +1 -1
- package/build/lib/logsink.js +8 -7
- package/build/lib/logsink.js.map +1 -1
- package/build/lib/schema/arg-spec.d.ts.map +1 -1
- package/build/lib/schema/arg-spec.js +5 -8
- package/build/lib/schema/arg-spec.js.map +1 -1
- package/build/lib/schema/cli-args.d.ts.map +1 -1
- package/build/lib/schema/cli-args.js +20 -19
- package/build/lib/schema/cli-args.js.map +1 -1
- package/build/lib/schema/cli-transformers.d.ts.map +1 -1
- package/build/lib/schema/cli-transformers.js.map +1 -1
- package/build/lib/schema/schema.d.ts.map +1 -1
- package/build/lib/schema/schema.js +28 -21
- package/build/lib/schema/schema.js.map +1 -1
- package/build/lib/utils/hash.d.ts +5 -0
- package/build/lib/utils/hash.d.ts.map +1 -0
- package/build/lib/{utils.js → utils/hash.js} +3 -21
- package/build/lib/utils/hash.js.map +1 -0
- package/build/lib/utils/index.d.ts +8 -0
- package/build/lib/utils/index.d.ts.map +1 -0
- package/build/lib/utils/index.js +31 -0
- package/build/lib/utils/index.js.map +1 -0
- package/build/lib/utils/is-package-changed.d.ts +16 -0
- package/build/lib/utils/is-package-changed.d.ts.map +1 -0
- package/build/lib/utils/is-package-changed.js +62 -0
- package/build/lib/utils/is-package-changed.js.map +1 -0
- package/build/lib/utils/object.d.ts +120 -0
- package/build/lib/utils/object.d.ts.map +1 -0
- package/build/lib/utils/object.js +288 -0
- package/build/lib/utils/object.js.map +1 -0
- package/build/lib/{extension → utils}/package-changed.d.ts +0 -1
- package/build/lib/utils/package-changed.d.ts.map +1 -0
- package/build/lib/{extension → utils}/package-changed.js +3 -4
- package/build/lib/utils/package-changed.js.map +1 -0
- package/build/lib/utils/package-json.d.ts +9 -0
- package/build/lib/utils/package-json.d.ts.map +1 -0
- package/build/lib/utils/package-json.js +32 -0
- package/build/lib/utils/package-json.js.map +1 -0
- package/build/lib/utils/resolve-from.d.ts +11 -0
- package/build/lib/utils/resolve-from.d.ts.map +1 -0
- package/build/lib/utils/resolve-from.js +41 -0
- package/build/lib/utils/resolve-from.js.map +1 -0
- package/build/types/cli.d.ts.map +1 -1
- package/build/types/index.d.ts.map +1 -1
- package/build/types/manifest/base.d.ts.map +1 -1
- package/build/types/manifest/v3.d.ts.map +1 -1
- package/build/types/manifest/v4.d.ts.map +1 -1
- package/lib/appium.ts +59 -55
- package/lib/bidi-commands.ts +106 -60
- package/lib/bootstrap/appium-initializer.ts +27 -19
- package/lib/bootstrap/appium-main-runner.ts +8 -4
- package/lib/bootstrap/config-file.ts +33 -16
- package/lib/bootstrap/grid-v3-register.ts +26 -19
- package/lib/bootstrap/main-helpers.ts +25 -19
- package/lib/bootstrap/node-helpers.ts +19 -22
- package/lib/bootstrap/startup-config.ts +42 -39
- package/lib/cli/args.ts +3 -4
- package/lib/cli/driver-command.ts +19 -13
- package/lib/cli/extension-command.ts +208 -143
- package/lib/cli/extension.ts +4 -6
- package/lib/cli/parser.ts +32 -30
- package/lib/cli/plugin-command.ts +20 -9
- package/lib/cli/setup-command.ts +54 -39
- package/lib/cli/utils.ts +4 -3
- package/lib/doctor/doctor.ts +15 -17
- package/lib/extension/driver-config.ts +22 -17
- package/lib/extension/extension-config.ts +74 -66
- package/lib/extension/index.ts +42 -25
- package/lib/extension/manifest.ts +34 -31
- package/lib/extension/plugin-config.ts +15 -10
- package/lib/helpers/build.ts +6 -5
- package/lib/helpers/capability.ts +40 -35
- package/lib/helpers/network.ts +6 -5
- package/lib/insecure-features.ts +16 -14
- package/lib/inspector-commands.ts +72 -40
- package/lib/logsink.ts +22 -26
- package/lib/schema/arg-spec.ts +9 -8
- package/lib/schema/cli-args-guards.ts +4 -4
- package/lib/schema/cli-args.ts +25 -21
- package/lib/schema/cli-transformers.ts +6 -2
- package/lib/schema/format-errors.ts +1 -1
- package/lib/schema/schema.ts +52 -38
- package/lib/{utils.ts → utils/hash.ts} +2 -19
- package/lib/utils/index.ts +23 -0
- package/lib/utils/is-package-changed.ts +78 -0
- package/lib/utils/object.ts +312 -0
- package/lib/{extension → utils}/package-changed.ts +6 -7
- package/lib/utils/package-json.ts +36 -0
- package/lib/utils/resolve-from.ts +40 -0
- package/package.json +13 -16
- package/scripts/autoinstall-extensions.js +8 -8
- package/tsconfig.json +8 -2
- package/types/cli.ts +18 -18
- package/types/index.ts +2 -2
- package/types/manifest/base.ts +2 -2
- package/types/manifest/v3.ts +2 -2
- package/types/manifest/v4.ts +2 -2
- package/build/lib/extension/package-changed.d.ts.map +0 -1
- package/build/lib/extension/package-changed.js.map +0 -1
- package/build/lib/utils.d.ts +0 -13
- package/build/lib/utils.d.ts.map +0 -1
- package/build/lib/utils.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-helpers.js","sourceRoot":"","sources":["../../../lib/bootstrap/node-helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"node-helpers.js","sourceRoot":"","sources":["../../../lib/bootstrap/node-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startup-config.d.ts","sourceRoot":"","sources":["../../../lib/bootstrap/startup-config.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"startup-config.d.ts","sourceRoot":"","sources":["../../../lib/bootstrap/startup-config.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,eAAe,CAAC;AAQxD;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,IAAI,GAAG,IAAI,CAyE9D;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,UAAU,CACxB,6BAA6B,EAAE,OAAO,CAAC,IAAI,CAAC,EAC5C,YAAY,EAAE,oBAAoB,EAClC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,EACvB,UAAU,EAAE,IAAI,GACf,IAAI,CAmBN"}
|
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.getNonDefaultServerArgs = getNonDefaultServerArgs;
|
|
7
4
|
exports.showConfig = showConfig;
|
|
8
5
|
/* eslint-disable no-console */
|
|
9
|
-
const
|
|
6
|
+
const support_1 = require("@appium/support");
|
|
10
7
|
const schema_1 = require("../schema/schema");
|
|
8
|
+
const utils_1 = require("../utils");
|
|
11
9
|
/**
|
|
12
10
|
* Returns key/value pairs of server arguments that differ from schema defaults (flattened comparison).
|
|
13
11
|
*
|
|
@@ -20,9 +18,10 @@ function getNonDefaultServerArgs(parsedArgs) {
|
|
|
20
18
|
*/
|
|
21
19
|
const flatten = (args) => {
|
|
22
20
|
const argSpecs = (0, schema_1.getAllArgSpecs)();
|
|
23
|
-
const flattened =
|
|
24
|
-
|
|
25
|
-
|
|
21
|
+
const flattened = [...argSpecs.values()].reduce((acc, argSpec) => {
|
|
22
|
+
const value = (0, utils_1.getPath)(args, argSpec.dest);
|
|
23
|
+
if (value !== undefined) {
|
|
24
|
+
acc[argSpec.dest] = { value, argSpec };
|
|
26
25
|
}
|
|
27
26
|
return acc;
|
|
28
27
|
}, {});
|
|
@@ -31,17 +30,13 @@ function getNonDefaultServerArgs(parsedArgs) {
|
|
|
31
30
|
const args = flatten(parsedArgs);
|
|
32
31
|
// hopefully these function names are descriptive enough
|
|
33
32
|
const typesDiffer = (dest) => typeof args[dest].value !== typeof defaultsFromSchema[dest];
|
|
34
|
-
const defaultValueIsArray = (dest) =>
|
|
35
|
-
const argsValueIsArray = (dest) =>
|
|
36
|
-
const arraysDiffer = (dest) =>
|
|
33
|
+
const defaultValueIsArray = (dest) => Array.isArray(defaultsFromSchema[dest]);
|
|
34
|
+
const argsValueIsArray = (dest) => Array.isArray(args[dest].value);
|
|
35
|
+
const arraysDiffer = (dest) => (0, utils_1.difference)(args[dest].value, defaultsFromSchema[dest]).length > 0;
|
|
37
36
|
const valuesDiffer = (dest) => args[dest].value !== defaultsFromSchema[dest];
|
|
38
|
-
const defaultIsDefined = (dest) =>
|
|
39
|
-
|
|
40
|
-
const
|
|
41
|
-
const defaultValueNotArrayAndValuesDiffer = lodash_1.default.overEvery([
|
|
42
|
-
lodash_1.default.negate(defaultValueIsArray),
|
|
43
|
-
valuesDiffer,
|
|
44
|
-
]);
|
|
37
|
+
const defaultIsDefined = (dest) => defaultsFromSchema[dest] !== undefined;
|
|
38
|
+
const argValueNotArrayOrArraysDiffer = (dest) => !argsValueIsArray(dest) || arraysDiffer(dest);
|
|
39
|
+
const defaultValueNotArrayAndValuesDiffer = (dest) => !defaultValueIsArray(dest) && valuesDiffer(dest);
|
|
45
40
|
/**
|
|
46
41
|
* This used to be a hideous conditional, but it's broken up into a hideous function instead.
|
|
47
42
|
* hopefully this makes things a little more understandable.
|
|
@@ -53,18 +48,21 @@ function getNonDefaultServerArgs(parsedArgs) {
|
|
|
53
48
|
* - ensures the args value is an array
|
|
54
49
|
* - ensures the args values do not differ from the default values
|
|
55
50
|
*/
|
|
56
|
-
const isNotDefault =
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
lodash_1.default.overEvery([defaultValueIsArray, argValueNotArrayOrArraysDiffer]),
|
|
61
|
-
defaultValueNotArrayAndValuesDiffer,
|
|
62
|
-
]),
|
|
63
|
-
]);
|
|
51
|
+
const isNotDefault = (dest) => defaultIsDefined(dest) &&
|
|
52
|
+
(typesDiffer(dest) ||
|
|
53
|
+
(defaultValueIsArray(dest) && argValueNotArrayOrArraysDiffer(dest)) ||
|
|
54
|
+
defaultValueNotArrayAndValuesDiffer(dest));
|
|
64
55
|
const defaultsFromSchema = (0, schema_1.getDefaultsForSchema)(true);
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
(
|
|
56
|
+
const nonDefault = (0, utils_1.pickBy)(args, (_v, key) => isNotDefault(String(key)));
|
|
57
|
+
const result = {};
|
|
58
|
+
for (const entry of Object.values(nonDefault)) {
|
|
59
|
+
if (!entry) {
|
|
60
|
+
continue;
|
|
61
|
+
}
|
|
62
|
+
const { value, argSpec } = entry;
|
|
63
|
+
(0, utils_1.setPath)(result, argSpec.dest, value);
|
|
64
|
+
}
|
|
65
|
+
return result;
|
|
68
66
|
}
|
|
69
67
|
/**
|
|
70
68
|
* Prints a breakdown of configuration: defaults, config file, CLI/programmatic overrides, and final merged args.
|
|
@@ -90,7 +88,7 @@ function showConfig(nonDefaultPreConfigParsedArgs, configResult, defaults, parse
|
|
|
90
88
|
console.log(`\n(no configuration file loaded)`);
|
|
91
89
|
}
|
|
92
90
|
const compactedNonDefaultPreConfigArgs = compactConfig(nonDefaultPreConfigParsedArgs);
|
|
93
|
-
if (
|
|
91
|
+
if (support_1.util.isEmpty(compactedNonDefaultPreConfigArgs)) {
|
|
94
92
|
console.log(`\n(no CLI parameters provided)`);
|
|
95
93
|
}
|
|
96
94
|
else {
|
|
@@ -107,5 +105,9 @@ function showConfig(nonDefaultPreConfigParsedArgs, configResult, defaults, parse
|
|
|
107
105
|
* 3. Removes empty objects (but not `false` values)
|
|
108
106
|
* Does not operate recursively.
|
|
109
107
|
*/
|
|
110
|
-
|
|
108
|
+
function compactConfig(obj) {
|
|
109
|
+
return (0, utils_1.pickBy)(obj, (value, key) => key !== 'subcommand' &&
|
|
110
|
+
value !== undefined &&
|
|
111
|
+
!(value !== null && typeof value === 'object' && support_1.util.isEmpty(value)));
|
|
112
|
+
}
|
|
111
113
|
//# sourceMappingURL=startup-config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startup-config.js","sourceRoot":"","sources":["../../../lib/bootstrap/startup-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"startup-config.js","sourceRoot":"","sources":["../../../lib/bootstrap/startup-config.ts"],"names":[],"mappings":"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"}
|
package/build/lib/cli/args.d.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import _ from 'lodash';
|
|
2
1
|
import type { ArgumentOptions } from 'argparse';
|
|
3
2
|
import type { ExtensionType } from '@appium/types';
|
|
4
3
|
import type { CliExtensionSubcommand } from 'appium/types';
|
|
@@ -10,7 +9,9 @@ export type ArgumentDefinitions = Map<[
|
|
|
10
9
|
*
|
|
11
10
|
* The result is memoized because parser setup is static across process lifetime.
|
|
12
11
|
*/
|
|
13
|
-
export declare const getExtensionArgs: (() => Record<ExtensionType, Record<CliExtensionSubcommand, ArgumentDefinitions>>) &
|
|
12
|
+
export declare const getExtensionArgs: (() => Record<ExtensionType, Record<CliExtensionSubcommand, ArgumentDefinitions>>) & {
|
|
13
|
+
cache: Map<unknown, Record<ExtensionType, Record<CliExtensionSubcommand, ArgumentDefinitions>>>;
|
|
14
|
+
};
|
|
14
15
|
/**
|
|
15
16
|
* Returns CLI argument definitions for the `server` command.
|
|
16
17
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"args.d.ts","sourceRoot":"","sources":["../../../lib/cli/args.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"args.d.ts","sourceRoot":"","sources":["../../../lib/cli/args.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,UAAU,CAAC;AAC9C,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAC,sBAAsB,EAAC,MAAM,cAAc,CAAC;AAgBzD,MAAM,MAAM,mBAAmB,GAAG,GAAG,CACnC;IAAC,IAAI,EAAE,MAAM;CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,EAC9C,eAAe,CAChB,CAAC;AAwBF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,SAA6C,MAAM,CAC9E,aAAa,EACb,MAAM,CAAC,sBAAsB,EAAE,mBAAmB,CAAC,CACpD;;CAgBC,CAAC;AAEH;;;;;GAKG;AACH,wBAAgB,aAAa,IAAI,mBAAmB,CAEnD"}
|
package/build/lib/cli/args.js
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.getExtensionArgs = void 0;
|
|
7
4
|
exports.getServerArgs = getServerArgs;
|
|
8
|
-
const
|
|
5
|
+
const support_1 = require("@appium/support");
|
|
9
6
|
const constants_1 = require("../constants");
|
|
10
7
|
const extension_config_1 = require("../extension/extension-config");
|
|
11
8
|
const cli_args_1 = require("../schema/cli-args");
|
|
@@ -35,7 +32,7 @@ const globalExtensionArgs = new Map([
|
|
|
35
32
|
*
|
|
36
33
|
* The result is memoized because parser setup is static across process lifetime.
|
|
37
34
|
*/
|
|
38
|
-
exports.getExtensionArgs =
|
|
35
|
+
exports.getExtensionArgs = support_1.util.memoize(function getExtensionArgs() {
|
|
39
36
|
const extensionArgs = {};
|
|
40
37
|
for (const type of EXTENSION_TYPES) {
|
|
41
38
|
extensionArgs[type] = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"args.js","sourceRoot":"","sources":["../../../lib/cli/args.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"args.js","sourceRoot":"","sources":["../../../lib/cli/args.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import type { ExtMetadata, ExtRecord, InstallType } from 'appium/types';
|
|
2
2
|
import ExtensionCliCommand from './extension-command';
|
|
3
3
|
import type { ExtensionArgs, ExtensionCommandOptions, ExtensionUpdateResult, PostInstallText, RunOutput } from './extension-command';
|
|
4
|
-
import '@colors/colors';
|
|
5
4
|
type DriverInstallOpts = {
|
|
6
5
|
driver: string;
|
|
7
6
|
installType: InstallType;
|
|
@@ -29,7 +28,7 @@ export default class DriverCliCommand extends ExtensionCliCommand<'driver'> {
|
|
|
29
28
|
*
|
|
30
29
|
* @param opts - install options
|
|
31
30
|
*/
|
|
32
|
-
install({ driver, installType, packageName }: DriverInstallOpts): Promise<ExtRecord<'driver'>>;
|
|
31
|
+
install({ driver, installType, packageName, }: DriverInstallOpts): Promise<ExtRecord<'driver'>>;
|
|
33
32
|
/**
|
|
34
33
|
* Uninstall a driver
|
|
35
34
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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;
|
|
1
|
+
{"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;AAG7B,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,EACZ,MAAM,EACN,WAAW,EACX,WAAW,GACZ,EAAE,iBAAiB,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAQnD;;;;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,CAC9B,cAAc,EAAE,WAAW,CAAC,QAAQ,CAAC,EACrC,WAAW,EAAE,MAAM,GAClB,IAAI;CAcR"}
|
|
@@ -3,10 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const
|
|
6
|
+
const support_1 = require("@appium/support");
|
|
7
7
|
const extension_command_1 = __importDefault(require("./extension-command"));
|
|
8
8
|
const constants_1 = require("../constants");
|
|
9
|
-
require("@colors/colors");
|
|
10
9
|
const REQ_DRIVER_FIELDS = ['driverName', 'automationName', 'platformNames', 'mainClass'];
|
|
11
10
|
class DriverCliCommand extends extension_command_1.default {
|
|
12
11
|
constructor({ config, json }) {
|
|
@@ -18,7 +17,7 @@ class DriverCliCommand extends extension_command_1.default {
|
|
|
18
17
|
*
|
|
19
18
|
* @param opts - install options
|
|
20
19
|
*/
|
|
21
|
-
async install({ driver, installType, packageName }) {
|
|
20
|
+
async install({ driver, installType, packageName, }) {
|
|
22
21
|
return await super._install({
|
|
23
22
|
installSpec: driver,
|
|
24
23
|
installType,
|
|
@@ -74,9 +73,9 @@ class DriverCliCommand extends extension_command_1.default {
|
|
|
74
73
|
* @returns formatted success text
|
|
75
74
|
*/
|
|
76
75
|
getPostInstallText({ extName, extData }) {
|
|
77
|
-
return (`Driver ${extName}@${extData.version} successfully installed\n
|
|
78
|
-
`- automationName: ${extData.automationName
|
|
79
|
-
`- platformNames: ${JSON.stringify(extData.platformNames)
|
|
76
|
+
return (`${support_1.console.styleText('green', `Driver ${extName}@${extData.version} successfully installed`)}\n` +
|
|
77
|
+
`- automationName: ${support_1.console.styleText('green', extData.automationName)}\n` +
|
|
78
|
+
`- platformNames: ${support_1.console.styleText('green', JSON.stringify(extData.platformNames))}`);
|
|
80
79
|
}
|
|
81
80
|
/**
|
|
82
81
|
* Validates fields in `appium` field of `driverMetadata`
|
|
@@ -88,8 +87,8 @@ class DriverCliCommand extends extension_command_1.default {
|
|
|
88
87
|
* @param installSpec - install spec from CLI
|
|
89
88
|
*/
|
|
90
89
|
validateExtensionFields(driverMetadata, installSpec) {
|
|
91
|
-
const missingFields = REQ_DRIVER_FIELDS.reduce((acc, field) =>
|
|
92
|
-
if (!
|
|
90
|
+
const missingFields = REQ_DRIVER_FIELDS.reduce((acc, field) => driverMetadata[field] ? acc : [...acc, field], []);
|
|
91
|
+
if (!support_1.util.isEmpty(missingFields)) {
|
|
93
92
|
throw new Error(`Driver "${installSpec}" did not expose correct fields for compatibility ` +
|
|
94
93
|
`with Appium. Missing fields: ${JSON.stringify(missingFields)}`);
|
|
95
94
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver-command.js","sourceRoot":"","sources":["../../../lib/cli/driver-command.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"driver-command.js","sourceRoot":"","sources":["../../../lib/cli/driver-command.ts"],"names":[],"mappings":";;;;;AAAA,6CAA8C;AAE9C,4EAAsD;AAQtD,4CAA2C;AAC3C,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,EACZ,MAAM,EACN,WAAW,EACX,WAAW,GACO;QAClB,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,GAAG,iBAAO,CAAC,SAAS,CAAC,OAAO,EAAE,UAAU,OAAO,IAAI,OAAO,CAAC,OAAO,yBAAyB,CAAC,IAAI;YAChG,qBAAqB,iBAAO,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,IAAI;YAC3E,oBAAoB,iBAAO,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,EAAE,CACxF,CAAC;IACJ,CAAC;IAED;;;;;;;;OAQG;IACM,uBAAuB,CAC9B,cAAqC,EACrC,WAAmB;QAEnB,MAAM,aAAa,GAAG,iBAAiB,CAAC,MAAM,CAC5C,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CACb,cAAc,CAAC,KAAoC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,EAC9E,EAAE,CACH,CAAC;QAEF,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CACb,WAAW,WAAW,oDAAoD;gBACxE,gCAAgC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAClE,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AA7GD,mCA6GC"}
|
|
@@ -167,7 +167,7 @@ declare abstract class ExtensionCliCommand<ExtType extends ExtensionType = Exten
|
|
|
167
167
|
* Build the initial list data structure from installed and known extensions
|
|
168
168
|
*
|
|
169
169
|
*/
|
|
170
|
-
protected _install({ installSpec, installType, packageName }: InstallOpts): Promise<Record<string, any>>;
|
|
170
|
+
protected _install({ installSpec, installType, packageName, }: InstallOpts): Promise<Record<string, any>>;
|
|
171
171
|
/**
|
|
172
172
|
* Uninstall an extension.
|
|
173
173
|
*
|
|
@@ -182,7 +182,7 @@ declare abstract class ExtensionCliCommand<ExtType extends ExtensionType = Exten
|
|
|
182
182
|
* Attempt to update one or more drivers using NPM
|
|
183
183
|
*
|
|
184
184
|
*/
|
|
185
|
-
protected _update({ installSpec, unsafe }: ExtensionUpdateOpts): Promise<ExtensionUpdateResult>;
|
|
185
|
+
protected _update({ installSpec, unsafe, }: ExtensionUpdateOpts): Promise<ExtensionUpdateResult>;
|
|
186
186
|
/**
|
|
187
187
|
* Given an extension name, figure out what its highest possible version upgrade is, and also the
|
|
188
188
|
* highest possible safe upgrade.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extension-command.d.ts","sourceRoot":"","sources":["../../../lib/cli/extension-command.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,YAAY,EAAE,aAAa,EAAe,MAAM,eAAe,CAAC;AAC7E,OAAO,KAAK,EACV,iBAAiB,IAAI,uBAAuB,EAC5C,WAAW,IAAI,iBAAiB,EAChC,WAAW,IAAI,iBAAiB,EAChC,cAAc,IAAI,oBAAoB,EACtC,SAAS,IAAI,eAAe,EAC5B,WAAW,EACZ,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EAAC,eAAe,IAAI,mBAAmB,EAAC,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"extension-command.d.ts","sourceRoot":"","sources":["../../../lib/cli/extension-command.ts"],"names":[],"mappings":"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"}
|