@applitools/core 1.2.17 → 1.3.0

package/dist/ufg/open-eyes.js

@@ -34,12 +34,10 @@ const abort_1 = require("./abort");
 const abort_controller_1 = require("abort-controller");
 const utils = __importStar(require("@applitools/utils"));
 function makeOpenEyes({ core, client, spec, logger: defaultLogger, }) {
-    return async function openEyes({ settings, eyes, driver, target, logger = defaultLogger, }) {
+    return async function openEyes({ target, settings, eyes, logger = defaultLogger, }) {
         var _a, _b;
-        logger.log(`Command "openEyes" is called with ${(spec === null || spec === void 0 ? void 0 : spec.isDriver(target)) ? 'default driver and' : ''}`, ...(settings ? ['settings', settings] : []), eyes ? 'predefined eyes' : '');
-        driver !== null && driver !== void 0 ? driver : (driver = (spec === null || spec === void 0 ? void 0 : spec.isDriver(target))
-            ? await (0, driver_1.makeDriver)({ spec, driver: target, logger, customConfig: { disableHelper: true } })
-            : null);
+        logger.log(`Command "openEyes" is called with ${target ? 'default driver and' : ''}`, ...(settings ? ['settings', settings] : []), eyes ? 'predefined eyes' : '');
+        const driver = target && (await (0, driver_1.makeDriver)({ spec, driver: target, logger, customConfig: { disableHelper: true } }));
         if (driver && !eyes) {
             const currentContext = driver.currentContext;
             if ((_a = settings.environment) === null || _a === void 0 ? void 0 : _a.viewportSize) {
@@ -81,15 +79,12 @@ function makeOpenEyes({ core, client, spec, logger: defaultLogger, }) {
                 },
                 getBaseEyes,
                 // check with indexing and storage
-                check: utils.general.wrap((0, check_1.makeCheck)({ eyes, client, driver, spec, signal: controller.signal, logger }), async (check, options = {}) => {
-                    var _a;
-                    (_a = options.settings) !== null && _a !== void 0 ? _a : (options.settings = {});
-                    options.settings.stepIndex = stepIndex++;
-                    const results = await check(options);
+                check: utils.general.wrap((0, check_1.makeCheck)({ eyes, client, target: driver, spec, signal: controller.signal, logger }), async (check, options = {}) => {
+                    const results = await check({ ...options, settings: { ...options.settings, stepIndex: stepIndex++ } });
                     storage.push(...results.map(result => ({ promise: result.promise, renderer: result.renderer })));
                     return results;
                 }),
-                checkAndClose: (0, check_and_close_1.makeCheckAndClose)({ eyes, client, driver, spec, signal: controller.signal, logger }),
+                checkAndClose: (0, check_and_close_1.makeCheckAndClose)({ eyes, client, target: driver, spec, signal: controller.signal, logger }),
                 // close only once
                 close: utils.general.wrap((0, close_1.makeClose)({ storage, logger }), async (close, options) => {
                     if (closed || aborted)

package/dist/utils/wait-for-lazy-load.js

@@ -2,16 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.waitForLazyLoad = void 0;
 const snippets_1 = require("@applitools/snippets");
-async function waitForLazyLoad({ driver, settings, logger, }) {
+async function waitForLazyLoad({ context, settings, logger, }) {
     var _a, _b, _c, _d, _e;
     logger.log('lazy loading the page before capturing a screenshot');
-    const arg = {
-        scrollLength: (_a = settings.scrollLength) !== null && _a !== void 0 ? _a : 300,
-        waitingTime: (_b = settings.waitingTime) !== null && _b !== void 0 ? _b : 2000,
-        maxAmountToScroll: (_c = settings.maxAmountToScroll) !== null && _c !== void 0 ? _c : 15000,
-    };
-    await driver.currentContext.executePoll(snippets_1.lazyLoad, {
-        main: [arg],
+    await context.executePoll(snippets_1.lazyLoad, {
+        main: [
+            await context.getScrollingElement(),
+            {
+                scrollLength: (_a = settings.scrollLength) !== null && _a !== void 0 ? _a : 300,
+                waitingTime: (_b = settings.waitingTime) !== null && _b !== void 0 ? _b : 2000,
+                maxAmountToScroll: (_c = settings.maxAmountToScroll) !== null && _c !== void 0 ? _c : 15000,
+            },
+        ],
         poll: [],
         executionTimeout: 5 * 60 * 1000,
         pollTimeout: (_e = (_d = settings.pollTimeout) !== null && _d !== void 0 ? _d : settings.waitingTime) !== null && _e !== void 0 ? _e : 2000,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/core",
-  "version": "1.2.17",
+  "version": "1.3.0",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -61,28 +61,30 @@
     }
   },
   "dependencies": {
-    "@applitools/core-base": "1.1.16",
+    "@applitools/core-base": "1.1.17",
     "@applitools/dom-capture": "11.2.0",
-    "@applitools/dom-snapshot": "4.7.1",
-    "@applitools/driver": "1.11.12",
-    "@applitools/logger": "1.1.31",
-    "@applitools/nml-client": "1.3.13",
-    "@applitools/req": "1.1.18",
-    "@applitools/screenshoter": "3.7.12",
-    "@applitools/snippets": "2.4.9",
-    "@applitools/ufg-client": "1.1.7",
-    "@applitools/utils": "1.3.17",
+    "@applitools/dom-snapshot": "4.7.2",
+    "@applitools/driver": "1.11.14",
+    "@applitools/logger": "1.1.32",
+    "@applitools/nml-client": "1.3.14",
+    "@applitools/req": "1.1.19",
+    "@applitools/screenshoter": "3.7.13",
+    "@applitools/snippets": "2.4.10",
+    "@applitools/ufg-client": "1.1.8",
+    "@applitools/utils": "1.3.18",
     "abort-controller": "3.0.0",
+    "chalk": "4.1.2",
+    "node-fetch": "2.6.7",
     "throat": "6.0.1"
   },
   "devDependencies": {
     "@applitools/bongo": "^2.2.0",
     "@applitools/sdk-fake-eyes-server": "^2.1.3",
-    "@applitools/spec-driver-puppeteer": "^1.1.25",
-    "@applitools/spec-driver-selenium": "^1.5.11",
+    "@applitools/spec-driver-puppeteer": "^1.1.26",
+    "@applitools/spec-driver-selenium": "^1.5.12",
     "@applitools/spec-driver-webdriverio": "^1.4.9",
-    "@applitools/test-server": "^1.1.12",
-    "@applitools/test-utils": "^1.5.2",
+    "@applitools/test-server": "^1.1.13",
+    "@applitools/test-utils": "^1.5.3",
     "@types/mocha": "^9.1.1",
     "@types/node": "12",
     "@types/selenium-webdriver": "^4.1.2",
@@ -102,7 +104,7 @@
     "puppeteer": "^16.2.0",
     "selenium-webdriver": "4.4",
     "ts-node": "^10.7.0",
-    "typescript": "^4.8.3",
+    "typescript": "^4.9.4",
     "webdriverio": "^7.25.0"
   },
   "engines": {

package/types/automation/get-viewport-size.d.ts

@@ -1,9 +1,12 @@
-import type { Core } from './types';
+import type { DriverTarget } from './types';
 import { type Logger } from '@applitools/logger';
 import { type SpecDriver } from '@applitools/driver';
-declare type Options<TDriver, TContext, TElement, TSelector> = {
+type Options<TDriver, TContext, TElement, TSelector> = {
     spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
     logger?: Logger;
 };
-export declare function makeGetViewportSize<TDriver, TContext, TElement, TSelector>({ spec, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): Core<TDriver, TContext, TElement, TSelector>['getViewportSize'];
+export declare function makeGetViewportSize<TDriver, TContext, TElement, TSelector>({ spec, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): ({ target, logger, }: {
+    target: DriverTarget<TDriver, TContext, TElement, TSelector>;
+    logger?: Logger;
+}) => Promise<import("@applitools/utils").Size>;
 export {};

package/types/automation/locate.d.ts

@@ -1,12 +1,15 @@
-import type { Core, Target } from './types';
+import type { DriverTarget, ImageTarget, LocateSettings, LocateResult } from './types';
 import type { Core as BaseCore } from '@applitools/core-base';
 import { type Logger } from '@applitools/logger';
 import { type SpecDriver } from '@applitools/driver';
-declare type Options<TDriver, TContext, TElement, TSelector> = {
+type Options<TDriver, TContext, TElement, TSelector> = {
     core: BaseCore;
     spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
-    target?: Target<TDriver>;
     logger?: Logger;
 };
-export declare function makeLocate<TDriver, TContext, TElement, TSelector>({ spec, core, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): Core<TDriver, TContext, TElement, TSelector>['locate'];
+export declare function makeLocate<TDriver, TContext, TElement, TSelector>({ spec, core, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): <TLocator extends string>({ settings, target, logger, }: {
+    target: DriverTarget<TDriver, TContext, TElement, TSelector> | ImageTarget;
+    settings: LocateSettings<TLocator, TElement, TSelector>;
+    logger?: Logger;
+}) => Promise<LocateResult<TLocator>>;
 export {};

package/types/automation/set-viewport-size.d.ts

@@ -1,9 +1,14 @@
-import type { Core } from './types';
+import type { Size } from '@applitools/utils';
+import type { DriverTarget } from './types';
 import { type Logger } from '@applitools/logger';
 import { type SpecDriver } from '@applitools/driver';
-declare type Options<TDriver, TContext, TElement, TSelector> = {
+type Options<TDriver, TContext, TElement, TSelector> = {
     spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
     logger?: Logger;
 };
-export declare function makeSetViewportSize<TDriver, TContext, TElement, TSelector>({ spec, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): Core<TDriver, TContext, TElement, TSelector>['setViewportSize'];
+export declare function makeSetViewportSize<TDriver, TContext, TElement, TSelector>({ spec, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): ({ target, size, logger, }: {
+    target: DriverTarget<TDriver, TContext, TElement, TSelector>;
+    size: Size;
+    logger?: Logger;
+}) => Promise<void>;
 export {};

package/types/automation/types.d.ts

@@ -3,116 +3,65 @@ import type * as BaseCore from '@applitools/core-base/types';
 import { type Driver, type Selector } from '@applitools/driver';
 import { type Logger } from '@applitools/logger';
 export * from '@applitools/core-base/types';
-export declare type Screenshot = BaseCore.Target;
-export declare type Target<TDriver> = TDriver;
+export type DriverTarget<TDriver, TContext, TElement, TSelector> = TDriver | Driver<TDriver, TContext, TElement, TSelector>;
 export interface Core<TDriver, TContext, TElement, TSelector, TEyes = Eyes<TDriver, TContext, TElement, TSelector>> extends BaseCore.Core<TEyes> {
     isDriver(driver: any): driver is TDriver;
     isElement(element: any): element is TElement;
     isSelector(selector: any): selector is TSelector;
     getViewportSize(options: {
-        driver: Driver<TDriver, TContext, TElement, TSelector>;
-        logger?: Logger;
-    }): Promise<Size>;
-    getViewportSize(options: {
-        target: TDriver;
+        target: DriverTarget<TDriver, TContext, TElement, TSelector>;
         logger?: Logger;
     }): Promise<Size>;
     setViewportSize(options: {
-        driver: Driver<TDriver, TContext, TElement, TSelector>;
-        size: Size;
-        logger?: Logger;
-    }): Promise<void>;
-    setViewportSize(options: {
-        target: TDriver;
+        target: DriverTarget<TDriver, TContext, TElement, TSelector>;
         size: Size;
         logger?: Logger;
     }): Promise<void>;
     openEyes(options: {
-        driver?: Driver<TDriver, TContext, TElement, TSelector>;
+        target?: DriverTarget<TDriver, TContext, TElement, TSelector>;
         settings: BaseCore.OpenSettings;
+        eyes?: BaseCore.Eyes[];
         logger?: Logger;
     }): Promise<TEyes>;
-    openEyes(options: {
-        target?: TDriver;
-        settings?: BaseCore.OpenSettings;
-        logger?: Logger;
-    }): Promise<TEyes>;
-    /** @internal */
-    openEyes(options: {
-        driver?: Driver<TDriver, TContext, TElement, TSelector>;
-        eyes: BaseCore.Eyes[];
-        logger?: Logger;
-    }): Promise<TEyes>;
-    /** @internal */
-    openEyes(options: {
-        target?: TDriver;
-        eyes: BaseCore.Eyes[];
-        logger?: Logger;
-    }): Promise<TEyes>;
-    locate<TLocator extends string>(options: {
-        driver: Driver<TDriver, TContext, TElement, TSelector>;
-        settings: LocateSettings<TLocator, TElement, TSelector>;
-        logger?: Logger;
-    }): Promise<BaseCore.LocateResult<TLocator>>;
     locate<TLocator extends string>(options: {
-        target: Target<TDriver> | Screenshot;
+        target: DriverTarget<TDriver, TContext, TElement, TSelector> | BaseCore.ImageTarget;
         settings: LocateSettings<TLocator, TElement, TSelector>;
         logger?: Logger;
     }): Promise<BaseCore.LocateResult<TLocator>>;
 }
-export interface Eyes<TDriver, TContext, TElement, TSelector, TTarget = Target<TDriver>> extends BaseCore.Eyes<TTarget> {
+export interface Eyes<TDriver, TContext, TElement, TSelector, TTarget = DriverTarget<TDriver, TContext, TElement, TSelector>> extends BaseCore.Eyes<TTarget> {
     getBaseEyes(options?: {
         logger?: Logger;
     }): Promise<BaseCore.Eyes[]>;
-    check(options: {
-        driver?: Driver<TDriver, TContext, TElement, TSelector>;
-        settings?: CheckSettings<TElement, TSelector>;
-        logger?: Logger;
-    }): Promise<BaseCore.CheckResult[]>;
-    check(options: {
+    check(options?: {
         target?: TTarget;
         settings?: CheckSettings<TElement, TSelector>;
         logger?: Logger;
     }): Promise<BaseCore.CheckResult[]>;
-    checkAndClose(options: {
-        driver?: Driver<TDriver, TContext, TElement, TSelector>;
-        settings?: CheckSettings<TElement, TSelector> & BaseCore.CloseSettings;
-        logger?: Logger;
-    }): Promise<BaseCore.TestResult[]>;
-    checkAndClose(options: {
+    checkAndClose(options?: {
         target?: TTarget;
         settings?: CheckSettings<TElement, TSelector> & BaseCore.CloseSettings;
         logger?: Logger;
     }): Promise<BaseCore.TestResult[]>;
-    locateText?<TPattern extends string>(options: {
-        driver?: Driver<TDriver, TContext, TElement, TSelector>;
-        settings: LocateTextSettings<TPattern, TElement, TSelector>;
-        logger?: Logger;
-    }): Promise<BaseCore.LocateTextResult<TPattern>>;
     locateText?<TPattern extends string>(options: {
         target?: TTarget;
         settings: LocateTextSettings<TPattern, TElement, TSelector>;
         logger?: Logger;
     }): Promise<BaseCore.LocateTextResult<TPattern>>;
-    extractText?(options: {
-        driver?: Driver<TDriver, TContext, TElement, TSelector>;
-        settings: MaybeArray<ExtractTextSettings<TElement, TSelector>>;
-        logger?: Logger;
-    }): Promise<string[]>;
     extractText?(options: {
         target?: TTarget;
         settings: MaybeArray<ExtractTextSettings<TElement, TSelector>>;
         logger?: Logger;
     }): Promise<string[]>;
 }
-declare type RegionReference<TElement, TSelector> = Region | ElementReference<TElement, TSelector>;
-declare type ElementReference<TElement, TSelector> = TElement | Selector<TSelector>;
-declare type FrameReference<TElement, TSelector> = ElementReference<TElement, TSelector> | string | number;
-declare type ContextReference<TElement, TSelector> = {
+type RegionReference<TElement, TSelector> = Region | ElementReference<TElement, TSelector>;
+type ElementReference<TElement, TSelector> = TElement | Selector<TSelector>;
+type FrameReference<TElement, TSelector> = ElementReference<TElement, TSelector> | string | number;
+type ContextReference<TElement, TSelector> = {
     frame: FrameReference<TElement, TSelector>;
     scrollRootElement?: ElementReference<TElement, TSelector>;
 };
-declare type StitchMode = 'Scroll' | 'CSS';
+type StitchMode = 'Scroll' | 'CSS';
 export interface ScreenshotSettings<TElement, TSelector> extends BaseCore.ImageSettings<RegionReference<TElement, TSelector>> {
     frames?: (ContextReference<TElement, TSelector> | FrameReference<TElement, TSelector>)[];
     fully?: boolean;
@@ -133,7 +82,7 @@ export interface ScreenshotSettings<TElement, TSelector> extends BaseCore.ImageS
     };
     webview?: boolean | string;
 }
-export declare type LocateSettings<TLocator extends string, TElement, TSelector> = BaseCore.LocateSettings<TLocator, RegionReference<TElement, TSelector>> & ScreenshotSettings<TElement, TSelector>;
-export declare type CheckSettings<TElement, TSelector> = BaseCore.CheckSettings<RegionReference<TElement, TSelector>> & ScreenshotSettings<TElement, TSelector>;
-export declare type LocateTextSettings<TPattern extends string, TElement, TSelector> = BaseCore.LocateTextSettings<TPattern, RegionReference<TElement, TSelector>> & ScreenshotSettings<TElement, TSelector>;
-export declare type ExtractTextSettings<TElement, TSelector> = BaseCore.ExtractTextSettings<RegionReference<TElement, TSelector>> & ScreenshotSettings<TElement, TSelector>;
+export type LocateSettings<TLocator extends string, TElement, TSelector> = BaseCore.LocateSettings<TLocator, RegionReference<TElement, TSelector>> & ScreenshotSettings<TElement, TSelector>;
+export type CheckSettings<TElement, TSelector> = BaseCore.CheckSettings<RegionReference<TElement, TSelector>> & ScreenshotSettings<TElement, TSelector>;
+export type LocateTextSettings<TPattern extends string, TElement, TSelector> = BaseCore.LocateTextSettings<TPattern, RegionReference<TElement, TSelector>> & ScreenshotSettings<TElement, TSelector>;
+export type ExtractTextSettings<TElement, TSelector> = BaseCore.ExtractTextSettings<RegionReference<TElement, TSelector>> & ScreenshotSettings<TElement, TSelector>;

package/types/automation/utils/take-screenshot.d.ts

@@ -2,7 +2,7 @@ import type { Region } from '@applitools/utils';
 import type { ScreenshotSettings } from '../../classic/types';
 import { type Logger } from '@applitools/logger';
 import { type Driver, type Element } from '@applitools/driver';
-export declare type Screenshot = {
+export type Screenshot = {
     image: any;
     region: Region;
     element: Element<unknown, unknown, unknown, unknown>;

package/types/check-and-close.d.ts

@@ -1,20 +1,20 @@
-import type { Target, Config, CheckSettings, CloseSettings, TestResult } from './types';
-import type { Eyes as ClassicEyes } from './classic/types';
-import type { Eyes as UFGEyes } from './ufg/types';
+import type { Target, Eyes, Config, CheckSettings, CloseSettings, TestResult } from './types';
 import { type Logger } from '@applitools/logger';
-declare type Options<TDriver, TContext, TElement, TSelector> = {
-    type?: 'classic' | 'ufg';
-    getTypedEyes<TType extends 'classic' | 'ufg'>(options: {
-        type: TType;
-        renderers: any[];
-    }): Promise<TType extends 'ufg' ? UFGEyes<TDriver, TContext, TElement, TSelector> : ClassicEyes<TDriver, TContext, TElement, TSelector>>;
+import { type SpecDriver } from '@applitools/driver';
+type Options<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg'> = {
+    type?: TType;
+    eyes: Eyes<TDriver, TContext, TElement, TSelector, TType>;
+    target?: Target<TDriver, TContext, TElement, TSelector, TType>;
+    spec?: SpecDriver<TDriver, TContext, TElement, TSelector>;
     logger: Logger;
 };
-export declare function makeCheckAndClose<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg' = 'classic' | 'ufg'>({ type: defaultType, getTypedEyes, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): ({ type, target, settings, config, logger, }?: {
+export declare function makeCheckAndClose<TDriver, TContext, TElement, TSelector, TDefaultType extends 'classic' | 'ufg' = 'classic'>({ type: defaultType, eyes, target: defaultTarget, spec, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector, TDefaultType>): <TType extends "classic" | "ufg" = TDefaultType>({ type, target, settings, config, logger, }?: {
     type?: TType;
-    target?: Target<TDriver, TType>;
-    settings?: CheckSettings<TElement, TSelector, TType> & CloseSettings<TType>;
-    config?: Config<TElement, TSelector, TType>;
+    target?: Target<TDriver, TContext, TElement, TSelector, TType>;
+    settings?: CheckSettings<TElement, TSelector, TDefaultType> & (TDefaultType extends "ufg" ? import("@applitools/core-base").CloseSettings : import("@applitools/core-base").CloseSettings) & {
+        throwErr?: boolean;
+    } & CheckSettings<TElement, TSelector, TType> & (TType extends "ufg" ? import("@applitools/core-base").CloseSettings : import("@applitools/core-base").CloseSettings);
+    config?: Config<TElement, TSelector, TDefaultType> & Config<TElement, TSelector, TType>;
     logger?: Logger;
 }) => Promise<TestResult<TType>[]>;
 export {};

package/types/check.d.ts

@@ -1,18 +1,16 @@
-import type { Target, Config, CheckSettings, CheckResult } from './types';
-import type { Eyes as ClassicEyes } from './classic/types';
-import type { Eyes as UFGEyes } from './ufg/types';
+import type { Target, Eyes, Config, CheckSettings, CheckResult } from './types';
 import { type Logger } from '@applitools/logger';
-declare type Options<TDriver, TContext, TElement, TSelector> = {
-    type?: 'classic' | 'ufg';
-    getTypedEyes<TType extends 'classic' | 'ufg'>(options: {
-        type: TType;
-        renderers: any[];
-    }): Promise<TType extends 'ufg' ? UFGEyes<TDriver, TContext, TElement, TSelector> : ClassicEyes<TDriver, TContext, TElement, TSelector>>;
+import { type SpecDriver } from '@applitools/driver';
+type Options<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg'> = {
+    type?: TType;
+    eyes: Eyes<TDriver, TContext, TElement, TSelector, TType>;
+    target?: Target<TDriver, TContext, TElement, TSelector, TType>;
+    spec?: SpecDriver<TDriver, TContext, TElement, TSelector>;
     logger?: Logger;
 };
-export declare function makeCheck<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg'>({ type: defaultType, getTypedEyes, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): ({ type, target, settings, config, logger, }?: {
+export declare function makeCheck<TDriver, TContext, TElement, TSelector, TDefaultType extends 'classic' | 'ufg' = 'classic'>({ type: defaultType, eyes, target: defaultTarget, spec, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector, TDefaultType>): <TType extends "classic" | "ufg" = TDefaultType>({ type, target, settings, config, logger, }?: {
     type?: TType;
-    target?: Target<TDriver, TType>;
+    target?: Target<TDriver, TContext, TElement, TSelector, TType>;
     settings?: CheckSettings<TElement, TSelector, TType>;
     config?: Config<TElement, TSelector, TType>;
     logger?: Logger;

package/types/classic/check-and-close.d.ts

@@ -1,11 +1,15 @@
-import type { Eyes } from './types';
+import type { ClassicTarget, DriverTarget, Eyes, CheckSettings, CloseSettings, TestResult } from './types';
 import { type Logger } from '@applitools/logger';
-import { type Driver, type SpecDriver } from '@applitools/driver';
-declare type Options<TDriver, TContext, TElement, TSelector> = {
+import { type SpecDriver } from '@applitools/driver';
+type Options<TDriver, TContext, TElement, TSelector> = {
     eyes: Eyes<TDriver, TContext, TElement, TSelector>;
-    driver?: Driver<TDriver, TContext, TElement, TSelector>;
+    target?: DriverTarget<TDriver, TContext, TElement, TSelector>;
     spec?: SpecDriver<TDriver, TContext, TElement, TSelector>;
     logger?: Logger;
 };
-export declare function makeCheckAndClose<TDriver, TContext, TElement, TSelector>({ eyes, driver: defaultDriver, spec, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): Eyes<TDriver, TContext, TElement, TSelector>['checkAndClose'];
+export declare function makeCheckAndClose<TDriver, TContext, TElement, TSelector>({ eyes, target: defaultTarget, spec, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): ({ target, settings, logger, }?: {
+    target?: ClassicTarget<TDriver, TContext, TElement, TSelector>;
+    settings?: CheckSettings<TElement, TSelector> & CloseSettings;
+    logger?: Logger;
+}) => Promise<TestResult[]>;
 export {};

package/types/classic/check.d.ts

@@ -1,11 +1,15 @@
-import type { Eyes } from './types';
+import type { ClassicTarget, DriverTarget, Eyes, CheckSettings, CheckResult } from './types';
 import { type Logger } from '@applitools/logger';
-import { type Driver, type SpecDriver } from '@applitools/driver';
-declare type Options<TDriver, TContext, TElement, TSelector> = {
+import { type SpecDriver } from '@applitools/driver';
+type Options<TDriver, TContext, TElement, TSelector> = {
     eyes: Eyes<TDriver, TContext, TElement, TSelector>;
-    driver?: Driver<TDriver, TContext, TElement, TSelector>;
+    target?: DriverTarget<TDriver, TContext, TElement, TSelector>;
     spec?: SpecDriver<TDriver, TContext, TElement, TSelector>;
     logger?: Logger;
 };
-export declare function makeCheck<TDriver, TContext, TElement, TSelector>({ eyes, driver: defaultDriver, spec, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): Eyes<TDriver, TContext, TElement, TSelector>['check'];
+export declare function makeCheck<TDriver, TContext, TElement, TSelector>({ eyes, target: defaultTarget, spec, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): ({ target, settings, logger, }?: {
+    target?: ClassicTarget<TDriver, TContext, TElement, TSelector>;
+    settings?: CheckSettings<TElement, TSelector>;
+    logger?: Logger;
+}) => Promise<CheckResult[]>;
 export {};

package/types/classic/core.d.ts

@@ -2,7 +2,7 @@ import type { Core } from './types';
 import { type SpecDriver } from '@applitools/driver';
 import { type Logger } from '@applitools/logger';
 import { type Core as BaseCore } from '@applitools/core-base';
-declare type Options<TDriver, TContext, TElement, TSelector> = {
+type Options<TDriver, TContext, TElement, TSelector> = {
     spec?: SpecDriver<TDriver, TContext, TElement, TSelector>;
     core?: BaseCore;
     agentId?: string;

package/types/classic/extract-text.d.ts

@@ -1,11 +1,16 @@
-import type { Eyes } from './types';
+import type { MaybeArray } from '@applitools/utils';
+import type { ClassicTarget, DriverTarget, Eyes, ExtractTextSettings } from './types';
 import { type Logger } from '@applitools/logger';
-import { type Driver, type SpecDriver } from '@applitools/driver';
-declare type Options<TDriver, TContext, TElement, TSelector> = {
+import { type SpecDriver } from '@applitools/driver';
+type Options<TDriver, TContext, TElement, TSelector> = {
     eyes: Eyes<TDriver, TContext, TElement, TSelector>;
-    driver?: Driver<TDriver, TContext, TElement, TSelector>;
+    target?: DriverTarget<TDriver, TContext, TElement, TSelector>;
     spec?: SpecDriver<TDriver, TContext, TElement, TSelector>;
     logger?: Logger;
 };
-export declare function makeExtractText<TDriver, TContext, TElement, TSelector>({ eyes, driver: defaultDriver, spec, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): Eyes<TDriver, TContext, TElement, TSelector>['extractText'];
+export declare function makeExtractText<TDriver, TContext, TElement, TSelector>({ eyes, target: defaultTarget, spec, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): ({ target, settings, logger, }: {
+    target?: ClassicTarget<TDriver, TContext, TElement, TSelector>;
+    settings: MaybeArray<ExtractTextSettings<TElement, TSelector>>;
+    logger?: Logger;
+}) => Promise<string[]>;
 export {};

package/types/classic/get-base-eyes.d.ts

@@ -1,7 +1,7 @@
 import type { OpenSettings } from './types';
 import type { Core as BaseCore, Eyes as BaseEyes } from '@applitools/core-base';
 import { type Logger } from '@applitools/logger';
-declare type Options = {
+type Options = {
     settings?: OpenSettings;
     eyes?: BaseEyes[];
     core?: BaseCore;
@@ -10,8 +10,8 @@ declare type Options = {
 export declare function makeGetBaseEyes({ settings, core, eyes, logger: defaultLogger }: Options): (({ logger }?: {
     logger?: Logger;
 }) => Promise<BaseEyes[]>) & {
-    getCachedValues(): Promise<BaseEyes<import("@applitools/core-base").Target>[]>[];
-    setCachedValue(key: any, value: Promise<BaseEyes<import("@applitools/core-base").Target>[]>): void;
+    getCachedValues(): Promise<BaseEyes<import("@applitools/core-base").ImageTarget>[]>[];
+    setCachedValue(key: any, value: Promise<BaseEyes<import("@applitools/core-base").ImageTarget>[]>): void;
     clearCache(): void;
 };
 export {};

package/types/classic/locate-text.d.ts

@@ -1,11 +1,15 @@
-import type { Eyes } from './types';
+import type { ClassicTarget, DriverTarget, Eyes, LocateTextSettings, LocateTextResult } from './types';
 import { type Logger } from '@applitools/logger';
-import { type Driver, type SpecDriver } from '@applitools/driver';
-declare type Options<TDriver, TContext, TElement, TSelector> = {
+import { type SpecDriver } from '@applitools/driver';
+type Options<TDriver, TContext, TElement, TSelector> = {
     eyes: Eyes<TDriver, TContext, TElement, TSelector>;
-    driver?: Driver<TDriver, TContext, TElement, TSelector>;
+    target?: DriverTarget<TDriver, TContext, TElement, TSelector>;
     spec?: SpecDriver<TDriver, TContext, TElement, TSelector>;
     logger?: Logger;
 };
-export declare function makeLocateText<TDriver, TContext, TElement, TSelector>({ spec, driver: defaultDriver, eyes, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): Eyes<TDriver, TContext, TElement, TSelector>['locateText'];
+export declare function makeLocateText<TDriver, TContext, TElement, TSelector>({ eyes, target: defaultTarget, spec, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): <TPattern extends string>({ target, settings, logger, }: {
+    target?: ClassicTarget<TDriver, TContext, TElement, TSelector>;
+    settings: LocateTextSettings<TPattern, TElement, TSelector>;
+    logger?: Logger;
+}) => Promise<LocateTextResult<TPattern>>;
 export {};

package/types/classic/open-eyes.d.ts

@@ -1,11 +1,16 @@
-import type { Core } from './types';
-import type { Core as BaseCore } from '@applitools/core-base';
+import type { DriverTarget, Eyes, OpenSettings } from './types';
+import type { Core as BaseCore, Eyes as BaseEyes } from '@applitools/core-base';
 import { type Logger } from '@applitools/logger';
 import { type SpecDriver } from '@applitools/driver';
-declare type Options<TDriver, TContext, TElement, TSelector> = {
+type Options<TDriver, TContext, TElement, TSelector> = {
     core: BaseCore;
     spec?: SpecDriver<TDriver, TContext, TElement, TSelector>;
     logger?: Logger;
 };
-export declare function makeOpenEyes<TDriver, TContext, TElement, TSelector>({ core, spec, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): Core<TDriver, TContext, TElement, TSelector>['openEyes'];
+export declare function makeOpenEyes<TDriver, TContext, TElement, TSelector>({ core, spec, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): ({ target, settings, eyes, logger, }: {
+    target?: DriverTarget<TDriver, TContext, TElement, TSelector>;
+    settings: OpenSettings;
+    eyes?: BaseEyes[];
+    logger?: Logger;
+}) => Promise<Eyes<TDriver, TContext, TElement, TSelector>>;
 export {};

package/types/classic/types.d.ts

@@ -1,61 +1,34 @@
 import type * as BaseCore from '@applitools/core-base/types';
 import type * as AutomationCore from '../automation/types';
 import { type Logger } from '@applitools/logger';
-import { type Driver } from '@applitools/driver';
 export * from '../automation/types';
-export declare type Target<TDriver> = AutomationCore.Target<TDriver> | AutomationCore.Screenshot;
-export interface Core<TDriver, TContext, TElement, TSelector> extends AutomationCore.Core<TDriver, TContext, TElement, TSelector, Eyes<TDriver, TContext, TElement, TSelector>> {
+export type ClassicTarget<TDriver, TContext, TElement, TSelector> = AutomationCore.DriverTarget<TDriver, TContext, TElement, TSelector> | AutomationCore.ImageTarget;
+export interface Core<TDriver, TContext, TElement, TSelector, TEyes = Eyes<TDriver, TContext, TElement, TSelector>> extends AutomationCore.Core<TDriver, TContext, TElement, TSelector, TEyes> {
     readonly type: 'classic';
     openEyes(options: {
-        driver?: Driver<TDriver, TContext, TElement, TSelector>;
+        target?: AutomationCore.DriverTarget<TDriver, TContext, TElement, TSelector>;
         settings: OpenSettings;
+        eyes?: BaseCore.Eyes[];
         logger?: Logger;
-    }): Promise<Eyes<TDriver, TContext, TElement, TSelector>>;
-    openEyes(options: {
-        target?: TDriver;
-        settings: OpenSettings;
-        logger?: Logger;
-    }): Promise<Eyes<TDriver, TContext, TElement, TSelector>>;
-    /** @internal */
-    openEyes(options: {
-        driver?: Driver<TDriver, TContext, TElement, TSelector>;
-        eyes: BaseCore.Eyes[];
-        logger?: Logger;
-    }): Promise<Eyes<TDriver, TContext, TElement, TSelector>>;
-    /** @internal */
-    openEyes(options: {
-        target?: TDriver;
-        eyes: BaseCore.Eyes[];
-        logger?: Logger;
-    }): Promise<Eyes<TDriver, TContext, TElement, TSelector>>;
+    }): Promise<TEyes>;
 }
-export interface Eyes<TDriver, TContext, TElement, TSelector, TTarget = Target<TDriver>> extends AutomationCore.Eyes<TDriver, TContext, TElement, TSelector, TTarget> {
+export interface Eyes<TDriver, TContext, TElement, TSelector, TTarget = ClassicTarget<TDriver, TContext, TElement, TSelector>> extends AutomationCore.Eyes<TDriver, TContext, TElement, TSelector, TTarget> {
     readonly type: 'classic';
-    check(options?: {
-        driver?: Driver<TDriver, TContext, TElement, TSelector>;
-        settings?: CheckSettings<TElement, TSelector>;
-        logger?: Logger;
-    }): Promise<AutomationCore.CheckResult[]>;
     check(options?: {
         target?: TTarget;
         settings?: CheckSettings<TElement, TSelector>;
         logger?: Logger;
     }): Promise<AutomationCore.CheckResult[]>;
-    checkAndClose(options?: {
-        driver?: Driver<TDriver, TContext, TElement, TSelector>;
-        settings?: CheckSettings<TElement, TSelector> & AutomationCore.CloseSettings;
-        logger?: Logger;
-    }): Promise<AutomationCore.TestResult[]>;
     checkAndClose(options?: {
         target?: TTarget;
         settings?: CheckSettings<TElement, TSelector> & AutomationCore.CloseSettings;
         logger?: Logger;
     }): Promise<AutomationCore.TestResult[]>;
 }
-export declare type OpenSettings = AutomationCore.OpenSettings & {
+export type OpenSettings = AutomationCore.OpenSettings & {
     keepPlatformNameAsIs?: boolean;
     useCeilForViewportSize?: boolean;
 };
-export declare type CheckSettings<TElement, TSelector> = AutomationCore.CheckSettings<TElement, TSelector> & {
+export type CheckSettings<TElement, TSelector> = AutomationCore.CheckSettings<TElement, TSelector> & {
     retryTimeout?: number;
 };