@h3ravel/router 1.8.0 → 1.8.2

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import { H3, Middleware, MiddlewareOptions } from 'h3';
 import { Application, ServiceProvider } from '@h3ravel/core';
-import { IRouter, EventHandler, IMiddleware, RouterEnd, IController } from '@h3ravel/shared';
+import { IRouter, RouteEventHandler, IMiddleware, RouterEnd, IController, EventHandler } from '@h3ravel/shared';
 
 declare class Router implements IRouter {
     protected h3App: H3;
@@ -54,7 +54,7 @@ declare class Router implements IRouter {
      * @param name        Optional route name (for URL generation or referencing).
      * @param middleware  Optional array of middleware functions to execute before the handler.
      */
-    get(path: string, definition: EventHandler | [(new (...args: any[]) => Record<string, any>), methodName: string], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
+    get(path: string, definition: RouteEventHandler | [(new (...args: any[]) => Record<string, any>), methodName: string], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
     /**
      * Registers a route that responds to HTTP POST requests.
      *
@@ -65,7 +65,7 @@ declare class Router implements IRouter {
      * @param name        Optional route name (for URL generation or referencing).
      * @param middleware  Optional array of middleware functions to execute before the handler.
      */
-    post(path: string, definition: EventHandler | [(new (...args: any[]) => Record<string, any>), methodName: string], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
+    post(path: string, definition: RouteEventHandler | [(new (...args: any[]) => Record<string, any>), methodName: string], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
     /**
      * Registers a route that responds to HTTP PUT requests.
      *
@@ -76,7 +76,7 @@ declare class Router implements IRouter {
      * @param name        Optional route name (for URL generation or referencing).
      * @param middleware  Optional array of middleware functions to execute before the handler.
      */
-    put(path: string, definition: EventHandler | [(new (...args: any[]) => Record<string, any>), methodName: string], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
+    put(path: string, definition: RouteEventHandler | [(new (...args: any[]) => Record<string, any>), methodName: string], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
     /**
      * Registers a route that responds to HTTP PATCH requests.
      *
@@ -87,7 +87,7 @@ declare class Router implements IRouter {
      * @param name        Optional route name (for URL generation or referencing).
      * @param middleware  Optional array of middleware functions to execute before the handler.
      */
-    patch(path: string, definition: EventHandler | [(new (...args: any[]) => Record<string, any>), methodName: string], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
+    patch(path: string, definition: RouteEventHandler | [(new (...args: any[]) => Record<string, any>), methodName: string], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
     /**
      * Registers a route that responds to HTTP DELETE requests.
      *
@@ -98,7 +98,7 @@ declare class Router implements IRouter {
      * @param name        Optional route name (for URL generation or referencing).
      * @param middleware  Optional array of middleware functions to execute before the handler.
      */
-    delete(path: string, definition: EventHandler | [(new (...args: any[]) => Record<string, any>), methodName: string], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
+    delete(path: string, definition: RouteEventHandler | [(new (...args: any[]) => Record<string, any>), methodName: string], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
     /**
      * API Resource support
      *
@@ -123,7 +123,7 @@ declare class Router implements IRouter {
     group(options: {
         prefix?: string;
         middleware?: EventHandler[];
-    }, callback: () => void): this;
+    }, callback: (_e: this) => void): this;
     /**
      * Set the name of the current route
      *

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { H3, Middleware, MiddlewareOptions } from 'h3';
 import { Application, ServiceProvider } from '@h3ravel/core';
-import { IRouter, EventHandler, IMiddleware, RouterEnd, IController } from '@h3ravel/shared';
+import { IRouter, RouteEventHandler, IMiddleware, RouterEnd, IController, EventHandler } from '@h3ravel/shared';
 
 declare class Router implements IRouter {
     protected h3App: H3;
@@ -54,7 +54,7 @@ declare class Router implements IRouter {
      * @param name        Optional route name (for URL generation or referencing).
      * @param middleware  Optional array of middleware functions to execute before the handler.
      */
-    get(path: string, definition: EventHandler | [(new (...args: any[]) => Record<string, any>), methodName: string], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
+    get(path: string, definition: RouteEventHandler | [(new (...args: any[]) => Record<string, any>), methodName: string], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
     /**
      * Registers a route that responds to HTTP POST requests.
      *
@@ -65,7 +65,7 @@ declare class Router implements IRouter {
      * @param name        Optional route name (for URL generation or referencing).
      * @param middleware  Optional array of middleware functions to execute before the handler.
      */
-    post(path: string, definition: EventHandler | [(new (...args: any[]) => Record<string, any>), methodName: string], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
+    post(path: string, definition: RouteEventHandler | [(new (...args: any[]) => Record<string, any>), methodName: string], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
     /**
      * Registers a route that responds to HTTP PUT requests.
      *
@@ -76,7 +76,7 @@ declare class Router implements IRouter {
      * @param name        Optional route name (for URL generation or referencing).
      * @param middleware  Optional array of middleware functions to execute before the handler.
      */
-    put(path: string, definition: EventHandler | [(new (...args: any[]) => Record<string, any>), methodName: string], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
+    put(path: string, definition: RouteEventHandler | [(new (...args: any[]) => Record<string, any>), methodName: string], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
     /**
      * Registers a route that responds to HTTP PATCH requests.
      *
@@ -87,7 +87,7 @@ declare class Router implements IRouter {
      * @param name        Optional route name (for URL generation or referencing).
      * @param middleware  Optional array of middleware functions to execute before the handler.
      */
-    patch(path: string, definition: EventHandler | [(new (...args: any[]) => Record<string, any>), methodName: string], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
+    patch(path: string, definition: RouteEventHandler | [(new (...args: any[]) => Record<string, any>), methodName: string], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
     /**
      * Registers a route that responds to HTTP DELETE requests.
      *
@@ -98,7 +98,7 @@ declare class Router implements IRouter {
      * @param name        Optional route name (for URL generation or referencing).
      * @param middleware  Optional array of middleware functions to execute before the handler.
      */
-    delete(path: string, definition: EventHandler | [(new (...args: any[]) => Record<string, any>), methodName: string], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
+    delete(path: string, definition: RouteEventHandler | [(new (...args: any[]) => Record<string, any>), methodName: string], name?: string, middleware?: IMiddleware[]): Omit<this, RouterEnd>;
     /**
      * API Resource support
      *
@@ -123,7 +123,7 @@ declare class Router implements IRouter {
     group(options: {
         prefix?: string;
         middleware?: EventHandler[];
-    }, callback: () => void): this;
+    }, callback: (_e: this) => void): this;
     /**
      * Set the name of the current route
      *

package/dist/index.js

@@ -1288,7 +1288,7 @@ var Router = class {
    * @param methodName  Method to invoke on the controller (defaults to 'index')
    */
   resolveControllerOrHandler(handler, methodName) {
-    if (typeof handler === "function") {
+    if (typeof handler === "function" && typeof handler.prototype !== "undefined") {
       return (_ctx) => {
         let controller;
         if (Container.hasAnyDecorator(handler)) {
@@ -1301,7 +1301,7 @@ var Router = class {
           throw new Error(`Method "${String(action)}" not found on controller ${handler.name}`);
         }
         const paramTypes = Reflect.getMetadata("design:paramtypes", controller, action) || [];
-        const args = paramTypes.map((paramType) => {
+        let args = paramTypes.map((paramType) => {
           switch (paramType?.name) {
             case "Application":
               return this.app;
@@ -1315,6 +1315,11 @@ var Router = class {
               return this.app.make(paramType);
           }
         });
+        if (args.length < 1) {
+          args = [
+            _ctx
+          ];
+        }
         return controller[action](...args);
       };
     }
@@ -1411,13 +1416,30 @@ var Router = class {
     const basePath = `/${path2}`.replace(/\/+$/, "").replace(/(\/)+/g, "$1");
     const name = basePath.substring(basePath.lastIndexOf("/") + 1).replaceAll(/\/|:/g, "") || "";
     const param = singularize(name);
-    const controller = new Controller(this.app);
-    this.addRoute("get", basePath, controller.index.bind(controller), `${name}.index`, middleware);
-    this.addRoute("post", basePath, controller.store.bind(controller), `${name}.store`, middleware);
-    this.addRoute("get", `${basePath}/:${param}`, controller.show.bind(controller), `${name}.show`, middleware);
-    this.addRoute("put", `${basePath}/:${param}`, controller.update.bind(controller), `${name}.update`, middleware);
-    this.addRoute("patch", `${basePath}/:${param}`, controller.update.bind(controller), `${name}.update`, middleware);
-    this.addRoute("delete", `${basePath}/:${param}`, controller.destroy.bind(controller), `${name}.destroy`, middleware);
+    this.get(basePath, [
+      Controller,
+      "index"
+    ], `${name}.index`, middleware);
+    this.post(basePath, [
+      Controller,
+      "store"
+    ], `${name}.store`, middleware);
+    this.get(`${basePath}/:${param}`, [
+      Controller,
+      "show"
+    ], `${name}.show`, middleware);
+    this.put(`${basePath}/:${param}`, [
+      Controller,
+      "update"
+    ], `${name}.update`, middleware);
+    this.patch(`${basePath}/:${param}`, [
+      Controller,
+      "update"
+    ], `${name}.update`, middleware);
+    this.delete(`${basePath}/:${param}`, [
+      Controller,
+      "destroy"
+    ], `${name}.destroy`, middleware);
     return this;
   }
   /**
@@ -1450,7 +1472,7 @@ var Router = class {
     ];
     this.groupPrefix += options.prefix || "";
     this.groupMiddleware.push(...options.middleware || []);
-    callback();
+    callback(this);
     this.groupPrefix = prevPrefix;
     this.groupMiddleware = prevMiddleware;
     return this;