@applitools/core 2.3.14 → 2.4.0

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## 2.4.0 - 2023/3/12
+
+### Features
+### Bug fixes
+- Fixed ufg concurrency regression
+
 ## 2.3.14 - 2023/3/7
 
 ### Features

package/dist/automation/extract-text.js

@@ -33,7 +33,7 @@ function makeExtractText({ core, spec, logger: defaultLogger }) {
     return async function extractText({ target, settings, logger = defaultLogger, }) {
         logger.log('Command "extractText" is called with settings', settings);
         if (!(0, driver_1.isDriver)(target, spec)) {
-            return core.extractText({ target, settings: settings, logger });
+            return core.base.extractText({ target, settings: settings, logger });
         }
         settings = utils.types.isArray(settings) ? settings : [settings];
         const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
@@ -63,7 +63,7 @@ function makeExtractText({ core, spec, logger: defaultLogger }) {
             }
             delete settings.region;
             delete settings.normalization;
-            const results = await core.extractText({
+            const results = await core.base.extractText({
                 target: baseTarget,
                 settings: settings,
                 logger,

package/dist/automation/locate-text.js

@@ -32,7 +32,7 @@ function makeLocateText({ core, spec, logger: defaultLogger }) {
     return async function locateText({ target, settings, logger = defaultLogger, }) {
         logger.log('Command "locateText" is called with settings', settings);
         if (!(0, driver_1.isDriver)(target, spec)) {
-            return core.locateText({ target, settings: settings, logger });
+            return core.base.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 });
@@ -45,7 +45,7 @@ function makeLocateText({ core, spec, logger: defaultLogger }) {
             // else await screenshot.element?.setAttribute('data-applitools-scroll', 'true')
             // baseTarget.dom = await takeDomCapture({driver, logger}).catch(() => null)
         }
-        const results = await core.locateText({
+        const results = await core.base.locateText({
             target: baseTarget,
             settings: settings,
             logger,

package/dist/automation/locate.js

@@ -7,12 +7,16 @@ 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 });
+            return core.base.locate({ target, settings: settings, logger });
         }
         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 });
+        const results = await core.base.locate({
+            target: baseTarget,
+            settings: settings,
+            logger,
+        });
         return results;
     };
 }

package/dist/check-and-close.js

@@ -4,16 +4,15 @@ exports.makeCheckAndClose = void 0;
 const driver_1 = require("@applitools/driver");
 function makeCheckAndClose({ type: defaultType = 'classic', eyes, target: defaultTarget, spec, logger: defaultLogger, }) {
     return async function checkAndClose({ type = defaultType, target = defaultTarget, settings = {}, config, logger = defaultLogger, } = {}) {
+        var _a;
         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,
-                }
-                : undefined,
+            settings: (_a = settings.renderers) === null || _a === void 0 ? void 0 : _a.map(renderer => ({
+                type: (driver === null || driver === void 0 ? void 0 : driver.isNative) ? 'native' : 'web',
+                renderer,
+            })),
             logger,
         });
         const results = await typedEyes.checkAndClose({ target: driver !== null && driver !== void 0 ? driver : target, settings, logger });

package/dist/check.js

@@ -33,8 +33,8 @@ const chalk_1 = __importDefault(require("chalk"));
 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;
-        var _r, _s, _t, _u;
+        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 };
         (_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);
@@ -47,12 +47,12 @@ function makeCheck({ type: defaultType = 'classic', eyes, target: defaultTarget,
         (_h = settings.sendDom) !== null && _h !== void 0 ? _h : (settings.sendDom = eyes.test.account.rcaEnabled || settings.matchLevel === 'Layout' || settings.enablePatterns || settings.useDom);
         (_j = settings.autProxy) !== null && _j !== void 0 ? _j : (settings.autProxy = eyes.test.server.proxy);
         (_k = settings.useDom) !== null && _k !== void 0 ? _k : (settings.useDom = false);
-        (_l = (_r = settings).retryTimeout) !== null && _l !== void 0 ? _l : (_r.retryTimeout = 2000);
+        (_l = (_s = settings).retryTimeout) !== null && _l !== void 0 ? _l : (_s.retryTimeout = 2000);
         settings.lazyLoad = settings.lazyLoad === true ? {} : settings.lazyLoad;
         if (settings.lazyLoad) {
-            (_m = (_s = settings.lazyLoad).scrollLength) !== null && _m !== void 0 ? _m : (_s.scrollLength = 300);
-            (_o = (_t = settings.lazyLoad).waitingTime) !== null && _o !== void 0 ? _o : (_t.waitingTime = 2000);
-            (_p = (_u = settings.lazyLoad).maxAmountToScroll) !== null && _p !== void 0 ? _p : (_u.maxAmountToScroll = 15000);
+            (_m = (_t = settings.lazyLoad).scrollLength) !== null && _m !== void 0 ? _m : (_t.scrollLength = 300);
+            (_o = (_u = settings.lazyLoad).waitingTime) !== null && _o !== void 0 ? _o : (_u.waitingTime = 2000);
+            (_p = (_v = settings.lazyLoad).maxAmountToScroll) !== null && _p !== void 0 ? _p : (_v.maxAmountToScroll = 15000);
         }
         settings.stepIndex = stepIndex++;
         (_q = settings.waitBetweenStitches) !== null && _q !== void 0 ? _q : (settings.waitBetweenStitches = utils.types.isObject(settings.lazyLoad) ? settings.lazyLoad.waitingTime : 100);
@@ -62,9 +62,10 @@ function makeCheck({ type: defaultType = 'classic', eyes, target: defaultTarget,
         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 }
-                : undefined,
+            settings: (_r = settings.renderers) === null || _r === void 0 ? void 0 : _r.map(renderer => ({
+                type: (driver === null || driver === void 0 ? void 0 : driver.isNative) ? 'native' : 'web',
+                renderer,
+            })),
             logger,
         });
         const results = await typedEyes.check({ target: driver !== null && driver !== void 0 ? driver : target, settings, logger });

package/dist/classic/core.js

@@ -33,22 +33,22 @@ 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: defaultLogger, }) {
+function makeCore({ spec, base, agentId = 'core-classic', cwd = process.cwd(), logger: defaultLogger, }) {
     var _a;
     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 && 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 }),
+    logger.log(`Core classic is initialized ${base ? 'with' : 'without'} custom base core`);
+    base !== null && base !== void 0 ? base : (base = (0, core_base_1.makeCore)({ agentId, cwd, logger }));
+    return utils.general.extend(base, core => {
+        return {
+            type: 'classic',
+            base: base,
+            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 }),
+        };
     });
 }
 exports.makeCore = makeCore;

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

@@ -25,15 +25,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeGetBaseEyes = void 0;
 const utils = __importStar(require("@applitools/utils"));
-function makeGetBaseEyes({ settings, core, eyes, logger: defaultLogger }) {
+function makeGetBaseEyes({ settings, eyes, base, logger: defaultLogger }) {
     const getBaseEyesWithCache = utils.general.cachify(getBaseEyes, () => 'default');
-    if (eyes)
-        getBaseEyesWithCache.setCachedValue('default', Promise.resolve(eyes));
+    if (base)
+        getBaseEyesWithCache.setCachedValue('default', Promise.resolve(base));
     return getBaseEyesWithCache;
     async function getBaseEyes({ logger = defaultLogger } = {}) {
         logger.log(`Command "getBaseEyes" is called with settings`, settings);
-        const eyes = await core.openEyes({ settings, logger });
-        return [eyes];
+        const baseEyes = await eyes.core.base.openEyes({ settings, logger });
+        return [baseEyes];
     }
 }
 exports.makeGetBaseEyes = makeGetBaseEyes;

package/dist/classic/open-eyes.js

@@ -32,12 +32,12 @@ const close_1 = require("./close");
 const abort_1 = require("./abort");
 const utils = __importStar(require("@applitools/utils"));
 function makeOpenEyes({ core, spec, logger: defaultLogger }) {
-    return async function openEyes({ target, settings, eyes, logger = defaultLogger, }) {
+    return async function openEyes({ target, settings, base, logger = defaultLogger, }) {
         var _a, _b, _c, _d, _e;
         var _f;
-        logger.log(`Command "openEyes" is called with ${target ? 'default driver and' : ''}`, ...(settings ? ['settings', settings] : []), eyes ? 'predefined eyes' : '');
+        logger.log(`Command "openEyes" is called with ${target ? 'default driver and' : ''}`, ...(settings ? ['settings', settings] : []), base ? 'predefined eyes' : '');
         const driver = target && (await (0, driver_1.makeDriver)({ spec, driver: target, logger, customConfig: settings }));
-        if (driver && !eyes) {
+        if (driver && !base) {
             const currentContext = driver.currentContext;
             (_a = settings.environment) !== null && _a !== void 0 ? _a : (settings.environment = {});
             if (driver.isEC) {
@@ -79,11 +79,11 @@ function makeOpenEyes({ core, spec, logger: defaultLogger }) {
             }
             await currentContext.focus();
         }
-        const getBaseEyes = (0, get_base_eyes_1.makeGetBaseEyes)({ settings, core, eyes, logger });
-        const [baseEyes] = await getBaseEyes();
-        return utils.general.extend(baseEyes, eyes => ({
+        base !== null && base !== void 0 ? base : (base = [await core.base.openEyes({ settings, logger })]);
+        return utils.general.extend(base[0], eyes => ({
             type: 'classic',
-            getBaseEyes,
+            core,
+            getBaseEyes: (0, get_base_eyes_1.makeGetBaseEyes)({ settings, eyes, base, logger }),
             check: (0, check_1.makeCheck)({ eyes, target: driver, spec, logger }),
             checkAndClose: (0, check_and_close_1.makeCheckAndClose)({ eyes, target: driver, spec, logger }),
             close: (0, close_1.makeClose)({ eyes, target: driver, spec, logger }),

package/dist/close-batch.js

@@ -33,7 +33,7 @@ function makeCloseBatch({ core, logger: defaultLogger }) {
             (_a = settings.serverUrl) !== null && _a !== void 0 ? _a : (settings.serverUrl = (_b = utils.general.getEnvValue('SERVER_URL')) !== null && _b !== void 0 ? _b : 'https://eyesapi.applitools.com');
             (_c = settings.apiKey) !== null && _c !== void 0 ? _c : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
         });
-        await core.closeBatch({ settings, logger });
+        await core.base.closeBatch({ settings, logger });
     };
 }
 exports.makeCloseBatch = makeCloseBatch;

package/dist/core.js

@@ -35,27 +35,27 @@ const open_eyes_1 = require("./open-eyes");
 const make_manager_1 = require("./make-manager");
 const close_batch_1 = require("./close-batch");
 const delete_test_1 = require("./delete-test");
-const make_ec_client_1 = require("./make-ec-client");
+const get_ec_client_1 = require("./get-ec-client");
 const utils = __importStar(require("@applitools/utils"));
-function makeCore({ spec, concurrency, core: defaultCore, agentId = 'core', cwd = process.cwd(), logger, } = {}) {
+function makeCore({ spec, concurrency, base: defaultBase, agentId = 'core', cwd = process.cwd(), logger: defaultLogger, } = {}) {
     var _a;
-    logger = (_a = logger === null || logger === void 0 ? void 0 : logger.extend({ label: 'core' })) !== null && _a !== void 0 ? _a : (0, logger_1.makeLogger)({ label: 'core' });
-    logger.log(`Core is initialized ${defaultCore ? 'with' : 'without'} custom base core`);
-    const core = defaultCore !== null && defaultCore !== void 0 ? defaultCore : (0, core_base_1.makeCore)({ agentId, cwd, logger });
-    return utils.general.extend(core, {
-        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, concurrency, logger }),
-        makeManager: (0, make_manager_1.makeMakeManager)({ spec, core: defaultCore, concurrency, agentId, logger }),
-        closeBatch: (0, close_batch_1.makeCloseBatch)({ core, logger }),
-        deleteTest: (0, delete_test_1.makeDeleteTest)({ core, logger }),
-        makeECClient: (0, make_ec_client_1.makeMakeECClient)({ core, logger }),
+    const logger = (_a = defaultLogger === null || defaultLogger === void 0 ? void 0 : defaultLogger.extend({ label: 'core' })) !== null && _a !== void 0 ? _a : (0, logger_1.makeLogger)({ label: 'core' });
+    logger.log(`Core is initialized ${defaultBase ? 'with' : 'without'} custom base core`);
+    const base = defaultBase !== null && defaultBase !== void 0 ? defaultBase : (0, core_base_1.makeCore)({ agentId, cwd, logger });
+    return utils.general.extend(base, core => {
+        return {
+            base: base,
+            getViewportSize: spec && (0, get_viewport_size_1.makeGetViewportSize)({ spec, logger }),
+            setViewportSize: spec && (0, set_viewport_size_1.makeSetViewportSize)({ spec, logger }),
+            getECClient: (0, get_ec_client_1.makeGetECClient)({ logger }),
+            makeManager: (0, make_manager_1.makeMakeManager)({ spec, concurrency, core, base: defaultBase, agentId, 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, concurrency, logger }),
+            closeBatch: (0, close_batch_1.makeCloseBatch)({ core, logger }),
+            deleteTest: (0, delete_test_1.makeDeleteTest)({ core, logger }),
+        };
     });
 }
 exports.makeCore = makeCore;

package/dist/delete-test.js

@@ -33,7 +33,7 @@ function makeDeleteTest({ core, logger: defaultLogger }) {
             (_a = settings.serverUrl) !== null && _a !== void 0 ? _a : (settings.serverUrl = (_b = utils.general.getEnvValue('SERVER_URL')) !== null && _b !== void 0 ? _b : 'https://eyesapi.applitools.com');
             (_c = settings.apiKey) !== null && _c !== void 0 ? _c : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
         });
-        await core.deleteTest({ settings, logger });
+        await core.base.deleteTest({ settings, logger });
     };
 }
 exports.makeDeleteTest = makeDeleteTest;

package/dist/extract-text.js

@@ -36,7 +36,7 @@ function makeExtractText({ spec, core, logger: defaultLogger }) {
             (_c = settings.apiKey) !== null && _c !== void 0 ? _c : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
             return settings;
         });
-        const classicCore = (0, core_1.makeCore)({ spec, core, logger });
+        const classicCore = (0, core_1.makeCore)({ spec, base: core.base, logger });
         const results = await classicCore.extractText({ target, settings, logger });
         return results;
     };

package/dist/{make-ec-client.js → get-ec-client.js}

@@ -23,14 +23,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeMakeECClient = void 0;
+exports.makeGetECClient = void 0;
+const ec_client_1 = require("@applitools/ec-client");
 const utils = __importStar(require("@applitools/utils"));
-function makeMakeECClient({ logger: defaultLogger }) {
-    return utils.general.cachify(makeECClient, ([options]) => options === null || options === void 0 ? void 0 : options.settings);
-    async function makeECClient({ settings, logger = defaultLogger, } = {}) {
-        const { makeECClient } = require('@applitools/ec-client');
-        const client = await makeECClient({ settings, logger });
+function makeGetECClient({ logger: defaultLogger }) {
+    return utils.general.cachify(getECClient, ([options]) => [options === null || options === void 0 ? void 0 : options.settings]);
+    async function getECClient({ settings, logger = defaultLogger, } = {}) {
+        const client = await (0, ec_client_1.makeECClient)({ settings, logger });
         return client;
     }
 }
-exports.makeMakeECClient = makeMakeECClient;
+exports.makeGetECClient = makeGetECClient;

package/dist/get-typed-eyes.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeGetTypedEyes = void 0;
 function makeGetTypedEyes({ type: defaultType, settings: defaultSettings, target, cores, logger: defaultLogger, }) {
     let eyes;
-    return async function getTypesEyes({ type = defaultType, settings, logger = defaultLogger, } = {}) {
+    return async function getTypedEyes({ type = defaultType, settings, logger = defaultLogger, } = {}) {
         if (!eyes) {
             eyes = await cores[type].openEyes({ target, settings: defaultSettings, logger });
             return eyes;
@@ -12,13 +12,13 @@ function makeGetTypedEyes({ type: defaultType, settings: defaultSettings, target
             return eyes;
         }
         else if (type === 'ufg') {
-            const baseEyes = await eyes.getBaseEyes();
-            const typedEyes = await cores.ufg.openEyes({ target, settings: defaultSettings, eyes: baseEyes, logger });
+            const base = await eyes.getBaseEyes({ logger });
+            const typedEyes = await cores.ufg.openEyes({ target, settings: defaultSettings, base, logger });
             return typedEyes;
         }
         else {
-            const baseEyes = (await Promise.all(settings.renderers.map(renderer => eyes.getBaseEyes({ settings: { type: settings.type, renderer } })))).flat();
-            const typedEyes = await cores.classic.openEyes({ target, settings: defaultSettings, eyes: baseEyes, logger });
+            const base = (await Promise.all(settings.map(settings => eyes.getBaseEyes({ settings, logger })))).flat();
+            const typedEyes = await cores.classic.openEyes({ target, settings: defaultSettings, base, logger });
             return typedEyes;
         }
     };

package/dist/locate-text.js

@@ -32,7 +32,7 @@ function makeLocateText({ spec, core, logger: defaultLogger }) {
         settings = { ...config === null || config === void 0 ? void 0 : config.open, ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
         (_a = settings.serverUrl) !== null && _a !== void 0 ? _a : (settings.serverUrl = (_b = utils.general.getEnvValue('SERVER_URL')) !== null && _b !== void 0 ? _b : 'https://eyesapi.applitools.com');
         (_c = settings.apiKey) !== null && _c !== void 0 ? _c : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
-        const classicCore = (0, core_1.makeCore)({ spec, core, logger });
+        const classicCore = (0, core_1.makeCore)({ spec, base: core.base, logger });
         const results = await classicCore.locateText({ target, settings, logger });
         return results;
     };

package/dist/locate.js

@@ -32,7 +32,7 @@ function makeLocate({ spec, core, logger: defaultLogger }) {
         settings = { ...config === null || config === void 0 ? void 0 : config.open, ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
         (_a = settings.serverUrl) !== null && _a !== void 0 ? _a : (settings.serverUrl = (_b = utils.general.getEnvValue('SERVER_URL')) !== null && _b !== void 0 ? _b : 'https://eyesapi.applitools.com');
         (_c = settings.apiKey) !== null && _c !== void 0 ? _c : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
-        const classicCore = (0, core_1.makeCore)({ spec, core, logger });
+        const classicCore = (0, core_1.makeCore)({ spec, base: core.base, logger });
         const results = await classicCore.locate({ target, settings, logger });
         return results;
     };

package/dist/make-manager.js

@@ -30,14 +30,14 @@ const core_2 = require("./ufg/core");
 const open_eyes_1 = require("./open-eyes");
 const get_manager_results_1 = require("./get-manager-results");
 const utils = __importStar(require("@applitools/utils"));
-function makeMakeManager({ spec, core, concurrency: defaultConcurrency = utils.general.getEnvValue('CONCURRENCY', 'number'), agentId: defaultAgentId, cwd = process.cwd(), logger: defaultLogger, }) {
+function makeMakeManager({ spec, concurrency: defaultConcurrency = utils.general.getEnvValue('CONCURRENCY', 'number'), core, base, agentId: defaultAgentId, cwd = process.cwd(), logger: defaultLogger, }) {
     return async function makeManager({ type = 'classic', concurrency = defaultConcurrency, legacyConcurrency, batch, agentId = type === 'ufg' ? defaultAgentId === null || defaultAgentId === void 0 ? void 0 : defaultAgentId.replace(/(\/\d)/, '.visualgrid$1') : defaultAgentId, logger = defaultLogger, } = {}) {
         var _a, _b;
         concurrency !== null && concurrency !== void 0 ? concurrency : (concurrency = utils.types.isInteger(legacyConcurrency) ? legacyConcurrency * 5 : 5);
         batch !== null && batch !== void 0 ? batch : (batch = {});
         (_a = batch.id) !== null && _a !== void 0 ? _a : (batch.id = (_b = utils.general.getEnvValue('BATCH_ID')) !== null && _b !== void 0 ? _b : `generated-${utils.general.guid()}`);
-        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 }) };
+        base !== null && base !== void 0 ? base : (base = (0, core_base_1.makeCore)({ agentId, cwd, logger }));
+        const cores = { ufg: (0, core_2.makeCore)({ spec, base, concurrency, logger }), classic: (0, core_1.makeCore)({ spec, base, logger }) };
         const storage = [];
         return {
             openEyes: utils.general.wrap((0, open_eyes_1.makeOpenEyes)({ type, batch, spec, core, cores, logger }), async (openEyes, options) => {

package/dist/open-eyes.js

@@ -53,14 +53,9 @@ function makeOpenEyes({ type: defaultType = 'classic', concurrency, batch, core,
         (_o = settings.baselineBranchName) !== null && _o !== void 0 ? _o : (settings.baselineBranchName = utils.general.getEnvValue('BASELINE_BRANCH'));
         (_p = settings.ignoreBaseline) !== null && _p !== void 0 ? _p : (settings.ignoreBaseline = false);
         (_q = settings.compareWithParentBranch) !== null && _q !== void 0 ? _q : (settings.compareWithParentBranch = false);
-        if (type === 'ufg') {
-            const ufgSettings = settings;
-            const ufgConfig = config;
-            (_r = ufgSettings.renderConcurrency) !== null && _r !== void 0 ? _r : (ufgSettings.renderConcurrency = (_t = (_s = ufgConfig === null || ufgConfig === void 0 ? void 0 : ufgConfig.check) === null || _s === void 0 ? void 0 : _s.renderers) === null || _t === void 0 ? void 0 : _t.length);
-        }
         const driver = target && (await (0, driver_1.makeDriver)({ spec, driver: target, logger, customConfig: settings }));
         if (driver === null || driver === void 0 ? void 0 : driver.isEC) {
-            (_u = settings.properties) !== null && _u !== void 0 ? _u : (settings.properties = []);
+            (_r = settings.properties) !== null && _r !== void 0 ? _r : (settings.properties = []);
             settings.properties.push({ name: 'Running platform', value: 'Execution cloud' });
         }
         core.logEvent({
@@ -73,7 +68,7 @@ function makeOpenEyes({ type: defaultType = 'classic', concurrency, batch, core,
                 event: {
                     type: 'runnerStarted',
                     testConcurrency: concurrency,
-                    concurrentRendersPerTest: settings.renderConcurrency,
+                    concurrentRendersPerTest: (_u = (_t = (_s = config === null || config === void 0 ? void 0 : config.check) === null || _s === void 0 ? void 0 : _s.renderers) === null || _t === void 0 ? void 0 : _t.length) !== null && _u !== void 0 ? _u : 1,
                     node: { version: process.version, platform: process.platform, arch: process.arch },
                     driverUrl: driver === null || driver === void 0 ? void 0 : driver.remoteHostname,
                     extractedCIProvider: (0, extract_ci_provider_1.extractCIProvider)(),
@@ -86,8 +81,8 @@ function makeOpenEyes({ type: defaultType = 'classic', concurrency, batch, core,
             settings: settings,
             target: driver,
             cores: cores !== null && cores !== void 0 ? 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 }),
+                ufg: (0, core_2.makeCore)({ spec, base: core.base, concurrency: concurrency !== null && concurrency !== void 0 ? concurrency : 5, logger }),
+                classic: (0, core_1.makeCore)({ spec, base: core.base, logger }),
             },
             logger,
         });

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

@@ -45,10 +45,15 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
             logger.warn('Command "checkAndClose" was called after test was already aborted');
             throw new abort_error_1.AbortError('Command "checkAndClose" was called after test was already aborted');
         }
-        const ufgClient = await eyes.getUFGClient({ logger });
         const { elementReferencesToCalculate, elementReferenceToTarget, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({
             settings,
         });
+        const uniqueRenderers = (0, uniquify_renderers_1.uniquifyRenderers)((_a = settings.renderers) !== null && _a !== void 0 ? _a : []);
+        const ufgClient = await eyes.core.getUFGClient({
+            config: { ...eyes.test.account, ...eyes.test.account.ufg, proxy: eyes.test.server.proxy },
+            concurrency: uniqueRenderers.length,
+            logger,
+        });
         let snapshots;
         let snapshotUrl;
         let snapshotTitle;
@@ -56,9 +61,8 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
         let regionToTarget;
         let scrollRootSelector;
         let selectorsToCalculate;
-        const uniqueRenderers = (0, uniquify_renderers_1.uniquifyRenderers)((_a = settings.renderers) !== null && _a !== void 0 ? _a : []);
-        if ((0, driver_1.isDriver)(target, spec)) {
-            const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
+        const driver = spec && (0, driver_1.isDriver)(target, spec) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : null;
+        if (driver) {
             if (uniqueRenderers.length === 0) {
                 if (driver.isWeb) {
                     const viewportSize = await driver.getViewportSize();
@@ -130,7 +134,7 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
                 snapshots = await (0, take_dom_snapshots_1.takeDomSnapshots)({ driver, ...snapshotOptions, logger });
             }
             else {
-                const nmlClient = await eyes.getNMLClient({ driver, logger });
+                const nmlClient = await eyes.core.getNMLClient({ config: eyes.test.server, driver, logger });
                 if (nmlClient) {
                     snapshots = (await nmlClient.takeSnapshots({ ...snapshotOptions, logger }));
                 }

package/dist/ufg/check.js

@@ -45,10 +45,15 @@ function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: defaultL
             logger.warn('Command "check" was called after test was already aborted');
             throw new abort_error_1.AbortError('Command "check" was called after test was already aborted');
         }
-        const ufgClient = await eyes.getUFGClient({ logger });
         const { elementReferencesToCalculate, elementReferenceToTarget, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({
             settings,
         });
+        const uniqueRenderers = (0, uniquify_renderers_1.uniquifyRenderers)((_a = settings.renderers) !== null && _a !== void 0 ? _a : []);
+        const ufgClient = await eyes.core.getUFGClient({
+            config: { ...eyes.test.account, ...eyes.test.account.ufg, proxy: eyes.test.server.proxy },
+            concurrency: uniqueRenderers.length || 5,
+            logger,
+        });
         let snapshots;
         let snapshotUrl;
         let snapshotTitle;
@@ -56,7 +61,6 @@ function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: defaultL
         let regionToTarget;
         let scrollRootSelector;
         let selectorsToCalculate;
-        const uniqueRenderers = (0, uniquify_renderers_1.uniquifyRenderers)((_a = settings.renderers) !== null && _a !== void 0 ? _a : []);
         const driver = spec && (0, driver_1.isDriver)(target, spec) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : null;
         if (driver) {
             await driver.currentContext.setScrollingElement((_b = settings.scrollRootElement) !== null && _b !== void 0 ? _b : null);
@@ -131,7 +135,7 @@ function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: defaultL
                 snapshots = await (0, take_dom_snapshots_1.takeDomSnapshots)({ driver, ...snapshotOptions, logger });
             }
             else {
-                const nmlClient = await eyes.getNMLClient({ driver, logger });
+                const nmlClient = await eyes.core.getNMLClient({ config: eyes.test.server, driver, logger });
                 if (nmlClient) {
                     snapshots = (await nmlClient.takeSnapshots({ ...snapshotOptions, logger }));
                 }