@applitools/eyes-webdriverio 5.32.12 → 5.34.2

package/dist/spec-driver.js

@@ -6,398 +6,8 @@ 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.wrapDriver = exports.build = exports.performAction = exports.getElementText = exports.getElementAttribute = exports.getElementRegion = exports.getOrientation = exports.waitUntilDisplayed = exports.scrollIntoView = exports.hover = exports.type = 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.extractSelector = exports.transformSelector = exports.transformElement = exports.isSelector = exports.isElement = exports.isDriver = void 0;
-const utils = __importStar(require("@applitools/utils"));
-const legacy = __importStar(require("./legacy"));
-const LEGACY_ELEMENT_ID = 'ELEMENT';
-const ELEMENT_ID = 'element-6066-11e4-a52e-4f735466cecf';
-function extractElementId(element) {
-    if (utils.types.has(element, 'elementId'))
-        return element.elementId;
-    else if (utils.types.has(element, ELEMENT_ID))
-        return element[ELEMENT_ID];
-    else if (utils.types.has(element, LEGACY_ELEMENT_ID))
-        return element[LEGACY_ELEMENT_ID];
-}
-function transformArgument(arg) {
-    if (!arg)
-        return [];
-    const elements = [];
-    const argWithElementMarkers = transform(arg);
-    return [argWithElementMarkers, ...elements];
-    function transform(arg) {
-        if (isElement(arg)) {
-            elements.push(arg);
-            return { isElement: true };
-        }
-        else if (utils.types.isArray(arg)) {
-            return arg.map(transform);
-        }
-        else if (utils.types.isObject(arg)) {
-            return Object.entries(arg).reduce((object, [key, value]) => {
-                return Object.assign(object, { [key]: transform(value) });
-            }, {});
-        }
-        else {
-            return arg;
-        }
-    }
-}
-function scriptRunner(script, arg, ...elements) {
-    const func = new Function(script.startsWith('function') ? `return (${script}).apply(null, arguments)` : script);
-    return func(transform(arg));
-    function transform(arg) {
-        if (!arg) {
-            return arg;
-        }
-        else if (arg.isElement) {
-            return elements.shift();
-        }
-        else if (Array.isArray(arg)) {
-            return arg.map(transform);
-        }
-        else if (typeof arg === 'object') {
-            return Object.entries(arg).reduce((object, [key, value]) => {
-                return Object.assign(object, { [key]: transform(value) });
-            }, {});
-        }
-        else {
-            return arg;
-        }
-    }
-}
-function isDriver(browser) {
-    if (!browser)
-        return false;
-    return browser.constructor.name === 'Browser';
-}
-exports.isDriver = isDriver;
-function isElement(element) {
-    if (!element)
-        return false;
-    return Boolean(element.elementId || element[ELEMENT_ID] || element[LEGACY_ELEMENT_ID]);
-}
-exports.isElement = isElement;
-function isSelector(selector) {
-    return utils.types.isString(selector) || utils.types.isFunction(selector) || selector instanceof legacy.By;
-}
-exports.isSelector = isSelector;
-function transformElement(element) {
-    const elementId = extractElementId(element);
-    return { [ELEMENT_ID]: elementId, [LEGACY_ELEMENT_ID]: elementId };
-}
-exports.transformElement = transformElement;
-function transformSelector(selector) {
-    if (utils.types.has(selector, 'selector')) {
-        if (!utils.types.has(selector, 'type'))
-            return selector.selector;
-        if (selector.type === 'css')
-            return `css selector:${selector.selector}`;
-        else
-            return `${selector.type}:${selector.selector}`;
-    }
-    return selector;
-}
-exports.transformSelector = transformSelector;
-function extractSelector(element) {
-    return element.selector;
-}
-exports.extractSelector = extractSelector;
-function isStaleElementError(error) {
-    if (!error)
-        return false;
-    const errOrResult = error.originalError || error;
-    return errOrResult instanceof Error && errOrResult.name === 'stale element reference';
-}
-exports.isStaleElementError = isStaleElementError;
-async function isEqualElements(_browser, element1, element2) {
-    if (!element1 || !element2)
-        return false;
-    const elementId1 = extractElementId(element1);
-    const elementId2 = extractElementId(element2);
-    return elementId1 === elementId2;
-}
-exports.isEqualElements = isEqualElements;
-async function executeScript(browser, script, arg) {
-    if (browser.isDevTools) {
-        script = utils.types.isString(script) ? script : script.toString();
-        return browser.execute(scriptRunner, script, ...transformArgument(arg));
-    }
-    else {
-        return browser.execute(script, arg);
-    }
-}
-exports.executeScript = executeScript;
-async function mainContext(browser) {
-    await browser.switchToFrame(null);
-    return browser;
-}
-exports.mainContext = mainContext;
-async function parentContext(browser) {
-    await browser.switchToParentFrame();
-    return browser;
-}
-exports.parentContext = parentContext;
-async function childContext(browser, element) {
-    await browser.switchToFrame(element);
-    return browser;
-}
-exports.childContext = childContext;
-async function findElement(browser, selector, parent) {
-    selector = selector instanceof legacy.By ? selector.toString() : selector;
-    const root = parent ? await browser.$(parent) : browser;
-    const element = await root.$(selector);
-    return !utils.types.has(element, 'error') ? element : null;
-}
-exports.findElement = findElement;
-async function findElements(browser, selector, parent) {
-    selector = selector instanceof legacy.By ? selector.toString() : selector;
-    const root = parent ? await browser.$(parent) : browser;
-    const elements = await root.$$(selector);
-    return Array.from(elements);
-}
-exports.findElements = findElements;
-async function getWindowSize(browser) {
-    if (utils.types.isFunction(browser.getWindowRect)) {
-        const rect = await browser.getWindowRect();
-        return { width: rect.width, height: rect.height };
-    }
-    else {
-        return browser.getWindowSize();
-    }
-}
-exports.getWindowSize = getWindowSize;
-async function setWindowSize(browser, size) {
-    if (utils.types.isFunction(browser.setWindowRect)) {
-        await browser.setWindowRect(0, 0, size.width, size.height);
-    }
-    else {
-        await browser.setWindowPosition(0, 0);
-        await browser.setWindowSize(size.width, size.height);
-    }
-}
-exports.setWindowSize = setWindowSize;
-async function getDriverInfo(browser) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-    const capabilities = browser.capabilities;
-    const info = {
-        sessionId: browser.sessionId,
-        isMobile: browser.isMobile,
-        isNative: browser.isMobile && !capabilities.browserName,
-        deviceName: (_b = (_a = capabilities.desired) === null || _a === void 0 ? void 0 : _a.deviceName) !== null && _b !== void 0 ? _b : capabilities.deviceName,
-        platformName: (_d = (_c = capabilities.platformName) !== null && _c !== void 0 ? _c : capabilities.platform) !== null && _d !== void 0 ? _d : (_e = capabilities.desired) === null || _e === void 0 ? void 0 : _e.platformName,
-        platformVersion: capabilities.platformVersion,
-        browserName: (_f = capabilities.browserName) !== null && _f !== void 0 ? _f : (_g = capabilities.desired) === null || _g === void 0 ? void 0 : _g.browserName,
-        browserVersion: (_h = capabilities.browserVersion) !== null && _h !== void 0 ? _h : capabilities.version,
-        pixelRatio: capabilities.pixelRatio,
-    };
-    if (info.isNative) {
-        const capabilities = utils.types.has(browser.capabilities, ['pixelRatio', 'viewportRect', 'statBarHeight'])
-            ? browser.capabilities
-            : await browser.getSession();
-        info.pixelRatio = capabilities.pixelRatio;
-        try {
-            const { statusBar, navigationBar } = (await browser.getSystemBars());
-            info.statusBarHeight = statusBar.visible ? statusBar.height : 0;
-            info.navigationBarHeight = navigationBar.visible ? navigationBar.height : 0;
-        }
-        catch (err) {
-            info.statusBarHeight = (_l = (_j = capabilities.statBarHeight) !== null && _j !== void 0 ? _j : (_k = capabilities.viewportRect) === null || _k === void 0 ? void 0 : _k.top) !== null && _l !== void 0 ? _l : 0;
-            info.navigationBarHeight = 0;
-        }
-    }
-    return info;
-}
-exports.getDriverInfo = getDriverInfo;
-async function getTitle(browser) {
-    return browser.getTitle();
-}
-exports.getTitle = getTitle;
-async function getUrl(browser) {
-    return browser.getUrl();
-}
-exports.getUrl = getUrl;
-async function visit(browser, url) {
-    await browser.url(url);
-}
-exports.visit = visit;
-async function takeScreenshot(browser) {
-    if (browser.isDevTools) {
-        const puppeteer = await browser.getPuppeteer();
-        const [page] = await puppeteer.pages();
-        const scr = await page._client.send('Page.captureScreenshot');
-        return scr.data;
-    }
-    return browser.takeScreenshot();
-}
-exports.takeScreenshot = takeScreenshot;
-async function click(browser, element) {
-    if (isSelector(element))
-        element = await findElement(browser, element);
-    const extendedElement = await browser.$(element);
-    await extendedElement.click();
-}
-exports.click = click;
-async function type(browser, element, keys) {
-    if (isSelector(element))
-        element = await findElement(browser, element);
-    const extendedElement = await browser.$(element);
-    await extendedElement.setValue(keys);
-}
-exports.type = type;
-async function hover(browser, element) {
-    if (isSelector(element))
-        element = await findElement(browser, element);
-    if (browser.isDevTools) {
-        const { x, y, width, height } = await browser.execute((element) => {
-            const rect = element.getBoundingClientRect();
-            return { x: rect.x, y: rect.y, width: rect.width, height: rect.height };
-        }, element);
-        const puppeteer = await browser.getPuppeteer();
-        const [page] = await puppeteer.pages();
-        await page.mouse.move(x + width / 2, y + height / 2);
-    }
-    else {
-        const extendedElement = await browser.$(element);
-        await extendedElement.moveTo();
-    }
-}
-exports.hover = hover;
-async function scrollIntoView(browser, element, align = false) {
-    if (isSelector(element))
-        element = await findElement(browser, element);
-    const extendedElement = await browser.$(element);
-    await extendedElement.scrollIntoView(align);
-}
-exports.scrollIntoView = scrollIntoView;
-async function waitUntilDisplayed(browser, selector, timeout) {
-    const element = await findElement(browser, selector);
-    if (process.env.APPLITOOLS_WEBDRIVERIO_MAJOR_VERSION === '5') {
-        await element.waitForDisplayed(timeout);
-    }
-    else {
-        await element.waitForDisplayed({ timeout });
-    }
-}
-exports.waitUntilDisplayed = waitUntilDisplayed;
-async function getOrientation(browser) {
-    const orientation = await browser.getOrientation();
-    return orientation.toLowerCase();
-}
-exports.getOrientation = getOrientation;
-async function getElementRegion(browser, element) {
-    const extendedElement = await browser.$(element);
-    if (utils.types.isFunction(extendedElement, 'getRect')) {
-        return extendedElement.getRect();
-    }
-    else {
-        const region = { x: 0, y: 0, width: 0, height: 0 };
-        if (utils.types.isFunction(extendedElement.getLocation)) {
-            const location = await extendedElement.getLocation();
-            region.x = location.x;
-            region.y = location.y;
-        }
-        if (utils.types.isFunction(extendedElement.getSize)) {
-            const size = await extendedElement.getSize();
-            region.width = size.width;
-            region.height = size.height;
-        }
-        return region;
-    }
-}
-exports.getElementRegion = getElementRegion;
-async function getElementAttribute(browser, element, attr) {
-    return browser.getElementAttribute(extractElementId(element), attr);
-}
-exports.getElementAttribute = getElementAttribute;
-async function getElementText(browser, element) {
-    const extendedElement = await browser.$(element);
-    return extendedElement.getText();
-}
-exports.getElementText = getElementText;
-async function performAction(browser, steps) {
-    return browser.touchAction(steps);
-}
-exports.performAction = performAction;
-const browserOptionsNames = {
-    chrome: 'goog:chromeOptions',
-    firefox: 'moz:firefoxOptions',
-};
-async function build(env) {
-    const webdriverio = require('webdriverio');
-    const chromedriver = require('chromedriver');
-    const parseEnv = require('@applitools/test-utils/src/parse-env');
-    const { protocol, browser = '', capabilities, url, attach, proxy, configurable = true, args = [], headless, logLevel = 'silent', } = parseEnv(env, process.env.APPLITOOLS_WEBDRIVERIO_PROTOCOL);
-    const options = {
-        capabilities: Object.assign({ browserName: browser }, capabilities),
-        logLevel,
-    };
-    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 webdriverio.remote(options);
-    return [driver, () => driver.deleteSession().then(() => chromedriver.stop())];
-}
-exports.build = build;
-exports.wrapDriver = legacy.wrapDriver;
+__exportStar(require("@applitools/spec-driver-webdriverio"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/eyes-webdriverio",
-  "version": "5.32.12",
+  "version": "5.34.2",
   "description": "Applitools Eyes SDK for WebdriverIO",
   "keywords": [
     "eyes-webdriverio",
@@ -19,7 +19,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git@github.com:applitools/eyes.sdk.javascript1.git"
+    "url": "git@github.com:applitools/eyes.sdk.javascript1.git",
+    "directory": "packages/eyes-webdriverio-5"
   },
   "license": "SEE LICENSE IN LICENSE",
   "author": {
@@ -28,27 +29,63 @@
   },
   "main": "./dist/index.js",
   "types": "./types/index.d.ts",
-  "directories": {
-    "lib": "./src",
-    "example": "./example",
-    "test": "./test"
+  "exports": {
+    ".": {
+      "default": "./dist/index.js",
+      "types": "./types/index.d.ts"
+    },
+    "./service": {
+      "default": "./dist/service.js",
+      "types": "./types/service.d.ts"
+    },
+    "./v7": {
+      "types": "./types/v7.d.ts"
+    },
+    "./v6": {
+      "types": "./types/v6.d.ts"
+    },
+    "./v5": {
+      "types": "./types/v5-async.d.ts"
+    },
+    "./v5/async": {
+      "types": "./types/v5-async.d.ts"
+    },
+    "./v5/sync": {
+      "types": "./types/v5-sync.d.ts"
+    }
+  },
+  "typesVersions": {
+    "*": {
+      "service": [
+        "./types/service.d.ts"
+      ],
+      "v7": [
+        "./types/v7.d.ts"
+      ],
+      "v6": [
+        "./types/v6.d.ts"
+      ],
+      "v5": [
+        "./types/v5-async.d.ts"
+      ],
+      "v5/async": [
+        "./types/v5-async.d.ts"
+      ],
+      "v5/sync": [
+        "./types/v5-sync.d.ts"
+      ]
+    }
   },
   "files": [
     "dist",
     "types"
   ],
   "scripts": {
-    "lint": "eslint '**/*.js'",
-    "build": "yarn build:tsconfig && yarn build:dist && yarn build:types",
-    "build:tsconfig": "tsconfig.js --once",
-    "build:tsconfig:6": "APPLITOOLS_WEBDRIVERIO_MAJOR_VERSION=6 tsconfig.js --once",
-    "build:tsconfig:5": "APPLITOOLS_WEBDRIVERIO_MAJOR_VERSION=5 tsconfig.js --once",
-    "build:dist": "tsc",
-    "build:types": "api-extractor ./src/index.ts --out ./types/index.d.ts --external-globals WebdriverIO Applitools",
+    "lint": "eslint '**/*.ts'",
+    "build": "ttsc --project tsconfig$([ ! -z $APPLITOOLS_WEBDRIVERIO_MAJOR_VERSION ] && echo .v$APPLITOOLS_WEBDRIVERIO_MAJOR_VERSION).json",
     "generate:tests": "coverage-tests generate https://raw.githubusercontent.com/applitools/sdk.coverage.tests/master/js/config.js --name 'eyes.webdriverio.javascript5'",
-    "test": "yarn build:tsconfig && yarn build:dist && yarn test:it && yarn test:service && yarn test:coverage",
-    "test:it": "mocha --exit --no-timeouts -r ts-node/register ./test/it/*.ts",
-    "test:service": "mocha ./test/service/unit/*.spec.js && wdio \"test/service/wdio.conf.js\" && wdio \"test/service/no-config/wdio.no-config.conf.js\" && wdio \"test/service/vg/wdio.vg.conf.js\"",
+    "test": "yarn test:service && yarn test:coverage",
+    "test:service": "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:coverage": "yarn generate:tests && APPLITOOLS_BATCH_NAME='JS Coverage Tests: eyes-webdriverio-5' APPLITOOLS_BATCH_ID=$(uuidgen) XUNIT_FILE=coverage-test-report.xml mocha --config .mocharc.cvg.js",
     "test:coverage:wd": "APPLITOOLS_WEBDRIVERIO_PROTOCOL=wd yarn test:coverage",
     "test:coverage:cdp": "APPLITOOLS_WEBDRIVERIO_PROTOCOL=cdp yarn test:coverage",
@@ -57,7 +94,7 @@
     "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='wdio wdio+cdp wdio@6 wdio@5' -f links='eyes-sdk-core eyes-api types test-utils utils driver snippets screenshoter sdk-shared visual-grid-client' -f linking-depth=3",
+    "gh:test": "gh workflow run test.yml --ref $(git rev-parse --abbrev-ref HEAD) -f packages='wdio wdio+cdp wdio@6 wdio@5' -f links='types test-utils sdk-shared eyes-sdk-core visual-grid-client eyes-api spec-driver-webdriverio utils driver snippets screenshoter' -f linking-depth=3",
     "gh:publish": "gh workflow run publish.yml --ref $(git rev-parse --abbrev-ref HEAD) -f packages='wdio'",
     "preversion": "bongo preversion && yarn build",
     "version": "bongo version",
@@ -69,30 +106,26 @@
     }
   },
   "dependencies": {
-    "@applitools/dom-snapshot": "4.5.10",
-    "@applitools/eyes-api": "1.1.4",
-    "@applitools/eyes-sdk-core": "12.23.18",
-    "@applitools/utils": "1.2.3",
-    "@applitools/visual-grid-client": "15.8.37"
+    "@applitools/eyes-api": "1.1.6",
+    "@applitools/eyes-sdk-core": "12.24.2",
+    "@applitools/spec-driver-webdriverio": "1.2.1",
+    "@applitools/visual-grid-client": "15.8.47"
   },
   "devDependencies": {
-    "@applitools/api-extractor": "1.1.3",
+    "@applitools/api-extractor": "1.2.3",
     "@applitools/scripts": "1.0.1",
-    "@applitools/sdk-coverage-tests": "^2.3.15",
-    "@applitools/sdk-release-kit": "^0.13.3",
-    "@applitools/sdk-shared": "0.9.6",
+    "@applitools/sdk-coverage-tests": "^2.3.16",
+    "@applitools/sdk-release-kit": "^0.13.4",
+    "@applitools/sdk-shared": "0.9.9",
     "@applitools/test-utils": "1.0.9",
     "@types/mocha": "^9.0.0",
     "@typescript-eslint/eslint-plugin": "^4.15.1",
     "@typescript-eslint/parser": "^4.15.1",
-    "@wdio/cli": "5.18.6",
-    "@wdio/dot-reporter": "5.18.6",
-    "@wdio/local-runner": "5.18.6",
-    "@wdio/mocha-framework": "5.18.6",
-    "@wdio/sync": "5.18.6",
-    "chai": "^4.2.0",
-    "chai-as-promised": "^7.1.1",
-    "chromedriver": "^92.0.1",
+    "@wdio/cli": "^7.16.5",
+    "@wdio/dot-reporter": "^7.16.4",
+    "@wdio/local-runner": "^7.16.5",
+    "@wdio/mocha-framework": "^7.16.4",
+    "chromedriver": "^95.0.0",
     "eslint": "^7.9.0",
     "eslint-config-prettier": "^7.2.0",
     "eslint-plugin-mocha-no-only": "^1.1.1",
@@ -102,11 +135,10 @@
     "husky": "^4.3.8",
     "mocha": "^8.0.1",
     "prettier": "^2.1.2",
-    "shared-examples-for": "^0.1.3",
     "spec-xunit-file": "0.0.1-3",
     "ts-node": "^10.2.1",
-    "tsconfig.js": "^3.0.0",
-    "typescript": "^4.1.5",
+    "ttypescript": "^1.5.12",
+    "typescript": "^4.5.1-rc",
     "webdriverio": "^7.5.2"
   },
   "peerDependencies": {