@applitools/core 4.22.0 → 4.23.0

package/CHANGELOG.md

@@ -1,5 +1,173 @@
 # Changelog
 
+## [4.23.0](https://github.com/Applitools-Dev/sdk/compare/js/core@4.22.1...js/core@4.23.0) (2024-11-07)
+
+
+### Features
+
+* offline storybook ([#2596](https://github.com/Applitools-Dev/sdk/issues/2596)) ([c8edf80](https://github.com/Applitools-Dev/sdk/commit/c8edf80bc379d0cf5d94d798314bdad405d2f2b4))
+
+
+### Bug Fixes
+
+* handle missing commits in parent and current branch ([#2586](https://github.com/Applitools-Dev/sdk/issues/2586)) ([3b40be5](https://github.com/Applitools-Dev/sdk/commit/3b40be544c36235b43121af82485bfc2e71d9e27))
+
+
+### Code Refactoring
+
+* start linting "no-floating-promises" (wip) ([#2539](https://github.com/Applitools-Dev/sdk/issues/2539)) ([51b91cb](https://github.com/Applitools-Dev/sdk/commit/51b91cb15603f7d68e4bd6a16eb0f80e3f380295))
+
+
+### Dependencies
+
+* @applitools/utils bumped to 1.7.5
+  #### Code Refactoring
+
+  * start linting "no-floating-promises" (wip) ([#2539](https://github.com/Applitools-Dev/sdk/issues/2539)) ([51b91cb](https://github.com/Applitools-Dev/sdk/commit/51b91cb15603f7d68e4bd6a16eb0f80e3f380295))
+* @applitools/dom-snapshot bumped to 4.11.7
+  #### Code Refactoring
+
+  * start linting "no-floating-promises" (wip) ([#2539](https://github.com/Applitools-Dev/sdk/issues/2539)) ([51b91cb](https://github.com/Applitools-Dev/sdk/commit/51b91cb15603f7d68e4bd6a16eb0f80e3f380295))
+
+
+
+* @applitools/snippets bumped to 2.6.2
+  #### Bug Fixes
+
+  * provide a clear "stale element" exception message when passing detached regions to `check` ([#2590](https://github.com/Applitools-Dev/sdk/issues/2590)) ([1e5b49e](https://github.com/Applitools-Dev/sdk/commit/1e5b49e9aec6b8caf89f2cdb1f8e81a237d52896))
+* @applitools/dom-capture bumped to 11.5.1
+  #### Code Refactoring
+
+  * start linting "no-floating-promises" (wip) ([#2539](https://github.com/Applitools-Dev/sdk/issues/2539)) ([51b91cb](https://github.com/Applitools-Dev/sdk/commit/51b91cb15603f7d68e4bd6a16eb0f80e3f380295))
+* @applitools/spec-driver-webdriver bumped to 1.1.19
+  #### Code Refactoring
+
+  * start linting "no-floating-promises" (wip) ([#2539](https://github.com/Applitools-Dev/sdk/issues/2539)) ([51b91cb](https://github.com/Applitools-Dev/sdk/commit/51b91cb15603f7d68e4bd6a16eb0f80e3f380295))
+
+
+
+* @applitools/tunnel-client bumped to 1.5.9
+  #### Code Refactoring
+
+  * start linting "no-floating-promises" (wip) ([#2539](https://github.com/Applitools-Dev/sdk/issues/2539)) ([51b91cb](https://github.com/Applitools-Dev/sdk/commit/51b91cb15603f7d68e4bd6a16eb0f80e3f380295))
+
+
+
+* @applitools/ufg-client bumped to 1.14.0
+  #### Features
+
+  * offline storybook ([#2596](https://github.com/Applitools-Dev/sdk/issues/2596)) ([c8edf80](https://github.com/Applitools-Dev/sdk/commit/c8edf80bc379d0cf5d94d798314bdad405d2f2b4))
+
+
+
+* @applitools/ec-client bumped to 1.9.13
+  #### Code Refactoring
+
+  * start linting "no-floating-promises" (wip) ([#2539](https://github.com/Applitools-Dev/sdk/issues/2539)) ([51b91cb](https://github.com/Applitools-Dev/sdk/commit/51b91cb15603f7d68e4bd6a16eb0f80e3f380295))
+
+
+
+* @applitools/logger bumped to 2.0.19
+
+* @applitools/socket bumped to 1.1.19
+
+* @applitools/req bumped to 1.7.3
+
+* @applitools/image bumped to 1.1.14
+
+* @applitools/driver bumped to 1.19.7
+
+* @applitools/spec-driver-selenium bumped to 1.5.90
+
+* @applitools/spec-driver-puppeteer bumped to 1.4.19
+
+* @applitools/screenshoter bumped to 3.9.5
+
+* @applitools/nml-client bumped to 1.8.17
+
+* @applitools/core-base bumped to 1.19.2
+  #### Code Refactoring
+
+  * start linting "no-floating-promises" (wip) ([#2539](https://github.com/Applitools-Dev/sdk/issues/2539)) ([51b91cb](https://github.com/Applitools-Dev/sdk/commit/51b91cb15603f7d68e4bd6a16eb0f80e3f380295))
+
+
+
+
+## [4.22.1](https://github.com/Applitools-Dev/sdk/compare/js/core@4.22.0...js/core@4.22.1) (2024-10-31)
+
+
+### Bug Fixes
+
+* trigger release ([c97dbfc](https://github.com/Applitools-Dev/sdk/commit/c97dbfc89245f374917702a867b87f2794155e54))
+
+
+### Dependencies
+
+* @applitools/dom-snapshot bumped to 4.11.6
+  #### Bug Fixes
+
+  * trigger release ([c97dbfc](https://github.com/Applitools-Dev/sdk/commit/c97dbfc89245f374917702a867b87f2794155e54))
+
+
+
+* @applitools/snippets bumped to 2.6.1
+  #### Bug Fixes
+
+  * trigger release ([c97dbfc](https://github.com/Applitools-Dev/sdk/commit/c97dbfc89245f374917702a867b87f2794155e54))
+* @applitools/driver bumped to 1.19.6
+  #### Bug Fixes
+
+  * trigger release ([c97dbfc](https://github.com/Applitools-Dev/sdk/commit/c97dbfc89245f374917702a867b87f2794155e54))
+
+
+
+* @applitools/spec-driver-webdriver bumped to 1.1.18
+  #### Bug Fixes
+
+  * trigger release ([c97dbfc](https://github.com/Applitools-Dev/sdk/commit/c97dbfc89245f374917702a867b87f2794155e54))
+
+
+
+* @applitools/spec-driver-selenium bumped to 1.5.89
+  #### Bug Fixes
+
+  * trigger release ([c97dbfc](https://github.com/Applitools-Dev/sdk/commit/c97dbfc89245f374917702a867b87f2794155e54))
+
+
+
+* @applitools/spec-driver-puppeteer bumped to 1.4.18
+  #### Bug Fixes
+
+  * trigger release ([c97dbfc](https://github.com/Applitools-Dev/sdk/commit/c97dbfc89245f374917702a867b87f2794155e54))
+
+
+
+* @applitools/screenshoter bumped to 3.9.4
+  #### Bug Fixes
+
+  * trigger release ([c97dbfc](https://github.com/Applitools-Dev/sdk/commit/c97dbfc89245f374917702a867b87f2794155e54))
+
+
+
+* @applitools/nml-client bumped to 1.8.16
+  #### Bug Fixes
+
+  * trigger release ([c97dbfc](https://github.com/Applitools-Dev/sdk/commit/c97dbfc89245f374917702a867b87f2794155e54))
+
+
+
+* @applitools/core-base bumped to 1.19.1
+  #### Bug Fixes
+
+  * trigger release ([c97dbfc](https://github.com/Applitools-Dev/sdk/commit/c97dbfc89245f374917702a867b87f2794155e54))
+* @applitools/ec-client bumped to 1.9.12
+  #### Bug Fixes
+
+  * trigger release ([c97dbfc](https://github.com/Applitools-Dev/sdk/commit/c97dbfc89245f374917702a867b87f2794155e54))
+
+
+
+
 ## [4.22.0](https://github.com/Applitools-Dev/sdk/compare/js/core@4.21.2...js/core@4.22.0) (2024-10-31)
 
 

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

@@ -173,7 +173,7 @@ function makeCheckAndClose({ eyes, target: defaultTarget, environments: defaultE
                         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`);
                     }
                     if (settings.assumesMutability) {
-                        eyes.core.logEvent({
+                        void eyes.core.logEvent({
                             settings: {
                                 level: 'Notice',
                                 event: {

package/dist/classic/check.js

@@ -191,7 +191,7 @@ async function checkEnvironment({ eyes, driver, target, environment, signal, log
         catch (error) {
             environmentLogger.error(`Check on environment with id "${(_b = baseEyes.test.environment) === null || _b === void 0 ? void 0 : _b.environmentId}" failed due to an error`, error);
             if (baseEyes.running && !(signal === null || signal === void 0 ? void 0 : signal.aborted))
-                baseEyes.abort({ logger: environmentLogger, settings: { reason: error } });
+                void baseEyes.abort({ logger: environmentLogger, settings: { reason: error } });
         }
     }
     catch (error) {

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

@@ -52,7 +52,7 @@ function makeGetBaseEyes({ settings: defaultSettings, eyes, logger: mainLogger,
             },
             logger,
         });
-        (0, report_kobiton_1.reportKobiton)({ driver: settings.driver, settings: baseEyes.test, logger });
+        void (0, report_kobiton_1.reportKobiton)({ driver: settings.driver, settings: baseEyes.test, logger });
         return baseEyes;
     }
 }

package/dist/cli/cli.js

@@ -36,7 +36,7 @@ const run_offline_snapshots_1 = require("../run-offline-snapshots");
 const yargs_1 = __importDefault(require("yargs"));
 const utils = __importStar(require("@applitools/utils"));
 const fs_1 = __importDefault(require("fs"));
-yargs_1.default
+void yargs_1.default
     .example([
     ['eyes universal', 'Run Eyes Universal server on default port (21077)'],
     ['eyes universal --fork', 'Run Eyes Universal server in a forked process'],
@@ -112,7 +112,7 @@ yargs_1.default
             console.log(port); // NOTE: this is a part of the generic protocol
         }
         else {
-            (0, core_server_1.makeCoreServer)({ ...args, ...args.config, isProcess: true });
+            void (0, core_server_1.makeCoreServer)({ ...args, ...args.config, isProcess: true });
         }
     },
 })

package/dist/core.js

@@ -24,6 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeCore = void 0;
+const utils = __importStar(require("@applitools/utils"));
 const logger_1 = require("@applitools/logger");
 const core_base_1 = require("@applitools/core-base");
 const core_1 = require("./classic/core");
@@ -44,7 +45,7 @@ const extract_test_environment_1 = require("./utils/extract-test-environment");
 const ensure_offline_folder_1 = require("./utils/ensure-offline-folder");
 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"));
+const take_snapshots_1 = require("./ufg/take-snapshots");
 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 });
@@ -52,7 +53,7 @@ function makeCore({ spec, clients, base: defaultBase, concurrency = utils.genera
     const offlineLocationPath = (0, ensure_offline_folder_1.ensureOfflineFolder)();
     logger.log(`[pid=${process.pid} Core is initialized ${defaultBase ? 'with' : 'without'} custom base core ${offlineLocationPath ? `and offline location ${offlineLocationPath} ` : ''}and environment `, environment);
     if (environment.sdk)
-        (0, validate_sdk_version_1.validateSdkVersion)(environment.sdk, { logger });
+        void (0, validate_sdk_version_1.validateSdkVersion)(environment.sdk, { logger });
     const base = defaultBase !== null && defaultBase !== void 0 ? defaultBase : (0, core_base_1.makeCore)({ agentId, concurrency, logger, offlineLocationPath });
     const cores = {
         ufg: (0, core_2.makeCore)({ spec, clients, base, asyncCache, logger, offlineLocationPath }),
@@ -86,6 +87,7 @@ function makeCore({ spec, clients, base: defaultBase, concurrency = utils.genera
             openEyes: (0, open_eyes_1.makeOpenEyes)({ spec, clients, core, cores, environment, asyncCache, cwd, logger }),
             closeBatch: (0, close_batch_1.makeCloseBatch)({ core, logger }),
             deleteTest: (0, delete_test_1.makeDeleteTest)({ core, logger }),
+            takeSnapshots: spec && (0, take_snapshots_1.makeTakeSnapshots)({ spec, core: cores.ufg, logger }),
         };
     });
 }

package/dist/index.js

@@ -26,7 +26,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.takeDomSnapshots = exports.logs = exports.formatters = void 0;
+exports.logs = exports.formatters = void 0;
 __exportStar(require("./types"), exports);
 __exportStar(require("./core"), exports);
 __exportStar(require("./universal/core-server"), exports);
@@ -35,6 +35,3 @@ __exportStar(require("./autonomous/core"), exports);
 __exportStar(require("@applitools/driver/dist/debug"), exports);
 exports.formatters = __importStar(require("./utils/format-results"));
 exports.logs = __importStar(require("./troubleshoot/logs"));
-// TODO remove export after every dependency migrated to new distributed ufg submodule
-var take_dom_snapshots_1 = require("./ufg/utils/take-dom-snapshots");
-Object.defineProperty(exports, "takeDomSnapshots", { enumerable: true, get: function () { return take_dom_snapshots_1.takeDomSnapshots; } });

package/dist/open-eyes.js

@@ -39,18 +39,18 @@ const core_base_1 = require("@applitools/core-base");
 const extract_git_info_1 = require("./utils/extract-git-info");
 function makeOpenEyes({ type: defaultType = 'classic', clients, batch, removeDuplicateTests, core, cores, spec, environment, logger: mainLogger, asyncCache, cwd = process.cwd(), }) {
     return async function openEyes({ type = defaultType, settings: openSettings, config, target, logger = mainLogger, }) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
-        var _x, _y, _z, _0, _1;
+        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, _0;
         logger = logger.extend(mainLogger, { tags: [`eyes-${type}-${utils.general.shortid()}`] });
         const settings = { ...config === null || config === void 0 ? void 0 : config.open, ...openSettings };
         const eyesServerSettings = (0, populate_eyes_server_settings_1.populateEyesServerSettings)(settings);
         (_a = settings.userTestId) !== null && _a !== void 0 ? _a : (settings.userTestId = `${settings.testName}--${utils.general.guid()}`);
         settings.batch = { ...batch, ...settings.batch };
-        (_b = (_x = settings.batch).id) !== null && _b !== void 0 ? _b : (_x.id = (_c = utils.general.getEnvValue('BATCH_ID')) !== null && _c !== void 0 ? _c : `generated-${utils.general.guid()}`);
-        (_d = (_y = settings.batch).buildId) !== null && _d !== void 0 ? _d : (_y.buildId = utils.general.getEnvValue('BATCH_BUILD_ID'));
-        (_e = (_z = settings.batch).name) !== null && _e !== void 0 ? _e : (_z.name = utils.general.getEnvValue('BATCH_NAME'));
-        (_f = (_0 = settings.batch).sequenceName) !== null && _f !== void 0 ? _f : (_0.sequenceName = utils.general.getEnvValue('BATCH_SEQUENCE'));
-        (_g = (_1 = settings.batch).notifyOnCompletion) !== null && _g !== void 0 ? _g : (_1.notifyOnCompletion = utils.general.getEnvValue('BATCH_NOTIFY', 'boolean'));
+        (_b = (_w = settings.batch).id) !== null && _b !== void 0 ? _b : (_w.id = (_c = utils.general.getEnvValue('BATCH_ID')) !== null && _c !== void 0 ? _c : `generated-${utils.general.guid()}`);
+        (_d = (_x = settings.batch).buildId) !== null && _d !== void 0 ? _d : (_x.buildId = utils.general.getEnvValue('BATCH_BUILD_ID'));
+        (_e = (_y = settings.batch).name) !== null && _e !== void 0 ? _e : (_y.name = utils.general.getEnvValue('BATCH_NAME'));
+        (_f = (_z = settings.batch).sequenceName) !== null && _f !== void 0 ? _f : (_z.sequenceName = utils.general.getEnvValue('BATCH_SEQUENCE'));
+        (_g = (_0 = settings.batch).notifyOnCompletion) !== null && _g !== void 0 ? _g : (_0.notifyOnCompletion = utils.general.getEnvValue('BATCH_NOTIFY', 'boolean'));
         (_h = settings.keepBatchOpen) !== null && _h !== void 0 ? _h : (settings.keepBatchOpen = utils.general.getEnvValue('DONT_CLOSE_BATCHES', 'boolean'));
         (_j = settings.branchName) !== null && _j !== void 0 ? _j : (settings.branchName = utils.general.getEnvValue('BRANCH'));
         (_k = settings.parentBranchName) !== null && _k !== void 0 ? _k : (settings.parentBranchName = utils.general.getEnvValue('PARENT_BRANCH'));
@@ -66,9 +66,8 @@ function makeOpenEyes({ type: defaultType = 'classic', clients, batch, removeDup
             logger.warn(`latestCommitInfo.timestamp is an invalid ISO date string: ${settings.latestCommitInfo.timestamp}`);
             settings.latestCommitInfo = undefined;
         }
-        const isRealBatchId = !!settings.batch.id && !((_u = settings.batch) === null || _u === void 0 ? void 0 : _u.id.startsWith('generated'));
-        if (process.env.CI && (isRealBatchId || settings.latestCommitInfo)) {
-            await populateAutoScmInfo(settings.batch.id || settings.latestCommitInfo.sha);
+        if (process.env.CI && (isRealBatchId(settings.batch.id) || settings.latestCommitInfo)) {
+            await populateAutoScmInfo(isRealBatchId(settings.batch.id) ? settings.batch.id : settings.latestCommitInfo.sha);
         }
         if (settings.ignoreGitBranching) {
             settings.gitBranchingTimestamp = undefined;
@@ -91,14 +90,14 @@ function makeOpenEyes({ type: defaultType = 'classic', clients, batch, removeDup
         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());
-        core.logEvent({
+        void core.logEvent({
             settings: {
                 ...settings,
                 level: 'Notice',
                 event: {
                     type: 'openEyes',
                     userTestId: settings.userTestId,
-                    concurrency: (_v = cores === null || cores === void 0 ? void 0 : cores[type].concurrency) !== null && _v !== void 0 ? _v : core.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,
@@ -106,7 +105,7 @@ function makeOpenEyes({ type: defaultType = 'classic', clients, batch, removeDup
                         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: (_w = driverEnvironment === null || driverEnvironment === void 0 ? void 0 : driverEnvironment.applitoolsLib) === null || _w === void 0 ? void 0 : _w.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,
@@ -143,8 +142,8 @@ function makeOpenEyes({ type: defaultType = 'classic', clients, batch, removeDup
         }); // TODO solve the types issue
         /////// END FUNCTION BODY ///////////////////
         async function populateAutoScmInfo(batchId) {
-            var _a, _b, _c, _d, _e;
-            var _f, _g;
+            var _a, _b, _c, _d;
+            var _e;
             const branchName = await (0, extract_git_info_1.extractGitBranch)({ execOptions: { cwd }, logger });
             const { owner: repoOwner, name: repoName } = await (0, extract_git_info_1.extractGitRepo)({ execOptions: { cwd }, logger });
             const buildId = await (0, extract_git_info_1.extractBuildIdFromCI)();
@@ -159,10 +158,10 @@ function makeOpenEyes({ type: defaultType = 'classic', clients, batch, removeDup
                 });
                 if (scmInfo) {
                     (_a = settings.batch) !== null && _a !== void 0 ? _a : (settings.batch = {});
-                    (_b = (_f = settings.batch).id) !== null && _b !== void 0 ? _b : (_f.id = batchId);
-                    (_c = (_g = settings.batch).buildId) !== null && _c !== void 0 ? _c : (_g.buildId = buildId);
-                    (_d = settings.branchName) !== null && _d !== void 0 ? _d : (settings.branchName = branchName);
-                    (_e = settings.parentBranchName) !== null && _e !== void 0 ? _e : (settings.parentBranchName = scmInfo.scmTargetBranch);
+                    settings.batch.id = isRealBatchId(settings.batch.id) ? settings.batch.id : batchId;
+                    (_b = (_e = settings.batch).buildId) !== null && _b !== void 0 ? _b : (_e.buildId = buildId);
+                    (_c = settings.branchName) !== null && _c !== void 0 ? _c : (settings.branchName = branchName);
+                    (_d = settings.parentBranchName) !== null && _d !== void 0 ? _d : (settings.parentBranchName = scmInfo.scmTargetBranch);
                 }
             }
             else {
@@ -243,3 +242,6 @@ function getLatestCommitInfoFromEnvVars(logger) {
         logger.warn(`APPLITOOLS_GIT_LATEST_COMMIT_SHA was provided without APPLITOOLS_GIT_LATEST_COMMIT_TIMESTAMP. Not populating latestCommitInfo with the provided sha ${sha}.`);
     }
 }
+function isRealBatchId(batchId) {
+    return !!batchId && !batchId.startsWith('generated');
+}

package/dist/troubleshoot/check-network.js

@@ -114,5 +114,5 @@ async function checkNetwork({ stream = process.stdout, eyes = eyes_1.default, uf
 }
 exports.checkNetwork = checkNetwork;
 if (require.main === module) {
-    checkNetwork();
+    void checkNetwork();
 }

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

@@ -28,29 +28,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeCheckAndClose = void 0;
 const driver_1 = require("@applitools/driver");
-const take_dom_snapshots_1 = require("./utils/take-dom-snapshots");
 const to_base_check_settings_1 = require("../automation/utils/to-base-check-settings");
-const to_generated_selectors_1 = require("./utils/to-generated-selectors");
 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"));
 const lang = __importStar(require("../lang"));
 const chalk_1 = __importDefault(require("chalk"));
+const take_snapshots_1 = require("./take-snapshots");
+const create_render_target_from_snapshot_1 = require("./create-render-target-from-snapshot");
 function makeCheckAndClose({ eyes, target: defaultTarget, environments: defaultEnvironments = [], spec, signal, logger: mainLogger, }) {
     return async function checkAndClose({ target = defaultTarget, settings = {}, logger = mainLogger, } = {}) {
-        var _a, _b;
+        var _a;
         logger = logger.extend(mainLogger);
         logger.log('Command "checkAndClose" is called with settings', settings);
         if (signal === null || signal === void 0 ? void 0 : 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 { elementReferences, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({ settings });
-        const { elementReferencesToMark, getGeneratedSelectors } = (0, to_generated_selectors_1.toGeneratedSelectors)({
-            elementReferences,
-            transformElementReference: elementReference => { var _a; return ((0, driver_1.isSelector)(elementReference) && ((_a = spec === null || spec === void 0 ? void 0 : spec.toSimpleCommonSelector) === null || _a === void 0 ? void 0 : _a.call(spec, elementReference))) || undefined; },
-        });
         const uniqueEnvironments = (0, uniquify_environments_1.uniquifyEnvironments)((_a = settings.environments) !== null && _a !== void 0 ? _a : defaultEnvironments);
         const ufgClient = await eyes.core.getUFGClient({
             settings: {
@@ -61,66 +56,27 @@ function makeCheckAndClose({ eyes, target: defaultTarget, environments: defaultE
             logger,
         });
         let snapshots;
-        let snapshotUrl;
-        let snapshotTitle;
-        let userAgent;
-        const driver = spec && (0, driver_1.isDriver)(target, spec)
-            ? await (0, driver_1.makeDriver)({ spec, driver: target, reset: target === defaultTarget, logger })
-            : undefined;
-        if (driver) {
-            const environment = await driver.getEnvironment();
-            const currentContext = driver.currentContext;
-            await currentContext.setScrollingElement((_b = settings.scrollRootElement) !== null && _b !== void 0 ? _b : null);
-            if (environment.isWeb) {
-                userAgent = await driver.getUserAgentLegacy();
-                snapshots = await (0, take_dom_snapshots_1.takeDomSnapshots)({
-                    driver,
-                    settings: {
-                        ...eyes.test.eyesServer,
-                        waitBeforeCapture: settings.waitBeforeCapture,
-                        disableBrowserFetching: settings.disableBrowserFetching,
-                        layoutBreakpoints: settings.layoutBreakpoints,
-                        environments: uniqueEnvironments,
-                        skipResources: ufgClient.getCachedResourceUrls(),
-                        lazyLoad: settings.lazyLoad,
-                        elementReferences: elementReferencesToMark,
-                    },
-                    provides: {
-                        getChromeEmulationDevices: ufgClient.getChromeEmulationDevices,
-                        getIOSDevices: ufgClient.getIOSDevices,
-                    },
-                    logger,
-                });
-            }
-            else {
-                const nmlClient = await eyes.core.getNMLClient({
-                    driver,
-                    settings: { ...eyes.test.eyesServer, supportedEnvironmentsUrl: eyes.test.supportedEnvironmentsUrl },
-                    logger,
-                });
-                snapshots = (await nmlClient.takeSnapshots({
-                    settings: {
-                        ...eyes.test.eyesServer,
-                        waitBeforeCapture: settings.waitBeforeCapture,
-                        environments: uniqueEnvironments,
-                    },
-                    logger,
-                }));
-            }
-            await currentContext.focus();
-            snapshotUrl = await driver.getUrl();
-            snapshotTitle = await driver.getTitle();
+        let driver;
+        if (spec && (0, driver_1.isDriver)(target, spec)) {
+            const takeSnapshots = (0, take_snapshots_1.makeTakeSnapshots)({ core: eyes.core, spec, signal, logger });
+            driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
+            snapshots = await takeSnapshots({
+                driver,
+                account: eyes.test.account,
+                settings: { ...settings, environments: uniqueEnvironments },
+                logger,
+            });
         }
         else {
+            // TODO (amit)
             snapshots = !utils.types.isArray(target) ? Array(uniqueEnvironments.length).fill(target) : target;
-            snapshotUrl = utils.types.has(snapshots[0], 'url') ? snapshots[0].url : undefined;
         }
-        const generatedSelectors = snapshots.map(snapshot => getGeneratedSelectors(utils.types.has(snapshot, 'generatedSelectors') ? snapshot.generatedSelectors : undefined));
-        const promises = uniqueEnvironments.map(async (environment, index) => {
+        const promises = snapshots.map(async (snapshot, i) => {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const environmentLogger = logger.extend({ tags: [`environment-${utils.general.shortid()}`] });
-            const ufgEnvironment = environment;
-            if (utils.types.has(ufgEnvironment, 'name') && ufgEnvironment.name === 'edge') {
+            const { target } = snapshot;
+            const environment = uniqueEnvironments[i];
+            if (utils.types.has(environment, 'name') && environment.name === 'edge') {
                 environmentLogger.console.log(chalk_1.default.yellow(lang.edgeUfgEnvironmentDeprecatedWarning));
             }
             try {
@@ -128,26 +84,10 @@ function makeCheckAndClose({ eyes, target: defaultTarget, environments: defaultE
                     environmentLogger.warn('Command "check" was aborted before rendering');
                     throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
                 }
-                const { cookies, ...snapshot } = snapshots[index];
-                const selectors = generatedSelectors[index];
-                if (utils.types.has(ufgEnvironment, 'iosDeviceInfo') || utils.types.has(ufgEnvironment, 'androidDeviceInfo')) {
-                    ufgEnvironment.type = utils.types.has(snapshot, 'cdt') ? 'web' : 'native';
+                if (utils.types.has(environment, 'iosDeviceInfo') || utils.types.has(environment, 'androidDeviceInfo')) {
+                    environment.type = utils.types.has(target, 'cdt') ? 'web' : 'native';
                 }
-                const renderTargetPromise = ufgClient.createRenderTarget({
-                    snapshot,
-                    settings: {
-                        environment: ufgEnvironment,
-                        cookies,
-                        headers: {
-                            Referer: snapshotUrl,
-                            'User-Agent': userAgent,
-                            ...settings.headers,
-                        },
-                        proxy: eyes.test.eyesServer.proxy,
-                        autProxy: settings.autProxy,
-                    },
-                    logger: environmentLogger,
-                });
+                const renderTargetPromise = (0, create_render_target_from_snapshot_1.createRenderTargetFromSnapshot)({ ufgClient, snapshot, logger: environmentLogger });
                 const baseEyes = await eyes.getBaseEyes({ settings: { environment, driver }, logger });
                 try {
                     if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
@@ -167,31 +107,35 @@ function makeCheckAndClose({ eyes, target: defaultTarget, environments: defaultE
                         environmentLogger.warn(`Render on environment with id "${(_c = baseEyes.test.environment) === null || _c === void 0 ? void 0 : _c.environmentId}" was aborted during one of the previous steps`);
                         throw new abort_error_1.AbortError(`Render on environment with id "${(_d = baseEyes.test.environment) === null || _d === void 0 ? void 0 : _d.environmentId}" was aborted during one of the previous steps`);
                     }
+                    const { elementReferences: selectors, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({
+                        settings: snapshot.settings,
+                    });
                     const { renderId, selectorRegions, ...baseTarget } = await ufgClient.render({
                         target: renderTarget,
                         settings: {
-                            ...settings,
-                            region: (_e = selectors.target) !== null && _e !== void 0 ? _e : settings.region,
+                            ...snapshot.settings,
+                            region: (_e = selectors.target) !== null && _e !== void 0 ? _e : snapshot.settings.region,
                             scrollRootElement: selectors.scrolling,
-                            selectorsToCalculate: selectors.calculate.flatMap(({ safeSelector }) => safeSelector !== null && safeSelector !== void 0 ? safeSelector : []),
-                            includeFullPageSize: !!settings.pageId,
-                            environment: { ...ufgEnvironment, environmentId: baseEyes.test.environment.environmentId },
+                            selectorsToCalculate: selectors.calculate,
+                            includeFullPageSize: Boolean(snapshot.settings.pageId),
+                            environment: { ...environment, environmentId: baseEyes.test.environment.environmentId },
                             uploadUrl: baseEyes.test.uploadUrl,
                             stitchingServiceUrl: baseEyes.test.stitchingServiceUrl,
                         },
                         signal,
                         logger: environmentLogger,
                     });
-                    let offset = 0;
                     const baseSettings = getBaseCheckSettings({
-                        calculatedRegions: selectors.calculate.map(({ originalSelector, safeSelector }) => ({
-                            selector: originalSelector !== null && originalSelector !== void 0 ? originalSelector : undefined,
-                            regions: safeSelector ? selectorRegions[offset++] : [],
-                        })),
+                        calculatedRegions: selectors.calculate.map((_, index) => {
+                            var _a;
+                            return ({
+                                regions: (_a = selectorRegions === null || selectorRegions === void 0 ? void 0 : selectorRegions[index]) !== null && _a !== void 0 ? _a : [],
+                            });
+                        }),
                     });
                     baseSettings.renderId = renderId;
-                    baseTarget.source = snapshotUrl;
-                    baseTarget.name = snapshotTitle;
+                    baseTarget.source = snapshot.url;
+                    baseTarget.name = snapshot.title;
                     if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
                         environmentLogger.warn('Command "check" was aborted after rendering');
                         throw new abort_error_1.AbortError('Command "check" was aborted after rendering');
@@ -201,7 +145,7 @@ function makeCheckAndClose({ eyes, target: defaultTarget, environments: defaultE
                         throw new abort_error_1.AbortError(`Render on environment with id "${(_g = baseEyes.test.environment) === null || _g === void 0 ? void 0 : _g.environmentId}" was aborted during one of the previous steps`);
                     }
                     if (settings.assumesMutability) {
-                        eyes.core.logEvent({
+                        void eyes.core.logEvent({
                             settings: {
                                 level: 'Notice',
                                 event: {
@@ -238,8 +182,8 @@ function makeCheckAndClose({ eyes, target: defaultTarget, environments: defaultE
                 }
             }
             catch (error) {
-                environmentLogger.error(`Environment with id ${ufgEnvironment.environmentId} failed before rendering started due to an error`, error);
-                error.info = { ...error.info, userTestId: eyes.test.userTestId, environment: ufgEnvironment };
+                environmentLogger.error(`Environment with id ${environment.environmentId} failed before rendering started due to an error`, error);
+                error.info = { ...error.info, userTestId: eyes.test.userTestId, environment };
                 throw error;
             }
         });

package/dist/ufg/check.js

@@ -145,7 +145,7 @@ function makeCheck({ eyes, target: defaultTarget, environments: defaultEnvironme
                         throw new abort_error_1.AbortError(`Render on environment with id "${(_g = baseEyes.test.environment) === null || _g === void 0 ? void 0 : _g.environmentId}" was aborted during one of the previous steps`);
                     }
                     if (settings.assumesMutability) {
-                        eyes.core.logEvent({
+                        void eyes.core.logEvent({
                             settings: {
                                 level: 'Notice',
                                 event: {

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

@@ -71,7 +71,7 @@ function makeGetBaseEyes({ settings: defaultSettings, eyes, logger: mainLogger,
             },
             logger,
         });
-        (0, report_kobiton_1.reportKobiton)({ driver: settings.driver, settings: baseEyes.test, logger });
+        void (0, report_kobiton_1.reportKobiton)({ driver: settings.driver, settings: baseEyes.test, logger });
         return baseEyes;
     }
 }

package/dist/ufg/utils/take-dom-snapshot.js

@@ -162,6 +162,7 @@ function logSnapshot(logger, snapshot) {
         logger.log(`blobs urls (${snapshot.blobs.length}):`, JSON.stringify(snapshot.blobs.map(({ url }) => url)));
         logger.log(`resource urls (${snapshot.resourceUrls.length}):`, JSON.stringify(snapshot.resourceUrls));
         logger.log(`cdt nodes with data-applitools-selector: ${JSON.stringify(snapshot.cdt.filter(node => { var _a; return (_a = node.attributes) === null || _a === void 0 ? void 0 : _a.some(attr => attr.name === 'data-applitools-selector'); }))}`);
+        logger.log('safeSelectors:', snapshot.safeSelectors);
     }
     catch (err) {
         logger.error(`error while logging cdt`, err);

package/dist/utils/extract-git-info.js

@@ -127,13 +127,16 @@ exports.extractBranchingTimestamp = utils.general.cachify(async function ({ bran
     logger = logger.extend({ tags: [`extract-branching-timestamp-${utils.general.shortid()}`] });
     const command = `HASH=$(git merge-base ${branchName} ${parentBranchName}) && git show -q --format=%aI $HASH`;
     let result = await executeWithLog(command, { execOptions, logger });
-    if (result.stderr) {
-        const [, missingBranch] = (_a = result.stderr.match(/Not a valid object name ([^\s]+)/)) !== null && _a !== void 0 ? _a : [];
-        if (missingBranch) {
-            result = await executeWithLog(`git fetch origin ${missingBranch}:${missingBranch} && ${command}`, {
-                execOptions,
-                logger,
-            });
+    // both parent and current branches could be missing, that's why we have to iterate the missing branches check check twice
+    for (let i = 0; i < 2; i++) {
+        if (result.stderr) {
+            const [, missingBranch] = (_a = result.stderr.match(/Not a valid object name ([^\s]+)/)) !== null && _a !== void 0 ? _a : [];
+            if (missingBranch) {
+                result = await executeWithLog(`git fetch origin ${missingBranch}:${missingBranch} && ${command}`, {
+                    execOptions,
+                    logger,
+                });
+            }
         }
     }
     if (!result.stdout) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/core",
-  "version": "4.22.0",
+  "version": "4.23.0",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -74,20 +74,20 @@
     }
   },
   "dependencies": {
-    "@applitools/core-base": "1.19.0",
-    "@applitools/dom-capture": "11.5.0",
-    "@applitools/dom-snapshot": "4.11.5",
-    "@applitools/driver": "1.19.5",
-    "@applitools/ec-client": "1.9.11",
-    "@applitools/logger": "2.0.18",
-    "@applitools/nml-client": "1.8.15",
-    "@applitools/req": "1.7.2",
-    "@applitools/screenshoter": "3.9.3",
-    "@applitools/snippets": "2.6.0",
-    "@applitools/socket": "1.1.18",
-    "@applitools/spec-driver-webdriver": "1.1.17",
-    "@applitools/ufg-client": "1.13.1",
-    "@applitools/utils": "1.7.4",
+    "@applitools/core-base": "1.19.2",
+    "@applitools/dom-capture": "11.5.1",
+    "@applitools/dom-snapshot": "4.11.7",
+    "@applitools/driver": "1.19.7",
+    "@applitools/ec-client": "1.9.13",
+    "@applitools/logger": "2.0.19",
+    "@applitools/nml-client": "1.8.17",
+    "@applitools/req": "1.7.3",
+    "@applitools/screenshoter": "3.9.5",
+    "@applitools/snippets": "2.6.2",
+    "@applitools/socket": "1.1.19",
+    "@applitools/spec-driver-webdriver": "1.1.19",
+    "@applitools/ufg-client": "1.14.0",
+    "@applitools/utils": "1.7.5",
     "@types/ws": "8.5.5",
     "abort-controller": "3.0.0",
     "chalk": "4.1.2",
@@ -100,11 +100,11 @@
   "devDependencies": {
     "@applitools/bongo": "^5.10.0",
     "@applitools/sea": "^1.0.0",
-    "@applitools/spec-driver-puppeteer": "^1.4.17",
-    "@applitools/spec-driver-selenium": "^1.5.88",
+    "@applitools/spec-driver-puppeteer": "^1.4.19",
+    "@applitools/spec-driver-selenium": "^1.5.90",
     "@applitools/test-server": "^1.2.2",
     "@applitools/test-utils": "^1.5.17",
-    "@applitools/tunnel-client": "^1.5.8",
+    "@applitools/tunnel-client": "^1.5.9",
     "@types/node": "^12.20.55",
     "@types/selenium-webdriver": "^4.1.2",
     "@types/semver": "^7.5.8",

package/types/index.d.ts

@@ -7,4 +7,3 @@ export { type SpecType, type SpecDriver, type Selector } from '@applitools/drive
 export * from '@applitools/driver/dist/debug';
 export * as formatters from './utils/format-results';
 export * as logs from './troubleshoot/logs';
-export { takeDomSnapshots } from './ufg/utils/take-dom-snapshots';

package/types/types.d.ts

@@ -46,6 +46,12 @@ export interface Core<TSpec extends SpecType, TDefaultType extends 'classic' | '
         config?: Config<TSpec, TDefaultType>;
         logger?: Logger;
     }): Promise<string[]>;
+    takeSnapshots?(options: {
+        driver: AutomationCore.DriverTarget<TSpec>;
+        settings?: UFGCore.SnapshotSettings<TSpec>;
+        account: BaseCore.Account;
+        logger?: Logger;
+    }): Promise<UFGCore.Snapshot[]>;
 }
 export interface EyesManager<TSpec extends SpecType, TDefaultType extends 'classic' | 'ufg' = 'classic' | 'ufg'> {
     readonly concurrency: number | undefined;

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

@@ -1,8 +1,8 @@
-import type { Region } from '@applitools/utils';
 import type { DriverTarget, Target, Eyes, CheckSettings, CloseSettings, Environment } from './types';
 import { type AbortSignal } from 'abort-controller';
 import { type Logger } from '@applitools/logger';
 import { type SpecType, type SpecDriver } from '@applitools/driver';
+import * as utils from '@applitools/utils';
 type Options<TSpec extends SpecType> = {
     eyes: Eyes<TSpec>;
     target?: DriverTarget<TSpec>;
@@ -13,7 +13,7 @@ type Options<TSpec extends SpecType> = {
 };
 export declare function makeCheckAndClose<TSpec extends SpecType>({ eyes, target: defaultTarget, environments: defaultEnvironments, spec, signal, logger: mainLogger, }: Options<TSpec>): ({ target, settings, logger, }?: {
     target?: Target<TSpec> | undefined;
-    settings?: (import("@applitools/core-base").CheckSettings<Region | import("@applitools/driver").ElementReference<TSpec>> & import("./types").ScreenshotSettings<TSpec> & {
+    settings?: (import("@applitools/core-base").CheckSettings<utils.Region | import("@applitools/driver").ElementReference<TSpec>> & import("./types").ScreenshotSettings<TSpec> & {
         environments?: Environment[] | undefined;
     } & {
         disableBrowserFetching?: boolean | undefined;