appium 2.4.0 → 2.5.0
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/cli/driver-command.d.ts +4 -3
- package/build/lib/cli/driver-command.d.ts.map +1 -1
- package/build/lib/cli/driver-command.js +3 -2
- package/build/lib/cli/driver-command.js.map +1 -1
- package/build/lib/cli/extension-command.d.ts +6 -4
- package/build/lib/cli/extension-command.d.ts.map +1 -1
- package/build/lib/cli/extension-command.js +18 -12
- package/build/lib/cli/extension-command.js.map +1 -1
- package/build/lib/cli/plugin-command.d.ts +3 -2
- package/build/lib/cli/plugin-command.d.ts.map +1 -1
- package/build/lib/cli/plugin-command.js +2 -1
- package/build/lib/cli/plugin-command.js.map +1 -1
- package/build/lib/doctor/doctor.d.ts +18 -2
- package/build/lib/doctor/doctor.d.ts.map +1 -1
- package/build/lib/doctor/doctor.js +30 -10
- package/build/lib/doctor/doctor.js.map +1 -1
- package/build/lib/extension/extension-config.d.ts.map +1 -1
- package/build/lib/extension/extension-config.js +10 -6
- package/build/lib/extension/extension-config.js.map +1 -1
- package/lib/cli/driver-command.js +3 -2
- package/lib/cli/extension-command.js +22 -13
- package/lib/cli/plugin-command.js +2 -1
- package/lib/doctor/doctor.js +29 -8
- package/lib/extension/extension-config.js +10 -6
- package/package.json +9 -9
|
@@ -34,12 +34,13 @@ export default class DriverCliCommand extends ExtensionCliCommand<"driver"> {
|
|
|
34
34
|
*/
|
|
35
35
|
run({ driver, scriptName, extraArgs }: DriverRunOptions): Promise<import('./extension-command').RunOutput>;
|
|
36
36
|
/**
|
|
37
|
-
* Runs doctor checks for the given driver
|
|
37
|
+
* Runs doctor checks for the given driver.
|
|
38
38
|
*
|
|
39
39
|
* @param {DriverDoctorOptions} opts
|
|
40
|
-
* @returns {Promise<
|
|
40
|
+
* @returns {Promise<number>} The amount of executed doctor checks.
|
|
41
|
+
* @throws {Error} If any of the mandatory Doctor checks fails.
|
|
41
42
|
*/
|
|
42
|
-
doctor({ driver }: DriverDoctorOptions): Promise<
|
|
43
|
+
doctor({ driver }: DriverDoctorOptions): Promise<number>;
|
|
43
44
|
}
|
|
44
45
|
export type ExtensionType = import('@appium/types').ExtensionType;
|
|
45
46
|
export type DriverType = import('@appium/types').DriverType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver-command.d.ts","sourceRoot":"","sources":["../../../lib/cli/driver-command.js"],"names":[],"mappings":"AAOA;;GAEG;AAEH;IACE;;OAEG;IACH,8BAFW,OAAO,qBAAqB,EAAE,uBAAuB,CAAC,UAAU,CAAC,EAK3E;IAED;;;;;OAKG;IACH,8CAHW,iBAAiB,GAChB,QAAQ,UAAU,UAAU,CAAC,CAAC,CAQzC;IAED;;;;;OAKG;IACH,sBAHW,mBAAmB,GAClB,QAAQ,UAAU,UAAU,CAAC,CAAC,CAIzC;IAED;;;;;OAKG;IACH,2BAHW,gBAAgB,GACf,QAAQ,OAAO,qBAAqB,EAAE,qBAAqB,CAAC,CAIvE;IAED;;;;OAIG;IACH,uCAHW,gBAAgB,GACf,QAAQ,OAAO,qBAAqB,EAAE,SAAS,CAAC,CAS3D;IAED
|
|
1
|
+
{"version":3,"file":"driver-command.d.ts","sourceRoot":"","sources":["../../../lib/cli/driver-command.js"],"names":[],"mappings":"AAOA;;GAEG;AAEH;IACE;;OAEG;IACH,8BAFW,OAAO,qBAAqB,EAAE,uBAAuB,CAAC,UAAU,CAAC,EAK3E;IAED;;;;;OAKG;IACH,8CAHW,iBAAiB,GAChB,QAAQ,UAAU,UAAU,CAAC,CAAC,CAQzC;IAED;;;;;OAKG;IACH,sBAHW,mBAAmB,GAClB,QAAQ,UAAU,UAAU,CAAC,CAAC,CAIzC;IAED;;;;;OAKG;IACH,2BAHW,gBAAgB,GACf,QAAQ,OAAO,qBAAqB,EAAE,qBAAqB,CAAC,CAIvE;IAED;;;;OAIG;IACH,uCAHW,gBAAgB,GACf,QAAQ,OAAO,qBAAqB,EAAE,SAAS,CAAC,CAS3D;IAED;;;;;;OAMG;IACH,mBAJW,mBAAmB,GACjB,QAAQ,MAAM,CAAC,CAO3B;CAqCF;4BAGY,OAAO,eAAe,EAAE,aAAa;yBACrC,OAAO,eAAe,EAAE,UAAU;+EAKlC,OAAO,cAAc,EAAE,SAAS,CAAC,OAAO,CAAC;;YAKxC,OAAO,+BAA+B,EAAE,eAAe,CAAC,UAAU,CAAC;UACnE,OAAO;;;;;;;;;YAMP,MAAM;;;;iBACN,WAAW;;;;;;0BAKZ,OAAO,cAAc,EAAE,WAAW;;;;;;;;YAMjC,MAAM;;;;;;;;;YAMN,MAAM;;;;YACN,OAAO;;;;;;;;;YAMP,MAAM;;;;gBACN,MAAM;;;;;;;;;;;;;YAON,MAAM;;gCAzKY,qBAAqB"}
|
|
@@ -64,10 +64,11 @@ class DriverCliCommand extends extension_command_1.default {
|
|
|
64
64
|
});
|
|
65
65
|
}
|
|
66
66
|
/**
|
|
67
|
-
* Runs doctor checks for the given driver
|
|
67
|
+
* Runs doctor checks for the given driver.
|
|
68
68
|
*
|
|
69
69
|
* @param {DriverDoctorOptions} opts
|
|
70
|
-
* @returns {Promise<
|
|
70
|
+
* @returns {Promise<number>} The amount of executed doctor checks.
|
|
71
|
+
* @throws {Error} If any of the mandatory Doctor checks fails.
|
|
71
72
|
*/
|
|
72
73
|
async doctor({ driver }) {
|
|
73
74
|
return await super._doctor({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver-command.js","sourceRoot":"","sources":["../../../lib/cli/driver-command.js"],"names":[],"mappings":";;;;;AAAA,oDAAuB;AACvB,4EAAsD;AACtD,4CAA2C;AAC3C,0BAAwB;AAExB,MAAM,iBAAiB,GAAG,CAAC,YAAY,EAAE,gBAAgB,EAAE,eAAe,EAAE,WAAW,CAAC,CAAC;AAEzF;;GAEG;AAEH,MAAqB,gBAAiB,SAAQ,2BAAmB;IAC/D;;OAEG;IACH,YAAY,EAAC,MAAM,EAAE,IAAI,EAAC;QACxB,KAAK,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAC;QACtB,IAAI,CAAC,eAAe,GAAG,yBAAa,CAAC;IACvC,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,OAAO,CAAC,EAAC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAC;QAC9C,OAAO,MAAM,KAAK,CAAC,QAAQ,CAAC;YAC1B,WAAW,EAAE,MAAM;YACnB,WAAW;YACX,WAAW;SACZ,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,SAAS,CAAC,EAAC,MAAM,EAAC;QACtB,OAAO,MAAM,KAAK,CAAC,UAAU,CAAC,EAAC,WAAW,EAAE,MAAM,EAAC,CAAC,CAAC;IACvD,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,MAAM,EAAC;QAC3B,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC,EAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC,CAAC;IAC5D,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAC;QACvC,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
|
|
1
|
+
{"version":3,"file":"driver-command.js","sourceRoot":"","sources":["../../../lib/cli/driver-command.js"],"names":[],"mappings":";;;;;AAAA,oDAAuB;AACvB,4EAAsD;AACtD,4CAA2C;AAC3C,0BAAwB;AAExB,MAAM,iBAAiB,GAAG,CAAC,YAAY,EAAE,gBAAgB,EAAE,eAAe,EAAE,WAAW,CAAC,CAAC;AAEzF;;GAEG;AAEH,MAAqB,gBAAiB,SAAQ,2BAAmB;IAC/D;;OAEG;IACH,YAAY,EAAC,MAAM,EAAE,IAAI,EAAC;QACxB,KAAK,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAC;QACtB,IAAI,CAAC,eAAe,GAAG,yBAAa,CAAC;IACvC,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,OAAO,CAAC,EAAC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAC;QAC9C,OAAO,MAAM,KAAK,CAAC,QAAQ,CAAC;YAC1B,WAAW,EAAE,MAAM;YACnB,WAAW;YACX,WAAW;SACZ,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,SAAS,CAAC,EAAC,MAAM,EAAC;QACtB,OAAO,MAAM,KAAK,CAAC,UAAU,CAAC,EAAC,WAAW,EAAE,MAAM,EAAC,CAAC,CAAC;IACvD,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,MAAM,EAAC;QAC3B,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC,EAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC,CAAC;IAC5D,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAC;QACvC,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,EAAC;QACnB,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC;YACzB,WAAW,EAAE,MAAM;SACpB,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,kBAAkB,CAAC,EAAC,OAAO,EAAE,OAAO,EAAC;QACnC,OAAO,CACL,UAAU,OAAO,IAAI,OAAO,CAAC,OAAO,2BAA2B,CAAC,KAAK;YACrE,qBAAqB,OAAO,CAAC,cAAc,CAAC,KAAK,IAAI;YACrD,oBAAoB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,CAClE,CAAC;IACJ,CAAC;IAED;;;;;;;;OAQG;IACH,uBAAuB,CAAC,cAAc,EAAE,WAAW;QACjD,MAAM,aAAa,GAAG,iBAAiB,CAAC,MAAM,CAC5C,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC,EAC/D,EAAE,CACH,CAAC;QAEF,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;YAC7B,MAAM,IAAI,KAAK,CACb,WAAW,WAAW,kDAAkD;gBACtE,gCAAgC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAClE,CAAC;SACH;IACH,CAAC;CACF;AAzGD,mCAyGC;AAED;;;GAGG;AAEH;;;GAGG;AAEH;;;;GAIG;AAEH;;;;;;GAMG;AAEH;;GAEG;AAEH;;;;GAIG;AAEH;;;;;GAKG;AAEH;;;;;;GAMG;AAEH;;;;GAIG"}
|
|
@@ -305,7 +305,7 @@ declare class ExtensionCliCommand<ExtType extends import("@appium/types").Extens
|
|
|
305
305
|
* @param {InstallViaNpmArgs} installViaNpmOpts
|
|
306
306
|
* @returns {Promise<void>}
|
|
307
307
|
*/
|
|
308
|
-
_checkInstallCompatibility({ installSpec, pkgName, installType }: InstallViaNpmArgs): Promise<void>;
|
|
308
|
+
_checkInstallCompatibility({ installSpec, pkgName, pkgVer, installType }: InstallViaNpmArgs): Promise<void>;
|
|
309
309
|
/**
|
|
310
310
|
* Install an extension
|
|
311
311
|
*
|
|
@@ -403,12 +403,14 @@ declare class ExtensionCliCommand<ExtType extends import("@appium/types").Extens
|
|
|
403
403
|
*/
|
|
404
404
|
_runUnbuffered(cwd: string, script: string, args?: string[], opts?: import('child_process').SpawnOptions): import('node:child_process').ChildProcess;
|
|
405
405
|
/**
|
|
406
|
-
* Runs doctor checks for the given extension
|
|
406
|
+
* Runs doctor checks for the given extension.
|
|
407
407
|
*
|
|
408
408
|
* @param {DoctorOptions} opts
|
|
409
|
-
* @returns {Promise<
|
|
409
|
+
* @returns {Promise<number>} The amount of Doctor checks that were
|
|
410
|
+
* successfully loaded and executed for the given extension
|
|
411
|
+
* @throws {Error} If any of the mandatory Doctor checks fails.
|
|
410
412
|
*/
|
|
411
|
-
_doctor({ installSpec }: DoctorOptions): Promise<
|
|
413
|
+
_doctor({ installSpec }: DoctorOptions): Promise<number>;
|
|
412
414
|
/**
|
|
413
415
|
* Runs a script cached inside the `scripts` field under `appium`
|
|
414
416
|
* inside of the extension's `package.json` file. Will throw
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extension-command.d.ts","sourceRoot":"","sources":["../../../lib/cli/extension-command.js"],"names":[],"mappings":";;;;;;;;;
|
|
1
|
+
{"version":3,"file":"extension-command.d.ts","sourceRoot":"","sources":["../../../lib/cli/extension-command.js"],"names":[],"mappings":"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"}
|
|
@@ -34,13 +34,14 @@ function receiptToManifest(receipt) {
|
|
|
34
34
|
return /** @type {ExtManifest<ExtType>} */ (lodash_1.default.omit(receipt, 'driverName', 'pluginName'));
|
|
35
35
|
}
|
|
36
36
|
/**
|
|
37
|
-
* Fetches the remote extension version
|
|
37
|
+
* Fetches the remote extension version requirements
|
|
38
38
|
*
|
|
39
|
-
* @param {string}
|
|
39
|
+
* @param {string} pkgName Extension name
|
|
40
|
+
* @param {string} [pkgVer] Extension version (if not provided then the latest is assumed)
|
|
40
41
|
* @returns {Promise<[string, string|null]>}
|
|
41
42
|
*/
|
|
42
|
-
async function getRemoteExtensionVersionReq(
|
|
43
|
-
const allDeps = await support_1.npm.getPackageInfo(
|
|
43
|
+
async function getRemoteExtensionVersionReq(pkgName, pkgVer) {
|
|
44
|
+
const allDeps = await support_1.npm.getPackageInfo(`${pkgName}${pkgVer ? `@${pkgVer}` : ``}`, ['peerDependencies', 'dependencies']);
|
|
44
45
|
const requiredVersionPair = lodash_1.default.flatMap(lodash_1.default.values(allDeps).map(lodash_1.default.toPairs))
|
|
45
46
|
.find(([name]) => name === 'appium');
|
|
46
47
|
return [utils_2.npmPackage.version, requiredVersionPair ? requiredVersionPair[1] : null];
|
|
@@ -208,12 +209,12 @@ class ExtensionCliCommand {
|
|
|
208
209
|
* @param {InstallViaNpmArgs} installViaNpmOpts
|
|
209
210
|
* @returns {Promise<void>}
|
|
210
211
|
*/
|
|
211
|
-
async _checkInstallCompatibility({ installSpec, pkgName, installType }) {
|
|
212
|
+
async _checkInstallCompatibility({ installSpec, pkgName, pkgVer, installType }) {
|
|
212
213
|
if (extension_config_1.INSTALL_TYPE_NPM !== installType) {
|
|
213
214
|
return;
|
|
214
215
|
}
|
|
215
216
|
await (0, utils_1.spinWith)(this.isJsonOutput, `Checking if '${pkgName}' is compatible`, async () => {
|
|
216
|
-
const [serverVersion, extVersionRequirement] = await getRemoteExtensionVersionReq(
|
|
217
|
+
const [serverVersion, extVersionRequirement] = await getRemoteExtensionVersionReq(pkgName, pkgVer);
|
|
217
218
|
if (serverVersion && extVersionRequirement && !semver_1.default.satisfies(serverVersion, extVersionRequirement)) {
|
|
218
219
|
throw this._createFatalError(`'${installSpec}' cannot be installed because the server version it requires (${extVersionRequirement}) ` +
|
|
219
220
|
`does not meet the currently installed one (${serverVersion}). Please install ` +
|
|
@@ -628,10 +629,12 @@ class ExtensionCliCommand {
|
|
|
628
629
|
});
|
|
629
630
|
}
|
|
630
631
|
/**
|
|
631
|
-
* Runs doctor checks for the given extension
|
|
632
|
+
* Runs doctor checks for the given extension.
|
|
632
633
|
*
|
|
633
634
|
* @param {DoctorOptions} opts
|
|
634
|
-
* @returns {Promise<
|
|
635
|
+
* @returns {Promise<number>} The amount of Doctor checks that were
|
|
636
|
+
* successfully loaded and executed for the given extension
|
|
637
|
+
* @throws {Error} If any of the mandatory Doctor checks fails.
|
|
635
638
|
*/
|
|
636
639
|
async _doctor({ installSpec }) {
|
|
637
640
|
if (!this.config.isInstalled(installSpec)) {
|
|
@@ -651,7 +654,7 @@ class ExtensionCliCommand {
|
|
|
651
654
|
}
|
|
652
655
|
if (!doctorSpec) {
|
|
653
656
|
this.log.info(`The ${this.type} "${installSpec}" does not export any doctor checks`);
|
|
654
|
-
return
|
|
657
|
+
return 0;
|
|
655
658
|
}
|
|
656
659
|
if (!lodash_1.default.isPlainObject(doctorSpec) || !lodash_1.default.isArray(doctorSpec.checks)) {
|
|
657
660
|
throw this._createFatalError(`The 'doctor' entry in the package manifest '${packageJsonPath}' must be a proper object ` +
|
|
@@ -688,12 +691,15 @@ class ExtensionCliCommand {
|
|
|
688
691
|
.filter(isDoctorCheck);
|
|
689
692
|
if (lodash_1.default.isEmpty(checks)) {
|
|
690
693
|
this.log.info(`The ${this.type} "${installSpec}" exports no valid doctor checks`);
|
|
691
|
-
return
|
|
694
|
+
return 0;
|
|
692
695
|
}
|
|
693
696
|
this.log.debug(`Running ${support_1.util.pluralize('doctor check', checks.length, true)} ` +
|
|
694
697
|
`for the "${installSpec}" ${this.type}`);
|
|
695
|
-
await new doctor_1.Doctor(checks).run();
|
|
696
|
-
|
|
698
|
+
const exitCode = await new doctor_1.Doctor(checks).run();
|
|
699
|
+
if (exitCode !== doctor_1.EXIT_CODE.SUCCESS) {
|
|
700
|
+
throw this._createFatalError('Treatment required');
|
|
701
|
+
}
|
|
702
|
+
return checks.length;
|
|
697
703
|
}
|
|
698
704
|
/**
|
|
699
705
|
* Runs a script cached inside the `scripts` field under `appium`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extension-command.js","sourceRoot":"","sources":["../../../lib/cli/extension-command.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"extension-command.js","sourceRoot":"","sources":["../../../lib/cli/extension-command.js"],"names":[],"mappings":"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"}
|
|
@@ -38,9 +38,10 @@ export default class PluginCliCommand extends ExtensionCliCommand<"plugin"> {
|
|
|
38
38
|
* Runs doctor checks for the given plugin
|
|
39
39
|
*
|
|
40
40
|
* @param {PluginDoctorOptions} opts
|
|
41
|
-
* @returns {Promise<
|
|
41
|
+
* @returns {Promise<number>} The amount of executed doctor checks.
|
|
42
|
+
* @throws {Error} If any of the mandatory Doctor checks fails.
|
|
42
43
|
*/
|
|
43
|
-
doctor({ plugin }: PluginDoctorOptions): Promise<
|
|
44
|
+
doctor({ plugin }: PluginDoctorOptions): Promise<number>;
|
|
44
45
|
}
|
|
45
46
|
export type ExtensionType = import('@appium/types').ExtensionType;
|
|
46
47
|
export type PluginType = import('@appium/types').PluginType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-command.d.ts","sourceRoot":"","sources":["../../../lib/cli/plugin-command.js"],"names":[],"mappings":"AAMA;;GAEG;AACH;IACE;;;OAGG;IACH,8BAFW,OAAO,qBAAqB,EAAE,uBAAuB,CAAC,UAAU,CAAC,EAK3E;IAED;;;;;OAKG;IACH,8CAHW,iBAAiB,GACf,QAAQ,UAAU,UAAU,CAAC,CAAC,CAQ1C;IAED;;;;;OAKG;IACH,sBAHW,mBAAmB,GACjB,QAAQ,UAAU,UAAU,CAAC,CAAC,CAI1C;IAED;;;;;OAKG;IACH,2BAHW,gBAAgB,GACd,QAAQ,OAAO,qBAAqB,EAAE,qBAAqB,CAAC,CAIxE;IAED;;;;OAIG;IACH,uCAHW,gBAAgB,GACd,QAAQ,OAAO,qBAAqB,EAAE,SAAS,CAAC,CAS5D;IAED
|
|
1
|
+
{"version":3,"file":"plugin-command.d.ts","sourceRoot":"","sources":["../../../lib/cli/plugin-command.js"],"names":[],"mappings":"AAMA;;GAEG;AACH;IACE;;;OAGG;IACH,8BAFW,OAAO,qBAAqB,EAAE,uBAAuB,CAAC,UAAU,CAAC,EAK3E;IAED;;;;;OAKG;IACH,8CAHW,iBAAiB,GACf,QAAQ,UAAU,UAAU,CAAC,CAAC,CAQ1C;IAED;;;;;OAKG;IACH,sBAHW,mBAAmB,GACjB,QAAQ,UAAU,UAAU,CAAC,CAAC,CAI1C;IAED;;;;;OAKG;IACH,2BAHW,gBAAgB,GACd,QAAQ,OAAO,qBAAqB,EAAE,qBAAqB,CAAC,CAIxE;IAED;;;;OAIG;IACH,uCAHW,gBAAgB,GACd,QAAQ,OAAO,qBAAqB,EAAE,SAAS,CAAC,CAS5D;IAED;;;;;;OAMG;IACH,mBAJW,mBAAmB,GACjB,QAAQ,MAAM,CAAC,CAO3B;CAkCF;4BAGY,OAAO,eAAe,EAAE,aAAa;yBACrC,OAAO,eAAe,EAAE,UAAU;+EAKlC,OAAO,cAAc,EAAE,SAAS,CAAC,OAAO,CAAC;;;;;;;;YAMxC,MAAM;;;;iBACN,WAAW;;;;;;0BAKZ,OAAO,cAAc,EAAE,WAAW;;;;;;;;YAMjC,MAAM;;;;;;;;;YAMN,MAAM;;;;YACN,OAAO;;;;;;;;;YAMP,MAAM;;;;gBACN,MAAM;;;;;;;;;;;;;YAON,MAAM;;gCA/JY,qBAAqB"}
|
|
@@ -67,7 +67,8 @@ class PluginCliCommand extends extension_command_1.default {
|
|
|
67
67
|
* Runs doctor checks for the given plugin
|
|
68
68
|
*
|
|
69
69
|
* @param {PluginDoctorOptions} opts
|
|
70
|
-
* @returns {Promise<
|
|
70
|
+
* @returns {Promise<number>} The amount of executed doctor checks.
|
|
71
|
+
* @throws {Error} If any of the mandatory Doctor checks fails.
|
|
71
72
|
*/
|
|
72
73
|
async doctor({ plugin }) {
|
|
73
74
|
return await super._doctor({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-command.js","sourceRoot":"","sources":["../../../lib/cli/plugin-command.js"],"names":[],"mappings":";;;;;AAAA,oDAAuB;AACvB,4EAAsD;AACtD,4CAA2C;AAE3C,MAAM,iBAAiB,GAAG,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;AAEtD;;GAEG;AACH,MAAqB,gBAAiB,SAAQ,2BAAmB;IAC/D;;;OAGG;IACH,YAAY,EAAC,MAAM,EAAE,IAAI,EAAC;QACxB,KAAK,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAC;QACtB,IAAI,CAAC,eAAe,GAAG,yBAAa,CAAC;IACvC,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,OAAO,CAAC,EAAC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAC;QAC9C,OAAO,MAAM,KAAK,CAAC,QAAQ,CAAC;YAC1B,WAAW,EAAE,MAAM;YACnB,WAAW;YACX,WAAW;SACZ,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,SAAS,CAAC,EAAC,MAAM,EAAC;QACtB,OAAO,MAAM,KAAK,CAAC,UAAU,CAAC,EAAC,WAAW,EAAE,MAAM,EAAC,CAAC,CAAC;IACvD,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,MAAM,EAAC;QAC3B,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC,EAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC,CAAC;IAC5D,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAC;QACvC,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
|
|
1
|
+
{"version":3,"file":"plugin-command.js","sourceRoot":"","sources":["../../../lib/cli/plugin-command.js"],"names":[],"mappings":";;;;;AAAA,oDAAuB;AACvB,4EAAsD;AACtD,4CAA2C;AAE3C,MAAM,iBAAiB,GAAG,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;AAEtD;;GAEG;AACH,MAAqB,gBAAiB,SAAQ,2BAAmB;IAC/D;;;OAGG;IACH,YAAY,EAAC,MAAM,EAAE,IAAI,EAAC;QACxB,KAAK,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAC;QACtB,IAAI,CAAC,eAAe,GAAG,yBAAa,CAAC;IACvC,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,OAAO,CAAC,EAAC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAC;QAC9C,OAAO,MAAM,KAAK,CAAC,QAAQ,CAAC;YAC1B,WAAW,EAAE,MAAM;YACnB,WAAW;YACX,WAAW;SACZ,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,SAAS,CAAC,EAAC,MAAM,EAAC;QACtB,OAAO,MAAM,KAAK,CAAC,UAAU,CAAC,EAAC,WAAW,EAAE,MAAM,EAAC,CAAC,CAAC;IACvD,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,MAAM,EAAC;QAC3B,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC,EAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC,CAAC;IAC5D,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAC;QACvC,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,EAAC;QACnB,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC;YACzB,WAAW,EAAE,MAAM;SACpB,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,kBAAkB,CAAC,EAAC,OAAO,EAAE,OAAO,EAAC;QACnC,OAAO,UAAU,OAAO,IAAI,OAAO,CAAC,OAAO,yBAAyB,CAAC,KAAK,CAAC;IAC7E,CAAC;IAED;;;;;;;;;OASG;IACH,uBAAuB,CAAC,cAAc,EAAE,WAAW;QACjD,MAAM,aAAa,GAAG,iBAAiB,CAAC,MAAM,CAC5C,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC,EAC/D,EAAE,CACH,CAAC;QAEF,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;YAC7B,MAAM,IAAI,KAAK,CACb,qBAAqB,WAAW,kDAAkD;gBAChF,gCAAgC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAClE,CAAC;SACH;IACH,CAAC;CACF;AAvGD,mCAuGC;AAED;;;GAGG;AAEH;;;GAGG;AAEH;;;;;;GAMG;AAEH;;GAEG;AAEH;;;;GAIG;AAEH;;;;;GAKG;AAEH;;;;;;GAMG;AAEH;;;;GAIG"}
|
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
export const EXIT_CODE: Readonly<{
|
|
2
|
+
SUCCESS: 0;
|
|
3
|
+
HAS_MAJOR_ISSUES: 127;
|
|
4
|
+
}>;
|
|
1
5
|
export class Doctor {
|
|
2
6
|
/**
|
|
3
7
|
* @param {DoctorCheck[]} [checks=[]]
|
|
@@ -28,8 +32,20 @@ export class Doctor {
|
|
|
28
32
|
* @param {DoctorIssue} f
|
|
29
33
|
*/
|
|
30
34
|
runAutoFix(f: DoctorIssue): Promise<void>;
|
|
31
|
-
|
|
32
|
-
|
|
35
|
+
/**
|
|
36
|
+
* @returns {Promise<boolean>}
|
|
37
|
+
*/
|
|
38
|
+
runAutoFixes(): Promise<boolean>;
|
|
39
|
+
/**
|
|
40
|
+
* @returns {Promise<EXIT_CODE[keyof EXIT_CODE]>}
|
|
41
|
+
*/
|
|
42
|
+
run(): Promise<Readonly<{
|
|
43
|
+
SUCCESS: 0;
|
|
44
|
+
HAS_MAJOR_ISSUES: 127;
|
|
45
|
+
}>[keyof Readonly<{
|
|
46
|
+
SUCCESS: 0;
|
|
47
|
+
HAS_MAJOR_ISSUES: 127;
|
|
48
|
+
}>]>;
|
|
33
49
|
/**
|
|
34
50
|
* @param {DoctorCheckResult} result
|
|
35
51
|
* @param {DoctorCheck} check
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../../lib/doctor/doctor.js"],"names":[],"mappings":"AAIA;IACE;;OAEG;IACH,yEASC;IARC,0CAAqC;IACrC,4BAA4B;IAC5B,QADW,WAAW,EAAE,CACJ;IAIpB,4BAA4B;IAC5B,aADW,WAAW,EAAE,CACH;IAGvB;;OAEG;IACH,yCAEC;IAED;;OAEG;IACH,yCAEC;IAED;;OAEG;IACH,0BAcC;IAED;;OAEG;IACH,sBAFa,QAAQ,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../../lib/doctor/doctor.js"],"names":[],"mappings":"AAIA;;;GAGG;AAEH;IACE;;OAEG;IACH,yEASC;IARC,0CAAqC;IACrC,4BAA4B;IAC5B,QADW,WAAW,EAAE,CACJ;IAIpB,4BAA4B;IAC5B,aADW,WAAW,EAAE,CACH;IAGvB;;OAEG;IACH,yCAEC;IAED;;OAEG;IACH,yCAEC;IAED;;OAEG;IACH,0BAcC;IAED;;OAEG;IACH,sBAFa,QAAQ,OAAO,CAAC,CAkD5B;IAED;;OAEG;IACH,cAFW,WAAW,iBA0BrB;IAED;;OAEG;IACH,gBAFa,QAAQ,OAAO,CAAC,CAkB5B;IAED;;OAEG;IACH,OAFa,QAAQ;;;OAAU;;;MAAe,CAAC,CAAC,CAc/C;IAED;;;;OAIG;IACH,gBAJW,iBAAiB,SACjB,WAAW,GACT,WAAW,QAgBvB;IAED;;OAEG;IACH,mBAFa,MAAM,CAKlB;IAED;;OAEG;IACH,iBAFa,OAAO,CASnB;CACF;;WAIa,WAAW;WACX,MAAM;;;0BAKP,OAAO,eAAe,EAAE,YAAY;gCACpC,OAAO,eAAe,EAAE,iBAAiB"}
|
|
@@ -3,10 +3,14 @@ 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
|
-
exports.Doctor = void 0;
|
|
6
|
+
exports.Doctor = exports.EXIT_CODE = void 0;
|
|
7
7
|
require("@colors/colors");
|
|
8
8
|
const lodash_1 = __importDefault(require("lodash"));
|
|
9
9
|
const support_1 = require("@appium/support");
|
|
10
|
+
exports.EXIT_CODE = Object.freeze({
|
|
11
|
+
SUCCESS: 0,
|
|
12
|
+
HAS_MAJOR_ISSUES: 127,
|
|
13
|
+
});
|
|
10
14
|
class Doctor {
|
|
11
15
|
/**
|
|
12
16
|
* @param {DoctorCheck[]} [checks=[]]
|
|
@@ -65,7 +69,13 @@ class Doctor {
|
|
|
65
69
|
/** @type {string[]} */
|
|
66
70
|
const fixMessages = [];
|
|
67
71
|
for (const issue of issues) {
|
|
68
|
-
|
|
72
|
+
let message;
|
|
73
|
+
try {
|
|
74
|
+
message = await issue.check.fix();
|
|
75
|
+
}
|
|
76
|
+
catch (e) {
|
|
77
|
+
message = e.message;
|
|
78
|
+
}
|
|
69
79
|
if (message) {
|
|
70
80
|
fixMessages.push(message);
|
|
71
81
|
}
|
|
@@ -80,7 +90,7 @@ class Doctor {
|
|
|
80
90
|
'The configuration cannot be automatically fixed, please do the following first:',
|
|
81
91
|
], manualIssues);
|
|
82
92
|
await handleIssues([
|
|
83
|
-
'### Optional Manual Fixes
|
|
93
|
+
'### Optional Manual Fixes ###',
|
|
84
94
|
'To fix these optional issues, please do the following manually:',
|
|
85
95
|
], manualIssuesOptional);
|
|
86
96
|
if (manualIssues.length > 0) {
|
|
@@ -123,6 +133,9 @@ class Doctor {
|
|
|
123
133
|
this.log.info(`### Fix was applied but issue remains ###`);
|
|
124
134
|
}
|
|
125
135
|
}
|
|
136
|
+
/**
|
|
137
|
+
* @returns {Promise<boolean>}
|
|
138
|
+
*/
|
|
126
139
|
async runAutoFixes() {
|
|
127
140
|
const autoFixes = lodash_1.default.filter(this.foundIssues, (f) => f.check.hasAutofix());
|
|
128
141
|
for (const f of autoFixes) {
|
|
@@ -132,22 +145,29 @@ class Doctor {
|
|
|
132
145
|
if (lodash_1.default.find(autoFixes, (f) => !f.fixed)) {
|
|
133
146
|
// a few issues remain.
|
|
134
147
|
this.log.info('Bye! A few issues remain, fix manually and/or rerun doctor!');
|
|
148
|
+
this.log.info('');
|
|
149
|
+
return false;
|
|
135
150
|
}
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
this.log.info('Bye! All issues have been fixed!');
|
|
139
|
-
}
|
|
151
|
+
// nothing left to fix.
|
|
152
|
+
this.log.info('Bye! All issues have been fixed!');
|
|
140
153
|
this.log.info('');
|
|
154
|
+
return true;
|
|
141
155
|
}
|
|
156
|
+
/**
|
|
157
|
+
* @returns {Promise<EXIT_CODE[keyof EXIT_CODE]>}
|
|
158
|
+
*/
|
|
142
159
|
async run() {
|
|
143
160
|
await this.diagnose();
|
|
144
161
|
if (this.reportSuccess()) {
|
|
145
|
-
return;
|
|
162
|
+
return exports.EXIT_CODE.SUCCESS;
|
|
146
163
|
}
|
|
147
164
|
if (await this.reportManualIssues()) {
|
|
148
|
-
return;
|
|
165
|
+
return exports.EXIT_CODE.HAS_MAJOR_ISSUES;
|
|
166
|
+
}
|
|
167
|
+
if (!await this.runAutoFixes()) {
|
|
168
|
+
return exports.EXIT_CODE.HAS_MAJOR_ISSUES;
|
|
149
169
|
}
|
|
150
|
-
|
|
170
|
+
return exports.EXIT_CODE.SUCCESS;
|
|
151
171
|
}
|
|
152
172
|
/**
|
|
153
173
|
* @param {DoctorCheckResult} result
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../lib/doctor/doctor.js"],"names":[],"mappings":";;;;;;AAAA,0BAAwB;AACxB,oDAAuB;AACvB,6CAAuD;
|
|
1
|
+
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../lib/doctor/doctor.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extension-config.d.ts","sourceRoot":"","sources":["../../../lib/extension/extension-config.js"],"names":[],"mappings":"AAgBA;;;;;GAKG;AACH,qCAAsC;AACtC;;;GAGG;AACH,yCAA0C;AAC1C;;;GAGG;AACH,2CAA4C;AAC5C;;;GAGG;AACH,qCAAsC;AACtC;;;GAGG;AACH,qCAAsC;AAEtC,+BAA+B;AAC/B,4BADW,IAAI,WAAW,CAAC,CAOxB;AAEH;;;;;GAKG;AACH;
|
|
1
|
+
{"version":3,"file":"extension-config.d.ts","sourceRoot":"","sources":["../../../lib/extension/extension-config.js"],"names":[],"mappings":"AAgBA;;;;;GAKG;AACH,qCAAsC;AACtC;;;GAGG;AACH,yCAA0C;AAC1C;;;GAGG;AACH,2CAA4C;AAC5C;;;GAGG;AACH,qCAAsC;AACtC;;;GAGG;AACH,qCAAsC;AAEtC,+BAA+B;AAC/B,4BADW,IAAI,WAAW,CAAC,CAOxB;AAEH;;;;;GAKG;AACH;IA6iBE;;;;;;;;;OASG;IACH,oCAkBC;IAED;;;;;;OAMG;IACH,uKAEC;IA1jBD;;;;OAIG;IACH,wBAIC;IAlCD;;;OAGG;IACH,eAFU,OAAO,CAEH;IAEd;;;;;OAKG;IACH,qBAFU,SAAS,UAAU,OAAO,CAAC,CAAC,CAElB;IAEpB,mDAAmD;IACnD,KADW,OAAO,eAAe,EAAE,YAAY,CAC3C;IAEJ,uBAAuB;IACvB,UADW,QAAQ,CACV;IAkBT,2BAEC;IAED,yBAEC;IAED;;;;;;OAMG;IACH,qBAJW,QAAQ,OAAO,CAAC,eAChB,YAAY,OAAO,CAAC,GAClB,kBAAkB,EAAE,CAQhC;IAED;;;;;;OAMG;IACH,qBAJW,QAAQ,OAAO,CAAC,eAChB,YAAY,OAAO,CAAC,GAClB,QAAQ,MAAM,EAAE,CAAC,CAS7B;IAED;;;;;;OAMG;IAEH,+BALW,YAAY,OAAO,CAAC,WACpB,QAAQ,OAAO,CAAC,GACd,QAAQ,MAAM,EAAE,CAAC,CAK7B;IAED;;;;OAIG;IACH;;;MAsCC;IAED;;;;;;;;;;OAUG;IACH,0BAHW,UAAU,OAAO,CAAC,GAChB,QAAQ,UAAU,OAAO,CAAC,CAAC,CAyDvC;IAED;;;;;;;OAOG;IACH,yBAFa,QAAQ,OAAO,0BAA0B,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,CAW9E;IAED;;;;;;;;;OASG;IACH,sCAJW,YAAY,OAAO,CAAC,WACpB,QAAQ,OAAO,CAAC,GACd,QAAQ,MAAM,EAAE,CAAC,CAqF7B;IACD;;;;;;OAMG;IACH,+BAJW,YAAY,OAAO,CAAC,WACpB,QAAQ,OAAO,CAAC,GACd,kBAAkB,EAAE,CA0ChC;IAED;;;;;OAKG;IAEH,sCALW,YAAY,OAAO,CAAC,WACpB,QAAQ,OAAO,CAAC,GACd,kBAAkB,EAAE,CA6BhC;IAED;;;;;OAKG;IAEH,+BALW,YAAY,OAAO,CAAC,WACpB,QAAQ,OAAO,CAAC,GACd,kBAAkB,EAAE,CAMhC;IAED;;;;;OAKG;IACH,sBALW,MAAM,eACN,YAAY,OAAO,CAAC,cACpB,2BAA2B,GACzB,QAAQ,IAAI,CAAC,CAOzB;IAED;;;;;OAKG;IACH,yBALW,QAAQ,OAAO,CAAC,eAChB,YAAY,OAAO,CAAC,cACpB,2BAA2B,GACzB,QAAQ,IAAI,CAAC,CAUzB;IAED;;;;;;OAMG;IACH,yBAJW,QAAQ,OAAO,CAAC,cAChB,2BAA2B,GACzB,QAAQ,IAAI,CAAC,CAOzB;IAED;;;OAGG;IAEH,2CAHa,IAAI,CAkBhB;IAED;;;;;;OAMG;IAEH,uBANW,QAAQ,OAAO,CAAC,eAChB,YAAY,OAAO,CAAC,GAClB,MAAM,CAMlB;IAED;;;;;;OAMG;IACH,wBAHW,MAAM,OAAO,IAAI,CAAC,mBAAmB,GACnC,MAAM,CAOlB;IAED;;;;OAIG;IACH,2BAHW,QAAQ,OAAO,CAAC,GACd,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAuBrC;IAED;;;;;OAKG;IACH,sBAHW,QAAQ,OAAO,CAAC,GACd,QAAQ,SAAS,OAAO,CAAC,CAAC,CActC;IAED;;;OAGG;IACH,qBAHW,MAAM,GACJ,OAAO,CAInB;IA2CD;;;;;;OAMG;IACH,6BAJW,QAAQ,OAAO,CAAC,eAChB,sBAAsB,OAAO,CAAC,GAC5B,OAAO,KAAK,EAAE,YAAY,GAAC,SAAS,CAShD;;CACF;;;;;;;;;;SAOa,MAAM;;;;SACN,GAAG;;;;;uCAMH,GAAG,OACJ,IAAI;4BAIJ,OAAO,eAAe,EAAE,aAAa;uBACrC,OAAO,YAAY,EAAE,QAAQ;0BAC7B,OAAO,cAAc,EAAE,WAAW;iFAKlC,OAAO,cAAc,EAAE,WAAW,CAAC,OAAO,CAAC;2FAK3C,YAAY,OAAO,CAAC,GAAG;IAAC,MAAM,EAAE,YAAY,YAAY,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA;CAAC;6EAK5E,OAAO,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC;8EAKvC,OAAO,cAAc,EAAE,QAAQ,CAAC,OAAO,CAAC;+EAKxC,OAAO,cAAc,EAAE,SAAS,CAAC,OAAO,CAAC;gFAKzC,OAAO,kBAAkB,EAAE,UAAU,CAAC,OAAO,CAAC"}
|
|
@@ -257,7 +257,9 @@ class ExtensionConfig {
|
|
|
257
257
|
if (invalidFields.length) {
|
|
258
258
|
const invalidFieldsEnumerationText = support_1.util.pluralize('invalid or missing field', invalidFields.length, true);
|
|
259
259
|
const invalidFieldsText = invalidFields.map((field) => `"${field}"`).join(', ');
|
|
260
|
-
warnings.push(`${extTypeText} "${extName}" (package \`${pkgName}\`) has ${invalidFieldsEnumerationText} (${invalidFieldsText}) in \`extensions.yaml\`;
|
|
260
|
+
warnings.push(`${extTypeText} "${extName}" (package \`${pkgName}\`) has ${invalidFieldsEnumerationText} (${invalidFieldsText}) in \`extensions.yaml\`; ` +
|
|
261
|
+
`this may cause upgrades done via the \`appium\` CLI tool to fail. Please reinstall with \`appium ${this.extensionType} uninstall ` +
|
|
262
|
+
`${extName}\` and \`appium ${this.extensionType} install ${extName}\` to attempt a fix.`);
|
|
261
263
|
}
|
|
262
264
|
/**
|
|
263
265
|
* Helps concatenate warning messages related to peer dependencies
|
|
@@ -271,11 +273,11 @@ class ExtensionConfig {
|
|
|
271
273
|
/** @type {import('../cli/extension-command').ExtensionListData<ExtType>} */ (listData[extName]);
|
|
272
274
|
if (extListData?.installed) {
|
|
273
275
|
const { updateVersion, upToDate } = extListData;
|
|
274
|
-
if (!upToDate) {
|
|
275
|
-
warnings.push(createPeerWarning(`its peer dependency on
|
|
276
|
+
if (!upToDate && updateVersion) {
|
|
277
|
+
warnings.push(createPeerWarning(`its peer dependency on Appium ${appiumVersion}. Try to upgrade \`${pkgName}\` to v${updateVersion} or newer.`));
|
|
276
278
|
}
|
|
277
279
|
else {
|
|
278
|
-
warnings.push(createPeerWarning(`its peer dependency on
|
|
280
|
+
warnings.push(createPeerWarning(`its peer dependency on Appium ${appiumVersion}. Please install a compatible version of the ${lodash_1.default.toLower(extTypeText)}.`));
|
|
279
281
|
}
|
|
280
282
|
}
|
|
281
283
|
}
|
|
@@ -284,10 +286,12 @@ class ExtensionConfig {
|
|
|
284
286
|
const extListData =
|
|
285
287
|
/** @type {import('../cli/extension-command').InstalledExtensionListData<ExtType>} */ (listData[extName]);
|
|
286
288
|
if (!extListData?.upToDate && extListData?.updateVersion) {
|
|
287
|
-
warnings.push(createPeerWarning(`an invalid or missing peer dependency on Appium. A newer version of \`${pkgName}\` is available;
|
|
289
|
+
warnings.push(createPeerWarning(`an invalid or missing peer dependency on Appium. A newer version of \`${pkgName}\` is available; ` +
|
|
290
|
+
`please attempt to upgrade "${extName}" to v${extListData.updateVersion} or newer.`));
|
|
288
291
|
}
|
|
289
292
|
else {
|
|
290
|
-
warnings.push(createPeerWarning(`an invalid or missing peer dependency on Appium.
|
|
293
|
+
warnings.push(createPeerWarning(`an invalid or missing peer dependency on Appium. ` +
|
|
294
|
+
`Please ask the developer of \`${pkgName}\` to add a peer dependency on \`^appium@${config_1.APPIUM_VER}\`.`));
|
|
291
295
|
}
|
|
292
296
|
}
|
|
293
297
|
return warnings;
|
|
@@ -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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"}
|
|
@@ -67,10 +67,11 @@ export default class DriverCliCommand extends ExtensionCliCommand {
|
|
|
67
67
|
}
|
|
68
68
|
|
|
69
69
|
/**
|
|
70
|
-
* Runs doctor checks for the given driver
|
|
70
|
+
* Runs doctor checks for the given driver.
|
|
71
71
|
*
|
|
72
72
|
* @param {DriverDoctorOptions} opts
|
|
73
|
-
* @returns {Promise<
|
|
73
|
+
* @returns {Promise<number>} The amount of executed doctor checks.
|
|
74
|
+
* @throws {Error} If any of the mandatory Doctor checks fails.
|
|
74
75
|
*/
|
|
75
76
|
async doctor({driver}) {
|
|
76
77
|
return await super._doctor({
|
|
@@ -16,7 +16,7 @@ import {packageDidChange} from '../extension/package-changed';
|
|
|
16
16
|
import {spawn} from 'child_process';
|
|
17
17
|
import {inspect} from 'node:util';
|
|
18
18
|
import {pathToFileURL} from 'url';
|
|
19
|
-
import {Doctor} from '../doctor/doctor';
|
|
19
|
+
import {Doctor, EXIT_CODE as DOCTOR_EXIT_CODE} from '../doctor/doctor';
|
|
20
20
|
import {npmPackage} from '../utils';
|
|
21
21
|
import semver from 'semver';
|
|
22
22
|
|
|
@@ -36,13 +36,17 @@ function receiptToManifest(receipt) {
|
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
/**
|
|
39
|
-
* Fetches the remote extension version
|
|
39
|
+
* Fetches the remote extension version requirements
|
|
40
40
|
*
|
|
41
|
-
* @param {string}
|
|
41
|
+
* @param {string} pkgName Extension name
|
|
42
|
+
* @param {string} [pkgVer] Extension version (if not provided then the latest is assumed)
|
|
42
43
|
* @returns {Promise<[string, string|null]>}
|
|
43
44
|
*/
|
|
44
|
-
async function getRemoteExtensionVersionReq(
|
|
45
|
-
const allDeps = await npm.getPackageInfo(
|
|
45
|
+
async function getRemoteExtensionVersionReq(pkgName, pkgVer) {
|
|
46
|
+
const allDeps = await npm.getPackageInfo(
|
|
47
|
+
`${pkgName}${pkgVer ? `@${pkgVer}` : ``}`,
|
|
48
|
+
['peerDependencies', 'dependencies']
|
|
49
|
+
);
|
|
46
50
|
const requiredVersionPair = _.flatMap(_.values(allDeps).map(_.toPairs))
|
|
47
51
|
.find(([name]) => name === 'appium');
|
|
48
52
|
return [npmPackage.version, requiredVersionPair ? requiredVersionPair[1] : null];
|
|
@@ -246,13 +250,13 @@ class ExtensionCliCommand {
|
|
|
246
250
|
* @param {InstallViaNpmArgs} installViaNpmOpts
|
|
247
251
|
* @returns {Promise<void>}
|
|
248
252
|
*/
|
|
249
|
-
async _checkInstallCompatibility({installSpec, pkgName, installType}) {
|
|
253
|
+
async _checkInstallCompatibility({installSpec, pkgName, pkgVer, installType}) {
|
|
250
254
|
if (INSTALL_TYPE_NPM !== installType) {
|
|
251
255
|
return;
|
|
252
256
|
}
|
|
253
257
|
|
|
254
258
|
await spinWith(this.isJsonOutput, `Checking if '${pkgName}' is compatible`, async () => {
|
|
255
|
-
const [serverVersion, extVersionRequirement] = await getRemoteExtensionVersionReq(
|
|
259
|
+
const [serverVersion, extVersionRequirement] = await getRemoteExtensionVersionReq(pkgName, pkgVer);
|
|
256
260
|
if (serverVersion && extVersionRequirement && !semver.satisfies(serverVersion, extVersionRequirement)) {
|
|
257
261
|
throw this._createFatalError(
|
|
258
262
|
`'${installSpec}' cannot be installed because the server version it requires (${extVersionRequirement}) ` +
|
|
@@ -738,10 +742,12 @@ class ExtensionCliCommand {
|
|
|
738
742
|
}
|
|
739
743
|
|
|
740
744
|
/**
|
|
741
|
-
* Runs doctor checks for the given extension
|
|
745
|
+
* Runs doctor checks for the given extension.
|
|
742
746
|
*
|
|
743
747
|
* @param {DoctorOptions} opts
|
|
744
|
-
* @returns {Promise<
|
|
748
|
+
* @returns {Promise<number>} The amount of Doctor checks that were
|
|
749
|
+
* successfully loaded and executed for the given extension
|
|
750
|
+
* @throws {Error} If any of the mandatory Doctor checks fails.
|
|
745
751
|
*/
|
|
746
752
|
async _doctor({installSpec}) {
|
|
747
753
|
if (!this.config.isInstalled(installSpec)) {
|
|
@@ -765,7 +771,7 @@ class ExtensionCliCommand {
|
|
|
765
771
|
}
|
|
766
772
|
if (!doctorSpec) {
|
|
767
773
|
this.log.info(`The ${this.type} "${installSpec}" does not export any doctor checks`);
|
|
768
|
-
return
|
|
774
|
+
return 0;
|
|
769
775
|
}
|
|
770
776
|
if (!_.isPlainObject(doctorSpec) || !_.isArray(doctorSpec.checks)) {
|
|
771
777
|
throw this._createFatalError(
|
|
@@ -806,14 +812,17 @@ class ExtensionCliCommand {
|
|
|
806
812
|
.filter(isDoctorCheck);
|
|
807
813
|
if (_.isEmpty(checks)) {
|
|
808
814
|
this.log.info(`The ${this.type} "${installSpec}" exports no valid doctor checks`);
|
|
809
|
-
return
|
|
815
|
+
return 0;
|
|
810
816
|
}
|
|
811
817
|
this.log.debug(
|
|
812
818
|
`Running ${util.pluralize('doctor check', checks.length, true)} ` +
|
|
813
819
|
`for the "${installSpec}" ${this.type}`
|
|
814
820
|
);
|
|
815
|
-
await new Doctor(checks).run();
|
|
816
|
-
|
|
821
|
+
const exitCode = await new Doctor(checks).run();
|
|
822
|
+
if (exitCode !== DOCTOR_EXIT_CODE.SUCCESS) {
|
|
823
|
+
throw this._createFatalError('Treatment required');
|
|
824
|
+
}
|
|
825
|
+
return checks.length;
|
|
817
826
|
}
|
|
818
827
|
|
|
819
828
|
/**
|
|
@@ -69,7 +69,8 @@ export default class PluginCliCommand extends ExtensionCliCommand {
|
|
|
69
69
|
* Runs doctor checks for the given plugin
|
|
70
70
|
*
|
|
71
71
|
* @param {PluginDoctorOptions} opts
|
|
72
|
-
* @returns {Promise<
|
|
72
|
+
* @returns {Promise<number>} The amount of executed doctor checks.
|
|
73
|
+
* @throws {Error} If any of the mandatory Doctor checks fails.
|
|
73
74
|
*/
|
|
74
75
|
async doctor({plugin}) {
|
|
75
76
|
return await super._doctor({
|
package/lib/doctor/doctor.js
CHANGED
|
@@ -2,6 +2,11 @@ import '@colors/colors';
|
|
|
2
2
|
import _ from 'lodash';
|
|
3
3
|
import { util, doctor, logger } from '@appium/support';
|
|
4
4
|
|
|
5
|
+
export const EXIT_CODE = /** @type {const} */ Object.freeze({
|
|
6
|
+
SUCCESS: 0,
|
|
7
|
+
HAS_MAJOR_ISSUES: 127,
|
|
8
|
+
});
|
|
9
|
+
|
|
5
10
|
export class Doctor {
|
|
6
11
|
/**
|
|
7
12
|
* @param {DoctorCheck[]} [checks=[]]
|
|
@@ -68,7 +73,12 @@ export class Doctor {
|
|
|
68
73
|
/** @type {string[]} */
|
|
69
74
|
const fixMessages = [];
|
|
70
75
|
for (const issue of issues) {
|
|
71
|
-
|
|
76
|
+
let message;
|
|
77
|
+
try {
|
|
78
|
+
message = await issue.check.fix();
|
|
79
|
+
} catch (e) {
|
|
80
|
+
message = e.message;
|
|
81
|
+
}
|
|
72
82
|
if (message) {
|
|
73
83
|
fixMessages.push(message);
|
|
74
84
|
}
|
|
@@ -84,7 +94,7 @@ export class Doctor {
|
|
|
84
94
|
'The configuration cannot be automatically fixed, please do the following first:',
|
|
85
95
|
], manualIssues);
|
|
86
96
|
await handleIssues([
|
|
87
|
-
'### Optional Manual Fixes
|
|
97
|
+
'### Optional Manual Fixes ###',
|
|
88
98
|
'To fix these optional issues, please do the following manually:',
|
|
89
99
|
], manualIssuesOptional);
|
|
90
100
|
|
|
@@ -127,6 +137,9 @@ export class Doctor {
|
|
|
127
137
|
}
|
|
128
138
|
}
|
|
129
139
|
|
|
140
|
+
/**
|
|
141
|
+
* @returns {Promise<boolean>}
|
|
142
|
+
*/
|
|
130
143
|
async runAutoFixes() {
|
|
131
144
|
const autoFixes = _.filter(this.foundIssues, (f) => f.check.hasAutofix());
|
|
132
145
|
for (const f of autoFixes) {
|
|
@@ -136,22 +149,30 @@ export class Doctor {
|
|
|
136
149
|
if (_.find(autoFixes, (f) => !f.fixed)) {
|
|
137
150
|
// a few issues remain.
|
|
138
151
|
this.log.info('Bye! A few issues remain, fix manually and/or rerun doctor!');
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
this.log.info('Bye! All issues have been fixed!');
|
|
152
|
+
this.log.info('');
|
|
153
|
+
return false;
|
|
142
154
|
}
|
|
155
|
+
// nothing left to fix.
|
|
156
|
+
this.log.info('Bye! All issues have been fixed!');
|
|
143
157
|
this.log.info('');
|
|
158
|
+
return true;
|
|
144
159
|
}
|
|
145
160
|
|
|
161
|
+
/**
|
|
162
|
+
* @returns {Promise<EXIT_CODE[keyof EXIT_CODE]>}
|
|
163
|
+
*/
|
|
146
164
|
async run() {
|
|
147
165
|
await this.diagnose();
|
|
148
166
|
if (this.reportSuccess()) {
|
|
149
|
-
return;
|
|
167
|
+
return EXIT_CODE.SUCCESS;
|
|
150
168
|
}
|
|
151
169
|
if (await this.reportManualIssues()) {
|
|
152
|
-
return;
|
|
170
|
+
return EXIT_CODE.HAS_MAJOR_ISSUES;
|
|
171
|
+
}
|
|
172
|
+
if (!await this.runAutoFixes()) {
|
|
173
|
+
return EXIT_CODE.HAS_MAJOR_ISSUES;
|
|
153
174
|
}
|
|
154
|
-
|
|
175
|
+
return EXIT_CODE.SUCCESS;
|
|
155
176
|
}
|
|
156
177
|
|
|
157
178
|
/**
|
|
@@ -311,7 +311,9 @@ export class ExtensionConfig {
|
|
|
311
311
|
const invalidFieldsText = invalidFields.map((field) => `"${field}"`).join(', ');
|
|
312
312
|
|
|
313
313
|
warnings.push(
|
|
314
|
-
`${extTypeText} "${extName}" (package \`${pkgName}\`) has ${invalidFieldsEnumerationText} (${invalidFieldsText}) in \`extensions.yaml\`;
|
|
314
|
+
`${extTypeText} "${extName}" (package \`${pkgName}\`) has ${invalidFieldsEnumerationText} (${invalidFieldsText}) in \`extensions.yaml\`; ` +
|
|
315
|
+
`this may cause upgrades done via the \`appium\` CLI tool to fail. Please reinstall with \`appium ${this.extensionType} uninstall ` +
|
|
316
|
+
`${extName}\` and \`appium ${this.extensionType} install ${extName}\` to attempt a fix.`
|
|
315
317
|
);
|
|
316
318
|
}
|
|
317
319
|
|
|
@@ -331,16 +333,16 @@ export class ExtensionConfig {
|
|
|
331
333
|
);
|
|
332
334
|
if (extListData?.installed) {
|
|
333
335
|
const {updateVersion, upToDate} = extListData;
|
|
334
|
-
if (!upToDate) {
|
|
336
|
+
if (!upToDate && updateVersion) {
|
|
335
337
|
warnings.push(
|
|
336
338
|
createPeerWarning(
|
|
337
|
-
`its peer dependency on
|
|
339
|
+
`its peer dependency on Appium ${appiumVersion}. Try to upgrade \`${pkgName}\` to v${updateVersion} or newer.`
|
|
338
340
|
)
|
|
339
341
|
);
|
|
340
342
|
} else {
|
|
341
343
|
warnings.push(
|
|
342
344
|
createPeerWarning(
|
|
343
|
-
`its peer dependency on
|
|
345
|
+
`its peer dependency on Appium ${appiumVersion}. Please install a compatible version of the ${_.toLower(extTypeText)}.`
|
|
344
346
|
)
|
|
345
347
|
);
|
|
346
348
|
}
|
|
@@ -354,13 +356,15 @@ export class ExtensionConfig {
|
|
|
354
356
|
if (!extListData?.upToDate && extListData?.updateVersion) {
|
|
355
357
|
warnings.push(
|
|
356
358
|
createPeerWarning(
|
|
357
|
-
`an invalid or missing peer dependency on Appium. A newer version of \`${pkgName}\` is available;
|
|
359
|
+
`an invalid or missing peer dependency on Appium. A newer version of \`${pkgName}\` is available; ` +
|
|
360
|
+
`please attempt to upgrade "${extName}" to v${extListData.updateVersion} or newer.`
|
|
358
361
|
)
|
|
359
362
|
);
|
|
360
363
|
} else {
|
|
361
364
|
warnings.push(
|
|
362
365
|
createPeerWarning(
|
|
363
|
-
`an invalid or missing peer dependency on Appium.
|
|
366
|
+
`an invalid or missing peer dependency on Appium. ` +
|
|
367
|
+
`Please ask the developer of \`${pkgName}\` to add a peer dependency on \`^appium@${APPIUM_VER}\`.`
|
|
364
368
|
)
|
|
365
369
|
);
|
|
366
370
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "appium",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.5.0",
|
|
4
4
|
"description": "Automation for Apps.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"automation",
|
|
@@ -60,12 +60,12 @@
|
|
|
60
60
|
"test:unit": "mocha \"./test/unit/**/*.spec.js\""
|
|
61
61
|
},
|
|
62
62
|
"dependencies": {
|
|
63
|
-
"@appium/base-driver": "^9.5.
|
|
64
|
-
"@appium/base-plugin": "^2.2.
|
|
65
|
-
"@appium/docutils": "^1.0.
|
|
63
|
+
"@appium/base-driver": "^9.5.1",
|
|
64
|
+
"@appium/base-plugin": "^2.2.27",
|
|
65
|
+
"@appium/docutils": "^1.0.3",
|
|
66
66
|
"@appium/schema": "~0.5.0",
|
|
67
|
-
"@appium/support": "^4.2.
|
|
68
|
-
"@appium/types": "^0.16.
|
|
67
|
+
"@appium/support": "^4.2.1",
|
|
68
|
+
"@appium/types": "^0.16.1",
|
|
69
69
|
"@sidvind/better-ajv-errors": "2.1.3",
|
|
70
70
|
"@types/argparse": "2.0.14",
|
|
71
71
|
"@types/bluebird": "3.5.42",
|
|
@@ -78,7 +78,7 @@
|
|
|
78
78
|
"argparse": "2.0.1",
|
|
79
79
|
"async-lock": "1.4.1",
|
|
80
80
|
"asyncbox": "3.0.0",
|
|
81
|
-
"axios": "1.6.
|
|
81
|
+
"axios": "1.6.7",
|
|
82
82
|
"bluebird": "3.7.2",
|
|
83
83
|
"cross-env": "7.0.3",
|
|
84
84
|
"lilconfig": "3.0.0",
|
|
@@ -90,7 +90,7 @@
|
|
|
90
90
|
"semver": "7.5.4",
|
|
91
91
|
"source-map-support": "0.5.21",
|
|
92
92
|
"teen_process": "2.1.1",
|
|
93
|
-
"type-fest": "4.
|
|
93
|
+
"type-fest": "4.10.1",
|
|
94
94
|
"winston": "3.11.0",
|
|
95
95
|
"wrap-ansi": "7.0.0",
|
|
96
96
|
"ws": "8.16.0",
|
|
@@ -103,5 +103,5 @@
|
|
|
103
103
|
"publishConfig": {
|
|
104
104
|
"access": "public"
|
|
105
105
|
},
|
|
106
|
-
"gitHead": "
|
|
106
|
+
"gitHead": "9cc598a92c2f0d2dfbf40d54698f0ee39b50e4dc"
|
|
107
107
|
}
|