@tsed/common 7.0.0-beta.13 → 7.0.0-beta.16

package/lib/esm/services/Platform.js

@@ -1,9 +1,8 @@
 import { __decorate, __metadata } from "tslib";
-import { Injectable, InjectorService, ProviderScope, ProviderType } from "@tsed/di";
-import { concatPath, getJsonEntityStore, getOperationsRoutes, JsonEntityStore } from "@tsed/schema";
-import { buildRouter, createRouter, getRouter } from "../builder/PlatformControllerBuilder.js";
-import { PlatformRouteDetails } from "../domain/PlatformRouteDetails.js";
+import { Injectable, InjectorService, ProviderScope } from "@tsed/di";
+import { PlatformRouters } from "@tsed/platform-router";
 import { PlatformApplication } from "./PlatformApplication.js";
+import { PlatformHandler } from "./PlatformHandler.js";
 import { PlatformMiddlewaresChain } from "./PlatformMiddlewaresChain.js";
 /**
  * `Platform` is used to provide all routes collected by annotation `@Controller`.
@@ -13,115 +12,72 @@ import { PlatformMiddlewaresChain } from "./PlatformMiddlewaresChain.js";
 let Platform = class Platform {
     injector;
     platformApplication;
-    _routes = [];
-    _controllers = [];
-    constructor(injector, platformApplication) {
+    platformRouters;
+    platformHandler;
+    platformMiddlewaresChain;
+    #controllers = new Map();
+    constructor(injector, platformApplication, platformRouters, platformHandler, platformMiddlewaresChain) {
         this.injector = injector;
         this.platformApplication = platformApplication;
-        this.createRouters();
+        this.platformRouters = platformRouters;
+        this.platformHandler = platformHandler;
+        this.platformMiddlewaresChain = platformMiddlewaresChain;
+        // configure the router module
+        platformRouters.hooks
+            .on("alterEndpointHandlers", platformMiddlewaresChain.get.bind(platformMiddlewaresChain))
+            .on("alterHandler", (handler, handlerMetadata) => {
+            handler = handlerMetadata.isRawMiddleware() ? handler : this.platformHandler.createHandler(handler, handlerMetadata);
+            return platformApplication.adapter.mapHandler(handler, handlerMetadata);
+        });
+        platformRouters.prebuild();
     }
     get app() {
         return this.platformApplication;
     }
-    get routes() {
-        return this._routes;
-    }
     addRoutes(routes) {
         routes.forEach((routeSettings) => {
             this.addRoute(routeSettings.route, routeSettings.token);
         });
     }
-    addRoute(basePath, token) {
-        const { injector } = this;
-        const provider = injector.getProvider(token);
+    addRoute(route, token) {
+        const provider = this.injector.getProvider(token);
         if (!provider || provider.hasParent()) {
-            return;
+            return this;
         }
-        this._controllers.push(...this.getAllControllers(basePath, token));
-        const ctrlPath = concatPath(basePath, JsonEntityStore.from(provider.token).path);
-        this.app.use(ctrlPath, ...[].concat(getRouter(injector, provider).callback()));
-        this._routes = getOperationsRoutes(provider.token, {
-            withChildren: true,
-            basePath
-        }).reduce((routes, operationRoute) => {
-            if (injector.hasProvider(token)) {
-                const provider = injector.getProvider(operationRoute.token);
-                const route = new PlatformRouteDetails({
-                    ...operationRoute,
-                    provider
-                });
-                routes = routes.concat(route);
-            }
-            return routes;
-        }, this._routes);
+        const router = this.platformRouters.from(provider.token);
+        this.app.use(route, router);
         return this;
     }
-    /**
-     * Get all routes built by TsExpressDecorators and mounted on Express application.
-     * @returns {PlatformRouteDetails[]}
-     */
-    getRoutes() {
-        return this._routes;
+    getLayers() {
+        this.#controllers = new Map();
+        return this.platformRouters.getLayers(this.app).map((layer) => {
+            if (layer.isProvider()) {
+                this.#controllers.set(layer.provider.token, {
+                    route: String(layer.path).split(layer.provider.path)[0],
+                    provider: layer.provider
+                });
+            }
+            return layer;
+        });
     }
     /**
      * Get all controllers mounted on the application.
      * @returns  {RouteController[]}
      */
     getMountedControllers() {
-        return this._controllers;
-    }
-    $onInit() {
-        this.buildControllers();
-    }
-    /**
-     * Create routers from the collected controllers.
-     * @private
-     */
-    createRouters() {
-        const { injector } = this;
-        injector.getProviders(ProviderType.CONTROLLER).map((provider) => {
-            createRouter(injector, provider);
-        });
-    }
-    /**
-     * Get all router controllers from the controller token.
-     * @private
-     */
-    getAllControllers(basePath, token) {
-        const store = token.isStore ? token : getJsonEntityStore(token);
-        const ctrlPath = concatPath(basePath, JsonEntityStore.from(token).path);
-        const children = store.get("childrenControllers", []);
-        return children
-            .reduce((controllers, token) => {
-            const childBasePath = concatPath(basePath, store.path);
-            return controllers.concat(this.getAllControllers(childBasePath, token));
-        }, [])
-            .concat([
-            {
-                route: ctrlPath,
-                provider: this.injector.getProvider(token)
-            }
-        ]);
-    }
-    /**
-     * Create controllers from DI
-     * @private
-     */
-    buildControllers() {
-        const { injector } = this;
-        injector.getProviders(ProviderType.CONTROLLER).map((provider) => {
-            if (!provider.hasParent()) {
-                return buildRouter(injector, provider);
-            }
-        });
+        return [...this.#controllers.values()];
     }
 };
 Platform = __decorate([
     Injectable({
         scope: ProviderScope.SINGLETON,
-        imports: [PlatformMiddlewaresChain]
+        imports: []
     }),
-    __metadata("design:paramtypes", [InjectorService, PlatformApplication])
+    __metadata("design:paramtypes", [InjectorService,
+        PlatformApplication,
+        PlatformRouters,
+        PlatformHandler,
+        PlatformMiddlewaresChain])
 ], Platform);
 export { Platform };
 //# sourceMappingURL=Platform.js.map

package/lib/esm/services/Platform.js.map

@@ -1 +1 @@
-{"version":3,"file":"Platform.js","sourceRoot":"","sources":["../../../src/services/Platform.ts"],"names":[],"mappings":"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","sourcesContent":["import {Type} from \"@tsed/core\";\nimport {Injectable, InjectorService, ProviderScope, ProviderType, TokenProvider} from \"@tsed/di\";\nimport {concatPath, EndpointMetadata, getJsonEntityStore, getOperationsRoutes, JsonEntityStore} from \"@tsed/schema\";\nimport {buildRouter, createRouter, getRouter} from \"../builder/PlatformControllerBuilder\";\nimport {ControllerProvider} from \"../domain/ControllerProvider\";\nimport {PlatformRouteDetails} from \"../domain/PlatformRouteDetails\";\nimport {Route, RouteController} from \"../interfaces/Route\";\nimport {PlatformApplication} from \"./PlatformApplication\";\nimport {PlatformMiddlewaresChain} from \"./PlatformMiddlewaresChain\";\n\n/**\n * `Platform` is used to provide all routes collected by annotation `@Controller`.\n *\n * @platform\n */\n@Injectable({\n  scope: ProviderScope.SINGLETON,\n  imports: [PlatformMiddlewaresChain]\n})\nexport class Platform {\n  private _routes: PlatformRouteDetails[] = [];\n  private _controllers: RouteController[] = [];\n\n  constructor(readonly injector: InjectorService, readonly platformApplication: PlatformApplication) {\n    this.createRouters();\n  }\n\n  get app() {\n    return this.platformApplication;\n  }\n\n  get routes(): PlatformRouteDetails[] {\n    return this._routes;\n  }\n\n  public addRoutes(routes: Route[]) {\n    routes.forEach((routeSettings) => {\n      this.addRoute(routeSettings.route, routeSettings.token);\n    });\n  }\n\n  public addRoute(basePath: string, token: TokenProvider) {\n    const {injector} = this;\n    const provider = injector.getProvider(token) as ControllerProvider;\n\n    if (!provider || provider.hasParent()) {\n      return;\n    }\n\n    this._controllers.push(...this.getAllControllers(basePath, token));\n\n    const ctrlPath = concatPath(basePath, JsonEntityStore.from(provider.token).path);\n\n    this.app.use(ctrlPath, ...[].concat(getRouter(injector, provider).callback()));\n\n    this._routes = getOperationsRoutes<EndpointMetadata>(provider.token, {\n      withChildren: true,\n      basePath\n    }).reduce((routes, operationRoute) => {\n      if (injector.hasProvider(token)) {\n        const provider = injector.getProvider(operationRoute.token) as ControllerProvider;\n        const route = new PlatformRouteDetails({\n          ...operationRoute,\n          provider\n        });\n\n        routes = routes.concat(route);\n      }\n\n      return routes;\n    }, this._routes);\n\n    return this;\n  }\n\n  /**\n   * Get all routes built by TsExpressDecorators and mounted on Express application.\n   * @returns {PlatformRouteDetails[]}\n   */\n  public getRoutes(): PlatformRouteDetails[] {\n    return this._routes;\n  }\n\n  /**\n   * Get all controllers mounted on the application.\n   * @returns  {RouteController[]}\n   */\n  public getMountedControllers(): RouteController[] {\n    return this._controllers;\n  }\n\n  protected $onInit() {\n    this.buildControllers();\n  }\n\n  /**\n   * Create routers from the collected controllers.\n   * @private\n   */\n  private createRouters() {\n    const {injector} = this;\n\n    injector.getProviders(ProviderType.CONTROLLER).map((provider: ControllerProvider) => {\n      createRouter(injector, provider);\n    });\n  }\n\n  /**\n   * Get all router controllers from the controller token.\n   * @private\n   */\n  private getAllControllers(basePath: string, token: Type<any> | any): RouteController[] {\n    const store: JsonEntityStore = token.isStore ? token : getJsonEntityStore(token);\n    const ctrlPath = concatPath(basePath, JsonEntityStore.from(token).path);\n    const children = store.get<Type[]>(\"childrenControllers\", []);\n\n    return children\n      .reduce<RouteController[]>((controllers, token) => {\n        const childBasePath = concatPath(basePath, store.path);\n        return controllers.concat(this.getAllControllers(childBasePath, token));\n      }, [])\n      .concat([\n        {\n          route: ctrlPath,\n          provider: this.injector.getProvider(token) as ControllerProvider\n        }\n      ]);\n  }\n\n  /**\n   * Create controllers from DI\n   * @private\n   */\n  private buildControllers() {\n    const {injector} = this;\n\n    injector.getProviders(ProviderType.CONTROLLER).map((provider: ControllerProvider) => {\n      if (!provider.hasParent()) {\n        return buildRouter(injector, provider);\n      }\n    });\n  }\n}\n"]}
+{"version":3,"file":"Platform.js","sourceRoot":"","sources":["../../../src/services/Platform.ts"],"names":[],"mappings":"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","sourcesContent":["import {Injectable, InjectorService, ProviderScope, TokenProvider} from \"@tsed/di\";\nimport {PlatformHandlerMetadata, PlatformRouters} from \"@tsed/platform-router\";\nimport {ControllerProvider} from \"@tsed/di\";\nimport {Route, RouteController} from \"../interfaces/Route\";\nimport {PlatformApplication} from \"./PlatformApplication\";\nimport {PlatformHandler} from \"./PlatformHandler\";\nimport {PlatformMiddlewaresChain} from \"./PlatformMiddlewaresChain\";\n\n/**\n * `Platform` is used to provide all routes collected by annotation `@Controller`.\n *\n * @platform\n */\n@Injectable({\n  scope: ProviderScope.SINGLETON,\n  imports: []\n})\nexport class Platform {\n  #controllers: Map<string, RouteController> = new Map();\n\n  constructor(\n    readonly injector: InjectorService,\n    readonly platformApplication: PlatformApplication,\n    readonly platformRouters: PlatformRouters,\n    readonly platformHandler: PlatformHandler,\n    readonly platformMiddlewaresChain: PlatformMiddlewaresChain\n  ) {\n    // configure the router module\n    platformRouters.hooks\n      .on(\"alterEndpointHandlers\", platformMiddlewaresChain.get.bind(platformMiddlewaresChain))\n      .on(\"alterHandler\", (handler: Function, handlerMetadata: PlatformHandlerMetadata) => {\n        handler = handlerMetadata.isRawMiddleware() ? handler : this.platformHandler.createHandler(handler as any, handlerMetadata);\n\n        return platformApplication.adapter.mapHandler(handler, handlerMetadata);\n      });\n\n    platformRouters.prebuild();\n  }\n\n  get app() {\n    return this.platformApplication;\n  }\n\n  public addRoutes(routes: Route[]) {\n    routes.forEach((routeSettings) => {\n      this.addRoute(routeSettings.route, routeSettings.token);\n    });\n  }\n\n  public addRoute(route: string, token: TokenProvider) {\n    const provider = this.injector.getProvider(token) as ControllerProvider;\n\n    if (!provider || provider.hasParent()) {\n      return this;\n    }\n\n    const router = this.platformRouters.from(provider.token);\n\n    this.app.use(route, router);\n\n    return this;\n  }\n\n  public getLayers() {\n    this.#controllers = new Map();\n\n    return this.platformRouters.getLayers(this.app).map((layer) => {\n      if (layer.isProvider()) {\n        this.#controllers.set(layer.provider.token, {\n          route: String(layer.path).split(layer.provider.path)[0],\n          provider: layer.provider\n        });\n      }\n\n      return layer;\n    });\n  }\n\n  /**\n   * Get all controllers mounted on the application.\n   * @returns  {RouteController[]}\n   */\n  public getMountedControllers(): RouteController[] {\n    return [...this.#controllers.values()];\n  }\n}\n"]}

package/lib/esm/services/PlatformAdapter.js

@@ -11,8 +11,6 @@ export class PlatformAdapter {
     onInit;
     beforeLoadRoutes;
     afterLoadRoutes;
-    useRouter;
-    useContext;
 }
 registerProvider({
     provide: PlatformAdapter,

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

@@ -1 +1 @@
-{"version":3,"file":"PlatformAdapter.js","sourceRoot":"","sources":["../../../src/services/PlatformAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAgB,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAIzE,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAE1C,MAAM,OAAgB,eAAe;IACnC;;OAEG;IACH,SAAS,CAAiB;IAC1B;;OAEG;IACH,MAAM,CAAa;IACnB,gBAAgB,CAAsB;IACtC,eAAe,CAAsB;IACrC,SAAS,CAAa;IACtB,UAAU,CAAa;CAwBxB;AAMD,gBAAgB,CAAC;IACf,OAAO,EAAE,eAAe;IACxB,IAAI,EAAE,CAAC,eAAe,CAAC;IACvB,QAAQ,EAAE,WAAW;CACtB,CAAC,CAAC","sourcesContent":["import {Type} from \"@tsed/core\";\nimport {InjectorService, ProviderOpts, registerProvider} from \"@tsed/di\";\nimport {PlatformMulter, PlatformMulterSettings} from \"../config/interfaces/PlatformMulterSettings\";\nimport {PlatformStaticsOptions} from \"../config/interfaces/PlatformStaticsSettings\";\nimport {RouterOptions} from \"express\";\nimport {FakeAdapter} from \"./FakeAdapter\";\n\nexport abstract class PlatformAdapter<App = TsED.Application, Router = TsED.Router> {\n  /**\n   * Load providers in top priority\n   */\n  providers: ProviderOpts[];\n  /**\n   * Called after the injector instantiation\n   */\n  onInit?: () => any;\n  beforeLoadRoutes?: () => Promise<any>;\n  afterLoadRoutes?: () => Promise<any>;\n  useRouter?: () => any;\n  useContext?: () => any;\n\n  abstract app(): {app: App; callback(): any};\n\n  abstract router(routerOptions?: Partial<RouterOptions>): {router: Router; callback(): any};\n  /**\n   * Return the statics middlewares\n   * @param endpoint\n   * @param options\n   */\n  abstract statics(endpoint: string, options: PlatformStaticsOptions): any;\n\n  /**\n   * Return the multipart middleware\n   * @param options\n   */\n  abstract multipart(options: PlatformMulterSettings): PlatformMulter;\n\n  /**\n   * Return the body parser for the given\n   * @param type\n   * @param opts\n   */\n  abstract bodyParser(type: string, opts?: Record<string, any>): any;\n}\n\nexport interface PlatformBuilderSettings<App = TsED.Application, Router = TsED.Router> extends Partial<TsED.Configuration> {\n  adapter?: Type<PlatformAdapter<App, Router>>;\n}\n\nregisterProvider({\n  provide: PlatformAdapter,\n  deps: [InjectorService],\n  useClass: FakeAdapter\n});\n"]}
+{"version":3,"file":"PlatformAdapter.js","sourceRoot":"","sources":["../../../src/services/PlatformAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAgB,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAKzE,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAE1C,MAAM,OAAgB,eAAe;IACnC;;OAEG;IACH,SAAS,CAAiB;IAC1B;;OAEG;IACH,MAAM,CAAa;IACnB,gBAAgB,CAAsB;IACtC,eAAe,CAAsB;CAsCtC;AAMD,gBAAgB,CAAC;IACf,OAAO,EAAE,eAAe;IACxB,IAAI,EAAE,CAAC,eAAe,CAAC;IACvB,QAAQ,EAAE,WAAW;CACtB,CAAC,CAAC","sourcesContent":["import {Type} from \"@tsed/core\";\nimport {InjectorService, ProviderOpts, registerProvider} from \"@tsed/di\";\nimport {PlatformContextHandler, PlatformHandlerMetadata, PlatformLayer} from \"@tsed/platform-router\";\nimport {PlatformMulter, PlatformMulterSettings} from \"../config/interfaces/PlatformMulterSettings\";\nimport {PlatformStaticsOptions} from \"../config/interfaces/PlatformStaticsSettings\";\nimport {PlatformContext} from \"../domain/PlatformContext\";\nimport {FakeAdapter} from \"./FakeAdapter\";\n\nexport abstract class PlatformAdapter<App = TsED.Application> {\n  /**\n   * Load providers in top priority\n   */\n  providers: ProviderOpts[];\n  /**\n   * Called after the injector instantiation\n   */\n  onInit?: () => any;\n  beforeLoadRoutes?: () => Promise<any>;\n  afterLoadRoutes?: () => Promise<any>;\n  /**\n   * create initial context\n   */\n  abstract useContext: () => any;\n  /**\n   * Map router layer to the targeted framework\n   */\n  abstract mapLayers: (layer: PlatformLayer[]) => void;\n  /**\n   * Map handler to the targeted framework\n   */\n  abstract mapHandler: (handler: Function, layer: PlatformHandlerMetadata) => Function;\n\n  /**\n   * Return the app instance\n   */\n  abstract app(): {app: App; callback(): any};\n\n  /**\n   * Return the statics middlewares\n   * @param endpoint\n   * @param options\n   */\n  abstract statics(endpoint: string, options: PlatformStaticsOptions): any;\n\n  /**\n   * Return the multipart middleware\n   * @param options\n   */\n  abstract multipart(options: PlatformMulterSettings): PlatformMulter;\n\n  /**\n   * Return the body parser for the given\n   * @param type\n   * @param opts\n   */\n  abstract bodyParser(type: string, opts?: Record<string, any>): any;\n}\n\nexport interface PlatformBuilderSettings<App = TsED.Application> extends Partial<TsED.Configuration> {\n  adapter?: Type<PlatformAdapter<App>>;\n}\n\nregisterProvider({\n  provide: PlatformAdapter,\n  deps: [InjectorService],\n  useClass: FakeAdapter\n});\n"]}

package/lib/esm/services/PlatformApplication.js

@@ -1,7 +1,6 @@
 import { __decorate, __metadata } from "tslib";
-import { Injectable, ProviderScope } from "@tsed/di";
-import { PlatformHandler } from "./PlatformHandler.js";
-import { PlatformRouter } from "./PlatformRouter.js";
+import { Injectable, InjectorService, 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`.
@@ -9,23 +8,36 @@ import { PlatformAdapter } from "./PlatformAdapter.js";
  * @platform
  */
 let PlatformApplication = class PlatformApplication extends PlatformRouter {
-    raw;
+    adapter;
+    injector;
     rawApp;
-    constructor(platformHandler, adapter) {
-        super(platformHandler, adapter);
+    rawCallback;
+    constructor(adapter, injector) {
+        super(injector);
+        this.adapter = adapter;
+        this.injector = injector;
         const { app, callback } = adapter.app();
-        this.rawApp = this.raw = app;
-        this.callback = callback;
+        this.rawApp = app;
+        this.rawCallback = callback;
     }
     getApp() {
-        return this.raw;
+        return this.rawApp;
+    }
+    multer(options) {
+        return this.adapter.multipart(options);
+    }
+    callback(req, res) {
+        if (req && res) {
+            return this.callback()(req, res);
+        }
+        return this.rawCallback();
     }
 };
 PlatformApplication = __decorate([
     Injectable({
         scope: ProviderScope.SINGLETON
     }),
-    __metadata("design:paramtypes", [PlatformHandler, PlatformAdapter])
+    __metadata("design:paramtypes", [PlatformAdapter, InjectorService])
 ], PlatformApplication);
 export { PlatformApplication };
 //# sourceMappingURL=PlatformApplication.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"PlatformApplication.js","sourceRoot":"","sources":["../../../src/services/PlatformApplication.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,UAAU,EAAE,aAAa,EAAC,MAAM,UAAU,CAAC;AACnD,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AASlD;;;;GAIG;AAIH,IAAa,mBAAmB,GAAhC,MAAa,mBAAkE,SAAQ,cAA2B;IAChH,GAAG,CAAM;IACT,MAAM,CAAM;IAGZ,YAAY,eAAgC,EAAE,OAAqC;QACjF,KAAK,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;QAChC,MAAM,EAAC,GAAG,EAAE,QAAQ,EAAC,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAEtC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,GAAG,CAAC;IAClB,CAAC;CACF,CAAA;AAhBY,mBAAmB;IAH/B,UAAU,CAAC;QACV,KAAK,EAAE,aAAa,CAAC,SAAS;KAC/B,CAAC;qCAM6B,eAAe,EAAW,eAAe;GAL3D,mBAAmB,CAgB/B;SAhBY,mBAAmB","sourcesContent":["import {Injectable, ProviderScope} from \"@tsed/di\";\nimport {PlatformHandler} from \"./PlatformHandler\";\nimport {PlatformRouter} from \"./PlatformRouter\";\nimport {PlatformAdapter} from \"./PlatformAdapter\";\n\ndeclare global {\n  namespace TsED {\n    // @ts-ignore\n    export interface Application {}\n  }\n}\n\n/**\n * `PlatformApplication` is used to provide all routes collected by annotation `@Controller`.\n *\n * @platform\n */\n@Injectable({\n  scope: ProviderScope.SINGLETON\n})\nexport class PlatformApplication<App = TsED.Application, Router = TsED.Router> extends PlatformRouter<App, Router> {\n  raw: App;\n  rawApp: App;\n  declare rawRouter: Router;\n\n  constructor(platformHandler: PlatformHandler, adapter: PlatformAdapter<App, Router>) {\n    super(platformHandler, adapter);\n    const {app, callback} = adapter.app();\n\n    this.rawApp = this.raw = app;\n    this.callback = callback;\n  }\n\n  getApp(): App {\n    return this.raw;\n  }\n}\n"]}
+{"version":3,"file":"PlatformApplication.js","sourceRoot":"","sources":["../../../src/services/PlatformApplication.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,UAAU,EAAE,eAAe,EAAE,aAAa,EAAC,MAAM,UAAU,CAAC;AACpE,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AAGrD,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AASlD;;;;GAIG;AAIH,IAAa,mBAAmB,GAAhC,MAAa,mBAA4C,SAAQ,cAAc;IAI1D;IAAsC;IAHzD,MAAM,CAAM;IACZ,WAAW,CAAY;IAEvB,YAAmB,OAA6B,EAAS,QAAyB;QAChF,KAAK,CAAC,QAAQ,CAAC,CAAC;QADC,YAAO,GAAP,OAAO,CAAsB;QAAS,aAAQ,GAAR,QAAQ,CAAiB;QAEhF,MAAM,EAAC,GAAG,EAAE,QAAQ,EAAC,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAEtC,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;YACd,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SAClC;QAED,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;IAC5B,CAAC;CACF,CAAA;AA7BY,mBAAmB;IAH/B,UAAU,CAAC;QACV,KAAK,EAAE,aAAa,CAAC,SAAS;KAC/B,CAAC;qCAK4B,eAAe,EAAwB,eAAe;GAJvE,mBAAmB,CA6B/B;SA7BY,mBAAmB","sourcesContent":["import {Injectable, InjectorService, ProviderScope} from \"@tsed/di\";\nimport {PlatformRouter} from \"@tsed/platform-router\";\nimport {IncomingMessage, ServerResponse} from \"http\";\nimport {PlatformMulterSettings} from \"../config/interfaces/PlatformMulterSettings\";\nimport {PlatformAdapter} from \"./PlatformAdapter\";\n\ndeclare global {\n  namespace TsED {\n    // @ts-ignore\n    export interface Application {}\n  }\n}\n\n/**\n * `PlatformApplication` is used to provide all routes collected by annotation `@Controller`.\n *\n * @platform\n */\n@Injectable({\n  scope: ProviderScope.SINGLETON\n})\nexport class PlatformApplication<App = TsED.Application> extends PlatformRouter {\n  rawApp: App;\n  rawCallback: () => any;\n\n  constructor(public adapter: PlatformAdapter<App>, public injector: InjectorService) {\n    super(injector);\n    const {app, callback} = adapter.app();\n\n    this.rawApp = app;\n    this.rawCallback = callback;\n  }\n\n  getApp(): App {\n    return this.rawApp;\n  }\n\n  multer(options: PlatformMulterSettings) {\n    return this.adapter.multipart(options);\n  }\n\n  callback(): (req: IncomingMessage, res: ServerResponse) => any;\n  callback(req: IncomingMessage, res: ServerResponse): any;\n  callback(req?: IncomingMessage, res?: ServerResponse) {\n    if (req && res) {\n      return this.callback()(req, res);\n    }\n\n    return this.rawCallback();\n  }\n}\n"]}

package/lib/esm/services/PlatformHandler.js

@@ -1,235 +1,159 @@
 import { __decorate, __metadata } from "tslib";
-import { AnyToPromiseStatus, isFunction, isStream } from "@tsed/core";
-import { Inject, Injectable, InjectorService, ProviderScope } from "@tsed/di";
+import { AnyToPromiseStatus, catchAsyncError, isFunction, isStream } from "@tsed/core";
+import { Inject, Injectable, ProviderScope } from "@tsed/di";
 import { $log } from "@tsed/logger";
 import { PlatformParams } from "@tsed/platform-params";
 import { PlatformResponseFilter } from "@tsed/platform-response-filter";
+import { PlatformHandlerMetadata, PlatformHandlerType, PlatformRouters } from "@tsed/platform-router";
+import { promisify } from "util";
 import { AnyToPromiseWithCtx } from "../domain/AnyToPromiseWithCtx.js";
-import { HandlerMetadata } from "../domain/HandlerMetadata.js";
-import { HandlerType } from "../interfaces/HandlerType.js";
-import { createHandlerMetadata } from "../utils/createHandlerMetadata.js";
 import { setResponseHeaders } from "../utils/setResponseHeaders.js";
 /**
  * Platform Handler abstraction layer. Wrap original class method to a pure platform handler (Express, Koa, etc...).
  * @platform
  */
 let PlatformHandler = class PlatformHandler {
-    injector;
-    params;
     responseFilter;
-    constructor(injector, params) {
-        this.injector = injector;
-        this.params = params;
-    }
-    /**
-     * Create a native middleware based on the given metadata and return an instance of AnyToPromiseWithCtx
-     * @param input
-     * @param options
-     */
-    createHandler(input, options = {}) {
-        return this.createRawHandler(createHandlerMetadata(this.injector, input, options));
+    platformRouters;
+    platformParams;
+    createHandler(handler, handlerMetadata) {
+        return async ($ctx) => {
+            $ctx.handlerMetadata = handlerMetadata;
+            const error = await catchAsyncError(() => this.onRequest(handler, $ctx));
+            return this.next(error, $ctx.next, $ctx);
+        };
     }
     /**
-     * Create injectable handler from the given provider
      * @param provider
      * @param propertyKey
      */
     createCustomHandler(provider, propertyKey) {
-        const handler = this.compileHandler(new HandlerMetadata({
-            token: provider.provide,
-            target: provider.useClass,
-            type: HandlerType.CUSTOM,
-            scope: provider.scope,
+        const metadata = new PlatformHandlerMetadata({
+            provider,
+            type: PlatformHandlerType.CUSTOM,
             propertyKey
-        }));
-        return async ($ctx, next) => handler({
-            $ctx,
-            next
         });
+        const handler = this.platformParams.compileHandler(metadata.store);
+        return async ($ctx) => {
+            $ctx.set(PlatformHandlerMetadata, metadata);
+            // @ts-ignore
+            return this.onRequest(handler, $ctx);
+        };
     }
     /**
      * Send the response to the consumer.
-     * @param data
-     * @param ctx
      * @protected
+     * @param $ctx
      */
-    async flush(data, ctx) {
-        const { response } = ctx;
+    async flush($ctx) {
+        const { response } = $ctx;
         if (!response.isDone()) {
-            data = await this.responseFilter.serialize(data, ctx);
-            data = await this.responseFilter.transform(data, ctx);
+            let data = await this.responseFilter.serialize($ctx.data, $ctx);
+            data = await this.responseFilter.transform(data, $ctx);
             response.body(data);
         }
+        return response;
     }
-    compileHandler(metadata) {
-        if (metadata.type === HandlerType.CTX_FN) {
-            return async (scope) => {
-                // @ts-ignore
-                return this.onCtxRequest({
-                    ...scope,
-                    handler: () => metadata.handler(scope.$ctx),
-                    metadata
-                });
-            };
+    setResponseHeaders($ctx) {
+        if (!$ctx.response.isDone()) {
+            return setResponseHeaders($ctx);
         }
-        const promise = this.params.compileHandler({
-            token: metadata.token,
-            propertyKey: metadata.propertyKey,
-            getCustomArgs: metadata.injectable ? undefined : this.getDefaultArgs(metadata)
-        });
-        return async (scope) => {
-            const handler = await promise;
-            // @ts-ignore
-            return this.onRequest({
-                ...scope,
-                handler,
-                metadata
-            });
-        };
     }
-    async onCtxRequest(requestOptions) {
-        await requestOptions.handler(requestOptions);
-        return this.next(requestOptions);
+    /**
+     * @param error
+     * @param next
+     * @param $ctx
+     */
+    next(error, next, $ctx) {
+        if (isStream($ctx.data) || $ctx.isDone()) {
+            return;
+        }
+        return error ? next(error) : next();
     }
     /**
      * Call handler when a request his handle
-     * @param requestOptions
      */
-    async onRequest(requestOptions) {
-        const { $ctx, metadata, err, handler } = requestOptions;
-        // istanbul ignore next
-        if (!$ctx || $ctx.isDone()) {
+    async onRequest(handler, $ctx) {
+        // istanbul ignore next$
+        if ($ctx.isDone()) {
             $log.error({
                 name: "HEADERS_SENT",
-                message: `An endpoint is called but the response is already send to the client. The call comes from the handler: ${metadata.toString()}`
+                message: `An endpoint is called but the response is already send to the client. The call comes from the handler: ${$ctx.handlerMetadata.toString()}`
             });
             return;
         }
-        return $ctx.runInContext(async () => {
-            const resolver = new AnyToPromiseWithCtx({ $ctx, err });
-            try {
-                const { state, data, status, headers } = await resolver.call(handler);
-                if (state === AnyToPromiseStatus.RESOLVED) {
-                    if (status) {
-                        $ctx.response.status(status);
-                    }
-                    if (headers) {
-                        $ctx.response.setHeaders(headers);
-                    }
-                    if (data !== undefined) {
-                        $ctx.data = data;
-                    }
-                    // Can be canceled by the handler itself
-                    return await this.onSuccess($ctx.data, requestOptions);
-                }
+        try {
+            const { handlerMetadata } = $ctx;
+            if (handlerMetadata.type === PlatformHandlerType.CTX_FN) {
+                return await handler({ $ctx });
             }
-            catch (er) {
-                return this.onError(er, requestOptions);
+            const resolver = new AnyToPromiseWithCtx($ctx);
+            const { state, data, status, headers } = await resolver.call(handler);
+            // Note: restore previous handler metadata (for OIDC)
+            $ctx.handlerMetadata = handlerMetadata;
+            if (state === AnyToPromiseStatus.RESOLVED) {
+                if (status) {
+                    $ctx.response.status(status);
+                }
+                if (headers) {
+                    $ctx.response.setHeaders(headers);
+                }
+                if (data !== undefined) {
+                    $ctx.data = data;
+                }
+                // Can be canceled by the handler itself
+                return await this.onSuccess($ctx);
             }
-        });
-    }
-    async onError(er, requestOptions) {
-        const { next, $ctx, metadata } = requestOptions;
-        if ($ctx) {
-            $ctx.data = er;
         }
-        if (!next) {
-            throw er;
+        catch (error) {
+            return this.onError(error, $ctx);
         }
-        // istanbul ignore next
-        if (!$ctx || $ctx.isDone()) {
-            $log.warn({
-                name: "HEADERS_SENT",
-                message: `An error was caught after the headers were sent to the client. The error comes from the handler: ${metadata.toString()}`,
-                stack: er.stack,
-                origin: er,
-                request_id: $ctx?.id
-            });
-            return;
-        }
-        return next(er);
+    }
+    async onError(error, $ctx) {
+        $ctx.error = error;
+        throw error;
     }
     /**
      * Manage success scenario
-     * @param data
-     * @param requestOptions
+     * @param $ctx
      * @protected
      */
-    async onSuccess(data, requestOptions) {
-        const { metadata, $ctx, next } = requestOptions;
+    async onSuccess($ctx) {
         // istanbul ignore next
-        if ($ctx?.isDone()) {
+        if ($ctx.isDone()) {
             return;
         }
+        $ctx.error = null;
+        const metadata = $ctx.handlerMetadata;
         // set headers each times that an endpoint is called
-        if (metadata.type === HandlerType.ENDPOINT) {
-            this.setHeaders($ctx);
+        if (metadata.isEndpoint()) {
+            this.setResponseHeaders($ctx);
         }
         // call returned middleware
-        if (isFunction(data) && !isStream(data)) {
-            return this.callReturnedMiddleware(data, $ctx, next);
+        if (isFunction($ctx.data) && !isStream($ctx.data)) {
+            return promisify($ctx.data)($ctx.getRequest(), $ctx.getResponse());
         }
         if (metadata.isFinal()) {
-            return this.flush(data, $ctx);
-        }
-        return this.next(requestOptions);
-    }
-    /**
-     * Call the returned middleware by the handler.
-     * @param middleware
-     * @param ctx
-     * @param next
-     * @protected
-     */
-    callReturnedMiddleware(middleware, ctx, next) {
-        return middleware(ctx.getRequest(), ctx.getResponse(), next);
-    }
-    /**
-     * create Raw handler
-     * @param metadata
-     */
-    createRawHandler(metadata) {
-        if ([HandlerType.RAW_ERR_FN, HandlerType.RAW_FN].includes(metadata.type)) {
-            return metadata.handler;
+            return this.flush($ctx);
         }
-        const handler = this.compileHandler(metadata);
-        return async (request, response, next) => {
-            return handler({
-                next,
-                $ctx: request.$ctx
-            });
-        };
-    }
-    /**
-     * Set response headers
-     * @param ctx
-     * @protected
-     */
-    setHeaders(ctx) {
-        return setResponseHeaders(ctx);
-    }
-    next(requestOptions) {
-        const { $ctx, next } = requestOptions;
-        return !$ctx.response.isDone() && next && next();
-    }
-    getDefaultArgs(metadata) {
-        return async (scope) => [
-            metadata.hasErrorParam && scope.err,
-            scope.$ctx.request.request,
-            scope.$ctx.response.response,
-            metadata.hasNextFunction && scope.next
-        ].filter(Boolean);
     }
 };
 __decorate([
     Inject(),
     __metadata("design:type", PlatformResponseFilter)
 ], PlatformHandler.prototype, "responseFilter", void 0);
+__decorate([
+    Inject(),
+    __metadata("design:type", PlatformRouters)
+], PlatformHandler.prototype, "platformRouters", void 0);
+__decorate([
+    Inject(),
+    __metadata("design:type", PlatformParams)
+], PlatformHandler.prototype, "platformParams", void 0);
 PlatformHandler = __decorate([
     Injectable({
         scope: ProviderScope.SINGLETON
-    }),
-    __metadata("design:paramtypes", [InjectorService, PlatformParams])
+    })
 ], PlatformHandler);
 export { PlatformHandler };
 //# sourceMappingURL=PlatformHandler.js.map