clear-router 2.8.2 → 2.8.3

package/dist/fastify/router.d.cts

@@ -1,8 +1,9 @@
-import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouteGroupSource } from "../types/basic.cjs";
 import { FastifyApp, Handler, HttpContext, Middleware } from "../types/fastify.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";
 
 //#region src/fastify/router.d.ts
 /**
@@ -99,7 +100,7 @@ declare class Router extends CoreRouter {
    * @param callback
    * @param middlewares
    */
-  static group(prefix: string, source: RouteGroupSource, middlewares?: Middleware[]): Promise<void>;
+  static group(prefix: string, source: RouteGroupSource, middlewares?: Middleware[]): RouteGroup<HttpContext, Middleware, Handler>;
   /**
    * Apply middlewares to a group of routes defined within the callback
    *

package/dist/fastify/router.d.mts

@@ -1,8 +1,9 @@
-import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouteGroupSource } from "../types/basic.mjs";
 import { FastifyApp, Handler, HttpContext, Middleware } from "../types/fastify.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";
 
 //#region src/fastify/router.d.ts
 /**
@@ -99,7 +100,7 @@ declare class Router extends CoreRouter {
    * @param callback
    * @param middlewares
    */
-  static group(prefix: string, source: RouteGroupSource, middlewares?: Middleware[]): Promise<void>;
+  static group(prefix: string, source: RouteGroupSource, middlewares?: Middleware[]): RouteGroup<HttpContext, Middleware, Handler>;
   /**
    * Apply middlewares to a group of routes defined within the callback
    *

package/dist/fastify/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/fastify/router.ts
@@ -134,8 +134,8 @@ var Router = class Router extends CoreRouter {
 	* @param callback 
 	* @param middlewares 
 	*/
-	static async group(prefix, source, middlewares) {
-		await super.group(prefix, source, middlewares);
+	static group(prefix, source, middlewares) {
+		return super.group(prefix, source, middlewares);
 	}
 	/**
 	* Apply middlewares to a group of routes defined within the callback

package/dist/h3/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');
 let h3 = require("h3");
 
@@ -9,7 +9,7 @@ let h3 = require("h3");
 * @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:h3";
 	static bodyCache = /* @__PURE__ */ new WeakMap();
 	static toResponse(ctx, value, method, path) {
@@ -143,8 +143,8 @@ var Router = class Router extends require_router.CoreRouter {
 	* @param callback 
 	* @param middlewares 
 	*/
-	static async group(prefix, source, middlewares) {
-		await super.group(prefix, source, 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/h3/router.d.cts

@@ -1,8 +1,9 @@
-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 { 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 { H3 } from "h3";
 
 //#region src/h3/router.d.ts
@@ -101,7 +102,7 @@ declare class Router extends CoreRouter {
    * @param callback
    * @param middlewares
    */
-  static group(prefix: string, source: RouteGroupSource, middlewares?: Middleware$1[]): Promise<void>;
+  static group(prefix: string, source: RouteGroupSource, middlewares?: Middleware$1[]): RouteGroup<HttpContext, Middleware$1, Handler>;
   /**
    * Adds global middlewares to the router, which will be applied to all routes.
    *

package/dist/h3/router.d.mts

@@ -1,8 +1,9 @@
-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 { 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 { H3 } from "h3";
 
 //#region src/h3/router.d.ts
@@ -101,7 +102,7 @@ declare class Router extends CoreRouter {
    * @param callback
    * @param middlewares
    */
-  static group(prefix: string, source: RouteGroupSource, middlewares?: Middleware$1[]): Promise<void>;
+  static group(prefix: string, source: RouteGroupSource, middlewares?: Middleware$1[]): RouteGroup<HttpContext, Middleware$1, Handler>;
   /**
    * Adds global middlewares to the router, which will be applied to all routes.
    *

package/dist/h3/router.mjs

@@ -1,4 +1,4 @@
-import { CoreRouter } from "../core/router.mjs";
+import { CoreRouter } from "../core/CoreRouter.mjs";
 import { resolveResponseMeta } from "../core/responses.mjs";
 import { HTTPResponse, getQuery, getRouterParams, readBody } from "h3";
 
@@ -143,8 +143,8 @@ var Router = class Router extends CoreRouter {
 	* @param callback 
 	* @param middlewares 
 	*/
-	static async group(prefix, source, middlewares) {
-		await super.group(prefix, source, 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/hono/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/hono/router.ts
@@ -8,7 +8,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:hono";
 	static bodyCache = /* @__PURE__ */ new WeakMap();
 	static toResponse(ctx, value, method, path) {
@@ -147,8 +147,8 @@ var Router = class Router extends require_router.CoreRouter {
 	* @param callback 
 	* @param middlewares 
 	*/
-	static async group(prefix, source, middlewares) {
-		await super.group(prefix, source, middlewares);
+	static group(prefix, source, middlewares) {
+		return super.group(prefix, source, middlewares);
 	}
 	/**
 	* Apply middlewares to a group of routes defined within the callback

package/dist/hono/router.d.cts

@@ -1,8 +1,9 @@
-import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouteGroupSource } from "../types/basic.cjs";
 import { Handler, HonoApp, HttpContext, Middleware } from "../types/hono.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";
 
 //#region src/hono/router.d.ts
 /**
@@ -101,7 +102,7 @@ declare class Router extends CoreRouter {
    * @param callback
    * @param middlewares
    */
-  static group(prefix: string, source: RouteGroupSource, middlewares?: Middleware[]): Promise<void>;
+  static group(prefix: string, source: RouteGroupSource, middlewares?: Middleware[]): RouteGroup<HttpContext, Middleware, Handler>;
   /**
    * Apply middlewares to a group of routes defined within the callback
    *

package/dist/hono/router.d.mts

@@ -1,8 +1,9 @@
-import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouteGroupSource } from "../types/basic.mjs";
 import { Handler, HonoApp, HttpContext, Middleware } from "../types/hono.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";
 
 //#region src/hono/router.d.ts
 /**
@@ -101,7 +102,7 @@ declare class Router extends CoreRouter {
    * @param callback
    * @param middlewares
    */
-  static group(prefix: string, source: RouteGroupSource, middlewares?: Middleware[]): Promise<void>;
+  static group(prefix: string, source: RouteGroupSource, middlewares?: Middleware[]): RouteGroup<HttpContext, Middleware, Handler>;
   /**
    * Apply middlewares to a group of routes defined within the callback
    *

package/dist/hono/router.mjs

@@ -1,4 +1,4 @@
-import { CoreRouter } from "../core/router.mjs";
+import { CoreRouter } from "../core/CoreRouter.mjs";
 import { resolveResponseMeta } from "../core/responses.mjs";
 
 //#region src/hono/router.ts
@@ -147,8 +147,8 @@ var Router = class Router extends CoreRouter {
 	* @param callback 
 	* @param middlewares 
 	*/
-	static async group(prefix, source, middlewares) {
-		await super.group(prefix, source, middlewares);
+	static group(prefix, source, middlewares) {
+		return super.group(prefix, source, middlewares);
 	}
 	/**
 	* Apply middlewares to a group of routes defined within the callback

package/dist/index.cjs

@@ -2,19 +2,21 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_ClearRequest = require('./ClearRequest.cjs');
 const require_Controller = require('./Controller.cjs');
 const require_Route = require('./Route.cjs');
+const require_helpers = require('./core/helpers.cjs');
+const require_RouteGroup = require('./RouteGroup.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');
+const require_CoreRouter = require('./core/CoreRouter.cjs');
 require('./core/index.cjs');
 
 exports.ClearRequest = require_ClearRequest.ClearRequest;
 exports.Controller = require_Controller.Controller;
-exports.CoreRouter = require_router.CoreRouter;
+exports.CoreRouter = require_CoreRouter.CoreRouter;
 exports.Request = require_Request.Request;
 exports.Response = require_Response.Response;
 exports.Route = require_Route.Route;
+exports.RouteGroup = require_RouteGroup.RouteGroup;
 exports.definePlugin = require_plugins.definePlugin;
 exports.importFile = require_helpers.importFile;
 exports.wrap = require_helpers.wrap;

package/dist/index.d.cts

@@ -1,10 +1,11 @@
 import { ClearHttpContext, RouteParameter } from "./Contracts.cjs";
+import { Request } from "./core/Request.cjs";
 import { Response } from "./core/Response.cjs";
 import { Route } from "./Route.cjs";
-import { Request } from "./core/Request.cjs";
 import { ClearRequest } from "./ClearRequest.cjs";
 import { Controller } from "./Controller.cjs";
+import { RouteGroup } from "./RouteGroup.cjs";
 import { ClearRouterPlugin, ClearRouterPluginArgumentsContext, ClearRouterPluginContext, ClearRouterPluginInput, ClearRouterPluginRequestContext, PluginArgumentsResolver, PluginBind, PluginBindFactory, PluginBindValue, PluginSetupResult, definePlugin } from "./core/plugins.cjs";
-import { CoreRouter } from "./core/router.cjs";
+import { CoreRouter } from "./core/CoreRouter.cjs";
 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 };
+export { ClearHttpContext, ClearRequest, ClearRouterPlugin, ClearRouterPluginArgumentsContext, ClearRouterPluginContext, ClearRouterPluginInput, ClearRouterPluginRequestContext, Controller, CoreRouter, PluginArgumentsResolver, PluginBind, PluginBindFactory, PluginBindValue, PluginSetupResult, Request, Response, Route, RouteGroup, RouteParameter, definePlugin, importFile, wrap };

package/dist/index.d.mts

@@ -1,10 +1,11 @@
 import { ClearHttpContext, RouteParameter } from "./Contracts.mjs";
+import { Request } from "./core/Request.mjs";
 import { Response } from "./core/Response.mjs";
 import { Route } from "./Route.mjs";
-import { Request } from "./core/Request.mjs";
 import { ClearRequest } from "./ClearRequest.mjs";
 import { Controller } from "./Controller.mjs";
+import { RouteGroup } from "./RouteGroup.mjs";
 import { ClearRouterPlugin, ClearRouterPluginArgumentsContext, ClearRouterPluginContext, ClearRouterPluginInput, ClearRouterPluginRequestContext, PluginArgumentsResolver, PluginBind, PluginBindFactory, PluginBindValue, PluginSetupResult, definePlugin } from "./core/plugins.mjs";
-import { CoreRouter } from "./core/router.mjs";
+import { CoreRouter } from "./core/CoreRouter.mjs";
 import { importFile, 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, importFile, wrap };
+export { ClearHttpContext, ClearRequest, ClearRouterPlugin, ClearRouterPluginArgumentsContext, ClearRouterPluginContext, ClearRouterPluginInput, ClearRouterPluginRequestContext, Controller, CoreRouter, PluginArgumentsResolver, PluginBind, PluginBindFactory, PluginBindValue, PluginSetupResult, Request, Response, Route, RouteGroup, RouteParameter, definePlugin, importFile, wrap };

package/dist/index.mjs

@@ -1,11 +1,12 @@
 import { ClearRequest } from "./ClearRequest.mjs";
 import { Controller } from "./Controller.mjs";
 import { Route } from "./Route.mjs";
+import { importFile, wrap } from "./core/helpers.mjs";
+import { RouteGroup } from "./RouteGroup.mjs";
 import { Request } from "./core/Request.mjs";
 import { Response } from "./core/Response.mjs";
 import { definePlugin } from "./core/plugins.mjs";
-import { importFile, wrap } from "./core/helpers.mjs";
-import { CoreRouter } from "./core/router.mjs";
+import { CoreRouter } from "./core/CoreRouter.mjs";
 import "./core/index.mjs";
 
-export { ClearRequest, Controller, CoreRouter, Request, Response, Route, definePlugin, importFile, wrap };
+export { ClearRequest, Controller, CoreRouter, Request, Response, Route, RouteGroup, definePlugin, importFile, wrap };

package/dist/koa/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/koa/router.ts
@@ -8,7 +8,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:koa";
 	static bodyCache = /* @__PURE__ */ new WeakMap();
 	static async readBodyCached(ctx) {
@@ -157,8 +157,8 @@ var Router = class Router extends require_router.CoreRouter {
 	* @param callback
 	* @param middlewares
 	*/
-	static async group(prefix, source, middlewares) {
-		await super.group(prefix, source, middlewares);
+	static group(prefix, source, middlewares) {
+		return super.group(prefix, source, middlewares);
 	}
 	/**
 	* Apply middlewares to a group of routes defined within the callback

package/dist/koa/router.d.cts

@@ -1,8 +1,9 @@
-import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouteGroupSource } from "../types/basic.cjs";
 import { Handler, HttpContext, KoaRouterApp, Middleware } from "../types/koa.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";
 
 //#region src/koa/router.d.ts
 /**
@@ -102,7 +103,7 @@ declare class Router extends CoreRouter {
    * @param callback
    * @param middlewares
    */
-  static group(prefix: string, source: RouteGroupSource, middlewares?: Middleware[]): Promise<void>;
+  static group(prefix: string, source: RouteGroupSource, middlewares?: Middleware[]): RouteGroup<HttpContext, Middleware, Handler>;
   /**
    * Apply middlewares to a group of routes defined within the callback
    *

package/dist/koa/router.d.mts

@@ -1,8 +1,9 @@
-import { ApiResourceMiddleware, HttpMethod, ResourceAction, RouteGroupSource } from "../types/basic.mjs";
 import { Handler, HttpContext, KoaRouterApp, Middleware } from "../types/koa.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";
 
 //#region src/koa/router.d.ts
 /**
@@ -102,7 +103,7 @@ declare class Router extends CoreRouter {
    * @param callback
    * @param middlewares
    */
-  static group(prefix: string, source: RouteGroupSource, middlewares?: Middleware[]): Promise<void>;
+  static group(prefix: string, source: RouteGroupSource, middlewares?: Middleware[]): RouteGroup<HttpContext, Middleware, Handler>;
   /**
    * Apply middlewares to a group of routes defined within the callback
    *

package/dist/koa/router.mjs

@@ -1,4 +1,4 @@
-import { CoreRouter } from "../core/router.mjs";
+import { CoreRouter } from "../core/CoreRouter.mjs";
 import { isFetchResponse, resolveResponseMeta } from "../core/responses.mjs";
 
 //#region src/koa/router.ts
@@ -157,8 +157,8 @@ var Router = class Router extends CoreRouter {
 	* @param callback
 	* @param middlewares
 	*/
-	static async group(prefix, source, middlewares) {
-		await super.group(prefix, source, middlewares);
+	static group(prefix, source, middlewares) {
+		return super.group(prefix, source, middlewares);
 	}
 	/**
 	* Apply middlewares to a group of routes defined within the callback

package/dist/types/basic.d.cts

@@ -1,13 +1,12 @@
+import { Route } from "../Route.cjs";
 import { JitiOptions, JitiResolveOptions } from "jiti";
+import { AsyncLocalStorage } from "node:async_hooks";
 
 //#region src/types/basic.d.ts
-/**
- * Controller method reference
- */
-type ControllerHandler = [any, string];
 type MaybePromise<T = any> = T | Promise<T>;
-type RouteGroupCallback = () => MaybePromise<void>;
-type RouteGroupSource = RouteGroupCallback | string;
+type RouteGroupCallback = () => MaybePromise<any>;
+type RouteGroupEntry = RouteGroupCallback | string;
+type RouteGroupSource = RouteGroupEntry | RouteGroupEntry[];
 type MiddlewareHandle<Args extends any[] = any[], Return = any> = (...args: Args) => MaybePromise<Return>;
 type MiddlewareClass<M extends MiddlewareHandle = MiddlewareHandle> = new () => {
   handle: M;
@@ -52,6 +51,40 @@ interface RouterConfig {
     autoDiscover?: boolean;
   };
 }
+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>;
+};
+interface RouteGroupContext {
+  prefix: string;
+  groupMiddlewares: any[];
+  routeCollectors?: Array<Set<Route<any, any, any>>>;
+}
+interface RouteGroupOptions {
+  prefix: string;
+  source: RouteGroupSource;
+  middlewares?: any[];
+  context: AsyncLocalStorage<RouteGroupContext>;
+  defaultPrefix: string;
+  defaultMiddlewares: any[];
+  normalizePath: (path: string) => string;
+  removeRoute: (route: Route<any, any, any>) => void;
+}
+type RouteGroupCondition = (source: RouteGroupSource) => MaybePromise<unknown>;
 interface FileImporter {
   <T = unknown>(filePath: string): Promise<T>;
   <T = unknown>(filePath: string, userOptions?: JitiOptions | undefined): Promise<T>;
@@ -60,4 +93,4 @@ interface FileImporter {
   })): Promise<T>;
 }
 //#endregion
-export { ApiResourceMiddleware, ClassMiddleware, ControllerHandler, FileImporter, HttpMethod, MiddlewareHandle, RequestData, ResourceAction, RouteGroupSource, RouterConfig };
+export { ApiResourceMiddleware, ClassMiddleware, FileImporter, HttpMethod, MiddlewareHandle, RequestData, ResourceAction, ResourceRouteDefinition, ResourceRouteRegistrar, ResourceRouteRemover, ResourceRoutesOptions, RouteGroupCondition, RouteGroupContext, RouteGroupOptions, RouteGroupSource, RouterConfig };

package/dist/types/basic.d.mts

@@ -1,3 +1,5 @@
+import { Route } from "../Route.mjs";
+import { AsyncLocalStorage } from "node:async_hooks";
 import { JitiOptions, JitiResolveOptions } from "jiti";
 
 //#region src/types/basic.d.ts
@@ -6,8 +8,9 @@ import { JitiOptions, JitiResolveOptions } from "jiti";
  */
 type ControllerHandler = [any, string];
 type MaybePromise<T = any> = T | Promise<T>;
-type RouteGroupCallback = () => MaybePromise<void>;
-type RouteGroupSource = RouteGroupCallback | string;
+type RouteGroupCallback = () => MaybePromise<any>;
+type RouteGroupEntry = RouteGroupCallback | string;
+type RouteGroupSource = RouteGroupEntry | RouteGroupEntry[];
 type MiddlewareHandle<Args extends any[] = any[], Return = any> = (...args: Args) => MaybePromise<Return>;
 type MiddlewareClass<M extends MiddlewareHandle = MiddlewareHandle> = new () => {
   handle: M;
@@ -52,6 +55,40 @@ interface RouterConfig {
     autoDiscover?: boolean;
   };
 }
+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>;
+};
+interface RouteGroupContext {
+  prefix: string;
+  groupMiddlewares: any[];
+  routeCollectors?: Array<Set<Route<any, any, any>>>;
+}
+interface RouteGroupOptions {
+  prefix: string;
+  source: RouteGroupSource;
+  middlewares?: any[];
+  context: AsyncLocalStorage<RouteGroupContext>;
+  defaultPrefix: string;
+  defaultMiddlewares: any[];
+  normalizePath: (path: string) => string;
+  removeRoute: (route: Route<any, any, any>) => void;
+}
+type RouteGroupCondition = (source: RouteGroupSource) => MaybePromise<unknown>;
 interface FileImporter {
   <T = unknown>(filePath: string): Promise<T>;
   <T = unknown>(filePath: string, userOptions?: JitiOptions | undefined): Promise<T>;
@@ -60,4 +97,4 @@ interface FileImporter {
   })): Promise<T>;
 }
 //#endregion
-export { ApiResourceMiddleware, ClassMiddleware, ControllerHandler, FileImporter, HttpMethod, MaybePromise, MiddlewareClass, MiddlewareHandle, MiddlewareInstance, RequestData, ResourceAction, RouteGroupCallback, RouteGroupSource, RouterConfig };
+export { ApiResourceMiddleware, ClassMiddleware, ControllerHandler, FileImporter, HttpMethod, MaybePromise, MiddlewareClass, MiddlewareHandle, MiddlewareInstance, RequestData, ResourceAction, ResourceRouteDefinition, ResourceRouteRegistrar, ResourceRouteRemover, ResourceRoutesOptions, RouteGroupCallback, RouteGroupCondition, RouteGroupContext, RouteGroupEntry, RouteGroupOptions, RouteGroupSource, RouterConfig };

package/dist/types/express.d.cts

@@ -1,41 +1,7 @@
-import { ClassMiddleware, ControllerHandler, MiddlewareHandle } from "./basic.cjs";
-import { ClearHttpContext } from "../Contracts.cjs";
-import { Response as Response$1 } from "../core/Response.cjs";
-import { Request as Request$1 } from "../core/Request.cjs";
+import { ClassMiddleware, MiddlewareHandle } from "./basic.cjs";
 import { NextFunction, Request, Response } from "express";
 
 //#region src/types/express.d.ts
-interface RequestWithGetBody extends Request {
-  getBody: () => Record<string, any>;
-}
-/**
- * HTTP context passed to route handlers
- */
-interface HttpContext extends ClearHttpContext {
-  req: RequestWithGetBody;
-  res: Response;
-  next: NextFunction;
-  clearRequest: Request$1;
-  clearResponse: Response$1;
-}
-/**
- * Route handler function type
- */
-type RouteHandler = (
-/**
- * Express context object containing req, res, and next
- */
-
-ctx: HttpContext,
-/**
- * ClearRequest instance
- */
-
-req: Request$1) => any | Promise<any>;
-/**
- * Handler can be either a function or controller reference
- */
-type Handler = RouteHandler | ControllerHandler;
 /**
  * Middleware function type
  */
@@ -45,4 +11,4 @@ type MiddlewareFunction = MiddlewareHandle<[Request, Response, NextFunction]>;
  */
 type Middleware = MiddlewareFunction | ClassMiddleware<MiddlewareFunction>;
 //#endregion
-export { Handler, HttpContext, Middleware };
+export { Middleware };

package/dist/types/express.d.mts

@@ -1,6 +1,6 @@
-import { ClassMiddleware, ControllerHandler, MiddlewareHandle } from "./basic.mjs";
 import { ClearHttpContext } from "../Contracts.mjs";
 import { Response as Response$1 } from "../core/Response.mjs";
+import { ClassMiddleware, ControllerHandler, MiddlewareHandle } from "./basic.mjs";
 import { Request as Request$1 } from "../core/Request.mjs";
 import { NextFunction, Request, Response } from "express";
 

package/dist/types/fastify.d.cts

@@ -1,24 +1,12 @@
-import { ClassMiddleware, ControllerHandler, MiddlewareHandle } from "./basic.cjs";
-import { ClearHttpContext } from "../Contracts.cjs";
-import { Response } from "../core/Response.cjs";
-import { Request } from "../core/Request.cjs";
-import { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
+import { ClassMiddleware, MiddlewareHandle } from "./basic.cjs";
+import { FastifyReply, FastifyRequest } from "fastify";
 
 //#region src/types/fastify.d.ts
 interface RequestWithGetBody extends FastifyRequest {
   getBody: () => Record<string, any>;
 }
-interface HttpContext extends ClearHttpContext {
-  req: RequestWithGetBody;
-  reply: FastifyReply;
-  clearRequest: Request;
-  clearResponse: Response;
-}
-type RouteHandler = (ctx: HttpContext, req: Request) => any | Promise<any>;
-type Handler = RouteHandler | ControllerHandler;
 type NextFunction = (err?: Error) => void;
 type MiddlewareFunction = MiddlewareHandle<[req: RequestWithGetBody, reply: FastifyReply, next: NextFunction]>;
 type Middleware = MiddlewareFunction | ClassMiddleware<MiddlewareFunction>;
-type FastifyApp = FastifyInstance;
 //#endregion
-export { FastifyApp, Handler, HttpContext, Middleware };
+export { Middleware };

package/dist/types/fastify.d.mts

@@ -1,6 +1,6 @@
-import { ClassMiddleware, ControllerHandler, MiddlewareHandle } from "./basic.mjs";
 import { ClearHttpContext } from "../Contracts.mjs";
 import { Response } from "../core/Response.mjs";
+import { ClassMiddleware, ControllerHandler, MiddlewareHandle } from "./basic.mjs";
 import { Request } from "../core/Request.mjs";
 import { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";