@applitools/core 1.4.6 → 2.0.0

package/dist/{classic → automation}/extract-text.js

@@ -25,16 +25,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeExtractText = 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 take_screenshot_1 = require("./utils/take-screenshot");
+const take_dom_capture_1 = require("../classic/utils/take-dom-capture");
 const utils = __importStar(require("@applitools/utils"));
-const snippets_1 = require("@applitools/snippets");
-function makeExtractText({ eyes, target: defaultTarget, spec, logger: defaultLogger, }) {
-    return async function extractText({ target = defaultTarget, settings, logger = defaultLogger, }) {
+const { getText } = require('@applitools/snippets');
+function makeExtractText({ core, spec, logger: defaultLogger }) {
+    return async function extractText({ target, settings, logger = defaultLogger, }) {
         logger.log('Command "extractText" is called with settings', settings);
-        const [baseEyes] = await eyes.getBaseEyes();
         if (!(0, driver_1.isDriver)(target, spec)) {
-            return baseEyes.extractText({ target, settings: settings, logger });
+            return core.extractText({ target, settings: settings, logger });
         }
         settings = utils.types.isArray(settings) ? settings : [settings];
         const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
@@ -42,11 +41,11 @@ function makeExtractText({ eyes, target: defaultTarget, spec, logger: defaultLog
             var _a;
             const steps = await prev;
             const screenshot = await (0, take_screenshot_1.takeScreenshot)({ driver, settings, logger });
-            if (!settings.hint && !utils.types.has(settings.region, ['x', 'y', 'width', 'height'])) {
+            if (!settings.hint && (0, driver_1.isElementReference)(settings.region, spec)) {
                 const element = await driver.currentContext.element(settings.region);
                 if (!element)
                     throw new Error(`Unable to find element using provided selector`);
-                settings.hint = await driver.currentContext.execute(snippets_1.getText, [element]);
+                settings.hint = await driver.currentContext.execute(getText, [element]);
                 if (settings.hint)
                     settings.hint = settings.hint.replace(/[.\\+]/g, '\\$&');
             }
@@ -60,11 +59,15 @@ function makeExtractText({ eyes, target: defaultTarget, spec, logger: defaultLog
                     await screenshot.scrollingElement.setAttribute('data-applitools-scroll', 'true');
                 else
                     await ((_a = screenshot.element) === null || _a === void 0 ? void 0 : _a.setAttribute('data-applitools-scroll', 'true'));
-                baseTarget.dom = await (0, take_dom_capture_1.takeDomCapture)({ driver, logger }).catch(() => null);
+                baseTarget.dom = await (0, take_dom_capture_1.takeDomCapture)({ driver, logger }).catch(() => undefined);
             }
             delete settings.region;
             delete settings.normalization;
-            const results = await baseEyes.extractText({ target: baseTarget, settings: settings, logger });
+            const results = await core.extractText({
+                target: baseTarget,
+                settings: settings,
+                logger,
+            });
             steps.push(results);
             return steps;
         }, Promise.resolve([]));

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

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeGetViewportSize = void 0;
 const driver_1 = require("@applitools/driver");
-function makeGetViewportSize({ spec, logger: defaultLogger, }) {
+function makeGetViewportSize({ spec, logger: defaultLogger }) {
     return async function getViewportSize({ target, logger = defaultLogger, }) {
         logger.log(`Command "getViewportSize" is called`);
-        const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
+        const driver = await (0, driver_1.makeDriver)({ driver: target, spec, logger });
         return driver.getViewportSize();
     };
 }

package/dist/{classic → automation}/locate-text.js

@@ -25,15 +25,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeLocateText = void 0;
 const driver_1 = require("@applitools/driver");
-const take_screenshot_1 = require("../automation/utils/take-screenshot");
+const take_screenshot_1 = require("./utils/take-screenshot");
 // import {takeDomCapture} from './utils/take-dom-capture'
 const utils = __importStar(require("@applitools/utils"));
-function makeLocateText({ eyes, target: defaultTarget, spec, logger: defaultLogger, }) {
-    return async function locateText({ target = defaultTarget, settings, logger = defaultLogger, }) {
+function makeLocateText({ core, spec, logger: defaultLogger }) {
+    return async function locateText({ target, settings, logger = defaultLogger, }) {
         logger.log('Command "locateText" is called with settings', settings);
-        const [baseEyes] = await eyes.getBaseEyes();
         if (!(0, driver_1.isDriver)(target, spec)) {
-            return baseEyes.locateText({ target, settings: settings, logger });
+            return core.locateText({ target, settings: settings, logger });
         }
         const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
         const screenshot = await (0, take_screenshot_1.takeScreenshot)({ driver, settings, logger });
@@ -46,7 +45,7 @@ function makeLocateText({ eyes, target: defaultTarget, spec, logger: defaultLogg
             // else await screenshot.element?.setAttribute('data-applitools-scroll', 'true')
             // baseTarget.dom = await takeDomCapture({driver, logger}).catch(() => null)
         }
-        const results = await baseEyes.locateText({
+        const results = await core.locateText({
             target: baseTarget,
             settings: settings,
             logger,

package/dist/automation/locate.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeLocate = void 0;
 const driver_1 = require("@applitools/driver");
 const take_screenshot_1 = require("./utils/take-screenshot");
-function makeLocate({ spec, core, logger: defaultLogger, }) {
+function makeLocate({ spec, core, logger: defaultLogger }) {
     return async function locate({ settings, target, logger = defaultLogger, }) {
         logger.log(`Command "locate" is called with settings`, settings);
         if (!(0, driver_1.isDriver)(target, spec)) {
             return core.locate({ target, settings: settings, logger });
         }
-        const driver = (0, driver_1.isDriver)(target, spec) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : null;
+        const driver = await (0, driver_1.makeDriver)({ driver: target, spec, logger });
         const screenshot = await (0, take_screenshot_1.takeScreenshot)({ driver, settings, logger });
         const baseTarget = { image: await screenshot.image.toPng() };
         const results = await core.locate({ target: baseTarget, settings: settings, logger });

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

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeSetViewportSize = void 0;
 const driver_1 = require("@applitools/driver");
-function makeSetViewportSize({ spec, logger: defaultLogger, }) {
+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 (0, driver_1.makeDriver)({ spec, driver: target, logger });
+        const driver = await (0, driver_1.makeDriver)({ driver: target, spec, logger });
         return driver.setViewportSize(size);
     };
 }

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

@@ -24,11 +24,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.takeScreenshot = void 0;
-const screenshoter_1 = require("@applitools/screenshoter");
 const utils = __importStar(require("@applitools/utils"));
+const { takeScreenshot: legacyTakeScreenshot } = require('@applitools/screenshoter');
 async function takeScreenshot({ driver, settings, logger, }) {
     var _a, _b;
-    return (0, screenshoter_1.takeScreenshot)({
+    return legacyTakeScreenshot({
         driver,
         frames: (_a = settings.frames) === null || _a === void 0 ? void 0 : _a.map(frame => {
             return utils.types.isPlainObject(frame) && utils.types.has(frame, 'frame')

package/dist/{utils → automation/utils}/to-base-check-settings.js

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toBaseCheckSettings = void 0;
 const utils = __importStar(require("@applitools/utils"));
-function toBaseCheckSettings({ settings, }) {
+function toBaseCheckSettings({ settings }) {
     const regionTypes = ['ignore', 'layout', 'strict', 'content', 'floating', 'accessibility'];
     const elementReferencesToCalculate = regionTypes.flatMap(regionType => {
         var _a;
@@ -46,9 +46,10 @@ function toBaseCheckSettings({ settings, }) {
             delete transformedSettings.region;
         }
         regionTypes.forEach(regionType => {
+            var _a;
             if (!transformedSettings[`${regionType}Regions`])
                 return;
-            transformedSettings[`${regionType}Regions`] = transformedSettings[`${regionType}Regions`].flatMap(reference => {
+            transformedSettings[`${regionType}Regions`] = (_a = transformedSettings[`${regionType}Regions`]) === null || _a === void 0 ? void 0 : _a.flatMap(reference => {
                 const { region, ...options } = utils.types.has(reference, 'region') ? reference : { region: reference };
                 if (isRegion(region))
                     return reference;

package/dist/{utils → automation/utils}/wait-for-lazy-load.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.waitForLazyLoad = void 0;
-const snippets_1 = require("@applitools/snippets");
+const { lazyLoad } = require('@applitools/snippets');
 async function waitForLazyLoad({ context, settings, logger, }) {
     var _a, _b, _c, _d, _e;
     logger.log('lazy loading the page before capturing a screenshot');
-    await context.executePoll(snippets_1.lazyLoad, {
+    await context.executePoll(lazyLoad, {
         main: [
             await context.getScrollingElement(),
             {

package/dist/check-and-close.js

@@ -2,16 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeCheckAndClose = void 0;
 const driver_1 = require("@applitools/driver");
-function makeCheckAndClose({ type: defaultType, eyes, target: defaultTarget, spec, logger: defaultLogger, }) {
+function makeCheckAndClose({ type: defaultType = 'classic', eyes, target: defaultTarget, spec, logger: defaultLogger, }) {
     return async function checkAndClose({ type = defaultType, target = defaultTarget, 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 driver = (0, driver_1.isDriver)(target, spec) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : null;
         const typedEyes = await eyes.getTypedEyes({
             type,
-            settings: driver && {
-                type: driver.isNative ? 'native' : 'web',
-                renderers: settings.renderers,
-            },
+            settings: driver
+                ? {
+                    type: driver.isNative ? 'native' : 'web',
+                    renderers: settings.renderers,
+                }
+                : undefined,
             logger,
         });
         const results = await typedEyes.checkAndClose({ target: driver !== null && driver !== void 0 ? driver : target, settings, logger });

package/dist/check.js

@@ -30,7 +30,7 @@ exports.makeCheck = void 0;
 const driver_1 = require("@applitools/driver");
 const utils = __importStar(require("@applitools/utils"));
 const chalk_1 = __importDefault(require("chalk"));
-function makeCheck({ type: defaultType, eyes, target: defaultTarget, spec, logger: defaultLogger, }) {
+function makeCheck({ type: defaultType = 'classic', eyes, target: defaultTarget, spec, logger: defaultLogger, }) {
     let stepIndex = 0;
     return async function check({ type = defaultType, target = defaultTarget, settings, config, logger = defaultLogger, } = {}) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
@@ -62,10 +62,9 @@ function makeCheck({ type: defaultType, eyes, target: defaultTarget, spec, logge
         const driver = (0, driver_1.isDriver)(target, spec) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : null;
         const typedEyes = await eyes.getTypedEyes({
             type,
-            settings: driver && {
-                type: driver.isNative ? 'native' : 'web',
-                renderers: settings.renderers,
-            },
+            settings: driver
+                ? { type: driver.isNative ? 'native' : 'web', renderers: settings.renderers }
+                : undefined,
             logger,
         });
         const results = await typedEyes.check({ target: driver !== null && driver !== void 0 ? driver : target, settings, logger });

package/dist/classic/abort.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeAbort = void 0;
 const driver_1 = require("@applitools/driver");
-function makeAbort({ eyes, target, spec, logger: defaultLogger, }) {
-    return async function ({ settings, logger = defaultLogger, } = {}) {
+function makeAbort({ eyes, target, spec, logger: defaultLogger }) {
+    return async function abort({ settings, logger = defaultLogger, } = {}) {
         const driver = (0, driver_1.isDriver)(target, spec) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : null;
         const testMetadata = await (driver === null || driver === void 0 ? void 0 : driver.getSessionMetadata());
-        const [baseEyes] = await eyes.getBaseEyes();
-        return await baseEyes.abort({ settings: { ...settings, testMetadata }, logger });
+        const baseEyes = await eyes.getBaseEyes();
+        await Promise.all(baseEyes.map(baseEyes => baseEyes.abort({ settings: { ...settings, testMetadata }, logger })));
     };
 }
 exports.makeAbort = makeAbort;

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

@@ -27,13 +27,15 @@ 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 to_base_check_settings_1 = require("../utils/to-base-check-settings");
-const wait_for_lazy_load_1 = require("../utils/wait-for-lazy-load");
+const to_base_check_settings_1 = require("../automation/utils/to-base-check-settings");
+const wait_for_lazy_load_1 = require("../automation/utils/wait-for-lazy-load");
 const utils = __importStar(require("@applitools/utils"));
 function makeCheckAndClose({ eyes, target: defaultTarget, spec, logger: defaultLogger, }) {
     return async function checkAndClose({ target = defaultTarget, settings = {}, logger = defaultLogger, } = {}) {
         var _a;
         logger.log('Command "checkAndClose" is called with settings', settings);
+        if (!target)
+            throw new Error('Method was called with no target');
         const baseEyes = await eyes.getBaseEyes({ logger });
         if (!(0, driver_1.isDriver)(target, spec)) {
             const baseSettings = settings;
@@ -66,13 +68,15 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, logger: defaultL
                 await screenshot.scrollingElement.setAttribute('data-applitools-scroll', 'true');
             else
                 await ((_a = screenshot.element) === null || _a === void 0 ? void 0 : _a.setAttribute('data-applitools-scroll', 'true'));
-            baseTarget.dom = await (0, take_dom_capture_1.takeDomCapture)({ driver, logger }).catch(() => null);
+            baseTarget.dom = await (0, take_dom_capture_1.takeDomCapture)({ driver, logger }).catch(() => undefined);
         }
         if (settings.pageId) {
             const scrollingElement = await driver.mainContext.getScrollingElement();
-            const scrollingOffset = driver.isNative ? { x: 0, y: 0 } : await scrollingElement.getScrollOffset();
+            const scrollingOffset = !scrollingElement || driver.isNative ? { x: 0, y: 0 } : await scrollingElement.getScrollOffset();
             baseTarget.locationInView = utils.geometry.offset(scrollingOffset, screenshot.region);
-            baseTarget.fullViewSize = scrollingElement ? await scrollingElement.getContentSize() : await driver.getViewportSize();
+            baseTarget.fullViewSize = scrollingElement
+                ? await scrollingElement.getContentSize()
+                : await driver.getViewportSize();
         }
         await screenshot.restoreState();
         return (await Promise.all(baseEyes.map(baseEyes => baseEyes.checkAndClose({ target: baseTarget, settings: baseSettings, logger })))).flat();

package/dist/classic/check.js

@@ -27,13 +27,15 @@ 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 to_base_check_settings_1 = require("../utils/to-base-check-settings");
-const wait_for_lazy_load_1 = require("../utils/wait-for-lazy-load");
+const to_base_check_settings_1 = require("../automation/utils/to-base-check-settings");
+const wait_for_lazy_load_1 = require("../automation/utils/wait-for-lazy-load");
 const utils = __importStar(require("@applitools/utils"));
 function makeCheck({ eyes, target: defaultTarget, spec, logger: defaultLogger, }) {
     return async function check({ target = defaultTarget, settings = {}, logger = defaultLogger, } = {}) {
-        var _a, _b;
+        var _a, _b, _c;
         logger.log('Command "check" is called with settings', settings);
+        if (!target)
+            throw new Error('Method was called with no target');
         const baseEyes = await eyes.getBaseEyes();
         if (!(0, driver_1.isDriver)(target, spec)) {
             return (await Promise.all(baseEyes.map(baseEyes => baseEyes.check({ target, settings: settings, logger })))).flat();
@@ -52,7 +54,7 @@ function makeCheck({ eyes, target: defaultTarget, spec, logger: defaultLogger, }
         }
         // TODO it actually could be different per eyes
         const shouldRunOnce = true;
-        const finishAt = Date.now() + settings.retryTimeout;
+        const finishAt = Date.now() + ((_b = settings.retryTimeout) !== null && _b !== void 0 ? _b : 0);
         let baseTarget;
         let baseSettings;
         let results;
@@ -75,14 +77,16 @@ function makeCheck({ eyes, target: defaultTarget, spec, logger: defaultLogger, }
                 if (settings.fully)
                     await screenshot.scrollingElement.setAttribute('data-applitools-scroll', 'true');
                 else
-                    await ((_b = screenshot.element) === null || _b === void 0 ? void 0 : _b.setAttribute('data-applitools-scroll', 'true'));
-                baseTarget.dom = await (0, take_dom_capture_1.takeDomCapture)({ driver, logger }).catch(() => null);
+                    await ((_c = screenshot.element) === null || _c === void 0 ? void 0 : _c.setAttribute('data-applitools-scroll', 'true'));
+                baseTarget.dom = await (0, take_dom_capture_1.takeDomCapture)({ driver, logger }).catch(() => undefined);
             }
             if (settings.pageId) {
                 const scrollingElement = await driver.mainContext.getScrollingElement();
-                const scrollingOffset = driver.isNative ? { x: 0, y: 0 } : await scrollingElement.getScrollOffset();
+                const scrollingOffset = !scrollingElement || driver.isNative ? { x: 0, y: 0 } : await scrollingElement.getScrollOffset();
                 baseTarget.locationInView = utils.geometry.offset(scrollingOffset, screenshot.region);
-                baseTarget.fullViewSize = scrollingElement ? await scrollingElement.getContentSize() : await driver.getViewportSize();
+                baseTarget.fullViewSize = scrollingElement
+                    ? await scrollingElement.getContentSize()
+                    : await driver.getViewportSize();
             }
             await screenshot.restoreState();
             baseSettings.ignoreMismatch = !shouldRunOnce;

package/dist/classic/close.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeClose = void 0;
 const driver_1 = require("@applitools/driver");
-function makeClose({ eyes, target, spec, logger: defaultLogger, }) {
-    return async function ({ settings, logger = defaultLogger, } = {}) {
+function makeClose({ eyes, target, spec, logger: defaultLogger }) {
+    return async function close({ settings, logger = defaultLogger, } = {}) {
         const driver = (0, driver_1.isDriver)(target, spec) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : null;
         const testMetadata = await (driver === null || driver === void 0 ? void 0 : driver.getSessionMetadata());
         const baseEyes = await eyes.getBaseEyes();
-        return (await Promise.all(baseEyes.map(baseEyes => baseEyes.close({ settings: { ...settings, testMetadata }, logger })))).flat();
+        await Promise.all(baseEyes.map(baseEyes => baseEyes.close({ settings: { ...settings, testMetadata }, logger })));
     };
 }
 exports.makeClose = makeClose;

package/dist/classic/core.js

@@ -29,21 +29,25 @@ const core_base_1 = require("@applitools/core-base");
 const get_viewport_size_1 = require("../automation/get-viewport-size");
 const set_viewport_size_1 = require("../automation/set-viewport-size");
 const locate_1 = require("../automation/locate");
+const locate_text_1 = require("../automation/locate-text");
+const extract_text_1 = require("../automation/extract-text");
 const open_eyes_1 = require("./open-eyes");
 const utils = __importStar(require("@applitools/utils"));
-function makeCore({ spec, core, agentId = 'core-classic', cwd = process.cwd(), logger, }) {
+function makeCore({ spec, core, agentId = 'core-classic', cwd = process.cwd(), logger: defaultLogger, }) {
     var _a;
-    logger = (_a = logger === null || logger === void 0 ? void 0 : logger.extend({ label: 'core-classic' })) !== null && _a !== void 0 ? _a : (0, logger_1.makeLogger)({ label: 'core-classic' });
+    const logger = (_a = defaultLogger === null || defaultLogger === void 0 ? void 0 : defaultLogger.extend({ label: 'core-classic' })) !== null && _a !== void 0 ? _a : (0, logger_1.makeLogger)({ label: 'core-classic' });
     logger.log(`Core classic is initialized ${core ? 'with' : 'without'} custom base core`);
     core !== null && core !== void 0 ? core : (core = (0, core_base_1.makeCore)({ agentId, cwd, logger }));
     return utils.general.extend(core, {
         type: 'classic',
-        isDriver: spec === null || spec === void 0 ? void 0 : spec.isDriver,
-        isElement: spec === null || spec === void 0 ? void 0 : spec.isElement,
-        isSelector: spec === null || spec === void 0 ? void 0 : spec.isSelector,
+        isDriver: spec && spec.isDriver,
+        isElement: spec && spec.isElement,
+        isSelector: spec && spec.isSelector,
         getViewportSize: spec && (0, get_viewport_size_1.makeGetViewportSize)({ spec, logger }),
         setViewportSize: spec && (0, set_viewport_size_1.makeSetViewportSize)({ spec, logger }),
         locate: (0, locate_1.makeLocate)({ spec, core, logger }),
+        locateText: (0, locate_text_1.makeLocateText)({ spec, core, logger }),
+        extractText: (0, extract_text_1.makeExtractText)({ spec, core, logger }),
         openEyes: (0, open_eyes_1.makeOpenEyes)({ spec, core, logger }),
     });
 }

package/dist/classic/open-eyes.js

@@ -28,12 +28,10 @@ const driver_1 = require("@applitools/driver");
 const get_base_eyes_1 = require("./get-base-eyes");
 const check_1 = require("./check");
 const check_and_close_1 = require("./check-and-close");
-const locate_text_1 = require("./locate-text");
-const extract_text_1 = require("./extract-text");
 const close_1 = require("./close");
 const abort_1 = require("./abort");
 const utils = __importStar(require("@applitools/utils"));
-function makeOpenEyes({ core, spec, logger: defaultLogger, }) {
+function makeOpenEyes({ core, spec, logger: defaultLogger }) {
     return async function openEyes({ target, settings, eyes, logger = defaultLogger, }) {
         var _a, _b, _c, _d, _e;
         var _f;
@@ -47,27 +45,29 @@ function makeOpenEyes({ core, spec, logger: defaultLogger, }) {
             }
             if (driver.isWeb) {
                 (_b = (_f = settings.environment).userAgent) !== null && _b !== void 0 ? _b : (_f.userAgent = driver.userAgent);
-                if (driver.isChromium &&
-                    ((driver.isWindows && Number.parseInt(driver.browserVersion) >= 107) ||
-                        (driver.isMac && Number.parseInt(driver.browserVersion) >= 90))) {
-                    settings.environment.os = `${driver.platformName} ${(_c = driver.platformVersion) !== null && _c !== void 0 ? _c : ''}`.trim();
-                }
             }
             if (!settings.environment.deviceName && driver.deviceName) {
                 settings.environment.deviceName = driver.deviceName;
             }
-            if (!settings.environment.os && driver.isNative && driver.platformName) {
-                settings.environment.os = driver.platformName;
-                if (!settings.keepPlatformNameAsIs) {
-                    if ((_d = settings.environment.os) === null || _d === void 0 ? void 0 : _d.startsWith('android')) {
-                        settings.environment.os = `Android${settings.environment.os.slice(7)}`;
+            if (!settings.environment.os) {
+                if (driver.isNative && driver.platformName) {
+                    settings.environment.os = driver.platformName;
+                    if (!settings.keepPlatformNameAsIs) {
+                        if ((_c = settings.environment.os) === null || _c === void 0 ? void 0 : _c.startsWith('android')) {
+                            settings.environment.os = `Android${settings.environment.os.slice(7)}`;
+                        }
+                        if ((_d = settings.environment.os) === null || _d === void 0 ? void 0 : _d.startsWith('ios')) {
+                            settings.environment.os = `iOS${settings.environment.os.slice(3)}`;
+                        }
                     }
-                    if ((_e = settings.environment.os) === null || _e === void 0 ? void 0 : _e.startsWith('ios')) {
-                        settings.environment.os = `iOS${settings.environment.os.slice(3)}`;
+                    if (driver.platformVersion) {
+                        settings.environment.os += ` ${driver.platformVersion}`;
                     }
                 }
-                if (driver.platformVersion) {
-                    settings.environment.os += ` ${driver.platformVersion}`;
+                else if (driver.isChromium &&
+                    ((driver.isWindows && Number.parseInt(driver.browserVersion) >= 107) ||
+                        (driver.isMac && Number.parseInt(driver.browserVersion) >= 90))) {
+                    settings.environment.os = `${driver.platformName} ${(_e = driver.platformVersion) !== null && _e !== void 0 ? _e : ''}`.trim();
                 }
             }
             if (!settings.environment.viewportSize || driver.isMobile) {
@@ -86,8 +86,6 @@ function makeOpenEyes({ core, spec, logger: defaultLogger, }) {
             getBaseEyes,
             check: (0, check_1.makeCheck)({ eyes, target: driver, spec, logger }),
             checkAndClose: (0, check_and_close_1.makeCheckAndClose)({ eyes, target: driver, spec, logger }),
-            locateText: (0, locate_text_1.makeLocateText)({ eyes, target: driver, spec, logger }),
-            extractText: (0, extract_text_1.makeExtractText)({ eyes, target: driver, spec, logger }),
             close: (0, close_1.makeClose)({ eyes, target: driver, spec, logger }),
             abort: (0, abort_1.makeAbort)({ eyes, target: driver, spec, logger }),
         }));

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

@@ -1,25 +1,21 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.takeDomCapture = void 0;
-const dom_capture_1 = require("@applitools/dom-capture");
-const req_1 = __importDefault(require("@applitools/req"));
+const req_1 = require("@applitools/req");
+const { getCaptureDomPoll, getPollResult, getCaptureDomPollForIE, getPollResultForIE, } = require('@applitools/dom-capture');
 async function takeDomCapture({ driver, settings, logger, }) {
-    var _a;
+    var _a, _b, _c;
     const isLegacyBrowser = driver.isIE || driver.isEdgeLegacy;
-    const { canExecuteOnlyFunctionScripts } = driver.features;
     const arg = {
         chunkByteLength: (_a = settings === null || settings === void 0 ? void 0 : settings.chunkByteLength) !== null && _a !== void 0 ? _a : (Number(process.env.APPLITOOLS_SCRIPT_RESULT_MAX_BYTE_LENGTH) || (driver.isIOS ? 100000 : 250 * 1024 * 1024)),
     };
     const scripts = {
-        main: canExecuteOnlyFunctionScripts
+        main: ((_b = driver.features) === null || _b === void 0 ? void 0 : _b.canExecuteOnlyFunctionScripts)
             ? require('@applitools/dom-capture').captureDomPoll
-            : `return (${isLegacyBrowser ? await (0, dom_capture_1.getCaptureDomPollForIE)() : await (0, dom_capture_1.getCaptureDomPoll)()}).apply(null, arguments);`,
-        poll: canExecuteOnlyFunctionScripts
+            : `return (${isLegacyBrowser ? await getCaptureDomPollForIE() : await getCaptureDomPoll()}).apply(null, arguments);`,
+        poll: ((_c = driver.features) === null || _c === void 0 ? void 0 : _c.canExecuteOnlyFunctionScripts)
             ? require('@applitools/dom-capture').pollResult
-            : `return (${isLegacyBrowser ? await (0, dom_capture_1.getPollResultForIE)() : await (0, dom_capture_1.getPollResult)()}).apply(null, arguments);`,
+            : `return (${isLegacyBrowser ? await getPollResultForIE() : await getPollResult()}).apply(null, arguments);`,
     };
     const url = await driver.getUrl();
     const dom = await captureContextDom(driver.mainContext);
@@ -34,17 +30,17 @@ async function takeDomCapture({ driver, settings, logger, }) {
             pollTimeout: (_b = settings === null || settings === void 0 ? void 0 : settings.pollTimeout) !== null && _b !== void 0 ? _b : 200,
         });
         if (!capture)
-            return {};
+            return '';
         const raws = capture.split('\n');
         const tokens = JSON.parse(raws[0]);
         const cssEndIndex = raws.indexOf(tokens.separator);
         const frameEndIndex = raws.indexOf(tokens.separator, cssEndIndex + 1);
         let dom = raws[frameEndIndex + 1];
         const cssResources = await Promise.all(raws.slice(1, cssEndIndex).reduce((cssResources, href) => {
-            return href ? cssResources.concat(fetchCss(new URL(href, url).href)) : cssResources;
+            return href ? cssResources.concat(fetchCssResource(new URL(href, url).href)) : cssResources;
         }, []));
-        for (const { href, css } of cssResources) {
-            dom = dom.replace(`${tokens.cssStartToken}${href}${tokens.cssEndToken}`, css);
+        for (const { url, css } of cssResources) {
+            dom = dom.replace(`${tokens.cssStartToken}${url}${tokens.cssEndToken}`, css);
         }
         const framePaths = raws.slice(cssEndIndex + 1, frameEndIndex);
         for (const xpaths of framePaths) {
@@ -60,74 +56,59 @@ async function takeDomCapture({ driver, settings, logger, }) {
             }
             catch (ignored) {
                 logger.log('Switching to frame failed');
-                contextDom = {};
+                contextDom = '';
             }
             dom = dom.replace(`${tokens.iframeStartToken}${xpaths}${tokens.iframeEndToken}`, contextDom);
         }
         return dom;
     }
-    async function fetchCss(href) {
+    async function fetchCssResource(url) {
+        logger.log(`Request to download css will be sent to the address "[GET]${url}"`);
         try {
-            logger.log(`Given URL to download: ${href}`);
-            const response = await (0, req_1.default)(href, {
+            const response = await (0, req_1.req)(url, {
                 retry: {
                     limit: 1,
-                    validate: ({ response, error }) => Boolean(error) || response.status >= 400,
+                    validate: ({ response, error }) => Boolean(error) || !response.ok,
                 },
-                fetch: settings.fetch,
+                fetch: settings === null || settings === void 0 ? void 0 : settings.fetch,
             });
-            if (response.status < 400) {
-                const css = await response.text();
-                logger.log(`downloading CSS in length of ${css.length} chars took`);
-                return { href, css: cleanStringForJSON(css) };
-            }
+            logger.log(`Request to download css that was sent to the address "[GET]${url}" respond with ${response.statusText}(${response.status})`, response.ok ? `and css of length ${(await response.clone().text()).length} chars` : '');
+            return { url, css: response.ok ? encodeJSON(await response.text()) : '' };
         }
-        catch (err) {
-            return { href, css: '' };
+        catch (error) {
+            logger.error(`Request to download css that was sent to the address "[GET]${url}" failed with error`, error);
+            return { url, css: '' };
         }
     }
-    function cleanStringForJSON(str) {
-        if (str == null || str.length === 0) {
+    function encodeJSON(str) {
+        if (!str)
             return '';
-        }
-        let sb = '';
-        let char = '\0';
-        let tmp;
-        for (let i = 0, l = str.length; i < l; i += 1) {
-            char = str[i];
+        return Array.from(str).reduce((result, char) => {
             switch (char) {
                 case '\\':
                 case '"':
                 case '/':
-                    sb += '\\' + char; // eslint-disable-line
-                    break;
+                    return result + '\\' + char;
                 case '\b':
-                    sb += '\\b';
-                    break;
+                    return result + '\\b';
                 case '\t':
-                    sb += '\\t';
-                    break;
+                    return result + '\\t';
                 case '\n':
-                    sb += '\\n';
-                    break;
+                    return result + '\\n';
                 case '\f':
-                    sb += '\\f';
-                    break;
+                    return result + '\\f';
                 case '\r':
-                    sb += '\\r';
-                    break;
+                    return result + '\\r';
                 default:
                     if (char < ' ') {
-                        tmp = '000' + char.charCodeAt(0).toString(16); // eslint-disable-line
-                        sb += '\\u' + tmp.substring(tmp.length - 4); // eslint-disable-line
+                        const tmp = '000' + char.charCodeAt(0).toString(16);
+                        return result + '\\u' + tmp.substring(tmp.length - 4);
                     }
                     else {
-                        sb += char;
+                        return result + char;
                     }
-                    break;
             }
-        }
-        return sb;
+        }, '');
     }
 }
 exports.takeDomCapture = takeDomCapture;