@applitools/driver 1.13.4 → 1.13.5

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # Changelog
 
+## [1.13.5](https://github.com/applitools/eyes.sdk.javascript1/compare/js/driver@1.13.4...js/driver@1.13.5) (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/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))
+
 ## [1.13.4](https://github.com/applitools/eyes.sdk.javascript1/compare/js/driver@1.13.3...js/driver@1.13.4) (2023-08-03)
 
 

package/dist/context.js

@@ -27,14 +27,12 @@ exports.Context = void 0;
 const selector_1 = require("./selector");
 const element_1 = require("./element");
 const utils = __importStar(require("@applitools/utils"));
-const specUtils = __importStar(require("./spec-utils"));
 const snippets = require('@applitools/snippets');
 class Context {
     _isReference(reference) {
         return (utils.types.isInteger(reference) ||
             utils.types.isString(reference) ||
-            reference instanceof element_1.Element ||
-            this._spec.isElement(reference) ||
+            (0, element_1.isElement)(reference, this._spec) ||
             (0, selector_1.isSelector)(reference, this._spec));
     }
     constructor(options) {
@@ -104,11 +102,11 @@ class Context {
         await this.focus();
         const { parent, all, wait } = options;
         const environment = await this.driver.getEnvironment();
-        const transformedSelector = specUtils.transformSelector(this._spec, selector, environment);
+        const transformedSelector = (0, selector_1.makeSelector)({ selector, spec: this._spec, environment });
         let elements = [];
         if (wait) {
             if (this._spec.waitForSelector) {
-                const element = await this._spec.waitForSelector(this.target, specUtils.transformSelector(this._spec, selector, environment), parent, wait);
+                const element = await this._spec.waitForSelector(this.target, (0, selector_1.makeSelector)({ selector, spec: this._spec, environment }), parent, wait);
                 if (element)
                     elements = [element];
             }
@@ -116,7 +114,7 @@ class Context {
                 let waiting = true;
                 const timeout = setTimeout(() => (waiting = false), wait.timeout);
                 while (waiting) {
-                    const element = await this._spec.findElement(this.target, specUtils.transformSelector(this._spec, selector, environment), parent);
+                    const element = await this._spec.findElement(this.target, (0, selector_1.makeSelector)({ selector, spec: this._spec, environment }), parent);
                     if (element) {
                         clearTimeout(timeout);
                         elements = [element];
@@ -134,7 +132,7 @@ class Context {
             if (element)
                 elements = [element];
         }
-        if ((0, selector_1.isObjectCommonSelector)(selector, this._spec)) {
+        if ((0, selector_1.isComplexSelector)(selector, this._spec)) {
             if (elements.length > 0) {
                 if (selector.child) {
                     elements = await elements.reduce((result, element) => {
@@ -197,12 +195,13 @@ class Context {
                 throw new TypeError(`Context element with name, id, or selector ${JSON.stringify(this._reference)}' is not found`);
             }
         }
-        else if (this._spec.isElement(this._reference) || this._reference instanceof element_1.Element) {
+        else if ((0, element_1.isElement)(this._reference, this._spec)) {
             this.logger.log('Initialize context from reference element', this._reference);
-            this._element =
-                this._reference instanceof element_1.Element
-                    ? this._reference
-                    : new element_1.Element({ spec: this._spec, context: this.parent, element: this._reference });
+            this._element = await (0, element_1.makeElement)({
+                spec: this._spec,
+                context: this.parent,
+                element: this._reference,
+            });
         }
         else {
             throw new TypeError('Reference type does not supported');
@@ -267,38 +266,38 @@ class Context {
         }
     }
     async element(elementOrSelector) {
-        if (this._spec.isElement(elementOrSelector)) {
-            return new element_1.Element({ spec: this._spec, context: this, element: elementOrSelector });
+        if ((0, element_1.isElement)(elementOrSelector, this._spec)) {
+            return (0, element_1.makeElement)({ spec: this._spec, context: this, element: elementOrSelector });
         }
         else if (!(0, selector_1.isSelector)(elementOrSelector, this._spec)) {
             throw new TypeError('Cannot find element using argument of unknown type!');
         }
         if (this.isRef) {
-            return new element_1.Element({ spec: this._spec, context: this, selector: elementOrSelector });
+            return (0, element_1.makeElement)({ spec: this._spec, context: this, selector: elementOrSelector });
         }
         this.logger.log('Finding element by selector: ', elementOrSelector);
         const [element] = await this._findElements(elementOrSelector, { all: false });
-        return element ? new element_1.Element({ spec: this._spec, context: this, element, selector: elementOrSelector }) : null;
+        return element ? (0, element_1.makeElement)({ spec: this._spec, context: this, element, selector: elementOrSelector }) : null;
     }
     async elements(selectorOrElement) {
         if ((0, selector_1.isSelector)(selectorOrElement, this._spec)) {
             if (this.isRef) {
-                return [new element_1.Element({ spec: this._spec, context: this, selector: selectorOrElement })];
+                return [await (0, element_1.makeElement)({ spec: this._spec, context: this, selector: selectorOrElement })];
             }
             this.logger.log('Finding elements by selector: ', selectorOrElement);
             const elements = await this._findElements(selectorOrElement, { all: true });
-            return elements.map((element, index) => {
-                return new element_1.Element({
+            return Promise.all(elements.map((element, index) => {
+                return (0, element_1.makeElement)({
                     spec: this._spec,
                     context: this,
                     element,
                     selector: selectorOrElement,
                     index,
                 });
-            });
+            }));
         }
-        else if (this._spec.isElement(selectorOrElement)) {
-            return [new element_1.Element({ spec: this._spec, context: this, element: selectorOrElement })];
+        else if ((0, element_1.isElement)(selectorOrElement, this._spec)) {
+            return [await (0, element_1.makeElement)({ spec: this._spec, context: this, element: selectorOrElement })];
         }
         else {
             throw new TypeError('Cannot find elements using argument of unknown type!');
@@ -309,7 +308,7 @@ class Context {
         const [element] = await this._findElements(selector, {
             wait: { state: 'exist', timeout: 10000, interval: 500, ...options },
         });
-        return element ? new element_1.Element({ spec: this._spec, context: this, element, selector }) : null;
+        return element ? (0, element_1.makeElement)({ spec: this._spec, context: this, element, selector }) : null;
     }
     async execute(script, arg) {
         await this.focus();
@@ -323,8 +322,8 @@ class Context {
         }
         function serialize(value) {
             var _a, _b;
-            if (this._spec.isElement(value) || value instanceof element_1.Element) {
-                return value instanceof element_1.Element ? value.toJSON() : value;
+            if ((0, element_1.isElement)(value, this._spec)) {
+                return (0, element_1.isElementInstance)(value) ? value.toJSON() : value;
             }
             else if (utils.types.isArray(value)) {
                 return value.map(value => serialize.call(this, value));
@@ -390,7 +389,7 @@ class Context {
         return (_a = this._element) !== null && _a !== void 0 ? _a : null;
     }
     async getScrollingElement() {
-        if (!(this._scrollingElement instanceof element_1.Element)) {
+        if (!(0, element_1.isElementInstance)(this._scrollingElement)) {
             await this.focus();
             const environment = await this.driver.getEnvironment();
             if (this._scrollingElement) {
@@ -420,8 +419,7 @@ class Context {
         else if (scrollingElement === null)
             this._scrollingElement = null;
         else {
-            this._scrollingElement =
-                scrollingElement instanceof element_1.Element ? scrollingElement : await this.element(scrollingElement);
+            this._scrollingElement = await this.element(scrollingElement);
         }
     }
     async blurElement(element) {

package/dist/debug/check-spec-driver.js

@@ -31,14 +31,14 @@ async function checkSpecDriver(options) {
             assert_1.strict.ok(isElements, 'script returns elements inside nested structure and could be executed with a nested structure of elements');
         },
         'find element with string selector': async () => {
-            const selector = transformSelector('html>body>h1');
+            const selector = toSelector('html>body>h1');
             const element = await spec.findElement(context, selector);
             const isWantedElement = await spec.executeScript(context, `return arguments[0] === document.querySelector("${selector}")`, element);
             assert_1.strict.ok(isWantedElement, `returns element by string selector - "${selector}"`);
         },
         'find element with spec selector': async () => {
-            const cssSelector = transformSelector({ type: 'css', selector: 'html>body>h1' });
-            const xpathSelector = transformSelector({ type: 'xpath', selector: '//html/body/h1' });
+            const cssSelector = toSelector({ type: 'css', selector: 'html>body>h1' });
+            const xpathSelector = toSelector({ type: 'xpath', selector: '//html/body/h1' });
             const verificationScript = `return arguments[0] === document.querySelector('html>body>h1')`;
             const cssElement = await spec.findElement(context, cssSelector);
             const isCssElement = await spec.executeScript(context, verificationScript, cssElement);
@@ -48,19 +48,19 @@ async function checkSpecDriver(options) {
             assert_1.strict.ok(isXpathElement, `returns element by spec selector - ${JSON.stringify(xpathSelector)}`);
         },
         'find element with unresolvable selector': async () => {
-            const selector = transformSelector('unresolvable_selector');
+            const selector = toSelector('unresolvable_selector');
             const element = await spec.findElement(context, selector);
             assert_1.strict.equal(element, null, `returns null by unresolvable selector - "${selector}"`);
         },
         'find elements with string selector': async () => {
-            const selector = transformSelector('html p');
+            const selector = toSelector('html p');
             const elements = await spec.findElements(context, selector);
             const isExpectedElements = await spec.executeScript(context, `var expected = arguments[0]; return Array.prototype.every.call(document.querySelectorAll("${selector}"), function(element, index) { return element === expected[index] })`, elements);
             assert_1.strict.ok(isExpectedElements, `returns elements by string selector - "${selector}"`);
         },
         'find elements with spec selector': async () => {
-            const cssSelector = transformSelector({ type: 'css', selector: 'html p' });
-            const xpathSelector = transformSelector({ type: 'xpath', selector: '//html//p' });
+            const cssSelector = toSelector({ type: 'css', selector: 'html p' });
+            const xpathSelector = toSelector({ type: 'xpath', selector: '//html//p' });
             const verificationScript = `var expected = arguments[0]; return Array.prototype.every.call(document.querySelectorAll('html p'), function(element, index) { return element === expected[index] })`;
             const cssElements = await spec.findElements(context, cssSelector);
             const isCssElements = await spec.executeScript(context, verificationScript, cssElements);
@@ -70,12 +70,12 @@ async function checkSpecDriver(options) {
             assert_1.strict.ok(isXpathElements, `returns element by spec selector - ${JSON.stringify(xpathSelector)}`);
         },
         'find elements with unresolvable selector': async () => {
-            const selector = transformSelector('unresolvable_selector');
+            const selector = toSelector('unresolvable_selector');
             const element = await spec.findElements(context, selector);
             assert_1.strict.deepEqual(element, [], `returns empty array by unresolvable selector - "${selector}"`);
         },
         'child context': async () => {
-            const element = await spec.findElement(context, transformSelector('[name="frame1"]'));
+            const element = await spec.findElement(context, toSelector('[name="frame1"]'));
             const childContext = await spec.childContext(context, element);
             const inFrame = await spec.executeScript(childContext, 'return window.frameElement.name === "frame1"');
             assert_1.strict.ok(inFrame, 'returns or switches to a child context');
@@ -85,7 +85,7 @@ async function checkSpecDriver(options) {
         'is equal elements': async () => {
             if (!spec.isEqualElements)
                 return { skipped: true };
-            const htmlEl = await spec.findElement(context, transformSelector('html'));
+            const htmlEl = await spec.findElement(context, toSelector('html'));
             const htmlEl2 = await spec.executeScript(context, 'return document.documentElement');
             assert_1.strict.ok(await spec.isEqualElements(context, htmlEl, htmlEl2), 'elements should be equal');
             const bodyEl = await spec.executeScript(context, 'return document.body');
@@ -94,32 +94,34 @@ async function checkSpecDriver(options) {
             assert_1.strict.ok(!(await spec.isEqualElements(context, undefined, htmlEl)), 'isEqualElements should return false if one of the arguments is falsy');
         },
         'main context': async () => {
-            const mainDocument1 = await spec.findElement(context, transformSelector('html'));
-            const childContext1 = await spec.childContext(context, (await spec.findElement(context, transformSelector('[name="frame1"]'))));
-            const childContext2 = await spec.childContext(childContext1, (await spec.findElement(childContext1, transformSelector('[name="frame1-1"]'))));
-            const frameDocument = await spec.findElement(childContext2, transformSelector('html'));
+            const mainDocument1 = await spec.findElement(context, toSelector('html'));
+            const childContext1 = await spec.childContext(context, (await spec.findElement(context, toSelector('[name="frame1"]'))));
+            const childContext2 = await spec.childContext(childContext1, (await spec.findElement(childContext1, toSelector('[name="frame1-1"]'))));
+            const frameDocument = await spec.findElement(childContext2, toSelector('html'));
             assert_1.strict.ok(!(await isEqualElements(childContext2, mainDocument1, frameDocument)));
             const mainContext = await spec.mainContext(childContext2);
-            const mainDocument2 = await spec.findElement(mainContext, transformSelector('html'));
+            const mainDocument2 = await spec.findElement(mainContext, toSelector('html'));
             assert_1.strict.ok(await isEqualElements(mainContext, mainDocument2, mainDocument1));
         },
         'parent context': async () => {
-            const parentContext1 = await spec.childContext(context, (await spec.findElement(context, transformSelector('[name="frame1"]'))));
-            const parentDocument1 = await spec.findElement(parentContext1, transformSelector('html'));
-            const frameContext = await spec.childContext(parentContext1, (await spec.findElement(parentContext1, transformSelector('[name="frame1-1"]'))));
-            const frameDocument = await spec.findElement(frameContext, transformSelector('html'));
+            const parentContext1 = await spec.childContext(context, (await spec.findElement(context, toSelector('[name="frame1"]'))));
+            const parentDocument1 = await spec.findElement(parentContext1, toSelector('html'));
+            const frameContext = await spec.childContext(parentContext1, (await spec.findElement(parentContext1, toSelector('[name="frame1-1"]'))));
+            const frameDocument = await spec.findElement(frameContext, toSelector('html'));
             assert_1.strict.ok(!(await isEqualElements(frameContext, parentDocument1, frameDocument)));
             const parentContext2 = await spec.parentContext(frameContext);
-            const parentDocument2 = await spec.findElement(parentContext2, transformSelector('html'));
+            const parentDocument2 = await spec.findElement(parentContext2, toSelector('html'));
             assert_1.strict.ok(await isEqualElements(parentContext2, parentDocument2, parentDocument1));
             await spec.mainContext(context);
         },
         'get title': async () => {
-            const title = await spec.getTitle(driver);
+            var _a;
+            const title = await ((_a = spec.getTitle) === null || _a === void 0 ? void 0 : _a.call(spec, driver));
             assert_1.strict.equal(title, 'Cross SDK test', 'returns title of the current page');
         },
         'get url': async () => {
-            const url = await spec.getUrl(driver);
+            var _a;
+            const url = await ((_a = spec.getUrl) === null || _a === void 0 ? void 0 : _a.call(spec, driver));
             assert_1.strict.equal(url, 'https://applitools.github.io/demo/TestPages/FramesTestPage/', 'returns url of the current page');
         },
         'is driver': async () => {
@@ -129,7 +131,7 @@ async function checkSpecDriver(options) {
             assert_1.strict.ok(!(await spec.isDriver('str')), 'string should not be considered a driver');
         },
         'is element': async () => {
-            const el = await spec.findElement(context, transformSelector('html'));
+            const el = await spec.findElement(context, toSelector('html'));
             assert_1.strict.ok(await spec.isElement(el), 'element should be considered an element :)');
             assert_1.strict.ok(!(await spec.isElement(undefined)), 'undefined should not be considered an element');
             assert_1.strict.ok(!(await spec.isElement(3)), 'number should not be considered an element');
@@ -151,17 +153,17 @@ async function checkSpecDriver(options) {
         }
     }
     return report;
-    function isEqualElements(context, element1, element2) {
+    async function isEqualElements(context, element1, element2) {
         var _a, _b;
-        return ((_b = (_a = spec.isEqualElements) === null || _a === void 0 ? void 0 : _a.call(spec, context, element1, element2)) !== null && _b !== void 0 ? _b : spec.executeScript(context, snippets.isEqualElements, [element1, element2]).catch(() => false));
+        return ((_b = (await ((_a = spec.isEqualElements) === null || _a === void 0 ? void 0 : _a.call(spec, context, element1, element2)))) !== null && _b !== void 0 ? _b : spec.executeScript(context, snippets.isEqualElements, [element1, element2]).catch(() => false));
     }
     function extractContext(driver) {
         var _a, _b;
         return (_b = (_a = spec.extractContext) === null || _a === void 0 ? void 0 : _a.call(spec, driver)) !== null && _b !== void 0 ? _b : driver;
     }
-    function transformSelector(selector) {
+    function toSelector(selector) {
         var _a, _b;
-        return (_b = (_a = spec.transformSelector) === null || _a === void 0 ? void 0 : _a.call(spec, selector)) !== null && _b !== void 0 ? _b : selector;
+        return (_b = (_a = spec.toSelector) === null || _a === void 0 ? void 0 : _a.call(spec, selector)) !== null && _b !== void 0 ? _b : selector;
     }
 }
 exports.checkSpecDriver = checkSpecDriver;

package/dist/driver.js

@@ -23,19 +23,19 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeDriver = exports.isDriver = exports.Driver = void 0;
-const context_1 = require("./context");
+exports.makeDriver = exports.isDriver = exports.isDriverInstance = exports.Driver = void 0;
 const logger_1 = require("@applitools/logger");
+const context_1 = require("./context");
+const selector_1 = require("./selector");
 const helper_ios_1 = require("./helper-ios");
 const helper_android_1 = require("./helper-android");
 const user_agent_1 = require("./user-agent");
 const capabilities_1 = require("./capabilities");
-const specUtils = __importStar(require("./spec-utils"));
 const utils = __importStar(require("@applitools/utils"));
 const snippets = require('@applitools/snippets');
 class Driver {
     constructor(options) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d;
         this._state = {};
         this._customConfig = {};
         this._original = this;
@@ -43,13 +43,13 @@ class Driver {
         this._customConfig = (_a = options.customConfig) !== null && _a !== void 0 ? _a : {};
         this._guid = utils.general.guid();
         this._spec = options.spec;
-        this._target = (_d = (_c = (_b = this._spec).transformDriver) === null || _c === void 0 ? void 0 : _c.call(_b, options.driver)) !== null && _d !== void 0 ? _d : options.driver;
+        this._target = options.driver;
         if (!this._spec.isDriver(this._target)) {
             throw new TypeError('Driver constructor called with argument of unknown type!');
         }
         this._mainContext = new context_1.Context({
             spec: this._spec,
-            context: (_g = (_f = (_e = this._spec).extractContext) === null || _f === void 0 ? void 0 : _f.call(_e, this._target)) !== null && _g !== void 0 ? _g : this._target,
+            context: (_d = (_c = (_b = this._spec).extractContext) === null || _c === void 0 ? void 0 : _c.call(_b, this._target)) !== null && _d !== void 0 ? _d : this._target,
             driver: this,
         });
         this._currentContext = this._mainContext;
@@ -124,9 +124,6 @@ class Driver {
                 },
             });
         }
-        function transformSelector(selector) {
-            return specUtils.transformSelector(spec, selector, { isWeb: true });
-        }
         async function getContextInfo(context) {
             const [documentElement, selector, isRoot, isCORS] = await spec.executeScript(context, snippets.getContextInfo);
             return { documentElement, selector, isRoot, isCORS };
@@ -143,7 +140,7 @@ class Driver {
         }
         async function findContextReference(context, contextInfo) {
             if (contextInfo.selector) {
-                const contextElement = await spec.findElement(context, transformSelector({ type: 'xpath', selector: contextInfo.selector }));
+                const contextElement = await spec.findElement(context, (0, selector_1.makeSelector)({ selector: { type: 'xpath', selector: contextInfo.selector }, spec, environment: { isWeb: true } }));
                 if (contextElement)
                     return contextElement;
             }
@@ -151,7 +148,7 @@ class Driver {
                 if (childContextInfo.isCORS !== contextInfo.isCORS)
                     continue;
                 const childContext = await spec.childContext(context, childContextInfo.contextElement);
-                const contentDocument = await spec.findElement(childContext, transformSelector('html'));
+                const contentDocument = await spec.findElement(childContext, (0, selector_1.makeSelector)({ selector: 'html', spec, environment: { isWeb: true } }));
                 const isWantedContext = await isEqualElements(childContext, contentDocument, contextInfo.documentElement);
                 await spec.parentContext(childContext);
                 if (isWantedContext)
@@ -160,7 +157,7 @@ class Driver {
             return null;
         }
         async function findContextPath(context, contextInfo, contextPath = []) {
-            const contentDocument = await spec.findElement(context, transformSelector('html'));
+            const contentDocument = await spec.findElement(context, (0, selector_1.makeSelector)({ selector: 'html', spec, environment: { isWeb: true } }));
             if (await isEqualElements(context, contentDocument, contextInfo.documentElement)) {
                 return contextPath;
             }
@@ -458,6 +455,11 @@ class Driver {
         }
     }
     async getSessionMetadata() {
+        var _a;
+        // NOTE: not using this.getEnvironment() to not provoke environment extraction if it was not calculated yet.
+        // It is faster to try to execute and fail then collect all of the environment information
+        if (((_a = this._environment) === null || _a === void 0 ? void 0 : _a.isECClient) === false)
+            return undefined;
         try {
             const metadata = await this.currentContext.execute('applitools:metadata');
             this._logger.log('Extracted session metadata', metadata);
@@ -679,7 +681,7 @@ class Driver {
         const environment = await this.getEnvironment();
         if (environment.isMobile && !environment.isEmulation)
             return;
-        if (this._spec.setViewportSize) {
+        if (this._spec.setViewportSize && (!this._spec.setWindowSize || environment.isChromium)) {
             this._logger.log('Setting viewport size to', size, 'using spec method');
             await this._spec.setViewportSize(this.target, size);
             return;
@@ -788,18 +790,20 @@ class Driver {
         }
     }
     async getTitle() {
+        var _a, _b, _c;
         const environment = await this.getEnvironment();
         if (environment.isNative)
             return undefined;
-        const title = await this._spec.getTitle(this.target);
+        const title = (_c = (await ((_b = (_a = this._spec).getTitle) === null || _b === void 0 ? void 0 : _b.call(_a, this.target)))) !== null && _c !== void 0 ? _c : '';
         this._logger.log('Extracted title:', title);
         return title;
     }
     async getUrl() {
+        var _a, _b, _c;
         const environment = await this.getEnvironment();
         if (environment.isNative)
             return undefined;
-        const url = await this._spec.getUrl(this.target);
+        const url = (_c = (await ((_b = (_a = this._spec).getUrl) === null || _b === void 0 ? void 0 : _b.call(_a, this.target)))) !== null && _c !== void 0 ? _c : '';
         this._logger.log('Extracted url:', url);
         return url;
     }
@@ -821,12 +825,27 @@ class Driver {
     }
 }
 exports.Driver = Driver;
+function isDriverInstance(driver) {
+    return driver instanceof Driver;
+}
+exports.isDriverInstance = isDriverInstance;
 function isDriver(driver, spec) {
-    return driver instanceof Driver || !!(spec === null || spec === void 0 ? void 0 : spec.isDriver(driver));
+    var _a;
+    return isDriverInstance(driver) || !!(spec === null || spec === void 0 ? void 0 : spec.isDriver(driver)) || !!((_a = spec === null || spec === void 0 ? void 0 : spec.isSecondaryDriver) === null || _a === void 0 ? void 0 : _a.call(spec, driver));
 }
 exports.isDriver = isDriver;
 async function makeDriver(options) {
-    const driver = options.driver instanceof Driver ? options.driver : new Driver(options);
+    var _a, _b, _c;
+    let driver;
+    if (options.driver instanceof Driver) {
+        driver = options.driver;
+        if (options.relaxed)
+            return driver;
+    }
+    else {
+        options.driver = (_c = (await ((_b = (_a = options.spec) === null || _a === void 0 ? void 0 : _a.toDriver) === null || _b === void 0 ? void 0 : _b.call(_a, options.driver)))) !== null && _c !== void 0 ? _c : options.driver;
+        driver = new Driver(options);
+    }
     if (options.logger)
         driver.updateLogger(options.logger);
     return driver.refresh({ reset: options.reset });

package/dist/element.js

@@ -23,21 +23,21 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isElementReference = exports.Element = void 0;
+exports.makeElement = exports.isElementReference = exports.isElement = exports.isElementInstance = exports.Element = void 0;
 const selector_1 = require("./selector");
 const utils = __importStar(require("@applitools/utils"));
 const snippets = require('@applitools/snippets');
 class Element {
     constructor(options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f;
         this._state = {};
         this._spec = options.spec;
         this._context = options.context;
         if (utils.types.has(options, 'element')) {
-            this._target = (_c = (_b = (_a = this._spec).transformElement) === null || _b === void 0 ? void 0 : _b.call(_a, options.element)) !== null && _c !== void 0 ? _c : options.element;
+            this._target = options.element;
             if (this._spec.isElement(this._target)) {
                 // Some frameworks contains information about the selector inside an element
-                this._selector = (_d = options.selector) !== null && _d !== void 0 ? _d : (_f = (_e = this._spec).extractSelector) === null || _f === void 0 ? void 0 : _f.call(_e, options.element);
+                this._selector = (_a = options.selector) !== null && _a !== void 0 ? _a : (_c = (_b = this._spec).extractSelector) === null || _c === void 0 ? void 0 : _c.call(_b, options.element);
                 this._index = options.index;
             }
         }
@@ -50,8 +50,8 @@ class Element {
         if ((0, selector_1.isSimpleCommonSelector)(this._selector) && !utils.types.isString(this._selector)) {
             this._commonSelector = this._selector;
         }
-        else if (this._selector && this._spec.untransformSelector) {
-            this._commonSelector = this._spec.untransformSelector((_j = (_h = (_g = this._spec).transformSelector) === null || _h === void 0 ? void 0 : _h.call(_g, this._selector)) !== null && _j !== void 0 ? _j : this._selector);
+        else if (this._selector && this._spec.toSimpleCommonSelector) {
+            this._commonSelector = this._spec.toSimpleCommonSelector((_f = (_e = (_d = this._spec).toSelector) === null || _e === void 0 ? void 0 : _e.call(_d, this._selector)) !== null && _f !== void 0 ? _f : this._selector);
         }
         else if (utils.types.isString(this._selector)) {
             this._commonSelector = { selector: this._selector };
@@ -624,6 +624,11 @@ class Element {
             return this.getScrollOffset();
         }
     }
+    async hover() {
+        var _a, _b;
+        this.logger.log(`Hovering on the element with selector`, this.selector);
+        await ((_b = (_a = this._spec).hover) === null || _b === void 0 ? void 0 : _b.call(_a, this.context.target, this.target));
+    }
     async click() {
         var _a, _b;
         this.logger.log(`Clicking on the element with selector`, this.selector);
@@ -722,7 +727,34 @@ class Element {
     }
 }
 exports.Element = Element;
+function isElementInstance(element) {
+    return element instanceof Element;
+}
+exports.isElementInstance = isElementInstance;
+function isElement(element, spec) {
+    var _a;
+    return isElementInstance(element) || !!(spec === null || spec === void 0 ? void 0 : spec.isElement(element)) || !!((_a = spec === null || spec === void 0 ? void 0 : spec.isSecondaryElement) === null || _a === void 0 ? void 0 : _a.call(spec, element));
+}
+exports.isElement = isElement;
 function isElementReference(reference, spec) {
-    return !!spec && (spec.isElement(reference) || (0, selector_1.isSelector)(reference, spec));
+    return isElement(reference, spec) || (0, selector_1.isSelector)(reference, spec);
 }
 exports.isElementReference = isElementReference;
+async function makeElement(options) {
+    var _a, _b, _c;
+    let element;
+    if (utils.types.has(options, 'element')) {
+        if (options.element instanceof Element) {
+            element = options.element;
+        }
+        else {
+            options.element = (_c = (await ((_b = (_a = options.spec) === null || _a === void 0 ? void 0 : _a.toElement) === null || _b === void 0 ? void 0 : _b.call(_a, options.element)))) !== null && _c !== void 0 ? _c : options.element;
+            element = new Element(options);
+        }
+    }
+    else {
+        element = new Element(options);
+    }
+    return element;
+}
+exports.makeElement = makeElement;

package/dist/fake/spec-driver.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.visit = exports.getTitle = exports.getUrl = exports.getOrientation = exports.setWindowSize = exports.getWindowSize = exports.getDriverInfo = exports.takeScreenshot = exports.childContext = exports.parentContext = exports.mainContext = exports.getElementText = exports.findElements = exports.findElement = exports.executeScript = exports.isEqualElements = exports.isStaleElementError = exports.extractSelector = exports.untransformSelector = exports.transformSelector = exports.isSelector = exports.isElement = exports.isDriver = void 0;
+exports.visit = exports.getTitle = exports.getUrl = exports.getOrientation = exports.setWindowSize = exports.getWindowSize = exports.getDriverInfo = exports.takeScreenshot = exports.childContext = exports.parentContext = exports.mainContext = exports.getElementText = exports.findElements = exports.findElement = exports.executeScript = exports.isEqualElements = exports.isStaleElementError = exports.extractSelector = exports.toSimpleCommonSelector = exports.toSelector = exports.isSelector = exports.isElement = exports.isDriver = void 0;
 const utils = __importStar(require("@applitools/utils"));
 function isDriver(driver) {
     return driver && driver.constructor.name === 'MockDriver';
@@ -41,11 +41,11 @@ function isSelector(selector) {
     return (utils.types.isString(selector) || utils.types.has(selector, ['using', 'value']) || (selector === null || selector === void 0 ? void 0 : selector.forceSelector) === true);
 }
 exports.isSelector = isSelector;
-function transformSelector(selector) {
+function toSelector(selector) {
     return utils.types.has(selector, 'selector') ? selector.selector : selector;
 }
-exports.transformSelector = transformSelector;
-function untransformSelector(selector) {
+exports.toSelector = toSelector;
+function toSimpleCommonSelector(selector) {
     if (utils.types.isString(selector)) {
         return { type: 'css', selector: selector };
     }
@@ -57,7 +57,7 @@ function untransformSelector(selector) {
     }
     return null;
 }
-exports.untransformSelector = untransformSelector;
+exports.toSimpleCommonSelector = toSimpleCommonSelector;
 function extractSelector(element) {
     if (utils.types.has(element, ['selector'])) {
         return element.selector;

package/dist/index.js

@@ -10,27 +10,13 @@ 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 __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);
 };
-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;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.specUtils = void 0;
 __exportStar(require("./spec-driver"), exports);
 __exportStar(require("./driver"), exports);
 __exportStar(require("./context"), exports);
 __exportStar(require("./element"), exports);
 __exportStar(require("./selector"), exports);
 __exportStar(require("./types"), exports);
-exports.specUtils = __importStar(require("./spec-utils"));

package/dist/selector.js

@@ -23,20 +23,41 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSimpleCommonSelector = exports.isObjectCommonSelector = exports.isSelector = void 0;
+exports.makeSelector = exports.isSimpleCommonSelector = exports.isComplexSelector = exports.isSelector = void 0;
 const utils = __importStar(require("@applitools/utils"));
 function isSelector(selector, spec) {
-    return (spec === null || spec === void 0 ? void 0 : spec.isSelector(selector)) || utils.types.isString(selector) || isObjectCommonSelector(selector, spec);
+    var _a;
+    return ((spec === null || spec === void 0 ? void 0 : spec.isSelector(selector)) ||
+        ((_a = spec === null || spec === void 0 ? void 0 : spec.isSecondarySelector) === null || _a === void 0 ? void 0 : _a.call(spec, selector)) ||
+        utils.types.isString(selector) ||
+        isComplexSelector(selector, spec));
 }
 exports.isSelector = isSelector;
-function isObjectCommonSelector(selector, spec) {
+function isComplexSelector(selector, spec) {
     return (utils.types.isPlainObject(selector) &&
         utils.types.has(selector, 'selector') &&
         Object.keys(selector).every(key => ['selector', 'type', 'frame', 'shadow', 'child', 'fallback'].includes(key)) &&
         (utils.types.isString(selector.selector) || !!(spec === null || spec === void 0 ? void 0 : spec.isSelector(selector.selector))));
 }
-exports.isObjectCommonSelector = isObjectCommonSelector;
+exports.isComplexSelector = isComplexSelector;
 function isSimpleCommonSelector(selector) {
-    return utils.types.isString(selector) || isObjectCommonSelector(selector);
+    return utils.types.isString(selector) || isComplexSelector(selector);
 }
 exports.isSimpleCommonSelector = isSimpleCommonSelector;
+function makeSelector(options) {
+    var _a, _b;
+    const { spec, environment } = options;
+    let selector = options.selector;
+    if ((environment === null || environment === void 0 ? void 0 : environment.isWeb) && isComplexSelector(selector, spec)) {
+        if (selector.type === 'id')
+            selector = { type: 'css', selector: `#${selector.selector}` };
+        else if (selector.type === 'name')
+            selector = { type: 'css', selector: `[name="${selector.selector}"]` };
+        else if (selector.type === 'class name')
+            selector = { type: 'css', selector: `.${selector.selector}` };
+        else if (selector.type === 'tag name')
+            selector = { type: 'css', selector: `${selector.selector}` };
+    }
+    return (_b = (_a = spec.toSelector) === null || _a === void 0 ? void 0 : _a.call(spec, selector)) !== null && _b !== void 0 ? _b : selector;
+}
+exports.makeSelector = makeSelector;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/driver",
-  "version": "1.13.4",
+  "version": "1.13.5",
   "description": "Applitools universal framework wrapper",
   "keywords": [
     "applitools",
@@ -73,9 +73,9 @@
     "test": "run --top-level mocha './test/**/*.spec.ts'"
   },
   "dependencies": {
-    "@applitools/logger": "2.0.7",
-    "@applitools/snippets": "2.4.22",
-    "@applitools/utils": "1.5.0",
+    "@applitools/logger": "2.0.8",
+    "@applitools/snippets": "2.4.23",
+    "@applitools/utils": "1.5.1",
     "semver": "7.5.4"
   },
   "devDependencies": {

package/types/context.d.ts

@@ -3,7 +3,7 @@ import type { Cookie } from './types';
 import { type SpecType, type SpecDriver, type WaitOptions } from './spec-driver';
 import { type Driver } from './driver';
 import { type Selector } from './selector';
-import { Element, type ElementReference } from './element';
+import { type ElementReference, type Element } from './element';
 export type ContextReference<T extends SpecType> = Element<T> | ElementReference<T> | string | number;
 export type NestedContextReference<T extends SpecType> = {
     reference: ContextReference<T>;

package/types/driver.d.ts

@@ -4,8 +4,8 @@ import type { DriverInfo, Capabilities, UserAgent, Environment, Viewport, Featur
 import { type Selector } from './selector';
 import { type SpecType, type SpecDriver, type WaitOptions } from './spec-driver';
 import { type Element } from './element';
-import { Context, type ContextReference } from './context';
 import { type Logger } from '@applitools/logger';
+import { Context, type ContextReference } from './context';
 import { HelperIOS } from './helper-ios';
 import { HelperAndroid } from './helper-android';
 type DriverOptions<T extends SpecType> = {
@@ -87,14 +87,16 @@ export declare class Driver<T extends SpecType> {
     execute(script: ((arg: any) => any) | string, arg?: any): Promise<any>;
     visit(url: string): Promise<void>;
 }
-export declare function isDriver<T extends SpecType>(driver: any, spec?: SpecDriver<T>): driver is Driver<T> | T['driver'];
+export declare function isDriverInstance<T extends SpecType>(driver: any): driver is Driver<T>;
+export declare function isDriver<T extends SpecType>(driver: any, spec?: SpecDriver<T>): driver is Driver<T> | T['driver'] | T['secondary']['driver'];
 export declare function makeDriver<T extends SpecType>(options: {
-    driver: Driver<T> | T['driver'];
+    driver: Driver<T> | T['driver'] | T['secondary']['driver'];
     spec?: SpecDriver<T>;
     customConfig?: {
         useCeilForViewportSize?: boolean;
     };
     reset?: boolean;
+    relaxed?: boolean;
     logger?: Logger;
 }): Promise<Driver<T>>;
 export {};

package/types/element.d.ts

@@ -2,7 +2,7 @@ import type { Location, Size, Region } from '@applitools/utils';
 import { type SpecType, type SpecDriver } from './spec-driver';
 import { type Context } from './context';
 import { type Selector, type CommonSelector } from './selector';
-export type ElementReference<T extends SpecType> = T['element'] | Selector<T>;
+export type ElementReference<T extends SpecType> = T['element'] | T['secondary']['element'] | Selector<T>;
 type ElementState = {
     contentSize?: Size;
     scrollOffset?: Location;
@@ -74,6 +74,7 @@ export declare class Element<T extends SpecType> {
     getScrollOffset(): Promise<Location>;
     getTranslateOffset(): Promise<Location>;
     getInnerOffset(): Promise<Location>;
+    hover(): Promise<void>;
     click(): Promise<void>;
     type(value: string): Promise<void>;
     preserveState(): Promise<ElementState>;
@@ -84,5 +85,18 @@ export declare class Element<T extends SpecType> {
     withRefresh<TResult>(operation: (...args: any[]) => TResult): Promise<TResult>;
     toJSON(): T['element'];
 }
+export declare function isElementInstance<T extends SpecType>(element: any): element is Element<T>;
+export declare function isElement<T extends SpecType>(element: any, spec?: SpecDriver<T>): element is Element<T> | T['element'] | T['secondary']['element'];
 export declare function isElementReference<T extends SpecType>(reference: any, spec?: SpecDriver<T>): reference is ElementReference<T>;
+export declare function makeElement<T extends SpecType>(options: {
+    spec: SpecDriver<T>;
+    context?: Context<T>;
+} & ({
+    element: Element<T> | T['element'] | T['secondary']['element'];
+    selector?: Selector<T>;
+    index?: number;
+} | {
+    selector: Selector<T>;
+    index?: number;
+})): Promise<Element<T>>;
 export {};

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

@@ -14,10 +14,10 @@ type CommonSelector = string | {
 export declare function isDriver(driver: any): driver is Driver;
 export declare function isElement(element: any): element is Element;
 export declare function isSelector(selector: any): selector is Selector;
-export declare function transformSelector(selector: Selector | {
+export declare function toSelector(selector: Selector | {
     selector: Selector;
 }): Selector;
-export declare function untransformSelector(selector: Selector): CommonSelector | null;
+export declare function toSimpleCommonSelector(selector: Selector): CommonSelector | null;
 export declare function extractSelector(element: Element): any;
 export declare function isStaleElementError(): boolean;
 export declare function isEqualElements(_driver: Driver, element1: Element, element2: Element): Promise<boolean>;

package/types/index.d.ts

@@ -4,4 +4,3 @@ export * from './context';
 export * from './element';
 export * from './selector';
 export * from './types';
-export * as specUtils from './spec-utils';

package/types/selector.d.ts

@@ -1,5 +1,5 @@
 import { type SpecType, type SpecDriver } from './spec-driver';
-export type Selector<T extends SpecType = never> = T['selector'] | CommonSelector<T['selector']>;
+export type Selector<T extends SpecType = never> = T['selector'] | T['secondary']['selector'] | CommonSelector<T['selector'] | T['secondary']['selector']>;
 export type CommonSelector<TSelector = never> = string | ComplexSelector<TSelector>;
 type ComplexSelector<TSelector> = {
     selector: TSelector | string;
@@ -9,7 +9,17 @@ type ComplexSelector<TSelector> = {
     frame?: TSelector | string | CommonSelector<TSelector>;
     fallback?: TSelector | string | CommonSelector<TSelector>;
 };
-export declare function isSelector<T extends SpecType>(selector: any, spec?: Pick<SpecDriver<T>, 'isSelector'>): selector is Selector<T>;
-export declare function isObjectCommonSelector<T extends SpecType>(selector: any, spec?: Pick<SpecDriver<T>, 'isSelector'>): selector is Exclude<CommonSelector<T['selector']>, string>;
+export declare function isSelector<T extends SpecType>(selector: any, spec?: Pick<SpecDriver<T>, 'isSelector' | 'isSecondarySelector'>): selector is Selector<T>;
+export declare function isComplexSelector<T extends SpecType>(selector: any, spec?: Pick<SpecDriver<T>, 'isSelector'>): selector is Exclude<CommonSelector<T['selector']>, string>;
 export declare function isSimpleCommonSelector(selector: any): selector is CommonSelector;
+export declare function makeSelector<T extends SpecType>(options: {
+    selector: Selector<T>;
+    spec: Pick<SpecDriver<T>, 'isSelector' | 'toSelector'>;
+    environment?: {
+        isWeb?: boolean;
+        isNative?: boolean;
+        isIOS?: boolean;
+        isAndroid?: boolean;
+    };
+}): T['selector'];
 export {};

package/types/spec-driver.d.ts

@@ -2,47 +2,105 @@
 import type { Size, Region } from '@applitools/utils';
 import type { DriverInfo, Capabilities, ScreenOrientation, Cookie } from './types';
 import { type CommonSelector } from './selector';
-export type SpecType<TDriver = unknown, TContext = unknown, TElement = unknown, TSelector = unknown> = {
+export type SpecType<TDriver = unknown, TContext = unknown, TElement = unknown, TSelector = unknown, TSecondary extends SpecType = SpecType<unknown, unknown, unknown, unknown, never>> = {
     driver: TDriver;
     context: TContext;
     element: TElement;
     selector: TSelector;
+    secondary: TSecondary;
 };
 export interface SpecDriver<T extends SpecType> {
+    /**
+     * Assures that the given driver has a speced type.
+     */
     isDriver(driver: any): driver is T['driver'];
+    /**
+     * Assures that the given driver has a secondary type.
+     */
+    isSecondaryDriver?(driver: any): driver is T['secondary']['driver'];
+    /**
+     * Assures that the given context has a speced type.
+     * (applicable only to cdp-like specs.)
+     */
     isContext?(context: any): context is T['context'];
+    /**
+     * Assures that the given context has a secondary type.
+     */
+    isSecondaryContext?(context: any): context is T['secondary']['context'];
+    /**
+     * Assures that the given element has a speced type.
+     */
     isElement(element: any): element is T['element'];
+    /**
+     * Assures that the given element has a secondary type.
+     */
+    isSecondaryElement?(element: any): element is T['secondary']['element'];
+    /**
+     * Assures that the given selector has a speced context.
+     */
     isSelector(selector: any): selector is T['selector'];
-    transformDriver?(driver: any): T['driver'];
-    transformElement?(element: any): T['element'];
-    transformSelector?(selector: CommonSelector<T['selector']> | T['selector']): T['selector'];
-    untransformSelector?(selector: T['selector']): CommonSelector | null;
-    extractContext?(element: T['driver'] | T['context']): T['context'];
-    extractSelector?(element: T['element']): T['selector'];
+    /**
+     * Assures that the given selector has a secondary type.
+     */
+    isSecondarySelector?(selector: any): selector is T['secondary']['selector'];
+    /**
+     * Assures that two given elements are equal.
+     * (should be implemented only if there is different a different method then in-browser comparison.)
+     */
+    isEqualElements?(context: T['context'], element1: T['element'], element2: T['element']): boolean | Promise<boolean>;
+    /**
+     * Assures that the error is a stale element error.
+     */
     isStaleElementError(error: any, selector?: T['selector']): boolean;
-    isEqualElements?(context: T['context'], element1: T['element'], element2: T['element']): Promise<boolean>;
-    extractHostName?(driver: T['driver']): string | null;
-    mainContext(context: T['context']): Promise<T['context']>;
-    parentContext?(context: T['context']): Promise<T['context']>;
-    childContext(context: T['context'], element: T['element']): Promise<T['context']>;
+    /**
+     * Converts the given driver to a speced driver.
+     * (applicable in cases when spec has certain variations or sub-types of the driver.)
+     */
+    toDriver?(driver: T['secondary']['driver']): T['driver'] | Promise<T['driver']>;
+    /**
+     * Transforms the given element to a speced element.
+     * (applicable in cases when spec has certain variations or sub-types of the element.)
+     */
+    toElement?(element: T['secondary']['element']): T['element'] | Promise<T['element']>;
+    /**
+     * Transforms the given common selector to a speced selector.
+     */
+    toSelector?(selector: T['secondary']['selector'] | CommonSelector<T['selector']>): T['selector'];
+    /**
+     * Transforms the given speced selector to simple common selector if possible.
+     */
+    toSimpleCommonSelector?(selector: T['selector']): CommonSelector | null;
+    /**
+     * Extracts context from the given driver.
+     */
+    extractContext?(element: T['driver']): T['context'];
+    /**
+     * Extracts selector from the given element if possible.
+     * (should be implemented in cases when speced type of the element contains selector in itself.)
+     */
+    extractSelector?(element: T['element']): T['selector'] | null;
+    /**
+     * Executes given script in the given contexts with given argument.
+     */
     executeScript(context: T['context'], script: ((arg?: any) => any) | string, arg?: any): Promise<any>;
     findElement(context: T['context'], selector: T['selector'], parent?: T['element']): Promise<T['element'] | null>;
     findElements(context: T['context'], selector: T['selector'], parent?: T['element']): Promise<T['element'][]>;
     waitForSelector?(context: T['context'], selector: T['selector'], parent?: T['element'], options?: WaitOptions): Promise<T['element'] | null>;
+    getElementRegion?(context: T['context'], element: T['element']): Promise<Region>;
+    getElementAttribute?(context: T['context'], element: T['element'], attr: string): Promise<string>;
     setElementText?(context: T['context'], element: T['element'], text: string): Promise<void>;
     getElementText?(context: T['context'], element: T['element']): Promise<string>;
+    hover?(context: T['context'], element: T['element']): Promise<void>;
+    click?(context: T['context'], element: T['element']): Promise<void>;
+    mainContext(context: T['context']): Promise<T['context']>;
+    parentContext?(context: T['context']): Promise<T['context']>;
+    childContext(context: T['context'], element: T['element']): Promise<T['context']>;
+    getDriverInfo?(driver: T['driver']): Promise<DriverInfo>;
+    getCapabilities?(driver: T['driver']): Promise<Capabilities>;
     setWindowSize?(driver: T['driver'], size: Size): Promise<void>;
     getWindowSize?(driver: T['driver']): Promise<Size>;
     setViewportSize?(driver: T['driver'], size: Size): Promise<void>;
     getViewportSize?(driver: T['driver']): Promise<Size>;
-    getCookies?(driver: T['driver'] | T['context'], context?: boolean): Promise<Cookie[]>;
-    getDriverInfo?(driver: T['driver']): Promise<DriverInfo>;
-    getCapabilities?(driver: T['driver']): Promise<Capabilities>;
-    getTitle(driver: T['driver']): Promise<string>;
-    getUrl(driver: T['driver']): Promise<string>;
-    takeScreenshot(driver: T['driver']): Promise<Buffer | string>;
-    click?(context: T['context'], element: T['element'] | T['selector']): Promise<void>;
-    visit?(driver: T['driver'], url: string): Promise<void>;
     getOrientation?(driver: T['driver']): Promise<ScreenOrientation>;
     setOrientation?(driver: T['driver'], orientation: ScreenOrientation): Promise<void>;
     getSystemBars?(driver: T['driver']): Promise<{
@@ -61,9 +119,12 @@ export interface SpecDriver<T extends SpecType> {
             width: number;
         };
     }>;
-    getElementRegion?(driver: T['driver'], element: T['element']): Promise<Region>;
-    getElementAttribute?(driver: T['driver'], element: T['element'], attr: string): Promise<string>;
+    getCookies?(driver: T['driver'] | T['context'], context?: boolean): Promise<Cookie[]>;
+    getTitle?(driver: T['driver']): Promise<string>;
+    getUrl?(driver: T['driver']): Promise<string>;
+    visit?(driver: T['driver'], url: string): Promise<void>;
     performAction?(driver: T['driver'], steps: any[]): Promise<void>;
+    takeScreenshot(driver: T['driver']): Promise<Buffer | string>;
     getCurrentWorld?(driver: T['driver']): Promise<string>;
     getWorlds?(driver: T['driver']): Promise<string[]>;
     switchWorld?(driver: T['driver'], id: string): Promise<void>;

package/types/utils.d.ts

@@ -0,0 +1,2 @@
+import { type SpecType, type SpecDriver } from './spec-driver';
+export declare function withFastCache<TSpecDriver extends SpecDriver<SpecType>>(spec: TSpecDriver): TSpecDriver;

package/dist/spec-utils.js

@@ -1,76 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.withFastCache = exports.splitSelector = exports.transformSelector = void 0;
-const selector_1 = require("./selector");
-function transformSelector(spec, selector, environment) {
-    var _a, _b;
-    if ((environment === null || environment === void 0 ? void 0 : environment.isWeb) && (0, selector_1.isObjectCommonSelector)(selector, spec)) {
-        if (selector.type === 'id')
-            selector = { type: 'css', selector: `#${selector.selector}` };
-        else if (selector.type === 'name')
-            selector = { type: 'css', selector: `[name="${selector.selector}"]` };
-        else if (selector.type === 'class name')
-            selector = { type: 'css', selector: `.${selector.selector}` };
-        else if (selector.type === 'tag name')
-            selector = { type: 'css', selector: `${selector.selector}` };
-    }
-    selector;
-    return (_b = (_a = spec.transformSelector) === null || _a === void 0 ? void 0 : _a.call(spec, selector)) !== null && _b !== void 0 ? _b : selector;
-}
-exports.transformSelector = transformSelector;
-function splitSelector(spec, selector) {
-    let targetSelector = selector;
-    let activeSelector = {};
-    let elementSelector = activeSelector;
-    const contextSelectors = [];
-    while (targetSelector) {
-        if ((0, selector_1.isObjectCommonSelector)(targetSelector, spec)) {
-            activeSelector.selector = targetSelector.selector;
-            if (targetSelector.type)
-                activeSelector.type = targetSelector.type;
-            if (targetSelector.child) {
-                activeSelector = activeSelector.child = {};
-                targetSelector = targetSelector.child;
-            }
-            else if (targetSelector.shadow) {
-                activeSelector = activeSelector.shadow = {};
-                targetSelector = targetSelector.shadow;
-            }
-            else if (targetSelector.frame) {
-                contextSelectors.push(elementSelector);
-                elementSelector = activeSelector = {};
-                targetSelector = targetSelector.frame;
-            }
-            else {
-                targetSelector = null;
-            }
-        }
-        else {
-            activeSelector.selector = targetSelector;
-            targetSelector = null;
-        }
-    }
-    return { contextSelectors, elementSelector };
-}
-exports.splitSelector = splitSelector;
-function withFastCache(spec) {
-    const cache = new Map();
-    return Object.entries(spec).reduce((spec, [name, command]) => {
-        spec[name] = (...args) => {
-            const value = cache.get(command);
-            if ((value === null || value === void 0 ? void 0 : value.args.length) === args.length && value.args.every((arg, index) => arg === args[index])) {
-                return value.result;
-            }
-            else {
-                cache.delete(command);
-            }
-            const result = command(...args);
-            if (!(result instanceof Promise))
-                return result;
-            cache.set(command, { args, result });
-            return result.finally(() => setImmediate(() => cache.delete(command)));
-        };
-        return spec;
-    }, {});
-}
-exports.withFastCache = withFastCache;