@applitools/core 1.1.4 → 1.1.6

package/dist/automation/get-viewport-size.js

@@ -5,7 +5,7 @@ const driver_1 = require("@applitools/driver");
 function makeGetViewportSize({ spec, logger: defaultLogger, }) {
     return async function getViewportSize({ target, logger = defaultLogger }) {
         logger.log('Command "getViewportSize" is called');
-        const driver = await new driver_1.Driver({ spec, driver: target, logger }).init();
+        const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
         return driver.getViewportSize();
     };
 }

package/dist/automation/set-viewport-size.js

@@ -5,7 +5,7 @@ const driver_1 = require("@applitools/driver");
 function makeSetViewportSize({ spec, logger: defaultLogger, }) {
     return async function setViewportSize({ target, size, logger = defaultLogger }) {
         logger.log('Command "setViewportSize" is called with size', size);
-        const driver = await new driver_1.Driver({ spec, driver: target, logger }).init();
+        const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
         return driver.setViewportSize(size);
     };
 }

package/dist/automation/types.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@applitools/core-base/types"), exports);

package/dist/check-and-close.js

@@ -4,7 +4,11 @@ exports.makeCheckAndClose = void 0;
 function makeCheckAndClose({ eyes, logger: defaultLogger, }) {
     return async function checkAndClose({ target, settings = {}, config, logger = defaultLogger, } = {}) {
         settings = { ...config === null || config === void 0 ? void 0 : config.screenshot, ...config === null || config === void 0 ? void 0 : config.check, ...config === null || config === void 0 ? void 0 : config.close, ...settings };
-        const results = await eyes.checkAndClose({ target: target, settings, logger });
+        const results = await eyes.checkAndClose({
+            target: target,
+            settings,
+            logger,
+        });
         return results;
     };
 }

package/dist/check.js

@@ -42,7 +42,7 @@ function makeCheck({ eyes, logger: defaultLogger, }) {
         (_f = settings.overlap) !== null && _f !== void 0 ? _f : (settings.overlap = { top: 10, bottom: 50 });
         (_g = settings.matchLevel) !== null && _g !== void 0 ? _g : (settings.matchLevel = 'Strict');
         (_h = settings.ignoreCaret) !== null && _h !== void 0 ? _h : (settings.ignoreCaret = true);
-        (_j = settings.sendDom) !== null && _j !== void 0 ? _j : (settings.sendDom = true);
+        (_j = settings.sendDom) !== null && _j !== void 0 ? _j : (settings.sendDom = eyes.test.account.rcaEnabled || settings.matchLevel === 'Layout' || settings.enablePatterns || settings.useDom);
         (_k = settings.useDom) !== null && _k !== void 0 ? _k : (settings.useDom = false);
         (_l = (_r = settings).retryTimeout) !== null && _l !== void 0 ? _l : (_r.retryTimeout = 2000);
         settings.lazyLoad = settings.lazyLoad === true ? {} : settings.lazyLoad;

package/dist/classic/types.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("../automation/types"), exports);

package/dist/index.js

@@ -27,6 +27,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatters = void 0;
+__exportStar(require("./types"), exports);
 __exportStar(require("./core"), exports);
 exports.formatters = __importStar(require("./utils/format-results"));
 __exportStar(require("@applitools/driver/dist/debug"), exports);

package/dist/troubleshoot/check-network.js

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;

package/dist/types.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@applitools/core-base/types"), exports);

package/dist/ufg/check.js

@@ -44,7 +44,7 @@ function makeCheck({ spec, getEyes, client, test, signal, target: defaultTarget,
             throw new abort_error_1.AbortError('Command "check" was called after test was already aborted');
         }
         const { elementReferencesToCalculate, elementReferenceToTarget, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({ settings });
-        let snapshots, snapshotUrl, snapshotTitle, regionToTarget, selectorsToCalculate;
+        let snapshots, snapshotUrl, snapshotTitle, userAgent, regionToTarget, selectorsToCalculate;
         if (spec === null || spec === void 0 ? void 0 : spec.isDriver(target)) {
             // TODO driver custom config
             const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
@@ -54,6 +54,7 @@ function makeCheck({ spec, getEyes, client, test, signal, target: defaultTarget,
             }
             let cleanupGeneratedSelectors;
             if (driver.isWeb) {
+                userAgent = driver.userAgent;
                 const generated = await (0, generate_safe_selectors_1.generateSafeSelectors)({
                     context: driver.currentContext,
                     elementReferences: [...(elementReferenceToTarget ? [elementReferenceToTarget] : []), ...elementReferencesToCalculate],
@@ -118,20 +119,17 @@ function makeCheck({ spec, getEyes, client, test, signal, target: defaultTarget,
                 const { cookies, ...snapshot } = snapshots[index];
                 const renderTargetPromise = client.createRenderTarget({
                     snapshot,
-                    settings: { renderer, referer: snapshotUrl, cookies, proxy: test.server.proxy, autProxy: settings.autProxy },
+                    settings: { renderer, referer: snapshotUrl, cookies, proxy: test.server.proxy, autProxy: settings.autProxy, userAgent },
                 });
-                const request = {
-                    target: null,
-                    settings: {
-                        ...settings,
-                        region: regionToTarget,
-                        type: utils.types.has(snapshot, 'cdt') ? 'web' : 'native',
-                        renderer,
-                        selectorsToCalculate: selectorsToCalculate.flatMap(({ safeSelector }) => safeSelector !== null && safeSelector !== void 0 ? safeSelector : []),
-                        includeFullPageSize: Boolean(settings.pageId),
-                    },
+                const renderSettings = {
+                    ...settings,
+                    region: regionToTarget,
+                    type: utils.types.has(snapshot, 'cdt') ? 'web' : 'native',
+                    renderer,
+                    selectorsToCalculate: selectorsToCalculate.flatMap(({ safeSelector }) => safeSelector !== null && safeSelector !== void 0 ? safeSelector : []),
+                    includeFullPageSize: Boolean(settings.pageId),
                 };
-                const { rendererId, rawEnvironment } = await client.bookRenderer({ settings: request.settings });
+                const { rendererId, rawEnvironment } = await client.bookRenderer({ settings: renderSettings });
                 const eyes = await getEyes({ rawEnvironment });
                 try {
                     if (signal.aborted) {
@@ -142,8 +140,8 @@ function makeCheck({ spec, getEyes, client, test, signal, target: defaultTarget,
                         logger.warn(`Renderer with id ${rendererId} was aborted during one of the previous steps`);
                         throw new abort_error_1.AbortError(`Renderer with id "${rendererId}" was aborted during one of the previous steps`);
                     }
-                    request.settings.rendererId = rendererId;
-                    request.target = await renderTargetPromise;
+                    renderSettings.rendererId = rendererId;
+                    const renderTarget = await renderTargetPromise;
                     if (signal.aborted) {
                         logger.warn('Command "check" was aborted before rendering');
                         throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
@@ -152,7 +150,11 @@ function makeCheck({ spec, getEyes, client, test, signal, target: defaultTarget,
                         logger.warn(`Renderer with id ${rendererId} was aborted during one of the previous steps`);
                         throw new abort_error_1.AbortError(`Renderer with id "${rendererId}" was aborted during one of the previous steps`);
                     }
-                    const { renderId, selectorRegions, ...baseTarget } = await client.render({ request, signal });
+                    const { renderId, selectorRegions, ...baseTarget } = await client.render({
+                        target: renderTarget,
+                        settings: renderSettings,
+                        signal,
+                    });
                     let offset = 0;
                     const baseSettings = getBaseCheckSettings({
                         calculatedRegions: selectorsToCalculate.map(({ originalSelector, safeSelector }) => ({

package/dist/ufg/types.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("../automation/types"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/core",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -23,6 +23,10 @@
       "types": "./types/index.d.ts",
       "default": "./dist/index.js"
     },
+    "./types": {
+      "types": "./types/types.d.ts",
+      "default": "./dist/types.js"
+    },
     "./dist/*": "./dist/*.js",
     "./package.json": "./package.json"
   },
@@ -57,29 +61,28 @@
     }
   },
   "dependencies": {
-    "@applitools/core-base": "1.0.8",
+    "@applitools/core-base": "1.1.2",
     "@applitools/dom-capture": "11.2.0",
     "@applitools/dom-snapshot": "4.7.0",
-    "@applitools/driver": "1.10.5",
-    "@applitools/logger": "1.1.26",
-    "@applitools/nml-client": "1.3.2",
-    "@applitools/req": "1.1.10",
-    "@applitools/screenshoter": "3.6.3",
+    "@applitools/driver": "1.10.6",
+    "@applitools/logger": "1.1.27",
+    "@applitools/nml-client": "1.3.4",
+    "@applitools/req": "1.1.11",
+    "@applitools/screenshoter": "3.6.4",
     "@applitools/snippets": "2.4.5",
-    "@applitools/types": "1.5.19",
-    "@applitools/ufg-client": "1.0.8",
-    "@applitools/utils": "1.3.12",
+    "@applitools/ufg-client": "1.0.10",
+    "@applitools/utils": "1.3.13",
     "abort-controller": "3.0.0",
     "throat": "6.0.1"
   },
   "devDependencies": {
     "@applitools/bongo": "^2.2.0",
     "@applitools/sdk-fake-eyes-server": "^2.1.3",
-    "@applitools/spec-driver-puppeteer": "^1.1.15",
-    "@applitools/spec-driver-selenium": "^1.4.5",
-    "@applitools/spec-driver-webdriverio": "^1.3.1",
-    "@applitools/test-server": "^1.1.5",
-    "@applitools/test-utils": "^1.5.1",
+    "@applitools/spec-driver-puppeteer": "^1.1.17",
+    "@applitools/spec-driver-selenium": "^1.5.0",
+    "@applitools/spec-driver-webdriverio": "^1.4.1",
+    "@applitools/test-server": "^1.1.6",
+    "@applitools/test-utils": "^1.5.2",
     "@types/hoxy": "^3.3.1",
     "@types/mocha": "^9.1.1",
     "@types/node": "12",

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

@@ -1,5 +1,5 @@
-import type { SpecDriver } from '@applitools/types';
 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>;
     logger?: Logger;
@@ -7,5 +7,5 @@ declare type Options<TDriver, TContext, TElement, TSelector> = {
 export declare function makeGetViewportSize<TDriver, TContext, TElement, TSelector>({ spec, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): ({ target, logger }: {
     target: TDriver;
     logger?: Logger;
-}) => Promise<import("@applitools/driver").Size>;
+}) => Promise<import("@applitools/utils").Size>;
 export {};

package/types/automation/locate.d.ts

@@ -1,7 +1,7 @@
-import type { SpecDriver, Region } from '@applitools/types';
-import type { Core as BaseCore } from '@applitools/types/base';
-import type { Target, LocateSettings } from '@applitools/types/classic';
+import type { Target, LocateSettings, LocateResult } from './types';
+import type { Core as BaseCore } from '@applitools/core-base';
 import { type Logger } from '@applitools/logger';
+import { type SpecDriver } from '@applitools/driver';
 declare type Options<TDriver, TContext, TElement, TSelector> = {
     spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
     core: BaseCore;
@@ -12,5 +12,5 @@ export declare function makeLocate<TDriver, TContext, TElement, TSelector>({ spe
     target?: Target<TDriver>;
     settings?: LocateSettings<TLocator, TElement, TSelector>;
     logger?: Logger;
-}) => Promise<Record<TLocator, Region[]>>;
+}) => Promise<LocateResult<TLocator>>;
 export {};

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

@@ -1,5 +1,6 @@
-import type { SpecDriver, Size } from '@applitools/types';
+import type { Size } from '@applitools/utils';
 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>;
     logger?: Logger;

package/types/automation/types.d.ts

@@ -0,0 +1,84 @@
+import type { MaybeArray, Size, Region } from '@applitools/utils';
+import type * as BaseCore from '@applitools/core-base/types';
+import { 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 interface Core<TDriver, TElement, TSelector, TEyes = Eyes<TDriver, 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: {
+        target: TDriver;
+        logger?: Logger;
+    }): Promise<Size>;
+    setViewportSize(options: {
+        target: TDriver;
+        size: Size;
+        logger?: Logger;
+    }): Promise<void>;
+    openEyes(options: {
+        target?: TDriver;
+        settings: BaseCore.OpenSettings;
+        logger?: Logger;
+    }): Promise<TEyes>;
+    locate<TLocator extends string>(options: {
+        target?: Target<TDriver> | Screenshot;
+        settings: LocateSettings<TLocator, TElement, TSelector>;
+        logger?: Logger;
+    }): Promise<BaseCore.LocateResult<TLocator>>;
+}
+export interface Eyes<TDriver, TElement, TSelector, TTarget = Target<TDriver>> extends BaseCore.Eyes<TTarget> {
+    check(options: {
+        target?: TTarget;
+        settings?: CheckSettings<TElement, TSelector>;
+    }): Promise<BaseCore.CheckResult[]>;
+    checkAndClose(options: {
+        target?: TTarget;
+        settings?: CheckSettings<TElement, TSelector> & BaseCore.CloseSettings;
+        logger?: Logger;
+    }): Promise<BaseCore.TestResult[]>;
+    locateText?<TPattern extends string>(options: {
+        target?: TTarget;
+        settings: LocateTextSettings<TPattern, TElement, TSelector>;
+        logger?: Logger;
+    }): Promise<BaseCore.LocateTextResult<TPattern>>;
+    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> = {
+    frame: FrameReference<TElement, TSelector>;
+    scrollRootElement?: ElementReference<TElement, TSelector>;
+};
+declare type StitchMode = 'Scroll' | 'CSS';
+export interface ScreenshotSettings<TElement, TSelector> extends BaseCore.ImageSettings<RegionReference<TElement, TSelector>> {
+    frames?: (ContextReference<TElement, TSelector> | FrameReference<TElement, TSelector>)[];
+    fully?: boolean;
+    scrollRootElement?: ElementReference<TElement, TSelector>;
+    stitchMode?: StitchMode;
+    hideScrollbars?: boolean;
+    hideCaret?: boolean;
+    overlap?: {
+        top?: number;
+        bottom?: number;
+    };
+    waitBeforeCapture?: number;
+    waitBetweenStitches?: number;
+    lazyLoad?: boolean | {
+        scrollLength?: number;
+        waitingTime?: number;
+        maxAmountToScroll?: number;
+    };
+    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>;

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

@@ -1,5 +1,5 @@
-import type { Region } from '@applitools/types';
-import { ScreenshotSettings } from '@applitools/types/classic';
+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 = {

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

@@ -1,6 +1,6 @@
-import type { Target, Config, CheckSettings, CloseSettings, TestResult } from '@applitools/types';
-import type { Eyes as ClassicEyes } from '@applitools/types/classic';
-import type { Eyes as UFGEyes } from '@applitools/types/ufg';
+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 Logger } from '@applitools/logger';
 declare type Options<TDriver, TElement, TSelector> = {
     eyes: ClassicEyes<TDriver, TElement, TSelector> | UFGEyes<TDriver, TElement, TSelector>;

package/types/check.d.ts

@@ -1,10 +1,10 @@
-import type { Target, Config, CheckSettings, CheckResult } from '@applitools/types';
-import type { Eyes as ClassicEyes } from '@applitools/types/classic';
-import type { Eyes as UFGEyes } from '@applitools/types/ufg';
+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 Logger } from '@applitools/logger';
 declare type Options<TDriver, TElement, TSelector> = {
     eyes: ClassicEyes<TDriver, TElement, TSelector> | UFGEyes<TDriver, TElement, TSelector>;
-    logger: Logger;
+    logger?: Logger;
 };
 export declare function makeCheck<TDriver, TElement, TSelector, TType extends 'classic' | 'ufg'>({ eyes, logger: defaultLogger, }: Options<TDriver, TElement, TSelector>): ({ target, settings, config, logger, }?: {
     target?: Target<TDriver, TType>;

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

@@ -1,7 +1,7 @@
-import type { SpecDriver } from '@applitools/types';
-import type { Eyes as BaseEyes } from '@applitools/types/base';
-import type { Target, CheckSettings, CloseSettings, TestResult } from '@applitools/types/classic';
+import type { Target, CheckSettings, CloseSettings, TestResult } from './types';
+import type { 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> = {
     spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
     eyes: BaseEyes;

package/types/classic/check.d.ts

@@ -1,7 +1,7 @@
-import type { SpecDriver } from '@applitools/types';
-import type { Eyes as BaseEyes } from '@applitools/types/base';
-import type { Target, CheckSettings, CheckResult } from '@applitools/types/classic';
+import type { Target, CheckSettings, CheckResult } from './types';
+import type { 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> = {
     spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
     eyes: BaseEyes;

package/types/classic/core.d.ts

@@ -1,7 +1,7 @@
-import type { SpecDriver } from '@applitools/types';
-import type { Core as BaseCore } from '@applitools/types/base';
-import type { Core } from '@applitools/types/classic';
+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> = {
     spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
     core?: BaseCore;

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

@@ -1,7 +1,8 @@
-import type { MaybeArray, SpecDriver } from '@applitools/types';
-import type { Eyes as BaseEyes } from '@applitools/types/base';
-import type { Target, ExtractTextSettings } from '@applitools/types/classic';
+import type { MaybeArray } from '@applitools/utils';
+import type { Target, ExtractTextSettings } from './types';
+import type { 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> = {
     spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
     eyes: BaseEyes;

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

@@ -1,7 +1,7 @@
-import type { SpecDriver, TextRegion } from '@applitools/types';
-import type { Eyes as BaseEyes } from '@applitools/types/base';
-import type { Target, LocateTextSettings } from '@applitools/types/classic';
+import type { Target, LocateTextSettings, LocateTextResult } from './types';
+import type { 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> = {
     spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
     eyes: BaseEyes;
@@ -12,5 +12,5 @@ export declare function makeLocateText<TDriver, TContext, TElement, TSelector>({
     target?: Target<TDriver>;
     settings?: LocateTextSettings<TPattern, TElement, TSelector>;
     logger?: Logger;
-}) => Promise<Record<TPattern, TextRegion[]>>;
+}) => Promise<LocateTextResult<TPattern>>;
 export {};

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

@@ -1,7 +1,7 @@
-import type { SpecDriver } from '@applitools/types';
-import type { Core as BaseCore } from '@applitools/types/base';
-import type { Eyes, Target, OpenSettings } from '@applitools/types/classic';
+import type { Eyes, Target, OpenSettings } 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;

package/types/classic/types.d.ts

@@ -0,0 +1,31 @@
+import type * as AutomationCore from '../automation/types';
+import { type Logger } from '@applitools/logger';
+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>> {
+    readonly type: 'classic';
+    openEyes(options: {
+        target?: TDriver;
+        settings: OpenSettings;
+        logger?: Logger;
+    }): Promise<Eyes<TDriver, TElement, TSelector>>;
+}
+export interface Eyes<TDriver, TElement, TSelector, TTarget = Target<TDriver>> extends AutomationCore.Eyes<TDriver, TElement, TSelector, TTarget> {
+    check(options?: {
+        target?: TTarget;
+        settings?: CheckSettings<TElement, TSelector>;
+        logger?: Logger;
+    }): Promise<AutomationCore.CheckResult[]>;
+    checkAndClose(options: {
+        target?: TTarget;
+        settings?: CheckSettings<TElement, TSelector> & AutomationCore.CloseSettings;
+        logger?: Logger;
+    }): Promise<AutomationCore.TestResult[]>;
+}
+export declare type OpenSettings = AutomationCore.OpenSettings & {
+    keepPlatformNameAsIs?: boolean;
+    useCeilForViewportSize?: boolean;
+};
+export declare type CheckSettings<TElement, TSelector> = AutomationCore.CheckSettings<TElement, TSelector> & {
+    retryTimeout?: number;
+};

package/types/classic/utils/transform-check-settings.d.ts

@@ -1,5 +1,5 @@
-import type { CheckSettings as BaseCheckSettings } from '@applitools/types/base';
-import type { CheckSettings } from '@applitools/types/classic';
+import type { CheckSettings } from '../types';
+import type { CheckSettings as BaseCheckSettings } from '@applitools/core-base';
 import { type Logger } from '@applitools/logger';
 import { type Context } from '@applitools/driver';
 import { type Screenshot } from '../../automation/utils/take-screenshot';

package/types/close-batch.d.ts

@@ -1,5 +1,6 @@
-import type { MaybeArray, CloseBatchSettings } from '@applitools/types';
-import type { Core as BaseCore } from '@applitools/types/base';
+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 = {
     core: BaseCore;

package/types/close-manager.d.ts

@@ -1,5 +1,5 @@
-import type { Eyes, TestResult, TestResultSummary } from '@applitools/types';
-import type { Core as BaseCore } from '@applitools/types/base';
+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'> = {
     core: BaseCore<unknown>;

package/types/close.d.ts

@@ -1,6 +1,6 @@
-import type { Config, CloseSettings, TestResult } from '@applitools/types';
-import type { Eyes as ClassicEyes } from '@applitools/types/classic';
-import type { Eyes as UFGEyes } from '@applitools/types/ufg';
+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>;

package/types/core.d.ts

@@ -1,6 +1,6 @@
-import type { SpecDriver } from '@applitools/types';
-import type { Core as BaseCore } from '@applitools/types/base';
-import type { Core } from '@applitools/types';
+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> = {
     spec: SpecDriver<TDriver, TContext, TElement, TSelector>;

package/types/delete-test.d.ts

@@ -1,5 +1,6 @@
-import type { MaybeArray, DeleteTestSettings } from '@applitools/types';
-import type { Core as BaseCore } from '@applitools/types/base';
+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 = {
     core: BaseCore;

package/types/errors/test-error.d.ts

@@ -1,4 +1,4 @@
-import type { TestResult } from '@applitools/types/base';
+import type { TestResult } from '@applitools/core-base';
 import { CoreError } from '@applitools/core-base';
 export declare class TestError extends CoreError {
     constructor(result: TestResult);

package/types/extract-text.d.ts

@@ -1,6 +1,7 @@
-import type { MaybeArray, Target, Config, ExtractTextSettings } from '@applitools/types';
-import type { Eyes as ClassicEyes } from '@applitools/types/classic';
-import type { Eyes as UFGEyes } from '@applitools/types/ufg';
+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 Logger } from '@applitools/logger';
 declare type Options<TDriver, TElement, TSelector> = {
     eyes: ClassicEyes<TDriver, TElement, TSelector> | UFGEyes<TDriver, TElement, TSelector>;

package/types/index.d.ts

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

package/types/locate-text.d.ts

@@ -1,6 +1,6 @@
-import type { TextRegion, Target, Config, LocateTextSettings } from '@applitools/types';
-import type { Eyes as ClassicEyes } from '@applitools/types/classic';
-import type { Eyes as UFGEyes } from '@applitools/types/ufg';
+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 Logger } from '@applitools/logger';
 declare type Options<TDriver, TElement, TSelector> = {
     eyes: ClassicEyes<TDriver, TElement, TSelector> | UFGEyes<TDriver, TElement, TSelector>;
@@ -11,5 +11,5 @@ export declare function makeLocateText<TDriver, TElement, TSelector, TType exten
     settings: LocateTextSettings<TPattern, TElement, TSelector, TType>;
     config?: Config<TElement, TSelector, TType>;
     logger?: Logger;
-}) => Promise<Record<TPattern, TextRegion[]>>;
+}) => Promise<LocateTextResult<TPattern>>;
 export {};

package/types/locate.d.ts

@@ -1,7 +1,9 @@
-import type { Region, SpecDriver, Config, LocateSettings } from '@applitools/types';
-import type { Core as BaseCore } from '@applitools/types/base';
-import type { Screenshot } from '@applitools/types/classic';
+import type { Region } from '@applitools/utils';
+import type { 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> = {
     spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
     core: BaseCore;

package/types/make-manager.d.ts

@@ -1,6 +1,7 @@
-import type { EyesManager, SpecDriver } from '@applitools/types';
-import type { Core as BaseCore } from '@applitools/types/base';
+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> = {
     spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
     core?: BaseCore;

package/types/open-eyes.d.ts

@@ -1,8 +1,9 @@
-import type { Eyes, Config, OpenSettings, SpecDriver } from '@applitools/types';
-import type { Core as ClassicCore } from '@applitools/types/classic';
-import type { Core as UFGCore } from '@applitools/types/ufg';
-import type { Core as BaseCore } from '@applitools/types/base';
+import type { Eyes, Config, OpenSettings } 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>;
@@ -15,5 +16,5 @@ export declare function makeOpenEyes<TDriver, TContext, TElement, TSelector>({ s
     settings?: Partial<OpenSettings<TType>>;
     config?: Config<TElement, TSelector, TType>;
     logger?: Logger;
-}) => Promise<Eyes<TDriver, TElement, TSelector, TType, import("@applitools/types").Target<TDriver, TType>>>;
+}) => Promise<Eyes<TDriver, TElement, TSelector, TType, import("./types").Target<TDriver, TType>>>;
 export {};

package/types/troubleshoot/check-network.d.ts

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 /// <reference types="node" />
 export declare function checkNetwork({ stream, eyes, ufg }?: {
     stream?: NodeJS.WriteStream;

package/types/types.d.ts

@@ -0,0 +1,126 @@
+import type { MaybeArray } from '@applitools/utils';
+import type * as AutomationCore from './automation/types';
+import type * as ClassicCore from './classic/types';
+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 interface Core<TDriver, TElement, TSelector> extends AutomationCore.Core<TDriver, TElement, TSelector> {
+    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>>;
+    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'> {
+    openEyes(options: {
+        target?: TDriver;
+        settings?: Partial<OpenSettings<TType>>;
+        config?: Config<TElement, TSelector, TType>;
+        logger?: Logger;
+    }): Promise<Eyes<TDriver, TElement, TSelector, TType>>;
+    closeManager: (options?: {
+        settings?: {
+            throwErr?: boolean;
+        };
+        logger?: Logger;
+    }) => Promise<TestResultSummary<TType>>;
+}
+export interface ClassicEyes<TDriver, TElement, TSelector, TTarget = Target<TDriver, 'classic'>> extends ClassicCore.Eyes<TDriver, TElement, TSelector, TTarget> {
+    check(options: {
+        target?: TTarget;
+        settings?: Partial<CheckSettings<TElement, TSelector, 'classic'>>;
+        config?: Config<TElement, TSelector, 'classic'>;
+        logger?: Logger;
+    }): Promise<CheckResult<'classic'>[]>;
+    checkAndClose(options: {
+        target?: TTarget;
+        settings?: Partial<CheckSettings<TElement, TSelector, 'classic'> & CloseSettings<'classic'>>;
+        config?: Config<TElement, TSelector, 'classic'>;
+        logger?: Logger;
+    }): Promise<TestResult<'classic'>[]>;
+    locateText<TPattern extends string>(options: {
+        target?: TTarget;
+        settings: Partial<LocateTextSettings<TPattern, TElement, TSelector, 'classic'>>;
+        config?: Config<TElement, TSelector, 'classic'>;
+        logger?: Logger;
+    }): Promise<AutomationCore.LocateTextResult<TPattern>>;
+    extractText(options: {
+        target?: TTarget;
+        settings: MaybeArray<Partial<ExtractTextSettings<TElement, TSelector, 'classic'>>>;
+        config?: Config<TElement, TSelector, 'classic'>;
+        logger?: Logger;
+    }): Promise<string[]>;
+    close(options?: {
+        settings?: Partial<CloseSettings<'classic'>>;
+        config?: Config<TElement, TSelector, 'classic'>;
+        logger?: Logger;
+    }): Promise<TestResult<'classic'>[]>;
+}
+export interface UFGEyes<TDriver, TElement, TSelector, TTarget = Target<TDriver, 'ufg'>> extends UFGCore.Eyes<TDriver, TElement, TSelector, TTarget> {
+    check(options: {
+        target?: TTarget;
+        settings?: Partial<CheckSettings<TElement, TSelector, 'ufg'>>;
+        config?: Config<TElement, TSelector, 'ufg'>;
+        logger?: Logger;
+    }): Promise<CheckResult<'ufg'>[]>;
+    checkAndClose(options: {
+        target?: TTarget;
+        settings?: Partial<CheckSettings<TElement, TSelector, 'ufg'> & CloseSettings<'ufg'>>;
+        config?: Config<TElement, TSelector, 'ufg'>;
+        logger?: Logger;
+    }): Promise<TestResult<'ufg'>[]>;
+    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 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) & {
+    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 interface TestResultContainer<TType extends 'classic' | 'ufg'> {
+    readonly error?: Error;
+    readonly result?: TestResult<TType>;
+    readonly renderer?: TType extends 'ufg' ? Renderer : never;
+    readonly userTestId?: string;
+}
+export interface TestResultSummary<TType extends 'classic' | 'ufg'> {
+    readonly results: TestResultContainer<TType>[];
+    readonly passed: number;
+    readonly unresolved: number;
+    readonly failed: number;
+    readonly exceptions: number;
+    readonly mismatches: number;
+    readonly missing: number;
+    readonly matches: number;
+}

package/types/ufg/abort.d.ts

@@ -1,7 +1,7 @@
-import type { Renderer } from '@applitools/types';
-import type { Eyes as BaseEyes } from '@applitools/types/base';
-import type { TestResult } from '@applitools/types/ufg';
+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 = {
     storage: {

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

@@ -1,7 +1,7 @@
-import type { SpecDriver } from '@applitools/types';
-import type { Eyes as BaseEyes } from '@applitools/types/base';
-import type { Target, TestInfo } from '@applitools/types/ufg';
+import type { Target, TestInfo } from './types';
+import type { Eyes as BaseEyes } from '@applitools/core-base';
 import { type Logger } from '@applitools/logger';
+import { type SpecDriver } from '@applitools/driver';
 import { type UFGClient } from '@applitools/ufg-client';
 declare type Options<TDriver, TContext, TElement, TSelector> = {
     getEyes: (options: {

package/types/ufg/check.d.ts

@@ -1,9 +1,9 @@
-import type { SpecDriver } from '@applitools/types';
-import type { Eyes as BaseEyes } from '@applitools/types/base';
-import type { Target, TestInfo, CheckSettings, CheckResult } from '@applitools/types/ufg';
+import type { Target, TestInfo, CheckSettings, CheckResult } from './types';
+import type { Eyes as BaseEyes } from '@applitools/core-base';
 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';
 declare type Options<TDriver, TContext, TElement, TSelector> = {
     getEyes: (options: {
         rawEnvironment: any;

package/types/ufg/close.d.ts

@@ -1,7 +1,7 @@
-import type { Renderer } from '@applitools/types';
-import type { Eyes as BaseEyes } from '@applitools/types/base';
-import type { CloseSettings, TestResult } from '@applitools/types/ufg';
+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 = {
     storage: {
         renderer: Renderer;

package/types/ufg/core.d.ts

@@ -1,7 +1,7 @@
-import type { SpecDriver } from '@applitools/types';
-import type { Core as BaseCore } from '@applitools/types/base';
-import type { Core } from '@applitools/types/ufg';
+import type { Core } from './types';
+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> = {
     concurrency: number;

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

@@ -1,7 +1,7 @@
-import type { SpecDriver } from '@applitools/types';
-import type { Core as BaseCore } from '@applitools/types/base';
-import type { Eyes, Target, OpenSettings } from '@applitools/types/ufg';
+import type { Eyes, Target, OpenSettings } from './types';
+import type { Core as BaseCore } from '@applitools/core-base';
 import { type Logger } from '@applitools/logger';
+import { type SpecDriver } from '@applitools/driver';
 import { type UFGClient } from '@applitools/ufg-client';
 declare type Options<TDriver, TContext, TElement, TSelector> = {
     core: BaseCore;

package/types/ufg/types.d.ts

@@ -0,0 +1,58 @@
+import type { MaybeArray } from '@applitools/utils';
+import type * as AutomationCore from '../automation/types';
+import { type Logger } from '@applitools/logger';
+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>> {
+    readonly type: 'ufg';
+    openEyes(options: {
+        target?: TDriver;
+        settings: OpenSettings;
+        logger?: Logger;
+    }): Promise<Eyes<TDriver, TElement, TSelector>>;
+}
+export interface Eyes<TDriver, TElement, TSelector, TTarget = Target<TDriver>> extends AutomationCore.Eyes<TDriver, TElement, TSelector, TTarget> {
+    check(options?: {
+        target?: TTarget;
+        settings?: CheckSettings<TElement, TSelector>;
+        logger?: Logger;
+    }): Promise<CheckResult[]>;
+    checkAndClose(options?: {
+        target?: TTarget;
+        settings?: CheckSettings<TElement, TSelector> & AutomationCore.CloseSettings;
+        logger?: Logger;
+    }): Promise<TestResult[]>;
+    locateText?: never;
+    extractText?: never;
+    close(options?: {
+        settings?: AutomationCore.CloseSettings;
+        logger?: Logger;
+    }): Promise<TestResult[]>;
+    abort(options?: {
+        logger?: Logger;
+    }): Promise<TestResult[]>;
+}
+export declare type OpenSettings = AutomationCore.OpenSettings & {
+    renderConcurrency?: number;
+};
+export declare type CheckSettings<TElement, TSelector> = AutomationCore.CheckSettings<TElement, TSelector> & {
+    renderers?: Renderer[];
+    hooks?: {
+        beforeCaptureScreenshot: string;
+    };
+    disableBrowserFetching?: boolean;
+    layoutBreakpoints?: boolean | number[];
+    ufgOptions?: Record<string, any>;
+    autProxy?: Proxy & {
+        mode?: 'Allow' | 'Block';
+        domains?: string[];
+    };
+};
+export declare type CheckResult = AutomationCore.CheckResult & {
+    readonly renderer?: Renderer;
+};
+export declare type TestResult = AutomationCore.TestResult & {
+    readonly renderer?: Renderer;
+};

package/types/ufg/utils/generate-safe-selectors.d.ts

@@ -1,5 +1,4 @@
-import type { Selector } from '@applitools/types';
-import { type Context } from '@applitools/driver';
+import { type Context, type Selector } from '@applitools/driver';
 export declare function generateSafeSelectors<TElement, TSelector>({ context, elementReferences, }: {
     context: Context<unknown, unknown, TElement, TSelector>;
     elementReferences: (TElement | Selector<TSelector>)[];

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

@@ -1,6 +1,6 @@
-import type { DomSnapshot } from '@applitools/types/ufg';
 import { type Logger } from '@applitools/logger';
 import { type Context } from '@applitools/driver';
+import { type DomSnapshot } from '@applitools/ufg-client';
 import { type PollScriptSettings } from '../../utils/execute-poll-script';
 export declare type DomSnapshotSettings = Partial<PollScriptSettings> & {
     disableBrowserFetching?: boolean;

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

@@ -1,7 +1,7 @@
-import type { Size, Renderer, ChromeEmulationDevice, IOSDevice, ScreenOrientation } from '@applitools/types';
-import type { DomSnapshot } from '@applitools/types/ufg';
+import type { Size } from '@applitools/utils';
 import { type Logger } from '@applitools/logger';
 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 & {

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

@@ -1,7 +1,7 @@
-import type { Size, ChromeEmulationDevice, IOSDevice, ScreenOrientation } from '@applitools/types';
-import type { DomSnapshot, AndroidVHS, IOSVHS } from '@applitools/types/ufg';
+import type { Size } from '@applitools/utils';
 import { type Logger } from '@applitools/logger';
 import { type Driver } from '@applitools/driver';
+import { type DomSnapshot, type AndroidSnapshot, type IOSSnapshot, type ChromeEmulationDevice, type IOSDevice, type ScreenOrientation } from '@applitools/ufg-client';
 import { type DomSnapshotsSettings } from './take-dom-snapshots';
 import { type VHSesSettings } from './take-vhses';
 export * from './take-dom-snapshots';
@@ -18,4 +18,4 @@ export declare function takeSnapshots<TDriver extends Driver<unknown, unknown, u
         getIOSDevices(): Promise<Record<IOSDevice, Record<ScreenOrientation, Size>>>;
     };
     logger?: Logger;
-}): Promise<DomSnapshot[] | AndroidVHS[] | IOSVHS[]>;
+}): Promise<DomSnapshot[] | AndroidSnapshot[] | IOSSnapshot[]>;

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

@@ -1,7 +1,7 @@
-import type { Renderer } from '@applitools/types';
-import type { ServerSettings, AndroidVHS, IOSVHS } from '@applitools/types/ufg';
+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 & {
     renderers: Renderer[];
     waitBeforeCapture?: number;
@@ -14,4 +14,4 @@ export declare function takeVHSes<TDriver extends Driver<unknown, unknown, unkno
         beforeEachSnapshot?(): void | Promise<void>;
     };
     logger: Logger;
-}): Promise<AndroidVHS[] | IOSVHS[]>;
+}): Promise<AndroidSnapshot[] | IOSSnapshot[]>;

package/types/utils/format-results.d.ts

@@ -1,4 +1,4 @@
-import type { TestResult } from '@applitools/types/base';
+import type { TestResult } from '@applitools/core-base';
 export declare function toFormatterString(results: TestResult[], { includeSubTests, markNewAsPassed }?: {
     includeSubTests?: boolean;
     markNewAsPassed?: boolean;

package/types/utils/to-base-check-settings.d.ts

@@ -1,7 +1,8 @@
-import { Region, Selector } from '@applitools/types';
-import { CheckSettings as BaseCheckSettings } from '@applitools/types/base';
-import { CheckSettings as ClassicCheckSettings } from '@applitools/types/classic';
-import { CheckSettings as UFGCheckSettings } from '@applitools/types/ufg';
+import type { Region } from '@applitools/utils';
+import type { CheckSettings as BaseCheckSettings } from '@applitools/core-base';
+import type { CheckSettings as UFGCheckSettings } from '../ufg/types';
+import type { CheckSettings as ClassicCheckSettings } from '../ufg/types';
+import { type Selector } from '@applitools/driver';
 export declare function toBaseCheckSettings<TElement, TSelector>({ settings, }: {
     settings: ClassicCheckSettings<TElement, TSelector> | UFGCheckSettings<TElement, TSelector>;
 }): {