@applitools/core 1.2.17 → 1.3.1

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;
 };

package/types/classic/utils/take-dom-capture.d.ts

@@ -1,7 +1,7 @@
 import { type Driver } from '@applitools/driver';
 import { type Logger } from '@applitools/logger';
 import { type Fetch } from '@applitools/req';
-export declare type DomCaptureSettings = {
+export type DomCaptureSettings = {
     fetch?: Fetch;
     executionTimeout?: number;
     pollTimeout?: number;

package/types/close-batch.d.ts

@@ -2,7 +2,7 @@ import type { MaybeArray } from '@applitools/utils';
 import type { CloseBatchSettings } from './types';
 import type { Core as BaseCore } from '@applitools/core-base';
 import { type Logger } from '@applitools/logger';
-declare type Options = {
+type Options = {
     core: BaseCore;
     logger: Logger;
 };

package/types/close-manager.d.ts

@@ -1,7 +1,7 @@
 import type { Eyes, TestResult, TestResultSummary } from './types';
 import type { Core as BaseCore } from '@applitools/core-base';
 import { type Logger } from '@applitools/logger';
-declare type Options<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg'> = {
+type Options<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg'> = {
     core: BaseCore<unknown>;
     storage: {
         eyes: Eyes<TDriver, TContext, TElement, TSelector, TType>;

package/types/close.d.ts

@@ -1,12 +1,10 @@
-import type { Config, CloseSettings, TestResult } from './types';
-import type { Eyes as ClassicEyes } from './classic/types';
-import type { Eyes as UFGEyes } from './ufg/types';
+import type { Eyes, Config, CloseSettings, TestResult } from './types';
 import { type Logger } from '@applitools/logger';
-declare type Options<TDriver, TContext, TElement, TSelector> = {
-    eyes: ClassicEyes<TDriver, TContext, TElement, TSelector> | UFGEyes<TDriver, TContext, TElement, TSelector>;
+type Options<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg'> = {
+    eyes: Eyes<TDriver, TContext, TElement, TSelector, TType>;
     logger: Logger;
 };
-export declare function makeClose<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg'>({ eyes, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): ({ settings, config, logger, }?: {
+export declare function makeClose<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg'>({ eyes, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector, TType>): ({ settings, config, logger, }?: {
     settings?: CloseSettings<TType>;
     config?: Config<TElement, TSelector, TType>;
     logger?: Logger;

package/types/core.d.ts

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

package/types/delete-test.d.ts

@@ -2,7 +2,7 @@ import type { MaybeArray } from '@applitools/utils';
 import type { DeleteTestSettings } from './types';
 import type { Core as BaseCore } from '@applitools/core-base';
 import { type Logger } from '@applitools/logger';
-declare type Options = {
+type Options = {
     core: BaseCore;
     logger: Logger;
 };

package/types/extract-text.d.ts

@@ -1,16 +1,14 @@
 import type { MaybeArray } from '@applitools/utils';
-import type { Target, Config, ExtractTextSettings } from './types';
-import type { Eyes as ClassicEyes } from './classic/types';
-import type { Eyes as UFGEyes } from './ufg/types';
+import type { Target, Eyes, Config, ExtractTextSettings } from './types';
 import { type Logger } from '@applitools/logger';
-declare type Options<TDriver, TContext, TElement, TSelector> = {
-    eyes: ClassicEyes<TDriver, TContext, TElement, TSelector> | UFGEyes<TDriver, TContext, TElement, TSelector>;
+type Options<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg'> = {
+    eyes: Eyes<TDriver, TContext, TElement, TSelector, TType>;
     logger: Logger;
 };
-export declare function makeExtractText<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg'>({ eyes, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): ({ target, settings, config, logger, }: {
-    target?: Target<TDriver, TType>;
-    settings: MaybeArray<ExtractTextSettings<TElement, TSelector, TType>>;
-    config?: Config<TElement, TSelector, TType>;
+export declare function makeExtractText<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg' = 'classic'>({ eyes, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector, TType>): ({ target, settings, config, logger, }: {
+    target?: Target<TDriver, TContext, TElement, TSelector, 'classic'>;
+    settings: MaybeArray<ExtractTextSettings<TElement, TSelector, 'classic'>>;
+    config?: Config<TElement, TSelector, 'classic'>;
     logger?: Logger;
 }) => Promise<string[]>;
 export {};

package/types/get-typed-eyes.d.ts

@@ -0,0 +1,21 @@
+import type { TypedCore, TypedEyes, OpenSettings } from './types';
+import { type Renderer } from '@applitools/ufg-client';
+import { type Logger } from '@applitools/logger';
+type Options<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg'> = {
+    type: TType;
+    settings: OpenSettings<TType>;
+    target?: TDriver;
+    cores: {
+        [TKey in 'classic' | 'ufg']: TypedCore<TDriver, TContext, TElement, TSelector, TKey>;
+    };
+    logger?: Logger;
+};
+export declare function makeGetTypedEyes<TDriver, TContext, TElement, TSelector, TDefaultType extends 'classic' | 'ufg'>({ type: defaultType, settings: defaultSettings, target, cores, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector, TDefaultType>): <TType extends "classic" | "ufg" = TDefaultType>({ type, settings, logger, }?: {
+    type?: TType;
+    settings?: {
+        type: 'web' | 'native';
+        renderers: Renderer[];
+    };
+    logger?: Logger;
+}) => Promise<TypedEyes<TDriver, TContext, TElement, TSelector, TType, import("./types").Target<TDriver, TContext, TElement, TSelector, TType>>>;
+export {};

package/types/index.d.ts

@@ -1,5 +1,6 @@
 export * from './types';
 export { type Selector } from '@applitools/driver';
 export * from './core';
+export { takeDomSnapshots } from './ufg/utils/take-dom-snapshots';
 export * as formatters from './utils/format-results';
 export * from '@applitools/driver/dist/debug';

package/types/locate-text.d.ts

@@ -1,15 +1,13 @@
-import type { Target, Config, LocateTextSettings, LocateTextResult } from './types';
-import type { Eyes as ClassicEyes } from './classic/types';
-import type { Eyes as UFGEyes } from './ufg/types';
+import type { Target, Eyes, Config, LocateTextSettings, LocateTextResult } from './types';
 import { type Logger } from '@applitools/logger';
-declare type Options<TDriver, TContext, TElement, TSelector> = {
-    eyes: ClassicEyes<TDriver, TContext, TElement, TSelector> | UFGEyes<TDriver, TContext, TElement, TSelector>;
+type Options<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg'> = {
+    eyes: Eyes<TDriver, TContext, TElement, TSelector, TType>;
     logger: Logger;
 };
-export declare function makeLocateText<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg' = 'classic' | 'ufg'>({ eyes, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): <TPattern extends string>({ target, settings, config, logger, }: {
-    target?: Target<TDriver, TType>;
-    settings: LocateTextSettings<TPattern, TElement, TSelector, TType>;
-    config?: Config<TElement, TSelector, TType>;
+export declare function makeLocateText<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg' = 'classic'>({ eyes, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector, TType>): <TPattern extends string>({ target, settings, config, logger, }: {
+    target?: Target<TDriver, TContext, TElement, TSelector, 'classic'>;
+    settings: import("./automation/types").LocateTextSettings<TPattern, TElement, TSelector>;
+    config?: Config<TElement, TSelector, 'classic'>;
     logger?: Logger;
 }) => Promise<LocateTextResult<TPattern>>;
 export {};

package/types/locate.d.ts

@@ -1,16 +1,15 @@
 import type { Region } from '@applitools/utils';
-import type { Config, LocateSettings } from './types';
+import type { DriverTarget, ImageTarget, Config, LocateSettings } from './types';
 import type { Core as BaseCore } from '@applitools/core-base';
-import type { Screenshot } from './classic/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>;
     core: BaseCore;
     logger: Logger;
 };
 export declare function makeLocate<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg'>({ spec, core, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): <TLocator extends string>({ target, settings, config, logger, }: {
-    target?: TDriver | Screenshot;
+    target?: DriverTarget<TDriver, TContext, TElement, TSelector> | ImageTarget;
     settings: LocateSettings<TLocator, TElement, TSelector>;
     config?: Config<TElement, TSelector, TType>;
     logger?: Logger;

package/types/make-manager.d.ts

@@ -2,7 +2,7 @@ import type { EyesManager } 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> = {
     spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
     core?: BaseCore;
     concurrency?: number;
@@ -13,6 +13,7 @@ declare type Options<TDriver, TContext, TElement, TSelector> = {
 export declare function makeMakeManager<TDriver, TContext, TElement, TSelector>({ spec, core, concurrency: defaultConcurrency, agentId: defaultAgentId, cwd, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): <TType extends "classic" | "ufg" = "classic">({ type, concurrency, legacyConcurrency, agentId, logger, }?: {
     type?: TType;
     concurrency?: number;
+    /** @deprecated */
     legacyConcurrency?: number;
     agentId?: string;
     logger?: Logger;