webdriverio 7.20.7 → 7.20.8-alpha.504

package/build/utils/getElementObject.js

@@ -1,29 +1,33 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getElements = exports.getElement = void 0;
-const utils_1 = require("@wdio/utils");
-const lodash_clonedeep_1 = __importDefault(require("lodash.clonedeep"));
-const _1 = require(".");
-const middlewares_1 = require("../middlewares");
-const constants_1 = require("../constants");
+import { webdriverMonad, wrapCommand } from '@wdio/utils';
+import clone from 'lodash.clonedeep';
+import { getBrowserObject, getPrototype as getWDIOPrototype, getElementFromResponse } from './index.js';
+import { elementErrorHandler } from '../middlewares.js';
+import { ELEMENT_KEY } from '../constants.js';
+import * as browserCommands from '../commands/browser.js';
 /**
  * transforms a findElement response into a WDIO element
  * @param  {String} selector  selector that was used to query the element
  * @param  {Object} res       findElement response
  * @return {Object}           WDIO element object
  */
-const getElement = function findElement(selector, res, isReactElement = false) {
-    const browser = (0, _1.getBrowserObject)(this);
+export const getElement = function findElement(selector, res, isReactElement = false) {
+    const browser = getBrowserObject(this);
+    const browserCommandKeys = Object.keys(browserCommands);
     const propertiesObject = {
-        ...(0, lodash_clonedeep_1.default)(browser.__propertiesObject__),
-        ...(0, _1.getPrototype)('element'),
+        /**
+         * filter out browser commands from object
+         */
+        ...(Object.entries(clone(browser.__propertiesObject__)).reduce((commands, [name, descriptor]) => {
+            if (!browserCommandKeys.includes(name)) {
+                commands[name] = descriptor;
+            }
+            return commands;
+        }, {})),
+        ...getWDIOPrototype('element'),
         scope: { value: 'element' }
     };
-    const element = (0, utils_1.webdriverMonad)(this.options, (client) => {
-        const elementId = (0, _1.getElementFromResponse)(res);
+    const element = webdriverMonad(this.options, (client) => {
+        const elementId = getElementFromResponse(res);
         if (elementId) {
             /**
              * set elementId for easy access
@@ -33,7 +37,7 @@ const getElement = function findElement(selector, res, isReactElement = false) {
              * set element id with proper key so element can be passed into execute commands
              */
             if (this.isW3C) {
-                client[constants_1.ELEMENT_KEY] = elementId;
+                client[ELEMENT_KEY] = elementId;
             }
             else {
                 client.ELEMENT = elementId;
@@ -48,31 +52,45 @@ const getElement = function findElement(selector, res, isReactElement = false) {
         client.isReactElement = isReactElement;
         return client;
     }, propertiesObject);
-    const elementInstance = element(this.sessionId, (0, middlewares_1.elementErrorHandler)(utils_1.wrapCommand));
+    const elementInstance = element(this.sessionId, elementErrorHandler(wrapCommand));
     const origAddCommand = elementInstance.addCommand.bind(elementInstance);
     elementInstance.addCommand = (name, fn) => {
         browser.__propertiesObject__[name] = { value: fn };
-        origAddCommand(name, (0, utils_1.runFnInFiberContext)(fn));
+        origAddCommand(name, fn);
     };
     return elementInstance;
 };
-exports.getElement = getElement;
 /**
  * transforms a findElements response into an array of WDIO elements
  * @param  {String} selector  selector that was used to query the element
  * @param  {Object} res       findElements response
  * @return {Array}            array of WDIO elements
  */
-const getElements = function getElements(selector, elemResponse, isReactElement = false) {
-    const browser = (0, _1.getBrowserObject)(this);
+export const getElements = function getElements(selector, elemResponse, isReactElement = false) {
+    const browser = getBrowserObject(this);
+    const browserCommandKeys = Object.keys(browserCommands);
     const propertiesObject = {
-        ...(0, lodash_clonedeep_1.default)(browser.__propertiesObject__),
-        ...(0, _1.getPrototype)('element')
+        /**
+         * filter out browser commands from object
+         */
+        ...(Object.entries(clone(browser.__propertiesObject__)).reduce((commands, [name, descriptor]) => {
+            if (!browserCommandKeys.includes(name)) {
+                commands[name] = descriptor;
+            }
+            return commands;
+        }, {})),
+        ...getWDIOPrototype('element')
     };
     const elements = elemResponse.map((res, i) => {
+        /**
+         * if we already deal with an element, just return it
+         */
+        if (res.selector) {
+            return res;
+        }
         propertiesObject.scope = { value: 'element' };
-        const element = (0, utils_1.webdriverMonad)(this.options, (client) => {
-            const elementId = (0, _1.getElementFromResponse)(res);
+        const element = webdriverMonad(this.options, (client) => {
+            const elementId = getElementFromResponse(res);
             if (elementId) {
                 /**
                  * set elementId for easy access
@@ -81,27 +99,28 @@ const getElements = function getElements(selector, elemResponse, isReactElement
                 /**
                  * set element id with proper key so element can be passed into execute commands
                  */
-                const elementKey = this.isW3C ? constants_1.ELEMENT_KEY : 'ELEMENT';
+                const elementKey = this.isW3C ? ELEMENT_KEY : 'ELEMENT';
                 client[elementKey] = elementId;
             }
             else {
                 client.error = res;
             }
-            client.selector = selector;
+            client.selector = Array.isArray(selector)
+                ? selector[i].selector
+                : selector;
             client.parent = this;
             client.index = i;
             client.emit = this.emit.bind(this);
             client.isReactElement = isReactElement;
             return client;
         }, propertiesObject);
-        const elementInstance = element(this.sessionId, (0, middlewares_1.elementErrorHandler)(utils_1.wrapCommand));
+        const elementInstance = element(this.sessionId, elementErrorHandler(wrapCommand));
         const origAddCommand = elementInstance.addCommand.bind(elementInstance);
         elementInstance.addCommand = (name, fn) => {
             browser.__propertiesObject__[name] = { value: fn };
-            origAddCommand(name, (0, utils_1.runFnInFiberContext)(fn));
+            origAddCommand(name, fn);
         };
         return elementInstance;
     });
     return elements;
 };
-exports.getElements = getElements;

package/build/utils/implicitWait.js

@@ -1,16 +1,11 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const logger_1 = __importDefault(require("@wdio/logger"));
-const log = (0, logger_1.default)('webdriverio');
+import logger from '@wdio/logger';
+const log = logger('webdriverio');
 /**
  * wait on element if:
  *  - elementId couldn't be fetched in the first place
  *  - command is not explicit wait command for existance or displayedness
  */
-async function implicitWait(currentElement, commandName) {
+export default async function implicitWait(currentElement, commandName) {
     if (!currentElement.elementId && !commandName.match(/(waitUntil|waitFor|isExisting|is?\w+Displayed|is?\w+Clickable)/)) {
         log.debug(`command ${commandName} was called on an element ("${currentElement.selector}") ` +
             'that wasn\'t found, waiting for it...');
@@ -36,4 +31,3 @@ async function implicitWait(currentElement, commandName) {
     }
     return currentElement;
 }
-exports.default = implicitWait;

package/build/utils/index.d.ts

@@ -1,6 +1,11 @@
 import type { ElementReference } from '@wdio/protocols';
 import type { Options } from '@wdio/types';
 import type { ElementArray, Selector, ParsedCSSValue, CustomLocatorReturnValue } from '../types';
+declare global {
+    interface Window {
+        __wdio_element: Record<string, HTMLElement>;
+    }
+}
 /**
  * enhances objects with element commands
  */
@@ -15,10 +20,6 @@ export declare const getElementFromResponse: (res: ElementReference) => any;
  * traverse up the scope chain until browser element was reached
  */
 export declare function getBrowserObject(elem: WebdriverIO.Element | WebdriverIO.Browser): WebdriverIO.Browser;
-/**
- * transform whatever value is into an array of char strings
- */
-export declare function transformToCharString(value: any, translateToUnicode?: boolean): string[];
 /**
  * parse css values to a better format
  * @param  {Object} cssPropertyValue result of WebDriver call
@@ -31,7 +32,7 @@ export declare function parseCSS(cssPropertyValue: string, cssProperty?: string)
  * @param  {String} value  text
  * @return {Array}         set of characters or unicode symbols
  */
-export declare function checkUnicode(value: string, isDevTools?: boolean): string[];
+export declare function checkUnicode(value: string, isDevTools?: boolean, platformName?: string): string[];
 /**
  * logic to find an element
  */
@@ -79,7 +80,7 @@ export declare function addLocatorStrategyHandler(scope: WebdriverIO.Browser | W
  * @param   {Array}             props       additional properties required to fetch elements again
  * @returns {object[]}  elements
  */
-export declare const enhanceElementsArray: (elements: ElementArray, parent: WebdriverIO.Browser | WebdriverIO.Element, selector: Selector, foundWith?: string, props?: any[]) => ElementArray;
+export declare const enhanceElementsArray: (elements: ElementArray, parent: WebdriverIO.Browser | WebdriverIO.Element, selector: Selector | ElementReference[] | WebdriverIO.Element[], foundWith?: string, props?: any[]) => ElementArray;
 /**
  * is protocol stub
  * @param {string} automationProtocol
@@ -92,7 +93,7 @@ export declare const getAutomationProtocol: (config: Options.WebdriverIO | Optio
  *
  * NOTE: this method is executed twice when running the WDIO testrunner
  */
-export declare const updateCapabilities: (params: Options.WebdriverIO | Options.Testrunner, automationProtocol?: Options.SupportedProtocols) => Promise<void>;
+export declare const updateCapabilities: (params: Options.WebdriverIO | Options.Testrunner, automationProtocol?: Options.SupportedProtocols) => void;
 /**
  * compare if an object (`base`) contains the same values as another object (`match`)
  * @param {object} base  object to compare to

package/build/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AACvD,OAAO,KAAK,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAA;AAKxD,OAAO,KAAK,EAAE,YAAY,EAAmB,QAAQ,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AAsBjH;;GAEG;AACH,eAAO,MAAM,YAAY,UAAW,SAAS,GAAG,SAAS,uCAmBxD,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,QAAS,gBAAgB,QAuB3D,CAAA;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAE,IAAI,EAAE,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,CAGtG;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAE,KAAK,EAAE,GAAG,EAAE,kBAAkB,UAAO,YA0B3E;AAWD;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAE,gBAAgB,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,kBAkDvE;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CACxB,KAAK,EAAE,MAAM,EACb,UAAU,UAAQ,YAKrB;AAkBD;;GAEG;AACH,wBAAsB,WAAW,CAC7B,IAAI,EAAE,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,EAC/C,QAAQ,EAAE,QAAQ,qCAmDrB;AAED;;GAEG;AACH,wBAAsB,YAAY,CAC9B,IAAI,EAAE,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,EAC/C,QAAQ,EAAE,QAAQ,+BAgDrB;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,GAAG,OAkBpD;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,KAAK,EAAE,WAAW,CAAC,OAAO,iDAuC9D;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,UAInD;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,QAIrD;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAE,GAAG,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAcnE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAE,KAAK,EAAE,WAAW,CAAC,OAAO;;;GAK5D;AAED,wBAAsB,YAAY,CAAE,OAAO,EAAE,WAAW,CAAC,OAAO,oBAkB/D;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,kBAAkB,UACnF,MAAM,mBAAmB,MAAM,SAAS,WAAW,KAAK,wBAAwB,UAOjG;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,aACnB,YAAY,UACd,YAAY,OAAO,GAAG,mBAAmB,YACvC,QAAQ,8BAEX,GAAG,EAAE,iBAOf,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,MAAM,wBAAyB,MAAM,YAA6C,CAAA;AAE/F,eAAO,MAAM,qBAAqB,WAAkB,mBAAmB,GAAG,QAAQ,UAAU,wCAmE3F,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,WAAkB,mBAAmB,GAAG,QAAQ,UAAU,uBAAuB,QAAQ,kBAAkB,kBAIzI,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,SACvB,OAAO,MAAM,EAAE,MAAM,CAAC,SACrB,OAAO,MAAM,EAAE,MAAM,CAAC,YAShC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AACvD,OAAO,KAAK,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAA;AAMxD,OAAO,KAAK,EAAE,YAAY,EAAmB,QAAQ,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AAMjH,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QAAG,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;KAAE;CACnE;AAeD;;GAEG;AACH,eAAO,MAAM,YAAY,UAAW,SAAS,GAAG,SAAS,uCAexD,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,QAAS,gBAAgB,QAuB3D,CAAA;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAE,IAAI,EAAE,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,CAGtG;AAWD;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAE,gBAAgB,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,kBAkDvE;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CACxB,KAAK,EAAE,MAAM,EACb,UAAU,UAAQ,EAClB,YAAY,CAAC,EAAE,MAAM,YAmBxB;AA2BD;;GAEG;AACH,wBAAsB,WAAW,CAC7B,IAAI,EAAE,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,EAC/C,QAAQ,EAAE,QAAQ,qCAsErB;AAED;;GAEG;AACH,wBAAsB,YAAY,CAC9B,IAAI,EAAE,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,EAC/C,QAAQ,EAAE,QAAQ,+BAkDrB;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,GAAG,OAkBpD;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,KAAK,EAAE,WAAW,CAAC,OAAO,iDAuC9D;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,UAInD;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,QAIrD;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAE,GAAG,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAcnE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAE,KAAK,EAAE,WAAW,CAAC,OAAO;;;GAK5D;AAED,wBAAsB,YAAY,CAAE,OAAO,EAAE,WAAW,CAAC,OAAO,oBAkB/D;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,kBAAkB,UACnF,MAAM,mBAAmB,MAAM,SAAS,WAAW,KAAK,wBAAwB,UAOjG;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,aACnB,YAAY,UACd,YAAY,OAAO,GAAG,mBAAmB,YACvC,QAAQ,GAAG,gBAAgB,EAAE,GAAG,mBAAmB,EAAE,8BAExD,GAAG,EAAE,iBAcf,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,MAAM,wBAAyB,MAAM,YAAgD,CAAA;AAElG,eAAO,MAAM,qBAAqB,WAAkB,mBAAmB,GAAG,QAAQ,UAAU,wCAmE3F,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,WACnB,mBAAmB,GAAG,QAAQ,UAAU,uBAC3B,QAAQ,kBAAkB,SAKlD,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,SACvB,OAAO,MAAM,EAAE,MAAM,CAAC,SACrB,OAAO,MAAM,EAAE,MAAM,CAAC,YAShC,CAAA"}