webdriverio 7.21.0 → 8.0.0-alpha.239

package/build/utils/index.js

@@ -1,27 +1,22 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.containsHeaderObject = exports.updateCapabilities = exports.getAutomationProtocol = exports.isStub = exports.enhanceElementsArray = exports.addLocatorStrategyHandler = exports.hasElementId = exports.getScrollPosition = exports.validateUrl = exports.assertDirectoryExists = exports.getAbsoluteFilepath = exports.getElementRect = exports.verifyArgsAndStripIfElement = exports.findElements = exports.findElement = exports.checkUnicode = exports.parseCSS = exports.transformToCharString = exports.getBrowserObject = exports.getElementFromResponse = exports.getPrototype = void 0;
-const fs_1 = __importDefault(require("fs"));
-const http_1 = __importDefault(require("http"));
-const path_1 = __importDefault(require("path"));
-const css_value_1 = __importDefault(require("css-value"));
-const rgb2hex_1 = __importDefault(require("rgb2hex"));
-const grapheme_splitter_1 = __importDefault(require("grapheme-splitter"));
-const logger_1 = __importDefault(require("@wdio/logger"));
-const lodash_isobject_1 = __importDefault(require("lodash.isobject"));
-const lodash_isplainobject_1 = __importDefault(require("lodash.isplainobject"));
-const url_1 = require("url");
-const devtools_1 = require("devtools");
-const utils_1 = require("@wdio/utils");
-const webdriverio_1 = require("query-selector-shadow-dom/plugins/webdriverio");
-const constants_1 = require("../constants");
-const findStrategy_1 = require("./findStrategy");
-const browserCommands = require('../commands/browser').default;
-const elementCommands = require('../commands/element').default;
-const log = (0, logger_1.default)('webdriverio');
+import fs from 'node:fs';
+import http from 'node:http';
+import path from 'node:path';
+import { URL } from 'node:url';
+import cssValue from 'css-value';
+import rgb2hex from 'rgb2hex';
+import GraphemeSplitter from 'grapheme-splitter';
+import logger from '@wdio/logger';
+import isObject from 'lodash.isobject';
+import isPlainObject from 'lodash.isplainobject';
+// @ts-expect-error
+import { locatorStrategy } from 'query-selector-shadow-dom/plugins/webdriverio/index.js';
+import { SUPPORTED_BROWSER } from 'devtools';
+import { UNICODE_CHARACTERS } from '@wdio/utils';
+import browserCommands from '../commands/browser.js';
+import elementCommands from '../commands/element.js';
+import { ELEMENT_KEY, DRIVER_DEFAULT_ENDPOINT, DEEP_SELECTOR, Key } from '../constants.js';
+import { findStrategy } from './findStrategy.js';
+const log = logger('webdriverio');
 const INVALID_SELECTOR_ERROR = 'selector needs to be typeof `string` or `function`';
 const scopes = {
     browser: browserCommands,
@@ -35,16 +30,12 @@ const applyScopePrototype = (prototype, scope) => {
 /**
  * enhances objects with element commands
  */
-const getPrototype = (scope) => {
+export const getPrototype = (scope) => {
     const prototype = {
         /**
          * used to store the puppeteer instance in the browser scope
          */
-        puppeteer: { value: null, writable: true },
-        /**
-         * for handling sync execution in @wdio/sync
-         */
-        _NOT_FIBER: { value: false, writable: true, configurable: true }
+        puppeteer: { value: null, writable: true }
     };
     /**
      * register action commands
@@ -53,13 +44,12 @@ const getPrototype = (scope) => {
     prototype.strategies = { value: new Map() };
     return prototype;
 };
-exports.getPrototype = getPrototype;
 /**
  * get element id from WebDriver response
  * @param  {?Object|undefined} res         body object from response or null
  * @return {?string}   element id or null if element couldn't be found
  */
-const getElementFromResponse = (res) => {
+export const getElementFromResponse = (res) => {
     /**
     * a function selector can return null
     */
@@ -75,52 +65,18 @@ const getElementFromResponse = (res) => {
     /**
      * W3C WebDriver response
      */
-    if (res[constants_1.ELEMENT_KEY]) {
-        return res[constants_1.ELEMENT_KEY];
+    if (res[ELEMENT_KEY]) {
+        return res[ELEMENT_KEY];
     }
     return null;
 };
-exports.getElementFromResponse = getElementFromResponse;
 /**
  * traverse up the scope chain until browser element was reached
  */
-function getBrowserObject(elem) {
+export function getBrowserObject(elem) {
     const elemObject = elem;
     return elemObject.parent ? getBrowserObject(elemObject.parent) : elem;
 }
-exports.getBrowserObject = getBrowserObject;
-/**
- * transform whatever value is into an array of char strings
- */
-function transformToCharString(value, translateToUnicode = true) {
-    const ret = [];
-    if (!Array.isArray(value)) {
-        value = [value];
-    }
-    for (const val of value) {
-        if (typeof val === 'string') {
-            translateToUnicode
-                ? ret.push(...checkUnicode(val))
-                : ret.push(...`${val}`.split(''));
-        }
-        else if (typeof val === 'number') {
-            const entry = `${val}`.split('');
-            ret.push(...entry);
-        }
-        else if (val && typeof val === 'object') {
-            try {
-                ret.push(...JSON.stringify(val).split(''));
-            }
-            catch (err) { /* ignore */ }
-        }
-        else if (typeof val === 'boolean') {
-            const entry = val ? 'true'.split('') : 'false'.split('');
-            ret.push(...entry);
-        }
-    }
-    return ret;
-}
-exports.transformToCharString = transformToCharString;
 function sanitizeCSS(value) {
     /* istanbul ignore next */
     if (!value) {
@@ -134,14 +90,13 @@ function sanitizeCSS(value) {
  * @param  {String} cssProperty      name of css property to parse
  * @return {Object}                  parsed css property
  */
-function parseCSS(cssPropertyValue, cssProperty) {
-    var _a;
+export function parseCSS(cssPropertyValue, cssProperty) {
     const parsedValue = {
         property: cssProperty,
         value: cssPropertyValue.toLowerCase().trim(),
         parsed: {}
     };
-    if (((_a = parsedValue.value) === null || _a === void 0 ? void 0 : _a.indexOf('rgb')) === 0) {
+    if (parsedValue.value?.indexOf('rgb') === 0) {
         /**
          * remove whitespaces in rgb values
          */
@@ -150,13 +105,13 @@ function parseCSS(cssPropertyValue, cssProperty) {
          * parse color values
          */
         let color = parsedValue.value;
-        parsedValue.parsed = (0, rgb2hex_1.default)(parsedValue.value);
+        parsedValue.parsed = rgb2hex(parsedValue.value);
         parsedValue.parsed.type = 'color';
         const colorType = /[rgba]+/g.exec(color) || [];
         parsedValue.parsed[colorType[0]] = color;
     }
     else if (parsedValue.property === 'font-family') {
-        let font = (0, css_value_1.default)(cssPropertyValue);
+        let font = cssValue(cssPropertyValue);
         let string = parsedValue.value;
         let value = cssPropertyValue.split(/,/).map(sanitizeCSS);
         parsedValue.value = sanitizeCSS(font[0].value || font[0].string);
@@ -167,7 +122,7 @@ function parseCSS(cssPropertyValue, cssProperty) {
          * parse other css properties
          */
         try {
-            const value = (0, css_value_1.default)(cssPropertyValue);
+            const value = cssValue(cssPropertyValue);
             if (value.length === 1) {
                 parsedValue.parsed = value[0];
             }
@@ -182,18 +137,27 @@ function parseCSS(cssPropertyValue, cssProperty) {
     }
     return parsedValue;
 }
-exports.parseCSS = parseCSS;
 /**
  * check for unicode character or split string into literals
  * @param  {String} value  text
  * @return {Array}         set of characters or unicode symbols
  */
-function checkUnicode(value, isDevTools = false) {
-    return Object.prototype.hasOwnProperty.call(utils_1.UNICODE_CHARACTERS, value)
-        ? isDevTools ? [value] : [utils_1.UNICODE_CHARACTERS[value]]
-        : new grapheme_splitter_1.default().splitGraphemes(value);
+export function checkUnicode(value, isDevTools = false, platformName) {
+    if (value === Key.Ctrl) {
+        return [platformName && platformName.match(/mac(\s)*os/i) ? Key.Command : Key.Control];
+    }
+    /**
+     * when sending emoji characters like 😄 or a value that is not a special character defined
+     * by the WebDriver protocol
+     */
+    if (!Object.prototype.hasOwnProperty.call(UNICODE_CHARACTERS, value)) {
+        return new GraphemeSplitter().splitGraphemes(value);
+    }
+    if (isDevTools) {
+        return [value];
+    }
+    return [UNICODE_CHARACTERS[value]];
 }
-exports.checkUnicode = checkUnicode;
 function fetchElementByJSFunction(selector, scope) {
     if (!scope.elementId) {
         return scope.execute(selector);
@@ -209,34 +173,35 @@ function fetchElementByJSFunction(selector, scope) {
 /**
  * logic to find an element
  */
-async function findElement(selector) {
+export async function findElement(selector) {
+    const browserObject = getBrowserObject(this);
     /**
      * check if shadow DOM integration is used
      */
-    if (!this.isDevTools && typeof selector === 'string' && selector.startsWith(constants_1.DEEP_SELECTOR)) {
-        const notFoundError = new Error(`shadow selector "${selector.slice(constants_1.DEEP_SELECTOR.length)}" did not return an HTMLElement`);
-        let elem = await this.execute(webdriverio_1.locatorStrategy, ...[
-            selector.slice(constants_1.DEEP_SELECTOR.length),
+    if (!this.isDevTools && typeof selector === 'string' && selector.startsWith(DEEP_SELECTOR)) {
+        const notFoundError = new Error(`shadow selector "${selector.slice(DEEP_SELECTOR.length)}" did not return an HTMLElement`);
+        let elem = await browserObject.execute(locatorStrategy, ...[
+            selector.slice(DEEP_SELECTOR.length),
             this.elementId ? this : undefined
         ].filter(Boolean));
         elem = Array.isArray(elem) ? elem[0] : elem;
-        return (0, exports.getElementFromResponse)(elem) ? elem : notFoundError;
+        return getElementFromResponse(elem) ? elem : notFoundError;
     }
     /**
      * fetch element using custom strategy function
      */
-    if ((0, lodash_isplainobject_1.default)(selector) && typeof selector.strategy === 'function') {
+    if (isPlainObject(selector) && typeof selector.strategy === 'function') {
         const { strategy, strategyName, strategyArguments } = selector;
         const notFoundError = new Error(`Custom Strategy "${strategyName}" did not return an HTMLElement`);
-        let elem = await this.execute(strategy, ...strategyArguments);
+        let elem = await browserObject.execute(strategy, ...strategyArguments);
         elem = Array.isArray(elem) ? elem[0] : elem;
-        return (0, exports.getElementFromResponse)(elem) ? elem : notFoundError;
+        return getElementFromResponse(elem) ? elem : notFoundError;
     }
     /**
      * fetch element using regular protocol command
      */
-    if (typeof selector === 'string' || (0, lodash_isplainobject_1.default)(selector)) {
-        const { using, value } = (0, findStrategy_1.findStrategy)(selector, this.isW3C, this.isMobile);
+    if (typeof selector === 'string' || isPlainObject(selector)) {
+        const { using, value } = findStrategy(selector, this.isW3C, this.isMobile);
         return this.elementId
             // casting to any necessary given weak type support of protocol commands
             ? this.findElementFromElement(this.elementId, using, value)
@@ -249,40 +214,40 @@ async function findElement(selector) {
         const notFoundError = new Error(`Function selector "${selector.toString()}" did not return an HTMLElement`);
         let elem = await fetchElementByJSFunction(selector, this);
         elem = Array.isArray(elem) ? elem[0] : elem;
-        return (0, exports.getElementFromResponse)(elem) ? elem : notFoundError;
+        return getElementFromResponse(elem) ? elem : notFoundError;
     }
     throw new Error(INVALID_SELECTOR_ERROR);
 }
-exports.findElement = findElement;
 /**
  * logic to find a elements
  */
-async function findElements(selector) {
+export async function findElements(selector) {
+    const browserObject = getBrowserObject(this);
     /**
      * check if shadow DOM integration is used
      */
-    if (!this.isDevTools && typeof selector === 'string' && selector.startsWith(constants_1.DEEP_SELECTOR)) {
-        const elems = await this.execute(webdriverio_1.locatorStrategy, ...[
-            selector.slice(constants_1.DEEP_SELECTOR.length),
+    if (!this.isDevTools && typeof selector === 'string' && selector.startsWith(DEEP_SELECTOR)) {
+        const elems = await browserObject.execute(locatorStrategy, ...[
+            selector.slice(DEEP_SELECTOR.length),
             this.elementId ? this : undefined
         ].filter(Boolean));
         const elemArray = Array.isArray(elems) ? elems : [elems];
-        return elemArray.filter((elem) => elem && (0, exports.getElementFromResponse)(elem));
+        return elemArray.filter((elem) => elem && getElementFromResponse(elem));
     }
     /**
      * fetch elements using custom strategy function
      */
-    if ((0, lodash_isplainobject_1.default)(selector) && typeof selector.strategy === 'function') {
+    if (isPlainObject(selector) && typeof selector.strategy === 'function') {
         const { strategy, strategyArguments } = selector;
-        const elems = await this.execute(strategy, ...strategyArguments);
+        const elems = await browserObject.execute(strategy, ...strategyArguments);
         const elemArray = Array.isArray(elems) ? elems : [elems];
-        return elemArray.filter((elem) => elem && (0, exports.getElementFromResponse)(elem));
+        return elemArray.filter((elem) => elem && getElementFromResponse(elem));
     }
     /**
      * fetch element using regular protocol command
      */
-    if (typeof selector === 'string' || (0, lodash_isplainobject_1.default)(selector)) {
-        const { using, value } = (0, findStrategy_1.findStrategy)(selector, this.isW3C, this.isMobile);
+    if (typeof selector === 'string' || isPlainObject(selector)) {
+        const { using, value } = findStrategy(selector, this.isW3C, this.isMobile);
         return this.elementId
             // casting to any necessary given weak type support of protocol commands
             ? this.findElementsFromElement(this.elementId, using, value)
@@ -294,23 +259,22 @@ async function findElements(selector) {
     if (typeof selector === 'function') {
         const elems = await fetchElementByJSFunction(selector, this);
         const elemArray = Array.isArray(elems) ? elems : [elems];
-        return elemArray.filter((elem) => elem && (0, exports.getElementFromResponse)(elem));
+        return elemArray.filter((elem) => elem && getElementFromResponse(elem));
     }
     throw new Error(INVALID_SELECTOR_ERROR);
 }
-exports.findElements = findElements;
 /**
  * Strip element object and return w3c and jsonwp compatible keys
  */
-function verifyArgsAndStripIfElement(args) {
+export function verifyArgsAndStripIfElement(args) {
     function verify(arg) {
-        if ((0, lodash_isobject_1.default)(arg) && arg.constructor.name === 'Element') {
+        if (isObject(arg) && arg.constructor.name === 'Element') {
             const elem = arg;
             if (!elem.elementId) {
                 throw new Error(`The element with selector "${elem.selector}" you are trying to pass into the execute method wasn't found`);
             }
             return {
-                [constants_1.ELEMENT_KEY]: elem.elementId,
+                [ELEMENT_KEY]: elem.elementId,
                 ELEMENT: elem.elementId
             };
         }
@@ -318,11 +282,10 @@ function verifyArgsAndStripIfElement(args) {
     }
     return !Array.isArray(args) ? verify(args) : args.map(verify);
 }
-exports.verifyArgsAndStripIfElement = verifyArgsAndStripIfElement;
 /**
  * getElementRect
  */
-async function getElementRect(scope) {
+export async function getElementRect(scope) {
     const rect = await scope.getElementRect(scope.elementId);
     let defaults = { x: 0, y: 0, width: 0, height: 0 };
     /**
@@ -359,31 +322,28 @@ async function getElementRect(scope) {
     }
     return rect;
 }
-exports.getElementRect = getElementRect;
-function getAbsoluteFilepath(filepath) {
+export function getAbsoluteFilepath(filepath) {
     return filepath.startsWith('/') || filepath.startsWith('\\') || filepath.match(/^[a-zA-Z]:\\/)
         ? filepath
-        : path_1.default.join(process.cwd(), filepath);
+        : path.join(process.cwd(), filepath);
 }
-exports.getAbsoluteFilepath = getAbsoluteFilepath;
 /**
  * check if directory exists
  */
-function assertDirectoryExists(filepath) {
-    if (!fs_1.default.existsSync(path_1.default.dirname(filepath))) {
-        throw new Error(`directory (${path_1.default.dirname(filepath)}) doesn't exist`);
+export function assertDirectoryExists(filepath) {
+    if (!fs.existsSync(path.dirname(filepath))) {
+        throw new Error(`directory (${path.dirname(filepath)}) doesn't exist`);
     }
 }
-exports.assertDirectoryExists = assertDirectoryExists;
 /**
  * check if urls are valid and fix them if necessary
  * @param  {string}  url                url to navigate to
  * @param  {Boolean} [retryCheck=false] true if an url was already check and still failed with fix applied
  * @return {string}                     fixed url
  */
-function validateUrl(url, origError) {
+export function validateUrl(url, origError) {
     try {
-        const urlObject = new url_1.URL(url);
+        const urlObject = new URL(url);
         return urlObject.href;
     }
     catch (err) {
@@ -396,19 +356,17 @@ function validateUrl(url, origError) {
         return validateUrl(`http://${url}`, new Error(`Invalid URL: ${url}`));
     }
 }
-exports.validateUrl = validateUrl;
 /**
  * get window's scrollX and scrollY
  * @param {object} scope
  */
-function getScrollPosition(scope) {
+export function getScrollPosition(scope) {
     return getBrowserObject(scope)
         .execute(/* istanbul ignore next */ function () {
         return { scrollX: this.pageXOffset, scrollY: this.pageYOffset };
     });
 }
-exports.getScrollPosition = getScrollPosition;
-async function hasElementId(element) {
+export async function hasElementId(element) {
     /*
      * This is only necessary as isDisplayed is on the exclusion list for the middleware
      */
@@ -426,8 +384,7 @@ async function hasElementId(element) {
     }
     return true;
 }
-exports.hasElementId = hasElementId;
-function addLocatorStrategyHandler(scope) {
+export function addLocatorStrategyHandler(scope) {
     return (name, func) => {
         if (scope.strategies.get(name)) {
             throw new Error(`Strategy ${name} already exists`);
@@ -435,7 +392,6 @@ function addLocatorStrategyHandler(scope) {
         scope.strategies.set(name, func);
     };
 }
-exports.addLocatorStrategyHandler = addLocatorStrategyHandler;
 /**
  * Enhance elements array with data required to refetch it
  * @param   {object[]}          elements    elements
@@ -445,22 +401,19 @@ exports.addLocatorStrategyHandler = addLocatorStrategyHandler;
  * @param   {Array}             props       additional properties required to fetch elements again
  * @returns {object[]}  elements
  */
-const enhanceElementsArray = (elements, parent, selector, foundWith = '$$', props = []) => {
+export const enhanceElementsArray = (elements, parent, selector, foundWith = '$$', props = []) => {
     elements.parent = parent;
     elements.selector = selector;
     elements.foundWith = foundWith;
     elements.props = props;
     return elements;
 };
-exports.enhanceElementsArray = enhanceElementsArray;
 /**
  * is protocol stub
  * @param {string} automationProtocol
  */
-const isStub = (automationProtocol) => automationProtocol === './protocol-stub';
-exports.isStub = isStub;
-const getAutomationProtocol = async (config) => {
-    var _a, _b;
+export const isStub = (automationProtocol) => automationProtocol === './protocol-stub.js';
+export const getAutomationProtocol = async (config) => {
     /**
      * if automation protocol is set by user prefer this
      */
@@ -476,10 +429,10 @@ const getAutomationProtocol = async (config) => {
     /**
      * only run DevTools protocol if capabilities match supported platforms
      */
-    const caps = (((_a = config.capabilities) === null || _a === void 0 ? void 0 : _a.alwaysMatch) ||
+    const caps = (config.capabilities?.alwaysMatch ||
         config.capabilities) || {};
     const desiredCaps = caps;
-    if (!devtools_1.SUPPORTED_BROWSER.includes((_b = caps.browserName) === null || _b === void 0 ? void 0 : _b.toLowerCase())) {
+    if (!SUPPORTED_BROWSER.includes(caps.browserName?.toLowerCase())) {
         return 'webdriver';
     }
     /**
@@ -500,7 +453,7 @@ const getAutomationProtocol = async (config) => {
      * make a head request to check if a driver is available
      */
     const resp = await new Promise((resolve) => {
-        const req = http_1.default.request(constants_1.DRIVER_DEFAULT_ENDPOINT, resolve);
+        const req = http.request(DRIVER_DEFAULT_ENDPOINT, resolve);
         req.on('error', (error) => resolve({ error }));
         req.end();
     });
@@ -516,25 +469,23 @@ const getAutomationProtocol = async (config) => {
     }
     return 'devtools';
 };
-exports.getAutomationProtocol = getAutomationProtocol;
 /**
  * updateCapabilities allows modifying capabilities before session
  * is started
  *
  * NOTE: this method is executed twice when running the WDIO testrunner
  */
-const updateCapabilities = async (params, automationProtocol) => {
+export const updateCapabilities = (params, automationProtocol) => {
     if (automationProtocol && !params.automationProtocol) {
         params.automationProtocol = automationProtocol;
     }
 };
-exports.updateCapabilities = updateCapabilities;
 /**
  * compare if an object (`base`) contains the same values as another object (`match`)
  * @param {object} base  object to compare to
  * @param {object} match object that needs to match thebase
  */
-const containsHeaderObject = (base, match) => {
+export const containsHeaderObject = (base, match) => {
     for (const [key, value] of Object.entries(match)) {
         if (typeof base[key] === 'undefined' || base[key] !== value) {
             return false;
@@ -542,4 +493,3 @@ const containsHeaderObject = (base, match) => {
     }
     return true;
 };
-exports.containsHeaderObject = containsHeaderObject;

package/build/utils/interception/devtools.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import type { CDPSession } from 'puppeteer-core/lib/cjs/puppeteer/common/Connection';
 import type Protocol from 'devtools-protocol';
-import Interception from '.';
+import Interception from './index.js';
 import type { Matches, MockOverwrite, MockResponseParams } from './types';
 declare type ClientResponse = {
     body: string;

package/build/utils/interception/devtools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"devtools.d.ts","sourceRoot":"","sources":["../../../src/utils/interception/devtools.ts"],"names":[],"mappings":";AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oDAAoD,CAAA;AACpF,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAA;AAG7C,OAAO,YAAY,MAAM,GAAG,CAAA;AAC5B,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAMzE,aAAK,cAAc,GAAG;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,aAAa,CAAC,EAAE,OAAO,CAAA;CAC1B,CAAA;AAED,UAAU,WAAW;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,aAAK,KAAK,GAAG;IACT,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,OAAO,GAAG;QAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;IACtD,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,eAAe,EAAE,WAAW,EAAE,CAAA;CACjC,CAAA;AAID,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,YAAY;IAC1D,MAAM,CAAC,yBAAyB,CAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,GAAG,cAAc,CAAC;IA8IjI;;OAEG;IACH,IAAI,KAAK,cAER;IAED;;OAEG;IACH,KAAK;IAIL;;;OAGG;IACH,OAAO;IAKP;;;;OAIG;IACH,OAAO,CAAE,SAAS,EAAE,aAAa,EAAE,MAAM,GAAE,kBAAuB;IAIlE;;;;OAIG;IACH,WAAW,CAAE,SAAS,EAAE,aAAa,EAAE,MAAM,GAAE,kBAAuB;IAItE;;;OAGG;IACH,KAAK,CAAE,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,GAAE,OAAc;IAOxE;;;OAGG;IACH,SAAS,CAAE,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW;CAGvD"}
+{"version":3,"file":"devtools.d.ts","sourceRoot":"","sources":["../../../src/utils/interception/devtools.ts"],"names":[],"mappings":";AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oDAAoD,CAAA;AACpF,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAA;AAE7C,OAAO,YAAY,MAAM,YAAY,CAAA;AACrC,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAMzE,aAAK,cAAc,GAAG;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,aAAa,CAAC,EAAE,OAAO,CAAA;CAC1B,CAAA;AAED,UAAU,WAAW;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,aAAK,KAAK,GAAG;IACT,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,OAAO,GAAG;QAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;IACtD,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,eAAe,EAAE,WAAW,EAAE,CAAA;CACjC,CAAA;AAID,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,YAAY;IAC1D,MAAM,CAAC,yBAAyB,CAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,GAAG,cAAc,CAAC;IA8IjI;;OAEG;IACH,IAAI,KAAK,cAER;IAED;;OAEG;IACH,KAAK;IAIL;;;OAGG;IACH,OAAO;IAKP;;;;OAIG;IACH,OAAO,CAAE,SAAS,EAAE,aAAa,EAAE,MAAM,GAAE,kBAAuB;IAIlE;;;;OAIG;IACH,WAAW,CAAE,SAAS,EAAE,aAAa,EAAE,MAAM,GAAE,kBAAuB;IAItE;;;OAGG;IACH,KAAK,CAAE,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,GAAE,OAAc;IAOxE;;;OAGG;IACH,SAAS,CAAE,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW;CAGvD"}

package/build/utils/interception/devtools.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 fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
-const logger_1 = __importDefault(require("@wdio/logger"));
-const _1 = __importDefault(require("."));
-const __1 = require("..");
-const constants_1 = require("../../constants");
-const log = (0, logger_1.default)('webdriverio');
-class DevtoolsInterception extends _1.default {
+import path from 'node:path';
+import fse from 'fs-extra';
+import logger from '@wdio/logger';
+import Interception from './index.js';
+import { containsHeaderObject } from '../index.js';
+import { ERROR_REASON } from '../../constants.js';
+const log = logger('webdriverio');
+export default class DevtoolsInterception extends Interception {
     static handleRequestInterception(client, mocks) {
         return async (event) => {
             // responseHeaders and responseStatusCode are only present in Response stage
@@ -36,7 +31,7 @@ class DevtoolsInterception extends _1.default {
                 /**
                  * match mock url
                  */
-                if (!_1.default.isMatchingRequest(mock.url, request.url)) {
+                if (!Interception.isMatchingRequest(mock.url, request.url)) {
                     continue;
                 }
                 /**
@@ -94,9 +89,9 @@ class DevtoolsInterception extends _1.default {
                     /**
                      * check if local file and load it
                      */
-                    const responseFilePath = path_1.default.isAbsolute(newBody) ? newBody : path_1.default.join(process.cwd(), newBody);
-                    if (newBody.length > 0 && await fs_extra_1.default.pathExists(responseFilePath) && await canAccess(responseFilePath)) {
-                        newBody = await fs_extra_1.default.readFile(responseFilePath);
+                    const responseFilePath = path.isAbsolute(newBody) ? newBody : path.join(process.cwd(), newBody);
+                    if (newBody.length > 0 && await fse.pathExists(responseFilePath) && await canAccess(responseFilePath)) {
+                        newBody = await fse.readFile(responseFilePath);
                     }
                     else if (newBody.startsWith('http')) {
                         responseCode = 301;
@@ -169,8 +164,8 @@ class DevtoolsInterception extends _1.default {
      * @param {string} errorCode  error code of the response
      */
     abort(errorReason, sticky = true) {
-        if (typeof errorReason !== 'string' || !constants_1.ERROR_REASON.includes(errorReason)) {
-            throw new Error(`Invalid value for errorReason, allowed are: ${constants_1.ERROR_REASON.join(', ')}`);
+        if (typeof errorReason !== 'string' || !ERROR_REASON.includes(errorReason)) {
+            throw new Error(`Invalid value for errorReason, allowed are: ${ERROR_REASON.join(', ')}`);
         }
         this.respondOverwrites.push({ errorReason, sticky });
     }
@@ -182,7 +177,6 @@ class DevtoolsInterception extends _1.default {
         this.abort(errorReason, false);
     }
 }
-exports.default = DevtoolsInterception;
 const filterMethod = (method, expected) => {
     if (typeof expected === 'undefined') {
         return false;
@@ -199,7 +193,7 @@ const filterHeaders = (responseHeaders, expected) => {
     if (typeof expected === 'function') {
         return expected(responseHeaders) !== true;
     }
-    return !(0, __1.containsHeaderObject)(responseHeaders, expected);
+    return !containsHeaderObject(responseHeaders, expected);
 };
 const filterRequest = (postData, expected) => {
     if (typeof expected === 'undefined') {
@@ -226,7 +220,7 @@ const filterStatusCode = (statusCode, expected) => {
  */
 const canAccess = async (filepath) => {
     try {
-        await fs_extra_1.default.access(filepath);
+        await fse.access(filepath);
         return true;
     }
     catch {
@@ -243,5 +237,5 @@ const tryParseJson = (body) => {
 };
 const logFetchError = (err) => {
     /* istanbul ignore next */
-    log.debug(err === null || err === void 0 ? void 0 : err.message);
+    log.debug(err?.message);
 };

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

@@ -1,5 +1,5 @@
-import { WaitForOptions } from '../../types';
-import { MockFilterOptions, MockOverwrite, MockResponseParams, Matches } from './types';
+import type { WaitForOptions } from '../../types';
+import type { MockFilterOptions, MockOverwrite, MockResponseParams, Matches } from './types';
 import type Protocol from 'devtools-protocol';
 export default abstract class Interception {
     url: string | RegExp;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/interception/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEvF,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAA;AAE7C,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,YAAY;IAkB3B,GAAG,EAAE,MAAM,GAAG,MAAM;IACpB,aAAa,EAAE,iBAAiB;IAChC,OAAO,EAAE,WAAW,CAAC,OAAO;IAnBvC,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;IAC9C,QAAQ,CAAC,KAAK,IAAK,IAAI;IACvB,QAAQ,CAAC,OAAO,IAAK,IAAI;IACzB,QAAQ,CAAC,OAAO,CAAE,SAAS,EAAE,aAAa,EAAE,MAAM,EAAE,kBAAkB,GAAG,IAAI;IAC7E,QAAQ,CAAC,WAAW,CAAE,SAAS,EAAE,aAAa,EAAE,MAAM,EAAE,kBAAkB,GAAG,IAAI;IACjF,QAAQ,CAAC,KAAK,CAAE,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI;IACjF,QAAQ,CAAC,SAAS,CAAE,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,GAAG,IAAI;IAEpE,iBAAiB,EAAE;QACf,SAAS,CAAC,EAAE,aAAa,CAAA;QACzB,MAAM,CAAC,EAAE,kBAAkB,CAAA;QAC3B,MAAM,CAAC,EAAE,OAAO,CAAA;QAChB,WAAW,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAA;KAC7C,EAAE,CAAK;IACR,OAAO,EAAE,OAAO,EAAE,CAAK;gBAGZ,GAAG,EAAE,MAAM,GAAG,MAAM,EACpB,aAAa,EAAE,iBAAsB,EACrC,OAAO,EAAE,WAAW,CAAC,OAAO;IAIvC,eAAe,CAAE,EACb,OAA6C,EAC7C,QAA+C,EAC/C,UAAU,GACb,GAAE,cAAmB;IA4BtB,MAAM,CAAC,iBAAiB,CAAE,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,SAAS,EAAE,MAAM;CAU5E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/interception/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAE5F,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAA;AAE7C,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,YAAY;IAkB3B,GAAG,EAAE,MAAM,GAAG,MAAM;IACpB,aAAa,EAAE,iBAAiB;IAChC,OAAO,EAAE,WAAW,CAAC,OAAO;IAnBvC,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;IAC9C,QAAQ,CAAC,KAAK,IAAK,IAAI;IACvB,QAAQ,CAAC,OAAO,IAAK,IAAI;IACzB,QAAQ,CAAC,OAAO,CAAE,SAAS,EAAE,aAAa,EAAE,MAAM,EAAE,kBAAkB,GAAG,IAAI;IAC7E,QAAQ,CAAC,WAAW,CAAE,SAAS,EAAE,aAAa,EAAE,MAAM,EAAE,kBAAkB,GAAG,IAAI;IACjF,QAAQ,CAAC,KAAK,CAAE,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI;IACjF,QAAQ,CAAC,SAAS,CAAE,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,GAAG,IAAI;IAEpE,iBAAiB,EAAE;QACf,SAAS,CAAC,EAAE,aAAa,CAAA;QACzB,MAAM,CAAC,EAAE,kBAAkB,CAAA;QAC3B,MAAM,CAAC,EAAE,OAAO,CAAA;QAChB,WAAW,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAA;KAC7C,EAAE,CAAK;IACR,OAAO,EAAE,OAAO,EAAE,CAAK;gBAGZ,GAAG,EAAE,MAAM,GAAG,MAAM,EACpB,aAAa,EAAE,iBAAsB,EACrC,OAAO,EAAE,WAAW,CAAC,OAAO;IAIvC,eAAe,CAAE,EACb,OAA6C,EAC7C,QAA+C,EAC/C,UAAU,GACb,GAAE,cAAmB;IA4BtB,MAAM,CAAC,iBAAiB,CAAE,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,SAAS,EAAE,MAAM;CAU5E"}