@tsed/platform-http 8.5.1 → 8.5.3

package/lib/esm/common/fn/adapter.js

@@ -1,13 +1,23 @@
-import { refValue } from "@tsed/di";
+import { GlobalProviders, injector, refValue } from "@tsed/di";
+import { PlatformAdapter } from "../services/PlatformAdapter.js";
 const ADAPTER = "platform.adapter";
 let globalAdapter;
-/**
- * Set the platform adapter
- */
-export function adapter(adapter) {
+export function adapter(adapter, imports = []) {
     const ref = refValue(ADAPTER);
     if (adapter) {
         globalAdapter ||= adapter;
+        imports?.forEach(({ token, useClass }) => {
+            const provider = GlobalProviders.get(token);
+            if (useClass && provider) {
+                provider.useClass = useClass;
+                injector().set(token, provider);
+            }
+        });
+        injector()
+            .addProvider(PlatformAdapter, {
+            useClass: adapter
+        })
+            .alias(PlatformAdapter, "PlatformAdapter");
     }
     ref.value ||= globalAdapter;
     return ref.value;

package/lib/esm/common/fn/adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../../src/common/fn/adapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAC,MAAM,UAAU,CAAC;AAIlC,MAAM,OAAO,GAAG,kBAAkB,CAAC;AAEnC,IAAI,aAAyC,CAAC;AAE9C;;GAEG;AACH,MAAM,UAAU,OAAO,CAAC,OAAoC;IAC1D,MAAM,GAAG,GAAG,QAAQ,CAA6B,OAAO,CAAC,CAAC;IAE1D,IAAI,OAAO,EAAE,CAAC;QACZ,aAAa,KAAK,OAAO,CAAC;IAC5B,CAAC;IAED,GAAG,CAAC,KAAK,KAAK,aAAa,CAAC;IAE5B,OAAO,GAAG,CAAC,KAAmC,CAAC;AACjD,CAAC"}
+{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../../src/common/fn/adapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAE,QAAQ,EAAgB,QAAQ,EAAC,MAAM,UAAU,CAAC;AAE3E,OAAO,EAAC,eAAe,EAAC,MAAM,gCAAgC,CAAC;AAE/D,MAAM,OAAO,GAAG,kBAAkB,CAAC;AAEnC,IAAI,aAAyC,CAAC;AAU9C,MAAM,UAAU,OAAO,CAAC,OAAoC,EAAE,UAA0B,EAAE;IACxF,MAAM,GAAG,GAAG,QAAQ,CAA6B,OAAO,CAAC,CAAC;IAE1D,IAAI,OAAO,EAAE,CAAC;QACZ,aAAa,KAAK,OAAO,CAAC;QAE1B,OAAO,EAAE,OAAO,CAAC,CAAC,EAAC,KAAK,EAAE,QAAQ,EAAC,EAAE,EAAE;YACrC,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC5C,IAAI,QAAQ,IAAI,QAAQ,EAAE,CAAC;gBACzB,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBAC7B,QAAQ,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAClC,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,QAAQ,EAAE;aACP,WAAW,CAAC,eAAe,EAAE;YAC5B,QAAQ,EAAE,OAAO;SAClB,CAAC;aACD,KAAK,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;IAC/C,CAAC;IAED,GAAG,CAAC,KAAK,KAAK,aAAa,CAAC;IAE5B,OAAO,GAAG,CAAC,KAAmC,CAAC;AACjD,CAAC"}

package/lib/esm/common/middlewares/PlatformMulterMiddleware.js

@@ -3,7 +3,7 @@ import { constant, inject, injectable, ProviderType } from "@tsed/di";
 import { BadRequest } from "@tsed/exceptions";
 import { Context } from "@tsed/platform-params";
 import { PlatformContext } from "../domain/PlatformContext.js";
-import { PlatformApplication } from "../services/PlatformApplication.js";
+import { PlatformAdapter } from "../services/PlatformAdapter.js";
 export class MulterException extends BadRequest {
     constructor(er) {
         super(er.message);
@@ -15,9 +15,6 @@ export class MulterException extends BadRequest {
  * @middleware
  */
 export class PlatformMulterMiddleware {
-    constructor() {
-        this.app = inject(PlatformApplication);
-    }
     async use(ctx) {
         try {
             const { fields, options = {} } = ctx.endpoint.get(PlatformMulterMiddleware);
@@ -29,7 +26,7 @@ export class PlatformMulterMiddleware {
             if (settings.storage) {
                 delete settings.dest;
             }
-            const multer = this.app.multer(settings);
+            const multer = inject(PlatformAdapter).multipart(settings);
             if (multer) {
                 const middleware = multer.fields(this.getFields({ fields }));
                 return await middleware(ctx.getRequest(), ctx.getResponse());

package/lib/esm/common/middlewares/PlatformMulterMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"PlatformMulterMiddleware.js","sourceRoot":"","sources":["../../../../src/common/middlewares/PlatformMulterMiddleware.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAC,MAAM,UAAU,CAAC;AACpE,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAC,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAI9C,OAAO,EAAC,eAAe,EAAC,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAC,mBAAmB,EAAC,MAAM,oCAAoC,CAAC;AAMvE,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAC7C,YAAY,EAAe;QACzB,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;QAClB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI,CAAC;IACtB,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,wBAAwB;IAArC;QACY,QAAG,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAkC9C,CAAC;IAhCO,AAAN,KAAK,CAAC,GAAG,CAAY,GAAoB;QACvC,IAAI,CAAC;YACH,MAAM,EAAC,MAAM,EAAE,OAAO,GAAG,EAAE,EAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;YAC1E,MAAM,QAAQ,GAA2B;gBACvC,GAAG,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC;gBACzB,GAAG,OAAO;aACX,CAAC;YAEF,0BAA0B;YAC1B,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACrB,OAAO,QAAQ,CAAC,IAAI,CAAC;YACvB,CAAC;YAED,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAEzC,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,UAAU,GAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAC,MAAM,EAAC,CAAC,CAAC,CAAC;gBAEhE,OAAO,MAAM,UAAU,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;YAC/D,CAAC;QACH,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACZ,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;gBACZ,MAAM,IAAI,eAAe,CAAC,EAAE,CAAC,CAAC;YAChC,CAAC;YAED,MAAM,EAAE,CAAC;QACX,CAAC;IACH,CAAC;IAES,SAAS,CAAC,IAAwB;QAC1C,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAC,IAAI,EAAE,QAAQ,EAAC,EAAE,EAAE,CAAC,CAAC,EAAC,IAAI,EAAE,QAAQ,EAAC,CAAC,CAAC,CAAC;IACnE,CAAC;CACF;AAhCO;IAAK,WAAA,OAAO,EAAE,CAAA;;qCAAM,eAAe;;mDA2BxC;AAOH,UAAU,CAAC,wBAAwB,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC"}
+{"version":3,"file":"PlatformMulterMiddleware.js","sourceRoot":"","sources":["../../../../src/common/middlewares/PlatformMulterMiddleware.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAC,MAAM,UAAU,CAAC;AACpE,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAC,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAI9C,OAAO,EAAC,eAAe,EAAC,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAC,eAAe,EAAC,MAAM,gCAAgC,CAAC;AAO/D,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAC7C,YAAY,EAAe;QACzB,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;QAClB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI,CAAC;IACtB,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,wBAAwB;IAC7B,AAAN,KAAK,CAAC,GAAG,CAAY,GAAoB;QACvC,IAAI,CAAC;YACH,MAAM,EAAC,MAAM,EAAE,OAAO,GAAG,EAAE,EAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;YAC1E,MAAM,QAAQ,GAA2B;gBACvC,GAAG,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC;gBACzB,GAAG,OAAO;aACX,CAAC;YAEF,0BAA0B;YAC1B,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACrB,OAAO,QAAQ,CAAC,IAAI,CAAC;YACvB,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAE3D,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,UAAU,GAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAC,MAAM,EAAC,CAAC,CAAC,CAAC;gBAEhE,OAAO,MAAM,UAAU,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;YAC/D,CAAC;QACH,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACZ,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;gBACZ,MAAM,IAAI,eAAe,CAAC,EAAE,CAAC,CAAC;YAChC,CAAC;YAED,MAAM,EAAE,CAAC;QACX,CAAC;IACH,CAAC;IAES,SAAS,CAAC,IAAwB;QAC1C,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAC,IAAI,EAAE,QAAQ,EAAC,EAAE,EAAE,CAAC,CAAC,EAAC,IAAI,EAAE,QAAQ,EAAC,CAAC,CAAC,CAAC;IACnE,CAAC;CACF;AAhCO;IAAK,WAAA,OAAO,EAAE,CAAA;;qCAAM,eAAe;;mDA2BxC;AAOH,UAAU,CAAC,wBAAwB,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC"}

package/lib/esm/common/services/PlatformAdapter.js

@@ -1,16 +1,21 @@
-import { injectable } from "@tsed/di";
+import { configuration, constant, inject, injectable } from "@tsed/di";
+import { $on } from "@tsed/hooks";
 import { application } from "../fn/application.js";
 import { createHttpServer } from "../utils/createHttpServer.js";
 import { createHttpsServer } from "../utils/createHttpsServer.js";
+import { Platform } from "./Platform.js";
+import { PlatformApplication } from "./PlatformApplication.js";
+import { PlatformHandler } from "./PlatformHandler.js";
 export class PlatformAdapter {
     constructor() {
-        /**
-         * Load providers in top priority
-         */
-        this.providers = [];
-    }
-    get app() {
-        return application();
+        this.app = inject(PlatformApplication);
+        const platformApp = inject(PlatformApplication);
+        const { app, callback } = this.createApp();
+        platformApp.rawApp = app;
+        platformApp.rawCallback = callback;
+        $on("$afterInvoke", PlatformAdapter, () => {
+            configuration().set("PLATFORM_NAME", constant("PLATFORM_NAME") || this.NAME);
+        });
     }
     getServers() {
         const app = application();
@@ -32,5 +37,5 @@ export class PlatformAdapter {
         return handler;
     }
 }
-injectable(PlatformAdapter).alias("PlatformAdapter");
+injectable(PlatformAdapter).imports([PlatformApplication, Platform, PlatformHandler]).alias("PlatformAdapter");
 //# sourceMappingURL=PlatformAdapter.js.map

package/lib/esm/common/services/PlatformAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"PlatformAdapter.js","sourceRoot":"","sources":["../../../../src/common/services/PlatformAdapter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,UAAU,EAAe,MAAM,UAAU,CAAC;AAKlD,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AAIhE,MAAM,OAAgB,eAAe;IAArC;QAEE;;WAEG;QACH,cAAS,GAAmB,EAAE,CAAC;IAgEjC,CAAC;IA9DC,IAAI,GAAG;QACL,OAAO,WAAW,EAAE,CAAC;IACvB,CAAC;IAED,UAAU;QACR,MAAM,GAAG,GAAG,WAAW,EAAO,CAAC;QAC/B,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,EAAE,iBAAiB,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAU,CAAC;IACxG,CAAC;IAED,MAAM;QACJ,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,gBAAgB;QACd,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,eAAe;QACb,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAYD;;OAEG;IACH,UAAU,CAAC,OAAiB,EAAE,KAA8B;QAC1D,OAAO,OAAO,CAAC;IACjB,CAAC;CA0BF;AAMD,UAAU,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC"}
+{"version":3,"file":"PlatformAdapter.js","sourceRoot":"","sources":["../../../../src/common/services/PlatformAdapter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,aAAa,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAC,MAAM,UAAU,CAAC;AACrE,OAAO,EAAC,GAAG,EAAC,MAAM,aAAa,CAAC;AAKhC,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AACvC,OAAO,EAAC,mBAAmB,EAAC,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AAErD,MAAM,OAAgB,eAAe;IAKnC;QAFS,QAAG,GAAG,MAAM,CAA2B,mBAAmB,CAAC,CAAC;QAGnE,MAAM,WAAW,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;QAEhD,MAAM,EAAC,GAAG,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QACzC,WAAW,CAAC,MAAM,GAAG,GAAU,CAAC;QAChC,WAAW,CAAC,WAAW,GAAG,QAAQ,CAAC;QAEnC,GAAG,CAAC,cAAc,EAAE,eAAe,EAAE,GAAG,EAAE;YACxC,aAAa,EAAE,CAAC,GAAG,CAAC,eAAe,EAAE,QAAQ,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/E,CAAC,CAAC,CAAC;IACL,CAAC;IAED,UAAU;QACR,MAAM,GAAG,GAAG,WAAW,EAAO,CAAC;QAC/B,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,EAAE,iBAAiB,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAU,CAAC;IACxG,CAAC;IAED,MAAM;QACJ,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,gBAAgB;QACd,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,eAAe;QACb,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAYD;;OAEG;IACH,UAAU,CAAC,OAAiB,EAAE,KAA8B;QAC1D,OAAO,OAAO,CAAC;IACjB,CAAC;CA0BF;AAMD,UAAU,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,mBAAmB,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC"}

package/lib/esm/common/services/PlatformApplication.js

@@ -1,25 +1,15 @@
-import { inject, injectable, ProviderScope } from "@tsed/di";
+import { injectable, ProviderScope } from "@tsed/di";
 import { PlatformRouter } from "@tsed/platform-router";
-import { PlatformAdapter } from "./PlatformAdapter.js";
 /**
  * `PlatformApplication` is used to provide all routes collected by annotation `@Controller`.
  *
  * @platform
  */
 export class PlatformApplication extends PlatformRouter {
-    constructor() {
-        super();
-        this.adapter = inject((PlatformAdapter));
-        const { app, callback } = this.adapter.createApp();
-        this.rawApp = app;
-        this.rawCallback = callback;
-    }
+    rawCallback() { }
     getApp() {
         return this.rawApp;
     }
-    multer(options) {
-        return this.adapter.multipart(options);
-    }
     callback(req, res) {
         if (req && res) {
             return this.callback()(req, res);

package/lib/esm/common/services/PlatformApplication.js.map

@@ -1 +1 @@
-{"version":3,"file":"PlatformApplication.js","sourceRoot":"","sources":["../../../../src/common/services/PlatformApplication.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,MAAM,EAAE,UAAU,EAAE,aAAa,EAAC,MAAM,UAAU,CAAC;AAC3D,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AAGrD,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AASrD;;;;GAIG;AACH,MAAM,OAAO,mBAA4C,SAAQ,cAAc;IAM7E;QACE,KAAK,EAAE,CAAC;QANV,YAAO,GAAyB,MAAM,CAAC,CAAA,eAAoB,CAAA,CAAC,CAAC;QAQ3D,MAAM,EAAC,GAAG,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;QAEjD,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC;QAClB,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC;IAC9B,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,OAA+B;QACpC,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;IAID,QAAQ,CAAC,GAAqB,EAAE,GAAoB;QAClD,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;YACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACnC,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;IAC5B,CAAC;CACF;AAED,UAAU,CAAC,mBAAmB,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC"}
+{"version":3,"file":"PlatformApplication.js","sourceRoot":"","sources":["../../../../src/common/services/PlatformApplication.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAE,aAAa,EAAC,MAAM,UAAU,CAAC;AACnD,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AASrD;;;;GAIG;AACH,MAAM,OAAO,mBAA4C,SAAQ,cAAc;IAG7E,WAAW,KAAS,CAAC;IAErB,MAAM;QACJ,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAID,QAAQ,CAAC,GAAqB,EAAE,GAAoB;QAClD,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;YACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACnC,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;IAC5B,CAAC;CACF;AAED,UAAU,CAAC,mBAAmB,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC"}

package/lib/esm/common/services/PlatformHandler.js

@@ -6,7 +6,7 @@ import { PlatformResponseFilter } from "@tsed/platform-response-filter";
 import { PlatformHandlerMetadata, PlatformHandlerType, PlatformRouters, useResponseHandler } from "@tsed/platform-router";
 import { AnyToPromiseWithCtx } from "../domain/AnyToPromiseWithCtx.js";
 import { setResponseHeaders } from "../utils/setResponseHeaders.js";
-import { PlatformApplication } from "./PlatformApplication.js";
+import { PlatformAdapter } from "./PlatformAdapter.js";
 import { PlatformMiddlewaresChain } from "./PlatformMiddlewaresChain.js";
 /**
  * Platform Handler abstraction layer. Wrap original class method to a pure platform handler (Express, Koa, etc...).
@@ -17,7 +17,6 @@ export class PlatformHandler {
         this.responseFilter = inject(PlatformResponseFilter);
         this.platformParams = inject(PlatformParams);
         this.platformExceptions = inject(PlatformExceptions);
-        this.platformApplication = inject(PlatformApplication);
         this.platformMiddlewaresChain = inject(PlatformMiddlewaresChain);
         this.platformRouters = inject(PlatformRouters);
         // configure the router module
@@ -29,7 +28,7 @@ export class PlatformHandler {
         })
             .on("alterHandler", (handlerMetadata) => {
             const handler = handlerMetadata.isInjectable() ? this.createHandler(handlerMetadata) : handlerMetadata.handler;
-            return this.platformApplication.adapter.mapHandler(handler, handlerMetadata);
+            return inject(PlatformAdapter).mapHandler(handler, handlerMetadata);
         });
     }
     createHandler(handlerMetadata) {

package/lib/esm/common/services/PlatformHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"PlatformHandler.js","sourceRoot":"","sources":["../../../../src/common/services/PlatformHandler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PlatformHandler.js","sourceRoot":"","sources":["../../../../src/common/services/PlatformHandler.ts"],"names":[],"mappings":"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"}

package/lib/esm/common/services/PlatformMiddlewaresChain.js

@@ -1,14 +1,12 @@
 import { isClass } from "@tsed/core";
-import { constant, inject, injectable } from "@tsed/di";
+import { constant, injectable } from "@tsed/di";
 import { ParamTypes } from "@tsed/platform-params";
 import { JsonEntityStore } from "@tsed/schema";
 import { PlatformAcceptMimesMiddleware } from "../middlewares/PlatformAcceptMimesMiddleware.js";
 import { PlatformMulterMiddleware } from "../middlewares/PlatformMulterMiddleware.js";
-import { PlatformAdapter } from "./PlatformAdapter.js";
 export class PlatformMiddlewaresChain {
     constructor() {
         this.acceptMimes = constant("acceptMimes", []);
-        this.adapter = inject(PlatformAdapter);
     }
     get(handlers, operationRoute) {
         const { ACCEPT_MIMES, FILE } = this.getParamTypes(handlers, operationRoute);

package/lib/esm/common/services/PlatformMiddlewaresChain.js.map

@@ -1 +1 @@
-{"version":3,"file":"PlatformMiddlewaresChain.js","sourceRoot":"","sources":["../../../../src/common/services/PlatformMiddlewaresChain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,YAAY,CAAC;AACnC,OAAO,EAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAC,MAAM,UAAU,CAAC;AACtD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAC,eAAe,EAAqB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAC,6BAA6B,EAAC,MAAM,iDAAiD,CAAC;AAC9F,OAAO,EAAC,wBAAwB,EAAC,MAAM,4CAA4C,CAAC;AACpF,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AAErD,MAAM,OAAO,wBAAwB;IAArC;QACY,gBAAW,GAAG,QAAQ,CAAW,aAAa,EAAE,EAAE,CAAC,CAAC;QACpD,YAAO,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;IAwC9C,CAAC;IAtCC,GAAG,CAAC,QAAkC,EAAE,cAAkC;QACxE,MAAM,EAAC,YAAY,EAAE,IAAI,EAAC,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAE1E,OAAO;YACL,GAAG,QAAQ;YACX,MAAM,EAAE,CAAC,YAAY,IAAI,6BAA6B,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,IAAI,IAAI,wBAAwB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAU;SACvI,CAAC;IACJ,CAAC;IAES,cAAc,CAAC,cAAkC;QACzD,OAAO,cAAc,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;IAC/E,CAAC;IAES,aAAa,CAAC,WAAqC,EAAE,cAAkC;QAC/F,OAAO,WAAW,CAAC,MAAM;aACtB,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC;aACzB,MAAM,CAAC,OAAO,CAAC;aACf,MAAM,CACL,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE;YACpB,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAExD,IAAI,MAAM,CAAC,aAAa,KAAK,QAAQ,EAAE,CAAC;gBACtC,MAAM,EAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAC,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC;gBACtD,UAAU,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,IAAI,IAAI,CAAC;gBAC1C,UAAU,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,IAAI,QAAQ,CAAC;gBACtD,UAAU,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,IAAI,IAAI,CAAC;YAC5C,CAAC;YAED,OAAO,UAAU,CAAC;QACpB,CAAC,EACD;YACE,YAAY,EAAE,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC;YACjD,IAAI,EAAE,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC;YAC1C,QAAQ,EAAE,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC;YACjD,IAAI,EAAE,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,cAAc,CAAC,MAAM,KAAK,KAAK;SAC7E,CACF,CAAC;IACN,CAAC;CACF;AAED,UAAU,CAAC,wBAAwB,CAAC,CAAC"}
+{"version":3,"file":"PlatformMiddlewaresChain.js","sourceRoot":"","sources":["../../../../src/common/services/PlatformMiddlewaresChain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,YAAY,CAAC;AACnC,OAAO,EAAC,QAAQ,EAAE,UAAU,EAAC,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAC,eAAe,EAAqB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAC,6BAA6B,EAAC,MAAM,iDAAiD,CAAC;AAC9F,OAAO,EAAC,wBAAwB,EAAC,MAAM,4CAA4C,CAAC;AAEpF,MAAM,OAAO,wBAAwB;IAArC;QACY,gBAAW,GAAG,QAAQ,CAAW,aAAa,EAAE,EAAE,CAAC,CAAC;IAwChE,CAAC;IAtCC,GAAG,CAAC,QAAkC,EAAE,cAAkC;QACxE,MAAM,EAAC,YAAY,EAAE,IAAI,EAAC,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAE1E,OAAO;YACL,GAAG,QAAQ;YACX,MAAM,EAAE,CAAC,YAAY,IAAI,6BAA6B,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,IAAI,IAAI,wBAAwB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAU;SACvI,CAAC;IACJ,CAAC;IAES,cAAc,CAAC,cAAkC;QACzD,OAAO,cAAc,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;IAC/E,CAAC;IAES,aAAa,CAAC,WAAqC,EAAE,cAAkC;QAC/F,OAAO,WAAW,CAAC,MAAM;aACtB,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC;aACzB,MAAM,CAAC,OAAO,CAAC;aACf,MAAM,CACL,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE;YACpB,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAExD,IAAI,MAAM,CAAC,aAAa,KAAK,QAAQ,EAAE,CAAC;gBACtC,MAAM,EAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAC,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC;gBACtD,UAAU,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,IAAI,IAAI,CAAC;gBAC1C,UAAU,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,IAAI,QAAQ,CAAC;gBACtD,UAAU,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,IAAI,IAAI,CAAC;YAC5C,CAAC;YAED,OAAO,UAAU,CAAC;QACpB,CAAC,EACD;YACE,YAAY,EAAE,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC;YACjD,IAAI,EAAE,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC;YAC1C,QAAQ,EAAE,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC;YACjD,IAAI,EAAE,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,cAAc,CAAC,MAAM,KAAK,KAAK;SAC7E,CACF,CAAC;IACN,CAAC;CACF;AAED,UAAU,CAAC,wBAAwB,CAAC,CAAC"}

package/lib/esm/common/utils/createInjector.js

@@ -1,22 +1,9 @@
-import { toMap } from "@tsed/core";
 import { injector, setLoggerConfiguration } from "@tsed/di";
 import { $log } from "@tsed/logger";
 import { PlatformConfiguration } from "../config/services/PlatformConfiguration.js";
 import { adapter as $adapter } from "../fn/adapter.js";
-import { Platform } from "../services/Platform.js";
 import { PlatformAdapter } from "../services/PlatformAdapter.js";
-import { PlatformApplication } from "../services/PlatformApplication.js";
-import { PlatformHandler } from "../services/PlatformHandler.js";
-import { PlatformRequest } from "../services/PlatformRequest.js";
-import { PlatformResponse } from "../services/PlatformResponse.js";
 $log.name = "TSED";
-const DEFAULT_PROVIDERS = [
-    { token: PlatformHandler },
-    { token: PlatformResponse },
-    { token: PlatformRequest },
-    { token: PlatformApplication },
-    { token: Platform }
-];
 export function createInjector(settings) {
     const inj = injector();
     inj.addProvider(PlatformConfiguration);
@@ -24,21 +11,8 @@ export function createInjector(settings) {
     inj.logger = $log;
     inj.settings.set(settings);
     setLoggerConfiguration();
-    const adapterToken = $adapter(settings.adapter);
-    inj
-        .addProvider(PlatformAdapter, {
-        useClass: adapterToken
-    })
-        .alias(PlatformAdapter, "PlatformAdapter");
-    const adapter = inj.invoke(PlatformAdapter);
-    inj.settings.set("PLATFORM_NAME", settings.PLATFORM_NAME || adapter.NAME);
-    const instance = inj.get(PlatformAdapter);
-    toMap(instance.providers, "token").forEach((provider, token) => {
-        inj.addProvider(token, provider);
-    });
-    DEFAULT_PROVIDERS.filter((provider) => ![PlatformResponse, PlatformRequest].includes(provider.token)).map((provider) => {
-        return inj.get(provider.token);
-    });
+    $adapter(settings.adapter);
+    inj.invoke(PlatformAdapter);
     return inj;
 }
 //# sourceMappingURL=createInjector.js.map

package/lib/esm/common/utils/createInjector.js.map

@@ -1 +1 @@
-{"version":3,"file":"createInjector.js","sourceRoot":"","sources":["../../../../src/common/utils/createInjector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,YAAY,CAAC;AACjC,OAAO,EAAC,QAAQ,EAAgB,sBAAsB,EAAC,MAAM,UAAU,CAAC;AACxE,OAAO,EAAC,IAAI,EAAC,MAAM,cAAc,CAAC;AAElC,OAAO,EAAC,qBAAqB,EAAC,MAAM,6CAA6C,CAAC;AAClF,OAAO,EAAC,OAAO,IAAI,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAC,QAAQ,EAAC,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAC,eAAe,EAAC,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAC,mBAAmB,EAAC,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAC,eAAe,EAAC,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAC,eAAe,EAAC,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAC,gBAAgB,EAAC,MAAM,iCAAiC,CAAC;AAEjE,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC;AAEnB,MAAM,iBAAiB,GAAG;IACxB,EAAC,KAAK,EAAE,eAAe,EAAC;IACxB,EAAC,KAAK,EAAE,gBAAgB,EAAC;IACzB,EAAC,KAAK,EAAE,eAAe,EAAC;IACxB,EAAC,KAAK,EAAE,mBAAmB,EAAC;IAC5B,EAAC,KAAK,EAAE,QAAQ,EAAC;CAClB,CAAC;AAEF,MAAM,UAAU,cAAc,CAAC,QAAqC;IAClE,MAAM,GAAG,GAAG,QAAQ,EAAE,CAAC;IACvB,GAAG,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;IAEvC,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;IACjD,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC;IAClB,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAE3B,sBAAsB,EAAE,CAAC;IAEzB,MAAM,YAAY,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAEhD,GAAG;SACA,WAAW,CAAC,eAAe,EAAE;QAC5B,QAAQ,EAAE,YAAY;KACvB,CAAC;SACD,KAAK,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;IAE7C,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAE5C,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,eAAe,EAAE,QAAQ,CAAC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1E,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAkB,eAAe,CAAE,CAAC;IAE5D,KAAK,CAAoB,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE;QAChF,GAAG,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,iBAAiB,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAc,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC9H,OAAO,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"createInjector.js","sourceRoot":"","sources":["../../../../src/common/utils/createInjector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,sBAAsB,EAAC,MAAM,UAAU,CAAC;AAC1D,OAAO,EAAC,IAAI,EAAC,MAAM,cAAc,CAAC;AAElC,OAAO,EAAC,qBAAqB,EAAC,MAAM,6CAA6C,CAAC;AAClF,OAAO,EAAC,OAAO,IAAI,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAC,eAAe,EAAC,MAAM,gCAAgC,CAAC;AAE/D,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC;AAEnB,MAAM,UAAU,cAAc,CAAC,QAAqC;IAClE,MAAM,GAAG,GAAG,QAAQ,EAAE,CAAC;IACvB,GAAG,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;IAEvC,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;IACjD,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC;IAClB,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAE3B,sBAAsB,EAAE,CAAC;IAEzB,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAE3B,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAE5B,OAAO,GAAG,CAAC;AACb,CAAC"}

package/lib/types/common/fn/adapter.d.ts

@@ -1,6 +1,11 @@
 import { Type } from "@tsed/core";
-import type { PlatformAdapter } from "../services/PlatformAdapter.js";
+import { ProviderOpts } from "@tsed/di";
+import { PlatformAdapter } from "../services/PlatformAdapter.js";
 /**
- * Set the platform adapter
+ * Set the platform adapter token and his dependencies
  */
-export declare function adapter(adapter?: Type<PlatformAdapter<any>>): Type<PlatformAdapter<any>>;
+export declare function adapter(adapter: Type<PlatformAdapter<any>>, imports?: ProviderOpts[]): Type<PlatformAdapter<any>>;
+/**
+ * Get the platform adapter token
+ */
+export declare function adapter(): Type<PlatformAdapter<any>>;

package/lib/types/common/middlewares/PlatformMulterMiddleware.d.ts

@@ -3,7 +3,6 @@ import { MiddlewareMethods } from "@tsed/platform-middlewares";
 import type { MulterError } from "multer";
 import { PlatformMulterField } from "../config/interfaces/PlatformMulterSettings.js";
 import { PlatformContext } from "../domain/PlatformContext.js";
-import { PlatformApplication } from "../services/PlatformApplication.js";
 export interface MulterInputOptions {
     fields: PlatformMulterField[];
 }
@@ -14,7 +13,6 @@ export declare class MulterException extends BadRequest {
  * @middleware
  */
 export declare class PlatformMulterMiddleware implements MiddlewareMethods {
-    protected app: PlatformApplication<any>;
     use(ctx: PlatformContext): Promise<any>;
     protected getFields(conf: MulterInputOptions): {
         name: string;

package/lib/types/common/services/PlatformAdapter.d.ts

@@ -1,19 +1,15 @@
 /// <reference types="node" resolution-mode="require"/>
 import { IncomingMessage, ServerResponse } from "node:http";
 import { Type } from "@tsed/core";
-import { ProviderOpts } from "@tsed/di";
 import { PlatformHandlerMetadata, PlatformLayer } from "@tsed/platform-router";
 import { PlatformMulter, PlatformMulterSettings } from "../config/interfaces/PlatformMulterSettings.js";
 import { PlatformStaticsOptions } from "../config/interfaces/PlatformStaticsSettings.js";
 import { CreateServerReturn } from "../utils/createServer.js";
-import type { PlatformApplication } from "./PlatformApplication.js";
+import { PlatformApplication } from "./PlatformApplication.js";
 export declare abstract class PlatformAdapter<App = TsED.Application> {
     abstract readonly NAME: string;
-    /**
-     * Load providers in top priority
-     */
-    providers: ProviderOpts[];
-    get app(): PlatformApplication<App>;
+    readonly app: PlatformApplication<App>;
+    constructor();
     getServers(): CreateServerReturn[];
     onInit(): Promise<void> | void;
     beforeLoadRoutes(): Promise<void> | void;

package/lib/types/common/services/PlatformApplication.d.ts

@@ -1,9 +1,6 @@
-/// <reference types="multer" />
 /// <reference types="node" resolution-mode="require"/>
 import { IncomingMessage, ServerResponse } from "node:http";
 import { PlatformRouter } from "@tsed/platform-router";
-import { PlatformMulterSettings } from "../config/interfaces/PlatformMulterSettings.js";
-import { PlatformAdapter } from "./PlatformAdapter.js";
 declare global {
     namespace TsED {
         interface Application {
@@ -16,12 +13,9 @@ declare global {
  * @platform
  */
 export declare class PlatformApplication<App = TsED.Application> extends PlatformRouter {
-    adapter: PlatformAdapter<App>;
     rawApp: App;
-    rawCallback: () => any;
-    constructor();
+    rawCallback(): any;
     getApp(): App;
-    multer(options: PlatformMulterSettings): import("multer").Multer;
     callback(): (req: IncomingMessage, res: ServerResponse) => any;
     callback(req: IncomingMessage, res: ServerResponse): any;
 }

package/lib/types/common/services/PlatformHandler.d.ts

@@ -5,7 +5,6 @@ import { PlatformParams, PlatformParamsCallback } from "@tsed/platform-params";
 import { PlatformResponseFilter } from "@tsed/platform-response-filter";
 import { PlatformHandlerMetadata, PlatformRouters } from "@tsed/platform-router";
 import { PlatformContext } from "../domain/PlatformContext.js";
-import { PlatformApplication } from "./PlatformApplication.js";
 import { PlatformMiddlewaresChain } from "./PlatformMiddlewaresChain.js";
 /**
  * Platform Handler abstraction layer. Wrap original class method to a pure platform handler (Express, Koa, etc...).
@@ -15,7 +14,6 @@ export declare class PlatformHandler {
     protected responseFilter: PlatformResponseFilter;
     protected platformParams: PlatformParams;
     protected platformExceptions: PlatformExceptions;
-    protected platformApplication: PlatformApplication<any>;
     protected platformMiddlewaresChain: PlatformMiddlewaresChain;
     protected platformRouters: PlatformRouters;
     constructor();

package/lib/types/common/services/PlatformMiddlewaresChain.d.ts

@@ -1,9 +1,7 @@
 import { AlterEndpointHandlersArg } from "@tsed/platform-router";
 import { JsonOperationRoute } from "@tsed/schema";
-import { PlatformAdapter } from "./PlatformAdapter.js";
 export declare class PlatformMiddlewaresChain {
     protected acceptMimes: string[];
-    protected adapter: PlatformAdapter<any>;
     get(handlers: AlterEndpointHandlersArg, operationRoute: JsonOperationRoute): AlterEndpointHandlersArg;
     protected hasAcceptMimes(operationRoute: JsonOperationRoute): number;
     protected getParamTypes(middlewares: AlterEndpointHandlersArg, operationRoute: JsonOperationRoute): {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tsed/platform-http",
   "description": "A TypeScript Framework on top of Express",
   "type": "module",
-  "version": "8.5.1",
+  "version": "8.5.3",
   "source": "./src/common/index.ts",
   "main": "./lib/esm/common/index.js",
   "module": "./lib/esm/common/index.js",
@@ -70,28 +70,28 @@
     }
   ],
   "dependencies": {
-    "@tsed/core": "8.5.1",
-    "@tsed/di": "8.5.1",
-    "@tsed/exceptions": "8.5.1",
-    "@tsed/hooks": "8.5.1",
-    "@tsed/json-mapper": "8.5.1",
+    "@tsed/core": "8.5.3",
+    "@tsed/di": "8.5.3",
+    "@tsed/exceptions": "8.5.3",
+    "@tsed/hooks": "8.5.3",
+    "@tsed/json-mapper": "8.5.3",
     "@tsed/logger": "^7.0.1",
-    "@tsed/platform-exceptions": "8.5.1",
-    "@tsed/platform-middlewares": "8.5.1",
-    "@tsed/platform-params": "8.5.1",
-    "@tsed/platform-response-filter": "8.5.1",
-    "@tsed/platform-router": "8.5.1",
-    "@tsed/platform-views": "8.5.1",
-    "@tsed/schema": "8.5.1",
+    "@tsed/platform-exceptions": "8.5.3",
+    "@tsed/platform-middlewares": "8.5.3",
+    "@tsed/platform-params": "8.5.3",
+    "@tsed/platform-response-filter": "8.5.3",
+    "@tsed/platform-router": "8.5.3",
+    "@tsed/platform-views": "8.5.3",
+    "@tsed/schema": "8.5.3",
     "@types/json-schema": "7.0.15",
     "accepts": "^1.3.8",
     "tslib": "2.7.0",
     "uuid": "10.0.0"
   },
   "devDependencies": {
-    "@tsed/barrels": "8.5.1",
-    "@tsed/engines": "8.5.1",
-    "@tsed/typescript": "8.5.1",
+    "@tsed/barrels": "8.5.3",
+    "@tsed/engines": "8.5.3",
+    "@tsed/typescript": "8.5.3",
     "cross-env": "7.0.3",
     "eslint": "9.12.0",
     "typescript": "5.4.5",

package/src/common/fn/adapter.ts

@@ -1,20 +1,39 @@
 import {Type} from "@tsed/core";
-import {refValue} from "@tsed/di";
+import {GlobalProviders, injector, ProviderOpts, refValue} from "@tsed/di";
 
-import type {PlatformAdapter} from "../services/PlatformAdapter.js";
+import {PlatformAdapter} from "../services/PlatformAdapter.js";
 
 const ADAPTER = "platform.adapter";
 
 let globalAdapter: Type<PlatformAdapter<any>>;
 
 /**
- * Set the platform adapter
+ * Set the platform adapter token and his dependencies
  */
-export function adapter(adapter?: Type<PlatformAdapter<any>>): Type<PlatformAdapter<any>> {
+export function adapter(adapter: Type<PlatformAdapter<any>>, imports?: ProviderOpts[]): Type<PlatformAdapter<any>>;
+/**
+ * Get the platform adapter token
+ */
+export function adapter(): Type<PlatformAdapter<any>>;
+export function adapter(adapter?: Type<PlatformAdapter<any>>, imports: ProviderOpts[] = []): Type<PlatformAdapter<any>> {
   const ref = refValue<Type<PlatformAdapter<any>>>(ADAPTER);
 
   if (adapter) {
     globalAdapter ||= adapter;
+
+    imports?.forEach(({token, useClass}) => {
+      const provider = GlobalProviders.get(token);
+      if (useClass && provider) {
+        provider.useClass = useClass;
+        injector().set(token, provider);
+      }
+    });
+
+    injector()
+      .addProvider(PlatformAdapter, {
+        useClass: adapter
+      })
+      .alias(PlatformAdapter, "PlatformAdapter");
   }
 
   ref.value ||= globalAdapter;

package/src/common/middlewares/PlatformMulterMiddleware.spec.ts

@@ -1,4 +1,5 @@
 import {catchAsyncError} from "@tsed/core";
+import {inject} from "@tsed/di";
 import {Exception} from "@tsed/exceptions";
 import {MulterError} from "multer";
 
@@ -6,6 +7,7 @@ import {PlatformTest} from "../../testing/PlatformTest.js";
 import {MulterOptions} from "../decorators/multer/multerOptions.js";
 import {MultipartFile} from "../decorators/multer/multipartFile.js";
 import {EndpointMetadata} from "../domain/EndpointMetadata.js";
+import {PlatformAdapter} from "../services/PlatformAdapter.js";
 import {PlatformApplication} from "../services/PlatformApplication.js";
 import {PlatformMulterMiddleware} from "./PlatformMulterMiddleware.js";
 
@@ -19,20 +21,16 @@ async function build(options = {}) {
   const multer = {
     fields: vi.fn().mockReturnValue(multerMiddleware)
   };
-  const app = {
-    multer: vi.fn().mockReturnValue(multer)
-  };
 
-  const middleware = await PlatformTest.invoke<PlatformMulterMiddleware>(PlatformMulterMiddleware, [
-    {
-      token: PlatformApplication,
-      use: app
-    }
-  ]);
+  const middleware = inject(PlatformMulterMiddleware);
   const ctx: any = PlatformTest.createRequestContext();
   ctx.endpoint = EndpointMetadata.get(Test, "upload");
 
-  return {middleware, ctx, multer, app, multerMiddleware};
+  const adapter = inject(PlatformAdapter);
+
+  vi.spyOn(adapter, "multipart").mockReturnValue(multer as any);
+
+  return {middleware, ctx, multer, adapter, multerMiddleware};
 }
 
 describe("PlatformMulterMiddleware", () => {
@@ -45,24 +43,24 @@ describe("PlatformMulterMiddleware", () => {
   );
   afterEach(() => PlatformTest.reset());
   it("should create middleware", async () => {
-    const {middleware, ctx, multer, app, multerMiddleware} = await build({});
+    const {middleware, ctx, multer, adapter, multerMiddleware} = await build({});
 
     await middleware.use(ctx);
 
-    expect(app.multer).toHaveBeenCalledWith({
+    expect(adapter.multipart).toHaveBeenCalledWith({
       dest: "/dest"
     });
     expect(multer.fields).toHaveBeenCalledWith([{maxCount: undefined, name: "file1"}]);
     expect(multerMiddleware).toHaveBeenCalledWith(ctx.request.raw, ctx.response.raw);
   });
   it("should create middleware with storage", async () => {
-    const {middleware, ctx, multer, app, multerMiddleware} = await build({
+    const {middleware, ctx, multer, adapter, multerMiddleware} = await build({
       storage: "storage"
     });
 
     await middleware.use(ctx);
 
-    expect(app.multer).toHaveBeenCalledWith({
+    expect(adapter.multipart).toHaveBeenCalledWith({
       storage: "storage"
     });
     expect(multer.fields).toHaveBeenCalledWith([{maxCount: undefined, name: "file1"}]);

package/src/common/middlewares/PlatformMulterMiddleware.ts

@@ -6,6 +6,7 @@ import type {MulterError} from "multer";
 
 import {PlatformMulterField, PlatformMulterSettings} from "../config/interfaces/PlatformMulterSettings.js";
 import {PlatformContext} from "../domain/PlatformContext.js";
+import {PlatformAdapter} from "../services/PlatformAdapter.js";
 import {PlatformApplication} from "../services/PlatformApplication.js";
 
 export interface MulterInputOptions {
@@ -24,8 +25,6 @@ export class MulterException extends BadRequest {
  * @middleware
  */
 export class PlatformMulterMiddleware implements MiddlewareMethods {
-  protected app = inject(PlatformApplication);
-
   async use(@Context() ctx: PlatformContext) {
     try {
       const {fields, options = {}} = ctx.endpoint.get(PlatformMulterMiddleware);
@@ -39,7 +38,7 @@ export class PlatformMulterMiddleware implements MiddlewareMethods {
         delete settings.dest;
       }
 
-      const multer = this.app.multer(settings);
+      const multer = inject(PlatformAdapter).multipart(settings);
 
       if (multer) {
         const middleware: any = multer.fields(this.getFields({fields}));

package/src/common/services/PlatformAdapter.ts

@@ -1,7 +1,8 @@
 import {IncomingMessage, ServerResponse} from "node:http";
 
 import {Type} from "@tsed/core";
-import {injectable, ProviderOpts} from "@tsed/di";
+import {configuration, constant, inject, injectable} from "@tsed/di";
+import {$on} from "@tsed/hooks";
 import {PlatformHandlerMetadata, PlatformLayer} from "@tsed/platform-router";
 
 import {PlatformMulter, PlatformMulterSettings} from "../config/interfaces/PlatformMulterSettings.js";
@@ -10,17 +11,25 @@ import {application} from "../fn/application.js";
 import {createHttpServer} from "../utils/createHttpServer.js";
 import {createHttpsServer} from "../utils/createHttpsServer.js";
 import {CreateServerReturn} from "../utils/createServer.js";
-import type {PlatformApplication} from "./PlatformApplication.js";
+import {Platform} from "./Platform.js";
+import {PlatformApplication} from "./PlatformApplication.js";
+import {PlatformHandler} from "./PlatformHandler.js";
 
 export abstract class PlatformAdapter<App = TsED.Application> {
   abstract readonly NAME: string;
-  /**
-   * Load providers in top priority
-   */
-  providers: ProviderOpts[] = [];
 
-  get app(): PlatformApplication<App> {
-    return application();
+  readonly app = inject<PlatformApplication<App>>(PlatformApplication);
+
+  constructor() {
+    const platformApp = inject(PlatformApplication);
+
+    const {app, callback} = this.createApp();
+    platformApp.rawApp = app as any;
+    platformApp.rawCallback = callback;
+
+    $on("$afterInvoke", PlatformAdapter, () => {
+      configuration().set("PLATFORM_NAME", constant("PLATFORM_NAME") || this.NAME);
+    });
   }
 
   getServers(): CreateServerReturn[] {
@@ -87,4 +96,4 @@ export interface PlatformBuilderSettings<App = TsED.Application> extends Partial
   adapter?: Type<PlatformAdapter<App>>;
 }
 
-injectable(PlatformAdapter).alias("PlatformAdapter");
+injectable(PlatformAdapter).imports([PlatformApplication, Platform, PlatformHandler]).alias("PlatformAdapter");

package/src/common/services/PlatformApplication.spec.ts

@@ -33,7 +33,6 @@ async function getPlatformApp() {
   ]);
   configuration().logger = {};
   platformApp.rawApp = createDriver() as any;
-  vi.spyOn(platformApp, "multer").mockReturnValue({} as never);
 
   return {platformApp, platformHandler};
 }
@@ -63,17 +62,6 @@ describe("PlatformApplication", () => {
       platformApp.statics("/", {root: "/root"});
     });
   });
-  describe("multer()", () => {
-    it("should call statics", async () => {
-      // GIVEN
-      const {platformApp} = await getPlatformApp();
-
-      vi.spyOn(console, "warn");
-
-      // WHEN
-      platformApp.multer({});
-    });
-  });
 
   describe("callback()", () => {
     it("should return the callback", async () => {

package/src/common/services/PlatformApplication.ts

@@ -1,11 +1,8 @@
 import {IncomingMessage, ServerResponse} from "node:http";
 
-import {inject, injectable, ProviderScope} from "@tsed/di";
+import {injectable, ProviderScope} from "@tsed/di";
 import {PlatformRouter} from "@tsed/platform-router";
 
-import {PlatformMulterSettings} from "../config/interfaces/PlatformMulterSettings.js";
-import {PlatformAdapter} from "./PlatformAdapter.js";
-
 declare global {
   namespace TsED {
     // @ts-ignore
@@ -19,28 +16,14 @@ declare global {
  * @platform
  */
 export class PlatformApplication<App = TsED.Application> extends PlatformRouter {
-  adapter: PlatformAdapter<App> = inject(PlatformAdapter<App>);
-
   rawApp: App;
-  rawCallback: () => any;
 
-  constructor() {
-    super();
-
-    const {app, callback} = this.adapter.createApp();
-
-    this.rawApp = app;
-    this.rawCallback = callback;
-  }
+  rawCallback(): any {}
 
   getApp(): App {
     return this.rawApp;
   }
 
-  multer(options: PlatformMulterSettings) {
-    return this.adapter.multipart(options);
-  }
-
   callback(): (req: IncomingMessage, res: ServerResponse) => any;
   callback(req: IncomingMessage, res: ServerResponse): any;
   callback(req?: IncomingMessage, res?: ServerResponse) {

package/src/common/services/PlatformHandler.ts

@@ -15,7 +15,7 @@ import {JsonOperationRoute} from "@tsed/schema";
 import {AnyToPromiseWithCtx} from "../domain/AnyToPromiseWithCtx.js";
 import {PlatformContext} from "../domain/PlatformContext.js";
 import {setResponseHeaders} from "../utils/setResponseHeaders.js";
-import {PlatformApplication} from "./PlatformApplication.js";
+import {PlatformAdapter} from "./PlatformAdapter.js";
 import {PlatformMiddlewaresChain} from "./PlatformMiddlewaresChain.js";
 
 /**
@@ -26,7 +26,6 @@ export class PlatformHandler {
   protected responseFilter = inject(PlatformResponseFilter);
   protected platformParams = inject(PlatformParams);
   protected platformExceptions = inject(PlatformExceptions);
-  protected platformApplication = inject(PlatformApplication);
   protected platformMiddlewaresChain = inject(PlatformMiddlewaresChain);
   protected platformRouters = inject(PlatformRouters);
 
@@ -43,7 +42,7 @@ export class PlatformHandler {
       .on("alterHandler", (handlerMetadata: PlatformHandlerMetadata) => {
         const handler = handlerMetadata.isInjectable() ? this.createHandler(handlerMetadata) : handlerMetadata.handler;
 
-        return this.platformApplication.adapter.mapHandler(handler, handlerMetadata);
+        return inject(PlatformAdapter).mapHandler(handler, handlerMetadata);
       });
   }
 

package/src/common/services/PlatformMiddlewaresChain.ts

@@ -1,16 +1,14 @@
 import {isClass} from "@tsed/core";
-import {constant, inject, injectable} from "@tsed/di";
+import {constant, injectable} from "@tsed/di";
 import {ParamTypes} from "@tsed/platform-params";
 import {AlterEndpointHandlersArg} from "@tsed/platform-router";
 import {JsonEntityStore, JsonOperationRoute} from "@tsed/schema";
 
 import {PlatformAcceptMimesMiddleware} from "../middlewares/PlatformAcceptMimesMiddleware.js";
 import {PlatformMulterMiddleware} from "../middlewares/PlatformMulterMiddleware.js";
-import {PlatformAdapter} from "./PlatformAdapter.js";
 
 export class PlatformMiddlewaresChain {
   protected acceptMimes = constant<string[]>("acceptMimes", []);
-  protected adapter = inject(PlatformAdapter);
 
   get(handlers: AlterEndpointHandlersArg, operationRoute: JsonOperationRoute): AlterEndpointHandlersArg {
     const {ACCEPT_MIMES, FILE} = this.getParamTypes(handlers, operationRoute);

package/src/common/utils/createInjector.ts

@@ -1,26 +1,12 @@
-import {toMap} from "@tsed/core";
-import {injector, ProviderOpts, setLoggerConfiguration} from "@tsed/di";
+import {injector, setLoggerConfiguration} from "@tsed/di";
 import {$log} from "@tsed/logger";
 
 import {PlatformConfiguration} from "../config/services/PlatformConfiguration.js";
 import {adapter as $adapter} from "../fn/adapter.js";
-import {Platform} from "../services/Platform.js";
 import {PlatformAdapter} from "../services/PlatformAdapter.js";
-import {PlatformApplication} from "../services/PlatformApplication.js";
-import {PlatformHandler} from "../services/PlatformHandler.js";
-import {PlatformRequest} from "../services/PlatformRequest.js";
-import {PlatformResponse} from "../services/PlatformResponse.js";
 
 $log.name = "TSED";
 
-const DEFAULT_PROVIDERS = [
-  {token: PlatformHandler},
-  {token: PlatformResponse},
-  {token: PlatformRequest},
-  {token: PlatformApplication},
-  {token: Platform}
-];
-
 export function createInjector(settings: Partial<TsED.Configuration>) {
   const inj = injector();
   inj.addProvider(PlatformConfiguration);
@@ -31,27 +17,9 @@ export function createInjector(settings: Partial<TsED.Configuration>) {
 
   setLoggerConfiguration();
 
-  const adapterToken = $adapter(settings.adapter);
-
-  inj
-    .addProvider(PlatformAdapter, {
-      useClass: adapterToken
-    })
-    .alias(PlatformAdapter, "PlatformAdapter");
-
-  const adapter = inj.invoke(PlatformAdapter);
-
-  inj.settings.set("PLATFORM_NAME", settings.PLATFORM_NAME || adapter.NAME);
-
-  const instance = inj.get<PlatformAdapter>(PlatformAdapter)!;
-
-  toMap<any, ProviderOpts>(instance.providers, "token").forEach((provider, token) => {
-    inj.addProvider(token, provider);
-  });
+  $adapter(settings.adapter);
 
-  DEFAULT_PROVIDERS.filter((provider) => ![PlatformResponse, PlatformRequest].includes(provider.token as never)).map((provider) => {
-    return inj.get(provider.token);
-  });
+  inj.invoke(PlatformAdapter);
 
   return inj;
 }