msw 0.0.0-fetch.rc-14 → 0.0.0-fetch.rc-16

package/README.md

@@ -71,12 +71,12 @@ In-browser usage is what sets Mock Service Worker apart from other tools. Utiliz
 ```js
 // src/mocks.js
 // 1. Import the library.
-import { rest, HttpResponse } from 'msw'
+import { http, HttpResponse } from 'msw'
 import { setupWorker } from 'msw/browser'
 
 // 2. Describe network behavior with request handlers.
 const worker = setupWorker(
-  rest.get('https://github.com/octocat', ({ request, params, cookies }) => {
+  http.get('https://github.com/octocat', ({ request, params, cookies }) => {
     return HttpResponse.json(
       {
         message: 'Mocked response',
@@ -121,7 +121,7 @@ Take a look at the example of an integration test in Jest that uses [React Testi
 // test/Dashboard.test.js
 
 import React from 'react'
-import { rest, HttpResponse } from 'msw'
+import { http, HttpResponse } from 'msw'
 import { setupServer } from 'msw/node'
 import { render, screen, waitFor } from '@testing-library/react'
 import Dashboard from '../src/components/Dashboard'
@@ -130,7 +130,7 @@ const server = setupServer(
   // Describe network behavior with request handlers.
   // Tip: move the handlers into their own module and
   // import it across your browser and Node.js setups!
-  rest.get('/posts', ({ request, params, cookies }) => {
+  http.get('/posts', ({ request, params, cookies }) => {
     return HttpResponse.json([
       {
         id: 'f8dd058f-9006-4174-8d49-e3086bc39c21',
@@ -193,12 +193,18 @@ Mock Service Worker is trusted by hundreds of thousands of engineers around the
 
 <br />
 
-<a href="https://www.github.com/" target="_blank">
-  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="media/sponsors/github-light.svg" />
-    <img src="media/sponsors/github.svg" alt="GitHub" width="75" />
-  </picture>
-</a>
+<table>
+  <tr>
+    <td>
+      <a href="https://www.github.com/" target="_blank">
+        <picture>
+          <source media="(prefers-color-scheme: dark)" srcset="media/sponsors/github-light.svg" />
+          <img src="media/sponsors/github.svg" alt="GitHub" width="75" />
+        </picture>
+      </a>
+    </td>
+  </tr>
+</table>
 
 ### Silver Sponsors
 
@@ -229,6 +235,18 @@ Mock Service Worker is trusted by hundreds of thousands of engineers around the
 >
 > **Learn more on our [GitHub Sponsors profile](https://github.com/sponsors/mswjs)**.
 
+<br />
+
+<table>
+  <tr>
+    <td>
+      <a href="https://materialize.com/" target="_blank">
+        <img src="media/sponsors/materialize.svg" alt="Materialize" width="75" />
+      </a>
+    </td>
+  </tr>
+</table>
+
 ## Awards & Mentions
 
 We've been extremely humbled to receive awards and mentions from the community for all the innovation and reach Mock Service Worker brings to the JavaScript ecosystem.

package/lib/browser/index.d.ts

@@ -68,11 +68,6 @@ interface SetupWorker {
      * @see {@link https://mswjs.io/docs/api/setup-worker/list-handlers `worker.listHandlers()`}
      */
     listHandlers(): ReadonlyArray<RequestHandler<RequestHandlerDefaultInfo, any>>;
-    /**
-     * Lists all active request handlers.
-     * @see {@link https://mswjs.io/docs/api/setup-worker/print-handlers `worker.printHandlers()`}
-     */
-    printHandlers: () => void;
     events: LifeCycleEventEmitter<LifeCycleEventsMap>;
 }
 
@@ -84,7 +79,6 @@ declare class SetupWorkerApi extends SetupApi<LifeCycleEventsMap> implements Set
     constructor(...handlers: Array<RequestHandler>);
     private createWorkerContext;
     start(options?: StartOptions): StartReturnType;
-    printHandlers(): void;
     stop(): void;
 }
 /**

package/lib/browser/index.js

@@ -276,7 +276,7 @@ var createRequestListener = (context, options) => {
                 responseStream ? [responseStream] : void 0
               );
               if (!options.quiet) {
-                context.emitter.once("response:mocked", (response2) => {
+                context.emitter.once("response:mocked", ({ response: response2 }) => {
                   handler.log(requestCloneForLogs, response2, parsedRequest);
                 });
               }
@@ -327,9 +327,9 @@ function requestIntegrityCheck(context, serviceWorker) {
     const { payload: actualChecksum } = yield context.events.once(
       "INTEGRITY_CHECK_RESPONSE"
     );
-    if (actualChecksum !== "b24acb1451c726c44a3a37a0b8092d67") {
+    if (actualChecksum !== "42fb047ce943b9103a6ed499f86548c4") {
       throw new Error(
-        `Currently active Service Worker (${actualChecksum}) is behind the latest published one (${"b24acb1451c726c44a3a37a0b8092d67"}).`
+        `Currently active Service Worker (${actualChecksum}) is behind the latest published one (${"42fb047ce943b9103a6ed499f86548c4"}).`
       );
     }
     return serviceWorker;
@@ -362,27 +362,19 @@ function createResponseListener(context) {
     if ((_a = responseJson.type) == null ? void 0 : _a.includes("opaque")) {
       return;
     }
-    const response = new Response(responseJson.body, responseJson);
-    const isMockedResponse = response.headers.get("x-powered-by") === "msw";
-    if (isMockedResponse) {
-      context.emitter.emit(
-        "response:mocked",
+    const response = responseJson.status === 0 ? Response.error() : new Response(responseJson.body, responseJson);
+    context.emitter.emit(
+      responseJson.isMockedResponse ? "response:mocked" : "response:bypass",
+      {
         response,
         /**
          * @todo @fixme In this context, we don't know anything about
          * the request.
          */
-        null,
-        responseJson.requestId
-      );
-    } else {
-      context.emitter.emit(
-        "response:bypass",
-        response,
-        null,
-        responseJson.requestId
-      );
-    }
+        request: null,
+        requestId: responseJson.requestId
+      }
+    );
   };
 }
 
@@ -544,7 +536,7 @@ function createFallbackRequestListener(context, options) {
     name: "fallback",
     interceptors: [new import_fetch.FetchInterceptor(), new import_XMLHttpRequest.XMLHttpRequestInterceptor()]
   });
-  interceptor.on("request", (request, requestId) => __async(this, null, function* () {
+  interceptor.on("request", (_0) => __async(this, [_0], function* ({ request, requestId }) {
     const requestCloneForLogs = request.clone();
     const response = yield (0, import_handleRequest2.handleRequest)(
       request,
@@ -555,7 +547,7 @@ function createFallbackRequestListener(context, options) {
       {
         onMockedResponse(_, { handler, parsedRequest }) {
           if (!options.quiet) {
-            context.emitter.once("response:mocked", (response2) => {
+            context.emitter.once("response:mocked", ({ response: response2 }) => {
               handler.log(requestCloneForLogs, response2, parsedRequest);
             });
           }
@@ -566,13 +558,19 @@ function createFallbackRequestListener(context, options) {
       request.respondWith(response);
     }
   }));
-  interceptor.on("response", (response, request, requestId) => {
-    if (response.headers.get("x-powered-by") === "msw") {
-      context.emitter.emit("response:mocked", response, request, requestId);
-    } else {
-      context.emitter.emit("response:bypass", response, request, requestId);
+  interceptor.on(
+    "response",
+    ({ response, isMockedResponse, request, requestId }) => {
+      context.emitter.emit(
+        isMockedResponse ? "response:mocked" : "response:bypass",
+        {
+          response,
+          request,
+          requestId
+        }
+      );
     }
-  });
+  );
   interceptor.apply();
   return interceptor;
 }
@@ -719,19 +717,6 @@ var SetupWorkerApi = class extends import_SetupApi.SetupApi {
       return yield this.startHandler(this.context.startOptions, options);
     });
   }
-  printHandlers() {
-    const handlers = this.listHandlers();
-    handlers.forEach((handler) => {
-      const { header, callFrame } = handler.info;
-      const pragma = handler.info.hasOwnProperty("operationType") ? "[graphql]" : "[rest]";
-      console.groupCollapsed(`${pragma} ${header}`);
-      if (callFrame) {
-        console.log(`Declaration: ${callFrame}`);
-      }
-      console.log("Handler:", handler);
-      console.groupEnd();
-    });
-  }
   stop() {
     super.dispose();
     this.context.events.removeAllListeners();

package/lib/browser/index.mjs

@@ -252,7 +252,7 @@ var createRequestListener = (context, options) => {
                 responseStream ? [responseStream] : void 0
               );
               if (!options.quiet) {
-                context.emitter.once("response:mocked", (response2) => {
+                context.emitter.once("response:mocked", ({ response: response2 }) => {
                   handler.log(requestCloneForLogs, response2, parsedRequest);
                 });
               }
@@ -303,9 +303,9 @@ function requestIntegrityCheck(context, serviceWorker) {
     const { payload: actualChecksum } = yield context.events.once(
       "INTEGRITY_CHECK_RESPONSE"
     );
-    if (actualChecksum !== "b24acb1451c726c44a3a37a0b8092d67") {
+    if (actualChecksum !== "42fb047ce943b9103a6ed499f86548c4") {
       throw new Error(
-        `Currently active Service Worker (${actualChecksum}) is behind the latest published one (${"b24acb1451c726c44a3a37a0b8092d67"}).`
+        `Currently active Service Worker (${actualChecksum}) is behind the latest published one (${"42fb047ce943b9103a6ed499f86548c4"}).`
       );
     }
     return serviceWorker;
@@ -338,27 +338,19 @@ function createResponseListener(context) {
     if ((_a = responseJson.type) == null ? void 0 : _a.includes("opaque")) {
       return;
     }
-    const response = new Response(responseJson.body, responseJson);
-    const isMockedResponse = response.headers.get("x-powered-by") === "msw";
-    if (isMockedResponse) {
-      context.emitter.emit(
-        "response:mocked",
+    const response = responseJson.status === 0 ? Response.error() : new Response(responseJson.body, responseJson);
+    context.emitter.emit(
+      responseJson.isMockedResponse ? "response:mocked" : "response:bypass",
+      {
         response,
         /**
          * @todo @fixme In this context, we don't know anything about
          * the request.
          */
-        null,
-        responseJson.requestId
-      );
-    } else {
-      context.emitter.emit(
-        "response:bypass",
-        response,
-        null,
-        responseJson.requestId
-      );
-    }
+        request: null,
+        requestId: responseJson.requestId
+      }
+    );
   };
 }
 
@@ -522,7 +514,7 @@ function createFallbackRequestListener(context, options) {
     name: "fallback",
     interceptors: [new FetchInterceptor(), new XMLHttpRequestInterceptor()]
   });
-  interceptor.on("request", (request, requestId) => __async(this, null, function* () {
+  interceptor.on("request", (_0) => __async(this, [_0], function* ({ request, requestId }) {
     const requestCloneForLogs = request.clone();
     const response = yield handleRequest2(
       request,
@@ -533,7 +525,7 @@ function createFallbackRequestListener(context, options) {
       {
         onMockedResponse(_, { handler, parsedRequest }) {
           if (!options.quiet) {
-            context.emitter.once("response:mocked", (response2) => {
+            context.emitter.once("response:mocked", ({ response: response2 }) => {
               handler.log(requestCloneForLogs, response2, parsedRequest);
             });
           }
@@ -544,13 +536,19 @@ function createFallbackRequestListener(context, options) {
       request.respondWith(response);
     }
   }));
-  interceptor.on("response", (response, request, requestId) => {
-    if (response.headers.get("x-powered-by") === "msw") {
-      context.emitter.emit("response:mocked", response, request, requestId);
-    } else {
-      context.emitter.emit("response:bypass", response, request, requestId);
+  interceptor.on(
+    "response",
+    ({ response, isMockedResponse, request, requestId }) => {
+      context.emitter.emit(
+        isMockedResponse ? "response:mocked" : "response:bypass",
+        {
+          response,
+          request,
+          requestId
+        }
+      );
     }
-  });
+  );
   interceptor.apply();
   return interceptor;
 }
@@ -697,19 +695,6 @@ var SetupWorkerApi = class extends SetupApi {
       return yield this.startHandler(this.context.startOptions, options);
     });
   }
-  printHandlers() {
-    const handlers = this.listHandlers();
-    handlers.forEach((handler) => {
-      const { header, callFrame } = handler.info;
-      const pragma = handler.info.hasOwnProperty("operationType") ? "[graphql]" : "[rest]";
-      console.groupCollapsed(`${pragma} ${header}`);
-      if (callFrame) {
-        console.log(`Declaration: ${callFrame}`);
-      }
-      console.log("Handler:", handler);
-      console.groupEnd();
-    });
-  }
   stop() {
     super.dispose();
     this.context.events.removeAllListeners();

package/lib/core/NetworkError.d.ts

@@ -3,9 +3,9 @@
  * processing a request.
  *
  * @example
- * import { rest, NetworkError } from 'msw'
+ * import { http, NetworkError } from 'msw'
  *
- * rest.get('/user', () => {
+ * http.get('/user', () => {
  *   throw new NetworkError('Failed to fetch')
  * })
  */

package/lib/core/SetupApi.d.ts

@@ -21,7 +21,6 @@ declare abstract class SetupApi<EventsMap extends EventMap> extends Disposable {
     resetHandlers(...nextHandlers: Array<RequestHandler>): void;
     listHandlers(): ReadonlyArray<RequestHandler<RequestHandlerDefaultInfo, any, any>>;
     private createLifeCycleEvents;
-    abstract printHandlers(): void;
 }
 
 export { SetupApi };

package/lib/core/handlers/GraphQLHandler.js

@@ -120,14 +120,14 @@ Consider naming this operation or using "graphql.operation()" request handler to
     return __async(this, null, function* () {
       const loggedRequest = yield (0, import_serializeRequest.serializeRequest)(request);
       const loggedResponse = yield (0, import_serializeResponse.serializeResponse)(response);
-      const statusColor = (0, import_getStatusCodeColor.getStatusCodeColor)(response.status);
+      const statusColor = (0, import_getStatusCodeColor.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}`;
       console.groupCollapsed(
         import_devUtils.devUtils.formatMessage("%s %s (%c%s%c)"),
         (0, import_getTimestamp.getTimestamp)(),
         `${requestInfo}`,
         `color:${statusColor}`,
-        `${response.status} ${response.statusText}`,
+        `${loggedResponse.status} ${loggedResponse.statusText}`,
         "color:inherit"
       );
       console.log("Request:", loggedRequest);

package/lib/core/handlers/GraphQLHandler.mjs

@@ -101,14 +101,14 @@ Consider naming this operation or using "graphql.operation()" request handler to
     return __async(this, null, function* () {
       const loggedRequest = yield serializeRequest(request);
       const loggedResponse = yield serializeResponse(response);
-      const statusColor = getStatusCodeColor(response.status);
+      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}`;
       console.groupCollapsed(
         devUtils.formatMessage("%s %s (%c%s%c)"),
         getTimestamp(),
         `${requestInfo}`,
         `color:${statusColor}`,
-        `${response.status} ${response.statusText}`,
+        `${loggedResponse.status} ${loggedResponse.statusText}`,
         "color:inherit"
       );
       console.log("Request:", loggedRequest);

package/lib/core/handlers/{RestHandler.d.ts → HttpHandler.d.ts}

@@ -2,12 +2,12 @@ import { g as RequestHandlerDefaultInfo, R as RequestHandler, a as ResponseResol
 import { Path, Match, PathParams } from '../utils/matching/matchRequestUrl.js';
 import '../typeUtils.js';
 
-type RestHandlerMethod = string | RegExp;
-interface RestHandlerInfo extends RequestHandlerDefaultInfo {
-    method: RestHandlerMethod;
+type HttpHandlerMethod = string | RegExp;
+interface HttpHandlerInfo extends RequestHandlerDefaultInfo {
+    method: HttpHandlerMethod;
     path: Path;
 }
-declare enum RESTMethods {
+declare enum HttpMethods {
     HEAD = "HEAD",
     GET = "GET",
     POST = "POST",
@@ -19,32 +19,32 @@ declare enum RESTMethods {
 type RequestQuery = {
     [queryName: string]: string;
 };
-type RestRequestParsedResult = {
+type HttpRequestParsedResult = {
     match: Match;
     cookies: Record<string, string>;
 };
-type RestRequestResolverExtras<Params extends PathParams> = {
+type HttpRequestResolverExtras<Params extends PathParams> = {
     params: Params;
     cookies: Record<string, string | Array<string>>;
 };
 /**
- * Request handler for REST API requests.
+ * Request handler for HTTP requests.
  * Provides request matching based on method and URL.
  */
-declare class RestHandler extends RequestHandler<RestHandlerInfo, RestRequestParsedResult, RestRequestResolverExtras<any>> {
-    constructor(method: RestHandlerMethod, path: Path, resolver: ResponseResolver<RestRequestResolverExtras<any>, any, any>, options?: RequestHandlerPublicOptions);
+declare class HttpHandler extends RequestHandler<HttpHandlerInfo, HttpRequestParsedResult, HttpRequestResolverExtras<any>> {
+    constructor(method: HttpHandlerMethod, path: Path, resolver: ResponseResolver<HttpRequestResolverExtras<any>, any, any>, options?: RequestHandlerPublicOptions);
     private checkRedundantQueryParameters;
     parse(request: Request, resolutionContext?: ResponseResolutionContext): Promise<{
         match: Match;
         cookies: Record<string, string>;
     }>;
-    predicate(request: Request, parsedResult: RestRequestParsedResult): boolean;
+    predicate(request: Request, parsedResult: HttpRequestParsedResult): boolean;
     private matchMethod;
-    protected extendInfo(_request: Request, parsedResult: RestRequestParsedResult): {
+    protected extendInfo(_request: Request, parsedResult: HttpRequestParsedResult): {
         params: PathParams<string>;
         cookies: Record<string, string>;
     };
     log(request: Request, response: Response): Promise<void>;
 }
 
-export { RESTMethods, RequestQuery, RestHandler, RestHandlerInfo, RestRequestParsedResult, RestRequestResolverExtras };
+export { HttpHandler, HttpHandlerInfo, HttpMethods, HttpRequestParsedResult, HttpRequestResolverExtras, RequestQuery };

package/lib/core/handlers/{RestHandler.js → HttpHandler.js}

@@ -36,12 +36,12 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-var RestHandler_exports = {};
-__export(RestHandler_exports, {
-  RESTMethods: () => RESTMethods,
-  RestHandler: () => RestHandler
+var HttpHandler_exports = {};
+__export(HttpHandler_exports, {
+  HttpHandler: () => HttpHandler,
+  HttpMethods: () => HttpMethods
 });
-module.exports = __toCommonJS(RestHandler_exports);
+module.exports = __toCommonJS(HttpHandler_exports);
 var import_devUtils = require("../utils/internal/devUtils.js");
 var import_isStringEqual = require("../utils/internal/isStringEqual.js");
 var import_getStatusCodeColor = require("../utils/logging/getStatusCodeColor.js");
@@ -53,17 +53,17 @@ var import_getPublicUrlFromRequest = require("../utils/request/getPublicUrlFromR
 var import_getRequestCookies = require("../utils/request/getRequestCookies.js");
 var import_cleanUrl = require("../utils/url/cleanUrl.js");
 var import_RequestHandler = require("./RequestHandler.js");
-var RESTMethods = /* @__PURE__ */ ((RESTMethods2) => {
-  RESTMethods2["HEAD"] = "HEAD";
-  RESTMethods2["GET"] = "GET";
-  RESTMethods2["POST"] = "POST";
-  RESTMethods2["PUT"] = "PUT";
-  RESTMethods2["PATCH"] = "PATCH";
-  RESTMethods2["OPTIONS"] = "OPTIONS";
-  RESTMethods2["DELETE"] = "DELETE";
-  return RESTMethods2;
-})(RESTMethods || {});
-class RestHandler extends import_RequestHandler.RequestHandler {
+var HttpMethods = /* @__PURE__ */ ((HttpMethods2) => {
+  HttpMethods2["HEAD"] = "HEAD";
+  HttpMethods2["GET"] = "GET";
+  HttpMethods2["POST"] = "POST";
+  HttpMethods2["PUT"] = "PUT";
+  HttpMethods2["PATCH"] = "PATCH";
+  HttpMethods2["OPTIONS"] = "OPTIONS";
+  HttpMethods2["DELETE"] = "DELETE";
+  return HttpMethods2;
+})(HttpMethods || {});
+class HttpHandler extends import_RequestHandler.RequestHandler {
   constructor(method, path, resolver, options) {
     super({
       info: {
@@ -129,14 +129,14 @@ class RestHandler extends import_RequestHandler.RequestHandler {
       const publicUrl = (0, import_getPublicUrlFromRequest.getPublicUrlFromRequest)(request);
       const loggedRequest = yield (0, import_serializeRequest.serializeRequest)(request);
       const loggedResponse = yield (0, import_serializeResponse.serializeResponse)(response);
-      const statusColor = (0, import_getStatusCodeColor.getStatusCodeColor)(response.status);
+      const statusColor = (0, import_getStatusCodeColor.getStatusCodeColor)(loggedResponse.status);
       console.groupCollapsed(
         import_devUtils.devUtils.formatMessage("%s %s %s (%c%s%c)"),
         (0, import_getTimestamp.getTimestamp)(),
         request.method,
         publicUrl,
         `color:${statusColor}`,
-        `${response.status} ${response.statusText}`,
+        `${loggedResponse.status} ${loggedResponse.statusText}`,
         "color:inherit"
       );
       console.log("Request", loggedRequest);

package/lib/core/handlers/{RestHandler.mjs → HttpHandler.mjs}

@@ -33,17 +33,17 @@ import { cleanUrl, getSearchParams } from '../utils/url/cleanUrl.mjs';
 import {
   RequestHandler
 } from './RequestHandler.mjs';
-var RESTMethods = /* @__PURE__ */ ((RESTMethods2) => {
-  RESTMethods2["HEAD"] = "HEAD";
-  RESTMethods2["GET"] = "GET";
-  RESTMethods2["POST"] = "POST";
-  RESTMethods2["PUT"] = "PUT";
-  RESTMethods2["PATCH"] = "PATCH";
-  RESTMethods2["OPTIONS"] = "OPTIONS";
-  RESTMethods2["DELETE"] = "DELETE";
-  return RESTMethods2;
-})(RESTMethods || {});
-class RestHandler extends RequestHandler {
+var HttpMethods = /* @__PURE__ */ ((HttpMethods2) => {
+  HttpMethods2["HEAD"] = "HEAD";
+  HttpMethods2["GET"] = "GET";
+  HttpMethods2["POST"] = "POST";
+  HttpMethods2["PUT"] = "PUT";
+  HttpMethods2["PATCH"] = "PATCH";
+  HttpMethods2["OPTIONS"] = "OPTIONS";
+  HttpMethods2["DELETE"] = "DELETE";
+  return HttpMethods2;
+})(HttpMethods || {});
+class HttpHandler extends RequestHandler {
   constructor(method, path, resolver, options) {
     super({
       info: {
@@ -109,14 +109,14 @@ class RestHandler extends RequestHandler {
       const publicUrl = getPublicUrlFromRequest(request);
       const loggedRequest = yield serializeRequest(request);
       const loggedResponse = yield serializeResponse(response);
-      const statusColor = getStatusCodeColor(response.status);
+      const statusColor = getStatusCodeColor(loggedResponse.status);
       console.groupCollapsed(
         devUtils.formatMessage("%s %s %s (%c%s%c)"),
         getTimestamp(),
         request.method,
         publicUrl,
         `color:${statusColor}`,
-        `${response.status} ${response.statusText}`,
+        `${loggedResponse.status} ${loggedResponse.statusText}`,
         "color:inherit"
       );
       console.log("Request", loggedRequest);
@@ -127,6 +127,6 @@ class RestHandler extends RequestHandler {
   }
 }
 export {
-  RESTMethods,
-  RestHandler
+  HttpHandler,
+  HttpMethods
 };

package/lib/core/{rest.d.ts → http.d.ts}

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