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

package/lib/browser/index.js

@@ -220,9 +220,6 @@ var WorkerChannel = class {
   }
 };
 
-// src/browser/setupWorker/start/createRequestListener.ts
-var import_NetworkError = require("../core/NetworkError.js");
-
 // src/browser/utils/pruneGetRequestBody.ts
 function pruneGetRequestBody(request) {
   if (["HEAD", "GET"].includes(request.method)) {
@@ -285,13 +282,6 @@ var createRequestListener = (context, options) => {
         }
       );
     } catch (error) {
-      if (error instanceof import_NetworkError.NetworkError) {
-        messageChannel.postMessage("NETWORK_ERROR", {
-          name: error.name,
-          message: error.message
-        });
-        return;
-      }
       if (error instanceof Error) {
         import_devUtils4.devUtils.error(
           `Uncaught exception in the request handler for "%s %s":
@@ -327,9 +317,9 @@ function requestIntegrityCheck(context, serviceWorker) {
     const { payload: actualChecksum } = yield context.events.once(
       "INTEGRITY_CHECK_RESPONSE"
     );
-    if (actualChecksum !== "42fb047ce943b9103a6ed499f86548c4") {
+    if (actualChecksum !== "3343a047c60712815551260184217eb5") {
       throw new Error(
-        `Currently active Service Worker (${actualChecksum}) is behind the latest published one (${"42fb047ce943b9103a6ed499f86548c4"}).`
+        `Currently active Service Worker (${actualChecksum}) is behind the latest published one (${"3343a047c60712815551260184217eb5"}).`
       );
     }
     return serviceWorker;

package/lib/browser/index.mjs

@@ -196,9 +196,6 @@ var WorkerChannel = class {
   }
 };
 
-// src/browser/setupWorker/start/createRequestListener.ts
-import { NetworkError } from '../core/NetworkError.mjs';
-
 // src/browser/utils/pruneGetRequestBody.ts
 function pruneGetRequestBody(request) {
   if (["HEAD", "GET"].includes(request.method)) {
@@ -261,13 +258,6 @@ var createRequestListener = (context, options) => {
         }
       );
     } catch (error) {
-      if (error instanceof NetworkError) {
-        messageChannel.postMessage("NETWORK_ERROR", {
-          name: error.name,
-          message: error.message
-        });
-        return;
-      }
       if (error instanceof Error) {
         devUtils4.error(
           `Uncaught exception in the request handler for "%s %s":
@@ -303,9 +293,9 @@ function requestIntegrityCheck(context, serviceWorker) {
     const { payload: actualChecksum } = yield context.events.once(
       "INTEGRITY_CHECK_RESPONSE"
     );
-    if (actualChecksum !== "42fb047ce943b9103a6ed499f86548c4") {
+    if (actualChecksum !== "3343a047c60712815551260184217eb5") {
       throw new Error(
-        `Currently active Service Worker (${actualChecksum}) is behind the latest published one (${"42fb047ce943b9103a6ed499f86548c4"}).`
+        `Currently active Service Worker (${actualChecksum}) is behind the latest published one (${"3343a047c60712815551260184217eb5"}).`
       );
     }
     return serviceWorker;

package/lib/core/{GraphQLHandler-2e60cda6.d.ts → GraphQLHandler-ef45ae39.d.ts}

@@ -1,5 +1,5 @@
 import { OperationTypeNode, DocumentNode, GraphQLError } from 'graphql';
-import { g as RequestHandlerDefaultInfo, D as DefaultBodyType, R as RequestHandler, a as ResponseResolver } from './RequestHandler-e964183f.js';
+import { g as RequestHandlerDefaultInfo, D as DefaultBodyType, R as RequestHandler, a as ResponseResolver, f as RequestHandlerOptions } from './RequestHandler-7c716cf7.js';
 import { Path } from './utils/matching/matchRequestUrl.js';
 
 interface ParsedGraphQLQuery {
@@ -48,7 +48,7 @@ interface GraphQLResponseBody<BodyType extends DefaultBodyType> {
 declare function isDocumentNode(value: DocumentNode | any): value is DocumentNode;
 declare class GraphQLHandler extends RequestHandler<GraphQLHandlerInfo, ParsedGraphQLRequest, GraphQLResolverExtras<any>> {
     private endpoint;
-    constructor(operationType: ExpectedOperationTypeNode, operationName: GraphQLHandlerNameSelector, endpoint: Path, resolver: ResponseResolver<GraphQLResolverExtras<any>, any, any>);
+    constructor(operationType: ExpectedOperationTypeNode, operationName: GraphQLHandlerNameSelector, endpoint: Path, resolver: ResponseResolver<GraphQLResolverExtras<any>, any, any>, options?: RequestHandlerOptions);
     parse(request: Request): Promise<ParsedGraphQLRequest<GraphQLVariables>>;
     predicate(request: Request, parsedResult: ParsedGraphQLRequest): boolean;
     protected extendInfo(_request: Request, parsedResult: ParsedGraphQLRequest<GraphQLVariables>): {

package/lib/core/HttpResponse.d.ts

@@ -1,2 +1,2 @@
-export { e as HttpResponse, H as HttpResponseInit, S as StrictRequest, d as StrictResponse } from './RequestHandler-e964183f.js';
+export { e as HttpResponse, H as HttpResponseInit, S as StrictRequest, d as StrictResponse } from './RequestHandler-7c716cf7.js';
 import './typeUtils.js';

package/lib/core/{RequestHandler-e964183f.d.ts → RequestHandler-7c716cf7.d.ts}

@@ -11,7 +11,7 @@ interface ResponseResolutionContext {
 /**
  * Returns a mocked response for a given request using following request handlers.
  */
-declare const getResponse: <Handler extends RequestHandler<RequestHandlerDefaultInfo, any, any>[]>(request: Request, handlers: Handler, resolutionContext?: ResponseResolutionContext) => Promise<ResponseLookupResult | null>;
+declare const getResponse: <Handler extends RequestHandler<RequestHandlerDefaultInfo, any, any, RequestHandlerOptions>[]>(request: Request, handlers: Handler, resolutionContext?: ResponseResolutionContext) => Promise<ResponseLookupResult | null>;
 
 interface HttpResponseInit extends ResponseInit {
     type?: ResponseType;
@@ -90,11 +90,12 @@ type ResponseResolverInfo<ResolverExtraInfo extends Record<string, unknown>, Req
     request: StrictRequest<RequestBodyType>;
 } & ResolverExtraInfo;
 type ResponseResolver<ResolverExtraInfo extends Record<string, unknown> = Record<string, unknown>, RequestBodyType extends DefaultBodyType = DefaultBodyType, ResponseBodyType extends DefaultBodyType = undefined> = (info: ResponseResolverInfo<ResolverExtraInfo, RequestBodyType>) => AsyncResponseResolverReturnType<ResponseBodyType>;
-interface RequestHandlerOptions<HandlerInfo> extends RequestHandlerPublicOptions {
+interface RequestHandlerArgs<HandlerInfo, HandlerOptions extends RequestHandlerOptions> {
     info: HandlerInfo;
     resolver: ResponseResolver<any>;
+    options?: HandlerOptions;
 }
-interface RequestHandlerPublicOptions {
+interface RequestHandlerOptions {
     once?: boolean;
 }
 interface RequestHandlerExecutionResult<ParsedResult extends Record<string, unknown> | undefined> {
@@ -103,7 +104,7 @@ interface RequestHandlerExecutionResult<ParsedResult extends Record<string, unkn
     request: Request;
     response?: Response;
 }
-declare abstract class RequestHandler<HandlerInfo extends RequestHandlerDefaultInfo = RequestHandlerDefaultInfo, ParsedResult extends Record<string, any> | undefined = any, ResolverExtras extends Record<string, unknown> = any> {
+declare abstract class RequestHandler<HandlerInfo extends RequestHandlerDefaultInfo = RequestHandlerDefaultInfo, ParsedResult extends Record<string, any> | undefined = any, ResolverExtras extends Record<string, unknown> = any, HandlerOptions extends RequestHandlerOptions = RequestHandlerOptions> {
     info: HandlerInfo & RequestHandlerInternalInfo;
     /**
      * Indicates whether this request handler has been used
@@ -113,8 +114,8 @@ declare abstract class RequestHandler<HandlerInfo extends RequestHandlerDefaultI
     protected resolver: ResponseResolver<ResolverExtras, any, any>;
     private resolverGenerator?;
     private resolverGeneratorResult?;
-    private once;
-    constructor(options: RequestHandlerOptions<HandlerInfo>);
+    private options?;
+    constructor(args: RequestHandlerArgs<HandlerInfo, HandlerOptions>);
     /**
      * Determine if the captured request should be mocked.
      */
@@ -142,4 +143,4 @@ declare abstract class RequestHandler<HandlerInfo extends RequestHandlerDefaultI
     private createExecutionResult;
 }
 
-export { AsyncResponseResolverReturnType as A, DefaultBodyType as D, HttpResponseInit as H, MaybeAsyncResponseResolverReturnType as M, RequestHandler as R, StrictRequest as S, ResponseResolver as a, ResponseResolverReturnType as b, DefaultRequestMultipartBody as c, StrictResponse as d, HttpResponse as e, RequestHandlerPublicOptions as f, RequestHandlerDefaultInfo as g, ResponseLookupResult as h, ResponseResolutionContext as i, getResponse as j, RequestHandlerInternalInfo as k, ResponseResolverInfo as l, RequestHandlerOptions as m, RequestHandlerExecutionResult as n };
+export { AsyncResponseResolverReturnType as A, DefaultBodyType as D, HttpResponseInit as H, MaybeAsyncResponseResolverReturnType as M, RequestHandler as R, StrictRequest as S, ResponseResolver as a, ResponseResolverReturnType as b, DefaultRequestMultipartBody as c, StrictResponse as d, HttpResponse as e, RequestHandlerOptions as f, RequestHandlerDefaultInfo as g, ResponseLookupResult as h, ResponseResolutionContext as i, getResponse as j, RequestHandlerInternalInfo as k, ResponseResolverInfo as l, RequestHandlerArgs as m, RequestHandlerExecutionResult as n };

package/lib/core/SetupApi.d.ts

@@ -1,5 +1,5 @@
 import { EventMap, Emitter } from 'strict-event-emitter';
-import { R as RequestHandler, g as RequestHandlerDefaultInfo } from './RequestHandler-e964183f.js';
+import { R as RequestHandler, g as RequestHandlerDefaultInfo } from './RequestHandler-7c716cf7.js';
 import { LifeCycleEventEmitter } from './sharedOptions.js';
 import { Disposable } from './utils/internal/Disposable.js';
 import './typeUtils.js';

package/lib/core/bypass.d.ts

@@ -1,16 +1,14 @@
 type BypassRequestInput = string | URL | Request;
 /**
- * Derives request input and init from the given Request info
- * to define a request that will always be ignored by MSW.
+ * Creates a `Request` instance that will always be bypassed by MSW.
  *
  * @example
- * import fetch, { Request } from 'node-fetch'
  * import { bypass } from 'msw'
  *
- * fetch(...bypass('/resource'))
- * fetch(...bypass(new URL('/resource', 'https://example.com)))
- * fetch(...bypass(new Request('https://example.com/resource')))
+ * fetch(bypass('/resource'))
+ * fetch(bypass(new URL('/resource', 'https://example.com)))
+ * fetch(bypass(new Request('https://example.com/resource')))
  */
-declare function bypass(input: BypassRequestInput, init?: RequestInit): Promise<[string, RequestInit]>;
+declare function bypass(input: BypassRequestInput, init?: RequestInit): Request;
 
 export { BypassRequestInput, bypass };

package/lib/core/bypass.js

@@ -16,79 +16,21 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var bypass_exports = {};
 __export(bypass_exports, {
   bypass: () => bypass
 });
 module.exports = __toCommonJS(bypass_exports);
 var import_outvariant = require("outvariant");
-var import_headers_polyfill = require("headers-polyfill");
 function bypass(input, init) {
-  return __async(this, null, function* () {
-    if (isRequest(input)) {
-      (0, import_outvariant.invariant)(
-        !input.bodyUsed,
-        'Failed to create a bypassed request to "%s %s": given request instance already has its body read. Make sure to clone the intercepted request if you wish to read its body before bypassing it.',
-        input.method,
-        input.url
-      );
-    }
-    const url = isRequest(input) ? input.url : input.toString();
-    const resolvedInit = typeof init !== "undefined" ? init : yield getRequestInit(input);
-    const headers = new import_headers_polyfill.Headers(resolvedInit.headers);
-    headers.set("x-msw-intention", "bypass");
-    resolvedInit.headers = headers;
-    return [url, resolvedInit];
-  });
-}
-function isRequest(input) {
-  return typeof input === "object" && input.constructor.name === "Request" && "clone" in input && typeof input.clone === "function";
-}
-function getRequestInit(input) {
-  return __async(this, null, function* () {
-    if (!isRequest(input)) {
-      return {};
-    }
-    const init = {
-      // Set each request init property explicitly
-      // to prevent leaking internal properties of whichever
-      // Request polyfill provided as the input.
-      mode: input.mode,
-      method: input.method,
-      cache: input.cache,
-      headers: input.headers,
-      credentials: input.credentials,
-      signal: input.signal,
-      referrerPolicy: input.referrerPolicy,
-      referrer: input.referrer,
-      redirect: input.redirect,
-      integrity: input.integrity,
-      keepalive: input.keepalive
-    };
-    if (init.method !== "HEAD" && input.method !== "GET") {
-      init.body = yield input.clone().arrayBuffer();
-      init.duplex = input.duplex;
-    }
-    return init;
-  });
+  const request = input instanceof Request ? input : new Request(input, init);
+  (0, import_outvariant.invariant)(
+    !request.bodyUsed,
+    'Failed to create a bypassed request to "%s %s": given request instance already has its body read. Make sure to clone the intercepted request if you wish to read its body before bypassing it.',
+    request.method,
+    request.url
+  );
+  const requestClone = request.clone();
+  requestClone.headers.set("x-msw-intention", "bypass");
+  return requestClone;
 }

package/lib/core/bypass.mjs

@@ -1,73 +1,15 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 import { invariant } from "outvariant";
-import { Headers } from "headers-polyfill";
 function bypass(input, init) {
-  return __async(this, null, function* () {
-    if (isRequest(input)) {
-      invariant(
-        !input.bodyUsed,
-        'Failed to create a bypassed request to "%s %s": given request instance already has its body read. Make sure to clone the intercepted request if you wish to read its body before bypassing it.',
-        input.method,
-        input.url
-      );
-    }
-    const url = isRequest(input) ? input.url : input.toString();
-    const resolvedInit = typeof init !== "undefined" ? init : yield getRequestInit(input);
-    const headers = new Headers(resolvedInit.headers);
-    headers.set("x-msw-intention", "bypass");
-    resolvedInit.headers = headers;
-    return [url, resolvedInit];
-  });
-}
-function isRequest(input) {
-  return typeof input === "object" && input.constructor.name === "Request" && "clone" in input && typeof input.clone === "function";
-}
-function getRequestInit(input) {
-  return __async(this, null, function* () {
-    if (!isRequest(input)) {
-      return {};
-    }
-    const init = {
-      // Set each request init property explicitly
-      // to prevent leaking internal properties of whichever
-      // Request polyfill provided as the input.
-      mode: input.mode,
-      method: input.method,
-      cache: input.cache,
-      headers: input.headers,
-      credentials: input.credentials,
-      signal: input.signal,
-      referrerPolicy: input.referrerPolicy,
-      referrer: input.referrer,
-      redirect: input.redirect,
-      integrity: input.integrity,
-      keepalive: input.keepalive
-    };
-    if (init.method !== "HEAD" && input.method !== "GET") {
-      init.body = yield input.clone().arrayBuffer();
-      init.duplex = input.duplex;
-    }
-    return init;
-  });
+  const request = input instanceof Request ? input : new Request(input, init);
+  invariant(
+    !request.bodyUsed,
+    'Failed to create a bypassed request to "%s %s": given request instance already has its body read. Make sure to clone the intercepted request if you wish to read its body before bypassing it.',
+    request.method,
+    request.url
+  );
+  const requestClone = request.clone();
+  requestClone.headers.set("x-msw-intention", "bypass");
+  return requestClone;
 }
 export {
   bypass

package/lib/core/graphql.d.ts

@@ -1,6 +1,6 @@
 import { DocumentNode } from 'graphql';
-import { a as ResponseResolver } from './RequestHandler-e964183f.js';
-import { a as GraphQLVariables, d as GraphQLResolverExtras, e as GraphQLResponseBody, G as GraphQLHandler, f as GraphQLHandlerNameSelector } from './GraphQLHandler-2e60cda6.js';
+import { a as ResponseResolver, f as RequestHandlerOptions } from './RequestHandler-7c716cf7.js';
+import { a as GraphQLVariables, d as GraphQLResolverExtras, e as GraphQLResponseBody, G as GraphQLHandler, f as GraphQLHandlerNameSelector } from './GraphQLHandler-ef45ae39.js';
 import { Path } from './utils/matching/matchRequestUrl.js';
 import './typeUtils.js';
 
@@ -31,7 +31,7 @@ declare const standardGraphQLHandlers: {
      * })
      * @see {@link https://mswjs.io/docs/api/graphql/query `graphql.query()`}
      */
-    query: <Query_1 extends Record<string, any>, Variables_1 extends GraphQLVariables = GraphQLVariables>(operationName: GraphQLHandlerNameSelector | TypedDocumentNode<Query_1, Variables_1>, resolver: ResponseResolver<GraphQLResolverExtras<Variables_1>, null, GraphQLResponseBody<Query_1>>) => GraphQLHandler;
+    query: <Query_1 extends Record<string, any>, Variables_1 extends GraphQLVariables = GraphQLVariables>(operationName: GraphQLHandlerNameSelector | TypedDocumentNode<Query_1, Variables_1>, resolver: ResponseResolver<GraphQLResolverExtras<Variables_1>, null, GraphQLResponseBody<Query_1>>, options?: RequestHandlerOptions) => GraphQLHandler;
     /**
      * Captures a GraphQL mutation by a given name.
      * @example
@@ -40,7 +40,7 @@ declare const standardGraphQLHandlers: {
      * })
      * @see {@link https://mswjs.io/docs/api/graphql/mutation `graphql.mutation()`}
      */
-    mutation: <Query_1 extends Record<string, any>, Variables_1 extends GraphQLVariables = GraphQLVariables>(operationName: GraphQLHandlerNameSelector | TypedDocumentNode<Query_1, Variables_1>, resolver: ResponseResolver<GraphQLResolverExtras<Variables_1>, null, GraphQLResponseBody<Query_1>>) => GraphQLHandler;
+    mutation: <Query_1 extends Record<string, any>, Variables_1 extends GraphQLVariables = GraphQLVariables>(operationName: GraphQLHandlerNameSelector | TypedDocumentNode<Query_1, Variables_1>, resolver: ResponseResolver<GraphQLResolverExtras<Variables_1>, null, GraphQLResponseBody<Query_1>>, options?: RequestHandlerOptions) => GraphQLHandler;
 };
 declare function createGraphQLLink(url: Path): typeof standardGraphQLHandlers;
 declare const graphql: {
@@ -62,7 +62,7 @@ declare const graphql: {
      * })
      * @see {@link https://mswjs.io/docs/api/graphql/query `graphql.query()`}
      */
-    query: <Query_1 extends Record<string, any>, Variables_1 extends GraphQLVariables = GraphQLVariables>(operationName: GraphQLHandlerNameSelector | TypedDocumentNode<Query_1, Variables_1>, resolver: ResponseResolver<GraphQLResolverExtras<Variables_1>, null, GraphQLResponseBody<Query_1>>) => GraphQLHandler;
+    query: <Query_1 extends Record<string, any>, Variables_1 extends GraphQLVariables = GraphQLVariables>(operationName: GraphQLHandlerNameSelector | TypedDocumentNode<Query_1, Variables_1>, resolver: ResponseResolver<GraphQLResolverExtras<Variables_1>, null, GraphQLResponseBody<Query_1>>, options?: RequestHandlerOptions) => GraphQLHandler;
     /**
      * Captures a GraphQL mutation by a given name.
      * @example
@@ -71,7 +71,7 @@ declare const graphql: {
      * })
      * @see {@link https://mswjs.io/docs/api/graphql/mutation `graphql.mutation()`}
      */
-    mutation: <Query_1 extends Record<string, any>, Variables_1 extends GraphQLVariables = GraphQLVariables>(operationName: GraphQLHandlerNameSelector | TypedDocumentNode<Query_1, Variables_1>, resolver: ResponseResolver<GraphQLResolverExtras<Variables_1>, null, GraphQLResponseBody<Query_1>>) => GraphQLHandler;
+    mutation: <Query_1 extends Record<string, any>, Variables_1 extends GraphQLVariables = GraphQLVariables>(operationName: GraphQLHandlerNameSelector | TypedDocumentNode<Query_1, Variables_1>, resolver: ResponseResolver<GraphQLResolverExtras<Variables_1>, null, GraphQLResponseBody<Query_1>>, options?: RequestHandlerOptions) => GraphQLHandler;
 };
 
 export { TypedDocumentNode, graphql };

package/lib/core/graphql.js

@@ -40,8 +40,14 @@ __export(graphql_exports, {
 module.exports = __toCommonJS(graphql_exports);
 var import_GraphQLHandler = require("./handlers/GraphQLHandler.js");
 function createScopedGraphQLHandler(operationType, url) {
-  return (operationName, resolver) => {
-    return new import_GraphQLHandler.GraphQLHandler(operationType, operationName, url, resolver);
+  return (operationName, resolver, options = {}) => {
+    return new import_GraphQLHandler.GraphQLHandler(
+      operationType,
+      operationName,
+      url,
+      resolver,
+      options
+    );
   };
 }
 function createGraphQLOperationHandler(url) {

package/lib/core/graphql.mjs

@@ -21,8 +21,14 @@ import {
   GraphQLHandler
 } from './handlers/GraphQLHandler.mjs';
 function createScopedGraphQLHandler(operationType, url) {
-  return (operationName, resolver) => {
-    return new GraphQLHandler(operationType, operationName, url, resolver);
+  return (operationName, resolver, options = {}) => {
+    return new GraphQLHandler(
+      operationType,
+      operationName,
+      url,
+      resolver,
+      options
+    );
   };
 }
 function createGraphQLOperationHandler(url) {

package/lib/core/handlers/GraphQLHandler.d.ts

@@ -1,5 +1,5 @@
 import 'graphql';
-import '../RequestHandler-e964183f.js';
+import '../RequestHandler-7c716cf7.js';
 import '../utils/matching/matchRequestUrl.js';
-export { E as ExpectedOperationTypeNode, G as GraphQLHandler, k as GraphQLHandlerInfo, f as GraphQLHandlerNameSelector, c as GraphQLJsonRequestBody, b as GraphQLRequestBody, d as GraphQLResolverExtras, e as GraphQLResponseBody, a as GraphQLVariables, l as isDocumentNode } from '../GraphQLHandler-2e60cda6.js';
+export { E as ExpectedOperationTypeNode, G as GraphQLHandler, k as GraphQLHandlerInfo, f as GraphQLHandlerNameSelector, c as GraphQLJsonRequestBody, b as GraphQLRequestBody, d as GraphQLResolverExtras, e as GraphQLResponseBody, a as GraphQLVariables, l as isDocumentNode } from '../GraphQLHandler-ef45ae39.js';
 import '../typeUtils.js';

package/lib/core/handlers/GraphQLHandler.js

@@ -58,7 +58,7 @@ function isDocumentNode(value) {
   return typeof value === "object" && "kind" in value && "definitions" in value;
 }
 class GraphQLHandler extends import_RequestHandler.RequestHandler {
-  constructor(operationType, operationName, endpoint, resolver) {
+  constructor(operationType, operationName, endpoint, resolver, options) {
     let resolvedOperationName = operationName;
     if (isDocumentNode(operationName)) {
       const parsedNode = (0, import_parseGraphQLRequest.parseDocumentNode)(operationName);
@@ -81,7 +81,8 @@ class GraphQLHandler extends import_RequestHandler.RequestHandler {
         operationType,
         operationName: resolvedOperationName
       },
-      resolver
+      resolver,
+      options
     });
     this.endpoint = endpoint;
   }

package/lib/core/handlers/GraphQLHandler.mjs

@@ -39,7 +39,7 @@ function isDocumentNode(value) {
   return typeof value === "object" && "kind" in value && "definitions" in value;
 }
 class GraphQLHandler extends RequestHandler {
-  constructor(operationType, operationName, endpoint, resolver) {
+  constructor(operationType, operationName, endpoint, resolver, options) {
     let resolvedOperationName = operationName;
     if (isDocumentNode(operationName)) {
       const parsedNode = parseDocumentNode(operationName);
@@ -62,7 +62,8 @@ class GraphQLHandler extends RequestHandler {
         operationType,
         operationName: resolvedOperationName
       },
-      resolver
+      resolver,
+      options
     });
     this.endpoint = endpoint;
   }

package/lib/core/handlers/HttpHandler.d.ts

@@ -1,4 +1,4 @@
-import { g as RequestHandlerDefaultInfo, R as RequestHandler, a as ResponseResolver, f as RequestHandlerPublicOptions, i as ResponseResolutionContext } from '../RequestHandler-e964183f.js';
+import { g as RequestHandlerDefaultInfo, R as RequestHandler, a as ResponseResolver, f as RequestHandlerOptions, i as ResponseResolutionContext } from '../RequestHandler-7c716cf7.js';
 import { Path, Match, PathParams } from '../utils/matching/matchRequestUrl.js';
 import '../typeUtils.js';
 
@@ -32,7 +32,7 @@ type HttpRequestResolverExtras<Params extends PathParams> = {
  * Provides request matching based on method and URL.
  */
 declare class HttpHandler extends RequestHandler<HttpHandlerInfo, HttpRequestParsedResult, HttpRequestResolverExtras<any>> {
-    constructor(method: HttpHandlerMethod, path: Path, resolver: ResponseResolver<HttpRequestResolverExtras<any>, any, any>, options?: RequestHandlerPublicOptions);
+    constructor(method: HttpHandlerMethod, path: Path, resolver: ResponseResolver<HttpRequestResolverExtras<any>, any, any>, options?: RequestHandlerOptions);
     private checkRedundantQueryParameters;
     parse(request: Request, resolutionContext?: ResponseResolutionContext): Promise<{
         match: Match;

package/lib/core/handlers/HttpHandler.js

@@ -72,7 +72,7 @@ class HttpHandler extends import_RequestHandler.RequestHandler {
         method
       },
       resolver,
-      once: options == null ? void 0 : options.once
+      options
     });
     this.checkRedundantQueryParameters();
   }

package/lib/core/handlers/HttpHandler.mjs

@@ -52,7 +52,7 @@ class HttpHandler extends RequestHandler {
         method
       },
       resolver,
-      once: options == null ? void 0 : options.once
+      options
     });
     this.checkRedundantQueryParameters();
   }

package/lib/core/handlers/RequestHandler.d.ts

@@ -1,2 +1,2 @@
-export { A as AsyncResponseResolverReturnType, D as DefaultBodyType, c as DefaultRequestMultipartBody, M as MaybeAsyncResponseResolverReturnType, R as RequestHandler, g as RequestHandlerDefaultInfo, n as RequestHandlerExecutionResult, k as RequestHandlerInternalInfo, m as RequestHandlerOptions, f as RequestHandlerPublicOptions, a as ResponseResolver, l as ResponseResolverInfo, b as ResponseResolverReturnType } from '../RequestHandler-e964183f.js';
+export { A as AsyncResponseResolverReturnType, D as DefaultBodyType, c as DefaultRequestMultipartBody, M as MaybeAsyncResponseResolverReturnType, R as RequestHandler, m as RequestHandlerArgs, g as RequestHandlerDefaultInfo, n as RequestHandlerExecutionResult, k as RequestHandlerInternalInfo, f as RequestHandlerOptions, a as ResponseResolver, l as ResponseResolverInfo, b as ResponseResolverReturnType } from '../RequestHandler-7c716cf7.js';
 import '../typeUtils.js';

package/lib/core/handlers/RequestHandler.js

@@ -62,11 +62,11 @@ var import_outvariant = require("outvariant");
 var import_getCallFrame = require("../utils/internal/getCallFrame.js");
 var import_isIterable = require("../utils/internal/isIterable.js");
 class RequestHandler {
-  constructor(options) {
-    this.resolver = options.resolver;
-    this.once = options.once || false;
+  constructor(args) {
+    this.resolver = args.resolver;
+    this.options = args.options;
     const callFrame = (0, import_getCallFrame.getCallFrame)(new Error());
-    this.info = __spreadProps(__spreadValues({}, options.info), {
+    this.info = __spreadProps(__spreadValues({}, args.info), {
       callFrame
     });
     this.isUsed = false;
@@ -101,7 +101,8 @@ class RequestHandler {
    */
   run(request, resolutionContext) {
     return __async(this, null, function* () {
-      if (this.isUsed && this.once) {
+      var _a;
+      if (this.isUsed && ((_a = this.options) == null ? void 0 : _a.once)) {
         return null;
       }
       const mainRequestRef = request.clone();

package/lib/core/handlers/RequestHandler.mjs

@@ -41,11 +41,11 @@ import { invariant } from "outvariant";
 import { getCallFrame } from '../utils/internal/getCallFrame.mjs';
 import { isIterable } from '../utils/internal/isIterable.mjs';
 class RequestHandler {
-  constructor(options) {
-    this.resolver = options.resolver;
-    this.once = options.once || false;
+  constructor(args) {
+    this.resolver = args.resolver;
+    this.options = args.options;
     const callFrame = getCallFrame(new Error());
-    this.info = __spreadProps(__spreadValues({}, options.info), {
+    this.info = __spreadProps(__spreadValues({}, args.info), {
       callFrame
     });
     this.isUsed = false;
@@ -80,7 +80,8 @@ class RequestHandler {
    */
   run(request, resolutionContext) {
     return __async(this, null, function* () {
-      if (this.isUsed && this.once) {
+      var _a;
+      if (this.isUsed && ((_a = this.options) == null ? void 0 : _a.once)) {
         return null;
       }
       const mainRequestRef = request.clone();

package/lib/core/http.d.ts

@@ -1,17 +1,17 @@
-import { D as DefaultBodyType, a as ResponseResolver, f as RequestHandlerPublicOptions } from './RequestHandler-e964183f.js';
+import { D as DefaultBodyType, a as ResponseResolver, f as RequestHandlerOptions } from './RequestHandler-7c716cf7.js';
 import { HttpRequestResolverExtras, HttpHandler } from './handlers/HttpHandler.js';
 import { PathParams, Path } from './utils/matching/matchRequestUrl.js';
 import './typeUtils.js';
 
 declare const http: {
-    all: <Params extends PathParams<keyof Params> = PathParams, RequestBodyType extends DefaultBodyType = DefaultBodyType, ResponseBodyType extends DefaultBodyType = undefined>(path: Path, resolver: ResponseResolver<HttpRequestResolverExtras<Params>, RequestBodyType, ResponseBodyType>, options?: RequestHandlerPublicOptions) => HttpHandler;
-    head: <Params_1 extends PathParams<keyof Params_1> = PathParams, RequestBodyType_1 extends DefaultBodyType = DefaultBodyType, ResponseBodyType_1 extends DefaultBodyType = undefined>(path: Path, resolver: ResponseResolver<HttpRequestResolverExtras<Params_1>, RequestBodyType_1, ResponseBodyType_1>, options?: RequestHandlerPublicOptions) => HttpHandler;
-    get: <Params_2 extends PathParams<keyof Params_2> = PathParams, RequestBodyType_2 extends DefaultBodyType = DefaultBodyType, ResponseBodyType_2 extends DefaultBodyType = undefined>(path: Path, resolver: ResponseResolver<HttpRequestResolverExtras<Params_2>, RequestBodyType_2, ResponseBodyType_2>, options?: RequestHandlerPublicOptions) => HttpHandler;
-    post: <Params_3 extends PathParams<keyof Params_3> = PathParams, RequestBodyType_3 extends DefaultBodyType = DefaultBodyType, ResponseBodyType_3 extends DefaultBodyType = undefined>(path: Path, resolver: ResponseResolver<HttpRequestResolverExtras<Params_3>, RequestBodyType_3, ResponseBodyType_3>, options?: RequestHandlerPublicOptions) => HttpHandler;
-    put: <Params_4 extends PathParams<keyof Params_4> = PathParams, RequestBodyType_4 extends DefaultBodyType = DefaultBodyType, ResponseBodyType_4 extends DefaultBodyType = undefined>(path: Path, resolver: ResponseResolver<HttpRequestResolverExtras<Params_4>, RequestBodyType_4, ResponseBodyType_4>, options?: RequestHandlerPublicOptions) => HttpHandler;
-    delete: <Params_5 extends PathParams<keyof Params_5> = PathParams, RequestBodyType_5 extends DefaultBodyType = DefaultBodyType, ResponseBodyType_5 extends DefaultBodyType = undefined>(path: Path, resolver: ResponseResolver<HttpRequestResolverExtras<Params_5>, RequestBodyType_5, ResponseBodyType_5>, options?: RequestHandlerPublicOptions) => HttpHandler;
-    patch: <Params_6 extends PathParams<keyof Params_6> = PathParams, RequestBodyType_6 extends DefaultBodyType = DefaultBodyType, ResponseBodyType_6 extends DefaultBodyType = undefined>(path: Path, resolver: ResponseResolver<HttpRequestResolverExtras<Params_6>, RequestBodyType_6, ResponseBodyType_6>, options?: RequestHandlerPublicOptions) => HttpHandler;
-    options: <Params_7 extends PathParams<keyof Params_7> = PathParams, RequestBodyType_7 extends DefaultBodyType = DefaultBodyType, ResponseBodyType_7 extends DefaultBodyType = undefined>(path: Path, resolver: ResponseResolver<HttpRequestResolverExtras<Params_7>, RequestBodyType_7, ResponseBodyType_7>, options?: RequestHandlerPublicOptions) => HttpHandler;
+    all: <Params extends PathParams<keyof Params> = PathParams, RequestBodyType extends DefaultBodyType = DefaultBodyType, ResponseBodyType extends DefaultBodyType = undefined>(path: Path, resolver: ResponseResolver<HttpRequestResolverExtras<Params>, RequestBodyType, ResponseBodyType>, options?: RequestHandlerOptions) => HttpHandler;
+    head: <Params_1 extends PathParams<keyof Params_1> = PathParams, RequestBodyType_1 extends DefaultBodyType = DefaultBodyType, ResponseBodyType_1 extends DefaultBodyType = undefined>(path: Path, resolver: ResponseResolver<HttpRequestResolverExtras<Params_1>, RequestBodyType_1, ResponseBodyType_1>, options?: RequestHandlerOptions) => HttpHandler;
+    get: <Params_2 extends PathParams<keyof Params_2> = PathParams, RequestBodyType_2 extends DefaultBodyType = DefaultBodyType, ResponseBodyType_2 extends DefaultBodyType = undefined>(path: Path, resolver: ResponseResolver<HttpRequestResolverExtras<Params_2>, RequestBodyType_2, ResponseBodyType_2>, options?: RequestHandlerOptions) => HttpHandler;
+    post: <Params_3 extends PathParams<keyof Params_3> = PathParams, RequestBodyType_3 extends DefaultBodyType = DefaultBodyType, ResponseBodyType_3 extends DefaultBodyType = undefined>(path: Path, resolver: ResponseResolver<HttpRequestResolverExtras<Params_3>, RequestBodyType_3, ResponseBodyType_3>, options?: RequestHandlerOptions) => HttpHandler;
+    put: <Params_4 extends PathParams<keyof Params_4> = PathParams, RequestBodyType_4 extends DefaultBodyType = DefaultBodyType, ResponseBodyType_4 extends DefaultBodyType = undefined>(path: Path, resolver: ResponseResolver<HttpRequestResolverExtras<Params_4>, RequestBodyType_4, ResponseBodyType_4>, options?: RequestHandlerOptions) => HttpHandler;
+    delete: <Params_5 extends PathParams<keyof Params_5> = PathParams, RequestBodyType_5 extends DefaultBodyType = DefaultBodyType, ResponseBodyType_5 extends DefaultBodyType = undefined>(path: Path, resolver: ResponseResolver<HttpRequestResolverExtras<Params_5>, RequestBodyType_5, ResponseBodyType_5>, options?: RequestHandlerOptions) => HttpHandler;
+    patch: <Params_6 extends PathParams<keyof Params_6> = PathParams, RequestBodyType_6 extends DefaultBodyType = DefaultBodyType, ResponseBodyType_6 extends DefaultBodyType = undefined>(path: Path, resolver: ResponseResolver<HttpRequestResolverExtras<Params_6>, RequestBodyType_6, ResponseBodyType_6>, options?: RequestHandlerOptions) => HttpHandler;
+    options: <Params_7 extends PathParams<keyof Params_7> = PathParams, RequestBodyType_7 extends DefaultBodyType = DefaultBodyType, ResponseBodyType_7 extends DefaultBodyType = undefined>(path: Path, resolver: ResponseResolver<HttpRequestResolverExtras<Params_7>, RequestBodyType_7, ResponseBodyType_7>, options?: RequestHandlerOptions) => HttpHandler;
 };
 
 export { http };

package/lib/core/index.d.ts

@@ -1,9 +1,9 @@
 export { SetupApi } from './SetupApi.js';
-export { A as AsyncResponseResolverReturnType, D as DefaultBodyType, c as DefaultRequestMultipartBody, e as HttpResponse, H as HttpResponseInit, R as RequestHandler, a as ResponseResolver, b as ResponseResolverReturnType, S as StrictRequest, d as StrictResponse } from './RequestHandler-e964183f.js';
+export { A as AsyncResponseResolverReturnType, D as DefaultBodyType, c as DefaultRequestMultipartBody, e as HttpResponse, H as HttpResponseInit, R as RequestHandler, a as ResponseResolver, b as ResponseResolverReturnType, S as StrictRequest, d as StrictResponse } from './RequestHandler-7c716cf7.js';
 export { http } from './http.js';
 export { HttpHandler, HttpMethods, HttpRequestParsedResult, RequestQuery } from './handlers/HttpHandler.js';
 export { graphql } from './graphql.js';
-export { G as GraphQLHandler, c as GraphQLJsonRequestBody, b as GraphQLRequestBody, a as GraphQLVariables, P as ParsedGraphQLRequest } from './GraphQLHandler-2e60cda6.js';
+export { G as GraphQLHandler, c as GraphQLJsonRequestBody, b as GraphQLRequestBody, a as GraphQLVariables, P as ParsedGraphQLRequest } from './GraphQLHandler-ef45ae39.js';
 export { Match, Path, PathParams, matchRequestUrl } from './utils/matching/matchRequestUrl.js';
 export { HandleRequestOptions, handleRequest } from './utils/handleRequest.js';
 export { cleanUrl } from './utils/url/cleanUrl.js';
@@ -11,7 +11,6 @@ export { LifeCycleEventsMap, SharedOptions } from './sharedOptions.js';
 export { DelayMode, MAX_SERVER_RESPONSE_TIME, MIN_SERVER_RESPONSE_TIME, NODE_SERVER_RESPONSE_TIME, SET_TIMEOUT_MAX_ALLOWED_INT, delay } from './delay.js';
 export { bypass } from './bypass.js';
 export { passthrough } from './passthrough.js';
-export { NetworkError } from './NetworkError.js';
 import 'strict-event-emitter';
 import './utils/internal/Disposable.js';
 import './typeUtils.js';