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

package/dist/cjs/lib/structures/router/RouterBranch.cjs

@@ -0,0 +1,184 @@
+'use strict';
+
+var utilities = require('@sapphire/utilities');
+var RouterNode_cjs = require('./RouterNode.cjs');
+
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+var _RouterBranch = class _RouterBranch {
+  constructor(name, dynamic, parent) {
+    /**
+     * The name of the branch.
+     */
+    __publicField(this, "name");
+    /**
+     * Whether or not the branch is dynamic.
+     */
+    __publicField(this, "dynamic");
+    /**
+     * The parent branch, if any.
+     */
+    __publicField(this, "parent");
+    /**
+     * The node this branch is associated with.
+     */
+    __publicField(this, "node", new RouterNode_cjs.RouterNode(this));
+    /**
+     * The methods supported by the branch's node or any of its children.
+     */
+    __publicField(this, "supportedMethods", []);
+    __publicField(this, "_staticChildren", []);
+    __publicField(this, "_dynamicChild", null);
+    this.name = name;
+    this.dynamic = dynamic;
+    this.parent = parent;
+  }
+  /**
+   * The path representing this branch
+   * @version 7.0.0
+   */
+  get path() {
+    return this.parent ? `${this.parent}/${this}` : `${this}`;
+  }
+  /**
+   * The branches the branch is associated with
+   * @version 7.0.0
+   */
+  get children() {
+    return this._staticChildren.concat(this._dynamicChild ?? []);
+  }
+  /**
+   * Whether or not the branch is empty
+   * @version 7.0.0
+   */
+  get empty() {
+    return this._staticChildren.length === 0 && this._dynamicChild === null;
+  }
+  /**
+   * 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) {
+    return this._find(parts, 0);
+  }
+  /**
+   * 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) {
+    return this.dynamic || this.name === name;
+  }
+  /**
+   * Returns the string representation of the branch
+   * @version 7.0.0
+   *
+   * @returns The string representation of the branch
+   */
+  toString() {
+    return this.dynamic ? `[${this.name}]` : this.name;
+  }
+  *nodes() {
+    yield this.node;
+    for (const child of this._staticChildren) {
+      yield* child.nodes();
+    }
+    if (this._dynamicChild) {
+      yield* this._dynamicChild.nodes();
+    }
+  }
+  _add(parts, index, route) {
+    const result = this._performAdd(parts, index, route);
+    this._updateSupportedChildrenMethods();
+    return result;
+  }
+  _remove(parts, index, route) {
+    const result = this._performRemove(parts, index, route);
+    if (result) this._updateSupportedChildrenMethods();
+    return result;
+  }
+  _performAdd(parts, index, route) {
+    if (index >= parts.length) {
+      for (const method of route.methods) {
+        this.node.set(method, route);
+      }
+      return this.node;
+    }
+    const part = parts[index];
+    const child = this._staticChildren.find((branch2) => branch2.matches(part));
+    if (child) {
+      return child._add(parts, index + 1, route);
+    }
+    if (this._dynamicChild) {
+      return this._dynamicChild._add(parts, index + 1, route);
+    }
+    const dynamic = part.startsWith("[") && part.endsWith("]");
+    let branch;
+    if (dynamic) {
+      branch = new _RouterBranch(part.slice(1, -1), true, this);
+      this._dynamicChild = branch;
+    } else {
+      branch = new _RouterBranch(part, false, this);
+      this._staticChildren.push(branch);
+    }
+    return branch._add(parts, index + 1, route);
+  }
+  _performRemove(parts, index, route) {
+    if (index >= parts.length) {
+      let success = false;
+      for (const method of route.methods) {
+        if (this.node.delete(method, route)) {
+          success = true;
+        }
+      }
+      return success;
+    }
+    const part = parts[index];
+    const staticChildIndex = this._staticChildren.findIndex((branch) => branch.matches(part));
+    if (staticChildIndex === -1) {
+      const child = this._staticChildren[index];
+      const removed = child._remove(parts, index + 1, route);
+      if (removed && child.empty) {
+        this._staticChildren = this._staticChildren.filter((branch) => branch !== child);
+      }
+      return removed;
+    }
+    if (this._dynamicChild) {
+      const removed = this._dynamicChild._remove(parts, index + 1, route);
+      if (removed && this._dynamicChild.empty) {
+        this._dynamicChild = null;
+      }
+      return removed;
+    }
+    return false;
+  }
+  _find(parts, index) {
+    if (index >= parts.length) return this;
+    const part = parts[index];
+    const child = this._staticChildren.find((branch) => branch.matches(part)) ?? this._dynamicChild;
+    if (utilities.isNullish(child)) return null;
+    return child._find(parts, index + 1);
+  }
+  _updateSupportedChildrenMethods() {
+    const methods = new Set(this.node.methods());
+    for (const child of this.children) {
+      for (const method of child.node.methods()) {
+        methods.add(method);
+      }
+    }
+    this.supportedMethods = [...methods];
+  }
+};
+__name(_RouterBranch, "RouterBranch");
+var RouterBranch = _RouterBranch;
+
+exports.RouterBranch = RouterBranch;
+//# sourceMappingURL=out.js.map
+//# sourceMappingURL=RouterBranch.cjs.map

package/dist/cjs/lib/structures/router/RouterBranch.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/lib/structures/router/RouterBranch.ts"],"names":["branch"],"mappings":"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","sourcesContent":["import { isNullish } from '@sapphire/utilities';\nimport type { Route } from '../Route';\nimport { RouterNode } from './RouterNode';\n\nexport class RouterBranch {\n\t/**\n\t * The name of the branch.\n\t */\n\tpublic readonly name: string;\n\n\t/**\n\t * Whether or not the branch is dynamic.\n\t */\n\tpublic readonly dynamic: boolean;\n\n\t/**\n\t * The parent branch, if any.\n\t */\n\tpublic readonly parent: RouterBranch | null;\n\n\t/**\n\t * The node this branch is associated with.\n\t */\n\tpublic readonly node = new RouterNode(this);\n\n\t/**\n\t * The methods supported by the branch's node or any of its children.\n\t */\n\tpublic supportedMethods: readonly string[] = [];\n\n\tprivate _staticChildren: RouterBranch[] = [];\n\tprivate _dynamicChild: RouterBranch | null = null;\n\n\tpublic constructor(name: string, dynamic: boolean, parent: RouterBranch | null) {\n\t\tthis.name = name;\n\t\tthis.dynamic = dynamic;\n\t\tthis.parent = parent;\n\t}\n\n\t/**\n\t * The path representing this branch\n\t * @version 7.0.0\n\t */\n\tpublic get path(): string {\n\t\treturn this.parent ? `${this.parent}/${this}` : `${this}`;\n\t}\n\n\t/**\n\t * The branches the branch is associated with\n\t * @version 7.0.0\n\t */\n\tpublic get children(): RouterBranch[] {\n\t\treturn this._staticChildren.concat(this._dynamicChild ?? []);\n\t}\n\n\t/**\n\t * Whether or not the branch is empty\n\t * @version 7.0.0\n\t */\n\tpublic get empty(): boolean {\n\t\treturn this._staticChildren.length === 0 && this._dynamicChild === null;\n\t}\n\n\t/**\n\t * Tries to find a branch given a path\n\t * @version 7.0.0\n\t *\n\t * @param parts The parts of a path to find a node from\n\t * @returns The branch found, or null if not found\n\t */\n\tpublic find(parts: readonly string[]): RouterBranch | null {\n\t\treturn this._find(parts, 0);\n\t}\n\n\t/**\n\t * Checks if the given name matches the branch\n\t * @version 7.0.0\n\t *\n\t * @param name The name to match\n\t * @returns Whether or not the branch matches the name\n\t */\n\tpublic matches(name: string): boolean {\n\t\treturn this.dynamic || this.name === name;\n\t}\n\n\t/**\n\t * Returns the string representation of the branch\n\t * @version 7.0.0\n\t *\n\t * @returns The string representation of the branch\n\t */\n\tpublic toString(): string {\n\t\treturn this.dynamic ? `[${this.name}]` : this.name;\n\t}\n\n\tpublic *nodes(): IterableIterator<RouterNode> {\n\t\tyield this.node;\n\t\tfor (const child of this._staticChildren) {\n\t\t\tyield* child.nodes();\n\t\t}\n\n\t\tif (this._dynamicChild) {\n\t\t\tyield* this._dynamicChild.nodes();\n\t\t}\n\t}\n\n\tprotected _add(parts: readonly string[], index: number, route: Route): RouterNode {\n\t\tconst result = this._performAdd(parts, index, route);\n\t\tthis._updateSupportedChildrenMethods();\n\t\treturn result;\n\t}\n\n\tprotected _remove(parts: readonly string[], index: number, route: Route): boolean {\n\t\tconst result = this._performRemove(parts, index, route);\n\t\tif (result) this._updateSupportedChildrenMethods();\n\t\treturn result;\n\t}\n\n\tprotected _performAdd(parts: readonly string[], index: number, route: Route): RouterNode {\n\t\tif (index >= parts.length) {\n\t\t\tfor (const method of route.methods) {\n\t\t\t\tthis.node.set(method, route);\n\t\t\t}\n\n\t\t\treturn this.node;\n\t\t}\n\n\t\tconst part = parts[index];\n\t\tconst child = this._staticChildren.find((branch) => branch.matches(part));\n\t\tif (child) {\n\t\t\treturn child._add(parts, index + 1, route);\n\t\t}\n\n\t\tif (this._dynamicChild) {\n\t\t\treturn this._dynamicChild._add(parts, index + 1, route);\n\t\t}\n\n\t\tconst dynamic = part.startsWith('[') && part.endsWith(']');\n\t\tlet branch: RouterBranch;\n\t\tif (dynamic) {\n\t\t\tbranch = new RouterBranch(part.slice(1, -1), true, this);\n\t\t\tthis._dynamicChild = branch;\n\t\t} else {\n\t\t\tbranch = new RouterBranch(part, false, this);\n\t\t\tthis._staticChildren.push(branch);\n\t\t}\n\n\t\treturn branch._add(parts, index + 1, route);\n\t}\n\n\tprotected _performRemove(parts: readonly string[], index: number, route: Route): boolean {\n\t\tif (index >= parts.length) {\n\t\t\tlet success = false;\n\t\t\tfor (const method of route.methods) {\n\t\t\t\tif (this.node.delete(method, route)) {\n\t\t\t\t\tsuccess = true;\n\t\t\t\t}\n\t\t\t}\n\n\t\t\treturn success;\n\t\t}\n\n\t\tconst part = parts[index];\n\t\tconst staticChildIndex = this._staticChildren.findIndex((branch) => branch.matches(part));\n\t\tif (staticChildIndex === -1) {\n\t\t\tconst child = this._staticChildren[index];\n\t\t\tconst removed = child._remove(parts, index + 1, route);\n\t\t\tif (removed && child.empty) {\n\t\t\t\tthis._staticChildren = this._staticChildren.filter((branch) => branch !== child);\n\t\t\t}\n\n\t\t\treturn removed;\n\t\t}\n\n\t\tif (this._dynamicChild) {\n\t\t\tconst removed = this._dynamicChild._remove(parts, index + 1, route);\n\t\t\tif (removed && this._dynamicChild.empty) {\n\t\t\t\tthis._dynamicChild = null;\n\t\t\t}\n\n\t\t\treturn removed;\n\t\t}\n\n\t\treturn false;\n\t}\n\n\tprotected _find(parts: readonly string[], index: number): RouterBranch | null {\n\t\tif (index >= parts.length) return this;\n\n\t\tconst part = parts[index];\n\t\tconst child = this._staticChildren.find((branch) => branch.matches(part)) ?? this._dynamicChild;\n\n\t\t// If a child is not found, return null:\n\t\tif (isNullish(child)) return null;\n\n\t\t// Continue the search:\n\t\treturn child._find(parts, index + 1);\n\t}\n\n\tprotected _updateSupportedChildrenMethods(): void {\n\t\tconst methods = new Set(this.node.methods());\n\t\tfor (const child of this.children) {\n\t\t\tfor (const method of child.node.methods()) {\n\t\t\t\tmethods.add(method);\n\t\t\t}\n\t\t}\n\n\t\tthis.supportedMethods = [...methods];\n\t}\n}\n"]}

package/dist/cjs/lib/structures/router/RouterNode.cjs

@@ -0,0 +1,67 @@
+'use strict';
+
+var discord_js = require('discord.js');
+
+var __defProp = Object.defineProperty;
+var __typeError = (msg) => {
+  throw TypeError(msg);
+};
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
+var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
+var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+var _methods;
+var _RouterNode = class _RouterNode {
+  constructor(parent) {
+    /**
+     * The branch containing this node.
+     */
+    __publicField(this, "parent");
+    /**
+     * The methods this node supports.
+     */
+    __privateAdd(this, _methods, new discord_js.Collection());
+    this.parent = parent;
+  }
+  get path() {
+    return this.parent.path;
+  }
+  extractParameters(parts) {
+    const parameters = {};
+    let branch = this.parent;
+    let index = parts.length - 1;
+    do {
+      if (branch.dynamic) parameters[branch.name] = parts[index];
+      branch = branch.parent;
+      --index;
+    } while (branch);
+    return parameters;
+  }
+  get(method) {
+    return __privateGet(this, _methods).get(method) ?? null;
+  }
+  set(method, route) {
+    __privateGet(this, _methods).set(method, route);
+    return this;
+  }
+  delete(method, route) {
+    const existing = __privateGet(this, _methods).get(method);
+    if (existing === route) {
+      __privateGet(this, _methods).delete(method);
+      return true;
+    }
+    return false;
+  }
+  methods() {
+    return __privateGet(this, _methods).keys();
+  }
+};
+_methods = new WeakMap();
+__name(_RouterNode, "RouterNode");
+var RouterNode = _RouterNode;
+
+exports.RouterNode = RouterNode;
+//# sourceMappingURL=out.js.map
+//# sourceMappingURL=RouterNode.cjs.map

package/dist/cjs/lib/structures/router/RouterNode.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/lib/structures/router/RouterNode.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,SAAS,kBAAkB;AAA3B;AAKO,IAAM,cAAN,MAAM,YAAW;AAAA,EAWhB,YAAY,QAAsB;AAPzC;AAAA;AAAA;AAAA,wBAAgB;AAKhB;AAAA;AAAA;AAAA,iCAAW,IAAI,WAA8B;AAG5C,SAAK,SAAS;AAAA,EACf;AAAA,EAEA,IAAW,OAAO;AACjB,WAAO,KAAK,OAAO;AAAA,EACpB;AAAA,EAEO,kBAAkB,OAAkD;AAC1E,UAAM,aAAqC,CAAC;AAE5C,QAAI,SAA8B,KAAK;AACvC,QAAI,QAAQ,MAAM,SAAS;AAC3B,OAAG;AACF,UAAI,OAAO,QAAS,YAAW,OAAO,IAAI,IAAI,MAAM,KAAK;AAEzD,eAAS,OAAO;AAChB,QAAE;AAAA,IACH,SAAS;AAET,WAAO;AAAA,EACR;AAAA,EAEO,IAAI,QAAkC;AAC5C,WAAO,mBAAK,UAAS,IAAI,MAAM,KAAK;AAAA,EACrC;AAAA,EAEO,IAAI,QAAoB,OAAoB;AAClD,uBAAK,UAAS,IAAI,QAAQ,KAAK;AAC/B,WAAO;AAAA,EACR;AAAA,EAEO,OAAO,QAAoB,OAAuB;AACxD,UAAM,WAAW,mBAAK,UAAS,IAAI,MAAM;AACzC,QAAI,aAAa,OAAO;AACvB,yBAAK,UAAS,OAAO,MAAM;AAC3B,aAAO;AAAA,IACR;AAEA,WAAO;AAAA,EACR;AAAA,EAEO,UAAwC;AAC9C,WAAO,mBAAK,UAAS,KAAK;AAAA,EAC3B;AACD;AA/CC;AATuB;AAAjB,IAAM,aAAN","sourcesContent":["import { Collection } from 'discord.js';\nimport type { Route } from '../Route';\nimport type { MethodName } from '../http/HttpMethods';\nimport type { RouterBranch } from './RouterBranch';\n\nexport class RouterNode {\n\t/**\n\t * The branch containing this node.\n\t */\n\tpublic readonly parent: RouterBranch;\n\n\t/**\n\t * The methods this node supports.\n\t */\n\t#methods = new Collection<MethodName, Route>();\n\n\tpublic constructor(parent: RouterBranch) {\n\t\tthis.parent = parent;\n\t}\n\n\tpublic get path() {\n\t\treturn this.parent.path;\n\t}\n\n\tpublic extractParameters(parts: readonly string[]): Record<string, string> {\n\t\tconst parameters: Record<string, string> = {};\n\n\t\tlet branch: RouterBranch | null = this.parent;\n\t\tlet index = parts.length - 1;\n\t\tdo {\n\t\t\tif (branch.dynamic) parameters[branch.name] = parts[index];\n\n\t\t\tbranch = branch.parent;\n\t\t\t--index;\n\t\t} while (branch);\n\n\t\treturn parameters;\n\t}\n\n\tpublic get(method: MethodName): Route | null {\n\t\treturn this.#methods.get(method) ?? null;\n\t}\n\n\tpublic set(method: MethodName, route: Route): this {\n\t\tthis.#methods.set(method, route);\n\t\treturn this;\n\t}\n\n\tpublic delete(method: MethodName, route: Route): boolean {\n\t\tconst existing = this.#methods.get(method);\n\t\tif (existing === route) {\n\t\t\tthis.#methods.delete(method);\n\t\t\treturn true;\n\t\t}\n\n\t\treturn false;\n\t}\n\n\tpublic methods(): IterableIterator<MethodName> {\n\t\treturn this.#methods.keys();\n\t}\n}\n"]}

package/dist/cjs/lib/structures/router/RouterRoot.cjs

@@ -0,0 +1,71 @@
+'use strict';
+
+var utilities = require('@sapphire/utilities');
+var RouterBranch_cjs = require('./RouterBranch.cjs');
+
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var _RouterRoot = class _RouterRoot extends RouterBranch_cjs.RouterBranch {
+  constructor() {
+    super("::ROOT::", false, null);
+  }
+  /**
+   * Adds a route to the branch
+   *
+   * @param route The route to add
+   * @returns The node the route was added to
+   */
+  add(route) {
+    return this._add(route.path, 0, route);
+  }
+  /**
+   * Removes a route from the branch
+   *
+   * @param route The route to remove
+   * @returns Whether or not the route was removed
+   */
+  remove(route) {
+    return this._remove(route.path, 0, route);
+  }
+  // eslint-disable-next-line @typescript-eslint/class-literal-property-style
+  get path() {
+    return "";
+  }
+  toString() {
+    return "";
+  }
+  static normalize(path) {
+    const parts = [];
+    if (utilities.isNullishOrEmpty(path)) return parts;
+    let part = "";
+    for (const char of path) {
+      if (char === "/") {
+        if (part.length) {
+          parts.push(part);
+          part = "";
+        }
+      } else {
+        part += char;
+      }
+    }
+    if (part.length) {
+      parts.push(part);
+      part = "";
+    }
+    return parts;
+  }
+  static extractMethod(path) {
+    if (path.length === 0) return null;
+    const lastIndex = path.length - 1;
+    const last = path[lastIndex];
+    const methodIndex = last.lastIndexOf(".");
+    if (methodIndex === -1 || methodIndex === last.length - 1) return null;
+    return last.slice(methodIndex + 1).toUpperCase();
+  }
+};
+__name(_RouterRoot, "RouterRoot");
+var RouterRoot = _RouterRoot;
+
+exports.RouterRoot = RouterRoot;
+//# sourceMappingURL=out.js.map
+//# sourceMappingURL=RouterRoot.cjs.map

package/dist/cjs/lib/structures/router/RouterRoot.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/lib/structures/router/RouterRoot.ts"],"names":[],"mappings":";;;;AAAA,SAAS,wBAAwB;AAGjC,SAAS,oBAAoB;AAGtB,IAAM,cAAN,MAAM,oBAAmB,aAAa;AAAA,EACrC,cAAc;AACpB,UAAM,YAAY,OAAO,IAAI;AAAA,EAC9B;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQO,IAAI,OAA0B;AACpC,WAAO,KAAK,KAAK,MAAM,MAAM,GAAG,KAAK;AAAA,EACtC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQO,OAAO,OAAuB;AACpC,WAAO,KAAK,QAAQ,MAAM,MAAM,GAAG,KAAK;AAAA,EACzC;AAAA;AAAA,EAGA,IAAoB,OAAe;AAClC,WAAO;AAAA,EACR;AAAA,EAEgB,WAAmB;AAClC,WAAO;AAAA,EACR;AAAA,EAEA,OAAc,UAAU,MAA2C;AAClE,UAAM,QAAQ,CAAC;AACf,QAAI,iBAAiB,IAAI,EAAG,QAAO;AAEnC,QAAI,OAAO;AACX,eAAW,QAAQ,MAAM;AACxB,UAAI,SAAS,KAAK;AACjB,YAAI,KAAK,QAAQ;AAChB,gBAAM,KAAK,IAAI;AACf,iBAAO;AAAA,QACR;AAAA,MACD,OAAO;AACN,gBAAQ;AAAA,MACT;AAAA,IACD;AAEA,QAAI,KAAK,QAAQ;AAChB,YAAM,KAAK,IAAI;AACf,aAAO;AAAA,IACR;AAEA,WAAO;AAAA,EACR;AAAA,EAEA,OAAc,cAAc,MAA4C;AACvE,QAAI,KAAK,WAAW,EAAG,QAAO;AAE9B,UAAM,YAAY,KAAK,SAAS;AAChC,UAAM,OAAO,KAAK,SAAS;AAC3B,UAAM,cAAc,KAAK,YAAY,GAAG;AACxC,QAAI,gBAAgB,MAAM,gBAAgB,KAAK,SAAS,EAAG,QAAO;AAElE,WAAO,KAAK,MAAM,cAAc,CAAC,EAAE,YAAY;AAAA,EAChD;AACD;AApE6C;AAAtC,IAAM,aAAN","sourcesContent":["import { isNullishOrEmpty } from '@sapphire/utilities';\nimport type { Route } from '../Route';\nimport type { MethodName } from '../http/HttpMethods';\nimport { RouterBranch } from './RouterBranch';\nimport type { RouterNode } from './RouterNode';\n\nexport class RouterRoot extends RouterBranch {\n\tpublic constructor() {\n\t\tsuper('::ROOT::', false, null);\n\t}\n\n\t/**\n\t * Adds a route to the branch\n\t *\n\t * @param route The route to add\n\t * @returns The node the route was added to\n\t */\n\tpublic add(route: Route): RouterNode {\n\t\treturn this._add(route.path, 0, route);\n\t}\n\n\t/**\n\t * Removes a route from the branch\n\t *\n\t * @param route The route to remove\n\t * @returns Whether or not the route was removed\n\t */\n\tpublic remove(route: Route): boolean {\n\t\treturn this._remove(route.path, 0, route);\n\t}\n\n\t// eslint-disable-next-line @typescript-eslint/class-literal-property-style\n\tpublic override get path(): string {\n\t\treturn '';\n\t}\n\n\tpublic override toString(): string {\n\t\treturn '';\n\t}\n\n\tpublic static normalize(path: string | null | undefined): string[] {\n\t\tconst parts = [] as string[];\n\t\tif (isNullishOrEmpty(path)) return parts;\n\n\t\tlet part = '';\n\t\tfor (const char of path) {\n\t\t\tif (char === '/') {\n\t\t\t\tif (part.length) {\n\t\t\t\t\tparts.push(part);\n\t\t\t\t\tpart = '';\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\tpart += char;\n\t\t\t}\n\t\t}\n\n\t\tif (part.length) {\n\t\t\tparts.push(part);\n\t\t\tpart = '';\n\t\t}\n\n\t\treturn parts;\n\t}\n\n\tpublic static extractMethod(path: readonly string[]): MethodName | null {\n\t\tif (path.length === 0) return null;\n\n\t\tconst lastIndex = path.length - 1;\n\t\tconst last = path[lastIndex];\n\t\tconst methodIndex = last.lastIndexOf('.');\n\t\tif (methodIndex === -1 || methodIndex === last.length - 1) return null;\n\n\t\treturn last.slice(methodIndex + 1).toUpperCase() as MethodName;\n\t}\n}\n"]}

package/dist/cjs/listeners/PluginRouteError.cjs

@@ -8,9 +8,9 @@ var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var _PluginListener = class _PluginListener extends framework.Listener {
   constructor(context) {
-    super(context, { emitter: "server", event: Server_cjs.ServerEvents.RouteError });
+    super(context, { emitter: "server", event: Server_cjs.ServerEvent.RouteError });
   }
-  run(error, { response }) {
+  run(error, _request, response) {
     this.container.logger.fatal(error);
     if (!response.writableEnded) response.status(HttpCodes_cjs.HttpCodes.InternalServerError).json({ error: error.message ?? error });
   }

package/dist/cjs/listeners/PluginRouteError.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/listeners/PluginRouteError.ts"],"names":[],"mappings":";;;;AAAA,SAAS,gBAAgB;AACzB,SAAS,iBAAiB;AAC1B,SAAS,oBAAiD;AAEnD,IAAM,kBAAN,MAAM,wBAAuB,SAAS;AAAA,EACrC,YAAY,SAAiC;AACnD,UAAM,SAAS,EAAE,SAAS,UAAU,OAAO,aAAa,WAAW,CAAC;AAAA,EACrE;AAAA,EAEgB,IAAI,OAAc,EAAE,SAAS,GAA2B;AAEvE,SAAK,UAAU,OAAO,MAAM,KAAK;AAGjC,QAAI,CAAC,SAAS,cAAe,UAAS,OAAO,UAAU,mBAAmB,EAAE,KAAK,EAAE,OAAO,MAAM,WAAW,MAAM,CAAC;AAAA,EACnH;AACD;AAZ6C;AAAtC,IAAM,iBAAN","sourcesContent":["import { Listener } from '@sapphire/framework';\nimport { HttpCodes } from '../lib/structures/http/HttpCodes';\nimport { ServerEvents, type MiddlewareErrorContext } from '../lib/structures/http/Server';\n\nexport class PluginListener extends Listener {\n\tpublic constructor(context: Listener.LoaderContext) {\n\t\tsuper(context, { emitter: 'server', event: ServerEvents.RouteError });\n\t}\n\n\tpublic override run(error: Error, { response }: MiddlewareErrorContext) {\n\t\t// Log the error to console:\n\t\tthis.container.logger.fatal(error);\n\n\t\t// Send a response to the client if none was sent:\n\t\tif (!response.writableEnded) response.status(HttpCodes.InternalServerError).json({ error: error.message ?? error });\n\t}\n}\n"]}
+{"version":3,"sources":["../../../src/listeners/PluginRouteError.ts"],"names":[],"mappings":";;;;AAAA,SAAS,gBAAgB;AAGzB,SAAS,iBAAiB;AAC1B,SAAS,mBAAmB;AAErB,IAAM,kBAAN,MAAM,wBAAuB,SAAS;AAAA,EACrC,YAAY,SAAiC;AACnD,UAAM,SAAS,EAAE,SAAS,UAAU,OAAO,YAAY,WAAW,CAAC;AAAA,EACpE;AAAA,EAEgB,IAAI,OAAc,UAAsB,UAAuB;AAE9E,SAAK,UAAU,OAAO,MAAM,KAAK;AAGjC,QAAI,CAAC,SAAS,cAAe,UAAS,OAAO,UAAU,mBAAmB,EAAE,KAAK,EAAE,OAAO,MAAM,WAAW,MAAM,CAAC;AAAA,EACnH;AACD;AAZ6C;AAAtC,IAAM,iBAAN","sourcesContent":["import { Listener } from '@sapphire/framework';\nimport type { ApiRequest } from '../lib/structures/api/ApiRequest';\nimport type { ApiResponse } from '../lib/structures/api/ApiResponse';\nimport { HttpCodes } from '../lib/structures/http/HttpCodes';\nimport { ServerEvent } from '../lib/structures/http/Server';\n\nexport class PluginListener extends Listener {\n\tpublic constructor(context: Listener.LoaderContext) {\n\t\tsuper(context, { emitter: 'server', event: ServerEvent.RouteError });\n\t}\n\n\tpublic override run(error: Error, _request: ApiRequest, response: ApiResponse) {\n\t\t// Log the error to console:\n\t\tthis.container.logger.fatal(error);\n\n\t\t// Send a response to the client if none was sent:\n\t\tif (!response.writableEnded) response.status(HttpCodes.InternalServerError).json({ error: error.message ?? error });\n\t}\n}\n"]}

package/dist/cjs/listeners/PluginServerMiddlewareError.cjs

@@ -8,9 +8,9 @@ var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var _PluginListener = class _PluginListener extends framework.Listener {
   constructor(context) {
-    super(context, { emitter: "server", event: Server_cjs.ServerEvents.MiddlewareError });
+    super(context, { emitter: "server", event: Server_cjs.ServerEvent.MiddlewareError });
   }
-  run(error, { response }) {
+  run(error, _request, response) {
     this.container.logger.fatal(error);
     if (!response.writableEnded) response.status(HttpCodes_cjs.HttpCodes.InternalServerError).json({ error: error.message ?? error });
   }

package/dist/cjs/listeners/PluginServerMiddlewareError.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/listeners/PluginServerMiddlewareError.ts"],"names":[],"mappings":";;;;AAAA,SAAS,gBAAgB;AACzB,SAAS,iBAAiB;AAC1B,SAAS,oBAAiD;AAEnD,IAAM,kBAAN,MAAM,wBAAuB,SAAS;AAAA,EACrC,YAAY,SAAiC;AACnD,UAAM,SAAS,EAAE,SAAS,UAAU,OAAO,aAAa,gBAAgB,CAAC;AAAA,EAC1E;AAAA,EAEgB,IAAI,OAAc,EAAE,SAAS,GAA2B;AAEvE,SAAK,UAAU,OAAO,MAAM,KAAK;AAGjC,QAAI,CAAC,SAAS,cAAe,UAAS,OAAO,UAAU,mBAAmB,EAAE,KAAK,EAAE,OAAO,MAAM,WAAW,MAAM,CAAC;AAAA,EACnH;AACD;AAZ6C;AAAtC,IAAM,iBAAN","sourcesContent":["import { Listener } from '@sapphire/framework';\nimport { HttpCodes } from '../lib/structures/http/HttpCodes';\nimport { ServerEvents, type MiddlewareErrorContext } from '../lib/structures/http/Server';\n\nexport class PluginListener extends Listener {\n\tpublic constructor(context: Listener.LoaderContext) {\n\t\tsuper(context, { emitter: 'server', event: ServerEvents.MiddlewareError });\n\t}\n\n\tpublic override run(error: Error, { response }: MiddlewareErrorContext) {\n\t\t// Log the error to console:\n\t\tthis.container.logger.fatal(error);\n\n\t\t// Send a response to the client if none was sent:\n\t\tif (!response.writableEnded) response.status(HttpCodes.InternalServerError).json({ error: error.message ?? error });\n\t}\n}\n"]}
+{"version":3,"sources":["../../../src/listeners/PluginServerMiddlewareError.ts"],"names":[],"mappings":";;;;AAAA,SAAS,gBAAgB;AAGzB,SAAS,iBAAiB;AAC1B,SAAS,mBAAmB;AAErB,IAAM,kBAAN,MAAM,wBAAuB,SAAS;AAAA,EACrC,YAAY,SAAiC;AACnD,UAAM,SAAS,EAAE,SAAS,UAAU,OAAO,YAAY,gBAAgB,CAAC;AAAA,EACzE;AAAA,EAEgB,IAAI,OAAc,UAAsB,UAAuB;AAE9E,SAAK,UAAU,OAAO,MAAM,KAAK;AAGjC,QAAI,CAAC,SAAS,cAAe,UAAS,OAAO,UAAU,mBAAmB,EAAE,KAAK,EAAE,OAAO,MAAM,WAAW,MAAM,CAAC;AAAA,EACnH;AACD;AAZ6C;AAAtC,IAAM,iBAAN","sourcesContent":["import { Listener } from '@sapphire/framework';\nimport type { ApiRequest } from '../lib/structures/api/ApiRequest';\nimport type { ApiResponse } from '../lib/structures/api/ApiResponse';\nimport { HttpCodes } from '../lib/structures/http/HttpCodes';\nimport { ServerEvent } from '../lib/structures/http/Server';\n\nexport class PluginListener extends Listener {\n\tpublic constructor(context: Listener.LoaderContext) {\n\t\tsuper(context, { emitter: 'server', event: ServerEvent.MiddlewareError });\n\t}\n\n\tpublic override run(error: Error, _request: ApiRequest, response: ApiResponse) {\n\t\t// Log the error to console:\n\t\tthis.container.logger.fatal(error);\n\n\t\t// Send a response to the client if none was sent:\n\t\tif (!response.writableEnded) response.status(HttpCodes.InternalServerError).json({ error: error.message ?? error });\n\t}\n}\n"]}

package/dist/cjs/listeners/PluginServerMiddlewareSuccess.cjs

@@ -7,13 +7,13 @@ var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var _PluginListener = class _PluginListener extends framework.Listener {
   constructor(context) {
-    super(context, { emitter: "server", event: Server_cjs.ServerEvents.MiddlewareSuccess });
+    super(context, { emitter: "server", event: Server_cjs.ServerEvent.MiddlewareSuccess });
   }
-  async run(request, response, match) {
+  async run(request, response) {
     try {
-      await match.cb(request, response);
+      await request.route.run(request, response);
     } catch (error) {
-      this.container.server.emit(Server_cjs.ServerEvents.RouteError, error, { request, response, match });
+      this.container.server.emit(Server_cjs.ServerEvent.RouteError, error, request, response);
     }
   }
 };

package/dist/cjs/listeners/PluginServerMiddlewareSuccess.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/listeners/PluginServerMiddlewareSuccess.ts"],"names":[],"mappings":";;;;AAAA,SAAS,gBAAgB;AAIzB,SAAS,oBAAoB;AAEtB,IAAM,kBAAN,MAAM,wBAAuB,SAAS;AAAA,EACrC,YAAY,SAAiC;AACnD,UAAM,SAAS,EAAE,SAAS,UAAU,OAAO,aAAa,kBAAkB,CAAC;AAAA,EAC5E;AAAA,EAEA,MAAsB,IAAI,SAAqB,UAAuB,OAAmB;AACxF,QAAI;AACH,YAAM,MAAM,GAAG,SAAS,QAAQ;AAAA,IACjC,SAAS,OAAO;AACf,WAAK,UAAU,OAAO,KAAK,aAAa,YAAY,OAAO,EAAE,SAAS,UAAU,MAAM,CAAC;AAAA,IACxF;AAAA,EACD;AACD;AAZ6C;AAAtC,IAAM,iBAAN","sourcesContent":["import { Listener } from '@sapphire/framework';\nimport type { RouteMatch } from '../lib/structures/RouteStore';\nimport type { ApiRequest } from '../lib/structures/api/ApiRequest';\nimport type { ApiResponse } from '../lib/structures/api/ApiResponse';\nimport { ServerEvents } from '../lib/structures/http/Server';\n\nexport class PluginListener extends Listener {\n\tpublic constructor(context: Listener.LoaderContext) {\n\t\tsuper(context, { emitter: 'server', event: ServerEvents.MiddlewareSuccess });\n\t}\n\n\tpublic override async run(request: ApiRequest, response: ApiResponse, match: RouteMatch) {\n\t\ttry {\n\t\t\tawait match.cb(request, response);\n\t\t} catch (error) {\n\t\t\tthis.container.server.emit(ServerEvents.RouteError, error, { request, response, match });\n\t\t}\n\t}\n}\n"]}
+{"version":3,"sources":["../../../src/listeners/PluginServerMiddlewareSuccess.ts"],"names":[],"mappings":";;;;AAAA,SAAS,gBAAgB;AAGzB,SAAS,mBAAmB;AAErB,IAAM,kBAAN,MAAM,wBAAuB,SAAS;AAAA,EACrC,YAAY,SAAiC;AACnD,UAAM,SAAS,EAAE,SAAS,UAAU,OAAO,YAAY,kBAAkB,CAAC;AAAA,EAC3E;AAAA,EAEA,MAAsB,IAAI,SAAqB,UAAuB;AACrE,QAAI;AACH,YAAM,QAAQ,MAAO,IAAI,SAAS,QAAQ;AAAA,IAC3C,SAAS,OAAO;AACf,WAAK,UAAU,OAAO,KAAK,YAAY,YAAY,OAAO,SAAS,QAAQ;AAAA,IAC5E;AAAA,EACD;AACD;AAZ6C;AAAtC,IAAM,iBAAN","sourcesContent":["import { Listener } from '@sapphire/framework';\nimport type { ApiRequest } from '../lib/structures/api/ApiRequest';\nimport type { ApiResponse } from '../lib/structures/api/ApiResponse';\nimport { ServerEvent } from '../lib/structures/http/Server';\n\nexport class PluginListener extends Listener {\n\tpublic constructor(context: Listener.LoaderContext) {\n\t\tsuper(context, { emitter: 'server', event: ServerEvent.MiddlewareSuccess });\n\t}\n\n\tpublic override async run(request: ApiRequest, response: ApiResponse) {\n\t\ttry {\n\t\t\tawait request.route!.run(request, response);\n\t\t} catch (error) {\n\t\t\tthis.container.server.emit(ServerEvent.RouteError, error, request, response);\n\t\t}\n\t}\n}\n"]}

package/dist/cjs/listeners/PluginServerRequest.cjs

@@ -2,28 +2,62 @@
 
 var framework = require('@sapphire/framework');
 var Server_cjs = require('../lib/structures/http/Server.cjs');
+var RouterRoot_cjs = require('../lib/structures/router/RouterRoot.cjs');
 
 var __defProp = Object.defineProperty;
+var __typeError = (msg) => {
+  throw TypeError(msg);
+};
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
+var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
+var _PluginListener_instances, parseURL_fn;
 var _PluginListener = class _PluginListener extends framework.Listener {
   constructor(context) {
-    super(context, { emitter: "server", event: Server_cjs.ServerEvents.Request });
+    super(context, { emitter: "server", event: Server_cjs.ServerEvent.Request });
+    __privateAdd(this, _PluginListener_instances);
   }
   async run(request, response) {
-    const match = this.container.server.routes.match(request);
+    const { parts, querystring } = __privateMethod(this, _PluginListener_instances, parseURL_fn).call(this, request.url);
+    request.query = Object.fromEntries(new URLSearchParams(querystring).entries());
+    const branch = this.container.server.routes.router.find(parts);
+    const node = branch ? branch.node : null;
+    const route = node ? node.get(request.method ?? "GET") : null;
+    if (node !== null) {
+      request.params = node.extractParameters(parts);
+    }
+    request.routerNode = node;
+    request.route = route;
     try {
-      await this.container.server.middlewares.run(request, response, match?.route ?? null);
+      await this.container.server.middlewares.run(request, response);
     } catch (error) {
-      this.container.server.emit(Server_cjs.ServerEvents.MiddlewareError, error, { request, response, match });
+      this.container.server.emit(Server_cjs.ServerEvent.MiddlewareError, error, request, response);
       return;
     }
-    if (match === null) {
-      this.container.server.emit(Server_cjs.ServerEvents.NoMatch, request, response);
+    if (branch === null) {
+      this.container.server.emit(Server_cjs.ServerEvent.RouterBranchNotFound, request, response);
+    } else if (route === null) {
+      this.container.server.emit(Server_cjs.ServerEvent.RouterBranchMethodNotAllowed, request, response);
     } else {
-      this.container.server.emit(Server_cjs.ServerEvents.Match, request, response, match);
+      this.container.server.emit(Server_cjs.ServerEvent.RouterFound, request, response);
     }
   }
 };
+_PluginListener_instances = new WeakSet();
+parseURL_fn = /* @__PURE__ */ __name(function(url = "") {
+  const index = url.indexOf("?");
+  let pathname;
+  let querystring;
+  if (index === -1) {
+    pathname = url;
+    querystring = "";
+  } else {
+    pathname = url.substring(0, index);
+    querystring = url.substring(index + 1);
+  }
+  return { parts: RouterRoot_cjs.RouterRoot.normalize(pathname), querystring };
+}, "#parseURL");
 __name(_PluginListener, "PluginListener");
 var PluginListener = _PluginListener;
 

package/dist/cjs/listeners/PluginServerRequest.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/listeners/PluginServerRequest.ts"],"names":[],"mappings":";;;;AAAA,SAAS,gBAAgB;AAGzB,SAAS,oBAAoB;AAEtB,IAAM,kBAAN,MAAM,wBAAuB,SAAS;AAAA,EACrC,YAAY,SAAiC;AACnD,UAAM,SAAS,EAAE,SAAS,UAAU,OAAO,aAAa,QAAQ,CAAC;AAAA,EAClE;AAAA,EAEA,MAAsB,IAAI,SAAqB,UAAuB;AACrE,UAAM,QAAQ,KAAK,UAAU,OAAO,OAAO,MAAM,OAAO;AAExD,QAAI;AAEH,YAAM,KAAK,UAAU,OAAO,YAAY,IAAI,SAAS,UAAU,OAAO,SAAS,IAAI;AAAA,IACpF,SAAS,OAAO;AACf,WAAK,UAAU,OAAO,KAAK,aAAa,iBAAiB,OAAO,EAAE,SAAS,UAAU,MAAM,CAAC;AAG5F;AAAA,IACD;AAEA,QAAI,UAAU,MAAM;AACnB,WAAK,UAAU,OAAO,KAAK,aAAa,SAAS,SAAS,QAAQ;AAAA,IACnE,OAAO;AACN,WAAK,UAAU,OAAO,KAAK,aAAa,OAAO,SAAS,UAAU,KAAK;AAAA,IACxE;AAAA,EACD;AACD;AAxB6C;AAAtC,IAAM,iBAAN","sourcesContent":["import { Listener } from '@sapphire/framework';\nimport type { ApiRequest } from '../lib/structures/api/ApiRequest';\nimport type { ApiResponse } from '../lib/structures/api/ApiResponse';\nimport { ServerEvents } from '../lib/structures/http/Server';\n\nexport class PluginListener extends Listener {\n\tpublic constructor(context: Listener.LoaderContext) {\n\t\tsuper(context, { emitter: 'server', event: ServerEvents.Request });\n\t}\n\n\tpublic override async run(request: ApiRequest, response: ApiResponse) {\n\t\tconst match = this.container.server.routes.match(request);\n\n\t\ttry {\n\t\t\t// Middlewares need to be run regardless of the match, specially since browsers do an OPTIONS request first.\n\t\t\tawait this.container.server.middlewares.run(request, response, match?.route ?? null);\n\t\t} catch (error) {\n\t\t\tthis.container.server.emit(ServerEvents.MiddlewareError, error, { request, response, match });\n\n\t\t\t// If a middleware errored, it might cause undefined behavior in the routes, so we will return early.\n\t\t\treturn;\n\t\t}\n\n\t\tif (match === null) {\n\t\t\tthis.container.server.emit(ServerEvents.NoMatch, request, response);\n\t\t} else {\n\t\t\tthis.container.server.emit(ServerEvents.Match, request, response, match);\n\t\t}\n\t}\n}\n"]}
+{"version":3,"sources":["../../../src/listeners/PluginServerRequest.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,SAAS,gBAAgB;AAIzB,SAAS,mBAAmB;AAC5B,SAAS,kBAAkB;AAL3B;AAOO,IAAM,kBAAN,MAAM,wBAAuB,SAAS;AAAA,EACrC,YAAY,SAAiC;AACnD,UAAM,SAAS,EAAE,SAAS,UAAU,OAAO,YAAY,QAAQ,CAAC;AAF3D;AAAA,EAGN;AAAA,EAEA,MAAsB,IAAI,SAAqB,UAAuB;AACrE,UAAM,EAAE,OAAO,YAAY,IAAI,sBAAK,wCAAL,WAAe,QAAQ;AACtD,YAAQ,QAAQ,OAAO,YAAY,IAAI,gBAAgB,WAAW,EAAE,QAAQ,CAAC;AAE7E,UAAM,SAAS,KAAK,UAAU,OAAO,OAAO,OAAO,KAAK,KAAK;AAC7D,UAAM,OAAO,SAAS,OAAO,OAAO;AACpC,UAAM,QAAQ,OAAO,KAAK,IAAK,QAAQ,UAAU,KAAoB,IAAI;AAEzE,QAAI,SAAS,MAAM;AAClB,cAAQ,SAAS,KAAM,kBAAkB,KAAK;AAAA,IAC/C;AAEA,YAAQ,aAAa;AACrB,YAAQ,QAAQ;AAEhB,QAAI;AAEH,YAAM,KAAK,UAAU,OAAO,YAAY,IAAI,SAAS,QAAQ;AAAA,IAC9D,SAAS,OAAO;AACf,WAAK,UAAU,OAAO,KAAK,YAAY,iBAAiB,OAAO,SAAS,QAAQ;AAGhF;AAAA,IACD;AAEA,QAAI,WAAW,MAAM;AACpB,WAAK,UAAU,OAAO,KAAK,YAAY,sBAAsB,SAAS,QAAQ;AAAA,IAC/E,WAAW,UAAU,MAAM;AAC1B,WAAK,UAAU,OAAO,KAAK,YAAY,8BAA8B,SAAS,QAAQ;AAAA,IACvF,OAAO;AACN,WAAK,UAAU,OAAO,KAAK,YAAY,aAAa,SAAS,QAAQ;AAAA,IACtE;AAAA,EACD;AAiBD;AAtDO;AAuCN,cAAS,gCAAC,MAAM,IAAI;AACnB,QAAM,QAAQ,IAAI,QAAQ,GAAG;AAE7B,MAAI;AACJ,MAAI;AACJ,MAAI,UAAU,IAAI;AACjB,eAAW;AACX,kBAAc;AAAA,EACf,OAAO;AACN,eAAW,IAAI,UAAU,GAAG,KAAK;AACjC,kBAAc,IAAI,UAAU,QAAQ,CAAC;AAAA,EACtC;AAEA,SAAO,EAAE,OAAO,WAAW,UAAU,QAAQ,GAAG,YAAY;AAC7D,GAdS;AAvCmC;AAAtC,IAAM,iBAAN","sourcesContent":["import { Listener } from '@sapphire/framework';\nimport type { ApiRequest } from '../lib/structures/api/ApiRequest';\nimport type { ApiResponse } from '../lib/structures/api/ApiResponse';\nimport type { MethodName } from '../lib/structures/http/HttpMethods';\nimport { ServerEvent } from '../lib/structures/http/Server';\nimport { RouterRoot } from '../lib/structures/router/RouterRoot';\n\nexport class PluginListener extends Listener {\n\tpublic constructor(context: Listener.LoaderContext) {\n\t\tsuper(context, { emitter: 'server', event: ServerEvent.Request });\n\t}\n\n\tpublic override async run(request: ApiRequest, response: ApiResponse) {\n\t\tconst { parts, querystring } = this.#parseURL(request.url);\n\t\trequest.query = Object.fromEntries(new URLSearchParams(querystring).entries());\n\n\t\tconst branch = this.container.server.routes.router.find(parts);\n\t\tconst node = branch ? branch.node : null;\n\t\tconst route = node ? node.get((request.method ?? 'GET') as MethodName) : null;\n\n\t\tif (node !== null) {\n\t\t\trequest.params = node!.extractParameters(parts);\n\t\t}\n\n\t\trequest.routerNode = node;\n\t\trequest.route = route;\n\n\t\ttry {\n\t\t\t// Middlewares need to be run regardless of the match, specially since browsers do an OPTIONS request first.\n\t\t\tawait this.container.server.middlewares.run(request, response);\n\t\t} catch (error) {\n\t\t\tthis.container.server.emit(ServerEvent.MiddlewareError, error, request, response);\n\n\t\t\t// If a middleware errored, it might cause undefined behavior in the routes, so we will return early.\n\t\t\treturn;\n\t\t}\n\n\t\tif (branch === null) {\n\t\t\tthis.container.server.emit(ServerEvent.RouterBranchNotFound, request, response);\n\t\t} else if (route === null) {\n\t\t\tthis.container.server.emit(ServerEvent.RouterBranchMethodNotAllowed, request, response);\n\t\t} else {\n\t\t\tthis.container.server.emit(ServerEvent.RouterFound, request, response);\n\t\t}\n\t}\n\n\t#parseURL(url = '') {\n\t\tconst index = url.indexOf('?');\n\n\t\tlet pathname: string;\n\t\tlet querystring: string;\n\t\tif (index === -1) {\n\t\t\tpathname = url;\n\t\t\tquerystring = '';\n\t\t} else {\n\t\t\tpathname = url.substring(0, index);\n\t\t\tquerystring = url.substring(index + 1);\n\t\t}\n\n\t\treturn { parts: RouterRoot.normalize(pathname), querystring };\n\t}\n}\n"]}

package/dist/cjs/listeners/{PluginServerMatch.cjs → PluginServerRouterBranchMethodNotAllowed.cjs}

@@ -7,15 +7,10 @@ var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var _PluginListener = class _PluginListener extends framework.Listener {
   constructor(context) {
-    super(context, { emitter: "server", event: Server_cjs.ServerEvents.Match });
+    super(context, { emitter: "server", event: Server_cjs.ServerEvent.RouterBranchMethodNotAllowed });
   }
-  run(request, response, match) {
-    this.container.server.emit(
-      response.writableEnded ? Server_cjs.ServerEvents.MiddlewareFailure : Server_cjs.ServerEvents.MiddlewareSuccess,
-      request,
-      response,
-      match
-    );
+  run(_, response) {
+    if (!response.writableEnded) response.methodNotAllowed();
   }
 };
 __name(_PluginListener, "PluginListener");
@@ -23,4 +18,4 @@ var PluginListener = _PluginListener;
 
 exports.PluginListener = PluginListener;
 //# sourceMappingURL=out.js.map
-//# sourceMappingURL=PluginServerMatch.cjs.map
+//# sourceMappingURL=PluginServerRouterBranchMethodNotAllowed.cjs.map

package/dist/cjs/listeners/PluginServerRouterBranchMethodNotAllowed.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/listeners/PluginServerRouterBranchMethodNotAllowed.ts"],"names":[],"mappings":";;;;AAAA,SAAS,gBAAgB;AAGzB,SAAS,mBAAmB;AAErB,IAAM,kBAAN,MAAM,wBAAuB,SAAS;AAAA,EACrC,YAAY,SAAiC;AACnD,UAAM,SAAS,EAAE,SAAS,UAAU,OAAO,YAAY,6BAA6B,CAAC;AAAA,EACtF;AAAA,EAEgB,IAAI,GAAe,UAAuB;AACzD,QAAI,CAAC,SAAS,cAAe,UAAS,iBAAiB;AAAA,EACxD;AACD;AAR6C;AAAtC,IAAM,iBAAN","sourcesContent":["import { Listener } from '@sapphire/framework';\nimport type { ApiRequest } from '../lib/structures/api/ApiRequest';\nimport type { ApiResponse } from '../lib/structures/api/ApiResponse';\nimport { ServerEvent } from '../lib/structures/http/Server';\n\nexport class PluginListener extends Listener {\n\tpublic constructor(context: Listener.LoaderContext) {\n\t\tsuper(context, { emitter: 'server', event: ServerEvent.RouterBranchMethodNotAllowed });\n\t}\n\n\tpublic override run(_: ApiRequest, response: ApiResponse) {\n\t\tif (!response.writableEnded) response.methodNotAllowed();\n\t}\n}\n"]}

package/dist/cjs/listeners/{PluginServerNoMatch.cjs → PluginServerRouterBranchNotFound.cjs}

@@ -7,7 +7,7 @@ var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var _PluginListener = class _PluginListener extends framework.Listener {
   constructor(context) {
-    super(context, { emitter: "server", event: Server_cjs.ServerEvents.NoMatch });
+    super(context, { emitter: "server", event: Server_cjs.ServerEvent.RouterBranchNotFound });
   }
   run(_, response) {
     if (!response.writableEnded) response.notFound();
@@ -18,4 +18,4 @@ var PluginListener = _PluginListener;
 
 exports.PluginListener = PluginListener;
 //# sourceMappingURL=out.js.map
-//# sourceMappingURL=PluginServerNoMatch.cjs.map
+//# sourceMappingURL=PluginServerRouterBranchNotFound.cjs.map

package/dist/cjs/listeners/PluginServerRouterBranchNotFound.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/listeners/PluginServerRouterBranchNotFound.ts"],"names":[],"mappings":";;;;AAAA,SAAS,gBAAgB;AAGzB,SAAS,mBAAmB;AAErB,IAAM,kBAAN,MAAM,wBAAuB,SAAS;AAAA,EACrC,YAAY,SAAiC;AACnD,UAAM,SAAS,EAAE,SAAS,UAAU,OAAO,YAAY,qBAAqB,CAAC;AAAA,EAC9E;AAAA,EAEgB,IAAI,GAAe,UAAuB;AACzD,QAAI,CAAC,SAAS,cAAe,UAAS,SAAS;AAAA,EAChD;AACD;AAR6C;AAAtC,IAAM,iBAAN","sourcesContent":["import { Listener } from '@sapphire/framework';\nimport type { ApiRequest } from '../lib/structures/api/ApiRequest';\nimport type { ApiResponse } from '../lib/structures/api/ApiResponse';\nimport { ServerEvent } from '../lib/structures/http/Server';\n\nexport class PluginListener extends Listener {\n\tpublic constructor(context: Listener.LoaderContext) {\n\t\tsuper(context, { emitter: 'server', event: ServerEvent.RouterBranchNotFound });\n\t}\n\n\tpublic override run(_: ApiRequest, response: ApiResponse) {\n\t\tif (!response.writableEnded) response.notFound();\n\t}\n}\n"]}

package/dist/cjs/listeners/PluginServerRouterFound.cjs

@@ -0,0 +1,21 @@
+'use strict';
+
+var framework = require('@sapphire/framework');
+var Server_cjs = require('../lib/structures/http/Server.cjs');
+
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var _PluginListener = class _PluginListener extends framework.Listener {
+  constructor(context) {
+    super(context, { emitter: "server", event: Server_cjs.ServerEvent.RouterFound });
+  }
+  run(request, response) {
+    this.container.server.emit(response.writableEnded ? Server_cjs.ServerEvent.MiddlewareFailure : Server_cjs.ServerEvent.MiddlewareSuccess, request, response);
+  }
+};
+__name(_PluginListener, "PluginListener");
+var PluginListener = _PluginListener;
+
+exports.PluginListener = PluginListener;
+//# sourceMappingURL=out.js.map
+//# sourceMappingURL=PluginServerRouterFound.cjs.map

package/dist/cjs/listeners/PluginServerRouterFound.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/listeners/PluginServerRouterFound.ts"],"names":[],"mappings":";;;;AAAA,SAAS,gBAAgB;AAGzB,SAAS,mBAAmB;AAErB,IAAM,kBAAN,MAAM,wBAAuB,SAAS;AAAA,EACrC,YAAY,SAAiC;AACnD,UAAM,SAAS,EAAE,SAAS,UAAU,OAAO,YAAY,YAAY,CAAC;AAAA,EACrE;AAAA,EAEgB,IAAI,SAAqB,UAAuB;AAC/D,SAAK,UAAU,OAAO,KAAK,SAAS,gBAAgB,YAAY,oBAAoB,YAAY,mBAAmB,SAAS,QAAQ;AAAA,EACrI;AACD;AAR6C;AAAtC,IAAM,iBAAN","sourcesContent":["import { Listener } from '@sapphire/framework';\nimport type { ApiRequest } from '../lib/structures/api/ApiRequest';\nimport type { ApiResponse } from '../lib/structures/api/ApiResponse';\nimport { ServerEvent } from '../lib/structures/http/Server';\n\nexport class PluginListener extends Listener {\n\tpublic constructor(context: Listener.LoaderContext) {\n\t\tsuper(context, { emitter: 'server', event: ServerEvent.RouterFound });\n\t}\n\n\tpublic override run(request: ApiRequest, response: ApiResponse) {\n\t\tthis.container.server.emit(response.writableEnded ? ServerEvent.MiddlewareFailure : ServerEvent.MiddlewareSuccess, request, response);\n\t}\n}\n"]}

package/dist/cjs/listeners/_load.cjs

@@ -2,22 +2,24 @@
 
 var pieces = require('@sapphire/pieces');
 var PluginRouteError_cjs = require('./PluginRouteError.cjs');
-var PluginServerMatch_cjs = require('./PluginServerMatch.cjs');
 var PluginServerMiddlewareError_cjs = require('./PluginServerMiddlewareError.cjs');
 var PluginServerMiddlewareSuccess_cjs = require('./PluginServerMiddlewareSuccess.cjs');
-var PluginServerNoMatch_cjs = require('./PluginServerNoMatch.cjs');
 var PluginServerRequest_cjs = require('./PluginServerRequest.cjs');
+var PluginServerRouterBranchMethodNotAllowed_cjs = require('./PluginServerRouterBranchMethodNotAllowed.cjs');
+var PluginServerRouterBranchNotFound_cjs = require('./PluginServerRouterBranchNotFound.cjs');
+var PluginServerRouterFound_cjs = require('./PluginServerRouterFound.cjs');
 
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 function loadListeners() {
   const store = "listeners";
   void pieces.container.stores.loadPiece({ name: "PluginRouteError", piece: PluginRouteError_cjs.PluginListener, store });
-  void pieces.container.stores.loadPiece({ name: "PluginServerMatch", piece: PluginServerMatch_cjs.PluginListener, store });
   void pieces.container.stores.loadPiece({ name: "PluginServerMiddlewareError", piece: PluginServerMiddlewareError_cjs.PluginListener, store });
   void pieces.container.stores.loadPiece({ name: "PluginServerMiddlewareSuccess", piece: PluginServerMiddlewareSuccess_cjs.PluginListener, store });
-  void pieces.container.stores.loadPiece({ name: "PluginServerNoMatch", piece: PluginServerNoMatch_cjs.PluginListener, store });
   void pieces.container.stores.loadPiece({ name: "PluginServerRequest", piece: PluginServerRequest_cjs.PluginListener, store });
+  void pieces.container.stores.loadPiece({ name: "PluginServerRouterBranchMethodNotAllowed", piece: PluginServerRouterBranchMethodNotAllowed_cjs.PluginListener, store });
+  void pieces.container.stores.loadPiece({ name: "PluginServerRouterBranchNotFound", piece: PluginServerRouterBranchNotFound_cjs.PluginListener, store });
+  void pieces.container.stores.loadPiece({ name: "PluginServerRouterFound", piece: PluginServerRouterFound_cjs.PluginListener, store });
 }
 __name(loadListeners, "loadListeners");