@applitools/core 1.4.3 → 1.4.5

package/dist/classic/open-eyes.js

@@ -42,13 +42,8 @@ function makeOpenEyes({ core, spec, logger: defaultLogger, }) {
         if (driver && !eyes) {
             const currentContext = driver.currentContext;
             (_a = settings.environment) !== null && _a !== void 0 ? _a : (settings.environment = {});
-            settings.environment.egSessionId = (driver === null || driver === void 0 ? void 0 : driver.isExecutionGrid) ? driver.sessionId : null;
-            if (!settings.environment.viewportSize || driver.isMobile) {
-                const size = await driver.getViewportSize();
-                settings.environment.viewportSize = utils.geometry.scale(size, driver.viewportScale);
-            }
-            else {
-                await driver.setViewportSize(settings.environment.viewportSize);
+            if (driver.isEC) {
+                settings.environment.ecSessionId = driver.sessionId;
             }
             if (driver.isWeb) {
                 (_b = (_f = settings.environment).userAgent) !== null && _b !== void 0 ? _b : (_f.userAgent = driver.userAgent);
@@ -75,6 +70,13 @@ function makeOpenEyes({ core, spec, logger: defaultLogger, }) {
                     settings.environment.os += ` ${driver.platformVersion}`;
                 }
             }
+            if (!settings.environment.viewportSize || driver.isMobile) {
+                const size = await driver.getViewportSize();
+                settings.environment.viewportSize = utils.geometry.scale(size, driver.viewportScale);
+            }
+            else {
+                await driver.setViewportSize(settings.environment.viewportSize);
+            }
             await currentContext.focus();
         }
         const getBaseEyes = (0, get_base_eyes_1.makeGetBaseEyes)({ settings, core, eyes, logger });

package/dist/core.js

@@ -33,7 +33,7 @@ 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_eg_client_1 = require("./make-eg-client");
+const make_ec_client_1 = require("./make-ec-client");
 const utils = __importStar(require("@applitools/utils"));
 function makeCore({ spec, concurrency, core, agentId = 'core', cwd = process.cwd(), logger, } = {}) {
     var _a;
@@ -51,7 +51,7 @@ function makeCore({ spec, concurrency, core, agentId = 'core', cwd = process.cwd
         makeManager: (0, make_manager_1.makeMakeManager)({ spec, concurrency, agentId, logger }),
         closeBatch: (0, close_batch_1.makeCloseBatch)({ core, logger }),
         deleteTest: (0, delete_test_1.makeDeleteTest)({ core, logger }),
-        makeEGClient: (0, make_eg_client_1.makeMakeEGClient)({ core, logger }),
+        makeECClient: (0, make_ec_client_1.makeMakeECClient)({ core, logger }),
     });
 }
 exports.makeCore = makeCore;

package/dist/extract-text.js

@@ -25,8 +25,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeExtractText = void 0;
 const utils = __importStar(require("@applitools/utils"));
-function makeExtractText({ eyes, logger: defaultLogger, }) {
-    return async function extractText({ target, settings, config, logger = defaultLogger, }) {
+function makeExtractText({ eyes, target: defaultTarget, logger: defaultLogger, }) {
+    return async function extractText({ target = defaultTarget, settings, config, logger = defaultLogger, }) {
         var _a;
         if (utils.types.isArray(settings)) {
             settings = settings.map(settings => {

package/dist/locate-text.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeLocateText = void 0;
-function makeLocateText({ eyes, logger: defaultLogger, }) {
-    return async function locateText({ target, settings, config, logger = defaultLogger, }) {
+function makeLocateText({ eyes, target: defaultTarget, logger: defaultLogger, }) {
+    return async function locateText({ target = defaultTarget, settings, config, logger = defaultLogger, }) {
         var _a;
         settings = { ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
         (_a = settings.autProxy) !== null && _a !== void 0 ? _a : (settings.autProxy = eyes.test.server.proxy);
         const classicEyes = await eyes.getTypedEyes({ type: 'classic', logger });
-        const results = await classicEyes.locateText({ target: target, settings, logger });
+        const results = await classicEyes.locateText({ target, settings, logger });
         return results;
     };
 }

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

@@ -23,21 +23,22 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeMakeEGClient = void 0;
+exports.makeMakeECClient = void 0;
 const utils = __importStar(require("@applitools/utils"));
-function makeMakeEGClient({ core, logger: defaultLogger }) {
-    return async function makeEGClient({ settings, logger = defaultLogger, } = {}) {
+function makeMakeECClient({ core, logger: defaultLogger }) {
+    return utils.general.cachify(makeECClient, ([options]) => options === null || options === void 0 ? void 0 : options.settings);
+    async function makeECClient({ settings, logger = defaultLogger, } = {}) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         var _j, _k;
-        const { makeEGClient } = require('@applitools/execution-grid-client');
+        const { makeECClient } = require('@applitools/ec-client');
         const serverUrl = (_c = (_b = (_a = settings.capabilities.eyesServerUrl) !== null && _a !== void 0 ? _a : utils.general.getEnvValue('EYES_SERVER_URL')) !== null && _b !== void 0 ? _b : utils.general.getEnvValue('SERVER_URL')) !== null && _c !== void 0 ? _c : 'https://eyesapi.applitools.com';
         const apiKey = ((_d = (_j = settings.capabilities).apiKey) !== null && _d !== void 0 ? _d : (_j.apiKey = utils.general.getEnvValue('API_KEY')));
         const proxy = (_e = settings.proxy) !== null && _e !== void 0 ? _e : (utils.general.getEnvValue('PROXY_URL') && { url: utils.general.getEnvValue('PROXY_URL') });
         const account = await core.getAccountInfo({ settings: { serverUrl, apiKey, proxy }, logger });
         (_f = settings.capabilities) !== null && _f !== void 0 ? _f : (settings.capabilities = {});
         (_g = (_k = settings.capabilities).useSelfHealing) !== null && _g !== void 0 ? _g : (_k.useSelfHealing = (_h = utils.general.getEnvValue('USE_SELF_HEALING', 'boolean')) !== null && _h !== void 0 ? _h : account.selfHealingEnabled);
-        const client = await makeEGClient({ settings, logger });
+        const client = await makeECClient({ settings, logger });
         return client;
-    };
+    }
 }
-exports.makeMakeEGClient = makeMakeEGClient;
+exports.makeMakeECClient = makeMakeECClient;

package/dist/open-eyes.js

@@ -24,6 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeOpenEyes = void 0;
+const driver_1 = require("@applitools/driver");
 const core_1 = require("./classic/core");
 const core_2 = require("./ufg/core");
 const get_typed_eyes_1 = require("./get-typed-eyes");
@@ -32,8 +33,8 @@ const check_and_close_1 = require("./check-and-close");
 const locate_text_1 = require("./locate-text");
 const extract_text_1 = require("./extract-text");
 const close_1 = require("./close");
-const utils = __importStar(require("@applitools/utils"));
 const extract_ci_provider_1 = require("./utils/extract-ci-provider");
+const utils = __importStar(require("@applitools/utils"));
 function makeOpenEyes({ type: defaultType = 'classic', concurrency, batch, core, cores, spec, logger: defaultLogger, }) {
     return async function openEyes({ type = defaultType, settings, config, target, logger = defaultLogger, }) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
@@ -58,6 +59,11 @@ function makeOpenEyes({ type: defaultType = 'classic', concurrency, batch, core,
             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 = []);
+            settings.properties.push({ name: 'Running platform', value: 'Execution cloud' });
+        }
         core.logEvent({
             settings: {
                 serverUrl: settings.serverUrl,
@@ -70,7 +76,7 @@ function makeOpenEyes({ type: defaultType = 'classic', concurrency, batch, core,
                     testConcurrency: concurrency,
                     concurrentRendersPerTest: settings.renderConcurrency,
                     node: { version: process.version, platform: process.platform, arch: process.arch },
-                    driverUrl: target && ((_u = spec === null || spec === void 0 ? void 0 : spec.extractHostName) === null || _u === void 0 ? void 0 : _u.call(spec, target)),
+                    driverUrl: driver === null || driver === void 0 ? void 0 : driver.remoteHostname,
                     extractedCIProvider: (0, extract_ci_provider_1.extractCIProvider)(),
                 },
             },
@@ -79,7 +85,7 @@ function makeOpenEyes({ type: defaultType = 'classic', concurrency, batch, core,
         const getTypedEyes = (0, get_typed_eyes_1.makeGetTypedEyes)({
             type,
             settings: settings,
-            target,
+            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 }),
@@ -89,10 +95,10 @@ function makeOpenEyes({ type: defaultType = 'classic', concurrency, batch, core,
         const eyes = await getTypedEyes({ logger });
         return utils.general.extend(eyes, eyes => ({
             getTypedEyes,
-            check: (0, check_1.makeCheck)({ type, eyes, target, spec, logger }),
-            checkAndClose: (0, check_and_close_1.makeCheckAndClose)({ type, eyes, target, spec, logger }),
-            locateText: (0, locate_text_1.makeLocateText)({ eyes, logger }),
-            extractText: (0, extract_text_1.makeExtractText)({ eyes, logger }),
+            check: (0, check_1.makeCheck)({ type, eyes, target: driver, spec, logger }),
+            checkAndClose: (0, check_and_close_1.makeCheckAndClose)({ type, eyes, target: driver, spec, logger }),
+            locateText: (0, locate_text_1.makeLocateText)({ eyes, target: driver, logger }),
+            extractText: (0, extract_text_1.makeExtractText)({ eyes, target: driver, logger }),
             close: (0, close_1.makeClose)({ eyes, logger }),
         }));
     };

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

@@ -32,25 +32,35 @@ const take_snapshots_1 = require("./utils/take-snapshots");
 const wait_for_lazy_load_1 = require("../utils/wait-for-lazy-load");
 const to_base_check_settings_1 = require("../utils/to-base-check-settings");
 const generate_safe_selectors_1 = require("./utils/generate-safe-selectors");
+const uniquify_renderers_1 = require("./utils/uniquify-renderers");
 const abort_error_1 = require("../errors/abort-error");
 const utils = __importStar(require("@applitools/utils"));
 const chalk_1 = __importDefault(require("chalk"));
 function makeCheckAndClose({ spec, eyes, client, signal, target: defaultTarget, logger: defaultLogger, }) {
     return async function checkAndClose({ target = defaultTarget, settings = {}, logger = defaultLogger, snapshots, }) {
-        var _a, _b;
+        var _a, _b, _c;
         logger.log('Command "checkAndClose" is called with settings', settings);
         if (signal.aborted) {
             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 { elementReferencesToCalculate, elementReferenceToTarget, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({ settings });
-        let snapshotUrl, snapshotTitle, userAgent, regionToTarget, selectorsToCalculate;
+        let snapshotUrl;
+        let snapshotTitle;
+        let userAgent;
+        let regionToTarget;
+        let selectorsToCalculate;
+        const uniqueRenderers = (0, uniquify_renderers_1.uniquifyRenderers)((_a = settings.renderers) !== null && _a !== void 0 ? _a : []);
         if ((0, driver_1.isDriver)(target, spec)) {
-            // TODO driver custom config
             const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
-            if (driver.isWeb && (!settings.renderers || settings.renderers.length === 0)) {
-                const viewportSize = await driver.getViewportSize();
-                settings.renderers = [{ name: 'chrome', ...viewportSize }];
+            if (uniqueRenderers.length === 0) {
+                if (driver.isWeb) {
+                    const viewportSize = await driver.getViewportSize();
+                    uniqueRenderers.push({ name: 'chrome', ...viewportSize });
+                }
+                else {
+                    // TODO add default nmg renderers
+                }
             }
             let cleanupGeneratedSelectors;
             if (driver.isWeb) {
@@ -61,7 +71,7 @@ function makeCheckAndClose({ spec, eyes, client, signal, target: defaultTarget,
                 });
                 cleanupGeneratedSelectors = generated.cleanupGeneratedSelectors;
                 if (elementReferenceToTarget) {
-                    regionToTarget = (_a = generated.selectors[0]) === null || _a === void 0 ? void 0 : _a.safeSelector;
+                    regionToTarget = (_b = generated.selectors[0]) === null || _b === void 0 ? void 0 : _b.safeSelector;
                     if (!regionToTarget)
                         throw new Error('Target element not found');
                     selectorsToCalculate = generated.selectors.slice(1);
@@ -109,7 +119,7 @@ function makeCheckAndClose({ spec, eyes, client, signal, target: defaultTarget,
             snapshots = !utils.types.isArray(target) ? Array(settings.renderers.length).fill(target) : target;
             snapshotUrl = utils.types.has(snapshots[0], 'url') ? snapshots[0].url : undefined;
         }
-        regionToTarget !== null && regionToTarget !== void 0 ? regionToTarget : (regionToTarget = (_b = elementReferenceToTarget) !== null && _b !== void 0 ? _b : settings.region);
+        regionToTarget !== null && regionToTarget !== void 0 ? regionToTarget : (regionToTarget = (_c = elementReferenceToTarget) !== null && _c !== void 0 ? _c : settings.region);
         selectorsToCalculate !== null && selectorsToCalculate !== void 0 ? selectorsToCalculate : (selectorsToCalculate = elementReferencesToCalculate.map(selector => ({
             originalSelector: selector,
             safeSelector: selector,

package/dist/ufg/check.js

@@ -32,9 +32,9 @@ const take_snapshots_1 = require("./utils/take-snapshots");
 const wait_for_lazy_load_1 = require("../utils/wait-for-lazy-load");
 const to_base_check_settings_1 = require("../utils/to-base-check-settings");
 const generate_safe_selectors_1 = require("./utils/generate-safe-selectors");
+const uniquify_renderers_1 = require("./utils/uniquify-renderers");
 const abort_error_1 = require("../errors/abort-error");
 const utils = __importStar(require("@applitools/utils"));
-const add_key_to_duplicated_values_in_array_1 = __importDefault(require("./utils/add-key-to-duplicated-values-in-array"));
 const chalk_1 = __importDefault(require("chalk"));
 function makeCheck({ eyes, client, target: defaultTarget, spec, signal, logger: defaultLogger, }) {
     return async function check({ target = defaultTarget, settings = {}, logger = defaultLogger, }) {
@@ -45,14 +45,24 @@ function makeCheck({ eyes, client, target: defaultTarget, spec, signal, logger:
             throw new abort_error_1.AbortError('Command "check" was called after test was already aborted');
         }
         const { elementReferencesToCalculate, elementReferenceToTarget, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({ settings });
-        let snapshots, snapshotUrl, snapshotTitle, userAgent, regionToTarget, selectorsToCalculate;
-        const uniqueRenderers = (0, add_key_to_duplicated_values_in_array_1.default)((_a = settings.renderers) !== null && _a !== void 0 ? _a : []);
+        let snapshots;
+        let snapshotUrl;
+        let snapshotTitle;
+        let userAgent;
+        let regionToTarget;
+        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 });
             await driver.currentContext.setScrollingElement((_b = settings.scrollRootElement) !== null && _b !== void 0 ? _b : null);
-            if (driver.isWeb && uniqueRenderers.length === 0) {
-                const viewportSize = await driver.getViewportSize();
-                uniqueRenderers.push({ name: 'chrome', ...viewportSize });
+            if (uniqueRenderers.length === 0) {
+                if (driver.isWeb) {
+                    const viewportSize = await driver.getViewportSize();
+                    uniqueRenderers.push({ name: 'chrome', ...viewportSize });
+                }
+                else {
+                    // TODO add default nmg renderers
+                }
             }
             let cleanupGeneratedSelectors;
             if (driver.isWeb) {

package/dist/ufg/open-eyes.js

@@ -35,16 +35,16 @@ const abort_controller_1 = require("abort-controller");
 const utils = __importStar(require("@applitools/utils"));
 function makeOpenEyes({ core, client, spec, logger: defaultLogger, }) {
     return async function openEyes({ target, settings, eyes, logger = defaultLogger, }) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         logger.log(`Command "openEyes" is called with ${target ? 'default driver and' : ''}`, ...(settings ? ['settings', settings] : []), eyes ? 'predefined eyes' : '');
         const driver = target && (await (0, driver_1.makeDriver)({ spec, driver: target, logger, customConfig: { disableHelper: true } }));
-        (_a = settings.environment) !== null && _a !== void 0 ? _a : (settings.environment = {});
-        settings.environment.egSessionId = (driver === null || driver === void 0 ? void 0 : driver.isExecutionGrid) ? driver.sessionId : null;
         if (driver && !eyes) {
             const currentContext = driver.currentContext;
-            (_b = settings.environment) !== null && _b !== void 0 ? _b : (settings.environment = {});
-            settings.environment.egSessionId = (driver === null || driver === void 0 ? void 0 : driver.isExecutionGrid) ? driver.sessionId : null;
-            if ((_c = settings.environment) === null || _c === void 0 ? void 0 : _c.viewportSize) {
+            (_a = settings.environment) !== null && _a !== void 0 ? _a : (settings.environment = {});
+            if (driver.isEC) {
+                settings.environment.ecSessionId = driver.sessionId;
+            }
+            if (settings.environment.viewportSize) {
                 await driver.setViewportSize(settings.environment.viewportSize);
             }
             await currentContext.focus();
@@ -53,7 +53,7 @@ function makeOpenEyes({ core, client, spec, logger: defaultLogger, }) {
         const account = await core.getAccountInfo({ settings, logger });
         client !== null && client !== void 0 ? client : (client = (0, ufg_client_1.makeUFGClient)({
             config: { ...account.ufg, ...account, proxy: settings.proxy },
-            concurrency: (_d = settings.renderConcurrency) !== null && _d !== void 0 ? _d : 5,
+            concurrency: (_b = settings.renderConcurrency) !== null && _b !== void 0 ? _b : 5,
             logger,
         }));
         const getBaseEyes = (0, get_base_eyes_1.makeGetBaseEyes)({ settings, eyes, core, client, logger });

package/dist/ufg/utils/uniquify-renderers.js

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

package/dist/utils/extract-ci-provider.js

@@ -2,41 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractCIProvider = void 0;
 function extractCIProvider() {
-    if (process.env.TF_BUILD) {
+    if (process.env.TF_BUILD)
         return 'Azure';
-    }
-    if (process.env['bamboo.buildKey']) {
+    if (process.env['bamboo.buildKey'])
         return 'Bamboo';
-    }
-    if (process.env.BUILDKITE) {
+    if (process.env.BUILDKITE)
         return 'Buildkite';
-    }
-    if (process.env.CIRCLECI) {
+    if (process.env.CIRCLECI)
         return 'Circle';
-    }
-    if (process.env.CIRRUS_CI) {
+    if (process.env.CIRRUS_CI)
         return 'Cirrus';
-    }
-    if (process.env.CODEBUILD_BUILD_ID) {
+    if (process.env.CODEBUILD_BUILD_ID)
         return 'CodeBuild';
-    }
-    if (process.env.GITHUB_ACTIONS) {
+    if (process.env.GITHUB_ACTIONS)
         return 'GitHub Actions';
-    }
-    if (process.env.GITLAB_CI) {
+    if (process.env.GITLAB_CI)
         return 'GitLab';
-    }
-    if (process.env.HEROKU_TEST_RUN_ID) {
+    if (process.env.HEROKU_TEST_RUN_ID)
         return 'Heroku';
-    }
-    if (process.env.BUILD_ID) {
+    if (process.env.BUILD_ID)
         return 'Jenkins';
-    }
-    if (process.env.TEAMCITY_VERSION) {
+    if (process.env.TEAMCITY_VERSION)
         return 'TeamCity';
-    }
-    if (process.env.TRAVIS) {
+    if (process.env.TRAVIS)
         return 'Travis';
-    }
+    return null;
 }
 exports.extractCIProvider = extractCIProvider;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/core",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -61,33 +61,33 @@
     }
   },
   "dependencies": {
-    "@applitools/core-base": "1.1.30",
+    "@applitools/core-base": "1.1.31",
     "@applitools/dom-capture": "11.2.0",
     "@applitools/dom-snapshot": "4.7.3",
-    "@applitools/driver": "1.11.25",
-    "@applitools/logger": "1.1.40",
-    "@applitools/nml-client": "1.3.27",
-    "@applitools/req": "1.1.27",
-    "@applitools/screenshoter": "3.7.22",
-    "@applitools/snippets": "2.4.13",
-    "@applitools/ufg-client": "1.1.19",
-    "@applitools/utils": "1.3.26",
+    "@applitools/driver": "1.11.26",
+    "@applitools/logger": "1.1.42",
+    "@applitools/nml-client": "1.3.28",
+    "@applitools/req": "1.1.28",
+    "@applitools/screenshoter": "3.7.23",
+    "@applitools/snippets": "2.4.14",
+    "@applitools/ufg-client": "1.1.21",
+    "@applitools/utils": "1.3.28",
     "abort-controller": "3.0.0",
     "chalk": "4.1.2",
     "node-fetch": "2.6.7",
     "throat": "6.0.1"
   },
   "optionalDependencies": {
-    "@applitools/execution-grid-client": "^1.2.3"
+    "@applitools/ec-client": "^1.2.5"
   },
   "devDependencies": {
     "@applitools/bongo": "^2.2.2",
     "@applitools/sdk-fake-eyes-server": "^2.1.3",
-    "@applitools/spec-driver-puppeteer": "^1.1.36",
-    "@applitools/spec-driver-selenium": "^1.5.23",
-    "@applitools/spec-driver-webdriverio": "^1.4.20",
-    "@applitools/test-server": "^1.1.21",
-    "@applitools/test-utils": "^1.5.8",
+    "@applitools/spec-driver-puppeteer": "^1.1.37",
+    "@applitools/spec-driver-selenium": "^1.5.24",
+    "@applitools/spec-driver-webdriverio": "^1.4.21",
+    "@applitools/test-server": "^1.1.22",
+    "@applitools/test-utils": "^1.5.9",
     "@types/mocha": "^9.1.1",
     "@types/node": "12",
     "@types/selenium-webdriver": "^4.1.2",

package/types/check-and-close.d.ts

@@ -1,10 +1,10 @@
-import type { Target, Eyes, Config, CheckSettings, CloseSettings, TestResult } from './types';
+import type { Target, DriverTarget, Eyes, Config, CheckSettings, CloseSettings, TestResult } from './types';
 import { type Logger } from '@applitools/logger';
 import { type SpecDriver } from '@applitools/driver';
 type Options<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg'> = {
     type?: TType;
     eyes: Eyes<TDriver, TContext, TElement, TSelector, TType>;
-    target?: Target<TDriver, TContext, TElement, TSelector, TType>;
+    target?: DriverTarget<TDriver, TContext, TElement, TSelector>;
     spec?: SpecDriver<TDriver, TContext, TElement, TSelector>;
     logger: Logger;
 };

package/types/check.d.ts

@@ -1,10 +1,10 @@
-import type { Target, Eyes, Config, CheckSettings, CheckResult } from './types';
+import type { Target, DriverTarget, Eyes, Config, CheckSettings, CheckResult } from './types';
 import { type Logger } from '@applitools/logger';
 import { type SpecDriver } from '@applitools/driver';
 type Options<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg'> = {
     type?: TType;
     eyes: Eyes<TDriver, TContext, TElement, TSelector, TType>;
-    target?: Target<TDriver, TContext, TElement, TSelector, TType>;
+    target?: DriverTarget<TDriver, TContext, TElement, TSelector>;
     spec?: SpecDriver<TDriver, TContext, TElement, TSelector>;
     logger?: Logger;
 };

package/types/extract-text.d.ts

@@ -1,11 +1,12 @@
 import type { MaybeArray } from '@applitools/utils';
-import type { Target, Eyes, Config, ExtractTextSettings } from './types';
+import type { Target, DriverTarget, Eyes, Config, ExtractTextSettings } from './types';
 import { type Logger } from '@applitools/logger';
 type Options<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg'> = {
     eyes: Eyes<TDriver, TContext, TElement, TSelector, TType>;
+    target?: DriverTarget<TDriver, TContext, TElement, TSelector>;
     logger: Logger;
 };
-export declare function makeExtractText<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg' = 'classic'>({ eyes, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector, TType>): ({ target, settings, config, logger, }: {
+export declare function makeExtractText<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg' = 'classic'>({ eyes, target: defaultTarget, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector, TType>): ({ target, settings, config, logger, }: {
     target?: Target<TDriver, TContext, TElement, TSelector, 'classic'>;
     settings: MaybeArray<ExtractTextSettings<TElement, TSelector, 'classic'>>;
     config?: Config<TElement, TSelector, 'classic'>;

package/types/get-typed-eyes.d.ts

@@ -1,10 +1,10 @@
-import type { TypedCore, TypedEyes, OpenSettings } from './types';
+import type { DriverTarget, TypedCore, TypedEyes, OpenSettings } from './types';
 import { type Renderer } from '@applitools/ufg-client';
 import { type Logger } from '@applitools/logger';
 type Options<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg'> = {
     type: TType;
     settings: OpenSettings<TType>;
-    target?: TDriver;
+    target?: DriverTarget<TDriver, TContext, TElement, TSelector>;
     cores: {
         [TKey in 'classic' | 'ufg']: TypedCore<TDriver, TContext, TElement, TSelector, TKey>;
     };

package/types/locate-text.d.ts

@@ -1,10 +1,11 @@
-import type { Target, Eyes, Config, LocateTextSettings, LocateTextResult } from './types';
+import type { DriverTarget, Target, Eyes, Config, LocateTextSettings, LocateTextResult } from './types';
 import { type Logger } from '@applitools/logger';
 type Options<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg'> = {
     eyes: Eyes<TDriver, TContext, TElement, TSelector, TType>;
+    target?: DriverTarget<TDriver, TContext, TElement, TSelector>;
     logger: Logger;
 };
-export declare function makeLocateText<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg' = 'classic'>({ eyes, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector, TType>): <TPattern extends string>({ target, settings, config, logger, }: {
+export declare function makeLocateText<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg' = 'classic'>({ eyes, target: defaultTarget, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector, TType>): <TPattern extends string>({ target, settings, config, logger, }: {
     target?: Target<TDriver, TContext, TElement, TSelector, 'classic'>;
     settings: import("./automation/types").LocateTextSettings<TPattern, TElement, TSelector>;
     config?: Config<TElement, TSelector, 'classic'>;

package/types/make-ec-client.d.ts

@@ -0,0 +1,16 @@
+import type { Core as BaseCore } from '@applitools/core-base';
+import { type ECClient, type ECClientSettings } from '@applitools/ec-client';
+import { type Logger } from '@applitools/logger';
+type Options = {
+    core: BaseCore;
+    logger: Logger;
+};
+export declare function makeMakeECClient({ core, logger: defaultLogger }: Options): (({ settings, logger, }?: {
+    settings?: ECClientSettings;
+    logger?: Logger;
+}) => Promise<ECClient>) & {
+    getCachedValues(): Promise<ECClient>[];
+    setCachedValue(key: any, value: Promise<ECClient>): void;
+    clearCache(): void;
+};
+export {};

package/types/types.d.ts

@@ -1,5 +1,5 @@
 import type { MaybeArray } from '@applitools/utils';
-import type { EGClient } from '@applitools/execution-grid-client';
+import type { ECClient } from '@applitools/ec-client';
 import type * as AutomationCore from './automation/types';
 import type * as ClassicCore from './classic/types';
 import type * as UFGCore from './ufg/types';
@@ -11,10 +11,10 @@ export type TypedCore<TDriver, TContext, TElement, TSelector, TType extends 'cla
 export type TypedEyes<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg', TTarget = Target<TDriver, TContext, TElement, TSelector, TType>> = TType extends 'ufg' ? UFGCore.Eyes<TDriver, TContext, TElement, TSelector, TTarget> : ClassicCore.Eyes<TDriver, TContext, TElement, TSelector, TTarget>;
 export type Target<TDriver, TContext, TElement, TSelector, TType extends 'classic' | 'ufg'> = TType extends 'ufg' ? UFGCore.UFGTarget<TDriver, TContext, TElement, TSelector> : ClassicCore.ClassicTarget<TDriver, TContext, TElement, TSelector>;
 export interface Core<TDriver, TContext, TElement, TSelector> extends AutomationCore.Core<TDriver, TContext, TElement, TSelector> {
-    makeEGClient(options?: {
+    makeECClient(options?: {
         settings?: any;
         logger?: Logger;
-    }): Promise<EGClient>;
+    }): Promise<ECClient>;
     makeManager<TType extends 'classic' | 'ufg' = 'classic'>(options?: {
         type: TType;
         concurrency?: TType extends 'ufg' ? number : never;

package/types/ufg/utils/uniquify-renderers.d.ts

@@ -0,0 +1,2 @@
+import { type Renderer } from '@applitools/ufg-client';
+export declare function uniquifyRenderers(renderers: Renderer[]): Renderer[];

package/dist/ufg/utils/add-key-to-duplicated-values-in-array.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function addKeyToDuplicatedValuesInArray(array) {
-    const result = [];
-    const duplicates = new Map();
-    for (const value of array) {
-        let index = 0;
-        const key = JSON.stringify(value);
-        if (duplicates.has(key)) {
-            index = duplicates.get(key) + 1;
-            result.push({ ...value, id: `${typeof value.id !== 'undefined' ? value.id + '-' : ''}${index}` });
-        }
-        else {
-            result.push(value);
-        }
-        duplicates.set(key, index);
-    }
-    return result;
-}
-exports.default = addKeyToDuplicatedValuesInArray;

package/types/make-eg-client.d.ts

@@ -1,12 +0,0 @@
-import type { Core as BaseCore } from '@applitools/core-base';
-import { type EGClient, type EGClientSettings } from '@applitools/execution-grid-client';
-import { type Logger } from '@applitools/logger';
-type Options = {
-    core: BaseCore;
-    logger: Logger;
-};
-export declare function makeMakeEGClient({ core, logger: defaultLogger }: Options): ({ settings, logger, }?: {
-    settings?: EGClientSettings;
-    logger?: Logger;
-}) => Promise<EGClient>;
-export {};

package/types/ufg/utils/add-key-to-duplicated-values-in-array.d.ts

@@ -1,3 +0,0 @@
-export default function addKeyToDuplicatedValuesInArray<TValue extends {
-    id?: string;
-}>(array: TValue[]): TValue[];