@adonisjs/http-server 6.8.2-0 → 6.8.2-2

package/build/src/request.js

@@ -1,4 +1,3 @@
-import cuid from 'cuid';
 import fresh from 'fresh';
 import typeIs from 'type-is';
 import accepts from 'accepts';
@@ -8,6 +7,7 @@ import proxyaddr from 'proxy-addr';
 import { safeEqual } from '@poppinss/utils';
 import Macroable from '@poppinss/macroable';
 import lodash from '@poppinss/utils/lodash';
+import { createId } from '@paralleldrive/cuid2';
 import { parse } from 'node:url';
 import { trustProxy } from './helpers.js';
 import { CookieParser } from './cookies/parser.js';
@@ -53,7 +53,7 @@ export class Request extends Macroable {
     id() {
         let requestId = this.header('x-request-id');
         if (!requestId && this.#config.generateRequestId) {
-            requestId = cuid();
+            requestId = createId();
             this.request.headers['x-request-id'] = requestId;
         }
         return requestId;

package/build/src/router/brisk.js

@@ -23,7 +23,7 @@ export class BriskRoute extends Macroable {
         return this.route;
     }
     redirect(identifier, params, options) {
-        return this.setHandler(async (ctx) => {
+        return this.setHandler(async function redirectsToRoute(ctx) {
             const redirector = ctx.response.redirect();
             if (options?.status) {
                 redirector.status(options.status);
@@ -32,7 +32,7 @@ export class BriskRoute extends Macroable {
         });
     }
     redirectToPath(url, options) {
-        return this.setHandler(async (ctx) => {
+        return this.setHandler(async function redirectsToPath(ctx) {
             const redirector = ctx.response.redirect();
             if (options?.status) {
                 redirector.status(options.status);

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

@@ -29,8 +29,8 @@ export declare class Router extends LookupStore {
     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;
+    resource(resource: string, controller: string | LazyImport<Constructor<any>> | Constructor<any>): RouteResource;
+    shallowResource(resource: string, controller: string | LazyImport<Constructor<any>> | Constructor<any>): RouteResource;
     on(pattern: string): BriskRoute;
     where(param: string, matcher: RouteMatcher | string | RegExp): this;
     commit(): void;

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

@@ -1,6 +1,7 @@
 import Macroable from '@poppinss/macroable';
 import type { Application } from '@adonisjs/application';
 import { Route } from './route.js';
+import type { Constructor, LazyImport } from '../types/base.js';
 import type { ParsedGlobalMiddleware } from '../types/middleware.js';
 import type { ResourceActionNames, RouteMatcher, RouteMatchers } from '../types/route.js';
 export declare class RouteResource extends Macroable {
@@ -8,7 +9,7 @@ export declare class RouteResource extends Macroable {
     routes: Route[];
     constructor(app: Application<any>, routerMiddleware: ParsedGlobalMiddleware[], options: {
         resource: string;
-        controller: string;
+        controller: string | LazyImport<Constructor<any>> | Constructor<any>;
         globalMatchers: RouteMatchers;
         shallow: boolean;
     });

package/build/src/router/resource.js

@@ -42,7 +42,9 @@ export class RouteResource extends Macroable {
         const route = new Route(this.#app, this.#routerMiddleware, {
             pattern,
             methods,
-            handler: `${this.#controller}.${action}`,
+            handler: typeof this.#controller === 'string'
+                ? `${this.#controller}.${action}`
+                : [this.#controller, action],
             globalMatchers: this.#globalMatchers,
         });
         route.as(`${this.#routesBaseName}.${action}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/http-server",
-  "version": "6.8.2-0",
+  "version": "6.8.2-2",
   "description": "AdonisJS HTTP server with support packed with Routing and Cookies",
   "main": "build/index.js",
   "type": "module",
@@ -40,7 +40,6 @@
   "license": "MIT",
   "devDependencies": {
     "@adonisjs/application": "^7.1.2-0",
-    "@adonisjs/config": "^4.2.1-0",
     "@adonisjs/encryption": "^5.1.2-0",
     "@adonisjs/events": "^8.4.9-0",
     "@adonisjs/fold": "^9.9.3-0",
@@ -48,13 +47,12 @@
     "@commitlint/cli": "^17.4.4",
     "@commitlint/config-conventional": "^17.4.4",
     "@fastify/middie": "^8.1.0",
-    "@japa/api-client": "^1.4.4",
     "@japa/assert": "^1.4.1",
     "@japa/expect-type": "^1.0.3",
     "@japa/run-failed-tests": "^1.1.1",
     "@japa/runner": "^2.5.1",
     "@japa/spec-reporter": "^1.3.3",
-    "@swc/core": "^1.3.37",
+    "@swc/core": "^1.3.39",
     "@types/accepts": "^1.3.5",
     "@types/content-disposition": "^0.5.5",
     "@types/cookie": "^0.5.1",
@@ -65,6 +63,7 @@
     "@types/fs-extra": "^11.0.1",
     "@types/http-status-codes": "^1.2.0",
     "@types/mime-types": "^2.1.1",
+    "@types/node": "^18.15.0",
     "@types/on-finished": "^2.3.1",
     "@types/pem": "^1.9.6",
     "@types/proxy-addr": "^2.0.0",
@@ -76,13 +75,13 @@
     "c8": "^7.13.0",
     "cross-env": "^7.0.3",
     "del-cli": "^5.0.0",
-    "eslint": "^8.35.0",
-    "eslint-config-prettier": "^8.6.0",
+    "eslint": "^8.36.0",
+    "eslint-config-prettier": "^8.7.0",
     "eslint-plugin-adonis": "^3.0.3",
     "eslint-plugin-prettier": "^4.2.1",
-    "fastify": "^4.14.0",
+    "fastify": "^4.14.1",
     "fs-extra": "^11.1.0",
-    "github-label-sync": "^2.2.0",
+    "github-label-sync": "^2.3.1",
     "http-status-codes": "^2.2.0",
     "husky": "^8.0.3",
     "np": "^7.6.3",
@@ -94,15 +93,15 @@
     "typescript": "^4.9.5"
   },
   "dependencies": {
+    "@paralleldrive/cuid2": "^2.2.0",
     "@poppinss/macroable": "^1.0.0-2",
     "@poppinss/matchit": "^3.1.2",
-    "@poppinss/middleware": "^3.1.0",
+    "@poppinss/middleware": "^3.1.1",
     "@poppinss/utils": "^6.5.0-0",
     "@sindresorhus/is": "^5.3.0",
     "accepts": "^1.3.8",
     "content-disposition": "^0.5.4",
     "cookie": "^0.5.0",
-    "cuid": "^3.0.0",
     "destroy": "^1.2.0",
     "encodeurl": "^1.0.2",
     "etag": "^1.8.1",
@@ -110,7 +109,7 @@
     "mime-types": "^2.1.35",
     "on-finished": "^2.4.1",
     "proxy-addr": "^2.0.7",
-    "qs": "^6.11.0",
+    "qs": "^6.11.1",
     "tmp-cache": "^1.1.0",
     "type-is": "^1.6.18",
     "vary": "^1.1.2",