msw 0.0.0-fetch.rc-20 → 0.0.0-fetch.rc-22

package/lib/iife/index.js

@@ -514,10 +514,10 @@ var MockServiceWorker = (() => {
       this.isUsed = false;
     }
     /**
-     * Parse the captured request to extract additional information from it.
+     * Parse the intercepted request to extract additional information from it.
      * Parsed result is then exposed to other methods of this request handler.
      */
-    parse(_request, _resolutionContext) {
+    parse(_args) {
       return __async(this, null, function* () {
         return {};
       });
@@ -525,54 +525,61 @@ var MockServiceWorker = (() => {
     /**
      * Test if this handler matches the given request.
      */
-    test(request, resolutionContext) {
+    test(args) {
       return __async(this, null, function* () {
-        return this.predicate(
-          request,
-          yield this.parse(request.clone(), resolutionContext),
-          resolutionContext
-        );
+        const parsedResult = yield this.parse({
+          request: args.request,
+          resolutionContext: args.resolutionContext
+        });
+        return this.predicate({
+          request: args.request,
+          parsedResult,
+          resolutionContext: args.resolutionContext
+        });
       });
     }
-    extendInfo(_request, _parsedResult) {
+    extendResolverArgs(_args) {
       return {};
     }
     /**
      * Execute this request handler and produce a mocked response
      * using the given resolver function.
      */
-    run(request, resolutionContext) {
+    run(args) {
       return __async(this, null, function* () {
         var _a3;
         if (this.isUsed && ((_a3 = this.options) == null ? void 0 : _a3.once)) {
           return null;
         }
-        const mainRequestRef = request.clone();
+        const mainRequestRef = args.request.clone();
         this.isUsed = true;
-        const parsedResult = yield this.parse(
-          mainRequestRef.clone(),
-          resolutionContext
-        );
-        const shouldInterceptRequest = this.predicate(
-          mainRequestRef.clone(),
+        const parsedResult = yield this.parse({
+          request: args.request,
+          resolutionContext: args.resolutionContext
+        });
+        const shouldInterceptRequest = this.predicate({
+          request: args.request,
           parsedResult,
-          resolutionContext
-        );
+          resolutionContext: args.resolutionContext
+        });
         if (!shouldInterceptRequest) {
           return null;
         }
         const executeResolver = this.wrapResolver(this.resolver);
-        const resolverExtras = this.extendInfo(request, parsedResult);
+        const resolverExtras = this.extendResolverArgs({
+          request: args.request,
+          parsedResult
+        });
         const mockedResponse = yield executeResolver(__spreadProps(__spreadValues({}, resolverExtras), {
-          request
+          request: args.request
         }));
-        const executionResult = this.createExecutionResult(
+        const executionResult = this.createExecutionResult({
           // Pass the cloned request to the result so that logging
           // and other consumers could read its body once more.
-          mainRequestRef,
-          parsedResult,
-          mockedResponse
-        );
+          request: mainRequestRef,
+          response: mockedResponse,
+          parsedResult
+        });
         return executionResult;
       });
     }
@@ -604,12 +611,12 @@ var MockServiceWorker = (() => {
         return result;
       });
     }
-    createExecutionResult(request, parsedResult, response) {
+    createExecutionResult(args) {
       return {
         handler: this,
-        parsedResult,
-        request,
-        response
+        request: args.request,
+        response: args.response,
+        parsedResult: args.parsedResult
       };
     }
   };
@@ -2335,46 +2342,47 @@ Invalid value has been removed from localStorage to prevent subsequent failed pa
         `Found a redundant usage of query parameters in the request handler URL for "${method} ${path}". Please match against a path instead and access query parameters in the response resolver function using "req.url.searchParams".`
       );
     }
-    parse(request, resolutionContext) {
+    parse(args) {
       return __async(this, null, function* () {
-        const url = new URL(request.url);
+        var _a3;
+        const url = new URL(args.request.url);
         const match2 = matchRequestUrl(
           url,
           this.info.path,
-          resolutionContext == null ? void 0 : resolutionContext.baseUrl
+          (_a3 = args.resolutionContext) == null ? void 0 : _a3.baseUrl
         );
-        const cookies = getAllRequestCookies(request);
+        const cookies = getAllRequestCookies(args.request);
         return {
           match: match2,
           cookies
         };
       });
     }
-    predicate(request, parsedResult) {
-      const hasMatchingMethod = this.matchMethod(request.method);
-      const hasMatchingUrl = parsedResult.match.matches;
+    predicate(args) {
+      const hasMatchingMethod = this.matchMethod(args.request.method);
+      const hasMatchingUrl = args.parsedResult.match.matches;
       return hasMatchingMethod && hasMatchingUrl;
     }
     matchMethod(actualMethod) {
       return this.info.method instanceof RegExp ? this.info.method.test(actualMethod) : isStringEqual(this.info.method, actualMethod);
     }
-    extendInfo(_request, parsedResult) {
+    extendResolverArgs(args) {
       var _a3;
       return {
-        params: ((_a3 = parsedResult.match) == null ? void 0 : _a3.params) || {},
-        cookies: parsedResult.cookies
+        params: ((_a3 = args.parsedResult.match) == null ? void 0 : _a3.params) || {},
+        cookies: args.parsedResult.cookies
       };
     }
-    log(request, response) {
+    log(args) {
       return __async(this, null, function* () {
-        const publicUrl = getPublicUrlFromRequest(request);
-        const loggedRequest = yield serializeRequest(request);
-        const loggedResponse = yield serializeResponse(response);
+        const publicUrl = getPublicUrlFromRequest(args.request);
+        const loggedRequest = yield serializeRequest(args.request);
+        const loggedResponse = yield serializeResponse(args.response);
         const statusColor = getStatusCodeColor(loggedResponse.status);
         console.groupCollapsed(
           devUtils.formatMessage("%s %s %s (%c%s%c)"),
           getTimestamp(),
-          request.method,
+          args.request.method,
           publicUrl,
           `color:${statusColor}`,
           `${loggedResponse.status} ${loggedResponse.statusText}`,
@@ -2405,7 +2413,7 @@ Invalid value has been removed from localStorage to prevent subsequent failed pa
     options: createHttpHandler("OPTIONS" /* OPTIONS */)
   };
 
-  // node_modules/.pnpm/graphql@16.8.0/node_modules/graphql/jsutils/devAssert.mjs
+  // node_modules/.pnpm/graphql@16.8.1/node_modules/graphql/jsutils/devAssert.mjs
   function devAssert(condition, message3) {
     const booleanCondition = Boolean(condition);
     if (!booleanCondition) {
@@ -2413,12 +2421,12 @@ Invalid value has been removed from localStorage to prevent subsequent failed pa
     }
   }
 
-  // node_modules/.pnpm/graphql@16.8.0/node_modules/graphql/jsutils/isObjectLike.mjs
+  // node_modules/.pnpm/graphql@16.8.1/node_modules/graphql/jsutils/isObjectLike.mjs
   function isObjectLike(value) {
     return typeof value == "object" && value !== null;
   }
 
-  // node_modules/.pnpm/graphql@16.8.0/node_modules/graphql/jsutils/invariant.mjs
+  // node_modules/.pnpm/graphql@16.8.1/node_modules/graphql/jsutils/invariant.mjs
   function invariant2(condition, message3) {
     const booleanCondition = Boolean(condition);
     if (!booleanCondition) {
@@ -2428,7 +2436,7 @@ Invalid value has been removed from localStorage to prevent subsequent failed pa
     }
   }
 
-  // node_modules/.pnpm/graphql@16.8.0/node_modules/graphql/language/location.mjs
+  // node_modules/.pnpm/graphql@16.8.1/node_modules/graphql/language/location.mjs
   var LineRegExp = /\r\n|[\n\r]/g;
   function getLocation(source, position) {
     let lastLineStart = 0;
@@ -2447,7 +2455,7 @@ Invalid value has been removed from localStorage to prevent subsequent failed pa
     };
   }
 
-  // node_modules/.pnpm/graphql@16.8.0/node_modules/graphql/language/printLocation.mjs
+  // node_modules/.pnpm/graphql@16.8.1/node_modules/graphql/language/printLocation.mjs
   function printLocation(location2) {
     return printSourceLocation(
       location2.source,
@@ -2494,7 +2502,7 @@ Invalid value has been removed from localStorage to prevent subsequent failed pa
     return existingLines.map(([prefix, line]) => prefix.padStart(padLen) + (line ? " " + line : "")).join("\n");
   }
 
-  // node_modules/.pnpm/graphql@16.8.0/node_modules/graphql/error/GraphQLError.mjs
+  // node_modules/.pnpm/graphql@16.8.1/node_modules/graphql/error/GraphQLError.mjs
   function toNormalizedOptions(args) {
     const firstArg = args[0];
     if (firstArg == null || "kind" in firstArg || "length" in firstArg) {
@@ -2643,7 +2651,7 @@ Invalid value has been removed from localStorage to prevent subsequent failed pa
     return array === void 0 || array.length === 0 ? void 0 : array;
   }
 
-  // node_modules/.pnpm/graphql@16.8.0/node_modules/graphql/error/syntaxError.mjs
+  // node_modules/.pnpm/graphql@16.8.1/node_modules/graphql/error/syntaxError.mjs
   function syntaxError(source, position, description) {
     return new GraphQLError(`Syntax Error: ${description}`, {
       source,
@@ -2651,7 +2659,7 @@ Invalid value has been removed from localStorage to prevent subsequent failed pa
     });
   }
 
-  // node_modules/.pnpm/graphql@16.8.0/node_modules/graphql/language/ast.mjs
+  // node_modules/.pnpm/graphql@16.8.1/node_modules/graphql/language/ast.mjs
   var Location = class {
     /**
      * The character offset at which this Node begins.
@@ -2817,7 +2825,7 @@ Invalid value has been removed from localStorage to prevent subsequent failed pa
     OperationTypeNode2["SUBSCRIPTION"] = "subscription";
   })(OperationTypeNode || (OperationTypeNode = {}));
 
-  // node_modules/.pnpm/graphql@16.8.0/node_modules/graphql/language/directiveLocation.mjs
+  // node_modules/.pnpm/graphql@16.8.1/node_modules/graphql/language/directiveLocation.mjs
   var DirectiveLocation;
   (function(DirectiveLocation2) {
     DirectiveLocation2["QUERY"] = "QUERY";
@@ -2841,7 +2849,7 @@ Invalid value has been removed from localStorage to prevent subsequent failed pa
     DirectiveLocation2["INPUT_FIELD_DEFINITION"] = "INPUT_FIELD_DEFINITION";
   })(DirectiveLocation || (DirectiveLocation = {}));
 
-  // node_modules/.pnpm/graphql@16.8.0/node_modules/graphql/language/kinds.mjs
+  // node_modules/.pnpm/graphql@16.8.1/node_modules/graphql/language/kinds.mjs
   var Kind;
   (function(Kind2) {
     Kind2["NAME"] = "Name";
@@ -2889,7 +2897,7 @@ Invalid value has been removed from localStorage to prevent subsequent failed pa
     Kind2["INPUT_OBJECT_TYPE_EXTENSION"] = "InputObjectTypeExtension";
   })(Kind || (Kind = {}));
 
-  // node_modules/.pnpm/graphql@16.8.0/node_modules/graphql/language/characterClasses.mjs
+  // node_modules/.pnpm/graphql@16.8.1/node_modules/graphql/language/characterClasses.mjs
   function isWhiteSpace(code) {
     return code === 9 || code === 32;
   }
@@ -2907,7 +2915,7 @@ Invalid value has been removed from localStorage to prevent subsequent failed pa
     return isLetter(code) || isDigit(code) || code === 95;
   }
 
-  // node_modules/.pnpm/graphql@16.8.0/node_modules/graphql/language/blockString.mjs
+  // node_modules/.pnpm/graphql@16.8.1/node_modules/graphql/language/blockString.mjs
   function dedentBlockStringLines(lines) {
     var _firstNonEmptyLine2;
     let commonIndent = Number.MAX_SAFE_INTEGER;
@@ -2939,7 +2947,7 @@ Invalid value has been removed from localStorage to prevent subsequent failed pa
     return i;
   }
 
-  // node_modules/.pnpm/graphql@16.8.0/node_modules/graphql/language/tokenKind.mjs
+  // node_modules/.pnpm/graphql@16.8.1/node_modules/graphql/language/tokenKind.mjs
   var TokenKind;
   (function(TokenKind2) {
     TokenKind2["SOF"] = "<SOF>";
@@ -2966,7 +2974,7 @@ Invalid value has been removed from localStorage to prevent subsequent failed pa
     TokenKind2["COMMENT"] = "Comment";
   })(TokenKind || (TokenKind = {}));
 
-  // node_modules/.pnpm/graphql@16.8.0/node_modules/graphql/language/lexer.mjs
+  // node_modules/.pnpm/graphql@16.8.1/node_modules/graphql/language/lexer.mjs
   var Lexer = class {
     /**
      * The previously focused non-ignored token.
@@ -3467,7 +3475,7 @@ Invalid value has been removed from localStorage to prevent subsequent failed pa
     );
   }
 
-  // node_modules/.pnpm/graphql@16.8.0/node_modules/graphql/jsutils/inspect.mjs
+  // node_modules/.pnpm/graphql@16.8.1/node_modules/graphql/jsutils/inspect.mjs
   var MAX_ARRAY_LENGTH = 10;
   var MAX_RECURSIVE_DEPTH = 2;
   function inspect(value) {
@@ -3550,7 +3558,7 @@ Invalid value has been removed from localStorage to prevent subsequent failed pa
     return tag;
   }
 
-  // node_modules/.pnpm/graphql@16.8.0/node_modules/graphql/jsutils/instanceOf.mjs
+  // node_modules/.pnpm/graphql@16.8.1/node_modules/graphql/jsutils/instanceOf.mjs
   var instanceOf = (
     /* c8 ignore next 6 */
     // FIXME: https://github.com/graphql/graphql-js/issues/2317
@@ -3587,7 +3595,7 @@ spurious results.`);
     }
   );
 
-  // node_modules/.pnpm/graphql@16.8.0/node_modules/graphql/language/source.mjs
+  // node_modules/.pnpm/graphql@16.8.1/node_modules/graphql/language/source.mjs
   var Source = class {
     constructor(body, name = "GraphQL request", locationOffset = {
       line: 1,
@@ -3614,7 +3622,7 @@ spurious results.`);
     return instanceOf(source, Source);
   }
 
-  // node_modules/.pnpm/graphql@16.8.0/node_modules/graphql/language/parser.mjs
+  // node_modules/.pnpm/graphql@16.8.1/node_modules/graphql/language/parser.mjs
   function parse2(source, options) {
     const parser = new Parser(source, options);
     return parser.parseDocument();
@@ -4872,7 +4880,7 @@ spurious results.`);
     }
   }
 
-  // node_modules/.pnpm/headers-polyfill@3.2.3/node_modules/headers-polyfill/lib/index.mjs
+  // node_modules/.pnpm/headers-polyfill@4.0.1/node_modules/headers-polyfill/lib/index.mjs
   var __create4 = Object.create;
   var __defProp6 = Object.defineProperty;
   var __getOwnPropDesc5 = Object.getOwnPropertyDescriptor;
@@ -4891,6 +4899,10 @@ spurious results.`);
     return to;
   };
   var __toESM4 = (mod, isNodeMode, target) => (target = mod != null ? __create4(__getProtoOf4(mod)) : {}, __copyProps5(
+    // If the importer is in node compatibility mode or this is not an ESM
+    // file that has been converted to a CommonJS file using a Babel-
+    // compatible transform (i.e. "__esModule" has not been set), then set
+    // "default" to the CommonJS "module.exports" for node compatibility.
     isNodeMode || !mod || !mod.__esModule ? __defProp6(target, "default", { value: mod, enumerable: true }) : target,
     mod
   ));
@@ -5063,30 +5075,92 @@ spurious results.`);
   var import_set_cookie_parser2 = __toESM4(require_set_cookie2());
   var HEADERS_INVALID_CHARACTERS = /[^a-z0-9\-#$%&'*+.^_`|~]/i;
   function normalizeHeaderName(name) {
-    if (typeof name !== "string") {
-      name = String(name);
-    }
     if (HEADERS_INVALID_CHARACTERS.test(name) || name.trim() === "") {
       throw new TypeError("Invalid character in header field name");
     }
-    return name.toLowerCase();
-  }
+    return name.trim().toLowerCase();
+  }
+  var charCodesToRemove = [
+    String.fromCharCode(10),
+    String.fromCharCode(13),
+    String.fromCharCode(9),
+    String.fromCharCode(32)
+  ];
+  var HEADER_VALUE_REMOVE_REGEXP = new RegExp(
+    `(^[${charCodesToRemove.join("")}]|$[${charCodesToRemove.join("")}])`,
+    "g"
+  );
   function normalizeHeaderValue(value) {
+    const nextValue = value.replace(HEADER_VALUE_REMOVE_REGEXP, "");
+    return nextValue;
+  }
+  function isValidHeaderName(value) {
     if (typeof value !== "string") {
-      value = String(value);
+      return false;
     }
-    return value;
+    if (value.length === 0) {
+      return false;
+    }
+    for (let i = 0; i < value.length; i++) {
+      const character = value.charCodeAt(i);
+      if (character > 127 || !isToken(character)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  function isToken(value) {
+    return ![
+      127,
+      32,
+      "(",
+      ")",
+      "<",
+      ">",
+      "@",
+      ",",
+      ";",
+      ":",
+      "\\",
+      '"',
+      "/",
+      "[",
+      "]",
+      "?",
+      "=",
+      "{",
+      "}"
+    ].includes(value);
+  }
+  function isValidHeaderValue(value) {
+    if (typeof value !== "string") {
+      return false;
+    }
+    if (value.trim() !== value) {
+      return false;
+    }
+    for (let i = 0; i < value.length; i++) {
+      const character = value.charCodeAt(i);
+      if (
+        // NUL.
+        character === 0 || // HTTP newline bytes.
+        character === 10 || character === 13
+      ) {
+        return false;
+      }
+    }
+    return true;
   }
   var NORMALIZED_HEADERS = Symbol("normalizedHeaders");
   var RAW_HEADER_NAMES = Symbol("rawHeaderNames");
   var HEADER_VALUE_DELIMITER = ", ";
   var _a;
   var _b;
-  var HeadersPolyfill = class {
+  var Headers2 = class _Headers {
     constructor(init) {
       this[_a] = {};
       this[_b] = /* @__PURE__ */ new Map();
-      if (["Headers", "HeadersPolyfill"].includes(init == null ? void 0 : init.constructor.name) || init instanceof HeadersPolyfill) {
+      if (["Headers", "HeadersPolyfill"].includes(init == null ? void 0 : init.constructor.name) || init instanceof _Headers) {
         const initialHeaders = init;
         initialHeaders.forEach((value, name) => {
           this.append(name, value);
@@ -5112,35 +5186,79 @@ spurious results.`);
       return this.entries();
     }
     *keys() {
-      for (const name of Object.keys(this[NORMALIZED_HEADERS])) {
+      for (const [name] of this.entries()) {
         yield name;
       }
     }
     *values() {
-      for (const value of Object.values(this[NORMALIZED_HEADERS])) {
+      for (const [, value] of this.entries()) {
         yield value;
       }
     }
     *entries() {
-      for (const name of Object.keys(this[NORMALIZED_HEADERS])) {
-        yield [name, this.get(name)];
+      let sortedKeys = Object.keys(this[NORMALIZED_HEADERS]).sort(
+        (a, b) => a.localeCompare(b)
+      );
+      for (const name of sortedKeys) {
+        if (name === "set-cookie") {
+          for (const value of this.getSetCookie()) {
+            yield [name, value];
+          }
+        } else {
+          yield [name, this.get(name)];
+        }
+      }
+    }
+    /**
+     * Returns a boolean stating whether a `Headers` object contains a certain header.
+     */
+    has(name) {
+      if (!isValidHeaderName(name)) {
+        throw new TypeError(`Invalid header name "${name}"`);
       }
+      return this[NORMALIZED_HEADERS].hasOwnProperty(normalizeHeaderName(name));
     }
+    /**
+     * Returns a `ByteString` sequence of all the values of a header with a given name.
+     */
     get(name) {
       var _a3;
+      if (!isValidHeaderName(name)) {
+        throw TypeError(`Invalid header name "${name}"`);
+      }
       return (_a3 = this[NORMALIZED_HEADERS][normalizeHeaderName(name)]) != null ? _a3 : null;
     }
+    /**
+     * Sets a new value for an existing header inside a `Headers` object, or adds the header if it does not already exist.
+     */
     set(name, value) {
+      if (!isValidHeaderName(name) || !isValidHeaderValue(value)) {
+        return;
+      }
       const normalizedName = normalizeHeaderName(name);
-      this[NORMALIZED_HEADERS][normalizedName] = normalizeHeaderValue(value);
+      const normalizedValue = normalizeHeaderValue(value);
+      this[NORMALIZED_HEADERS][normalizedName] = normalizeHeaderValue(normalizedValue);
       this[RAW_HEADER_NAMES].set(normalizedName, name);
     }
+    /**
+     * Appends a new value onto an existing header inside a `Headers` object, or adds the header if it does not already exist.
+     */
     append(name, value) {
+      if (!isValidHeaderName(name) || !isValidHeaderValue(value)) {
+        return;
+      }
       const normalizedName = normalizeHeaderName(name);
-      let resolvedValue = this.has(normalizedName) ? `${this.get(normalizedName)}, ${value}` : value;
+      const normalizedValue = normalizeHeaderValue(value);
+      let resolvedValue = this.has(normalizedName) ? `${this.get(normalizedName)}, ${normalizedValue}` : normalizedValue;
       this.set(name, resolvedValue);
     }
+    /**
+     * Deletes a header from the `Headers` object.
+     */
     delete(name) {
+      if (!isValidHeaderName(name)) {
+        return;
+      }
       if (!this.has(name)) {
         return;
       }
@@ -5148,26 +5266,20 @@ spurious results.`);
       delete this[NORMALIZED_HEADERS][normalizedName];
       this[RAW_HEADER_NAMES].delete(normalizedName);
     }
-    all() {
-      return this[NORMALIZED_HEADERS];
-    }
-    raw() {
-      const rawHeaders = {};
-      for (const [name, value] of this.entries()) {
-        rawHeaders[this[RAW_HEADER_NAMES].get(name)] = value;
-      }
-      return rawHeaders;
-    }
-    has(name) {
-      return this[NORMALIZED_HEADERS].hasOwnProperty(normalizeHeaderName(name));
-    }
+    /**
+     * Traverses the `Headers` object,
+     * calling the given callback for each header.
+     */
     forEach(callback, thisArg) {
-      for (const name in this[NORMALIZED_HEADERS]) {
-        if (this[NORMALIZED_HEADERS].hasOwnProperty(name)) {
-          callback.call(thisArg, this[NORMALIZED_HEADERS][name], name, this);
-        }
+      for (const [name, value] of this.entries()) {
+        callback.call(thisArg, value, name, this);
       }
     }
+    /**
+     * Returns an array containing the values
+     * of all Set-Cookie headers associated
+     * with a response
+     */
     getSetCookie() {
       const setCookieHeader = this.get("set-cookie");
       if (setCookieHeader === null) {
@@ -5190,7 +5302,7 @@ spurious results.`);
       const value = parts.join(": ");
       headers.append(name, value);
       return headers;
-    }, new HeadersPolyfill());
+    }, new Headers2());
   }
 
   // src/core/utils/internal/parseMultipartData.ts
@@ -5411,43 +5523,48 @@ spurious results.`);
       });
       this.endpoint = endpoint;
     }
-    parse(request) {
+    parse(args) {
       return __async(this, null, function* () {
-        return parseGraphQLRequest(request).catch((error3) => {
+        return parseGraphQLRequest(args.request).catch((error3) => {
           console.error(error3);
           return void 0;
         });
       });
     }
-    predicate(request, parsedResult) {
-      if (!parsedResult) {
+    predicate(args) {
+      if (!args.parsedResult) {
         return false;
       }
-      if (!parsedResult.operationName && this.info.operationType !== "all") {
-        const publicUrl = getPublicUrlFromRequest(request);
-        devUtils.warn(`Failed to intercept a GraphQL request at "${request.method} ${publicUrl}": anonymous GraphQL operations are not supported.
+      if (!args.parsedResult.operationName && this.info.operationType !== "all") {
+        const publicUrl = getPublicUrlFromRequest(args.request);
+        devUtils.warn(`Failed to intercept a GraphQL request at "${args.request.method} ${publicUrl}": anonymous GraphQL operations are not supported.
 
 Consider naming this operation or using "graphql.operation()" request handler to intercept GraphQL requests regardless of their operation name/type. Read more: https://mswjs.io/docs/api/graphql/operation`);
         return false;
       }
-      const hasMatchingUrl = matchRequestUrl(new URL(request.url), this.endpoint);
-      const hasMatchingOperationType = this.info.operationType === "all" || parsedResult.operationType === this.info.operationType;
-      const hasMatchingOperationName = this.info.operationName instanceof RegExp ? this.info.operationName.test(parsedResult.operationName || "") : parsedResult.operationName === this.info.operationName;
+      const hasMatchingUrl = matchRequestUrl(
+        new URL(args.request.url),
+        this.endpoint
+      );
+      const hasMatchingOperationType = this.info.operationType === "all" || args.parsedResult.operationType === this.info.operationType;
+      const hasMatchingOperationName = this.info.operationName instanceof RegExp ? this.info.operationName.test(args.parsedResult.operationName || "") : args.parsedResult.operationName === this.info.operationName;
       return hasMatchingUrl.matches && hasMatchingOperationType && hasMatchingOperationName;
     }
-    extendInfo(_request, parsedResult) {
+    extendResolverArgs(args) {
+      var _a3, _b2, _c;
       return {
-        query: (parsedResult == null ? void 0 : parsedResult.query) || "",
-        operationName: (parsedResult == null ? void 0 : parsedResult.operationName) || "",
-        variables: (parsedResult == null ? void 0 : parsedResult.variables) || {}
+        query: ((_a3 = args.parsedResult) == null ? void 0 : _a3.query) || "",
+        operationName: ((_b2 = args.parsedResult) == null ? void 0 : _b2.operationName) || "",
+        variables: ((_c = args.parsedResult) == null ? void 0 : _c.variables) || {}
       };
     }
-    log(request, response, parsedRequest) {
+    log(args) {
       return __async(this, null, function* () {
-        const loggedRequest = yield serializeRequest(request);
-        const loggedResponse = yield serializeResponse(response);
+        var _a3, _b2, _c, _d;
+        const loggedRequest = yield serializeRequest(args.request);
+        const loggedResponse = yield serializeResponse(args.response);
         const statusColor = getStatusCodeColor(loggedResponse.status);
-        const requestInfo = (parsedRequest == null ? void 0 : parsedRequest.operationName) ? `${parsedRequest == null ? void 0 : parsedRequest.operationType} ${parsedRequest == null ? void 0 : parsedRequest.operationName}` : `anonymous ${parsedRequest == null ? void 0 : parsedRequest.operationType}`;
+        const requestInfo = ((_a3 = args.parsedResult) == null ? void 0 : _a3.operationName) ? `${(_b2 = args.parsedResult) == null ? void 0 : _b2.operationType} ${(_c = args.parsedResult) == null ? void 0 : _c.operationName}` : `anonymous ${(_d = args.parsedResult) == null ? void 0 : _d.operationType}`;
         console.groupCollapsed(
           devUtils.formatMessage("%s %s (%c%s%c)"),
           getTimestamp(),
@@ -5483,32 +5600,39 @@ Consider naming this operation or using "graphql.operation()" request handler to
   }
   var standardGraphQLHandlers = {
     /**
-     * Captures any GraphQL operation, regardless of its name, under the current scope.
-     * @example
-     * graphql.operation(() => {
-     *   return HttpResponse.json({ data: { name: 'John' } })
-     * })
-     * @see {@link https://mswjs.io/docs/api/graphql/operation `graphql.operation()`}
-     */
-    operation: createGraphQLOperationHandler("*"),
-    /**
-     * Captures a GraphQL query by a given name.
+     * Intercepts a GraphQL query by a given name.
+     *
      * @example
      * graphql.query('GetUser', () => {
      *   return HttpResponse.json({ data: { user: { name: 'John' } } })
      * })
-     * @see {@link https://mswjs.io/docs/api/graphql/query `graphql.query()`}
+     *
+     * @see {@link https://mswjs.io/docs/api/graphql#graphqlqueryqueryname-resolver `graphql.query()` API reference}
      */
     query: createScopedGraphQLHandler("query", "*"),
     /**
-     * Captures a GraphQL mutation by a given name.
+     * Intercepts a GraphQL mutation by its name.
+     *
      * @example
      * graphql.mutation('SavePost', () => {
      *   return HttpResponse.json({ data: { post: { id: 'abc-123 } } })
      * })
-     * @see {@link https://mswjs.io/docs/api/graphql/mutation `graphql.mutation()`}
+     *
+     * @see {@link https://mswjs.io/docs/api/graphql#graphqlmutationmutationname-resolver `graphql.query()` API reference}
+     *
      */
-    mutation: createScopedGraphQLHandler("mutation", "*")
+    mutation: createScopedGraphQLHandler("mutation", "*"),
+    /**
+     * Intercepts any GraphQL operation, regardless of its type or name.
+     *
+     * @example
+     * graphql.operation(() => {
+     *   return HttpResponse.json({ data: { name: 'John' } })
+     * })
+     *
+     * @see {@link https://mswjs.io/docs/api/graphql#graphloperationresolver `graphql.operation()` API reference}
+     */
+    operation: createGraphQLOperationHandler("*")
   };
   function createGraphQLLink(url) {
     return {
@@ -5518,6 +5642,15 @@ Consider naming this operation or using "graphql.operation()" request handler to
     };
   }
   var graphql = __spreadProps(__spreadValues({}, standardGraphQLHandlers), {
+    /**
+     * Intercepts GraphQL operations scoped by the given URL.
+     *
+     * @example
+     * const github = graphql.link('https://api.github.com/graphql')
+     * github.query('GetRepo', resolver)
+     *
+     * @see {@link https://mswjs.io/docs/api/graphql#graphqllinkurl `graphql.link()` API reference}
+     */
     link: createGraphQLLink
   });
 
@@ -5538,7 +5671,7 @@ Consider naming this operation or using "graphql.operation()" request handler to
     let matchingHandler = null;
     let result = null;
     for (const handler of handlers) {
-      result = yield handler.run(request, resolutionContext);
+      result = yield handler.run({ request, resolutionContext });
       if (result !== null) {
         matchingHandler = handler;
       }
@@ -5549,7 +5682,7 @@ Consider naming this operation or using "graphql.operation()" request handler to
     if (matchingHandler) {
       return {
         handler: matchingHandler,
-        parsedRequest: result == null ? void 0 : result.parsedResult,
+        parsedResult: result == null ? void 0 : result.parsedResult,
         response: result == null ? void 0 : result.response
       };
     }
@@ -5760,7 +5893,7 @@ ${handlers.map((handler) => `  \u2022 ${handler.info.header}`).join("\n")}`;
         const requestHeader = parsedGraphQLQuery ? getGraphQLRequestHeader(parsedGraphQLQuery) : `${request.method} ${publicUrl}`;
         const handlerSuggestion = generateHandlerSuggestion();
         const messageTemplate = [
-          `captured a request without a matching request handler:`,
+          `intercepted a request without a matching request handler:`,
           `  \u2022 ${requestHeader}`,
           handlerSuggestion,
           `If you still wish to intercept this unhandled request, please create a request handler for it.
@@ -6231,7 +6364,7 @@ Learn more about creating the Service Worker script: https://mswjs.io/docs/cli/i
               messageChannel.postMessage("NOT_FOUND");
             },
             onMockedResponse(_0, _1) {
-              return __async(this, arguments, function* (response, { handler, parsedRequest }) {
+              return __async(this, arguments, function* (response, { handler, parsedResult }) {
                 const responseClone = response.clone();
                 const responseInit = toResponseInit(response);
                 const responseStream = responseClone.body;
@@ -6246,7 +6379,11 @@ Learn more about creating the Service Worker script: https://mswjs.io/docs/cli/i
                 );
                 if (!options.quiet) {
                   context.emitter.once("response:mocked", ({ response: response2 }) => {
-                    handler.log(requestCloneForLogs, response2, parsedRequest);
+                    handler.log({
+                      request: requestCloneForLogs,
+                      response: response2,
+                      parsedResult
+                    });
                   });
                 }
               });
@@ -6289,9 +6426,9 @@ This exception has been gracefully handled as a 500 response, however, it's stro
       const { payload: actualChecksum } = yield context.events.once(
         "INTEGRITY_CHECK_RESPONSE"
       );
-      if (actualChecksum !== "3343a047c60712815551260184217eb5") {
+      if (actualChecksum !== "0877fcdc026242810f5bfde0d7178db4") {
         throw new Error(
-          `Currently active Service Worker (${actualChecksum}) is behind the latest published one (${"3343a047c60712815551260184217eb5"}).`
+          `Currently active Service Worker (${actualChecksum}) is behind the latest published one (${"0877fcdc026242810f5bfde0d7178db4"}).`
         );
       }
       return serviceWorker;
@@ -7760,10 +7897,14 @@ If this message still persists after updating, please report an issue: https://g
         options,
         context.emitter,
         {
-          onMockedResponse(_, { handler, parsedRequest }) {
+          onMockedResponse(_, { handler, parsedResult }) {
             if (!options.quiet) {
               context.emitter.once("response:mocked", ({ response: response2 }) => {
-                handler.log(requestCloneForLogs, response2, parsedRequest);
+                handler.log({
+                  request: requestCloneForLogs,
+                  response: response2,
+                  parsedResult
+                });
               });
             }
           }