@applitools/driver 1.11.26 → 1.11.27

package/dist/helper-android.js

@@ -30,16 +30,6 @@ exports.HelperAndroid = void 0;
 const utils = __importStar(require("@applitools/utils"));
 const gte_1 = __importDefault(require("semver/functions/gte"));
 class HelperAndroid {
-    constructor(options) {
-        this._supportAsync = false;
-        this._spec = options.spec;
-        this._input = options.input;
-        this._action = options.action;
-        this._legacy = options.legacy;
-        this._logger = options.logger;
-        this.name = this._legacy ? 'android-legacy' : 'android';
-        this._supportAsync = options.supportAsync === true;
-    }
     static async make(options) {
         var _a;
         const { spec, driver, logger } = options;
@@ -68,6 +58,16 @@ class HelperAndroid {
             })
             : null;
     }
+    constructor(options) {
+        this._supportAsync = false;
+        this._spec = options.spec;
+        this._input = options.input;
+        this._action = options.action;
+        this._legacy = options.legacy;
+        this._logger = options.logger;
+        this.name = this._legacy ? 'android-legacy' : 'android';
+        this._supportAsync = options.supportAsync === true;
+    }
     async _getElementId(element) {
         const resourceId = await element.getAttribute('resource-id');
         if (!resourceId)
@@ -91,12 +91,12 @@ class HelperAndroid {
         }
         if (text === 'WAIT') {
             this._logger.warn(`Helper library didn't provide a response for async command (${command}) during ${timeout}ms`);
-            text = null;
+            text = '';
         }
         return text;
     }
     async getContentRegion(element, options) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         const elementId = await this._getElementId(element);
         if (!elementId)
             return null;
@@ -115,18 +115,18 @@ class HelperAndroid {
         const contentHeight = Number(contentHeightString);
         if (Number.isNaN(contentHeight))
             return null;
-        const region = await this._spec.getElementRegion(this._input.driver.target, element.target);
-        if (contentHeight < region.height)
+        const region = await ((_e = (_d = this._spec).getElementRegion) === null || _e === void 0 ? void 0 : _e.call(_d, this._input.driver.target, element.target));
+        if (!region || contentHeight < region.height)
             return null;
         return { x: region.x, y: region.y, width: region.width, height: contentHeight };
     }
     async getTouchPadding() {
         if (this._legacy)
-            return null;
+            return undefined;
         const touchPaddingString = await this._command(`getTouchPadding;0;0;0;0;0`);
         const touchPadding = Number(touchPaddingString);
         if (!touchPadding || Number.isNaN(touchPadding))
-            return null;
+            return undefined;
         return touchPadding;
     }
     async getRegion(element) {
@@ -146,18 +146,18 @@ class HelperAndroid {
     }
     async scrollToTop(element) {
         if (this._legacy)
-            return null;
+            return;
         const elementId = await this._getElementId(element);
         if (!elementId)
-            return null;
+            return;
         await this._command(`moveToTop;${elementId};0;-1;0`);
     }
     async scrollBy(element, offset) {
         if (this._legacy)
-            return null;
+            return;
         const elementId = await this._getElementId(element);
         if (!elementId)
-            return null;
+            return;
         await this._command(`scroll;${elementId};${offset.y};0;0;0`);
     }
 }

package/dist/helper-ios.js

@@ -2,6 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HelperIOS = void 0;
 class HelperIOS {
+    static async make(options) {
+        const { spec, driver, logger } = options;
+        const element = await driver.element({ type: 'name', selector: 'applitools_grab_scrollable_data_button' });
+        return element ? new HelperIOS({ driver, element, spec, logger }) : null;
+    }
     constructor(options) {
         this._driver = options.driver;
         this._element = options.element;
@@ -9,14 +14,9 @@ class HelperIOS {
         this._logger = options.logger;
         this.name = 'ios';
     }
-    static async make(options) {
-        const { spec, driver, logger } = options;
-        const element = await driver.element({ type: 'name', selector: 'applitools_grab_scrollable_data_button' });
-        return element ? new HelperIOS({ driver, element, spec, logger }) : null;
-    }
     async getContentRegion(element) {
+        var _a, _b;
         await this._element.click();
-        const region = await this._spec.getElementRegion(this._driver.target, element.target);
         const sizeLabel = await this._driver.element({ type: 'name', selector: 'applitools_content_size_label' });
         const sizeString = await (sizeLabel === null || sizeLabel === void 0 ? void 0 : sizeLabel.getText());
         if (!sizeString)
@@ -35,6 +35,9 @@ class HelperIOS {
             if (!Number.isNaN(contentOffset.y))
                 contentSize.height -= contentOffset.y;
         }
+        const region = await ((_b = (_a = this._spec).getElementRegion) === null || _b === void 0 ? void 0 : _b.call(_a, this._driver.target, element.target));
+        if (!region || contentSize.height < region.height)
+            return null;
         return contentSize.height >= region.height ? { x: region.x, y: region.y, ...contentSize } : null;
     }
 }

package/dist/user-agent-data.js

@@ -9,7 +9,7 @@ const WINDOWS_VERSIONS = {
     '15.0.0': '11',
 };
 function parseUserAgentData(userAgentData) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const chromiumBrand = (_a = userAgentData.brands) === null || _a === void 0 ? void 0 : _a.find(brand => /Chromium/i.test(brand.brand));
     const browserBrand = (_c = (_b = userAgentData.brands) === null || _b === void 0 ? void 0 : _b.find(brand => brand !== chromiumBrand && !/Not.?A.?Brand/i.test(brand.brand))) !== null && _c !== void 0 ? _c : chromiumBrand;
     const info = {
@@ -26,7 +26,7 @@ function parseUserAgentData(userAgentData) {
     }
     else if (info.platformName === 'macOS') {
         info.platformName = 'Mac OS X';
-        info.platformVersion = info.platformVersion.split(/[._]/, 2).join('.');
+        info.platformVersion = (_d = info.platformVersion) === null || _d === void 0 ? void 0 : _d.split(/[._]/, 2).join('.');
     }
     return info;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/driver",
-  "version": "1.11.26",
+  "version": "1.11.27",
   "description": "Applitools universal framework wrapper",
   "keywords": [
     "applitools",
@@ -71,8 +71,8 @@
     "types"
   ],
   "scripts": {
-    "lint": "eslint '**/*.ts'",
-    "build": "tsc",
+    "lint": "npx eslint '**/*.ts'",
+    "build": "npx tsc --project ./tsconfig.build.json",
     "test": "yarn test:unit",
     "test:sanity": "yarn test:unit",
     "test:unit": "mocha --no-timeouts -r ts-node/register ./test/unit/*.spec.ts",
@@ -81,34 +81,17 @@
     "version": "bongo version",
     "postversion": "bongo postversion --skip-release-notification"
   },
-  "husky": {
-    "hooks": {
-      "pre-push": "yarn bongo lint"
-    }
-  },
   "dependencies": {
-    "@applitools/logger": "1.1.42",
-    "@applitools/snippets": "2.4.14",
-    "@applitools/utils": "1.3.28",
+    "@applitools/logger": "1.1.44",
+    "@applitools/snippets": "2.4.15",
+    "@applitools/utils": "1.3.29",
     "semver": "7.3.7"
   },
   "devDependencies": {
     "@applitools/bongo": "^2.2.2",
-    "@applitools/scripts": "^1.2.0",
     "@types/mocha": "^9.1.1",
-    "@types/node": "^17.0.31",
-    "@typescript-eslint/eslint-plugin": "^5.22.0",
-    "@typescript-eslint/parser": "^5.22.0",
-    "eslint": "^8.14.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-mocha-no-only": "^1.1.1",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "husky": "^4.3.7",
-    "mocha": "^10.0.0",
-    "prettier": "^2.6.2",
-    "ts-node": "^10.7.0",
-    "typescript": "^4.6.4"
+    "@types/node": "12",
+    "mocha": "^10.0.0"
   },
   "engines": {
     "node": ">=12.13.0"

package/types/capabilities.d.ts

@@ -1,4 +1,4 @@
 import { type DriverInfo } from './spec-driver';
-declare type Capabilities = Record<string, any>;
+type Capabilities = Record<string, any>;
 export declare function parseCapabilities(capabilities: Capabilities): DriverInfo;
 export {};

package/types/context.d.ts

@@ -5,39 +5,34 @@ import { type Driver } from './driver';
 import { type Selector } from './selector';
 import { type Logger } from '@applitools/logger';
 import { Element } from './element';
-export declare type ContextReference<TDriver, TContext, TElement, TSelector> = Context<TDriver, TContext, TElement, TSelector> | Element<TDriver, TContext, TElement, TSelector> | TElement | Selector<TSelector> | string | number;
-export declare type ContextPlain<TDriver, TContext, TElement, TSelector> = ContextReference<TDriver, TContext, TElement, TSelector> | {
+export type ContextReference<TDriver, TContext, TElement, TSelector> = Context<TDriver, TContext, TElement, TSelector> | Element<TDriver, TContext, TElement, TSelector> | TElement | Selector<TSelector> | string | number;
+export type ContextPlain<TDriver, TContext, TElement, TSelector> = ContextReference<TDriver, TContext, TElement, TSelector> | {
     reference: ContextReference<TDriver, TContext, TElement, TSelector>;
     scrollingElement?: Element<TDriver, TContext, TElement, TSelector>;
     parent?: ContextPlain<TDriver, TContext, TElement, TSelector>;
 };
-export declare type ContextState = {
-    region?: Region;
-    clientRegion?: Region;
-    scrollingRegion?: Region;
-    innerOffset?: Location;
+type ContextOptions<TDriver, TContext, TElement, TSelector> = {
+    spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
+    context?: TContext;
+    driver?: Driver<TDriver, TContext, TElement, TSelector>;
+    parent?: Context<TDriver, TContext, TElement, TSelector>;
+    reference?: ContextReference<TDriver, TContext, TElement, TSelector>;
+    element?: Element<TDriver, TContext, TElement, TSelector>;
+    scrollingElement?: Element<TDriver, TContext, TElement, TSelector>;
+    logger: Logger;
 };
 export declare class Context<TDriver, TContext, TElement, TSelector> {
-    private _target;
-    private _driver;
-    private _parent;
-    private _element;
-    private _reference;
-    private _scrollingElement;
+    private _target?;
+    private _driver?;
+    private _parent?;
+    private _element?;
+    private _reference?;
+    private _scrollingElement?;
     private _state;
     private _logger;
     private _isReference;
     protected readonly _spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
-    constructor(options: {
-        spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
-        context?: TContext | Context<TDriver, TContext, TElement, TSelector>;
-        driver?: Driver<TDriver, TContext, TElement, TSelector>;
-        parent?: Context<TDriver, TContext, TElement, TSelector>;
-        reference?: ContextReference<TDriver, TContext, TElement, TSelector>;
-        element?: Element<TDriver, TContext, TElement, TSelector>;
-        scrollingElement?: Element<TDriver, TContext, TElement, TSelector>;
-        logger?: Logger;
-    });
+    constructor(options: ContextOptions<TDriver, TContext, TElement, TSelector>);
     get target(): TContext;
     get driver(): Driver<TDriver, TContext, TElement, TSelector>;
     get parent(): Context<TDriver, TContext, TElement, TSelector> | null;
@@ -52,9 +47,9 @@ export declare class Context<TDriver, TContext, TElement, TSelector> {
     focus(): Promise<this>;
     equals(context: Context<TDriver, TContext, TElement, TSelector> | Element<TDriver, TContext, TElement, TSelector>): Promise<boolean>;
     context(reference: ContextPlain<TDriver, TContext, TElement, TSelector>): Promise<Context<TDriver, TContext, TElement, TSelector>>;
-    element(elementOrSelector: TElement | Selector<TSelector>): Promise<Element<TDriver, TContext, TElement, TSelector>>;
+    element(elementOrSelector: TElement | Selector<TSelector>): Promise<Element<TDriver, TContext, TElement, TSelector> | null>;
     elements(selectorOrElement: Selector<TSelector> | TElement): Promise<Element<TDriver, TContext, TElement, TSelector>[]>;
-    waitFor(selector: Selector<TSelector>, options?: WaitOptions): Promise<Element<TDriver, TContext, TElement, TSelector>>;
+    waitFor(selector: Selector<TSelector>, options?: WaitOptions): Promise<Element<TDriver, TContext, TElement, TSelector> | null>;
     execute(script: ((args: any) => any) | string, arg?: any): Promise<any>;
     executePoll(script: ((arg: any) => any) | string | {
         main: ((arg: any) => any) | string;
@@ -65,10 +60,10 @@ export declare class Context<TDriver, TContext, TElement, TSelector> {
         executionTimeout?: number;
         pollTimeout?: number;
     }): Promise<any>;
-    getContextElement(): Promise<Element<TDriver, TContext, TElement, TSelector>>;
-    getScrollingElement(): Promise<Element<TDriver, TContext, TElement, TSelector>>;
-    setScrollingElement(scrollingElement: Element<TDriver, TContext, TElement, TSelector> | TElement | Selector<TSelector>): Promise<void>;
-    blurElement(element?: Element<TDriver, TContext, TElement, TSelector>): Promise<TElement>;
+    getContextElement(): Promise<Element<TDriver, TContext, TElement, TSelector> | null>;
+    getScrollingElement(): Promise<Element<TDriver, TContext, TElement, TSelector> | null>;
+    setScrollingElement(scrollingElement: Element<TDriver, TContext, TElement, TSelector> | TElement | Selector<TSelector> | undefined | null): Promise<void>;
+    blurElement(element?: Element<TDriver, TContext, TElement, TSelector>): Promise<TElement | null>;
     focusElement(element: Element<TDriver, TContext, TElement, TSelector>): Promise<any>;
     getRegion(): Promise<Region>;
     getClientRegion(): Promise<Region>;
@@ -83,3 +78,4 @@ export declare class Context<TDriver, TContext, TElement, TSelector> {
     private preserveContextRegions;
     private preserveScrollingRegion;
 }
+export {};

package/types/debug/check-spec-driver.d.ts

@@ -2,4 +2,19 @@ import { type SpecDriver } from '../spec-driver';
 export declare function checkSpecDriver<TDriver, TContext, TElement, TSelector>(options: {
     spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
     driver: TDriver;
-}): Promise<any[]>;
+}): Promise<({
+    skipped: boolean;
+    test: string;
+    error?: undefined;
+} | {
+    success: boolean;
+    test: string;
+    error?: undefined;
+} | {
+    test: string;
+    error: {
+        message: any;
+        expected: any;
+        actual: any;
+    };
+})[]>;

package/types/driver.d.ts

@@ -2,15 +2,15 @@
 import type { Size, Region } from '@applitools/utils';
 import type { ScreenOrientation, Cookie } from './types';
 import { type Selector } from './selector';
-import { type SpecDriver } from './spec-driver';
+import { type SpecDriver, type WaitOptions } from './spec-driver';
 import { type Element } from './element';
 import { Context, type ContextReference } from './context';
 import { type Logger } from '@applitools/logger';
 import { HelperIOS } from './helper-ios';
 import { HelperAndroid } from './helper-android';
-declare type DriverOptions<TDriver, TContext, TElement, TSelector> = {
+type DriverOptions<TDriver, TContext, TElement, TSelector> = {
     spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
-    driver: Driver<TDriver, TContext, TElement, TSelector> | TDriver;
+    driver: TDriver;
     logger?: Logger;
     customConfig?: {
         useCeilForViewportSize?: boolean;
@@ -25,29 +25,29 @@ export declare class Driver<TDriver, TContext, TElement, TSelector> {
     private _logger;
     private _customConfig;
     private _helper?;
-    private _previousWorld;
+    private _previousWorld?;
     protected readonly _spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
     constructor(options: DriverOptions<TDriver, TContext, TElement, TSelector>);
     get target(): TDriver;
     get currentContext(): Context<TDriver, TContext, TElement, TSelector>;
     get mainContext(): Context<TDriver, TContext, TElement, TSelector>;
-    get helper(): HelperAndroid<TDriver, TContext, TElement, TSelector> | HelperIOS<TDriver, TContext, TElement, TSelector>;
+    get helper(): HelperAndroid<TDriver, TContext, TElement, TSelector> | HelperIOS<TDriver, TContext, TElement, TSelector> | null | undefined;
     get features(): {
-        shadowSelector?: boolean;
-        allCookies?: boolean;
-        canExecuteOnlyFunctionScripts?: boolean;
-    };
-    get deviceName(): string;
-    get platformName(): string;
-    get platformVersion(): string | number;
-    get browserName(): string;
-    get browserVersion(): string | number;
-    get userAgent(): string;
-    get orientation(): ScreenOrientation;
+        shadowSelector?: boolean | undefined;
+        allCookies?: boolean | undefined;
+        canExecuteOnlyFunctionScripts?: boolean | undefined;
+    } | undefined;
+    get deviceName(): string | undefined;
+    get platformName(): string | undefined;
+    get platformVersion(): string | number | undefined;
+    get browserName(): string | undefined;
+    get browserVersion(): string | number | undefined;
+    get userAgent(): string | undefined;
+    get orientation(): ScreenOrientation | undefined;
     get pixelRatio(): number;
     get viewportScale(): number;
-    get statusBarSize(): number;
-    get navigationBarSize(): number;
+    get statusBarSize(): number | undefined;
+    get navigationBarSize(): number | undefined;
     get isNative(): boolean;
     get isWebView(): boolean;
     get isWeb(): boolean;
@@ -62,7 +62,7 @@ export declare class Driver<TDriver, TContext, TElement, TSelector> {
     get isEdgeLegacy(): boolean;
     get isECClient(): boolean;
     get isEC(): boolean;
-    get sessionId(): string;
+    get sessionId(): string | undefined;
     get remoteHostname(): string | undefined;
     updateCurrentContext(context: Context<TDriver, TContext, TElement, TSelector>): void;
     init(): Promise<this>;
@@ -87,15 +87,16 @@ export declare class Driver<TDriver, TContext, TElement, TSelector> {
     switchToChildContext(...references: ContextReference<TDriver, TContext, TElement, TSelector>[]): Promise<Context<TDriver, TContext, TElement, TSelector>>;
     normalizeRegion(region: Region): Promise<Region>;
     getRegionInViewport(context: Context<TDriver, TContext, TElement, TSelector>, region: Region): Promise<Region>;
-    element(selector: Selector<TSelector>): Promise<Element<TDriver, TContext, TElement, TSelector>>;
+    element(selector: Selector<TSelector>): Promise<Element<TDriver, TContext, TElement, TSelector> | null>;
     elements(selector: Selector<TSelector>): Promise<Element<TDriver, TContext, TElement, TSelector>[]>;
+    waitFor(selector: Selector<TSelector>, options?: WaitOptions): Promise<Element<TDriver, TContext, TElement, TSelector> | null>;
     execute(script: ((arg: any) => any) | string, arg?: any): Promise<any>;
     takeScreenshot(): Promise<Buffer>;
     getViewportRegion(): Promise<Region>;
     getViewportSize(): Promise<Size>;
     setViewportSize(size: Size): Promise<void>;
     getDisplaySize(): Promise<Size>;
-    getOrientation(): Promise<'portrait' | 'landscape' | 'portrait-secondary' | 'landscape-secondary'>;
+    getOrientation(): Promise<ScreenOrientation>;
     setOrientation(orientation: 'portrait' | 'landscape'): Promise<void>;
     getCookies(): Promise<Cookie[]>;
     getTitle(): Promise<string>;
@@ -103,5 +104,13 @@ export declare class Driver<TDriver, TContext, TElement, TSelector> {
     visit(url: string): Promise<void>;
 }
 export declare function isDriver<TDriver>(driver: any, spec?: SpecDriver<TDriver, any, any, any>): driver is Driver<TDriver, any, any, any> | TDriver;
-export declare function makeDriver<TDriver, TContext, TElement, TSelector>(options: DriverOptions<TDriver, TContext, TElement, TSelector>): Promise<Driver<TDriver, TContext, TElement, TSelector>>;
+export declare function makeDriver<TDriver, TContext, TElement, TSelector>(options: {
+    driver: TDriver | Driver<TDriver, TContext, TElement, TSelector>;
+    spec?: SpecDriver<TDriver, TContext, TElement, TSelector>;
+    logger?: Logger;
+    customConfig?: {
+        useCeilForViewportSize?: boolean;
+        disableHelper?: boolean;
+    };
+}): Promise<Driver<TDriver, TContext, TElement, TSelector>>;
 export {};

package/types/element.d.ts

@@ -3,7 +3,8 @@ import { type SpecDriver } from './spec-driver';
 import { type Context } from './context';
 import { type Selector } from './selector';
 import { type Logger } from '@applitools/logger';
-export declare type ElementState<TElement> = {
+export type ElementReference<TElement, TSelector> = TElement | Selector<TSelector>;
+type ElementState<TElement> = {
     contentSize?: Size;
     scrollOffset?: Location;
     transforms?: any;
@@ -11,28 +12,33 @@ export declare type ElementState<TElement> = {
     touchPadding?: number;
     containedElements?: Map<TElement, boolean>;
 };
+type ElementOptions<TDriver, TContext, TElement, TSelector> = {
+    spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
+    context?: Context<TDriver, TContext, TElement, TSelector>;
+    logger: Logger;
+} & ({
+    element: TElement;
+    selector?: Selector<TSelector>;
+    index?: number;
+} | {
+    selector: Selector<TSelector>;
+    index?: number;
+});
 export declare class Element<TDriver, TContext, TElement, TSelector> {
-    private _target;
-    private _context;
-    private _selector;
-    private _commonSelector?;
-    private _index;
+    private _target?;
+    private _context?;
+    private _selector?;
+    private _commonSelector;
+    private _index?;
     private _state;
     private _originalOverflow;
     private _logger;
     protected readonly _spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
-    constructor(options: {
-        spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
-        element?: TElement | Element<TDriver, TContext, TElement, TSelector>;
-        context?: Context<TDriver, TContext, TElement, TSelector>;
-        selector?: Selector<TSelector>;
-        index?: number;
-        logger?: Logger;
-    });
-    get target(): TElement;
-    get selector(): Selector<TSelector>;
-    get commonSelector(): Selector<never>;
-    get index(): number;
+    constructor(options: ElementOptions<TDriver, TContext, TElement, TSelector>);
+    get target(): NonNullable<TElement>;
+    get selector(): Selector<TSelector> | undefined;
+    get commonSelector(): Selector<never> | null;
+    get index(): number | undefined;
     get context(): Context<TDriver, TContext, TElement, TSelector>;
     get driver(): import("./driver").Driver<TDriver, TContext, TElement, TSelector>;
     get isRef(): boolean;
@@ -48,7 +54,6 @@ export declare class Element<TDriver, TContext, TElement, TSelector> {
             maxAmountToScroll?: number;
         };
     }): Promise<Region>;
-    getContentSizeIOS(): Promise<Region>;
     getContentSize(options?: {
         lazyLoad?: {
             scrollLength?: number;
@@ -59,7 +64,7 @@ export declare class Element<TDriver, TContext, TElement, TSelector> {
     isPager(): Promise<boolean>;
     isScrollable(): Promise<boolean>;
     isRoot(): Promise<boolean>;
-    getShadowRoot(): Promise<TElement>;
+    getShadowRoot(): Promise<TElement | null>;
     getTouchPadding(): Promise<number>;
     getText(): Promise<string>;
     getAttribute(name: string): Promise<string>;
@@ -81,3 +86,5 @@ export declare class Element<TDriver, TContext, TElement, TSelector> {
     withRefresh<TResult>(operation: (...args: any[]) => TResult): Promise<TResult>;
     toJSON(): TElement;
 }
+export declare function isElementReference<TElement, TSelector>(reference: any, spec?: SpecDriver<unknown, unknown, TElement, TSelector>): reference is ElementReference<TElement, TSelector>;
+export {};

package/types/fake/mock-driver.d.ts

@@ -3,12 +3,14 @@ export declare class MockDriver {
     mockScript(scriptMatcher: any, resultGenerator: any): void;
     mockElement(selector: any, state: any): any;
     mockElements(nodes: any, { parentId, parentContextId, parentRootId }?: {
-        parentId?: any;
-        parentContextId?: any;
-        parentRootId?: any;
+        parentId?: null | undefined;
+        parentContextId?: null | undefined;
+        parentRootId?: null | undefined;
     }): void;
     mockSelector(selector: any, element: any): void;
-    wrapMethod(name: any, wrapper: any): void;
+    wrapMethod<TName extends {
+        [K in keyof MockDriver]: MockDriver[K] extends (...args: any[]) => any ? K : never;
+    }[keyof MockDriver]>(name: TName, wrapper: (method: this[TName], thisArg: this, args: Parameters<this[TName]>) => ReturnType<this[TName]>): void;
     unwrapMethod(name: any): void;
     get info(): {
         isMobile: boolean;
@@ -19,7 +21,7 @@ export declare class MockDriver {
         browserName: any;
         browserVersion: any;
     };
-    executeScript(script: any, args?: any[]): Promise<any>;
+    executeScript(script: any, args?: never[]): Promise<any>;
     findElement(selector: any, rootElement?: any): Promise<any>;
     findElements(selector: any, rootElement?: any): Promise<any>;
     switchToFrame(reference: any): Promise<this>;
@@ -29,7 +31,7 @@ export declare class MockDriver {
     getUrl(): Promise<any>;
     getTitle(): Promise<any>;
     visit(url: any): Promise<void>;
-    takeScreenshot(): Promise<void>;
+    takeScreenshot(): Promise<unknown>;
     toString(): string;
     toJSON(): string;
 }

package/types/fake/spec-driver.d.ts

@@ -1,13 +1,13 @@
 /// <reference types="node" />
 import type { Size } from '@applitools/utils';
 import { type DriverInfo } from '../spec-driver';
-export declare type Driver = any;
-export declare type Element = any;
-export declare type Selector = string | {
+export type Driver = any;
+export type Element = any;
+export type Selector = string | {
     using: string;
     value: string;
 };
-declare type CommonSelector = string | {
+type CommonSelector = string | {
     selector: string;
     type?: string;
 };
@@ -17,7 +17,7 @@ export declare function isSelector(selector: any): selector is Selector;
 export declare function transformSelector(selector: Selector | {
     selector: Selector;
 }): Selector;
-export declare function untransformSelector(selector: Selector): CommonSelector;
+export declare function untransformSelector(selector: Selector): CommonSelector | null;
 export declare function extractSelector(element: Element): any;
 export declare function isStaleElementError(): boolean;
 export declare function isEqualElements(_driver: Driver, element1: Element, element2: Element): Promise<boolean>;

package/types/helper-android.d.ts

@@ -11,7 +11,7 @@ export declare class HelperAndroid<TDriver, TContext, TElement, TSelector> {
     }): Promise<HelperAndroid<TDriver, TContext, TElement, TSelector> | null>;
     private readonly _spec;
     private readonly _input;
-    private readonly _action?;
+    private readonly _action;
     private readonly _legacy;
     private readonly _supportAsync;
     private _logger;
@@ -19,10 +19,10 @@ export declare class HelperAndroid<TDriver, TContext, TElement, TSelector> {
     constructor(options: {
         spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
         input: Element<TDriver, TContext, TElement, TSelector>;
-        action?: Element<TDriver, TContext, TElement, TSelector>;
+        action: Element<TDriver, TContext, TElement, TSelector> | null;
         legacy: boolean;
-        logger?: any;
-        supportAsync?: boolean;
+        supportAsync: boolean;
+        logger: Logger;
     });
     private _getElementId;
     private _command;
@@ -32,9 +32,9 @@ export declare class HelperAndroid<TDriver, TContext, TElement, TSelector> {
             waitingTime?: number;
             maxAmountToScroll?: number;
         };
-    }): Promise<Region>;
-    getTouchPadding(): Promise<number>;
-    getRegion(element: Element<TDriver, TContext, TElement, TSelector>): Promise<Region>;
+    }): Promise<Region | null>;
+    getTouchPadding(): Promise<number | undefined>;
+    getRegion(element: Element<TDriver, TContext, TElement, TSelector>): Promise<Region | null>;
     scrollToTop(element: Element<TDriver, TContext, TElement, TSelector>): Promise<void>;
     scrollBy(element: Element<TDriver, TContext, TElement, TSelector>, offset: Location): Promise<void>;
 }

package/types/helper-ios.d.ts

@@ -18,7 +18,7 @@ export declare class HelperIOS<TDriver, TContext, TElement, TSelector> {
         driver: Driver<TDriver, TContext, TElement, TSelector>;
         element: Element<TDriver, TContext, TElement, TSelector>;
         spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
-        logger?: Logger;
+        logger: Logger;
     });
-    getContentRegion(element: Element<TDriver, TContext, TElement, TSelector>): Promise<Region>;
+    getContentRegion(element: Element<TDriver, TContext, TElement, TSelector>): Promise<Region | null>;
 }

package/types/selector.d.ts

@@ -1,4 +1,4 @@
-export declare type Selector<TSelector = never> = TSelector | string | {
+export type Selector<TSelector = never> = TSelector | string | {
     selector: TSelector | string;
     type?: string;
     child?: Selector<TSelector>;
@@ -6,4 +6,4 @@ export declare type Selector<TSelector = never> = TSelector | string | {
     frame?: Selector<TSelector>;
     fallback?: Selector<TSelector>;
 };
-export declare type CommonSelector = Selector;
+export type CommonSelector = Selector;