@applitools/core 4.24.1 → 4.25.0

package/CHANGELOG.md

@@ -1,5 +1,51 @@
 # Changelog
 
+## [4.25.0](https://github.com/Applitools-Dev/sdk/compare/js/core@4.24.2...js/core@4.25.0) (2024-11-29)
+
+
+### Features
+
+* offline cli with config ([#2646](https://github.com/Applitools-Dev/sdk/issues/2646)) ([0589dc4](https://github.com/Applitools-Dev/sdk/commit/0589dc429a0c94451e957932106f258dadfd88cc))
+
+## [4.24.2](https://github.com/Applitools-Dev/sdk/compare/js/core@4.24.1...js/core@4.24.2) (2024-11-27)
+
+
+### Bug Fixes
+
+* don't populate branchName and parentBranchName when scm integration exists ([#2634](https://github.com/Applitools-Dev/sdk/issues/2634)) ([e45d671](https://github.com/Applitools-Dev/sdk/commit/e45d671e11ed40a82de1bd5ab22e757aff00b63f))
+* enhance error logging in takeScreenshots and pollify functions ([#2644](https://github.com/Applitools-Dev/sdk/issues/2644)) ([2428fa5](https://github.com/Applitools-Dev/sdk/commit/2428fa500a9fd47a803aa5aca9f79e5c5b3584f9))
+
+
+### Dependencies
+
+* @applitools/dom-shared bumped to 1.0.16
+  #### Bug Fixes
+
+  * enhance error logging in takeScreenshots and pollify functions ([#2644](https://github.com/Applitools-Dev/sdk/issues/2644)) ([2428fa5](https://github.com/Applitools-Dev/sdk/commit/2428fa500a9fd47a803aa5aca9f79e5c5b3584f9))
+* @applitools/dom-snapshot bumped to 4.11.11
+
+* @applitools/req bumped to 1.7.4
+  #### Bug Fixes
+
+  * set heartbeat request timeout as the request interval ([#2587](https://github.com/Applitools-Dev/sdk/issues/2587)) ([0251d27](https://github.com/Applitools-Dev/sdk/commit/0251d27d9ed44ec247732f66904ae3d4fa4123f1))
+* @applitools/dom-capture bumped to 11.5.2
+
+* @applitools/nml-client bumped to 1.8.19
+
+* @applitools/tunnel-client bumped to 1.5.10
+
+* @applitools/ufg-client bumped to 1.14.1
+
+* @applitools/core-base bumped to 1.19.3
+  #### Bug Fixes
+
+  * set heartbeat request timeout as the request interval ([#2587](https://github.com/Applitools-Dev/sdk/issues/2587)) ([0251d27](https://github.com/Applitools-Dev/sdk/commit/0251d27d9ed44ec247732f66904ae3d4fa4123f1))
+
+
+
+* @applitools/ec-client bumped to 1.9.15
+
+
 ## [4.24.1](https://github.com/Applitools-Dev/sdk/compare/js/core@4.24.0...js/core@4.24.1) (2024-11-14)
 
 

package/dist/classic/utils/take-screenshots.js

@@ -44,7 +44,10 @@ async function takeScreenshots({ driver, settings, logger, }) {
             await ((_a = screenshot.scrollingElement) === null || _a === void 0 ? void 0 : _a.setAttribute('data-applitools-scroll', 'true'));
         else
             await ((_b = screenshot.element) === null || _b === void 0 ? void 0 : _b.setAttribute('data-applitools-scroll', 'true'));
-        baseTarget.dom = await (0, take_dom_capture_1.takeDomCapture)({ driver, settings: settings.domSettings, logger }).catch(() => undefined);
+        baseTarget.dom = await (0, take_dom_capture_1.takeDomCapture)({ driver, settings: settings.domSettings, logger }).catch(error => {
+            logger.error('failed to capture DOM', error);
+            return undefined;
+        });
     }
     if (settings.calculateView) {
         const scrollingElement = await driver.mainContext.getScrollingElement();

package/dist/cli/cli.js

@@ -32,7 +32,6 @@ const core_server_1 = require("../universal/core-server");
 const core_server_process_1 = require("../universal/core-server-process");
 const logs_1 = require("../troubleshoot/logs");
 const check_network_1 = require("../troubleshoot/check-network");
-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"));
@@ -152,29 +151,5 @@ void yargs_1.default
     handler: async () => {
         await (0, check_network_1.checkNetwork)();
     },
-})
-    .command({
-    command: 'run-offline-snapshots',
-    builder: yargs => yargs
-        .options({
-        offlineLocationPath: {
-            description: 'path to offline snapshots folder',
-            type: 'string',
-        },
-        failOnDiff: {
-            description: 'should exit process with non-zero exit code, thereby failing the CI job',
-            type: 'boolean',
-            default: false,
-        },
-    })
-        .fail((_msg, err, _yargs) => {
-        if (err) {
-            console.error(err.message);
-            process.exit(1);
-        }
-    }),
-    handler: async (args) => {
-        await (0, run_offline_snapshots_1.runOfflineSnapshots)(args);
-    },
 })
     .wrap(yargs_1.default.terminalWidth()).argv;

package/dist/index.js

@@ -35,3 +35,4 @@ __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"));
+__exportStar(require("./offline/run-offline-snapshots"), exports);

package/dist/offline/merge-configs.js

@@ -0,0 +1,42 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeConfigs = void 0;
+const utils = __importStar(require("@applitools/utils"));
+function mergeConfigs(base, other) {
+    return Object.entries(other).reduce((base, [key, value]) => {
+        if (utils.types.has(base, key) &&
+            utils.types.isObject(value) &&
+            !(value instanceof String) &&
+            !utils.types.isArray(value)) {
+            base[key] = mergeConfigs(base[key], value);
+        }
+        else if (value !== undefined) {
+            base[key] = value;
+        }
+        return base;
+    }, { ...base });
+}
+exports.mergeConfigs = mergeConfigs;

package/dist/{run-offline-snapshots.js → offline/run-offline-snapshots.js}

@@ -29,19 +29,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runOfflineSnapshots = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const core_1 = require("./core");
-const get_ufg_client_1 = require("./ufg/get-ufg-client");
+const core_1 = require("../core");
+const get_ufg_client_1 = require("../ufg/get-ufg-client");
 const logger_1 = require("@applitools/logger");
-const to_base_check_settings_1 = require("./automation/utils/to-base-check-settings");
+const to_base_check_settings_1 = require("../automation/utils/to-base-check-settings");
 const chalk_1 = __importDefault(require("chalk"));
 const utils = __importStar(require("@applitools/utils"));
+const merge_configs_1 = require("./merge-configs");
 async function runOfflineSnapshots(options) {
+    var _a, _b;
     if (!options.offlineLocationPath)
         throw new Error('offlineLocationPath is required');
     const startTime = Date.now();
-    const logger = (0, logger_1.makeLogger)({ format: { label: 'offline-exec' } });
+    const logger = (_a = options.logger) !== null && _a !== void 0 ? _a : (0, logger_1.makeLogger)({ format: { label: 'offline-exec' } });
+    const eyesServerSettings = { ...(_b = options.config) === null || _b === void 0 ? void 0 : _b.open, ...options };
     const core = (0, core_1.makeCore)();
-    const account = await core.getAccountInfo({ settings: options });
+    const account = await core.getAccountInfo({ settings: eyesServerSettings });
     const ufgClient = await (0, get_ufg_client_1.makeGetUFGClient)({ logger })({
         settings: { ...account.eyesServer, ...account.ufgServer },
     });
@@ -66,6 +69,7 @@ async function runOfflineSnapshots(options) {
     else {
         logger.console.log(outputStr);
     }
+    return allTestResults;
     async function runExecution(executionName) {
         const executionLogger = logger.extend({ tags: [executionName] });
         const executionPath = path_1.default.resolve(options.offlineLocationPath, executionName);
@@ -75,9 +79,10 @@ async function runOfflineSnapshots(options) {
         const results = await Promise.all(testFolders.map(async (testFolder) => {
             const testLogger = logger.extend({ tags: [testFolder] });
             const testPath = path_1.default.resolve(executionPath, testFolder);
-            const openSettings = (await fs_1.default.promises
+            const fileOpenSettings = await fs_1.default.promises
                 .readFile(path_1.default.resolve(testPath, 'settings.json'), 'utf-8')
-                .then(JSON.parse));
+                .then(JSON.parse);
+            const openSettings = (0, merge_configs_1.mergeConfigs)(fileOpenSettings, options.config.open);
             logger.console.log(`Running test: ${openSettings.testName} (${formatEnvironment(openSettings.environment)})`);
             return runTest(executionPath, testPath, openSettings, testLogger);
         }));
@@ -110,9 +115,9 @@ async function runOfflineSnapshots(options) {
         // logger.log('resource hashes for test', testFolder, ':', resourceHashes)
         logger.log('uploaded resources for test', testPath);
         await Promise.all(targets.map((target, index) => runCheck(eyes, target, index, logger)));
-        await eyes.close({
-            settings: await fs_1.default.promises.readFile(path_1.default.resolve(testPath, 'close.json'), 'utf-8').then(JSON.parse),
-        });
+        const fileCloseSettings = await fs_1.default.promises.readFile(path_1.default.resolve(testPath, 'close.json'), 'utf-8').then(JSON.parse);
+        const closeSettings = (0, merge_configs_1.mergeConfigs)(fileCloseSettings, options.config.close);
+        await eyes.close({ settings: closeSettings });
         logger.log('done running test', logger);
         return { batchId: openSettings.batch.id, results: (await eyes.getResults({ logger }))[0] };
     }
@@ -180,9 +185,10 @@ async function runOfflineSnapshots(options) {
         baseSettings.stepIndex = index;
         baseTarget.source = target.target.source; // TODO verify
         // baseTarget.name = snapshot.title // TODO figure out
+        const mergedCheckSettings = (0, merge_configs_1.mergeConfigs)(baseSettings, options.config.check);
         await eyes.check({
             target: { ...baseTarget, isTransformed: true },
-            settings: baseSettings,
+            settings: mergedCheckSettings,
             logger: checkLogger,
         });
     }

package/dist/open-eyes.js

@@ -142,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;
-            var _e;
+            var _a, _b;
+            var _c;
             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,9 +159,8 @@ function makeOpenEyes({ type: defaultType = 'classic', clients, batch, removeDup
                 if (scmInfo) {
                     (_a = settings.batch) !== null && _a !== void 0 ? _a : (settings.batch = {});
                     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);
+                    (_b = (_c = settings.batch).buildId) !== null && _b !== void 0 ? _b : (_c.buildId = buildId);
+                    // Intentionally not auto populating branchName and parentBranchName. If there is scmInfo then Eyes already knows these values.
                 }
             }
             else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/core",
-  "version": "4.24.1",
+  "version": "4.25.0",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -28,8 +28,8 @@
     "./package.json": "./package.json"
   },
   "bin": {
-    "eyes": "./dist/cli/cli.js",
-    "eyes-check-network": "./dist/troubleshoot/check-network.js"
+    "eyes-check-network": "./dist/troubleshoot/check-network.js",
+    "eyes-core": "./dist/cli/cli.js"
   },
   "main": "./dist/index.js",
   "types": "./types/index.d.ts",
@@ -49,8 +49,8 @@
     "build:bin:zip": "zip -j ./bin/core.zip $(find ./bin -type f -not -name '*.zip' -not -name '*.tar.gz' | xargs)",
     "build:bin:tgz": "tar -czf ./bin/core.tar.gz $(find ./bin -type f -not -name '*.zip' -not -name '*.tar.gz' | xargs)",
     "test": "run --top-level mocha './test/**/*.spec.ts' --exclude './test/bin/**' --parallel --jobs ${MOCHA_JOBS:-15} --exit",
-    "test:local": "MOCHA_OMIT_TAGS=sauce run test",
-    "test:sauce": "MOCHA_ONLY_TAGS=sauce run test",
+    "test:local": "MOCHA_OMIT_TAGS=sauce,browserstack run test",
+    "test:sauce": "MOCHA_ONLY_TAGS=sauce,browserstack run test",
     "test:bin": "MOCHA_GROUP=bin run --top-level mocha './test/bin/**/*.spec.ts' --parallel --jobs ${MOCHA_JOBS:-15}",
     "test:e2e": "MOCHA_GROUP=e2e run --top-level mocha './test/e2e/**/*.spec.ts' --parallel --jobs ${MOCHA_JOBS:-15} --exit",
     "test:it": "MOCHA_GROUP=it run --top-level mocha './test/it/**/*.spec.ts'",
@@ -58,7 +58,7 @@
     "setup": "run --top-level browsers:setup"
   },
   "sea": {
-    "bin": "eyes",
+    "bin": "eyes-core",
     "certs": {
       "win": {
         "cert": "env.CODE_SIGNING_CERT_WIN",
@@ -74,19 +74,19 @@
     }
   },
   "dependencies": {
-    "@applitools/core-base": "1.19.2",
-    "@applitools/dom-capture": "11.5.1",
-    "@applitools/dom-snapshot": "4.11.10",
+    "@applitools/core-base": "1.19.3",
+    "@applitools/dom-capture": "11.5.2",
+    "@applitools/dom-snapshot": "4.11.11",
     "@applitools/driver": "1.20.0",
-    "@applitools/ec-client": "1.9.14",
+    "@applitools/ec-client": "1.9.15",
     "@applitools/logger": "2.0.19",
-    "@applitools/nml-client": "1.8.18",
-    "@applitools/req": "1.7.3",
+    "@applitools/nml-client": "1.8.19",
+    "@applitools/req": "1.7.4",
     "@applitools/screenshoter": "3.10.0",
     "@applitools/snippets": "2.6.3",
     "@applitools/socket": "1.1.19",
     "@applitools/spec-driver-webdriver": "1.1.20",
-    "@applitools/ufg-client": "1.14.0",
+    "@applitools/ufg-client": "1.14.1",
     "@applitools/utils": "1.7.5",
     "@types/ws": "8.5.5",
     "abort-controller": "3.0.0",
@@ -104,7 +104,7 @@
     "@applitools/spec-driver-selenium": "^1.5.91",
     "@applitools/test-server": "^1.2.2",
     "@applitools/test-utils": "^1.5.17",
-    "@applitools/tunnel-client": "^1.5.9",
+    "@applitools/tunnel-client": "^1.5.10",
     "@types/node": "^12.20.55",
     "@types/selenium-webdriver": "^4.1.2",
     "@types/semver": "^7.5.8",

package/types/index.d.ts

@@ -7,3 +7,4 @@ 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 * from './offline/run-offline-snapshots';

package/types/offline/merge-configs.d.ts

@@ -0,0 +1 @@
+export declare function mergeConfigs<TBase extends Record<string, any>>(base: TBase, other: Record<string, any>): TBase;

package/types/offline/run-offline-snapshots.d.ts

@@ -0,0 +1,11 @@
+import { Config, type EyesServerSettings } from '../types';
+import { type Logger } from '@applitools/logger';
+import type { TestResult } from '@applitools/core-base';
+import type { SpecType } from '@applitools/driver';
+export type OfflineSnapshotsSettings = EyesServerSettings & {
+    offlineLocationPath: string;
+    failOnDiff: boolean;
+    config: Config<SpecType, 'ufg'>;
+    logger?: Logger;
+};
+export declare function runOfflineSnapshots(options: OfflineSnapshotsSettings): Promise<TestResult[]>;

package/types/run-offline-snapshots.d.ts

@@ -1,6 +0,0 @@
-import { type EyesServerSettings } from './types';
-export type OfflineSnapshotsSettings = EyesServerSettings & {
-    offlineLocationPath: string;
-    failOnDiff: boolean;
-};
-export declare function runOfflineSnapshots(options: OfflineSnapshotsSettings): Promise<void>;