appium 2.0.0-beta.56 → 2.0.0-beta.58
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/LICENSE +1 -1
- package/README.md +6 -8
- package/build/lib/appium.d.ts +43 -35
- package/build/lib/appium.d.ts.map +1 -1
- package/build/lib/appium.js +38 -30
- package/build/lib/appium.js.map +1 -1
- package/build/lib/cli/args.d.ts.map +1 -1
- package/build/lib/cli/args.js +10 -0
- package/build/lib/cli/args.js.map +1 -1
- package/build/lib/cli/driver-command.d.ts +7 -7
- package/build/lib/cli/driver-command.d.ts.map +1 -1
- package/build/lib/cli/driver-command.js +13 -8
- package/build/lib/cli/driver-command.js.map +1 -1
- package/build/lib/cli/extension-command.d.ts +60 -43
- package/build/lib/cli/extension-command.d.ts.map +1 -1
- package/build/lib/cli/extension-command.js +133 -65
- package/build/lib/cli/extension-command.js.map +1 -1
- package/build/lib/cli/extension.d.ts +5 -5
- package/build/lib/cli/extension.d.ts.map +1 -1
- package/build/lib/cli/extension.js +1 -1
- package/build/lib/cli/extension.js.map +1 -1
- package/build/lib/cli/plugin-command.d.ts +7 -7
- package/build/lib/cli/plugin-command.d.ts.map +1 -1
- package/build/lib/cli/plugin-command.js +13 -8
- package/build/lib/cli/plugin-command.js.map +1 -1
- package/build/lib/config.d.ts +1 -1
- package/build/lib/config.d.ts.map +1 -1
- package/build/lib/config.js +3 -2
- package/build/lib/config.js.map +1 -1
- package/build/lib/constants.d.ts +8 -1
- package/build/lib/constants.d.ts.map +1 -1
- package/build/lib/constants.js +9 -2
- package/build/lib/constants.js.map +1 -1
- package/build/lib/extension/driver-config.d.ts +6 -6
- package/build/lib/extension/driver-config.d.ts.map +1 -1
- package/build/lib/extension/driver-config.js +5 -7
- package/build/lib/extension/driver-config.js.map +1 -1
- package/build/lib/extension/extension-config.d.ts +31 -10
- package/build/lib/extension/extension-config.d.ts.map +1 -1
- package/build/lib/extension/extension-config.js +44 -24
- package/build/lib/extension/extension-config.js.map +1 -1
- package/build/lib/extension/manifest-migrations.d.ts.map +1 -1
- package/build/lib/extension/manifest-migrations.js +29 -13
- package/build/lib/extension/manifest-migrations.js.map +1 -1
- package/build/lib/extension/manifest.d.ts +5 -5
- package/build/lib/extension/manifest.d.ts.map +1 -1
- package/build/lib/extension/manifest.js +19 -12
- package/build/lib/extension/manifest.js.map +1 -1
- package/build/lib/main.d.ts.map +1 -1
- package/build/lib/main.js +3 -3
- package/build/lib/main.js.map +1 -1
- package/build/lib/schema/cli-args.d.ts +1 -1
- package/build/lib/schema/cli-args.d.ts.map +1 -1
- package/build/lib/schema/cli-args.js +1 -1
- package/build/lib/utils.d.ts +118 -12
- package/build/lib/utils.d.ts.map +1 -1
- package/build/lib/utils.js +8 -10
- package/build/lib/utils.js.map +1 -1
- package/build/types/manifest/index.d.ts +4 -2
- package/build/types/manifest/index.d.ts.map +1 -1
- package/build/types/manifest/index.js +4 -2
- package/build/types/manifest/index.js.map +1 -1
- package/build/types/manifest/v4.d.ts +139 -0
- package/build/types/manifest/v4.d.ts.map +1 -0
- package/build/types/manifest/v4.js +3 -0
- package/build/types/manifest/v4.js.map +1 -0
- package/lib/appium.js +43 -32
- package/lib/cli/args.js +10 -0
- package/lib/cli/driver-command.js +13 -8
- package/lib/cli/extension-command.js +146 -75
- package/lib/cli/extension.js +5 -5
- package/lib/cli/plugin-command.js +13 -8
- package/lib/config.js +3 -2
- package/lib/constants.js +9 -1
- package/lib/extension/driver-config.js +5 -8
- package/lib/extension/extension-config.js +42 -15
- package/lib/extension/manifest-migrations.js +31 -15
- package/lib/extension/manifest.js +26 -19
- package/lib/main.js +7 -4
- package/lib/schema/cli-args.js +1 -1
- package/lib/utils.js +8 -10
- package/package.json +11 -11
- package/scripts/autoinstall-extensions.js +23 -0
- package/types/manifest/index.ts +4 -3
- package/types/manifest/v4.ts +161 -0
|
@@ -15,33 +15,52 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
15
15
|
};
|
|
16
16
|
var _ExtensionConfig_listDataCache;
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
exports.
|
|
19
|
-
const
|
|
18
|
+
exports.ExtensionConfig = exports.INSTALL_TYPES = exports.INSTALL_TYPE_DEV = exports.INSTALL_TYPE_GIT = exports.INSTALL_TYPE_GITHUB = exports.INSTALL_TYPE_LOCAL = exports.INSTALL_TYPE_NPM = void 0;
|
|
19
|
+
const support_1 = require("@appium/support");
|
|
20
20
|
const bluebird_1 = __importDefault(require("bluebird"));
|
|
21
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
21
22
|
const path_1 = __importDefault(require("path"));
|
|
22
23
|
const resolve_from_1 = __importDefault(require("resolve-from"));
|
|
23
24
|
const semver_1 = require("semver");
|
|
24
|
-
const support_1 = require("@appium/support");
|
|
25
25
|
const extension_1 = require("../cli/extension");
|
|
26
26
|
const config_1 = require("../config");
|
|
27
27
|
const logger_1 = __importDefault(require("../logger"));
|
|
28
28
|
const schema_1 = require("../schema/schema");
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
29
|
+
/**
|
|
30
|
+
* "npm" install type
|
|
31
|
+
* Used when extension was installed by npm package name
|
|
32
|
+
* @remarks _All_ extensions are installed _by_ `npm`, but only this one means the package name was
|
|
33
|
+
* used to specify it
|
|
34
|
+
*/
|
|
35
|
+
exports.INSTALL_TYPE_NPM = 'npm';
|
|
36
|
+
/**
|
|
37
|
+
* "local" install type
|
|
38
|
+
* Used when extension was installed from a local path
|
|
39
|
+
*/
|
|
40
|
+
exports.INSTALL_TYPE_LOCAL = 'local';
|
|
41
|
+
/**
|
|
42
|
+
* "github" install type
|
|
43
|
+
* Used when extension was installed via GitHub URL
|
|
44
|
+
*/
|
|
45
|
+
exports.INSTALL_TYPE_GITHUB = 'github';
|
|
46
|
+
/**
|
|
47
|
+
* "git" install type
|
|
48
|
+
* Used when extensions was installed via Git URL
|
|
49
|
+
*/
|
|
50
|
+
exports.INSTALL_TYPE_GIT = 'git';
|
|
51
|
+
/**
|
|
52
|
+
* "dev" install type
|
|
53
|
+
* Used when automatically detected as a working copy
|
|
54
|
+
*/
|
|
55
|
+
exports.INSTALL_TYPE_DEV = 'dev';
|
|
37
56
|
/** @type {Set<InstallType>} */
|
|
38
|
-
|
|
39
|
-
INSTALL_TYPE_GIT,
|
|
40
|
-
INSTALL_TYPE_GITHUB,
|
|
41
|
-
INSTALL_TYPE_LOCAL,
|
|
42
|
-
INSTALL_TYPE_NPM,
|
|
57
|
+
exports.INSTALL_TYPES = new Set([
|
|
58
|
+
exports.INSTALL_TYPE_GIT,
|
|
59
|
+
exports.INSTALL_TYPE_GITHUB,
|
|
60
|
+
exports.INSTALL_TYPE_LOCAL,
|
|
61
|
+
exports.INSTALL_TYPE_NPM,
|
|
62
|
+
exports.INSTALL_TYPE_DEV,
|
|
43
63
|
]);
|
|
44
|
-
exports.INSTALL_TYPES = INSTALL_TYPES;
|
|
45
64
|
/**
|
|
46
65
|
* This class is abstract. It should not be instantiated directly.
|
|
47
66
|
*
|
|
@@ -56,7 +75,7 @@ class ExtensionConfig {
|
|
|
56
75
|
*/
|
|
57
76
|
constructor(extensionType, manifest) {
|
|
58
77
|
/**
|
|
59
|
-
* @type {
|
|
78
|
+
* @type {import('../cli/extension-command').ExtensionList<ExtType>|undefined}
|
|
60
79
|
*/
|
|
61
80
|
_ExtensionConfig_listDataCache.set(this, void 0);
|
|
62
81
|
this.extensionType = extensionType;
|
|
@@ -201,7 +220,7 @@ class ExtensionConfig {
|
|
|
201
220
|
* This is an expensive operation, so the result is cached. Currently, there is no
|
|
202
221
|
* use case for invalidating the cache.
|
|
203
222
|
* @protected
|
|
204
|
-
* @returns {Promise<
|
|
223
|
+
* @returns {Promise<import('../cli/extension-command').ExtensionList<ExtType>>}
|
|
205
224
|
*/
|
|
206
225
|
async getListData() {
|
|
207
226
|
if (__classPrivateFieldGet(this, _ExtensionConfig_listDataCache, "f")) {
|
|
@@ -230,7 +249,7 @@ class ExtensionConfig {
|
|
|
230
249
|
if (!lodash_1.default.isString(installSpec)) {
|
|
231
250
|
invalidFields.push('installSpec');
|
|
232
251
|
}
|
|
233
|
-
if (!INSTALL_TYPES.has(installType)) {
|
|
252
|
+
if (!exports.INSTALL_TYPES.has(installType)) {
|
|
234
253
|
invalidFields.push('installType');
|
|
235
254
|
}
|
|
236
255
|
const extTypeText = lodash_1.default.capitalize(this.extensionType);
|
|
@@ -247,7 +266,8 @@ class ExtensionConfig {
|
|
|
247
266
|
const createPeerWarning = (reason) => `${extTypeText} "${extName}" (package \`${pkgName}\`) may be incompatible with the current version of Appium (v${config_1.APPIUM_VER}) due to ${reason}`;
|
|
248
267
|
if (lodash_1.default.isString(appiumVersion) && !(0, semver_1.satisfies)(config_1.APPIUM_VER, appiumVersion)) {
|
|
249
268
|
const listData = await this.getListData();
|
|
250
|
-
const extListData =
|
|
269
|
+
const extListData =
|
|
270
|
+
/** @type {import('../cli/extension-command').ExtensionListData<ExtType>} */ (listData[extName]);
|
|
251
271
|
if (extListData?.installed) {
|
|
252
272
|
const { updateVersion, upToDate } = extListData;
|
|
253
273
|
if (!upToDate) {
|
|
@@ -260,7 +280,8 @@ class ExtensionConfig {
|
|
|
260
280
|
}
|
|
261
281
|
else if (!lodash_1.default.isString(appiumVersion)) {
|
|
262
282
|
const listData = await this.getListData();
|
|
263
|
-
const extListData =
|
|
283
|
+
const extListData =
|
|
284
|
+
/** @type {import('../cli/extension-command').InstalledExtensionListData<ExtType>} */ (listData[extName]);
|
|
264
285
|
if (!extListData?.upToDate && extListData?.updateVersion) {
|
|
265
286
|
warnings.push(createPeerWarning(`an invalid or missing peer dependency on Appium. A newer version of \`${pkgName}\` is available; please attempt to upgrade "${extName}" to v${extListData.updateVersion} or newer.`));
|
|
266
287
|
}
|
|
@@ -464,6 +485,7 @@ class ExtensionConfig {
|
|
|
464
485
|
delete require.cache[reqResolved];
|
|
465
486
|
}
|
|
466
487
|
logger_1.default.debug(`Requiring ${this.extensionType} at ${reqPath}`);
|
|
488
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
467
489
|
const MainClass = require(reqPath)[mainClass];
|
|
468
490
|
if (!MainClass) {
|
|
469
491
|
throw new ReferenceError(`Could not find a class named "${mainClass}" exported by ${this.extensionType} "${extName}"`);
|
|
@@ -545,8 +567,6 @@ _ExtensionConfig_listDataCache = new WeakMap();
|
|
|
545
567
|
/**
|
|
546
568
|
* @typedef {import('@appium/types').ExtensionType} ExtensionType
|
|
547
569
|
* @typedef {import('./manifest').Manifest} Manifest
|
|
548
|
-
* @typedef {import('../cli/extension-command').ExtensionListData} ExtensionListData
|
|
549
|
-
* @typedef {import('../cli/extension-command').InstalledExtensionListData} InstalledExtensionListData
|
|
550
570
|
* @typedef {import('appium/types').InstallType} InstallType
|
|
551
571
|
*/
|
|
552
572
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extension-config.js","sourceRoot":"","sources":["../../../lib/extension/extension-config.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"extension-config.js","sourceRoot":"","sources":["../../../lib/extension/extension-config.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest-migrations.d.ts","sourceRoot":"","sources":["../../../lib/extension/manifest-migrations.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"manifest-migrations.d.ts","sourceRoot":"","sources":["../../../lib/extension/manifest-migrations.js"],"names":[],"mappings":"AAwFA;;;;;;;GAOG;AACH,kCAHW,SAAS,QAAQ,CAAC,GAChB,QAAQ,OAAO,CAAC,CAc5B;;;;;;;;mCASU,SAAS,QAAQ,CAAC,KAChB,OAAO,GAAC,QAAQ,OAAO,CAAC;2BAIxB,OAAO,cAAc,EAAE,YAAY;yBACnC,OAAO,eAAe,EAAE,UAAU;yBAClC,OAAO,eAAe,EAAE,UAAU;qCAClC,OAAO,cAAc,EAAE,sBAAsB;mCAC7C,OAAO,cAAc,EAAE,oBAAoB;4BAC3C,OAAO,eAAe,EAAE,aAAa;6BACrC,OAAO,cAAc,EAAE,UAAU,CAAC,YAAY;uBAC9C,OAAO,YAAY,EAAE,QAAQ;iFAK7B,OAAO,cAAc,EAAE,WAAW,CAAC,OAAO,CAAC"}
|
|
@@ -15,6 +15,10 @@ const logger_1 = __importDefault(require("../logger"));
|
|
|
15
15
|
* Constant for v3 of the schema rev.
|
|
16
16
|
*/
|
|
17
17
|
const SCHEMA_REV_3 = 3;
|
|
18
|
+
/**
|
|
19
|
+
* Constant for v4 of the schema rev.
|
|
20
|
+
*/
|
|
21
|
+
const SCHEMA_REV_4 = 4;
|
|
18
22
|
/**
|
|
19
23
|
* Collection of functions to migrate from one version to another.
|
|
20
24
|
*
|
|
@@ -23,7 +27,7 @@ const SCHEMA_REV_3 = 3;
|
|
|
23
27
|
* itself will happen within {@linkcode Manifest.syncWithInstalledExtensions}; the extensions
|
|
24
28
|
* will be checked and the manifest file updated per the state of the filesystem.
|
|
25
29
|
*
|
|
26
|
-
* @type {{[P in keyof ManifestDataVersions]?: Migration}}
|
|
30
|
+
* @type { {[P in keyof ManifestDataVersions]?: Migration} }
|
|
27
31
|
*/
|
|
28
32
|
const Migrations = {
|
|
29
33
|
/**
|
|
@@ -35,19 +39,32 @@ const Migrations = {
|
|
|
35
39
|
* @type {Migration}
|
|
36
40
|
*/
|
|
37
41
|
[SCHEMA_REV_3]: (manifest) => {
|
|
38
|
-
let shouldSync = false;
|
|
39
42
|
/** @type {Array<ExtManifest<PluginType>|ExtManifest<DriverType>>} */
|
|
40
43
|
const allExtData = [
|
|
41
44
|
...Object.values(manifest.getExtensionData(constants_1.DRIVER_TYPE)),
|
|
42
45
|
...Object.values(manifest.getExtensionData(constants_1.PLUGIN_TYPE)),
|
|
43
46
|
];
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
47
|
+
return allExtData.some((metadata) => !('installPath' in metadata));
|
|
48
|
+
},
|
|
49
|
+
/**
|
|
50
|
+
* Updates installed extensions to use `InstallType` of `dev` if appropriate.
|
|
51
|
+
*
|
|
52
|
+
* Previously, these types of extensions (automatically discovered) would use the default `InstallType` of `npm`, so we need
|
|
53
|
+
* to refresh any with this install type.
|
|
54
|
+
*
|
|
55
|
+
* This should only happen once; we do not want to re-check everything with `npm` install type
|
|
56
|
+
* every time.
|
|
57
|
+
* @type {Migration}
|
|
58
|
+
*/
|
|
59
|
+
[SCHEMA_REV_4]: (manifest) => {
|
|
60
|
+
if (manifest.schemaRev < SCHEMA_REV_4) {
|
|
61
|
+
const allExtData = [
|
|
62
|
+
...Object.values(manifest.getExtensionData(constants_1.DRIVER_TYPE)),
|
|
63
|
+
...Object.values(manifest.getExtensionData(constants_1.PLUGIN_TYPE)),
|
|
64
|
+
];
|
|
65
|
+
return allExtData.some((metadata) => metadata.installType === 'npm');
|
|
49
66
|
}
|
|
50
|
-
return
|
|
67
|
+
return false;
|
|
51
68
|
},
|
|
52
69
|
};
|
|
53
70
|
/**
|
|
@@ -63,7 +80,7 @@ const Migrations = {
|
|
|
63
80
|
* @returns {boolean} Whether the data was modified
|
|
64
81
|
*/
|
|
65
82
|
function setSchemaRev(manifest, version) {
|
|
66
|
-
if (manifest.schemaRev ?? 0 < version) {
|
|
83
|
+
if ((manifest.schemaRev ?? 0) < version) {
|
|
67
84
|
manifest.setSchemaRev(version);
|
|
68
85
|
return true;
|
|
69
86
|
}
|
|
@@ -79,14 +96,13 @@ function setSchemaRev(manifest, version) {
|
|
|
79
96
|
*/
|
|
80
97
|
async function migrate(manifest) {
|
|
81
98
|
let didChange = false;
|
|
82
|
-
for await (const
|
|
83
|
-
const version = /** @type {keyof ManifestDataVersions} */ (Number(v));
|
|
99
|
+
for await (const migration of Object.values(Migrations)) {
|
|
84
100
|
didChange = (await migration(manifest)) || didChange;
|
|
85
|
-
didChange = setSchemaRev(manifest, version) || didChange;
|
|
86
101
|
}
|
|
102
|
+
didChange = setSchemaRev(manifest, constants_1.CURRENT_SCHEMA_REV) || didChange;
|
|
87
103
|
if (didChange) {
|
|
88
104
|
// this is not _technically_ true, since we don't actually write the file here.
|
|
89
|
-
logger_1.default.
|
|
105
|
+
logger_1.default.debug(`Upgraded extension manifest to schema v${manifest.schemaRev}`);
|
|
90
106
|
}
|
|
91
107
|
return didChange;
|
|
92
108
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest-migrations.js","sourceRoot":"","sources":["../../../lib/extension/manifest-migrations.js"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"manifest-migrations.js","sourceRoot":"","sources":["../../../lib/extension/manifest-migrations.js"],"names":[],"mappings":";;;;;;AAAA,4CAA0E;AAC1E,uDAA4B;AAE5B;;;;GAIG;AAEH;;GAEG;AACH,MAAM,YAAY,GAAG,CAAC,CAAC;AAEvB;;GAEG;AACH,MAAM,YAAY,GAAG,CAAC,CAAC;AAEvB;;;;;;;;;GASG;AACH,MAAM,UAAU,GAAG;IACjB;;;;;;;OAOG;IACH,CAAC,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE;QAC3B,qEAAqE;QACrE,MAAM,UAAU,GAAG;YACjB,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,uBAAW,CAAC,CAAC;YACxD,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,uBAAW,CAAC,CAAC;SACzD,CAAC;QACF,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,IAAI,QAAQ,CAAC,CAAC,CAAC;IACrE,CAAC;IACD;;;;;;;;;OASG;IACH,CAAC,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE;QAC3B,IAAI,QAAQ,CAAC,SAAS,GAAG,YAAY,EAAE;YACrC,MAAM,UAAU,GAAG;gBACjB,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,uBAAW,CAAC,CAAC;gBACxD,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,uBAAW,CAAC,CAAC;aACzD,CAAC;YACF,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,WAAW,KAAK,KAAK,CAAC,CAAC;SACtE;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,SAAS,YAAY,CAAC,QAAQ,EAAE,OAAO;IACrC,IAAI,CAAC,QAAQ,CAAC,SAAS,IAAI,CAAC,CAAC,GAAG,OAAO,EAAE;QACvC,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,OAAO,CAAC,QAAQ;IACpC,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,KAAK,EAAE,MAAM,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QACvD,SAAS,GAAG,CAAC,MAAM,SAAS,CAAC,QAAQ,CAAC,CAAC,IAAI,SAAS,CAAC;KACtD;IACD,SAAS,GAAG,YAAY,CAAC,QAAQ,EAAE,8BAAkB,CAAC,IAAI,SAAS,CAAC;IACpE,IAAI,SAAS,EAAE;QACb,+EAA+E;QAC/E,gBAAG,CAAC,KAAK,CAAC,0CAA0C,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;KAC3E;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAZD,0BAYC;AAED;;;;;;;;;GASG;AAEH;;;;;;;;;GASG;AAEH;;;GAGG"}
|
|
@@ -8,10 +8,8 @@ export class Manifest {
|
|
|
8
8
|
* Returns a new or existing {@link Manifest} instance, based on the value of `appiumHome`.
|
|
9
9
|
*
|
|
10
10
|
* Maintains one instance per value of `appiumHome`.
|
|
11
|
-
* @param {string} appiumHome - Path to `APPIUM_HOME`
|
|
12
|
-
* @returns {Manifest}
|
|
13
11
|
*/
|
|
14
|
-
static getInstance: ((appiumHome:
|
|
12
|
+
static getInstance: ((appiumHome: string) => Manifest) & _.MemoizedFunction;
|
|
15
13
|
/**
|
|
16
14
|
* Sets internal data to a fresh clone of {@link INITIAL_MANIFEST_DATA}
|
|
17
15
|
*
|
|
@@ -22,9 +20,10 @@ export class Manifest {
|
|
|
22
20
|
private constructor();
|
|
23
21
|
/**
|
|
24
22
|
* Searches `APPIUM_HOME` for installed extensions and adds them to the manifest.
|
|
23
|
+
* @param {boolean} hasAppiumDependency - This affects whether or not the "dev" `InstallType` is used
|
|
25
24
|
* @returns {Promise<boolean>} `true` if any extensions were added, `false` otherwise.
|
|
26
25
|
*/
|
|
27
|
-
syncWithInstalledExtensions(): Promise<boolean>;
|
|
26
|
+
syncWithInstalledExtensions(hasAppiumDependency?: boolean): Promise<boolean>;
|
|
28
27
|
/**
|
|
29
28
|
* Returns `true` if driver with name `name` is registered.
|
|
30
29
|
* @param {string} name - Driver name
|
|
@@ -43,9 +42,10 @@ export class Manifest {
|
|
|
43
42
|
* @template {ExtensionType} ExtType
|
|
44
43
|
* @param {ExtPackageJson<ExtType>} pkgJson
|
|
45
44
|
* @param {string} pkgPath
|
|
45
|
+
* @param {typeof INSTALL_TYPE_NPM | typeof INSTALL_TYPE_DEV} [installType]
|
|
46
46
|
* @returns {boolean} - `true` if this method did anything.
|
|
47
47
|
*/
|
|
48
|
-
addExtensionFromPackage<ExtType extends import("@appium/types").ExtensionType>(pkgJson: ExtPackageJson<ExtType>, pkgPath: string): boolean;
|
|
48
|
+
addExtensionFromPackage<ExtType extends import("@appium/types").ExtensionType>(pkgJson: ExtPackageJson<ExtType>, pkgPath: string, installType?: "npm" | "dev" | undefined): boolean;
|
|
49
49
|
/**
|
|
50
50
|
* Adds an extension to the manifest as was installed by the `appium` CLI. The
|
|
51
51
|
* `extData`, `extType`, and `extName` have already been determined.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../../lib/extension/manifest.js"],"names":[],"mappings":"AAqFA;;;;GAIG;AACH;IAwDE
|
|
1
|
+
{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../../lib/extension/manifest.js"],"names":[],"mappings":"AAqFA;;;;GAIG;AACH;IAwDE;;;;OAIG;IACH,kCAEa,MAAM,KACJ,QAAQ,uBAKrB;IAzBF;;;;;;OAMG;IACH,sBAGC;IAiBD;;;;OAIG;IACH,kDAHW,OAAO,GACL,QAAQ,OAAO,CAAC,CAwE5B;IAED;;;;OAIG;IACH,gBAHW,MAAM,GACJ,OAAO,CAInB;IAED;;;;OAIG;IACH,gBAHW,MAAM,GACJ,OAAO,CAInB;IAED;;;;;;;;OAQG;IACH,0HAJW,MAAM,4CAEJ,OAAO,CA0CnB;IAED;;;;;;;;;;OAUG;IACH,mGAJW,MAAM,2DAQhB;IAED;;;OAGG;IACH,kBAFW,MAAM,OAAO,uBAAuB,EAAE,oBAAoB,QAIpE;IAED;;;;OAIG;IACH,yBAHW,aAAa,WACb,MAAM,QAIhB;IAED;;OAEG;IACH,yBAEC;IAED;;OAEG;IACH,2BAEC;IAED;;OAEG;IACH,wBAEC;IAED;;;;;;OAMG;IACH,8HAEC;IAED;;;;;;;;;;;;;;;;OAgBG;IACH,QAFa,QAAQ,YAAY,CAAC,CAsFjC;IAyBD;;;;;;;OAOG;IACH,SAFa,QAAQ,OAAO,CAAC,CAiC5B;;CACF;;;;yBAIY,OAAO,eAAe,EAAE,UAAU;;;;yBAKlC,OAAO,eAAe,EAAE,UAAU;;;;;;;2BASlC,OAAO,cAAc,EAAE,YAAY;+BACnC,OAAO,cAAc,EAAE,gBAAgB;oFAKvC,OAAO,cAAc,EAAE,cAAc,CAAC,OAAO,CAAC;iFAK9C,OAAO,cAAc,EAAE,WAAW,CAAC,OAAO,CAAC;+EAK3C,OAAO,cAAc,EAAE,SAAS,CAAC,OAAO,CAAC;;;;4BAKzC,OAAO,eAAe,EAAE,aAAa"}
|
|
@@ -149,17 +149,19 @@ class Manifest {
|
|
|
149
149
|
}
|
|
150
150
|
/**
|
|
151
151
|
* Searches `APPIUM_HOME` for installed extensions and adds them to the manifest.
|
|
152
|
+
* @param {boolean} hasAppiumDependency - This affects whether or not the "dev" `InstallType` is used
|
|
152
153
|
* @returns {Promise<boolean>} `true` if any extensions were added, `false` otherwise.
|
|
153
154
|
*/
|
|
154
|
-
async syncWithInstalledExtensions() {
|
|
155
|
+
async syncWithInstalledExtensions(hasAppiumDependency = false) {
|
|
155
156
|
// this could be parallelized, but we can't use fs.walk as an async iterator
|
|
156
157
|
let didChange = false;
|
|
157
158
|
/**
|
|
158
159
|
* Listener for the `match` event of a `glob` instance
|
|
159
160
|
* @param {string} filepath - Path to a `package.json`
|
|
161
|
+
* @param {boolean} [devType] - If `true`, this is an extension in "dev mode"
|
|
160
162
|
* @returns {Promise<void>}
|
|
161
163
|
*/
|
|
162
|
-
const onMatch = async (filepath) => {
|
|
164
|
+
const onMatch = async (filepath, devType = false) => {
|
|
163
165
|
try {
|
|
164
166
|
const pkg = JSON.parse(await support_1.fs.readFile(filepath, 'utf8'));
|
|
165
167
|
if (isExtension(pkg)) {
|
|
@@ -177,7 +179,8 @@ class Manifest {
|
|
|
177
179
|
(isPlugin(pkg) && !this.hasPlugin(name))) {
|
|
178
180
|
logger_1.default.info(`Discovered installed ${extType} "${name}"`);
|
|
179
181
|
}
|
|
180
|
-
const
|
|
182
|
+
const installType = devType && hasAppiumDependency ? extension_config_1.INSTALL_TYPE_DEV : extension_config_1.INSTALL_TYPE_NPM;
|
|
183
|
+
const changed = this.addExtensionFromPackage(pkg, filepath, installType);
|
|
181
184
|
didChange = didChange || changed;
|
|
182
185
|
}
|
|
183
186
|
}
|
|
@@ -188,8 +191,9 @@ class Manifest {
|
|
|
188
191
|
* @type {Promise<void>[]}
|
|
189
192
|
*/
|
|
190
193
|
const queue = [
|
|
191
|
-
// look at `package.json` in `APPIUM_HOME` only
|
|
192
|
-
|
|
194
|
+
// look at `package.json` in `APPIUM_HOME` only.
|
|
195
|
+
// this causes extensions in "dev mode" to be automatically found
|
|
196
|
+
onMatch(path_1.default.join(__classPrivateFieldGet(this, _Manifest_appiumHome, "f"), 'package.json'), true),
|
|
193
197
|
];
|
|
194
198
|
// add dependencies to the queue
|
|
195
199
|
await new bluebird_1.default((resolve, reject) => {
|
|
@@ -232,9 +236,10 @@ class Manifest {
|
|
|
232
236
|
* @template {ExtensionType} ExtType
|
|
233
237
|
* @param {ExtPackageJson<ExtType>} pkgJson
|
|
234
238
|
* @param {string} pkgPath
|
|
239
|
+
* @param {typeof INSTALL_TYPE_NPM | typeof INSTALL_TYPE_DEV} [installType]
|
|
235
240
|
* @returns {boolean} - `true` if this method did anything.
|
|
236
241
|
*/
|
|
237
|
-
addExtensionFromPackage(pkgJson, pkgPath) {
|
|
242
|
+
addExtensionFromPackage(pkgJson, pkgPath, installType = extension_config_1.INSTALL_TYPE_NPM) {
|
|
238
243
|
const extensionPath = path_1.default.dirname(pkgPath);
|
|
239
244
|
/**
|
|
240
245
|
* @type {InternalMetadata}
|
|
@@ -243,7 +248,7 @@ class Manifest {
|
|
|
243
248
|
pkgName: pkgJson.name,
|
|
244
249
|
version: pkgJson.version,
|
|
245
250
|
appiumVersion: pkgJson.peerDependencies?.appium,
|
|
246
|
-
installType
|
|
251
|
+
installType,
|
|
247
252
|
installSpec: `${pkgJson.name}@${pkgJson.version}`,
|
|
248
253
|
installPath: extensionPath,
|
|
249
254
|
};
|
|
@@ -393,6 +398,7 @@ class Manifest {
|
|
|
393
398
|
logger_1.default.debug(`Updating manifest schema from rev ${data.schemaRev ?? '(none)'} to ${constants_1.CURRENT_SCHEMA_REV}`);
|
|
394
399
|
shouldWrite = await (0, manifest_migrations_1.migrate)(this);
|
|
395
400
|
}
|
|
401
|
+
const hasAppiumDependency = await support_1.env.hasAppiumDependency(this.appiumHome);
|
|
396
402
|
/**
|
|
397
403
|
* we still may want to sync with installed extensions even if we have a
|
|
398
404
|
* new file. right now this is limited to the following cases:
|
|
@@ -404,11 +410,9 @@ class Manifest {
|
|
|
404
410
|
* It may also make sense to sync with the extensions in an arbitrary
|
|
405
411
|
* `APPIUM_HOME`, but we don't do that here.
|
|
406
412
|
*/
|
|
407
|
-
if (shouldWrite ||
|
|
408
|
-
((await support_1.env.hasAppiumDependency(this.appiumHome)) &&
|
|
409
|
-
(await (0, package_changed_1.packageDidChange)(this.appiumHome)))) {
|
|
413
|
+
if (shouldWrite || (hasAppiumDependency && (await (0, package_changed_1.packageDidChange)(this.appiumHome)))) {
|
|
410
414
|
logger_1.default.debug('Discovering newly installed extensions...');
|
|
411
|
-
shouldWrite = (await this.syncWithInstalledExtensions()) || shouldWrite;
|
|
415
|
+
shouldWrite = (await this.syncWithInstalledExtensions(hasAppiumDependency)) || shouldWrite;
|
|
412
416
|
}
|
|
413
417
|
if (shouldWrite) {
|
|
414
418
|
await this.write();
|
|
@@ -480,10 +484,13 @@ async function _Manifest_setManifestPath() {
|
|
|
480
484
|
* Returns a new or existing {@link Manifest} instance, based on the value of `appiumHome`.
|
|
481
485
|
*
|
|
482
486
|
* Maintains one instance per value of `appiumHome`.
|
|
487
|
+
*/
|
|
488
|
+
Manifest.getInstance = lodash_1.default.memoize(
|
|
489
|
+
/**
|
|
483
490
|
* @param {string} appiumHome - Path to `APPIUM_HOME`
|
|
484
491
|
* @returns {Manifest}
|
|
485
492
|
*/
|
|
486
|
-
|
|
493
|
+
function _getInstance(appiumHome) {
|
|
487
494
|
return new Manifest(appiumHome);
|
|
488
495
|
});
|
|
489
496
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../lib/extension/manifest.js"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;AAEH,wDAAyB;AACzB,gDAAwB;AACxB,6CAAwC;AACxC,oDAAuB;AACvB,gDAAwB;AACxB,gDAAwB;AACxB,4CAA0E;AAC1E,uDAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../lib/extension/manifest.js"],"names":[],"mappings":"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"}
|
package/build/lib/main.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../lib/main.js"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../lib/main.js"],"names":[],"mappings":";;yBA8Ya,OAAO,eAAe,EAAE,UAAU;yBAClC,OAAO,eAAe,EAAE,UAAU;0BAClC,OAAO,eAAe,EAAE,WAAW;0BACnC,OAAO,eAAe,EAAE,WAAW;yBACnC,OAAO,cAAc,EAAE,UAAU;qCACjC,OAAO,cAAc,EAAE,sBAAsB;kCAC7C,OAAO,cAAc,EAAE,mBAAmB;4BAC1C,OAAO,cAAc,EAAE,gBAAgB;4BACvC,OAAO,cAAc,EAAE,gBAAgB;4BACvC,OAAO,cAAc,EAAE,gBAAgB;4BACvC,OAAO,aAAa,EAAE,aAAa;4BACnC,OAAO,aAAa,EAAE,aAAa;;;;mCAKlC,EAAE;;;;;kBAKF,OAAO,UAAU,EAAE,YAAY;;;;gBAC/B,OAAO,cAAc,EAAE,UAAU;;wEAKlC,GAAG,SAAS,aAAa,GAAG,cAAc,GAAG,OAAO,aAAa,EAAE,gBAAgB,GAAG,oBAAoB;yJAM1G,OAAO,cAAc,EAAE,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC;+JAMxC,OAAO,cAAc,EAAE,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC;AAjK3D;;;;;;;GAOG;AACH,qSAmGC;AAxOD;;;;;;;;;;;;;;;;GAgBG;AACH,kPA0GC"}
|
package/build/lib/main.js
CHANGED
|
@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
7
7
|
exports.resolveAppiumHome = exports.init = exports.main = exports.validate = exports.getSchema = exports.finalizeSchema = exports.readConfigFile = void 0;
|
|
8
8
|
const logsink_1 = require("./logsink"); // this import needs to come first since it sets up global npmlog
|
|
9
9
|
const logger_1 = __importDefault(require("./logger")); // logger needs to remain second
|
|
10
|
-
// @ts-ignore
|
|
11
10
|
const base_driver_1 = require("@appium/base-driver");
|
|
12
11
|
const support_1 = require("@appium/support");
|
|
13
12
|
const asyncbox_1 = require("asyncbox");
|
|
@@ -34,7 +33,7 @@ async function preflightChecks(args, throwInsteadOfExit = false) {
|
|
|
34
33
|
(0, config_1.checkNodeOk)();
|
|
35
34
|
await (0, config_1.checkNpmOk)();
|
|
36
35
|
if (args.longStacktrace) {
|
|
37
|
-
|
|
36
|
+
Error.stackTraceLimit = constants_1.LONG_STACKTRACE_LIMIT;
|
|
38
37
|
}
|
|
39
38
|
if (args.showBuildInfo) {
|
|
40
39
|
await (0, config_1.showBuildInfo)();
|
|
@@ -194,7 +193,8 @@ async function init(args) {
|
|
|
194
193
|
logger_1.default.info(`Loaded ${support_1.util.pluralize('filtering rule', rules.length, true)} from '${serverArgs.logFilters}'`);
|
|
195
194
|
}
|
|
196
195
|
}
|
|
197
|
-
const appiumDriver = new appium_1.AppiumDriver(
|
|
196
|
+
const appiumDriver = new appium_1.AppiumDriver(
|
|
197
|
+
/** @type {import('@appium/types').DriverOpts<import('./appium').AppiumDriverConstraints>} */ (serverArgs));
|
|
198
198
|
// set the config on the umbrella driver so it can match drivers to caps
|
|
199
199
|
appiumDriver.driverConfig = driverConfig;
|
|
200
200
|
await preflightChecks(serverArgs, throwInsteadOfExit);
|
package/build/lib/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../lib/main.js"],"names":[],"mappings":";;;;;;;AAEA,uCAA8C,CAAC,iEAAiE;AAChH,sDAA8B,CAAC,gCAAgC;AAC/D,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../lib/main.js"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ export function toParserArgs(): import('../cli/args').ArgumentDefinitions;
|
|
|
10
10
|
/**
|
|
11
11
|
* <T>
|
|
12
12
|
*/
|
|
13
|
-
export type FormatValidator<T> = import('ajv/dist/types').FormatValidator<T>;
|
|
13
|
+
export type FormatValidator<T extends string | number> = import('ajv/dist/types').FormatValidator<T>;
|
|
14
14
|
/**
|
|
15
15
|
* A JSON 7 schema with our custom keywords.
|
|
16
16
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-args.d.ts","sourceRoot":"","sources":["../../../lib/schema/cli-args.js"],"names":[],"mappings":"AAoNA;;;;;;;GAOG;AACH,gCAHa,OAAO,aAAa,EAAE,mBAAmB,CAMrD;;;;
|
|
1
|
+
{"version":3,"file":"cli-args.d.ts","sourceRoot":"","sources":["../../../lib/schema/cli-args.js"],"names":[],"mappings":"AAoNA;;;;;;;GAOG;AACH,gCAHa,OAAO,aAAa,EAAE,mBAAmB,CAMrD;;;;yDAIY,OAAO,gBAAgB,EAAE,eAAe,CAAC,CAAC,CAAC;;;;+BAK3C,OAAO,YAAY,EAAE,wBAAwB,GAAG,OAAO,aAAa,EAAE,WAAW"}
|