clear-router 2.7.7 → 2.8.0

package/dist/koa/router.cjs

@@ -77,7 +77,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
@@ -182,7 +182,7 @@ var Router = class Router extends require_router.CoreRouter {
 	* @returns    The  @koa/router instance with the applied routes
 	*/
 	static 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/koa/router.d.cts

@@ -1,6 +1,7 @@
 import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.cjs";
 import { Handler, HttpContext, KoaRouterApp, Middleware } from "../types/koa.cjs";
 import { Route } from "../Route.cjs";
+import { ResourceRoutes } from "../ResourceRoutes.cjs";
 import { CoreRouter } from "../core/router.cjs";
 
 //#region src/koa/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/koa/router.d.mts

@@ -1,6 +1,7 @@
 import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.mjs";
 import { Handler, HttpContext, KoaRouterApp, Middleware } from "../types/koa.mjs";
 import { Route } from "../Route.mjs";
+import { ResourceRoutes } from "../ResourceRoutes.mjs";
 import { CoreRouter } from "../core/router.mjs";
 
 //#region src/koa/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/koa/router.mjs

@@ -77,7 +77,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
@@ -182,7 +182,7 @@ var Router = class Router extends CoreRouter {
 	* @returns    The  @koa/router instance with the applied routes
 	*/
 	static 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/types/basic.d.cts

@@ -3,6 +3,16 @@
  * Controller method reference
  */
 type ControllerHandler = [any, string];
+type MaybePromise<T = any> = T | Promise<T>;
+type ResourceAction = 'index' | 'show' | 'create' | 'update' | 'destroy';
+type MiddlewareHandle<Args extends any[] = any[], Return = any> = (...args: Args) => MaybePromise<Return>;
+type MiddlewareClass<M extends MiddlewareHandle = MiddlewareHandle> = new () => {
+  handle: M;
+};
+type MiddlewareInstance<M extends MiddlewareHandle = MiddlewareHandle> = {
+  handle: M;
+};
+type ClassMiddleware<M extends MiddlewareHandle = MiddlewareHandle> = MiddlewareClass<M> | MiddlewareInstance<M>;
 /**
  * HTTP methods supported by the router
  */
@@ -40,4 +50,4 @@ interface RouterConfig {
   };
 }
 //#endregion
-export { ApiResourceMiddleware, ControllerAction, ControllerHandler, HttpMethod, RequestData, RouterConfig };
+export { ApiResourceMiddleware, ClassMiddleware, ControllerAction, ControllerHandler, HttpMethod, MiddlewareHandle, RequestData, ResourceAction, RouterConfig };

package/dist/types/basic.d.mts

@@ -3,6 +3,16 @@
  * Controller method reference
  */
 type ControllerHandler = [any, string];
+type MaybePromise<T = any> = T | Promise<T>;
+type ResourceAction = 'index' | 'show' | 'create' | 'update' | 'destroy';
+type MiddlewareHandle<Args extends any[] = any[], Return = any> = (...args: Args) => MaybePromise<Return>;
+type MiddlewareClass<M extends MiddlewareHandle = MiddlewareHandle> = new () => {
+  handle: M;
+};
+type MiddlewareInstance<M extends MiddlewareHandle = MiddlewareHandle> = {
+  handle: M;
+};
+type ClassMiddleware<M extends MiddlewareHandle = MiddlewareHandle> = MiddlewareClass<M> | MiddlewareInstance<M>;
 /**
  * HTTP methods supported by the router
  */
@@ -40,4 +50,4 @@ interface RouterConfig {
   };
 }
 //#endregion
-export { ApiResourceMiddleware, ControllerAction, ControllerHandler, HttpMethod, RequestData, RouterConfig };
+export { ApiResourceMiddleware, ClassMiddleware, ControllerAction, ControllerHandler, HttpMethod, MiddlewareHandle, RequestData, ResourceAction, RouterConfig };

package/dist/types/express.d.cts

@@ -1,4 +1,4 @@
-import { ControllerHandler } from "./basic.cjs";
+import { ClassMiddleware, ControllerHandler, MiddlewareHandle } from "./basic.cjs";
 import { ClearHttpContext } from "../Contracts.cjs";
 import { Response as Response$1 } from "../core/Response.cjs";
 import { Request as Request$1 } from "../core/Request.cjs";
@@ -39,6 +39,10 @@ type Handler = RouteHandler | ControllerHandler;
 /**
  * Middleware function type
  */
-type Middleware = (req: Request, res: Response, next: NextFunction) => any | Promise<any>;
+type MiddlewareFunction = MiddlewareHandle<[Request, Response, NextFunction]>;
+/**
+ * Middleware class or instance with a framework-aware handle method.
+ */
+type Middleware = MiddlewareFunction | ClassMiddleware<MiddlewareFunction>;
 //#endregion
 export { Handler, HttpContext, Middleware };

package/dist/types/express.d.mts

@@ -1,4 +1,4 @@
-import { ControllerHandler } from "./basic.mjs";
+import { ClassMiddleware, ControllerHandler, MiddlewareHandle } from "./basic.mjs";
 import { ClearHttpContext } from "../Contracts.mjs";
 import { Response as Response$1 } from "../core/Response.mjs";
 import { Request as Request$1 } from "../core/Request.mjs";
@@ -39,6 +39,10 @@ type Handler = RouteHandler | ControllerHandler;
 /**
  * Middleware function type
  */
-type Middleware = (req: Request, res: Response, next: NextFunction) => any | Promise<any>;
+type MiddlewareFunction = MiddlewareHandle<[Request, Response, NextFunction]>;
+/**
+ * Middleware class or instance with a framework-aware handle method.
+ */
+type Middleware = MiddlewareFunction | ClassMiddleware<MiddlewareFunction>;
 //#endregion
 export { Handler, HttpContext, Middleware };

package/dist/types/fastify.d.cts

@@ -1,4 +1,4 @@
-import { ControllerHandler } from "./basic.cjs";
+import { ClassMiddleware, ControllerHandler, MiddlewareHandle } from "./basic.cjs";
 import { ClearHttpContext } from "../Contracts.cjs";
 import { Response } from "../core/Response.cjs";
 import { Request } from "../core/Request.cjs";
@@ -17,7 +17,8 @@ interface HttpContext extends ClearHttpContext {
 type RouteHandler = (ctx: HttpContext, req: Request) => any | Promise<any>;
 type Handler = RouteHandler | ControllerHandler;
 type NextFunction = (err?: Error) => void;
-type Middleware = (req: RequestWithGetBody, reply: FastifyReply, next: NextFunction) => any | Promise<any>;
+type MiddlewareFunction = MiddlewareHandle<[req: RequestWithGetBody, reply: FastifyReply, next: NextFunction]>;
+type Middleware = MiddlewareFunction | ClassMiddleware<MiddlewareFunction>;
 type FastifyApp = FastifyInstance;
 //#endregion
 export { FastifyApp, Handler, HttpContext, Middleware };

package/dist/types/fastify.d.mts

@@ -1,4 +1,4 @@
-import { ControllerHandler } from "./basic.mjs";
+import { ClassMiddleware, ControllerHandler, MiddlewareHandle } from "./basic.mjs";
 import { ClearHttpContext } from "../Contracts.mjs";
 import { Response } from "../core/Response.mjs";
 import { Request } from "../core/Request.mjs";
@@ -17,7 +17,8 @@ interface HttpContext extends ClearHttpContext {
 type RouteHandler = (ctx: HttpContext, req: Request) => any | Promise<any>;
 type Handler = RouteHandler | ControllerHandler;
 type NextFunction = (err?: Error) => void;
-type Middleware = (req: RequestWithGetBody, reply: FastifyReply, next: NextFunction) => any | Promise<any>;
+type MiddlewareFunction = MiddlewareHandle<[req: RequestWithGetBody, reply: FastifyReply, next: NextFunction]>;
+type Middleware = MiddlewareFunction | ClassMiddleware<MiddlewareFunction>;
 type FastifyApp = FastifyInstance;
 //#endregion
 export { FastifyApp, Handler, HttpContext, Middleware };

package/dist/types/h3.d.cts

@@ -1,4 +1,4 @@
-import { ControllerHandler } from "./basic.cjs";
+import { ClassMiddleware, ControllerHandler } from "./basic.cjs";
 import { ClearHttpContext } from "../Contracts.cjs";
 import { Response as Response$1 } from "../core/Response.cjs";
 import { Request } from "../core/Request.cjs";
@@ -37,5 +37,10 @@ req: Request) => any | Promise<any>;
  * Handler can be either a function or controller reference
  */
 type Handler = RouteHandler | ControllerHandler;
+/**
+ * Middleware function type
+ */
+type MiddlewareFunction = Middleware;
+type Middleware$1 = MiddlewareFunction | ClassMiddleware<MiddlewareFunction>;
 //#endregion
-export { H3App, Handler, HttpContext, type Middleware };
+export { H3App, Handler, HttpContext, Middleware$1 as Middleware };

package/dist/types/h3.d.mts

@@ -1,4 +1,4 @@
-import { ControllerHandler } from "./basic.mjs";
+import { ClassMiddleware, ControllerHandler } from "./basic.mjs";
 import { ClearHttpContext } from "../Contracts.mjs";
 import { Response as Response$1 } from "../core/Response.mjs";
 import { Request } from "../core/Request.mjs";
@@ -37,5 +37,10 @@ req: Request) => any | Promise<any>;
  * Handler can be either a function or controller reference
  */
 type Handler = RouteHandler | ControllerHandler;
+/**
+ * Middleware function type
+ */
+type MiddlewareFunction = Middleware;
+type Middleware$1 = MiddlewareFunction | ClassMiddleware<MiddlewareFunction>;
 //#endregion
-export { H3App, Handler, HttpContext, type Middleware };
+export { H3App, Handler, HttpContext, Middleware$1 as Middleware };

package/dist/types/hono.d.cts

@@ -1,4 +1,4 @@
-import { ControllerHandler } from "./basic.cjs";
+import { ClassMiddleware, ControllerHandler } from "./basic.cjs";
 import { ClearHttpContext } from "../Contracts.cjs";
 import { Response } from "../core/Response.cjs";
 import { Request } from "../core/Request.cjs";
@@ -15,7 +15,8 @@ interface HttpContext extends Context, ClearHttpContext {
 }
 type RouteHandler = (ctx: HttpContext, req: Request) => any | Promise<any>;
 type Handler = RouteHandler | ControllerHandler;
-type Middleware = MiddlewareHandler;
-type HonoApp = { [K in 'get' | 'post' | 'put' | 'delete' | 'patch' | 'options' | 'head']: (path: string, ...handlers: Middleware[]) => any };
+type MiddlewareFunction = MiddlewareHandler;
+type Middleware = MiddlewareFunction | ClassMiddleware<MiddlewareFunction>;
+type HonoApp = { [K in 'get' | 'post' | 'put' | 'delete' | 'patch' | 'options' | 'head']: (path: string, ...handlers: MiddlewareFunction[]) => any };
 //#endregion
 export { Handler, HonoApp, HttpContext, Middleware };

package/dist/types/hono.d.mts

@@ -1,4 +1,4 @@
-import { ControllerHandler } from "./basic.mjs";
+import { ClassMiddleware, ControllerHandler } from "./basic.mjs";
 import { ClearHttpContext } from "../Contracts.mjs";
 import { Response } from "../core/Response.mjs";
 import { Request } from "../core/Request.mjs";
@@ -15,7 +15,8 @@ interface HttpContext extends Context, ClearHttpContext {
 }
 type RouteHandler = (ctx: HttpContext, req: Request) => any | Promise<any>;
 type Handler = RouteHandler | ControllerHandler;
-type Middleware = MiddlewareHandler;
-type HonoApp = { [K in 'get' | 'post' | 'put' | 'delete' | 'patch' | 'options' | 'head']: (path: string, ...handlers: Middleware[]) => any };
+type MiddlewareFunction = MiddlewareHandler;
+type Middleware = MiddlewareFunction | ClassMiddleware<MiddlewareFunction>;
+type HonoApp = { [K in 'get' | 'post' | 'put' | 'delete' | 'patch' | 'options' | 'head']: (path: string, ...handlers: MiddlewareFunction[]) => any };
 //#endregion
 export { Handler, HonoApp, HttpContext, Middleware };

package/dist/types/koa.d.cts

@@ -1,4 +1,4 @@
-import { ControllerHandler } from "./basic.cjs";
+import { ClassMiddleware, ControllerHandler } from "./basic.cjs";
 import { ClearHttpContext } from "../Contracts.cjs";
 import { Response } from "../core/Response.cjs";
 import { Request } from "../core/Request.cjs";
@@ -19,7 +19,8 @@ interface HttpContext extends Koa.Context, ClearHttpContext {
 }
 type RouteHandler = (ctx: HttpContext, req: Request) => any | Promise<any>;
 type Handler = RouteHandler | ControllerHandler;
-type Middleware = Koa.Middleware<any, any>;
+type MiddlewareFunction = Koa.Middleware<any, any>;
+type Middleware = MiddlewareFunction | ClassMiddleware<MiddlewareFunction>;
 type KoaRouterApp = Router<any, any>;
 //#endregion
 export { Handler, HttpContext, KoaRouterApp, Middleware };

package/dist/types/koa.d.mts

@@ -1,4 +1,4 @@
-import { ControllerHandler } from "./basic.mjs";
+import { ClassMiddleware, ControllerHandler } from "./basic.mjs";
 import { ClearHttpContext } from "../Contracts.mjs";
 import { Response } from "../core/Response.mjs";
 import { Request } from "../core/Request.mjs";
@@ -19,7 +19,8 @@ interface HttpContext extends Koa.Context, ClearHttpContext {
 }
 type RouteHandler = (ctx: HttpContext, req: Request) => any | Promise<any>;
 type Handler = RouteHandler | ControllerHandler;
-type Middleware = Koa.Middleware<any, any>;
+type MiddlewareFunction = Koa.Middleware<any, any>;
+type Middleware = MiddlewareFunction | ClassMiddleware<MiddlewareFunction>;
 type KoaRouterApp = Router<any, any>;
 //#endregion
 export { Handler, HttpContext, KoaRouterApp, Middleware };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clear-router",
-  "version": "2.7.7",
+  "version": "2.8.0",
   "description": "Laravel-style routing for Node.js with support for Express, H3, Fastify, Hono, and Koa, including CommonJS, ESM, and TypeScript support.",
   "keywords": [
     "h3",