clear-router 2.8.1 → 2.8.3

package/dist/RouteGroup.mjs

@@ -0,0 +1,120 @@
+import { importFile } from "./core/helpers.mjs";
+import { isAbsolute, join, resolve } from "node:path";
+import { readdir, stat } from "node:fs/promises";
+
+//#region src/RouteGroup.ts
+/**
+* @class clear-router RouteGroup
+* @description A route group describes a collection of routes on clear-router
+* @author 3m1n3nc3
+* @repository https://github.com/arkstack-tmp/clear-router
+*/
+var RouteGroup = class {
+	checks = [];
+	registration;
+	routes = /* @__PURE__ */ new Set();
+	constructor(options) {
+		this.options = options;
+		this.registration = this.register();
+	}
+	/**
+	* Returning a falsy value will stop route group registration
+	* 
+	* @param condition 
+	* @returns 
+	*/
+	when(condition) {
+		this.checks.push(this.registration.then(async () => {
+			if (!await condition(this.options.source)) this.rollback();
+		}));
+		return this;
+	}
+	/**
+	* Register one or more middleware that will be executed before every route in the group.
+	*
+	* @param middlewares
+	* @returns
+	*/
+	middleware(middlewares) {
+		this.checks.push(this.registration.then(() => {
+			for (const route of this.routes) route.middleware(middlewares);
+		}));
+		return this;
+	}
+	/**
+	* Attaches callbacks for the resolution and/or rejection of the RouteGroup.
+	* 
+	* @param onfulfilled 
+	* @param onrejected 
+	* @returns 
+	*/
+	then(onfulfilled, onrejected) {
+		return Promise.all([this.registration, ...this.checks]).then(() => void 0).then(onfulfilled, onrejected);
+	}
+	/**
+	* Register the routes
+	*/
+	async register() {
+		const current = this.options.context.getStore();
+		const previousPrefix = current?.prefix ?? this.options.defaultPrefix;
+		const previousMiddlewares = current?.groupMiddlewares ?? this.options.defaultMiddlewares;
+		const fullPrefix = [previousPrefix, this.options.prefix].filter(Boolean).join("/");
+		const nextContext = {
+			prefix: this.options.normalizePath(fullPrefix),
+			groupMiddlewares: [...previousMiddlewares, ...this.options.middlewares || []],
+			routeCollectors: [...current?.routeCollectors ?? [], this.routes]
+		};
+		await this.options.context.run(nextContext, async () => {
+			for (const entry of Array.isArray(this.options.source) ? this.options.source : [this.options.source]) {
+				if (typeof entry === "function") {
+					await Promise.resolve(entry());
+					continue;
+				}
+				for (const file of await this.resolveFiles(entry)) await importFile(file);
+			}
+		});
+	}
+	/**
+	* Rollback the route registrations
+	*/
+	rollback() {
+		for (const route of this.routes) this.options.removeRoute(route);
+	}
+	/**
+	* Resolve files from the group path
+	* 
+	* @param source 
+	* @returns 
+	*/
+	async resolveFiles(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.readDirectory(resolved);
+	}
+	/**
+	* Read all the files in the configured directory
+	* 
+	* @param directory 
+	* @returns 
+	*/
+	async readDirectory(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.readDirectory(path));
+			else if (entry.isFile() && /\.(?:[cm]?ts)$/.test(entry.name) && !entry.name.endsWith(".d.ts")) files.push(path);
+		}
+		return files;
+	}
+};
+
+//#endregion
+export { RouteGroup };

package/dist/core/{router.cjs → CoreRouter.cjs}

@@ -3,10 +3,11 @@ 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_RouteGroup = require('../RouteGroup.cjs');
 let node_async_hooks = require("node:async_hooks");
 let node_module = require("node:module");
 
-//#region src/core/router.ts
+//#region src/core/CoreRouter.ts
 /**
 * @class clear-router CoreRouter
 * @description Core routing logic for clear-router, shared between all supported adapters (Express.js, H3, etc.)
@@ -530,6 +531,7 @@ var CoreRouter = class {
 		});
 		if (!methods.includes("options") && !this.routesByPathMethod.get(`OPTIONS ${fullPath}`)) this.options(path, this.createDefaultOptionsHandler());
 		this.routes.add(route);
+		for (const collector of context?.routeCollectors ?? []) collector.add(route);
 		for (const method of methods.map((m) => m.toUpperCase())) {
 			this.routesByPathMethod.set(`${method} ${fullPath}`, route);
 			if (!this.routesByMethod.has(method)) this.routesByMethod.set(method, []);
@@ -640,18 +642,17 @@ var CoreRouter = class {
 	* @param callback 
 	* @param middlewares 
 	*/
-	static async group(prefix, callback, middlewares) {
+	static group(prefix, source, middlewares) {
 		this.ensureState();
-		const context = this.groupContext.getStore();
-		const previousPrefix = context?.prefix ?? this.prefix;
-		const previousMiddlewares = context?.groupMiddlewares ?? this.groupMiddlewares;
-		const fullPrefix = [previousPrefix, prefix].filter(Boolean).join("/");
-		const nextContext = {
-			prefix: this.normalizePath(fullPrefix),
-			groupMiddlewares: [...previousMiddlewares, ...middlewares || []]
-		};
-		await this.groupContext.run(nextContext, async () => {
-			await Promise.resolve(callback());
+		return new require_RouteGroup.RouteGroup({
+			prefix,
+			source,
+			middlewares,
+			context: this.groupContext,
+			defaultPrefix: this.prefix,
+			defaultMiddlewares: this.groupMiddlewares,
+			normalizePath: (path) => this.normalizePath(path),
+			removeRoute: (route) => this.removeRoute(route)
 		});
 	}
 	/**

package/dist/core/{router.d.cts → CoreRouter.d.cts}

@@ -1,13 +1,14 @@
-import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouterConfig } from "../types/basic.cjs";
+import { Request } from "./Request.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 { ApiResourceMiddleware, HttpMethod, ResourceAction, RouteGroupContext, RouteGroupSource, RouterConfig } from "../types/basic.cjs";
 import { Controller } from "../Controller.cjs";
+import { RouteGroup } from "../RouteGroup.cjs";
+import { ClearRouterPluginArgumentsContext, ClearRouterPluginInput, ClearRouterPluginRequestContext, PluginArgumentsResolver, PluginBind } from "./plugins.cjs";
 import { ResourceRoutes } from "../ResourceRoutes.cjs";
 import { AsyncLocalStorage } from "node:async_hooks";
 
-//#region src/core/router.d.ts
+//#region src/core/CoreRouter.d.ts
 /**
  * @class clear-router CoreRouter
  * @description Core routing logic for clear-router, shared between all supported adapters (Express.js, H3, etc.)
@@ -26,10 +27,7 @@ declare abstract class CoreRouter {
   private static requestProvider?;
   private static responseProvider?;
   static config: RouterConfig;
-  protected static groupContext: AsyncLocalStorage<{
-    prefix: string;
-    groupMiddlewares: any[];
-  }>;
+  protected static groupContext: AsyncLocalStorage<RouteGroupContext>;
   protected static pluginRequestContext: AsyncLocalStorage<ClearRouterPluginRequestContext<any>>;
   static routes: Set<Route<any, any, any>>;
   static routesByPathMethod: Map<string, Route<any, any, any>>;
@@ -65,10 +63,7 @@ declare abstract class CoreRouter {
   protected static getPluginHttpCtxResolvers(): Set<PluginArgumentsResolver>;
   protected static createDefaultState(): {
     config: RouterConfig;
-    groupContext: AsyncLocalStorage<{
-      prefix: string;
-      groupMiddlewares: any[];
-    }>;
+    groupContext: AsyncLocalStorage<RouteGroupContext>;
     routes: Set<never>;
     routesByPathMethod: Map<any, any>;
     routesByMethod: Map<any, any>;
@@ -219,7 +214,7 @@ 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[]): RouteGroup<any, any, any>;
   /**
    * Adds global middlewares to the router, which will be applied to all routes.
    *

package/dist/core/{router.d.mts → CoreRouter.d.mts}

@@ -1,13 +1,14 @@
-import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouterConfig } from "../types/basic.mjs";
 import { Response } from "./Response.mjs";
 import { Route } from "../Route.mjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouteGroupContext, RouteGroupSource, RouterConfig } from "../types/basic.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 { RouteGroup } from "../RouteGroup.mjs";
 import { AsyncLocalStorage } from "node:async_hooks";
 
-//#region src/core/router.d.ts
+//#region src/core/CoreRouter.d.ts
 /**
  * @class clear-router CoreRouter
  * @description Core routing logic for clear-router, shared between all supported adapters (Express.js, H3, etc.)
@@ -26,10 +27,7 @@ declare abstract class CoreRouter {
   private static requestProvider?;
   private static responseProvider?;
   static config: RouterConfig;
-  protected static groupContext: AsyncLocalStorage<{
-    prefix: string;
-    groupMiddlewares: any[];
-  }>;
+  protected static groupContext: AsyncLocalStorage<RouteGroupContext>;
   protected static pluginRequestContext: AsyncLocalStorage<ClearRouterPluginRequestContext<any>>;
   static routes: Set<Route<any, any, any>>;
   static routesByPathMethod: Map<string, Route<any, any, any>>;
@@ -65,10 +63,7 @@ declare abstract class CoreRouter {
   protected static getPluginHttpCtxResolvers(): Set<PluginArgumentsResolver>;
   protected static createDefaultState(): {
     config: RouterConfig;
-    groupContext: AsyncLocalStorage<{
-      prefix: string;
-      groupMiddlewares: any[];
-    }>;
+    groupContext: AsyncLocalStorage<RouteGroupContext>;
     routes: Set<never>;
     routesByPathMethod: Map<any, any>;
     routesByMethod: Map<any, any>;
@@ -219,7 +214,7 @@ 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[]): RouteGroup<any, any, any>;
   /**
    * Adds global middlewares to the router, which will be applied to all routes.
    *

package/dist/core/{router.mjs → CoreRouter.mjs}

@@ -3,10 +3,11 @@ 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 { RouteGroup } from "../RouteGroup.mjs";
 import { createRequire } from "node:module";
 import { AsyncLocalStorage } from "node:async_hooks";
 
-//#region src/core/router.ts
+//#region src/core/CoreRouter.ts
 /**
 * @class clear-router CoreRouter
 * @description Core routing logic for clear-router, shared between all supported adapters (Express.js, H3, etc.)
@@ -530,6 +531,7 @@ var CoreRouter = class {
 		});
 		if (!methods.includes("options") && !this.routesByPathMethod.get(`OPTIONS ${fullPath}`)) this.options(path, this.createDefaultOptionsHandler());
 		this.routes.add(route);
+		for (const collector of context?.routeCollectors ?? []) collector.add(route);
 		for (const method of methods.map((m) => m.toUpperCase())) {
 			this.routesByPathMethod.set(`${method} ${fullPath}`, route);
 			if (!this.routesByMethod.has(method)) this.routesByMethod.set(method, []);
@@ -640,18 +642,17 @@ var CoreRouter = class {
 	* @param callback 
 	* @param middlewares 
 	*/
-	static async group(prefix, callback, middlewares) {
+	static group(prefix, source, middlewares) {
 		this.ensureState();
-		const context = this.groupContext.getStore();
-		const previousPrefix = context?.prefix ?? this.prefix;
-		const previousMiddlewares = context?.groupMiddlewares ?? this.groupMiddlewares;
-		const fullPrefix = [previousPrefix, prefix].filter(Boolean).join("/");
-		const nextContext = {
-			prefix: this.normalizePath(fullPrefix),
-			groupMiddlewares: [...previousMiddlewares, ...middlewares || []]
-		};
-		await this.groupContext.run(nextContext, async () => {
-			await Promise.resolve(callback());
+		return new RouteGroup({
+			prefix,
+			source,
+			middlewares,
+			context: this.groupContext,
+			defaultPrefix: this.prefix,
+			defaultMiddlewares: this.groupMiddlewares,
+			normalizePath: (path) => this.normalizePath(path),
+			removeRoute: (route) => this.removeRoute(route)
 		});
 	}
 	/**

package/dist/core/Request.d.cts

@@ -1,5 +1,5 @@
-import { HttpMethod, RequestData } from "../types/basic.cjs";
 import { Route } from "../Route.cjs";
+import { HttpMethod, RequestData } from "../types/basic.cjs";
 import { ClearRequest } from "../ClearRequest.cjs";
 
 //#region src/core/Request.d.ts

package/dist/core/Request.d.mts

@@ -1,6 +1,6 @@
-import { HttpMethod, RequestData } from "../types/basic.mjs";
-import { Route } from "../Route.mjs";
 import { ClearRequest } from "../ClearRequest.mjs";
+import { Route } from "../Route.mjs";
+import { HttpMethod, RequestData } from "../types/basic.mjs";
 
 //#region src/core/Request.d.ts
 declare class Request<X = any, M = any> extends ClearRequest<X, M> {

package/dist/core/bindings.d.cts

@@ -2,10 +2,6 @@
 type BindToken<T = any> = abstract new (...args: any[]) => T;
 type BindFactory<T = any> = (ctx: any) => T | Promise<T>;
 type BindValue<T = any> = T | BindFactory<T> | BindToken<T>;
-type BindDecorator = MethodDecorator & ClassDecorator & {
-  <This, Value extends (this: This, ...args: any[]) => any>(value: Value, context: ClassMethodDecoratorContext<This, Value>): void | Value;
-  <Value extends abstract new (...args: any[]) => any>(value: Value, context: ClassDecoratorContext<Value>): void | Value;
-};
 declare class Container {
   private static readonly registry;
   static bind<T>(token: BindToken<T>, value: BindValue<T>): void;
@@ -20,6 +16,5 @@ declare class Container {
   private static staticPropsMatch;
   private static resolveBinding;
 }
-declare function Bind(...tokens: BindToken[]): BindDecorator;
 //#endregion
-export { Bind, BindDecorator, BindFactory, BindToken, BindValue, Container };
+export { BindToken, BindValue, Container };

package/dist/core/helpers.cjs

@@ -1,9 +1,32 @@
+let node_path = require("node:path");
+let jiti = require("jiti");
+let node_url = require("node:url");
 
 //#region src/core/helpers.ts
 const wrap = (value) => {
 	if (value === null || value === void 0) return [];
 	return Array.isArray(value) ? value : [value];
 };
+/**
+* 
+* Dynamically imports a file at the given path with full TypeScript support,
+* including `tsconfig.json` path aliases. 
+*
+* @param filePath - The path to the file to import. 
+* @returns The imported module typed as `T`.
+*
+* @example
+* const config = await importFile<AppConfig>('./config/app.ts')
+*/
+const importFile = async (filePath, userOptions, resolveOptions) => {
+	const resolvedPath = (0, node_path.resolve)(filePath);
+	return await (0, jiti.createJiti)((0, node_url.pathToFileURL)(resolvedPath).href, {
+		...userOptions,
+		interopDefault: false,
+		tsconfigPaths: true
+	}).import(resolvedPath, resolveOptions);
+};
 
 //#endregion
+exports.importFile = importFile;
 exports.wrap = wrap;

package/dist/core/helpers.d.cts

@@ -1,4 +1,18 @@
+import { FileImporter } from "../types/basic.cjs";
+
 //#region src/core/helpers.d.ts
 declare const wrap: <T>(value: T | T[] | null | undefined) => T[];
+/**
+*
+* Dynamically imports a file at the given path with full TypeScript support,
+* including `tsconfig.json` path aliases.
+*
+* @param filePath - The path to the file to import.
+* @returns The imported module typed as `T`.
+*
+* @example
+* const config = await importFile<AppConfig>('./config/app.ts')
+*/
+declare const importFile: FileImporter;
 //#endregion
-export { wrap };
+export { importFile, wrap };

package/dist/core/helpers.d.mts

@@ -1,4 +1,18 @@
+import { FileImporter } from "../types/basic.mjs";
+
 //#region src/core/helpers.d.ts
 declare const wrap: <T>(value: T | T[] | null | undefined) => T[];
+/**
+*
+* Dynamically imports a file at the given path with full TypeScript support,
+* including `tsconfig.json` path aliases.
+*
+* @param filePath - The path to the file to import.
+* @returns The imported module typed as `T`.
+*
+* @example
+* const config = await importFile<AppConfig>('./config/app.ts')
+*/
+declare const importFile: FileImporter;
 //#endregion
-export { wrap };
+export { importFile, wrap };

package/dist/core/helpers.mjs

@@ -1,8 +1,31 @@
+import { resolve } from "node:path";
+import { createJiti } from "jiti";
+import { pathToFileURL } from "node:url";
+
 //#region src/core/helpers.ts
 const wrap = (value) => {
 	if (value === null || value === void 0) return [];
 	return Array.isArray(value) ? value : [value];
 };
+/**
+* 
+* Dynamically imports a file at the given path with full TypeScript support,
+* including `tsconfig.json` path aliases. 
+*
+* @param filePath - The path to the file to import. 
+* @returns The imported module typed as `T`.
+*
+* @example
+* const config = await importFile<AppConfig>('./config/app.ts')
+*/
+const importFile = async (filePath, userOptions, resolveOptions) => {
+	const resolvedPath = resolve(filePath);
+	return await createJiti(pathToFileURL(resolvedPath).href, {
+		...userOptions,
+		interopDefault: false,
+		tsconfigPaths: true
+	}).import(resolvedPath, resolveOptions);
+};
 
 //#endregion
-export { wrap };
+export { importFile, wrap };

package/dist/core/index.cjs

@@ -1,12 +1,6 @@
-Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+const require_helpers = require('./helpers.cjs');
+const require_RouteGroup = require('../RouteGroup.cjs');
 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;
+const require_CoreRouter = require('./CoreRouter.cjs');

package/dist/core/index.d.cts

@@ -1,6 +1,7 @@
 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";
-import { wrap } from "./helpers.cjs";
-export { ClearRouterPlugin, ClearRouterPluginArgumentsContext, ClearRouterPluginContext, ClearRouterPluginInput, ClearRouterPluginRequestContext, CoreRouter, PluginArgumentsResolver, PluginBind, PluginBindFactory, PluginBindValue, PluginSetupResult, Request, Response, definePlugin, wrap };
+import { RouteGroup } from "../RouteGroup.cjs";
+import { CoreRouter } from "./CoreRouter.cjs";
+import { importFile, wrap } from "./helpers.cjs";
+export { ClearRouterPlugin, ClearRouterPluginArgumentsContext, ClearRouterPluginContext, ClearRouterPluginInput, ClearRouterPluginRequestContext, CoreRouter, PluginArgumentsResolver, PluginBind, PluginBindFactory, PluginBindValue, PluginSetupResult, Request, Response, RouteGroup, definePlugin, importFile, wrap };

package/dist/core/index.d.mts

@@ -1,6 +1,7 @@
 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";
-import { wrap } from "./helpers.mjs";
-export { ClearRouterPlugin, ClearRouterPluginArgumentsContext, ClearRouterPluginContext, ClearRouterPluginInput, ClearRouterPluginRequestContext, CoreRouter, PluginArgumentsResolver, PluginBind, PluginBindFactory, PluginBindValue, PluginSetupResult, Request, Response, definePlugin, wrap };
+import { RouteGroup } from "../RouteGroup.mjs";
+import { CoreRouter } from "./CoreRouter.mjs";
+import { importFile, wrap } from "./helpers.mjs";
+export { ClearRouterPlugin, ClearRouterPluginArgumentsContext, ClearRouterPluginContext, ClearRouterPluginInput, ClearRouterPluginRequestContext, CoreRouter, PluginArgumentsResolver, PluginBind, PluginBindFactory, PluginBindValue, PluginSetupResult, Request, Response, RouteGroup, definePlugin, importFile, wrap };

package/dist/core/index.mjs

@@ -1,7 +1,8 @@
 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";
+import { importFile, wrap } from "./helpers.mjs";
+import { RouteGroup } from "../RouteGroup.mjs";
+import { CoreRouter } from "./CoreRouter.mjs";
 
-export { CoreRouter, Request, Response, definePlugin, wrap };
+export { CoreRouter, Request, Response, RouteGroup, definePlugin, importFile, wrap };

package/dist/core/plugins.d.cts

@@ -1,6 +1,6 @@
-import { RouterConfig } from "../types/basic.cjs";
-import { Response } from "./Response.cjs";
 import { Request } from "./Request.cjs";
+import { Response } from "./Response.cjs";
+import { RouterConfig } from "../types/basic.cjs";
 import { BindToken, BindValue, Container } from "./bindings.cjs";
 
 //#region src/core/plugins.d.ts

package/dist/core/plugins.d.mts

@@ -1,5 +1,5 @@
-import { RouterConfig } from "../types/basic.mjs";
 import { Response } from "./Response.mjs";
+import { RouterConfig } from "../types/basic.mjs";
 import { Request } from "./Request.mjs";
 import { BindToken, BindValue, Container } from "./bindings.mjs";
 

package/dist/decorators/setup.cjs

@@ -1,11 +1,11 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_bindings = require('../core/bindings.cjs');
-const require_router = require('../core/router.cjs');
+const require_CoreRouter = require('../core/CoreRouter.cjs');
 require('./index.cjs');
 require("reflect-metadata");
 
 //#region src/decorators/setup.ts
-require_router.CoreRouter.configureDefaults({ container: {
+require_CoreRouter.CoreRouter.configureDefaults({ container: {
 	enabled: true,
 	autoDiscover: true
 } });

package/dist/decorators/setup.mjs

@@ -1,5 +1,5 @@
 import { Bind, Container } from "../core/bindings.mjs";
-import { CoreRouter } from "../core/router.mjs";
+import { CoreRouter } from "../core/CoreRouter.mjs";
 import "./index.mjs";
 import "reflect-metadata";
 

package/dist/express/router.cjs

@@ -1,4 +1,4 @@
-const require_router = require('../core/router.cjs');
+const require_CoreRouter = require('../core/CoreRouter.cjs');
 const require_responses = require('../core/responses.cjs');
 
 //#region src/express/router.ts
@@ -9,7 +9,7 @@ const require_responses = require('../core/responses.cjs');
 * @author 3m1n3nc3
 * @repository https://github.com/arkstack-tmp/clear-router
 */
-var Router = class Router extends require_router.CoreRouter {
+var Router = class Router extends require_CoreRouter.CoreRouter {
 	static routerStateNamespace = "clear-router:express";
 	static ensureRequestBodyAccessor(req) {
 		if (typeof req.getBody !== "function") req.getBody = () => req.body ?? {};
@@ -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 group(prefix, source, middlewares) {
+		return 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,8 +1,9 @@
-import { ApiResourceMiddleware, HttpMethod, ResourceAction } from "../types/basic.cjs";
 import { Handler, HttpContext, Middleware } from "../types/express.cjs";
 import { Route } from "../Route.cjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouteGroupSource } from "../types/basic.cjs";
 import { ResourceRoutes } from "../ResourceRoutes.cjs";
-import { CoreRouter } from "../core/router.cjs";
+import { RouteGroup } from "../RouteGroup.cjs";
+import { CoreRouter } from "../core/CoreRouter.cjs";
 import { Router } from "express";
 
 //#region src/express/router.d.ts
@@ -101,7 +102,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[]): RouteGroup<HttpContext, Middleware, Handler>;
   /**
    * Adds global middlewares to the router, which will be applied to all routes.
    *

package/dist/express/router.d.mts

@@ -1,8 +1,9 @@
-import { ApiResourceMiddleware, HttpMethod, ResourceAction } from "../types/basic.mjs";
 import { Handler, HttpContext, Middleware } from "../types/express.mjs";
 import { Route } from "../Route.mjs";
+import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouteGroupSource } from "../types/basic.mjs";
 import { ResourceRoutes } from "../ResourceRoutes.mjs";
-import { CoreRouter } from "../core/router.mjs";
+import { RouteGroup } from "../RouteGroup.mjs";
+import { CoreRouter } from "../core/CoreRouter.mjs";
 import { Router } from "express";
 
 //#region src/express/router.d.ts
@@ -101,7 +102,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[]): RouteGroup<HttpContext, Middleware, Handler>;
   /**
    * Adds global middlewares to the router, which will be applied to all routes.
    *

package/dist/express/router.mjs

@@ -1,4 +1,4 @@
-import { CoreRouter } from "../core/router.mjs";
+import { CoreRouter } from "../core/CoreRouter.mjs";
 import { isFetchResponse, resolveResponseMeta, responseWasSent } from "../core/responses.mjs";
 
 //#region src/express/router.ts
@@ -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 group(prefix, source, middlewares) {
+		return super.group(prefix, source, middlewares);
 	}
 	/**
 	* Adds global middlewares to the router, which will be applied to all routes.