clear-router 2.8.0 → 2.8.1

package/dist/ResourceRoutes.cjs

@@ -1,4 +1,6 @@
 const require_ResourceRouteSelection = require('./ResourceRouteSelection.cjs');
+const require_helpers = require('./core/helpers.cjs');
+require('./core/index.cjs');
 
 //#region src/ResourceRoutes.ts
 /**
@@ -7,17 +9,78 @@ const require_ResourceRouteSelection = require('./ResourceRouteSelection.cjs');
 * @author 3m1n3nc3
 * @repository https://github.com/arkstack-tmp/clear-router
 */
-var ResourceRoutes = class {
-	constructor(routes) {
-		this.routes = routes;
+var ResourceRoutes = class ResourceRoutes {
+	static actions = {
+		index: {
+			method: "get",
+			path: "/"
+		},
+		show: {
+			method: "get",
+			path: "/:{param}"
+		},
+		create: {
+			method: "post",
+			path: "/"
+		},
+		update: {
+			method: "put",
+			path: "/:{param}"
+		},
+		destroy: {
+			method: "delete",
+			path: "/:{param}"
+		}
+	};
+	routes = {};
+	options;
+	chainedMiddlewares = [];
+	constructor(basePath, controller, paramName, options, registerRoute, removeRoute) {
+		this.basePath = basePath;
+		this.controller = controller;
+		this.paramName = paramName;
+		this.registerRoute = registerRoute;
+		this.removeRoute = removeRoute;
+		this.options = options ?? {};
+	}
+	register() {
+		this.clear();
+		const preController = typeof this.controller === "function" ? new this.controller() : this.controller;
+		for (const action of this.selectedActions()) {
+			if (typeof preController[action] !== "function") continue;
+			const definition = this.definitionFor(action);
+			const route = this.registerRoute({
+				action,
+				method: definition.method,
+				path: `${this.basePath}${definition.path}`,
+				handler: [this.controller, action],
+				middlewares: this.resolveActionMiddlewares(action),
+				name: `${this.nameFor(definition.path)}.${action.toLowerCase()}`
+			});
+			this.routes[action] = route;
+		}
+		for (const middlewares of this.chainedMiddlewares) this.middleware(middlewares, false);
+		return this;
+	}
+	/**
+	* Only register routes for the provided actions.
+	*/
+	only(action, ...actions) {
+		this.options.only = Array.from(new Set(require_helpers.wrap(action).concat(actions)));
+		return this.register();
+	}
+	/**
+	* Register all resource routes except the provided actions.
+	*/
+	except(action, ...actions) {
+		this.options.except = Array.from(new Set(require_helpers.wrap(action).concat(actions)));
+		return this.register();
 	}
 	/**
 	* Register one or more middleware that will be executed before the route.
-	* 
-	* @param middlewares 
-	* @returns 
 	*/
-	middleware(middlewares) {
+	middleware(middlewares, remember = true) {
+		if (remember) this.chainedMiddlewares.push(middlewares);
 		for (const route of Object.values(this.routes)) route?.middleware(middlewares);
 		return this;
 	}
@@ -51,9 +114,36 @@ var ResourceRoutes = class {
 	delete() {
 		return this.byMethod("delete");
 	}
+	selectedActions() {
+		const actions = this.options.only?.length ? this.options.only : Object.keys(ResourceRoutes.actions);
+		const except = new Set(this.options.except ?? []);
+		return actions.filter((action) => !except.has(action));
+	}
+	definitionFor(action) {
+		const definition = ResourceRoutes.actions[action];
+		return {
+			method: definition.method,
+			path: definition.path.replace("{param}", this.paramName)
+		};
+	}
+	resolveActionMiddlewares(action) {
+		const middlewares = this.isActionMiddlewareMap(this.options.middlewares) ? this.options.middlewares[action] : this.options.middlewares;
+		return Array.isArray(middlewares) ? middlewares : middlewares ? [middlewares] : void 0;
+	}
+	isActionMiddlewareMap(middlewares) {
+		if (!middlewares || Array.isArray(middlewares) || typeof middlewares !== "object") return false;
+		return Object.keys(ResourceRoutes.actions).some((action) => action in middlewares);
+	}
+	nameFor(path) {
+		return `${this.basePath}${path}`.replace(/\/:[^/]+|\/\{[^}]+\}/g, "").replace(/\{(\w+):[^}]+\}/g, "$1").replace(/\/|:|[{}]/g, ".").replace(/\.{2,}/g, ".").replace(/^\.|\.$/g, "");
+	}
 	byMethod(method) {
 		return new require_ResourceRouteSelection.ResourceRouteSelection(Object.values(this.routes).filter((route) => Boolean(route?.methods.includes(method))));
 	}
+	clear() {
+		for (const route of Object.values(this.routes)) if (route) this.removeRoute(route);
+		for (const key of Object.keys(this.routes)) delete this.routes[key];
+	}
 };
 
 //#endregion

package/dist/ResourceRoutes.d.cts

@@ -1,10 +1,28 @@
-import { HttpMethod, ResourceAction } from "./types/basic.cjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction } from "./types/basic.cjs";
 import { Middleware } from "./types/express.cjs";
 import { Middleware as Middleware$1 } from "./types/h3.cjs";
 import { Route } from "./Route.cjs";
 import { ResourceRouteSelection } from "./ResourceRouteSelection.cjs";
 
 //#region src/ResourceRoutes.d.ts
+type ResourceRouteDefinition = {
+  method: HttpMethod;
+  path: string;
+};
+type ResourceRouteRegistrar<X, M, H> = (input: {
+  action: ResourceAction;
+  method: HttpMethod;
+  path: string;
+  handler: any;
+  middlewares?: M[];
+  name: string;
+}) => Route<X, M, H>;
+type ResourceRouteRemover<X, M, H> = (route: Route<X, M, H>) => void;
+type ResourceRoutesOptions<M = any> = {
+  only?: ResourceAction[];
+  except?: ResourceAction[];
+  middlewares?: ApiResourceMiddleware<M>;
+};
 /**
  * @class clear-router ResourceRoutes
  * @description A ResourceRoutes creates a collection of resourceful routes in a single call
@@ -12,15 +30,50 @@ import { ResourceRouteSelection } from "./ResourceRouteSelection.cjs";
  * @repository https://github.com/arkstack-tmp/clear-router
  */
 declare class ResourceRoutes<X = any, M = Middleware$1 | Middleware, H = any> {
+  readonly basePath: string;
+  readonly controller: any;
+  readonly paramName: string;
+  protected readonly registerRoute: ResourceRouteRegistrar<X, M, H>;
+  protected readonly removeRoute: ResourceRouteRemover<X, M, H>;
+  static actions: {
+    readonly index: {
+      readonly method: "get";
+      readonly path: "/";
+    };
+    readonly show: {
+      readonly method: "get";
+      readonly path: "/:{param}";
+    };
+    readonly create: {
+      readonly method: "post";
+      readonly path: "/";
+    };
+    readonly update: {
+      readonly method: "put";
+      readonly path: "/:{param}";
+    };
+    readonly destroy: {
+      readonly method: "delete";
+      readonly path: "/:{param}";
+    };
+  };
   readonly routes: Partial<Record<ResourceAction, Route<X, M, H>>>;
-  constructor(routes: Partial<Record<ResourceAction, Route<X, M, H>>>);
+  protected options: ResourceRoutesOptions<M>;
+  protected chainedMiddlewares: Array<M[] | M>;
+  constructor(basePath: string, controller: any, paramName: string, options: ResourceRoutesOptions<M> | undefined, registerRoute: ResourceRouteRegistrar<X, M, H>, removeRoute: ResourceRouteRemover<X, M, H>);
+  register(): this;
+  /**
+   * Only register routes for the provided actions.
+   */
+  only(action: ResourceAction | ResourceAction[], ...actions: ResourceAction[]): this;
+  /**
+   * Register all resource routes except the provided actions.
+   */
+  except(action: ResourceAction | ResourceAction[], ...actions: ResourceAction[]): this;
   /**
    * Register one or more middleware that will be executed before the route.
-   *
-   * @param middlewares
-   * @returns
    */
-  middleware(middlewares: M[] | M): this;
+  middleware(middlewares: M[] | M, remember?: boolean): this;
   action(action: ResourceAction): Route<X, M, H> | undefined;
   index(): Route<X, M, H> | undefined;
   show(): Route<X, M, H> | undefined;
@@ -31,7 +84,13 @@ declare class ResourceRoutes<X = any, M = Middleware$1 | Middleware, H = any> {
   post(): ResourceRouteSelection<X, M, H>;
   put(): ResourceRouteSelection<X, M, H>;
   delete(): ResourceRouteSelection<X, M, H>;
+  protected selectedActions(): ResourceAction[];
+  protected definitionFor(action: ResourceAction): ResourceRouteDefinition;
+  protected resolveActionMiddlewares(action: ResourceAction): M[] | undefined;
+  protected isActionMiddlewareMap(middlewares: ApiResourceMiddleware<M> | undefined): middlewares is { [K in ResourceAction]?: M | M[] };
+  protected nameFor(path: string): string;
   protected byMethod(method: HttpMethod): ResourceRouteSelection<X, M, H>;
+  protected clear(): void;
 }
 //#endregion
 export { ResourceRoutes };

package/dist/ResourceRoutes.d.mts

@@ -1,10 +1,28 @@
-import { HttpMethod, ResourceAction } from "./types/basic.mjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction } from "./types/basic.mjs";
 import { Middleware } from "./types/express.mjs";
 import { Middleware as Middleware$1 } from "./types/h3.mjs";
 import { Route } from "./Route.mjs";
 import { ResourceRouteSelection } from "./ResourceRouteSelection.mjs";
 
 //#region src/ResourceRoutes.d.ts
+type ResourceRouteDefinition = {
+  method: HttpMethod;
+  path: string;
+};
+type ResourceRouteRegistrar<X, M, H> = (input: {
+  action: ResourceAction;
+  method: HttpMethod;
+  path: string;
+  handler: any;
+  middlewares?: M[];
+  name: string;
+}) => Route<X, M, H>;
+type ResourceRouteRemover<X, M, H> = (route: Route<X, M, H>) => void;
+type ResourceRoutesOptions<M = any> = {
+  only?: ResourceAction[];
+  except?: ResourceAction[];
+  middlewares?: ApiResourceMiddleware<M>;
+};
 /**
  * @class clear-router ResourceRoutes
  * @description A ResourceRoutes creates a collection of resourceful routes in a single call
@@ -12,15 +30,50 @@ import { ResourceRouteSelection } from "./ResourceRouteSelection.mjs";
  * @repository https://github.com/arkstack-tmp/clear-router
  */
 declare class ResourceRoutes<X = any, M = Middleware$1 | Middleware, H = any> {
+  readonly basePath: string;
+  readonly controller: any;
+  readonly paramName: string;
+  protected readonly registerRoute: ResourceRouteRegistrar<X, M, H>;
+  protected readonly removeRoute: ResourceRouteRemover<X, M, H>;
+  static actions: {
+    readonly index: {
+      readonly method: "get";
+      readonly path: "/";
+    };
+    readonly show: {
+      readonly method: "get";
+      readonly path: "/:{param}";
+    };
+    readonly create: {
+      readonly method: "post";
+      readonly path: "/";
+    };
+    readonly update: {
+      readonly method: "put";
+      readonly path: "/:{param}";
+    };
+    readonly destroy: {
+      readonly method: "delete";
+      readonly path: "/:{param}";
+    };
+  };
   readonly routes: Partial<Record<ResourceAction, Route<X, M, H>>>;
-  constructor(routes: Partial<Record<ResourceAction, Route<X, M, H>>>);
+  protected options: ResourceRoutesOptions<M>;
+  protected chainedMiddlewares: Array<M[] | M>;
+  constructor(basePath: string, controller: any, paramName: string, options: ResourceRoutesOptions<M> | undefined, registerRoute: ResourceRouteRegistrar<X, M, H>, removeRoute: ResourceRouteRemover<X, M, H>);
+  register(): this;
+  /**
+   * Only register routes for the provided actions.
+   */
+  only(action: ResourceAction | ResourceAction[], ...actions: ResourceAction[]): this;
+  /**
+   * Register all resource routes except the provided actions.
+   */
+  except(action: ResourceAction | ResourceAction[], ...actions: ResourceAction[]): this;
   /**
    * Register one or more middleware that will be executed before the route.
-   *
-   * @param middlewares
-   * @returns
    */
-  middleware(middlewares: M[] | M): this;
+  middleware(middlewares: M[] | M, remember?: boolean): this;
   action(action: ResourceAction): Route<X, M, H> | undefined;
   index(): Route<X, M, H> | undefined;
   show(): Route<X, M, H> | undefined;
@@ -31,7 +84,13 @@ declare class ResourceRoutes<X = any, M = Middleware$1 | Middleware, H = any> {
   post(): ResourceRouteSelection<X, M, H>;
   put(): ResourceRouteSelection<X, M, H>;
   delete(): ResourceRouteSelection<X, M, H>;
+  protected selectedActions(): ResourceAction[];
+  protected definitionFor(action: ResourceAction): ResourceRouteDefinition;
+  protected resolveActionMiddlewares(action: ResourceAction): M[] | undefined;
+  protected isActionMiddlewareMap(middlewares: ApiResourceMiddleware<M> | undefined): middlewares is { [K in ResourceAction]?: M | M[] };
+  protected nameFor(path: string): string;
   protected byMethod(method: HttpMethod): ResourceRouteSelection<X, M, H>;
+  protected clear(): void;
 }
 //#endregion
 export { ResourceRoutes };

package/dist/ResourceRoutes.mjs

@@ -1,4 +1,6 @@
 import { ResourceRouteSelection } from "./ResourceRouteSelection.mjs";
+import { wrap } from "./core/helpers.mjs";
+import "./core/index.mjs";
 
 //#region src/ResourceRoutes.ts
 /**
@@ -7,17 +9,78 @@ import { ResourceRouteSelection } from "./ResourceRouteSelection.mjs";
 * @author 3m1n3nc3
 * @repository https://github.com/arkstack-tmp/clear-router
 */
-var ResourceRoutes = class {
-	constructor(routes) {
-		this.routes = routes;
+var ResourceRoutes = class ResourceRoutes {
+	static actions = {
+		index: {
+			method: "get",
+			path: "/"
+		},
+		show: {
+			method: "get",
+			path: "/:{param}"
+		},
+		create: {
+			method: "post",
+			path: "/"
+		},
+		update: {
+			method: "put",
+			path: "/:{param}"
+		},
+		destroy: {
+			method: "delete",
+			path: "/:{param}"
+		}
+	};
+	routes = {};
+	options;
+	chainedMiddlewares = [];
+	constructor(basePath, controller, paramName, options, registerRoute, removeRoute) {
+		this.basePath = basePath;
+		this.controller = controller;
+		this.paramName = paramName;
+		this.registerRoute = registerRoute;
+		this.removeRoute = removeRoute;
+		this.options = options ?? {};
+	}
+	register() {
+		this.clear();
+		const preController = typeof this.controller === "function" ? new this.controller() : this.controller;
+		for (const action of this.selectedActions()) {
+			if (typeof preController[action] !== "function") continue;
+			const definition = this.definitionFor(action);
+			const route = this.registerRoute({
+				action,
+				method: definition.method,
+				path: `${this.basePath}${definition.path}`,
+				handler: [this.controller, action],
+				middlewares: this.resolveActionMiddlewares(action),
+				name: `${this.nameFor(definition.path)}.${action.toLowerCase()}`
+			});
+			this.routes[action] = route;
+		}
+		for (const middlewares of this.chainedMiddlewares) this.middleware(middlewares, false);
+		return this;
+	}
+	/**
+	* Only register routes for the provided actions.
+	*/
+	only(action, ...actions) {
+		this.options.only = Array.from(new Set(wrap(action).concat(actions)));
+		return this.register();
+	}
+	/**
+	* Register all resource routes except the provided actions.
+	*/
+	except(action, ...actions) {
+		this.options.except = Array.from(new Set(wrap(action).concat(actions)));
+		return this.register();
 	}
 	/**
 	* Register one or more middleware that will be executed before the route.
-	* 
-	* @param middlewares 
-	* @returns 
 	*/
-	middleware(middlewares) {
+	middleware(middlewares, remember = true) {
+		if (remember) this.chainedMiddlewares.push(middlewares);
 		for (const route of Object.values(this.routes)) route?.middleware(middlewares);
 		return this;
 	}
@@ -51,9 +114,36 @@ var ResourceRoutes = class {
 	delete() {
 		return this.byMethod("delete");
 	}
+	selectedActions() {
+		const actions = this.options.only?.length ? this.options.only : Object.keys(ResourceRoutes.actions);
+		const except = new Set(this.options.except ?? []);
+		return actions.filter((action) => !except.has(action));
+	}
+	definitionFor(action) {
+		const definition = ResourceRoutes.actions[action];
+		return {
+			method: definition.method,
+			path: definition.path.replace("{param}", this.paramName)
+		};
+	}
+	resolveActionMiddlewares(action) {
+		const middlewares = this.isActionMiddlewareMap(this.options.middlewares) ? this.options.middlewares[action] : this.options.middlewares;
+		return Array.isArray(middlewares) ? middlewares : middlewares ? [middlewares] : void 0;
+	}
+	isActionMiddlewareMap(middlewares) {
+		if (!middlewares || Array.isArray(middlewares) || typeof middlewares !== "object") return false;
+		return Object.keys(ResourceRoutes.actions).some((action) => action in middlewares);
+	}
+	nameFor(path) {
+		return `${this.basePath}${path}`.replace(/\/:[^/]+|\/\{[^}]+\}/g, "").replace(/\{(\w+):[^}]+\}/g, "$1").replace(/\/|:|[{}]/g, ".").replace(/\.{2,}/g, ".").replace(/^\.|\.$/g, "");
+	}
 	byMethod(method) {
 		return new ResourceRouteSelection(Object.values(this.routes).filter((route) => Boolean(route?.methods.includes(method))));
 	}
+	clear() {
+		for (const route of Object.values(this.routes)) if (route) this.removeRoute(route);
+		for (const key of Object.keys(this.routes)) delete this.routes[key];
+	}
 };
 
 //#endregion

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

@@ -3,8 +3,10 @@ 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.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

@@ -90,6 +90,15 @@ var CoreRouter = class {
 			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
 	*/
@@ -537,47 +546,14 @@ 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 } = (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, "");
-				resourceRoutes[action] = this.add(method, `${basePath}${path}`, [controller, action], Array.isArray(actionMiddlewares) ? actionMiddlewares : actionMiddlewares ? [actionMiddlewares] : void 0).name(name + "." + action.toLowerCase());
-			}
-		}
-		return new require_ResourceRoutes.ResourceRoutes(resourceRoutes);
+		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,4 +1,4 @@
-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";
@@ -49,6 +49,7 @@ declare abstract class CoreRouter {
   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
    */
@@ -143,8 +144,8 @@ declare abstract class CoreRouter {
    * @param options
    */
   static apiResource(basePath: string, controller: any, options?: {
-    only?: ControllerAction[];
-    except?: ControllerAction[];
+    only?: ResourceAction[];
+    except?: ResourceAction[];
     middlewares?: ApiResourceMiddleware<any>;
   }): ResourceRoutes<any, any, any>;
   /**

package/dist/core/router.d.mts

@@ -1,4 +1,4 @@
-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";
@@ -49,6 +49,7 @@ declare abstract class CoreRouter {
   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
    */
@@ -143,8 +144,8 @@ declare abstract class CoreRouter {
    * @param options
    */
   static apiResource(basePath: string, controller: any, options?: {
-    only?: ControllerAction[];
-    except?: ControllerAction[];
+    only?: ResourceAction[];
+    except?: ResourceAction[];
     middlewares?: ApiResourceMiddleware<any>;
   }): ResourceRoutes<any, any, any>;
   /**

package/dist/core/router.mjs

@@ -90,6 +90,15 @@ var CoreRouter = class {
 			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
 	*/
@@ -537,47 +546,14 @@ 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");
 			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, "");
-				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);
+		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/express/router.d.cts

@@ -1,4 +1,4 @@
-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";
@@ -34,8 +34,8 @@ 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>;
   }): ResourceRoutes<HttpContext, Middleware, Handler>;
   /**

package/dist/express/router.d.mts

@@ -1,4 +1,4 @@
-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";
@@ -34,8 +34,8 @@ 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>;
   }): ResourceRoutes<HttpContext, Middleware, Handler>;
   /**

package/dist/fastify/router.d.cts

@@ -1,4 +1,4 @@
-import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.cjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction } from "../types/basic.cjs";
 import { FastifyApp, Handler, HttpContext, Middleware } from "../types/fastify.cjs";
 import { Route } from "../Route.cjs";
 import { ResourceRoutes } from "../ResourceRoutes.cjs";
@@ -32,8 +32,8 @@ declare class Router extends CoreRouter {
    * @param options      Optional configuration for the resource
    */
   static apiResource(basePath: string, controller: any, options?: {
-    only?: ControllerAction[];
-    except?: ControllerAction[];
+    only?: ResourceAction[];
+    except?: ResourceAction[];
     middlewares?: ApiResourceMiddleware<Middleware>;
   }): ResourceRoutes<HttpContext, Middleware, Handler>;
   /**

package/dist/fastify/router.d.mts

@@ -1,4 +1,4 @@
-import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.mjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction } from "../types/basic.mjs";
 import { FastifyApp, Handler, HttpContext, Middleware } from "../types/fastify.mjs";
 import { Route } from "../Route.mjs";
 import { ResourceRoutes } from "../ResourceRoutes.mjs";
@@ -32,8 +32,8 @@ declare class Router extends CoreRouter {
    * @param options      Optional configuration for the resource
    */
   static apiResource(basePath: string, controller: any, options?: {
-    only?: ControllerAction[];
-    except?: ControllerAction[];
+    only?: ResourceAction[];
+    except?: ResourceAction[];
     middlewares?: ApiResourceMiddleware<Middleware>;
   }): ResourceRoutes<HttpContext, Middleware, Handler>;
   /**

package/dist/h3/router.d.cts

@@ -1,4 +1,4 @@
-import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.cjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction } from "../types/basic.cjs";
 import { H3App, Handler, HttpContext, Middleware as Middleware$1 } from "../types/h3.cjs";
 import { Route } from "../Route.cjs";
 import { ResourceRoutes } from "../ResourceRoutes.cjs";
@@ -34,8 +34,8 @@ declare class Router extends CoreRouter {
    * @param options
    */
   static apiResource(basePath: string, controller: any, options?: {
-    only?: ControllerAction[];
-    except?: ControllerAction[];
+    only?: ResourceAction[];
+    except?: ResourceAction[];
     middlewares?: ApiResourceMiddleware<Middleware$1>;
   }): ResourceRoutes<HttpContext, Middleware$1, Handler>;
   /**

package/dist/h3/router.d.mts

@@ -1,4 +1,4 @@
-import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.mjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction } from "../types/basic.mjs";
 import { H3App, Handler, HttpContext, Middleware as Middleware$1 } from "../types/h3.mjs";
 import { Route } from "../Route.mjs";
 import { ResourceRoutes } from "../ResourceRoutes.mjs";
@@ -34,8 +34,8 @@ declare class Router extends CoreRouter {
    * @param options
    */
   static apiResource(basePath: string, controller: any, options?: {
-    only?: ControllerAction[];
-    except?: ControllerAction[];
+    only?: ResourceAction[];
+    except?: ResourceAction[];
     middlewares?: ApiResourceMiddleware<Middleware$1>;
   }): ResourceRoutes<HttpContext, Middleware$1, Handler>;
   /**

package/dist/hono/router.d.cts

@@ -1,4 +1,4 @@
-import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.cjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction } from "../types/basic.cjs";
 import { Handler, HonoApp, HttpContext, Middleware } from "../types/hono.cjs";
 import { Route } from "../Route.cjs";
 import { ResourceRoutes } from "../ResourceRoutes.cjs";
@@ -34,8 +34,8 @@ declare class Router extends CoreRouter {
    * @param options
    */
   static apiResource(basePath: string, controller: any, options?: {
-    only?: ControllerAction[];
-    except?: ControllerAction[];
+    only?: ResourceAction[];
+    except?: ResourceAction[];
     middlewares?: ApiResourceMiddleware<Middleware>;
   }): ResourceRoutes<HttpContext, Middleware, Handler>;
   /**

package/dist/hono/router.d.mts

@@ -1,4 +1,4 @@
-import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.mjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction } from "../types/basic.mjs";
 import { Handler, HonoApp, HttpContext, Middleware } from "../types/hono.mjs";
 import { Route } from "../Route.mjs";
 import { ResourceRoutes } from "../ResourceRoutes.mjs";
@@ -34,8 +34,8 @@ declare class Router extends CoreRouter {
    * @param options
    */
   static apiResource(basePath: string, controller: any, options?: {
-    only?: ControllerAction[];
-    except?: ControllerAction[];
+    only?: ResourceAction[];
+    except?: ResourceAction[];
     middlewares?: ApiResourceMiddleware<Middleware>;
   }): ResourceRoutes<HttpContext, Middleware, Handler>;
   /**

package/dist/index.cjs

@@ -6,6 +6,7 @@ const require_Request = require('./core/Request.cjs');
 const require_Response = require('./core/Response.cjs');
 const require_plugins = require('./core/plugins.cjs');
 const require_router = require('./core/router.cjs');
+const require_helpers = require('./core/helpers.cjs');
 require('./core/index.cjs');
 
 exports.ClearRequest = require_ClearRequest.ClearRequest;
@@ -14,4 +15,5 @@ exports.CoreRouter = require_router.CoreRouter;
 exports.Request = require_Request.Request;
 exports.Response = require_Response.Response;
 exports.Route = require_Route.Route;
-exports.definePlugin = require_plugins.definePlugin;
+exports.definePlugin = require_plugins.definePlugin;
+exports.wrap = require_helpers.wrap;

package/dist/index.d.cts

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

package/dist/index.d.mts

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

package/dist/index.mjs

@@ -5,6 +5,7 @@ import { Request } from "./core/Request.mjs";
 import { Response } from "./core/Response.mjs";
 import { definePlugin } from "./core/plugins.mjs";
 import { CoreRouter } from "./core/router.mjs";
+import { wrap } from "./core/helpers.mjs";
 import "./core/index.mjs";
 
-export { ClearRequest, Controller, CoreRouter, Request, Response, Route, definePlugin };
+export { ClearRequest, Controller, CoreRouter, Request, Response, Route, definePlugin, wrap };

package/dist/koa/router.d.cts

@@ -1,4 +1,4 @@
-import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.cjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction } from "../types/basic.cjs";
 import { Handler, HttpContext, KoaRouterApp, Middleware } from "../types/koa.cjs";
 import { Route } from "../Route.cjs";
 import { ResourceRoutes } from "../ResourceRoutes.cjs";
@@ -34,8 +34,8 @@ declare class Router extends CoreRouter {
    * @param options
    */
   static apiResource(basePath: string, controller: any, options?: {
-    only?: ControllerAction[];
-    except?: ControllerAction[];
+    only?: ResourceAction[];
+    except?: ResourceAction[];
     middlewares?: ApiResourceMiddleware<Middleware>;
   }): ResourceRoutes<HttpContext, Middleware, Handler>;
   /**

package/dist/koa/router.d.mts

@@ -1,4 +1,4 @@
-import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.mjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction } from "../types/basic.mjs";
 import { Handler, HttpContext, KoaRouterApp, Middleware } from "../types/koa.mjs";
 import { Route } from "../Route.mjs";
 import { ResourceRoutes } from "../ResourceRoutes.mjs";
@@ -34,8 +34,8 @@ declare class Router extends CoreRouter {
    * @param options
    */
   static apiResource(basePath: string, controller: any, options?: {
-    only?: ControllerAction[];
-    except?: ControllerAction[];
+    only?: ResourceAction[];
+    except?: ResourceAction[];
     middlewares?: ApiResourceMiddleware<Middleware>;
   }): ResourceRoutes<HttpContext, Middleware, Handler>;
   /**

package/dist/types/basic.d.cts

@@ -4,7 +4,6 @@
  */
 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;
@@ -18,14 +17,14 @@ type ClassMiddleware<M extends MiddlewareHandle = MiddlewareHandle> = Middleware
  */
 type HttpMethod = 'get' | 'post' | 'put' | 'delete' | 'patch' | 'options' | 'head';
 /**
- * Common controller action names
+ * Common resource action names
  */
-type ControllerAction = 'index' | 'show' | 'create' | 'update' | 'destroy';
+type ResourceAction = 'index' | 'show' | 'create' | 'update' | 'destroy';
 /**
  * Generic Object type for request data
  */
 type RequestData = Record<string, any>;
-type ApiResourceMiddleware<M = any> = M | M[] | { [K in ControllerAction]?: M | M[] };
+type ApiResourceMiddleware<M = any> = M | M[] | { [K in ResourceAction]?: M | M[] };
 interface RouterConfig {
   /**
    * When enabled, API param name will be infered from the route path.
@@ -50,4 +49,4 @@ interface RouterConfig {
   };
 }
 //#endregion
-export { ApiResourceMiddleware, ClassMiddleware, ControllerAction, ControllerHandler, HttpMethod, MiddlewareHandle, RequestData, ResourceAction, RouterConfig };
+export { ApiResourceMiddleware, ClassMiddleware, ControllerHandler, HttpMethod, MiddlewareHandle, RequestData, ResourceAction, RouterConfig };

package/dist/types/basic.d.mts

@@ -4,7 +4,6 @@
  */
 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;
@@ -18,14 +17,14 @@ type ClassMiddleware<M extends MiddlewareHandle = MiddlewareHandle> = Middleware
  */
 type HttpMethod = 'get' | 'post' | 'put' | 'delete' | 'patch' | 'options' | 'head';
 /**
- * Common controller action names
+ * Common resource action names
  */
-type ControllerAction = 'index' | 'show' | 'create' | 'update' | 'destroy';
+type ResourceAction = 'index' | 'show' | 'create' | 'update' | 'destroy';
 /**
  * Generic Object type for request data
  */
 type RequestData = Record<string, any>;
-type ApiResourceMiddleware<M = any> = M | M[] | { [K in ControllerAction]?: M | M[] };
+type ApiResourceMiddleware<M = any> = M | M[] | { [K in ResourceAction]?: M | M[] };
 interface RouterConfig {
   /**
    * When enabled, API param name will be infered from the route path.
@@ -50,4 +49,4 @@ interface RouterConfig {
   };
 }
 //#endregion
-export { ApiResourceMiddleware, ClassMiddleware, ControllerAction, ControllerHandler, HttpMethod, MiddlewareHandle, RequestData, ResourceAction, RouterConfig };
+export { ApiResourceMiddleware, ClassMiddleware, ControllerHandler, HttpMethod, MiddlewareHandle, RequestData, ResourceAction, RouterConfig };

package/package.json

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