appium-xcuitest-driver 10.1.7 → 10.2.1

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [10.2.1](https://github.com/appium/appium-xcuitest-driver/compare/v10.2.0...v10.2.1) (2025-10-10)
+
+### Miscellaneous Chores
+
+* Migrate doctor checks to typescript ([#2640](https://github.com/appium/appium-xcuitest-driver/issues/2640)) ([1bd49a7](https://github.com/appium/appium-xcuitest-driver/commit/1bd49a74a2e7789efd2cc52527b4559e9c91aa64))
+
+## [10.2.0](https://github.com/appium/appium-xcuitest-driver/compare/v10.1.7...v10.2.0) (2025-10-10)
+
+### Features
+
+* Add optional simulator doctor check ([#2639](https://github.com/appium/appium-xcuitest-driver/issues/2639)) ([201d451](https://github.com/appium/appium-xcuitest-driver/commit/201d4519d051546dfd3b9f94f87e19a7914b7932))
+
 ## [10.1.7](https://github.com/appium/appium-xcuitest-driver/compare/v10.1.6...v10.1.7) (2025-10-10)
 
 ### Miscellaneous Chores

package/build/lib/doctor/checks.d.ts

@@ -1,3 +1,3 @@
-export * as required from "./required-checks";
-export * as optional from "./optional-checks";
+export * as required from './required-checks';
+export * as optional from './optional-checks';
 //# sourceMappingURL=checks.d.ts.map

package/build/lib/doctor/checks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checks.d.ts","sourceRoot":"","sources":["../../../lib/doctor/checks.js"],"names":[],"mappings":""}
+{"version":3,"file":"checks.d.ts","sourceRoot":"","sources":["../../../lib/doctor/checks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAC9C,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC"}

package/build/lib/doctor/checks.js.map

@@ -1 +1 @@
-{"version":3,"file":"checks.js","sourceRoot":"","sources":["../../../lib/doctor/checks.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAA8C;AAC9C,8DAA8C"}
+{"version":3,"file":"checks.js","sourceRoot":"","sources":["../../../lib/doctor/checks.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAA8C;AAC9C,8DAA8C"}

package/build/lib/doctor/optional-checks.d.ts

@@ -1,29 +1,46 @@
-/** @satisfies {import('@appium/types').IDoctorCheck} */
-export class OptionalIdbCommandCheck {
-    IDB_README_URL: string;
-    diagnose(): Promise<import("@appium/types").DoctorCheckResult>;
+import type { IDoctorCheck, AppiumLogger, DoctorCheckResult } from '@appium/types';
+import '@colors/colors';
+export declare class OptionalIdbCommandCheck implements IDoctorCheck {
+    log: AppiumLogger;
+    static readonly IDB_README_URL = "https://git.io/JnxQc";
+    diagnose(): Promise<DoctorCheckResult>;
     fix(): Promise<string>;
     hasAutofix(): boolean;
     isOptional(): boolean;
 }
-export const optionalIdbCheck: OptionalIdbCommandCheck;
-/** @satisfies {import('@appium/types').IDoctorCheck} */
-export class OptionalApplesimutilsCommandCheck {
-    README_LINK: string;
-    diagnose(): Promise<import("@appium/types").DoctorCheckResult>;
+export declare const optionalIdbCheck: OptionalIdbCommandCheck;
+export declare class OptionalSimulatorCheck implements IDoctorCheck {
+    log: AppiumLogger;
+    static readonly SUPPORTED_SIMULATOR_PLATFORMS: SimulatorPlatform[];
+    diagnose(): Promise<DoctorCheckResult>;
     fix(): Promise<string>;
     hasAutofix(): boolean;
     isOptional(): boolean;
+    private _listInstalledSdks;
 }
-export const optionalApplesimutilsCheck: OptionalApplesimutilsCommandCheck;
-/** @satisfies {import('@appium/types').IDoctorCheck} */
-export class OptionalFfmpegCheck {
-    FFMPEG_BINARY: string;
-    FFMPEG_INSTALL_LINK: string;
-    diagnose(): Promise<import("@appium/types").DoctorCheckResult>;
+export declare const optionalSimulatorCheck: OptionalSimulatorCheck;
+export declare class OptionalApplesimutilsCommandCheck implements IDoctorCheck {
+    log: AppiumLogger;
+    static readonly README_LINK = "https://github.com/appium/appium-xcuitest-driver/blob/master/docs/reference/execute-methods.md#mobile-setpermission";
+    diagnose(): Promise<DoctorCheckResult>;
     fix(): Promise<string>;
     hasAutofix(): boolean;
     isOptional(): boolean;
 }
-export const optionalFfmpegCheck: OptionalFfmpegCheck;
+export declare const optionalApplesimutilsCheck: OptionalApplesimutilsCommandCheck;
+export declare class OptionalFfmpegCheck implements IDoctorCheck {
+    log: AppiumLogger;
+    static readonly FFMPEG_BINARY = "ffmpeg";
+    static readonly FFMPEG_INSTALL_LINK = "https://www.ffmpeg.org/download.html";
+    diagnose(): Promise<DoctorCheckResult>;
+    fix(): Promise<string>;
+    hasAutofix(): boolean;
+    isOptional(): boolean;
+}
+export declare const optionalFfmpegCheck: OptionalFfmpegCheck;
+interface SimulatorPlatform {
+    displayName: string;
+    name: string;
+}
+export {};
 //# sourceMappingURL=optional-checks.d.ts.map

package/build/lib/doctor/optional-checks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"optional-checks.d.ts","sourceRoot":"","sources":["../../../lib/doctor/optional-checks.js"],"names":[],"mappings":"AAIA,wDAAwD;AACxD;IACE,uBAAwC;IAExC,+DAaC;IAED,uBAEC;IAED,sBAEC;IAED,sBAEC;CACF;AACD,uDAA8D;AAG9D,wDAAwD;AACxD;IACE,oBAAoI;IAEpI,+DAKC;IAED,uBAEC;IAED,sBAEC;IAED,sBAEC;CACF;AACD,2EAAkF;AAGlF,wDAAwD;AACxD;IACE,sBAAyB;IACzB,4BAA6D;IAE7D,+DAMC;IAED,uBAKC;IAED,sBAEC;IAED,sBAEC;CACF;AACD,sDAA6D"}
+{"version":3,"file":"optional-checks.d.ts","sourceRoot":"","sources":["../../../lib/doctor/optional-checks.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAC,MAAM,eAAe,CAAC;AACjF,OAAO,gBAAgB,CAAC;AAGxB,qBAAa,uBAAwB,YAAW,YAAY;IAC1D,GAAG,EAAG,YAAY,CAAC;IACnB,MAAM,CAAC,QAAQ,CAAC,cAAc,0BAA0B;IAElD,QAAQ,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAetC,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC;IAI5B,UAAU,IAAI,OAAO;IAIrB,UAAU,IAAI,OAAO;CAGtB;AACD,eAAO,MAAM,gBAAgB,yBAAgC,CAAC;AAE9D,qBAAa,sBAAuB,YAAW,YAAY;IACzD,GAAG,EAAG,YAAY,CAAC;IACnB,MAAM,CAAC,QAAQ,CAAC,6BAA6B,EAAE,iBAAiB,EAAE,CAShE;IAEI,QAAQ,IAAI,OAAO,CAAC,iBAAiB,CAAC;IA0BtC,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC;IAI5B,UAAU,IAAI,OAAO;IAIrB,UAAU,IAAI,OAAO;YAIP,kBAAkB;CAIjC;AACD,eAAO,MAAM,sBAAsB,wBAA+B,CAAC;AAEnE,qBAAa,iCAAkC,YAAW,YAAY;IACpE,GAAG,EAAG,YAAY,CAAC;IACnB,MAAM,CAAC,QAAQ,CAAC,WAAW,yHAAyH;IAE9I,QAAQ,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAOtC,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC;IAI5B,UAAU,IAAI,OAAO;IAIrB,UAAU,IAAI,OAAO;CAGtB;AACD,eAAO,MAAM,0BAA0B,mCAA0C,CAAC;AAGlF,qBAAa,mBAAoB,YAAW,YAAY;IACtD,GAAG,EAAG,YAAY,CAAC;IACnB,MAAM,CAAC,QAAQ,CAAC,aAAa,YAAY;IACzC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,0CAA0C;IAEvE,QAAQ,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAQtC,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC;IAO5B,UAAU,IAAI,OAAO;IAIrB,UAAU,IAAI,OAAO;CAGtB;AACD,eAAO,MAAM,mBAAmB,qBAA4B,CAAC;AAE7D,UAAU,iBAAiB;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd"}

package/build/lib/doctor/optional-checks.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.optionalFfmpegCheck = exports.OptionalFfmpegCheck = exports.optionalApplesimutilsCheck = exports.OptionalApplesimutilsCommandCheck = exports.optionalIdbCheck = exports.OptionalIdbCommandCheck = void 0;
+exports.optionalFfmpegCheck = exports.OptionalFfmpegCheck = exports.optionalApplesimutilsCheck = exports.OptionalApplesimutilsCommandCheck = exports.optionalSimulatorCheck = exports.OptionalSimulatorCheck = exports.optionalIdbCheck = exports.OptionalIdbCommandCheck = void 0;
 const utils_1 = require("./utils");
 const support_1 = require("appium/support");
 require("@colors/colors");
-/** @satisfies {import('@appium/types').IDoctorCheck} */
+const teen_process_1 = require("teen_process");
 class OptionalIdbCommandCheck {
-    IDB_README_URL = 'https://git.io/JnxQc';
+    log;
+    static IDB_README_URL = 'https://git.io/JnxQc';
     async diagnose() {
         const fbIdbPath = await (0, utils_1.resolveExecutablePath)('idb');
         const fbCompanionIdbPath = await (0, utils_1.resolveExecutablePath)('idb_companion');
@@ -22,7 +23,7 @@ class OptionalIdbCommandCheck {
         return support_1.doctor.nokOptional('idb and idb_companion are not installed');
     }
     async fix() {
-        return `Why ${'idb'.bold} is needed and how to install it: ${this.IDB_README_URL}`;
+        return `Why ${'idb'.bold} is needed and how to install it: ${OptionalIdbCommandCheck.IDB_README_URL}`;
     }
     hasAutofix() {
         return false;
@@ -33,9 +34,57 @@ class OptionalIdbCommandCheck {
 }
 exports.OptionalIdbCommandCheck = OptionalIdbCommandCheck;
 exports.optionalIdbCheck = new OptionalIdbCommandCheck();
-/** @satisfies {import('@appium/types').IDoctorCheck} */
+class OptionalSimulatorCheck {
+    log;
+    static SUPPORTED_SIMULATOR_PLATFORMS = [
+        {
+            displayName: 'iOS',
+            name: 'iphonesimulator'
+        },
+        {
+            displayName: 'tvOS',
+            name: 'appletvsimulator'
+        }
+    ];
+    async diagnose() {
+        try {
+            // https://github.com/appium/appium/issues/12093#issuecomment-459358120
+            await (0, teen_process_1.exec)('xcrun', ['simctl', 'help']);
+        }
+        catch (err) {
+            return support_1.doctor.nokOptional(`Testing on Simulator is not possible. Cannot run 'xcrun simctl': ${err.stderr || err.message}`);
+        }
+        const sdks = await this._listInstalledSdks();
+        for (const { displayName, name } of OptionalSimulatorCheck.SUPPORTED_SIMULATOR_PLATFORMS) {
+            const errorPrefix = `Testing on ${displayName} Simulator is not possible`;
+            if (!sdks.some(({ platform }) => platform === name)) {
+                return support_1.doctor.nokOptional(`${errorPrefix}: SDK is not installed`);
+            }
+        }
+        return support_1.doctor.okOptional(`The following Simulator SDKs are installed:\n` +
+            sdks
+                .filter(({ platform }) => OptionalSimulatorCheck.SUPPORTED_SIMULATOR_PLATFORMS.some(({ name }) => name === platform))
+                .map(({ displayName }) => `\t→ ${displayName}`).join('\n'));
+    }
+    async fix() {
+        return `Install the desired Simulator SDK from Xcode's Settings -> Components`;
+    }
+    hasAutofix() {
+        return false;
+    }
+    isOptional() {
+        return true;
+    }
+    async _listInstalledSdks() {
+        const { stdout } = await (0, teen_process_1.exec)('xcodebuild', ['-json', '-showsdks']);
+        return JSON.parse(stdout);
+    }
+}
+exports.OptionalSimulatorCheck = OptionalSimulatorCheck;
+exports.optionalSimulatorCheck = new OptionalSimulatorCheck();
 class OptionalApplesimutilsCommandCheck {
-    README_LINK = 'https://github.com/appium/appium-xcuitest-driver/blob/master/docs/reference/execute-methods.md#mobile-setpermission';
+    log;
+    static README_LINK = 'https://github.com/appium/appium-xcuitest-driver/blob/master/docs/reference/execute-methods.md#mobile-setpermission';
     async diagnose() {
         const applesimutilsPath = await (0, utils_1.resolveExecutablePath)('applesimutils');
         return applesimutilsPath
@@ -43,7 +92,7 @@ class OptionalApplesimutilsCommandCheck {
             : support_1.doctor.nokOptional('applesimutils are not installed');
     }
     async fix() {
-        return `Why ${'applesimutils'.bold} is needed and how to install it: ${this.README_LINK}`;
+        return `Why ${'applesimutils'.bold} is needed and how to install it: ${OptionalApplesimutilsCommandCheck.README_LINK}`;
     }
     hasAutofix() {
         return false;
@@ -54,19 +103,19 @@ class OptionalApplesimutilsCommandCheck {
 }
 exports.OptionalApplesimutilsCommandCheck = OptionalApplesimutilsCommandCheck;
 exports.optionalApplesimutilsCheck = new OptionalApplesimutilsCommandCheck();
-/** @satisfies {import('@appium/types').IDoctorCheck} */
 class OptionalFfmpegCheck {
-    FFMPEG_BINARY = 'ffmpeg';
-    FFMPEG_INSTALL_LINK = 'https://www.ffmpeg.org/download.html';
+    log;
+    static FFMPEG_BINARY = 'ffmpeg';
+    static FFMPEG_INSTALL_LINK = 'https://www.ffmpeg.org/download.html';
     async diagnose() {
-        const ffmpegPath = await (0, utils_1.resolveExecutablePath)(this.FFMPEG_BINARY);
+        const ffmpegPath = await (0, utils_1.resolveExecutablePath)(OptionalFfmpegCheck.FFMPEG_BINARY);
         return ffmpegPath
-            ? support_1.doctor.okOptional(`${this.FFMPEG_BINARY} exists at '${ffmpegPath}'`)
-            : support_1.doctor.nokOptional(`${this.FFMPEG_BINARY} cannot be found`);
+            ? support_1.doctor.okOptional(`${OptionalFfmpegCheck.FFMPEG_BINARY} exists at '${ffmpegPath}'`)
+            : support_1.doctor.nokOptional(`${OptionalFfmpegCheck.FFMPEG_BINARY} cannot be found`);
     }
     async fix() {
-        return (`${`${this.FFMPEG_BINARY}`.bold} is used to capture screen recordings from the device under test. ` +
-            `Please read ${this.FFMPEG_INSTALL_LINK}.`);
+        return (`${`${OptionalFfmpegCheck.FFMPEG_BINARY}`.bold} is used to capture screen recordings from the device under test. ` +
+            `Please read ${OptionalFfmpegCheck.FFMPEG_INSTALL_LINK}.`);
     }
     hasAutofix() {
         return false;

package/build/lib/doctor/optional-checks.js.map

@@ -1 +1 @@
-{"version":3,"file":"optional-checks.js","sourceRoot":"","sources":["../../../lib/doctor/optional-checks.js"],"names":[],"mappings":";;;AAAA,mCAA8C;AAC9C,4CAAsC;AACtC,0BAAwB;AAExB,wDAAwD;AACxD,MAAa,uBAAuB;IAClC,cAAc,GAAG,sBAAsB,CAAC;IAExC,KAAK,CAAC,QAAQ;QACZ,MAAM,SAAS,GAAG,MAAM,IAAA,6BAAqB,EAAC,KAAK,CAAC,CAAC;QACrD,MAAM,kBAAkB,GAAG,MAAM,IAAA,6BAAqB,EAAC,eAAe,CAAC,CAAC;QACxE,IAAI,SAAS,IAAI,kBAAkB,EAAE,CAAC;YACpC,OAAO,gBAAM,CAAC,UAAU,CAAC,qCAAqC,CAAC,CAAC;QAClE,CAAC;QAED,IAAI,CAAC,SAAS,IAAI,kBAAkB,EAAE,CAAC;YACrC,OAAO,gBAAM,CAAC,WAAW,CAAC,sBAAsB,CAAC,CAAC;QACpD,CAAC;aAAM,IAAI,SAAS,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC5C,OAAO,gBAAM,CAAC,WAAW,CAAC,gCAAgC,CAAC,CAAC;QAC9D,CAAC;QACD,OAAO,gBAAM,CAAC,WAAW,CAAC,yCAAyC,CAAC,CAAC;IACvE,CAAC;IAED,KAAK,CAAC,GAAG;QACP,OAAO,OAAO,KAAK,CAAC,IAAI,qCAAqC,IAAI,CAAC,cAAc,EAAE,CAAC;IACrF,CAAC;IAED,UAAU;QACR,OAAO,KAAK,CAAC;IACf,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA7BD,0DA6BC;AACY,QAAA,gBAAgB,GAAG,IAAI,uBAAuB,EAAE,CAAC;AAG9D,wDAAwD;AACxD,MAAa,iCAAiC;IAC5C,WAAW,GAAG,qHAAqH,CAAC;IAEpI,KAAK,CAAC,QAAQ;QACZ,MAAM,iBAAiB,GAAG,MAAM,IAAA,6BAAqB,EAAC,eAAe,CAAC,CAAC;QACvE,OAAO,iBAAiB;YACtB,CAAC,CAAC,gBAAM,CAAC,UAAU,CAAC,kCAAkC,iBAAiB,EAAE,CAAC;YAC1E,CAAC,CAAC,gBAAM,CAAC,WAAW,CAAC,iCAAiC,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,GAAG;QACP,OAAO,OAAO,eAAe,CAAC,IAAI,qCAAqC,IAAI,CAAC,WAAW,EAAE,CAAC;IAC5F,CAAC;IAED,UAAU;QACR,OAAO,KAAK,CAAC;IACf,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AArBD,8EAqBC;AACY,QAAA,0BAA0B,GAAG,IAAI,iCAAiC,EAAE,CAAC;AAGlF,wDAAwD;AACxD,MAAa,mBAAmB;IAC9B,aAAa,GAAG,QAAQ,CAAC;IACzB,mBAAmB,GAAG,sCAAsC,CAAC;IAE7D,KAAK,CAAC,QAAQ;QACZ,MAAM,UAAU,GAAG,MAAM,IAAA,6BAAqB,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAEnE,OAAO,UAAU;YACf,CAAC,CAAC,gBAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,aAAa,eAAe,UAAU,GAAG,CAAC;YACtE,CAAC,CAAC,gBAAM,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,aAAa,kBAAkB,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,GAAG;QACP,OAAO,CACL,GAAG,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,IAAI,oEAAoE;YACnG,eAAe,IAAI,CAAC,mBAAmB,GAAG,CAC3C,CAAC;IACJ,CAAC;IAED,UAAU;QACR,OAAO,KAAK,CAAC;IACf,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA1BD,kDA0BC;AACY,QAAA,mBAAmB,GAAG,IAAI,mBAAmB,EAAE,CAAC"}
+{"version":3,"file":"optional-checks.js","sourceRoot":"","sources":["../../../lib/doctor/optional-checks.ts"],"names":[],"mappings":"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"}

package/build/lib/doctor/required-checks.d.ts

@@ -1,53 +1,42 @@
-/** @satisfies {import('@appium/types').IDoctorCheck} */
-export class XcodeCheck {
-    diagnose(): Promise<import("@appium/types").DoctorCheckResult>;
+import type { IDoctorCheck, AppiumLogger, DoctorCheckResult } from '@appium/types';
+import '@colors/colors';
+export declare class XcodeCheck implements IDoctorCheck {
+    log: AppiumLogger;
+    diagnose(): Promise<DoctorCheckResult>;
     fix(): Promise<string>;
     hasAutofix(): boolean;
     isOptional(): boolean;
 }
-export const xcodeCheck: XcodeCheck;
-/** @satisfies {import('@appium/types').IDoctorCheck} */
-export class XcodeToolsCheck {
-    diagnose(): Promise<import("@appium/types").DoctorCheckResult>;
+export declare const xcodeCheck: XcodeCheck;
+export declare class XcodeToolsCheck implements IDoctorCheck {
+    log: AppiumLogger;
+    diagnose(): Promise<DoctorCheckResult>;
     fix(): Promise<string>;
     hasAutofix(): boolean;
     isOptional(): boolean;
 }
-export const xcodeToolsCheck: XcodeToolsCheck;
-export const homeEnvVarCheck: EnvVarAndPathCheck;
-export type EnvVarCheckOptions = {
-    /**
-     * If set to true then
-     * the path is expected to be a valid folder
-     */
-    expectDir?: boolean | undefined;
-    /**
-     * If set to true then
-     * the path is expected to be a valid file
-     */
-    expectFile?: boolean | undefined;
-};
-/**
- * @typedef EnvVarCheckOptions
- * @property {boolean} [expectDir] If set to true then
- * the path is expected to be a valid folder
- * @property {boolean} [expectFile] If set to true then
- * the path is expected to be a valid file
- */
-/** @satisfies {import('@appium/types').IDoctorCheck} */
-declare class EnvVarAndPathCheck {
-    /**
-     * @param {string} varName
-     * @param {EnvVarCheckOptions} [opts={}]
-     */
+export declare const xcodeToolsCheck: XcodeToolsCheck;
+declare class EnvVarAndPathCheck implements IDoctorCheck {
+    private readonly varName;
+    private readonly opts;
+    log: AppiumLogger;
+    static readonly ENVIRONMENT_VARS_TUTORIAL_URL = "https://github.com/appium/java-client/blob/master/docs/environment.md";
     constructor(varName: string, opts?: EnvVarCheckOptions);
-    ENVIRONMENT_VARS_TUTORIAL_URL: string;
-    varName: string;
-    opts: EnvVarCheckOptions;
-    diagnose(): Promise<import("@appium/types").DoctorCheckResult>;
+    diagnose(): Promise<DoctorCheckResult>;
     fix(): Promise<string>;
     hasAutofix(): boolean;
     isOptional(): boolean;
 }
+export declare const homeEnvVarCheck: EnvVarAndPathCheck;
+export interface EnvVarCheckOptions {
+    /**
+     * If set to true then the path is expected to be a valid folder
+     */
+    expectDir?: boolean;
+    /**
+     * If set to true then the path is expected to be a valid file
+     */
+    expectFile?: boolean;
+}
 export {};
 //# sourceMappingURL=required-checks.d.ts.map

package/build/lib/doctor/required-checks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"required-checks.d.ts","sourceRoot":"","sources":["../../../lib/doctor/required-checks.js"],"names":[],"mappings":"AAMA,wDAAwD;AACxD;IACE,+DAOC;IAED,uBAEC;IAED,sBAEC;IAED,sBAEC;CACF;AACD,oCAA2C;AAG3C,wDAAwD;AACxD;IACE,+DAcC;IAED,uBAEC;IAED,sBAEC;IAED,sBAEC;CACF;AACD,8CAAqD;AA6DrD,iDAAiF;;;;;;;;;;;;;AA1DjF;;;;;;GAMG;AAEH,wDAAwD;AACxD;IAGE;;;OAGG;IACH,qBAHW,MAAM,SACN,kBAAkB,EAK5B;IATD,sCAAwG;IAOtG,gBAAsB;IACtB,yBAAgB;IAGlB,+DAoBC;IAED,uBAKC;IAED,sBAEC;IAED,sBAEC;CACF"}
+{"version":3,"file":"required-checks.d.ts","sourceRoot":"","sources":["../../../lib/doctor/required-checks.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAC,MAAM,eAAe,CAAC;AACjF,OAAO,gBAAgB,CAAC;AAGxB,qBAAa,UAAW,YAAW,YAAY;IAC7C,GAAG,EAAG,YAAY,CAAC;IAEb,QAAQ,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAStC,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC;IAI5B,UAAU,IAAI,OAAO;IAIrB,UAAU,IAAI,OAAO;CAGtB;AACD,eAAO,MAAM,UAAU,YAAmB,CAAC;AAG3C,qBAAa,eAAgB,YAAW,YAAY;IAClD,GAAG,EAAG,YAAY,CAAC;IAEb,QAAQ,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAUtC,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC;IAI5B,UAAU,IAAI,OAAO;IAIrB,UAAU,IAAI,OAAO;CAGtB;AACD,eAAO,MAAM,eAAe,iBAAwB,CAAC;AAGrD,cAAM,kBAAmB,YAAW,YAAY;IAK5C,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,IAAI;IALvB,GAAG,EAAG,YAAY,CAAC;IACnB,MAAM,CAAC,QAAQ,CAAC,6BAA6B,2EAA2E;gBAGrG,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,kBAAuB;IAG1C,QAAQ,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAsBtC,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC;IAO5B,UAAU,IAAI,OAAO;IAIrB,UAAU,IAAI,OAAO;CAGtB;AACD,eAAO,MAAM,eAAe,oBAAoD,CAAC;AAEjF,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB"}

package/build/lib/doctor/required-checks.js

@@ -5,8 +5,8 @@ const support_1 = require("appium/support");
 const teen_process_1 = require("teen_process");
 const appium_xcode_1 = require("appium-xcode");
 require("@colors/colors");
-/** @satisfies {import('@appium/types').IDoctorCheck} */
 class XcodeCheck {
+    log;
     async diagnose() {
         try {
             const xcodePath = await (0, appium_xcode_1.getPath)();
@@ -28,17 +28,10 @@ class XcodeCheck {
 }
 exports.XcodeCheck = XcodeCheck;
 exports.xcodeCheck = new XcodeCheck();
-/** @satisfies {import('@appium/types').IDoctorCheck} */
 class XcodeToolsCheck {
+    log;
     async diagnose() {
         const errPrefix = 'Xcode Command Line Tools are not installed or are improperly configured';
-        try {
-            // https://github.com/appium/appium/issues/12093#issuecomment-459358120
-            await (0, teen_process_1.exec)('xcrun', ['simctl', 'help']);
-        }
-        catch (err) {
-            return support_1.doctor.nok(`${errPrefix}. Cannot run 'xcrun simctl': ${err.stderr || err.message}`);
-        }
         try {
             await (0, teen_process_1.exec)('xcodebuild', ['-version']);
         }
@@ -59,20 +52,11 @@ class XcodeToolsCheck {
 }
 exports.XcodeToolsCheck = XcodeToolsCheck;
 exports.xcodeToolsCheck = new XcodeToolsCheck();
-/**
- * @typedef EnvVarCheckOptions
- * @property {boolean} [expectDir] If set to true then
- * the path is expected to be a valid folder
- * @property {boolean} [expectFile] If set to true then
- * the path is expected to be a valid file
- */
-/** @satisfies {import('@appium/types').IDoctorCheck} */
 class EnvVarAndPathCheck {
-    ENVIRONMENT_VARS_TUTORIAL_URL = 'https://github.com/appium/java-client/blob/master/docs/environment.md';
-    /**
-     * @param {string} varName
-     * @param {EnvVarCheckOptions} [opts={}]
-     */
+    varName;
+    opts;
+    log;
+    static ENVIRONMENT_VARS_TUTORIAL_URL = 'https://github.com/appium/java-client/blob/master/docs/environment.md';
     constructor(varName, opts = {}) {
         this.varName = varName;
         this.opts = opts;
@@ -83,7 +67,7 @@ class EnvVarAndPathCheck {
             return support_1.doctor.nok(`${this.varName} environment variable is NOT set!`);
         }
         if (!await support_1.fs.exists(varValue)) {
-            let errMsg = `${this.varName} is set to '${varValue}' but this path does not exist!`;
+            const errMsg = `${this.varName} is set to '${varValue}' but this path does not exist!`;
             return support_1.doctor.nok(errMsg);
         }
         const stat = await support_1.fs.stat(varValue);
@@ -97,7 +81,7 @@ class EnvVarAndPathCheck {
     }
     async fix() {
         return (`Make sure the environment variable ${this.varName.bold} is properly configured for the Appium process. ` +
-            `Refer ${this.ENVIRONMENT_VARS_TUTORIAL_URL} for more details.`);
+            `Refer ${EnvVarAndPathCheck.ENVIRONMENT_VARS_TUTORIAL_URL} for more details.`);
     }
     hasAutofix() {
         return false;

package/build/lib/doctor/required-checks.js.map

@@ -1 +1 @@
-{"version":3,"file":"required-checks.js","sourceRoot":"","sources":["../../../lib/doctor/required-checks.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"required-checks.js","sourceRoot":"","sources":["../../../lib/doctor/required-checks.ts"],"names":[],"mappings":"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"}

package/build/lib/doctor/utils.d.ts

@@ -1,8 +1,8 @@
 /**
  * Return an executable path of cmd
  *
- * @param {string} cmd Standard output by command
- * @return {Promise<string?>} The full path of cmd. `null` if the cmd is not found.
+ * @param cmd Standard output by command
+ * @return The full path of cmd. `null` if the cmd is not found.
  */
-export function resolveExecutablePath(cmd: string): Promise<string | null>;
+export declare function resolveExecutablePath(cmd: string): Promise<string | null>;
 //# sourceMappingURL=utils.d.ts.map

package/build/lib/doctor/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../lib/doctor/utils.js"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,2CAHW,MAAM,GACL,OAAO,CAAC,MAAM,OAAC,CAAC,CAU3B"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../lib/doctor/utils.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAQ/E"}

package/build/lib/doctor/utils.js

@@ -5,8 +5,8 @@ const support_1 = require("appium/support");
 /**
  * Return an executable path of cmd
  *
- * @param {string} cmd Standard output by command
- * @return {Promise<string?>} The full path of cmd. `null` if the cmd is not found.
+ * @param cmd Standard output by command
+ * @return The full path of cmd. `null` if the cmd is not found.
  */
 async function resolveExecutablePath(cmd) {
     try {

package/build/lib/doctor/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../lib/doctor/utils.js"],"names":[],"mappings":";;AAQA,sDAQC;AAhBD,4CAAkC;AAElC;;;;;GAKG;AACI,KAAK,UAAU,qBAAqB,CAAC,GAAG;IAC7C,IAAI,CAAC;QACH,MAAM,cAAc,GAAG,MAAM,YAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3C,IAAI,cAAc,IAAI,CAAC,MAAM,YAAE,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC;YACxD,OAAO,cAAc,CAAC;QACxB,CAAC;IACH,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IACV,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../lib/doctor/utils.ts"],"names":[],"mappings":";;AAQA,sDAQC;AAhBD,4CAAkC;AAElC;;;;;GAKG;AACI,KAAK,UAAU,qBAAqB,CAAC,GAAW;IACrD,IAAI,CAAC;QACH,MAAM,cAAc,GAAG,MAAM,YAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3C,IAAI,cAAc,IAAI,CAAC,MAAM,YAAE,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC;YACxD,OAAO,cAAc,CAAC;QACxB,CAAC;IACH,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IACV,OAAO,IAAI,CAAC;AACd,CAAC"}

package/lib/doctor/{checks.js → checks.ts}

@@ -1,2 +1,3 @@
 export * as required from './required-checks';
 export * as optional from './optional-checks';
+

package/lib/doctor/optional-checks.ts

@@ -0,0 +1,173 @@
+import {resolveExecutablePath} from './utils';
+import {doctor} from 'appium/support';
+import type {IDoctorCheck, AppiumLogger, DoctorCheckResult} from '@appium/types';
+import '@colors/colors';
+import {exec} from 'teen_process';
+
+export class OptionalIdbCommandCheck implements IDoctorCheck {
+  log!: AppiumLogger;
+  static readonly IDB_README_URL = 'https://git.io/JnxQc';
+
+  async diagnose(): Promise<DoctorCheckResult> {
+    const fbIdbPath = await resolveExecutablePath('idb');
+    const fbCompanionIdbPath = await resolveExecutablePath('idb_companion');
+    if (fbIdbPath && fbCompanionIdbPath) {
+      return doctor.okOptional('idb and idb_companion are installed');
+    }
+
+    if (!fbIdbPath && fbCompanionIdbPath) {
+      return doctor.nokOptional('idb is not installed');
+    } else if (fbIdbPath && !fbCompanionIdbPath) {
+      return doctor.nokOptional('idb_companion is not installed');
+    }
+    return doctor.nokOptional('idb and idb_companion are not installed');
+  }
+
+  async fix(): Promise<string> {
+    return `Why ${'idb'.bold} is needed and how to install it: ${OptionalIdbCommandCheck.IDB_README_URL}`;
+  }
+
+  hasAutofix(): boolean {
+    return false;
+  }
+
+  isOptional(): boolean {
+    return true;
+  }
+}
+export const optionalIdbCheck = new OptionalIdbCommandCheck();
+
+export class OptionalSimulatorCheck implements IDoctorCheck {
+  log!: AppiumLogger;
+  static readonly SUPPORTED_SIMULATOR_PLATFORMS: SimulatorPlatform[] = [
+    {
+      displayName: 'iOS',
+      name: 'iphonesimulator'
+    },
+    {
+      displayName: 'tvOS',
+      name: 'appletvsimulator'
+    }
+  ];
+
+  async diagnose(): Promise<DoctorCheckResult> {
+    try {
+      // https://github.com/appium/appium/issues/12093#issuecomment-459358120
+      await exec('xcrun', ['simctl', 'help']);
+    } catch (err) {
+      return doctor.nokOptional(
+        `Testing on Simulator is not possible. Cannot run 'xcrun simctl': ${(err as any).stderr || (err as Error).message}`
+      );
+    }
+
+    const sdks = await this._listInstalledSdks();
+    for (const {displayName, name} of OptionalSimulatorCheck.SUPPORTED_SIMULATOR_PLATFORMS) {
+      const errorPrefix = `Testing on ${displayName} Simulator is not possible`;
+      if (!sdks.some(({platform}) => platform === name)) {
+        return doctor.nokOptional(`${errorPrefix}: SDK is not installed`);
+      }
+    }
+
+    return doctor.okOptional(
+      `The following Simulator SDKs are installed:\n` +
+      sdks
+        .filter(({platform}) => OptionalSimulatorCheck.SUPPORTED_SIMULATOR_PLATFORMS.some(({name}) => name === platform))
+        .map(({displayName}) => `\t→ ${displayName}`).join('\n')
+    );
+  }
+
+  async fix(): Promise<string> {
+    return `Install the desired Simulator SDK from Xcode's Settings -> Components`;
+  }
+
+  hasAutofix(): boolean {
+    return false;
+  }
+
+  isOptional(): boolean {
+    return true;
+  }
+
+  private async _listInstalledSdks(): Promise<InstalledSdk[]> {
+    const {stdout} = await exec('xcodebuild', ['-json', '-showsdks']);
+    return JSON.parse(stdout);
+  }
+}
+export const optionalSimulatorCheck = new OptionalSimulatorCheck();
+
+export class OptionalApplesimutilsCommandCheck implements IDoctorCheck {
+  log!: AppiumLogger;
+  static readonly README_LINK = 'https://github.com/appium/appium-xcuitest-driver/blob/master/docs/reference/execute-methods.md#mobile-setpermission';
+
+  async diagnose(): Promise<DoctorCheckResult> {
+    const applesimutilsPath = await resolveExecutablePath('applesimutils');
+    return applesimutilsPath
+      ? doctor.okOptional(`applesimutils is installed at: ${applesimutilsPath}`)
+      : doctor.nokOptional('applesimutils are not installed');
+  }
+
+  async fix(): Promise<string> {
+    return `Why ${'applesimutils'.bold} is needed and how to install it: ${OptionalApplesimutilsCommandCheck.README_LINK}`;
+  }
+
+  hasAutofix(): boolean {
+    return false;
+  }
+
+  isOptional(): boolean {
+    return true;
+  }
+}
+export const optionalApplesimutilsCheck = new OptionalApplesimutilsCommandCheck();
+
+
+export class OptionalFfmpegCheck implements IDoctorCheck {
+  log!: AppiumLogger;
+  static readonly FFMPEG_BINARY = 'ffmpeg';
+  static readonly FFMPEG_INSTALL_LINK = 'https://www.ffmpeg.org/download.html';
+
+  async diagnose(): Promise<DoctorCheckResult> {
+    const ffmpegPath = await resolveExecutablePath(OptionalFfmpegCheck.FFMPEG_BINARY);
+
+    return ffmpegPath
+      ? doctor.okOptional(`${OptionalFfmpegCheck.FFMPEG_BINARY} exists at '${ffmpegPath}'`)
+      : doctor.nokOptional(`${OptionalFfmpegCheck.FFMPEG_BINARY} cannot be found`);
+  }
+
+  async fix(): Promise<string> {
+    return (
+      `${`${OptionalFfmpegCheck.FFMPEG_BINARY}`.bold} is used to capture screen recordings from the device under test. ` +
+      `Please read ${OptionalFfmpegCheck.FFMPEG_INSTALL_LINK}.`
+    );
+  }
+
+  hasAutofix(): boolean {
+    return false;
+  }
+
+  isOptional(): boolean {
+    return true;
+  }
+}
+export const optionalFfmpegCheck = new OptionalFfmpegCheck();
+
+interface SimulatorPlatform {
+  displayName: string;
+  name: string;
+}
+
+interface InstalledSdk {
+  buildID?: string;
+  canonicalName: string;
+  displayName: string;
+  isBaseSdk: boolean;
+  platform: string;
+  platformPath: string;
+  platformVersion: string;
+  productBuildVersion?: string;
+  productCopyright?: string;
+  productName?: string;
+  productVersion?: string;
+  sdkPath: string;
+  sdkVersion: string;
+}

package/lib/doctor/{required-checks.js → required-checks.ts}

@@ -1,97 +1,82 @@
 import {fs, doctor} from 'appium/support';
 import {exec} from 'teen_process';
 import { getPath as getXcodePath } from 'appium-xcode';
+import type {IDoctorCheck, AppiumLogger, DoctorCheckResult} from '@appium/types';
 import '@colors/colors';
 
 
-/** @satisfies {import('@appium/types').IDoctorCheck} */
-export class XcodeCheck {
-  async diagnose() {
+export class XcodeCheck implements IDoctorCheck {
+  log!: AppiumLogger;
+
+  async diagnose(): Promise<DoctorCheckResult> {
     try {
       const xcodePath = await getXcodePath();
       return doctor.ok(`Xcode is installed at '${xcodePath}'`);
     } catch (err) {
-      return doctor.nok(err.message);
+      return doctor.nok((err as Error).message);
     }
   }
 
-  async fix() {
+  async fix(): Promise<string> {
     return `Install Xcode and make sure it is properly configured`;
   }
 
-  hasAutofix() {
+  hasAutofix(): boolean {
     return false;
   }
 
-  isOptional() {
+  isOptional(): boolean {
     return false;
   }
 }
 export const xcodeCheck = new XcodeCheck();
 
 
-/** @satisfies {import('@appium/types').IDoctorCheck} */
-export class XcodeToolsCheck {
-  async diagnose() {
+export class XcodeToolsCheck implements IDoctorCheck {
+  log!: AppiumLogger;
+
+  async diagnose(): Promise<DoctorCheckResult> {
     const errPrefix = 'Xcode Command Line Tools are not installed or are improperly configured';
-    try {
-      // https://github.com/appium/appium/issues/12093#issuecomment-459358120
-      await exec('xcrun', ['simctl', 'help']);
-    } catch (err) {
-      return doctor.nok(`${errPrefix}. Cannot run 'xcrun simctl': ${err.stderr || err.message}`);
-    }
     try {
       await exec('xcodebuild', ['-version']);
     } catch (err) {
-      return doctor.nok(`${errPrefix}. Cannot run 'xcodebuild': ${err.stderr || err.message}`);
+      return doctor.nok(`${errPrefix}. Cannot run 'xcodebuild': ${(err as any).stderr || (err as Error).message}`);
     }
     return doctor.ok(`Xcode Command Line Tools are installed and work properly`);
   }
 
-  async fix() {
+  async fix(): Promise<string> {
     return `Make sure to install Xcode Command Line Tools by running 'xcode-select --install'`;
   }
 
-  hasAutofix() {
+  hasAutofix(): boolean {
     return false;
   }
 
-  isOptional() {
+  isOptional(): boolean {
     return false;
   }
 }
 export const xcodeToolsCheck = new XcodeToolsCheck();
 
 
-/**
- * @typedef EnvVarCheckOptions
- * @property {boolean} [expectDir] If set to true then
- * the path is expected to be a valid folder
- * @property {boolean} [expectFile] If set to true then
- * the path is expected to be a valid file
- */
+class EnvVarAndPathCheck implements IDoctorCheck {
+  log!: AppiumLogger;
+  static readonly ENVIRONMENT_VARS_TUTORIAL_URL = 'https://github.com/appium/java-client/blob/master/docs/environment.md';
 
-/** @satisfies {import('@appium/types').IDoctorCheck} */
-class EnvVarAndPathCheck {
-  ENVIRONMENT_VARS_TUTORIAL_URL = 'https://github.com/appium/java-client/blob/master/docs/environment.md';
+  constructor(
+    private readonly varName: string,
+    private readonly opts: EnvVarCheckOptions = {}
+  ) {}
 
-  /**
-   * @param {string} varName
-   * @param {EnvVarCheckOptions} [opts={}]
-   */
-  constructor(varName, opts = {}) {
-    this.varName = varName;
-    this.opts = opts;
-  }
-
-  async diagnose() {
+  async diagnose(): Promise<DoctorCheckResult> {
     const varValue = process.env[this.varName];
     if (!varValue) {
       return doctor.nok(`${this.varName} environment variable is NOT set!`);
     }
 
     if (!await fs.exists(varValue)) {
-      let errMsg = `${this.varName} is set to '${varValue}' but this path does not exist!`;
+      const errMsg = `${this.varName} is set to '${varValue}' but this path does not exist!`;
       return doctor.nok(errMsg);
     }
 
@@ -106,19 +91,30 @@ class EnvVarAndPathCheck {
     return doctor.ok(`${this.varName} is set to: ${varValue}`);
   }
 
-  async fix() {
+  async fix(): Promise<string> {
     return (
       `Make sure the environment variable ${this.varName.bold} is properly configured for the Appium process. ` +
-      `Refer ${this.ENVIRONMENT_VARS_TUTORIAL_URL} for more details.`
+      `Refer ${EnvVarAndPathCheck.ENVIRONMENT_VARS_TUTORIAL_URL} for more details.`
     );
   }
 
-  hasAutofix() {
+  hasAutofix(): boolean {
     return false;
   }
 
-  isOptional() {
+  isOptional(): boolean {
     return false;
   }
 }
 export const homeEnvVarCheck = new EnvVarAndPathCheck('HOME', {expectDir: true});
+
+export interface EnvVarCheckOptions {
+  /**
+   * If set to true then the path is expected to be a valid folder
+   */
+  expectDir?: boolean;
+  /**
+   * If set to true then the path is expected to be a valid file
+   */
+  expectFile?: boolean;
+}

package/lib/doctor/{utils.js → utils.ts}

@@ -3,10 +3,10 @@ import {fs} from 'appium/support';
 /**
  * Return an executable path of cmd
  *
- * @param {string} cmd Standard output by command
- * @return {Promise<string?>} The full path of cmd. `null` if the cmd is not found.
+ * @param cmd Standard output by command
+ * @return The full path of cmd. `null` if the cmd is not found.
  */
-export async function resolveExecutablePath(cmd) {
+export async function resolveExecutablePath(cmd: string): Promise<string | null> {
   try {
     const executablePath = await fs.which(cmd);
     if (executablePath && (await fs.exists(executablePath))) {
@@ -15,3 +15,4 @@ export async function resolveExecutablePath(cmd) {
   } catch {}
   return null;
 }
+

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "appium-xcuitest-driver",
-  "version": "10.1.7",
+  "version": "10.2.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "appium-xcuitest-driver",
-      "version": "10.1.7",
+      "version": "10.2.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@appium/strongbox": "^1.0.0-rc.1",

package/package.json

@@ -8,7 +8,7 @@
     "xcuitest",
     "xctest"
   ],
-  "version": "10.1.7",
+  "version": "10.2.1",
   "author": "Appium Contributors",
   "license": "Apache-2.0",
   "repository": {

package/lib/doctor/optional-checks.js

@@ -1,93 +0,0 @@
-import {resolveExecutablePath} from './utils';
-import {doctor} from 'appium/support';
-import '@colors/colors';
-
-/** @satisfies {import('@appium/types').IDoctorCheck} */
-export class OptionalIdbCommandCheck {
-  IDB_README_URL = 'https://git.io/JnxQc';
-
-  async diagnose() {
-    const fbIdbPath = await resolveExecutablePath('idb');
-    const fbCompanionIdbPath = await resolveExecutablePath('idb_companion');
-    if (fbIdbPath && fbCompanionIdbPath) {
-      return doctor.okOptional('idb and idb_companion are installed');
-    }
-
-    if (!fbIdbPath && fbCompanionIdbPath) {
-      return doctor.nokOptional('idb is not installed');
-    } else if (fbIdbPath && !fbCompanionIdbPath) {
-      return doctor.nokOptional('idb_companion is not installed');
-    }
-    return doctor.nokOptional('idb and idb_companion are not installed');
-  }
-
-  async fix() {
-    return `Why ${'idb'.bold} is needed and how to install it: ${this.IDB_README_URL}`;
-  }
-
-  hasAutofix() {
-    return false;
-  }
-
-  isOptional() {
-    return true;
-  }
-}
-export const optionalIdbCheck = new OptionalIdbCommandCheck();
-
-
-/** @satisfies {import('@appium/types').IDoctorCheck} */
-export class OptionalApplesimutilsCommandCheck {
-  README_LINK = 'https://github.com/appium/appium-xcuitest-driver/blob/master/docs/reference/execute-methods.md#mobile-setpermission';
-
-  async diagnose() {
-    const applesimutilsPath = await resolveExecutablePath('applesimutils');
-    return applesimutilsPath
-      ? doctor.okOptional(`applesimutils is installed at: ${applesimutilsPath}`)
-      : doctor.nokOptional('applesimutils are not installed');
-  }
-
-  async fix() {
-    return `Why ${'applesimutils'.bold} is needed and how to install it: ${this.README_LINK}`;
-  }
-
-  hasAutofix() {
-    return false;
-  }
-
-  isOptional() {
-    return true;
-  }
-}
-export const optionalApplesimutilsCheck = new OptionalApplesimutilsCommandCheck();
-
-
-/** @satisfies {import('@appium/types').IDoctorCheck} */
-export class OptionalFfmpegCheck {
-  FFMPEG_BINARY = 'ffmpeg';
-  FFMPEG_INSTALL_LINK = 'https://www.ffmpeg.org/download.html';
-
-  async diagnose() {
-    const ffmpegPath = await resolveExecutablePath(this.FFMPEG_BINARY);
-
-    return ffmpegPath
-      ? doctor.okOptional(`${this.FFMPEG_BINARY} exists at '${ffmpegPath}'`)
-      : doctor.nokOptional(`${this.FFMPEG_BINARY} cannot be found`);
-  }
-
-  async fix() {
-    return (
-      `${`${this.FFMPEG_BINARY}`.bold} is used to capture screen recordings from the device under test. ` +
-      `Please read ${this.FFMPEG_INSTALL_LINK}.`
-    );
-  }
-
-  hasAutofix() {
-    return false;
-  }
-
-  isOptional() {
-    return true;
-  }
-}
-export const optionalFfmpegCheck = new OptionalFfmpegCheck();