@applitools/eyes-webdriverio 5.45.2 → 5.45.3

package/CHANGELOG.md

@@ -1,5 +1,151 @@
 # Changelog
 
+## [5.45.3](https://github.com/applitools/eyes.sdk.javascript1/compare/js/eyes-webdriverio@5.45.2...js/eyes-webdriverio@5.45.3) (2023-08-18)
+
+
+### Code Refactoring
+
+* refactored spec driver interface ([#1839](https://github.com/applitools/eyes.sdk.javascript1/issues/1839)) ([aa49ec2](https://github.com/applitools/eyes.sdk.javascript1/commit/aa49ec2a7d14b8529acc3a8a4c2baecfa113d98a))
+
+
+### Dependencies
+
+* @applitools/utils bumped to 1.5.1
+  #### Code Refactoring
+
+  * refactored spec driver interface ([#1839](https://github.com/applitools/eyes.sdk.javascript1/issues/1839)) ([aa49ec2](https://github.com/applitools/eyes.sdk.javascript1/commit/aa49ec2a7d14b8529acc3a8a4c2baecfa113d98a))
+* @applitools/logger bumped to 2.0.8
+  #### Code Refactoring
+
+  * refactored spec driver interface ([#1839](https://github.com/applitools/eyes.sdk.javascript1/issues/1839)) ([aa49ec2](https://github.com/applitools/eyes.sdk.javascript1/commit/aa49ec2a7d14b8529acc3a8a4c2baecfa113d98a))
+
+
+
+* @applitools/socket bumped to 1.1.8
+  #### Code Refactoring
+
+  * refactored spec driver interface ([#1839](https://github.com/applitools/eyes.sdk.javascript1/issues/1839)) ([aa49ec2](https://github.com/applitools/eyes.sdk.javascript1/commit/aa49ec2a7d14b8529acc3a8a4c2baecfa113d98a))
+
+
+
+* @applitools/req bumped to 1.5.3
+  #### Code Refactoring
+
+  * refactored spec driver interface ([#1839](https://github.com/applitools/eyes.sdk.javascript1/issues/1839)) ([aa49ec2](https://github.com/applitools/eyes.sdk.javascript1/commit/aa49ec2a7d14b8529acc3a8a4c2baecfa113d98a))
+
+
+
+* @applitools/image bumped to 1.1.3
+  #### Code Refactoring
+
+  * refactored spec driver interface ([#1839](https://github.com/applitools/eyes.sdk.javascript1/issues/1839)) ([aa49ec2](https://github.com/applitools/eyes.sdk.javascript1/commit/aa49ec2a7d14b8529acc3a8a4c2baecfa113d98a))
+
+
+
+* @applitools/snippets bumped to 2.4.23
+  #### Code Refactoring
+
+  * refactored spec driver interface ([#1839](https://github.com/applitools/eyes.sdk.javascript1/issues/1839)) ([aa49ec2](https://github.com/applitools/eyes.sdk.javascript1/commit/aa49ec2a7d14b8529acc3a8a4c2baecfa113d98a))
+* @applitools/spec-driver-webdriver bumped to 1.0.42
+  #### Code Refactoring
+
+  * refactored spec driver interface ([#1839](https://github.com/applitools/eyes.sdk.javascript1/issues/1839)) ([aa49ec2](https://github.com/applitools/eyes.sdk.javascript1/commit/aa49ec2a7d14b8529acc3a8a4c2baecfa113d98a))
+
+
+
+* @applitools/spec-driver-selenium bumped to 1.5.56
+  #### Code Refactoring
+
+  * refactored spec driver interface ([#1839](https://github.com/applitools/eyes.sdk.javascript1/issues/1839)) ([aa49ec2](https://github.com/applitools/eyes.sdk.javascript1/commit/aa49ec2a7d14b8529acc3a8a4c2baecfa113d98a))
+
+
+
+* @applitools/spec-driver-puppeteer bumped to 1.1.73
+  #### Code Refactoring
+
+  * refactored spec driver interface ([#1839](https://github.com/applitools/eyes.sdk.javascript1/issues/1839)) ([aa49ec2](https://github.com/applitools/eyes.sdk.javascript1/commit/aa49ec2a7d14b8529acc3a8a4c2baecfa113d98a))
+
+
+
+* @applitools/driver bumped to 1.13.5
+  #### Bug Fixes
+
+  * optimize driver usage in close ([#1867](https://github.com/applitools/eyes.sdk.javascript1/issues/1867)) ([60dff6b](https://github.com/applitools/eyes.sdk.javascript1/commit/60dff6b160e69d3893c91a1125d668fa18b43072))
+
+
+  #### Code Refactoring
+
+  * refactored spec driver interface ([#1839](https://github.com/applitools/eyes.sdk.javascript1/issues/1839)) ([aa49ec2](https://github.com/applitools/eyes.sdk.javascript1/commit/aa49ec2a7d14b8529acc3a8a4c2baecfa113d98a))
+
+
+
+* @applitools/screenshoter bumped to 3.8.8
+  #### Code Refactoring
+
+  * refactored spec driver interface ([#1839](https://github.com/applitools/eyes.sdk.javascript1/issues/1839)) ([aa49ec2](https://github.com/applitools/eyes.sdk.javascript1/commit/aa49ec2a7d14b8529acc3a8a4c2baecfa113d98a))
+
+
+
+* @applitools/nml-client bumped to 1.5.8
+  #### Code Refactoring
+
+  * refactored spec driver interface ([#1839](https://github.com/applitools/eyes.sdk.javascript1/issues/1839)) ([aa49ec2](https://github.com/applitools/eyes.sdk.javascript1/commit/aa49ec2a7d14b8529acc3a8a4c2baecfa113d98a))
+
+
+
+* @applitools/tunnel-client bumped to 1.2.0
+  #### Features
+
+  * replace and destroy tunnels by tunnel id ([#1878](https://github.com/applitools/eyes.sdk.javascript1/issues/1878)) ([22bcc15](https://github.com/applitools/eyes.sdk.javascript1/commit/22bcc15b31457e3da56cdb6f73bee3dcb7e051a1))
+
+
+  #### Code Refactoring
+
+  * refactored spec driver interface ([#1839](https://github.com/applitools/eyes.sdk.javascript1/issues/1839)) ([aa49ec2](https://github.com/applitools/eyes.sdk.javascript1/commit/aa49ec2a7d14b8529acc3a8a4c2baecfa113d98a))
+
+
+
+* @applitools/ufg-client bumped to 1.7.1
+  #### Code Refactoring
+
+  * refactored spec driver interface ([#1839](https://github.com/applitools/eyes.sdk.javascript1/issues/1839)) ([aa49ec2](https://github.com/applitools/eyes.sdk.javascript1/commit/aa49ec2a7d14b8529acc3a8a4c2baecfa113d98a))
+
+
+
+* @applitools/ec-client bumped to 1.7.5
+  #### Code Refactoring
+
+  * refactored spec driver interface ([#1839](https://github.com/applitools/eyes.sdk.javascript1/issues/1839)) ([aa49ec2](https://github.com/applitools/eyes.sdk.javascript1/commit/aa49ec2a7d14b8529acc3a8a4c2baecfa113d98a))
+
+
+
+* @applitools/core-base bumped to 1.5.1
+  #### Code Refactoring
+
+  * refactored spec driver interface ([#1839](https://github.com/applitools/eyes.sdk.javascript1/issues/1839)) ([aa49ec2](https://github.com/applitools/eyes.sdk.javascript1/commit/aa49ec2a7d14b8529acc3a8a4c2baecfa113d98a))
+
+
+
+* @applitools/core bumped to 3.9.1
+  #### Bug Fixes
+
+  * optimize driver usage in close ([#1867](https://github.com/applitools/eyes.sdk.javascript1/issues/1867)) ([60dff6b](https://github.com/applitools/eyes.sdk.javascript1/commit/60dff6b160e69d3893c91a1125d668fa18b43072))
+
+
+  #### Code Refactoring
+
+  * refactored spec driver interface ([#1839](https://github.com/applitools/eyes.sdk.javascript1/issues/1839)) ([aa49ec2](https://github.com/applitools/eyes.sdk.javascript1/commit/aa49ec2a7d14b8529acc3a8a4c2baecfa113d98a))
+
+
+
+* @applitools/eyes bumped to 1.7.3
+  #### Code Refactoring
+
+  * refactored spec driver interface ([#1839](https://github.com/applitools/eyes.sdk.javascript1/issues/1839)) ([aa49ec2](https://github.com/applitools/eyes.sdk.javascript1/commit/aa49ec2a7d14b8529acc3a8a4c2baecfa113d98a))
+
+
+
+
 ## [5.45.2](https://github.com/applitools/eyes.sdk.javascript1/compare/js/eyes-webdriverio@5.45.1...js/eyes-webdriverio@5.45.2) (2023-08-10)
 
 

package/dist/api.js

@@ -29,11 +29,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.closeBatch = exports.BatchClose = exports.Configuration = exports.Target = exports.TargetAutomation = exports.CheckSettings = exports.CheckSettingsAutomation = exports.Eyes = void 0;
 const extract_environment_1 = require("./extract-environment");
 const eyes = __importStar(require("@applitools/eyes"));
-const spec = __importStar(require("@applitools/spec-driver-webdriverio"));
+const spec = __importStar(require("./spec-driver"));
 __exportStar(require("@applitools/eyes"), exports);
 __exportStar(require("./legacy"), exports);
-const environment = (0, extract_environment_1.extractEnvironment)();
-const sdk = { spec, agentId: `eyes-webdriverio/${require('../package.json').version}`, environment };
+const sdk = {
+    spec: spec,
+    agentId: `eyes-webdriverio/${require('../package.json').version}`,
+    environment: (0, extract_environment_1.extractEnvironment)(),
+};
 class Eyes extends eyes.Eyes {
 }
 exports.Eyes = Eyes;
@@ -41,16 +44,16 @@ Eyes._sdk = sdk;
 class CheckSettingsAutomation extends eyes.CheckSettingsAutomation {
 }
 exports.CheckSettingsAutomation = CheckSettingsAutomation;
-CheckSettingsAutomation._spec = spec;
+CheckSettingsAutomation._spec = sdk.spec;
 class CheckSettings extends CheckSettingsAutomation {
 }
 exports.CheckSettings = CheckSettings;
-exports.TargetAutomation = { ...eyes.TargetAutomation, spec };
-exports.Target = { ...eyes.Target, spec };
+exports.TargetAutomation = { ...eyes.TargetAutomation, spec: sdk.spec };
+exports.Target = { ...eyes.Target, spec: sdk.spec };
 class Configuration extends eyes.Configuration {
 }
 exports.Configuration = Configuration;
-Configuration._spec = spec;
+Configuration._spec = sdk.spec;
 class BatchClose extends eyes.BatchClose {
 }
 exports.BatchClose = BatchClose;

package/dist/extract-environment.js

@@ -10,6 +10,13 @@ function extractEnvironment() {
     catch {
         // NOTE: ignore error
     }
+    try {
+        const { name, version } = require('webdriver/package.json');
+        versions[name] = version;
+    }
+    catch {
+        // NOTE: ignore error
+    }
     return { versions };
 }
 exports.extractEnvironment = extractEnvironment;

package/dist/legacy.js

@@ -17,7 +17,7 @@ class By {
     static attributeValue(attr, value) {
         return new By(`*[${attr}="${value}"]`);
     }
-    // @ts-ignore
+    // @ts-expect-error
     static name(name) {
         return By.attributeValue('name', name);
     }

package/dist/spec-driver.js

@@ -10,8 +10,272 @@ 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 });
-__exportStar(require("@applitools/spec-driver-webdriverio"), exports);
+exports.build = exports.findElements = exports.findElement = exports.executeScript = exports.extractSelector = exports.toSimpleCommonSelector = exports.toSelector = exports.toElement = exports.toDriver = exports.isSecondarySelector = exports.isSelector = exports.isSecondaryElement = exports.isSecondaryDriver = void 0;
+const spec = __importStar(require("@applitools/spec-driver-webdriver"));
+const utils = __importStar(require("@applitools/utils"));
+__exportStar(require("@applitools/spec-driver-webdriver"), exports);
+const LEGACY_ELEMENT_ID = 'ELEMENT';
+const ELEMENT_ID = 'element-6066-11e4-a52e-4f735466cecf';
+const SHADOW_ROOT_ID = 'shadow-6066-11e4-a52e-4f735466cecf';
+const DIRECT_SELECTOR_REGEXP = /^(id|css selector|xpath|link text|partial link text|name|tag name|class name|-android uiautomator|-android datamatcher|-android viewmatcher|-android viewtag|-ios uiautomation|-ios predicate string|-ios class chain|accessibility id):(.+)/;
+async function getSearchRoot(driver, parent) {
+    const root = driver.original;
+    if (parent) {
+        const elementId = parent[SHADOW_ROOT_ID] || parent[ELEMENT_ID] || parent[LEGACY_ELEMENT_ID];
+        return root.$({ [ELEMENT_ID]: elementId });
+    }
+    return root;
+}
+function isSecondaryDriver(driver) {
+    if (!driver)
+        return false;
+    return spec.isSecondaryDriver(driver) || utils.types.instanceOf(driver, 'Browser');
+}
+exports.isSecondaryDriver = isSecondaryDriver;
+function isSecondaryElement(element) {
+    return !!(element === null || element === void 0 ? void 0 : element.elementId);
+}
+exports.isSecondaryElement = isSecondaryElement;
+function isSelector(selector) {
+    return utils.types.isString(selector) || utils.types.has(selector, 'strategyName') || utils.types.isFunction(selector);
+}
+exports.isSelector = isSelector;
+function isSecondarySelector(selector) {
+    return spec.isSelector(selector);
+}
+exports.isSecondarySelector = isSecondarySelector;
+function toDriver(driver) {
+    if (spec.isSecondaryDriver(driver))
+        return spec.toDriver(driver);
+    if (driver.isDevTools) {
+        driver.addCommand('sendCommandAndGetResult', async (name, options) => {
+            const puppeteer = await driver.getPuppeteer();
+            const [page] = await puppeteer.pages();
+            const session = await page.target().createCDPSession();
+            return session.send(name, options);
+        });
+    }
+    const transformedDriver = Object.create(driver, {
+        original: { enumerable: false, get: () => driver },
+    });
+    return transformedDriver;
+}
+exports.toDriver = toDriver;
+function toElement(element) {
+    if (utils.types.has(element, 'elementId')) {
+        return {
+            [ELEMENT_ID]: element.elementId,
+            [LEGACY_ELEMENT_ID]: element.elementId,
+            selector: isSelector(element.selector) ? element.selector : undefined,
+        };
+    }
+    return element;
+}
+exports.toElement = toElement;
+function toSelector(selector) {
+    if (utils.types.has(selector, 'selector')) {
+        if (utils.types.has(selector, 'type') && selector.type && utils.types.isString(selector.selector)) {
+            return `${selector.type === 'css' ? 'css selector' : selector.type}:${selector.selector}`;
+        }
+        else if (isSelector(selector.selector)) {
+            return selector.selector;
+        }
+        else {
+            selector = selector.selector;
+        }
+    }
+    if (utils.types.has(selector, ['using', 'value'])) {
+        return `${selector.using}:${selector.value}`;
+    }
+    return selector;
+}
+exports.toSelector = toSelector;
+function toSimpleCommonSelector(selector) {
+    if (utils.types.isFunction(selector) || utils.types.has(selector, 'strategyName'))
+        return null;
+    else if (utils.types.isString(selector)) {
+        const match = selector.match(DIRECT_SELECTOR_REGEXP);
+        if (!match)
+            return { selector };
+        const [, using, value] = match;
+        return { type: using === 'css selector' ? 'css' : using, selector: value };
+    }
+    return selector;
+}
+exports.toSimpleCommonSelector = toSimpleCommonSelector;
+function extractSelector(element) {
+    var _a;
+    return (_a = element.selector) !== null && _a !== void 0 ? _a : null;
+}
+exports.extractSelector = extractSelector;
+async function executeScript(driver, script, arg) {
+    if (driver.original.isDevTools) {
+        script = script.toString();
+        script = script.startsWith('function') ? `return (${script}).apply(null, arguments)` : script;
+        return driver.original.execute(runner, script.toString(), ...unwrap(arg));
+    }
+    return spec.executeScript(driver, script, arg);
+    function runner(script, arg, ...elements) {
+        return new Function(script).call(null, wrap(arg));
+        function wrap(value) {
+            if (value === 'pptr-element-marker') {
+                return elements.shift();
+            }
+            else if (Array.isArray(value)) {
+                return value.map(wrap);
+            }
+            else if (value && typeof value === 'object') {
+                return Object.fromEntries(Object.entries(value).map(([key, value]) => [key, wrap(value)]));
+            }
+            else {
+                return value;
+            }
+        }
+    }
+    function unwrap(arg) {
+        if (!arg)
+            return [];
+        const elements = [];
+        return [unwrap(arg), ...elements];
+        function unwrap(value) {
+            if (spec.isElement(value)) {
+                elements.push(value);
+                return 'pptr-element-marker';
+            }
+            else if (utils.types.isArray(value)) {
+                return value.map(unwrap);
+            }
+            else if (utils.types.isObject(value)) {
+                return Object.fromEntries(Object.entries(value).map(([key, value]) => [key, unwrap(value)]));
+            }
+            else {
+                return value;
+            }
+        }
+    }
+}
+exports.executeScript = executeScript;
+async function findElement(driver, selector, parent) {
+    const root = await getSearchRoot(driver, parent);
+    try {
+        const element = await root.$(selector);
+        return !utils.types.has(element, 'error') ? spec.toElement(element) : null;
+    }
+    catch (error) {
+        return null;
+    }
+}
+exports.findElement = findElement;
+async function findElements(driver, selector, parent) {
+    const root = await getSearchRoot(driver, parent);
+    const elements = await root.$$(selector);
+    return Array.from(elements, spec.toElement);
+}
+exports.findElements = findElements;
+const browserOptionsNames = {
+    chrome: 'goog:chromeOptions',
+    firefox: 'moz:firefoxOptions',
+};
+async function build(env) {
+    let frameworkPath;
+    try {
+        frameworkPath = require.resolve('webdriverio', { paths: [`${process.cwd()}/node_modules`] });
+    }
+    catch {
+        frameworkPath = 'webdriverio';
+    }
+    const { remote } = require(frameworkPath);
+    const chromedriver = require('chromedriver');
+    const parseEnv = require('@applitools/test-utils/src/parse-env');
+    const { protocol, browser = '', emulation, capabilities, url, attach, proxy, configurable = true, args = [], headless, logLevel = 'silent', } = parseEnv(env, process.env.APPLITOOLS_WEBDRIVERIO_PROTOCOL);
+    const options = {
+        capabilities: { browserName: browser, ...capabilities },
+        logLevel,
+        connectionRetryCount: 5,
+        connectionRetryTimeout: 180000,
+    };
+    if (browser === 'chrome' && protocol === 'cdp') {
+        options.automationProtocol = 'devtools';
+        options.capabilities[browserOptionsNames.chrome] = { args };
+        options.capabilities['wdio:devtoolsOptions'] = {
+            headless,
+            ignoreDefaultArgs: ['--hide-scrollbars'],
+        };
+    }
+    else if (protocol === 'wd') {
+        options.automationProtocol = 'webdriver';
+        options.protocol = url.protocol ? url.protocol.replace(/:$/, '') : undefined;
+        options.hostname = url.hostname;
+        if (url.port)
+            options.port = Number(url.port);
+        else if (options.protocol === 'http')
+            options.port = 80;
+        else if (options.protocol === 'https')
+            options.port = 443;
+        options.path = url.pathname;
+        if (configurable) {
+            if (browser === 'chrome' && attach) {
+                await chromedriver.start(['--port=9515'], true);
+                options.protocol = 'http';
+                options.hostname = 'localhost';
+                options.port = 9515;
+                options.path = '/';
+            }
+            const browserOptionsName = browserOptionsNames[browser || options.capabilities.browserName];
+            if (browserOptionsName) {
+                const browserOptions = options.capabilities[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;
+                }
+                options.capabilities[browserOptionsName] = browserOptions;
+            }
+        }
+    }
+    if (proxy) {
+        options.capabilities.proxy = {
+            proxyType: 'manual',
+            httpProxy: proxy.http || proxy.server,
+            sslProxy: proxy.https || proxy.server,
+            ftpProxy: proxy.ftp,
+            noProxy: proxy.bypass.join(','),
+        };
+    }
+    const driver = await remote(options);
+    if (driver.isDevTools && emulation) {
+        const puppeteer = await driver.getPuppeteer();
+        const [page] = await puppeteer.pages();
+        if (emulation.deviceMetrics) {
+            await page.setViewport({
+                width: emulation.deviceMetrics.width,
+                height: emulation.deviceMetrics.height,
+                deviceScaleFactor: emulation.deviceMetrics.pixelRatio,
+            });
+        }
+        if (emulation.userAgent) {
+            await page.setUserAgent(emulation.userAgent);
+        }
+    }
+    return [driver, () => driver.deleteSession().then(() => chromedriver.stop())];
+}
+exports.build = build;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/eyes-webdriverio",
-  "version": "5.45.2",
+  "version": "5.45.3",
   "description": "Applitools Eyes SDK for WebdriverIO",
   "keywords": [
     "eyes-webdriverio",
@@ -87,33 +87,37 @@
     "lint": "run --top-level eslint '**/*.ts'",
     "build": "run --top-level tspc --project tsconfig.build.v$([ ! -z $APPLITOOLS_FRAMEWORK_VERSION ] && echo $APPLITOOLS_FRAMEWORK_VERSION | cut -f1 -d'.' || echo 8).json",
     "generate:tests": "NODE_OPTIONS='--experimental-import-meta-resolve --experimental-loader=@applitools/generic/dist/code-loader.js' generic ./test/generic/config.mjs",
-    "test": "run test:service && run test:coverage",
-    "test:local": "run test:service && MOCHA_OMIT_TAGS=sauce run test:coverage",
+    "test": "run test:it && run test:service && run test:coverage",
+    "test:it": "MOCHA_GROUP=it run --top-level mocha './test/it/*.spec.ts' -r @applitools/test-utils/mocha-hooks/docker",
+    "test:local": "run test:it && run test:service && MOCHA_OMIT_TAGS=sauce run test:coverage",
+    "test:local:cdp": "APPLITOOLS_WEBDRIVERIO_PROTOCOL=cdp run test:local",
     "test:sauce": "MOCHA_ONLY_TAGS=sauce run test:coverage",
-    "test:service": "MOCHA_GROUP=service run --top-level mocha './test/service/unit/*.spec.js' && wdio run ./test/service/wdio.conf.js && wdio run ./test/service/no-config/wdio.no-config.conf.js && wdio run ./test/service/vg/wdio.vg.conf.js",
+    "test:service": "MOCHA_GROUP=service run --top-level mocha './test/service/unit/*.spec.js' && wdio run ./test/service/wdio.conf.js --autoCompileOpts.autoCompile=0 && wdio run ./test/service/no-config/wdio.no-config.conf.js --autoCompileOpts.autoCompile=0 && wdio run ./test/service/vg/wdio.vg.conf.js --autoCompileOpts.autoCompile=0",
     "test:coverage": "APPLITOOLS_BATCH_NAME='JS Coverage Tests: eyes-webdriverio' APPLITOOLS_BATCH_ID=$(uuidgen) MOCHA_GROUP=coverage run --top-level mocha './test/generated-coverage/*.spec.js' --parallel --jobs ${MOCHA_JOBS:-15} --exit",
     "setup": "run --top-level browsers:setup",
-    "up:framework": "run --top-level add-silent webdriverio"
+    "up:framework": "yarn add --dev --caret webdriverio${APPLITOOLS_FRAMEWORK_VERSION:+@$APPLITOOLS_FRAMEWORK_VERSION}"
   },
   "dependencies": {
-    "@applitools/eyes": "1.7.2",
-    "@applitools/spec-driver-webdriverio": "1.5.10"
+    "@applitools/driver": "1.13.5",
+    "@applitools/eyes": "1.7.3",
+    "@applitools/spec-driver-webdriver": "1.0.42"
   },
   "devDependencies": {
     "@applitools/api-extractor": "^1.2.21",
-    "@applitools/bongo": "^5.4.3",
-    "@applitools/generic": "^3.3.8",
+    "@applitools/bongo": "^5.6.1",
+    "@applitools/generic": "^3.3.9",
     "@applitools/test-utils": "^1.5.17",
     "@types/node": "^16.18.14",
-    "@wdio/cli": "^8.3.9",
-    "@wdio/dot-reporter": "^8.3.0",
-    "@wdio/globals": "^8.3.9",
-    "@wdio/local-runner": "^8.3.9",
-    "@wdio/mocha-framework": "^8.3.0",
-    "chromedriver": "^114.0.3",
+    "@wdio/cli": "^8.14.4",
+    "@wdio/dot-reporter": "^8.14.0",
+    "@wdio/globals": "^8.14.3",
+    "@wdio/local-runner": "^8.14.3",
+    "@wdio/mocha-framework": "^8.14.0",
+    "chromedriver": "^115.0.1",
+    "devtools": "^8.15.4",
     "expect-webdriverio": "^4.0.1",
     "geckodriver": "^1.20.0",
-    "webdriverio": "^8.10.7"
+    "webdriverio": "^8.15.4"
   },
   "peerDependencies": {
     "webdriverio": ">=5.0.0"

package/types/index.d.ts

@@ -1,7 +1,13 @@
 export type Driver = Applitools.WebdriverIO.Browser & { __applitoolsBrand?: undefined; };
-export type Element = (Applitools.WebdriverIO.Element | { ELEMENT: string; } | { 'element-6066-11e4-a52e-4f735466cecf': string; }) & { __applitoolsBrand?: undefined; };
-export type Selector = (Applitools.WebdriverIO.Selector | { using: string; value: string; }) & { __applitoolsBrand?: undefined; };
-export type SpecType = { driver: Driver; context: Driver; element: Element; selector: Selector; };
+export type Element = Applitools.WebdriverIO.Element & { __applitoolsBrand?: undefined; };
+export type Selector = Applitools.WebdriverIO.Selector & { __applitoolsBrand?: undefined; };
+export type SpecType = {
+    driver: Driver;
+    context: Driver;
+    element: Element;
+    selector: Selector;
+    secondary: never;
+};
 export class Eyes {
     static setViewportSize: (driver: Driver, viewportSize: RectangleSize) => Promise<void>;
     static getExecutionCloudUrl(config?: undefined | ConfigurationPlain): Promise<string>;
@@ -351,7 +357,7 @@ export type TargetAutomation = {
     webview(webview?: undefined | string): CheckSettingsAutomation;
     webview(webview?: undefined | boolean): CheckSettingsAutomation;
 };
-export const Target: TargetImage & TargetAutomation;
+export type Target = TargetImage & TargetAutomation;
 export type OCRRegion = { target: Element | RegionPlain | EyesSelector<Selector>; hint?: undefined | string; minMatch?: undefined | number; language?: undefined | string; };
 export type ConfigurationPlain = {
     debugScreenshots?: undefined | { save: boolean; path?: undefined | string; prefix?: undefined | string; };
@@ -664,7 +670,7 @@ export class BatchClose {
     setProxy(proxy: ProxySettingsPlain): BatchClose;
 }
 export const closeBatch: (options: { batchIds: Array<string>; serverUrl: string; apiKey: string; proxy?: undefined | ProxySettingsPlain; }) => Promise<void>;
-export type BrowserTypePlain = "chrome" | "chrome-one-version-back" | "chrome-two-versions-back" | "firefox" | "firefox-one-version-back" | "firefox-two-versions-back" | "ie" | "ie10" | "edge" | "edgechromium" | "edgelegacy" | "edgechromium-one-version-back" | "edgechromium-two-versions-back" | "safari" | "safari-earlyaccess" | "safari-one-version-back" | "safari-two-versions-back";
+export type BrowserTypePlain = "chrome" | "firefox" | "chrome-one-version-back" | "chrome-two-versions-back" | "firefox-one-version-back" | "firefox-two-versions-back" | "ie" | "ie10" | "edge" | "edgechromium" | "edgelegacy" | "edgechromium-one-version-back" | "edgechromium-two-versions-back" | "safari" | "safari-earlyaccess" | "safari-one-version-back" | "safari-two-versions-back";
 export enum BrowserType {
     CHROME = 'chrome',
     CHROME_ONE_VERSION_BACK = 'chrome-one-version-back',

package/types/service.d.ts

@@ -1,34 +1,20 @@
-import type {
-  Element,
-  Selector,
-  Eyes,
-  ConfigurationPlain,
-  Configuration,
-  CheckSettingsPlain,
-  CheckSettings,
-  TestResults,
-  TestResultsSummary,
-} from './index'
-  
-declare global {
-  namespace WebdriverIO {
-    interface ServiceOption extends ConfigurationPlain {
-      useVisualGrid?: boolean
-      concurrency?: number
-      eyes?: ServiceOption
-    }
-    interface Browser {
-      getEyes(): Eyes
-      eyesCheck(checkSettings?: CheckSettingsPlain): Promise<void>
-      eyesCheck(title: string, checkSettings: CheckSettings): Promise<void>
-      eyesSetScrollRootElement(element: Element | Selector): void
-      eyesAddProperty(key: string, value: string): void
-      eyesClearProperties(): void
-      eyesGetTestResults(): Promise<TestResults>
-      eyesSetConfiguration(configuration: ConfigurationPlain): void
-      eyesGetConfiguration(): Configuration
-      eyesGetIsOpen(): boolean
-      eyesGetAllTestResults(throwErr: boolean): Promise<TestResultsSummary>
-    }
-  }
+import { ConfigurationPlain } from './api';
+interface EyesServiceOptions extends ConfigurationPlain {
+    useVisualGrid?: boolean;
+    concurrency?: number;
+    eyes?: EyesServiceOptions;
 }
+declare class EyesService {
+    private _eyes;
+    private _appName?;
+    private _testResults?;
+    constructor({ useVisualGrid, concurrency, eyes, ...config }: EyesServiceOptions);
+    private _eyesOpen;
+    private _eyesClose;
+    beforeSession(config: Record<string, unknown>): void;
+    before(): void;
+    beforeTest(test: any): void;
+    afterTest(): Promise<void>;
+    after(): Promise<void>;
+}
+export = EyesService;

package/types/v5-async.d.ts

@@ -1 +1,32 @@
-/// <reference types="@applitools/spec-driver-webdriverio/v5/async"/>
+// @ts-nocheck
+
+declare namespace Applitools {
+  namespace WebdriverIO {
+    interface Browser extends globalThis.WebdriverIOAsync.BrowserObject {
+      isDevTools: boolean,
+      getSession(): Promise<Record<string, any>>
+      getPuppeteer(): Promise<any>
+      getUrl(): Promise<string>
+      getTitle(): Promise<string>
+      getOrientation(): Promise<string>
+      setOrientation(orientation: string): Promise<void>
+      getSystemBars(): Promise<object[]>
+      getContext(): Promise<string>
+      getElementAttribute(elementId: string, attr: string): Promise<string>
+      getWindowRect(): Promise<{x: number; y: number; width: number; height: number}>
+      getWindowPosition(): Promise<{x: number; y: number}>
+      _getWindowSize(): Promise<{width: number; height: number}>
+      setWindowRect(x: number, y: number, width: number, height: number): Promise<void>
+      setWindowPosition(x: number, y: number): Promise<void>
+      _setWindowSize(width: number, height: number): Promise<void>
+      switchToFrame(frameId?: any): Promise<void>
+      switchToParentFrame(): Promise<void>
+      takeScreenshot(): Promise<string>
+      sendCommandAndGetResult(command: string, params: Record<string, any>): Promise<Record<string, any>>
+      switchContext(id: string): Promise<void>
+      getContexts(): Promise<string[]>
+    }
+    interface Element extends globalThis.WebdriverIOAsync.Element {}
+    type Selector = string | ((element: HTMLElement) => HTMLElement) | ((element: HTMLElement) => HTMLElement[])
+  }
+}

package/types/v5-sync.d.ts

@@ -1 +1,32 @@
-/// <reference types="@applitools/spec-driver-webdriverio/v5/sync"/>
+// @ts-nocheck
+
+declare namespace Applitools {
+  namespace WebdriverIO {
+    interface Browser extends globalThis.WebdriverIO.BrowserObject {
+      isDevTools: boolean
+      getSession(): Record<string, any>
+      getPuppeteer(): any
+      getUrl(): string
+      getTitle(): string
+      getOrientation(): string
+      setOrientation(orientation: string): void
+      getSystemBars(): object[]
+      getContext(): string
+      getElementAttribute(elementId: string, attr: string): string
+      getWindowRect(): {x: number; y: number; width: number; height: number}
+      getWindowPosition(): {x: number; y: number}
+      _getWindowSize(): {width: number; height: number}
+      setWindowRect(x: number, y: number, width: number, height: number): void
+      setWindowPosition(x: number, y: number): void
+      _setWindowSize(width: number, height: number): void
+      switchToFrame(frameId?: any): void
+      switchToParentFrame(): void
+      takeScreenshot(): string
+      sendCommandAndGetResult(command: string, params: Record<string, any>): Record<string, any>
+      switchContext(id: string): void
+      getContexts(): string[]
+    }
+    interface Element extends globalThis.WebdriverIO.Element {}
+    type Selector = string | ((element: HTMLElement) => HTMLElement) | ((element: HTMLElement) => HTMLElement[])
+  }
+}

package/types/v6.d.ts

@@ -1 +1,9 @@
-/// <reference types="@applitools/spec-driver-webdriverio/v6"/>
+// @ts-nocheck
+
+declare namespace Applitools {
+  namespace WebdriverIO {
+    interface Browser extends globalThis.WebdriverIO.BrowserObject {}
+    interface Element extends globalThis.WebdriverIO.Element {}
+    type Selector = string | ((element: HTMLElement) => HTMLElement) | ((element: HTMLElement) => HTMLElement[])
+  }
+}

package/types/v7.d.ts

@@ -1 +1,9 @@
-/// <reference types="@applitools/spec-driver-webdriverio/v7"/>
+// @ts-nocheck
+
+declare namespace Applitools {
+  namespace WebdriverIO {
+    interface Browser extends globalThis.WebdriverIO.Browser {}
+    interface Element extends globalThis.WebdriverIO.Element {}
+    type Selector = string | ((element: HTMLElement) => HTMLElement) | ((element: HTMLElement) => HTMLElement[])
+  }
+}

package/types/v8.d.ts

@@ -1 +1,9 @@
-/// <reference types="@applitools/spec-driver-webdriverio/v8"/>
+// @ts-nocheck
+
+declare namespace Applitools {
+  namespace WebdriverIO {
+    interface Browser extends globalThis.WebdriverIO.Browser {}
+    interface Element extends globalThis.WebdriverIO.Element {}
+    type Selector = string | import('webdriverio').ElementFunction | import('webdriverio').CustomStrategyReference
+  }
+}