clear-router 2.8.0 → 2.8.2

package/dist/core/router.cjs

@@ -3,6 +3,9 @@ const require_Response = require('./Response.cjs');
 const require_bindings = require('./bindings.cjs');
 const require_ResourceRoutes = require('../ResourceRoutes.cjs');
 const require_Route = require('../Route.cjs');
+const require_helpers = require('./helpers.cjs');
+let node_path = require("node:path");
+let node_fs_promises = require("node:fs/promises");
 let node_async_hooks = require("node:async_hooks");
 let node_module = require("node:module");
 
@@ -90,6 +93,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 +549,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.
@@ -664,7 +643,7 @@ var CoreRouter = class {
 	* @param callback 
 	* @param middlewares 
 	*/
-	static async group(prefix, callback, middlewares) {
+	static async group(prefix, source, middlewares) {
 		this.ensureState();
 		const context = this.groupContext.getStore();
 		const previousPrefix = context?.prefix ?? this.prefix;
@@ -675,9 +654,35 @@ var CoreRouter = class {
 			groupMiddlewares: [...previousMiddlewares, ...middlewares || []]
 		};
 		await this.groupContext.run(nextContext, async () => {
-			await Promise.resolve(callback());
+			if (typeof source === "function") {
+				await Promise.resolve(source());
+				return;
+			}
+			for (const file of await this.resolveGroupFiles(source)) await require_helpers.importFile(file);
 		});
 	}
+	static async resolveGroupFiles(source) {
+		const resolved = (0, node_path.isAbsolute)(source) ? source : (0, node_path.resolve)(process.cwd(), source);
+		let sourceStat;
+		try {
+			sourceStat = await (0, node_fs_promises.stat)(resolved);
+		} catch {
+			throw new Error(`Route group source not found: ${source}`);
+		}
+		if (sourceStat.isFile()) return [resolved];
+		if (!sourceStat.isDirectory()) throw new Error(`Route group source must be a file or directory: ${source}`);
+		return this.readGroupDirectory(resolved);
+	}
+	static async readGroupDirectory(directory) {
+		const entries = await (0, node_fs_promises.readdir)(directory, { withFileTypes: true });
+		const files = [];
+		for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) {
+			const path = (0, node_path.join)(directory, entry.name);
+			if (entry.isDirectory()) files.push(...await this.readGroupDirectory(path));
+			else if (entry.isFile() && /\.(?:[cm]?ts)$/.test(entry.name) && !entry.name.endsWith(".d.ts")) files.push(path);
+		}
+		return files;
+	}
 	/**
 	* Adds global middlewares to the router, which will be applied to all routes.
 	* 

package/dist/core/router.d.cts

@@ -1,4 +1,4 @@
-import { ApiResourceMiddleware, ControllerAction, HttpMethod, RouterConfig } from "../types/basic.cjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouteGroupSource, 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>;
   /**
@@ -218,7 +219,9 @@ declare abstract class CoreRouter {
    * @param callback
    * @param middlewares
    */
-  static group(prefix: string, callback: () => void | Promise<void>, middlewares?: any[]): Promise<void>;
+  static group(prefix: string, source: RouteGroupSource, middlewares?: any[]): Promise<void>;
+  protected static resolveGroupFiles(source: string): Promise<string[]>;
+  protected static readGroupDirectory(directory: string): Promise<string[]>;
   /**
    * Adds global middlewares to the router, which will be applied to all routes.
    *

package/dist/core/router.d.mts

@@ -1,4 +1,4 @@
-import { ApiResourceMiddleware, ControllerAction, HttpMethod, RouterConfig } from "../types/basic.mjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouteGroupSource, 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>;
   /**
@@ -218,7 +219,9 @@ declare abstract class CoreRouter {
    * @param callback
    * @param middlewares
    */
-  static group(prefix: string, callback: () => void | Promise<void>, middlewares?: any[]): Promise<void>;
+  static group(prefix: string, source: RouteGroupSource, middlewares?: any[]): Promise<void>;
+  protected static resolveGroupFiles(source: string): Promise<string[]>;
+  protected static readGroupDirectory(directory: string): Promise<string[]>;
   /**
    * Adds global middlewares to the router, which will be applied to all routes.
    *

package/dist/core/router.mjs

@@ -3,7 +3,10 @@ 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 { importFile } from "./helpers.mjs";
 import { createRequire } from "node:module";
+import { isAbsolute, join, resolve } from "node:path";
+import { readdir, stat } from "node:fs/promises";
 import { AsyncLocalStorage } from "node:async_hooks";
 
 //#region src/core/router.ts
@@ -90,6 +93,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 +549,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.
@@ -664,7 +643,7 @@ var CoreRouter = class {
 	* @param callback 
 	* @param middlewares 
 	*/
-	static async group(prefix, callback, middlewares) {
+	static async group(prefix, source, middlewares) {
 		this.ensureState();
 		const context = this.groupContext.getStore();
 		const previousPrefix = context?.prefix ?? this.prefix;
@@ -675,9 +654,35 @@ var CoreRouter = class {
 			groupMiddlewares: [...previousMiddlewares, ...middlewares || []]
 		};
 		await this.groupContext.run(nextContext, async () => {
-			await Promise.resolve(callback());
+			if (typeof source === "function") {
+				await Promise.resolve(source());
+				return;
+			}
+			for (const file of await this.resolveGroupFiles(source)) await importFile(file);
 		});
 	}
+	static async resolveGroupFiles(source) {
+		const resolved = isAbsolute(source) ? source : resolve(process.cwd(), source);
+		let sourceStat;
+		try {
+			sourceStat = await stat(resolved);
+		} catch {
+			throw new Error(`Route group source not found: ${source}`);
+		}
+		if (sourceStat.isFile()) return [resolved];
+		if (!sourceStat.isDirectory()) throw new Error(`Route group source must be a file or directory: ${source}`);
+		return this.readGroupDirectory(resolved);
+	}
+	static async readGroupDirectory(directory) {
+		const entries = await readdir(directory, { withFileTypes: true });
+		const files = [];
+		for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) {
+			const path = join(directory, entry.name);
+			if (entry.isDirectory()) files.push(...await this.readGroupDirectory(path));
+			else if (entry.isFile() && /\.(?:[cm]?ts)$/.test(entry.name) && !entry.name.endsWith(".d.ts")) files.push(path);
+		}
+		return files;
+	}
 	/**
 	* Adds global middlewares to the router, which will be applied to all routes.
 	* 

package/dist/express/router.cjs

@@ -141,8 +141,8 @@ var Router = class Router extends require_router.CoreRouter {
 	* @param callback 
 	* @param middlewares 
 	*/
-	static async group(prefix, callback, middlewares) {
-		await super.group(prefix, callback, middlewares);
+	static async group(prefix, source, middlewares) {
+		await super.group(prefix, source, middlewares);
 	}
 	/**
 	* Adds global middlewares to the router, which will be applied to all routes.

package/dist/express/router.d.cts

@@ -1,4 +1,4 @@
-import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.cjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouteGroupSource } 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>;
   /**
@@ -101,7 +101,7 @@ declare class Router$1 extends CoreRouter {
    * @param callback
    * @param middlewares
    */
-  static group(prefix: string, callback: () => void | Promise<void>, middlewares?: Middleware[]): Promise<void>;
+  static group(prefix: string, source: RouteGroupSource, middlewares?: Middleware[]): Promise<void>;
   /**
    * Adds global middlewares to the router, which will be applied to all routes.
    *

package/dist/express/router.d.mts

@@ -1,4 +1,4 @@
-import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.mjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouteGroupSource } 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>;
   /**
@@ -101,7 +101,7 @@ declare class Router$1 extends CoreRouter {
    * @param callback
    * @param middlewares
    */
-  static group(prefix: string, callback: () => void | Promise<void>, middlewares?: Middleware[]): Promise<void>;
+  static group(prefix: string, source: RouteGroupSource, middlewares?: Middleware[]): Promise<void>;
   /**
    * Adds global middlewares to the router, which will be applied to all routes.
    *

package/dist/express/router.mjs

@@ -141,8 +141,8 @@ var Router = class Router extends CoreRouter {
 	* @param callback 
 	* @param middlewares 
 	*/
-	static async group(prefix, callback, middlewares) {
-		await super.group(prefix, callback, middlewares);
+	static async group(prefix, source, middlewares) {
+		await super.group(prefix, source, middlewares);
 	}
 	/**
 	* Adds global middlewares to the router, which will be applied to all routes.

package/dist/fastify/router.cjs

@@ -134,8 +134,8 @@ var Router = class Router extends require_router.CoreRouter {
 	* @param callback 
 	* @param middlewares 
 	*/
-	static async group(prefix, callback, middlewares) {
-		await super.group(prefix, callback, middlewares);
+	static async group(prefix, source, middlewares) {
+		await super.group(prefix, source, middlewares);
 	}
 	/**
 	* Apply middlewares to a group of routes defined within the callback

package/dist/fastify/router.d.cts

@@ -1,4 +1,4 @@
-import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.cjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouteGroupSource } 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>;
   /**
@@ -99,7 +99,7 @@ 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, source: RouteGroupSource, middlewares?: Middleware[]): Promise<void>;
   /**
    * Apply middlewares to a group of routes defined within the callback
    *

package/dist/fastify/router.d.mts

@@ -1,4 +1,4 @@
-import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.mjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouteGroupSource } 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>;
   /**
@@ -99,7 +99,7 @@ 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, source: RouteGroupSource, middlewares?: Middleware[]): Promise<void>;
   /**
    * Apply middlewares to a group of routes defined within the callback
    *

package/dist/fastify/router.mjs

@@ -134,8 +134,8 @@ var Router = class Router extends CoreRouter {
 	* @param callback 
 	* @param middlewares 
 	*/
-	static async group(prefix, callback, middlewares) {
-		await super.group(prefix, callback, middlewares);
+	static async group(prefix, source, middlewares) {
+		await super.group(prefix, source, middlewares);
 	}
 	/**
 	* Apply middlewares to a group of routes defined within the callback

package/dist/h3/router.cjs

@@ -143,8 +143,8 @@ var Router = class Router extends require_router.CoreRouter {
 	* @param callback 
 	* @param middlewares 
 	*/
-	static async group(prefix, callback, middlewares) {
-		await super.group(prefix, callback, middlewares);
+	static async group(prefix, source, middlewares) {
+		await super.group(prefix, source, middlewares);
 	}
 	/**
 	* Adds global middlewares to the router, which will be applied to all routes.

package/dist/h3/router.d.cts

@@ -1,4 +1,4 @@
-import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.cjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouteGroupSource } 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>;
   /**
@@ -101,7 +101,7 @@ declare class Router extends CoreRouter {
    * @param callback
    * @param middlewares
    */
-  static group(prefix: string, callback: () => void | Promise<void>, middlewares?: Middleware$1[]): Promise<void>;
+  static group(prefix: string, source: RouteGroupSource, middlewares?: Middleware$1[]): Promise<void>;
   /**
    * Adds global middlewares to the router, which will be applied to all routes.
    *

package/dist/h3/router.d.mts

@@ -1,4 +1,4 @@
-import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.mjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouteGroupSource } 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>;
   /**
@@ -101,7 +101,7 @@ declare class Router extends CoreRouter {
    * @param callback
    * @param middlewares
    */
-  static group(prefix: string, callback: () => void | Promise<void>, middlewares?: Middleware$1[]): Promise<void>;
+  static group(prefix: string, source: RouteGroupSource, middlewares?: Middleware$1[]): Promise<void>;
   /**
    * Adds global middlewares to the router, which will be applied to all routes.
    *

package/dist/h3/router.mjs

@@ -143,8 +143,8 @@ var Router = class Router extends CoreRouter {
 	* @param callback 
 	* @param middlewares 
 	*/
-	static async group(prefix, callback, middlewares) {
-		await super.group(prefix, callback, middlewares);
+	static async group(prefix, source, middlewares) {
+		await super.group(prefix, source, middlewares);
 	}
 	/**
 	* Adds global middlewares to the router, which will be applied to all routes.

package/dist/hono/router.cjs

@@ -147,8 +147,8 @@ var Router = class Router extends require_router.CoreRouter {
 	* @param callback 
 	* @param middlewares 
 	*/
-	static async group(prefix, callback, middlewares) {
-		await super.group(prefix, callback, middlewares);
+	static async group(prefix, source, middlewares) {
+		await super.group(prefix, source, middlewares);
 	}
 	/**
 	* Apply middlewares to a group of routes defined within the callback

package/dist/hono/router.d.cts

@@ -1,4 +1,4 @@
-import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.cjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouteGroupSource } 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>;
   /**
@@ -101,7 +101,7 @@ 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, source: RouteGroupSource, middlewares?: Middleware[]): Promise<void>;
   /**
    * Apply middlewares to a group of routes defined within the callback
    *

package/dist/hono/router.d.mts

@@ -1,4 +1,4 @@
-import { ApiResourceMiddleware, ControllerAction, HttpMethod } from "../types/basic.mjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouteGroupSource } 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>;
   /**
@@ -101,7 +101,7 @@ 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, source: RouteGroupSource, middlewares?: Middleware[]): Promise<void>;
   /**
    * Apply middlewares to a group of routes defined within the callback
    *

package/dist/hono/router.mjs

@@ -147,8 +147,8 @@ var Router = class Router extends CoreRouter {
 	* @param callback 
 	* @param middlewares 
 	*/
-	static async group(prefix, callback, middlewares) {
-		await super.group(prefix, callback, middlewares);
+	static async group(prefix, source, middlewares) {
+		await super.group(prefix, source, middlewares);
 	}
 	/**
 	* Apply middlewares to a group of routes defined within the callback

package/dist/index.cjs

@@ -5,6 +5,7 @@ const require_Route = require('./Route.cjs');
 const require_Request = require('./core/Request.cjs');
 const require_Response = require('./core/Response.cjs');
 const require_plugins = require('./core/plugins.cjs');
+const require_helpers = require('./core/helpers.cjs');
 const require_router = require('./core/router.cjs');
 require('./core/index.cjs');
 
@@ -14,4 +15,6 @@ 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.importFile = require_helpers.importFile;
+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 { importFile, 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, importFile, wrap };