@sapphire/plugin-api 7.0.0-next.d27dc1c → 7.0.0-next.d6024cd

package/dist/cjs/index.cjs

@@ -12,16 +12,18 @@ var MediaParserStore_cjs = require('./lib/structures/MediaParserStore.cjs');
 var Middleware_cjs = require('./lib/structures/Middleware.cjs');
 var MiddlewareStore_cjs = require('./lib/structures/MiddlewareStore.cjs');
 var Route_cjs = require('./lib/structures/Route.cjs');
+var RouterBranch_cjs = require('./lib/structures/router/RouterBranch.cjs');
+var RouterNode_cjs = require('./lib/structures/router/RouterNode.cjs');
+var RouterRoot_cjs = require('./lib/structures/router/RouterRoot.cjs');
 var RouteStore_cjs = require('./lib/structures/RouteStore.cjs');
 var MimeTypes_cjs = require('./lib/utils/MimeTypes.cjs');
-var RouteData_cjs = require('./lib/utils/RouteData.cjs');
 var _load_cjs = require('./listeners/_load.cjs');
 var _load_cjs$1 = require('./mediaParsers/_load.cjs');
 var _load_cjs$2 = require('./middlewares/_load.cjs');
 var _load_cjs$3 = require('./routes/_load.cjs');
 
 // src/index.ts
-var version = "7.0.0-next.d27dc1c";
+var version = "7.0.0-next.d6024cd";
 
 Object.defineProperty(exports, "loadListeners", {
   enumerable: true,
@@ -112,23 +114,35 @@ Object.keys(Route_cjs).forEach(function (k) {
     get: function () { return Route_cjs[k]; }
   });
 });
-Object.keys(RouteStore_cjs).forEach(function (k) {
+Object.keys(RouterBranch_cjs).forEach(function (k) {
   if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
     enumerable: true,
-    get: function () { return RouteStore_cjs[k]; }
+    get: function () { return RouterBranch_cjs[k]; }
   });
 });
-Object.keys(MimeTypes_cjs).forEach(function (k) {
+Object.keys(RouterNode_cjs).forEach(function (k) {
   if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
     enumerable: true,
-    get: function () { return MimeTypes_cjs[k]; }
+    get: function () { return RouterNode_cjs[k]; }
+  });
+});
+Object.keys(RouterRoot_cjs).forEach(function (k) {
+  if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: function () { return RouterRoot_cjs[k]; }
   });
 });
-Object.keys(RouteData_cjs).forEach(function (k) {
+Object.keys(RouteStore_cjs).forEach(function (k) {
+  if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: function () { return RouteStore_cjs[k]; }
+  });
+});
+Object.keys(MimeTypes_cjs).forEach(function (k) {
   if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
     enumerable: true,
-    get: function () { return RouteData_cjs[k]; }
+    get: function () { return MimeTypes_cjs[k]; }
   });
 });
-//# sourceMappingURL=out.js.map
+//# sourceMappingURL=index.cjs.map
 //# sourceMappingURL=index.cjs.map

package/dist/cjs/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts"],"names":[],"mappings":";AAKA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,SAAS,qBAAqB;AAC9B,SAAS,wBAAwB;AACjC,SAAS,uBAAuB;AAChC,SAAS,kBAAkB;AA+BpB,IAAM,UAAkB","sourcesContent":["import type { Server, ServerOptions } from './lib/structures/http/Server';\nimport type { MediaParserStore } from './lib/structures/MediaParserStore';\nimport type { MiddlewareStore } from './lib/structures/MiddlewareStore';\nimport type { RouteStore } from './lib/structures/RouteStore';\n\nexport * from './lib/structures/api/ApiRequest';\nexport * from './lib/structures/api/ApiResponse';\nexport * from './lib/structures/api/CookieStore';\nexport * from './lib/structures/http/Auth';\nexport * from './lib/structures/http/HttpCodes';\nexport * from './lib/structures/http/HttpMethods';\nexport * from './lib/structures/http/Server';\nexport * from './lib/structures/MediaParser';\nexport * from './lib/structures/MediaParserStore';\nexport * from './lib/structures/Middleware';\nexport * from './lib/structures/MiddlewareStore';\nexport * from './lib/structures/Route';\nexport * from './lib/structures/RouteStore';\nexport * from './lib/utils/MimeTypes';\nexport * from './lib/utils/RouteData';\n\nexport { loadListeners } from './listeners/_load';\nexport { loadMediaParsers } from './mediaParsers/_load';\nexport { loadMiddlewares } from './middlewares/_load';\nexport { loadRoutes } from './routes/_load';\n\ndeclare module 'discord.js' {\n\tinterface Client {\n\t\tserver: Server;\n\t}\n\n\tinterface ClientOptions {\n\t\tapi?: ServerOptions;\n\t}\n}\n\ndeclare module '@sapphire/pieces' {\n\tinterface StoreRegistryEntries {\n\t\troutes: RouteStore;\n\t\tmediaParsers: MediaParserStore;\n\t\tmiddlewares: MiddlewareStore;\n\t}\n\n\tinterface Container {\n\t\tserver: Server;\n\t}\n}\n\n/**\n * The [@sapphire/plugin-api](https://github.com/sapphiredev/plugins/blob/main/packages/api) version that you are currently using.\n * An example use of this is showing it of in a bot information command.\n *\n * Note to Sapphire developers: This needs to explicitly be `string` so it is not typed as the string that gets replaced by esbuild\n */\n// eslint-disable-next-line @typescript-eslint/no-inferrable-types\nexport const version: string = '7.0.0-next.d27dc1c';\n"]}
+{"version":3,"sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAyDO,IAAM,OAAkB,GAAA","file":"index.cjs","sourcesContent":["import type { Server, ServerOptions } from './lib/structures/http/Server';\nimport type { MediaParserStore } from './lib/structures/MediaParserStore';\nimport type { MiddlewareStore } from './lib/structures/MiddlewareStore';\nimport type { RouteStore } from './lib/structures/RouteStore';\n\nexport * from './lib/structures/api/ApiRequest';\nexport * from './lib/structures/api/ApiResponse';\nexport * from './lib/structures/api/CookieStore';\nexport * from './lib/structures/http/Auth';\nexport * from './lib/structures/http/HttpCodes';\nexport * from './lib/structures/http/HttpMethods';\nexport * from './lib/structures/http/Server';\nexport * from './lib/structures/MediaParser';\nexport * from './lib/structures/MediaParserStore';\nexport * from './lib/structures/Middleware';\nexport * from './lib/structures/MiddlewareStore';\nexport * from './lib/structures/Route';\nexport * from './lib/structures/router/RouterBranch';\nexport * from './lib/structures/router/RouterNode';\nexport * from './lib/structures/router/RouterRoot';\nexport * from './lib/structures/RouteStore';\nexport * from './lib/utils/MimeTypes';\n\nexport { loadListeners } from './listeners/_load';\nexport { loadMediaParsers } from './mediaParsers/_load';\nexport { loadMiddlewares } from './middlewares/_load';\nexport { loadRoutes } from './routes/_load';\n\ndeclare module 'discord.js' {\n\tinterface Client {\n\t\tserver: Server;\n\t}\n\n\tinterface ClientOptions {\n\t\tapi?: ServerOptions;\n\t}\n}\n\ndeclare module '@sapphire/pieces' {\n\tinterface StoreRegistryEntries {\n\t\troutes: RouteStore;\n\t\tmediaParsers: MediaParserStore;\n\t\tmiddlewares: MiddlewareStore;\n\t}\n\n\tinterface Container {\n\t\tserver: Server;\n\t}\n}\n\n/**\n * The [@sapphire/plugin-api](https://github.com/sapphiredev/plugins/blob/main/packages/api) version that you are currently using.\n * An example use of this is showing it of in a bot information command.\n *\n * Note to Sapphire developers: This needs to explicitly be `string` so it is not typed as the string that gets replaced by esbuild\n */\n// eslint-disable-next-line @typescript-eslint/no-inferrable-types\nexport const version: string = '7.0.0-next.d6024cd';\n"]}

package/dist/cjs/index.d.cts

@@ -1,11 +1,33 @@
-import { EventEmitter } from 'node:events';
+import { AsyncEventEmitter } from '@vladfrangu/async_event_emitter';
 import { IncomingMessage, ServerResponse, Server as Server$1, ServerOptions as ServerOptions$1 } from 'node:http';
 import { ListenOptions } from 'node:net';
-import { Store, Piece } from '@sapphire/pieces';
+import { Piece, Store } from '@sapphire/pieces';
 import { Awaitable } from '@sapphire/utilities';
 import { Gunzip } from 'zlib';
-import { Snowflake, OAuth2Scopes, RESTGetAPICurrentUserResult, RESTGetAPICurrentUserGuildsResult, RESTGetAPICurrentUserConnectionsResult, Collection } from 'discord.js';
 import { Readable } from 'node:stream';
+import { Snowflake, OAuth2Scopes, RESTGetAPICurrentUserResult, RESTGetAPICurrentUserGuildsResult, RESTGetAPICurrentUserConnectionsResult } from 'discord.js';
+
+declare enum MimeTypes {
+    ApplicationFormUrlEncoded = "application/x-www-form-urlencoded",
+    ApplicationJson = "application/json",
+    AudioOgg = "audio/ogg",
+    AudioOpus = "audio/opus",
+    AudioWebm = "audio/webm",
+    ImageGif = "image/gif",
+    ImageJpg = "image/jpeg",
+    ImagePng = "image/png",
+    ImageWebp = "image/webp",
+    ImageXIcon = "image/x-icon",
+    TextPlain = "text/plain",
+    TextHtml = "text/html",
+    VideoMp4 = "video/mp4",
+    VideoMpeg = "video/mpeg",
+    VideoOgg = "video/ogg",
+    VideoWebm = "video/webm"
+}
+
+type MethodName = (typeof MethodNames)[number];
+declare const MethodNames: readonly ["ACL", "BIND", "CHECKOUT", "CONNECT", "COPY", "DELETE", "GET", "HEAD", "LINK", "LOCK", "M-SEARCH", "MERGE", "MKACTIVITY", "MKCALENDAR", "MKCOL", "MOVE", "NOTIFY", "OPTIONS", "PATCH", "POST", "PROPFIND", "PROPPATCH", "PURGE", "PUT", "REBIND", "REPORT", "SEARCH", "SOURCE", "SUBSCRIBE", "TRACE", "UNBIND", "UNLINK", "UNLOCK", "UNSUBSCRIBE"];
 
 declare class Auth {
     #private;
@@ -167,82 +189,6 @@ interface LoginDataTransformer<T extends LoginData = LoginData> {
     (data: LoginData): Awaitable<T>;
 }
 
-declare class ApiRequest extends IncomingMessage {
-    /**
-     * The query parameters.
-     */
-    query: Record<string, string | string[]>;
-    /**
-     * The URI parameters.
-     */
-    params: Record<string, string>;
-    /**
-     * The body that was sent by the user.
-     */
-    body?: unknown;
-    /**
-     * The authorization information. This field indicates three possible values:
-     *
-     * - `undefined`: The authorization middleware has not been executed yet.
-     * - `null`: The user is not authorized.
-     * - `AuthData`: The user is authorized.
-     */
-    auth?: AuthData | null;
-}
-
-/**
- * @since 1.0.0
- */
-declare enum TypeState {
-    /**
-     * @since 1.0.0
-     */
-    Static = 0,
-    /**
-     * @since 1.0.0
-     */
-    Dynamic = 1
-}
-type MatchData = Record<string, string> | null;
-declare class RouteData {
-    readonly path: string;
-    private readonly static;
-    private readonly parts;
-    constructor(path: string);
-    match(split: readonly string[]): MatchData;
-    /**
-     * @since 1.0.0
-     */
-    private static parsePart;
-    /**
-     * @since 1.0.0
-     */
-    private static split;
-}
-interface ParsedPart {
-    value: string;
-    type: TypeState;
-}
-
-declare enum MimeTypes {
-    ApplicationFormUrlEncoded = "application/x-www-form-urlencoded",
-    ApplicationJson = "application/json",
-    AudioOgg = "audio/ogg",
-    AudioOpus = "audio/opus",
-    AudioWebm = "audio/webm",
-    ImageGif = "image/gif",
-    ImageJpg = "image/jpeg",
-    ImagePng = "image/png",
-    ImageWebp = "image/webp",
-    ImageXIcon = "image/x-icon",
-    TextPlain = "text/plain",
-    TextHtml = "text/html",
-    VideoMp4 = "video/mp4",
-    VideoMpeg = "video/mpeg",
-    VideoOgg = "video/ogg",
-    VideoWebm = "video/webm"
-}
-
 declare class CookieStore extends Map<string, string> {
     protected request: ApiRequest;
     protected response: ApiResponse;
@@ -307,6 +253,10 @@ declare class ApiResponse<Request extends IncomingMessage = IncomingMessage> ext
      * @since 1.0.0
      */
     notFound(data?: unknown): void;
+    /**
+     * @since 7.0.0
+     */
+    methodNotAllowed(data?: unknown): void;
     /**
      * @since 1.0.0
      */
@@ -350,32 +300,13 @@ declare class ApiResponse<Request extends IncomingMessage = IncomingMessage> ext
     setContentType(contentType: MimeTypes): this;
 }
 
-type Methods = 'ACL' | 'BIND' | 'CHECKOUT' | 'CONNECT' | 'COPY' | 'DELETE' | 'GET' | 'HEAD' | 'LINK' | 'LOCK' | 'M-SEARCH' | 'MERGE' | 'MKACTIVITY' | 'MKCALENDAR' | 'MKCOL' | 'MOVE' | 'NOTIFY' | 'OPTIONS' | 'PATCH' | 'POST' | 'PRI' | 'PROPFIND' | 'PROPPATCH' | 'PURGE' | 'PUT' | 'REBIND' | 'REPORT' | 'SEARCH' | 'SOURCE' | 'SUBSCRIBE' | 'TRACE' | 'UNBIND' | 'UNLINK' | 'UNLOCK' | 'UNSUBSCRIBE';
-declare const methods: Record<Methods, symbol>;
-declare const methodEntries: readonly [Methods, symbol][];
-
-interface MethodCallback {
-    (request: ApiRequest, response: ApiResponse): unknown;
-}
-interface RouteMatch {
-    route: Route;
-    cb: MethodCallback;
-}
-/**
- * @since 1.0.0
- */
-declare class RouteStore extends Store<Route, 'routes'> {
-    readonly table: Collection<Methods, Collection<Route<RouteOptions>, MethodCallback>>;
-    constructor();
-    match(request: ApiRequest): RouteMatch | null;
-    private parseURL;
-}
-
 interface RouteOptions extends Piece.Options {
     /**
      * The route the piece should represent.
      * @since 1.0.0
-     * @default ''
+     *
+     * @defaultValue The filesystem-based path, or the name if the location is virtual.
+     *
      * @example
      * ```typescript
      * '/users'
@@ -391,18 +322,61 @@ interface RouteOptions extends Piece.Options {
     /**
      * (RFC 7230 3.3.2) The maximum decimal number of octets.
      * @since 1.0.0
-     * @default this.context.server.options.maximumBodyLength ?? 1024 * 1024 * 50
+     *
+     * @defaultValue this.context.server.options.maximumBodyLength ?? 1024 * 1024 * 50
      */
     maximumBodyLength?: number;
     /**
      * The accepted content types for this route. If set to null, the route will accept any data.
      * @since 1.3.0
-     * @default this.context.server.options.acceptedContentMimeTypes ?? null
+     *
+     * @defaultValue this.context.server.options.acceptedContentMimeTypes ?? null
      */
-    acceptedContentMimeTypes?: MimeTypeWithoutParameters[] | null;
+    acceptedContentMimeTypes?: readonly MimeTypeWithoutParameters[] | null;
+    /**
+     * The methods this route accepts.
+     * @since 7.0.0
+     *
+     * @defaultValue The method defined in the piece name, or none if not set.
+     */
+    methods?: readonly MethodName[];
 }
 /**
  * @since 1.0.0
+ *
+ * @example A simple GET route that returns a JSON response:
+ * ```typescript
+ * // hello.get.ts
+ * import { Route } from '@sapphire/plugin-api';
+ *
+ * export class MyRoute extends Route {
+ *   public run(request: Route.Request, response: Route.Response) {
+ *     return response.json({ message: 'Hello, World!' });
+ *   }
+ * }
+ * ```
+ *
+ * ```bash
+ * $ curl http://localhost:4000/hello
+ * {"message":"Hello, World!"}
+ * ```
+ *
+ * @example A simple POST route that reads the body and returns it:
+ * ```typescript
+ * // echo.post.ts
+ * import { Route } from '@sapphire/plugin-api';
+ *
+ * export class MyRoute extends Route {
+ *   public run(request: Route.Request, response: Route.Response) {
+ *     return response.json(request.params);
+ *   }
+ * }
+ * ```
+ *
+ * ```bash
+ * $ curl -X POST -H "Content-Type: application/json" -d '{"hello":"world"}' http://localhost:4000/echo
+ * {"hello":"world"}
+ * ```
  */
 declare abstract class Route<Options extends Route.Options = Route.Options> extends Piece<Options, 'routes'> {
     /**
@@ -414,24 +388,15 @@ declare abstract class Route<Options extends Route.Options = Route.Options> exte
      */
     readonly acceptedContentMimeTypes: readonly MimeTypeWithoutParameters[] | null;
     /**
-     * The route information.
+     * The path this route represents.
      */
-    readonly router: RouteData;
+    readonly path: readonly string[];
     /**
      * The methods this route accepts.
      */
-    readonly methods: Collection<Methods, MethodCallback>;
+    readonly methods: ReadonlySet<MethodName>;
     constructor(context: Route.LoaderContext, options?: Options);
-    /**
-     * Per-piece listener that is called when the piece is loaded into the store.
-     * Useful to set-up asynchronous initialization tasks.
-     */
-    onLoad(): Awaitable<unknown>;
-    /**
-     * Per-piece listener that is called when the piece is unloaded from the store.
-     * Useful to set-up clean-up tasks.
-     */
-    onUnload(): Awaitable<unknown>;
+    abstract run(request: Route.Request, response: Route.Response): Awaitable<unknown>;
 }
 declare namespace Route {
     /** @deprecated Use {@linkcode LoaderContext} instead. */
@@ -444,6 +409,141 @@ declare namespace Route {
     type Response = ApiResponse;
 }
 
+declare class RouterBranch {
+    /**
+     * The name of the branch.
+     */
+    readonly name: string;
+    /**
+     * Whether or not the branch is dynamic.
+     */
+    readonly dynamic: boolean;
+    /**
+     * The parent branch, if any.
+     */
+    readonly parent: RouterBranch | null;
+    /**
+     * The node this branch is associated with.
+     */
+    readonly node: RouterNode;
+    /**
+     * The methods supported by the branch's node or any of its children.
+     */
+    supportedMethods: readonly string[];
+    private _staticChildren;
+    private _dynamicChild;
+    constructor(name: string, dynamic: boolean, parent: RouterBranch | null);
+    /**
+     * The path representing this branch
+     * @version 7.0.0
+     */
+    get path(): string;
+    /**
+     * The branches the branch is associated with
+     * @version 7.0.0
+     */
+    get children(): RouterBranch[];
+    /**
+     * Whether or not the branch is empty
+     * @version 7.0.0
+     */
+    get empty(): boolean;
+    /**
+     * Tries to find a branch given a path
+     * @version 7.0.0
+     *
+     * @param parts The parts of a path to find a node from
+     * @returns The branch found, or null if not found
+     */
+    find(parts: readonly string[]): RouterBranch | null;
+    /**
+     * Checks if the given name matches the branch
+     * @version 7.0.0
+     *
+     * @param name The name to match
+     * @returns Whether or not the branch matches the name
+     */
+    matches(name: string): boolean;
+    /**
+     * Returns the string representation of the branch
+     * @version 7.0.0
+     *
+     * @returns The string representation of the branch
+     */
+    toString(): string;
+    nodes(): IterableIterator<RouterNode>;
+    protected _add(parts: readonly string[], index: number, route: Route): RouterNode;
+    protected _remove(parts: readonly string[], index: number, route: Route): boolean;
+    protected _performAdd(parts: readonly string[], index: number, route: Route): RouterNode;
+    protected _performRemove(parts: readonly string[], index: number, route: Route): boolean;
+    protected _find(parts: readonly string[], index: number): RouterBranch | null;
+    protected _updateSupportedChildrenMethods(): void;
+}
+
+declare class RouterNode {
+    #private;
+    /**
+     * The branch containing this node.
+     */
+    readonly parent: RouterBranch;
+    constructor(parent: RouterBranch);
+    get path(): string;
+    extractParameters(parts: readonly string[]): Record<string, string>;
+    get(method: MethodName): Route | null;
+    set(method: MethodName, route: Route): this;
+    delete(method: MethodName, route: Route): boolean;
+    methods(): IterableIterator<MethodName>;
+}
+
+declare class ApiRequest extends IncomingMessage {
+    /**
+     * The query parameters.
+     */
+    query: Record<string, string | string[]>;
+    /**
+     * The URI parameters.
+     */
+    params: Record<string, string>;
+    /**
+     * The body that was sent by the user.
+     */
+    body?: unknown;
+    /**
+     * The authorization information. This field indicates three possible values:
+     *
+     * - `undefined`: The authorization middleware has not been executed yet.
+     * - `null`: The user is not authorized.
+     * - `AuthData`: The user is authorized.
+     */
+    auth?: AuthData | null;
+    /**
+     * The router node that matched the request. The field indicates three
+     * possible values:
+     *
+     * - `undefined`: The router handler has not been executed yet.
+     * - `null`: The router handler has been executed, but no node matched the
+     *   request.
+     * - `RouterNode`: The router handler has been executed and a node matched
+     *   the request.
+     *
+     * @since 7.0.0
+     */
+    routerNode?: RouterNode | null;
+    /**
+     * The route that matched the request. The field indicates three possible
+     * values:
+     *
+     * - `undefined`: The router handler has not been executed yet.
+     * - `null`: The router handler has been executed, but no route matched the
+     *   request.
+     * - `Route`: The router handler has been executed and a route matched the
+     *   request.
+     *
+     * @since 7.0.0
+     */
+    route?: Route | null;
+}
+
 /**
  * A media parser
  * @since 1.3.0
@@ -454,7 +554,7 @@ declare abstract class MediaParser<Options extends MediaParser.Options = MediaPa
      * Parses the body data from an API request.
      * @since 1.3.0
      */
-    abstract run(request: ApiRequest): Awaitable<unknown>;
+    abstract run(request: MediaParser.Request): Awaitable<unknown>;
     /**
      * Checks if a route accepts the media type from this parser.
      * @since 1.3.0
@@ -466,19 +566,19 @@ declare abstract class MediaParser<Options extends MediaParser.Options = MediaPa
      * @since 1.3.0
      * @param request The request to read the body from.
      */
-    protected readString(request: ApiRequest): Promise<string>;
+    protected readString(request: MediaParser.Request): Promise<string>;
     /**
      * Reads the content body as a buffer, this is useful for parsing/reading binary data.
      * @since 1.3.0
      * @param request The request to read the body from.
      */
-    protected readBuffer(request: ApiRequest): Promise<Buffer>;
+    protected readBuffer(request: MediaParser.Request): Promise<Buffer>;
     /**
      * Reads the content stream from a request, piping the data through a transformer stream.
      * @since 1.3.0
      * @param request The request to read the body from.
      */
-    protected contentStream(request: ApiRequest): ApiRequest | Gunzip | null;
+    protected contentStream(request: MediaParser.Request): MediaParser.Request | Gunzip | null;
 }
 declare namespace MediaParser {
     /** @deprecated Use {@linkcode LoaderContext} instead. */
@@ -487,6 +587,7 @@ declare namespace MediaParser {
     type Options = Piece.Options;
     type JSON = Piece.JSON;
     type LocationJSON = Piece.LocationJSON;
+    type Request = ApiRequest;
 }
 
 /**
@@ -535,7 +636,7 @@ declare abstract class Middleware<Options extends Middleware.Options = Middlewar
      * @param response The server's response.
      * @param route The route that matched this request, will be `null` if none matched.
      */
-    abstract run(request: ApiRequest, response: ApiResponse, route: Route | null): Awaitable<unknown>;
+    abstract run(request: Middleware.Request, response: Middleware.Response): Awaitable<unknown>;
 }
 declare namespace Middleware {
     /** @deprecated Use {@linkcode LoaderContext} instead. */
@@ -544,6 +645,8 @@ declare namespace Middleware {
     type Options = MiddlewareOptions;
     type JSON = Piece.JSON;
     type LocationJSON = Piece.LocationJSON;
+    type Request = ApiRequest;
+    type Response = ApiResponse;
 }
 
 /**
@@ -555,26 +658,68 @@ declare class MiddlewareStore extends Store<Middleware, 'middlewares'> {
      */
     readonly sortedMiddlewares: Middleware[];
     constructor();
-    run(request: ApiRequest, response: ApiResponse, route: Route | null): Promise<void>;
+    run(request: Middleware.Request, response: Middleware.Response): Promise<void>;
     set(key: string, value: Middleware): this;
     delete(key: string): boolean;
     clear(): void;
 }
 
-declare enum ServerEvents {
+declare class RouterRoot extends RouterBranch {
+    constructor();
+    /**
+     * Adds a route to the branch
+     *
+     * @param route The route to add
+     * @returns The node the route was added to
+     */
+    add(route: Route): RouterNode;
+    /**
+     * Removes a route from the branch
+     *
+     * @param route The route to remove
+     * @returns Whether or not the route was removed
+     */
+    remove(route: Route): boolean;
+    get path(): string;
+    toString(): string;
+    static normalize(path: string | null | undefined): string[];
+    static extractMethod(path: readonly string[]): MethodName | null;
+}
+
+/**
+ * @since 1.0.0
+ */
+declare class RouteStore extends Store<Route, 'routes'> {
+    readonly router: RouterRoot;
+    constructor();
+}
+
+declare enum ServerEvent {
     Error = "error",
     Request = "request",
-    Match = "match",
-    NoMatch = "noMatch",
+    RouterBranchNotFound = "routerBranchNotFound",
+    RouterBranchMethodNotAllowed = "routerBranchMethodNotAllowed",
+    RouterFound = "routerFound",
     RouteError = "routeError",
     MiddlewareFailure = "middlewareFailure",
     MiddlewareError = "middlewareError",
     MiddlewareSuccess = "middlewareSuccess"
 }
+interface ServerEvents {
+    [ServerEvent.Error]: [error: Error, request: ApiRequest, response: ApiResponse];
+    [ServerEvent.Request]: [request: ApiRequest, response: ApiResponse];
+    [ServerEvent.RouterBranchNotFound]: [request: ApiRequest, response: ApiResponse];
+    [ServerEvent.RouterBranchMethodNotAllowed]: [request: ApiRequest, response: ApiResponse, node: RouterBranch];
+    [ServerEvent.RouterFound]: [request: ApiRequest, response: ApiResponse];
+    [ServerEvent.RouteError]: [error: Error, request: ApiRequest, response: ApiResponse];
+    [ServerEvent.MiddlewareFailure]: [request: ApiRequest, response: ApiResponse];
+    [ServerEvent.MiddlewareSuccess]: [request: Route.Request, response: Route.Response, route: Route];
+    [ServerEvent.MiddlewareError]: [error: Error, request: ApiRequest, response: ApiResponse];
+}
 /**
  * @since 1.0.0
  */
-declare class Server extends EventEmitter {
+declare class Server extends AsyncEventEmitter<ServerEvents> {
     /**
      * The routes this server holds.
      * @since 1.0.0
@@ -707,27 +852,6 @@ interface ServerOptions {
  * @since 1.0.0
  */
 type AuthLessServerOptions = Omit<ServerOptions, 'auth'>;
-/**
- * The context sent in the error events.
- * @since 1.2.0
- */
-interface MiddlewareErrorContext {
-    /**
-     * The erroneous request.
-     * @since 1.2.0
-     */
-    request: ApiRequest;
-    /**
-     * The server's response.
-     * @since 1.2.0
-     */
-    response: ApiResponse;
-    /**
-     * The route match.
-     * @since 1.2.0
-     */
-    match: RouteMatch;
-}
 
 declare enum HttpCodes {
     /**
@@ -1141,4 +1265,4 @@ declare module '@sapphire/pieces' {
  */
 declare const version: string;
 
-export { ApiRequest, ApiResponse, Auth, type AuthData, type AuthLessServerOptions, type ContentTypeParameter, type ContentTypeType, CookieStore, HttpCodes, type LoginData, type LoginDataTransformer, type MatchData, MediaParser, MediaParserStore, type MethodCallback, type Methods, Middleware, type MiddlewareErrorContext, type MiddlewareOptions, MiddlewareStore, type MimeType, type MimeTypeWithoutParameters, MimeTypes, type ParsedPart, Route, RouteData, type RouteMatch, type RouteOptions, RouteStore, type SecureCookieStoreSetOptions, Server, ServerEvents, type ServerOptions, type ServerOptionsAuth, TypeState, loadListeners, loadMediaParsers, loadMiddlewares, loadRoutes, methodEntries, methods, version };
+export { ApiRequest, ApiResponse, Auth, type AuthData, type AuthLessServerOptions, type ContentTypeParameter, type ContentTypeType, CookieStore, HttpCodes, type LoginData, type LoginDataTransformer, MediaParser, MediaParserStore, type MethodName, MethodNames, Middleware, type MiddlewareOptions, MiddlewareStore, type MimeType, type MimeTypeWithoutParameters, MimeTypes, Route, type RouteOptions, RouteStore, RouterBranch, RouterNode, RouterRoot, type SecureCookieStoreSetOptions, Server, ServerEvent, type ServerEvents, type ServerOptions, type ServerOptionsAuth, loadListeners, loadMediaParsers, loadMiddlewares, loadRoutes, version };

package/dist/cjs/lib/structures/Augmentations.d.cjs

@@ -1,4 +1,4 @@
 'use strict';
 
-//# sourceMappingURL=out.js.map
+//# sourceMappingURL=Augmentations.d.cjs.map
 //# sourceMappingURL=Augmentations.d.cjs.map

package/dist/cjs/lib/structures/Augmentations.d.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":""}
+{"version":3,"sources":[],"names":[],"mappings":"","file":"Augmentations.d.cjs"}

package/dist/cjs/lib/structures/MediaParser.cjs

@@ -75,5 +75,5 @@ __name(_MediaParser, "MediaParser");
 var MediaParser = _MediaParser;
 
 exports.MediaParser = MediaParser;
-//# sourceMappingURL=out.js.map
+//# sourceMappingURL=MediaParser.cjs.map
 //# sourceMappingURL=MediaParser.cjs.map