clear-router 2.1.6 → 2.1.7

package/dist/express/index.cjs

@@ -15,6 +15,14 @@ var Router = class Router {
 	*/
 	static routes = [];
 	/**
+	* Mapping of routes by path and method for quick lookup.
+	*/
+	static routesByPathMethod = {};
+	/**
+	* Mapping of routes by method for quick lookup.
+	*/
+	static routesByMethod = {};
+	/**
 	* Current route prefix
 	*/
 	static prefix = "";
@@ -42,13 +50,23 @@ var Router = class Router {
 	* @param middlewares - Array of middleware functions
 	*/
 	static add(methods, path, handler, middlewares) {
-		const methodArray = Array.isArray(methods) ? methods : [methods];
+		methods = Array.isArray(methods) ? methods : [methods];
 		const fullPath = this.normalizePath(`${this.prefix}/${path}`);
-		this.routes.push(new require_Route.Route(methodArray, fullPath, handler, [
+		const route = new require_Route.Route(methods.includes("options") ? methods : methods.concat("options"), fullPath, handler, [
 			...this.globalMiddlewares,
 			...this.groupMiddlewares,
 			...middlewares || []
-		]));
+		]);
+		if (!methods.includes("options") && !this.routesByPathMethod[`OPTIONS ${fullPath}`]) this.options(path, ({ res }) => {
+			res.set("Allow", "GET, POST, PUT, DELETE, PATCH, OPTIONS, HEAD");
+			res.sendStatus(204);
+		});
+		this.routes.push(route);
+		for (const method of methods.map((m) => m.toUpperCase())) {
+			this.routesByPathMethod[`${method.toUpperCase()} ${fullPath}`] = route;
+			if (!this.routesByMethod[method]) this.routesByMethod[method] = [];
+			this.routesByMethod[method].push(route);
+		}
 	}
 	/**
 	* Register RESTful API resource routes for a controller with optional action filtering
@@ -184,12 +202,10 @@ var Router = class Router {
 		callback();
 		this.globalMiddlewares = prevMiddlewares;
 	}
-	/**
-	* Get all registered routes with their information
-	* @returns Array of route information objects
-	*/
-	static allRoutes() {
-		return this.routes;
+	static allRoutes(type) {
+		if (type === "method") return this.routesByMethod;
+		if (type === "path") return this.routesByPathMethod;
+		return this.routes.filter((e) => e.methods.length > 1 || e.methods[0] !== "options");
 	}
 	static async apply(router) {
 		for (const route of this.routes) {
@@ -218,7 +234,7 @@ var Router = class Router {
 			}
 			if (!handlerFunction) continue;
 			for (const method of route.methods) {
-				if (![
+				const allowedMethods = [
 					"get",
 					"post",
 					"put",
@@ -226,7 +242,9 @@ var Router = class Router {
 					"patch",
 					"options",
 					"head"
-				].includes(method)) {
+				];
+				if (method === "options" && route.methods.length > 1) continue;
+				if (!allowedMethods.includes(method)) {
 					const error = /* @__PURE__ */ new Error(`Invalid HTTP method: ${method} for route: ${route.path}`);
 					console.error("[ROUTES]", error.message);
 					throw error;

package/dist/express/index.d.cts

@@ -14,6 +14,14 @@ declare class Router {
    * All registered routes
    */
   static routes: Array<Route<HttpContext, Middleware>>;
+  /**
+   * Mapping of routes by path and method for quick lookup.
+   */
+  static routesByPathMethod: Record<string, Route<HttpContext, Middleware>>;
+  /**
+   * Mapping of routes by method for quick lookup.
+   */
+  static routesByMethod: { [method in Uppercase<HttpMethod>]?: Array<Route<HttpContext, Middleware>> };
   /**
    * Current route prefix
    */
@@ -117,7 +125,9 @@ declare class Router {
    * Get all registered routes with their information
    * @returns Array of route information objects
    */
-  static allRoutes(): Route<HttpContext, Middleware>[];
+  static allRoutes(type?: 'path'): Record<string, Route<HttpContext, Middleware>>;
+  static allRoutes(type?: 'method'): { [method in Uppercase<HttpMethod>]?: Array<Route<HttpContext, Middleware>> };
+  static allRoutes(type?: 'method'): Array<Route<HttpContext, Middleware>>;
   /**
    * Apply all registered routes to the provided Express Router instance
    * Handles controller-method binding and middleware application

package/dist/express/index.d.mts

@@ -14,6 +14,14 @@ declare class Router {
    * All registered routes
    */
   static routes: Array<Route<HttpContext, Middleware>>;
+  /**
+   * Mapping of routes by path and method for quick lookup.
+   */
+  static routesByPathMethod: Record<string, Route<HttpContext, Middleware>>;
+  /**
+   * Mapping of routes by method for quick lookup.
+   */
+  static routesByMethod: { [method in Uppercase<HttpMethod>]?: Array<Route<HttpContext, Middleware>> };
   /**
    * Current route prefix
    */
@@ -117,7 +125,9 @@ declare class Router {
    * Get all registered routes with their information
    * @returns Array of route information objects
    */
-  static allRoutes(): Route<HttpContext, Middleware>[];
+  static allRoutes(type?: 'path'): Record<string, Route<HttpContext, Middleware>>;
+  static allRoutes(type?: 'method'): { [method in Uppercase<HttpMethod>]?: Array<Route<HttpContext, Middleware>> };
+  static allRoutes(type?: 'method'): Array<Route<HttpContext, Middleware>>;
   /**
    * Apply all registered routes to the provided Express Router instance
    * Handles controller-method binding and middleware application

package/dist/express/index.mjs

@@ -14,6 +14,14 @@ var Router = class Router {
 	*/
 	static routes = [];
 	/**
+	* Mapping of routes by path and method for quick lookup.
+	*/
+	static routesByPathMethod = {};
+	/**
+	* Mapping of routes by method for quick lookup.
+	*/
+	static routesByMethod = {};
+	/**
 	* Current route prefix
 	*/
 	static prefix = "";
@@ -41,13 +49,23 @@ var Router = class Router {
 	* @param middlewares - Array of middleware functions
 	*/
 	static add(methods, path, handler, middlewares) {
-		const methodArray = Array.isArray(methods) ? methods : [methods];
+		methods = Array.isArray(methods) ? methods : [methods];
 		const fullPath = this.normalizePath(`${this.prefix}/${path}`);
-		this.routes.push(new Route(methodArray, fullPath, handler, [
+		const route = new Route(methods.includes("options") ? methods : methods.concat("options"), fullPath, handler, [
 			...this.globalMiddlewares,
 			...this.groupMiddlewares,
 			...middlewares || []
-		]));
+		]);
+		if (!methods.includes("options") && !this.routesByPathMethod[`OPTIONS ${fullPath}`]) this.options(path, ({ res }) => {
+			res.set("Allow", "GET, POST, PUT, DELETE, PATCH, OPTIONS, HEAD");
+			res.sendStatus(204);
+		});
+		this.routes.push(route);
+		for (const method of methods.map((m) => m.toUpperCase())) {
+			this.routesByPathMethod[`${method.toUpperCase()} ${fullPath}`] = route;
+			if (!this.routesByMethod[method]) this.routesByMethod[method] = [];
+			this.routesByMethod[method].push(route);
+		}
 	}
 	/**
 	* Register RESTful API resource routes for a controller with optional action filtering
@@ -183,12 +201,10 @@ var Router = class Router {
 		callback();
 		this.globalMiddlewares = prevMiddlewares;
 	}
-	/**
-	* Get all registered routes with their information
-	* @returns Array of route information objects
-	*/
-	static allRoutes() {
-		return this.routes;
+	static allRoutes(type) {
+		if (type === "method") return this.routesByMethod;
+		if (type === "path") return this.routesByPathMethod;
+		return this.routes.filter((e) => e.methods.length > 1 || e.methods[0] !== "options");
 	}
 	static async apply(router) {
 		for (const route of this.routes) {
@@ -217,7 +233,7 @@ var Router = class Router {
 			}
 			if (!handlerFunction) continue;
 			for (const method of route.methods) {
-				if (![
+				const allowedMethods = [
 					"get",
 					"post",
 					"put",
@@ -225,7 +241,9 @@ var Router = class Router {
 					"patch",
 					"options",
 					"head"
-				].includes(method)) {
+				];
+				if (method === "options" && route.methods.length > 1) continue;
+				if (!allowedMethods.includes(method)) {
 					const error = /* @__PURE__ */ new Error(`Invalid HTTP method: ${method} for route: ${route.path}`);
 					console.error("[ROUTES]", error.message);
 					throw error;

package/dist/h3/index.cjs

@@ -15,6 +15,14 @@ var Router = class Router {
 	*/
 	static routes = [];
 	/**
+	* Mapping of routes by path and method for quick lookup.
+	*/
+	static routesByPathMethod = {};
+	/**
+	* Mapping of routes by method for quick lookup.
+	*/
+	static routesByMethod = {};
+	/**
 	* Current route prefix
 	*/
 	static prefix = "";
@@ -42,13 +50,23 @@ var Router = class Router {
 	* @param middlewares - Array of middleware functions
 	*/
 	static add(methods, path, handler, middlewares) {
-		const methodArray = Array.isArray(methods) ? methods : [methods];
+		methods = Array.isArray(methods) ? methods : [methods];
 		const fullPath = this.normalizePath(`${this.prefix}/${path}`);
-		this.routes.push(new require_Route.Route(methodArray, fullPath, handler, [
+		const route = new require_Route.Route(methods.includes("options") ? methods : methods.concat("options"), fullPath, handler, [
 			...this.globalMiddlewares,
 			...this.groupMiddlewares,
 			...middlewares || []
-		]));
+		]);
+		if (!methods.includes("options") && !this.routesByPathMethod[`OPTIONS ${fullPath}`]) this.options(path, ({ res }) => {
+			res.headers.set("Allow", "GET, POST, PUT, DELETE, PATCH, OPTIONS, HEAD");
+			res.status = 204;
+		});
+		this.routes.push(route);
+		for (const method of methods.map((m) => m.toUpperCase())) {
+			this.routesByPathMethod[`${method} ${fullPath}`] = route;
+			if (!this.routesByMethod[method]) this.routesByMethod[method] = [];
+			this.routesByMethod[method].push(route);
+		}
 	}
 	/**
 	* Register RESTful API resource routes for a controller with optional action filtering
@@ -184,12 +202,10 @@ var Router = class Router {
 		callback();
 		this.globalMiddlewares = prevMiddlewares;
 	}
-	/**
-	* Get all registered routes with their information
-	* @returns Array of route information objects
-	*/
-	static allRoutes() {
-		return this.routes;
+	static allRoutes(type) {
+		if (type === "method") return this.routesByMethod;
+		if (type === "path") return this.routesByPathMethod;
+		return this.routes.filter((e) => e.methods.length > 1 || e.methods[0] !== "options");
 	}
 	/**
 	* Apply all registered routes to the provided H3 Router instance
@@ -225,7 +241,7 @@ var Router = class Router {
 			}
 			if (!handlerFunction) continue;
 			for (const method of route.methods) {
-				if (![
+				const allowedMethods = [
 					"get",
 					"post",
 					"put",
@@ -233,7 +249,9 @@ var Router = class Router {
 					"patch",
 					"options",
 					"head"
-				].includes(method)) {
+				];
+				if (method === "options" && route.methods.length > 1) continue;
+				if (!allowedMethods.includes(method)) {
 					const error = /* @__PURE__ */ new Error(`Invalid HTTP method: ${method} for route: ${route.path}`);
 					console.error("[ROUTES]", error.message);
 					throw error;

package/dist/h3/index.d.cts

@@ -1,5 +1,4 @@
 import { a as H3App, c as Middleware, i as Route, l as ControllerAction, o as Handler, s as HttpContext, u as HttpMethod } from "../express-JHxK-EqQ.cjs";
-import * as h3 from "h3";
 import { H3 } from "h3";
 
 //#region src/h3/router.d.ts
@@ -14,6 +13,14 @@ declare class Router {
    * All registered routes
    */
   static routes: Array<Route<HttpContext, Middleware>>;
+  /**
+   * Mapping of routes by path and method for quick lookup.
+   */
+  static routesByPathMethod: Record<string, Route<HttpContext, Middleware>>;
+  /**
+   * Mapping of routes by method for quick lookup.
+   */
+  static routesByMethod: { [method in Uppercase<HttpMethod>]?: Array<Route<HttpContext, Middleware>> };
   /**
    * Current route prefix
    */
@@ -117,7 +124,9 @@ declare class Router {
    * Get all registered routes with their information
    * @returns Array of route information objects
    */
-  static allRoutes(): Route<h3.H3Event<h3.EventHandlerRequest>, Middleware>[];
+  static allRoutes(type?: 'path'): Record<string, Route<HttpContext, Middleware>>;
+  static allRoutes(type?: 'method'): { [method in Uppercase<HttpMethod>]?: Array<Route<HttpContext, Middleware>> };
+  static allRoutes(type?: 'method'): Array<Route<HttpContext, Middleware>>;
   /**
    * Apply all registered routes to the provided H3 Router instance
    * Handles controller-method binding and middleware application

package/dist/h3/index.d.mts

@@ -1,5 +1,4 @@
 import { a as H3App, c as Middleware, i as Route, l as ControllerAction, o as Handler, s as HttpContext, u as HttpMethod } from "../express-D9GR9yTH.mjs";
-import * as h3 from "h3";
 import { H3 } from "h3";
 
 //#region src/h3/router.d.ts
@@ -14,6 +13,14 @@ declare class Router {
    * All registered routes
    */
   static routes: Array<Route<HttpContext, Middleware>>;
+  /**
+   * Mapping of routes by path and method for quick lookup.
+   */
+  static routesByPathMethod: Record<string, Route<HttpContext, Middleware>>;
+  /**
+   * Mapping of routes by method for quick lookup.
+   */
+  static routesByMethod: { [method in Uppercase<HttpMethod>]?: Array<Route<HttpContext, Middleware>> };
   /**
    * Current route prefix
    */
@@ -117,7 +124,9 @@ declare class Router {
    * Get all registered routes with their information
    * @returns Array of route information objects
    */
-  static allRoutes(): Route<h3.H3Event<h3.EventHandlerRequest>, Middleware>[];
+  static allRoutes(type?: 'path'): Record<string, Route<HttpContext, Middleware>>;
+  static allRoutes(type?: 'method'): { [method in Uppercase<HttpMethod>]?: Array<Route<HttpContext, Middleware>> };
+  static allRoutes(type?: 'method'): Array<Route<HttpContext, Middleware>>;
   /**
    * Apply all registered routes to the provided H3 Router instance
    * Handles controller-method binding and middleware application

package/dist/h3/index.mjs

@@ -14,6 +14,14 @@ var Router = class Router {
 	*/
 	static routes = [];
 	/**
+	* Mapping of routes by path and method for quick lookup.
+	*/
+	static routesByPathMethod = {};
+	/**
+	* Mapping of routes by method for quick lookup.
+	*/
+	static routesByMethod = {};
+	/**
 	* Current route prefix
 	*/
 	static prefix = "";
@@ -41,13 +49,23 @@ var Router = class Router {
 	* @param middlewares - Array of middleware functions
 	*/
 	static add(methods, path, handler, middlewares) {
-		const methodArray = Array.isArray(methods) ? methods : [methods];
+		methods = Array.isArray(methods) ? methods : [methods];
 		const fullPath = this.normalizePath(`${this.prefix}/${path}`);
-		this.routes.push(new Route(methodArray, fullPath, handler, [
+		const route = new Route(methods.includes("options") ? methods : methods.concat("options"), fullPath, handler, [
 			...this.globalMiddlewares,
 			...this.groupMiddlewares,
 			...middlewares || []
-		]));
+		]);
+		if (!methods.includes("options") && !this.routesByPathMethod[`OPTIONS ${fullPath}`]) this.options(path, ({ res }) => {
+			res.headers.set("Allow", "GET, POST, PUT, DELETE, PATCH, OPTIONS, HEAD");
+			res.status = 204;
+		});
+		this.routes.push(route);
+		for (const method of methods.map((m) => m.toUpperCase())) {
+			this.routesByPathMethod[`${method} ${fullPath}`] = route;
+			if (!this.routesByMethod[method]) this.routesByMethod[method] = [];
+			this.routesByMethod[method].push(route);
+		}
 	}
 	/**
 	* Register RESTful API resource routes for a controller with optional action filtering
@@ -183,12 +201,10 @@ var Router = class Router {
 		callback();
 		this.globalMiddlewares = prevMiddlewares;
 	}
-	/**
-	* Get all registered routes with their information
-	* @returns Array of route information objects
-	*/
-	static allRoutes() {
-		return this.routes;
+	static allRoutes(type) {
+		if (type === "method") return this.routesByMethod;
+		if (type === "path") return this.routesByPathMethod;
+		return this.routes.filter((e) => e.methods.length > 1 || e.methods[0] !== "options");
 	}
 	/**
 	* Apply all registered routes to the provided H3 Router instance
@@ -224,7 +240,7 @@ var Router = class Router {
 			}
 			if (!handlerFunction) continue;
 			for (const method of route.methods) {
-				if (![
+				const allowedMethods = [
 					"get",
 					"post",
 					"put",
@@ -232,7 +248,9 @@ var Router = class Router {
 					"patch",
 					"options",
 					"head"
-				].includes(method)) {
+				];
+				if (method === "options" && route.methods.length > 1) continue;
+				if (!allowedMethods.includes(method)) {
 					const error = /* @__PURE__ */ new Error(`Invalid HTTP method: ${method} for route: ${route.path}`);
 					console.error("[ROUTES]", error.message);
 					throw error;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clear-router",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "description": "Laravel-style routing system for Express.js and H3, with CommonJS, ESM, and TypeScript support",
   "keywords": [
     "h3",
@@ -72,6 +72,7 @@
     "@types/express": "^4.17.21",
     "@types/node": "^20.10.6",
     "@types/supertest": "^6.0.3",
+    "@vitest/coverage-v8": "4.0.18",
     "eslint": "^10.0.2",
     "supertest": "^7.1.1",
     "tsdown": "^0.20.3",