@h3ravel/router 1.12.1 → 1.12.2

package/dist/index.cjs

@@ -22,26 +22,17 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 //#endregion
 let __h3ravel_shared = require("@h3ravel/shared");
-__h3ravel_shared = __toESM(__h3ravel_shared);
 let __h3ravel_musket = require("@h3ravel/musket");
-__h3ravel_musket = __toESM(__h3ravel_musket);
 let node_fs_promises = require("node:fs/promises");
-node_fs_promises = __toESM(node_fs_promises);
 let __h3ravel_core = require("@h3ravel/core");
-__h3ravel_core = __toESM(__h3ravel_core);
 let __h3ravel_support = require("@h3ravel/support");
-__h3ravel_support = __toESM(__h3ravel_support);
 let node_path = require("node:path");
 node_path = __toESM(node_path);
 let h3 = require("h3");
-h3 = __toESM(h3);
 let node_fs = require("node:fs");
-node_fs = __toESM(node_fs);
 require("reflect-metadata");
 let __h3ravel_http = require("@h3ravel/http");
-__h3ravel_http = __toESM(__h3ravel_http);
 let __h3ravel_database = require("@h3ravel/database");
-__h3ravel_database = __toESM(__h3ravel_database);
 
 //#region src/Commands/RouteListCommand.ts
 var RouteListCommand = class extends __h3ravel_musket.Command {
@@ -259,7 +250,13 @@ var Router = class {
 				event$1._h3ravelContext = ctx;
 				return ctx;
 			};
-			return new __h3ravel_core.Kernel(this.app.context, middleware).handle(event, (ctx) => Promise.resolve(handler(ctx)));
+			return new __h3ravel_core.Kernel(this.app.context, middleware).handle(event, (ctx) => new Promise((resolve) => {
+				if (__h3ravel_shared.Resolver.isAsyncFunction(handler)) handler(ctx).then((response) => {
+					if (response instanceof __h3ravel_http.Response) resolve(response.prepare(ctx.request).send());
+					else resolve(response);
+				});
+				else resolve(handler(ctx));
+			}));
 		};
 	}
 	/**

package/dist/index.d.ts

@@ -1,10 +1,9 @@
 /// <reference path="./app.globals.d.ts" />
-import { EventHandler, ExtractControllerMethods, HttpContext, IMiddleware, IRouter, RouteEventHandler, RouterEnd } from "@h3ravel/shared";
 import { Command } from "@h3ravel/musket";
+import { EventHandler, ExtractControllerMethods, HttpContext, IMiddleware, IRouter, RouteEventHandler, RouterEnd } from "@h3ravel/shared";
+import { Model } from "@h3ravel/database";
 import { Application, ServiceProvider } from "@h3ravel/core";
 import { H3, Middleware, MiddlewareOptions } from "h3";
-import "reflect-metadata";
-import { Model } from "@h3ravel/database";
 
 //#region src/Commands/RouteListCommand.d.ts
 declare class RouteListCommand extends Command {

package/dist/index.js

@@ -1,4 +1,4 @@
-import { Logger } from "@h3ravel/shared";
+import { Logger, Resolver } from "@h3ravel/shared";
 import { Command } from "@h3ravel/musket";
 import { readFile, readdir, stat } from "node:fs/promises";
 import { Container, Kernel, ServiceProvider } from "@h3ravel/core";
@@ -226,7 +226,13 @@ var Router = class {
 				event$1._h3ravelContext = ctx;
 				return ctx;
 			};
-			return new Kernel(this.app.context, middleware).handle(event, (ctx) => Promise.resolve(handler(ctx)));
+			return new Kernel(this.app.context, middleware).handle(event, (ctx) => new Promise((resolve) => {
+				if (Resolver.isAsyncFunction(handler)) handler(ctx).then((response) => {
+					if (response instanceof Response) resolve(response.prepare(ctx.request).send());
+					else resolve(response);
+				});
+				else resolve(handler(ctx));
+			}));
 		};
 	}
 	/**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h3ravel/router",
-  "version": "1.12.1",
+  "version": "1.12.2",
   "description": "Route facade, decorators and controller system for H3ravel.",
   "h3ravel": {
     "providers": [
@@ -9,15 +9,15 @@
     ]
   },
   "type": "module",
-  "main": "./dist/index.js",
+  "main": "./dist/index.cjs",
   "types": "./dist/index.d.ts",
   "module": "./dist/index.js",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
-    }
+    },
+    "./*": "./*"
   },
   "files": [
     "dist"
@@ -45,11 +45,11 @@
     "@h3ravel/musket": "^0.3.1",
     "h3": "2.0.1-rc.5",
     "reflect-metadata": "^0.2.2",
-    "@h3ravel/core": "^1.20.0",
-    "@h3ravel/shared": "^0.26.0",
-    "@h3ravel/http": "^11.6.0",
-    "@h3ravel/support": "^0.14.4",
-    "@h3ravel/database": "^11.4.4"
+    "@h3ravel/core": "^1.20.1",
+    "@h3ravel/http": "^11.6.1",
+    "@h3ravel/shared": "^0.26.1",
+    "@h3ravel/support": "^0.14.5",
+    "@h3ravel/database": "^11.4.5"
   },
   "scripts": {
     "barrel": "barrelsby --directory src --delete --singleQuotes",

package/dist/index.d.cts

@@ -1,244 +0,0 @@
-/// <reference path="./app.globals.d.ts" />
-import { Command } from "@h3ravel/musket";
-import { EventHandler, ExtractControllerMethods, HttpContext, IMiddleware, IRouter, RouteEventHandler, RouterEnd } from "@h3ravel/shared";
-import { Model } from "@h3ravel/database";
-import { Application, ServiceProvider } from "@h3ravel/core";
-import { H3, Middleware, MiddlewareOptions } from "h3";
-
-//#region src/Commands/RouteListCommand.d.ts
-declare class RouteListCommand extends Command {
-  /**
-   * The name and signature of the console command.
-   *
-   * @var string
-   */
-  protected signature: string;
-  /**
-   * The console command description.
-   *
-   * @var string
-   */
-  protected description: string;
-  /**
-   * Execute the console command.
-   */
-  handle(this: any): Promise<void>;
-  /**
-   * List all registered routes.
-   */
-  protected list(): Promise<void>;
-  /**
-   * Get the color
-   *
-   * @param method
-   * @returns
-   */
-  private color;
-  /**
-   * Get the alternate method
-   *
-   * @param method
-   * @returns
-   */
-  private pair;
-}
-//#endregion
-//#region src/Helpers.d.ts
-declare class Helpers {
-  /**
-   * Extracts parameter names from a route path string.
-   *
-   * - Looks for segments prefixed with ":" (e.g. "/users/:id")
-   * - Captures only the param name (without the ":")
-   * - Returns all matches in order of appearance
-   *
-   * @param path - The route path string (e.g. "/groups/:group/users/:user")
-   * @returns An array of parameter names (e.g. ["group", "user"])
-   */
-  static extractParams(path: string): string[];
-  /**
-   * Resolves route model binding for a given path, HTTP context, and model.
-   *
-   * - Extracts all route parameters from the given path
-   * - If a parameter matches the model name, it attempts to resolve the model binding
-   *   using the provided value and binding field (defaults to "id" unless specified).
-   * - For non-matching parameters, it simply returns the key-value pair as is.
-   * - If no parameters are found, returns an empty object.
-   *
-   * @param path - The route path (e.g. "/groups/:group/users/:user")
-   * @param ctx - The HTTP context containing the request
-   * @param model - The model instance to resolve bindings against
-   * @returns A resolved model instance or an object containing param values
-   */
-  static resolveRouteModelBinding(path: string, ctx: HttpContext, model: Model): Promise<any>;
-}
-//#endregion
-//#region src/Providers/AssetsServiceProvider.d.ts
-/**
- * Handles public assets loading
- *
- * Auto-Registered
- */
-declare class AssetsServiceProvider extends ServiceProvider {
-  static priority: number;
-  register(): void;
-}
-//#endregion
-//#region src/Providers/RouteServiceProvider.d.ts
-/**
- * Handles routing registration
- *
- * Load route files (web.ts, api.ts).
- * Map controllers to routes.
- * Register route-related middleware.
- *
- * Auto-Registered
- */
-declare class RouteServiceProvider extends ServiceProvider {
-  static priority: number;
-  register(): void;
-  /**
-   * Load routes from src/routes
-   */
-  boot(): Promise<void>;
-}
-//#endregion
-//#region src/Route.d.ts
-declare class Router implements IRouter {
-  protected h3App: H3;
-  private app;
-  private routes;
-  private nameMap;
-  private groupPrefix;
-  private middlewareMap;
-  private groupMiddleware;
-  constructor(h3App: H3, app: Application);
-  /**
-   * Route Resolver
-   *
-   * @param handler
-   * @param middleware
-   * @returns
-   */
-  private resolveHandler;
-  /**
-   * Add a route to the stack
-   *
-   * @param method
-   * @param path
-   * @param handler
-   * @param name
-   * @param middleware
-   */
-  private addRoute;
-  /**
-   * Resolves a route handler definition into an executable EventHandler.
-   *
-   * A handler can be:
-   *   - A function matching the EventHandler signature
-   *   - A controller class (optionally decorated for IoC resolution)
-   *
-   * If it’s a controller class, this method will:
-   *   - Instantiate it (via IoC or manually)
-   *   - Call the specified method (defaults to `index`)
-   *
-   * @param handler     Event handler function OR controller class
-   * @param methodName  Method to invoke on the controller (defaults to 'index')
-   */
-  private resolveControllerOrHandler;
-  /**
-   * Registers a route that responds to HTTP GET requests.
-   *
-   * @param path        The URL pattern to match (can include parameters, e.g., '/users/:id').
-   * @param definition  Either:
-   *                      - An EventHandler function
-   *                      - A tuple: [ControllerClass, methodName]
-   * @param name        Optional route name (for URL generation or referencing).
-   * @param middleware  Optional array of middleware functions to execute before the handler.
-   */
-  get<C extends new (...args: any) => any>(path: string, definition: RouteEventHandler | [C, methodName: ExtractControllerMethods<InstanceType<C>>], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
-  /**
-   * Registers a route that responds to HTTP POST requests.
-   *
-   * @param path        The URL pattern to match (can include parameters, e.g., '/users').
-   * @param definition  Either:
-   *                      - An EventHandler function
-   *                      - A tuple: [ControllerClass, methodName]
-   * @param name        Optional route name (for URL generation or referencing).
-   * @param middleware  Optional array of middleware functions to execute before the handler.
-   */
-  post<C extends new (...args: any) => any>(path: string, definition: RouteEventHandler | [C, methodName: ExtractControllerMethods<InstanceType<C>>], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
-  /**
-   * Registers a route that responds to HTTP PUT requests.
-   *
-   * @param path        The URL pattern to match (can include parameters, e.g., '/users/:id').
-   * @param definition  Either:
-   *                      - An EventHandler function
-   *                      - A tuple: [ControllerClass, methodName]
-   * @param name        Optional route name (for URL generation or referencing).
-   * @param middleware  Optional array of middleware functions to execute before the handler.
-   */
-  put<C extends new (...args: any) => any>(path: string, definition: RouteEventHandler | [C, methodName: ExtractControllerMethods<InstanceType<C>>], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
-  /**
-   * Registers a route that responds to HTTP PATCH requests.
-   *
-   * @param path        The URL pattern to match (can include parameters, e.g., '/users/:id').
-   * @param definition  Either:
-   *                      - An EventHandler function
-   *                      - A tuple: [ControllerClass, methodName]
-   * @param name        Optional route name (for URL generation or referencing).
-   * @param middleware  Optional array of middleware functions to execute before the handler.
-   */
-  patch<C extends new (...args: any) => any>(path: string, definition: RouteEventHandler | [C, methodName: ExtractControllerMethods<InstanceType<C>>], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
-  /**
-   * Registers a route that responds to HTTP DELETE requests.
-   *
-   * @param path        The URL pattern to match (can include parameters, e.g., '/users/:id').
-   * @param definition  Either:
-   *                      - An EventHandler function
-   *                      - A tuple: [ControllerClass, methodName]
-   * @param name        Optional route name (for URL generation or referencing).
-   * @param middleware  Optional array of middleware functions to execute before the handler.
-   */
-  delete<C extends new (...args: any) => any>(path: string, definition: RouteEventHandler | [C, methodName: ExtractControllerMethods<InstanceType<C>>], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
-  /**
-   * API Resource support
-   *
-   * @param path
-   * @param controller
-   */
-  apiResource<C extends new (...args: any) => any>(path: string, Controller: C, middleware?: IMiddleware[]): Omit<this, RouterEnd | 'name'>;
-  /**
-   * Named route URL generator
-   *
-   * @param name
-   * @param params
-   * @returns
-   */
-  route(name: string, params?: Record<string, string>): string | undefined;
-  /**
-   * Grouping
-   *
-   * @param options
-   * @param callback
-   */
-  group(options: {
-    prefix?: string;
-    middleware?: EventHandler[];
-  }, callback: (_e: this) => void): this;
-  /**
-   * Set the name of the current route
-   *
-   * @param name
-   */
-  name(name: string): this;
-  /**
-   * Registers middleware for a specific path.
-   * @param path - The path to apply the middleware.
-   * @param handler - The middleware handler.
-   * @param opts - Optional middleware options.
-   */
-  middleware(path: string | IMiddleware[] | Middleware, handler: Middleware | MiddlewareOptions, opts?: MiddlewareOptions): this;
-}
-//#endregion
-export { AssetsServiceProvider, Helpers, RouteListCommand, RouteServiceProvider, Router };