@applitools/driver 1.11.34 → 1.11.35

package/dist/context.js

@@ -24,6 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 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"));
@@ -34,7 +35,7 @@ class Context {
             utils.types.isString(reference) ||
             reference instanceof element_1.Element ||
             this._spec.isElement(reference) ||
-            specUtils.isSelector(this._spec, reference));
+            (0, selector_1.isSelector)(reference, this._spec));
     }
     constructor(options) {
         var _a, _b, _c, _d;
@@ -130,7 +131,7 @@ class Context {
             if (element)
                 elements = [element];
         }
-        if (specUtils.isObjectCommonSelector(this._spec, selector)) {
+        if ((0, selector_1.isObjectCommonSelector)(selector, this._spec)) {
             if (elements.length > 0) {
                 if (selector.child) {
                     elements = await elements.reduce((result, element) => {
@@ -178,14 +179,14 @@ class Context {
             }
             this._element = elements[this._reference];
         }
-        else if (utils.types.isString(this._reference) || specUtils.isSelector(this._spec, this._reference)) {
+        else if (utils.types.isString(this._reference) || (0, selector_1.isSelector)(this._reference, this._spec)) {
             if (utils.types.isString(this._reference)) {
                 this._logger.log('Getting context element by name or id', this._reference);
                 this._element = await this.parent
                     .element(`iframe[name="${this._reference}"], iframe#${this._reference}`)
                     .catch(() => null);
             }
-            if (!this._element && specUtils.isSelector(this._spec, this._reference)) {
+            if (!this._element && (0, selector_1.isSelector)(this._reference, this._spec)) {
                 this._logger.log('Getting context element by selector', this._reference);
                 this._element = await this.parent.element(this._reference);
             }
@@ -267,7 +268,7 @@ class Context {
         if (this._spec.isElement(elementOrSelector)) {
             return new element_1.Element({ spec: this._spec, context: this, element: elementOrSelector, logger: this._logger });
         }
-        else if (!specUtils.isSelector(this._spec, elementOrSelector)) {
+        else if (!(0, selector_1.isSelector)(elementOrSelector, this._spec)) {
             throw new TypeError('Cannot find element using argument of unknown type!');
         }
         if (this.isRef) {
@@ -280,7 +281,7 @@ class Context {
             : null;
     }
     async elements(selectorOrElement) {
-        if (specUtils.isSelector(this._spec, selectorOrElement)) {
+        if ((0, selector_1.isSelector)(selectorOrElement, this._spec)) {
             if (this.isRef) {
                 return [new element_1.Element({ spec: this._spec, context: this, selector: selectorOrElement, logger: this._logger })];
             }

package/dist/driver.js

@@ -340,22 +340,21 @@ class Driver {
         return this._helper;
     }
     async extractBrokerUrl() {
-        if (this._state.brokerUrl)
-            return this._state.brokerUrl;
+        var _a;
+        var _b;
         if (!this.isNative)
             return null;
         this._logger.log('Broker url extraction is started');
-        const element = await this.element({ type: 'accessibility id', selector: 'Applitools_View' });
-        if (!element)
+        (_a = (_b = this._state).nmlElement) !== null && _a !== void 0 ? _a : (_b.nmlElement = await this.element({ type: 'accessibility id', selector: 'Applitools_View' }));
+        if (!this._state.nmlElement)
             return null;
         try {
             let result;
             do {
-                result = JSON.parse(await element.getText());
+                result = JSON.parse(await this._state.nmlElement.getText());
                 if (result.nextPath) {
                     this._logger.log('Broker url was extraction finished successfully with value', result.nextPath);
-                    this._state.brokerUrl = result.nextPath;
-                    return this._state.brokerUrl;
+                    return result.nextPath;
                 }
                 await utils.general.sleep(1000);
             } while (!result.error);
@@ -363,12 +362,11 @@ class Driver {
             return null;
         }
         catch (error) {
-            this._logger.error('Broker url extraction has failed with error', error);
-            return null;
+            this._logger.error('Broker url extraction has failed with error and will be retried', error);
+            this._state.nmlElement = null;
+            return this.extractBrokerUrl();
         }
     }
-    // begin world
-    //
     // About the concept of a  "World":
     //
     // Since "context" is an overloaded term from frames, we have decided to use

package/dist/element.js

@@ -24,8 +24,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isElementReference = exports.Element = void 0;
+const selector_1 = require("./selector");
 const utils = __importStar(require("@applitools/utils"));
-const specUtils = __importStar(require("./spec-utils"));
 const snippets = require('@applitools/snippets');
 class Element {
     constructor(options) {
@@ -42,13 +42,13 @@ class Element {
                 this._index = options.index;
             }
         }
-        else if (specUtils.isSelector(this._spec, options.selector)) {
+        else if ((0, selector_1.isSelector)(options.selector, this._spec)) {
             this._selector = options.selector;
         }
         else {
             throw new TypeError('Element constructor called with argument of unknown type!');
         }
-        if (specUtils.isSimpleCommonSelector(this._selector) && !utils.types.isString(this._selector)) {
+        if ((0, selector_1.isSimpleCommonSelector)(this._selector) && !utils.types.isString(this._selector)) {
             this._commonSelector = this._selector;
         }
         else if (this._selector && this._spec.untransformSelector) {
@@ -698,6 +698,6 @@ class Element {
 }
 exports.Element = Element;
 function isElementReference(reference, spec) {
-    return !!spec && (spec.isElement(reference) || specUtils.isSelector(spec, reference));
+    return !!spec && (spec.isElement(reference) || (0, selector_1.isSelector)(reference, spec));
 }
 exports.isElementReference = isElementReference;

package/dist/fake/mock-driver.js

@@ -206,6 +206,9 @@ class MockDriver {
         this.mockSelector(selector, element);
         return element;
     }
+    unmockElement(element) {
+        this.unmockSelector(element.selector, element);
+    }
     mockElements(nodes, { parentId = null, parentContextId = null, parentRootId = null } = {}) {
         for (const node of nodes) {
             const element = this.mockElement(node.selector, { ...node, parentId, parentContextId, parentRootId });
@@ -226,6 +229,15 @@ class MockDriver {
         }
         elements.push(element);
     }
+    unmockSelector(selector, element) {
+        const elements = this._elements.get(selector);
+        if (!elements)
+            return;
+        const index = elements.indexOf(element);
+        if (index < 0)
+            return;
+        elements.splice(index, 1);
+    }
     wrapMethod(name, wrapper) {
         if (!this[name] || name.startsWith('_') || !utils.types.isFunction(this[name]))
             return;

package/dist/selector.js

@@ -1,2 +1,42 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isSimpleCommonSelector = exports.isObjectCommonSelector = 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);
+}
+exports.isSelector = isSelector;
+function isObjectCommonSelector(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;
+function isSimpleCommonSelector(selector) {
+    return utils.types.isString(selector) || isObjectCommonSelector(selector);
+}
+exports.isSimpleCommonSelector = isSimpleCommonSelector;

package/dist/spec-utils.js

@@ -1,48 +1,10 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withFastCache = exports.splitSelector = exports.transformSelector = exports.isSelector = exports.isObjectCommonSelector = exports.isSimpleCommonSelector = void 0;
-const utils = __importStar(require("@applitools/utils"));
-function isSimpleCommonSelector(selector) {
-    return utils.types.isString(selector) || isObjectCommonSelector(null, selector);
-}
-exports.isSimpleCommonSelector = isSimpleCommonSelector;
-function isObjectCommonSelector(spec, selector) {
-    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;
-function isSelector(spec, selector) {
-    return spec.isSelector(selector) || utils.types.isString(selector) || isObjectCommonSelector(spec, selector);
-}
-exports.isSelector = isSelector;
+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) && isObjectCommonSelector(spec, selector)) {
+    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')
@@ -62,7 +24,7 @@ function splitSelector(spec, selector) {
     let elementSelector = activeSelector;
     const contextSelectors = [];
     while (targetSelector) {
-        if (isObjectCommonSelector(spec, targetSelector)) {
+        if ((0, selector_1.isObjectCommonSelector)(targetSelector, spec)) {
             activeSelector.selector = targetSelector.selector;
             if (targetSelector.type)
                 activeSelector.type = targetSelector.type;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/driver",
-  "version": "1.11.34",
+  "version": "1.11.35",
   "description": "Applitools universal framework wrapper",
   "keywords": [
     "applitools",

package/types/context.d.ts

@@ -1,9 +1,9 @@
 import type { Location, Size, Region } from '@applitools/utils';
 import type { Cookie } from './types';
+import { type Logger } from '@applitools/logger';
 import { type SpecType, type SpecDriver, type WaitOptions } from './spec-driver';
 import { type Driver } from './driver';
 import { type Selector } from './selector';
-import { type Logger } from '@applitools/logger';
 import { Element, type ElementReference } from './element';
 export type ContextReference<T extends SpecType> = Element<T> | ElementReference<T> | string | number;
 export type NestedContextReference<T extends SpecType> = {

package/types/element.d.ts

@@ -1,8 +1,8 @@
 import type { Location, Size, Region } from '@applitools/utils';
+import { type Logger } from '@applitools/logger';
 import { type SpecType, type SpecDriver } from './spec-driver';
 import { type Context } from './context';
 import { type Selector, type CommonSelector } from './selector';
-import { type Logger } from '@applitools/logger';
 export type ElementReference<T extends SpecType> = T['element'] | Selector<T>;
 type ElementState = {
     contentSize?: Size;

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

@@ -2,12 +2,14 @@ export declare class MockDriver {
     constructor(options?: {});
     mockScript(scriptMatcher: any, resultGenerator: any): void;
     mockElement(selector: any, state: any): any;
+    unmockElement(element: any): void;
     mockElements(nodes: any, { parentId, parentContextId, parentRootId }?: {
         parentId?: null | undefined;
         parentContextId?: null | undefined;
         parentRootId?: null | undefined;
     }): void;
     mockSelector(selector: any, element: any): void;
+    unmockSelector(selector: any, element: any): void;
     wrapMethod<TName extends {
         [K in keyof MockDriver]: MockDriver[K] extends (...args: any[]) => any ? K : never;
     }[keyof MockDriver]>(name: TName, wrapper: (method: this[TName], thisArg: this, args: Parameters<this[TName]>) => ReturnType<this[TName]>): void;

package/types/selector.d.ts

@@ -1,4 +1,4 @@
-import { type SpecType } from './spec-driver';
+import { type SpecType, type SpecDriver } from './spec-driver';
 export type Selector<T extends SpecType = never> = T['selector'] | CommonSelector<T['selector']>;
 export type CommonSelector<TSelector = never> = string | ComplexSelector<TSelector>;
 type ComplexSelector<TSelector> = {
@@ -9,4 +9,7 @@ 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 isSimpleCommonSelector(selector: any): selector is CommonSelector;
 export {};

package/types/spec-utils.d.ts

@@ -1,8 +1,5 @@
 import { type SpecType, type SpecDriver } from './spec-driver';
-import { type Selector, type CommonSelector } from './selector';
-export declare function isSimpleCommonSelector(selector: any): selector is CommonSelector;
-export declare function isObjectCommonSelector<T extends SpecType>(spec: Pick<SpecDriver<T>, 'isSelector'> | null, selector: any): selector is Exclude<CommonSelector<T['selector']>, string>;
-export declare function isSelector<T extends SpecType>(spec: Pick<SpecDriver<T>, 'isSelector'>, selector: any): selector is Selector<T>;
+import { type Selector } from './selector';
 export declare function transformSelector<T extends SpecType>(spec: Pick<SpecDriver<T>, 'isSelector' | 'transformSelector'>, selector: Selector<T>, environment?: {
     isWeb?: boolean;
     isNative?: boolean;