@applitools/eyes-selenium 4.56.0 → 4.56.4

package/CHANGELOG.md

@@ -3,6 +3,36 @@
 ## Unreleased
 
 
+## 4.56.4 - 2021/10/12
+
+- move spec driver implementation to the separate package
+- updated to @applitools/eyes-api@1.1.4 (from 1.1.3)
+- updated to @applitools/eyes-sdk-core@12.23.15 (from 12.23.14)
+- updated to @applitools/spec-driver-selenium@1.0.2 (from 1.0.1)
+- updated to @applitools/visual-grid-client@15.8.34 (from 15.8.33)
+- updated to @applitools/spec-driver-selenium@1.1.0 (from 1.0.2)
+
+## 4.56.3 - 2021/10/7
+
+- updated to @applitools/eyes-api@1.1.3 (from 1.1.1)
+- updated to @applitools/eyes-sdk-core@12.23.14 (from 12.23.6)
+- updated to @applitools/visual-grid-client@15.8.33 (from 15.8.26)
+
+## 4.56.2 - 2021/9/13
+
+- updated to @applitools/eyes-sdk-core@12.23.0 (from 12.22.6)
+- updated to @applitools/visual-grid-client@15.8.21 (from 15.8.20)
+- updated to @applitools/eyes-api@1.1.1 (from 1.0.12)
+- updated to @applitools/eyes-sdk-core@12.23.6 (from 12.23.0)
+- updated to @applitools/utils@1.2.3 (from 1.2.2)
+- updated to @applitools/visual-grid-client@15.8.26 (from 15.8.21)
+
+## 4.56.1 - 2021/8/13
+
+- updated to @applitools/eyes-api@1.0.12 (from 1.0.11)
+- updated to @applitools/eyes-sdk-core@12.22.6 (from 12.22.4)
+- updated to @applitools/visual-grid-client@15.8.20 (from 15.8.18)
+
 ## 4.56.0 - 2021/8/9
 
 - updated to @applitools/eyes-api@1.0.11 (from 1.0.7)

package/dist/api.js

@@ -6,15 +6,27 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     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;
+};
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BatchClose = exports.Target = exports.CheckSettings = exports.Configuration = exports.Eyes = void 0;
 const eyes_sdk_core_1 = require("@applitools/eyes-sdk-core");
-const api = require("@applitools/eyes-api");
-const spec = require("./spec-driver");
-const sdk = eyes_sdk_core_1.makeSDK({
+const api = __importStar(require("@applitools/eyes-api"));
+const spec = __importStar(require("@applitools/spec-driver-selenium"));
+const sdk = (0, eyes_sdk_core_1.makeSDK)({
     name: 'eyes.selenium',
     version: `${require('../package.json').version}--${process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION}`,
     spec,
@@ -38,4 +50,3 @@ class BatchClose extends api.BatchClose {
 }
 exports.BatchClose = BatchClose;
 BatchClose._spec = sdk;
-//# sourceMappingURL=api.js.map

package/dist/index.js

@@ -10,10 +10,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-if (!process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION) {
-    const { version } = require('selenium-webdriver/package.json');
-    const [major] = version.split('.', 1);
-    process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION = major;
-}
 __exportStar(require("./api"), exports);
-//# sourceMappingURL=index.js.map

package/dist/spec-driver.js

@@ -1,323 +1,13 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.wrapDriver = exports.build = exports.performAction = exports.getElementText = exports.getElementAttribute = exports.getElementRegion = exports.getOrientation = exports.waitUntilDisplayed = exports.scrollIntoView = exports.type = exports.hover = exports.click = exports.takeScreenshot = exports.visit = exports.getUrl = exports.getTitle = exports.getDriverInfo = exports.setWindowSize = exports.getWindowSize = exports.findElements = exports.findElement = exports.childContext = exports.parentContext = exports.mainContext = exports.executeScript = exports.isEqualElements = exports.isStaleElementError = exports.transformDriver = exports.isSelector = exports.isElement = exports.isDriver = void 0;
-const utils = require("@applitools/utils");
-const legacy = require("./legacy");
-const byHash = ['className', 'css', 'id', 'js', 'linkText', 'name', 'partialLinkText', 'tagName', 'xpath'];
-function extractElementId(element) {
-    return element.getId();
-}
-function transformSelector(selector) {
-    if (utils.types.isString(selector)) {
-        return { css: selector };
-    }
-    else if (utils.types.has(selector, ['type', 'selector'])) {
-        if (selector.type === 'css')
-            return { css: selector.selector };
-        else if (selector.type === 'xpath')
-            return { xpath: selector.selector };
-        else
-            return { using: selector.type, value: selector.selector };
-    }
-    return selector;
-}
-function isDriver(driver) {
-    return utils.types.instanceOf(driver, 'WebDriver');
-}
-exports.isDriver = isDriver;
-function isElement(element) {
-    return utils.types.instanceOf(element, 'WebElement');
-}
-exports.isElement = isElement;
-function isSelector(selector) {
-    if (!selector)
-        return false;
-    return (utils.types.has(selector, ['type', 'selector']) ||
-        utils.types.has(selector, ['using', 'value']) ||
-        Object.keys(selector).some(key => byHash.includes(key)) ||
-        utils.types.isString(selector));
-}
-exports.isSelector = isSelector;
-function transformDriver(driver) {
-    driver.getExecutor().defineCommand('getSessionDetails', 'GET', '/session/:sessionId');
-    driver.getExecutor().defineCommand('getOrientation', 'GET', '/session/:sessionId/orientation');
-    driver.getExecutor().defineCommand('performTouch', 'POST', '/session/:sessionId/touch/perform');
-    if (process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3') {
-        driver.getExecutor().defineCommand('switchToParentFrame', 'POST', '/session/:sessionId/frame/parent');
-    }
-    return driver;
-}
-exports.transformDriver = transformDriver;
-function isStaleElementError(error) {
-    if (!error)
-        return false;
-    error = error.originalError || error;
-    return error instanceof Error && error.name === 'StaleElementReferenceError';
-}
-exports.isStaleElementError = isStaleElementError;
-async function isEqualElements(_driver, element1, element2) {
-    if (!element1 || !element2)
-        return false;
-    const elementId1 = await extractElementId(element1);
-    const elementId2 = await extractElementId(element2);
-    return elementId1 === elementId2;
-}
-exports.isEqualElements = isEqualElements;
-async function executeScript(driver, script, arg) {
-    return driver.executeScript(script, arg);
-}
-exports.executeScript = executeScript;
-async function mainContext(driver) {
-    await driver.switchTo().defaultContent();
-    return driver;
-}
-exports.mainContext = mainContext;
-async function parentContext(driver) {
-    if (process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3') {
-        const { Command } = require('selenium-webdriver/lib/command');
-        await driver.schedule(new Command('switchToParentFrame'));
-        return driver;
-    }
-    await driver.switchTo().parentFrame();
-    return driver;
-}
-exports.parentContext = parentContext;
-async function childContext(driver, element) {
-    await driver.switchTo().frame(element);
-    return driver;
-}
-exports.childContext = childContext;
-async function findElement(driver, selector) {
-    try {
-        return await driver.findElement(transformSelector(selector));
-    }
-    catch (err) {
-        if (err.name === 'NoSuchElementError')
-            return null;
-        else
-            throw err;
-    }
-}
-exports.findElement = findElement;
-async function findElements(driver, selector) {
-    return driver.findElements(transformSelector(selector));
-}
-exports.findElements = findElements;
-async function getWindowSize(driver) {
-    try {
-        const window = driver.manage().window();
-        if (utils.types.isFunction(window.getSize)) {
-            return await window.getSize();
-        }
-        else if (utils.types.isFunction(window.getRect)) {
-            const rect = await window.getRect();
-            return { width: rect.width, height: rect.height };
-        }
-    }
-    catch (err) {
-        const cmd = require('selenium-webdriver/lib/command');
-        return driver.execute(new cmd.Command(cmd.Name.GET_WINDOW_SIZE).setParameter('windowHandle', 'current'));
-    }
-}
-exports.getWindowSize = getWindowSize;
-async function setWindowSize(driver, size) {
-    const window = driver.manage().window();
-    if (utils.types.isFunction(window.setRect)) {
-        await window.setRect({ x: 0, y: 0, width: size.width, height: size.height });
-    }
-    else {
-        await window.setPosition(0, 0);
-        await window.setSize(size.width, size.height);
-    }
-}
-exports.setWindowSize = setWindowSize;
-async function getDriverInfo(driver) {
-    var _a, _b, _c, _d, _e, _f;
-    const session = await driver.getSession();
-    const capabilities = await driver.getCapabilities();
-    const desiredCapabilities = (_a = capabilities.get('desired')) !== null && _a !== void 0 ? _a : {};
-    const platformName = (_c = (_b = capabilities.get('platformName')) !== null && _b !== void 0 ? _b : capabilities.get('platform')) !== null && _c !== void 0 ? _c : desiredCapabilities.platformName;
-    const isMobile = ['android', 'ios'].includes(platformName === null || platformName === void 0 ? void 0 : platformName.toLowerCase());
-    const info = {
-        sessionId: session.getId(),
-        isMobile,
-        isNative: isMobile && !capabilities.get('browserName'),
-        deviceName: (_d = desiredCapabilities.deviceName) !== null && _d !== void 0 ? _d : capabilities.get('deviceName'),
-        platformName,
-        platformVersion: capabilities.get('platformVersion'),
-        browserName: (_e = capabilities.get('browserName')) !== null && _e !== void 0 ? _e : desiredCapabilities.browserName,
-        browserVersion: (_f = capabilities.get('browserVersion')) !== null && _f !== void 0 ? _f : capabilities.get('version'),
-    };
-    if (info.isNative) {
-        let details;
-        if (capabilities.has('viewportRect') && capabilities.has('pixelRatio')) {
-            details = { viewportRect: capabilities.get('viewportRect'), pixelRatio: capabilities.get('pixelRatio') };
-        }
-        else {
-            const { Command } = require('selenium-webdriver/lib/command');
-            const getSessionDetailsCommand = new Command('getSessionDetails');
-            details =
-                process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3'
-                    ? await driver.schedule(getSessionDetailsCommand)
-                    : await driver.execute(getSessionDetailsCommand);
-        }
-        info.pixelRatio = details.pixelRatio;
-        if (details.viewportRect) {
-            info.viewportRegion = {
-                x: details.viewportRect.left,
-                y: details.viewportRect.top,
-                width: details.viewportRect.width,
-                height: details.viewportRect.height,
-            };
-        }
-    }
-    return info;
-}
-exports.getDriverInfo = getDriverInfo;
-async function getTitle(driver) {
-    return driver.getTitle();
-}
-exports.getTitle = getTitle;
-async function getUrl(driver) {
-    return driver.getCurrentUrl();
-}
-exports.getUrl = getUrl;
-async function visit(driver, url) {
-    await driver.get(url);
-}
-exports.visit = visit;
-async function takeScreenshot(driver) {
-    return driver.takeScreenshot();
-}
-exports.takeScreenshot = takeScreenshot;
-async function click(driver, element) {
-    if (isSelector(element))
-        element = await findElement(driver, element);
-    await element.click();
-}
-exports.click = click;
-async function hover(driver, element) {
-    if (isSelector(element))
-        element = await findElement(driver, element);
-    if (process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3') {
-        const { ActionSequence } = require('selenium-webdriver');
-        const action = new ActionSequence(driver);
-        await action.mouseMove(element).perform();
-    }
-    else {
-        await driver.actions().move({ origin: element }).perform();
-    }
-}
-exports.hover = hover;
-async function type(driver, element, keys) {
-    if (isSelector(element))
-        element = await findElement(driver, element);
-    await element.sendKeys(keys);
-}
-exports.type = type;
-async function scrollIntoView(driver, element, align = false) {
-    if (isSelector(element))
-        element = await findElement(driver, element);
-    await driver.executeScript('arguments[0].scrollIntoView(arguments[1])', element, align);
-}
-exports.scrollIntoView = scrollIntoView;
-async function waitUntilDisplayed(driver, selector, timeout) {
-    const { until } = require('selenium-webdriver');
-    const element = await findElement(driver, selector);
-    await driver.wait(until.elementIsVisible(element), timeout);
-}
-exports.waitUntilDisplayed = waitUntilDisplayed;
-async function getOrientation(driver) {
-    const { Command } = require('selenium-webdriver/lib/command');
-    const getOrientationCommand = new Command('getOrientation');
-    const orientation = process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3'
-        ? await driver.schedule(getOrientationCommand)
-        : await driver.execute(getOrientationCommand);
-    return orientation.toLowerCase();
-}
-exports.getOrientation = getOrientation;
-async function getElementRegion(_driver, element) {
-    return element.getRect();
-}
-exports.getElementRegion = getElementRegion;
-async function getElementAttribute(_driver, element, attr) {
-    return element.getAttribute(attr);
-}
-exports.getElementAttribute = getElementAttribute;
-async function getElementText(_driver, element) {
-    return element.getText();
-}
-exports.getElementText = getElementText;
-async function performAction(driver, steps) {
-    const { Command } = require('selenium-webdriver/lib/command');
-    const performTouchCommand = new Command('performTouch').setParameters({
-        actions: steps.map((_a) => {
-            var { action } = _a, options = __rest(_a, ["action"]);
-            return ({ action, options });
-        }),
-    });
-    if (process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3') {
-        await driver.schedule(performTouchCommand);
-    }
-    else {
-        await driver.execute(performTouchCommand);
-    }
-}
-exports.performAction = performAction;
-const browserOptionsNames = {
-    chrome: 'goog:chromeOptions',
-    firefox: 'moz:firefoxOptions',
-};
-async function build(env) {
-    var _a;
-    const { Builder } = require('selenium-webdriver');
-    const parseEnv = require('@applitools/test-utils/src/parse-env');
-    const { browser, capabilities, url, attach, proxy, configurable = true, appium = false, args = [], headless, } = parseEnv(Object.assign(Object.assign({}, env), { legacy: (_a = env.legacy) !== null && _a !== void 0 ? _a : process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3' }));
-    const desiredCapabilities = Object.assign({}, capabilities);
-    if (configurable) {
-        const browserOptionsName = browserOptionsNames[browser || desiredCapabilities.browserName];
-        if (browserOptionsName) {
-            const browserOptions = desiredCapabilities[browserOptionsName] || {};
-            browserOptions.args = [...(browserOptions.args || []), ...args];
-            if (headless)
-                browserOptions.args.push('headless');
-            if (attach) {
-                browserOptions.debuggerAddress = attach === true ? 'localhost:9222' : attach;
-                if (browser !== 'firefox')
-                    browserOptions.w3c = false;
-            }
-            desiredCapabilities[browserOptionsName] = browserOptions;
-        }
-    }
-    if (appium && browser === 'chrome') {
-        desiredCapabilities['appium:chromeOptions'] = { w3c: false };
-    }
-    const builder = new Builder().withCapabilities(desiredCapabilities);
-    if (url && !attach)
-        builder.usingServer(url.href);
-    if (proxy) {
-        builder.setProxy({
-            proxyType: 'manual',
-            httpProxy: proxy.http || proxy.server,
-            sslProxy: proxy.https || proxy.server,
-            ftpProxy: proxy.ftp,
-            noProxy: proxy.bypass,
-        });
-    }
-    const driver = await builder.build();
-    return [driver, () => driver.quit()];
-}
-exports.build = build;
-exports.wrapDriver = legacy.wrapDriver;
-//# sourceMappingURL=spec-driver.js.map
+__exportStar(require("@applitools/spec-driver-selenium"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/eyes-selenium",
-  "version": "4.56.0",
+  "version": "4.56.4",
   "description": "Applitools Eyes SDK for Selenium WebDriver",
   "keywords": [
     "eyes-selenium",
@@ -42,21 +42,19 @@
     "types"
   ],
   "scripts": {
-    "lint": "eslint '**/*.ts' '**/*.js'",
+    "lint": "eslint '**/*.ts'",
     "build": "yarn build:dist && yarn build:types",
-    "doc": "typedoc ./types/index.d.ts --theme minimal --tsconfig ./tsconfig.doc.json",
     "build:dist": "tsc",
     "build:types": "api-extractor ./src/index.ts --out ./types/index.d.ts --external-modules selenium-webdriver",
     "generate:tests": "coverage-tests generate https://raw.githubusercontent.com/applitools/sdk.coverage.tests/master/js/config.js --name 'eyes-selenium'",
-    "test": "yarn build:dist && yarn test:it && yarn test:coverage",
-    "test:it": "mocha --no-timeouts './test/it/**/*.spec.js'",
+    "test": "yarn test:coverage",
     "test:coverage": "yarn generate:tests && APPLITOOLS_BATCH_NAME='JS Coverage Tests: eyes-selenium' APPLITOOLS_BATCH_ID=$(uuidgen) XUNIT_FILE=coverage-test-report.xml mocha --config .mocharc.cvg.js",
     "report": "coverage-tests report https://raw.githubusercontent.com/applitools/sdk.coverage.tests/master/js/config.js --name 'eyes-selenium'",
     "setup": "yarn docker:setup",
     "docker:setup": "node ../scripts/scripts/generate-docker-compose-config.js && docker-compose up -d",
     "docker:teardown": "docker-compose down",
     "deps": "bongo deps",
-    "gh:test": "gh workflow run test.yml --ref $(git rev-parse --abbrev-ref HEAD) -f packages='selenium selenium@3' -f links='eyes-sdk-core eyes-api types test-utils utils driver screenshoter sdk-shared visual-grid-client' -f linking-depth=2",
+    "gh:test": "gh workflow run test.yml --ref $(git rev-parse --abbrev-ref HEAD) -f packages='selenium selenium@3' -f links='types test-utils sdk-shared eyes-sdk-core visual-grid-client eyes-api spec-driver-selenium utils driver snippets screenshoter' -f linking-depth=3",
     "gh:publish": "gh workflow run publish.yml --ref $(git rev-parse --abbrev-ref HEAD) -f packages='selenium'",
     "preversion": "bongo preversion && yarn build",
     "version": "bongo version",
@@ -68,23 +66,21 @@
     }
   },
   "dependencies": {
-    "@applitools/eyes-api": "1.0.11",
-    "@applitools/eyes-sdk-core": "12.22.4",
-    "@applitools/utils": "1.2.2",
-    "@applitools/visual-grid-client": "15.8.18"
+    "@applitools/eyes-api": "1.1.4",
+    "@applitools/eyes-sdk-core": "12.23.15",
+    "@applitools/spec-driver-selenium": "1.1.0",
+    "@applitools/visual-grid-client": "15.8.34"
   },
   "devDependencies": {
     "@applitools/api-extractor": "1.1.3",
     "@applitools/scripts": "1.0.1",
-    "@applitools/sdk-coverage-tests": "2.3.14",
-    "@applitools/sdk-release-kit": "0.13.0",
-    "@applitools/sdk-shared": "0.9.5",
-    "@applitools/test-utils": "1.0.7",
+    "@applitools/sdk-coverage-tests": "2.3.15",
+    "@applitools/sdk-release-kit": "0.13.3",
+    "@applitools/sdk-shared": "0.9.6",
+    "@applitools/test-utils": "1.0.9",
     "@types/selenium-webdriver": "^4.0.11",
     "@typescript-eslint/eslint-plugin": "^4.15.1",
     "@typescript-eslint/parser": "^4.15.1",
-    "chai": "^4.2.0",
-    "chai-as-promised": "^7.1.1",
     "chromedriver": "^87.0.4",
     "eslint": "^7.9.0",
     "eslint-config-prettier": "^7.2.0",
@@ -92,10 +88,9 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.3.1",
     "husky": "^4.3.8",
-    "mocha": "^8.0.1",
-    "ncp": "^2.0.0",
+    "mocha": "^9.1.2",
     "prettier": "^2.1.2",
-    "selenium-webdriver": "^4.0.0-beta.4",
+    "selenium-webdriver": "^4.0.0-rc-2",
     "spec-xunit-file": "0.0.1-3",
     "typescript": "^4.1.3"
   },

package/types/index.d.ts

@@ -61,6 +61,7 @@ export enum DeviceName {
   Galaxy_Note_9 = 'Galaxy Note 9',
   Galaxy_S10 = 'Galaxy S10',
   Galaxy_S10_Plus = 'Galaxy S10 Plus',
+  Galaxy_S20 = 'Galaxy S20',
   Galaxy_S3 = 'Galaxy S3',
   Galaxy_S5 = 'Galaxy S5',
   Galaxy_S8 = 'Galaxy S8',
@@ -92,6 +93,7 @@ export enum DeviceName {
   Pixel_3_XL = 'Pixel 3 XL',
   Pixel_4 = 'Pixel 4',
   Pixel_4_XL = 'Pixel 4 XL',
+  Pixel_5 = 'Pixel 5',
   iPad = 'iPad',
   iPad_6th_Gen = 'iPad 6th Gen',
   iPad_7th_Gen = 'iPad 7th Gen',
@@ -123,6 +125,10 @@ export enum IosDeviceName {
   iPhone_11 = 'iPhone 11',
   iPhone_11_Pro = 'iPhone 11 Pro',
   iPhone_11_Pro_Max = 'iPhone 11 Pro Max',
+  iPhone_12 = 'iPhone 12',
+  iPhone_12_Pro = 'iPhone 12 Pro',
+  iPhone_12_Pro_Max = 'iPhone 12 Pro Max',
+  iPhone_12_mini = 'iPhone 12 mini',
   iPhone_7 = 'iPhone 7',
   iPhone_8 = 'iPhone 8',
   iPhone_X = 'iPhone X',
@@ -192,7 +198,7 @@ export class AccessibilityMatchSettings implements Required<AccessibilityMatchSe
   setLeft(left: number): void;
   setRegion(region: RegionPlain): void;
   setTop(top: number): void;
-  setType(type: AccessibilityRegionType): void;
+  setType(type: AccessibilityRegionTypePlain): void;
   setWidth(width: number): void;
 }
 
@@ -279,31 +285,40 @@ export class BatchInfo implements Required<BatchInfoPlain> {
 
 export class CheckSettings {
   constructor(settings?: CheckSettingsPlain);
-  accessibilityRegion(region: {region: RegionPlain | Element | Selector; type?: AccessibilityRegionTypePlain}): this;
-  accessibilityRegion(region: RegionPlain, type?: AccessibilityRegionType): this;
-  accessibilityRegion(region: Element, type?: AccessibilityRegionType): this;
-  accessibilityRegion(region: Selector, type?: AccessibilityRegionType): this;
+  accessibilityRegion(region: {
+    region: RegionPlain | Element | EyesSelector<Selector>;
+    type?: AccessibilityRegionTypePlain;
+  }): this;
+  accessibilityRegion(region: RegionPlain, type?: AccessibilityRegionTypePlain): this;
+  accessibilityRegion(region: Element, type?: AccessibilityRegionTypePlain): this;
+  accessibilityRegion(region: EyesSelector<Selector>, type?: AccessibilityRegionTypePlain): this;
+  accessibilityRegion(region: LegacyRegionPlain, type?: AccessibilityRegionTypePlain): this;
   accessibilityRegions(
     ...regions: (
-      | {region: RegionPlain | Element | Selector; type?: AccessibilityRegionTypePlain}
+      | {region: RegionPlain | Element | EyesSelector<Selector>; type?: AccessibilityRegionTypePlain}
       | RegionPlain
       | Element
-      | Selector
+      | EyesSelector<Selector>
+      | LegacyRegionPlain
     )[]
   ): this;
-  accessibilityRegions(type: AccessibilityRegionType, ...regions: (RegionPlain | Element | Selector)[]): this;
+  accessibilityRegions(
+    type: AccessibilityRegionTypePlain,
+    ...regions: (RegionPlain | Element | EyesSelector<Selector> | LegacyRegionPlain)[]
+  ): this;
   beforeRenderScreenshotHook(script: string): this;
   content(): this;
   contentRegion(region: RegionPlain): this;
   contentRegion(region: Element): this;
-  contentRegion(region: Selector): this;
-  contentRegions(...regions: (RegionPlain | Element | Selector)[]): this;
+  contentRegion(region: EyesSelector<Selector>): this;
+  contentRegion(region: LegacyRegionPlain): this;
+  contentRegions(...regions: (RegionPlain | Element | EyesSelector<Selector> | LegacyRegionPlain)[]): this;
   disableBrowserFetching(disableBrowserFetching: boolean): this;
   enablePatterns(enablePatterns?: boolean): this;
   exact(): this;
   /** @deprecated */
   floating(region: {
-    region: RegionPlain | Element | Selector;
+    region: RegionPlain | Element | EyesSelector<Selector>;
     maxUpOffset?: number;
     maxDownOffset?: number;
     maxLeftOffset?: number;
@@ -314,9 +329,11 @@ export class CheckSettings {
   /** @deprecated */
   floating(region: Element): this;
   /** @deprecated */
-  floating(region: Selector): this;
+  floating(region: EyesSelector<Selector>): this;
+  /** @deprecated */
+  floating(region: LegacyRegionPlain): this;
   floatingRegion(region: {
-    region: RegionPlain | Element | Selector;
+    region: RegionPlain | Element | EyesSelector<Selector>;
     maxUpOffset?: number;
     maxDownOffset?: number;
     maxLeftOffset?: number;
@@ -337,7 +354,14 @@ export class CheckSettings {
     maxRightOffset?: number,
   ): this;
   floatingRegion(
-    region: Selector,
+    region: EyesSelector<Selector>,
+    maxUpOffset?: number,
+    maxDownOffset?: number,
+    maxLeftOffset?: number,
+    maxRightOffset?: number,
+  ): this;
+  floatingRegion(
+    region: LegacyRegionPlain,
     maxUpOffset?: number,
     maxDownOffset?: number,
     maxLeftOffset?: number,
@@ -346,7 +370,7 @@ export class CheckSettings {
   floatingRegions(
     ...regions: (
       | {
-          region: RegionPlain | Element | Selector;
+          region: RegionPlain | Element | EyesSelector<Selector>;
           maxUpOffset?: number;
           maxDownOffset?: number;
           maxLeftOffset?: number;
@@ -354,15 +378,19 @@ export class CheckSettings {
         }
       | RegionPlain
       | Element
-      | Selector
+      | EyesSelector<Selector>
+      | LegacyRegionPlain
     )[]
   ): this;
-  floatingRegions(maxOffset: number, ...regions: (RegionPlain | Element | Selector)[]): this;
+  floatingRegions(
+    maxOffset: number,
+    ...regions: (RegionPlain | Element | EyesSelector<Selector> | LegacyRegionPlain)[]
+  ): this;
   /** @deprecated */
   floatings(
     ...regions: (
       | {
-          region: RegionPlain | Element | Selector;
+          region: RegionPlain | Element | EyesSelector<Selector>;
           maxUpOffset?: number;
           maxDownOffset?: number;
           maxLeftOffset?: number;
@@ -370,65 +398,80 @@ export class CheckSettings {
         }
       | RegionPlain
       | Element
-      | Selector
+      | EyesSelector<Selector>
+      | LegacyRegionPlain
     )[]
   ): this;
   /** @deprecated */
-  floatings(maxOffset: number, ...regions: (RegionPlain | Element | Selector)[]): this;
-  frame(context: {frame: Element | Selector | string | number; scrollRootElement?: Element | Selector}): this;
+  floatings(
+    maxOffset: number,
+    ...regions: (RegionPlain | Element | EyesSelector<Selector> | LegacyRegionPlain)[]
+  ): this;
+  frame(context: {
+    frame: Element | EyesSelector<Selector> | string | number;
+    scrollRootElement?: Element | EyesSelector<Selector>;
+  }): this;
   frame(frame: Element, scrollRootElement?: Element): this;
-  frame(frame: Element, scrollRootElement?: Selector): this;
-  frame(frame: Selector, scrollRootElement?: Element): this;
-  frame(frame: Selector, scrollRootElement?: Selector): this;
+  frame(frame: Element, scrollRootElement?: EyesSelector<Selector>): this;
+  frame(frame: EyesSelector<Selector>, scrollRootElement?: Element): this;
+  frame(frame: EyesSelector<Selector>, scrollRootElement?: EyesSelector<Selector>): this;
   frame(frame: string, scrollRootElement?: Element): this;
-  frame(frame: string, scrollRootElement?: Selector): this;
+  frame(frame: string, scrollRootElement?: EyesSelector<Selector>): this;
   frame(frame: number, scrollRootElement?: Element): this;
-  frame(frame: number, scrollRootElement?: Selector): this;
+  frame(frame: number, scrollRootElement?: EyesSelector<Selector>): this;
   fully(fully?: boolean): this;
   hook(name: string, script: string): this;
   /** @deprecated */
-  ignore(ignoreRegion: RegionPlain): this;
+  ignore(region: RegionPlain): this;
+  /** @deprecated */
+  ignore(region: Element): this;
   /** @deprecated */
-  ignore(ignoreRegion: Element): this;
+  ignore(region: EyesSelector<Selector>): this;
   /** @deprecated */
-  ignore(ignoreRegion: Selector): this;
+  ignore(region: LegacyRegionPlain): this;
   ignoreCaret(ignoreCaret?: boolean): this;
   ignoreDisplacements(ignoreDisplacements?: boolean): this;
-  ignoreRegion(ignoreRegion: RegionPlain): this;
-  ignoreRegion(ignoreRegion: Element): this;
-  ignoreRegion(ignoreRegion: Selector): this;
-  ignoreRegions(...ignoreRegions: (RegionPlain | Element | Selector)[]): this;
+  ignoreRegion(region: RegionPlain): this;
+  ignoreRegion(region: Element): this;
+  ignoreRegion(region: EyesSelector<Selector>): this;
+  ignoreRegion(region: LegacyRegionPlain): this;
+  ignoreRegions(...regions: (RegionPlain | Element | EyesSelector<Selector> | LegacyRegionPlain)[]): this;
   /** @deprecated */
-  ignores(...ignoreRegions: (RegionPlain | Element | Selector)[]): this;
+  ignores(...regions: (RegionPlain | Element | EyesSelector<Selector> | LegacyRegionPlain)[]): this;
   layout(): this;
   layoutBreakpoints(layoutBreakpoints?: boolean): this;
   layoutBreakpoints(layoutBreakpoints?: number[]): this;
-  layoutRegion(layoutRegion: RegionPlain): this;
-  layoutRegion(layoutRegion: Element): this;
-  layoutRegion(layoutRegion: Selector): this;
-  layoutRegions(...layoutRegions: (RegionPlain | Element | Selector)[]): this;
-  matchLevel(matchLevel: MatchLevel): this;
+  layoutRegion(region: RegionPlain): this;
+  layoutRegion(region: Element): this;
+  layoutRegion(region: EyesSelector<Selector>): this;
+  layoutRegion(region: LegacyRegionPlain): this;
+  layoutRegions(...regions: (RegionPlain | Element | EyesSelector<Selector> | LegacyRegionPlain)[]): this;
+  matchLevel(matchLevel: MatchLevelPlain): this;
   /** @undocumented */
   name(name: string): this;
   region(region: RegionPlain): this;
   region(region: Element): this;
-  region(region: Selector): this;
+  region(region: EyesSelector<Selector>): this;
+  region(region: LegacyRegionPlain): this;
   renderId(renderId: string): this;
   scrollRootElement(scrollRootElement: Element): this;
-  scrollRootElement(scrollRootElement: Selector): this;
+  scrollRootElement(scrollRootElement: EyesSelector<Selector>): this;
   sendDom(sendDom?: boolean): this;
+  shadow(selector: EyesSelector<Selector>): this;
   /** @deprecated */
   stitchContent(stitchContent?: boolean): this;
   strict(): this;
-  strictRegion(strictRegion: RegionPlain): this;
-  strictRegion(strictRegion: Element): this;
-  strictRegion(strictRegion: Selector): this;
-  strictRegions(...regions: (RegionPlain | Element | Selector)[]): this;
+  strictRegion(region: RegionPlain): this;
+  strictRegion(region: Element): this;
+  strictRegion(region: EyesSelector<Selector>): this;
+  strictRegion(region: LegacyRegionPlain): this;
+  strictRegions(...regions: (RegionPlain | Element | EyesSelector<Selector> | LegacyRegionPlain)[]): this;
   timeout(timeout: number): this;
   useDom(useDom?: boolean): this;
   variationGroupId(variationGroupId: string): this;
   visualGridOption(key: string, value: any): this;
   visualGridOptions(options: {[key: string]: any}): this;
+  waitBeforeCapture(waitBeforeCapture: number): this;
   /** @deprecated */
   webHook(script: string): this;
   withName(name: string): this;
@@ -534,8 +577,8 @@ export class Configuration {
   set saveNewTests(saveNewTests: boolean);
   get scaleRatio(): number;
   set scaleRatio(scaleRatio: number);
-  get scrollRootElement(): Element | Selector;
-  set scrollRootElement(scrollRootElement: Element | Selector);
+  get scrollRootElement(): Element | EyesSelector<Selector>;
+  set scrollRootElement(scrollRootElement: Element | EyesSelector<Selector>);
   get sendDom(): boolean;
   set sendDom(sendDom: boolean);
   get serverUrl(): string;
@@ -552,13 +595,15 @@ export class Configuration {
   set viewportSize(viewportSize: RectangleSizePlain);
   get visualGridOptions(): {[key: string]: any};
   set visualGridOptions(visualGridOptions: {[key: string]: any});
+  get waitBeforeCapture(): number;
+  set waitBeforeCapture(waitBeforeCapture: number);
   get waitBeforeScreenshots(): number;
   set waitBeforeScreenshots(waitBeforeScreenshots: number);
   addBrowser(browserInfo: DesktopBrowserInfo): this;
   addBrowser(browserInfo: ChromeEmulationInfo): this;
   addBrowser(browserInfo: IOSDeviceInfo): this;
   addBrowser(browserInfo: {deviceName: DeviceNamePlain; screenOrientation?: ScreenOrientationPlain}): this;
-  addBrowser(width: number, height: number, name?: BrowserType): this;
+  addBrowser(width: number, height: number, name?: BrowserTypePlain): this;
   addBrowsers(
     ...browsersInfo: (
       | DesktopBrowserInfo
@@ -567,7 +612,7 @@ export class Configuration {
       | {deviceName: DeviceNamePlain; screenOrientation?: ScreenOrientationPlain}
     )[]
   ): this;
-  addDeviceEmulation(deviceName: DeviceName, screenOrientation?: ScreenOrientation): this;
+  addDeviceEmulation(deviceName: DeviceNamePlain, screenOrientation?: ScreenOrientationPlain): this;
   addProperty(name: string, value: string): this;
   addProperty(prop: PropertyDataPlain): this;
   clearProperties(): this;
@@ -633,7 +678,7 @@ export class Configuration {
   getSaveFailedTests(): boolean;
   getSaveNewTests(): boolean;
   getScaleRatio(): number;
-  getScrollRootElement(): Element | Selector;
+  getScrollRootElement(): Element | EyesSelector<Selector>;
   getSendDom(): boolean;
   getServerUrl(): string;
   getSessionType(): SessionType;
@@ -645,6 +690,7 @@ export class Configuration {
   getUseDom(): boolean;
   getViewportSize(): RectangleSize;
   getVisualGridOptions(): {[key: string]: any};
+  getWaitBeforeCapture(): number;
   getWaitBeforeScreenshots(): number;
   setAccessibilityValidation(accessibilityValidation: AccessibilitySettings): this;
   setAgentId(agentId: string): this;
@@ -695,7 +741,7 @@ export class Configuration {
   setLayoutBreakpoints(layoutBreakpoints: number[]): this;
   /** @undocumented */
   setLogHandler(handler: LogHandlerPlain): this;
-  setMatchLevel(matchLevel: MatchLevel): this;
+  setMatchLevel(matchLevel: MatchLevelPlain): this;
   setMatchTimeout(matchTimeout: number): this;
   setParentBranchName(parentBranchName: string): this;
   setProperties(properties: PropertyDataPlain[]): this;
@@ -715,19 +761,20 @@ export class Configuration {
   setSaveNewTests(saveNewTests: boolean): this;
   setScaleRatio(scaleRatio: number): this;
   setScrollRootElement(scrollRootElement: Element): this;
-  setScrollRootElement(scrollRootElement: Selector): this;
+  setScrollRootElement(scrollRootElement: EyesSelector<Selector>): this;
   setSendDom(sendDom: boolean): this;
   setServerUrl(serverUrl: string): this;
-  setSessionType(sessionType: SessionType): this;
+  setSessionType(sessionType: SessionTypePlain): this;
   /** @undocumented */
   setShowLogs(show: boolean): this;
-  setStitchMode(stitchMode: StitchMode): this;
+  setStitchMode(stitchMode: StitchModePlain): this;
   setStitchOverlap(stitchOverlap: number): this;
   setTestName(testName: string): this;
   setUseDom(useDom: boolean): this;
   setViewportSize(viewportSize: RectangleSizePlain): this;
   setVisualGridOption(key: string, value: any): this;
   setVisualGridOptions(visualGridOptions: {[key: string]: any}): this;
+  setWaitBeforeCapture(waitBeforeCapture: number): this;
   setWaitBeforeScreenshots(waitBeforeScreenshots: number): this;
 }
 
@@ -808,11 +855,11 @@ export class Eyes {
   /** @deprecated */
   checkElement(element: Element, timeout?: number, name?: string): Promise<MatchResult>;
   /** @deprecated */
-  checkElementBy(selector: Selector, timeout?: number, name?: string): Promise<MatchResult>;
+  checkElementBy(selector: EyesSelector<Selector>, timeout?: number, name?: string): Promise<MatchResult>;
   /** @deprecated */
   checkFrame(element: Element, timeout?: number, name?: string): Promise<MatchResult>;
   /** @deprecated */
-  checkFrame(element: Selector, timeout?: number, name?: string): Promise<MatchResult>;
+  checkFrame(element: EyesSelector<Selector>, timeout?: number, name?: string): Promise<MatchResult>;
   /** @deprecated */
   checkFrame(element: string, timeout?: number, name?: string): Promise<MatchResult>;
   /** @deprecated */
@@ -820,21 +867,26 @@ export class Eyes {
   /** @deprecated */
   checkRegion(region?: RegionPlain, name?: string, timeout?: number): Promise<MatchResult>;
   /** @deprecated */
-  checkRegionBy(selector: Selector, name?: string, timeout?: number, fully?: boolean): Promise<MatchResult>;
+  checkRegionBy(
+    selector: EyesSelector<Selector>,
+    name?: string,
+    timeout?: number,
+    fully?: boolean,
+  ): Promise<MatchResult>;
   /** @deprecated */
   checkRegionByElement(element: Element, name?: string, timeout?: number): Promise<MatchResult>;
   /** @deprecated */
   checkRegionInFrame(
     frame: Element,
-    selector: Selector,
+    selector: EyesSelector<Selector>,
     timeout?: number,
     name?: string,
     fully?: boolean,
   ): Promise<MatchResult>;
   /** @deprecated */
   checkRegionInFrame(
-    frame: Selector,
-    selector: Selector,
+    frame: EyesSelector<Selector>,
+    selector: EyesSelector<Selector>,
     timeout?: number,
     name?: string,
     fully?: boolean,
@@ -842,7 +894,7 @@ export class Eyes {
   /** @deprecated */
   checkRegionInFrame(
     frame: string,
-    selector: Selector,
+    selector: EyesSelector<Selector>,
     timeout?: number,
     name?: string,
     fully?: boolean,
@@ -850,7 +902,7 @@ export class Eyes {
   /** @deprecated */
   checkRegionInFrame(
     frame: number,
-    selector: Selector,
+    selector: EyesSelector<Selector>,
     timeout?: number,
     name?: string,
     fully?: boolean,
@@ -904,7 +956,7 @@ export class Eyes {
   getSaveDiffs(): boolean;
   getSaveNewTests(): boolean;
   getScaleRatio(): number;
-  getScrollRootElement(): Element | Selector;
+  getScrollRootElement(): Element | EyesSelector<Selector>;
   getSendDom(): boolean;
   getServerUrl(): string;
   /**
@@ -952,7 +1004,7 @@ export class Eyes {
     appName?: string,
     testName?: string,
     viewportSize?: RectangleSizePlain,
-    sessionType?: SessionType,
+    sessionType?: SessionTypePlain,
   ): Promise<Driver>;
   /**
    * @undocumented
@@ -985,7 +1037,7 @@ export class Eyes {
   setImageCut(cutProvider: CutProvider): void;
   setIsDisabled(isDisabled: boolean): void;
   setLogHandler(handler: LogHandler): void;
-  setMatchLevel(matchLevel: MatchLevel): void;
+  setMatchLevel(matchLevel: MatchLevelPlain): void;
   setMatchTimeout(matchTimeout: number): void;
   setParentBranchName(parentBranchName: string): void;
   setProxy(proxy: ProxySettingsPlain): void;
@@ -998,10 +1050,10 @@ export class Eyes {
   setSaveNewTests(saveNewTests: boolean): void;
   setScaleRatio(scaleRatio: number): void;
   setScrollRootElement(scrollRootElement: Element): void;
-  setScrollRootElement(scrollRootElement: Selector): void;
+  setScrollRootElement(scrollRootElement: EyesSelector<Selector>): void;
   setSendDom(sendDom: boolean): void;
   setServerUrl(serverUrl: string): void;
-  setStitchMode(stitchMode: StitchMode): void;
+  setStitchMode(stitchMode: StitchModePlain): void;
   setStitchOverlap(stitchOverlap: number): void;
   setTestName(testName: string): void;
   setViewportSize(size: RectangleSizePlain): Promise<void>;
@@ -1133,7 +1185,7 @@ export class ImageMatchSettings implements Required<ImageMatchSettingsPlain> {
   setIgnoreDisplacements(ignoreDisplacements: boolean): void;
   setIgnoreRegions(ignoreRegions: RegionPlain[]): void;
   setLayoutRegions(layoutRegions: RegionPlain[]): void;
-  setMatchLevel(matchLevel: MatchLevel): void;
+  setMatchLevel(matchLevel: MatchLevelPlain): void;
   setStrictRegions(strictRegions: RegionPlain[]): void;
   setUseDom(useDom: boolean): void;
 }
@@ -1412,6 +1464,7 @@ export class TestResults implements Required<TestResultsPlain> {
   get hostApp(): string;
   get hostDisplaySize(): RectangleSizePlain;
   get hostOS(): string;
+  get id(): string;
   get isAborted(): boolean;
   get isDifferent(): boolean;
   get isNew(): boolean;
@@ -1427,7 +1480,6 @@ export class TestResults implements Required<TestResultsPlain> {
   get steps(): number;
   get stepsInfo(): StepInfoPlain[];
   get strictMatches(): number;
-  get testId(): string;
   get url(): string;
   delete(): Promise<void>;
   /** @deprecated */
@@ -1624,15 +1676,15 @@ export type BrowserTypePlain =
 
 export type CheckSettingsPlain = {
   name?: string;
-  region?: RegionPlain | Element | Selector;
+  region?: RegionPlain | Element | EyesSelector<Selector>;
   frames?: (
-    | {frame: Element | Selector | string | number; scrollRootElement?: Element | Selector}
+    | {frame: Element | EyesSelector<Selector> | string | number; scrollRootElement?: Element | EyesSelector<Selector>}
     | Element
-    | Selector
+    | EyesSelector<Selector>
     | string
     | number
   )[];
-  scrollRootElement?: Element | Selector;
+  scrollRootElement?: Element | EyesSelector<Selector>;
   fully?: boolean;
   matchLevel?: MatchLevelPlain;
   useDom?: boolean;
@@ -1640,13 +1692,13 @@ export type CheckSettingsPlain = {
   enablePatterns?: boolean;
   ignoreDisplacements?: boolean;
   ignoreCaret?: boolean;
-  ignoreRegions?: (RegionPlain | Element | Selector)[];
-  layoutRegions?: (RegionPlain | Element | Selector)[];
-  strictRegions?: (RegionPlain | Element | Selector)[];
-  contentRegions?: (RegionPlain | Element | Selector)[];
+  ignoreRegions?: (RegionPlain | Element | EyesSelector<Selector>)[];
+  layoutRegions?: (RegionPlain | Element | EyesSelector<Selector>)[];
+  strictRegions?: (RegionPlain | Element | EyesSelector<Selector>)[];
+  contentRegions?: (RegionPlain | Element | EyesSelector<Selector>)[];
   floatingRegions?: (
     | {
-        region: RegionPlain | Element | Selector;
+        region: RegionPlain | Element | EyesSelector<Selector>;
         maxUpOffset?: number;
         maxDownOffset?: number;
         maxLeftOffset?: number;
@@ -1654,13 +1706,13 @@ export type CheckSettingsPlain = {
       }
     | RegionPlain
     | Element
-    | Selector
+    | EyesSelector<Selector>
   )[];
   accessibilityRegions?: (
-    | {region: RegionPlain | Element | Selector; type?: AccessibilityRegionTypePlain}
+    | {region: RegionPlain | Element | EyesSelector<Selector>; type?: AccessibilityRegionTypePlain}
     | RegionPlain
     | Element
-    | Selector
+    | EyesSelector<Selector>
   )[];
   disableBrowserFetching?: boolean;
   layoutBreakpoints?: boolean | number[];
@@ -1669,6 +1721,7 @@ export type CheckSettingsPlain = {
   renderId?: string;
   variationGroupId?: string;
   timeout?: number;
+  waitBeforeCapture?: number;
 };
 
 export type ChromeEmulationInfo = {
@@ -1717,16 +1770,18 @@ export type ConfigurationPlain = {
   hideScrollbars?: boolean;
   hideCaret?: boolean;
   stitchOverlap?: number;
-  scrollRootElement?: Element | Selector;
+  scrollRootElement?: Element | EyesSelector<Selector>;
   cut?: CutProviderPlain;
   rotation?: ImageRotationPlain;
   scaleRatio?: number;
+  waitBeforeCapture?: number;
 } & {
   /** @undocumented */ concurrentSessions?: number;
   browsersInfo?: (DesktopBrowserInfo | ChromeEmulationInfo | IOSDeviceInfo)[];
   visualGridOptions?: Record<string, any>;
   layoutBreakpoints?: boolean | number[];
   disableBrowserFetching?: boolean;
+  waitBeforeCapture?: number;
 };
 
 export type ConsoleLogHandlerPlain = {type: 'console'};
@@ -1761,6 +1816,7 @@ export type DeviceNamePlain =
   | 'Galaxy Note 9'
   | 'Galaxy S10'
   | 'Galaxy S10 Plus'
+  | 'Galaxy S20'
   | 'Galaxy S3'
   | 'Galaxy S5'
   | 'Galaxy S8'
@@ -1792,6 +1848,7 @@ export type DeviceNamePlain =
   | 'Pixel 3 XL'
   | 'Pixel 4'
   | 'Pixel 4 XL'
+  | 'Pixel 5'
   | 'iPad'
   | 'iPad 6th Gen'
   | 'iPad 7th Gen'
@@ -1822,6 +1879,11 @@ export type ExactMatchSettingsPlain = {
   minDiffWidth: number;
 };
 
+export type EyesSelector<TSelector = never> =
+  | TSelector
+  | string
+  | {frame?: EyesSelector<TSelector>; selector: TSelector | string; shadow?: EyesSelector<TSelector>; type?: string};
+
 export type FailureReportPlain = 'IMMEDIATE' | 'ON_CLOSE';
 
 export type FileLogHandlerPlain = {type: 'file'; filename?: string; append?: boolean};
@@ -1869,6 +1931,10 @@ export type IosDeviceNamePlain =
   | 'iPhone 11'
   | 'iPhone 11 Pro'
   | 'iPhone 11 Pro Max'
+  | 'iPhone 12'
+  | 'iPhone 12 Pro'
+  | 'iPhone 12 Pro Max'
+  | 'iPhone 12 mini'
   | 'iPhone 7'
   | 'iPhone 8'
   | 'iPhone X'
@@ -1877,6 +1943,9 @@ export type IosDeviceNamePlain =
 
 export type IosVersionPlain = 'latest' | 'latest-1';
 
+/** @deprecated */
+export type LegacyRegionPlain = {height: number; left: number; top: number; width: number};
+
 export type LocationPlain = {x: number; y: number};
 
 export type LogHandlerPlain = CustomLogHandlerPlain | FileLogHandlerPlain | ConsoleLogHandlerPlain;
@@ -1885,7 +1954,12 @@ export type MatchLevelPlain = 'Content' | 'Exact' | 'Layout' | 'Layout2' | 'Layo
 
 export type MatchResultPlain = {readonly asExpected?: boolean; readonly windowId?: number};
 
-export type OCRRegion = {target: RegionPlain | Element | Selector; hint?: string; minMatch?: number; language?: string};
+export type OCRRegion = {
+  target: RegionPlain | Element | EyesSelector<Selector>;
+  hint?: string;
+  minMatch?: number;
+  language?: string;
+};
 
 export type OCRSettings<TPattern extends string = string> = {
   firstOnly?: boolean;
@@ -1906,11 +1980,7 @@ export type RunnerOptionsPlain = {testConcurrency?: number};
 
 export type ScreenOrientationPlain = 'landscape' | 'portrait';
 
-export type Selector =
-  | import('selenium-webdriver').Locator
-  | {using: string; value: string}
-  | string
-  | {selector: string; type: string};
+export type Selector = import('selenium-webdriver').Locator | {using: string; value: string};
 
 export type SessionTypePlain = 'PROGRESSION' | 'SEQUENTIAL';
 
@@ -1950,6 +2020,7 @@ export type TestResultsPlain = {
   readonly hostApp?: string;
   readonly hostDisplaySize?: RectangleSizePlain;
   readonly hostOS?: string;
+  readonly id?: string;
   readonly isAborted?: boolean;
   readonly isDifferent?: boolean;
   readonly isNew?: boolean;
@@ -1965,7 +2036,6 @@ export type TestResultsPlain = {
   readonly steps?: number;
   readonly stepsInfo?: StepInfoPlain[];
   readonly strictMatches?: number;
-  readonly testId?: string;
   readonly url?: string;
 };
 
@@ -1987,16 +2057,21 @@ export const Target: {
   window(): CheckSettings;
   region(region: RegionPlain): CheckSettings;
   region(region: Element): CheckSettings;
-  region(region: Selector): CheckSettings;
-  frame(context: {frame: Element | Selector | string | number; scrollRootElement?: Element | Selector}): CheckSettings;
+  region(region: EyesSelector<Selector>): CheckSettings;
+  region(region: LegacyRegionPlain): CheckSettings;
+  frame(context: {
+    frame: Element | EyesSelector<Selector> | string | number;
+    scrollRootElement?: Element | EyesSelector<Selector>;
+  }): CheckSettings;
   frame(frame: Element, scrollRootElement?: Element): CheckSettings;
-  frame(frame: Element, scrollRootElement?: Selector): CheckSettings;
-  frame(frame: Selector, scrollRootElement?: Element): CheckSettings;
-  frame(frame: Selector, scrollRootElement?: Selector): CheckSettings;
+  frame(frame: Element, scrollRootElement?: EyesSelector<Selector>): CheckSettings;
+  frame(frame: EyesSelector<Selector>, scrollRootElement?: Element): CheckSettings;
+  frame(frame: EyesSelector<Selector>, scrollRootElement?: EyesSelector<Selector>): CheckSettings;
   frame(frame: string, scrollRootElement?: Element): CheckSettings;
-  frame(frame: string, scrollRootElement?: Selector): CheckSettings;
+  frame(frame: string, scrollRootElement?: EyesSelector<Selector>): CheckSettings;
   frame(frame: number, scrollRootElement?: Element): CheckSettings;
-  frame(frame: number, scrollRootElement?: Selector): CheckSettings;
+  frame(frame: number, scrollRootElement?: EyesSelector<Selector>): CheckSettings;
+  shadow(selector: EyesSelector<Selector>): CheckSettings;
 };
 
 /** @deprecated */

package/dist/api.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,6DAAiD;AACjD,4CAA2C;AAC3C,sCAAqC;AAGrC,MAAM,GAAG,GAAG,uBAAO,CAAC;IAClB,IAAI,EAAE,eAAe;IACrB,OAAO,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC,GAAG,CAAC,iCAAiC,EAAE;IAClG,IAAI;IACJ,gBAAgB,EAAE,OAAO,CAAC,gCAAgC,CAAC;CAC5D,CAAC,CAAA;AAEF,uDAAoC;AAIpC,MAAa,IAAK,SAAQ,GAAG,CAAC,IAA+B;;AAA7D,oBAGC;AAF2B,UAAK,GAAG,GAAG,CAAA;AAMvC,MAAa,aAAc,SAAQ,GAAG,CAAC,aAAgC;;AAAvE,sCAEC;AAD2B,mBAAK,GAAG,GAAG,CAAA;AAOvC,MAAa,aAAc,SAAQ,GAAG,CAAC,aAAgC;;AAAvE,sCAEC;AAD2B,mBAAK,GAAG,GAAG,CAAA;AAG1B,QAAA,MAAM,GAAkC,aAAoB,CAAA;AAEzE,MAAa,UAAW,SAAQ,GAAG,CAAC,UAAU;;AAA9C,gCAEC;AAD2B,gBAAK,GAAG,GAAG,CAAA"}

package/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,iCAAiC,EAAE;IAClD,MAAM,EAAC,OAAO,EAAC,GAAG,OAAO,CAAC,iCAAiC,CAAC,CAAA;IAC5D,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IACrC,OAAO,CAAC,GAAG,CAAC,iCAAiC,GAAG,KAAK,CAAA;CACtD;AAED,wCAAqB"}

package/dist/legacy.js

@@ -1,79 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.wrapDriver = void 0;
-function wrapDriver(driver) {
-    const api = {
-        get remoteWebDriver() {
-            return driver;
-        },
-        getRemoteWebDriver() {
-            return driver;
-        },
-        async findElementById(id) {
-            return driver.findElement({ id });
-        },
-        async findElementsById(id) {
-            return driver.findElements({ id });
-        },
-        async findElementByName(name) {
-            return driver.findElement({ name });
-        },
-        async findElementsByName(name) {
-            return driver.findElements({ name });
-        },
-        async findElementByCssSelector(css) {
-            return driver.findElement({ css });
-        },
-        async findElementsByCssSelector(css) {
-            return driver.findElements({ css });
-        },
-        async findElementByClassName(className) {
-            throw driver.findElement({ className });
-        },
-        async findElementsByClassName(className) {
-            throw driver.findElements({ className });
-        },
-        async findElementByLinkText(linkText) {
-            throw driver.findElement({ linkText });
-        },
-        async findElementsByLinkText(linkText) {
-            throw driver.findElements({ linkText });
-        },
-        async findElementByPartialLinkText(partialLinkText) {
-            throw driver.findElement({ partialLinkText });
-        },
-        async findElementsByPartialLinkText(partialLinkText) {
-            throw driver.findElements({ partialLinkText });
-        },
-        async findElementByTagName(tagName) {
-            return driver.findElement({ tagName });
-        },
-        async findElementsByTagName(tagName) {
-            return driver.findElements({ tagName });
-        },
-        async findElementByXPath(xpath) {
-            return driver.findElement({ xpath });
-        },
-        async findElementsByXPath(xpath) {
-            return driver.findElements({ xpath });
-        },
-        async getBrowserName() {
-            const capabilities = await driver.getCapabilities();
-            return capabilities.getBrowserName();
-        },
-        async getBrowserVersion() {
-            const capabilities = await driver.getCapabilities();
-            return capabilities.getBrowserVersion();
-        },
-    };
-    return new Proxy(driver, {
-        get(target, key, receiver) {
-            if (Object.hasOwnProperty.call(api, key)) {
-                return Reflect.get(api, key, receiver);
-            }
-            return Reflect.get(target, key);
-        },
-    });
-}
-exports.wrapDriver = wrapDriver;
-//# sourceMappingURL=legacy.js.map

package/dist/legacy.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"legacy.js","sourceRoot":"","sources":["../src/legacy.ts"],"names":[],"mappings":"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"}

package/dist/spec-driver.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"spec-driver.js","sourceRoot":"","sources":["../src/spec-driver.ts"],"names":[],"mappings":"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"}