@applitools/core 4.5.1 → 4.6.0

package/CHANGELOG.md

@@ -1,5 +1,82 @@
 # Changelog
 
+## [4.6.0](https://github.com/applitools/eyes.sdk.javascript1/compare/js/core@4.5.2...js/core@4.6.0) (2024-01-16)
+
+
+### Features
+
+* added possibility to provide `fallbackBaselineId` in environment objects ([#2146](https://github.com/applitools/eyes.sdk.javascript1/issues/2146)) ([f0782ea](https://github.com/applitools/eyes.sdk.javascript1/commit/f0782ea4c38935f97fc47248ed6a5b67f87b0634))
+
+
+### Bug Fixes
+
+* add environment variable for setting ufg server ufg ([#2147](https://github.com/applitools/eyes.sdk.javascript1/issues/2147)) ([cfc701f](https://github.com/applitools/eyes.sdk.javascript1/commit/cfc701f7a43fed0fe252d4090b9c1dc490063c76))
+* remove local environment id ([#2152](https://github.com/applitools/eyes.sdk.javascript1/issues/2152)) ([59aaeae](https://github.com/applitools/eyes.sdk.javascript1/commit/59aaeaed474fbde78b76ae7ac803960e3ecd8166))
+
+
+### Dependencies
+
+* @applitools/dom-snapshot bumped to 4.7.16
+  #### Bug Fixes
+
+  * handle unparsable values of media attribute in dom snapshot ([a2afe2e](https://github.com/applitools/eyes.sdk.javascript1/commit/a2afe2e18508f44f9c046270da0c1e09fb9aea03))
+* @applitools/nml-client bumped to 1.6.4
+  #### Bug Fixes
+
+  * remove local environment id ([#2152](https://github.com/applitools/eyes.sdk.javascript1/issues/2152)) ([59aaeae](https://github.com/applitools/eyes.sdk.javascript1/commit/59aaeaed474fbde78b76ae7ac803960e3ecd8166))
+* @applitools/ec-client bumped to 1.7.22
+
+* @applitools/core-base bumped to 1.9.0
+  #### Features
+
+  * added possibility to provide `fallbackBaselineId` in environment objects ([#2146](https://github.com/applitools/eyes.sdk.javascript1/issues/2146)) ([f0782ea](https://github.com/applitools/eyes.sdk.javascript1/commit/f0782ea4c38935f97fc47248ed6a5b67f87b0634))
+
+
+  #### Bug Fixes
+
+  * add environment variable for setting ufg server ufg ([#2147](https://github.com/applitools/eyes.sdk.javascript1/issues/2147)) ([cfc701f](https://github.com/applitools/eyes.sdk.javascript1/commit/cfc701f7a43fed0fe252d4090b9c1dc490063c76))
+
+## [4.5.2](https://github.com/applitools/eyes.sdk.javascript1/compare/js/core@4.5.1...js/core@4.5.2) (2024-01-02)
+
+
+### Bug Fixes
+
+* environment for each check for local environment ([#2135](https://github.com/applitools/eyes.sdk.javascript1/issues/2135)) ([f3a4483](https://github.com/applitools/eyes.sdk.javascript1/commit/f3a44831d41e190aa259367b17e930e7b6f39a04))
+* fixed concurrency splank logging ([#2115](https://github.com/applitools/eyes.sdk.javascript1/issues/2115)) ([83afd7d](https://github.com/applitools/eyes.sdk.javascript1/commit/83afd7dd2b52125fdc233dadbaf774811ea1c738))
+* fixed the issue when custom os name passed through configuration wasn't respected ([359fc0d](https://github.com/applitools/eyes.sdk.javascript1/commit/359fc0df5a9400312605bb9e8842784b7a05ba7d))
+
+
+### Dependencies
+
+* @applitools/dom-shared bumped to 1.0.12
+  #### Bug Fixes
+
+  * fix error handling in process page poll ([#2127](https://github.com/applitools/eyes.sdk.javascript1/issues/2127)) ([4346026](https://github.com/applitools/eyes.sdk.javascript1/commit/4346026d567b92747df5b4f13fb1e82b849a856e))
+* @applitools/dom-snapshot bumped to 4.7.15
+  #### Bug Fixes
+
+  * fix error handling in process page poll ([#2127](https://github.com/applitools/eyes.sdk.javascript1/issues/2127)) ([4346026](https://github.com/applitools/eyes.sdk.javascript1/commit/4346026d567b92747df5b4f13fb1e82b849a856e))
+
+
+
+* @applitools/nml-client bumped to 1.6.3
+  #### Bug Fixes
+
+  * environment for each check for local environment ([#2135](https://github.com/applitools/eyes.sdk.javascript1/issues/2135)) ([f3a4483](https://github.com/applitools/eyes.sdk.javascript1/commit/f3a44831d41e190aa259367b17e930e7b6f39a04))
+* @applitools/dom-capture bumped to 11.2.5
+
+* @applitools/ec-client bumped to 1.7.21
+
+* @applitools/core-base bumped to 1.8.0
+  #### Features
+
+  * sorted result regions of locate method ([ef6b249](https://github.com/applitools/eyes.sdk.javascript1/commit/ef6b249ad9d6998d6089423efd93f0220f13d378))
+
+
+  #### Bug Fixes
+
+  * fixed concurrency splank logging ([#2115](https://github.com/applitools/eyes.sdk.javascript1/issues/2115)) ([83afd7d](https://github.com/applitools/eyes.sdk.javascript1/commit/83afd7dd2b52125fdc233dadbaf774811ea1c738))
+
 ## [4.5.1](https://github.com/applitools/eyes.sdk.javascript1/compare/js/core@4.5.0...js/core@4.5.1) (2023-12-19)
 
 

package/dist/classic/core.js

@@ -34,10 +34,10 @@ const extract_text_1 = require("../automation/extract-text");
 const get_nml_client_1 = require("../automation/get-nml-client");
 const open_eyes_1 = require("./open-eyes");
 const utils = __importStar(require("@applitools/utils"));
-function makeCore({ spec, clients, base, concurrency, agentId = 'core-classic', cwd = process.cwd(), logger: defaultLogger, }) {
+function makeCore({ spec, clients, base: defaultBase, concurrency, agentId = 'core-classic', cwd = process.cwd(), logger: defaultLogger, }) {
     const logger = (0, logger_1.makeLogger)({ logger: defaultLogger, format: { label: 'core-classic' } });
-    logger.log(`Core classic is initialized ${base ? 'with' : 'without'} custom base core`);
-    base !== null && base !== void 0 ? base : (base = (0, core_base_1.makeCore)({ concurrency, agentId, cwd, logger }));
+    logger.log(`Core classic is initialized ${defaultBase ? 'with' : 'without'} custom base core`);
+    const base = defaultBase !== null && defaultBase !== void 0 ? defaultBase : (0, core_base_1.makeCore)({ agentId, concurrency, cwd, logger });
     return utils.general.extend(base, core => {
         return {
             type: 'classic',

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

@@ -40,11 +40,13 @@ function makeGetBaseEyes({ settings: defaultSettings, eyes, logger: mainLogger,
     });
     return getBaseEyesWithCache;
     async function getBaseEyes({ settings, logger = mainLogger, }) {
+        var _a;
         logger = logger.extend(mainLogger);
         logger.log(`Command "getBaseEyes" is called with settings`, settings);
         return eyes.core.base.openEyes({
             settings: {
                 ...defaultSettings,
+                fallbackBaselineId: (_a = settings.environment) === null || _a === void 0 ? void 0 : _a.fallbackBaselineId,
                 environment: { ...defaultSettings.environment, ...settings.environment },
             },
             logger,

package/dist/classic/open-eyes.js

@@ -54,7 +54,7 @@ function makeOpenEyes({ core, spec, logger: mainLogger }) {
         const controller = new abort_controller_1.AbortController();
         const account = await core.getAccountInfo({ settings, logger });
         return utils.general.extend({}, eyes => {
-            var _a;
+            var _a, _b, _c;
             return {
                 type: 'classic',
                 core,
@@ -63,7 +63,7 @@ function makeOpenEyes({ core, spec, logger: mainLogger }) {
                     batchId: (_a = settings.batch) === null || _a === void 0 ? void 0 : _a.id,
                     keepBatchOpen: settings.keepBatchOpen,
                     eyesServer: account.eyesServer,
-                    ufgServer: account.ufgServer,
+                    ufgServer: { ...account.ufgServer, ufgServerUrl: (_b = settings.ufgServerUrl) !== null && _b !== void 0 ? _b : (_c = account.ufgServer) === null || _c === void 0 ? void 0 : _c.ufgServerUrl },
                     uploadUrl: account.uploadUrl,
                     stitchingServiceUrl: account.stitchingServiceUrl,
                     supportedEnvironmentsUrl: account.supportedEnvironmentsUrl,

package/dist/classic/utils/extract-default-environments.js

@@ -26,40 +26,43 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractDefaultEnvironments = void 0;
 const utils = __importStar(require("@applitools/utils"));
 async function extractDefaultEnvironments({ driver, settings, }) {
-    var _a, _b, _c;
-    const environment = {};
+    var _a, _b;
+    const environment = { ...settings === null || settings === void 0 ? void 0 : settings.environment };
     if (!driver)
-        return [(_a = settings === null || settings === void 0 ? void 0 : settings.environment) !== null && _a !== void 0 ? _a : environment];
+        return [environment];
     const currentContext = driver.currentContext;
     try {
         const driverEnvironment = await driver.getEnvironment();
         const viewport = await driver.getViewport();
         const size = await driver.getViewportSize();
         environment.viewportSize = utils.geometry.scale(size, viewport.viewportScale);
+        environment.environmentId = utils.general.guid();
         if (driverEnvironment.isEC)
-            environment.ecSessionId = (_b = (await driver.getSessionId())) !== null && _b !== void 0 ? _b : undefined;
+            environment.ecSessionId = (_a = (await driver.getSessionId())) !== null && _a !== void 0 ? _a : undefined;
         if (driverEnvironment.isWeb)
             environment.userAgent = await driver.getUserAgentLegacy();
-        if (driverEnvironment.deviceName)
+        if (!environment.deviceName && driverEnvironment.deviceName)
             environment.deviceName = driverEnvironment.deviceName;
-        if (driverEnvironment.isNative && driverEnvironment.platformName) {
-            environment.os = driverEnvironment.platformName;
-            if (driverEnvironment.platformVersion)
-                environment.os += ` ${driverEnvironment.platformVersion}`;
-            if (!(settings === null || settings === void 0 ? void 0 : settings.keepPlatformNameAsIs)) {
-                if (/^android/i.test(environment.os)) {
-                    environment.os = `Android${environment.os.slice(7)}`;
-                }
-                if (/^ios/i.test(environment.os)) {
-                    environment.os = `iOS${environment.os.slice(3)}`;
+        if (!environment.os) {
+            if (driverEnvironment.isNative && driverEnvironment.platformName) {
+                environment.os = driverEnvironment.platformName;
+                if (driverEnvironment.platformVersion)
+                    environment.os += ` ${driverEnvironment.platformVersion}`;
+                if (!(settings === null || settings === void 0 ? void 0 : settings.keepPlatformNameAsIs)) {
+                    if (/^android/i.test(environment.os)) {
+                        environment.os = `Android${environment.os.slice(7)}`;
+                    }
+                    if (/^ios/i.test(environment.os)) {
+                        environment.os = `iOS${environment.os.slice(3)}`;
+                    }
                 }
             }
-        }
-        else if (driverEnvironment.isReliable &&
-            driverEnvironment.isChromium &&
-            ((driverEnvironment.isWindows && Number.parseInt(driverEnvironment.browserVersion) >= 107) ||
-                (driverEnvironment.isMac && Number.parseInt(driverEnvironment.browserVersion) >= 90))) {
-            environment.os = `${driverEnvironment.platformName} ${(_c = driverEnvironment.platformVersion) !== null && _c !== void 0 ? _c : ''}`.trim();
+            else if (driverEnvironment.isReliable &&
+                driverEnvironment.isChromium &&
+                ((driverEnvironment.isWindows && Number.parseInt(driverEnvironment.browserVersion) >= 107) ||
+                    (driverEnvironment.isMac && Number.parseInt(driverEnvironment.browserVersion) >= 90))) {
+                environment.os = `${driverEnvironment.platformName} ${(_b = driverEnvironment.platformVersion) !== null && _b !== void 0 ? _b : ''}`.trim();
+            }
         }
         return [environment];
     }

package/dist/core.js

@@ -42,7 +42,7 @@ const extract_test_environment_1 = require("./utils/extract-test-environment");
 const validate_sdk_version_1 = require("./utils/validate-sdk-version");
 const memory_usage_logging_1 = require("./utils/memory-usage-logging");
 const utils = __importStar(require("@applitools/utils"));
-function makeCore({ spec, clients, concurrency, base: defaultBase, environment: defaultEnvironment, agentId = 'core', cwd = process.cwd(), logger: defaultLogger, asyncCache, } = {}) {
+function makeCore({ spec, clients, base: defaultBase, concurrency = utils.general.getEnvValue('CONCURRENCY', 'number'), environment: defaultEnvironment, agentId = 'core', cwd = process.cwd(), logger: defaultLogger, asyncCache, } = {}) {
     const logger = (0, logger_1.makeLogger)({ logger: defaultLogger, format: { label: 'core' } });
     (0, memory_usage_logging_1.startMemoryUsageLogging)({ logger });
     const environment = (0, extract_test_environment_1.extractTestEnvironment)(defaultEnvironment);
@@ -58,22 +58,11 @@ function makeCore({ spec, clients, concurrency, base: defaultBase, environment:
             getNMLClient: (0, get_nml_client_1.makeGetNMLClient)({ client: clients === null || clients === void 0 ? void 0 : clients.nml, logger }),
             getECClient: (0, get_ec_client_1.makeGetECClient)({ logger }),
             getAccountInfo: (0, get_account_info_1.makeGetAccountInfo)({ core, logger }),
-            makeManager: (0, make_manager_1.makeMakeManager)({
-                spec,
-                clients,
-                concurrency,
-                core,
-                base: defaultBase,
-                agentId,
-                cwd,
-                environment,
-                asyncCache,
-                logger,
-            }),
+            makeManager: (0, make_manager_1.makeMakeManager)({ spec, clients, core, agentId, cwd, environment, asyncCache, 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, clients, core, concurrency, environment, asyncCache, logger }),
+            openEyes: (0, open_eyes_1.makeOpenEyes)({ spec, clients, core, environment, asyncCache, logger }),
             closeBatch: (0, close_batch_1.makeCloseBatch)({ core, logger }),
             deleteTest: (0, delete_test_1.makeDeleteTest)({ core, logger }),
         };

package/dist/make-manager.js

@@ -30,16 +30,16 @@ 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, clients, concurrency: defaultConcurrency = utils.general.getEnvValue('CONCURRENCY', 'number'), core, base: defaultBase, agentId: defaultAgentId, environment, cwd = process.cwd(), logger: mainLogger, asyncCache, }) {
+function makeMakeManager({ spec, clients, core, base: defaultBase, agentId: defaultAgentId, environment, cwd = process.cwd(), logger: mainLogger, asyncCache, }) {
     return async function makeManager({ type = 'classic', settings, logger = mainLogger, } = {}) {
-        var _a, _b, _c, _d, _e;
-        var _f;
+        var _a, _b, _c, _d, _e, _f;
+        var _g;
         logger = logger.extend(mainLogger, { tags: [`manager-${type}-${utils.general.shortid()}`] });
         settings !== null && settings !== void 0 ? settings : (settings = {});
-        (_a = settings.concurrency) !== null && _a !== void 0 ? _a : (settings.concurrency = defaultConcurrency !== null && defaultConcurrency !== void 0 ? defaultConcurrency : (utils.types.isInteger(settings.legacyConcurrency) ? settings.legacyConcurrency * 5 : 5));
-        (_b = settings.batch) !== null && _b !== void 0 ? _b : (settings.batch = {});
-        (_c = (_f = settings.batch).id) !== null && _c !== void 0 ? _c : (_f.id = (_d = utils.general.getEnvValue('BATCH_ID')) !== null && _d !== void 0 ? _d : `generated-${utils.general.guid()}`);
-        (_e = settings.agentId) !== null && _e !== void 0 ? _e : (settings.agentId = type === 'ufg' ? defaultAgentId === null || defaultAgentId === void 0 ? void 0 : defaultAgentId.replace(/(\/\d)/, '.visualgrid$1') : defaultAgentId);
+        (_a = settings.concurrency) !== null && _a !== void 0 ? _a : (settings.concurrency = (_b = utils.general.getEnvValue('CONCURRENCY', 'number')) !== null && _b !== void 0 ? _b : (utils.types.isInteger(settings.legacyConcurrency) ? settings.legacyConcurrency * 5 : 100));
+        (_c = settings.batch) !== null && _c !== void 0 ? _c : (settings.batch = {});
+        (_d = (_g = settings.batch).id) !== null && _d !== void 0 ? _d : (_g.id = (_e = utils.general.getEnvValue('BATCH_ID')) !== null && _e !== void 0 ? _e : `generated-${utils.general.guid()}`);
+        (_f = settings.agentId) !== null && _f !== void 0 ? _f : (settings.agentId = type === 'ufg' ? defaultAgentId === null || defaultAgentId === void 0 ? void 0 : defaultAgentId.replace(/(\/\d)/, '.visualgrid$1') : defaultAgentId);
         logger.log('Command "makeManager" is called with settings', settings);
         const base = defaultBase !== null && defaultBase !== void 0 ? defaultBase : (0, core_base_1.makeCore)({ agentId: settings.agentId, concurrency: settings.concurrency, cwd, logger });
         const cores = {
@@ -48,6 +48,10 @@ function makeMakeManager({ spec, clients, concurrency: defaultConcurrency = util
         };
         const storage = [];
         return {
+            get concurrency() {
+                return base.concurrency;
+            },
+            base,
             openEyes: utils.general.wrap((0, open_eyes_1.makeOpenEyes)({ type, clients, batch: settings.batch, spec, core, cores, environment, asyncCache, logger }), async (openEyes, options) => {
                 const eyes = await openEyes(options);
                 storage.push(eyes);

package/dist/open-eyes.js

@@ -34,10 +34,10 @@ const close_1 = require("./close");
 const abort_1 = require("./abort");
 const get_eyes_results_1 = require("./get-eyes-results");
 const utils = __importStar(require("@applitools/utils"));
-function makeOpenEyes({ type: defaultType = 'classic', clients, concurrency, batch, core, cores, spec, environment, logger: mainLogger, asyncCache, }) {
+function makeOpenEyes({ type: defaultType = 'classic', clients, batch, core, cores, spec, environment, logger: mainLogger, asyncCache, }) {
     return async function openEyes({ type = defaultType, settings, config, target, logger = mainLogger, }) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
-        var _u, _v, _w, _x;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+        var _w, _x, _y, _z;
         logger = logger.extend(mainLogger, { tags: [`eyes-${type}-${utils.general.shortid()}`] });
         settings = { ...config === null || config === void 0 ? void 0 : config.open, ...settings };
         (_a = settings.userTestId) !== null && _a !== void 0 ? _a : (settings.userTestId = `${settings.testName}--${utils.general.guid()}`);
@@ -45,16 +45,17 @@ function makeOpenEyes({ type: defaultType = 'classic', clients, concurrency, bat
         (_e = settings.apiKey) !== null && _e !== void 0 ? _e : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
         (_f = settings.useDnsCache) !== null && _f !== void 0 ? _f : (settings.useDnsCache = utils.general.getEnvValue('USE_DNS_CACHE', 'boolean'));
         settings.batch = { ...batch, ...settings.batch };
-        (_g = (_u = settings.batch).id) !== null && _g !== void 0 ? _g : (_u.id = (_h = utils.general.getEnvValue('BATCH_ID')) !== null && _h !== void 0 ? _h : `generated-${utils.general.guid()}`);
-        (_j = (_v = settings.batch).name) !== null && _j !== void 0 ? _j : (_v.name = utils.general.getEnvValue('BATCH_NAME'));
-        (_k = (_w = settings.batch).sequenceName) !== null && _k !== void 0 ? _k : (_w.sequenceName = utils.general.getEnvValue('BATCH_SEQUENCE'));
-        (_l = (_x = settings.batch).notifyOnCompletion) !== null && _l !== void 0 ? _l : (_x.notifyOnCompletion = utils.general.getEnvValue('BATCH_NOTIFY', 'boolean'));
+        (_g = (_w = settings.batch).id) !== null && _g !== void 0 ? _g : (_w.id = (_h = utils.general.getEnvValue('BATCH_ID')) !== null && _h !== void 0 ? _h : `generated-${utils.general.guid()}`);
+        (_j = (_x = settings.batch).name) !== null && _j !== void 0 ? _j : (_x.name = utils.general.getEnvValue('BATCH_NAME'));
+        (_k = (_y = settings.batch).sequenceName) !== null && _k !== void 0 ? _k : (_y.sequenceName = utils.general.getEnvValue('BATCH_SEQUENCE'));
+        (_l = (_z = settings.batch).notifyOnCompletion) !== null && _l !== void 0 ? _l : (_z.notifyOnCompletion = utils.general.getEnvValue('BATCH_NOTIFY', 'boolean'));
         (_m = settings.keepBatchOpen) !== null && _m !== void 0 ? _m : (settings.keepBatchOpen = utils.general.getEnvValue('DONT_CLOSE_BATCHES', 'boolean'));
         (_o = settings.branchName) !== null && _o !== void 0 ? _o : (settings.branchName = utils.general.getEnvValue('BRANCH'));
         (_p = settings.parentBranchName) !== null && _p !== void 0 ? _p : (settings.parentBranchName = utils.general.getEnvValue('PARENT_BRANCH'));
         (_q = settings.baselineBranchName) !== null && _q !== void 0 ? _q : (settings.baselineBranchName = utils.general.getEnvValue('BASELINE_BRANCH'));
-        (_r = settings.ignoreBaseline) !== null && _r !== void 0 ? _r : (settings.ignoreBaseline = false);
-        (_s = settings.compareWithParentBranch) !== null && _s !== void 0 ? _s : (settings.compareWithParentBranch = false);
+        (_r = settings.ufgServerUrl) !== null && _r !== void 0 ? _r : (settings.ufgServerUrl = utils.general.getEnvValue('UFG_SERVER_URL'));
+        (_s = settings.ignoreBaseline) !== null && _s !== void 0 ? _s : (settings.ignoreBaseline = false);
+        (_t = settings.compareWithParentBranch) !== null && _t !== void 0 ? _t : (settings.compareWithParentBranch = false);
         const driver = target && (await (0, driver_1.makeDriver)({ spec, driver: target, logger, customConfig: settings }));
         const driverEnvironment = await (driver === null || driver === void 0 ? void 0 : driver.getEnvironment());
         const driverUrl = await (driver === null || driver === void 0 ? void 0 : driver.getDriverUrl());
@@ -65,7 +66,7 @@ function makeOpenEyes({ type: defaultType = 'classic', clients, concurrency, bat
                 event: {
                     type: 'openEyes',
                     userTestId: settings.userTestId,
-                    concurrency,
+                    concurrency: (_u = cores === null || cores === void 0 ? void 0 : cores[type].concurrency) !== null && _u !== void 0 ? _u : core.concurrency,
                     environment,
                     driver: {
                         deviceName: driverEnvironment === null || driverEnvironment === void 0 ? void 0 : driverEnvironment.deviceName,
@@ -73,7 +74,7 @@ function makeOpenEyes({ type: defaultType = 'classic', clients, concurrency, bat
                         browserVersion: driverEnvironment === null || driverEnvironment === void 0 ? void 0 : driverEnvironment.browserVersion,
                         platformName: driverEnvironment === null || driverEnvironment === void 0 ? void 0 : driverEnvironment.platformName,
                         platformVersion: driverEnvironment === null || driverEnvironment === void 0 ? void 0 : driverEnvironment.platformVersion,
-                        isApplitoolsLib: (_t = driverEnvironment === null || driverEnvironment === void 0 ? void 0 : driverEnvironment.applitoolsLib) === null || _t === void 0 ? void 0 : _t.instrumented,
+                        isApplitoolsLib: (_v = driverEnvironment === null || driverEnvironment === void 0 ? void 0 : driverEnvironment.applitoolsLib) === null || _v === void 0 ? void 0 : _v.instrumented,
                         isEC: driverEnvironment === null || driverEnvironment === void 0 ? void 0 : driverEnvironment.isEC,
                     },
                     driverUrl,
@@ -86,7 +87,7 @@ function makeOpenEyes({ type: defaultType = 'classic', clients, concurrency, bat
             settings: settings,
             target: driver,
             cores: cores !== null && cores !== void 0 ? cores : {
-                ufg: (0, core_2.makeCore)({ spec, clients, base: core.base, concurrency: concurrency !== null && concurrency !== void 0 ? concurrency : 5, asyncCache, logger }),
+                ufg: (0, core_2.makeCore)({ spec, clients, base: core.base, asyncCache, logger }),
                 classic: (0, core_1.makeCore)({ spec, clients, base: core.base, logger }),
             },
             logger,

package/dist/ufg/core.js

@@ -35,10 +35,10 @@ const get_nml_client_1 = require("../automation/get-nml-client");
 const get_ufg_client_1 = require("./get-ufg-client");
 const open_eyes_1 = require("./open-eyes");
 const utils = __importStar(require("@applitools/utils"));
-function makeCore({ spec, clients, base, concurrency, fetchConcurrency, agentId = 'core-ufg', cwd = process.cwd(), logger: defaultLogger, asyncCache, }) {
+function makeCore({ spec, clients, base: defaultBase, concurrency, fetchConcurrency, agentId = 'core-ufg', cwd = process.cwd(), logger: defaultLogger, asyncCache, }) {
     const logger = (0, logger_1.makeLogger)({ logger: defaultLogger, format: { label: 'core-ufg' } });
-    logger.log(`Core ufg is initialized ${base ? 'with' : 'without'} custom base core`);
-    base !== null && base !== void 0 ? base : (base = (0, core_base_1.makeCore)({ concurrency, agentId, cwd, logger }));
+    logger.log(`Core ufg is initialized ${defaultBase ? 'with' : 'without'} custom base core`);
+    const base = defaultBase !== null && defaultBase !== void 0 ? defaultBase : (0, core_base_1.makeCore)({ agentId, concurrency, cwd, logger });
     return utils.general.extend(base, core => {
         return {
             type: 'ufg',

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

@@ -39,6 +39,7 @@ function makeGetBaseEyes({ settings: defaultSettings, eyes, logger: mainLogger,
     });
     return getBaseEyesWithCache;
     async function getBaseEyes({ settings, logger = mainLogger, }) {
+        var _a;
         logger = logger.extend(mainLogger);
         logger.log(`Command "getBaseEyes" is called with settings`, settings);
         const ufgClient = await eyes.core.getUFGClient({
@@ -56,6 +57,7 @@ function makeGetBaseEyes({ settings: defaultSettings, eyes, logger: mainLogger,
         return eyes.core.base.openEyes({
             settings: {
                 ...defaultSettings,
+                fallbackBaselineId: (_a = settings.environment) === null || _a === void 0 ? void 0 : _a.fallbackBaselineId,
                 environment: { ...defaultSettings.environment, ...environment, properties: settings.environment.properties },
             },
             logger,

package/dist/ufg/open-eyes.js

@@ -54,7 +54,7 @@ function makeOpenEyes({ core, spec, logger: mainLogger }) {
         const controller = new abort_controller_1.AbortController();
         const account = await core.getAccountInfo({ settings, logger });
         return utils.general.extend({}, eyes => {
-            var _a;
+            var _a, _b, _c;
             return {
                 type: 'ufg',
                 core,
@@ -63,7 +63,7 @@ function makeOpenEyes({ core, spec, logger: mainLogger }) {
                     batchId: (_a = settings.batch) === null || _a === void 0 ? void 0 : _a.id,
                     keepBatchOpen: settings.keepBatchOpen,
                     eyesServer: account.eyesServer,
-                    ufgServer: account.ufgServer,
+                    ufgServer: { ...account.ufgServer, ufgServerUrl: (_b = settings.ufgServerUrl) !== null && _b !== void 0 ? _b : (_c = account.ufgServer) === null || _c === void 0 ? void 0 : _c.ufgServerUrl },
                     uploadUrl: account.uploadUrl,
                     stitchingServiceUrl: account.stitchingServiceUrl,
                     supportedEnvironmentsUrl: account.supportedEnvironmentsUrl,

package/dist/universal/core.js

@@ -32,6 +32,7 @@ const utils = __importStar(require("@applitools/utils"));
 function makeCore(options) {
     const socketPromise = makeClientSocket(options);
     const core = {
+        concurrency: undefined,
         base: null,
         async getAccountInfo(options) {
             const socket = await socketPromise;
@@ -97,6 +98,8 @@ function makeCore(options) {
 exports.makeCore = makeCore;
 function makeManager({ socket, core, managerRef, }) {
     const manager = {
+        concurrency: undefined,
+        base: null,
         async openEyes(options) {
             const eyesRef = await socket.request('EyesManager.openEyes', { ...options, manager: managerRef });
             return makeEyes({ socket, core, eyesRef });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/core",
-  "version": "4.5.1",
+  "version": "4.6.0",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -74,13 +74,13 @@
     }
   },
   "dependencies": {
-    "@applitools/core-base": "1.7.5",
-    "@applitools/dom-capture": "11.2.4",
-    "@applitools/dom-snapshot": "4.7.14",
+    "@applitools/core-base": "1.9.0",
+    "@applitools/dom-capture": "11.2.5",
+    "@applitools/dom-snapshot": "4.7.16",
     "@applitools/driver": "1.16.1",
-    "@applitools/ec-client": "1.7.20",
+    "@applitools/ec-client": "1.7.22",
     "@applitools/logger": "2.0.14",
-    "@applitools/nml-client": "1.6.2",
+    "@applitools/nml-client": "1.6.4",
     "@applitools/req": "1.6.4",
     "@applitools/screenshoter": "3.8.20",
     "@applitools/snippets": "2.4.24",

package/types/automation/types.d.ts

@@ -34,10 +34,12 @@ export interface AndroidDeviceEnvironment {
 export type RenderEnvironment = (DesktopBrowserEnvironment | ChromeEmulationDeviceEnvironment | IOSDeviceEnvironment | AndroidDeviceEnvironment) & {
     environmentId?: string;
     properties?: BaseCore.CustomProperty[];
+    fallbackBaselineId?: string;
 };
 export type ExactEnvironment = BaseCore.Environment & {
     environmentId?: string;
     requested?: RenderEnvironment;
+    fallbackBaselineId?: string;
 };
 export type Environment = RenderEnvironment | ExactEnvironment;
 export interface Core<TSpec extends SpecType> extends BaseCore.Core {

package/types/classic/core.d.ts

@@ -14,5 +14,5 @@ type Options<TSpec extends SpecType> = {
     cwd?: string;
     logger?: Logger;
 };
-export declare function makeCore<TSpec extends SpecType>({ spec, clients, base, concurrency, agentId, cwd, logger: defaultLogger, }: Options<TSpec>): Core<TSpec>;
+export declare function makeCore<TSpec extends SpecType>({ spec, clients, base: defaultBase, concurrency, agentId, cwd, logger: defaultLogger, }: Options<TSpec>): Core<TSpec>;
 export {};

package/types/core.d.ts

@@ -10,13 +10,13 @@ type Options<TSpec extends SpecType> = {
         ufg?: UFGClient;
         nml?: NMLClient;
     };
-    concurrency?: number;
     base?: BaseCore;
-    agentId?: string;
+    concurrency?: number;
     environment?: Record<string, any>;
+    agentId?: string;
     cwd?: string;
     logger?: Logger;
     asyncCache?: AsyncCache;
 };
-export declare function makeCore<TSpec extends SpecType>({ spec, clients, concurrency, base: defaultBase, environment: defaultEnvironment, agentId, cwd, logger: defaultLogger, asyncCache, }?: Options<TSpec>): Core<TSpec, 'classic' | 'ufg'>;
+export declare function makeCore<TSpec extends SpecType>({ spec, clients, base: defaultBase, concurrency, environment: defaultEnvironment, agentId, cwd, logger: defaultLogger, asyncCache, }?: Options<TSpec>): Core<TSpec, 'classic' | 'ufg'>;
 export {};

package/types/make-manager.d.ts

@@ -10,7 +10,6 @@ type Options<TSpec extends SpecType> = {
         ufg?: UFGClient;
         nml?: NMLClient;
     };
-    concurrency?: number;
     core: Core<TSpec>;
     base?: BaseCore;
     agentId?: string;
@@ -19,7 +18,7 @@ type Options<TSpec extends SpecType> = {
     logger: Logger;
     asyncCache?: AsyncCache;
 };
-export declare function makeMakeManager<TSpec extends SpecType>({ spec, clients, concurrency: defaultConcurrency, core, base: defaultBase, agentId: defaultAgentId, environment, cwd, logger: mainLogger, asyncCache, }: Options<TSpec>): <TType extends "classic" | "ufg" = "classic">({ type, settings, logger, }?: {
+export declare function makeMakeManager<TSpec extends SpecType>({ spec, clients, core, base: defaultBase, agentId: defaultAgentId, environment, cwd, logger: mainLogger, asyncCache, }: Options<TSpec>): <TType extends "classic" | "ufg" = "classic">({ type, settings, logger, }?: {
     type?: TType | undefined;
     settings?: ManagerSettings | undefined;
     logger?: Logger | undefined;

package/types/open-eyes.d.ts

@@ -9,7 +9,6 @@ type Options<TSpec extends SpecType, TType extends 'classic' | 'ufg'> = {
         ufg?: UFGClient;
         nml?: NMLClient;
     };
-    concurrency?: number;
     batch?: Batch;
     core: Core<TSpec, TType>;
     cores?: {
@@ -20,7 +19,7 @@ type Options<TSpec extends SpecType, TType extends 'classic' | 'ufg'> = {
     logger: Logger;
     asyncCache?: AsyncCache;
 };
-export declare function makeOpenEyes<TSpec extends SpecType, TDefaultType extends 'classic' | 'ufg' = 'classic'>({ type: defaultType, clients, concurrency, batch, core, cores, spec, environment, logger: mainLogger, asyncCache, }: Options<TSpec, TDefaultType>): <TType extends "classic" | "ufg" = TDefaultType>({ type, settings, config, target, logger, }: {
+export declare function makeOpenEyes<TSpec extends SpecType, TDefaultType extends 'classic' | 'ufg' = 'classic'>({ type: defaultType, clients, batch, core, cores, spec, environment, logger: mainLogger, asyncCache, }: Options<TSpec, TDefaultType>): <TType extends "classic" | "ufg" = TDefaultType>({ type, settings, config, target, logger, }: {
     type?: TType | undefined;
     settings?: Partial<OpenSettings<TDefaultType> & OpenSettings<TType>> | undefined;
     config?: (Config<TSpec, TDefaultType> & Config<TSpec, TType>) | undefined;

package/types/types.d.ts

@@ -1,4 +1,5 @@
 import type { MaybeArray } from '@applitools/utils';
+import type * as BaseCore from '@applitools/core-base/types';
 import type * as AutomationCore from './automation/types';
 import type * as ClassicCore from './classic/types';
 import type * as UFGCore from './ufg/types';
@@ -47,6 +48,8 @@ export interface Core<TSpec extends SpecType, TDefaultType extends 'classic' | '
     }): Promise<string[]>;
 }
 export interface EyesManager<TSpec extends SpecType, TDefaultType extends 'classic' | 'ufg' = 'classic' | 'ufg'> {
+    readonly concurrency: number | undefined;
+    readonly base: BaseCore.Core;
     openEyes<TType extends 'classic' | 'ufg' = TDefaultType>(options: {
         type?: TType;
         target?: AutomationCore.DriverTarget<TSpec>;

package/types/ufg/core.d.ts

@@ -18,5 +18,5 @@ type Options<TSpec extends SpecType> = {
     logger?: Logger;
     asyncCache?: AsyncCache;
 };
-export declare function makeCore<TSpec extends SpecType>({ spec, clients, base, concurrency, fetchConcurrency, agentId, cwd, logger: defaultLogger, asyncCache, }: Options<TSpec>): Core<TSpec>;
+export declare function makeCore<TSpec extends SpecType>({ spec, clients, base: defaultBase, concurrency, fetchConcurrency, agentId, cwd, logger: defaultLogger, asyncCache, }: Options<TSpec>): Core<TSpec>;
 export {};