appium-xcuitest-driver 10.2.2 → 10.4.0

package/lib/driver.js

@@ -18,7 +18,52 @@ import {
   onDownloadApp,
   verifyApplicationPlatform,
 } from './app-utils';
-import commands from './commands';
+import * as activeAppInfoCommands from './commands/active-app-info';
+import * as alertCommands from './commands/alert';
+import * as appManagementCommands from './commands/app-management';
+import * as appearanceCommands from './commands/appearance';
+import * as appStringsCommands from './commands/app-strings';
+import * as auditCommands from './commands/audit';
+import * as batteryCommands from './commands/battery';
+import * as biometricCommands from './commands/biometric';
+import * as certificateCommands from './commands/certificate';
+import * as clipboardCommands from './commands/clipboard';
+import * as conditionCommands from './commands/condition';
+import * as contentSizeCommands from './commands/content-size';
+import * as contextCommands from './commands/context';
+import * as deviceInfoCommands from './commands/deviceInfo';
+import * as elementCommands from './commands/element';
+import * as executeCommands from './commands/execute';
+import * as fileMovementCommands from './commands/file-movement';
+import * as findCommands from './commands/find';
+import * as generalCommands from './commands/general';
+import * as geolocationCommands from './commands/geolocation';
+import * as gestureCommands from './commands/gesture';
+import * as iohidCommands from './commands/iohid';
+import * as keychainsCommands from './commands/keychains';
+import * as keyboardCommands from './commands/keyboard';
+import * as localizationCommands from './commands/localization';
+import * as locationCommands from './commands/location';
+import * as lockCommands from './commands/lock';
+import * as logCommands from './commands/log';
+import * as memoryCommands from './commands/memory';
+import * as navigationCommands from './commands/navigation';
+import * as notificationsCommands from './commands/notifications';
+import * as pasteboardCommands from './commands/pasteboard';
+import * as pcapCommands from './commands/pcap';
+import * as performanceCommands from './commands/performance';
+import * as permissionsCommands from './commands/permissions';
+import * as proxyHelperCommands from './commands/proxy-helper';
+import * as recordAudioCommands from './commands/record-audio';
+import * as recordScreenCommands from './commands/recordscreen';
+import * as screenshotCommands from './commands/screenshots';
+import * as sourceCommands from './commands/source';
+import * as simctlCommands from './commands/simctl';
+import * as timeoutCommands from './commands/timeouts';
+import * as webCommands from './commands/web';
+import * as xctestCommands from './commands/xctest';
+import * as xctestRecordScreenCommands from './commands/xctest-record-screen';
+import * as increaseContrastCommands from './commands/increase-contrast';
 import {desiredCapConstraints} from './desired-caps';
 import {DEVICE_CONNECTIONS_FACTORY} from './device-connections-factory';
 import {executeMethodMap} from './execute-method-map';
@@ -249,6 +294,9 @@ export class XCUITestDriver extends BaseDriver {
   /** @type {import('./commands/pcap').TrafficCapture|null} */
   _trafficCapture;
 
+  /** @type {import('./commands/recordscreen').ScreenRecorder|null} */
+  _recentScreenRecorder;
+
   /** @type {Simulator|RealDevice} */
   _device;
 
@@ -610,7 +658,7 @@ export class XCUITestDriver extends BaseDriver {
         ...this.opts,
         device: this.device,
         realDevice: this.isRealDevice(),
-        iosSdkVersion: this._iosSdkVersion,
+        iosSdkVersion: this._iosSdkVersion ?? undefined,
         reqBasePath: this.basePath,
       },
       // @ts-ignore this is ok
@@ -709,7 +757,7 @@ export class XCUITestDriver extends BaseDriver {
         if (_.isNil(this.opts.safariInitialUrl) && _.isNil(this.opts.initialDeeplinkUrl)) {
           this.log.info(`Use the 'safariInitialUrl' capability to customize it`);
         };
-        await this.setUrl(this.getCurrentUrl());
+        await this.setUrl(this.getCurrentUrl() || this.getDefaultUrl());
       } else {
         const currentUrl = await this.getUrl();
         this.log.info(`Current URL: ${currentUrl}`);
@@ -1788,445 +1836,449 @@ export class XCUITestDriver extends BaseDriver {
    | ACTIVEAPPINFO |
    +---------------+*/
 
-  mobileGetActiveAppInfo = commands.activeAppInfoExtensions.mobileGetActiveAppInfo;
+  mobileGetActiveAppInfo = activeAppInfoCommands.mobileGetActiveAppInfo;
 
   /*-------+
    | ALERT |
    +-------+*/
-  getAlertText = commands.alertExtensions.getAlertText;
-  setAlertText = commands.alertExtensions.setAlertText;
-  postAcceptAlert = commands.alertExtensions.postAcceptAlert;
-  postDismissAlert = commands.alertExtensions.postDismissAlert;
-  getAlertButtons = commands.alertExtensions.getAlertButtons;
-  mobileHandleAlert = commands.alertExtensions.mobileHandleAlert;
+  getAlertText = alertCommands.getAlertText;
+  setAlertText = alertCommands.setAlertText;
+  postAcceptAlert = alertCommands.postAcceptAlert;
+  postDismissAlert = alertCommands.postDismissAlert;
+  getAlertButtons = alertCommands.getAlertButtons;
+  mobileHandleAlert = alertCommands.mobileHandleAlert;
 
   /*---------------+
    | APPMANAGEMENT |
    +---------------+*/
 
-  mobileInstallApp = commands.appManagementExtensions.mobileInstallApp;
-  mobileIsAppInstalled = commands.appManagementExtensions.mobileIsAppInstalled;
-  mobileRemoveApp = commands.appManagementExtensions.mobileRemoveApp;
-  mobileLaunchApp = commands.appManagementExtensions.mobileLaunchApp;
-  mobileTerminateApp = commands.appManagementExtensions.mobileTerminateApp;
-  mobileActivateApp = commands.appManagementExtensions.mobileActivateApp;
-  mobileKillApp = commands.appManagementExtensions.mobileKillApp;
-  mobileQueryAppState = commands.appManagementExtensions.mobileQueryAppState;
-  installApp = commands.appManagementExtensions.installApp;
-  activateApp = commands.appManagementExtensions.activateApp;
-  isAppInstalled = commands.appManagementExtensions.isAppInstalled;
+  mobileInstallApp = appManagementCommands.mobileInstallApp;
+  mobileIsAppInstalled = appManagementCommands.mobileIsAppInstalled;
+  mobileRemoveApp = appManagementCommands.mobileRemoveApp;
+  mobileLaunchApp = appManagementCommands.mobileLaunchApp;
+  mobileTerminateApp = appManagementCommands.mobileTerminateApp;
+  mobileActivateApp = appManagementCommands.mobileActivateApp;
+  mobileKillApp = appManagementCommands.mobileKillApp;
+  mobileQueryAppState = appManagementCommands.mobileQueryAppState;
+  installApp = appManagementCommands.installApp;
+  activateApp = appManagementCommands.activateApp;
+  isAppInstalled = appManagementCommands.isAppInstalled;
   // @ts-ignore it must return boolean
-  terminateApp = commands.appManagementExtensions.terminateApp;
-  queryAppState = commands.appManagementExtensions.queryAppState;
-  mobileListApps = commands.appManagementExtensions.mobileListApps;
-  mobileClearApp = commands.appManagementExtensions.mobileClearApp;
+  terminateApp = appManagementCommands.terminateApp;
+  queryAppState = appManagementCommands.queryAppState;
+  mobileListApps = appManagementCommands.mobileListApps;
+  mobileClearApp = appManagementCommands.mobileClearApp;
 
   /*------------+
    | APPEARANCE |
    +------------+*/
 
-  mobileSetAppearance = commands.appearanceExtensions.mobileSetAppearance;
-  mobileGetAppearance = commands.appearanceExtensions.mobileGetAppearance;
+  mobileSetAppearance = appearanceCommands.mobileSetAppearance;
+  mobileGetAppearance = appearanceCommands.mobileGetAppearance;
 
   /*------------+
    | INCREASE CONTRAST |
    +------------+*/
 
-  mobileSetIncreaseContrast = commands.increaseContrastExtensions.mobileSetIncreaseContrast;
-  mobileGetIncreaseContrast = commands.increaseContrastExtensions.mobileGetIncreaseContrast;
+  mobileSetIncreaseContrast = increaseContrastCommands.mobileSetIncreaseContrast;
+  mobileGetIncreaseContrast = increaseContrastCommands.mobileGetIncreaseContrast;
 
   /*------------+
    | CONTENT SIZE |
    +------------+*/
 
-  mobileSetContentSize = commands.contentSizeExtensions.mobileSetContentSize;
-  mobileGetContentSize = commands.contentSizeExtensions.mobileGetContentSize;
+  mobileSetContentSize = contentSizeCommands.mobileSetContentSize;
+  mobileGetContentSize = contentSizeCommands.mobileGetContentSize;
 
   /*------------+
    | AUDIT      |
    +------------+*/
 
-  mobilePerformAccessibilityAudit = commands.auditExtensions.mobilePerformAccessibilityAudit;
+  mobilePerformAccessibilityAudit = auditCommands.mobilePerformAccessibilityAudit;
 
   /*---------+
    | BATTERY |
    +---------+*/
-  mobileGetBatteryInfo = commands.batteryExtensions.mobileGetBatteryInfo;
+  mobileGetBatteryInfo = batteryCommands.mobileGetBatteryInfo;
 
   /*-----------+
    | BIOMETRIC |
    +-----------+*/
 
-  mobileEnrollBiometric = commands.biometricExtensions.mobileEnrollBiometric;
-  mobileSendBiometricMatch = commands.biometricExtensions.mobileSendBiometricMatch;
-  mobileIsBiometricEnrolled = commands.biometricExtensions.mobileIsBiometricEnrolled;
+  mobileEnrollBiometric = biometricCommands.mobileEnrollBiometric;
+  mobileSendBiometricMatch = biometricCommands.mobileSendBiometricMatch;
+  mobileIsBiometricEnrolled = biometricCommands.mobileIsBiometricEnrolled;
 
   /*-------------+
    | CERTIFICATE |
    +-------------+*/
-  mobileInstallCertificate = commands.certificateExtensions.mobileInstallCertificate;
-  mobileListCertificates = commands.certificateExtensions.mobileListCertificates;
-  mobileRemoveCertificate = commands.certificateExtensions.mobileRemoveCertificate;
+  mobileInstallCertificate = certificateCommands.mobileInstallCertificate;
+  mobileListCertificates = certificateCommands.mobileListCertificates;
+  mobileRemoveCertificate = certificateCommands.mobileRemoveCertificate;
 
   /*-----------+
    | CLIPBOARD |
    +-----------+*/
 
-  setClipboard = commands.clipboardExtensions.setClipboard;
-  getClipboard = commands.clipboardExtensions.getClipboard;
+  setClipboard = clipboardCommands.setClipboard;
+  getClipboard = clipboardCommands.getClipboard;
 
   /*-----------+
    | CONDITION |
    +-----------+*/
 
-  listConditionInducers = commands.conditionExtensions.listConditionInducers;
-  enableConditionInducer = commands.conditionExtensions.enableConditionInducer;
-  disableConditionInducer = commands.conditionExtensions.disableConditionInducer;
+  listConditionInducers = conditionCommands.listConditionInducers;
+  enableConditionInducer = conditionCommands.enableConditionInducer;
+  disableConditionInducer = conditionCommands.disableConditionInducer;
 
   /*---------+
    | CONTEXT |
    +---------+*/
 
-  getContexts = commands.contextExtensions.getContexts;
-  getCurrentContext = commands.contextExtensions.getCurrentContext;
+  getContexts = contextCommands.getContexts;
+  getCurrentContext = contextCommands.getCurrentContext;
   // @ts-ignore This is OK
-  getWindowHandle = commands.contextExtensions.getWindowHandle;
-  getWindowHandles = commands.contextExtensions.getWindowHandles;
-  setContext = commands.contextExtensions.setContext;
+  getWindowHandle = contextCommands.getWindowHandle;
+  getWindowHandles = contextCommands.getWindowHandles;
+  // @ts-ignore Type mismatch: function type vs method signature
+  setContext = contextCommands.setContext;
   // @ts-ignore This is OK
-  setWindow = commands.contextExtensions.setWindow;
-  activateRecentWebview = commands.contextExtensions.activateRecentWebview;
-  connectToRemoteDebugger = commands.contextExtensions.connectToRemoteDebugger;
-  getContextsAndViews = commands.contextExtensions.getContextsAndViews;
-  listWebFrames = commands.contextExtensions.listWebFrames;
-  mobileGetContexts = commands.contextExtensions.mobileGetContexts;
-  onPageChange = commands.contextExtensions.onPageChange;
-  useNewSafari = commands.contextExtensions.useNewSafari;
-  getCurrentUrl = commands.contextExtensions.getCurrentUrl;
-  getNewRemoteDebugger = commands.contextExtensions.getNewRemoteDebugger;
-  getRecentWebviewContextId = commands.contextExtensions.getRecentWebviewContextId;
-  isWebContext = commands.contextExtensions.isWebContext;
-  isWebview = commands.contextExtensions.isWebview;
-  setCurrentUrl = commands.contextExtensions.setCurrentUrl;
-  stopRemote = commands.contextExtensions.stopRemote;
+  setWindow = contextCommands.setWindow;
+  activateRecentWebview = contextCommands.activateRecentWebview;
+  connectToRemoteDebugger = contextCommands.connectToRemoteDebugger;
+  getContextsAndViews = contextCommands.getContextsAndViews;
+  listWebFrames = contextCommands.listWebFrames;
+  mobileGetContexts = contextCommands.mobileGetContexts;
+  onPageChange = contextCommands.onPageChange;
+  useNewSafari = contextCommands.useNewSafari;
+  getCurrentUrl = contextCommands.getCurrentUrl;
+  getNewRemoteDebugger = contextCommands.getNewRemoteDebugger;
+  getRecentWebviewContextId = contextCommands.getRecentWebviewContextId;
+  isWebContext = contextCommands.isWebContext;
+  isWebview = contextCommands.isWebview;
+  setCurrentUrl = contextCommands.setCurrentUrl;
+  stopRemote = contextCommands.stopRemote;
 
   /*------------+
    | DEVICEINFO |
    +------------+*/
 
-  mobileGetDeviceInfo = commands.deviceInfoExtensions.mobileGetDeviceInfo;
+  mobileGetDeviceInfo = deviceInfoCommands.mobileGetDeviceInfo;
 
   /*---------+
    | ELEMENT |
    +---------+*/
 
-  elementDisplayed = commands.elementExtensions.elementDisplayed;
-  elementEnabled = commands.elementExtensions.elementEnabled;
-  elementSelected = commands.elementExtensions.elementSelected;
-  getName = commands.elementExtensions.getName;
-  getNativeAttribute = commands.elementExtensions.getNativeAttribute;
-  getAttribute = commands.elementExtensions.getAttribute;
-  getProperty = commands.elementExtensions.getProperty;
-  getText = commands.elementExtensions.getText;
-  getElementRect = commands.elementExtensions.getElementRect;
-  getLocation = commands.elementExtensions.getLocation;
-  getLocationInView = commands.elementExtensions.getLocationInView;
-  getSize = commands.elementExtensions.getSize;
+  elementDisplayed = elementCommands.elementDisplayed;
+  elementEnabled = elementCommands.elementEnabled;
+  elementSelected = elementCommands.elementSelected;
+  getName = elementCommands.getName;
+  getNativeAttribute = elementCommands.getNativeAttribute;
+  getAttribute = elementCommands.getAttribute;
+  getProperty = elementCommands.getProperty;
+  getText = elementCommands.getText;
+  getElementRect = elementCommands.getElementRect;
+  getLocation = elementCommands.getLocation;
+  getLocationInView = elementCommands.getLocationInView;
+  getSize = elementCommands.getSize;
   /** @deprecated */
-  setValueImmediate = commands.elementExtensions.setValueImmediate;
-  setValue = commands.elementExtensions.setValue;
-  setValueWithWebAtom = commands.elementExtensions.setValueWithWebAtom;
-  keys = commands.elementExtensions.keys;
-  clear = commands.elementExtensions.clear;
-  getContentSize = commands.elementExtensions.getContentSize;
-  getNativeRect = commands.elementExtensions.getNativeRect;
+  setValueImmediate = elementCommands.setValueImmediate;
+  setValue = elementCommands.setValue;
+  setValueWithWebAtom = elementCommands.setValueWithWebAtom;
+  keys = elementCommands.keys;
+  clear = elementCommands.clear;
+  getContentSize = elementCommands.getContentSize;
+  getNativeRect = elementCommands.getNativeRect;
 
   /*---------+
    | EXECUTE |
    +---------+*/
 
-  receiveAsyncResponse = commands.executeExtensions.receiveAsyncResponse;
-  execute = commands.executeExtensions.execute;
-  executeAsync = commands.executeExtensions.executeAsync;
-  executeMobile = commands.executeExtensions.executeMobile;
-  mobileSimctl = commands.simctl.mobileSimctl;
+  receiveAsyncResponse = executeCommands.receiveAsyncResponse;
+  execute = executeCommands.execute;
+  // @ts-ignore Type mismatch: function type vs method signature
+  executeAsync = executeCommands.executeAsync;
+  // Note: executeMobile is handled internally via execute method
+  mobileSimctl = simctlCommands.mobileSimctl;
 
   /*--------------+
    | FILEMOVEMENT |
    +--------------+*/
 
-  pushFile = commands.fileMovementExtensions.pushFile;
-  mobilePushFile = commands.fileMovementExtensions.mobilePushFile;
-  pullFile = commands.fileMovementExtensions.pullFile;
-  mobilePullFile = commands.fileMovementExtensions.mobilePullFile;
-  mobileDeleteFolder = commands.fileMovementExtensions.mobileDeleteFolder;
-  mobileDeleteFile = commands.fileMovementExtensions.mobileDeleteFile;
-  pullFolder = commands.fileMovementExtensions.pullFolder;
-  mobilePullFolder = commands.fileMovementExtensions.mobilePullFolder;
+  pushFile = fileMovementCommands.pushFile;
+  mobilePushFile = fileMovementCommands.mobilePushFile;
+  pullFile = fileMovementCommands.pullFile;
+  mobilePullFile = fileMovementCommands.mobilePullFile;
+  mobileDeleteFolder = fileMovementCommands.mobileDeleteFolder;
+  mobileDeleteFile = fileMovementCommands.mobileDeleteFile;
+  pullFolder = fileMovementCommands.pullFolder;
+  mobilePullFolder = fileMovementCommands.mobilePullFolder;
 
   /*--------+
    | MEMORY |
    +--------+*/
 
-  mobileSendMemoryWarning = commands.memoryExtensions.mobileSendMemoryWarning;
+  mobileSendMemoryWarning = memoryCommands.mobileSendMemoryWarning;
 
   /*------+
    | FIND |
    +------+*/
 
-  findElOrEls = commands.findExtensions.findElOrEls;
-  findNativeElementOrElements = commands.findExtensions.findNativeElementOrElements;
-  doNativeFind = commands.findExtensions.doNativeFind;
-  getFirstVisibleChild = commands.findExtensions.getFirstVisibleChild;
+  findElOrEls = findCommands.findElOrEls;
+  findNativeElementOrElements = findCommands.findNativeElementOrElements;
+  doNativeFind = findCommands.doNativeFind;
+  getFirstVisibleChild = findCommands.getFirstVisibleChild;
 
   /*---------+
    | GENERAL |
    +---------+*/
 
-  active = commands.generalExtensions.active;
-  background = commands.appManagementExtensions.background;
-  touchId = commands.generalExtensions.touchId;
-  toggleEnrollTouchId = commands.generalExtensions.toggleEnrollTouchId;
-  getWindowSize = commands.generalExtensions.getWindowSize;
-  getDeviceTime = commands.generalExtensions.getDeviceTime;
-  mobileGetDeviceTime = commands.generalExtensions.mobileGetDeviceTime;
-  getWindowRect = commands.generalExtensions.getWindowRect;
-  getStrings = commands.appStringsExtensions.getStrings;
-  removeApp = commands.generalExtensions.removeApp;
-  launchApp = commands.generalExtensions.launchApp;
-  closeApp = commands.generalExtensions.closeApp;
-  setUrl = commands.generalExtensions.setUrl;
-  getViewportRect = commands.generalExtensions.getViewportRect;
-  getScreenInfo = commands.generalExtensions.getScreenInfo;
-  getStatusBarHeight = commands.generalExtensions.getStatusBarHeight;
-  getDevicePixelRatio = commands.generalExtensions.getDevicePixelRatio;
-  mobilePressButton = commands.generalExtensions.mobilePressButton;
-  mobileSiriCommand = commands.generalExtensions.mobileSiriCommand;
+  active = generalCommands.active;
+  background = appManagementCommands.background;
+  touchId = generalCommands.touchId;
+  toggleEnrollTouchId = generalCommands.toggleEnrollTouchId;
+  getWindowSize = generalCommands.getWindowSize;
+  getDeviceTime = generalCommands.getDeviceTime;
+  mobileGetDeviceTime = generalCommands.mobileGetDeviceTime;
+  getWindowRect = generalCommands.getWindowRect;
+  getStrings = appStringsCommands.getStrings;
+  removeApp = generalCommands.removeApp;
+  launchApp = generalCommands.launchApp;
+  closeApp = generalCommands.closeApp;
+  // @ts-ignore Type mismatch: function type vs method signature
+  setUrl = generalCommands.setUrl;
+  getViewportRect = generalCommands.getViewportRect;
+  getScreenInfo = generalCommands.getScreenInfo;
+  getStatusBarHeight = generalCommands.getStatusBarHeight;
+  getDevicePixelRatio = generalCommands.getDevicePixelRatio;
+  mobilePressButton = generalCommands.mobilePressButton;
+  mobileSiriCommand = generalCommands.mobileSiriCommand;
 
   /*-------------+
    | GEOLOCATION |
    +-------------+*/
-  mobileGetSimulatedLocation = commands.geolocationExtensions.mobileGetSimulatedLocation;
-  mobileSetSimulatedLocation = commands.geolocationExtensions.mobileSetSimulatedLocation;
-  mobileResetSimulatedLocation = commands.geolocationExtensions.mobileResetSimulatedLocation;
+  mobileGetSimulatedLocation = geolocationCommands.mobileGetSimulatedLocation;
+  mobileSetSimulatedLocation = geolocationCommands.mobileSetSimulatedLocation;
+  mobileResetSimulatedLocation = geolocationCommands.mobileResetSimulatedLocation;
 
   /*---------+
    | GESTURE |
    +---------+*/
-  mobileShake = commands.gestureExtensions.mobileShake;
-  click = commands.gestureExtensions.click;
-  releaseActions = commands.gestureExtensions.releaseActions;
-  performActions = commands.gestureExtensions.performActions;
-  nativeClick = commands.gestureExtensions.nativeClick;
-  mobileScrollToElement = commands.gestureExtensions.mobileScrollToElement;
-  mobileScroll = commands.gestureExtensions.mobileScroll;
-  mobileSwipe = commands.gestureExtensions.mobileSwipe;
-  mobilePinch = commands.gestureExtensions.mobilePinch;
-  mobileDoubleTap = commands.gestureExtensions.mobileDoubleTap;
-  mobileTwoFingerTap = commands.gestureExtensions.mobileTwoFingerTap;
-  mobileTouchAndHold = commands.gestureExtensions.mobileTouchAndHold;
-  mobileTap = commands.gestureExtensions.mobileTap;
-  mobileDragFromToForDuration = commands.gestureExtensions.mobileDragFromToForDuration;
-  mobileDragFromToWithVelocity = commands.gestureExtensions.mobileDragFromToWithVelocity;
-  mobileTapWithNumberOfTaps = commands.gestureExtensions.mobileTapWithNumberOfTaps;
-  mobileForcePress = commands.gestureExtensions.mobileForcePress;
-  mobileSelectPickerWheelValue = commands.gestureExtensions.mobileSelectPickerWheelValue;
-  mobileRotateElement = commands.gestureExtensions.mobileRotateElement;
+  mobileShake = gestureCommands.mobileShake;
+  click = gestureCommands.click;
+  releaseActions = gestureCommands.releaseActions;
+  performActions = gestureCommands.performActions;
+  nativeClick = gestureCommands.nativeClick;
+  mobileScrollToElement = gestureCommands.mobileScrollToElement;
+  mobileScroll = gestureCommands.mobileScroll;
+  mobileSwipe = gestureCommands.mobileSwipe;
+  mobilePinch = gestureCommands.mobilePinch;
+  mobileDoubleTap = gestureCommands.mobileDoubleTap;
+  mobileTwoFingerTap = gestureCommands.mobileTwoFingerTap;
+  mobileTouchAndHold = gestureCommands.mobileTouchAndHold;
+  mobileTap = gestureCommands.mobileTap;
+  mobileDragFromToForDuration = gestureCommands.mobileDragFromToForDuration;
+  mobileDragFromToWithVelocity = gestureCommands.mobileDragFromToWithVelocity;
+  mobileTapWithNumberOfTaps = gestureCommands.mobileTapWithNumberOfTaps;
+  mobileForcePress = gestureCommands.mobileForcePress;
+  mobileSelectPickerWheelValue = gestureCommands.mobileSelectPickerWheelValue;
+  mobileRotateElement = gestureCommands.mobileRotateElement;
 
   /*-------+
    | IOHID |
    +-------+*/
-  mobilePerformIoHidEvent = commands.iohidExtensions.mobilePerformIoHidEvent;
+  mobilePerformIoHidEvent = iohidCommands.mobilePerformIoHidEvent;
 
   /*-----------+
    | KEYCHAINS |
    +-----------+*/
 
-  mobileClearKeychains = commands.keychainsExtensions.mobileClearKeychains;
+  mobileClearKeychains = keychainsCommands.mobileClearKeychains;
 
   /*----------+
    | KEYBOARD |
    +----------+*/
 
-  hideKeyboard = commands.keyboardExtensions.hideKeyboard;
-  mobileHideKeyboard = commands.keyboardExtensions.mobileHideKeyboard;
-  isKeyboardShown = commands.keyboardExtensions.isKeyboardShown;
-  mobileKeys = commands.keyboardExtensions.mobileKeys;
+  hideKeyboard = keyboardCommands.hideKeyboard;
+  mobileHideKeyboard = keyboardCommands.mobileHideKeyboard;
+  isKeyboardShown = keyboardCommands.isKeyboardShown;
+  mobileKeys = keyboardCommands.mobileKeys;
 
   /*--------------+
    | LOCALIZATION |
    +--------------+*/
 
-  mobileConfigureLocalization = commands.localizationExtensions.mobileConfigureLocalization;
+  mobileConfigureLocalization = localizationCommands.mobileConfigureLocalization;
 
   /*----------+
    | LOCATION |
    +----------+*/
 
-  getGeoLocation = commands.locationExtensions.getGeoLocation;
-  setGeoLocation = commands.locationExtensions.setGeoLocation;
-  mobileResetLocationService = commands.locationExtensions.mobileResetLocationService;
+  getGeoLocation = locationCommands.getGeoLocation;
+  setGeoLocation = locationCommands.setGeoLocation;
+  mobileResetLocationService = locationCommands.mobileResetLocationService;
 
   /*------+
    | LOCK |
    +------+*/
-  lock = commands.lockExtensions.lock;
-  unlock = commands.lockExtensions.unlock;
-  isLocked = commands.lockExtensions.isLocked;
+  lock = lockCommands.lock;
+  unlock = lockCommands.unlock;
+  isLocked = lockCommands.isLocked;
 
   /*-----+
    | LOG |
    +-----+*/
 
-  extractLogs = commands.logExtensions.extractLogs;
-  supportedLogTypes = commands.logExtensions.supportedLogTypes;
-  startLogCapture = commands.logExtensions.startLogCapture;
-  mobileStartLogsBroadcast = commands.logExtensions.mobileStartLogsBroadcast;
-  mobileStopLogsBroadcast = commands.logExtensions.mobileStopLogsBroadcast;
+  extractLogs = logCommands.extractLogs;
+  supportedLogTypes = logCommands.supportedLogTypes;
+  startLogCapture = logCommands.startLogCapture;
+  mobileStartLogsBroadcast = logCommands.mobileStartLogsBroadcast;
+  mobileStopLogsBroadcast = logCommands.mobileStopLogsBroadcast;
 
   /*------------+
    | NAVIGATION |
    +------------+*/
 
-  back = commands.navigationExtensions.back;
-  forward = commands.navigationExtensions.forward;
-  closeWindow = commands.navigationExtensions.closeWindow;
-  nativeBack = commands.navigationExtensions.nativeBack;
-  mobileDeepLink = commands.navigationExtensions.mobileDeepLink;
+  back = navigationCommands.back;
+  forward = navigationCommands.forward;
+  closeWindow = navigationCommands.closeWindow;
+  nativeBack = navigationCommands.nativeBack;
+  mobileDeepLink = navigationCommands.mobileDeepLink;
 
   /*---------------+
    | NOTIFICATIONS |
    +---------------+*/
 
-  mobilePushNotification = commands.notificationsExtensions.mobilePushNotification;
-  mobileExpectNotification = commands.notificationsExtensions.mobileExpectNotification;
+  mobilePushNotification = notificationsCommands.mobilePushNotification;
+  mobileExpectNotification = notificationsCommands.mobileExpectNotification;
 
   /*------------+
    | PASTEBOARD |
    +------------+*/
 
-  mobileSetPasteboard = commands.pasteboardExtensions.mobileSetPasteboard;
-  mobileGetPasteboard = commands.pasteboardExtensions.mobileGetPasteboard;
+  mobileSetPasteboard = pasteboardCommands.mobileSetPasteboard;
+  mobileGetPasteboard = pasteboardCommands.mobileGetPasteboard;
 
   /*------+
    | PCAP |
    +------+*/
 
-  mobileStartPcap = commands.pcapExtensions.mobileStartPcap;
-  mobileStopPcap = commands.pcapExtensions.mobileStopPcap;
+  mobileStartPcap = pcapCommands.mobileStartPcap;
+  mobileStopPcap = pcapCommands.mobileStopPcap;
 
   /*-------------+
    | PERFORMANCE |
    +-------------+*/
-  mobileStartPerfRecord = commands.performanceExtensions.mobileStartPerfRecord;
-  mobileStopPerfRecord = commands.performanceExtensions.mobileStopPerfRecord;
+  mobileStartPerfRecord = performanceCommands.mobileStartPerfRecord;
+  mobileStopPerfRecord = performanceCommands.mobileStopPerfRecord;
 
   /*-------------+
    | PERMISSIONS |
    +-------------+*/
 
-  mobileResetPermission = commands.permissionsExtensions.mobileResetPermission;
-  mobileGetPermission = commands.permissionsExtensions.mobileGetPermission;
-  mobileSetPermissions = commands.permissionsExtensions.mobileSetPermissions;
+  mobileResetPermission = permissionsCommands.mobileResetPermission;
+  mobileGetPermission = permissionsCommands.mobileGetPermission;
+  mobileSetPermissions = permissionsCommands.mobileSetPermissions;
 
   /*-------------+
    | PROXYHELPER |
    +-------------+*/
 
-  proxyCommand = commands.proxyHelperExtensions.proxyCommand;
+  proxyCommand = proxyHelperCommands.proxyCommand;
 
   /*-------------+
    | RECORDAUDIO |
    +-------------+*/
 
-  startAudioRecording = commands.recordAudioExtensions.startAudioRecording;
-  stopAudioRecording = commands.recordAudioExtensions.stopAudioRecording;
+  startAudioRecording = recordAudioCommands.startAudioRecording;
+  stopAudioRecording = recordAudioCommands.stopAudioRecording;
 
   /*--------------+
    | RECORDSCREEN |
    +--------------+*/
 
-  _recentScreenRecorder = commands.recordScreenExtensions._recentScreenRecorder;
-  startRecordingScreen = commands.recordScreenExtensions.startRecordingScreen;
-  stopRecordingScreen = commands.recordScreenExtensions.stopRecordingScreen;
+  // Note: _recentScreenRecorder is a property, not a function, so it's handled internally in recordscreen.js
+  startRecordingScreen = recordScreenCommands.startRecordingScreen;
+  stopRecordingScreen = recordScreenCommands.stopRecordingScreen;
 
   /*-------------+
    | SCREENSHOTS |
    +-------------+*/
-  getScreenshot = commands.screenshotExtensions.getScreenshot;
-  getElementScreenshot = commands.screenshotExtensions.getElementScreenshot;
-  getViewportScreenshot = commands.screenshotExtensions.getViewportScreenshot;
+  getScreenshot = screenshotCommands.getScreenshot;
+  getElementScreenshot = screenshotCommands.getElementScreenshot;
+  getViewportScreenshot = screenshotCommands.getViewportScreenshot;
 
   /*--------+
    | SOURCE |
    +--------+*/
-  getPageSource = commands.sourceExtensions.getPageSource;
-  mobileGetSource = commands.sourceExtensions.mobileGetSource;
+  getPageSource = sourceCommands.getPageSource;
+  mobileGetSource = sourceCommands.mobileGetSource;
 
   /*----------+
    | TIMEOUTS |
    +----------+*/
 
-  pageLoadTimeoutW3C = commands.timeoutExtensions.pageLoadTimeoutW3C;
-  pageLoadTimeoutMJSONWP = commands.timeoutExtensions.pageLoadTimeoutMJSONWP;
-  scriptTimeoutW3C = commands.timeoutExtensions.scriptTimeoutW3C;
-  scriptTimeoutMJSONWP = commands.timeoutExtensions.scriptTimeoutMJSONWP;
-  asyncScriptTimeout = commands.timeoutExtensions.asyncScriptTimeout;
-  setPageLoadTimeout = commands.timeoutExtensions.setPageLoadTimeout;
-  setAsyncScriptTimeout = commands.timeoutExtensions.setAsyncScriptTimeout;
+  pageLoadTimeoutW3C = timeoutCommands.pageLoadTimeoutW3C;
+  pageLoadTimeoutMJSONWP = timeoutCommands.pageLoadTimeoutMJSONWP;
+  scriptTimeoutW3C = timeoutCommands.scriptTimeoutW3C;
+  scriptTimeoutMJSONWP = timeoutCommands.scriptTimeoutMJSONWP;
+  asyncScriptTimeout = timeoutCommands.asyncScriptTimeout;
+  setPageLoadTimeout = timeoutCommands.setPageLoadTimeout;
+  setAsyncScriptTimeout = timeoutCommands.setAsyncScriptTimeout;
 
   /*-----+
    | WEB |
    +-----+*/
-  setFrame = commands.webExtensions.setFrame;
-  getCssProperty = commands.webExtensions.getCssProperty;
-  submit = commands.webExtensions.submit;
-  refresh = commands.webExtensions.refresh;
-  getUrl = commands.webExtensions.getUrl;
-  title = commands.webExtensions.title;
-  getCookies = commands.webExtensions.getCookies;
-  setCookie = commands.webExtensions.setCookie;
-  deleteCookie = commands.webExtensions.deleteCookie;
-  deleteCookies = commands.webExtensions.deleteCookies;
-  _deleteCookie = commands.webExtensions._deleteCookie;
-  cacheWebElement = commands.webExtensions.cacheWebElement;
-  cacheWebElements = commands.webExtensions.cacheWebElements;
-  executeAtom = commands.webExtensions.executeAtom;
-  executeAtomAsync = commands.webExtensions.executeAtomAsync;
-  getAtomsElement = commands.webExtensions.getAtomsElement;
-  convertElementsForAtoms = commands.webExtensions.convertElementsForAtoms;
-  getElementId = commands.webExtensions.getElementId;
-  hasElementId = commands.webExtensions.hasElementId;
-  findWebElementOrElements = commands.webExtensions.findWebElementOrElements;
-  clickWebCoords = commands.webExtensions.clickWebCoords;
-  getSafariIsIphone = commands.webExtensions.getSafariIsIphone;
-  getSafariDeviceSize = commands.webExtensions.getSafariDeviceSize;
-  getSafariIsNotched = commands.webExtensions.getSafariIsNotched;
-  getExtraTranslateWebCoordsOffset = commands.webExtensions.getExtraTranslateWebCoordsOffset;
-  getExtraNativeWebTapOffset = commands.webExtensions.getExtraNativeWebTapOffset;
-  nativeWebTap = commands.webExtensions.nativeWebTap;
-  translateWebCoords = commands.webExtensions.translateWebCoords;
-  checkForAlert = commands.webExtensions.checkForAlert;
-  waitForAtom = commands.webExtensions.waitForAtom;
-  mobileWebNav = commands.webExtensions.mobileWebNav;
-  getWdaLocalhostRoot = commands.webExtensions.getWdaLocalhostRoot;
-  mobileCalibrateWebToRealCoordinatesTranslation = commands.webExtensions.mobileCalibrateWebToRealCoordinatesTranslation;
-  mobileUpdateSafariPreferences = commands.webExtensions.mobileUpdateSafariPreferences;
+  // @ts-ignore Type mismatch: function type vs method signature
+  setFrame = webCommands.setFrame;
+  getCssProperty = webCommands.getCssProperty;
+  submit = webCommands.submit;
+  refresh = webCommands.refresh;
+  getUrl = webCommands.getUrl;
+  title = webCommands.title;
+  getCookies = webCommands.getCookies;
+  setCookie = webCommands.setCookie;
+  deleteCookie = webCommands.deleteCookie;
+  deleteCookies = webCommands.deleteCookies;
+  _deleteCookie = webCommands._deleteCookie;
+  cacheWebElement = webCommands.cacheWebElement;
+  cacheWebElements = webCommands.cacheWebElements;
+  executeAtom = webCommands.executeAtom;
+  executeAtomAsync = webCommands.executeAtomAsync;
+  getAtomsElement = webCommands.getAtomsElement;
+  convertElementsForAtoms = webCommands.convertElementsForAtoms;
+  getElementId = webCommands.getElementId;
+  hasElementId = webCommands.hasElementId;
+  findWebElementOrElements = webCommands.findWebElementOrElements;
+  clickWebCoords = webCommands.clickWebCoords;
+  getSafariIsIphone = webCommands.getSafariIsIphone;
+  getSafariDeviceSize = webCommands.getSafariDeviceSize;
+  getSafariIsNotched = webCommands.getSafariIsNotched;
+  getExtraTranslateWebCoordsOffset = webCommands.getExtraTranslateWebCoordsOffset;
+  getExtraNativeWebTapOffset = webCommands.getExtraNativeWebTapOffset;
+  nativeWebTap = webCommands.nativeWebTap;
+  translateWebCoords = webCommands.translateWebCoords;
+  checkForAlert = webCommands.checkForAlert;
+  waitForAtom = webCommands.waitForAtom;
+  mobileWebNav = webCommands.mobileWebNav;
+  getWdaLocalhostRoot = webCommands.getWdaLocalhostRoot;
+  mobileCalibrateWebToRealCoordinatesTranslation = webCommands.mobileCalibrateWebToRealCoordinatesTranslation;
+  mobileUpdateSafariPreferences = webCommands.mobileUpdateSafariPreferences;
 
   /*--------+
    | XCTEST |
    +--------+*/
-  mobileRunXCTest = commands.xctestExtensions.mobileRunXCTest;
-  mobileInstallXCTestBundle = commands.xctestExtensions.mobileInstallXCTestBundle;
-  mobileListXCTestBundles = commands.xctestExtensions.mobileListXCTestBundles;
-  mobileListXCTestsInTestBundle = commands.xctestExtensions.mobileListXCTestsInTestBundle;
+  mobileRunXCTest = xctestCommands.mobileRunXCTest;
+  mobileInstallXCTestBundle = xctestCommands.mobileInstallXCTestBundle;
+  mobileListXCTestBundles = xctestCommands.mobileListXCTestBundles;
+  mobileListXCTestsInTestBundle = xctestCommands.mobileListXCTestsInTestBundle;
 
   /*----------------------+
    | XCTEST SCREEN RECORD |
    +---------------------+*/
-  mobileStartXctestScreenRecording = commands.xctestRecordScreenExtensions.mobileStartXctestScreenRecording;
-  mobileGetXctestScreenRecordingInfo = commands.xctestRecordScreenExtensions.mobileGetXctestScreenRecordingInfo;
-  mobileStopXctestScreenRecording = commands.xctestRecordScreenExtensions.mobileStopXctestScreenRecording;
+  mobileStartXctestScreenRecording = xctestRecordScreenCommands.mobileStartXctestScreenRecording;
+  mobileGetXctestScreenRecordingInfo = xctestRecordScreenCommands.mobileGetXctestScreenRecordingInfo;
+  mobileStopXctestScreenRecording = xctestRecordScreenCommands.mobileStopXctestScreenRecording;
 }
 
 export default XCUITestDriver;