@applitools/core 3.9.0 → 3.9.1

package/CHANGELOG.md

@@ -1,5 +1,137 @@
 # Changelog
 
+## [3.9.1](https://github.com/applitools/eyes.sdk.javascript1/compare/js/core@3.9.0...js/core@3.9.1) (2023-08-18)
+
+
+### 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))
+
+
+### 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))
+
+
+
+
 ## [3.9.0](https://github.com/applitools/eyes.sdk.javascript1/compare/js/core@3.8.1...js/core@3.9.0) (2023-08-10)
 
 

package/dist/classic/abort.js

@@ -7,10 +7,10 @@ function makeAbort({ eyes, target, spec, logger: mainLogger }) {
         logger = logger.extend(mainLogger);
         logger.log('Command "abort" is called with settings', settings);
         settings !== null && settings !== void 0 ? settings : (settings = {});
-        if (!settings.testMetadata) {
+        if (!settings.testMetadata && (0, driver_1.isDriver)(target, spec)) {
             try {
-                const driver = (0, driver_1.isDriver)(target, spec) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : null;
-                settings.testMetadata = await (driver === null || driver === void 0 ? void 0 : driver.getSessionMetadata());
+                const driver = await (0, driver_1.makeDriver)({ spec, driver: target, relaxed: true, logger });
+                settings.testMetadata = await driver.getSessionMetadata();
             }
             catch (error) {
                 logger.warn('Command "abort" received an error during extracting driver metadata', error);

package/dist/classic/close.js

@@ -7,10 +7,10 @@ function makeClose({ eyes, target, spec, logger: mainLogger }) {
         logger = logger.extend(mainLogger);
         logger.log('Command "close" is called with settings', settings);
         settings !== null && settings !== void 0 ? settings : (settings = {});
-        if (!settings.testMetadata) {
+        if (!settings.testMetadata && (0, driver_1.isDriver)(target, spec)) {
             try {
-                const driver = (0, driver_1.isDriver)(target, spec) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : null;
-                settings.testMetadata = await (driver === null || driver === void 0 ? void 0 : driver.getSessionMetadata());
+                const driver = await (0, driver_1.makeDriver)({ spec, driver: target, relaxed: true, logger });
+                settings.testMetadata = await driver.getSessionMetadata();
             }
             catch (error) {
                 logger.warn('Command "close" received an error during extracting driver metadata', error);

package/dist/ufg/abort.js

@@ -8,10 +8,10 @@ function makeAbort({ storage, target, spec, controller, logger: mainLogger, }) {
         logger.log('Command "abort" is called with settings', settings);
         controller.abort();
         settings !== null && settings !== void 0 ? settings : (settings = {});
-        if (!settings.testMetadata) {
+        if (!settings.testMetadata && (0, driver_1.isDriver)(target, spec)) {
             try {
-                const driver = (0, driver_1.isDriver)(target, spec) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : null;
-                settings.testMetadata = await (driver === null || driver === void 0 ? void 0 : driver.getSessionMetadata());
+                const driver = await (0, driver_1.makeDriver)({ spec, driver: target, relaxed: true, logger });
+                settings.testMetadata = await driver.getSessionMetadata();
             }
             catch (error) {
                 logger.warn('Command "abort" received an error during extracting driver metadata', error);

package/dist/ufg/check-and-close.js

@@ -104,10 +104,10 @@ function makeCheckAndClose({ eyes, storage, target: defaultTarget, spec, signal,
             }
             else {
                 regionToTarget = (0, driver_1.isSelector)(elementReferenceToTarget)
-                    ? (_e = (_d = spec === null || spec === void 0 ? void 0 : spec.untransformSelector) === null || _d === void 0 ? void 0 : _d.call(spec, settings.scrollRootElement)) !== null && _e !== void 0 ? _e : undefined
+                    ? (_e = (_d = spec === null || spec === void 0 ? void 0 : spec.toSimpleCommonSelector) === null || _d === void 0 ? void 0 : _d.call(spec, settings.scrollRootElement)) !== null && _e !== void 0 ? _e : undefined
                     : undefined;
                 scrollRootSelector = (0, driver_1.isSelector)(settings.scrollRootElement)
-                    ? (_g = (_f = spec === null || spec === void 0 ? void 0 : spec.untransformSelector) === null || _f === void 0 ? void 0 : _f.call(spec, settings.scrollRootElement)) !== null && _g !== void 0 ? _g : undefined
+                    ? (_g = (_f = spec === null || spec === void 0 ? void 0 : spec.toSimpleCommonSelector) === null || _f === void 0 ? void 0 : _f.call(spec, settings.scrollRootElement)) !== null && _g !== void 0 ? _g : undefined
                     : undefined;
             }
             const currentContext = driver.currentContext;

package/dist/ufg/check.js

@@ -105,10 +105,10 @@ function makeCheck({ eyes, storage, target: defaultTarget, spec, signal, logger:
             }
             else {
                 regionToTarget = (0, driver_1.isSelector)(elementReferenceToTarget)
-                    ? (_f = (_e = spec === null || spec === void 0 ? void 0 : spec.untransformSelector) === null || _e === void 0 ? void 0 : _e.call(spec, settings.scrollRootElement)) !== null && _f !== void 0 ? _f : undefined
+                    ? (_f = (_e = spec === null || spec === void 0 ? void 0 : spec.toSimpleCommonSelector) === null || _e === void 0 ? void 0 : _e.call(spec, settings.scrollRootElement)) !== null && _f !== void 0 ? _f : undefined
                     : undefined;
                 scrollRootSelector = (0, driver_1.isSelector)(settings.scrollRootElement)
-                    ? (_h = (_g = spec === null || spec === void 0 ? void 0 : spec.untransformSelector) === null || _g === void 0 ? void 0 : _g.call(spec, settings.scrollRootElement)) !== null && _h !== void 0 ? _h : undefined
+                    ? (_h = (_g = spec === null || spec === void 0 ? void 0 : spec.toSimpleCommonSelector) === null || _g === void 0 ? void 0 : _g.call(spec, settings.scrollRootElement)) !== null && _h !== void 0 ? _h : undefined
                     : undefined;
             }
             const currentContext = driver.currentContext;

package/dist/ufg/close.js

@@ -7,10 +7,10 @@ function makeClose({ storage, target, spec, logger: mainLogger }) {
         logger = logger.extend(mainLogger);
         logger.log('Command "close" is called with settings', settings);
         settings !== null && settings !== void 0 ? settings : (settings = {});
-        if (!settings.testMetadata) {
+        if (!settings.testMetadata && (0, driver_1.isDriver)(target, spec)) {
             try {
-                const driver = (0, driver_1.isDriver)(target, spec) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : null;
-                settings.testMetadata = await (driver === null || driver === void 0 ? void 0 : driver.getSessionMetadata());
+                const driver = await (0, driver_1.makeDriver)({ spec, driver: target, relaxed: true, logger });
+                settings.testMetadata = await driver.getSessionMetadata();
             }
             catch (error) {
                 logger.warn('Command "close" received an error during extracting driver metadata', error);

package/dist/universal/spec-driver.js

@@ -27,7 +27,6 @@ exports.makeSpec = void 0;
 const utils = __importStar(require("@applitools/utils"));
 function makeSpec({ socket, spec, }) {
     const commands = {
-        // #region UTILITY
         isDriver(driver) {
             return utils.types.has(driver, 'applitools-ref-id');
         },
@@ -44,32 +43,17 @@ function makeSpec({ socket, spec, }) {
                     utils.types.has(selector, 'selector') &&
                     (utils.types.isString(selector.selector) || utils.types.has(selector, 'applitools-ref-id'))));
         },
-        extractContext(driver) {
-            return driver.context;
-        },
-        extractSelector(element) {
-            return element.selector;
-        },
-        extractHostName(driver) {
-            var _a;
-            return (_a = driver.hostname) !== null && _a !== void 0 ? _a : null;
-        },
-        isStaleElementError(error) {
-            return error === null || error === void 0 ? void 0 : error.isStaleElementError;
-        },
         async isEqualElements(context, element1, element2) {
             return socket.request('Driver.isEqualElements', { context, element1, element2 });
         },
-        // #endregion
-        // #region COMMANDS
-        async mainContext(context) {
-            return socket.request('Driver.mainContext', { context });
+        isStaleElementError(error) {
+            return error === null || error === void 0 ? void 0 : error.isStaleElementError;
         },
-        async parentContext(context) {
-            return socket.request('Driver.parentContext', { context });
+        extractContext(driver) {
+            return driver.context;
         },
-        async childContext(context, element) {
-            return socket.request('Driver.childContext', { context, element });
+        extractSelector(element) {
+            return element.selector;
         },
         async executeScript(context, script, arg) {
             return socket.request('Driver.executeScript', { context, script: script.toString(), arg });
@@ -89,20 +73,26 @@ function makeSpec({ socket, spec, }) {
         async setElementText(context, element, text) {
             return socket.request('Driver.setElementText', { context, element, text });
         },
-        async getWindowSize(driver) {
-            return socket.request('Driver.getWindowSize', { driver });
+        async getElementRegion(context, element) {
+            return socket.request('Driver.getElementRegion', { context, element });
         },
-        async setWindowSize(driver, size) {
-            return socket.request('Driver.setWindowSize', { driver, size });
+        async getElementAttribute(context, element, attr) {
+            return socket.request('Driver.getElementAttribute', { context, element, attr });
         },
-        async getViewportSize(driver) {
-            return socket.request('Driver.getViewportSize', { driver });
+        async hover(context, element) {
+            return socket.request('Driver.hover', { context, element });
         },
-        async setViewportSize(driver, size) {
-            return socket.request('Driver.setViewportSize', { driver, size });
+        async click(context, element) {
+            return socket.request('Driver.click', { context, element });
         },
-        async getCookies(driver, context) {
-            return socket.request('Driver.getCookies', { driver, context });
+        async mainContext(context) {
+            return socket.request('Driver.mainContext', { context });
+        },
+        async parentContext(context) {
+            return socket.request('Driver.parentContext', { context });
+        },
+        async childContext(context, element) {
+            return socket.request('Driver.childContext', { context, element });
         },
         async getCapabilities(driver) {
             return socket.request('Driver.getCapabilities', { driver });
@@ -110,23 +100,18 @@ function makeSpec({ socket, spec, }) {
         async getDriverInfo(driver) {
             return socket.request('Driver.getDriverInfo', { driver });
         },
-        async getTitle(driver) {
-            return socket.request('Driver.getTitle', { driver });
-        },
-        async getUrl(driver) {
-            return socket.request('Driver.getUrl', { driver });
+        async getWindowSize(driver) {
+            return socket.request('Driver.getWindowSize', { driver });
         },
-        async takeScreenshot(driver) {
-            return socket.request('Driver.takeScreenshot', { driver });
+        async setWindowSize(driver, size) {
+            return socket.request('Driver.setWindowSize', { driver, size });
         },
-        async click(context, element) {
-            return socket.request('Driver.click', { context, element });
+        async getViewportSize(driver) {
+            return socket.request('Driver.getViewportSize', { driver });
         },
-        async visit(driver, url) {
-            return socket.request('Driver.visit', { driver, url });
+        async setViewportSize(driver, size) {
+            return socket.request('Driver.setViewportSize', { driver, size });
         },
-        // #endregion
-        // #region NATIVE COMMANDS
         async getSystemBars(driver) {
             return socket.request('Driver.getSystemBars', { driver });
         },
@@ -136,15 +121,24 @@ function makeSpec({ socket, spec, }) {
         async setOrientation(driver, orientation) {
             return socket.request('Driver.setOrientation', { driver, orientation });
         },
-        async getElementRegion(driver, element) {
-            return socket.request('Driver.getElementRegion', { driver, element });
+        async getCookies(driver, context) {
+            return socket.request('Driver.getCookies', { driver, context });
+        },
+        async getTitle(driver) {
+            return socket.request('Driver.getTitle', { driver });
+        },
+        async getUrl(driver) {
+            return socket.request('Driver.getUrl', { driver });
         },
-        async getElementAttribute(driver, element, attr) {
-            return socket.request('Driver.getElementAttribute', { driver, element, attr });
+        async takeScreenshot(driver) {
+            return socket.request('Driver.takeScreenshot', { driver });
         },
         async performAction(driver, steps) {
             return socket.request('Driver.performAction', { driver, steps });
         },
+        async visit(driver, url) {
+            return socket.request('Driver.visit', { driver, url });
+        },
         async getCurrentWorld(driver) {
             return socket.request('Driver.getCurrentWorld', { driver });
         },
@@ -154,7 +148,6 @@ function makeSpec({ socket, spec, }) {
         async switchWorld(driver, name) {
             return socket.request('Driver.switchWorld', { driver, name });
         },
-        // #endregion
     };
     return spec.reduce((spec, name) => {
         return Object.assign(spec, { [name]: commands[name] });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/core",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -46,8 +46,8 @@
     "build:dist": "run --top-level tsc --project ./tsconfig.build.json",
     "build:x64": "yarn build:dist && yarn build:bin:x64",
     "build:arm64": "yarn build:dist && yarn build:bin:arm64",
-    "build:bin:x64": "pkg . --target node14-linux-x64,node14-alpine-x64,node14-macos-x64,node14-win-x64",
-    "build:bin:arm64": "pkg . --target node14-linux-arm64 --output ./bin/core-linux-arm64",
+    "build:bin:x64": "rm -rf ../spec-driver-webdriver/node_modules/webdriver && pkg . --target node14-linux-x64,node14-alpine-x64,node14-macos-x64,node14-win-x64",
+    "build:bin:arm64": "rm -rf ../spec-driver-webdriver/node_modules/webdriver && pkg . --target node14-linux-arm64 --output ./bin/core-linux-arm64",
     "build:bin:zip": "zip -j ./bin/core.zip $(find ./bin -type f -not -name '*.zip' -not -name '*.tar.gz' | xargs)",
     "build:bin:tgz": "tar -czf ./bin/core.tar.gz $(find ./bin -type f -not -name '*.zip' -not -name '*.tar.gz' | xargs)",
     "test": "run --top-level mocha './test/**/*.spec.ts' --exclude './test/bin/**' --parallel --jobs ${MOCHA_JOBS:-15} --exit",
@@ -62,52 +62,47 @@
   "pkg": {
     "scripts": "./dist/cli/cli.js",
     "outputPath": "./bin",
-    "compress": "GZip",
-    "assets": [
-      "./node_modules/vm2/lib/setup-sandbox.js"
-    ]
+    "compress": "GZip"
   },
   "dependencies": {
-    "@applitools/core-base": "1.5.0",
+    "@applitools/core-base": "1.5.1",
     "@applitools/dom-capture": "11.2.2",
     "@applitools/dom-snapshot": "4.7.10",
-    "@applitools/driver": "1.13.4",
-    "@applitools/ec-client": "1.7.4",
-    "@applitools/logger": "2.0.7",
-    "@applitools/nml-client": "1.5.7",
-    "@applitools/req": "1.5.2",
-    "@applitools/screenshoter": "3.8.7",
-    "@applitools/snippets": "2.4.22",
-    "@applitools/socket": "1.1.7",
-    "@applitools/spec-driver-webdriver": "1.0.41",
-    "@applitools/ufg-client": "1.7.0",
-    "@applitools/utils": "1.5.0",
+    "@applitools/driver": "1.13.5",
+    "@applitools/ec-client": "1.7.5",
+    "@applitools/logger": "2.0.8",
+    "@applitools/nml-client": "1.5.8",
+    "@applitools/req": "1.5.3",
+    "@applitools/screenshoter": "3.8.8",
+    "@applitools/snippets": "2.4.23",
+    "@applitools/socket": "1.1.8",
+    "@applitools/spec-driver-webdriver": "1.0.42",
+    "@applitools/ufg-client": "1.7.1",
+    "@applitools/utils": "1.5.1",
     "@types/ws": "8.5.5",
     "abort-controller": "3.0.0",
     "chalk": "4.1.2",
     "node-fetch": "2.6.7",
-    "webdriver": "7.30.0",
+    "webdriver": "7.31.1",
     "ws": "8.13.0",
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@applitools/bongo": "^5.4.3",
-    "@applitools/spec-driver-puppeteer": "^1.1.72",
-    "@applitools/spec-driver-selenium": "^1.5.55",
-    "@applitools/spec-driver-webdriverio": "^1.5.10",
+    "@applitools/bongo": "^5.6.1",
+    "@applitools/spec-driver-puppeteer": "^1.1.73",
+    "@applitools/spec-driver-selenium": "^1.5.56",
     "@applitools/test-server": "^1.2.2",
     "@applitools/test-utils": "^1.5.17",
-    "@applitools/tunnel-client": "^1.1.3",
+    "@applitools/tunnel-client": "^1.2.0",
     "@types/node": "^12.20.55",
     "@types/selenium-webdriver": "^4.1.2",
     "@types/yargs": "^17.0.22",
-    "chromedriver": "^114.0.3",
+    "chromedriver": "^115.0.1",
     "nock": "^13.3.2",
     "pkg": "^5.8.0",
     "png-async": "^0.9.4",
     "puppeteer": "^19.11.1",
-    "selenium-webdriver": "4.4",
-    "webdriverio": "^7.25.0"
+    "selenium-webdriver": "4.4"
   },
   "engines": {
     "node": ">=12.13.0"

package/types/universal/spec-driver.d.ts

@@ -1,11 +1,12 @@
 import type { Ref, ServerSocket, UniversalSpecDriver } from './types';
-import type { SpecType as BaseSpecType, SpecDriver, CommonSelector } from '@applitools/driver';
+import type { SpecType, SpecDriver as BaseSpecDriver, CommonSelector } from '@applitools/driver';
 export type Driver = Ref;
 export type Context = Ref;
 export type Element = Ref;
 export type Selector = string | CommonSelector | Ref;
-export type SpecType = BaseSpecType<Driver, Context, Element, Selector>;
+export type PrimarySpecType = SpecType<Driver, Context, Element, Selector>;
+export type SpecDriver = BaseSpecDriver<PrimarySpecType>;
 export declare function makeSpec({ socket, spec, }: {
-    socket: ServerSocket<SpecType, any>;
-    spec: (keyof UniversalSpecDriver<SpecType>)[];
-}): SpecDriver<SpecType>;
+    socket: ServerSocket<PrimarySpecType, any>;
+    spec: (keyof UniversalSpecDriver<PrimarySpecType>)[];
+}): SpecDriver;

package/types/universal/types.d.ts

@@ -56,16 +56,6 @@ export interface UniversalSpecDriver<T extends SpecType> {
         element1: T['element'];
         element2: T['element'];
     }): Promise<boolean>;
-    mainContext(options: {
-        context: T['context'];
-    }): Promise<T['context']>;
-    parentContext(options: {
-        context: T['context'];
-    }): Promise<T['context']>;
-    childContext(options: {
-        context: T['context'];
-        element: T['element'];
-    }): Promise<T['context']>;
     executeScript(options: {
         context: T['context'];
         script: string;
@@ -87,6 +77,15 @@ export interface UniversalSpecDriver<T extends SpecType> {
         parent?: T['element'];
         options?: WaitOptions;
     }): Promise<T['element'] | null>;
+    getElementRegion(options: {
+        context: T['context'];
+        element: T['element'];
+    }): Promise<Region>;
+    getElementAttribute(options: {
+        context: T['context'];
+        element: T['element'];
+        attr: string;
+    }): Promise<string>;
     setElementText(options: {
         context: T['context'];
         element: T['element'];
@@ -96,6 +95,30 @@ export interface UniversalSpecDriver<T extends SpecType> {
         context: T['context'];
         element: T['element'];
     }): Promise<string>;
+    hover(options: {
+        context: T['context'];
+        element: T['element'];
+    }): Promise<void>;
+    click(options: {
+        context: T['context'];
+        element: T['element'];
+    }): Promise<void>;
+    mainContext(options: {
+        context: T['context'];
+    }): Promise<T['context']>;
+    parentContext(options: {
+        context: T['context'];
+    }): Promise<T['context']>;
+    childContext(options: {
+        context: T['context'];
+        element: T['element'];
+    }): Promise<T['context']>;
+    getDriverInfo(options: {
+        driver: T['driver'];
+    }): Promise<DriverInfo>;
+    getCapabilities(options: {
+        driver: T['driver'];
+    }): Promise<Record<string, any>>;
     setWindowSize(options: {
         driver: T['driver'];
         size: Size;
@@ -110,40 +133,6 @@ export interface UniversalSpecDriver<T extends SpecType> {
     getViewportSize(options: {
         driver: T['driver'];
     }): Promise<Size>;
-    getCookies(options: {
-        driver: T['driver'] | T['context'];
-        context?: boolean;
-    }): Promise<Cookie[]>;
-    getDriverInfo(options: {
-        driver: T['driver'];
-    }): Promise<DriverInfo>;
-    getCapabilities(options: {
-        driver: T['driver'];
-    }): Promise<Record<string, any>>;
-    getTitle(options: {
-        driver: T['driver'];
-    }): Promise<string>;
-    getUrl(options: {
-        driver: T['driver'];
-    }): Promise<string>;
-    takeScreenshot(options: {
-        driver: T['driver'];
-    }): Promise<string>;
-    click(options: {
-        context: T['context'];
-        element: T['element'] | T['selector'];
-    }): Promise<void>;
-    visit(options: {
-        driver: T['driver'];
-        url: string;
-    }): Promise<void>;
-    getOrientation(options: {
-        driver: T['driver'];
-    }): Promise<'portrait' | 'landscape' | 'portrait-secondary' | 'landscape-secondary'>;
-    setOrientation(options: {
-        driver: T['driver'];
-        orientation: 'portrait' | 'landscape' | 'portrait-secondary' | 'landscape-secondary';
-    }): Promise<void>;
     getSystemBars(options: {
         driver: T['driver'];
     }): Promise<{
@@ -162,19 +151,34 @@ export interface UniversalSpecDriver<T extends SpecType> {
             width: number;
         };
     }>;
-    getElementRegion(options: {
+    getOrientation(options: {
         driver: T['driver'];
-        element: T['element'];
-    }): Promise<Region>;
-    getElementAttribute(options: {
+    }): Promise<'portrait' | 'landscape' | 'portrait-secondary' | 'landscape-secondary'>;
+    setOrientation(options: {
+        driver: T['driver'];
+        orientation: 'portrait' | 'landscape' | 'portrait-secondary' | 'landscape-secondary';
+    }): Promise<void>;
+    getCookies(options: {
+        driver: T['driver'] | T['context'];
+        context?: boolean;
+    }): Promise<Cookie[]>;
+    getTitle(options: {
+        driver: T['driver'];
+    }): Promise<string>;
+    getUrl(options: {
+        driver: T['driver'];
+    }): Promise<string>;
+    takeScreenshot(options: {
         driver: T['driver'];
-        element: T['element'];
-        attr: string;
     }): Promise<string>;
     performAction(options: {
         driver: T['driver'];
         steps: any[];
     }): Promise<void>;
+    visit(options: {
+        driver: T['driver'];
+        url: string;
+    }): Promise<void>;
     getCurrentWorld(options: {
         driver: T['driver'];
     }): Promise<string>;