@applitools/core 1.2.16 → 1.2.17

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

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeGetViewportSize = void 0;
 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 (0, driver_1.makeDriver)({ spec, driver: target, logger });
+    return async function getViewportSize({ driver, target, logger = defaultLogger, }) {
+        logger.log(`Command "getViewportSize" is called with ${driver ? 'driver' : 'target'}`);
+        driver !== null && driver !== void 0 ? driver : (driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger }));
         return driver.getViewportSize();
     };
 }

package/dist/automation/locate.js

@@ -3,18 +3,15 @@ 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, target: defaultTarget, logger: defaultLogger, }) {
-    return async function locate({ target = defaultTarget, settings, logger = defaultLogger, } = {}) {
-        logger.log('Command "locate" is called with settings', settings);
-        if (!(spec === null || spec === void 0 ? void 0 : spec.isDriver(target))) {
+function makeLocate({ spec, core, logger: defaultLogger, }) {
+    return async function locate({ settings, driver, target, logger = defaultLogger, } = {}) {
+        logger.log(`Command "locate" is called with ${driver ? 'driver' : 'target'} and settings`, settings);
+        driver !== null && driver !== void 0 ? driver : (driver = (spec === null || spec === void 0 ? void 0 : spec.isDriver(target)) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : null);
+        if (!driver) {
             return core.locate({ target: target, settings: settings, logger });
         }
-        // TODO driver custom config
-        const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
         const screenshot = await (0, take_screenshot_1.takeScreenshot)({ driver, settings, logger });
-        const baseTarget = {
-            image: await screenshot.image.toPng(),
-        };
+        const baseTarget = { image: await screenshot.image.toPng() };
         const results = await core.locate({ target: baseTarget, settings: settings, logger });
         return results;
     };

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

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeSetViewportSize = void 0;
 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 (0, driver_1.makeDriver)({ spec, driver: target, logger });
+    return async function setViewportSize({ driver, target, size, logger = defaultLogger, }) {
+        logger.log(`Command "setViewportSize" is called with ${driver ? 'driver' : 'target'} and size`, size);
+        driver !== null && driver !== void 0 ? driver : (driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger }));
         return driver.setViewportSize(size);
     };
 }

package/dist/check-and-close.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeCheckAndClose = void 0;
-function makeCheckAndClose({ eyes, logger: defaultLogger, }) {
-    return async function checkAndClose({ target, settings = {}, config, logger = defaultLogger, } = {}) {
+function makeCheckAndClose({ type: defaultType, getTypedEyes, logger: defaultLogger, }) {
+    return async function checkAndClose({ type = defaultType, 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 eyes = await getTypedEyes({ type, renderers: settings.renderers });
         const results = await eyes.checkAndClose({
             target: target,
-            settings,
+            settings: settings,
             logger,
         });
         return results;

package/dist/check.js

@@ -29,11 +29,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeCheck = void 0;
 const utils = __importStar(require("@applitools/utils"));
 const chalk_1 = __importDefault(require("chalk"));
-function makeCheck({ eyes, logger: defaultLogger, }) {
-    return async function check({ target, settings = {}, config, logger = defaultLogger, } = {}) {
+function makeCheck({ type: defaultType, getTypedEyes, logger: defaultLogger, }) {
+    return async function check({ type = defaultType, target, settings, config, logger = defaultLogger, } = {}) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
         var _s, _t, _u, _v;
         settings = { ...config === null || config === void 0 ? void 0 : config.screenshot, ...config === null || config === void 0 ? void 0 : config.check, ...settings };
+        const eyes = await getTypedEyes({ type, renderers: settings.renderers });
         (_a = settings.fully) !== null && _a !== void 0 ? _a : (settings.fully = !settings.region && (!settings.frames || settings.frames.length === 0));
         (_b = settings.waitBeforeCapture) !== null && _b !== void 0 ? _b : (settings.waitBeforeCapture = 100);
         (_c = settings.stitchMode) !== null && _c !== void 0 ? _c : (settings.stitchMode = 'Scroll');

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

@@ -30,19 +30,17 @@ 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 utils = __importStar(require("@applitools/utils"));
-function makeCheckAndClose({ spec, eyes, target: defaultTarget, logger: defaultLogger, }) {
-    return async function checkAndClose({ target = defaultTarget, settings, logger = defaultLogger, } = {}) {
+function makeCheckAndClose({ eyes, driver: defaultDriver, spec, logger: defaultLogger, }) {
+    return async function checkAndClose({ settings = {}, driver, target, logger = defaultLogger, } = {}) {
         var _a;
         logger.log('Command "checkAndClose" is called with settings', settings);
-        if (!(spec === null || spec === void 0 ? void 0 : spec.isDriver(target))) {
-            return eyes.checkAndClose({
-                target: target,
-                settings: settings,
-                logger,
-            });
+        driver !== null && driver !== void 0 ? driver : (driver = (spec === null || spec === void 0 ? void 0 : spec.isDriver(target)) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : defaultDriver);
+        const baseEyes = await eyes.getBaseEyes({ logger });
+        if (!driver) {
+            const baseTarget = target;
+            const baseSettings = settings;
+            return (await Promise.all(baseEyes.map(baseEyes => baseEyes.checkAndClose({ target: baseTarget, settings: baseSettings, logger })))).flat();
         }
-        // TODO driver custom config
-        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 { elementReferencesToCalculate, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({ settings });
@@ -73,8 +71,7 @@ function makeCheckAndClose({ spec, eyes, target: defaultTarget, logger: defaultL
             baseTarget.fullViewSize = scrollingElement ? await scrollingElement.getContentSize() : await driver.getViewportSize();
         }
         await screenshot.restoreState();
-        const results = await eyes.checkAndClose({ target: baseTarget, settings: baseSettings, logger });
-        return results;
+        return (await Promise.all(baseEyes.map(baseEyes => baseEyes.checkAndClose({ target: baseTarget, settings: baseSettings, logger })))).flat();
     };
 }
 exports.makeCheckAndClose = makeCheckAndClose;

package/dist/classic/check.js

@@ -30,20 +30,24 @@ 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 utils = __importStar(require("@applitools/utils"));
-function makeCheck({ spec, eyes, target: defaultTarget, logger: defaultLogger, }) {
-    return async function check({ target = defaultTarget, settings = {}, logger = defaultLogger, } = {}) {
+function makeCheck({ eyes, driver: defaultDriver, spec, logger: defaultLogger, }) {
+    return async function check({ settings = {}, driver, target, logger = defaultLogger, } = {}) {
         var _a;
         logger.log('Command "check" is called with settings', settings);
-        if (!(spec === null || spec === void 0 ? void 0 : spec.isDriver(target))) {
-            return eyes.check({ target: target, settings: settings, logger });
+        driver !== null && driver !== void 0 ? driver : (driver = (spec === null || spec === void 0 ? void 0 : spec.isDriver(target)) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : defaultDriver);
+        const baseEyes = await eyes.getBaseEyes();
+        if (!driver) {
+            const baseTarget = target;
+            const baseSettings = settings;
+            return (await Promise.all(baseEyes.map(baseEyes => baseEyes.check({ target: baseTarget, settings: baseSettings, logger })))).flat();
         }
-        // TODO driver custom config
-        const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
+        await driver.refreshContexts();
         await driver.currentContext.setScrollingElement(settings.scrollRootElement);
         if (settings.lazyLoad && driver.isWeb) {
             await (0, wait_for_lazy_load_1.waitForLazyLoad)({ driver, settings: settings.lazyLoad !== true ? settings.lazyLoad : {}, logger });
         }
-        const shouldRunOnce = eyes.test.isNew;
+        // TODO it actually could be different per eyes
+        const shouldRunOnce = true;
         const finishAt = Date.now() + settings.retryTimeout;
         let baseTarget;
         let baseSettings;
@@ -77,10 +81,12 @@ function makeCheck({ spec, eyes, target: defaultTarget, logger: defaultLogger, }
                 baseTarget.fullViewSize = scrollingElement ? await scrollingElement.getContentSize() : await driver.getViewportSize();
             }
             await screenshot.restoreState();
-            results = await eyes.check({ target: baseTarget, settings: { ...baseSettings, ignoreMismatch: !shouldRunOnce }, logger });
+            baseSettings.ignoreMismatch = !shouldRunOnce;
+            results = (await Promise.all(baseEyes.map(baseEyes => baseEyes.check({ target: baseTarget, settings: baseSettings, logger })))).flat();
         } while (!shouldRunOnce && !results.some(result => result.asExpected) && Date.now() < finishAt);
         if (!shouldRunOnce && !results.some(result => result.asExpected)) {
-            results = await eyes.check({ target: baseTarget, settings: baseSettings, logger });
+            baseSettings.ignoreMismatch = false;
+            results = (await Promise.all(baseEyes.map(baseEyes => baseEyes.check({ target: baseTarget, settings: baseSettings, logger })))).flat();
         }
         return results;
     };

package/dist/classic/extract-text.js

@@ -29,15 +29,19 @@ const take_screenshot_1 = require("../automation/utils/take-screenshot");
 const take_dom_capture_1 = require("./utils/take-dom-capture");
 const utils = __importStar(require("@applitools/utils"));
 const snippets_1 = require("@applitools/snippets");
-function makeExtractText({ spec, eyes, target: defaultTarget, logger: defaultLogger, }) {
-    return async function extractText({ target = defaultTarget, settings, logger = defaultLogger, } = {}) {
+function makeExtractText({ eyes, driver: defaultDriver, spec, logger: defaultLogger, }) {
+    return async function extractText({ settings, driver, target, logger = defaultLogger, } = {}) {
         logger.log('Command "extractText" is called with settings', settings);
-        if (!(spec === null || spec === void 0 ? void 0 : spec.isDriver(target))) {
-            return eyes.extractText({ target: target, settings: settings, logger });
+        driver !== null && driver !== void 0 ? driver : (driver = (spec === null || spec === void 0 ? void 0 : spec.isDriver(target)) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : defaultDriver);
+        const [baseEyes] = await eyes.getBaseEyes();
+        if (!driver) {
+            return baseEyes.extractText({
+                target: target,
+                settings: settings,
+                logger,
+            });
         }
         settings = utils.types.isArray(settings) ? settings : [settings];
-        // TODO driver custom config
-        const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
         const results = await settings.reduce(async (prev, settings) => {
             var _a;
             const steps = await prev;
@@ -64,7 +68,7 @@ function makeExtractText({ spec, eyes, target: defaultTarget, logger: defaultLog
             }
             delete settings.region;
             delete settings.normalization;
-            const results = await eyes.extractText({ target: baseTarget, settings: settings, logger });
+            const results = await baseEyes.extractText({ target: baseTarget, settings: settings, logger });
             steps.push(results);
             return steps;
         }, Promise.resolve([]));

package/dist/classic/get-base-eyes.js

@@ -0,0 +1,39 @@
+"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.makeGetBaseEyes = void 0;
+const utils = __importStar(require("@applitools/utils"));
+function makeGetBaseEyes({ settings, core, eyes, logger: defaultLogger }) {
+    const getBaseEyesWithCache = utils.general.cachify(getBaseEyes, () => 'default');
+    if (eyes) {
+        getBaseEyesWithCache.setCachedValue('default', Promise.resolve(eyes));
+    }
+    return getBaseEyesWithCache;
+    async function getBaseEyes({ logger = defaultLogger } = {}) {
+        logger.log(`Command "getBaseEyes" is called with ${utils.types.isArray(eyes) ? `eyes array of length ${eyes.length}` : 'single eyes instance'}`);
+        return [await core.openEyes({ settings, logger })];
+    }
+}
+exports.makeGetBaseEyes = makeGetBaseEyes;

package/dist/classic/locate-text.js

@@ -28,14 +28,14 @@ const driver_1 = require("@applitools/driver");
 const take_screenshot_1 = require("../automation/utils/take-screenshot");
 // import {takeDomCapture} from './utils/take-dom-capture'
 const utils = __importStar(require("@applitools/utils"));
-function makeLocateText({ spec, eyes, target: defaultTarget, logger: defaultLogger, }) {
-    return async function locateText({ target = defaultTarget, settings, logger = defaultLogger, } = {}) {
+function makeLocateText({ spec, driver: defaultDriver, eyes, logger: defaultLogger, }) {
+    return async function locateText({ settings, driver, target, logger = defaultLogger, } = {}) {
         logger.log('Command "locateText" is called with settings', settings);
-        if (!(spec === null || spec === void 0 ? void 0 : spec.isDriver(target))) {
-            return eyes.locateText({ target: target, settings: settings, logger });
+        driver !== null && driver !== void 0 ? driver : (driver = (spec === null || spec === void 0 ? void 0 : spec.isDriver(target)) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : defaultDriver);
+        const [baseEyes] = await eyes.getBaseEyes();
+        if (!driver) {
+            return baseEyes.locateText({ target: target, settings: settings, logger });
         }
-        // TODO driver custom config
-        const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
         const screenshot = await (0, take_screenshot_1.takeScreenshot)({ driver, settings, logger });
         const baseTarget = {
             image: await screenshot.image.toPng(),
@@ -46,7 +46,11 @@ function makeLocateText({ spec, eyes, target: defaultTarget, logger: defaultLogg
             // else await screenshot.element?.setAttribute('data-applitools-scroll', 'true')
             // baseTarget.dom = await takeDomCapture({driver, logger}).catch(() => null)
         }
-        const results = await eyes.locateText({ target: baseTarget, settings: settings, logger });
+        const results = await baseEyes.locateText({
+            target: baseTarget,
+            settings: settings,
+            logger,
+        });
         return results;
     };
 }

package/dist/classic/open-eyes.js

@@ -25,21 +25,19 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeOpenEyes = void 0;
 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 utils = __importStar(require("@applitools/utils"));
-function makeOpenEyes({ spec, core, logger: defaultLogger, }) {
-    return async function openEyes({ target, settings, logger = defaultLogger, }) {
+function makeOpenEyes({ core, spec, logger: defaultLogger, }) {
+    return async function openEyes({ settings, eyes, driver, target, logger = defaultLogger, }) {
         var _a, _b, _c, _d, _e;
         var _f;
-        logger.log(`Command "openEyes" is called with ${(spec === null || spec === void 0 ? void 0 : spec.isDriver(target)) ? 'default driver and' : ''} settings`, settings);
-        // TODO driver custom config
-        const driver = (spec === null || spec === void 0 ? void 0 : spec.isDriver(target))
-            ? await (0, driver_1.makeDriver)({ spec, driver: target, logger, customConfig: { useCeilForViewportSize: settings.useCeilForViewportSize } })
-            : null;
-        if (driver) {
+        logger.log(`Command "openEyes" is called with ${(spec === null || spec === void 0 ? void 0 : spec.isDriver(target)) ? 'default driver and' : ''}`, ...(settings ? ['settings', settings] : []), eyes ? 'predefined eyes' : '');
+        driver !== null && driver !== void 0 ? driver : (driver = (spec === null || spec === void 0 ? void 0 : spec.isDriver(target)) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger, customConfig: settings }) : null);
+        if (driver && !eyes) {
             const currentContext = driver.currentContext;
             (_a = settings.environment) !== null && _a !== void 0 ? _a : (settings.environment = {});
             if (!settings.environment.viewportSize || driver.isMobile) {
@@ -76,13 +74,16 @@ function makeOpenEyes({ spec, core, logger: defaultLogger, }) {
             }
             await currentContext.focus();
         }
-        const eyes = await core.openEyes({ settings, logger });
-        return utils.general.extend(eyes, {
-            check: (0, check_1.makeCheck)({ spec, eyes, target, logger }),
-            checkAndClose: (0, check_and_close_1.makeCheckAndClose)({ spec, eyes, target, logger }),
-            locateText: (0, locate_text_1.makeLocateText)({ spec, eyes, target, logger }),
-            extractText: (0, extract_text_1.makeExtractText)({ spec, eyes, target, logger }),
-        });
+        const getBaseEyes = (0, get_base_eyes_1.makeGetBaseEyes)({ settings, core, eyes, logger });
+        const [baseEyes] = await getBaseEyes();
+        return utils.general.extend(baseEyes, eyes => ({
+            type: 'classic',
+            getBaseEyes,
+            check: (0, check_1.makeCheck)({ eyes, driver, spec, logger }),
+            checkAndClose: (0, check_and_close_1.makeCheckAndClose)({ eyes, driver, spec, logger }),
+            locateText: (0, locate_text_1.makeLocateText)({ eyes, driver, spec, logger }),
+            extractText: (0, extract_text_1.makeExtractText)({ eyes, driver, spec, logger }),
+        }));
     };
 }
 exports.makeOpenEyes = makeOpenEyes;

package/dist/make-manager.js

@@ -32,12 +32,15 @@ const close_manager_1 = require("./close-manager");
 const utils = __importStar(require("@applitools/utils"));
 function makeMakeManager({ spec, core, concurrency: defaultConcurrency = utils.general.getEnvValue('CONCURRENCY', 'number'), agentId: defaultAgentId, cwd = process.cwd(), logger: defaultLogger, }) {
     return async function makeManager({ type, concurrency = defaultConcurrency, legacyConcurrency, agentId = type === 'ufg' ? defaultAgentId === null || defaultAgentId === void 0 ? void 0 : defaultAgentId.replace(/(\/\d)/, '.visualgrid$1') : defaultAgentId, logger = defaultLogger, } = {}) {
-        core !== null && core !== void 0 ? core : (core = (0, core_base_1.makeCore)({ agentId, cwd, logger }));
         concurrency !== null && concurrency !== void 0 ? concurrency : (concurrency = utils.types.isInteger(legacyConcurrency) ? legacyConcurrency * 5 : 5);
-        const typedCore = type === 'ufg' ? (0, core_2.makeCore)({ spec, core, concurrency, logger }) : (0, core_1.makeCore)({ spec, core, logger });
+        core !== null && core !== void 0 ? core : (core = (0, core_base_1.makeCore)({ agentId, cwd, logger }));
+        const cores = {
+            ufg: (0, core_2.makeCore)({ spec, core, concurrency, logger }),
+            classic: (0, core_1.makeCore)({ spec, core, logger }),
+        };
         const storage = [];
         // open eyes with result storage
-        const openEyes = utils.general.wrap((0, open_eyes_1.makeOpenEyes)({ spec, core: typedCore, logger }), async (openEyes, options) => {
+        const openEyes = utils.general.wrap((0, open_eyes_1.makeOpenEyes)({ type, spec, core, cores, logger }), async (openEyes, options) => {
             const eyes = await openEyes(options);
             const item = { eyes };
             storage.push(item);
@@ -58,7 +61,7 @@ function makeMakeManager({ spec, core, concurrency: defaultConcurrency = utils.g
         });
         return {
             openEyes,
-            closeManager: (0, close_manager_1.makeCloseManager)({ core: typedCore, storage, logger }),
+            closeManager: (0, close_manager_1.makeCloseManager)({ core, storage, logger }),
         };
     };
 }

package/dist/open-eyes.js

@@ -32,8 +32,8 @@ const locate_text_1 = require("./locate-text");
 const extract_text_1 = require("./extract-text");
 const close_1 = require("./close");
 const utils = __importStar(require("@applitools/utils"));
-function makeOpenEyes({ spec, core, concurrency, logger: defaultLogger, }) {
-    return async function openEyes({ type, target, settings, config, logger = defaultLogger, }) {
+function makeOpenEyes({ type: defaultType, concurrency, core, cores, spec, logger: defaultLogger, }) {
+    return async function openEyes({ type = defaultType, settings, config, target, logger = defaultLogger, }) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
         var _v, _w, _x, _y, _z;
         settings = { ...config === null || config === void 0 ? void 0 : config.open, ...settings };
@@ -51,9 +51,9 @@ function makeOpenEyes({ spec, core, concurrency, logger: defaultLogger, }) {
         (_p = settings.baselineBranchName) !== null && _p !== void 0 ? _p : (settings.baselineBranchName = utils.general.getEnvValue('BASELINE_BRANCH'));
         (_q = settings.ignoreBaseline) !== null && _q !== void 0 ? _q : (settings.ignoreBaseline = false);
         (_r = settings.compareWithParentBranch) !== null && _r !== void 0 ? _r : (settings.compareWithParentBranch = false);
-        (_s = (_z = settings).renderConcurrency) !== null && _s !== void 0 ? _s : (_z.renderConcurrency = (_u = (_t = config === null || config === void 0 ? void 0 : config.check) === null || _t === void 0 ? void 0 : _t.renderers) === null || _u === void 0 ? void 0 : _u.length);
-        if (!utils.types.has(core, 'type')) {
-            core = type === 'ufg' ? (0, core_2.makeCore)({ spec, core, concurrency, logger }) : (0, core_1.makeCore)({ spec, core, logger });
+        if (type === 'ufg') {
+            ;
+            (_s = (_z = settings).renderConcurrency) !== null && _s !== void 0 ? _s : (_z.renderConcurrency = (_u = (_t = config === null || config === void 0 ? void 0 : config.check) === null || _t === void 0 ? void 0 : _t.renderers) === null || _u === void 0 ? void 0 : _u.length);
         }
         core.logEvent({
             settings: {
@@ -71,10 +71,29 @@ function makeOpenEyes({ spec, core, concurrency, logger: defaultLogger, }) {
             },
             logger,
         });
-        const eyes = await core.openEyes({ target, settings: settings, logger });
+        cores !== null && cores !== void 0 ? cores : (cores = {
+            ufg: (0, core_2.makeCore)({ spec, core, concurrency: concurrency !== null && concurrency !== void 0 ? concurrency : 5, logger }),
+            classic: (0, core_1.makeCore)({ spec, core, logger }),
+        });
+        const eyes = type === 'ufg'
+            ? await cores.ufg.openEyes({ target, settings: settings, logger })
+            : await cores.classic.openEyes({ target, settings: settings, logger });
+        async function getTypedEyes({ type = 'classic', renderers, }) {
+            if (eyes.type === type) {
+                return eyes;
+            }
+            else if (type === 'ufg') {
+                const baseEyes = await eyes.getBaseEyes();
+                return cores.ufg.openEyes({ target, eyes: baseEyes, logger });
+            }
+            else {
+                const baseEyes = (await Promise.all(renderers.map(renderer => eyes.getBaseEyes({ settings: { renderer, type: 'native' } })))).flat();
+                return cores.classic.openEyes({ target, eyes: baseEyes, logger });
+            }
+        }
         return utils.general.extend(eyes, {
-            check: (0, check_1.makeCheck)({ eyes, logger }),
-            checkAndClose: (0, check_and_close_1.makeCheckAndClose)({ eyes, logger }),
+            check: (0, check_1.makeCheck)({ type, getTypedEyes, logger }),
+            checkAndClose: (0, check_and_close_1.makeCheckAndClose)({ type, getTypedEyes, logger }),
             locateText: (0, locate_text_1.makeLocateText)({ eyes, logger }),
             extractText: (0, extract_text_1.makeExtractText)({ eyes, logger }),
             close: (0, close_1.makeClose)({ eyes, logger }),

package/dist/ufg/abort.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeAbort = void 0;
 const abort_error_1 = require("../errors/abort-error");
-function makeAbort({ storage, controller, logger: defaultLogger }) {
+function makeAbort({ storage, controller, logger: defaultLogger, }) {
     return async function ({ logger = defaultLogger, } = {}) {
         controller.abort();
         const tests = storage.reduce((tests, { renderer, promise }) => {

package/dist/ufg/check.js

@@ -35,8 +35,8 @@ const generate_safe_selectors_1 = require("./utils/generate-safe-selectors");
 const abort_error_1 = require("../errors/abort-error");
 const utils = __importStar(require("@applitools/utils"));
 const chalk_1 = __importDefault(require("chalk"));
-function makeCheck({ spec, getEyes, client, test, signal, target: defaultTarget, logger: defaultLogger, }) {
-    return async function check({ target = defaultTarget, settings = {}, logger = defaultLogger, }) {
+function makeCheck({ eyes, client, driver: defaultDriver, spec, signal, logger: defaultLogger, }) {
+    return async function check({ settings = {}, driver, target, logger = defaultLogger, }) {
         var _a, _b;
         logger.log('Command "check" is called with settings', settings);
         if (signal.aborted) {
@@ -45,9 +45,8 @@ function makeCheck({ spec, getEyes, client, test, signal, target: defaultTarget,
         }
         const { elementReferencesToCalculate, elementReferenceToTarget, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({ settings });
         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 });
+        driver !== null && driver !== void 0 ? driver : (driver = (spec === null || spec === void 0 ? void 0 : spec.isDriver(target)) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : defaultDriver);
+        if (driver) {
             if (driver.isWeb && (!settings.renderers || settings.renderers.length === 0)) {
                 const viewportSize = await driver.getViewportSize();
                 settings.renderers = [{ name: 'chrome', ...viewportSize }];
@@ -74,7 +73,7 @@ function makeCheck({ spec, getEyes, client, test, signal, target: defaultTarget,
             snapshots = await (0, take_snapshots_1.takeSnapshots)({
                 driver,
                 settings: {
-                    ...test.server,
+                    ...eyes.test.server,
                     waitBeforeCapture: settings.waitBeforeCapture,
                     disableBrowserFetching: settings.disableBrowserFetching,
                     layoutBreakpoints: settings.layoutBreakpoints,
@@ -119,42 +118,48 @@ function makeCheck({ spec, getEyes, client, test, signal, target: defaultTarget,
                     throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
                 }
                 const { cookies, ...snapshot } = snapshots[index];
+                const snapshotType = utils.types.has(snapshot, 'cdt') ? 'web' : 'native';
                 const renderTargetPromise = client.createRenderTarget({
                     snapshot,
-                    settings: { renderer, referer: snapshotUrl, cookies, proxy: test.server.proxy, autProxy: settings.autProxy, userAgent },
+                    settings: {
+                        renderer,
+                        referer: snapshotUrl,
+                        cookies,
+                        proxy: eyes.test.server.proxy,
+                        autProxy: settings.autProxy,
+                        userAgent,
+                    },
                 });
-                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: renderSettings });
-                const eyes = await getEyes({ rawEnvironment });
+                const [baseEyes] = await eyes.getBaseEyes({ settings: { renderer, type: snapshotType }, logger });
                 try {
                     if (signal.aborted) {
                         logger.warn('Command "check" was aborted before rendering');
                         throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
                     }
-                    else if (eyes.aborted) {
-                        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`);
+                    else if (baseEyes.aborted) {
+                        logger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
+                        throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
                     }
-                    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');
                     }
-                    else if (eyes.aborted) {
-                        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`);
+                    else if (baseEyes.aborted) {
+                        logger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
+                        throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
                     }
                     const { renderId, selectorRegions, ...baseTarget } = await client.render({
                         target: renderTarget,
-                        settings: renderSettings,
+                        settings: {
+                            ...settings,
+                            region: regionToTarget,
+                            selectorsToCalculate: selectorsToCalculate.flatMap(({ safeSelector }) => safeSelector !== null && safeSelector !== void 0 ? safeSelector : []),
+                            includeFullPageSize: Boolean(settings.pageId),
+                            type: snapshotType,
+                            renderer,
+                            rendererId: baseEyes.test.rendererId,
+                        },
                         signal,
                     });
                     let offset = 0;
@@ -171,31 +176,31 @@ function makeCheck({ spec, getEyes, client, test, signal, target: defaultTarget,
                         logger.warn('Command "check" was aborted after rendering');
                         throw new abort_error_1.AbortError('Command "check" was aborted after rendering');
                     }
-                    else if (eyes.aborted) {
-                        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`);
+                    else if (baseEyes.aborted) {
+                        logger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
+                        throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
                     }
-                    const [result] = await eyes.check({ target: { ...baseTarget, isTransformed: true }, settings: baseSettings, logger });
-                    if (eyes.aborted) {
-                        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 [result] = await baseEyes.check({ target: { ...baseTarget, isTransformed: true }, settings: baseSettings, logger });
+                    if (baseEyes.aborted) {
+                        logger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
+                        throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
                     }
-                    return { ...result, eyes, renderer };
+                    return { ...result, eyes: baseEyes, renderer };
                 }
                 catch (error) {
-                    await eyes.abort();
-                    error.info = { eyes };
+                    await baseEyes.abort();
+                    error.info = { eyes: baseEyes };
                     throw error;
                 }
             }
             catch (error) {
-                error.info = { ...error.info, userTestId: test.userTestId, renderer };
+                error.info = { ...error.info, userTestId: eyes.test.userTestId, renderer };
                 throw error;
             }
         });
         return settings.renderers.map((renderer, index) => ({
             asExpected: true,
-            userTestId: test.userTestId,
+            userTestId: eyes.test.userTestId,
             renderer,
             promise: promises[index],
         }));