@adonisjs/http-server 6.1.0-0 → 6.2.0-0

package/build/src/request.js

@@ -212,7 +212,7 @@ export class Request extends Macroable {
             if (typeof route.handler === 'function') {
                 return false;
             }
-            return route.handler.name === identifier;
+            return route.handler.reference === identifier;
         });
     }
     is(types) {

package/build/src/router/lookup_store/route_finder.js

@@ -12,7 +12,7 @@ export class RouteFinder {
             if (typeof handler === 'function') {
                 return false;
             }
-            return handler.name === routeIdentifier;
+            return handler.reference === routeIdentifier;
         }) || null);
     }
     findOrFail(routeIdentifier) {

package/build/src/router/main.d.ts

@@ -5,11 +5,11 @@ import { Route } from './route.js';
 import { RouteGroup } from './group.js';
 import { BriskRoute } from './brisk.js';
 import { RouteResource } from './resource.js';
-import type { LazyImport } from '../types/base.js';
+import type { Constructor, LazyImport } from '../types/base.js';
 import { LookupStore } from './lookup_store/main.js';
 import { RouteMatchers as Matchers } from './matchers.js';
 import type { MiddlewareAsClass, ParsedGlobalMiddleware } from '../types/middleware.js';
-import type { RouteFn, MatchedRoute, RouteMatcher, MakeUrlOptions, MakeSignedUrlOptions } from '../types/route.js';
+import type { RouteFn, MatchedRoute, RouteMatcher, MakeUrlOptions, MakeSignedUrlOptions, GetControllerHandlers } from '../types/route.js';
 export declare class Router extends LookupStore {
     #private;
     routes: (Route | RouteResource | RouteGroup | BriskRoute)[];
@@ -21,13 +21,13 @@ export declare class Router extends LookupStore {
         name: K;
         args: Args[0];
     } & ParsedGlobalMiddleware; };
-    route(pattern: string, methods: string[], handler: string | RouteFn): Route;
-    any(pattern: string, handler: string | RouteFn): Route;
-    get(pattern: string, handler: string | RouteFn): Route;
-    post(pattern: string, handler: string | RouteFn): Route;
-    put(pattern: string, handler: string | RouteFn): Route;
-    patch(pattern: string, handler: string | RouteFn): Route;
-    delete(pattern: string, handler: string | RouteFn): Route;
+    route<T extends Constructor<any>>(pattern: string, methods: string[], handler: string | RouteFn | [LazyImport<T> | T, GetControllerHandlers<T>?]): Route<T>;
+    any<T extends Constructor<any>>(pattern: string, handler: string | RouteFn | [LazyImport<T> | T, GetControllerHandlers<T>?]): Route<T>;
+    get<T extends Constructor<any>>(pattern: string, handler: string | RouteFn | [LazyImport<T> | T, GetControllerHandlers<T>?]): Route<T>;
+    post<T extends Constructor<any>>(pattern: string, handler: string | RouteFn | [LazyImport<T> | T, GetControllerHandlers<T>?]): Route<T>;
+    put<T extends Constructor<any>>(pattern: string, handler: string | RouteFn | [LazyImport<T> | T, GetControllerHandlers<T>?]): Route<T>;
+    patch<T extends Constructor<any>>(pattern: string, handler: string | RouteFn | [LazyImport<T> | T, GetControllerHandlers<T>?]): Route<T>;
+    delete<T extends Constructor<any>>(pattern: string, handler: string | RouteFn | [LazyImport<T> | T, GetControllerHandlers<T>?]): Route<T>;
     group(callback: () => void): RouteGroup;
     resource(resource: string, controller: string): RouteResource;
     shallowResource(resource: string, controller: string): RouteResource;

package/build/src/router/route.d.ts

@@ -1,13 +1,14 @@
 import { Macroable } from '@poppinss/macroable';
 import type { Application } from '@adonisjs/application';
+import type { Constructor, LazyImport } from '../types/base.js';
 import type { MiddlewareFn, ParsedNamedMiddleware, ParsedGlobalMiddleware } from '../types/middleware.js';
-import type { RouteFn, RouteJSON, RouteMatcher, RouteMatchers, StoreRouteMiddleware } from '../types/route.js';
-export declare class Route extends Macroable {
+import type { GetControllerHandlers, RouteFn, RouteJSON, RouteMatcher, RouteMatchers, StoreRouteMiddleware } from '../types/route.js';
+export declare class Route<Controller extends Constructor<any> = any> extends Macroable {
     #private;
     constructor(app: Application<any, any>, routerMiddleware: ParsedGlobalMiddleware[], options: {
         pattern: string;
         methods: string[];
-        handler: RouteFn | string;
+        handler: RouteFn | string | [LazyImport<Controller> | Controller, GetControllerHandlers<Controller>?];
         globalMatchers: RouteMatchers;
     });
     where(param: string, matcher: RouteMatcher | string | RegExp): this;

package/build/src/router/route.js

@@ -1,8 +1,8 @@
 import is from '@sindresorhus/is';
 import Middleware from '@poppinss/middleware';
 import { Macroable } from '@poppinss/macroable';
-import { moduleExpression } from '@adonisjs/fold';
 import { RuntimeException } from '@poppinss/utils';
+import { moduleCaller, moduleExpression, moduleImporter } from '@adonisjs/fold';
 import { execute } from './executor.js';
 import { dropSlash } from '../helpers.js';
 export class Route extends Macroable {
@@ -30,10 +30,22 @@ export class Route extends Macroable {
     #resolveRouteHandle(handler) {
         if (typeof handler === 'string') {
             return {
-                name: handler,
+                reference: handler,
                 ...moduleExpression(handler, this.#app.appRoot).toHandleMethod(),
             };
         }
+        if (Array.isArray(handler)) {
+            if (is.class_(handler[0])) {
+                return {
+                    reference: handler[0].name,
+                    ...moduleCaller(handler[0], (handler[1] || 'handle')).toHandleMethod(),
+                };
+            }
+            return {
+                reference: handler[0].name,
+                ...moduleImporter(handler[0], (handler[1] || 'handle')).toHandleMethod(),
+            };
+        }
         return handler;
     }
     #getMatchers() {

package/build/src/types/route.d.ts

@@ -1,7 +1,11 @@
 import type Middleware from '@poppinss/middleware';
 import type { ContainerResolver } from '@adonisjs/fold';
+import type { Constructor, LazyImport } from './base.js';
 import type { HttpContext } from '../http_context/main.js';
 import type { MiddlewareFn, ParsedGlobalMiddleware } from './middleware.js';
+export type GetControllerHandlers<Controller extends Constructor<any>> = {
+    [K in keyof InstanceType<Controller>]: InstanceType<Controller>[K] extends (ctx: HttpContext, ...args: any[]) => any ? K : never;
+}[keyof InstanceType<Controller>];
 export type MatchItRouteToken = RouteMatcher & {
     old: string;
     type: 0 | 1 | 2 | 3;
@@ -10,7 +14,7 @@ export type MatchItRouteToken = RouteMatcher & {
 };
 export type RouteFn = (ctx: HttpContext) => any;
 export type StoreRouteHandler = RouteFn | {
-    name: string;
+    reference: string | [LazyImport<Constructor<any>> | Constructor<any>, any?];
     handle: (resolver: ContainerResolver<any>, ...args: [ctx: HttpContext, ...injections: any[]]) => any;
 };
 export type StoreRouteMiddleware = MiddlewareFn | ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/http-server",
-  "version": "6.1.0-0",
+  "version": "6.2.0-0",
   "description": "AdonisJS HTTP server with support packed with Routing and Cookies",
   "main": "build/index.js",
   "type": "module",
@@ -37,10 +37,10 @@
   "author": "virk,adonisjs",
   "license": "MIT",
   "devDependencies": {
-    "@adonisjs/application": "^6.3.1-0",
+    "@adonisjs/application": "^6.4.0-0",
     "@adonisjs/config": "^4.1.2-0",
     "@adonisjs/encryption": "^5.0.2-0",
-    "@adonisjs/fold": "^9.6.0-0",
+    "@adonisjs/fold": "^9.8.0-0",
     "@adonisjs/logger": "^5.1.0-0",
     "@commitlint/cli": "^17.3.0",
     "@commitlint/config-conventional": "^17.3.0",
@@ -113,9 +113,9 @@
     "vary": "^1.1.2"
   },
   "peerDependencies": {
-    "@adonisjs/application": "^6.3.1-0",
+    "@adonisjs/application": "^6.4.0-0",
     "@adonisjs/encryption": "^5.0.2-0",
-    "@adonisjs/fold": "^9.6.0-0"
+    "@adonisjs/fold": "^9.8.0-0"
   },
   "repository": {
     "type": "git",