clear-router 2.7.7 → 2.8.1

package/dist/Route.d.cts

@@ -5,6 +5,12 @@ import { Middleware as Middleware$1 } from "./types/h3.cjs";
 import { ClearRequest } from "./ClearRequest.cjs";
 
 //#region src/Route.d.ts
+/**
+ * @class clear-router Route
+ * @description A route describes a single enpoint on clear-router
+ * @author 3m1n3nc3
+ * @repository https://github.com/arkstack-tmp/clear-router
+ */
 declare class Route<X = any, M = Middleware$1 | Middleware, H = any> {
   ctx: X;
   body: RequestData;
@@ -26,9 +32,30 @@ declare class Route<X = any, M = Middleware$1 | Middleware, H = any> {
     registrationPaths?: string[];
     parameters?: RouteParameter[];
     onName?: (name: string, route: Route<X, M, H>, previousName?: string) => void;
+    normalizeMiddleware?: (middleware: M) => M;
   });
   private onName?;
+  private normalizeMiddleware?;
+  /**
+   * Set the route name
+   *
+   * @param name
+   * @returns
+   */
   name(name: string): this;
+  /**
+   * Register one or more middleware that will be executed before the route.
+   *
+   * @param middlewares
+   * @returns
+   */
+  middleware(middlewares: M[] | M): this;
+  /**
+   * Get the path generated and accessible by this route
+   *
+   * @param params
+   * @returns
+   */
   toPath(params?: RequestData): string;
 }
 //#endregion

package/dist/Route.d.mts

@@ -5,6 +5,12 @@ import { Middleware as Middleware$1 } from "./types/h3.mjs";
 import { ClearRequest } from "./ClearRequest.mjs";
 
 //#region src/Route.d.ts
+/**
+ * @class clear-router Route
+ * @description A route describes a single enpoint on clear-router
+ * @author 3m1n3nc3
+ * @repository https://github.com/arkstack-tmp/clear-router
+ */
 declare class Route<X = any, M = Middleware$1 | Middleware, H = any> {
   ctx: X;
   body: RequestData;
@@ -26,9 +32,30 @@ declare class Route<X = any, M = Middleware$1 | Middleware, H = any> {
     registrationPaths?: string[];
     parameters?: RouteParameter[];
     onName?: (name: string, route: Route<X, M, H>, previousName?: string) => void;
+    normalizeMiddleware?: (middleware: M) => M;
   });
   private onName?;
+  private normalizeMiddleware?;
+  /**
+   * Set the route name
+   *
+   * @param name
+   * @returns
+   */
   name(name: string): this;
+  /**
+   * Register one or more middleware that will be executed before the route.
+   *
+   * @param middlewares
+   * @returns
+   */
+  middleware(middlewares: M[] | M): this;
+  /**
+   * Get the path generated and accessible by this route
+   *
+   * @param params
+   * @returns
+   */
   toPath(params?: RequestData): string;
 }
 //#endregion

package/dist/Route.mjs

@@ -1,4 +1,10 @@
 //#region src/Route.ts
+/**
+* @class clear-router Route
+* @description A route describes a single enpoint on clear-router
+* @author 3m1n3nc3
+* @repository https://github.com/arkstack-tmp/clear-router
+*/
 var Route = class {
 	ctx;
 	body = {};
@@ -28,14 +34,40 @@ var Route = class {
 		this.controllerName = Array.isArray(handler) ? handler[0]?.name : void 0;
 		this.actionName = Array.isArray(handler) ? handler[1] : typeof handler === "function" ? handler.constructor.name ?? handler.name : void 0;
 		this.onName = options.onName;
+		this.normalizeMiddleware = options.normalizeMiddleware;
 	}
 	onName;
+	normalizeMiddleware;
+	/**
+	* Set the route name
+	* 
+	* @param name 
+	* @returns 
+	*/
 	name(name) {
 		const previousName = this.routeName;
 		this.routeName = name;
 		this.onName?.(name, this, previousName);
 		return this;
 	}
+	/**
+	* Register one or more middleware that will be executed before the route.
+	* 
+	* @param middlewares 
+	* @returns 
+	*/
+	middleware(middlewares) {
+		const normalized = (Array.isArray(middlewares) ? middlewares : [middlewares]).map((middleware) => this.normalizeMiddleware?.(middleware) ?? middleware);
+		this.middlewares.push(...normalized);
+		this.middlewareCount = this.middlewares.length;
+		return this;
+	}
+	/**
+	* Get the path generated and accessible by this route
+	* 
+	* @param params 
+	* @returns 
+	*/
 	toPath(params = {}) {
 		return this.path.replace(/\/?\{([^{}]+)\}/g, (segment, raw) => {
 			const optional = raw.endsWith("?");

package/dist/core/helpers.cjs

@@ -0,0 +1,9 @@
+
+//#region src/core/helpers.ts
+const wrap = (value) => {
+	if (value === null || value === void 0) return [];
+	return Array.isArray(value) ? value : [value];
+};
+
+//#endregion
+exports.wrap = wrap;

package/dist/core/helpers.d.cts

@@ -0,0 +1,4 @@
+//#region src/core/helpers.d.ts
+declare const wrap: <T>(value: T | T[] | null | undefined) => T[];
+//#endregion
+export { wrap };

package/dist/core/helpers.d.mts

@@ -0,0 +1,4 @@
+//#region src/core/helpers.d.ts
+declare const wrap: <T>(value: T | T[] | null | undefined) => T[];
+//#endregion
+export { wrap };

package/dist/core/helpers.mjs

@@ -0,0 +1,8 @@
+//#region src/core/helpers.ts
+const wrap = (value) => {
+	if (value === null || value === void 0) return [];
+	return Array.isArray(value) ? value : [value];
+};
+
+//#endregion
+export { wrap };

package/dist/core/index.cjs

@@ -1,4 +1,12 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_Request = require('./Request.cjs');
 const require_Response = require('./Response.cjs');
 const require_plugins = require('./plugins.cjs');
 const require_router = require('./router.cjs');
+const require_helpers = require('./helpers.cjs');
+
+exports.CoreRouter = require_router.CoreRouter;
+exports.Request = require_Request.Request;
+exports.Response = require_Response.Response;
+exports.definePlugin = require_plugins.definePlugin;
+exports.wrap = require_helpers.wrap;

package/dist/core/index.d.cts

@@ -2,4 +2,5 @@ import { Response } from "./Response.cjs";
 import { Request } from "./Request.cjs";
 import { ClearRouterPlugin, ClearRouterPluginArgumentsContext, ClearRouterPluginContext, ClearRouterPluginInput, ClearRouterPluginRequestContext, PluginArgumentsResolver, PluginBind, PluginBindFactory, PluginBindValue, PluginSetupResult, definePlugin } from "./plugins.cjs";
 import { CoreRouter } from "./router.cjs";
-export { ClearRouterPlugin, ClearRouterPluginArgumentsContext, ClearRouterPluginContext, ClearRouterPluginInput, ClearRouterPluginRequestContext, CoreRouter, PluginArgumentsResolver, PluginBind, PluginBindFactory, PluginBindValue, PluginSetupResult, Request, Response, definePlugin };
+import { wrap } from "./helpers.cjs";
+export { ClearRouterPlugin, ClearRouterPluginArgumentsContext, ClearRouterPluginContext, ClearRouterPluginInput, ClearRouterPluginRequestContext, CoreRouter, PluginArgumentsResolver, PluginBind, PluginBindFactory, PluginBindValue, PluginSetupResult, Request, Response, definePlugin, wrap };

package/dist/core/index.d.mts

@@ -2,4 +2,5 @@ import { Response } from "./Response.mjs";
 import { Request } from "./Request.mjs";
 import { ClearRouterPlugin, ClearRouterPluginArgumentsContext, ClearRouterPluginContext, ClearRouterPluginInput, ClearRouterPluginRequestContext, PluginArgumentsResolver, PluginBind, PluginBindFactory, PluginBindValue, PluginSetupResult, definePlugin } from "./plugins.mjs";
 import { CoreRouter } from "./router.mjs";
-export { ClearRouterPlugin, ClearRouterPluginArgumentsContext, ClearRouterPluginContext, ClearRouterPluginInput, ClearRouterPluginRequestContext, CoreRouter, PluginArgumentsResolver, PluginBind, PluginBindFactory, PluginBindValue, PluginSetupResult, Request, Response, definePlugin };
+import { wrap } from "./helpers.mjs";
+export { ClearRouterPlugin, ClearRouterPluginArgumentsContext, ClearRouterPluginContext, ClearRouterPluginInput, ClearRouterPluginRequestContext, CoreRouter, PluginArgumentsResolver, PluginBind, PluginBindFactory, PluginBindValue, PluginSetupResult, Request, Response, definePlugin, wrap };

package/dist/core/index.mjs

@@ -2,5 +2,6 @@ import { Request } from "./Request.mjs";
 import { Response } from "./Response.mjs";
 import { definePlugin } from "./plugins.mjs";
 import { CoreRouter } from "./router.mjs";
+import { wrap } from "./helpers.mjs";
 
-export { CoreRouter, Request, Response, definePlugin };
+export { CoreRouter, Request, Response, definePlugin, wrap };

package/dist/core/router.cjs

@@ -1,6 +1,7 @@
 const require_Request = require('./Request.cjs');
 const require_Response = require('./Response.cjs');
 const require_bindings = require('./bindings.cjs');
+const require_ResourceRoutes = require('../ResourceRoutes.cjs');
 const require_Route = require('../Route.cjs');
 let node_async_hooks = require("node:async_hooks");
 let node_module = require("node:module");
@@ -45,6 +46,60 @@ var CoreRouter = class {
 	static groupMiddlewares = [];
 	static globalMiddlewares = [];
 	/**
+	* Resolve middlewares before assigning to adapter
+	* 
+	* @param middleware 
+	* @returns 
+	*/
+	static resolveMiddleware(middleware) {
+		if (!middleware || typeof middleware === "function" && !require_bindings.isClass(middleware)) return middleware;
+		const instance = require_bindings.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);
+		}
+	}
+	static removeRoute(route) {
+		this.routes.delete(route);
+		if (route.routeName && this.routesByName.get(route.routeName) === route) this.routesByName.delete(route.routeName);
+		for (const method of route.methods) {
+			const methodKey = method.toUpperCase();
+			this.routesByPathMethod.delete(`${methodKey} ${route.path}`);
+			this.routesByMethod.set(methodKey, (this.routesByMethod.get(methodKey) ?? []).filter((existingRoute) => existingRoute !== route));
+		}
+	}
+	/**
 	* Resets the router to it's default state
 	*/
 	static reset() {
@@ -456,17 +511,22 @@ var CoreRouter = class {
 		const fullPath = this.normalizePath(`${activePrefix}/${path}`);
 		const registrationPaths = this.routeRegistrationPaths(fullPath);
 		const parameters = this.parseRouteParameters(fullPath);
-		const route = new require_Route.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 require_Route.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);
@@ -491,40 +551,9 @@ var CoreRouter = class {
 			const { str } = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href)("@h3ravel/support");
 			paramName = str(basePath).singular().afterLast("/").toString();
 		}
-		const actions = {
-			index: {
-				method: "get",
-				path: "/"
-			},
-			show: {
-				method: "get",
-				path: `/:${paramName}`
-			},
-			create: {
-				method: "post",
-				path: "/"
-			},
-			update: {
-				method: "put",
-				path: `/:${paramName}`
-			},
-			destroy: {
-				method: "delete",
-				path: `/:${paramName}`
-			}
-		};
-		const only = options?.only || Object.keys(actions);
-		const except = options?.except || [];
-		const preController = typeof controller === "function" ? new controller() : controller;
-		for (const action of only) {
-			if (except.includes(action)) continue;
-			if (typeof preController[action] === "function") {
-				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());
-			}
-		}
+		return new require_ResourceRoutes.ResourceRoutes(basePath, controller, paramName, options, ({ method, path, handler, middlewares, name }) => {
+			return this.add(method, path, handler, middlewares).name(name);
+		}, (route) => this.removeRoute(route)).register();
 	}
 	/**
 	* Adds a new GET route to the router.

package/dist/core/router.d.cts

@@ -1,9 +1,10 @@
-import { ApiResourceMiddleware, ControllerAction, HttpMethod, RouterConfig } from "../types/basic.cjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouterConfig } from "../types/basic.cjs";
 import { Response } from "./Response.cjs";
 import { Route } from "../Route.cjs";
 import { Request } from "./Request.cjs";
 import { ClearRouterPluginArgumentsContext, ClearRouterPluginInput, ClearRouterPluginRequestContext, PluginArgumentsResolver, PluginBind } from "./plugins.cjs";
 import { Controller } from "../Controller.cjs";
+import { ResourceRoutes } from "../ResourceRoutes.cjs";
 import { AsyncLocalStorage } from "node:async_hooks";
 
 //#region src/core/router.d.ts
@@ -37,6 +38,18 @@ 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;
+  protected static removeRoute(route: Route<any, any, any>): void;
   /**
    * Resets the router to it's default state
    */
@@ -131,10 +144,10 @@ declare abstract class CoreRouter {
    * @param options
    */
   static apiResource(basePath: string, controller: any, options?: {
-    only?: ControllerAction[];
-    except?: ControllerAction[];
+    only?: ResourceAction[];
+    except?: ResourceAction[];
     middlewares?: ApiResourceMiddleware<any>;
-  }): void;
+  }): ResourceRoutes<any, any, any>;
   /**
    * Adds a new GET route to the router.
    *

package/dist/core/router.d.mts

@@ -1,9 +1,10 @@
-import { ApiResourceMiddleware, ControllerAction, HttpMethod, RouterConfig } from "../types/basic.mjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouterConfig } from "../types/basic.mjs";
 import { Response } from "./Response.mjs";
 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,18 @@ 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;
+  protected static removeRoute(route: Route<any, any, any>): void;
   /**
    * Resets the router to it's default state
    */
@@ -131,10 +144,10 @@ declare abstract class CoreRouter {
    * @param options
    */
   static apiResource(basePath: string, controller: any, options?: {
-    only?: ControllerAction[];
-    except?: ControllerAction[];
+    only?: ResourceAction[];
+    except?: ResourceAction[];
     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,60 @@ 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);
+		}
+	}
+	static removeRoute(route) {
+		this.routes.delete(route);
+		if (route.routeName && this.routesByName.get(route.routeName) === route) this.routesByName.delete(route.routeName);
+		for (const method of route.methods) {
+			const methodKey = method.toUpperCase();
+			this.routesByPathMethod.delete(`${methodKey} ${route.path}`);
+			this.routesByMethod.set(methodKey, (this.routesByMethod.get(methodKey) ?? []).filter((existingRoute) => existingRoute !== route));
+		}
+	}
+	/**
 	* Resets the router to it's default state
 	*/
 	static reset() {
@@ -456,17 +511,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);
@@ -491,40 +551,9 @@ var CoreRouter = class {
 			const { str } = createRequire(import.meta.url)("@h3ravel/support");
 			paramName = str(basePath).singular().afterLast("/").toString();
 		}
-		const actions = {
-			index: {
-				method: "get",
-				path: "/"
-			},
-			show: {
-				method: "get",
-				path: `/:${paramName}`
-			},
-			create: {
-				method: "post",
-				path: "/"
-			},
-			update: {
-				method: "put",
-				path: `/:${paramName}`
-			},
-			destroy: {
-				method: "delete",
-				path: `/:${paramName}`
-			}
-		};
-		const only = options?.only || Object.keys(actions);
-		const except = options?.except || [];
-		const preController = typeof controller === "function" ? new controller() : controller;
-		for (const action of only) {
-			if (except.includes(action)) continue;
-			if (typeof preController[action] === "function") {
-				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());
-			}
-		}
+		return new ResourceRoutes(basePath, controller, paramName, options, ({ method, path, handler, middlewares, name }) => {
+			return this.add(method, path, handler, middlewares).name(name);
+		}, (route) => this.removeRoute(route)).register();
 	}
 	/**
 	* 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 { ApiResourceMiddleware, HttpMethod, ResourceAction } 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";
 
@@ -33,10 +34,10 @@ declare class Router$1 extends CoreRouter {
    * @param options
    */
   static apiResource(basePath: string, controller: any, options?: {
-    only?: ControllerAction[];
-    except?: ControllerAction[];
+    only?: ResourceAction[];
+    except?: ResourceAction[];
     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 { ApiResourceMiddleware, HttpMethod, ResourceAction } 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";
 
@@ -33,10 +34,10 @@ declare class Router$1 extends CoreRouter {
    * @param options
    */
   static apiResource(basePath: string, controller: any, options?: {
-    only?: ControllerAction[];
-    except?: ControllerAction[];
+    only?: ResourceAction[];
+    except?: ResourceAction[];
     middlewares?: ApiResourceMiddleware<Middleware>;
-  }): void;
+  }): ResourceRoutes<HttpContext, Middleware, Handler>;
   /**
    * Adds a new GET route to the router.
    *