@applitools/core 1.2.15 → 1.2.17

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

@@ -1,15 +1,11 @@
-import type { Eyes, Target, OpenSettings } from './types';
+import type { Core } 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> = {
-    spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
     core: BaseCore;
+    spec?: SpecDriver<TDriver, TContext, TElement, TSelector>;
     logger?: Logger;
 };
-export declare function makeOpenEyes<TDriver, TContext, TElement, TSelector>({ spec, core, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): ({ target, settings, logger, }: {
-    target?: Target<TDriver>;
-    settings: OpenSettings;
-    logger?: Logger;
-}) => Promise<Eyes<TDriver, TElement, TSelector>>;
+export declare function makeOpenEyes<TDriver, TContext, TElement, TSelector>({ core, spec, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): Core<TDriver, TContext, TElement, TSelector>['openEyes'];
 export {};

package/types/classic/types.d.ts

@@ -1,22 +1,52 @@
+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, TElement, TSelector> extends AutomationCore.Core<TDriver, TElement, TSelector, Eyes<TDriver, TElement, TSelector>> {
+export interface Core<TDriver, TContext, TElement, TSelector> extends AutomationCore.Core<TDriver, TContext, TElement, TSelector, Eyes<TDriver, TContext, TElement, TSelector>> {
     readonly type: 'classic';
+    openEyes(options: {
+        driver?: Driver<TDriver, TContext, TElement, TSelector>;
+        settings: OpenSettings;
+        logger?: Logger;
+    }): Promise<Eyes<TDriver, TContext, TElement, TSelector>>;
     openEyes(options: {
         target?: TDriver;
         settings: OpenSettings;
         logger?: Logger;
-    }): Promise<Eyes<TDriver, TElement, TSelector>>;
+    }): 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>>;
 }
-export interface Eyes<TDriver, TElement, TSelector, TTarget = Target<TDriver>> extends AutomationCore.Eyes<TDriver, TElement, TSelector, TTarget> {
+export interface Eyes<TDriver, TContext, TElement, TSelector, TTarget = Target<TDriver>> 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: {
+    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;

package/types/close-manager.d.ts

@@ -1,15 +1,15 @@
 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, TElement, TSelector, TType extends 'classic' | 'ufg'> = {
+declare type Options<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg'> = {
     core: BaseCore<unknown>;
     storage: {
-        eyes: Eyes<TDriver, TElement, TSelector, TType>;
+        eyes: Eyes<TDriver, TContext, TElement, TSelector, TType>;
         promise?: Promise<TestResult<TType>[]>;
     }[];
     logger?: Logger;
 };
-export declare function makeCloseManager<TDriver, TElement, TSelector, TType extends 'classic' | 'ufg' = 'classic'>({ core, storage, logger: defaultLogger, }: Options<TDriver, TElement, TSelector, TType>): ({ settings, logger, }?: {
+export declare function makeCloseManager<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg' = 'classic'>({ core, storage, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector, TType>): ({ settings, logger, }?: {
     settings?: {
         throwErr?: boolean;
     };

package/types/close.d.ts

@@ -2,11 +2,11 @@ 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 Logger } from '@applitools/logger';
-declare type Options<TDriver, TElement, TSelector> = {
-    eyes: ClassicEyes<TDriver, TElement, TSelector> | UFGEyes<TDriver, TElement, TSelector>;
+declare type Options<TDriver, TContext, TElement, TSelector> = {
+    eyes: ClassicEyes<TDriver, TContext, TElement, TSelector> | UFGEyes<TDriver, TContext, TElement, TSelector>;
     logger: Logger;
 };
-export declare function makeClose<TDriver, TElement, TSelector, TType extends 'classic' | 'ufg'>({ eyes, logger: defaultLogger, }: Options<TDriver, 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>): ({ settings, config, logger, }?: {
     settings?: CloseSettings<TType>;
     config?: Config<TElement, TSelector, TType>;
     logger?: Logger;

package/types/core.d.ts

@@ -10,5 +10,5 @@ declare type Options<TDriver, TContext, TElement, TSelector> = {
     cwd?: string;
     logger?: Logger;
 };
-export declare function makeCore<TDriver, TContext, TElement, TSelector>({ spec, concurrency, core, agentId, cwd, logger, }?: Options<TDriver, TContext, TElement, TSelector>): Core<TDriver, TElement, TSelector>;
+export declare function makeCore<TDriver, TContext, TElement, TSelector>({ spec, concurrency, core, agentId, cwd, logger, }?: Options<TDriver, TContext, TElement, TSelector>): Core<TDriver, TContext, TElement, TSelector>;
 export {};

package/types/extract-text.d.ts

@@ -3,11 +3,11 @@ 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 Logger } from '@applitools/logger';
-declare type Options<TDriver, TElement, TSelector> = {
-    eyes: ClassicEyes<TDriver, TElement, TSelector> | UFGEyes<TDriver, TElement, TSelector>;
+declare type Options<TDriver, TContext, TElement, TSelector> = {
+    eyes: ClassicEyes<TDriver, TContext, TElement, TSelector> | UFGEyes<TDriver, TContext, TElement, TSelector>;
     logger: Logger;
 };
-export declare function makeExtractText<TDriver, TElement, TSelector, TType extends 'classic' | 'ufg'>({ eyes, logger: defaultLogger, }: Options<TDriver, TElement, TSelector>): ({ target, settings, config, 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>;

package/types/locate-text.d.ts

@@ -2,11 +2,11 @@ import type { Target, Config, LocateTextSettings, LocateTextResult } from './typ
 import type { Eyes as ClassicEyes } from './classic/types';
 import type { Eyes as UFGEyes } from './ufg/types';
 import { type Logger } from '@applitools/logger';
-declare type Options<TDriver, TElement, TSelector> = {
-    eyes: ClassicEyes<TDriver, TElement, TSelector> | UFGEyes<TDriver, TElement, TSelector>;
+declare type Options<TDriver, TContext, TElement, TSelector> = {
+    eyes: ClassicEyes<TDriver, TContext, TElement, TSelector> | UFGEyes<TDriver, TContext, TElement, TSelector>;
     logger: Logger;
 };
-export declare function makeLocateText<TDriver, TElement, TSelector, TType extends 'classic' | 'ufg' = 'classic' | 'ufg'>({ eyes, logger: defaultLogger, }: Options<TDriver, TElement, TSelector>): <TPattern extends string>({ target, settings, config, 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>;

package/types/make-manager.d.ts

@@ -16,5 +16,5 @@ export declare function makeMakeManager<TDriver, TContext, TElement, TSelector>(
     legacyConcurrency?: number;
     agentId?: string;
     logger?: Logger;
-}) => Promise<EyesManager<TDriver, TElement, TSelector, TType>>;
+}) => Promise<EyesManager<TDriver, TContext, TElement, TSelector, TType>>;
 export {};

package/types/open-eyes.d.ts

@@ -1,20 +1,19 @@
-import type { Eyes, Config, OpenSettings } from './types';
+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 Logger } from '@applitools/logger';
 import { type SpecDriver } from '@applitools/driver';
 declare type Options<TDriver, TContext, TElement, TSelector> = {
-    spec?: SpecDriver<TDriver, TContext, TElement, TSelector>;
-    core?: BaseCore | ClassicCore<TDriver, TElement, TSelector> | UFGCore<TDriver, TElement, TSelector>;
+    type?: 'classic' | 'ufg';
     concurrency?: number;
+    core: BaseCore;
+    cores?: {
+        classic: ClassicCore<TDriver, TContext, TElement, TSelector>;
+        ufg: UFGCore<TDriver, TContext, TElement, TSelector>;
+    };
+    spec?: SpecDriver<TDriver, TContext, TElement, TSelector>;
     logger?: Logger;
 };
-export declare function makeOpenEyes<TDriver, TContext, TElement, TSelector>({ spec, core, concurrency, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): <TType extends "classic" | "ufg" = "classic">({ type, target, settings, config, logger, }: {
-    type?: TType;
-    target?: TDriver;
-    settings?: Partial<OpenSettings<TType>>;
-    config?: Config<TElement, TSelector, TType>;
-    logger?: Logger;
-}) => Promise<Eyes<TDriver, TElement, TSelector, TType, import("./types").Target<TDriver, TType>>>;
+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 {};

package/types/types.d.ts

@@ -6,34 +6,34 @@ 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 interface Core<TDriver, TElement, TSelector> extends AutomationCore.Core<TDriver, 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;
+        concurrency?: TType extends 'ufg' ? number : never;
+        agentId?: string;
+        logger?: Logger;
+    }): Promise<EyesManager<TDriver, TContext, TElement, TSelector, TType>>;
     openEyes<TType extends 'classic' | 'ufg' = 'classic'>(options: {
         type?: TType;
         target?: TDriver;
         settings?: Partial<OpenSettings<TType>>;
         config?: Config<TElement, TSelector, TType>;
         logger?: Logger;
-    }): Promise<Eyes<TDriver, TElement, TSelector, TType>>;
+    }): Promise<Eyes<TDriver, TContext, TElement, TSelector, TType>>;
     locate<TLocator extends string>(options: {
         target?: TDriver | AutomationCore.Screenshot;
         settings?: Partial<LocateSettings<TLocator, TElement, TSelector>>;
         config?: Config<TElement, TSelector, 'classic'>;
         logger?: Logger;
     }): Promise<AutomationCore.LocateResult<TLocator>>;
-    makeManager<TType extends 'classic' | 'ufg' = 'classic'>(options?: {
-        type: TType;
-        concurrency?: TType extends 'ufg' ? number : never;
-        agentId?: string;
-        logger?: Logger;
-    }): Promise<EyesManager<TDriver, TElement, TSelector, TType>>;
 }
-export interface EyesManager<TDriver, TElement, TSelector, TType extends 'classic' | 'ufg'> {
+export interface EyesManager<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg'> {
     openEyes(options: {
         target?: TDriver;
         settings?: Partial<OpenSettings<TType>>;
         config?: Config<TElement, TSelector, TType>;
         logger?: Logger;
-    }): Promise<Eyes<TDriver, TElement, TSelector, TType>>;
+    }): Promise<Eyes<TDriver, TContext, TElement, TSelector, TType>>;
     closeManager: (options?: {
         settings?: {
             throwErr?: boolean;
@@ -41,19 +41,21 @@ export interface EyesManager<TDriver, TElement, TSelector, TType extends 'classi
         logger?: Logger;
     }) => Promise<TestResultSummary<TType>>;
 }
-export interface ClassicEyes<TDriver, TElement, TSelector, TTarget = Target<TDriver, 'classic'>> extends ClassicCore.Eyes<TDriver, TElement, TSelector, TTarget> {
-    check(options?: {
+export interface ClassicEyes<TDriver, TContext, TElement, TSelector, TTarget = Target<TDriver, 'classic'>> extends ClassicCore.Eyes<TDriver, TContext, TElement, TSelector, TTarget> {
+    check<TType extends 'classic' | 'ufg' = 'classic'>(options?: {
+        type?: TType;
         target?: TTarget;
-        settings?: Partial<CheckSettings<TElement, TSelector, 'classic'>>;
-        config?: Config<TElement, TSelector, 'classic'>;
+        settings?: Partial<CheckSettings<TElement, TSelector, TType>>;
+        config?: Config<TElement, TSelector, TType>;
         logger?: Logger;
-    }): Promise<CheckResult<'classic'>[]>;
-    checkAndClose(options?: {
+    }): Promise<CheckResult<TType>[]>;
+    checkAndClose<TType extends 'classic' | 'ufg' = 'classic'>(options?: {
+        type?: TType;
         target?: TTarget;
-        settings?: Partial<CheckSettings<TElement, TSelector, 'classic'> & CloseSettings<'classic'>>;
-        config?: Config<TElement, TSelector, 'classic'>;
+        settings?: Partial<CheckSettings<TElement, TSelector, TType> & CloseSettings<TType>>;
+        config?: Config<TElement, TSelector, TType>;
         logger?: Logger;
-    }): Promise<TestResult<'classic'>[]>;
+    }): Promise<TestResult<TType>[]>;
     locateText<TPattern extends string>(options: {
         target?: TTarget;
         settings: Partial<LocateTextSettings<TPattern, TElement, TSelector, 'classic'>>;
@@ -72,26 +74,28 @@ export interface ClassicEyes<TDriver, TElement, TSelector, TTarget = Target<TDri
         logger?: Logger;
     }): Promise<TestResult<'classic'>[]>;
 }
-export interface UFGEyes<TDriver, TElement, TSelector, TTarget = Target<TDriver, 'ufg'>> extends UFGCore.Eyes<TDriver, TElement, TSelector, TTarget> {
-    check(options?: {
+export interface UFGEyes<TDriver, TContext, TElement, TSelector, TTarget = Target<TDriver, 'ufg'>> extends UFGCore.Eyes<TDriver, TContext, TElement, TSelector, TTarget> {
+    check<TType extends 'classic' | 'ufg' = 'ufg'>(options?: {
+        type?: TType;
         target?: TTarget;
-        settings?: Partial<CheckSettings<TElement, TSelector, 'ufg'>>;
-        config?: Config<TElement, TSelector, 'ufg'>;
+        settings?: Partial<CheckSettings<TElement, TSelector, TType>>;
+        config?: Config<TElement, TSelector, TType>;
         logger?: Logger;
-    }): Promise<CheckResult<'ufg'>[]>;
-    checkAndClose(options?: {
+    }): Promise<CheckResult<TType>[]>;
+    checkAndClose<TType extends 'classic' | 'ufg' = 'ufg'>(options?: {
+        type?: TType;
         target?: TTarget;
-        settings?: Partial<CheckSettings<TElement, TSelector, 'ufg'> & CloseSettings<'ufg'>>;
-        config?: Config<TElement, TSelector, 'ufg'>;
+        settings?: Partial<CheckSettings<TElement, TSelector, TType> & CloseSettings<TType>>;
+        config?: Config<TElement, TSelector, TType>;
         logger?: Logger;
-    }): Promise<TestResult<'ufg'>[]>;
+    }): Promise<TestResult<TType>[]>;
     close(options?: {
         settings?: Partial<CloseSettings<'ufg'>>;
         config?: Config<TElement, TSelector, 'ufg'>;
         logger?: Logger;
     }): Promise<TestResult<'ufg'>[]>;
 }
-export declare type Eyes<TDriver, TElement, TSelector, TType extends 'classic' | 'ufg', TTarget = Target<TDriver, TType>> = TType extends 'ufg' ? UFGEyes<TDriver, TElement, TSelector, TTarget> : ClassicEyes<TDriver, TElement, TSelector, TTarget>;
+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'> = {
     open: Partial<OpenSettings<TType>>;
     screenshot: Partial<ClassicCore.ScreenshotSettings<TElement, TSelector>>;

package/types/ufg/abort.d.ts

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

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

@@ -1,17 +1,15 @@
-import type { Target, TestInfo } from './types';
-import type { Eyes as BaseEyes } from '@applitools/core-base';
+import type { Eyes } from './types';
+import { type AbortSignal } from 'abort-controller';
 import { type Logger } from '@applitools/logger';
-import { type SpecDriver } from '@applitools/driver';
+import { type Driver, type SpecDriver } from '@applitools/driver';
 import { type UFGClient } from '@applitools/ufg-client';
 declare type Options<TDriver, TContext, TElement, TSelector> = {
-    getEyes: (options: {
-        rawEnvironment: any;
-    }) => Promise<BaseEyes>;
+    eyes: Eyes<TDriver, TContext, TElement, TSelector>;
     client: UFGClient;
-    test: TestInfo;
+    driver?: Driver<TDriver, TContext, TElement, TSelector>;
     spec?: SpecDriver<TDriver, TContext, TElement, TSelector>;
-    target?: Target<TDriver>;
+    signal?: AbortSignal;
     logger?: Logger;
 };
-export declare function makeCheckAndClose<TDriver, TContext, TElement, TSelector>(_options: Options<TDriver, TContext, TElement, TSelector>): any;
+export declare function makeCheckAndClose<TDriver, TContext, TElement, TSelector>(_options: Options<TDriver, TContext, TElement, TSelector>): Eyes<TDriver, TContext, TElement, TSelector>['checkAndClose'];
 export {};

package/types/ufg/check.d.ts

@@ -1,27 +1,15 @@
-import type { Target, TestInfo, CheckSettings, CheckResult } from './types';
-import type { Eyes as BaseEyes } from '@applitools/core-base';
+import type { Eyes } from './types';
 import { type AbortSignal } from 'abort-controller';
 import { type Logger } from '@applitools/logger';
 import { type UFGClient } from '@applitools/ufg-client';
-import { type SpecDriver } from '@applitools/driver';
+import { type Driver, type SpecDriver } from '@applitools/driver';
 declare type Options<TDriver, TContext, TElement, TSelector> = {
-    getEyes: (options: {
-        rawEnvironment: any;
-    }) => Promise<BaseEyes>;
+    eyes: Eyes<TDriver, TContext, TElement, TSelector>;
     client: UFGClient;
-    test: TestInfo;
+    driver?: Driver<TDriver, TContext, TElement, TSelector>;
     spec?: SpecDriver<TDriver, TContext, TElement, TSelector>;
     signal?: AbortSignal;
-    target?: Target<TDriver>;
     logger?: Logger;
 };
-export declare function makeCheck<TDriver, TContext, TElement, TSelector>({ spec, getEyes, client, test, signal, target: defaultTarget, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): ({ target, settings, logger, }: {
-    target?: Target<TDriver>;
-    settings?: CheckSettings<TElement, TSelector>;
-    logger?: Logger;
-}) => Promise<(CheckResult & {
-    promise: Promise<CheckResult & {
-        eyes: BaseEyes;
-    }>;
-})[]>;
+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 {};

package/types/ufg/close.d.ts

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

package/types/ufg/core.d.ts

@@ -12,5 +12,5 @@ declare type Options<TDriver, TContext, TElement, TSelector> = {
     cwd?: string;
     logger?: Logger;
 };
-export declare function makeCore<TDriver, TContext, TElement, TSelector>({ concurrency, spec, client, core, agentId, cwd, logger, }: Options<TDriver, TContext, TElement, TSelector>): Core<TDriver, TElement, TSelector>;
+export declare function makeCore<TDriver, TContext, TElement, TSelector>({ concurrency, spec, client, core, agentId, cwd, logger, }: Options<TDriver, TContext, TElement, TSelector>): Core<TDriver, TContext, TElement, TSelector>;
 export {};

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

@@ -0,0 +1,23 @@
+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 = {
+    settings?: OpenSettings;
+    eyes?: EyesBase[];
+    core?: CoreBase;
+    client?: UFGClient;
+    logger?: Logger;
+};
+export declare function makeGetBaseEyes({ settings: defaultSettings, core, client, eyes, logger: defaultLogger }: Options): (({ settings, logger, }?: {
+    settings?: {
+        type: 'web' | 'native';
+        renderer: Renderer;
+    };
+    logger?: Logger;
+}) => Promise<EyesBase[]>) & {
+    getCachedValues(): Promise<EyesBase<import("@applitools/core-base").Target>[]>[];
+    setCachedValue(key: any, value: Promise<EyesBase<import("@applitools/core-base").Target>[]>): void;
+    clearCache(): void;
+};
+export {};

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

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

package/types/ufg/types.d.ts

@@ -1,24 +1,61 @@
 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, TElement, TSelector> extends AutomationCore.Core<TDriver, TElement, TSelector, Eyes<TDriver, TElement, TSelector>> {
+export interface Core<TDriver, TContext, TElement, TSelector> extends AutomationCore.Core<TDriver, TContext, TElement, TSelector, Eyes<TDriver, TContext, TElement, TSelector>> {
     readonly type: 'ufg';
+    openEyes(options: {
+        driver?: Driver<TDriver, TContext, TElement, TSelector>;
+        settings: OpenSettings;
+        logger?: Logger;
+    }): Promise<Eyes<TDriver, TContext, TElement, TSelector>>;
     openEyes(options: {
         target?: TDriver;
         settings: OpenSettings;
         logger?: Logger;
-    }): Promise<Eyes<TDriver, TElement, TSelector>>;
+    }): 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>>;
 }
-export interface Eyes<TDriver, TElement, TSelector, TTarget = Target<TDriver>> extends AutomationCore.Eyes<TDriver, TElement, TSelector, TTarget> {
+export interface Eyes<TDriver, TContext, TElement, TSelector, TTarget = Target<TDriver>> extends AutomationCore.Eyes<TDriver, TContext, TElement, TSelector, TTarget> {
+    readonly type: 'ufg';
+    getBaseEyes(options?: {
+        settings?: {
+            type: 'web' | 'native';
+            renderer: Renderer;
+        };
+        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;
@@ -52,6 +89,9 @@ export declare type CheckSettings<TElement, TSelector> = AutomationCore.CheckSet
 };
 export declare type CheckResult = AutomationCore.CheckResult & {
     readonly renderer?: Renderer;
+    readonly promise?: Promise<Omit<CheckResult, 'promise'> & {
+        eyes: BaseCore.Eyes;
+    }>;
 };
 export declare type TestResult = AutomationCore.TestResult & {
     readonly renderer?: Renderer;