@kaito-http/core 2.3.7 → 2.4.0

package/dist/declarations/src/route.d.ts

@@ -1,13 +1,13 @@
-import { HTTPMethod } from 'find-my-way';
 import { z } from 'zod';
-import { ExtractRouteParams } from './util';
+import { ExtractRouteParams, KaitoMethod } from './util';
 export declare type RouteArgument<Path extends string, Context, Input extends z.ZodSchema> = {
     ctx: Context;
     input: z.infer<Input>;
     params: ExtractRouteParams<Path>;
 };
-export interface Route<Result, Path extends string, Method extends HTTPMethod, Context, Input extends z.ZodSchema> {
+export declare type Route<Context, Result, Path extends string, Method extends KaitoMethod, Input extends z.ZodSchema> = {
     input?: Input;
+    path: Path;
     method: Method;
-    run(arg: RouteArgument<Path, Context, Input>): Promise<Result>;
-}
+    run(args: RouteArgument<Path, Context, Input>): Promise<Result>;
+};

package/dist/declarations/src/router.d.ts

@@ -2,57 +2,24 @@ import fmw, { HTTPMethod, Instance } from 'find-my-way';
 import { z } from 'zod';
 import { Route } from './route';
 import { ServerConfig } from './server';
-import { NoEmpty, NormalizePath, Values } from './util';
-export declare type RoutesInit<Context> = {
-    [Path in string]: Route<any, Path, HTTPMethod, Context, z.ZodSchema>;
-};
+import { KaitoMethod } from './util';
+export declare type RoutesInit<Context> = Array<Route<Context, unknown, string, KaitoMethod, z.ZodSchema>>;
+export declare type MergePaths<Routes extends RoutesInit<unknown>, Prefix extends string> = Routes extends [
+    infer R,
+    ...infer Rest
+] ? R extends Route<infer Context, infer Result, infer Path, infer Method, infer Input> ? [Route<Context, Result, `${Prefix}${Path}`, Method, Input>, ...MergePaths<Extract<Rest, RoutesInit<any>>, Prefix>] : MergePaths<Extract<Rest, RoutesInit<any>>, Prefix> : [];
 export declare class Router<Context, Routes extends RoutesInit<Context>> {
-    static create<Context = null>(): Router<Context, {}>;
+    static create<Context = null>(): Router<Context, []>;
     private static handle;
     readonly 'routes': Routes;
-    readonly 'acl': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "ACL", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "ACL", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "ACL", Context, Input>; }>;
-    readonly 'bind': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "BIND", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "BIND", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "BIND", Context, Input>; }>;
-    readonly 'checkout': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "CHECKOUT", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "CHECKOUT", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "CHECKOUT", Context, Input>; }>;
-    readonly 'connect': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "CONNECT", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "CONNECT", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "CONNECT", Context, Input>; }>;
-    readonly 'copy': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "COPY", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "COPY", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "COPY", Context, Input>; }>;
-    readonly 'delete': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "DELETE", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "DELETE", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "DELETE", Context, Input>; }>;
-    readonly 'get': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "GET", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "GET", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "GET", Context, Input>; }>;
-    readonly 'head': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "HEAD", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "HEAD", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "HEAD", Context, Input>; }>;
-    readonly 'link': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "LINK", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "LINK", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "LINK", Context, Input>; }>;
-    readonly 'lock': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "LOCK", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "LOCK", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "LOCK", Context, Input>; }>;
-    readonly 'm_search': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "M-SEARCH", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "M-SEARCH", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "M-SEARCH", Context, Input>; }>;
-    readonly 'mkactivity': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "MKACTIVITY", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "MKACTIVITY", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "MKACTIVITY", Context, Input>; }>;
-    readonly 'mkcalendar': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "MKCALENDAR", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "MKCALENDAR", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "MKCALENDAR", Context, Input>; }>;
-    readonly 'mkcol': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "MKCOL", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "MKCOL", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "MKCOL", Context, Input>; }>;
-    readonly 'move': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "MOVE", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "MOVE", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "MOVE", Context, Input>; }>;
-    readonly 'notify': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "NOTIFY", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "NOTIFY", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "NOTIFY", Context, Input>; }>;
-    readonly 'options': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "OPTIONS", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "OPTIONS", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "OPTIONS", Context, Input>; }>;
-    readonly 'patch': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "PATCH", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "PATCH", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "PATCH", Context, Input>; }>;
-    readonly 'post': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "POST", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "POST", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "POST", Context, Input>; }>;
-    readonly 'propfind': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "PROPFIND", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "PROPFIND", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "PROPFIND", Context, Input>; }>;
-    readonly 'proppatch': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "PROPPATCH", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "PROPPATCH", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "PROPPATCH", Context, Input>; }>;
-    readonly 'purge': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "PURGE", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "PURGE", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "PURGE", Context, Input>; }>;
-    readonly 'put': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "PUT", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "PUT", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "PUT", Context, Input>; }>;
-    readonly 'rebind': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "REBIND", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "REBIND", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "REBIND", Context, Input>; }>;
-    readonly 'report': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "REPORT", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "REPORT", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "REPORT", Context, Input>; }>;
-    readonly 'search': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "SEARCH", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "SEARCH", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "SEARCH", Context, Input>; }>;
-    readonly 'source': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "SOURCE", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "SOURCE", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "SOURCE", Context, Input>; }>;
-    readonly 'subscribe': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "SUBSCRIBE", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "SUBSCRIBE", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "SUBSCRIBE", Context, Input>; }>;
-    readonly 'trace': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "TRACE", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "TRACE", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "TRACE", Context, Input>; }>;
-    readonly 'unbind': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "UNBIND", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "UNBIND", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "UNBIND", Context, Input>; }>;
-    readonly 'unlink': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "UNLINK", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "UNLINK", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "UNLINK", Context, Input>; }>;
-    readonly 'unlock': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "UNLOCK", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "UNLOCK", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "UNLOCK", Context, Input>; }>;
-    readonly 'unsubscribe': <Result, Path extends `/${string}`, Input extends z.ZodType<any, z.ZodTypeDef, any> = never>(path: Path, route: Omit<Route<Result, Path, "UNSUBSCRIBE", Context, Input>, "method">) => Router<Context, Path extends keyof Routes ? NoEmpty<Pick<Routes, Path>> | { [key in Path]: Route<Result, Path, "UNSUBSCRIBE", Context, Input>; } : Routes & { [key_1 in Path]: Route<Result, Path, "UNSUBSCRIBE", Context, Input>; }>;
     private constructor();
-    merge<Prefix extends string, NewRoutes extends RoutesInit<Context>>(prefix: NormalizePath<Prefix>, router: Router<Context, NewRoutes>): Router<Context, Routes & { [Path in Extract<keyof NewRoutes, string> as `/${Prefix}${Path}`]: Values<{ [M in NewRoutes[Path]["method"]]: Omit<Extract<NewRoutes[Path], {
-        method: M;
-    }>, "method" | "path"> & {
-        path: `/${Prefix}${Path}`;
-        method: M;
-    }; }>; }>;
     toFindMyWay(server: ServerConfig<Context>): Instance<fmw.HTTPVersion.V1>;
-    _copy<NewRoutes extends RoutesInit<Context>>(routes: NewRoutes): Router<Context, NewRoutes>;
-    private make;
+    add<Method extends HTTPMethod, Path extends string, Result, Input extends z.ZodSchema>(route: Route<Context, Result, Path, Method, Input>): Router<Context, [...Routes, Route<Context, Result, Path, Method, Input>]>;
+    map(): { [Method in Routes[number]["method"]]: { [R in Extract<Routes[number], {
+        method: Method;
+    }> as R["path"]]: R; }; };
+    merge<Prefix extends string, NewRoutes extends RoutesInit<Context>>(prefix: Prefix, router: Router<Context, NewRoutes>): Router<Context, [...Routes, ...MergePaths<NewRoutes, Prefix>]>;
+    private copyContext;
 }
 /**
  * @deprecated Please use Router#create instead

package/dist/declarations/src/server.d.ts

@@ -1,13 +1,15 @@
 /// <reference types="node" />
-import { Router, RoutesInit } from './router';
+import { Router } from './router';
 import * as http from 'http';
 import { KaitoRequest } from './req';
 import { KaitoResponse } from './res';
 import { KaitoError } from './error';
 import { GetContext } from './util';
+export declare type Before = (req: http.IncomingMessage, res: http.ServerResponse) => Promise<void>;
 export interface ServerConfig<Context> {
-    router: Router<Context, RoutesInit<Context>>;
+    router: Router<Context, any>;
     getContext: GetContext<Context>;
+    before?: Before[];
     onError(arg: {
         error: Error;
         req: KaitoRequest;

package/dist/declarations/src/util.d.ts

@@ -1,3 +1,4 @@
+import { HTTPMethod } from 'find-my-way';
 import { KaitoRequest } from './req';
 import { KaitoResponse } from './res';
 export declare type ExtractRouteParams<T extends string> = string extends T ? Record<string, string> : T extends `${string}:${infer Param}/${infer Rest}` ? {
@@ -5,6 +6,7 @@ export declare type ExtractRouteParams<T extends string> = string extends T ? Re
 } : T extends `${string}:${infer Param}` ? {
     [k in Param]: string;
 } : {};
+export declare type KaitoMethod = HTTPMethod | '*';
 export declare type GetContext<Result> = (req: KaitoRequest, res: KaitoResponse) => Promise<Result>;
 export declare function createGetContext<Context>(callback: GetContext<Context>): GetContext<Context>;
 export declare type InferContext<T> = T extends (req: KaitoRequest, res: KaitoResponse) => Promise<infer U> ? U : never;

package/dist/kaito-http-core.cjs.dev.js

@@ -11,32 +11,86 @@ var getRawBody = require('raw-body');
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
 function _interopNamespace(e) {
-	if (e && e.__esModule) return e;
-	var n = Object.create(null);
-	if (e) {
-		Object.keys(e).forEach(function (k) {
-			if (k !== 'default') {
-				var d = Object.getOwnPropertyDescriptor(e, k);
-				Object.defineProperty(n, k, d.get ? d : {
-					enumerable: true,
-					get: function () { return e[k]; }
-				});
-			}
-		});
-	}
-	n["default"] = e;
-	return Object.freeze(n);
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n["default"] = e;
+  return Object.freeze(n);
 }
 
 var http__namespace = /*#__PURE__*/_interopNamespace(http);
 var fmw__default = /*#__PURE__*/_interopDefault(fmw);
 var getRawBody__default = /*#__PURE__*/_interopDefault(getRawBody);
 
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+  try {
+    var info = gen[key](arg);
+    var value = info.value;
+  } catch (error) {
+    reject(error);
+    return;
+  }
+
+  if (info.done) {
+    resolve(value);
+  } else {
+    Promise.resolve(value).then(_next, _throw);
+  }
+}
+
+function _asyncToGenerator(fn) {
+  return function () {
+    var self = this,
+        args = arguments;
+    return new Promise(function (resolve, reject) {
+      var gen = fn.apply(self, args);
+
+      function _next(value) {
+        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+      }
+
+      function _throw(err) {
+        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+      }
+
+      _next(undefined);
+    });
+  };
+}
+
 function createFMWServer(config) {
   var fmw = config.router.toFindMyWay(config);
-  var server = http__namespace.createServer((req, res) => {
-    fmw.lookup(req, res);
-  });
+  var server = http__namespace.createServer( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator(function* (req, res) {
+      for (var fn of (_config$before = config.before) !== null && _config$before !== void 0 ? _config$before : []) {
+        var _config$before;
+
+        // Disabled because we need these to run in order!
+        // eslint-disable-next-line no-await-in-loop
+        yield fn(req, res);
+      }
+
+      if (req.method === 'OPTIONS') {
+        return;
+      }
+
+      fmw.lookup(req, res);
+    });
+
+    return function (_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }());
   return {
     server,
     fmw
@@ -99,42 +153,6 @@ function _objectSpread2(target) {
   return target;
 }
 
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-  try {
-    var info = gen[key](arg);
-    var value = info.value;
-  } catch (error) {
-    reject(error);
-    return;
-  }
-
-  if (info.done) {
-    resolve(value);
-  } else {
-    Promise.resolve(value).then(_next, _throw);
-  }
-}
-
-function _asyncToGenerator(fn) {
-  return function () {
-    var self = this,
-        args = arguments;
-    return new Promise(function (resolve, reject) {
-      var gen = fn.apply(self, args);
-
-      function _next(value) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-      }
-
-      function _throw(err) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-      }
-
-      _next(undefined);
-    });
-  };
-}
-
 class WrappedError extends Error {
   static maybe(maybeError) {
     if (maybeError instanceof Error) {
@@ -288,18 +306,18 @@ class KaitoResponse {
 
 class Router {
   static create() {
-    return new Router({});
+    return new Router([]);
   }
 
-  static handle(server, options) {
+  static handle(server, route, options) {
     return _asyncToGenerator(function* () {
       try {
-        var _options$route$input$, _options$route$input;
+        var _route$input$parse, _route$input;
 
         var context = yield server.getContext(options.req, options.res);
         var body = yield getInput(options.req);
-        var input = (_options$route$input$ = (_options$route$input = options.route.input) === null || _options$route$input === void 0 ? void 0 : _options$route$input.parse(body)) !== null && _options$route$input$ !== void 0 ? _options$route$input$ : undefined;
-        var result = yield options.route.run({
+        var input = (_route$input$parse = (_route$input = route.input) === null || _route$input === void 0 ? void 0 : _route$input.parse(body)) !== null && _route$input$parse !== void 0 ? _route$input$parse : undefined;
+        var result = yield route.run({
           ctx: context,
           input,
           params: options.params
@@ -342,89 +360,10 @@ class Router {
   }
 
   constructor(routes) {
-    _defineProperty(this, 'acl', this.make('ACL'));
-
-    _defineProperty(this, 'bind', this.make('BIND'));
-
-    _defineProperty(this, 'checkout', this.make('CHECKOUT'));
-
-    _defineProperty(this, 'connect', this.make('CONNECT'));
-
-    _defineProperty(this, 'copy', this.make('COPY'));
-
-    _defineProperty(this, 'delete', this.make('DELETE'));
-
-    _defineProperty(this, 'get', this.make('GET'));
-
-    _defineProperty(this, 'head', this.make('HEAD'));
-
-    _defineProperty(this, 'link', this.make('LINK'));
-
-    _defineProperty(this, 'lock', this.make('LOCK'));
-
-    _defineProperty(this, 'm_search', this.make('M-SEARCH'));
-
-    _defineProperty(this, 'mkactivity', this.make('MKACTIVITY'));
-
-    _defineProperty(this, 'mkcalendar', this.make('MKCALENDAR'));
-
-    _defineProperty(this, 'mkcol', this.make('MKCOL'));
-
-    _defineProperty(this, 'move', this.make('MOVE'));
-
-    _defineProperty(this, 'notify', this.make('NOTIFY'));
-
-    _defineProperty(this, 'options', this.make('OPTIONS'));
-
-    _defineProperty(this, 'patch', this.make('PATCH'));
-
-    _defineProperty(this, 'post', this.make('POST'));
-
-    _defineProperty(this, 'propfind', this.make('PROPFIND'));
-
-    _defineProperty(this, 'proppatch', this.make('PROPPATCH'));
-
-    _defineProperty(this, 'purge', this.make('PURGE'));
-
-    _defineProperty(this, 'put', this.make('PUT'));
-
-    _defineProperty(this, 'rebind', this.make('REBIND'));
-
-    _defineProperty(this, 'report', this.make('REPORT'));
-
-    _defineProperty(this, 'search', this.make('SEARCH'));
-
-    _defineProperty(this, 'source', this.make('SOURCE'));
-
-    _defineProperty(this, 'subscribe', this.make('SUBSCRIBE'));
-
-    _defineProperty(this, 'trace', this.make('TRACE'));
-
-    _defineProperty(this, 'unbind', this.make('UNBIND'));
-
-    _defineProperty(this, 'unlink', this.make('UNLINK'));
-
-    _defineProperty(this, 'unlock', this.make('UNLOCK'));
-
-    _defineProperty(this, 'unsubscribe', this.make('UNSUBSCRIBE'));
-
     this.routes = routes;
   }
 
-  merge(prefix, router) {
-    var newRoutes = Object.fromEntries(Object.entries(router.routes).map(_ref => {
-      var [k, v] = _ref;
-      return ["".concat(prefix).concat(k), v];
-    }));
-
-    var merged = _objectSpread2(_objectSpread2({}, this.routes), newRoutes);
-
-    return this._copy(merged);
-  }
-
   toFindMyWay(server) {
-    var _this = this;
-
     var instance = fmw__default["default"]({
       ignoreTrailingSlash: true,
 
@@ -440,54 +379,69 @@ class Router {
       }
 
     });
-    var paths = Object.keys(this.routes);
 
-    var _loop = function _loop(path) {
-      var route = _this.routes[path];
-      instance.on(route.method, path, /*#__PURE__*/function () {
-        var _ref2 = _asyncToGenerator(function* (incomingMessage, serverResponse, params) {
+    var _loop = function _loop(route) {
+      var handler = /*#__PURE__*/function () {
+        var _ref = _asyncToGenerator(function* (incomingMessage, serverResponse, params) {
           var req = new KaitoRequest(incomingMessage);
           var res = new KaitoResponse(serverResponse);
-          yield Router.handle(server, {
-            route,
+          yield Router.handle(server, route, {
             params,
             req,
             res
           });
         });
 
-        return function (_x, _x2, _x3) {
-          return _ref2.apply(this, arguments);
+        return function handler(_x, _x2, _x3) {
+          return _ref.apply(this, arguments);
         };
-      }());
+      }();
+
+      if (route.method === '*') {
+        instance.all(route.path, handler);
+        return "continue";
+      }
+
+      instance.on(route.method, route.path, handler);
     };
 
-    for (var path of paths) {
-      _loop(path);
+    for (var route of this.routes) {
+      var _ret = _loop(route);
+
+      if (_ret === "continue") continue;
     }
 
     return instance;
   }
 
-  _copy(routes) {
-    return new Router(routes);
+  add(route) {
+    return new Router([...this.routes, route]);
   }
 
-  make(method) {
-    return (path, route) => {
-      var addedRoute = _objectSpread2(_objectSpread2({}, route), {}, {
-        method
-      }); // `as unknown` is required because otherwise
-      // this type just gets massive and too slow,
-      // so we have to write it out specifically
+  map() {
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    var result = {};
 
+    for (var route of this.routes) {
+      var _result$method;
 
-      var merged = _objectSpread2(_objectSpread2({}, this.routes), {}, {
-        [path]: addedRoute
+      var method = route.method;
+      result[method] = _objectSpread2(_objectSpread2({}, (_result$method = result[method]) !== null && _result$method !== void 0 ? _result$method : {}), {}, {
+        [route.path]: route
       });
+    }
 
-      return this._copy(merged);
-    };
+    return result;
+  }
+
+  merge(prefix, router) {
+    return this.copyContext([...this.routes, ...router.routes.map(route => _objectSpread2(_objectSpread2({}, route), {}, {
+      path: prefix + route.path
+    }))]);
+  }
+
+  copyContext(routes) {
+    return new Router(routes);
   }
 
 }

package/dist/kaito-http-core.cjs.prod.js

@@ -11,32 +11,86 @@ var getRawBody = require('raw-body');
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
 function _interopNamespace(e) {
-	if (e && e.__esModule) return e;
-	var n = Object.create(null);
-	if (e) {
-		Object.keys(e).forEach(function (k) {
-			if (k !== 'default') {
-				var d = Object.getOwnPropertyDescriptor(e, k);
-				Object.defineProperty(n, k, d.get ? d : {
-					enumerable: true,
-					get: function () { return e[k]; }
-				});
-			}
-		});
-	}
-	n["default"] = e;
-	return Object.freeze(n);
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n["default"] = e;
+  return Object.freeze(n);
 }
 
 var http__namespace = /*#__PURE__*/_interopNamespace(http);
 var fmw__default = /*#__PURE__*/_interopDefault(fmw);
 var getRawBody__default = /*#__PURE__*/_interopDefault(getRawBody);
 
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+  try {
+    var info = gen[key](arg);
+    var value = info.value;
+  } catch (error) {
+    reject(error);
+    return;
+  }
+
+  if (info.done) {
+    resolve(value);
+  } else {
+    Promise.resolve(value).then(_next, _throw);
+  }
+}
+
+function _asyncToGenerator(fn) {
+  return function () {
+    var self = this,
+        args = arguments;
+    return new Promise(function (resolve, reject) {
+      var gen = fn.apply(self, args);
+
+      function _next(value) {
+        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+      }
+
+      function _throw(err) {
+        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+      }
+
+      _next(undefined);
+    });
+  };
+}
+
 function createFMWServer(config) {
   var fmw = config.router.toFindMyWay(config);
-  var server = http__namespace.createServer((req, res) => {
-    fmw.lookup(req, res);
-  });
+  var server = http__namespace.createServer( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator(function* (req, res) {
+      for (var fn of (_config$before = config.before) !== null && _config$before !== void 0 ? _config$before : []) {
+        var _config$before;
+
+        // Disabled because we need these to run in order!
+        // eslint-disable-next-line no-await-in-loop
+        yield fn(req, res);
+      }
+
+      if (req.method === 'OPTIONS') {
+        return;
+      }
+
+      fmw.lookup(req, res);
+    });
+
+    return function (_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }());
   return {
     server,
     fmw
@@ -99,42 +153,6 @@ function _objectSpread2(target) {
   return target;
 }
 
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-  try {
-    var info = gen[key](arg);
-    var value = info.value;
-  } catch (error) {
-    reject(error);
-    return;
-  }
-
-  if (info.done) {
-    resolve(value);
-  } else {
-    Promise.resolve(value).then(_next, _throw);
-  }
-}
-
-function _asyncToGenerator(fn) {
-  return function () {
-    var self = this,
-        args = arguments;
-    return new Promise(function (resolve, reject) {
-      var gen = fn.apply(self, args);
-
-      function _next(value) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-      }
-
-      function _throw(err) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-      }
-
-      _next(undefined);
-    });
-  };
-}
-
 class WrappedError extends Error {
   static maybe(maybeError) {
     if (maybeError instanceof Error) {
@@ -288,18 +306,18 @@ class KaitoResponse {
 
 class Router {
   static create() {
-    return new Router({});
+    return new Router([]);
   }
 
-  static handle(server, options) {
+  static handle(server, route, options) {
     return _asyncToGenerator(function* () {
       try {
-        var _options$route$input$, _options$route$input;
+        var _route$input$parse, _route$input;
 
         var context = yield server.getContext(options.req, options.res);
         var body = yield getInput(options.req);
-        var input = (_options$route$input$ = (_options$route$input = options.route.input) === null || _options$route$input === void 0 ? void 0 : _options$route$input.parse(body)) !== null && _options$route$input$ !== void 0 ? _options$route$input$ : undefined;
-        var result = yield options.route.run({
+        var input = (_route$input$parse = (_route$input = route.input) === null || _route$input === void 0 ? void 0 : _route$input.parse(body)) !== null && _route$input$parse !== void 0 ? _route$input$parse : undefined;
+        var result = yield route.run({
           ctx: context,
           input,
           params: options.params
@@ -342,89 +360,10 @@ class Router {
   }
 
   constructor(routes) {
-    _defineProperty(this, 'acl', this.make('ACL'));
-
-    _defineProperty(this, 'bind', this.make('BIND'));
-
-    _defineProperty(this, 'checkout', this.make('CHECKOUT'));
-
-    _defineProperty(this, 'connect', this.make('CONNECT'));
-
-    _defineProperty(this, 'copy', this.make('COPY'));
-
-    _defineProperty(this, 'delete', this.make('DELETE'));
-
-    _defineProperty(this, 'get', this.make('GET'));
-
-    _defineProperty(this, 'head', this.make('HEAD'));
-
-    _defineProperty(this, 'link', this.make('LINK'));
-
-    _defineProperty(this, 'lock', this.make('LOCK'));
-
-    _defineProperty(this, 'm_search', this.make('M-SEARCH'));
-
-    _defineProperty(this, 'mkactivity', this.make('MKACTIVITY'));
-
-    _defineProperty(this, 'mkcalendar', this.make('MKCALENDAR'));
-
-    _defineProperty(this, 'mkcol', this.make('MKCOL'));
-
-    _defineProperty(this, 'move', this.make('MOVE'));
-
-    _defineProperty(this, 'notify', this.make('NOTIFY'));
-
-    _defineProperty(this, 'options', this.make('OPTIONS'));
-
-    _defineProperty(this, 'patch', this.make('PATCH'));
-
-    _defineProperty(this, 'post', this.make('POST'));
-
-    _defineProperty(this, 'propfind', this.make('PROPFIND'));
-
-    _defineProperty(this, 'proppatch', this.make('PROPPATCH'));
-
-    _defineProperty(this, 'purge', this.make('PURGE'));
-
-    _defineProperty(this, 'put', this.make('PUT'));
-
-    _defineProperty(this, 'rebind', this.make('REBIND'));
-
-    _defineProperty(this, 'report', this.make('REPORT'));
-
-    _defineProperty(this, 'search', this.make('SEARCH'));
-
-    _defineProperty(this, 'source', this.make('SOURCE'));
-
-    _defineProperty(this, 'subscribe', this.make('SUBSCRIBE'));
-
-    _defineProperty(this, 'trace', this.make('TRACE'));
-
-    _defineProperty(this, 'unbind', this.make('UNBIND'));
-
-    _defineProperty(this, 'unlink', this.make('UNLINK'));
-
-    _defineProperty(this, 'unlock', this.make('UNLOCK'));
-
-    _defineProperty(this, 'unsubscribe', this.make('UNSUBSCRIBE'));
-
     this.routes = routes;
   }
 
-  merge(prefix, router) {
-    var newRoutes = Object.fromEntries(Object.entries(router.routes).map(_ref => {
-      var [k, v] = _ref;
-      return ["".concat(prefix).concat(k), v];
-    }));
-
-    var merged = _objectSpread2(_objectSpread2({}, this.routes), newRoutes);
-
-    return this._copy(merged);
-  }
-
   toFindMyWay(server) {
-    var _this = this;
-
     var instance = fmw__default["default"]({
       ignoreTrailingSlash: true,
 
@@ -440,54 +379,69 @@ class Router {
       }
 
     });
-    var paths = Object.keys(this.routes);
 
-    var _loop = function _loop(path) {
-      var route = _this.routes[path];
-      instance.on(route.method, path, /*#__PURE__*/function () {
-        var _ref2 = _asyncToGenerator(function* (incomingMessage, serverResponse, params) {
+    var _loop = function _loop(route) {
+      var handler = /*#__PURE__*/function () {
+        var _ref = _asyncToGenerator(function* (incomingMessage, serverResponse, params) {
           var req = new KaitoRequest(incomingMessage);
           var res = new KaitoResponse(serverResponse);
-          yield Router.handle(server, {
-            route,
+          yield Router.handle(server, route, {
             params,
             req,
             res
           });
         });
 
-        return function (_x, _x2, _x3) {
-          return _ref2.apply(this, arguments);
+        return function handler(_x, _x2, _x3) {
+          return _ref.apply(this, arguments);
         };
-      }());
+      }();
+
+      if (route.method === '*') {
+        instance.all(route.path, handler);
+        return "continue";
+      }
+
+      instance.on(route.method, route.path, handler);
     };
 
-    for (var path of paths) {
-      _loop(path);
+    for (var route of this.routes) {
+      var _ret = _loop(route);
+
+      if (_ret === "continue") continue;
     }
 
     return instance;
   }
 
-  _copy(routes) {
-    return new Router(routes);
+  add(route) {
+    return new Router([...this.routes, route]);
   }
 
-  make(method) {
-    return (path, route) => {
-      var addedRoute = _objectSpread2(_objectSpread2({}, route), {}, {
-        method
-      }); // `as unknown` is required because otherwise
-      // this type just gets massive and too slow,
-      // so we have to write it out specifically
+  map() {
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    var result = {};
 
+    for (var route of this.routes) {
+      var _result$method;
 
-      var merged = _objectSpread2(_objectSpread2({}, this.routes), {}, {
-        [path]: addedRoute
+      var method = route.method;
+      result[method] = _objectSpread2(_objectSpread2({}, (_result$method = result[method]) !== null && _result$method !== void 0 ? _result$method : {}), {}, {
+        [route.path]: route
       });
+    }
 
-      return this._copy(merged);
-    };
+    return result;
+  }
+
+  merge(prefix, router) {
+    return this.copyContext([...this.routes, ...router.routes.map(route => _objectSpread2(_objectSpread2({}, route), {}, {
+      path: prefix + route.path
+    }))]);
+  }
+
+  copyContext(routes) {
+    return new Router(routes);
   }
 
 }

package/dist/kaito-http-core.esm.js

@@ -4,11 +4,65 @@ import { TLSSocket } from 'tls';
 import { parse } from 'content-type';
 import getRawBody from 'raw-body';
 
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+  try {
+    var info = gen[key](arg);
+    var value = info.value;
+  } catch (error) {
+    reject(error);
+    return;
+  }
+
+  if (info.done) {
+    resolve(value);
+  } else {
+    Promise.resolve(value).then(_next, _throw);
+  }
+}
+
+function _asyncToGenerator(fn) {
+  return function () {
+    var self = this,
+        args = arguments;
+    return new Promise(function (resolve, reject) {
+      var gen = fn.apply(self, args);
+
+      function _next(value) {
+        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+      }
+
+      function _throw(err) {
+        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+      }
+
+      _next(undefined);
+    });
+  };
+}
+
 function createFMWServer(config) {
   var fmw = config.router.toFindMyWay(config);
-  var server = http.createServer((req, res) => {
-    fmw.lookup(req, res);
-  });
+  var server = http.createServer( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator(function* (req, res) {
+      for (var fn of (_config$before = config.before) !== null && _config$before !== void 0 ? _config$before : []) {
+        var _config$before;
+
+        // Disabled because we need these to run in order!
+        // eslint-disable-next-line no-await-in-loop
+        yield fn(req, res);
+      }
+
+      if (req.method === 'OPTIONS') {
+        return;
+      }
+
+      fmw.lookup(req, res);
+    });
+
+    return function (_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }());
   return {
     server,
     fmw
@@ -71,42 +125,6 @@ function _objectSpread2(target) {
   return target;
 }
 
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-  try {
-    var info = gen[key](arg);
-    var value = info.value;
-  } catch (error) {
-    reject(error);
-    return;
-  }
-
-  if (info.done) {
-    resolve(value);
-  } else {
-    Promise.resolve(value).then(_next, _throw);
-  }
-}
-
-function _asyncToGenerator(fn) {
-  return function () {
-    var self = this,
-        args = arguments;
-    return new Promise(function (resolve, reject) {
-      var gen = fn.apply(self, args);
-
-      function _next(value) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-      }
-
-      function _throw(err) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-      }
-
-      _next(undefined);
-    });
-  };
-}
-
 class WrappedError extends Error {
   static maybe(maybeError) {
     if (maybeError instanceof Error) {
@@ -260,18 +278,18 @@ class KaitoResponse {
 
 class Router {
   static create() {
-    return new Router({});
+    return new Router([]);
   }
 
-  static handle(server, options) {
+  static handle(server, route, options) {
     return _asyncToGenerator(function* () {
       try {
-        var _options$route$input$, _options$route$input;
+        var _route$input$parse, _route$input;
 
         var context = yield server.getContext(options.req, options.res);
         var body = yield getInput(options.req);
-        var input = (_options$route$input$ = (_options$route$input = options.route.input) === null || _options$route$input === void 0 ? void 0 : _options$route$input.parse(body)) !== null && _options$route$input$ !== void 0 ? _options$route$input$ : undefined;
-        var result = yield options.route.run({
+        var input = (_route$input$parse = (_route$input = route.input) === null || _route$input === void 0 ? void 0 : _route$input.parse(body)) !== null && _route$input$parse !== void 0 ? _route$input$parse : undefined;
+        var result = yield route.run({
           ctx: context,
           input,
           params: options.params
@@ -314,89 +332,10 @@ class Router {
   }
 
   constructor(routes) {
-    _defineProperty(this, 'acl', this.make('ACL'));
-
-    _defineProperty(this, 'bind', this.make('BIND'));
-
-    _defineProperty(this, 'checkout', this.make('CHECKOUT'));
-
-    _defineProperty(this, 'connect', this.make('CONNECT'));
-
-    _defineProperty(this, 'copy', this.make('COPY'));
-
-    _defineProperty(this, 'delete', this.make('DELETE'));
-
-    _defineProperty(this, 'get', this.make('GET'));
-
-    _defineProperty(this, 'head', this.make('HEAD'));
-
-    _defineProperty(this, 'link', this.make('LINK'));
-
-    _defineProperty(this, 'lock', this.make('LOCK'));
-
-    _defineProperty(this, 'm_search', this.make('M-SEARCH'));
-
-    _defineProperty(this, 'mkactivity', this.make('MKACTIVITY'));
-
-    _defineProperty(this, 'mkcalendar', this.make('MKCALENDAR'));
-
-    _defineProperty(this, 'mkcol', this.make('MKCOL'));
-
-    _defineProperty(this, 'move', this.make('MOVE'));
-
-    _defineProperty(this, 'notify', this.make('NOTIFY'));
-
-    _defineProperty(this, 'options', this.make('OPTIONS'));
-
-    _defineProperty(this, 'patch', this.make('PATCH'));
-
-    _defineProperty(this, 'post', this.make('POST'));
-
-    _defineProperty(this, 'propfind', this.make('PROPFIND'));
-
-    _defineProperty(this, 'proppatch', this.make('PROPPATCH'));
-
-    _defineProperty(this, 'purge', this.make('PURGE'));
-
-    _defineProperty(this, 'put', this.make('PUT'));
-
-    _defineProperty(this, 'rebind', this.make('REBIND'));
-
-    _defineProperty(this, 'report', this.make('REPORT'));
-
-    _defineProperty(this, 'search', this.make('SEARCH'));
-
-    _defineProperty(this, 'source', this.make('SOURCE'));
-
-    _defineProperty(this, 'subscribe', this.make('SUBSCRIBE'));
-
-    _defineProperty(this, 'trace', this.make('TRACE'));
-
-    _defineProperty(this, 'unbind', this.make('UNBIND'));
-
-    _defineProperty(this, 'unlink', this.make('UNLINK'));
-
-    _defineProperty(this, 'unlock', this.make('UNLOCK'));
-
-    _defineProperty(this, 'unsubscribe', this.make('UNSUBSCRIBE'));
-
     this.routes = routes;
   }
 
-  merge(prefix, router) {
-    var newRoutes = Object.fromEntries(Object.entries(router.routes).map(_ref => {
-      var [k, v] = _ref;
-      return ["".concat(prefix).concat(k), v];
-    }));
-
-    var merged = _objectSpread2(_objectSpread2({}, this.routes), newRoutes);
-
-    return this._copy(merged);
-  }
-
   toFindMyWay(server) {
-    var _this = this;
-
     var instance = fmw({
       ignoreTrailingSlash: true,
 
@@ -412,54 +351,69 @@ class Router {
       }
 
     });
-    var paths = Object.keys(this.routes);
 
-    var _loop = function _loop(path) {
-      var route = _this.routes[path];
-      instance.on(route.method, path, /*#__PURE__*/function () {
-        var _ref2 = _asyncToGenerator(function* (incomingMessage, serverResponse, params) {
+    var _loop = function _loop(route) {
+      var handler = /*#__PURE__*/function () {
+        var _ref = _asyncToGenerator(function* (incomingMessage, serverResponse, params) {
           var req = new KaitoRequest(incomingMessage);
           var res = new KaitoResponse(serverResponse);
-          yield Router.handle(server, {
-            route,
+          yield Router.handle(server, route, {
             params,
             req,
             res
           });
         });
 
-        return function (_x, _x2, _x3) {
-          return _ref2.apply(this, arguments);
+        return function handler(_x, _x2, _x3) {
+          return _ref.apply(this, arguments);
         };
-      }());
+      }();
+
+      if (route.method === '*') {
+        instance.all(route.path, handler);
+        return "continue";
+      }
+
+      instance.on(route.method, route.path, handler);
     };
 
-    for (var path of paths) {
-      _loop(path);
+    for (var route of this.routes) {
+      var _ret = _loop(route);
+
+      if (_ret === "continue") continue;
     }
 
     return instance;
   }
 
-  _copy(routes) {
-    return new Router(routes);
+  add(route) {
+    return new Router([...this.routes, route]);
   }
 
-  make(method) {
-    return (path, route) => {
-      var addedRoute = _objectSpread2(_objectSpread2({}, route), {}, {
-        method
-      }); // `as unknown` is required because otherwise
-      // this type just gets massive and too slow,
-      // so we have to write it out specifically
+  map() {
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    var result = {};
 
+    for (var route of this.routes) {
+      var _result$method;
 
-      var merged = _objectSpread2(_objectSpread2({}, this.routes), {}, {
-        [path]: addedRoute
+      var method = route.method;
+      result[method] = _objectSpread2(_objectSpread2({}, (_result$method = result[method]) !== null && _result$method !== void 0 ? _result$method : {}), {}, {
+        [route.path]: route
       });
+    }
 
-      return this._copy(merged);
-    };
+    return result;
+  }
+
+  merge(prefix, router) {
+    return this.copyContext([...this.routes, ...router.routes.map(route => _objectSpread2(_objectSpread2({}, route), {}, {
+      path: prefix + route.path
+    }))]);
+  }
+
+  copyContext(routes) {
+    return new Router(routes);
   }
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaito-http/core",
-  "version": "2.3.7",
+  "version": "2.4.0",
   "description": "Functional HTTP Framework for TypeScript",
   "repository": "https://github.com/kaito-http/kaito",
   "author": "Alistair Smith <hi@alistair.sh>",