webdriverio 9.0.0-alpha.11 → 9.0.0-alpha.113

package/build/utils/getElementObject.js

@@ -38,6 +38,7 @@ export const getElement = function findElement(selector, res, props = { isReactE
         ...getWDIOPrototype('element'),
         scope: { value: 'element' }
     };
+    propertiesObject.emit = { value: this.emit.bind(this) };
     const element = webdriverMonad(this.options, (client) => {
         const elementId = getElementFromResponse(res);
         if (elementId) {
@@ -48,19 +49,22 @@ export const getElement = function findElement(selector, res, props = { isReactE
             /**
              * set element id with proper key so element can be passed into execute commands
              */
-            if (this.isW3C) {
-                client[ELEMENT_KEY] = elementId;
-            }
-            else {
-                client.ELEMENT = elementId;
+            client[ELEMENT_KEY] = elementId;
+            /**
+             * Attach locator if element was fetched with WebDriver Bidi.
+             * This allows to later re-fetch the element within the same conditions.
+             */
+            if (res && this.isBidi && 'locator' in res) {
+                client.locator = res.locator;
             }
         }
         else {
             client.error = res;
         }
-        client.selector = selector || '';
+        if (selector) {
+            client.selector = selector;
+        }
         client.parent = this;
-        client.emit = this.emit.bind(this);
         client.isReactElement = props.isReactElement;
         client.isShadowElement = props.isShadowElement;
         return client;
@@ -105,6 +109,7 @@ export const getElements = function getElements(selector, elemResponse, props =
             return res;
         }
         propertiesObject.scope = { value: 'element' };
+        propertiesObject.emit = { value: this.emit.bind(this) };
         const element = webdriverMonad(this.options, (client) => {
             const elementId = getElementFromResponse(res);
             if (elementId) {
@@ -115,8 +120,14 @@ export const getElements = function getElements(selector, elemResponse, props =
                 /**
                  * set element id with proper key so element can be passed into execute commands
                  */
-                const elementKey = this.isW3C ? ELEMENT_KEY : 'ELEMENT';
-                client[elementKey] = elementId;
+                client[ELEMENT_KEY] = elementId;
+                /**
+                 * Attach locator if element was fetched with WebDriver Bidi.
+                 * This allows to later re-fetch the element within the same conditions.
+                 */
+                if (res && this.isBidi && 'locator' in res) {
+                    client.locator = res.locator;
+                }
             }
             else {
                 res = res;
@@ -127,7 +138,6 @@ export const getElements = function getElements(selector, elemResponse, props =
                 : selector;
             client.parent = this;
             client.index = i;
-            client.emit = this.emit.bind(this);
             client.isReactElement = props.isReactElement;
             client.isShadowElement = props.isShadowElement;
             return client;
@@ -142,4 +152,3 @@ export const getElements = function getElements(selector, elemResponse, props =
     });
     return elements;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0RWxlbWVudE9iamVjdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9nZXRFbGVtZW50T2JqZWN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxjQUFjLEVBQUUsV0FBVyxFQUFFLE1BQU0sYUFBYSxDQUFBO0FBQ3pELE9BQU8sS0FBSyxNQUFNLGtCQUFrQixDQUFBO0FBQ3BDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxXQUFXLENBQUE7QUFDdkMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sYUFBYSxDQUFBO0FBRzlDLE9BQU8sRUFBRSxZQUFZLElBQUksZ0JBQWdCLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDckYsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sbUJBQW1CLENBQUE7QUFDdkQsT0FBTyxLQUFLLGVBQWUsTUFBTSx3QkFBd0IsQ0FBQTtBQWN6RCxNQUFNLGNBQWUsU0FBUSxLQUFLO0lBQzlCLFlBQVksR0FBbUM7UUFFM0MsTUFBTSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsR0FBRyxHQUFZLENBQUE7UUFDcEMsTUFBTSxFQUFFLEtBQUssRUFBRSxVQUFVLEVBQUUsR0FBRyxHQUE2QixDQUFBO1FBRTNELEtBQUssQ0FBQyxLQUFLLElBQUksSUFBSSxJQUFJLEVBQUUsQ0FBQyxDQUFBO1FBQzFCLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFO1lBQ2hCLE9BQU8sRUFBRSxHQUFHLENBQUMsT0FBTztZQUNwQixLQUFLLEVBQUUsVUFBVSxJQUFJLEtBQUs7U0FDN0IsQ0FBQyxDQUFBO0lBQ04sQ0FBQztDQUNKO0FBRUQ7Ozs7O0dBS0c7QUFDSCxNQUFNLENBQUMsTUFBTSxVQUFVLEdBQUcsU0FBUyxXQUFXLENBRTFDLFFBQW1CLEVBQ25CLEdBQThCLEVBQzlCLFFBQXlCLEVBQUUsY0FBYyxFQUFFLEtBQUssRUFBRSxlQUFlLEVBQUUsS0FB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

package/build/utils/implicitWait.js

@@ -31,4 +31,3 @@ export default async function implicitWait(currentElement, commandName) {
     }
     return currentElement;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW1wbGljaXRXYWl0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2ltcGxpY2l0V2FpdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLE1BQU0sTUFBTSxjQUFjLENBQUE7QUFFakMsTUFBTSxHQUFHLEdBQUcsTUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFBO0FBRWpDOzs7O0dBSUc7QUFDSCxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssVUFBVSxZQUFZLENBQUUsY0FBbUMsRUFBRSxXQUFtQjtJQUNoRyxJQUFJLENBQUMsY0FBYyxDQUFDLFNBQVMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsZ0VBQWdFLENBQUMsRUFBRSxDQUFDO1FBQ3BILEdBQUcsQ0FBQyxLQUFLLENBQ0wsV0FBVyxXQUFXLCtCQUErQixjQUFjLENBQUMsUUFBUSxLQUFLO1lBQ2pGLHVDQUF1QyxDQUMxQyxDQUFBO1FBRUQsSUFBSSxDQUFDO1lBQ0QsTUFBTSxjQUFjLENBQUMsWUFBWSxFQUFFLENBQUE7WUFDbkM7O2VBRUc7WUFDSCxPQUFRLGNBQWMsQ0FBQyxNQUE4QixDQUFDLENBQUMsQ0FBQyxjQUFjLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDcEYsQ0FBQztRQUFDLE1BQU0sQ0FBQztZQUNMLElBQUksY0FBYyxDQUFDLFFBQVEsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxRQUFRLENBQUMsNkJBQTZCLENBQUMsRUFBRSxDQUFDO2dCQUM3RSxNQUFNLElBQUksS0FBSyxDQUNYLGNBQWMsV0FBVyxrREFBbUQsY0FBYyxDQUFDLE1BQThCLENBQUMsUUFBUSxnQ0FBZ0MsQ0FBQyxDQUFBO1lBQzNLLENBQUM7WUFFRCxJQUFJLGNBQWMsQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUMsUUFBUSxDQUFDLHlCQUF5QixDQUFDLEVBQUUsQ0FBQztnQkFDekUsTUFBTSxJQUFJLEtBQUssQ0FDWCxjQUFjLFdBQVcsOENBQStDLGNBQWMsQ0FBQyxNQUE4QixDQUFDLFFBQVEsZ0NBQWdDLENBQUMsQ0FBQTtZQUN2SyxDQUFDO1lBRUQsSUFBSSxjQUFjLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDLFFBQVEsQ0FBQyxvQkFBb0IsQ0FBQyxFQUFFLENBQUM7Z0JBQ3BFLE1BQU0sSUFBSSxLQUFLLENBQ1gsY0FBYyxXQUFXLGdEQUFpRCxjQUFjLENBQUMsTUFBOEIsQ0FBQyxRQUFRLDJCQUEyQixDQUFDLENBQUE7WUFDcEssQ0FBQztZQUVELE1BQU0sSUFBSSxLQUFLLENBQ1gsY0FBYyxXQUFXLDhCQUE4QixjQUFjLENBQUMsUUFBUSxnQ0FBZ0MsQ0FBQyxDQUFBO1FBQ3ZILENBQUM7SUFDTCxDQUFDO0lBRUQsT0FBTyxjQUFjLENBQUE7QUFDekIsQ0FBQyJ9

package/build/utils/index.d.ts

@@ -1,3 +1,4 @@
+import { type remote } from 'webdriver';
 import type { ElementReference } from '@wdio/protocols';
 import { type ShadowRootManager } from '../shadowRoot.js';
 import type { Selector, ParsedCSSValue, CustomLocatorReturnValue } from '../types.js';
@@ -39,14 +40,7 @@ export declare function isStaleElementError(err: Error): boolean;
  * @returns a function to handle the result of a shadow root inspection
  */
 export declare function elementPromiseHandler<T extends object>(handle: string, shadowRootManager: ShadowRootManager, shadowRootId?: string): (el: T | Error) => T | undefined;
-/**
- * determine if element is within the scope of another element
- * @param node an element somewhere located within the shadow DOM tree
- * @param host the host element (can be a shadow root or the document)
- * @param handle the browsing context
- * @returns true if the node is within the scope of the host
- */
-export declare function isWithinElementScope(node: ElementReference, host: WebdriverIO.Element, handle?: string): Promise<boolean>;
+export declare function transformClassicToBidiSelector(using: string, value: string): remote.BrowsingContextCssLocator | remote.BrowsingContextXPathLocator;
 /**
  * Parallel look up of a selector within multiple shadow roots
  * @param this WebdriverIO Browser or Element instance

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}

package/build/utils/index.js

@@ -11,7 +11,6 @@ import { ELEMENT_KEY } from 'webdriver';
 import { UNICODE_CHARACTERS, asyncIterators, getBrowserObject } from '@wdio/utils';
 import * as browserCommands from '../commands/browser.js';
 import * as elementCommands from '../commands/element.js';
-import isDescendent from '../scripts/isDescendant.js';
 import querySelectorAllDeep from './thirdParty/querySelectorShadowDom.js';
 import { DEEP_SELECTOR, Key } from '../constants.js';
 import { findStrategy } from './findStrategy.js';
@@ -182,7 +181,9 @@ export function isStaleElementError(err) {
         // Firefox
         err.message.includes('is no longer attached to the DOM') ||
         // Safari
-        err.message.includes('Stale element found'));
+        err.message.toLowerCase().includes('stale element found') ||
+        // Chrome through JS execution
+        err.message.includes('stale element not found in the current frame'));
 }
 /**
  * handle promise result (resolved or rejected promises)
@@ -210,43 +211,14 @@ export function elementPromiseHandler(handle, shadowRootManager, shadowRootId) {
         return el;
     };
 }
-/**
- * determine if element is within the scope of another element
- * @param node an element somewhere located within the shadow DOM tree
- * @param host the host element (can be a shadow root or the document)
- * @param handle the browsing context
- * @returns true if the node is within the scope of the host
- */
-export async function isWithinElementScope(node, host, handle) {
-    const browser = getBrowserObject(host);
-    const shadowRootManager = getShadowRootManager(browser);
-    const shadowRoots = shadowRootManager.getShadowRootsForContext(handle);
-    const [documentFound, ...shadowFinds] = await Promise.all([
-        browser.execute(isDescendent, host, node).then((wasFound) => wasFound ? host : undefined),
-        ...shadowRoots.map((shadowRootId) => (browser.execute(isDescendent, { [ELEMENT_KEY]: shadowRootId }, node).then((wasFound) => wasFound ? shadowRootId : undefined)))
-    ]);
-    if (documentFound) {
-        return true;
-    }
-    const allShadowFinds = shadowFinds.filter(Boolean);
-    if (allShadowFinds.length > 1) {
-        throw new Error('isWithinElementScope: too many results');
-    }
-    const shadowRootId = allShadowFinds[0];
-    if (!shadowRootId) {
-        return false;
+export function transformClassicToBidiSelector(using, value) {
+    if (using === 'css selector') {
+        return { type: 'css', value: value };
     }
-    const newNode = shadowRootManager.getElementWithShadowDOM(shadowRootId);
-    if (!newNode) {
-        return false;
+    if (using === 'xpath') {
+        return { type: 'xpath', value: value };
     }
-    /**
-     * recursively run the same function again, this time, instead of looking for the
-     * node, we look for the found custom component outside the shadow root.
-     */
-    return isWithinElementScope({
-        [ELEMENT_KEY]: newNode
-    }, host, handle);
+    throw new Error(`Can't transform classic selector ${using} to Bidi selector`);
 }
 /**
  * Parallel look up of a selector within multiple shadow roots
@@ -259,49 +231,48 @@ export async function findDeepElement(selector) {
     const browser = getBrowserObject(this);
     const shadowRootManager = getShadowRootManager(browser);
     const handle = await browser.getWindowHandle();
-    const shadowRoots = shadowRootManager.getShadowRootsForContext(handle);
+    const shadowRoots = shadowRootManager.getShadowElementsByContextId(handle, this.elementId);
     const { using, value } = findStrategy(selector, this.isW3C, this.isMobile);
+    const locator = transformClassicToBidiSelector(using, value);
     /**
      * look up selector within document and all shadow roots
      */
-    const deepElementResult = await Promise.all([
+    const deepElementResult = (await Promise.all([
         /**
-         * standard lookup in document
+         * fetch through all browsing contexts
          */
-        ELEMENT_KEY in this
-            ? this.findElementFromElement(this[ELEMENT_KEY], using, value)
-                .then(elementPromiseHandler(handle, shadowRootManager, undefined), elementPromiseHandler(handle, shadowRootManager, undefined))
-            : this.findElement(using, value)
-                .then(elementPromiseHandler(handle, shadowRootManager, undefined), elementPromiseHandler(handle, shadowRootManager, undefined)),
+        browser.browsingContextLocateNodes({
+            locator,
+            context: handle,
+            maxNodeCount: 1,
+            ...(this.elementId
+                ? { startNodes: [{ sharedId: this.elementId }] }
+                : {})
+        }).then((result) => {
+            const elementId = result.nodes[0]?.sharedId;
+            if (!elementId) {
+                return undefined;
+            }
+            const elem = {
+                [ELEMENT_KEY]: elementId,
+                locator
+            };
+            return elem;
+        }, (err) => {
+            log.warn(`Failed to execute browser.browsingContextLocateNodes({ ... }) due to ${err}, falling back to regular WebDriver Classic command`);
+            return browser.findElement(using, value).catch((err) => {
+                log.warn(`Failed to execute browser.findElement({ ... }) due to ${err}`);
+            });
+        }),
         /**
-         * lookup in shadow roots
+         * fetch through all shadow roots
          */
-        ...shadowRoots.map((shadowRootNodeId) => browser.findElementFromShadowRoot(shadowRootNodeId, using, value)
-            .then(elementPromiseHandler(handle, shadowRootManager, shadowRootNodeId), elementPromiseHandler(handle, shadowRootManager, shadowRootNodeId))
-            .then(async (res) => {
-            if (!res) {
-                return;
-            }
-            /**
-             * if an element was found with given selector within a shadow root
-             * and
-             * if we are calling the command from an element scope
-             * then
-             * we need to check if the found element is nested within the scope
-             */
-            if ('elementId' in this) {
-                return (await isWithinElementScope(res, this, handle))
-                    ? res
-                    : undefined;
-            }
-            return res;
-        }))
-    ]);
-    const allElementsFiltered = deepElementResult.flat().filter(Boolean);
-    if (allElementsFiltered.length === 0) {
+        ...shadowRoots.map((shadowRootNodeId) => browser.findElementFromShadowRoot(shadowRootNodeId, using, value).then(elementPromiseHandler(handle, shadowRootManager), elementPromiseHandler(handle, shadowRootManager)))
+    ])).filter(Boolean);
+    if (deepElementResult.length === 0) {
         return new Error(`Couldn't find element with selector "${selector}"`);
     }
-    return allElementsFiltered[0];
+    return deepElementResult[0];
 }
 /**
  * Parallel look up of a selector within multiple shadow roots
@@ -314,39 +285,35 @@ export async function findDeepElements(selector) {
     const browser = getBrowserObject(this);
     const shadowRootManager = getShadowRootManager(browser);
     const handle = await browser.getWindowHandle();
-    const shadowRoots = shadowRootManager.getShadowRootsForContext(handle);
+    const shadowRoots = shadowRootManager.getShadowElementsByContextId(handle, this.elementId);
     const { using, value } = findStrategy(selector, this.isW3C, this.isMobile);
+    const locator = transformClassicToBidiSelector(using, value);
     /**
      * look up selector within document and all shadow roots
      */
-    const deepElementsResult = await Promise.all([
+    const deepElementResult = (await Promise.all([
         /**
-         * standard lookup in document
+         * fetch through all browsing contexts
          */
-        ELEMENT_KEY in this
-            ? this.findElementsFromElement(this[ELEMENT_KEY], using, value)
-            : this.findElements(using, value),
+        browser.browsingContextLocateNodes({
+            locator,
+            context: handle,
+            ...(this.elementId
+                ? { startNodes: [{ sharedId: this.elementId }] }
+                : {})
+        }).then((result) => result.nodes.map((node) => ({
+            [ELEMENT_KEY]: node.sharedId,
+            locator
+        })), (err) => {
+            log.warn(`Failed to execute browser.browsingContextLocateNodes({ ... }) due to ${err}, falling back to regular WebDriver Classic command`);
+            return browser.findElements(using, value);
+        }),
         /**
-         * lookup in shadow roots
+         * fetch through all shadow roots
          */
-        ...shadowRoots.map((shadowRootNodeId) => browser.findElementsFromShadowRoot(shadowRootNodeId, using, value)
-            .then(elementPromiseHandler(handle, shadowRootManager, shadowRootNodeId), elementPromiseHandler(handle, shadowRootManager, shadowRootNodeId)).then(async (res) => {
-            if (!res) {
-                return;
-            }
-            if ('elementId' in this) {
-                const allElementsWithinScope = await Promise.all(res.map((el) => isWithinElementScope(el, this, handle)
-                    .then((isWithinScope) => isWithinScope ? el : undefined)));
-                return allElementsWithinScope.filter(Boolean);
-            }
-            return res;
-        }))
-    ]);
-    /**
-     * lastly, we filter all elements that are not defined, e.g. not found
-     * or not within the scope of the host element
-     */
-    return deepElementsResult.flat().filter(Boolean);
+        ...shadowRoots.map((shadowRootNodeId) => browser.findElementsFromShadowRoot(shadowRootNodeId, using, value).then(elementPromiseHandler(handle, shadowRootManager), elementPromiseHandler(handle, shadowRootManager)))
+    ])).filter(Boolean);
+    return deepElementResult.flat();
 }
 /**
  * logic to find an element
@@ -354,6 +321,15 @@ export async function findDeepElements(selector) {
  */
 export async function findElement(selector) {
     const browserObject = getBrowserObject(this);
+    /**
+     * do a deep lookup if
+     * - we are using Bidi
+     * - have a string selector
+     * - that is not a deep selector
+     */
+    if (this.isBidi && typeof selector === 'string' && !selector.startsWith(DEEP_SELECTOR)) {
+        return findDeepElement.call(this, selector);
+    }
     /**
      * check if shadow DOM integration is used
      */
@@ -649,4 +625,3 @@ export const containsHeaderObject = (base, match) => {
     }
     return true;
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}

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

@@ -1,27 +1,81 @@
 /// <reference types="node" resolution-mode="require"/>
-import EventEmitter from 'node:events';
+import { type JsonCompatible } from '@wdio/types';
+import { type local } from 'webdriver';
+import { URLPattern } from 'urlpattern-polyfill';
+import type { MockOptions, RespondWithOptions } from './types.js';
 import type { WaitForOptions } from '../../types.js';
-import type { MockFilterOptions, MockOverwrite, MockResponseParams, Matches, ErrorReason } from './types.js';
-export default abstract class Interception extends EventEmitter {
-    url: string | RegExp;
-    filterOptions: MockFilterOptions;
-    browser: WebdriverIO.Browser;
-    abstract calls: Matches[] | Promise<Matches[]>;
-    abstract clear(): void;
-    abstract restore(): Promise<void>;
-    abstract respond(overwrite: MockOverwrite, params: MockResponseParams): void;
-    abstract respondOnce(overwrite: MockOverwrite, params: MockResponseParams): void;
-    abstract abort(errorReason: ErrorReason, sticky: boolean): void;
-    abstract abortOnce(errorReason: ErrorReason): void;
-    respondOverwrites: {
-        overwrite?: MockOverwrite;
-        params?: MockResponseParams;
-        sticky?: boolean;
-        errorReason?: ErrorReason;
-    }[];
-    matches: Matches[];
-    constructor(url: string | RegExp, filterOptions: MockFilterOptions, browser: WebdriverIO.Browser);
+type RespondBody = string | JsonCompatible | Buffer;
+/**
+ * Network interception class based on a WebDriver Bidi implementation.
+ *
+ * Note: this code is executed in Node.js and in the browser, so make sure
+ *       you use primitives that work in both environments.
+ */
+export default class WebDriverInterception {
+    #private;
+    private constructor();
+    static initiate(url: string, 
+    /**
+     * ToDo(Christian): incorporate filterOptions
+     */
+    filterOptions: MockOptions, browser: WebdriverIO.Browser): Promise<WebDriverInterception>;
+    /**
+     * allows access to all requests made with given pattern
+     */
+    get calls(): local.NetworkResponseCompletedParameters[];
+    /**
+     * Resets all information stored in the `mock.calls` set.
+     */
+    clear(): this;
+    /**
+     * Does what `mock.clear()` does and makes removes custom request overrides
+     * and response overwrites
+     */
+    reset(): this;
+    /**
+     * Does everything that `mock.reset()` does, and also
+     * removes any mocked return values or implementations.
+     * Restored mock does not emit events and could not mock responses
+     */
+    restore(): Promise<this>;
+    /**
+     * Always respond with same overwrite
+     * @param {*} overwrites  payload to overwrite the response
+     * @param {*} params      additional respond parameters to overwrite
+     * @param {boolean} once  apply overwrite only once for the next request
+     */
+    respond(payload: RespondBody, params?: Omit<RespondWithOptions, 'body'>, once?: boolean): this;
+    /**
+     * alias for `mock.respond(…, true)`
+     */
+    respondOnce(payload: RespondBody, params?: Omit<RespondWithOptions, 'body'>): this;
+    /**
+     * Abort the request with an error code
+     * @param {string} errorReason  error code of the response
+     * @param {boolean} once        if request should be aborted only once for the next request
+     */
+    abort(once?: boolean): this;
+    /**
+     * alias for `mock.abort(true)`
+     */
+    abortOnce(): this;
+    /**
+     * Redirect request to another URL
+     * @param {string} redirectUrl  URL to redirect to
+     * @param {boolean} sticky      if request should be redirected for all following requests
+     */
+    redirect(redirectUrl: string, once?: boolean): this;
+    /**
+     * alias for `mock.redirect(…, true)`
+     */
+    redirectOnce(redirectUrl: string): this;
+    on(event: 'request', callback: (request: local.NetworkBeforeRequestSentParameters) => void): WebDriverInterception;
+    on(event: 'match', callback: (match: local.NetworkBeforeRequestSentParameters) => void): WebDriverInterception;
+    on(event: 'continue', callback: (requestId: string) => void): WebDriverInterception;
+    on(event: 'fail', callback: (requestId: string) => void): WebDriverInterception;
+    on(event: 'overwrite', callback: (response: local.NetworkResponseCompletedParameters) => void): WebDriverInterception;
     waitForResponse({ timeout, interval, timeoutMsg, }?: WaitForOptions): Promise<boolean> | Promise<Promise<boolean>>;
-    static isMatchingRequest(expectedUrl: string | RegExp, actualUrl: string): boolean;
 }
+export declare function parseUrlPattern(url: string | URLPattern): URLPattern;
+export {};
 //# sourceMappingURL=index.d.ts.map

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":";AAAA,OAAO,YAAY,MAAM,aAAa,CAAA;AAKtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAE5G,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,YAAa,SAAQ,YAAY;IAkBhD,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,OAAO,CAAC,IAAI,CAAC;IAClC,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,WAAW,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI;IAChE,QAAQ,CAAC,SAAS,CAAE,WAAW,EAAE,WAAW,GAAG,IAAI;IAEnD,iBAAiB,EAAE;QACf,SAAS,CAAC,EAAE,aAAa,CAAA;QACzB,MAAM,CAAC,EAAE,kBAAkB,CAAA;QAC3B,MAAM,CAAC,EAAE,OAAO,CAAA;QAChB,WAAW,CAAC,EAAE,WAAW,CAAA;KAC5B,EAAE,CAAK;IACR,OAAO,EAAE,OAAO,EAAE,CAAK;gBAGZ,GAAG,EAAE,MAAM,GAAG,MAAM,EACpB,aAAa,EAAE,iBAAsB,EACrC,OAAO,EAAE,WAAW,CAAC,OAAO;IAKvC,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,EAAE,KAAK,cAAc,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,WAAW,CAAA;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAKhD,OAAO,KAAK,EAAE,WAAW,EAAsB,kBAAkB,EAAE,MAAM,YAAY,CAAA;AACrF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAMpD,KAAK,WAAW,GAAG,MAAM,GAAG,cAAc,GAAG,MAAM,CAAA;AAEnD;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,qBAAqB;;IAetC,OAAO;WAgBM,QAAQ,CACjB,GAAG,EAAE,MAAM;IACX;;OAEG;IACH,aAAa,EAAE,WAAW,EAC1B,OAAO,EAAE,WAAW,CAAC,OAAO;IA6JhC;;OAEG;IACH,IAAI,KAAK,+CAER;IAED;;OAEG;IACH,KAAK;IAKL;;;OAGG;IACH,KAAK;IAML;;;;OAIG;IACG,OAAO;IAgBb;;;;;OAKG;IACH,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,GAAE,IAAI,CAAC,kBAAkB,EAAE,MAAM,CAAM,EAAE,IAAI,CAAC,EAAE,OAAO;IAY3F;;OAEG;IACH,WAAW,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,GAAE,IAAI,CAAC,kBAAkB,EAAE,MAAM,CAAM;IAI/E;;;;OAIG;IACH,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO;IAMpB;;OAEG;IACH,SAAS;IAIT;;;;OAIG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO;IAO5C;;OAEG;IACH,YAAY,CAAC,WAAW,EAAE,MAAM;IAIhC,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,kCAAkC,KAAK,IAAI,GAAG,qBAAqB;IAClH,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,kCAAkC,KAAK,IAAI,GAAG,qBAAqB;IAC9G,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,GAAG,qBAAqB;IACnF,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,GAAG,qBAAqB;IAC/E,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,kCAAkC,KAAK,IAAI,GAAG,qBAAqB;IAYrH,eAAe,CAAE,EACb,OAA8C,EAC9C,QAAgD,EAChD,UAAU,GACb,GAAE,cAAmB;CA2BzB;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,cAqBvD"}