clear-router 2.7.7 → 2.8.0

package/dist/core/router.d.mts

@@ -4,6 +4,7 @@ import { Route } from "../Route.mjs";
 import { Request } from "./Request.mjs";
 import { ClearRouterPluginArgumentsContext, ClearRouterPluginInput, ClearRouterPluginRequestContext, PluginArgumentsResolver, PluginBind } from "./plugins.mjs";
 import { Controller } from "../Controller.mjs";
+import { ResourceRoutes } from "../ResourceRoutes.mjs";
 import { AsyncLocalStorage } from "node:async_hooks";
 
 //#region src/core/router.d.ts
@@ -37,6 +38,17 @@ declare abstract class CoreRouter {
   static prefix: string;
   static groupMiddlewares: any[];
   static globalMiddlewares: any[];
+  /**
+   * Resolve middlewares before assigning to adapter
+   *
+   * @param middleware
+   * @returns
+   */
+  protected static resolveMiddleware(middleware: any): any;
+  protected static resolveMiddlewares(middlewares?: any[]): any[];
+  protected static routeSpecificity(route: Route<any, any, any>): [number, number, number];
+  protected static orderedRoutes(): Array<Route<any, any, any>>;
+  protected static removeRouteMethod(route: Route<any, any, any>, method: HttpMethod, path: string): void;
   /**
    * Resets the router to it's default state
    */
@@ -134,7 +146,7 @@ declare abstract class CoreRouter {
     only?: ControllerAction[];
     except?: ControllerAction[];
     middlewares?: ApiResourceMiddleware<any>;
-  }): void;
+  }): ResourceRoutes<any, any, any>;
   /**
    * Adds a new GET route to the router.
    *

package/dist/core/router.mjs

@@ -1,6 +1,7 @@
 import { Request } from "./Request.mjs";
 import { Response } from "./Response.mjs";
 import { Container, getBindingMetadataFromTargets, getDesignParamTypes, getStandardMetadata, isClass } from "./bindings.mjs";
+import { ResourceRoutes } from "../ResourceRoutes.mjs";
 import { Route } from "../Route.mjs";
 import { createRequire } from "node:module";
 import { AsyncLocalStorage } from "node:async_hooks";
@@ -45,6 +46,51 @@ var CoreRouter = class {
 	static groupMiddlewares = [];
 	static globalMiddlewares = [];
 	/**
+	* Resolve middlewares before assigning to adapter
+	* 
+	* @param middleware 
+	* @returns 
+	*/
+	static resolveMiddleware(middleware) {
+		if (!middleware || typeof middleware === "function" && !isClass(middleware)) return middleware;
+		const instance = isClass(middleware) ? new middleware() : middleware;
+		if (instance && typeof instance.handle === "function") return instance.handle.bind(instance);
+		return middleware;
+	}
+	static resolveMiddlewares(middlewares = []) {
+		return middlewares.map((middleware) => this.resolveMiddleware(middleware));
+	}
+	static routeSpecificity(route) {
+		const path = route.registrationPaths.slice().sort((left, right) => right.length - left.length)[0] ?? route.path;
+		const segments = this.normalizePath(path).split("/").filter(Boolean);
+		return [
+			segments.filter((segment) => !segment.startsWith(":")).length,
+			segments.length,
+			path.length
+		];
+	}
+	static orderedRoutes() {
+		return Array.from(this.routes).sort((left, right) => {
+			const leftScore = this.routeSpecificity(left);
+			const rightScore = this.routeSpecificity(right);
+			for (let index = 0; index < leftScore.length; index++) {
+				const difference = rightScore[index] - leftScore[index];
+				if (difference !== 0) return difference;
+			}
+			return 0;
+		});
+	}
+	static removeRouteMethod(route, method, path) {
+		route.methods = route.methods.filter((existingMethod) => existingMethod !== method);
+		this.routesByPathMethod.delete(`${method.toUpperCase()} ${path}`);
+		const methodKey = method.toUpperCase();
+		this.routesByMethod.set(methodKey, (this.routesByMethod.get(methodKey) ?? []).filter((existingRoute) => existingRoute !== route));
+		if (!route.methods.some((existingMethod) => existingMethod !== "options")) {
+			this.routes.delete(route);
+			if (route.routeName && this.routesByName.get(route.routeName) === route) this.routesByName.delete(route.routeName);
+		}
+	}
+	/**
 	* Resets the router to it's default state
 	*/
 	static reset() {
@@ -456,17 +502,22 @@ var CoreRouter = class {
 		const fullPath = this.normalizePath(`${activePrefix}/${path}`);
 		const registrationPaths = this.routeRegistrationPaths(fullPath);
 		const parameters = this.parseRouteParameters(fullPath);
-		const route = new Route(methods.includes("options") ? methods : methods.concat("options"), fullPath, handler, [
+		for (const method of methods) {
+			const existing = this.routesByPathMethod.get(`${method.toUpperCase()} ${fullPath}`);
+			if (existing) this.removeRouteMethod(existing, method, fullPath);
+		}
+		const route = new Route(methods.includes("options") ? methods : methods.concat("options"), fullPath, handler, this.resolveMiddlewares([
 			...this.globalMiddlewares,
 			...activeGroupMiddlewares,
 			...middlewares || []
-		], {
+		]), {
 			registrationPaths,
 			parameters,
 			onName: (name, route, previousName) => {
 				if (previousName && this.routesByName.get(previousName) === route) this.routesByName.delete(previousName);
 				this.routesByName.set(name, route);
-			}
+			},
+			normalizeMiddleware: (middleware) => this.resolveMiddleware(middleware)
 		});
 		if (!methods.includes("options") && !this.routesByPathMethod.get(`OPTIONS ${fullPath}`)) this.options(path, this.createDefaultOptionsHandler());
 		this.routes.add(route);
@@ -486,6 +537,7 @@ var CoreRouter = class {
 	* @param options 
 	*/
 	static apiResource(basePath, controller, options) {
+		const resourceRoutes = {};
 		let paramName = "id";
 		if (!!this.config.inferParamName && this.hasPackageInstalled("@h3ravel/support")) {
 			const { str } = createRequire(import.meta.url)("@h3ravel/support");
@@ -522,9 +574,10 @@ var CoreRouter = class {
 				const { method, path } = actions[action];
 				const actionMiddlewares = typeof options?.middlewares === "object" && !Array.isArray(options.middlewares) ? options.middlewares[action] : options?.middlewares;
 				const name = `${basePath}${path}`.replace(/\/:[^/]+|\/\{[^}]+\}/g, "").replace(/\{(\w+):[^}]+\}/g, "$1").replace(/\/|:|[{}]/g, ".").replace(/\.{2,}/g, ".").replace(/^\.|\.$/g, "");
-				this.add(method, `${basePath}${path}`, [controller, action], Array.isArray(actionMiddlewares) ? actionMiddlewares : actionMiddlewares ? [actionMiddlewares] : void 0).name(name + "." + action.toLowerCase());
+				resourceRoutes[action] = this.add(method, `${basePath}${path}`, [controller, action], Array.isArray(actionMiddlewares) ? actionMiddlewares : actionMiddlewares ? [actionMiddlewares] : void 0).name(name + "." + action.toLowerCase());
 			}
 		}
+		return new ResourceRoutes(resourceRoutes);
 	}
 	/**
 	* Adds a new GET route to the router.

package/dist/decorators/setup.d.mts

@@ -1,3 +1,2 @@
 import { Bind, BindDecorator, BindFactory, BindToken, BindValue, Container } from "../core/bindings.mjs";
-import "reflect-metadata";
 export { Bind, BindDecorator, BindFactory, BindToken, BindValue, Container };

package/dist/express/router.cjs

@@ -62,7 +62,7 @@ var Router = class Router extends require_router.CoreRouter {
 	* @param options 
 	*/
 	static apiResource(basePath, controller, options) {
-		super.apiResource(basePath, controller, options);
+		return super.apiResource(basePath, controller, options);
 	}
 	/**
 	* Adds a new GET route to the router.
@@ -160,7 +160,7 @@ var Router = class Router extends require_router.CoreRouter {
 		return super.route(name);
 	}
 	static async apply(router) {
-		for (const route of Array.from(this.routes)) {
+		for (const route of this.orderedRoutes()) {
 			let handlerFunction = null;
 			let instance = null;
 			let bindingTarget;

package/dist/express/router.d.cts

@@ -1,6 +1,7 @@
 import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.cjs";
 import { Handler, HttpContext, Middleware } from "../types/express.cjs";
 import { Route } from "../Route.cjs";
+import { ResourceRoutes } from "../ResourceRoutes.cjs";
 import { CoreRouter } from "../core/router.cjs";
 import { Router } from "express";
 
@@ -36,7 +37,7 @@ declare class Router$1 extends CoreRouter {
     only?: ControllerAction[];
     except?: ControllerAction[];
     middlewares?: ApiResourceMiddleware<Middleware>;
-  }): void;
+  }): ResourceRoutes<HttpContext, Middleware, Handler>;
   /**
    * Adds a new GET route to the router.
    *

package/dist/express/router.d.mts

@@ -1,6 +1,7 @@
 import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.mjs";
 import { Handler, HttpContext, Middleware } from "../types/express.mjs";
 import { Route } from "../Route.mjs";
+import { ResourceRoutes } from "../ResourceRoutes.mjs";
 import { CoreRouter } from "../core/router.mjs";
 import { Router } from "express";
 
@@ -36,7 +37,7 @@ declare class Router$1 extends CoreRouter {
     only?: ControllerAction[];
     except?: ControllerAction[];
     middlewares?: ApiResourceMiddleware<Middleware>;
-  }): void;
+  }): ResourceRoutes<HttpContext, Middleware, Handler>;
   /**
    * Adds a new GET route to the router.
    *

package/dist/express/router.mjs

@@ -62,7 +62,7 @@ var Router = class Router extends CoreRouter {
 	* @param options 
 	*/
 	static apiResource(basePath, controller, options) {
-		super.apiResource(basePath, controller, options);
+		return super.apiResource(basePath, controller, options);
 	}
 	/**
 	* Adds a new GET route to the router.
@@ -160,7 +160,7 @@ var Router = class Router extends CoreRouter {
 		return super.route(name);
 	}
 	static async apply(router) {
-		for (const route of Array.from(this.routes)) {
+		for (const route of this.orderedRoutes()) {
 			let handlerFunction = null;
 			let instance = null;
 			let bindingTarget;

package/dist/fastify/router.cjs

@@ -55,7 +55,7 @@ var Router = class Router extends require_router.CoreRouter {
 	* @param options      Optional configuration for the resource
 	*/
 	static apiResource(basePath, controller, options) {
-		super.apiResource(basePath, controller, options);
+		return super.apiResource(basePath, controller, options);
 	}
 	/**
 	* Define a GET route
@@ -159,7 +159,7 @@ var Router = class Router extends require_router.CoreRouter {
 	* @returns    The Fastify application instance with the applied routes
 	*/
 	static apply(app) {
-		for (const route of Array.from(this.routes)) {
+		for (const route of this.orderedRoutes()) {
 			let handlerFunction = null;
 			let instance = null;
 			let bindingTarget;

package/dist/fastify/router.d.cts

@@ -1,6 +1,7 @@
 import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.cjs";
 import { FastifyApp, Handler, HttpContext, Middleware } from "../types/fastify.cjs";
 import { Route } from "../Route.cjs";
+import { ResourceRoutes } from "../ResourceRoutes.cjs";
 import { CoreRouter } from "../core/router.cjs";
 
 //#region src/fastify/router.d.ts
@@ -34,7 +35,7 @@ declare class Router extends CoreRouter {
     only?: ControllerAction[];
     except?: ControllerAction[];
     middlewares?: ApiResourceMiddleware<Middleware>;
-  }): void;
+  }): ResourceRoutes<HttpContext, Middleware, Handler>;
   /**
    * Define a GET route
    *

package/dist/fastify/router.d.mts

@@ -1,6 +1,7 @@
 import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.mjs";
 import { FastifyApp, Handler, HttpContext, Middleware } from "../types/fastify.mjs";
 import { Route } from "../Route.mjs";
+import { ResourceRoutes } from "../ResourceRoutes.mjs";
 import { CoreRouter } from "../core/router.mjs";
 
 //#region src/fastify/router.d.ts
@@ -34,7 +35,7 @@ declare class Router extends CoreRouter {
     only?: ControllerAction[];
     except?: ControllerAction[];
     middlewares?: ApiResourceMiddleware<Middleware>;
-  }): void;
+  }): ResourceRoutes<HttpContext, Middleware, Handler>;
   /**
    * Define a GET route
    *

package/dist/fastify/router.mjs

@@ -55,7 +55,7 @@ var Router = class Router extends CoreRouter {
 	* @param options      Optional configuration for the resource
 	*/
 	static apiResource(basePath, controller, options) {
-		super.apiResource(basePath, controller, options);
+		return super.apiResource(basePath, controller, options);
 	}
 	/**
 	* Define a GET route
@@ -159,7 +159,7 @@ var Router = class Router extends CoreRouter {
 	* @returns    The Fastify application instance with the applied routes
 	*/
 	static apply(app) {
-		for (const route of Array.from(this.routes)) {
+		for (const route of this.orderedRoutes()) {
 			let handlerFunction = null;
 			let instance = null;
 			let bindingTarget;

package/dist/h3/router.cjs

@@ -64,7 +64,7 @@ var Router = class Router extends require_router.CoreRouter {
 	* @param options 
 	*/
 	static apiResource(basePath, controller, options) {
-		super.apiResource(basePath, controller, options);
+		return super.apiResource(basePath, controller, options);
 	}
 	/**
 	* Adds a new GET route to the router with the specified path, handler, and optional middlewares.
@@ -169,7 +169,7 @@ var Router = class Router extends require_router.CoreRouter {
 	* @returns 
 	*/
 	static apply(app) {
-		for (const route of Array.from(this.routes)) {
+		for (const route of this.orderedRoutes()) {
 			let handlerFunction = null;
 			let instance = null;
 			let bindingTarget;

package/dist/h3/router.d.cts

@@ -1,6 +1,7 @@
 import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.cjs";
-import { H3App, Handler, HttpContext, Middleware } from "../types/h3.cjs";
+import { H3App, Handler, HttpContext, Middleware as Middleware$1 } from "../types/h3.cjs";
 import { Route } from "../Route.cjs";
+import { ResourceRoutes } from "../ResourceRoutes.cjs";
 import { CoreRouter } from "../core/router.cjs";
 import { H3 } from "h3";
 
@@ -24,7 +25,7 @@ declare class Router extends CoreRouter {
    * @param handler
    * @param middlewares
    */
-  static add(methods: HttpMethod | HttpMethod[], path: string, handler: Handler, middlewares?: Middleware[] | Middleware): Route<HttpContext, Middleware, Handler>;
+  static add(methods: HttpMethod | HttpMethod[], path: string, handler: Handler, middlewares?: Middleware$1[] | Middleware$1): Route<HttpContext, Middleware$1, Handler>;
   /**
    * Define a resourceful API controller with standard CRUD routes
    *
@@ -35,8 +36,8 @@ declare class Router extends CoreRouter {
   static apiResource(basePath: string, controller: any, options?: {
     only?: ControllerAction[];
     except?: ControllerAction[];
-    middlewares?: ApiResourceMiddleware<Middleware>;
-  }): void;
+    middlewares?: ApiResourceMiddleware<Middleware$1>;
+  }): ResourceRoutes<HttpContext, Middleware$1, Handler>;
   /**
    * Adds a new GET route to the router with the specified path, handler, and optional middlewares.
    *
@@ -44,7 +45,7 @@ declare class Router extends CoreRouter {
    * @param handler
    * @param middlewares
    */
-  static get(path: string, handler: Handler, middlewares?: Middleware[] | Middleware): Route<HttpContext, Middleware, Handler>;
+  static get(path: string, handler: Handler, middlewares?: Middleware$1[] | Middleware$1): Route<HttpContext, Middleware$1, Handler>;
   /**
    * Adds a new POST route to the router with the specified path, handler, and optional middlewares.
    *
@@ -52,7 +53,7 @@ declare class Router extends CoreRouter {
    * @param handler
    * @param middlewares
    */
-  static post(path: string, handler: Handler, middlewares?: Middleware[] | Middleware): Route<HttpContext, Middleware, Handler>;
+  static post(path: string, handler: Handler, middlewares?: Middleware$1[] | Middleware$1): Route<HttpContext, Middleware$1, Handler>;
   /**
    * Adds a new PUT route to the router with the specified path, handler, and optional middlewares.
    *
@@ -60,7 +61,7 @@ declare class Router extends CoreRouter {
    * @param handler
    * @param middlewares
    */
-  static put(path: string, handler: Handler, middlewares?: Middleware[] | Middleware): Route<HttpContext, Middleware, Handler>;
+  static put(path: string, handler: Handler, middlewares?: Middleware$1[] | Middleware$1): Route<HttpContext, Middleware$1, Handler>;
   /**
    * Adds a new DELETE route to the router with the specified path, handler, and optional middlewares.
    *
@@ -68,7 +69,7 @@ declare class Router extends CoreRouter {
    * @param handler
    * @param middlewares
    */
-  static delete(path: string, handler: Handler, middlewares?: Middleware[] | Middleware): Route<HttpContext, Middleware, Handler>;
+  static delete(path: string, handler: Handler, middlewares?: Middleware$1[] | Middleware$1): Route<HttpContext, Middleware$1, Handler>;
   /**
    * Adds a new PATCH route to the router with the specified path, handler, and optional middlewares.
    *
@@ -76,7 +77,7 @@ declare class Router extends CoreRouter {
    * @param handler
    * @param middlewares
    */
-  static patch(path: string, handler: Handler, middlewares?: Middleware[] | Middleware): Route<HttpContext, Middleware, Handler>;
+  static patch(path: string, handler: Handler, middlewares?: Middleware$1[] | Middleware$1): Route<HttpContext, Middleware$1, Handler>;
   /**
    * Adds a new OPTIONS route to the router with the specified path, handler, and optional middlewares.
    *
@@ -84,7 +85,7 @@ declare class Router extends CoreRouter {
    * @param handler
    * @param middlewares
    */
-  static options(path: string, handler: Handler, middlewares?: Middleware[] | Middleware): Route<HttpContext, Middleware, Handler>;
+  static options(path: string, handler: Handler, middlewares?: Middleware$1[] | Middleware$1): Route<HttpContext, Middleware$1, Handler>;
   /**
    * Adds a new HEAD route to the router.
    *
@@ -92,7 +93,7 @@ declare class Router extends CoreRouter {
    * @param handler
    * @param middlewares
    */
-  static head(path: string, handler: Handler, middlewares?: Middleware[] | Middleware): Route<HttpContext, Middleware, Handler>;
+  static head(path: string, handler: Handler, middlewares?: Middleware$1[] | Middleware$1): Route<HttpContext, Middleware$1, Handler>;
   /**
    * Defines a group of routes with a common prefix.
    *
@@ -100,25 +101,25 @@ declare class Router extends CoreRouter {
    * @param callback
    * @param middlewares
    */
-  static group(prefix: string, callback: () => void | Promise<void>, middlewares?: Middleware[]): Promise<void>;
+  static group(prefix: string, callback: () => void | Promise<void>, middlewares?: Middleware$1[]): Promise<void>;
   /**
    * Adds global middlewares to the router, which will be applied to all routes.
    *
    * @param middlewares
    * @param callback
    */
-  static middleware(middlewares: Middleware[], callback: () => void): void;
+  static middleware(middlewares: Middleware$1[], callback: () => void): void;
   /**
    * Retrieves all registered routes in the router, optionally organized by path or method
    * for easier access and management.
    *
    * @param type
    */
-  static allRoutes(): Array<Route<HttpContext, Middleware, Handler>>;
-  static allRoutes(type: 'path'): Record<string, Route<HttpContext, Middleware, Handler>>;
-  static allRoutes(type: 'method'): { [method in Uppercase<HttpMethod>]?: Array<Route<HttpContext, Middleware, Handler>> };
-  static allRoutes(type: 'name'): Record<string, Route<HttpContext, Middleware, Handler>>;
-  static route(name: string): Route<HttpContext, Middleware, Handler> | undefined;
+  static allRoutes(): Array<Route<HttpContext, Middleware$1, Handler>>;
+  static allRoutes(type: 'path'): Record<string, Route<HttpContext, Middleware$1, Handler>>;
+  static allRoutes(type: 'method'): { [method in Uppercase<HttpMethod>]?: Array<Route<HttpContext, Middleware$1, Handler>> };
+  static allRoutes(type: 'name'): Record<string, Route<HttpContext, Middleware$1, Handler>>;
+  static route(name: string): Route<HttpContext, Middleware$1, Handler> | undefined;
   /**
    * Applies the registered routes to the given H3 application instance, setting up the
    * necessary handlers and middlewares for each route.

package/dist/h3/router.d.mts

@@ -1,6 +1,7 @@
 import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.mjs";
-import { H3App, Handler, HttpContext, Middleware } from "../types/h3.mjs";
+import { H3App, Handler, HttpContext, Middleware as Middleware$1 } from "../types/h3.mjs";
 import { Route } from "../Route.mjs";
+import { ResourceRoutes } from "../ResourceRoutes.mjs";
 import { CoreRouter } from "../core/router.mjs";
 import { H3 } from "h3";
 
@@ -24,7 +25,7 @@ declare class Router extends CoreRouter {
    * @param handler
    * @param middlewares
    */
-  static add(methods: HttpMethod | HttpMethod[], path: string, handler: Handler, middlewares?: Middleware[] | Middleware): Route<HttpContext, Middleware, Handler>;
+  static add(methods: HttpMethod | HttpMethod[], path: string, handler: Handler, middlewares?: Middleware$1[] | Middleware$1): Route<HttpContext, Middleware$1, Handler>;
   /**
    * Define a resourceful API controller with standard CRUD routes
    *
@@ -35,8 +36,8 @@ declare class Router extends CoreRouter {
   static apiResource(basePath: string, controller: any, options?: {
     only?: ControllerAction[];
     except?: ControllerAction[];
-    middlewares?: ApiResourceMiddleware<Middleware>;
-  }): void;
+    middlewares?: ApiResourceMiddleware<Middleware$1>;
+  }): ResourceRoutes<HttpContext, Middleware$1, Handler>;
   /**
    * Adds a new GET route to the router with the specified path, handler, and optional middlewares.
    *
@@ -44,7 +45,7 @@ declare class Router extends CoreRouter {
    * @param handler
    * @param middlewares
    */
-  static get(path: string, handler: Handler, middlewares?: Middleware[] | Middleware): Route<HttpContext, Middleware, Handler>;
+  static get(path: string, handler: Handler, middlewares?: Middleware$1[] | Middleware$1): Route<HttpContext, Middleware$1, Handler>;
   /**
    * Adds a new POST route to the router with the specified path, handler, and optional middlewares.
    *
@@ -52,7 +53,7 @@ declare class Router extends CoreRouter {
    * @param handler
    * @param middlewares
    */
-  static post(path: string, handler: Handler, middlewares?: Middleware[] | Middleware): Route<HttpContext, Middleware, Handler>;
+  static post(path: string, handler: Handler, middlewares?: Middleware$1[] | Middleware$1): Route<HttpContext, Middleware$1, Handler>;
   /**
    * Adds a new PUT route to the router with the specified path, handler, and optional middlewares.
    *
@@ -60,7 +61,7 @@ declare class Router extends CoreRouter {
    * @param handler
    * @param middlewares
    */
-  static put(path: string, handler: Handler, middlewares?: Middleware[] | Middleware): Route<HttpContext, Middleware, Handler>;
+  static put(path: string, handler: Handler, middlewares?: Middleware$1[] | Middleware$1): Route<HttpContext, Middleware$1, Handler>;
   /**
    * Adds a new DELETE route to the router with the specified path, handler, and optional middlewares.
    *
@@ -68,7 +69,7 @@ declare class Router extends CoreRouter {
    * @param handler
    * @param middlewares
    */
-  static delete(path: string, handler: Handler, middlewares?: Middleware[] | Middleware): Route<HttpContext, Middleware, Handler>;
+  static delete(path: string, handler: Handler, middlewares?: Middleware$1[] | Middleware$1): Route<HttpContext, Middleware$1, Handler>;
   /**
    * Adds a new PATCH route to the router with the specified path, handler, and optional middlewares.
    *
@@ -76,7 +77,7 @@ declare class Router extends CoreRouter {
    * @param handler
    * @param middlewares
    */
-  static patch(path: string, handler: Handler, middlewares?: Middleware[] | Middleware): Route<HttpContext, Middleware, Handler>;
+  static patch(path: string, handler: Handler, middlewares?: Middleware$1[] | Middleware$1): Route<HttpContext, Middleware$1, Handler>;
   /**
    * Adds a new OPTIONS route to the router with the specified path, handler, and optional middlewares.
    *
@@ -84,7 +85,7 @@ declare class Router extends CoreRouter {
    * @param handler
    * @param middlewares
    */
-  static options(path: string, handler: Handler, middlewares?: Middleware[] | Middleware): Route<HttpContext, Middleware, Handler>;
+  static options(path: string, handler: Handler, middlewares?: Middleware$1[] | Middleware$1): Route<HttpContext, Middleware$1, Handler>;
   /**
    * Adds a new HEAD route to the router.
    *
@@ -92,7 +93,7 @@ declare class Router extends CoreRouter {
    * @param handler
    * @param middlewares
    */
-  static head(path: string, handler: Handler, middlewares?: Middleware[] | Middleware): Route<HttpContext, Middleware, Handler>;
+  static head(path: string, handler: Handler, middlewares?: Middleware$1[] | Middleware$1): Route<HttpContext, Middleware$1, Handler>;
   /**
    * Defines a group of routes with a common prefix.
    *
@@ -100,25 +101,25 @@ declare class Router extends CoreRouter {
    * @param callback
    * @param middlewares
    */
-  static group(prefix: string, callback: () => void | Promise<void>, middlewares?: Middleware[]): Promise<void>;
+  static group(prefix: string, callback: () => void | Promise<void>, middlewares?: Middleware$1[]): Promise<void>;
   /**
    * Adds global middlewares to the router, which will be applied to all routes.
    *
    * @param middlewares
    * @param callback
    */
-  static middleware(middlewares: Middleware[], callback: () => void): void;
+  static middleware(middlewares: Middleware$1[], callback: () => void): void;
   /**
    * Retrieves all registered routes in the router, optionally organized by path or method
    * for easier access and management.
    *
    * @param type
    */
-  static allRoutes(): Array<Route<HttpContext, Middleware, Handler>>;
-  static allRoutes(type: 'path'): Record<string, Route<HttpContext, Middleware, Handler>>;
-  static allRoutes(type: 'method'): { [method in Uppercase<HttpMethod>]?: Array<Route<HttpContext, Middleware, Handler>> };
-  static allRoutes(type: 'name'): Record<string, Route<HttpContext, Middleware, Handler>>;
-  static route(name: string): Route<HttpContext, Middleware, Handler> | undefined;
+  static allRoutes(): Array<Route<HttpContext, Middleware$1, Handler>>;
+  static allRoutes(type: 'path'): Record<string, Route<HttpContext, Middleware$1, Handler>>;
+  static allRoutes(type: 'method'): { [method in Uppercase<HttpMethod>]?: Array<Route<HttpContext, Middleware$1, Handler>> };
+  static allRoutes(type: 'name'): Record<string, Route<HttpContext, Middleware$1, Handler>>;
+  static route(name: string): Route<HttpContext, Middleware$1, Handler> | undefined;
   /**
    * Applies the registered routes to the given H3 application instance, setting up the
    * necessary handlers and middlewares for each route.

package/dist/h3/router.mjs

@@ -64,7 +64,7 @@ var Router = class Router extends CoreRouter {
 	* @param options 
 	*/
 	static apiResource(basePath, controller, options) {
-		super.apiResource(basePath, controller, options);
+		return super.apiResource(basePath, controller, options);
 	}
 	/**
 	* Adds a new GET route to the router with the specified path, handler, and optional middlewares.
@@ -169,7 +169,7 @@ var Router = class Router extends CoreRouter {
 	* @returns 
 	*/
 	static apply(app) {
-		for (const route of Array.from(this.routes)) {
+		for (const route of this.orderedRoutes()) {
 			let handlerFunction = null;
 			let instance = null;
 			let bindingTarget;

package/dist/hono/router.cjs

@@ -68,7 +68,7 @@ var Router = class Router extends require_router.CoreRouter {
 	* @param options 
 	*/
 	static apiResource(basePath, controller, options) {
-		super.apiResource(basePath, controller, options);
+		return super.apiResource(basePath, controller, options);
 	}
 	/**
 	* Define a GET route
@@ -172,7 +172,7 @@ var Router = class Router extends require_router.CoreRouter {
 	* @returns    The Hono application instance with the applied routes
 	*/
 	static apply(app) {
-		for (const route of Array.from(this.routes)) {
+		for (const route of this.orderedRoutes()) {
 			let handlerFunction = null;
 			let instance = null;
 			let bindingTarget;

package/dist/hono/router.d.cts

@@ -1,6 +1,7 @@
 import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.cjs";
 import { Handler, HonoApp, HttpContext, Middleware } from "../types/hono.cjs";
 import { Route } from "../Route.cjs";
+import { ResourceRoutes } from "../ResourceRoutes.cjs";
 import { CoreRouter } from "../core/router.cjs";
 
 //#region src/hono/router.d.ts
@@ -36,7 +37,7 @@ declare class Router extends CoreRouter {
     only?: ControllerAction[];
     except?: ControllerAction[];
     middlewares?: ApiResourceMiddleware<Middleware>;
-  }): void;
+  }): ResourceRoutes<HttpContext, Middleware, Handler>;
   /**
    * Define a GET route
    *

package/dist/hono/router.d.mts

@@ -1,6 +1,7 @@
 import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.mjs";
 import { Handler, HonoApp, HttpContext, Middleware } from "../types/hono.mjs";
 import { Route } from "../Route.mjs";
+import { ResourceRoutes } from "../ResourceRoutes.mjs";
 import { CoreRouter } from "../core/router.mjs";
 
 //#region src/hono/router.d.ts
@@ -36,7 +37,7 @@ declare class Router extends CoreRouter {
     only?: ControllerAction[];
     except?: ControllerAction[];
     middlewares?: ApiResourceMiddleware<Middleware>;
-  }): void;
+  }): ResourceRoutes<HttpContext, Middleware, Handler>;
   /**
    * Define a GET route
    *

package/dist/hono/router.mjs

@@ -68,7 +68,7 @@ var Router = class Router extends CoreRouter {
 	* @param options 
 	*/
 	static apiResource(basePath, controller, options) {
-		super.apiResource(basePath, controller, options);
+		return super.apiResource(basePath, controller, options);
 	}
 	/**
 	* Define a GET route
@@ -172,7 +172,7 @@ var Router = class Router extends CoreRouter {
 	* @returns    The Hono application instance with the applied routes
 	*/
 	static apply(app) {
-		for (const route of Array.from(this.routes)) {
+		for (const route of this.orderedRoutes()) {
 			let handlerFunction = null;
 			let instance = null;
 			let bindingTarget;