@applitools/driver 1.11.26 → 1.11.27

package/dist/context.js

@@ -29,14 +29,19 @@ const utils = __importStar(require("@applitools/utils"));
 const specUtils = __importStar(require("./spec-utils"));
 const snippets = require('@applitools/snippets');
 class Context {
+    _isReference(reference) {
+        return (reference instanceof Context ||
+            utils.types.isInteger(reference) ||
+            utils.types.isString(reference) ||
+            reference instanceof element_1.Element ||
+            this._spec.isElement(reference) ||
+            specUtils.isSelector(this._spec, reference));
+    }
     constructor(options) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         this._state = {};
-        if (options.context instanceof Context)
-            return options.context;
         this._spec = options.spec;
-        if (options.logger)
-            this._logger = options.logger;
+        this._logger = options.logger;
         if (options.context) {
             if ((_c = (_b = (_a = this._spec).isContext) === null || _b === void 0 ? void 0 : _b.call(_a, options.context)) !== null && _c !== void 0 ? _c : this._spec.isDriver(options.context)) {
                 this._target = options.context;
@@ -54,11 +59,9 @@ class Context {
             this._reference = options.reference;
             this._parent = options.parent;
             this._scrollingElement = options.scrollingElement;
-            this._driver = options.driver || this._parent.driver;
+            this._driver = options.driver || ((_d = this._parent) === null || _d === void 0 ? void 0 : _d.driver);
         }
         else if (!options.reference) {
-            this._element = null;
-            this._parent = null;
             this._scrollingElement = options.scrollingElement;
             this._driver = options.driver;
         }
@@ -66,14 +69,6 @@ class Context {
             throw new TypeError('Context constructor called with argument of unknown type!');
         }
     }
-    _isReference(reference) {
-        return (reference instanceof Context ||
-            utils.types.isInteger(reference) ||
-            utils.types.isString(reference) ||
-            reference instanceof element_1.Element ||
-            this._spec.isElement(reference) ||
-            specUtils.isSelector(this._spec, reference));
-    }
     get target() {
         return this._target;
     }
@@ -105,6 +100,7 @@ class Context {
         return !this._target;
     }
     async _findElements(selector, options = {}) {
+        var _a;
         await this.focus();
         const { parent, all, wait } = options;
         const transformedSelector = specUtils.transformSelector(this._spec, selector, this.driver);
@@ -123,8 +119,9 @@ class Context {
                     if (element) {
                         clearTimeout(timeout);
                         elements = [element];
+                        break;
                     }
-                    await utils.general.sleep(wait.interval);
+                    await utils.general.sleep((_a = wait.interval) !== null && _a !== void 0 ? _a : 0);
                 }
             }
         }
@@ -163,7 +160,7 @@ class Context {
                 }
             }
             if (elements.length === 0 && selector.fallback) {
-                elements = await this._findElements(selector.fallback, parent);
+                elements = await this._findElements(selector.fallback, { parent });
             }
         }
         return elements;
@@ -171,8 +168,9 @@ class Context {
     async init() {
         if (this.isInitialized)
             return this;
-        if (!this._reference)
+        if (!this._reference || !this.parent) {
             throw new TypeError('Cannot initialize context without a reference to the context element');
+        }
         await this.parent.focus();
         this._logger.log('Context initialization');
         if (utils.types.isInteger(this._reference)) {
@@ -200,12 +198,10 @@ class Context {
         }
         else if (this._spec.isElement(this._reference) || this._reference instanceof element_1.Element) {
             this._logger.log('Initialize context from reference element', this._reference);
-            this._element = new element_1.Element({
-                spec: this._spec,
-                context: this.parent,
-                element: this._reference,
-                logger: this._logger,
-            });
+            this._element =
+                this._reference instanceof element_1.Element
+                    ? this._reference
+                    : new element_1.Element({ spec: this._spec, context: this.parent, element: this._reference, logger: this._logger });
         }
         else {
             throw new TypeError('Reference type does not supported');
@@ -241,7 +237,7 @@ class Context {
             return true;
         if (!this._element)
             return false;
-        return this._element.equals(context instanceof Context ? await context.getContextElement() : context);
+        return this._element.equals(context instanceof Context ? (await context.getContextElement()) : context);
     }
     async context(reference) {
         if (reference instanceof Context) {
@@ -264,6 +260,9 @@ class Context {
                 logger: this._logger,
             });
         }
+        else {
+            throw new Error('Cannot get context using reference of unknown type!');
+        }
     }
     async element(elementOrSelector) {
         if (this._spec.isElement(elementOrSelector)) {
@@ -307,6 +306,7 @@ class Context {
         }
     }
     async waitFor(selector, options) {
+        this._logger.log('Waiting for element by selector: ', selector, 'and options', options);
         const [element] = await this._findElements(selector, {
             wait: { state: 'exist', timeout: 10000, interval: 500, ...options },
         });
@@ -384,10 +384,11 @@ class Context {
         }
     }
     async getContextElement() {
+        var _a;
         if (this.isMain)
             return null;
         await this.init();
-        return this._element;
+        return (_a = this._element) !== null && _a !== void 0 ? _a : null;
     }
     async getScrollingElement() {
         if (!(this._scrollingElement instanceof element_1.Element)) {
@@ -444,7 +445,7 @@ class Context {
         }
     }
     async getRegion() {
-        var _a;
+        var _a, _b;
         if (this.isMain && this.isCurrent) {
             const viewportRegion = utils.geometry.region({ x: 0, y: 0 }, await this.driver.getViewportSize());
             this._state.region = this._scrollingElement
@@ -453,12 +454,12 @@ class Context {
         }
         else if ((_a = this.parent) === null || _a === void 0 ? void 0 : _a.isCurrent) {
             await this.init();
-            this._state.region = await this._element.getRegion();
+            this._state.region = await ((_b = this._element) === null || _b === void 0 ? void 0 : _b.getRegion());
         }
         return this._state.region;
     }
     async getClientRegion() {
-        var _a;
+        var _a, _b;
         if (this.isMain && this.isCurrent) {
             const viewportRegion = utils.geometry.region({ x: 0, y: 0 }, await this.driver.getViewportSize());
             this._state.clientRegion = this._scrollingElement
@@ -467,14 +468,14 @@ class Context {
         }
         else if ((_a = this.parent) === null || _a === void 0 ? void 0 : _a.isCurrent) {
             await this.init();
-            this._state.clientRegion = await this._element.getClientRegion();
+            this._state.clientRegion = await ((_b = this._element) === null || _b === void 0 ? void 0 : _b.getClientRegion());
         }
         return this._state.clientRegion;
     }
     async getScrollingRegion() {
         if (this.isCurrent) {
             const scrollingElement = await this.getScrollingElement();
-            this._state.scrollingRegion = await scrollingElement.getClientRegion();
+            this._state.scrollingRegion = await (scrollingElement === null || scrollingElement === void 0 ? void 0 : scrollingElement.getClientRegion());
         }
         return this._state.scrollingRegion;
     }
@@ -511,12 +512,12 @@ class Context {
     }
     async getRegionInViewport(region) {
         var _a, _b;
-        let currentContext = this;
         this._logger.log('Converting context region to viewport region', region);
         if (region)
-            region = utils.geometry.offsetNegative(region, await currentContext.getInnerOffset());
+            region = utils.geometry.offsetNegative(region, await this.getInnerOffset());
         else
             region = { x: 0, y: 0, width: Infinity, height: Infinity };
+        let currentContext = this;
         while (currentContext) {
             const contextRegion = await currentContext.getClientRegion();
             // const contextScrollingRegion = await currentContext.getScrollingRegion()

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

@@ -95,8 +95,8 @@ async function checkSpecDriver(options) {
         },
         '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 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'));
             assert_1.strict.ok(!(await isEqualElements(childContext2, mainDocument1, frameDocument)));
             const mainContext = await spec.mainContext(childContext2);
@@ -104,9 +104,9 @@ async function checkSpecDriver(options) {
             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 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 frameContext = await spec.childContext(parentContext1, (await spec.findElement(parentContext1, transformSelector('[name="frame1-1"]'))));
             const frameDocument = await spec.findElement(frameContext, transformSelector('html'));
             assert_1.strict.ok(!(await isEqualElements(frameContext, parentDocument1, frameDocument)));
             const parentContext2 = await spec.parentContext(frameContext);