@applitools/eyes-nightwatch 1.16.2 → 1.16.4

package/CHANGELOG.md

@@ -1,5 +1,208 @@
 # Changelog
 
+## [1.16.4](https://github.com/applitools/eyes.sdk.javascript1/compare/js/eyes-nightwatch@1.16.3...js/eyes-nightwatch@1.16.4) (2023-08-30)
+
+
+### Dependencies
+
+* @applitools/utils bumped to 1.5.2
+  #### Bug Fixes
+
+  * fixed some types ([498b1d7](https://github.com/applitools/eyes.sdk.javascript1/commit/498b1d7c547df04773b64b66ee39cccb402c093e))
+* @applitools/nml-client bumped to 1.5.9
+  #### Bug Fixes
+
+  * update broker url when server respond with error ([#1882](https://github.com/applitools/eyes.sdk.javascript1/issues/1882)) ([ab5a6ae](https://github.com/applitools/eyes.sdk.javascript1/commit/ab5a6ae8976b061bda8b56a9cc11c149e47d6dea))
+
+
+
+* @applitools/core bumped to 3.10.0
+  #### Features
+
+  * allowed running multiple classic test with different devices for applitoolsified native apps  ([#1891](https://github.com/applitools/eyes.sdk.javascript1/issues/1891)) ([a84311f](https://github.com/applitools/eyes.sdk.javascript1/commit/a84311f88e6f532268543a96f841ae5ad87d5659))
+
+
+
+* @applitools/eyes bumped to 1.8.0
+  #### Features
+
+  * added more iOS devices ([a84311f](https://github.com/applitools/eyes.sdk.javascript1/commit/a84311f88e6f532268543a96f841ae5ad87d5659))
+
+
+
+* @applitools/logger bumped to 2.0.9
+
+* @applitools/socket bumped to 1.1.9
+
+* @applitools/req bumped to 1.5.4
+
+* @applitools/image bumped to 1.1.4
+
+* @applitools/spec-driver-webdriver bumped to 1.0.43
+
+* @applitools/spec-driver-selenium bumped to 1.5.57
+
+* @applitools/spec-driver-puppeteer bumped to 1.1.74
+
+* @applitools/driver bumped to 1.13.6
+
+* @applitools/screenshoter bumped to 3.8.9
+
+* @applitools/tunnel-client bumped to 1.2.1
+
+* @applitools/ufg-client bumped to 1.7.2
+
+* @applitools/ec-client bumped to 1.7.6
+
+* @applitools/core-base bumped to 1.5.2
+
+
+## [1.16.3](https://github.com/applitools/eyes.sdk.javascript1/compare/js/eyes-nightwatch@1.16.2...js/eyes-nightwatch@1.16.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))
+
+
+
+
 ## [1.16.2](https://github.com/applitools/eyes.sdk.javascript1/compare/js/eyes-nightwatch@1.16.1...js/eyes-nightwatch@1.16.2) (2023-08-10)
 
 

package/dist/api.js

@@ -31,8 +31,11 @@ const extract_environment_1 = require("./extract-environment");
 const eyes = __importStar(require("@applitools/eyes"));
 const spec = __importStar(require("./spec-driver"));
 __exportStar(require("@applitools/eyes"), exports);
-const environment = (0, extract_environment_1.extractEnvironment)();
-const sdk = { spec, agentId: `eyes.nightwatch/${require('../package.json').version}`, environment };
+const sdk = {
+    spec: spec,
+    agentId: `eyes.nightwatch/${require('../package.json').version}`,
+    environment: (0, extract_environment_1.extractEnvironment)(),
+};
 class Eyes extends eyes.Eyes {
 }
 exports.Eyes = Eyes;
@@ -40,19 +43,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: spec,
-};
-exports.Target = { ...eyes.Target, spec: 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/spec-driver.js

@@ -26,7 +26,7 @@ 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.build = exports.findElements = exports.findElement = exports.untransformSelector = exports.transformSelector = exports.transformElement = exports.transformDriver = exports.isSelector = exports.isShadowRoot = exports.isElement = exports.isDriver = void 0;
+exports.build = exports.findElements = exports.findElement = exports.toSimpleCommonSelector = exports.toSelector = exports.toElement = exports.toDriver = 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);
@@ -34,32 +34,20 @@ const byHash = ['className', 'css', 'id', 'js', 'linkText', 'name', 'partialLink
 function isByHashSelector(selector) {
     return byHash.includes(Object.keys(selector)[0]);
 }
-const SHADOW_ROOT_ID = 'shadow-6066-11e4-a52e-4f735466cecf';
-function extractShadowRootId(shadowRoot) {
-    var _a;
-    return ((_a = shadowRoot[SHADOW_ROOT_ID]) !== null && _a !== void 0 ? _a : shadowRoot.id_);
-}
-function transformShadowRoot(shadowRoot) {
-    return { [SHADOW_ROOT_ID]: extractShadowRootId(shadowRoot) };
-}
 const XPATH_SELECTOR_START = ['/', '(', '../', './', '*/'];
 function isXpathSelector(selector) {
     return XPATH_SELECTOR_START.some(start => selector.startsWith(start));
 }
-function isDriver(driver) {
-    return spec.isDriver(driver) || utils.types.instanceOf(driver, 'NightwatchAPI');
-}
-exports.isDriver = isDriver;
-function isElement(element) {
-    return utils.types.has(element, 'value') ? spec.isElement(element.value) : spec.isElement(element);
+function isSecondaryDriver(driver) {
+    return utils.types.instanceOf(driver, 'NightwatchAPI') || spec.isSecondaryDriver(driver);
 }
-exports.isElement = isElement;
-function isShadowRoot(shadowRoot) {
-    if (!shadowRoot)
-        return false;
-    return spec.isShadowRoot(shadowRoot) || Boolean(extractShadowRootId(shadowRoot));
+exports.isSecondaryDriver = isSecondaryDriver;
+function isSecondaryElement(element) {
+    return ((utils.types.has(element, 'value') && spec.isElement(element.value)) ||
+        utils.types.has(element, 'webElement') ||
+        utils.types.instanceOf(element, 'WebElement'));
 }
-exports.isShadowRoot = isShadowRoot;
+exports.isSecondaryElement = isSecondaryElement;
 function isSelector(selector) {
     if (!selector)
         return false;
@@ -71,30 +59,37 @@ function isSelector(selector) {
         utils.types.instanceOf(selector, 'RelativeBy'));
 }
 exports.isSelector = isSelector;
-function transformDriver(driver) {
+function toDriver(driver) {
     var _a, _b, _c, _d;
     if (spec.isDriver(driver))
         return driver;
+    if (spec.isSecondaryDriver(driver))
+        return spec.toDriver(driver);
     const selenium = driver.options.selenium;
     const webdriver = driver.options.webdriver;
     const ssl = (_a = selenium === null || selenium === void 0 ? void 0 : selenium.ssl) !== null && _a !== void 0 ? _a : webdriver === null || webdriver === void 0 ? void 0 : webdriver.ssl;
     const hostname = (_b = selenium === null || selenium === void 0 ? void 0 : selenium.host) !== null && _b !== void 0 ? _b : webdriver === null || webdriver === void 0 ? void 0 : webdriver.host;
     const port = (_c = selenium === null || selenium === void 0 ? void 0 : selenium.port) !== null && _c !== void 0 ? _c : webdriver === null || webdriver === void 0 ? void 0 : webdriver.port;
     const path = (_d = selenium === null || selenium === void 0 ? void 0 : selenium.default_path_prefix) !== null && _d !== void 0 ? _d : webdriver === null || webdriver === void 0 ? void 0 : webdriver.default_path_prefix;
-    const transformedDriver = spec.transformDriver({
+    return spec.toDriver({
         sessionId: driver.sessionId,
         serverUrl: `http${ssl ? 's' : ''}://${hostname !== null && hostname !== void 0 ? hostname : 'localhost'}${port ? `:${port}` : ''}${path}`,
         capabilities: driver.capabilities,
+        original: driver,
     });
-    transformedDriver.original = driver;
-    return transformedDriver;
 }
-exports.transformDriver = transformDriver;
-function transformElement(element) {
-    return utils.types.has(element, 'value') ? spec.transformElement(element.value) : spec.transformElement(element);
+exports.toDriver = toDriver;
+function toElement(element) {
+    if (utils.types.has(element, 'value')) {
+        return element.value;
+    }
+    else if (utils.types.instanceOf(element, 'WebElement')) {
+        return element.getId().then(elementId => spec.toElement({ elementId }));
+    }
+    return element;
 }
-exports.transformElement = transformElement;
-function transformSelector(selector) {
+exports.toElement = toElement;
+function toSelector(selector) {
     if (utils.types.isString(selector)) {
         return { locateStrategy: isXpathSelector(selector) ? 'xpath' : 'css selector', selector };
     }
@@ -114,8 +109,8 @@ function transformSelector(selector) {
     }
     return selector;
 }
-exports.transformSelector = transformSelector;
-function untransformSelector(selector) {
+exports.toSelector = toSelector;
+function toSimpleCommonSelector(selector) {
     if (utils.types.instanceOf(selector, 'RelativeBy') || utils.types.isFunction(selector)) {
         return null;
     }
@@ -140,41 +135,29 @@ function untransformSelector(selector) {
     }
     return selector;
 }
-exports.untransformSelector = untransformSelector;
+exports.toSimpleCommonSelector = toSimpleCommonSelector;
 async function findElement(driver, selector, parent) {
-    const originalDriver = driver.original;
-    let element = null;
     if (utils.types.has(selector, 'selector') && selector.locateStrategy && !selector.index) {
-        parent = isShadowRoot(parent) ? transformShadowRoot(parent) : parent;
-        element = await spec.findElement(driver, { using: selector.locateStrategy, value: selector.selector }, parent);
+        return spec.findElement(driver, { using: selector.locateStrategy, value: selector.selector }, parent);
     }
-    else if (!(Number.parseInt(process.env.APPLITOOLS_FRAMEWORK_MAJOR_VERSION) < 2)) {
-        try {
-            element = await originalDriver.findElement(selector);
-        }
-        catch {
-            element = null;
-        }
+    try {
+        return await driver.original.findElement(selector);
+    }
+    catch {
+        return null;
     }
-    return spec.isElement(element) ? spec.transformElement(element) : null;
 }
 exports.findElement = findElement;
 async function findElements(driver, selector, parent) {
-    const originalDriver = driver.original;
-    let elements = [];
     if (utils.types.has(selector, 'selector') && selector.locateStrategy && !selector.index) {
-        parent = isShadowRoot(parent) ? transformShadowRoot(parent) : parent;
-        elements = await spec.findElements(driver, { using: selector.locateStrategy, value: selector.selector }, parent);
+        return spec.findElements(driver, { using: selector.locateStrategy, value: selector.selector }, parent);
     }
-    else if (!(Number.parseInt(process.env.APPLITOOLS_FRAMEWORK_MAJOR_VERSION) < 2)) {
-        try {
-            elements = await originalDriver.findElements(selector);
-        }
-        catch {
-            elements = [];
-        }
+    try {
+        return await driver.original.findElements(selector);
+    }
+    catch {
+        return [];
     }
-    return utils.types.isArray(elements) ? elements : [];
 }
 exports.findElements = findElements;
 const browserOptionsNames = {
@@ -223,16 +206,7 @@ async function build(env) {
         options.capabilities.browserName = null;
     if (options.capabilities.browserName !== 'firefox')
         options.selenium = options.webdriver;
-    if (Number.parseInt(process.env.APPLITOOLS_FRAMEWORK_MAJOR_VERSION) < 2) {
-        options.desiredCapabilities = options.capabilities;
-        const client = Nightwatch.client(options);
-        client.isES6AsyncTestcase = true;
-        await client.createSession();
-        return [client.api, () => client.session.close()];
-    }
-    else {
-        const driver = await Nightwatch.createClient(options).launchBrowser();
-        return [driver, () => driver.end()];
-    }
+    const driver = await Nightwatch.createClient(options).launchBrowser();
+    return [driver, () => driver.end()];
 }
 exports.build = build;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/eyes-nightwatch",
-  "version": "1.16.2",
+  "version": "1.16.4",
   "description": "Applitools Eyes SDK for Nightwatch.js",
   "keywords": [
     "eyes-nightwatch",
@@ -48,29 +48,29 @@
     "test:e2e": "nightwatch --config test/e2e/nightwatch.conf.js --eyes-config applitools.config.js test/e2e/*.spec.js",
     "test:coverage": "APPLITOOLS_BATCH_NAME='JS Coverage Tests: eyes-nightwatch' APPLITOOLS_BATCH_ID=$(uuidgen) MOCHA_GROUP=coverage run --top-level mocha './test/generated-coverage/*.spec.js' -r @applitools/test-utils/mocha-hooks/docker --parallel --jobs ${MOCHA_JOBS:-15} --exit",
     "setup": "run --top-level browsers:setup",
-    "up:framework": "run --top-level add-silent nightwatch"
+    "up:framework": "yarn add --dev --caret nightwatch${APPLITOOLS_FRAMEWORK_VERSION:+@$APPLITOOLS_FRAMEWORK_VERSION}"
   },
   "dependencies": {
-    "@applitools/driver": "1.13.4",
-    "@applitools/eyes": "1.7.2",
-    "@applitools/spec-driver-webdriver": "1.0.41",
-    "@applitools/utils": "1.5.0",
-    "webdriver": "7.30.0"
+    "@applitools/driver": "1.13.6",
+    "@applitools/eyes": "1.8.0",
+    "@applitools/spec-driver-webdriver": "1.0.43",
+    "@applitools/utils": "1.5.2",
+    "webdriver": "7.31.1"
   },
   "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.10",
     "@applitools/test-utils": "^1.5.17",
-    "@types/nightwatch": "^2.3.16",
+    "@types/nightwatch": "^2.3.25",
     "@types/node": "^12.20.55",
-    "chromedriver": "^114.0.3",
+    "chromedriver": "^115.0.1",
     "cucumber": "6.0.7",
     "geckodriver": "^3.0.1",
-    "nightwatch": "^2.6.21"
+    "nightwatch": "^3.1.2"
   },
   "peerDependencies": {
-    "nightwatch": ">=1.3.4"
+    "nightwatch": ">=2.0.0"
   },
   "engines": {
     "node": ">=12.13.0"

package/types/index.d.ts

@@ -1,7 +1,13 @@
 export type Driver = import('nightwatch').NightwatchBrowser & { __applitoolsBrand?: undefined; };
-export type Element = ((({ 'element-6066-11e4-a52e-4f735466cecf': string; } | { ELEMENT: string; }) & { __applitoolsBrand?: undefined; }) & { __applitoolsBrand?: undefined; }) | (import('nightwatch').NightwatchTypedCallbackResult<({ 'element-6066-11e4-a52e-4f735466cecf': string; } | { ELEMENT: string; }) & { __applitoolsBrand?: undefined; }> & { __applitoolsBrand?: undefined; });
-export type Selector = (string | { using: string; value: string; __applitoolsBrand?: undefined; } | import('nightwatch').ElementProperties | import('selenium-webdriver').By | import('selenium-webdriver').ByHash | import('selenium-webdriver').RelativeBy | { using: string; value: string; } | ((webdriver: import('selenium-webdriver').WebDriver) => Promise<any>)) & { __applitoolsBrand?: undefined; };
-export type SpecType = { driver: Driver; context: Driver; element: Element; selector: Selector; };
+export type Element = ((({ 'element-6066-11e4-a52e-4f735466cecf': string; } | { ELEMENT: string; }) & { __applitoolsBrand?: undefined; }) | import('selenium-webdriver').WebElement | import('nightwatch').NightwatchTypedCallbackResult<(({ 'element-6066-11e4-a52e-4f735466cecf': string; } | { ELEMENT: string; }) & { __applitoolsBrand?: undefined; }) & { __applitoolsBrand?: undefined; }>) & { __applitoolsBrand?: undefined; };
+export type Selector = (string | import('nightwatch').ElementProperties | import('selenium-webdriver').By | import('selenium-webdriver').ByHash | import('selenium-webdriver').RelativeBy | { using: string; value: string; } | ((webdriver: import('selenium-webdriver').WebDriver) => Promise<any>)) & { __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" | "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 type BrowserTypePlain = "firefox" | "chrome" | "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',
@@ -768,33 +774,66 @@ export enum FailureReport {
     IMMEDIATE = 'IMMEDIATE',
     ON_CLOSE = 'ON_CLOSE'
 }
-export type IosDeviceNamePlain = "iPhone 11" | "iPhone 11 Pro" | "iPhone 11 Pro Max" | "iPhone X" | "iPhone XR" | "iPhone 14 Pro Max" | "iPhone 14" | "iPhone 13 Pro Max" | "iPhone 13 Pro" | "iPhone 13" | "iPhone 12 Pro Max" | "iPhone 12 Pro" | "iPhone 12" | "iPhone 12 mini" | "iPhone Xs" | "iPhone 8" | "iPhone 8 Plus" | "iPhone 7" | "iPhone SE (1st generation)" | "iPad Pro (12.9-inch) (3rd generation)" | "iPad Pro (11-inch) (4th generation)" | "iPad (7th generation)" | "iPad (9th generation)" | "iPad Air (2nd generation)" | "iPad Air (4th generation)";
+export type IosDeviceNamePlain = "iPad Air 2" | "iPhone 11" | "iPhone 11 Pro" | "iPhone 11 Pro Max" | "iPhone X" | "iPhone XR" | "iPhone 6s" | "iPhone 6s Plus" | "iPhone 7" | "iPhone 7 Plus" | "iPhone 8" | "iPhone 8 Plus" | "iPhone Xs" | "iPhone Xs Max" | "iPhone 12" | "iPhone 12 mini" | "iPhone 12 Pro" | "iPhone 12 Pro Max" | "iPhone 13" | "iPhone 13 mini" | "iPhone 13 Pro" | "iPhone 13 Pro Max" | "iPhone 14" | "iPhone 14 Plus" | "iPhone 14 Pro" | "iPhone 14 Pro Max" | "iPhone SE (1st generation)" | "iPhone SE (2nd generation)" | "iPhone SE (3rd generation)" | "iPad (5th generation)" | "iPad (6th generation)" | "iPad (7th generation)" | "iPad (8th generation)" | "iPad (9th generation)" | "iPad (10th generation)" | "iPad Air (3rd generation)" | "iPad Air (4th generation)" | "iPad Air (5th generation)" | "iPad mini 4" | "iPad mini (5th generation)" | "iPad mini (6th generation)" | "iPad Pro (9.7-inch)" | "iPad Pro (10.5-inch)" | "iPad Pro (11-inch) (1st generation)" | "iPad Pro (12.9-inch) (1st generation)" | "iPad Pro (11-inch) (2nd generation)" | "iPad Pro (12.9-inch) (2nd generation)" | "iPad Pro (11-inch) (3rd generation)" | "iPad Pro (12.9-inch) (3rd generation)" | "iPad Pro (11-inch) (4th generation)" | "iPad Pro (12.9-inch) (4th generation)" | "iPad Pro (12.9-inch) (5th generation)" | "iPad Pro (12.9-inch) (6th generation)" | "iPod touch (7th generation)";
 export enum IosDeviceName {
-    iPhone_14_Pro_Max = 'iPhone 14 Pro Max',
-    iPhone_14 = 'iPhone 14',
-    iPhone_13_Pro_Max = 'iPhone 13 Pro Max',
-    iPhone_13_Pro = 'iPhone 13 Pro',
-    iPhone_13 = 'iPhone 13',
-    iPhone_12_Pro_Max = 'iPhone 12 Pro Max',
-    iPhone_12_Pro = 'iPhone 12 Pro',
-    iPhone_12 = 'iPhone 12',
-    iPhone_12_mini = 'iPhone 12 mini',
-    iPhone_11_Pro = 'iPhone 11 Pro',
-    iPhone_11_Pro_Max = 'iPhone 11 Pro Max',
-    iPhone_11 = 'iPhone 11',
-    iPhone_XR = 'iPhone XR',
-    iPhone_XS = 'iPhone Xs',
-    iPhone_X = 'iPhone X',
+    iPhone_6s = 'iPhone 6s',
+    iPhone_6s_Plus = 'iPhone 6s Plus',
+    iPhone_7 = 'iPhone 7',
+    iPhone_7_Plus = 'iPhone 7 Plus',
     iPhone_8 = 'iPhone 8',
     iPhone_8_Plus = 'iPhone 8 Plus',
-    iPhone_7 = 'iPhone 7',
+    iPhone_X = 'iPhone X',
+    iPhone_XR = 'iPhone XR',
+    iPhone_Xs = 'iPhone Xs',
+    iPhone_XS = 'iPhone Xs',
+    iPhone_Xs_Max = 'iPhone Xs Max',
+    iPhone_11 = 'iPhone 11',
+    iPhone_11_Pro = 'iPhone 11 Pro',
+    iPhone_11_Pro_Max = 'iPhone 11 Pro Max',
+    iPhone_12 = 'iPhone 12',
+    iPhone_12_mini = 'iPhone 12 mini',
+    iPhone_12_Pro = 'iPhone 12 Pro',
+    iPhone_12_Pro_Max = 'iPhone 12 Pro Max',
+    iPhone_13 = 'iPhone 13',
+    iPhone_13_mini = 'iPhone 13 mini',
+    iPhone_13_Pro = 'iPhone 13 Pro',
+    iPhone_13_Pro_Max = 'iPhone 13 Pro Max',
+    iPhone_14 = 'iPhone 14',
+    iPhone_14_Plus = 'iPhone 14 Plus',
+    iPhone_14_Pro = 'iPhone 14 Pro',
+    iPhone_14_Pro_Max = 'iPhone 14 Pro Max',
     iPhone_SE = 'iPhone SE (1st generation)',
-    iPad_Pro_3 = 'iPad Pro (12.9-inch) (3rd generation)',
-    iPad_Pro_4 = 'iPad Pro (11-inch) (4th generation)',
+    iPhone_SE_1 = 'iPhone SE (1st generation)',
+    iPhone_SE_2 = 'iPhone SE (2nd generation)',
+    iPhone_SE_3 = 'iPhone SE (3rd generation)',
+    iPad_5 = 'iPad (5th generation)',
+    iPad_6 = 'iPad (6th generation)',
     iPad_7 = 'iPad (7th generation)',
+    iPad_8 = 'iPad (8th generation)',
     iPad_9 = 'iPad (9th generation)',
-    iPad_Air_2 = 'iPad Air (2nd generation)',
-    iPad_Air_4 = 'iPad Air (4th generation)'
+    iPad_10 = 'iPad (10th generation)',
+    iPad_Air_2 = 'iPad Air 2',
+    iPad_Air_3 = 'iPad Air (3rd generation)',
+    iPad_Air_4 = 'iPad Air (4th generation)',
+    iPad_Air_5 = 'iPad Air (5th generation)',
+    iPad_mini_4 = 'iPad mini 4',
+    iPad_mini_5 = 'iPad mini (5th generation)',
+    iPad_mini_6 = 'iPad mini (6th generation)',
+    iPad_Pro_9_7_inch_1 = 'iPad Pro (9.7-inch)',
+    iPad_Pro_10_5_inch_1 = 'iPad Pro (10.5-inch)',
+    iPad_Pro_11_inch_1 = 'iPad Pro (11-inch) (1st generation)',
+    iPad_Pro_12_9_inch_1 = 'iPad Pro (12.9-inch) (1st generation)',
+    iPad_Pro_11_inch_2 = 'iPad Pro (11-inch) (2nd generation)',
+    iPad_Pro_12_9_inch_2 = 'iPad Pro (12.9-inch) (2nd generation)',
+    iPad_Pro_11_inch_3 = 'iPad Pro (11-inch) (3rd generation)',
+    iPad_Pro_12_9_inch_3 = 'iPad Pro (12.9-inch) (3rd generation)',
+    iPad_Pro_3 = 'iPad Pro (12.9-inch) (3rd generation)',
+    iPad_Pro_11_inch_4 = 'iPad Pro (11-inch) (4th generation)',
+    iPad_Pro_4 = 'iPad Pro (11-inch) (4th generation)',
+    iPad_Pro_12_9_inch_4 = 'iPad Pro (12.9-inch) (4th generation)',
+    iPad_Pro_12_9_inch_5 = 'iPad Pro (12.9-inch) (5th generation)',
+    iPad_Pro_12_9_inch_6 = 'iPad Pro (12.9-inch) (6th generation)',
+    iPod_touch_7 = 'iPod touch (7th generation)'
 }
 export type IosVersionPlain = AndroidVersionPlain;
 export enum IosVersion {