@adonisjs/http-server 8.0.0-next.1 → 8.0.0-next.3

package/build/{chunk-HMYAZG76.js → chunk-GX5AWCSU.js}

@@ -876,6 +876,8 @@ function safeDecodeURI(path, useSemicolonDelimiter) {
 }
 
 // src/router/route.ts
+import StringBuilder from "@poppinss/utils/string_builder";
+import string2 from "@poppinss/utils/string";
 var Route = class extends Macroable4 {
   /**
    * Route pattern
@@ -938,8 +940,10 @@ var Route = class extends Macroable4 {
     this.#routerMiddleware = routerMiddleware;
     this.#pattern = options.pattern;
     this.#methods = options.methods;
-    this.#handler = this.#resolveRouteHandle(options.handler);
     this.#globalMatchers = options.globalMatchers;
+    const { handler, routeName } = this.#resolveRouteHandle(options.handler);
+    this.#handler = handler;
+    this.#name = routeName;
   }
   /**
    * Resolves the route handler string expression to a
@@ -951,24 +955,41 @@ var Route = class extends Macroable4 {
       const method = parts.length === 1 ? "handle" : parts.pop();
       const moduleRefId = parts.join(".");
       return {
-        reference: handler,
-        ...moduleImporter(() => this.#app.import(moduleRefId), method).toHandleMethod(),
-        name: handler
+        handler: {
+          method,
+          reference: handler,
+          importExpression: moduleRefId,
+          ...moduleImporter(() => this.#app.import(moduleRefId), method).toHandleMethod(),
+          name: handler
+        },
+        routeName: `${new StringBuilder(moduleRefId.split("/").pop()).removeSuffix("controller").snakeCase()}.${string2.snakeCase(method)}`
       };
     }
     if (Array.isArray(handler)) {
-      if (is.class(handler[0])) {
+      const controller = handler[0];
+      const method = handler[1] ?? "handle";
+      if (is.class(controller)) {
         return {
-          reference: handler,
-          ...moduleCaller(handler[0], handler[1] || "handle").toHandleMethod()
+          handler: {
+            method,
+            reference: handler,
+            importExpression: null,
+            ...moduleCaller(controller, method).toHandleMethod()
+          },
+          routeName: `${new StringBuilder(controller.name).removeSuffix("controller").snakeCase()}.${string2.snakeCase(method)}`
         };
       }
       return {
-        reference: handler,
-        ...moduleImporter(handler[0], handler[1] || "handle").toHandleMethod()
+        handler: {
+          method,
+          reference: handler,
+          importExpression: String(controller),
+          ...moduleImporter(controller, method).toHandleMethod()
+        },
+        routeName: `${new StringBuilder(controller.name).removeSuffix("controller").snakeCase()}.${string2.snakeCase(method)}`
       };
     }
-    return handler;
+    return { handler };
   }
   /**
    * Returns an object of param matchers by merging global and local
@@ -4134,7 +4155,7 @@ var Router = class {
       const routeNames = routeNamesByDomain.get(route.domain);
       if (route.name && routeNames.has(route.name)) {
         throw new RuntimeException5(
-          `Route with duplicate name found. A route with name "${route.name}" already exists`
+          `A route with name "${route.name}" already exists. It may happen when two routes use the same controller, so make sure to give explicit names to these routes`
         );
       }
       if (route.name) {
@@ -4151,33 +4172,19 @@ var Router = class {
     this.#openedGroups = [];
     this.#commited = true;
   }
-  /**
-   * The lookup strategies to follow when generating URL builder
-   * types and client
-   */
-  lookupStrategies = ["name", "pattern"];
-  /**
-   * Define the lookup strategies to follow when generating URL builder
-   * types and client.
-   */
-  updateLookupStrategies(strategies) {
-    this.lookupStrategies = strategies;
-    return this;
-  }
   /**
    * Finds a route by its identifier. The identifier can be the
    * route name, controller.method name or the route pattern
    * itself.
    *
-   * When "followLookupStrategy" is enabled, the lookup will be performed
-   * on the basis of the lookup strategy enabled via the "lookupStrategies"
-   * method. The default lookupStrategy is "name" and "pattern".
+   * When "disableLegacyLookup" is set, the lookup will be performed
+   * only using the route name
    */
-  find(routeIdentifier, domain, method, followLookupStrategy) {
+  find(routeIdentifier, domain, method, disableLegacyLookup) {
     if (!domain) {
       let route = null;
       for (const routeDomain of Object.keys(this.routes)) {
-        route = this.find(routeIdentifier, routeDomain, method, followLookupStrategy);
+        route = this.find(routeIdentifier, routeDomain, method, disableLegacyLookup);
         if (route) {
           break;
         }
@@ -4188,9 +4195,9 @@ var Router = class {
     if (!routes) {
       return null;
     }
-    const lookupByName = !followLookupStrategy || this.lookupStrategies.includes("name");
-    const lookupByPattern = !followLookupStrategy || this.lookupStrategies.includes("pattern");
-    const lookupByController = !followLookupStrategy || this.lookupStrategies.includes("controller");
+    const lookupByName = true;
+    const lookupByPattern = !disableLegacyLookup;
+    const lookupByController = !disableLegacyLookup;
     return routes.find((route) => {
       if (method && !route.methods.includes(method)) {
         return false;
@@ -4211,12 +4218,11 @@ var Router = class {
    *
    * An error is raised when unable to find the route.
    *
-   * When "followLookupStrategy" is enabled, the lookup will be performed
-   * on the basis of the lookup strategy enabled via the "lookupStrategies"
-   * method. The default lookupStrategy is "name" and "pattern".
+   * When "disableLegacyLookup" is set, the lookup will be performed
+   * only using the route name
    */
-  findOrFail(routeIdentifier, domain, method, followLookupStrategy) {
-    const route = this.find(routeIdentifier, domain, method, followLookupStrategy);
+  findOrFail(routeIdentifier, domain, method, disableLegacyLookup) {
+    const route = this.find(routeIdentifier, domain, method, disableLegacyLookup);
     if (!route) {
       throw new Error(`Cannot lookup route "${routeIdentifier}"`);
     }
@@ -4270,21 +4276,11 @@ var Router = class {
         routesList["ALL"] = routesList["ALL"] ?? {};
         routesList[method] = routesList[method] ?? {};
         const identifiers = [];
-        if (this.lookupStrategies.includes("pattern")) {
-          if (!routesList[method][route.pattern]) {
-            identifiers.push(route.pattern);
-          }
-        }
-        if (this.lookupStrategies.includes("name") && route.name) {
+        if (route.name) {
           identifiers.push(
             domain && routesList[method][route.name] ? `${domain}@${route.name}` : route.name
           );
         }
-        if (this.lookupStrategies.includes("controller") && "reference" in route.handler && typeof route.handler.reference === "string") {
-          identifiers.push(
-            domain && routesList[method][route.handler.reference] ? `${domain}@${route.handler.reference}` : route.handler.reference
-          );
-        }
         identifiers.forEach((identifier) => {
           routesList["ALL"][identifier] = {
             params,
@@ -4871,7 +4867,7 @@ var Server = class {
 
 // src/define_config.ts
 import proxyAddr from "proxy-addr";
-import string2 from "@poppinss/utils/string";
+import string3 from "@poppinss/utils/string";
 import lodash2 from "@poppinss/utils/lodash";
 function defineConfig(config) {
   const { trustProxy: trustProxy2, ...rest } = config;
@@ -4911,7 +4907,7 @@ function defineConfig(config) {
   };
   const normalizedConfig = lodash2.merge({}, defaults, rest);
   if (normalizedConfig.cookie.maxAge) {
-    normalizedConfig.cookie.maxAge = string2.seconds.parse(normalizedConfig.cookie.maxAge);
+    normalizedConfig.cookie.maxAge = string3.seconds.parse(normalizedConfig.cookie.maxAge);
   }
   if (typeof trustProxy2 === "boolean") {
     const tpValue = trustProxy2;

package/build/factories/main.js

@@ -6,7 +6,7 @@ import {
   Router,
   Server,
   defineConfig
-} from "../chunk-HMYAZG76.js";
+} from "../chunk-GX5AWCSU.js";
 import "../chunk-ASX56VAK.js";
 
 // factories/router.ts

package/build/index.js

@@ -20,7 +20,7 @@ import {
   errors_exports,
   parseRange,
   tracing_channels_exports
-} from "./chunk-HMYAZG76.js";
+} from "./chunk-GX5AWCSU.js";
 import "./chunk-ASX56VAK.js";
 
 // src/exception_handler.ts

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

@@ -142,26 +142,15 @@ export declare class Router {
      * commit method is called.
      */
     commit(): void;
-    /**
-     * The lookup strategies to follow when generating URL builder
-     * types and client
-     */
-    lookupStrategies: ('name' | 'pattern' | 'controller')[];
-    /**
-     * Define the lookup strategies to follow when generating URL builder
-     * types and client.
-     */
-    updateLookupStrategies(strategies: ('name' | 'pattern' | 'controller')[]): this;
     /**
      * Finds a route by its identifier. The identifier can be the
      * route name, controller.method name or the route pattern
      * itself.
      *
-     * When "followLookupStrategy" is enabled, the lookup will be performed
-     * on the basis of the lookup strategy enabled via the "lookupStrategies"
-     * method. The default lookupStrategy is "name" and "pattern".
+     * When "disableLegacyLookup" is set, the lookup will be performed
+     * only using the route name
      */
-    find(routeIdentifier: string, domain?: string, method?: string, followLookupStrategy?: boolean): RouteJSON | null;
+    find(routeIdentifier: string, domain?: string, method?: string, disableLegacyLookup?: boolean): RouteJSON | null;
     /**
      * Finds a route by its identifier. The identifier can be the
      * route name, controller.method name or the route pattern
@@ -169,11 +158,10 @@ export declare class Router {
      *
      * An error is raised when unable to find the route.
      *
-     * When "followLookupStrategy" is enabled, the lookup will be performed
-     * on the basis of the lookup strategy enabled via the "lookupStrategies"
-     * method. The default lookupStrategy is "name" and "pattern".
+     * When "disableLegacyLookup" is set, the lookup will be performed
+     * only using the route name
      */
-    findOrFail(routeIdentifier: string, domain?: string, method?: string, followLookupStrategy?: boolean): RouteJSON;
+    findOrFail(routeIdentifier: string, domain?: string, method?: string, disableLegacyLookup?: boolean): RouteJSON;
     /**
      * Check if a route exists. The identifier can be the
      * route name, controller.method name or the route pattern

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

@@ -35,6 +35,9 @@ export type RouteFn = (ctx: HttpContext) => any;
  * Route handler persisted with the route store
  */
 export type StoreRouteHandler = RouteFn | {
+    name?: string;
+    method: string;
+    importExpression: string | null;
     reference: string | [LazyImport<Constructor<any>> | Constructor<any>, any?];
     handle: (resolver: ContainerResolver<any>, ...args: [ctx: HttpContext, ...injections: any[]]) => any;
 };

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

@@ -19,7 +19,7 @@ export type SignedURLOptions = URLOptions & {
 /**
  * Returns params for a route identifier
  */
-export type RouteBuilderArguments<Routes, Method extends keyof Routes, Identifier extends keyof Routes[Method], Options extends any = URLOptions> = Routes extends LookupList ? Prettify<undefined extends Routes[Method][Identifier]['params'] ? [identifier: Identifier, params?: undefined, options?: Options] : [undefined] extends [Routes[Method][Identifier]['params']] ? [
+export type RouteBuilderArguments<Routes, Method extends keyof Routes, Identifier extends keyof Routes[Method], Options extends any = URLOptions> = Routes extends LookupList ? Prettify<Routes[Method][Identifier]['params'] extends undefined ? [identifier: Identifier, params?: undefined, options?: Options] : [undefined] extends [Routes[Method][Identifier]['params']] ? [
     identifier: Identifier,
     params?: Routes[Method][Identifier]['params'] | Routes[Method][Identifier]['paramsTuple'],
     options?: Options

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/http-server",
-  "version": "8.0.0-next.1",
+  "version": "8.0.0-next.3",
   "description": "AdonisJS HTTP server with support packed with Routing and Cookies",
   "main": "build/index.js",
   "type": "module",
@@ -65,7 +65,7 @@
     "@types/fresh": "^0.5.3",
     "@types/fs-extra": "^11.0.4",
     "@types/mime-types": "^3.0.1",
-    "@types/node": "^24.2.1",
+    "@types/node": "^24.3.0",
     "@types/on-finished": "^2.3.5",
     "@types/pem": "^1.14.4",
     "@types/proxy-addr": "^2.0.3",
@@ -77,7 +77,7 @@
     "autocannon": "^8.0.0",
     "c8": "^10.1.3",
     "cross-env": "^10.0.0",
-    "eslint": "^9.33.0",
+    "eslint": "^9.34.0",
     "fastify": "^5.5.0",
     "fs-extra": "^11.3.1",
     "get-port": "^7.1.0",