@applitools/eyes-browser 1.0.4 → 1.0.6

package/CHANGELOG.md

@@ -1,5 +1,93 @@
 # Changelog
 
+## [1.0.6](https://github.com/applitools/eyes.sdk.javascript1/compare/js/eyes-browser@1.0.5...js/eyes-browser@1.0.6) (2024-01-30)
+
+
+### Dependencies
+
+* @applitools/snippets bumped to 2.4.25
+  #### Bug Fixes
+
+  * losing root context after layout breakpoints reload ([#2113](https://github.com/applitools/eyes.sdk.javascript1/issues/2113)) ([afa1473](https://github.com/applitools/eyes.sdk.javascript1/commit/afa14735e5539ab0f79aa610e6ec1ea8989a5922))
+* @applitools/spec-driver-webdriver bumped to 1.0.55
+
+* @applitools/spec-driver-selenium bumped to 1.5.69
+
+* @applitools/spec-driver-puppeteer bumped to 1.3.5
+
+* @applitools/driver bumped to 1.16.2
+  #### Bug Fixes
+
+  * losing root context after layout breakpoints reload ([#2113](https://github.com/applitools/eyes.sdk.javascript1/issues/2113)) ([afa1473](https://github.com/applitools/eyes.sdk.javascript1/commit/afa14735e5539ab0f79aa610e6ec1ea8989a5922))
+
+
+
+* @applitools/core bumped to 4.7.0
+  #### Features
+
+  * added support of proxy server url env var ([#2159](https://github.com/applitools/eyes.sdk.javascript1/issues/2159)) ([2f69c3d](https://github.com/applitools/eyes.sdk.javascript1/commit/2f69c3d37d7af9be1f459fd3d5f41b361161b5bf))
+
+
+  #### Bug Fixes
+
+  * losing root context after layout breakpoints reload ([#2113](https://github.com/applitools/eyes.sdk.javascript1/issues/2113)) ([afa1473](https://github.com/applitools/eyes.sdk.javascript1/commit/afa14735e5539ab0f79aa610e6ec1ea8989a5922))
+
+
+
+* @applitools/screenshoter bumped to 3.8.21
+
+* @applitools/nml-client bumped to 1.6.5
+
+* @applitools/ec-client bumped to 1.7.23
+
+* @applitools/eyes bumped to 1.13.6
+
+
+## [1.0.5](https://github.com/applitools/eyes.sdk.javascript1/compare/js/eyes-browser@1.0.4...js/eyes-browser@1.0.5) (2024-01-16)
+
+
+### Dependencies
+
+* @applitools/dom-snapshot bumped to 4.7.16
+  #### Bug Fixes
+
+  * handle unparsable values of media attribute in dom snapshot ([a2afe2e](https://github.com/applitools/eyes.sdk.javascript1/commit/a2afe2e18508f44f9c046270da0c1e09fb9aea03))
+* @applitools/nml-client bumped to 1.6.4
+  #### Bug Fixes
+
+  * remove local environment id ([#2152](https://github.com/applitools/eyes.sdk.javascript1/issues/2152)) ([59aaeae](https://github.com/applitools/eyes.sdk.javascript1/commit/59aaeaed474fbde78b76ae7ac803960e3ecd8166))
+* @applitools/core bumped to 4.6.0
+  #### Features
+
+  * added possibility to provide `fallbackBaselineId` in environment objects ([#2146](https://github.com/applitools/eyes.sdk.javascript1/issues/2146)) ([f0782ea](https://github.com/applitools/eyes.sdk.javascript1/commit/f0782ea4c38935f97fc47248ed6a5b67f87b0634))
+
+
+  #### Bug Fixes
+
+  * add environment variable for setting ufg server ufg ([#2147](https://github.com/applitools/eyes.sdk.javascript1/issues/2147)) ([cfc701f](https://github.com/applitools/eyes.sdk.javascript1/commit/cfc701f7a43fed0fe252d4090b9c1dc490063c76))
+  * remove local environment id ([#2152](https://github.com/applitools/eyes.sdk.javascript1/issues/2152)) ([59aaeae](https://github.com/applitools/eyes.sdk.javascript1/commit/59aaeaed474fbde78b76ae7ac803960e3ecd8166))
+
+
+
+* @applitools/ec-client bumped to 1.7.22
+
+* @applitools/core-base bumped to 1.9.0
+  #### Features
+
+  * added possibility to provide `fallbackBaselineId` in environment objects ([#2146](https://github.com/applitools/eyes.sdk.javascript1/issues/2146)) ([f0782ea](https://github.com/applitools/eyes.sdk.javascript1/commit/f0782ea4c38935f97fc47248ed6a5b67f87b0634))
+
+
+  #### Bug Fixes
+
+  * add environment variable for setting ufg server ufg ([#2147](https://github.com/applitools/eyes.sdk.javascript1/issues/2147)) ([cfc701f](https://github.com/applitools/eyes.sdk.javascript1/commit/cfc701f7a43fed0fe252d4090b9c1dc490063c76))
+* @applitools/eyes bumped to 1.13.5
+  #### Bug Fixes
+
+  * fixed default value in `useSystemScreenshot` method of check settings ([42a773c](https://github.com/applitools/eyes.sdk.javascript1/commit/42a773cc57e8e5de528a049b376159615892003b))
+
+
+
+
 ## [1.0.4](https://github.com/applitools/eyes.sdk.javascript1/compare/js/eyes-browser@1.0.3...js/eyes-browser@1.0.4) (2024-01-02)
 
 

package/dist/index.js

@@ -20360,7 +20360,9 @@ var require_requests = __commonJS({
               ignoreBaseline: settings.ignoreBaseline,
               saveDiffs: settings.saveDiffs,
               timeout: settings.abortIdleTestTimeout,
-              isComponentAgent: settings.isComponentTest
+              isComponentAgent: settings.isComponentTest,
+              fallbackExpectedOutput: settings.fallbackBaselineId
+              // mapping to the right field is the api
             }
           },
           expected: [200, 201],
@@ -21058,25 +21060,34 @@ var require_extract_branching_timestamp = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.extractBranchingTimestamp = void 0;
     var utils34 = __importStar(require_browser3());
+    var logger_1 = require_browser6();
     exports.extractBranchingTimestamp = utils34.general.cachify(extractGitBranchingTimestamp);
-    async function extractGitBranchingTimestamp({ branchName, parentBranchName }, options) {
+    async function extractGitBranchingTimestamp({ branchName, parentBranchName, execOptions, logger = (0, logger_1.makeLogger)() }) {
       var _a;
+      logger = logger.extend({ tags: [`extract-branching-timestamp-${utils34.general.shortid()}`] });
       const command = `HASH=$(git merge-base ${branchName} ${parentBranchName}) && git show -q --format=%cI $HASH`;
-      let result = await utils34.process.execute(command, options);
+      let result = await executeWithLog(command);
       if (result.stderr) {
         const [, missingBranch] = (_a = result.stderr.match(/Not a valid object name ([^\s]+)/)) !== null && _a !== void 0 ? _a : [];
         if (missingBranch) {
-          result = await utils34.process.execute(`git fetch origin ${missingBranch}:${missingBranch} && ${command}`, options);
+          result = await executeWithLog(`git fetch origin ${missingBranch}:${missingBranch} && ${command}`);
         }
       }
       if (!result.stdout) {
-        result = await utils34.process.execute(`git fetch origin --unshallow && ${command}`, options);
+        result = await executeWithLog(`git fetch origin --unshallow && ${command}`);
       }
       const timestamp = result.stdout.replace(/\s/g, "");
       if (!/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2}/.test(timestamp)) {
         throw new Error(`stderr: ${result.stderr}, stdout: ${result.stdout}`);
       }
       return timestamp;
+      async function executeWithLog(command2) {
+        logger.log(`executing command: ${command2}`);
+        const result2 = await utils34.process.execute(command2, execOptions);
+        if (result2.stderr && result2.code)
+          logger.log(`exit code: ${result2.code}, stderr: ${result2.stderr}`);
+        return result2;
+      }
     }
   }
 });
@@ -27807,7 +27818,12 @@ var require_open_eyes = __commonJS({
               parentBranchName = branches.parentBranchName;
             }
             if (branchName && parentBranchName && branchName !== parentBranchName) {
-              settings.gitBranchingTimestamp = await (0, extract_branching_timestamp_1.extractBranchingTimestamp)({ branchName, parentBranchName }, { cwd });
+              settings.gitBranchingTimestamp = await (0, extract_branching_timestamp_1.extractBranchingTimestamp)({
+                branchName,
+                parentBranchName,
+                execOptions: { cwd },
+                logger
+              });
               logger.log("Branching timestamp successfully extracted", settings.gitBranchingTimestamp);
             }
           } catch (err) {
@@ -27821,9 +27837,14 @@ var require_open_eyes = __commonJS({
         return new Promise((resolve, reject) => {
           throttle(() => {
             return new Promise(async (done) => {
+              var _a2;
               try {
                 const controller = new abort_controller_1.AbortController();
                 const eyesRequests = await requests.openEyes({ settings, logger });
+                eyesRequests.test.ufgServer = {
+                  ...eyesRequests.test.ufgServer,
+                  ufgServerUrl: (_a2 = settings.ufgServerUrl) !== null && _a2 !== void 0 ? _a2 : eyesRequests.test.ufgServer.ufgServerUrl
+                };
                 resolve(utils34.general.extend(eyesRequests, {
                   check: (0, check_1.makeCheck)({ requests: eyesRequests, signal: controller.signal, logger }),
                   checkAndClose: (0, check_and_close_1.makeCheckAndClose)({ requests: eyesRequests, done, signal: controller.signal, logger }),
@@ -28706,7 +28727,7 @@ var require_dist3 = __commonJS({
             return t(function() {
               var t2, n, r;
               try {
-                t2 = window.top.document === window.document || "root-context" === window.document["applitools-marker"];
+                t2 = window.top.document === window.document || "root-context" === window.parent.document["applitools-marker"];
               } catch (e2) {
                 t2 = false;
               }
@@ -31769,7 +31790,10 @@ var require_driver = __commonJS({
         this._currentContext = context;
       }
       async reloadPage() {
-        await this.mainContext.execute(snippets.reloadPage).catch(() => null);
+        if (this._spec.reload)
+          await this._spec.reload(this.target);
+        else
+          await this.mainContext.execute(snippets.reloadPage).catch(() => null);
         const refreshThis = await this.refresh({ reset: false });
         const scrollingElement = await this.mainContext.getScrollingElement();
         await (scrollingElement === null || scrollingElement === void 0 ? void 0 : scrollingElement.refresh());
@@ -32611,6 +32635,59 @@ var require_set_viewport_size = __commonJS({
   }
 });
 
+// ../core/dist/utils/populate-eyes-server-settings.js
+var require_populate_eyes_server_settings = __commonJS({
+  "../core/dist/utils/populate-eyes-server-settings.js"(exports) {
+    "use strict";
+    init_process();
+    init_setImmediate();
+    init_buffer();
+    var __createBinding = exports && exports.__createBinding || (Object.create ? function(o, m, k, k2) {
+      if (k2 === void 0)
+        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 === void 0)
+        k2 = k;
+      o[k2] = m[k];
+    });
+    var __setModuleDefault = exports && exports.__setModuleDefault || (Object.create ? function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    } : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports && exports.__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.populateEyesServerSettings = void 0;
+    var utils34 = __importStar(require_browser3());
+    function populateEyesServerSettings(settings) {
+      var _a, _b, _c, _d, _e, _f;
+      (_a = settings.eyesServerUrl) !== null && _a !== void 0 ? _a : settings.eyesServerUrl = (_c = (_b = utils34.general.getEnvValue("EYES_SERVER_URL")) !== null && _b !== void 0 ? _b : utils34.general.getEnvValue("SERVER_URL")) !== null && _c !== void 0 ? _c : "https://eyesapi.applitools.com";
+      (_d = settings.apiKey) !== null && _d !== void 0 ? _d : settings.apiKey = utils34.general.getEnvValue("API_KEY");
+      (_e = settings.proxy) !== null && _e !== void 0 ? _e : settings.proxy = utils34.general.getEnvValue("PROXY_URL") ? { url: utils34.general.getEnvValue("PROXY_URL") } : void 0;
+      (_f = settings.useDnsCache) !== null && _f !== void 0 ? _f : settings.useDnsCache = utils34.general.getEnvValue("USE_DNS_CACHE", "boolean");
+    }
+    exports.populateEyesServerSettings = populateEyesServerSettings;
+  }
+});
+
 // ../core/dist/get-account-info.js
 var require_get_account_info2 = __commonJS({
   "../core/dist/get-account-info.js"(exports) {
@@ -32652,13 +32729,12 @@ var require_get_account_info2 = __commonJS({
     };
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.makeGetAccountInfo = void 0;
+    var populate_eyes_server_settings_1 = require_populate_eyes_server_settings();
     var utils34 = __importStar(require_browser3());
     function makeGetAccountInfo({ core, logger: mainLogger }) {
       return async function getAccountInfo({ settings, logger = mainLogger }) {
-        var _a, _b, _c, _d;
         logger = logger.extend(mainLogger, { tags: [`get-account-info-${utils34.general.shortid()}`] });
-        (_a = settings.eyesServerUrl) !== null && _a !== void 0 ? _a : settings.eyesServerUrl = (_c = (_b = utils34.general.getEnvValue("EYES_SERVER_URL")) !== null && _b !== void 0 ? _b : utils34.general.getEnvValue("SERVER_URL")) !== null && _c !== void 0 ? _c : "https://eyesapi.applitools.com";
-        (_d = settings.apiKey) !== null && _d !== void 0 ? _d : settings.apiKey = utils34.general.getEnvValue("API_KEY");
+        (0, populate_eyes_server_settings_1.populateEyesServerSettings)(settings);
         return core.base.getAccountInfo({ settings, logger });
       };
     }
@@ -32837,7 +32913,6 @@ var require_requests2 = __commonJS({
     function makeNMLRequests({ settings, logger: mainLogger }) {
       let brokerUrl = settings.brokerUrl;
       const req2 = (0, req_broker_1.makeReqBroker)({ settings, logger: mainLogger });
-      const localEnvironmentId = utils34.general.guid();
       const getSupportedEnvironmentsWithCache = utils34.general.cachify(getSupportedEnvironments, () => "default");
       return {
         getSupportedEnvironments: getSupportedEnvironmentsWithCache,
@@ -32856,7 +32931,7 @@ var require_requests2 = __commonJS({
         const { localEnvironment, renderEnvironments, environmentSettings } = settings2.environments.reduce((result, environment) => {
           var _a;
           if (!utils34.types.has(environment, "iosDeviceInfo") && !utils34.types.has(environment, "androidDeviceInfo")) {
-            result.localEnvironment = { ...environment, environmentId: localEnvironmentId };
+            result.localEnvironment = environment;
           } else {
             const deviceInfo = utils34.types.has(environment, "iosDeviceInfo") ? environment.iosDeviceInfo : environment.androidDeviceInfo;
             const orientation = deviceInfo.screenOrientation === "landscape" ? "landscapeLeft" : (_a = deviceInfo.screenOrientation) !== null && _a !== void 0 ? _a : "portrait";
@@ -35539,11 +35614,13 @@ var require_get_base_eyes = __commonJS({
       });
       return getBaseEyesWithCache;
       async function getBaseEyes({ settings, logger = mainLogger }) {
+        var _a;
         logger = logger.extend(mainLogger);
         logger.log(`Command "getBaseEyes" is called with settings`, settings);
         return eyes.core.base.openEyes({
           settings: {
             ...defaultSettings,
+            fallbackBaselineId: (_a = settings.environment) === null || _a === void 0 ? void 0 : _a.fallbackBaselineId,
             environment: { ...defaultSettings.environment, ...settings.environment }
           },
           logger
@@ -36428,6 +36505,7 @@ var require_extract_default_environments = __commonJS({
         const viewport = await driver.getViewport();
         const size = await driver.getViewportSize();
         environment.viewportSize = utils34.geometry.scale(size, viewport.viewportScale);
+        environment.environmentId = utils34.general.guid();
         if (driverEnvironment.isEC)
           environment.ecSessionId = (_a = await driver.getSessionId()) !== null && _a !== void 0 ? _a : void 0;
         if (driverEnvironment.isWeb)
@@ -36531,7 +36609,7 @@ var require_open_eyes2 = __commonJS({
         const controller = new abort_controller_1.AbortController();
         const account = await core.getAccountInfo({ settings, logger });
         return utils34.general.extend({}, (eyes) => {
-          var _a2;
+          var _a2, _b2, _c2;
           return {
             type: "classic",
             core,
@@ -36540,7 +36618,7 @@ var require_open_eyes2 = __commonJS({
               batchId: (_a2 = settings.batch) === null || _a2 === void 0 ? void 0 : _a2.id,
               keepBatchOpen: settings.keepBatchOpen,
               eyesServer: account.eyesServer,
-              ufgServer: account.ufgServer,
+              ufgServer: { ...account.ufgServer, ufgServerUrl: (_b2 = settings.ufgServerUrl) !== null && _b2 !== void 0 ? _b2 : (_c2 = account.ufgServer) === null || _c2 === void 0 ? void 0 : _c2.ufgServerUrl },
               uploadUrl: account.uploadUrl,
               stitchingServiceUrl: account.stitchingServiceUrl,
               supportedEnvironmentsUrl: account.supportedEnvironmentsUrl,
@@ -36677,14 +36755,13 @@ var require_locate3 = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.makeLocate = void 0;
     var core_1 = require_core2();
+    var populate_eyes_server_settings_1 = require_populate_eyes_server_settings();
     var utils34 = __importStar(require_browser3());
     function makeLocate({ spec, core, logger: mainLogger }) {
       return async function locate({ target, settings, config, logger = mainLogger }) {
-        var _a, _b, _c, _d;
         logger = logger.extend(mainLogger, { tags: [`locate-${utils34.general.shortid()}`] });
         settings = { ...config === null || config === void 0 ? void 0 : config.open, ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
-        (_a = settings.eyesServerUrl) !== null && _a !== void 0 ? _a : settings.eyesServerUrl = (_c = (_b = utils34.general.getEnvValue("EYES_SERVER_URL")) !== null && _b !== void 0 ? _b : utils34.general.getEnvValue("SERVER_URL")) !== null && _c !== void 0 ? _c : "https://eyesapi.applitools.com";
-        (_d = settings.apiKey) !== null && _d !== void 0 ? _d : settings.apiKey = utils34.general.getEnvValue("API_KEY");
+        (0, populate_eyes_server_settings_1.populateEyesServerSettings)(settings);
         const classicCore = (0, core_1.makeCore)({ spec, base: core.base, logger });
         const results = await classicCore.locate({ target, settings, logger });
         return results;
@@ -36736,14 +36813,13 @@ var require_locate_text3 = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.makeLocateText = void 0;
     var core_1 = require_core2();
+    var populate_eyes_server_settings_1 = require_populate_eyes_server_settings();
     var utils34 = __importStar(require_browser3());
     function makeLocateText({ spec, core, logger: mainLogger }) {
       return async function locateText({ target, settings, config, logger = mainLogger }) {
-        var _a, _b, _c, _d;
         logger = logger.extend(mainLogger, { tags: [`locate-text-${utils34.general.shortid()}`] });
         settings = { ...config === null || config === void 0 ? void 0 : config.open, ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
-        (_a = settings.eyesServerUrl) !== null && _a !== void 0 ? _a : settings.eyesServerUrl = (_c = (_b = utils34.general.getEnvValue("EYES_SERVER_URL")) !== null && _b !== void 0 ? _b : utils34.general.getEnvValue("SERVER_URL")) !== null && _c !== void 0 ? _c : "https://eyesapi.applitools.com";
-        (_d = settings.apiKey) !== null && _d !== void 0 ? _d : settings.apiKey = utils34.general.getEnvValue("API_KEY");
+        (0, populate_eyes_server_settings_1.populateEyesServerSettings)(settings);
         const classicCore = (0, core_1.makeCore)({ spec, base: core.base, logger });
         const results = await classicCore.locateText({ target, settings, logger });
         return results;
@@ -36795,17 +36871,17 @@ var require_extract_text3 = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.makeExtractText = void 0;
     var core_1 = require_core2();
+    var populate_eyes_server_settings_1 = require_populate_eyes_server_settings();
     var utils34 = __importStar(require_browser3());
     function makeExtractText({ spec, core, logger: mainLogger }) {
       return async function extractText({ target, settings, config, logger = mainLogger }) {
         logger = logger.extend(mainLogger, { tags: [`extract-text-${utils34.general.shortid()}`] });
         settings = utils34.types.isArray(settings) ? settings : [settings];
         settings = settings.map((settings2) => {
-          var _a, _b, _c, _d, _e;
+          var _a;
           settings2 = { ...config === null || config === void 0 ? void 0 : config.open, ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings2 };
           (_a = settings2.userCommandId) !== null && _a !== void 0 ? _a : settings2.userCommandId = `extract-text--${utils34.general.guid()}`;
-          (_b = settings2.eyesServerUrl) !== null && _b !== void 0 ? _b : settings2.eyesServerUrl = (_d = (_c = utils34.general.getEnvValue("EYES_SERVER_URL")) !== null && _c !== void 0 ? _c : utils34.general.getEnvValue("SERVER_URL")) !== null && _d !== void 0 ? _d : "https://eyesapi.applitools.com";
-          (_e = settings2.apiKey) !== null && _e !== void 0 ? _e : settings2.apiKey = utils34.general.getEnvValue("API_KEY");
+          (0, populate_eyes_server_settings_1.populateEyesServerSettings)(settings2);
           return settings2;
         });
         const classicCore = (0, core_1.makeCore)({ spec, base: core.base, logger });
@@ -76334,6 +76410,7 @@ var require_get_base_eyes2 = __commonJS({
       });
       return getBaseEyesWithCache;
       async function getBaseEyes({ settings, logger = mainLogger }) {
+        var _a;
         logger = logger.extend(mainLogger);
         logger.log(`Command "getBaseEyes" is called with settings`, settings);
         const ufgClient = await eyes.core.getUFGClient({
@@ -76351,6 +76428,7 @@ var require_get_base_eyes2 = __commonJS({
         return eyes.core.base.openEyes({
           settings: {
             ...defaultSettings,
+            fallbackBaselineId: (_a = settings.environment) === null || _a === void 0 ? void 0 : _a.fallbackBaselineId,
             environment: { ...defaultSettings.environment, ...environment, properties: settings.environment.properties }
           },
           logger
@@ -80393,20 +80471,24 @@ var require_processPagePollCjs = __commonJS({
             const { display: n3 } = t4.defaultView.getComputedStyle(e4), { width: r2, height: o2 } = e4.getBoundingClientRect();
             return "none" === n3 || 0 === r2 || 0 === o2;
           }, uh = function(e4) {
-            return Gu.toPlainObject(Gu.parse(e4.toLowerCase(), { context: "mediaQueryList" })).children.some((e5) => {
-              const t4 = e5.children.reduce((e6, t5) => ("Identifier" === t5.type && "and" === t5.name ? e6.push([]) : e6[e6.length - 1].push(t5), e6), [[]]);
-              return t4.every((e6) => {
-                let t5, n3;
-                if (1 === e6.length)
-                  [n3] = e6;
-                else {
-                  if (2 !== e6.length)
-                    return false;
-                  [t5, n3] = e6;
-                }
-                return !(t5 && ("Identifier" !== t5.type || !["not", "only"].includes(t5.name))) && ("MediaFeature" === n3.type || ("Identifier" === n3.type && ["all", "screen"].includes(n3.name) ? !t5 || "not" !== t5.name : t5 && "not" === t5.name));
+            try {
+              return Gu.toPlainObject(Gu.parse(e4.toLowerCase(), { context: "mediaQueryList" })).children.some((e5) => {
+                const t4 = e5.children.reduce((e6, t5) => ("Identifier" === t5.type && "and" === t5.name ? e6.push([]) : e6[e6.length - 1].push(t5), e6), [[]]);
+                return t4.every((e6) => {
+                  let t5, n3;
+                  if (1 === e6.length)
+                    [n3] = e6;
+                  else {
+                    if (2 !== e6.length)
+                      return false;
+                    [t5, n3] = e6;
+                  }
+                  return !(t5 && ("Identifier" !== t5.type || !["not", "only"].includes(t5.name))) && ("MediaFeature" === n3.type || ("Identifier" === n3.type && ["all", "screen"].includes(n3.name) ? !t5 || "not" !== t5.name : t5 && "not" === t5.name));
+                });
               });
-            });
+            } catch {
+              return false;
+            }
           }, hh = Qu, dh = Su, ph = /* @__PURE__ */ new Set(["date", "datetime-local", "email", "month", "number", "password", "search", "tel", "text", "time", "url", "week"]), mh = /^on[a-z]+$/;
           function fh({ attributes: e4 = {} }) {
             return Object.keys(e4).filter((t4) => e4[t4] && e4[t4].name);
@@ -82073,7 +82155,7 @@ creating temp style for access.`), r2 = Em(e4);
               function D2(e5) {
                 return t5.defaultView && t5.defaultView.frameElement && t5.defaultView.frameElement.getAttribute(e5);
               }
-            }(t4).then((e4) => (u2("processPage end"), e4.scriptVersion = "4.7.15", e4));
+            }(t4).then((e4) => (u2("processPage end"), e4.scriptVersion = "4.7.16", e4));
           };
           window[mf] = window[mf] || {};
           const bf = pf(gf, window[mf], ff);
@@ -83324,7 +83406,7 @@ var require_open_eyes3 = __commonJS({
         const controller = new abort_controller_1.AbortController();
         const account = await core.getAccountInfo({ settings, logger });
         return utils34.general.extend({}, (eyes) => {
-          var _a2;
+          var _a2, _b2, _c2;
           return {
             type: "ufg",
             core,
@@ -83333,7 +83415,7 @@ var require_open_eyes3 = __commonJS({
               batchId: (_a2 = settings.batch) === null || _a2 === void 0 ? void 0 : _a2.id,
               keepBatchOpen: settings.keepBatchOpen,
               eyesServer: account.eyesServer,
-              ufgServer: account.ufgServer,
+              ufgServer: { ...account.ufgServer, ufgServerUrl: (_b2 = settings.ufgServerUrl) !== null && _b2 !== void 0 ? _b2 : (_c2 = account.ufgServer) === null || _c2 === void 0 ? void 0 : _c2.ufgServerUrl },
               uploadUrl: account.uploadUrl,
               stitchingServiceUrl: account.stitchingServiceUrl,
               supportedEnvironmentsUrl: account.supportedEnvironmentsUrl,
@@ -83870,28 +83952,28 @@ var require_open_eyes4 = __commonJS({
     var close_1 = require_close3();
     var abort_1 = require_abort3();
     var get_eyes_results_1 = require_get_eyes_results();
+    var populate_eyes_server_settings_1 = require_populate_eyes_server_settings();
     var utils34 = __importStar(require_browser3());
     function makeOpenEyes({ type: defaultType = "classic", clients, batch, core, cores, spec, environment, logger: mainLogger, asyncCache }) {
       return async function openEyes({ type = defaultType, settings, config, target, logger = mainLogger }) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
-        var _v, _w, _x, _y;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        var _r, _s, _t, _u;
         logger = logger.extend(mainLogger, { tags: [`eyes-${type}-${utils34.general.shortid()}`] });
         settings = { ...config === null || config === void 0 ? void 0 : config.open, ...settings };
+        (0, populate_eyes_server_settings_1.populateEyesServerSettings)(settings);
         (_a = settings.userTestId) !== null && _a !== void 0 ? _a : settings.userTestId = `${settings.testName}--${utils34.general.guid()}`;
-        (_b = settings.eyesServerUrl) !== null && _b !== void 0 ? _b : settings.eyesServerUrl = (_d = (_c = utils34.general.getEnvValue("EYES_SERVER_URL")) !== null && _c !== void 0 ? _c : utils34.general.getEnvValue("SERVER_URL")) !== null && _d !== void 0 ? _d : "https://eyesapi.applitools.com";
-        (_e = settings.apiKey) !== null && _e !== void 0 ? _e : settings.apiKey = utils34.general.getEnvValue("API_KEY");
-        (_f = settings.useDnsCache) !== null && _f !== void 0 ? _f : settings.useDnsCache = utils34.general.getEnvValue("USE_DNS_CACHE", "boolean");
         settings.batch = { ...batch, ...settings.batch };
-        (_g = (_v = settings.batch).id) !== null && _g !== void 0 ? _g : _v.id = (_h = utils34.general.getEnvValue("BATCH_ID")) !== null && _h !== void 0 ? _h : `generated-${utils34.general.guid()}`;
-        (_j = (_w = settings.batch).name) !== null && _j !== void 0 ? _j : _w.name = utils34.general.getEnvValue("BATCH_NAME");
-        (_k = (_x = settings.batch).sequenceName) !== null && _k !== void 0 ? _k : _x.sequenceName = utils34.general.getEnvValue("BATCH_SEQUENCE");
-        (_l = (_y = settings.batch).notifyOnCompletion) !== null && _l !== void 0 ? _l : _y.notifyOnCompletion = utils34.general.getEnvValue("BATCH_NOTIFY", "boolean");
-        (_m = settings.keepBatchOpen) !== null && _m !== void 0 ? _m : settings.keepBatchOpen = utils34.general.getEnvValue("DONT_CLOSE_BATCHES", "boolean");
-        (_o = settings.branchName) !== null && _o !== void 0 ? _o : settings.branchName = utils34.general.getEnvValue("BRANCH");
-        (_p = settings.parentBranchName) !== null && _p !== void 0 ? _p : settings.parentBranchName = utils34.general.getEnvValue("PARENT_BRANCH");
-        (_q = settings.baselineBranchName) !== null && _q !== void 0 ? _q : settings.baselineBranchName = utils34.general.getEnvValue("BASELINE_BRANCH");
-        (_r = settings.ignoreBaseline) !== null && _r !== void 0 ? _r : settings.ignoreBaseline = false;
-        (_s = settings.compareWithParentBranch) !== null && _s !== void 0 ? _s : settings.compareWithParentBranch = false;
+        (_b = (_r = settings.batch).id) !== null && _b !== void 0 ? _b : _r.id = (_c = utils34.general.getEnvValue("BATCH_ID")) !== null && _c !== void 0 ? _c : `generated-${utils34.general.guid()}`;
+        (_d = (_s = settings.batch).name) !== null && _d !== void 0 ? _d : _s.name = utils34.general.getEnvValue("BATCH_NAME");
+        (_e = (_t = settings.batch).sequenceName) !== null && _e !== void 0 ? _e : _t.sequenceName = utils34.general.getEnvValue("BATCH_SEQUENCE");
+        (_f = (_u = settings.batch).notifyOnCompletion) !== null && _f !== void 0 ? _f : _u.notifyOnCompletion = utils34.general.getEnvValue("BATCH_NOTIFY", "boolean");
+        (_g = settings.keepBatchOpen) !== null && _g !== void 0 ? _g : settings.keepBatchOpen = utils34.general.getEnvValue("DONT_CLOSE_BATCHES", "boolean");
+        (_h = settings.branchName) !== null && _h !== void 0 ? _h : settings.branchName = utils34.general.getEnvValue("BRANCH");
+        (_j = settings.parentBranchName) !== null && _j !== void 0 ? _j : settings.parentBranchName = utils34.general.getEnvValue("PARENT_BRANCH");
+        (_k = settings.baselineBranchName) !== null && _k !== void 0 ? _k : settings.baselineBranchName = utils34.general.getEnvValue("BASELINE_BRANCH");
+        (_l = settings.ufgServerUrl) !== null && _l !== void 0 ? _l : settings.ufgServerUrl = utils34.general.getEnvValue("UFG_SERVER_URL");
+        (_m = settings.ignoreBaseline) !== null && _m !== void 0 ? _m : settings.ignoreBaseline = false;
+        (_o = settings.compareWithParentBranch) !== null && _o !== void 0 ? _o : settings.compareWithParentBranch = false;
         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());
@@ -83902,7 +83984,7 @@ var require_open_eyes4 = __commonJS({
             event: {
               type: "openEyes",
               userTestId: settings.userTestId,
-              concurrency: (_t = cores === null || cores === void 0 ? void 0 : cores[type].concurrency) !== null && _t !== void 0 ? _t : core.concurrency,
+              concurrency: (_p = cores === null || cores === void 0 ? void 0 : cores[type].concurrency) !== null && _p !== void 0 ? _p : core.concurrency,
               environment,
               driver: {
                 deviceName: driverEnvironment === null || driverEnvironment === void 0 ? void 0 : driverEnvironment.deviceName,
@@ -83910,7 +83992,7 @@ var require_open_eyes4 = __commonJS({
                 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: (_u = driverEnvironment === null || driverEnvironment === void 0 ? void 0 : driverEnvironment.applitoolsLib) === null || _u === void 0 ? void 0 : _u.instrumented,
+                isApplitoolsLib: (_q = driverEnvironment === null || driverEnvironment === void 0 ? void 0 : driverEnvironment.applitoolsLib) === null || _q === void 0 ? void 0 : _q.instrumented,
                 isEC: driverEnvironment === null || driverEnvironment === void 0 ? void 0 : driverEnvironment.isEC
               },
               driverUrl
@@ -84195,7 +84277,7 @@ var require_make_manager = __commonJS({
         var _g;
         logger = logger.extend(mainLogger, { tags: [`manager-${type}-${utils34.general.shortid()}`] });
         settings !== null && settings !== void 0 ? settings : settings = {};
-        (_a = settings.concurrency) !== null && _a !== void 0 ? _a : settings.concurrency = (_b = utils34.general.getEnvValue("CONCURRENCY", "number")) !== null && _b !== void 0 ? _b : utils34.types.isInteger(settings.legacyConcurrency) ? settings.legacyConcurrency * 5 : 5;
+        (_a = settings.concurrency) !== null && _a !== void 0 ? _a : settings.concurrency = (_b = utils34.general.getEnvValue("CONCURRENCY", "number")) !== null && _b !== void 0 ? _b : utils34.types.isInteger(settings.legacyConcurrency) ? settings.legacyConcurrency * 5 : 100;
         (_c = settings.batch) !== null && _c !== void 0 ? _c : settings.batch = {};
         (_d = (_g = settings.batch).id) !== null && _d !== void 0 ? _d : _g.id = (_e = utils34.general.getEnvValue("BATCH_ID")) !== null && _e !== void 0 ? _e : `generated-${utils34.general.guid()}`;
         (_f = settings.agentId) !== null && _f !== void 0 ? _f : settings.agentId = type === "ufg" ? defaultAgentId === null || defaultAgentId === void 0 ? void 0 : defaultAgentId.replace(/(\/\d)/, ".visualgrid$1") : defaultAgentId;
@@ -84265,14 +84347,13 @@ var require_close_batch2 = __commonJS({
     };
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.makeCloseBatch = void 0;
+    var populate_eyes_server_settings_1 = require_populate_eyes_server_settings();
     var utils34 = __importStar(require_browser3());
     function makeCloseBatch({ core, logger: mainLogger }) {
       return async function closeBatch2({ settings, logger = mainLogger }) {
         logger = logger.extend(mainLogger, { tags: [`close-batch-${utils34.general.shortid()}`] });
         (utils34.types.isArray(settings) ? settings : [settings]).forEach((settings2) => {
-          var _a, _b, _c, _d;
-          (_a = settings2.eyesServerUrl) !== null && _a !== void 0 ? _a : settings2.eyesServerUrl = (_c = (_b = utils34.general.getEnvValue("EYES_SERVER_URL")) !== null && _b !== void 0 ? _b : utils34.general.getEnvValue("SERVER_URL")) !== null && _c !== void 0 ? _c : "https://eyesapi.applitools.com";
-          (_d = settings2.apiKey) !== null && _d !== void 0 ? _d : settings2.apiKey = utils34.general.getEnvValue("API_KEY");
+          (0, populate_eyes_server_settings_1.populateEyesServerSettings)(settings2);
         });
         return core.base.closeBatch({ settings, logger });
       };
@@ -84322,14 +84403,13 @@ var require_delete_test2 = __commonJS({
     };
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.makeDeleteTest = void 0;
+    var populate_eyes_server_settings_1 = require_populate_eyes_server_settings();
     var utils34 = __importStar(require_browser3());
     function makeDeleteTest({ core, logger: mainLogger }) {
       return async function deleteTest({ settings, logger = mainLogger }) {
         logger = logger.extend(mainLogger, { tags: [`delete-test-${utils34.general.shortid()}`] });
         (utils34.types.isArray(settings) ? settings : [settings]).forEach((settings2) => {
-          var _a, _b, _c, _d;
-          (_a = settings2.eyesServerUrl) !== null && _a !== void 0 ? _a : settings2.eyesServerUrl = (_c = (_b = utils34.general.getEnvValue("EYES_SERVER_URL")) !== null && _b !== void 0 ? _b : utils34.general.getEnvValue("SERVER_URL")) !== null && _c !== void 0 ? _c : "https://eyesapi.applitools.com";
-          (_d = settings2.apiKey) !== null && _d !== void 0 ? _d : settings2.apiKey = utils34.general.getEnvValue("API_KEY");
+          (0, populate_eyes_server_settings_1.populateEyesServerSettings)(settings2);
         });
         return core.base.deleteTest({ settings, logger });
       };
@@ -84401,7 +84481,7 @@ var require_package2 = __commonJS({
   "../core/package.json"(exports, module) {
     module.exports = {
       name: "@applitools/core",
-      version: "4.5.2",
+      version: "4.7.0",
       homepage: "https://applitools.com",
       bugs: {
         url: "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -87049,6 +87129,9 @@ var require_spec_driver3 = __commonJS({
         },
         async switchWorld(driver, name) {
           return socket.request("Driver.switchWorld", { driver, name });
+        },
+        async reload(driver) {
+          return socket.request("Driver.reload", { driver });
         }
       };
       return spec.reduce((spec2, name) => {
@@ -88142,7 +88225,7 @@ var require_package3 = __commonJS({
   "../eyes/package.json"(exports, module) {
     module.exports = {
       name: "@applitools/eyes",
-      version: "1.13.4",
+      version: "1.13.6",
       keywords: [
         "applitools",
         "eyes",
@@ -90054,7 +90137,7 @@ var CheckSettingsAutomationFluent = class extends CheckSettingsBaseFluent {
   visualGridOptions(options) {
     return this.ufgOptions(options);
   }
-  useSystemScreenshot(useSystemScreenshot) {
+  useSystemScreenshot(useSystemScreenshot = true) {
     this._settings.useSystemScreenshot = useSystemScreenshot;
     return this;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/eyes-browser",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "keywords": [
     "applitools",
     "browser",
@@ -48,7 +48,7 @@
     "test": "run --top-level mocha './test/**/*.spec.ts'"
   },
   "dependencies": {
-    "@applitools/eyes": "1.13.4"
+    "@applitools/eyes": "1.13.6"
   },
   "devDependencies": {
     "@types/node": "^12.20.55",

package/types/input/CheckSettings.d.ts

@@ -204,7 +204,7 @@ export declare class CheckSettingsAutomationFluent<TSpec extends Core.SpecType =
     visualGridOptions(options: {
         [key: string]: any;
     }): this;
-    useSystemScreenshot(useSystemScreenshot: boolean): this;
+    useSystemScreenshot(useSystemScreenshot?: boolean): this;
     timeout(timeout: number): this;
     waitBeforeCapture(waitBeforeCapture: number): this;
     lazyLoad(options?: LazyLoadOptions | boolean): this;