chore: update dependencies

thetutlage · thetutlage · commit dd9eb743db01 · 2022-12-10T17:02:43.000+05:30
diff --git a/benchmarks/adonisjs.ts b/benchmarks/adonisjs.ts
@@ -8,7 +8,7 @@
  */
 
 import { createServer } from 'node:http'
-import Encryption from '@adonisjs/encryption'
+import { Encryption } from '@adonisjs/encryption'
 import { Application } from '@adonisjs/application'
 
 import { defineConfig } from '../index.js'
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
   ],
   "exports": {
     ".": "./build/index.js",
-    "./types": "./build/src/types.js"
+    "./types": "./build/src/types/main.js"
   },
   "scripts": {
     "pretest": "npm run lint",
@@ -37,12 +37,12 @@
   "author": "virk,adonisjs",
   "license": "MIT",
   "devDependencies": {
-    "@adonisjs/application": "^6.1.2-0",
+    "@adonisjs/application": "^6.2.0-0",
     "@adonisjs/config": "^4.1.1-0",
-    "@adonisjs/encryption": "^5.0.1-0",
+    "@adonisjs/encryption": "^5.0.2-0",
     "@adonisjs/env": "^4.0.3-0",
-    "@adonisjs/fold": "^9.4.1-0",
-    "@adonisjs/logger": "^5.0.2-0",
+    "@adonisjs/fold": "^9.5.0-0",
+    "@adonisjs/logger": "^5.1.0-0",
     "@commitlint/cli": "^17.3.0",
     "@commitlint/config-conventional": "^17.3.0",
     "@fastify/middie": "^8.1.0",
@@ -114,9 +114,9 @@
     "vary": "^1.1.2"
   },
   "peerDependencies": {
-    "@adonisjs/application": "^6.1.2-0",
-    "@adonisjs/encryption": "^5.0.1-0",
-    "@adonisjs/fold": "^9.4.1-0"
+    "@adonisjs/application": "^6.2.0-0",
+    "@adonisjs/encryption": "^5.0.2-0",
+    "@adonisjs/fold": "^9.5.0-0"
   },
   "repository": {
     "type": "git",
diff --git a/src/cookies/client.ts b/src/cookies/client.ts
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import type Encryption from '@adonisjs/encryption'
+import type { Encryption } from '@adonisjs/encryption'
 
 import * as plainCookiesDriver from './drivers/plain.js'
 import * as signedCookiesDriver from './drivers/signed.js'
diff --git a/src/cookies/drivers/encrypted.ts b/src/cookies/drivers/encrypted.ts
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import type Encryption from '@adonisjs/encryption'
+import type { Encryption } from '@adonisjs/encryption'
 
 /**
  * Encrypt a value to be set as cookie
diff --git a/src/cookies/drivers/signed.ts b/src/cookies/drivers/signed.ts
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import type Encryption from '@adonisjs/encryption'
+import type { Encryption } from '@adonisjs/encryption'
 
 /**
  * Signs a value to be shared as a cookie. The signed output has a
diff --git a/src/cookies/parser.ts b/src/cookies/parser.ts
@@ -8,7 +8,7 @@
  */
 
 import cookie from 'cookie'
-import type Encryption from '@adonisjs/encryption'
+import type { Encryption } from '@adonisjs/encryption'
 
 import { CookieClient } from './client.js'
 
diff --git a/src/cookies/serializer.ts b/src/cookies/serializer.ts
@@ -9,7 +9,7 @@
 
 import cookie from 'cookie'
 import string from '@poppinss/utils/string'
-import type Encryption from '@adonisjs/encryption'
+import type { Encryption } from '@adonisjs/encryption'
 
 import { CookieClient } from './client.js'
 import type { CookieOptions } from '../types/response.js'
diff --git a/src/request.ts b/src/request.ts
@@ -16,7 +16,7 @@ import proxyaddr from 'proxy-addr'
 import { safeEqual } from '@poppinss/utils'
 import lodash from '@poppinss/utils/lodash'
 import { Macroable } from '@poppinss/macroable'
-import type Encryption from '@adonisjs/encryption'
+import type { Encryption } from '@adonisjs/encryption'
 import { parse, UrlWithStringQuery } from 'node:url'
 import { ServerResponse, IncomingMessage, IncomingHttpHeaders } from 'node:http'
 
diff --git a/src/response.ts b/src/response.ts
@@ -19,8 +19,8 @@ import json from '@poppinss/utils/json'
 import { Macroable } from '@poppinss/macroable'
 import { createReadStream, stat } from 'node:fs'
 import { RuntimeException } from '@poppinss/utils'
-import type Encryption from '@adonisjs/encryption'
 import contentDisposition from 'content-disposition'
+import type { Encryption } from '@adonisjs/encryption'
 import { ServerResponse, IncomingMessage, OutgoingHttpHeaders } from 'node:http'
 
 import type { Qs } from './qs.js'
diff --git a/src/router/brisk.ts b/src/router/brisk.ts
@@ -41,7 +41,7 @@ export class BriskRoute<
   /**
    * Reference to the AdonisJS application
    */
-  #app: Application
+  #app: Application<any, any, any>
 
   /**
    * Middleware store to resolve middleware
@@ -54,7 +54,7 @@ export class BriskRoute<
   route: null | Route<NamedMiddleware> = null
 
   constructor(
-    app: Application,
+    app: Application<any, any, any>,
     middlewareStore: MiddlewareStore<NamedMiddleware>,
     options: {
       pattern: string
diff --git a/src/router/executor.ts b/src/router/executor.ts
@@ -15,7 +15,7 @@ import type { HttpContext } from '../http_context/main.js'
  * Executor to execute the route middleware pipeline the route
  * handler
  */
-export function execute(route: StoreRouteNode, resolver: ContainerResolver, ctx: HttpContext) {
+export function execute(route: StoreRouteNode, resolver: ContainerResolver<any>, ctx: HttpContext) {
   return route.middleware
     .runner()
     .finalHandler(() => {
diff --git a/src/router/lookup_store/main.ts b/src/router/lookup_store/main.ts
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import type Encryption from '@adonisjs/encryption'
+import type { Encryption } from '@adonisjs/encryption'
 
 import type { Qs } from '../../qs.js'
 import { UrlBuilder } from './url_builder.js'
diff --git a/src/router/lookup_store/url_builder.ts b/src/router/lookup_store/url_builder.ts
@@ -8,7 +8,7 @@
  */
 
 import { RuntimeException } from '@poppinss/utils'
-import type Encryption from '@adonisjs/encryption'
+import type { Encryption } from '@adonisjs/encryption'
 
 import type { Qs } from '../../qs.js'
 import type { RouteFinder } from './route_finder.js'
diff --git a/src/router/main.ts b/src/router/main.ts
@@ -8,8 +8,8 @@
  */
 
 import is from '@sindresorhus/is'
-import type Encryption from '@adonisjs/encryption'
 import { RuntimeException } from '@poppinss/utils'
+import type { Encryption } from '@adonisjs/encryption'
 import type { Application } from '@adonisjs/application'
 
 import type { Qs } from '../qs.js'
@@ -52,7 +52,7 @@ export class Router<
   /**
    * Application is needed to resolve string based controller expressions
    */
-  #app: Application
+  #app: Application<any, any, any>
 
   /**
    * Store with tokenized routes
@@ -98,7 +98,7 @@ export class Router<
   matchers = new Matchers()
 
   constructor(
-    app: Application,
+    app: Application<any, any, any>,
     encryption: Encryption,
     middlewareStore: MiddlewareStore<NamedMiddleware>,
     qsParser: Qs
diff --git a/src/router/resource.ts b/src/router/resource.ts
@@ -49,7 +49,7 @@ export class RouteResource<
   /**
    * Reference to the AdonisJS application
    */
-  #app: Application
+  #app: Application<any, any, any>
 
   /**
    * Middleware store to resolve middleware
@@ -75,7 +75,7 @@ export class RouteResource<
   routes: Route[] = []
 
   constructor(
-    app: Application,
+    app: Application<any, any, any>,
     middlewareStore: MiddlewareStore<NamedMiddleware>,
     options: {
       resource: string
diff --git a/src/router/route.ts b/src/router/route.ts
@@ -71,7 +71,7 @@ export class Route<
   /**
    * Reference to the AdonisJS application
    */
-  #app: Application
+  #app: Application<any, any, any>
 
   /**
    * Middleware store to resolve middleware
@@ -103,7 +103,7 @@ export class Route<
   #middleware: StoreRouteMiddleware[][] = []
 
   constructor(
-    app: Application,
+    app: Application<any, any, any>,
     middlewareStore: MiddlewareStore<NamedMiddleware>,
     options: {
       pattern: string
diff --git a/src/server/factories/final_handler.ts b/src/server/factories/final_handler.ts
@@ -18,7 +18,7 @@ import { RouteNotFoundException } from '../../exceptions/route_not_found.js'
  * It looks for a matching route and executes the route middleware
  * stack.
  */
-export function finalHandler(router: Router, resolver: ContainerResolver, ctx: HttpContext) {
+export function finalHandler(router: Router, resolver: ContainerResolver<any>, ctx: HttpContext) {
   return function () {
     const url = ctx.request.url()
     const method = ctx.request.method()
diff --git a/src/server/factories/middleware_handler.ts b/src/server/factories/middleware_handler.ts
@@ -16,7 +16,7 @@ import { ParsedGlobalMiddleware } from '../../types/middleware.js'
 /**
  * The middleware handler invokes the middleware functions.
  */
-export function middlewareHandler(resolver: ContainerResolver, ctx: HttpContext) {
+export function middlewareHandler(resolver: ContainerResolver<any>, ctx: HttpContext) {
   return function (fn: ParsedGlobalMiddleware, next: NextFn) {
     return fn.handle(resolver, ctx, next)
   }
diff --git a/src/server/main.ts b/src/server/main.ts
@@ -9,7 +9,7 @@
 
 import Middleware from '@poppinss/middleware'
 import { RuntimeException } from '@poppinss/utils'
-import type Encryption from '@adonisjs/encryption'
+import type { Encryption } from '@adonisjs/encryption'
 import type { ContainerResolver } from '@adonisjs/fold'
 import type { Application } from '@adonisjs/application'
 import type { Server as HttpsServer } from 'node:https'
@@ -55,7 +55,7 @@ export class Server<NamedMiddleware extends Record<string, LazyImport<Middleware
   /**
    * The application instance to be shared with the router
    */
-  #app: Application
+  #app: Application<any, any, any>
 
   /**
    * The encryption instance to be shared with the router
@@ -94,7 +94,7 @@ export class Server<NamedMiddleware extends Record<string, LazyImport<Middleware
     return asyncLocalStorage.isEnabled
   }
 
-  constructor(app: Application, encryption: Encryption, config: ServerConfig) {
+  constructor(app: Application<any, any, any>, encryption: Encryption, config: ServerConfig) {
     this.#app = app
     this.#encryption = encryption
     this.#config = config
@@ -211,7 +211,7 @@ export class Server<NamedMiddleware extends Record<string, LazyImport<Middleware
   /**
    * Handles the HTTP request
    */
-  #handleRequest(ctx: HttpContext, resolver: ContainerResolver) {
+  #handleRequest(ctx: HttpContext, resolver: ContainerResolver<any>) {
     return this.#serverMiddlewareStack!.runner()
       .finalHandler(finalHandler(this.#router!, resolver, ctx))
       .run(middlewareHandler(resolver, ctx))
diff --git a/src/types/main.ts b/src/types/main.ts
@@ -0,0 +1,16 @@
+/*
+ * @adonisjs/http-server
+ *
+ * (c) AdonisJS
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+export * from './base.js'
+export * from './middleware.js'
+export * from './qs.js'
+export * from './request.js'
+export * from './response.js'
+export * from './route.js'
+export * from './server.js'
diff --git a/src/types/middleware.ts b/src/types/middleware.ts
@@ -44,7 +44,7 @@ export type MiddlewareFn = (ctx: HttpContext, next: NextFn) => any
  */
 export type ParsedGlobalMiddleware = {
   handle: (
-    resolver: ContainerResolver,
+    resolver: ContainerResolver<any>,
     ...args: [ctx: HttpContext, next: NextFn, params?: any]
   ) => any
 }
diff --git a/src/types/route.ts b/src/types/route.ts
@@ -36,7 +36,7 @@ export type StoreRouteHandler =
   | {
       name: string
       handle: (
-        resolver: ContainerResolver,
+        resolver: ContainerResolver<any>,
         ...args: [ctx: HttpContext, ...injections: any[]]
       ) => any
     }
@@ -56,7 +56,7 @@ export type StoreRouteNode = {
    * The execute function to execute the route middleware
    * and the handler
    */
-  execute: (route: StoreRouteNode, resolver: ContainerResolver, ctx: HttpContext) => any
+  execute: (route: StoreRouteNode, resolver: ContainerResolver<any>, ctx: HttpContext) => any
 
   /**
    * A unique name for the route
diff --git a/test_factories/encryption.ts b/test_factories/encryption.ts
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import Encryption from '@adonisjs/encryption'
+import { Encryption } from '@adonisjs/encryption'
 import { EncryptionOptions } from '@adonisjs/encryption/types'
 
 /**
diff --git a/test_factories/request.ts b/test_factories/request.ts
@@ -9,7 +9,7 @@
 
 import { Socket } from 'node:net'
 import proxyAddr from 'proxy-addr'
-import type Encryption from '@adonisjs/encryption'
+import type { Encryption } from '@adonisjs/encryption'
 import { IncomingMessage, ServerResponse } from 'node:http'
 
 import { Request } from '../src/request.js'
diff --git a/test_factories/response.ts b/test_factories/response.ts
@@ -8,7 +8,7 @@
  */
 
 import { Socket } from 'node:net'
-import type Encryption from '@adonisjs/encryption'
+import type { Encryption } from '@adonisjs/encryption'
 import { IncomingMessage, ServerResponse } from 'node:http'
 
 import { RouterFactory } from './router.js'
diff --git a/test_factories/router.ts b/test_factories/router.ts
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import type Encryption from '@adonisjs/encryption'
+import type { Encryption } from '@adonisjs/encryption'
 import type { Application } from '@adonisjs/application'
 
 import { AppFactory } from './app.js'
@@ -19,7 +19,7 @@ import { MiddlewareStore } from '../src/middleware/store.js'
 import type { MiddlewareAsClass } from '../src/types/middleware.js'
 
 type FactoryParameters<NamedMiddleware extends Record<string, LazyImport<MiddlewareAsClass>>> = {
-  app: Application
+  app: Application<any, any, any>
   encryption: Encryption
   middlewareStore: MiddlewareStore<NamedMiddleware>
 }
diff --git a/test_factories/server_factory.ts b/test_factories/server_factory.ts
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import type Encryption from '@adonisjs/encryption'
+import type { Encryption } from '@adonisjs/encryption'
 import type { Application } from '@adonisjs/application'
 
 import { AppFactory } from './app.js'
@@ -20,7 +20,7 @@ import type { ServerConfig } from '../src/types/server.js'
 import type { MiddlewareAsClass } from '../src/types/middleware.js'
 
 type FactoryParameters = {
-  app: Application
+  app: Application<any, any, any>
   encryption: Encryption
   config: Partial<ServerConfig>
 }
