@h3ravel/router 1.8.0 → 1.8.2

package/dist/index.cjs

@@ -1303,7 +1303,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 (import_core.Container.hasAnyDecorator(handler)) {
@@ -1316,7 +1316,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;
@@ -1330,6 +1330,11 @@ var Router = class {
               return this.app.make(paramType);
           }
         });
+        if (args.length < 1) {
+          args = [
+            _ctx
+          ];
+        }
         return controller[action](...args);
       };
     }
@@ -1426,13 +1431,30 @@ var Router = class {
     const basePath = `/${path2}`.replace(/\/+$/, "").replace(/(\/)+/g, "$1");
     const name = basePath.substring(basePath.lastIndexOf("/") + 1).replaceAll(/\/|:/g, "") || "";
     const param = (0, import_support.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;
   }
   /**
@@ -1465,7 +1487,7 @@ var Router = class {
     ];
     this.groupPrefix += options.prefix || "";
     this.groupMiddleware.push(...options.middleware || []);
-    callback();
+    callback(this);
     this.groupPrefix = prevPrefix;
     this.groupMiddleware = prevMiddleware;
     return this;