appium-xcuitest-driver 10.13.1 → 10.13.2

package/build/lib/commands/find.js

@@ -11,31 +11,23 @@ const lodash_1 = __importDefault(require("lodash"));
 const css_converter_1 = require("../css-converter");
 const driver_1 = require("appium/driver");
 const support_1 = require("appium/support");
-/**
- * @this {XCUITestDriver}
- */
 async function findElOrEls(strategy, selector, mult, context) {
     if (this.isWebview()) {
-        return await this.findWebElementOrElements(strategy, selector, mult, context);
-    }
-    else {
-        return await this.findNativeElementOrElements(strategy, selector, mult, context);
+        return mult
+            ? await this.findWebElementOrElements(strategy, selector, true, context)
+            : await this.findWebElementOrElements(strategy, selector, false, context);
     }
+    return mult
+        ? await this.findNativeElementOrElements(strategy, selector, true, context)
+        : await this.findNativeElementOrElements(strategy, selector, false, context);
 }
-/**
- * @this {XCUITestDriver}
- * @privateRemarks I'm not sure what these objects are; they aren't `Element`.
- * @returns {Promise<any|any[]|undefined>}
- */
 async function findNativeElementOrElements(strategy, selector, mult, context) {
     const initSelector = selector;
     let rewroteSelector = false;
     if (strategy === '-ios predicate string') {
-        // WebDriverAgent uses 'predicate string'
         strategy = 'predicate string';
     }
     else if (strategy === '-ios class chain') {
-        // WebDriverAgent uses 'class chain'
         strategy = WDA_CLASS_CHAIN_STRATEGY;
     }
     else if (strategy === 'css selector') {
@@ -43,12 +35,9 @@ async function findNativeElementOrElements(strategy, selector, mult, context) {
         selector = css_converter_1.CssConverter.toIosClassChainSelector(selector);
     }
     if (strategy === 'class name') {
-        // XCUITest classes have `XCUIElementType` prepended
-        // first check if there is the old `UIA` prefix
         if (selector.startsWith('UIA')) {
             selector = selector.substring(3);
         }
-        // now check if we need to add `XCUIElementType`
         if (!selector.startsWith('XCUIElementType')) {
             selector = stripViewFromSelector(`XCUIElementType${selector}`);
             rewroteSelector = true;
@@ -61,8 +50,7 @@ async function findNativeElementOrElements(strategy, selector, mult, context) {
         [strategy, selector] = rewriteMagicScrollable(mult, this.log);
     }
     else if (strategy === 'xpath') {
-        // Replace UIA if it comes after a forward slash or is at the beginning of the string
-        selector = selector.replace(/(^|\/)(UIA)([^[/]+)/g, (str, g1, g2, g3) => {
+        selector = selector.replace(/(^|\/)(UIA)([^[/]+)/g, (str, g1, _g2, g3) => {
             rewroteSelector = true;
             return g1 + stripViewFromSelector(`XCUIElementType${g3}`);
         });
@@ -72,39 +60,32 @@ async function findNativeElementOrElements(strategy, selector, mult, context) {
             `'${selector}' to match XCUI type. You should consider ` +
             `updating your tests to use the new selectors directly`);
     }
-    return await this.doNativeFind(strategy, selector, mult, context);
+    return mult
+        ? await this.doNativeFind(strategy, selector, true, context)
+        : await this.doNativeFind(strategy, selector, false, context);
 }
-/**
- * @this {XCUITestDriver}
- */
 async function doNativeFind(strategy, selector, mult, context) {
-    context = support_1.util.unwrapElement(context);
-    let endpoint = `/element${context ? `/${context}/element` : ''}${mult ? 's' : ''}`;
-    let body = {
+    const ctx = support_1.util.unwrapElement(context ?? null);
+    const endpoint = `/element${ctx ? `/${ctx}/element` : ''}${mult ? 's' : ''}`;
+    const body = {
         using: strategy,
         value: selector,
     };
-    /** @type {import('./proxy-helper').AllowedHttpMethod} */
     const method = 'POST';
-    // This is either an array is mult === true
-    // or an object if mult === false
-    /** @type {Element[]|undefined} */
-    let els;
+    let els = [];
     try {
         await this.implicitWaitForCondition(async () => {
             try {
-                els = /** @type {Element[]|undefined} */ (await this.proxyCommand(endpoint, method, body));
+                els = (await this.proxyCommand(endpoint, method, body));
             }
             catch {
                 els = [];
             }
-            // we succeed if we get some elements
             return !lodash_1.default.isEmpty(els);
         });
     }
     catch (err) {
         if (err.message?.match(/Condition unmet/)) {
-            // condition was not met setting res to empty array
             els = [];
         }
         else {
@@ -112,15 +93,21 @@ async function doNativeFind(strategy, selector, mult, context) {
         }
     }
     if (mult) {
-        return els;
+        return Array.isArray(els) ? els : [els];
     }
-    if (lodash_1.default.isEmpty(els)) {
+    if (Array.isArray(els)) {
+        if (lodash_1.default.isEmpty(els)) {
+            throw new driver_1.errors.NoSuchElementError();
+        }
+        return els[0];
+    }
+    if (!els) {
         throw new driver_1.errors.NoSuchElementError();
     }
     return els;
 }
 /**
- * @this {XCUITestDriver}
+ * Finds the first visible child element inside a context.
  */
 async function getFirstVisibleChild(mult, context) {
     this.log.info(`Getting first visible child`);
@@ -131,16 +118,10 @@ async function getFirstVisibleChild(mult, context) {
         throw new Error('Cannot get first visible child without a context element');
     }
     let index = 1;
-    // loop through children via class-chain finds, until we run out of children
-    // or we find a visible one. This loop looks infinite but its not, because at
-    // some point the call to doNativeFind will throw with an Element Not Found
-    // error, when the index gets higher than the number of child elements. This
-    // is what we want because that error will halt the loop and make it all the
-    // way to the client.
     while (true) {
         const strategy = WDA_CLASS_CHAIN_STRATEGY;
         const selector = `*[${index}]`;
-        const nthChild = await this.doNativeFind(strategy, selector, false, context);
+        const nthChild = (await this.doNativeFind(strategy, selector, false, context));
         const visible = await this.getAttribute('visible', nthChild);
         if (visible === 'true') {
             this.log.info(`Found first visible child at position ${index}`);
@@ -149,17 +130,10 @@ async function getFirstVisibleChild(mult, context) {
         index++;
     }
 }
-// we override the xpath search for this first-visible-child selector, which
-// looks like /*[@firstVisible="true"]
 const MAGIC_FIRST_VIS_CHILD_SEL = /\/\*\[@firstVisible\s*=\s*('|")true\1\]/;
-// we likewise override xpath search to provide a shortcut for finding all
-// scrollable elements
 const MAGIC_SCROLLABLE_SEL = /\/\/\*\[@scrollable\s*=\s*('|")true\1\]/;
 const WDA_CLASS_CHAIN_STRATEGY = 'class chain';
-// Check if the word 'View' is appended to selector and if it is, strip it out
 function stripViewFromSelector(selector) {
-    // Don't strip it out if it's one of these 4 element types
-    // (see https://github.com/facebook/WebDriverAgent/blob/master/WebDriverAgentLib/Utilities/FBElementTypeTransformer.m for reference)
     const keepView = [
         'XCUIElementTypeScrollView',
         'XCUIElementTypeCollectionView',
@@ -167,18 +141,10 @@ function stripViewFromSelector(selector) {
         'XCUIElementTypeWebView',
     ].includes(selector);
     if (!keepView && selector.indexOf('View') === selector.length - 4) {
-        return selector.substr(0, selector.length - 4);
-    }
-    else {
-        return selector;
+        return selector.substring(0, selector.length - 4);
     }
+    return selector;
 }
-/**
- *
- * @param {boolean} mult
- * @param {import('@appium/types').AppiumLogger|null} log
- * @returns {[string, string]}
- */
 function rewriteMagicScrollable(mult, log = null) {
     const pred = ['ScrollView', 'Table', 'CollectionView', 'WebView']
         .map((t) => `type == "XCUIElementType${t}"`)
@@ -192,8 +158,4 @@ function rewriteMagicScrollable(mult, log = null) {
         `format with selector '${selector}'`);
     return [strategy, selector];
 }
-/**
- * @typedef {import('../driver').XCUITestDriver} XCUITestDriver
- * @typedef {import('@appium/types').Element} Element
- */
 //# sourceMappingURL=find.js.map

package/build/lib/commands/find.js.map

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

package/build/lib/commands/navigation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"navigation.d.ts","sourceRoot":"","sources":["../../../lib/commands/navigation.js"],"names":[],"mappings":"AASA;;GAEG;AACH,8EAMC;AAED;;GAEG;AACH,iFAIC;AAED;;GAEG;AACH,oFAsBC;AAED;;;;;;;;;;;;GAYG;AACH,8EAPW,MAAM,aACN,MAAM,GAEJ,OAAO,CAAC,IAAI,CAAC,CASzB;AAED;;GAEG;AACH,uFAiCC;6BAGY,OAAO,WAAW,EAAE,cAAc;;;;;SAKjC,MAAM;;;;;;cACN,MAAM,OAAC"}
+{"version":3,"file":"navigation.d.ts","sourceRoot":"","sources":["../../../lib/commands/navigation.js"],"names":[],"mappings":"AAQA;;GAEG;AACH,8EAMC;AAED;;GAEG;AACH,iFAIC;AAED;;GAEG;AACH,oFAsBC;AAED;;;;;;;;;;;;GAYG;AACH,8EAPW,MAAM,aACN,MAAM,GAEJ,OAAO,CAAC,IAAI,CAAC,CASzB;AAED;;GAEG;AACH,uFAwCC;6BAGY,OAAO,WAAW,EAAE,cAAc;;;;;SAKjC,MAAM;;;;;;cACN,MAAM,OAAC"}

package/build/lib/commands/navigation.js

@@ -1,7 +1,4 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.back = back;
 exports.forward = forward;
@@ -9,7 +6,6 @@ exports.closeWindow = closeWindow;
 exports.mobileDeepLink = mobileDeepLink;
 exports.nativeBack = nativeBack;
 const driver_1 = require("appium/driver");
-const lodash_1 = __importDefault(require("lodash"));
 const asyncbox_1 = require("asyncbox");
 const utils_1 = require("../utils");
 // these two constitute the wait after closing a window
@@ -89,20 +85,22 @@ async function nativeBack() {
         return await this.mobilePressButton('Menu');
     }
     try {
-        let navBar = await this.findNativeElementOrElements('class name', 'XCUIElementTypeNavigationBar', false);
-        let buttons = await this.findNativeElementOrElements('class name', 'XCUIElementTypeButton', true, navBar);
-        if (buttons?.length === 0) {
-            throw new Error('No buttons found in navigation bar');
-        }
-        let backButton = lodash_1.default.filter(buttons, (value) => value.label === 'Back')[0];
-        if (backButton) {
+        const navBar = await this.findNativeElementOrElements('class name', 'XCUIElementTypeNavigationBar', false);
+        let dstButton;
+        const backButtons = await this.findNativeElementOrElements('-ios predicate string', 'type == "XCUIElementTypeButton" AND label == "Back"', true, navBar);
+        if (backButtons.length === 0) {
+            const buttons = await this.findNativeElementOrElements('-ios predicate string', 'type == "XCUIElementTypeButton"', true, navBar);
+            if (buttons.length === 0) {
+                throw new Error('No buttons found in navigation bar');
+            }
             this.log.debug(`Found navigation bar 'back' button. Clicking.`);
+            dstButton = buttons[0];
         }
         else {
-            this.log.debug(`Unable to find 'Back' button. Trying first button in navigation bar`);
-            backButton = buttons?.[0];
+            this.log.debug(`Did not find any navigation bar 'back' button. Clicking the first one.`);
+            dstButton = backButtons[0];
         }
-        await this.nativeClick(/** @type {string} */ (backButton));
+        await this.nativeClick(dstButton);
     }
     catch (err) {
         this.log.error(`Unable to find navigation bar and back button: ${err.message}`);

package/build/lib/commands/navigation.js.map

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

package/lib/commands/{certificate.js → certificate.ts}

@@ -9,6 +9,9 @@ import {exec} from 'teen_process';
 import {findAPortNotInUse, checkPortStatus} from 'portscanner';
 import {Pyidevice} from '../device/clients/py-ios-device-client';
 import {errors} from 'appium/driver';
+import type {Simulator} from 'appium-ios-simulator';
+import type {XCUITestDriver} from '../driver';
+import type {CertificateList} from './types';
 
 const CONFIG_EXTENSION = 'mobileconfig';
 const HOST_PORT_RANGE = [38200, 38299];
@@ -62,11 +65,8 @@ const OPEN_SSL_PATTERN = /,\sCN\s=\s([^,]+)/;
 
 /**
  * Parses the common name of the certificate from the given string.
- *
- * @param {string} stringCertificate
- * @returns {string} The common name of the certificate
  */
-export function parseCommonName(stringCertificate) {
+export function parseCommonName(stringCertificate: string): string {
   const result = [LIBRE_SSL_PATTERN, OPEN_SSL_PATTERN].reduce((acc, r) => {
     if (acc) {
       return acc;
@@ -87,22 +87,28 @@ export function parseCommonName(stringCertificate) {
  * certificates on Simulator over CLI.
  *
  * On real devices (or simulators before Xcode SDK 11.4), Apple provides no "official" way to do this via the command line.  In such a case (and also as a fallback if CLI setup fails), this method tries to wrap the certificate into `.mobileconfig` format, then deploys the wrapped file to the internal HTTP server so that it can be opened via mobile Safari. This command then goes through the profile installation procedure by clicking the necessary buttons using WebDriverAgent.
- * @param {string} content - Base64-encoded content of the public certificate in [PEM](https://knowledge.digicert.com/quovadis/ssl-certificates/ssl-general-topics/what-is-pem-format.html) format
- * @param {string} [commonName] - Common name of the certificate. If this is not set, the command will try to parse it from the provided `content`.
- * @param {boolean} isRoot - Defines where the certificate should be installed; either the Trusted Root Store (`true`) or the Keychain (`false`). On environments other than Xcode 11.4+ Simulator, this option is ignored.
- * @returns {Promise<string|void>} The content of the generated `.mobileconfig` file as
+ * @param content - Base64-encoded content of the public certificate in [PEM](https://knowledge.digicert.com/quovadis/ssl-certificates/ssl-general-topics/what-is-pem-format.html) format
+ * @param commonName - Common name of the certificate. If this is not set, the command will try to parse it from the provided `content`.
+ * @param isRoot - Defines where the certificate should be installed; either the Trusted Root Store (`true`) or the Keychain (`false`). On environments other than Xcode 11.4+ Simulator, this option is ignored.
+ * @returns The content of the generated `.mobileconfig` file as
  * a base64-encoded string. This config might be useful for debugging purposes.  If the certificate has been successfully set via CLI, then nothing is returned.
- * @this {XCUITestDriver}
  */
-export async function mobileInstallCertificate(content, commonName, isRoot = true) {
+export async function mobileInstallCertificate(
+  this: XCUITestDriver,
+  content: string,
+  commonName?: string,
+  isRoot = true,
+): Promise<string | void> {
   if (_.isEmpty(content)) {
     throw new Error('Certificate content should not be empty');
   }
 
   if (this.isSimulator()) {
     try {
-      const methodName = isRoot ? 'addRootCertificate' : 'addCertificate';
-      await /** @type {import('appium-ios-simulator').Simulator} */ (this.device).simctl[methodName](Buffer.from(content, 'base64').toString(), {
+      const methodName: 'addRootCertificate' | 'addCertificate' = isRoot
+        ? 'addRootCertificate'
+        : 'addCertificate';
+      await (this.device as Simulator).simctl[methodName](Buffer.from(content, 'base64').toString(), {
         raw: true,
       });
       return;
@@ -188,11 +194,12 @@ export async function mobileInstallCertificate(content, commonName, isRoot = tru
           }
         }
       } else {
-        await /** @type {import('appium-ios-simulator').Simulator} */ (this.device).openUrl(certUrl);
+        await (this.device as Simulator).openUrl(certUrl);
       }
 
       let isCertAlreadyInstalled = false;
-      if (util.compareVersions(/** @type {string} */ (this.opts.platformVersion), '>=', '12.2')) {
+      const platformVersion = this.opts.platformVersion ?? '';
+      if (util.compareVersions(platformVersion, '>=', '12.2')) {
         if (await installPost122Certificate(this, cn)) {
           await clickElement(this, Settings.Profile);
           await trustCertificateInPreferences(this, cn);
@@ -238,17 +245,19 @@ export async function mobileInstallCertificate(content, commonName, isRoot = tru
  *
  * @see https://github.com/YueChen-C/py-ios-device
  * @since 4.19.2
- * @param {string} name - Name of the profile
- * @returns {Promise<string>} Returns status acknowledgment status if
- * tht certificate is successfully removed or 'None' (basically just
- * forwards the original pyidevice output)
+ * @param name - Name of the profile
+ * @returns Status acknowledgment if
+ * the certificate is successfully removed or 'None' (forwards pyidevice output)
  * @throws {Error} If attempting to remove certificates for a simulated device or if `py-ios-device` is not installed
  * @group Real Device Only
  */
-export async function mobileRemoveCertificate(name) {
+export async function mobileRemoveCertificate(this: XCUITestDriver, name: string): Promise<string> {
   if (!this.isRealDevice()) {
     throw new errors.NotImplementedError('This extension is only supported on real devices');
   }
+  if (!this.opts.udid) {
+    throw new Error('udid capability is required');
+  }
   const client = new Pyidevice({
     udid: this.opts.udid,
     log: this.log,
@@ -263,11 +272,10 @@ export async function mobileRemoveCertificate(name) {
  * This only works _if and only if_ `py-ios-device` is installed on the same machine Appium is running on.
  * @since 4.10.0
  * @see https://github.com/YueChen-C/py-ios-device
- * @returns {Promise<import('./types').CertificateList>} An object describing the certificates installed on the real device.
+ * @returns An object describing the certificates installed on the real device.
  * @throws {Error} If attempting to list certificates for a simulated device or if `py-ios-device` is not installed
- * @this {XCUITestDriver}
  */
-export async function mobileListCertificates() {
+export async function mobileListCertificates(this: XCUITestDriver): Promise<CertificateList> {
   if (!this.isRealDevice()) {
     throw new errors.NotImplementedError('This extension is only supported on real devices');
   }
@@ -287,9 +295,9 @@ export async function mobileListCertificates() {
  * Extracts the common name of the certificate from the given buffer.
  *
  * @param {Buffer} certBuffer
- * @returns {Promise<string>} The common name of the certificate
+ * @returns The common name of the certificate
  */
-async function extractCommonName(certBuffer) {
+async function extractCommonName(certBuffer: Buffer): Promise<string> {
   const tempCert = await tempDir.open({
     prefix: 'cert',
     suffix: '.cer',
@@ -315,12 +323,12 @@ async function extractCommonName(certBuffer) {
  * for more details on such profiles.
  *
  * @param {Buffer} certBuffer - The actual content of PEM certificate encoded into NodeJS buffer
- * @param {string} commonName - Certificate's common name
+ * @param commonName - Certificate's common name
  * @returns {Object} The encoded structure of the given certificate, which is ready to be passed
  * as an argument to plist builder
  * @throws {Error} If the given certificate cannot be parsed
  */
-function toMobileConfig(certBuffer, commonName) {
+function toMobileConfig(certBuffer: Buffer, commonName: string): Record<string, any> {
   const getUUID = () => util.uuidV4().toUpperCase();
   const contentUuid = getUUID();
   return {
@@ -345,8 +353,12 @@ function toMobileConfig(certBuffer, commonName) {
   };
 }
 
-async function clickElement(driver, locator, options = {}) {
-  let element = null;
+async function clickElement(
+  driver: XCUITestDriver,
+  locator: {type: string; value: string},
+  options: {timeout?: number; skipIfInvisible?: boolean} = {},
+): Promise<boolean> {
+  let element: any = null;
   const {timeout = 5000, skipIfInvisible = false} = options;
   const lookupDelay = 500;
   try {
@@ -365,7 +377,7 @@ async function clickElement(driver, locator, options = {}) {
   return true;
 }
 
-async function installPre122Certificate(driver) {
+async function installPre122Certificate(driver: XCUITestDriver): Promise<boolean> {
   // Accept Safari alert
   await clickElement(driver, Button.Allow, {
     // certificate load might take some time on slow machines
@@ -393,7 +405,7 @@ async function installPre122Certificate(driver) {
   return true;
 }
 
-async function trustCertificateInPreferences(driver, name) {
+async function trustCertificateInPreferences(driver: XCUITestDriver, name: string): Promise<void> {
   await clickElement(driver, Settings.General);
   await clickElement(driver, Settings.About);
   const switchLocator = {
@@ -401,14 +413,12 @@ async function trustCertificateInPreferences(driver, name) {
     value: `**/XCUIElementTypeCell[\`label == '${name}'\`]/**/XCUIElementTypeSwitch`,
   };
   await retry(5, async () => {
-    await driver.mobileSwipe({
-      element: await driver.findNativeElementOrElements(
-        'class name',
-        'XCUIElementTypeTable',
-        false,
-      ),
-      direction: 'up',
-    });
+    const tableEl = await driver.findNativeElementOrElements(
+      'class name',
+      'XCUIElementTypeTable',
+      false,
+    );
+    await driver.mobileSwipe('up', undefined, tableEl);
     await clickElement(driver, Settings.Certificate_Trust_Settings, {
       timeout: 500,
     });
@@ -433,7 +443,7 @@ async function trustCertificateInPreferences(driver, name) {
   }
 }
 
-async function installPost122Certificate(driver, name) {
+async function installPost122Certificate(driver: XCUITestDriver, name: string): Promise<boolean> {
   // Accept Safari alert
   await clickElement(driver, Button.Allow, {
     // certificate load might take some time on slow machines
@@ -466,14 +476,12 @@ async function installPost122Certificate(driver, name) {
       break;
     }
 
-    await driver.mobileSwipe({
-      element: await driver.findNativeElementOrElements(
-        'class name',
-        'XCUIElementTypeTable',
-        false,
-      ),
-      direction: 'up',
-    });
+    const tableEl = await driver.findNativeElementOrElements(
+      'class name',
+      'XCUIElementTypeTable',
+      false,
+    );
+    await driver.mobileSwipe('up', undefined, tableEl);
   }
   if (!isCertFound) {
     throw new Error(`'${name}' cannot be found in the certificates list`);
@@ -498,6 +506,3 @@ async function installPost122Certificate(driver, name) {
   return true;
 }
 
-/**
- * @typedef {import('../driver').XCUITestDriver} XCUITestDriver
- */