@applitools/driver 1.11.2 → 1.11.4

package/dist/context.js

@@ -104,6 +104,70 @@ class Context {
     get isRef() {
         return !this._target;
     }
+    async _findElements(selector, options = {}) {
+        await this.focus();
+        const { parent, all, wait } = options;
+        const transformedSelector = specUtils.transformSelector(this._spec, selector, this.driver);
+        let elements = [];
+        if (wait) {
+            if (this._spec.waitForSelector) {
+                const element = await this._spec.waitForSelector(this.target, specUtils.transformSelector(this._spec, selector, this.driver), parent, wait);
+                if (element)
+                    elements = [element];
+            }
+            else {
+                let waiting = true;
+                const timeout = setTimeout(() => (waiting = false), wait.timeout);
+                while (waiting) {
+                    const element = await this._spec.findElement(this.target, specUtils.transformSelector(this._spec, selector, this.driver), parent);
+                    if (element) {
+                        clearTimeout(timeout);
+                        elements = [element];
+                    }
+                    await utils.general.sleep(wait.interval);
+                }
+            }
+        }
+        else if (all) {
+            elements = await this._spec.findElements(this.target, transformedSelector, parent);
+        }
+        else {
+            const element = await this._spec.findElement(this.target, transformedSelector, parent);
+            if (element)
+                elements = [element];
+        }
+        if (specUtils.isCommonSelector(this._spec, selector)) {
+            if (elements.length > 0) {
+                if (selector.child) {
+                    elements = await elements.reduce((result, element) => {
+                        return result.then(async (result) => {
+                            return result.concat(await this._findElements(selector.child, { parent: element, all, wait }));
+                        });
+                    }, Promise.resolve([]));
+                }
+                else if (selector.shadow) {
+                    elements = await elements.reduce((result, element) => {
+                        return result.then(async (result) => {
+                            const root = await this._spec.executeScript(this.target, snippets.getShadowRoot, [element]);
+                            return result.concat(root ? await this._findElements(selector.shadow, { parent: root, all, wait }) : []);
+                        });
+                    }, Promise.resolve([]));
+                }
+                else if (selector.frame) {
+                    elements = await elements.reduce((result, element) => {
+                        return result.then(async (result) => {
+                            const context = await this.context(element);
+                            return result.concat(await context._findElements(selector.frame, { all, wait }));
+                        });
+                    }, Promise.resolve([]));
+                }
+            }
+            if (elements.length === 0 && selector.fallback) {
+                elements = await this._findElements(selector.fallback, parent);
+            }
+        }
+        return elements;
+    }
     async init() {
         if (this.isInitialized)
             return this;
@@ -201,62 +265,21 @@ class Context {
             });
         }
     }
-    async root(selector) {
-        var _a;
-        await this.focus();
-        const { contextSelectors, elementSelector } = specUtils.splitSelector(this._spec, selector);
-        let context = this;
-        for (const contextSelector of contextSelectors) {
-            try {
-                context = await context.context(contextSelector);
-                await context.focus();
-            }
-            catch {
-                return null;
-            }
-        }
-        if ((_a = this.driver.features) === null || _a === void 0 ? void 0 : _a.shadowSelector)
-            return { context, selector: elementSelector };
-        let root = null;
-        let element = null;
-        let currentSelector = elementSelector;
-        while (specUtils.isCommonSelector(this._spec, currentSelector) &&
-            specUtils.isSelector(this._spec, currentSelector.shadow)) {
-            element = await this._spec.findElement(this.target, specUtils.transformSelector(this._spec, currentSelector, this.driver), root);
-            if (!element)
-                return null;
-            root = await this._spec.executeScript(this.target, snippets.getShadowRoot, [element]);
-            if (!root)
-                return null;
-            currentSelector = currentSelector.shadow;
-        }
-        return {
-            context,
-            shadow: element && new element_1.Element({ spec: this._spec, context, element, logger: this._logger }),
-            selector: currentSelector,
-        };
-    }
     async element(elementOrSelector) {
         if (this._spec.isElement(elementOrSelector)) {
             return new element_1.Element({ spec: this._spec, context: this, element: elementOrSelector, logger: this._logger });
         }
-        else if (specUtils.isSelector(this._spec, elementOrSelector)) {
-            if (this.isRef) {
-                return new element_1.Element({ spec: this._spec, context: this, selector: elementOrSelector, logger: this._logger });
-            }
-            this._logger.log('Finding element by selector: ', elementOrSelector);
-            const root = await this.root(elementOrSelector);
-            if (!root)
-                return null;
-            const element = await this._spec.findElement(root.context.target, specUtils.transformSelector(this._spec, root.selector, this.driver), root.shadow && (await root.shadow.getShadowRoot()));
-            // TODO root.selector is not a full selector from context root to an element, but selector inside a shadow
-            return element
-                ? new element_1.Element({ spec: this._spec, context: root.context, element, selector: root.selector, logger: this._logger })
-                : null;
-        }
-        else {
+        else if (!specUtils.isSelector(this._spec, elementOrSelector)) {
             throw new TypeError('Cannot find element using argument of unknown type!');
         }
+        if (this.isRef) {
+            return new element_1.Element({ spec: this._spec, context: this, selector: elementOrSelector, logger: this._logger });
+        }
+        this._logger.log('Finding element by selector: ', elementOrSelector);
+        const [element] = await this._findElements(elementOrSelector, { all: false });
+        return element
+            ? new element_1.Element({ spec: this._spec, context: this, element, selector: elementOrSelector, logger: this._logger })
+            : null;
     }
     async elements(selectorOrElement) {
         if (specUtils.isSelector(this._spec, selectorOrElement)) {
@@ -264,17 +287,13 @@ class Context {
                 return [new element_1.Element({ spec: this._spec, context: this, selector: selectorOrElement, logger: this._logger })];
             }
             this._logger.log('Finding elements by selector: ', selectorOrElement);
-            const root = await this.root(selectorOrElement);
-            if (!root)
-                return [];
-            const elements = await this._spec.findElements(root.context.target, specUtils.transformSelector(this._spec, root.selector, this.driver), root.shadow && (await root.shadow.getShadowRoot()));
+            const elements = await this._findElements(selectorOrElement, { all: true });
             return elements.map((element, index) => {
-                // TODO root.selector is not a full selector from context root to an element, but selector inside a shadow
                 return new element_1.Element({
                     spec: this._spec,
-                    context: root.context,
+                    context: this,
                     element,
-                    selector: root.selector,
+                    selector: selectorOrElement,
                     index,
                     logger: this._logger,
                 });
@@ -288,34 +307,10 @@ class Context {
         }
     }
     async waitFor(selector, options) {
-        var _a, _b;
-        const root = await this.root(selector);
-        if (!root)
-            return null;
-        options = { state: 'exist', timeout: 10000, interval: 500, ...options };
-        if (this._spec.waitForSelector) {
-            const element = await this._spec.waitForSelector(root.context.target, specUtils.transformSelector(this._spec, root.selector, this.driver), (_a = root.shadow) === null || _a === void 0 ? void 0 : _a.target, options);
-            return element
-                ? new element_1.Element({ spec: this._spec, context: root.context, element, selector: root.selector, logger: this._logger })
-                : null;
-        }
-        let waiting = true;
-        const timeout = setTimeout(() => (waiting = false), options.timeout);
-        while (waiting) {
-            const element = await this._spec.findElement(root.context.target, specUtils.transformSelector(this._spec, root.selector, this.driver), (_b = root.shadow) === null || _b === void 0 ? void 0 : _b.target);
-            if (element) {
-                clearTimeout(timeout);
-                return new element_1.Element({
-                    spec: this._spec,
-                    context: root.context,
-                    element,
-                    selector: root.selector,
-                    logger: this._logger,
-                });
-            }
-            await utils.general.sleep(options.interval);
-        }
-        return null;
+        const [element] = await this._findElements(selector, {
+            wait: { state: 'exist', timeout: 10000, interval: 500, ...options },
+        });
+        return element ? new element_1.Element({ spec: this._spec, context: this, element, selector, logger: this._logger }) : null;
     }
     async execute(script, arg) {
         await this.focus();
@@ -345,6 +340,49 @@ class Context {
             }
         }
     }
+    async executePoll(script, arg) {
+        this._logger.log('Executing poll script');
+        const { main: mainScript, poll: pollScript } = utils.types.isString(script) || utils.types.isFunction(script) ? { main: script, poll: script } : script;
+        const { main: mainArg, poll: pollArg, executionTimeout = 60000, pollTimeout = 1000, } = !utils.types.has(arg, ['main', 'poll']) ? { main: arg, poll: arg } : arg;
+        let isExecutionTimedOut = false;
+        const executionTimer = setTimeout(() => (isExecutionTimedOut = true), executionTimeout);
+        try {
+            let response = deserialize(await this.execute(mainScript, mainArg));
+            let chunks = '';
+            while (!isExecutionTimedOut) {
+                if (response.status === 'ERROR') {
+                    throw new Error(`Error during execute poll script: '${response.error}'`);
+                }
+                else if (response.status === 'SUCCESS') {
+                    return response.value;
+                }
+                else if (response.status === 'SUCCESS_CHUNKED') {
+                    chunks += response.value;
+                    if (response.done)
+                        return deserialize(chunks);
+                }
+                else if (response.status === 'WIP') {
+                    await utils.general.sleep(pollTimeout);
+                }
+                this._logger.log('Polling...');
+                response = deserialize(await this.execute(pollScript, pollArg));
+            }
+            throw new Error('Poll script execution is timed out');
+        }
+        finally {
+            clearTimeout(executionTimer);
+        }
+        function deserialize(json) {
+            try {
+                return JSON.parse(json);
+            }
+            catch (err) {
+                const firstChars = json.slice(0, 100);
+                const lastChars = json.slice(-100);
+                throw new Error(`Response is not a valid JSON string. length: ${json.length}, first 100 chars: "${firstChars}", last 100 chars: "${lastChars}". error: ${err}`);
+            }
+        }
+    }
     async getContextElement() {
         if (this.isMain)
             return null;

package/dist/driver.js

@@ -29,10 +29,11 @@ const logger_1 = require("@applitools/logger");
 const helper_ios_1 = require("./helper-ios");
 const helper_android_1 = require("./helper-android");
 const user_agent_1 = require("./user-agent");
+const user_agent_data_1 = require("./user-agent-data");
 const capabilities_1 = require("./capabilities");
+const snippets = __importStar(require("@applitools/snippets"));
 const utils = __importStar(require("@applitools/utils"));
 const specUtils = __importStar(require("./spec-utils"));
-const snippets = require('@applitools/snippets');
 // eslint-disable-next-line
 class Driver {
     constructor(options) {
@@ -135,12 +136,24 @@ class Driver {
         return (_b = (_a = this._driverInfo) === null || _a === void 0 ? void 0 : _a.isMobile) !== null && _b !== void 0 ? _b : false;
     }
     get isIOS() {
-        var _a;
-        return ((_a = this.platformName) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'ios';
+        var _a, _b;
+        return (_b = (_a = this._driverInfo) === null || _a === void 0 ? void 0 : _a.isIOS) !== null && _b !== void 0 ? _b : /iOS/i.test(this.platformName);
     }
     get isAndroid() {
-        var _a;
-        return ((_a = this.platformName) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'android';
+        var _a, _b;
+        return (_b = (_a = this._driverInfo) === null || _a === void 0 ? void 0 : _a.isAndroid) !== null && _b !== void 0 ? _b : /Android/i.test(this.platformName);
+    }
+    get isMac() {
+        var _a, _b;
+        return (_b = (_a = this._driverInfo) === null || _a === void 0 ? void 0 : _a.isMac) !== null && _b !== void 0 ? _b : /mac\s?OS/i.test(this.platformName);
+    }
+    get isWindows() {
+        var _a, _b;
+        return (_b = (_a = this._driverInfo) === null || _a === void 0 ? void 0 : _a.isWindows) !== null && _b !== void 0 ? _b : /Windows/i.test(this.platformName);
+    }
+    get isChromium() {
+        var _a, _b;
+        return ((_b = (_a = this._driverInfo) === null || _a === void 0 ? void 0 : _a.isChromium) !== null && _b !== void 0 ? _b : (/(chrome)/i.test(this.browserName) || (/edge/i.test(this.browserName) && Number(this.browserVersion) > 44)));
     }
     get isIE() {
         return /(internet explorer|ie)/i.test(this.browserName);
@@ -152,8 +165,8 @@ class Driver {
         this._currentContext = context;
     }
     async init() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6;
-        var _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18;
+        var _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34;
         // NOTE: this is here because saucelabs does not provide right capabilities for the first call
         await ((_b = (_a = this._spec).getCapabilities) === null || _b === void 0 ? void 0 : _b.call(_a, this.target));
         const capabilities = await ((_d = (_c = this._spec).getCapabilities) === null || _d === void 0 ? void 0 : _d.call(_c, this.target));
@@ -168,34 +181,54 @@ class Driver {
             this._driverInfo.isWebView = !!(world === null || world === void 0 ? void 0 : world.isWebView);
         }
         if (this.isWeb) {
-            (_h = (_7 = this._driverInfo).pixelRatio) !== null && _h !== void 0 ? _h : (_7.pixelRatio = await this.execute(snippets.getPixelRatio));
-            (_j = (_8 = this._driverInfo).viewportScale) !== null && _j !== void 0 ? _j : (_8.viewportScale = await this.execute(snippets.getViewportScale));
-            (_k = (_9 = this._driverInfo).userAgent) !== null && _k !== void 0 ? _k : (_9.userAgent = await this.execute(snippets.getUserAgent));
+            const browserInfo = await this.currentContext.executePoll(snippets.getBrowserInfo);
+            (_h = (_19 = this._driverInfo).userAgent) !== null && _h !== void 0 ? _h : (_19.userAgent = browserInfo.userAgent);
+            (_j = (_20 = this._driverInfo).pixelRatio) !== null && _j !== void 0 ? _j : (_20.pixelRatio = browserInfo.pixelRatio);
+            (_k = (_21 = this._driverInfo).viewportScale) !== null && _k !== void 0 ? _k : (_21.viewportScale = browserInfo.viewportScale);
+            if (browserInfo.userAgentData) {
+                (_l = (_22 = this._driverInfo).isMobile) !== null && _l !== void 0 ? _l : (_22.isMobile = this._driverInfo.isMobile);
+                (_m = (_23 = this._driverInfo).isChromium) !== null && _m !== void 0 ? _m : (_23.isChromium = this._driverInfo.isChromium);
+                if (this.isChromium) {
+                    if (this.isWindows && Number.parseInt(this.browserVersion) >= 107) {
+                        this._driverInfo.platformVersion = (_o = browserInfo.platformVersion) !== null && _o !== void 0 ? _o : this._driverInfo.platformVersion;
+                    }
+                    else if (this.isMac && Number.parseInt(this.browserVersion) >= 90) {
+                        this._driverInfo.platformVersion = (_p = browserInfo.platformVersion) !== null && _p !== void 0 ? _p : this._driverInfo.platformVersion;
+                    }
+                }
+            }
             if (this._driverInfo.userAgent) {
                 const userAgentInfo = (0, user_agent_1.parseUserAgent)(this._driverInfo.userAgent);
-                this._driverInfo.browserName = (_l = userAgentInfo.browserName) !== null && _l !== void 0 ? _l : this._driverInfo.browserName;
-                this._driverInfo.browserVersion = (_m = userAgentInfo.browserVersion) !== null && _m !== void 0 ? _m : this._driverInfo.browserVersion;
+                const userAgentDataInfo = browserInfo.userAgentData && (0, user_agent_data_1.parseUserAgentData)(browserInfo.userAgentData);
+                this._driverInfo.browserName =
+                    (_r = (_q = userAgentInfo.browserName) !== null && _q !== void 0 ? _q : userAgentDataInfo.browserName) !== null && _r !== void 0 ? _r : this._driverInfo.browserName;
+                this._driverInfo.browserVersion =
+                    (_t = (_s = userAgentInfo.browserVersion) !== null && _s !== void 0 ? _s : userAgentDataInfo.browserVersion) !== null && _t !== void 0 ? _t : this._driverInfo.browserVersion;
+                (_u = (_24 = this._driverInfo).isMobile) !== null && _u !== void 0 ? _u : (_24.isMobile = userAgentDataInfo === null || userAgentDataInfo === void 0 ? void 0 : userAgentDataInfo.isMobile);
+                (_v = (_25 = this._driverInfo).isChromium) !== null && _v !== void 0 ? _v : (_25.isChromium = userAgentDataInfo === null || userAgentDataInfo === void 0 ? void 0 : userAgentDataInfo.isChromium);
                 if (this._driverInfo.isMobile) {
-                    (_o = (_10 = this._driverInfo).platformName) !== null && _o !== void 0 ? _o : (_10.platformName = userAgentInfo.platformName);
-                    (_p = (_11 = this._driverInfo).platformVersion) !== null && _p !== void 0 ? _p : (_11.platformVersion = userAgentInfo.platformVersion);
+                    (_w = (_26 = this._driverInfo).platformName) !== null && _w !== void 0 ? _w : (_26.platformName = (_x = userAgentDataInfo === null || userAgentDataInfo === void 0 ? void 0 : userAgentDataInfo.platformName) !== null && _x !== void 0 ? _x : userAgentInfo.platformName);
+                    (_y = (_27 = this._driverInfo).platformVersion) !== null && _y !== void 0 ? _y : (_27.platformVersion = (_z = userAgentDataInfo === null || userAgentDataInfo === void 0 ? void 0 : userAgentDataInfo.platformVersion) !== null && _z !== void 0 ? _z : userAgentInfo.platformVersion);
                 }
                 else {
-                    this._driverInfo.platformName = (_q = userAgentInfo.platformName) !== null && _q !== void 0 ? _q : this._driverInfo.platformName;
-                    this._driverInfo.platformVersion = (_r = userAgentInfo.platformVersion) !== null && _r !== void 0 ? _r : this._driverInfo.platformVersion;
+                    this._driverInfo.platformName =
+                        (_1 = (_0 = userAgentDataInfo === null || userAgentDataInfo === void 0 ? void 0 : userAgentDataInfo.platformName) !== null && _0 !== void 0 ? _0 : userAgentInfo.platformName) !== null && _1 !== void 0 ? _1 : this._driverInfo.platformName;
+                    this._driverInfo.platformVersion =
+                        (_3 = (_2 = userAgentDataInfo === null || userAgentDataInfo === void 0 ? void 0 : userAgentDataInfo.platformVersion) !== null && _2 !== void 0 ? _2 : userAgentInfo.platformVersion) !== null && _3 !== void 0 ? _3 : this._driverInfo.platformVersion;
                 }
             }
-            if (!this._driverInfo.isMobile && (this.isAndroid || this.isIOS)) {
+            if (!this.isMobile && (this.isAndroid || this.isIOS)) {
                 this._driverInfo.isMobile = true;
                 this._driverInfo.isEmulation = this._driverInfo.isChrome;
             }
-            (_s = (_12 = this._driverInfo).features) !== null && _s !== void 0 ? _s : (_12.features = {});
-            (_t = (_13 = this._driverInfo.features).allCookies) !== null && _t !== void 0 ? _t : (_13.allCookies = this._driverInfo.isChrome || (/chrome/i.test(this._driverInfo.browserName) && !this._driverInfo.isMobile));
+            (_4 = (_28 = this._driverInfo).features) !== null && _4 !== void 0 ? _4 : (_28.features = {});
+            (_5 = (_29 = this._driverInfo.features).allCookies) !== null && _5 !== void 0 ? _5 : (_29.allCookies = this._driverInfo.isChrome || (/chrome/i.test(this._driverInfo.browserName) && !this._driverInfo.isMobile));
         }
         else {
             // this value always excludes the height of the navigation bar, and sometimes it also excludes the height of the status bar
             let windowSize = await this._spec.getWindowSize(this.target);
-            (_u = (_14 = this._driverInfo).displaySize) !== null && _u !== void 0 ? _u : (_14.displaySize = windowSize);
-            if (((_v = this.orientation) === null || _v === void 0 ? void 0 : _v.startsWith('landscape')) &&
+            (_6 = (_30 = this._driverInfo).displaySize) !== null && _6 !== void 0 ? _6 : (_30.displaySize = windowSize);
+            if (((_7 = this.orientation) === null || _7 === void 0 ? void 0 : _7.startsWith('landscape')) &&
                 this._driverInfo.displaySize.height > this._driverInfo.displaySize.width) {
                 this._driverInfo.displaySize = {
                     width: this._driverInfo.displaySize.height,
@@ -204,14 +237,14 @@ class Driver {
             }
             if (this.isAndroid) {
                 // bar sizes could be extracted only on android
-                const systemBars = await ((_x = (_w = this._spec).getSystemBars) === null || _x === void 0 ? void 0 : _x.call(_w, this.target).catch(() => null));
+                const systemBars = await ((_9 = (_8 = this._spec).getSystemBars) === null || _9 === void 0 ? void 0 : _9.call(_8, this.target).catch(() => null));
                 const { statusBar, navigationBar } = systemBars !== null && systemBars !== void 0 ? systemBars : {};
                 if (statusBar === null || statusBar === void 0 ? void 0 : statusBar.visible) {
                     this._logger.log('Driver status bar', statusBar);
                     const statusBarSize = statusBar.height;
                     // when status bar is overlapping content on android it returns status bar height equal to display height
                     if (statusBarSize < this._driverInfo.displaySize.height) {
-                        this._driverInfo.statusBarSize = Math.max((_y = this._driverInfo.statusBarSize) !== null && _y !== void 0 ? _y : 0, statusBarSize);
+                        this._driverInfo.statusBarSize = Math.max((_10 = this._driverInfo.statusBarSize) !== null && _10 !== void 0 ? _10 : 0, statusBarSize);
                     }
                 }
                 if (navigationBar === null || navigationBar === void 0 ? void 0 : navigationBar.visible) {
@@ -220,28 +253,28 @@ class Driver {
                     if (navigationBar.x > 0)
                         this._driverInfo.orientation = 'landscape-secondary';
                     // navigation bar size could be its height or width depending on screen orientation
-                    const navigationBarSize = navigationBar[((_z = this.orientation) === null || _z === void 0 ? void 0 : _z.startsWith('landscape')) ? 'width' : 'height'];
+                    const navigationBarSize = navigationBar[((_11 = this.orientation) === null || _11 === void 0 ? void 0 : _11.startsWith('landscape')) ? 'width' : 'height'];
                     // when navigation bar is invisible on android it returns navigation bar size equal to display size
                     if (navigationBarSize <
-                        this._driverInfo.displaySize[((_0 = this.orientation) === null || _0 === void 0 ? void 0 : _0.startsWith('landscape')) ? 'width' : 'height']) {
-                        this._driverInfo.navigationBarSize = Math.max((_1 = this._driverInfo.navigationBarSize) !== null && _1 !== void 0 ? _1 : 0, navigationBarSize);
+                        this._driverInfo.displaySize[((_12 = this.orientation) === null || _12 === void 0 ? void 0 : _12.startsWith('landscape')) ? 'width' : 'height']) {
+                        this._driverInfo.navigationBarSize = Math.max((_13 = this._driverInfo.navigationBarSize) !== null && _13 !== void 0 ? _13 : 0, navigationBarSize);
                     }
                     else {
                         this._driverInfo.navigationBarSize = 0;
                     }
                 }
                 // bar sizes have to be scaled on android
-                (_15 = this._driverInfo).statusBarSize && (_15.statusBarSize = this._driverInfo.statusBarSize / this.pixelRatio);
-                (_16 = this._driverInfo).navigationBarSize && (_16.navigationBarSize = this._driverInfo.navigationBarSize / this.pixelRatio);
+                (_31 = this._driverInfo).statusBarSize && (_31.statusBarSize = this._driverInfo.statusBarSize / this.pixelRatio);
+                (_32 = this._driverInfo).navigationBarSize && (_32.navigationBarSize = this._driverInfo.navigationBarSize / this.pixelRatio);
                 windowSize = utils.geometry.scale(windowSize, 1 / this.pixelRatio);
-                (_17 = this._driverInfo).displaySize && (_17.displaySize = utils.geometry.scale(this._driverInfo.displaySize, 1 / this.pixelRatio));
+                (_33 = this._driverInfo).displaySize && (_33.displaySize = utils.geometry.scale(this._driverInfo.displaySize, 1 / this.pixelRatio));
             }
             if (this.isIOS) {
-                if ((_2 = this.orientation) === null || _2 === void 0 ? void 0 : _2.startsWith('landscape'))
+                if ((_14 = this.orientation) === null || _14 === void 0 ? void 0 : _14.startsWith('landscape'))
                     this._driverInfo.statusBarSize = 0;
             }
             // calculate viewport location
-            (_3 = (_18 = this._driverInfo).viewportLocation) !== null && _3 !== void 0 ? _3 : (_18.viewportLocation = {
+            (_15 = (_34 = this._driverInfo).viewportLocation) !== null && _15 !== void 0 ? _15 : (_34.viewportLocation = {
                 x: this.orientation === 'landscape' ? this.navigationBarSize : 0,
                 y: this.statusBarSize,
             });
@@ -250,7 +283,7 @@ class Driver {
                 this._driverInfo.viewportSize = { ...this._driverInfo.displaySize };
                 this._driverInfo.viewportSize.height -= this.statusBarSize;
                 if (this.isAndroid) {
-                    this._driverInfo.viewportSize[((_4 = this.orientation) === null || _4 === void 0 ? void 0 : _4.startsWith('landscape')) ? 'width' : 'height'] -=
+                    this._driverInfo.viewportSize[((_16 = this.orientation) === null || _16 === void 0 ? void 0 : _16.startsWith('landscape')) ? 'width' : 'height'] -=
                         this.navigationBarSize;
                 }
             }
@@ -273,12 +306,12 @@ class Driver {
             }
             // TODO: if user opts into NML, skip initializing the helpers
             // init helper lib
-            if (!((_5 = this._customConfig) === null || _5 === void 0 ? void 0 : _5.disableHelper)) {
+            if (!((_17 = this._customConfig) === null || _17 === void 0 ? void 0 : _17.disableHelper)) {
                 this._helper = this.isIOS
                     ? await helper_ios_1.HelperIOS.make({ spec: this._spec, driver: this, logger: this._logger })
                     : await helper_android_1.HelperAndroid.make({ spec: this._spec, driver: this, logger: this._logger });
             }
-            this._logger.log(`Helper set to ${(_6 = this._helper) === null || _6 === void 0 ? void 0 : _6.name}`);
+            this._logger.log(`Helper set to ${(_18 = this._helper) === null || _18 === void 0 ? void 0 : _18.name}`);
         }
         this._logger.log('Combined driver info', this._driverInfo);
         return this;

package/dist/fake/mock-driver.js

@@ -117,16 +117,17 @@ class MockDriver {
             }
             return { x: scrollingElement.scrollPosition.x, y: scrollingElement.scrollPosition.y };
         });
-        this.mockScript(snippets.getPixelRatio, () => {
-            return 1;
-        });
         this.mockScript(snippets.getShadowRoot, ([element]) => {
             return element;
         });
-        this.mockScript(snippets.getUserAgent, () => {
-            if (this._ua !== undefined)
-                return this._ua;
-            return this.info.isMobile ? DEFAULT_MOBILE_UA : DEFAULT_DESKTOP_UA;
+        this.mockScript(snippets.getBrowserInfo, () => {
+            return JSON.stringify({
+                status: 'SUCCESS',
+                value: {
+                    userAgent: this._ua !== undefined ? this._ua : this.info.isMobile ? DEFAULT_MOBILE_UA : DEFAULT_DESKTOP_UA,
+                    pixelRatio: 1,
+                },
+            });
         });
         this.mockScript(snippets.getViewportSize, () => {
             return { width: this._window.rect.width, height: this._window.rect.height };

package/dist/spec-utils.js

@@ -34,7 +34,7 @@ exports.isSimpleCommonSelector = isSimpleCommonSelector;
 function isCommonSelector(spec, selector) {
     return (utils.types.isPlainObject(selector) &&
         utils.types.has(selector, 'selector') &&
-        Object.keys(selector).every(key => ['selector', 'type', 'frame', 'shadow'].includes(key)) &&
+        Object.keys(selector).every(key => ['selector', 'type', 'frame', 'shadow', 'child', 'fallback'].includes(key)) &&
         (utils.types.isString(selector.selector) || spec.isSelector(selector.selector)));
 }
 exports.isCommonSelector = isCommonSelector;
@@ -67,7 +67,11 @@ function splitSelector(spec, selector) {
             activeSelector.selector = targetSelector.selector;
             if (targetSelector.type)
                 activeSelector.type = targetSelector.type;
-            if (targetSelector.shadow) {
+            if (targetSelector.child) {
+                activeSelector = activeSelector.child = {};
+                targetSelector = targetSelector.child;
+            }
+            else if (targetSelector.shadow) {
                 activeSelector = activeSelector.shadow = {};
                 targetSelector = targetSelector.shadow;
             }

package/dist/user-agent-data.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseUserAgentData = void 0;
+const WINDOWS_VERSIONS = {
+    '0.1.0': '7',
+    '0.2.0': '8',
+    '0.3.0': '8.1',
+    '10.0.0': '10',
+    '15.0.0': '11',
+};
+function parseUserAgentData(userAgentData) {
+    var _a, _b, _c;
+    const chromiumBrand = (_a = userAgentData.brands) === null || _a === void 0 ? void 0 : _a.find(brand => /Chromium/i.test(brand.brand));
+    const browserBrand = (_c = (_b = userAgentData.brands) === null || _b === void 0 ? void 0 : _b.find(brand => brand !== chromiumBrand && !/Not.?A.?Brand/i.test(brand.brand))) !== null && _c !== void 0 ? _c : chromiumBrand;
+    const info = {
+        browserName: browserBrand === null || browserBrand === void 0 ? void 0 : browserBrand.brand,
+        browserVersion: browserBrand === null || browserBrand === void 0 ? void 0 : browserBrand.version,
+        platformName: userAgentData.platform || undefined,
+        platformVersion: userAgentData.platformVersion || undefined,
+        deviceName: userAgentData.model || undefined,
+        isMobile: userAgentData.mobile,
+        isChromium: Boolean(chromiumBrand),
+    };
+    if (info.platformName === 'Windows') {
+        info.platformVersion = WINDOWS_VERSIONS[info.platformVersion];
+    }
+    else if (info.platformName === 'macOS') {
+        info.platformName = 'Mac OS X';
+        info.platformVersion = info.platformVersion.split(/[._]/, 2).join('.');
+    }
+    return info;
+}
+exports.parseUserAgentData = parseUserAgentData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/driver",
-  "version": "1.11.2",
+  "version": "1.11.4",
   "description": "Applitools universal framework wrapper",
   "keywords": [
     "applitools",
@@ -87,9 +87,9 @@
     }
   },
   "dependencies": {
-    "@applitools/logger": "1.1.28",
-    "@applitools/snippets": "2.4.6",
-    "@applitools/utils": "1.3.14",
+    "@applitools/logger": "1.1.29",
+    "@applitools/snippets": "2.4.7",
+    "@applitools/utils": "1.3.15",
     "semver": "7.3.7"
   },
   "devDependencies": {

package/types/context.d.ts

@@ -47,19 +47,24 @@ export declare class Context<TDriver, TContext, TElement, TSelector> {
     get isCurrent(): boolean;
     get isInitialized(): boolean;
     get isRef(): boolean;
+    private _findElements;
     init(): Promise<this>;
     focus(): Promise<this>;
     equals(context: Context<TDriver, TContext, TElement, TSelector> | Element<TDriver, TContext, TElement, TSelector>): Promise<boolean>;
     context(reference: ContextPlain<TDriver, TContext, TElement, TSelector>): Promise<Context<TDriver, TContext, TElement, TSelector>>;
-    root(selector: Selector<TSelector>): Promise<{
-        context: Context<TDriver, TContext, TElement, TSelector>;
-        shadow?: Element<TDriver, TContext, TElement, TSelector>;
-        selector: Selector<TSelector>;
-    }>;
     element(elementOrSelector: TElement | Selector<TSelector>): Promise<Element<TDriver, TContext, TElement, TSelector>>;
     elements(selectorOrElement: Selector<TSelector> | TElement): Promise<Element<TDriver, TContext, TElement, TSelector>[]>;
     waitFor(selector: Selector<TSelector>, options?: WaitOptions): Promise<Element<TDriver, TContext, TElement, TSelector>>;
     execute(script: ((args: any) => any) | string, arg?: any): Promise<any>;
+    executePoll(script: ((arg: any) => any) | string | {
+        main: ((arg: any) => any) | string;
+        poll: ((arg: any) => any) | string;
+    }, arg?: any | {
+        main: any;
+        poll: any;
+        executionTimeout?: number;
+        pollTimeout?: number;
+    }): Promise<any>;
     getContextElement(): Promise<Element<TDriver, TContext, TElement, TSelector>>;
     getScrollingElement(): Promise<Element<TDriver, TContext, TElement, TSelector>>;
     setScrollingElement(scrollingElement: Element<TDriver, TContext, TElement, TSelector> | TElement | Selector<TSelector>): Promise<void>;

package/types/driver.d.ts

@@ -55,6 +55,9 @@ export declare class Driver<TDriver, TContext, TElement, TSelector> {
     get isMobile(): boolean;
     get isIOS(): boolean;
     get isAndroid(): boolean;
+    get isMac(): boolean;
+    get isWindows(): boolean;
+    get isChromium(): boolean;
     get isIE(): boolean;
     get isEdgeLegacy(): boolean;
     updateCurrentContext(context: Context<TDriver, TContext, TElement, TSelector>): void;

package/types/selector.d.ts

@@ -1,7 +1,9 @@
 export declare type Selector<TSelector = never> = TSelector | string | {
     selector: TSelector | string;
     type?: string;
+    child?: Selector<TSelector>;
     shadow?: Selector<TSelector>;
     frame?: Selector<TSelector>;
+    fallback?: Selector<TSelector>;
 };
 export declare type CommonSelector = Selector;

package/types/spec-driver.d.ts

@@ -21,11 +21,14 @@ export declare type DriverInfo = {
     navigationBarSize?: number;
     isW3C?: boolean;
     isChrome?: boolean;
+    isChromium?: boolean;
     isEmulation?: boolean;
     isMobile?: boolean;
     isNative?: boolean;
     isAndroid?: boolean;
     isIOS?: boolean;
+    isMac?: boolean;
+    isWindows?: boolean;
     isWebView?: boolean;
     features?: {
         shadowSelector?: boolean;

package/types/spec-utils.d.ts

@@ -1,11 +1,6 @@
 import { type SpecDriver } from './spec-driver';
 import { type Selector } from './selector';
-declare type CommonSelector<TSelector = never> = {
-    selector: TSelector | string;
-    type?: string;
-    shadow?: CommonSelector<TSelector> | TSelector | string;
-    frame?: CommonSelector<TSelector> | TSelector | string;
-};
+declare type CommonSelector<TSelector = never> = Exclude<Selector<TSelector>, TSelector | string>;
 export declare function isSimpleCommonSelector(selector: any): selector is CommonSelector;
 export declare function isCommonSelector<TSelector>(spec: Pick<SpecDriver<unknown, unknown, unknown, TSelector>, 'isSelector'>, selector: any): selector is CommonSelector<TSelector>;
 export declare function isSelector<TSelector>(spec: Pick<SpecDriver<unknown, unknown, unknown, TSelector>, 'isSelector'>, selector: any): selector is Selector<TSelector>;

package/types/user-agent-data.d.ts

@@ -0,0 +1,13 @@
+import { type DriverInfo } from './spec-driver';
+declare type UserAgentData = {
+    brands: {
+        brand: string;
+        version: string;
+    }[];
+    platform: string;
+    platformVersion?: string;
+    model?: string;
+    mobile?: boolean;
+};
+export declare function parseUserAgentData(userAgentData: UserAgentData): DriverInfo;
+export {};