@applitools/core 1.2.5 → 1.2.7

package/dist/automation/utils/take-screenshot.js

@@ -52,6 +52,7 @@ async function takeScreenshot({ driver, settings, logger, }) {
         },
         debug: settings.debugImages,
         logger,
+        regionsToCalculate: settings.regionsToCalculate,
     });
 }
 exports.takeScreenshot = takeScreenshot;

package/dist/classic/check-and-close.js

@@ -27,7 +27,7 @@ exports.makeCheckAndClose = void 0;
 const driver_1 = require("@applitools/driver");
 const take_screenshot_1 = require("../automation/utils/take-screenshot");
 const take_dom_capture_1 = require("./utils/take-dom-capture");
-const transform_check_settings_1 = require("./utils/transform-check-settings");
+const to_base_check_settings_1 = require("../utils/to-base-check-settings");
 const wait_for_lazy_load_1 = require("../utils/wait-for-lazy-load");
 const utils = __importStar(require("@applitools/utils"));
 function makeCheckAndClose({ spec, eyes, target: defaultTarget, logger: defaultLogger, }) {
@@ -40,7 +40,12 @@ function makeCheckAndClose({ spec, eyes, target: defaultTarget, logger: defaultL
         const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
         if (settings.lazyLoad)
             await (0, wait_for_lazy_load_1.waitForLazyLoad)({ driver, settings: settings.lazyLoad !== true ? settings.lazyLoad : {}, logger });
-        const screenshot = await (0, take_screenshot_1.takeScreenshot)({ driver, settings, logger });
+        const { elementReferencesToCalculate, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({ settings });
+        const screenshot = await (0, take_screenshot_1.takeScreenshot)({
+            driver,
+            settings: { ...settings, regionsToCalculate: elementReferencesToCalculate },
+            logger,
+        });
         const baseTarget = {
             name: await driver.getTitle(),
             source: await driver.getUrl(),
@@ -48,7 +53,7 @@ function makeCheckAndClose({ spec, eyes, target: defaultTarget, logger: defaultL
             locationInViewport: utils.geometry.location(screenshot.region),
             isTransformed: true,
         };
-        const baseSettings = await (0, transform_check_settings_1.transformCheckSettings)({ context: driver.currentContext, screenshot, settings, logger });
+        const baseSettings = getBaseCheckSettings({ calculatedRegions: screenshot.calculatedRegions });
         if (driver.isWeb && settings.sendDom) {
             if (settings.fully)
                 await screenshot.scrollingElement.setAttribute('data-applitools-scroll', 'true');

package/dist/classic/check.js

@@ -27,7 +27,7 @@ exports.makeCheck = void 0;
 const driver_1 = require("@applitools/driver");
 const take_screenshot_1 = require("../automation/utils/take-screenshot");
 const take_dom_capture_1 = require("./utils/take-dom-capture");
-const transform_check_settings_1 = require("./utils/transform-check-settings");
+const to_base_check_settings_1 = require("../utils/to-base-check-settings");
 const wait_for_lazy_load_1 = require("../utils/wait-for-lazy-load");
 const utils = __importStar(require("@applitools/utils"));
 function makeCheck({ spec, eyes, target: defaultTarget, logger: defaultLogger, }) {
@@ -48,8 +48,13 @@ function makeCheck({ spec, eyes, target: defaultTarget, logger: defaultLogger, }
         let baseTarget;
         let baseSettings;
         let results;
+        const { elementReferencesToCalculate, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({ settings });
         do {
-            const screenshot = await (0, take_screenshot_1.takeScreenshot)({ driver, settings, logger });
+            const screenshot = await (0, take_screenshot_1.takeScreenshot)({
+                driver,
+                settings: { ...settings, regionsToCalculate: elementReferencesToCalculate },
+                logger,
+            });
             baseTarget = {
                 name: await driver.getTitle(),
                 source: await driver.getUrl(),
@@ -57,7 +62,7 @@ function makeCheck({ spec, eyes, target: defaultTarget, logger: defaultLogger, }
                 locationInViewport: utils.geometry.location(screenshot.region),
                 isTransformed: true,
             };
-            baseSettings = await (0, transform_check_settings_1.transformCheckSettings)({ context: driver.currentContext, screenshot, settings, logger });
+            baseSettings = getBaseCheckSettings({ calculatedRegions: screenshot.calculatedRegions });
             if (driver.isWeb && settings.sendDom) {
                 if (settings.fully)
                     await screenshot.scrollingElement.setAttribute('data-applitools-scroll', 'true');

package/dist/classic/utils/take-dom-capture.js

@@ -17,13 +17,13 @@ async function takeDomCapture({ driver, settings, logger, }) {
     const scripts = {
         main: {
             script: canExecuteOnlyFunctionScripts
-                ? require('@applitools/dom-snapshot').captureDomPoll
+                ? require('@applitools/dom-capture').captureDomPoll
                 : `return (${isLegacyBrowser ? await (0, dom_capture_1.getCaptureDomPollForIE)() : await (0, dom_capture_1.getCaptureDomPoll)()}).apply(null, arguments);`,
             args: [arg],
         },
         poll: {
             script: canExecuteOnlyFunctionScripts
-                ? require('@applitools/dom-snapshot').pollResult
+                ? require('@applitools/dom-capture').pollResult
                 : `return (${isLegacyBrowser ? await (0, dom_capture_1.getPollResultForIE)() : await (0, dom_capture_1.getPollResult)()}).apply(null, arguments);`,
             args: [arg],
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/core",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -61,14 +61,14 @@
     }
   },
   "dependencies": {
-    "@applitools/core-base": "1.1.7",
+    "@applitools/core-base": "1.1.8",
     "@applitools/dom-capture": "11.2.0",
     "@applitools/dom-snapshot": "4.7.0",
     "@applitools/driver": "1.11.1",
     "@applitools/logger": "1.1.27",
     "@applitools/nml-client": "1.3.5",
     "@applitools/req": "1.1.12",
-    "@applitools/screenshoter": "3.7.1",
+    "@applitools/screenshoter": "3.7.2",
     "@applitools/snippets": "2.4.6",
     "@applitools/ufg-client": "1.1.2",
     "@applitools/utils": "1.3.13",

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

@@ -8,9 +8,12 @@ export declare type Screenshot = {
     element: Element<unknown, unknown, unknown, unknown>;
     scrollingElement: Element<unknown, unknown, unknown, unknown>;
     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>;
+    settings: ScreenshotSettings<TElement, TSelector> & {
+        regionsToCalculate?: any[];
+    };
     logger: Logger;
 }): Promise<Screenshot>;

package/dist/classic/utils/transform-check-settings.js

@@ -1,68 +0,0 @@
-"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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformCheckSettings = void 0;
-const utils = __importStar(require("@applitools/utils"));
-async function transformCheckSettings({ context, settings, screenshot, logger: _logger, }) {
-    return {
-        ...settings,
-        region: undefined,
-        normalization: undefined,
-        ignoreRegions: await transformRegions({ regions: settings.ignoreRegions }),
-        layoutRegions: await transformRegions({ regions: settings.layoutRegions }),
-        contentRegions: await transformRegions({ regions: settings.contentRegions }),
-        strictRegions: await transformRegions({ regions: settings.strictRegions }),
-        floatingRegions: await transformRegions({ regions: settings.floatingRegions }),
-        accessibilityRegions: await transformRegions({ regions: settings.accessibilityRegions }),
-    };
-    async function transformRegions({ regions = [], }) {
-        var _a;
-        const transformedRegions = [];
-        for (const region of regions) {
-            const { region: reference, ...options } = utils.types.has(region, 'region') ? region : { region };
-            if (utils.types.has(reference, ['x', 'y', 'width', 'height'])) {
-                transformedRegions.push(region);
-            }
-            else {
-                const elements = await context.elements(reference);
-                if (elements.length === 0)
-                    continue;
-                const contextLocationInViewport = await elements[0].context.getLocationInViewport();
-                for (const element of elements) {
-                    const elementRegionInViewport = utils.geometry.offset(await element.getRegion(), contextLocationInViewport);
-                    const elementRegionInTarget = utils.geometry.offsetNegative(elementRegionInViewport, utils.geometry.location(screenshot.region));
-                    const elementRegionIScaled = utils.geometry.scale(elementRegionInTarget, context.driver.viewportScale);
-                    transformedRegions.push({
-                        region: elementRegionIScaled,
-                        regionId: utils.types.isString(element.commonSelector) ? element.commonSelector : (_a = element.commonSelector) === null || _a === void 0 ? void 0 : _a.selector,
-                        ...options,
-                    });
-                }
-            }
-        }
-        return transformedRegions;
-    }
-}
-exports.transformCheckSettings = transformCheckSettings;

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

@@ -1,11 +0,0 @@
-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';
-export declare function transformCheckSettings<TDriver, TContext, TElement, TSelector>({ context, settings, screenshot, logger, }: {
-    context: Context<TDriver, TContext, TElement, TSelector>;
-    settings: CheckSettings<TElement, TSelector>;
-    screenshot: Screenshot;
-    logger: Logger;
-}): Promise<BaseCheckSettings>;