@applitools/driver 1.11.30 → 1.11.32

package/dist/context.js

@@ -130,7 +130,7 @@ class Context {
             if (element)
                 elements = [element];
         }
-        if (specUtils.isCommonSelector(this._spec, selector)) {
+        if (specUtils.isObjectCommonSelector(this._spec, selector)) {
             if (elements.length > 0) {
                 if (selector.child) {
                     elements = await elements.reduce((result, element) => {

package/dist/element.js

@@ -48,7 +48,7 @@ class Element {
         else {
             throw new TypeError('Element constructor called with argument of unknown type!');
         }
-        if (specUtils.isSimpleCommonSelector(this._selector)) {
+        if (specUtils.isSimpleCommonSelector(this._selector) && !utils.types.isString(this._selector)) {
             this._commonSelector = this._selector;
         }
         else if (this._selector && this._spec.untransformSelector) {

package/dist/spec-utils.js

@@ -23,28 +23,26 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withFastCache = exports.splitSelector = exports.transformSelector = exports.isSelector = exports.isCommonSelector = exports.isSimpleCommonSelector = void 0;
+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.isPlainObject(selector) &&
-        utils.types.has(selector, 'selector') &&
-        utils.types.isString(selector.selector));
+    return utils.types.isString(selector) || isObjectCommonSelector(null, selector);
 }
 exports.isSimpleCommonSelector = isSimpleCommonSelector;
-function isCommonSelector(spec, selector) {
+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.isSelector(selector.selector)));
+        (utils.types.isString(selector.selector) || !!(spec === null || spec === void 0 ? void 0 : spec.isSelector(selector.selector))));
 }
-exports.isCommonSelector = isCommonSelector;
+exports.isObjectCommonSelector = isObjectCommonSelector;
 function isSelector(spec, selector) {
-    return spec.isSelector(selector) || utils.types.isString(selector) || isCommonSelector(spec, selector);
+    return spec.isSelector(selector) || utils.types.isString(selector) || isObjectCommonSelector(spec, selector);
 }
 exports.isSelector = isSelector;
 function transformSelector(spec, selector, environment) {
     var _a, _b;
-    if ((environment === null || environment === void 0 ? void 0 : environment.isWeb) && isCommonSelector(spec, selector)) {
+    if ((environment === null || environment === void 0 ? void 0 : environment.isWeb) && isObjectCommonSelector(spec, selector)) {
         if (selector.type === 'id')
             selector = { type: 'css', selector: `#${selector.selector}` };
         else if (selector.type === 'name')
@@ -54,6 +52,7 @@ function transformSelector(spec, selector, environment) {
         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;
@@ -63,7 +62,7 @@ function splitSelector(spec, selector) {
     let elementSelector = activeSelector;
     const contextSelectors = [];
     while (targetSelector) {
-        if (isCommonSelector(spec, targetSelector)) {
+        if (isObjectCommonSelector(spec, targetSelector)) {
             activeSelector.selector = targetSelector.selector;
             if (targetSelector.type)
                 activeSelector.type = targetSelector.type;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/driver",
-  "version": "1.11.30",
+  "version": "1.11.32",
   "description": "Applitools universal framework wrapper",
   "keywords": [
     "applitools",
@@ -82,7 +82,7 @@
     "postversion": "bongo postversion --skip-release-notification"
   },
   "dependencies": {
-    "@applitools/logger": "1.1.45",
+    "@applitools/logger": "1.1.46",
     "@applitools/snippets": "2.4.15",
     "@applitools/utils": "1.3.30",
     "semver": "7.3.7"

package/types/element.d.ts

@@ -1,7 +1,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 } from './selector';
+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 = {
@@ -37,7 +37,7 @@ export declare class Element<T extends SpecType> {
     constructor(options: ElementOptions<T>);
     get target(): NonNullable<T["element"]>;
     get selector(): Selector<T> | undefined;
-    get commonSelector(): Selector<never> | null;
+    get commonSelector(): CommonSelector<never> | null;
     get index(): number | undefined;
     get context(): Context<T>;
     get driver(): import("./driver").Driver<T>;

package/types/selector.d.ts

@@ -1,10 +1,12 @@
 import { type SpecType } from './spec-driver';
-export type Selector<T extends SpecType = never> = T['selector'] | string | CommonSelector<T>;
-export type CommonSelector<T extends SpecType = never> = {
-    selector: T['selector'] | string;
+export type Selector<T extends SpecType = never> = T['selector'] | CommonSelector<T['selector']>;
+export type CommonSelector<TSelector = never> = string | ComplexSelector<TSelector>;
+type ComplexSelector<TSelector> = {
+    selector: TSelector | string;
     type?: string;
-    child?: T['selector'] | string | CommonSelector<T>;
-    shadow?: T['selector'] | string | CommonSelector<T>;
-    frame?: T['selector'] | string | CommonSelector<T>;
-    fallback?: T['selector'] | string | CommonSelector<T>;
+    child?: TSelector | string | CommonSelector<TSelector>;
+    shadow?: TSelector | string | CommonSelector<TSelector>;
+    frame?: TSelector | string | CommonSelector<TSelector>;
+    fallback?: TSelector | string | CommonSelector<TSelector>;
 };
+export {};

package/types/spec-driver.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import type { Location, Size, Region } from '@applitools/utils';
 import type { ScreenOrientation, Cookie } from './types';
-import { type Selector } from './selector';
+import { type CommonSelector } from './selector';
 export type SpecType<TDriver = unknown, TContext = unknown, TElement = unknown, TSelector = unknown> = {
     driver: TDriver;
     context: TContext;
@@ -15,8 +15,8 @@ export interface SpecDriver<T extends SpecType> {
     isSelector(selector: any): selector is T['selector'];
     transformDriver?(driver: any): T['driver'];
     transformElement?(element: any): T['element'];
-    transformSelector?(selector: Selector<T>): T['selector'];
-    untransformSelector?(selector: T['selector'] | Selector<T>): Selector | null;
+    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'];
     isStaleElementError(error: any, selector?: T['selector']): boolean;

package/types/spec-utils.d.ts

@@ -1,7 +1,7 @@
 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 isCommonSelector<T extends SpecType>(spec: Pick<SpecDriver<T>, 'isSelector'>, selector: any): selector is CommonSelector<T>;
+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>;
 export declare function transformSelector<T extends SpecType>(spec: Pick<SpecDriver<T>, 'isSelector' | 'transformSelector'>, selector: Selector<T>, environment?: {
     isWeb?: boolean;