@applitools/core 2.4.0 → 2.4.1

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## 2.4.1 - 2023/3/17
+
+### Features
+- Improved extraction of nml element
+### Bug fixes
+- Fixed issue with concurrency of the renders in ufg mode
+
 ## 2.4.0 - 2023/3/12
 
 ### Features

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

@@ -208,6 +208,7 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
                             includeFullPageSize: Boolean(settings.pageId),
                             type: snapshotType,
                             renderer,
+                            rendererUniqueId: baseEyes.test.rendererUniqueId,
                             rendererId: baseEyes.test.rendererId,
                         },
                         signal,

package/dist/ufg/check.js

@@ -209,6 +209,7 @@ function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: defaultL
                             includeFullPageSize: Boolean(settings.pageId),
                             type: snapshotType,
                             renderer,
+                            rendererUniqueId: baseEyes.test.rendererUniqueId,
                             rendererId: baseEyes.test.rendererId,
                         },
                         signal,

package/dist/ufg/core.js

@@ -22,9 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeCore = void 0;
 const logger_1 = require("@applitools/logger");
@@ -38,43 +35,15 @@ const get_ufg_client_1 = require("./get-ufg-client");
 const get_nml_client_1 = require("./get-nml-client");
 const open_eyes_1 = require("./open-eyes");
 const utils = __importStar(require("@applitools/utils"));
-const throat_1 = __importDefault(require("throat"));
 function makeCore({ concurrency, spec, clients, base, agentId = 'core-ufg', cwd = process.cwd(), logger: defaultLogger, }) {
     var _a;
     const logger = (_a = defaultLogger === null || defaultLogger === void 0 ? void 0 : defaultLogger.extend({ label: 'core-ufg' })) !== null && _a !== void 0 ? _a : (0, logger_1.makeLogger)({ 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)({ agentId, cwd, logger }));
+    base !== null && base !== void 0 ? base : (base = (0, core_base_1.makeCore)({ agentId, concurrency, cwd, logger }));
     return utils.general.extend(base, core => {
-        const throttle = (0, throat_1.default)(concurrency);
         return {
             type: 'ufg',
-            base: utils.general.extend(base, {
-                // open eyes with concurrency
-                openEyes: utils.general.wrap(base.openEyes, (openEyes, options) => {
-                    return new Promise((resolve, rejects) => {
-                        throttle(() => {
-                            return new Promise(async (done) => {
-                                try {
-                                    const eyes = await openEyes(options);
-                                    resolve(utils.general.extend(eyes, {
-                                        // release concurrency slot when closed
-                                        close: utils.general.wrap(eyes.close, (close, options) => close(options).finally(done)),
-                                        // release concurrency slot when aborted
-                                        abort: utils.general.wrap(eyes.abort, (abort, options) => abort(options).finally(done)),
-                                        // release concurrency slot when checkAndClose is done
-                                        checkAndClose: utils.general.wrap(eyes.checkAndClose, (checkAndClose, options) => checkAndClose(options).finally(done)),
-                                    }));
-                                }
-                                catch (error) {
-                                    rejects(error);
-                                    // release concurrency slot when error thrown
-                                    done();
-                                }
-                            });
-                        });
-                    });
-                }),
-            }),
+            base: base,
             getViewportSize: spec && (0, get_viewport_size_1.makeGetViewportSize)({ spec, logger }),
             setViewportSize: spec && (0, set_viewport_size_1.makeSetViewportSize)({ spec, logger }),
             locate: (0, locate_1.makeLocate)({ spec, core, logger }),

package/dist/ufg/get-ufg-client.js

@@ -31,8 +31,8 @@ function makeGetUFGClient({ client, logger: defaultLogger }) {
     if (client)
         getUFGClientWithCache.setCachedValue('default', Promise.resolve(client));
     return getUFGClientWithCache;
-    async function getUFGClient({ config, concurrency, logger = defaultLogger, }) {
-        return (0, ufg_client_1.makeUFGClient)({ config, concurrency: concurrency || 5, logger });
+    async function getUFGClient({ config, logger = defaultLogger }) {
+        return (0, ufg_client_1.makeUFGClient)({ config, logger });
     }
 }
 exports.makeGetUFGClient = makeGetUFGClient;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/core",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -75,25 +75,24 @@
     ]
   },
   "dependencies": {
-    "@applitools/core-base": "1.1.41",
+    "@applitools/core-base": "1.1.42",
     "@applitools/dom-capture": "11.2.1",
-    "@applitools/dom-snapshot": "4.7.5",
-    "@applitools/driver": "1.11.36",
-    "@applitools/ec-client": "1.2.15",
-    "@applitools/logger": "1.1.47",
-    "@applitools/nml-client": "1.3.39",
-    "@applitools/req": "1.1.31",
-    "@applitools/screenshoter": "3.7.30",
-    "@applitools/snippets": "2.4.16",
-    "@applitools/socket": "1.0.9",
-    "@applitools/spec-driver-webdriver": "1.0.16",
-    "@applitools/ufg-client": "1.2.2",
-    "@applitools/utils": "1.3.31",
+    "@applitools/dom-snapshot": "4.7.6",
+    "@applitools/driver": "1.11.37",
+    "@applitools/ec-client": "1.2.16",
+    "@applitools/logger": "1.1.48",
+    "@applitools/nml-client": "1.3.40",
+    "@applitools/req": "1.1.32",
+    "@applitools/screenshoter": "3.7.31",
+    "@applitools/snippets": "2.4.17",
+    "@applitools/socket": "1.0.10",
+    "@applitools/spec-driver-webdriver": "1.0.17",
+    "@applitools/ufg-client": "1.2.3",
+    "@applitools/utils": "1.3.32",
     "@types/ws": "8.5.4",
     "abort-controller": "3.0.0",
     "chalk": "4.1.2",
     "node-fetch": "2.6.7",
-    "throat": "6.0.1",
     "webdriver": "7.30.0",
     "ws": "8.12.0",
     "yargs": "17.6.2"
@@ -101,11 +100,11 @@
   "devDependencies": {
     "@applitools/bongo": "^3.0.1",
     "@applitools/sdk-coverage-tests": "^3.0.0",
-    "@applitools/spec-driver-puppeteer": "^1.1.48",
-    "@applitools/spec-driver-selenium": "^1.5.33",
-    "@applitools/spec-driver-webdriverio": "^1.4.31",
-    "@applitools/test-server": "^1.1.27",
-    "@applitools/test-utils": "^1.5.13",
+    "@applitools/spec-driver-puppeteer": "^1.1.49",
+    "@applitools/spec-driver-selenium": "^1.5.34",
+    "@applitools/spec-driver-webdriverio": "^1.4.32",
+    "@applitools/test-server": "^1.1.28",
+    "@applitools/test-utils": "^1.5.14",
     "@types/node": "^12.20.55",
     "@types/selenium-webdriver": "^4.1.2",
     "@types/yargs": "^17.0.22",

package/types/ufg/core.d.ts

@@ -5,7 +5,6 @@ import { type NMLClient } from '@applitools/nml-client';
 import { type SpecType, type SpecDriver } from '@applitools/driver';
 import { type Logger } from '@applitools/logger';
 type Options<TSpec extends SpecType> = {
-    concurrency: number;
     spec?: SpecDriver<TSpec>;
     clients?: {
         ufg?: UFGClient;
@@ -13,6 +12,7 @@ type Options<TSpec extends SpecType> = {
     };
     base?: BaseCore;
     agentId?: string;
+    concurrency?: number;
     cwd?: string;
     logger?: Logger;
 };

package/types/ufg/get-ufg-client.d.ts

@@ -4,9 +4,8 @@ type Options = {
     client?: UFGClient;
     logger: Logger;
 };
-export declare function makeGetUFGClient({ client, logger: defaultLogger }: Options): (({ config, concurrency, logger, }: {
+export declare function makeGetUFGClient({ client, logger: defaultLogger }: Options): (({ config, logger }: {
     config: UFGRequestsConfig;
-    concurrency?: number | undefined;
     logger?: Logger | undefined;
 }) => Promise<UFGClient>) & {
     getCachedValues(): Promise<UFGClient>[];