@applitools/core 3.11.8 → 4.0.1

package/CHANGELOG.md

@@ -1,5 +1,140 @@
 # Changelog
 
+## [4.0.1](https://github.com/applitools/eyes.sdk.javascript1/compare/js/core@4.0.0...js/core@4.0.1) (2023-10-25)
+
+
+### Dependencies
+
+* @applitools/tunnel-client bumped to 1.3.0
+  #### Features
+
+  * add more logs for tunnel worker ([60cf839](https://github.com/applitools/eyes.sdk.javascript1/commit/60cf839f23b214dff89ff4a9c59f231c96160daf))
+* @applitools/ec-client bumped to 1.7.14
+
+
+## [4.0.0](https://github.com/applitools/eyes.sdk.javascript1/compare/js/core@3.11.8...js/core@4.0.0) (2023-10-17)
+
+
+### ⚠ BREAKING CHANGES
+
+* update core to v4 ([#1936](https://github.com/applitools/eyes.sdk.javascript1/issues/1936))
+
+### Features
+
+* update core to v4 ([#1936](https://github.com/applitools/eyes.sdk.javascript1/issues/1936)) ([1b68d39](https://github.com/applitools/eyes.sdk.javascript1/commit/1b68d3945d96b17b9ab1f1a87d352206fd0c81d6))
+
+
+### Bug Fixes
+
+* upgrade dom-snapshot ([#1969](https://github.com/applitools/eyes.sdk.javascript1/issues/1969)) ([458beb8](https://github.com/applitools/eyes.sdk.javascript1/commit/458beb803aec3e6d51484a557b3eed8f537a709d))
+
+
+### Code Refactoring
+
+* disallow usage of global Buffer ([#1957](https://github.com/applitools/eyes.sdk.javascript1/issues/1957)) ([adcc082](https://github.com/applitools/eyes.sdk.javascript1/commit/adcc082f20f6b92e819b96424e995d9a69d99758))
+
+
+### Dependencies
+
+* @applitools/utils bumped to 1.6.2
+  #### Code Refactoring
+
+  * disallow usage of global Buffer ([#1957](https://github.com/applitools/eyes.sdk.javascript1/issues/1957)) ([adcc082](https://github.com/applitools/eyes.sdk.javascript1/commit/adcc082f20f6b92e819b96424e995d9a69d99758))
+* @applitools/logger bumped to 2.0.12
+  #### Code Refactoring
+
+  * disallow usage of global Buffer ([#1957](https://github.com/applitools/eyes.sdk.javascript1/issues/1957)) ([adcc082](https://github.com/applitools/eyes.sdk.javascript1/commit/adcc082f20f6b92e819b96424e995d9a69d99758))
+
+
+
+* @applitools/socket bumped to 1.1.12
+  #### Code Refactoring
+
+  * disallow usage of global Buffer ([#1957](https://github.com/applitools/eyes.sdk.javascript1/issues/1957)) ([adcc082](https://github.com/applitools/eyes.sdk.javascript1/commit/adcc082f20f6b92e819b96424e995d9a69d99758))
+
+
+
+* @applitools/req bumped to 1.6.2
+  #### Code Refactoring
+
+  * disallow usage of global Buffer ([#1957](https://github.com/applitools/eyes.sdk.javascript1/issues/1957)) ([adcc082](https://github.com/applitools/eyes.sdk.javascript1/commit/adcc082f20f6b92e819b96424e995d9a69d99758))
+
+
+
+* @applitools/image bumped to 1.1.7
+  #### Bug Fixes
+
+  * avoid using ascii text decoder ([1b68d39](https://github.com/applitools/eyes.sdk.javascript1/commit/1b68d3945d96b17b9ab1f1a87d352206fd0c81d6))
+
+
+  #### Code Refactoring
+
+  * disallow usage of global Buffer ([#1957](https://github.com/applitools/eyes.sdk.javascript1/issues/1957)) ([adcc082](https://github.com/applitools/eyes.sdk.javascript1/commit/adcc082f20f6b92e819b96424e995d9a69d99758))
+
+
+
+* @applitools/spec-driver-selenium bumped to 1.5.62
+
+* @applitools/spec-driver-puppeteer bumped to 1.2.4
+  #### Code Refactoring
+
+  * disallow usage of global Buffer ([#1957](https://github.com/applitools/eyes.sdk.javascript1/issues/1957)) ([adcc082](https://github.com/applitools/eyes.sdk.javascript1/commit/adcc082f20f6b92e819b96424e995d9a69d99758))
+
+
+
+* @applitools/screenshoter bumped to 3.8.14
+  #### Bug Fixes
+
+  * allow css scrolling when taking screenshot of the webview ([2d3a257](https://github.com/applitools/eyes.sdk.javascript1/commit/2d3a2572768e7f979d16297ca316a79ab2538adb))
+
+
+  #### Code Refactoring
+
+  * disallow usage of global Buffer ([#1957](https://github.com/applitools/eyes.sdk.javascript1/issues/1957)) ([adcc082](https://github.com/applitools/eyes.sdk.javascript1/commit/adcc082f20f6b92e819b96424e995d9a69d99758))
+
+
+
+* @applitools/ufg-client bumped to 1.9.6
+  #### Code Refactoring
+
+  * disallow usage of global Buffer ([#1957](https://github.com/applitools/eyes.sdk.javascript1/issues/1957)) ([adcc082](https://github.com/applitools/eyes.sdk.javascript1/commit/adcc082f20f6b92e819b96424e995d9a69d99758))
+  * drop jsdom dependency ([1b68d39](https://github.com/applitools/eyes.sdk.javascript1/commit/1b68d3945d96b17b9ab1f1a87d352206fd0c81d6))
+
+
+
+* @applitools/spec-driver-webdriver bumped to 1.0.48
+
+* @applitools/driver bumped to 1.14.4
+  #### Code Refactoring
+
+  * disallow usage of global Buffer ([#1957](https://github.com/applitools/eyes.sdk.javascript1/issues/1957)) ([adcc082](https://github.com/applitools/eyes.sdk.javascript1/commit/adcc082f20f6b92e819b96424e995d9a69d99758))
+
+
+
+* @applitools/nml-client bumped to 1.5.14
+
+* @applitools/tunnel-client bumped to 1.2.4
+  #### Code Refactoring
+
+  * disallow usage of global Buffer ([#1957](https://github.com/applitools/eyes.sdk.javascript1/issues/1957)) ([adcc082](https://github.com/applitools/eyes.sdk.javascript1/commit/adcc082f20f6b92e819b96424e995d9a69d99758))
+
+
+
+* @applitools/ec-client bumped to 1.7.13
+  #### Code Refactoring
+
+  * disallow usage of global Buffer ([#1957](https://github.com/applitools/eyes.sdk.javascript1/issues/1957)) ([adcc082](https://github.com/applitools/eyes.sdk.javascript1/commit/adcc082f20f6b92e819b96424e995d9a69d99758))
+
+
+
+* @applitools/core-base bumped to 1.7.2
+  #### Code Refactoring
+
+  * disallow usage of global Buffer ([#1957](https://github.com/applitools/eyes.sdk.javascript1/issues/1957)) ([adcc082](https://github.com/applitools/eyes.sdk.javascript1/commit/adcc082f20f6b92e819b96424e995d9a69d99758))
+
+
+
+
 ## [3.11.8](https://github.com/applitools/eyes.sdk.javascript1/compare/js/core@3.11.7...js/core@3.11.8) (2023-10-09)
 
 

package/dist/abort.js

@@ -25,14 +25,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeAbort = void 0;
 const utils = __importStar(require("@applitools/utils"));
-function makeAbort({ eyes, renderers: defaultRenderers, logger: mainLogger, }) {
+function makeAbort({ eyes, environments: defaultEnvironments, logger: mainLogger, }) {
     return async function abort({ settings, logger = mainLogger, } = {}) {
         var _a;
         logger = logger.extend(mainLogger, { tags: [`abort-${utils.general.shortid()}`] });
         const typedEyes = await eyes.getTypedEyes({ logger });
         settings !== null && settings !== void 0 ? settings : (settings = {});
-        if (typedEyes.type === 'classic' && !utils.types.isEmpty(defaultRenderers)) {
-            (_a = settings.renderers) !== null && _a !== void 0 ? _a : (settings.renderers = defaultRenderers);
+        if (typedEyes.type === 'classic' && !utils.types.isEmpty(defaultEnvironments)) {
+            (_a = settings.environments) !== null && _a !== void 0 ? _a : (settings.environments = defaultEnvironments);
         }
         await typedEyes.abort({ settings, logger });
     };

package/dist/automation/abort.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeAbort = void 0;
 const driver_1 = require("@applitools/driver");
-const uniquify_renderers_1 = require("./utils/uniquify-renderers");
-function makeAbort({ eyes, target, controller, renderers: defaultRenderers, spec, logger: mainLogger, }) {
+const uniquify_environments_1 = require("./utils/uniquify-environments");
+function makeAbort({ eyes, target, controller, environments: defaultEnvironments, spec, logger: mainLogger, }) {
     return async function abort({ settings, logger = mainLogger, } = {}) {
         var _a;
         logger = logger.extend(mainLogger);
@@ -27,11 +27,11 @@ function makeAbort({ eyes, target, controller, renderers: defaultRenderers, spec
                 logger.warn('Command "abort" received an error during extracting driver metadata', error);
             }
         }
-        (_a = settings.renderers) !== null && _a !== void 0 ? _a : (settings.renderers = defaultRenderers);
-        if (eyes.storage.size === 0 && settings.renderers && settings.renderers.length > 0) {
-            const uniqueRenderers = (0, uniquify_renderers_1.uniquifyRenderers)(settings.renderers);
-            logger.log('Command "abort" starting filler tests for renderers', uniqueRenderers);
-            await Promise.all(uniqueRenderers.map(renderer => eyes.getBaseEyes({ settings: { renderer }, logger })));
+        (_a = settings.environments) !== null && _a !== void 0 ? _a : (settings.environments = defaultEnvironments);
+        if (eyes.storage.size === 0 && settings.environments && settings.environments.length > 0) {
+            const uniqueEnvironments = (0, uniquify_environments_1.uniquifyEnvironments)(settings.environments);
+            logger.log('Command "abort" starting filler tests for environments', uniqueEnvironments);
+            await Promise.all(uniqueEnvironments.map(environment => eyes.getBaseEyes({ settings: { environment }, logger })));
         }
         eyes.storage.forEach(async (item) => {
             var _a, _b;

package/dist/automation/close.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeClose = void 0;
 const driver_1 = require("@applitools/driver");
-const uniquify_renderers_1 = require("./utils/uniquify-renderers");
-function makeClose({ eyes, target, renderers: defaultRenderers, spec, logger: mainLogger, }) {
+const uniquify_environments_1 = require("./utils/uniquify-environments");
+function makeClose({ eyes, target, environments: defaultEnvironments, spec, logger: mainLogger, }) {
     return async function close({ settings, logger = mainLogger, } = {}) {
         var _a;
         logger = logger.extend(mainLogger);
@@ -26,11 +26,11 @@ function makeClose({ eyes, target, renderers: defaultRenderers, spec, logger: ma
                 logger.warn('Command "close" received an error during extracting driver metadata', error);
             }
         }
-        (_a = settings.renderers) !== null && _a !== void 0 ? _a : (settings.renderers = defaultRenderers);
-        if (eyes.storage.size === 0 && settings.renderers && settings.renderers.length > 0) {
-            const uniqueRenderers = (0, uniquify_renderers_1.uniquifyRenderers)(settings.renderers);
-            logger.log('Command "close" starting filler tests for renderers', settings.renderers);
-            await Promise.all(uniqueRenderers.map(renderer => eyes.getBaseEyes({ settings: { renderer }, logger })));
+        (_a = settings.environments) !== null && _a !== void 0 ? _a : (settings.environments = defaultEnvironments);
+        if (eyes.storage.size === 0 && settings.environments && settings.environments.length > 0) {
+            const uniqueEnvironments = (0, uniquify_environments_1.uniquifyEnvironments)(settings.environments);
+            logger.log('Command "close" starting filler tests for environments', settings.environments);
+            await Promise.all(uniqueEnvironments.map(environment => eyes.getBaseEyes({ settings: { environment }, logger })));
         }
         eyes.storage.forEach(async (item) => {
             var _a, _b;

package/dist/automation/get-results.js

@@ -11,13 +11,13 @@ function makeGetResults({ eyes, logger: mainLogger }) {
             try {
                 const [eyes] = await Promise.all([item.eyes, ...item.jobs]);
                 const [result] = await eyes.getResults({ settings, logger });
-                return { ...result, renderer: eyes.test.renderer };
+                return { ...result, environment: eyes.test.environment };
             }
             catch (error) {
                 if (error instanceof abort_error_1.AbortError && ((_a = error.info) === null || _a === void 0 ? void 0 : _a.eyes)) {
                     logger.warn('Command "getResults" received an abort error during performing', settings);
                     const [result] = await error.info.eyes.getResults({ settings, logger });
-                    return { ...result, renderer: error.info.renderer };
+                    return { ...result, environment: error.info.environment };
                 }
                 logger.fatal('Command "getResults" received an error during performing', settings);
                 throw error;

package/dist/automation/utils/{extract-renderer-key.js → to-environment-key.js}

@@ -23,13 +23,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractRendererKey = void 0;
+exports.toEnvironmentKey = void 0;
 const utils = __importStar(require("@applitools/utils"));
-function extractRendererKey(renderer) {
-    var _a;
-    const originalRenderer = utils.types.has(renderer, 'environment')
-        ? (_a = renderer.environment.renderer) !== null && _a !== void 0 ? _a : renderer
-        : renderer;
-    return JSON.stringify(originalRenderer);
+function toEnvironmentKey(environment) {
+    return JSON.stringify(utils.types.has(environment, 'requested') ? environment.requested : environment);
 }
-exports.extractRendererKey = extractRendererKey;
+exports.toEnvironmentKey = toEnvironmentKey;

package/dist/automation/utils/uniquify-environments.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uniquifyEnvironments = void 0;
+function uniquifyEnvironments(environments) {
+    const duplications = new Map(environments.map(environment => [JSON.stringify(environment), 0]));
+    return environments.reduce((uniqueEnvironments, environment) => {
+        const key = JSON.stringify(environment);
+        let index = duplications.get(key);
+        if (index > 0) {
+            if (!environment.environmentId) {
+                let uniqueEnvironment;
+                do {
+                    uniqueEnvironment = { ...environment, environmentId: `${index}` };
+                    index += 1;
+                } while (duplications.has(JSON.stringify(uniqueEnvironment)));
+                uniqueEnvironments.push(uniqueEnvironment);
+            }
+        }
+        else {
+            index += 1;
+            uniqueEnvironments.push(environment);
+        }
+        duplications.set(key, index);
+        return uniqueEnvironments;
+    }, []);
+}
+exports.uniquifyEnvironments = uniquifyEnvironments;

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

@@ -28,11 +28,11 @@ const driver_1 = require("@applitools/driver");
 const take_screenshots_1 = require("./utils/take-screenshots");
 const to_base_check_settings_1 = require("../automation/utils/to-base-check-settings");
 const wait_for_lazy_load_1 = require("../automation/utils/wait-for-lazy-load");
-const uniquify_renderers_1 = require("../automation/utils/uniquify-renderers");
-const extract_renderer_key_1 = require("../automation/utils/extract-renderer-key");
+const uniquify_environments_1 = require("../automation/utils/uniquify-environments");
+const to_environment_key_1 = require("../automation/utils/to-environment-key");
 const abort_error_1 = require("../errors/abort-error");
 const utils = __importStar(require("@applitools/utils"));
-function makeCheckAndClose({ eyes, target: defaultTarget, renderers: defaultRenderers = [], spec, signal, logger: mainLogger, }) {
+function makeCheckAndClose({ eyes, target: defaultTarget, environments: defaultEnvironments = [], spec, signal, logger: mainLogger, }) {
     return async function checkAndClose({ target = defaultTarget, settings = {}, logger = mainLogger, } = {}) {
         var _a, _b;
         logger = logger.extend(mainLogger);
@@ -43,26 +43,26 @@ function makeCheckAndClose({ eyes, target: defaultTarget, renderers: defaultRend
             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 uniqueRenderers = (0, uniquify_renderers_1.uniquifyRenderers)((_a = settings.renderers) !== null && _a !== void 0 ? _a : defaultRenderers);
+        const uniqueEnvironments = (0, uniquify_environments_1.uniquifyEnvironments)((_a = settings.environments) !== null && _a !== void 0 ? _a : defaultEnvironments);
         const baseTargets = [];
         const baseSettings = [];
-        const transformedRenderers = [];
+        const exactEnvironments = [];
         if ((0, driver_1.isDriver)(target, spec)) {
             const driver = await (0, driver_1.makeDriver)({ spec, driver: target, reset: target === defaultTarget, logger });
             await driver.currentContext.setScrollingElement((_b = settings.scrollRootElement) !== null && _b !== void 0 ? _b : null);
-            const environment = await driver.getEnvironment();
-            uniqueRenderers.forEach(renderer => {
+            const driverEnvironment = await driver.getEnvironment();
+            uniqueEnvironments.forEach(environment => {
                 var _a, _b;
                 var _c, _d;
-                if (utils.types.has(renderer, 'iosDeviceInfo')) {
-                    (_a = (_c = renderer.iosDeviceInfo).version) !== null && _a !== void 0 ? _a : (_c.version = environment.platformVersion);
+                if (utils.types.has(environment, 'iosDeviceInfo')) {
+                    (_a = (_c = environment.iosDeviceInfo).version) !== null && _a !== void 0 ? _a : (_c.version = driverEnvironment.platformVersion);
                 }
-                else if (utils.types.has(renderer, 'androidDeviceInfo')) {
-                    (_b = (_d = renderer.androidDeviceInfo).version) !== null && _b !== void 0 ? _b : (_d.version = environment.platformVersion);
+                else if (utils.types.has(environment, 'androidDeviceInfo')) {
+                    (_b = (_d = environment.androidDeviceInfo).version) !== null && _b !== void 0 ? _b : (_d.version = driverEnvironment.platformVersion);
                 }
-                return renderer;
+                return environment;
             });
-            if (settings.lazyLoad && environment.isWeb) {
+            if (settings.lazyLoad && driverEnvironment.isWeb) {
                 await (0, wait_for_lazy_load_1.waitForLazyLoad)({
                     context: driver.currentContext,
                     settings: settings.lazyLoad !== true ? settings.lazyLoad : {},
@@ -70,19 +70,19 @@ function makeCheckAndClose({ eyes, target: defaultTarget, renderers: defaultRend
                 });
             }
             const { elementReferencesToCalculate, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({ settings });
-            if (environment.isWeb || !environment.isApplitoolsLib || settings.screenshotMode === 'default') {
+            if (driverEnvironment.isWeb || !driverEnvironment.isApplitoolsLib || settings.screenshotMode === 'default') {
                 const screenshots = await (0, take_screenshots_1.takeScreenshots)({
                     driver,
                     settings: {
                         ...settings,
-                        renderers: uniqueRenderers,
+                        environments: uniqueEnvironments,
                         regionsToCalculate: elementReferencesToCalculate,
                         calculateView: !!settings.pageId,
                         domSettings: settings.sendDom ? { proxy: eyes.test.eyesServer.proxy } : undefined,
                     },
                     logger,
                 });
-                transformedRenderers.push(...uniqueRenderers);
+                exactEnvironments.push(...uniqueEnvironments);
                 screenshots.forEach(({ calculatedRegions, ...baseTarget }) => {
                     baseTargets.push(baseTarget);
                     baseSettings.push(getBaseCheckSettings({ calculatedRegions }));
@@ -91,12 +91,12 @@ function makeCheckAndClose({ eyes, target: defaultTarget, renderers: defaultRend
             else {
                 const nmlClient = await eyes.core.getNMLClient({
                     driver,
-                    settings: { ...eyes.test.eyesServer, renderEnvironmentsUrl: eyes.test.renderEnvironmentsUrl },
+                    settings: { ...eyes.test.eyesServer, supportedEnvironmentsUrl: eyes.test.supportedEnvironmentsUrl },
                     logger,
                 });
                 const screenshots = await nmlClient.takeScreenshots({
                     settings: {
-                        renderers: uniqueRenderers,
+                        environments: uniqueEnvironments,
                         fully: settings.fully,
                         stitchMode: settings.stitchMode,
                         hideScrollbars: settings.hideScrollbars,
@@ -109,56 +109,57 @@ function makeCheckAndClose({ eyes, target: defaultTarget, renderers: defaultRend
                     },
                     logger,
                 });
-                screenshots.forEach(({ calculatedRegions: _calculatedRegions, renderEnvironment, ...baseTarget }) => {
-                    transformedRenderers.push({ environment: renderEnvironment });
+                screenshots.forEach(({ environment, ...baseTarget }) => {
+                    exactEnvironments.push(environment);
                     baseTargets.push({ ...baseTarget, isTransformed: true });
                     baseSettings.push(getBaseCheckSettings({ calculatedRegions: [] }));
                 });
             }
         }
         else {
-            transformedRenderers.push(...uniqueRenderers);
+            exactEnvironments.push(...uniqueEnvironments);
             baseTargets.push(target);
             baseSettings.push(settings);
         }
-        const promises = transformedRenderers.map(async (renderer, index) => {
-            const rendererLogger = logger.extend({ tags: [`renderer-${utils.general.shortid()}`] });
+        const promises = exactEnvironments.map(async (environment, index) => {
+            var _a, _b, _c;
+            const environmentLogger = logger.extend({ tags: [`environment-${utils.general.shortid()}`] });
             try {
                 if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
-                    rendererLogger.warn('Command "checkAndClose" was aborted before checking');
+                    environmentLogger.warn('Command "checkAndClose" was aborted before checking');
                     throw new abort_error_1.AbortError('Command "checkAndClose" was aborted before checking');
                 }
-                const baseEyes = await eyes.getBaseEyes({ settings: { renderer }, logger: rendererLogger });
+                const baseEyes = await eyes.getBaseEyes({ settings: { environment }, logger: environmentLogger });
                 try {
                     if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
-                        rendererLogger.warn('Command "checkAndClose" was aborted before checking');
+                        environmentLogger.warn('Command "checkAndClose" was aborted before checking');
                         throw new abort_error_1.AbortError('Command "checkAndClose" was aborted before checking');
                     }
                     else if (!baseEyes.running) {
-                        rendererLogger.warn(`Check on environment with id "${baseEyes.test.renderEnvironmentId}" was aborted during one of the previous steps`);
-                        throw new abort_error_1.AbortError(`Check on environment with id "${baseEyes.test.renderEnvironmentId}" was aborted during one of the previous steps`);
+                        environmentLogger.warn(`Check on environment with id "${(_a = baseEyes.test.environment) === null || _a === void 0 ? void 0 : _a.environmentId}" was aborted during one of the previous steps`);
+                        throw new abort_error_1.AbortError(`Check on environment with id "${(_b = baseEyes.test.environment) === null || _b === void 0 ? void 0 : _b.environmentId}" was aborted during one of the previous steps`);
                     }
                     await baseEyes.checkAndClose({
                         target: baseTargets[index],
                         settings: baseSettings[index],
-                        logger: rendererLogger,
+                        logger: environmentLogger,
                     });
                 }
                 catch (error) {
-                    rendererLogger.error(`Check on environment with id "${baseEyes.test.renderEnvironmentId}" failed due to an error`, error);
-                    await baseEyes.abort({ logger: rendererLogger });
+                    environmentLogger.error(`Check on environment with id "${(_c = baseEyes.test.environment) === null || _c === void 0 ? void 0 : _c.environmentId}" failed due to an error`, error);
+                    await baseEyes.abort({ logger: environmentLogger });
                     error.info = { eyes: baseEyes };
                     throw error;
                 }
             }
             catch (error) {
-                rendererLogger.error(`Check with id ${renderer.id} failed before checking started due to an error`, error);
-                error.info = { ...error.info, userTestId: eyes.test.userTestId, renderer };
+                environmentLogger.error(`Environment with id ${environment.environmentId} failed before checking started due to an error`, error);
+                error.info = { ...error.info, userTestId: eyes.test.userTestId, environment: environment };
                 throw error;
             }
         });
-        transformedRenderers.forEach((renderer, index) => {
-            const key = (0, extract_renderer_key_1.extractRendererKey)(renderer);
+        exactEnvironments.forEach((environment, index) => {
+            const key = (0, to_environment_key_1.toEnvironmentKey)(environment);
             let item = eyes.storage.get(key);
             if (!item) {
                 item = { eyes: utils.promises.makeControlledPromise(), jobs: [] };

package/dist/classic/check.js

@@ -28,11 +28,11 @@ const driver_1 = require("@applitools/driver");
 const take_screenshots_1 = require("./utils/take-screenshots");
 const to_base_check_settings_1 = require("../automation/utils/to-base-check-settings");
 const wait_for_lazy_load_1 = require("../automation/utils/wait-for-lazy-load");
-const uniquify_renderers_1 = require("../automation/utils/uniquify-renderers");
-const extract_renderer_key_1 = require("../automation/utils/extract-renderer-key");
+const uniquify_environments_1 = require("../automation/utils/uniquify-environments");
+const to_environment_key_1 = require("../automation/utils/to-environment-key");
 const abort_error_1 = require("../errors/abort-error");
 const utils = __importStar(require("@applitools/utils"));
-function makeCheck({ eyes, target: defaultTarget, renderers: defaultRenderers = [], spec, signal, logger: mainLogger, }) {
+function makeCheck({ eyes, target: defaultTarget, environments: defaultEnvironments = [], spec, signal, logger: mainLogger, }) {
     return async function check({ target = defaultTarget, settings = {}, logger = mainLogger, } = {}) {
         var _a, _b;
         logger = logger.extend(mainLogger);
@@ -43,26 +43,26 @@ function makeCheck({ eyes, target: defaultTarget, renderers: defaultRenderers =
             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 uniqueRenderers = (0, uniquify_renderers_1.uniquifyRenderers)((_a = settings.renderers) !== null && _a !== void 0 ? _a : defaultRenderers);
+        const uniqueEnvironments = (0, uniquify_environments_1.uniquifyEnvironments)((_a = settings.environments) !== null && _a !== void 0 ? _a : defaultEnvironments);
         const baseTargets = [];
         const baseSettings = [];
-        const transformedRenderers = [];
+        const exactEnvironments = [];
         if ((0, driver_1.isDriver)(target, spec)) {
             const driver = await (0, driver_1.makeDriver)({ spec, driver: target, reset: target === defaultTarget, logger });
             await driver.currentContext.setScrollingElement((_b = settings.scrollRootElement) !== null && _b !== void 0 ? _b : null);
-            const environment = await driver.getEnvironment();
-            uniqueRenderers.forEach(renderer => {
+            const driverEnvironment = await driver.getEnvironment();
+            uniqueEnvironments.forEach(environment => {
                 var _a, _b;
                 var _c, _d;
-                if (utils.types.has(renderer, 'iosDeviceInfo')) {
-                    (_a = (_c = renderer.iosDeviceInfo).version) !== null && _a !== void 0 ? _a : (_c.version = environment.platformVersion);
+                if (utils.types.has(environment, 'iosDeviceInfo')) {
+                    (_a = (_c = environment.iosDeviceInfo).version) !== null && _a !== void 0 ? _a : (_c.version = driverEnvironment.platformVersion);
                 }
-                else if (utils.types.has(renderer, 'androidDeviceInfo')) {
-                    (_b = (_d = renderer.androidDeviceInfo).version) !== null && _b !== void 0 ? _b : (_d.version = environment.platformVersion);
+                else if (utils.types.has(environment, 'androidDeviceInfo')) {
+                    (_b = (_d = environment.androidDeviceInfo).version) !== null && _b !== void 0 ? _b : (_d.version = driverEnvironment.platformVersion);
                 }
-                return renderer;
+                return environment;
             });
-            if (settings.lazyLoad && environment.isWeb) {
+            if (settings.lazyLoad && driverEnvironment.isWeb) {
                 await (0, wait_for_lazy_load_1.waitForLazyLoad)({
                     context: driver.currentContext,
                     settings: settings.lazyLoad !== true ? settings.lazyLoad : {},
@@ -70,19 +70,19 @@ function makeCheck({ eyes, target: defaultTarget, renderers: defaultRenderers =
                 });
             }
             const { elementReferencesToCalculate, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({ settings });
-            if (environment.isWeb || !environment.isApplitoolsLib || settings.screenshotMode === 'default') {
+            if (driverEnvironment.isWeb || !driverEnvironment.isApplitoolsLib || settings.screenshotMode === 'default') {
                 const screenshots = await (0, take_screenshots_1.takeScreenshots)({
                     driver,
                     settings: {
                         ...settings,
-                        renderers: uniqueRenderers,
+                        environments: uniqueEnvironments,
                         regionsToCalculate: elementReferencesToCalculate,
                         calculateView: !!settings.pageId,
                         domSettings: settings.sendDom ? { proxy: eyes.test.eyesServer.proxy } : undefined,
                     },
                     logger,
                 });
-                transformedRenderers.push(...uniqueRenderers);
+                exactEnvironments.push(...uniqueEnvironments);
                 screenshots.forEach(({ calculatedRegions, ...baseTarget }) => {
                     baseTargets.push(baseTarget);
                     baseSettings.push(getBaseCheckSettings({ calculatedRegions }));
@@ -91,12 +91,12 @@ function makeCheck({ eyes, target: defaultTarget, renderers: defaultRenderers =
             else {
                 const nmlClient = await eyes.core.getNMLClient({
                     driver,
-                    settings: { ...eyes.test.eyesServer, renderEnvironmentsUrl: eyes.test.renderEnvironmentsUrl },
+                    settings: { ...eyes.test.eyesServer, supportedEnvironmentsUrl: eyes.test.supportedEnvironmentsUrl },
                     logger,
                 });
                 const screenshots = await nmlClient.takeScreenshots({
                     settings: {
-                        renderers: uniqueRenderers,
+                        environments: uniqueEnvironments,
                         fully: settings.fully,
                         stitchMode: settings.stitchMode,
                         hideScrollbars: settings.hideScrollbars,
@@ -109,57 +109,58 @@ function makeCheck({ eyes, target: defaultTarget, renderers: defaultRenderers =
                     },
                     logger,
                 });
-                screenshots.forEach(({ calculatedRegions: _calculatedRegions, renderEnvironment, ...baseTarget }) => {
-                    transformedRenderers.push({ environment: renderEnvironment });
+                screenshots.forEach(({ environment, ...baseTarget }) => {
+                    exactEnvironments.push(environment);
                     baseTargets.push({ ...baseTarget, isTransformed: true });
                     baseSettings.push(getBaseCheckSettings({ calculatedRegions: [] }));
                 });
             }
         }
         else {
-            transformedRenderers.push(...uniqueRenderers);
+            exactEnvironments.push(...uniqueEnvironments);
             baseTargets.push(target);
             baseSettings.push(settings);
         }
-        const promises = transformedRenderers.map(async (renderer, index) => {
-            const rendererLogger = logger.extend({ tags: [`renderer-${utils.general.shortid()}`] });
+        const promises = exactEnvironments.map(async (environment, index) => {
+            var _a, _b, _c;
+            const environmentLogger = logger.extend({ tags: [`environment-${utils.general.shortid()}`] });
             try {
                 if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
-                    rendererLogger.warn('Command "check" was aborted before checking');
+                    environmentLogger.warn('Command "check" was aborted before checking');
                     throw new abort_error_1.AbortError('Command "check" was aborted before checking');
                 }
-                const baseEyes = await eyes.getBaseEyes({ settings: { renderer }, logger: rendererLogger });
+                const baseEyes = await eyes.getBaseEyes({ settings: { environment }, logger: environmentLogger });
                 try {
                     if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
-                        rendererLogger.warn('Command "check" was aborted before checking');
+                        environmentLogger.warn('Command "check" was aborted before checking');
                         throw new abort_error_1.AbortError('Command "check" was aborted before checking');
                     }
                     else if (!baseEyes.running) {
-                        rendererLogger.warn(`Check on environment with id "${baseEyes.test.renderEnvironmentId}" was aborted during one of the previous steps`);
-                        throw new abort_error_1.AbortError(`Check on environment with id "${baseEyes.test.renderEnvironmentId}" was aborted during one of the previous steps`);
+                        environmentLogger.warn(`Check on environment with id "${(_a = baseEyes.test.environment) === null || _a === void 0 ? void 0 : _a.environmentId}" was aborted during one of the previous steps`);
+                        throw new abort_error_1.AbortError(`Check on environment with id "${(_b = baseEyes.test.environment) === null || _b === void 0 ? void 0 : _b.environmentId}" was aborted during one of the previous steps`);
                     }
                     await baseEyes.check({
                         target: baseTargets[index],
                         settings: baseSettings[index],
-                        logger: rendererLogger,
+                        logger: environmentLogger,
                     });
                 }
                 catch (error) {
-                    rendererLogger.error(`Check on environment with id "${baseEyes.test.renderEnvironmentId}" failed due to an error`, error);
+                    environmentLogger.error(`Check on environment with id "${(_c = baseEyes.test.environment) === null || _c === void 0 ? void 0 : _c.environmentId}" failed due to an error`, error);
                     if (baseEyes.running && !(signal === null || signal === void 0 ? void 0 : signal.aborted))
-                        await baseEyes.abort({ logger: rendererLogger });
+                        await baseEyes.abort({ logger: environmentLogger });
                     error.info = { eyes: baseEyes };
                     throw error;
                 }
             }
             catch (error) {
-                rendererLogger.error(`Check with id ${renderer.id} failed before checking started due to an error`, error);
-                error.info = { ...error.info, userTestId: eyes.test.userTestId, renderer };
+                environmentLogger.error(`Environment with id ${environment.environmentId} failed before checking started due to an error`, error);
+                error.info = { ...error.info, userTestId: eyes.test.userTestId, environment };
                 throw error;
             }
         });
-        transformedRenderers.forEach((renderer, index) => {
-            const key = (0, extract_renderer_key_1.extractRendererKey)(renderer);
+        exactEnvironments.forEach((environment, index) => {
+            const key = (0, to_environment_key_1.toEnvironmentKey)(environment);
             let item = eyes.storage.get(key);
             if (!item) {
                 item = { eyes: utils.promises.makeControlledPromise(), jobs: [] };