@applitools/core 1.2.17 → 1.3.1

package/types/open-eyes.d.ts

@@ -1,19 +1,23 @@
-import type { Core } from './types';
-import type { Core as ClassicCore } from './classic/types';
-import type { Core as UFGCore } from './ufg/types';
-import type { Core as BaseCore } from '@applitools/core-base';
+import type { TypedCore, Eyes, Config, OpenSettings } from './types';
+import type { Core as BaseCore, Batch } from '@applitools/core-base';
 import { type Logger } from '@applitools/logger';
 import { type SpecDriver } from '@applitools/driver';
-declare type Options<TDriver, TContext, TElement, TSelector> = {
-    type?: 'classic' | 'ufg';
+type Options<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg'> = {
+    type?: TType;
     concurrency?: number;
     core: BaseCore;
     cores?: {
-        classic: ClassicCore<TDriver, TContext, TElement, TSelector>;
-        ufg: UFGCore<TDriver, TContext, TElement, TSelector>;
+        [TKey in 'classic' | 'ufg']: TypedCore<TDriver, TContext, TElement, TSelector, TKey>;
     };
     spec?: SpecDriver<TDriver, TContext, TElement, TSelector>;
     logger?: Logger;
+    batch?: Batch;
 };
-export declare function makeOpenEyes<TDriver, TContext, TElement, TSelector>({ type: defaultType, concurrency, core, cores, spec, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): Core<TDriver, TContext, TElement, TSelector>['openEyes'];
+export declare function makeOpenEyes<TDriver, TContext, TElement, TSelector, TDefaultType extends 'classic' | 'ufg' = 'classic'>({ type: defaultType, concurrency, core, cores, spec, logger: defaultLogger, batch, }: Options<TDriver, TContext, TElement, TSelector, TDefaultType>): <TType extends "classic" | "ufg" = TDefaultType>({ type, settings, config, target, logger, }: {
+    type?: TType;
+    settings?: Partial<OpenSettings<TDefaultType> & OpenSettings<TType>>;
+    config?: Config<TElement, TSelector, TDefaultType> & Config<TElement, TSelector, TType>;
+    target?: TDriver;
+    logger?: Logger;
+}) => Promise<Eyes<TDriver, TContext, TElement, TSelector, TType, import("./types").Target<TDriver, TContext, TElement, TSelector, TType>>>;
 export {};

package/types/types.d.ts

@@ -5,7 +5,10 @@ import type * as UFGCore from './ufg/types';
 import { type Logger } from '@applitools/logger';
 import { type Renderer } from '@applitools/ufg-client';
 export * from '@applitools/core-base/types';
-export declare type Target<TDriver, TType extends 'classic' | 'ufg'> = TType extends 'ufg' ? UFGCore.Target<TDriver> : ClassicCore.Target<TDriver>;
+export * from './automation/types';
+export type TypedCore<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg'> = TType extends 'ufg' ? UFGCore.Core<TDriver, TContext, TElement, TSelector> : ClassicCore.Core<TDriver, TContext, TElement, TSelector>;
+export type TypedEyes<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg', TTarget = Target<TDriver, TContext, TElement, TSelector, TType>> = TType extends 'ufg' ? UFGCore.Eyes<TDriver, TContext, TElement, TSelector, TTarget> : ClassicCore.Eyes<TDriver, TContext, TElement, TSelector, TTarget>;
+export type Target<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg'> = TType extends 'ufg' ? UFGCore.UFGTarget<TDriver, TContext, TElement, TSelector> : ClassicCore.ClassicTarget<TDriver, TContext, TElement, TSelector>;
 export interface Core<TDriver, TContext, TElement, TSelector> extends AutomationCore.Core<TDriver, TContext, TElement, TSelector> {
     makeManager<TType extends 'classic' | 'ufg' = 'classic'>(options?: {
         type: TType;
@@ -15,13 +18,13 @@ export interface Core<TDriver, TContext, TElement, TSelector> extends Automation
     }): Promise<EyesManager<TDriver, TContext, TElement, TSelector, TType>>;
     openEyes<TType extends 'classic' | 'ufg' = 'classic'>(options: {
         type?: TType;
-        target?: TDriver;
+        target?: AutomationCore.DriverTarget<TDriver, TContext, TElement, TSelector>;
         settings?: Partial<OpenSettings<TType>>;
         config?: Config<TElement, TSelector, TType>;
         logger?: Logger;
     }): Promise<Eyes<TDriver, TContext, TElement, TSelector, TType>>;
     locate<TLocator extends string>(options: {
-        target?: TDriver | AutomationCore.Screenshot;
+        target?: AutomationCore.DriverTarget<TDriver, TContext, TElement, TSelector> | AutomationCore.ImageTarget;
         settings?: Partial<LocateSettings<TLocator, TElement, TSelector>>;
         config?: Config<TElement, TSelector, 'classic'>;
         logger?: Logger;
@@ -41,19 +44,23 @@ export interface EyesManager<TDriver, TContext, TElement, TSelector, TType exten
         logger?: Logger;
     }) => Promise<TestResultSummary<TType>>;
 }
-export interface ClassicEyes<TDriver, TContext, TElement, TSelector, TTarget = Target<TDriver, 'classic'>> extends ClassicCore.Eyes<TDriver, TContext, TElement, TSelector, TTarget> {
+export interface ClassicEyes<TDriver, TContext, TElement, TSelector, TTarget = Target<TDriver, TContext, TElement, TSelector, 'classic'>> extends ClassicCore.Eyes<TDriver, TContext, TElement, TSelector, TTarget> {
+    getTypedEyes<TType extends 'classic' | 'ufg' = 'classic'>(options?: {
+        type?: TType;
+        logger?: Logger;
+    }): Promise<TypedEyes<TDriver, TContext, TElement, TSelector, TType>>;
     check<TType extends 'classic' | 'ufg' = 'classic'>(options?: {
         type?: TType;
         target?: TTarget;
-        settings?: Partial<CheckSettings<TElement, TSelector, TType>>;
-        config?: Config<TElement, TSelector, TType>;
+        settings?: Partial<CheckSettings<TElement, TSelector, 'classic'> & CheckSettings<TElement, TSelector, TType>>;
+        config?: Config<TElement, TSelector, 'classic'> & Config<TElement, TSelector, TType>;
         logger?: Logger;
     }): Promise<CheckResult<TType>[]>;
     checkAndClose<TType extends 'classic' | 'ufg' = 'classic'>(options?: {
         type?: TType;
         target?: TTarget;
-        settings?: Partial<CheckSettings<TElement, TSelector, TType> & CloseSettings<TType>>;
-        config?: Config<TElement, TSelector, TType>;
+        settings?: Partial<CheckSettings<TElement, TSelector, 'classic'> & CloseSettings<'classic'> & CheckSettings<TElement, TSelector, TType> & CloseSettings<TType>>;
+        config?: Config<TElement, TSelector, 'classic'> & Config<TElement, TSelector, TType>;
         logger?: Logger;
     }): Promise<TestResult<TType>[]>;
     locateText<TPattern extends string>(options: {
@@ -74,19 +81,27 @@ export interface ClassicEyes<TDriver, TContext, TElement, TSelector, TTarget = T
         logger?: Logger;
     }): Promise<TestResult<'classic'>[]>;
 }
-export interface UFGEyes<TDriver, TContext, TElement, TSelector, TTarget = Target<TDriver, 'ufg'>> extends UFGCore.Eyes<TDriver, TContext, TElement, TSelector, TTarget> {
+export interface UFGEyes<TDriver, TContext, TElement, TSelector, TTarget = Target<TDriver, TContext, TElement, TSelector, 'ufg'>> extends UFGCore.Eyes<TDriver, TContext, TElement, TSelector, TTarget> {
+    getTypedEyes<TType extends 'classic' | 'ufg' = 'classic'>(options?: {
+        type?: TType;
+        settings?: {
+            type: 'web' | 'native';
+            renderers: Renderer[];
+        };
+        logger?: Logger;
+    }): Promise<TypedEyes<TDriver, TContext, TElement, TSelector, TType>>;
     check<TType extends 'classic' | 'ufg' = 'ufg'>(options?: {
         type?: TType;
         target?: TTarget;
-        settings?: Partial<CheckSettings<TElement, TSelector, TType>>;
-        config?: Config<TElement, TSelector, TType>;
+        settings?: Partial<CheckSettings<TElement, TSelector, 'ufg'> & CheckSettings<TElement, TSelector, TType>>;
+        config?: Config<TElement, TSelector, 'ufg'> & Config<TElement, TSelector, TType>;
         logger?: Logger;
     }): Promise<CheckResult<TType>[]>;
     checkAndClose<TType extends 'classic' | 'ufg' = 'ufg'>(options?: {
         type?: TType;
         target?: TTarget;
-        settings?: Partial<CheckSettings<TElement, TSelector, TType> & CloseSettings<TType>>;
-        config?: Config<TElement, TSelector, TType>;
+        settings?: Partial<CheckSettings<TElement, TSelector, 'ufg'> & CloseSettings<'ufg'> & CheckSettings<TElement, TSelector, TType> & CloseSettings<TType>>;
+        config?: Config<TElement, TSelector, 'ufg'> & Config<TElement, TSelector, TType>;
         logger?: Logger;
     }): Promise<TestResult<TType>[]>;
     close(options?: {
@@ -95,23 +110,23 @@ export interface UFGEyes<TDriver, TContext, TElement, TSelector, TTarget = Targe
         logger?: Logger;
     }): Promise<TestResult<'ufg'>[]>;
 }
-export declare type Eyes<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg', TTarget = Target<TDriver, TType>> = TType extends 'ufg' ? UFGEyes<TDriver, TContext, TElement, TSelector, TTarget> : ClassicEyes<TDriver, TContext, TElement, TSelector, TTarget>;
-export declare type Config<TElement, TSelector, TType extends 'classic' | 'ufg'> = {
+export type Eyes<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg', TTarget = Target<TDriver, TContext, TElement, TSelector, TType>> = TType extends 'ufg' ? UFGEyes<TDriver, TContext, TElement, TSelector, TTarget> : ClassicEyes<TDriver, TContext, TElement, TSelector, TTarget>;
+export type Config<TElement, TSelector, TType extends 'classic' | 'ufg'> = {
     open: Partial<OpenSettings<TType>>;
     screenshot: Partial<ClassicCore.ScreenshotSettings<TElement, TSelector>>;
     check: Partial<Omit<CheckSettings<TElement, TSelector, TType>, keyof ClassicCore.ScreenshotSettings<TElement, TSelector>>>;
     close: Partial<CloseSettings<TType>>;
 };
-export declare type LocateSettings<TLocator extends string, TElement, TSelector> = AutomationCore.LocateSettings<TLocator, TElement, TSelector>;
-export declare type OpenSettings<TType extends 'classic' | 'ufg'> = TType extends 'ufg' ? UFGCore.OpenSettings : ClassicCore.OpenSettings;
-export declare type CheckSettings<TElement, TSelector, TType extends 'classic' | 'ufg'> = TType extends 'ufg' ? UFGCore.CheckSettings<TElement, TSelector> : ClassicCore.CheckSettings<TElement, TSelector>;
-export declare type LocateTextSettings<TPattern extends string, TElement, TSelector, TType extends 'classic' | 'ufg'> = TType extends 'ufg' ? UFGCore.LocateTextSettings<TPattern, TElement, TSelector> : ClassicCore.LocateTextSettings<TPattern, TElement, TSelector>;
-export declare type ExtractTextSettings<TElement, TSelector, TType extends 'classic' | 'ufg'> = TType extends 'ufg' ? UFGCore.ExtractTextSettings<TElement, TSelector> : ClassicCore.ExtractTextSettings<TElement, TSelector>;
-export declare type CloseSettings<TType extends 'classic' | 'ufg'> = (TType extends 'ufg' ? UFGCore.CloseSettings : ClassicCore.CloseSettings) & {
+export type LocateSettings<TLocator extends string, TElement, TSelector> = AutomationCore.LocateSettings<TLocator, TElement, TSelector>;
+export type OpenSettings<TType extends 'classic' | 'ufg'> = TType extends 'ufg' ? UFGCore.OpenSettings : ClassicCore.OpenSettings;
+export type CheckSettings<TElement, TSelector, TType extends 'classic' | 'ufg'> = TType extends 'ufg' ? UFGCore.CheckSettings<TElement, TSelector> : ClassicCore.CheckSettings<TElement, TSelector>;
+export type LocateTextSettings<TPattern extends string, TElement, TSelector, TType extends 'classic' | 'ufg'> = TType extends 'ufg' ? UFGCore.LocateTextSettings<TPattern, TElement, TSelector> : ClassicCore.LocateTextSettings<TPattern, TElement, TSelector>;
+export type ExtractTextSettings<TElement, TSelector, TType extends 'classic' | 'ufg'> = TType extends 'ufg' ? UFGCore.ExtractTextSettings<TElement, TSelector> : ClassicCore.ExtractTextSettings<TElement, TSelector>;
+export type CloseSettings<TType extends 'classic' | 'ufg'> = (TType extends 'ufg' ? UFGCore.CloseSettings : ClassicCore.CloseSettings) & {
     throwErr?: boolean;
 };
-export declare type CheckResult<TType extends 'classic' | 'ufg'> = TType extends 'ufg' ? UFGCore.CheckResult : ClassicCore.CheckResult;
-export declare type TestResult<TType extends 'classic' | 'ufg'> = TType extends 'ufg' ? UFGCore.TestResult : ClassicCore.TestResult;
+export type CheckResult<TType extends 'classic' | 'ufg'> = TType extends 'ufg' ? UFGCore.CheckResult : ClassicCore.CheckResult;
+export type TestResult<TType extends 'classic' | 'ufg'> = TType extends 'ufg' ? UFGCore.TestResult : ClassicCore.TestResult;
 export interface TestResultContainer<TType extends 'classic' | 'ufg'> {
     readonly error?: Error;
     readonly result?: TestResult<TType>;

package/types/ufg/abort.d.ts

@@ -1,9 +1,9 @@
-import type { Eyes } from './types';
+import type { TestResult } from './types';
 import type { Eyes as BaseEyes } from '@applitools/core-base';
 import { type Logger } from '@applitools/logger';
 import { type Renderer } from '@applitools/ufg-client';
 import { type AbortController } from 'abort-controller';
-declare type Options = {
+type Options = {
     storage: {
         renderer: Renderer;
         promise: Promise<{
@@ -14,5 +14,7 @@ declare type Options = {
     controller: AbortController;
     logger: Logger;
 };
-export declare function makeAbort({ storage, controller, logger: defaultLogger, }: Options): Eyes<unknown, unknown, unknown, unknown>['close'];
+export declare function makeAbort({ storage, controller, logger: defaultLogger }: Options): ({ logger, }?: {
+    logger?: Logger;
+}) => Promise<TestResult[]>;
 export {};

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

@@ -1,15 +1,21 @@
-import type { Eyes } from './types';
+import type { DriverTarget, UFGTarget, Eyes, CheckSettings, TestResult, CloseSettings } from './types';
+import { type DomSnapshot, type AndroidSnapshot, type IOSSnapshot } from '@applitools/ufg-client';
 import { type AbortSignal } from 'abort-controller';
 import { type Logger } from '@applitools/logger';
-import { type Driver, type SpecDriver } from '@applitools/driver';
 import { type UFGClient } from '@applitools/ufg-client';
-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>;
     client: UFGClient;
-    driver?: Driver<TDriver, TContext, TElement, TSelector>;
+    target?: DriverTarget<TDriver, TContext, TElement, TSelector>;
     spec?: SpecDriver<TDriver, TContext, TElement, TSelector>;
     signal?: AbortSignal;
     logger?: Logger;
 };
-export declare function makeCheckAndClose<TDriver, TContext, TElement, TSelector>(_options: Options<TDriver, TContext, TElement, TSelector>): Eyes<TDriver, TContext, TElement, TSelector>['checkAndClose'];
+export declare function makeCheckAndClose<TDriver, TContext, TElement, TSelector>({ spec, eyes, client, signal, target: defaultTarget, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): ({ target, settings, logger, snapshots, }: {
+    target?: UFGTarget<TDriver, TContext, TElement, TSelector>;
+    settings?: CheckSettings<TElement, TSelector> & CloseSettings;
+    logger?: Logger;
+    snapshots?: DomSnapshot[] | AndroidSnapshot[] | IOSSnapshot[];
+}) => Promise<TestResult[]>;
 export {};

package/types/ufg/check.d.ts

@@ -1,15 +1,19 @@
-import type { Eyes } from './types';
+import type { DriverTarget, UFGTarget, Eyes, CheckSettings, CheckResult } from './types';
 import { type AbortSignal } from 'abort-controller';
 import { type Logger } from '@applitools/logger';
 import { type UFGClient } from '@applitools/ufg-client';
-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>;
     client: UFGClient;
-    driver?: Driver<TDriver, TContext, TElement, TSelector>;
+    target?: DriverTarget<TDriver, TContext, TElement, TSelector>;
     spec?: SpecDriver<TDriver, TContext, TElement, TSelector>;
     signal?: AbortSignal;
     logger?: Logger;
 };
-export declare function makeCheck<TDriver, TContext, TElement, TSelector>({ eyes, client, driver: defaultDriver, spec, signal, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): Eyes<TDriver, TContext, TElement, TSelector>['check'];
+export declare function makeCheck<TDriver, TContext, TElement, TSelector>({ eyes, client, target: defaultTarget, spec, signal, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): ({ target, settings, logger, }: {
+    settings?: CheckSettings<TElement, TSelector>;
+    target?: UFGTarget<TDriver, TContext, TElement, TSelector>;
+    logger?: Logger;
+}) => Promise<CheckResult[]>;
 export {};

package/types/ufg/close.d.ts

@@ -1,8 +1,8 @@
-import type { Eyes } from './types';
+import type { CloseSettings, TestResult } from './types';
 import type { Eyes as BaseEyes } from '@applitools/core-base';
 import { type Logger } from '@applitools/logger';
 import { type Renderer } from '@applitools/ufg-client';
-declare type Options = {
+type Options = {
     storage: {
         renderer: Renderer;
         promise: Promise<{
@@ -12,5 +12,8 @@ declare type Options = {
     }[];
     logger: Logger;
 };
-export declare function makeClose({ storage, logger: defaultLogger }: Options): Eyes<unknown, unknown, unknown, unknown>['close'];
+export declare function makeClose({ storage, logger: defaultLogger }: Options): ({ settings, logger, }?: {
+    settings?: CloseSettings;
+    logger?: Logger;
+}) => Promise<TestResult[]>;
 export {};

package/types/ufg/core.d.ts

@@ -3,7 +3,7 @@ import type { Core as BaseCore } from '@applitools/core-base';
 import { type UFGClient } from '@applitools/ufg-client';
 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> = {
     concurrency: number;
     spec?: SpecDriver<TDriver, TContext, TElement, TSelector>;
     client?: UFGClient;

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

@@ -2,7 +2,7 @@ import type { OpenSettings } from './types';
 import type { Core as CoreBase, Eyes as EyesBase } from '@applitools/core-base';
 import { type Logger } from '@applitools/logger';
 import { type UFGClient, type Renderer } from '@applitools/ufg-client';
-declare type Options = {
+type Options = {
     settings?: OpenSettings;
     eyes?: EyesBase[];
     core?: CoreBase;
@@ -16,8 +16,8 @@ export declare function makeGetBaseEyes({ settings: defaultSettings, core, clien
     };
     logger?: Logger;
 }) => Promise<EyesBase[]>) & {
-    getCachedValues(): Promise<EyesBase<import("@applitools/core-base").Target>[]>[];
-    setCachedValue(key: any, value: Promise<EyesBase<import("@applitools/core-base").Target>[]>): void;
+    getCachedValues(): Promise<EyesBase<import("@applitools/core-base").ImageTarget>[]>[];
+    setCachedValue(key: any, value: Promise<EyesBase<import("@applitools/core-base").ImageTarget>[]>): void;
     clearCache(): void;
 };
 export {};

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

@@ -1,19 +1,18 @@
-import type { Eyes, Target, OpenSettings } from './types';
+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 Driver, type SpecDriver } from '@applitools/driver';
+import { type SpecDriver } from '@applitools/driver';
 import { type UFGClient } from '@applitools/ufg-client';
-declare type Options<TDriver, TContext, TElement, TSelector> = {
+type Options<TDriver, TContext, TElement, TSelector> = {
     core: BaseCore;
     client?: UFGClient;
     spec?: SpecDriver<TDriver, TContext, TElement, TSelector>;
     logger?: Logger;
 };
-export declare function makeOpenEyes<TDriver, TContext, TElement, TSelector>({ core, client, spec, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): ({ settings, eyes, driver, target, logger, }: {
-    settings?: OpenSettings;
+export declare function makeOpenEyes<TDriver, TContext, TElement, TSelector>({ core, client, spec, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): ({ target, settings, eyes, logger, }: {
+    target?: DriverTarget<TDriver, TContext, TElement, TSelector>;
+    settings: OpenSettings;
     eyes?: BaseEyes[];
-    driver?: Driver<TDriver, TContext, TElement, TSelector>;
-    target?: Target<TDriver>;
     logger?: Logger;
 }) => Promise<Eyes<TDriver, TContext, TElement, TSelector>>;
 export {};

package/types/ufg/types.d.ts

@@ -2,37 +2,21 @@ import type { MaybeArray } from '@applitools/utils';
 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';
 import { type Proxy } from '@applitools/req';
 import { type Renderer, type DomSnapshot, type AndroidSnapshot, type IOSSnapshot } from '@applitools/ufg-client';
 export * from '../automation/types';
-export declare type Target<TDriver> = AutomationCore.Target<TDriver> | MaybeArray<DomSnapshot> | MaybeArray<AndroidSnapshot> | MaybeArray<IOSSnapshot>;
-export interface Core<TDriver, TContext, TElement, TSelector> extends AutomationCore.Core<TDriver, TContext, TElement, TSelector, Eyes<TDriver, TContext, TElement, TSelector>> {
+export type SnapshotTarget = MaybeArray<DomSnapshot> | MaybeArray<AndroidSnapshot> | MaybeArray<IOSSnapshot>;
+export type UFGTarget<TDriver, TContext, TElement, TSelector> = AutomationCore.DriverTarget<TDriver, TContext, TElement, TSelector> | SnapshotTarget;
+export interface Core<TDriver, TContext, TElement, TSelector, TEyes = Eyes<TDriver, TContext, TElement, TSelector>> extends AutomationCore.Core<TDriver, TContext, TElement, TSelector, TEyes> {
     readonly type: 'ufg';
     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 = UFGTarget<TDriver, TContext, TElement, TSelector>> extends AutomationCore.Eyes<TDriver, TContext, TElement, TSelector, TTarget> {
     readonly type: 'ufg';
     getBaseEyes(options?: {
         settings?: {
@@ -41,21 +25,11 @@ export interface Eyes<TDriver, TContext, TElement, TSelector, TTarget = Target<T
         };
         logger?: Logger;
     }): Promise<BaseCore.Eyes[]>;
-    check(options?: {
-        driver?: Driver<TDriver, TContext, TElement, TSelector>;
-        settings?: CheckSettings<TElement, TSelector>;
-        logger?: Logger;
-    }): Promise<CheckResult[]>;
     check(options?: {
         target?: TTarget;
         settings?: CheckSettings<TElement, TSelector>;
         logger?: Logger;
     }): Promise<CheckResult[]>;
-    checkAndClose(options?: {
-        driver?: Driver<TDriver, TContext, TElement, TSelector>;
-        settings?: CheckSettings<TElement, TSelector> & AutomationCore.CloseSettings;
-        logger?: Logger;
-    }): Promise<TestResult[]>;
     checkAndClose(options?: {
         target?: TTarget;
         settings?: CheckSettings<TElement, TSelector> & AutomationCore.CloseSettings;
@@ -71,10 +45,10 @@ export interface Eyes<TDriver, TContext, TElement, TSelector, TTarget = Target<T
         logger?: Logger;
     }): Promise<TestResult[]>;
 }
-export declare type OpenSettings = AutomationCore.OpenSettings & {
+export type OpenSettings = AutomationCore.OpenSettings & {
     renderConcurrency?: number;
 };
-export declare type CheckSettings<TElement, TSelector> = AutomationCore.CheckSettings<TElement, TSelector> & {
+export type CheckSettings<TElement, TSelector> = AutomationCore.CheckSettings<TElement, TSelector> & {
     renderers?: Renderer[];
     hooks?: {
         beforeCaptureScreenshot: string;
@@ -82,17 +56,18 @@ export declare type CheckSettings<TElement, TSelector> = AutomationCore.CheckSet
     disableBrowserFetching?: boolean;
     layoutBreakpoints?: boolean | number[];
     ufgOptions?: Record<string, any>;
+    nmgOptions?: Record<string, any>;
     autProxy?: Proxy & {
         mode?: 'Allow' | 'Block';
         domains?: string[];
     };
 };
-export declare type CheckResult = AutomationCore.CheckResult & {
+export type CheckResult = AutomationCore.CheckResult & {
     readonly renderer?: Renderer;
     readonly promise?: Promise<Omit<CheckResult, 'promise'> & {
         eyes: BaseCore.Eyes;
     }>;
 };
-export declare type TestResult = AutomationCore.TestResult & {
+export type TestResult = AutomationCore.TestResult & {
     readonly renderer?: Renderer;
 };

package/types/ufg/utils/take-dom-snapshot.d.ts

@@ -1,7 +1,7 @@
 import { type Logger } from '@applitools/logger';
 import { type Context } from '@applitools/driver';
 import { type DomSnapshot } from '@applitools/ufg-client';
-export declare type DomSnapshotSettings = {
+export type DomSnapshotSettings = {
     disableBrowserFetching?: boolean;
     skipResources?: string[];
     chunkByteLength?: number;

package/types/ufg/utils/take-dom-snapshots.d.ts

@@ -4,9 +4,9 @@ import { type Driver } from '@applitools/driver';
 import { type DomSnapshot, type Renderer, type ChromeEmulationDevice, type IOSDevice, type ScreenOrientation } from '@applitools/ufg-client';
 import { type DomSnapshotSettings } from './take-dom-snapshot';
 export * from './take-dom-snapshot';
-export declare type DomSnapshotsSettings = DomSnapshotSettings & {
+export type DomSnapshotsSettings = DomSnapshotSettings & {
     renderers: Renderer[];
-    waitBeforeCapture?: number;
+    waitBeforeCapture?: number | (() => void);
     layoutBreakpoints?: number[] | boolean;
 };
 export declare function takeDomSnapshots<TDriver extends Driver<unknown, unknown, unknown, unknown>>({ driver, settings, hooks, provides, logger, }: {

package/types/ufg/utils/take-vhses.d.ts

@@ -2,7 +2,7 @@ import type { ServerSettings } from '../types';
 import { type Logger } from '@applitools/logger';
 import { type Driver } from '@applitools/driver';
 import { type Renderer, type AndroidSnapshot, type IOSSnapshot } from '@applitools/ufg-client';
-export declare type VHSesSettings = ServerSettings & {
+export type VHSesSettings = ServerSettings & {
     renderers: Renderer[];
     waitBeforeCapture?: number;
 };

package/types/utils/wait-for-lazy-load.d.ts

@@ -1,14 +1,14 @@
 import { type Logger } from '@applitools/logger';
-import { type Driver } from '@applitools/driver';
-export declare type LazyLoadSettings = {
+import { type Context } from '@applitools/driver';
+export type LazyLoadSettings = {
     scrollLength?: number;
     waitingTime?: number;
     maxAmountToScroll?: number;
     executionTimeout?: number;
     pollTimeout?: number;
 };
-export declare function waitForLazyLoad<TDriver extends Driver<unknown, unknown, unknown, unknown>>({ driver, settings, logger, }: {
-    driver: TDriver;
+export declare function waitForLazyLoad<TContext extends Context<unknown, unknown, unknown, unknown>>({ context, settings, logger, }: {
+    context: TContext;
     settings: LazyLoadSettings;
     logger: Logger;
 }): Promise<void>;