@applitools/core 1.4.6 → 2.0.0

package/dist/utils/format-results.js

@@ -4,13 +4,13 @@ exports.toJsonOutput = exports.toXmlOutput = exports.toFlattenedTAPString = expo
 const OK = 'ok';
 const NOT_OK = 'not ok';
 function toFormatterString(results, { includeSubTests = true, markNewAsPassed = false } = {}) {
-    if (results.length === 0) {
+    var _a;
+    if (results.length === 0)
         return 'No results found.';
-    }
     let formattedString = '[EYES: TEST RESULTS]:\n';
-    for (let i = 0; i < results.length; i += 1) {
-        /** @type {TestResults} */ const currentResult = results[i];
-        const testTitle = `${currentResult.name} [${currentResult.hostDisplaySize.width}x${currentResult.hostDisplaySize.height}]`;
+    results.forEach(currentResult => {
+        var _a, _b, _c, _d;
+        const testTitle = `${currentResult.name} [${(_a = currentResult.hostDisplaySize) === null || _a === void 0 ? void 0 : _a.width}x${(_b = currentResult.hostDisplaySize) === null || _b === void 0 ? void 0 : _b.height}]`;
         let testResult = '';
         if (currentResult.isNew) {
             testResult = markNewAsPassed ? 'Passed' : 'New';
@@ -19,39 +19,35 @@ function toFormatterString(results, { includeSubTests = true, markNewAsPassed =
             testResult = 'Passed';
         }
         else {
-            const stepsFailed = currentResult.mismatches + currentResult.missing;
+            const stepsFailed = ((_c = currentResult.mismatches) !== null && _c !== void 0 ? _c : 0) + ((_d = currentResult.missing) !== null && _d !== void 0 ? _d : 0);
             testResult = `Failed ${stepsFailed} of ${currentResult.steps}`;
         }
         formattedString += `${testTitle} - ${testResult}\n`;
         if (includeSubTests) {
-            if (currentResult.stepsInfo.length > 0) {
-                for (let j = 0; j < currentResult.stepsInfo.length; j += 1) {
-                    const currentStep = currentResult.stepsInfo[j];
+            if (currentResult.stepsInfo && currentResult.stepsInfo.length > 0) {
+                currentResult.stepsInfo.forEach(currentStep => {
                     const subTestTitle = currentStep.name;
                     const subTestResult = currentStep.isDifferent ? 'Passed' : 'Failed';
                     formattedString += `\t> ${subTestTitle} - ${subTestResult}\n`;
-                }
+                });
             }
             else {
                 formattedString += '\tNo steps exist for this test.\n';
             }
         }
-    }
-    formattedString += `See details at ${results[0].appUrls.batch}`;
+    });
+    formattedString += `See details at ${(_a = results[0].appUrls) === null || _a === void 0 ? void 0 : _a.batch}`;
     return formattedString;
 }
 exports.toFormatterString = toFormatterString;
 function toHierarchicTAPString(results, { includeSubTests = true, markNewAsPassed = false } = {}) {
-    if (results.length === 0) {
+    if (results.length === 0)
         return '';
-    }
     let tapString = `1..${results.length}\n`;
-    for (let i = 0; i < results.length; i += 1) {
-        /** @type {TestResults} */ const currentResult = results[i];
-        const tapIndex = i + 1;
-        if (i > 0) {
+    results.forEach((currentResult, index) => {
+        if (index > 0)
             tapString += '#\n';
-        }
+        const tapIndex = index + 1;
         const name = `Test: '${currentResult.name}', Application: '${currentResult.appName}'`;
         if (!currentResult.isDifferent) {
             tapString += `${OK} ${tapIndex} - [PASSED TEST] ${name}\n`;
@@ -73,24 +69,26 @@ function toHierarchicTAPString(results, { includeSubTests = true, markNewAsPasse
             }
             tapString += `#\tMismatches: ${currentResult.mismatches}\n`;
         }
-        const url = currentResult.appUrls && currentResult.appUrls.session ? currentResult.appUrls.session : "No URL (session didn't start).";
+        const url = currentResult.appUrls && currentResult.appUrls.session
+            ? currentResult.appUrls.session
+            : "No URL (session didn't start).";
         tapString += `#\tTest url: ${url}\n`;
         tapString += `#\tBrowser: ${currentResult.hostApp}, Viewport: ${currentResult.hostDisplaySize}\n`;
         if (includeSubTests) {
-            if (currentResult.stepsInfo.length > 0) {
+            if (currentResult.stepsInfo && currentResult.stepsInfo.length > 0) {
                 tapString += `\t1..${currentResult.stepsInfo.length}\n`;
-                for (let j = 0; j < currentResult.stepsInfo.length; j += 1) {
-                    const currentStep = currentResult.stepsInfo[j];
+                currentResult.stepsInfo.forEach(currentStep => {
+                    var _a;
                     tapString += '\t';
                     tapString += currentStep.isDifferent ? NOT_OK : OK;
-                    tapString += ` '${currentStep.name}', URL: ${currentStep.appUrls.step}\n`;
-                }
+                    tapString += ` '${currentStep.name}', URL: ${(_a = currentStep.appUrls) === null || _a === void 0 ? void 0 : _a.step}\n`;
+                });
             }
             else {
                 tapString += '\tNo steps exist for this test.\n';
             }
         }
-    }
+    });
     return tapString;
 }
 exports.toHierarchicTAPString = toHierarchicTAPString;
@@ -98,10 +96,9 @@ function toFlattenedTAPString(results, { markNewAsPassed = false } = {}) {
     let tapString = '';
     let stepsCounter = 0;
     // We'll add the TAP plan at the beginning, after we calculate the total number of steps.
-    for (let i = 0; i < results.length; i += 1) {
+    results.forEach((currentResult, index) => {
         tapString += '#\n';
-        /** @type {TestResults} */ const currentResult = results[i];
-        const tapIndex = i + 1;
+        const tapIndex = index + 1;
         const name = `Test: '${currentResult.name}', Application: '${currentResult.appName}'`;
         if (!currentResult.isDifferent) {
             tapString += `# ${OK} ${tapIndex} - [PASSED TEST] ${name}\n`;
@@ -123,20 +120,22 @@ function toFlattenedTAPString(results, { markNewAsPassed = false } = {}) {
             }
             tapString += `#\tMismatches: ${currentResult.mismatches}\n`;
         }
-        const url = currentResult.appUrls && currentResult.appUrls.session ? currentResult.appUrls.session : "No URL (session didn't start).";
+        const url = currentResult.appUrls && currentResult.appUrls.session
+            ? currentResult.appUrls.session
+            : "No URL (session didn't start).";
         tapString += `#\tTest url: ${url}\n`;
-        if (currentResult.stepsInfo.length > 0) {
-            for (let j = 0; j < currentResult.stepsInfo.length; j += 1) {
+        if (currentResult.stepsInfo && currentResult.stepsInfo.length > 0) {
+            currentResult.stepsInfo.forEach(currentStep => {
+                var _a;
                 stepsCounter += 1;
-                const currentStep = currentResult.stepsInfo[j];
                 tapString += currentStep.isDifferent ? NOT_OK : OK;
-                tapString += ` ${stepsCounter} '${currentStep.name}', URL: ${currentStep.appUrls.step}\n`;
-            }
+                tapString += ` ${stepsCounter} '${currentStep.name}', URL: ${(_a = currentStep.appUrls) === null || _a === void 0 ? void 0 : _a.step}\n`;
+            });
         }
         else {
             tapString += '#\tNo steps exist for this test.\n';
         }
-    }
+    });
     if (stepsCounter > 0) {
         tapString = `1..${stepsCounter}\n${tapString}`;
     }
@@ -148,6 +147,7 @@ function toXmlOutput(results, { totalTime } = {}) {
     let output = `<?xml version="1.0" encoding="UTF-8" ?>`;
     output += `\n<testsuite name="${suiteName}" tests="${results.length}" time="${totalTime}">`;
     results.forEach(result => {
+        var _a;
         output += `\n<testcase name="${result.name}"${result.duration ? ` time="${result.duration}"` : ''}>`;
         const properties = {};
         if (result.hostOS)
@@ -165,7 +165,7 @@ function toXmlOutput(results, { totalTime } = {}) {
         }
         if (result.isDifferent) {
             output += `\n<failure>`;
-            output += `\nDifference found. See ${result.appUrls.batch} for details.`;
+            output += `\nDifference found. See ${(_a = result.appUrls) === null || _a === void 0 ? void 0 : _a.batch} for details.`;
             output += `\n</failure>`;
         }
         else if (result.isAborted) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/core",
-  "version": "1.4.6",
+  "version": "2.0.0",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -40,74 +40,57 @@
     "types"
   ],
   "scripts": {
-    "lint": "eslint '**/*.ts'",
-    "build": "tsc --project ./tsconfig.build.json",
+    "lint": "node ../../node_modules/.bin/eslint '**/*.ts'",
+    "build": "node ../../node_modules/.bin/tsc --project ./tsconfig.build.json",
     "test": "mocha --no-timeouts -r ts-node/register --parallel --jobs 15 './test/**/*.spec.ts'",
     "test:sanity": "yarn test:unit",
     "test:e2e": "mocha --no-timeouts -r ts-node/register --parallel --jobs 15 './test/e2e/**/*.spec.ts'",
     "test:it": "mocha --no-timeouts -r ts-node/register './test/it/**/*.spec.ts'",
     "test:unit": "mocha --no-timeouts -r ts-node/register './test/unit/**/*.spec.ts'",
     "setup": "yarn docker:setup",
-    "docker:setup": "node ../scripts/scripts/generate-docker-compose-config.js && docker-compose up -d",
+    "docker:setup": "node ../../scripts/generate-docker-compose-config.js && docker-compose up -d",
     "docker:teardown": "docker-compose down",
     "deps": "bongo deps",
     "preversion": "bongo preversion",
     "version": "bongo version",
     "postversion": "bongo postversion --skip-release-notification"
   },
-  "husky": {
-    "hooks": {
-      "pre-push": "yarn bongo lint"
-    }
-  },
   "dependencies": {
-    "@applitools/core-base": "1.1.32",
+    "@applitools/core-base": "1.1.34",
     "@applitools/dom-capture": "11.2.1",
     "@applitools/dom-snapshot": "4.7.3",
-    "@applitools/driver": "1.11.26",
-    "@applitools/logger": "1.1.42",
-    "@applitools/nml-client": "1.3.29",
-    "@applitools/req": "1.1.28",
-    "@applitools/screenshoter": "3.7.23",
-    "@applitools/snippets": "2.4.14",
-    "@applitools/ufg-client": "1.1.22",
-    "@applitools/utils": "1.3.28",
+    "@applitools/driver": "1.11.29",
+    "@applitools/logger": "1.1.45",
+    "@applitools/nml-client": "1.3.32",
+    "@applitools/req": "1.1.30",
+    "@applitools/screenshoter": "3.7.25",
+    "@applitools/snippets": "2.4.15",
+    "@applitools/ufg-client": "1.1.24",
+    "@applitools/utils": "1.3.30",
     "abort-controller": "3.0.0",
     "chalk": "4.1.2",
     "node-fetch": "2.6.7",
     "throat": "6.0.1"
   },
   "optionalDependencies": {
-    "@applitools/ec-client": "^1.2.5"
+    "@applitools/ec-client": "1.2.6"
   },
   "devDependencies": {
     "@applitools/bongo": "^2.2.2",
-    "@applitools/sdk-fake-eyes-server": "^2.1.3",
-    "@applitools/spec-driver-puppeteer": "^1.1.38",
-    "@applitools/spec-driver-selenium": "^1.5.25",
-    "@applitools/spec-driver-webdriverio": "^1.4.22",
-    "@applitools/test-server": "^1.1.22",
-    "@applitools/test-utils": "^1.5.10",
+    "@applitools/spec-driver-puppeteer": "^1.1.40",
+    "@applitools/spec-driver-selenium": "^1.5.27",
+    "@applitools/spec-driver-webdriverio": "^1.4.24",
+    "@applitools/test-server": "^1.1.24",
+    "@applitools/test-utils": "^1.5.12",
     "@types/mocha": "^9.1.1",
     "@types/node": "12",
     "@types/selenium-webdriver": "^4.1.2",
-    "@typescript-eslint/eslint-plugin": "^5.38.0",
-    "@typescript-eslint/parser": "^5.38.0",
     "chromedriver": "^106.0.0",
-    "eslint": "^8.23.1",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-no-only-tests": "^3.0.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "husky": "^4.3.7",
     "mocha": "^10.0.0",
     "nock": "^13.2.8",
     "png-async": "^0.9.4",
-    "prettier": "^2.6.2",
     "puppeteer": "^16.2.0",
     "selenium-webdriver": "4.4",
-    "ts-node": "^10.7.0",
-    "typescript": "^4.9.4",
     "webdriverio": "^7.25.0"
   },
   "engines": {

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

@@ -0,0 +1,16 @@
+import type { MaybeArray } from '@applitools/utils';
+import type { DriverTarget, ImageTarget, ExtractTextSettings } from '../classic/types';
+import type { Core as BaseCore } from '@applitools/core-base';
+import { type Logger } from '@applitools/logger';
+import { type SpecType, type SpecDriver } from '@applitools/driver';
+type Options<TSpec extends SpecType> = {
+    core: BaseCore;
+    spec?: SpecDriver<TSpec>;
+    logger: Logger;
+};
+export declare function makeExtractText<TSpec extends SpecType>({ core, spec, logger: defaultLogger }: Options<TSpec>): ({ target, settings, logger, }: {
+    target: DriverTarget<TSpec> | ImageTarget;
+    settings: MaybeArray<ExtractTextSettings<TSpec>>;
+    logger?: Logger | undefined;
+}) => Promise<string[]>;
+export {};

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

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

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

@@ -0,0 +1,15 @@
+import type { DriverTarget, ImageTarget, LocateTextSettings, LocateTextResult } from './types';
+import type { Core as BaseCore } from '@applitools/core-base';
+import { type Logger } from '@applitools/logger';
+import { type SpecType, type SpecDriver } from '@applitools/driver';
+type Options<TSpec extends SpecType> = {
+    core: BaseCore;
+    spec?: SpecDriver<TSpec>;
+    logger: Logger;
+};
+export declare function makeLocateText<TSpec extends SpecType>({ core, spec, logger: defaultLogger }: Options<TSpec>): <TPattern extends string>({ target, settings, logger, }: {
+    target: DriverTarget<TSpec> | ImageTarget;
+    settings: LocateTextSettings<TPattern, TSpec>;
+    logger?: Logger | undefined;
+}) => Promise<LocateTextResult<TPattern>>;
+export {};

package/types/automation/locate.d.ts

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

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

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

package/types/automation/types.d.ts

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

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

@@ -1,19 +1,19 @@
 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 type Screenshot = {
+import { type Driver, type Element, type ElementReference, type SpecType } from '@applitools/driver';
+export type Screenshot<TSpec extends SpecType> = {
     image: any;
     region: Region;
-    element: Element<unknown, unknown, unknown, unknown>;
-    scrollingElement: Element<unknown, unknown, unknown, unknown>;
+    element: Element<TSpec>;
+    scrollingElement: Element<TSpec>;
     restoreState(): Promise<void>;
     calculatedRegions: [];
 };
-export declare function takeScreenshot<TDriver, TContext, TElement, TSelector>({ driver, settings, logger, }: {
-    driver: Driver<TDriver, TContext, TElement, TSelector>;
-    settings: ScreenshotSettings<TElement, TSelector> & {
-        regionsToCalculate?: any[];
+export declare function takeScreenshot<TSpec extends SpecType>({ driver, settings, logger, }: {
+    driver: Driver<TSpec>;
+    settings: ScreenshotSettings<TSpec> & {
+        regionsToCalculate?: ElementReference<TSpec>[];
     };
     logger: Logger;
-}): Promise<Screenshot>;
+}): Promise<Screenshot<TSpec>>;

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

@@ -0,0 +1,17 @@
+import type { Region } from '@applitools/utils';
+import type { CheckSettings } from '../types';
+import type { CheckSettings as BaseCheckSettings } from '@applitools/core-base';
+import { type SpecType, type ElementReference, type Selector } from '@applitools/driver';
+export declare function toBaseCheckSettings<TSpec extends SpecType>({ settings }: {
+    settings: CheckSettings<TSpec>;
+}): {
+    elementReferencesToCalculate: ElementReference<TSpec>[];
+    elementReferenceToTarget: ElementReference<TSpec> | undefined;
+    getBaseCheckSettings: ({ calculatedRegions, preserveTransformation, }: {
+        calculatedRegions: {
+            selector?: Selector;
+            regions: Region[];
+        }[];
+        preserveTransformation?: boolean | undefined;
+    }) => BaseCheckSettings;
+};

package/types/{utils → automation/utils}/wait-for-lazy-load.d.ts

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

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

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

package/types/check.d.ts

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