@tsed/platform-express 6.116.3 → 6.116.6

package/lib/cjs/components/PlatformExpress.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlatformExpress = void 0;
 const tslib_1 = require("tslib");
-const express_1 = tslib_1.__importDefault(require("express"));
 const common_1 = require("@tsed/common");
-const util_1 = require("util");
 const core_1 = require("@tsed/core");
+const express_1 = tslib_1.__importDefault(require("express"));
+const util_1 = require("util");
+const staticsMiddleware_1 = require("../middlewares/staticsMiddleware");
 const PlatformExpressHandler_1 = require("../services/PlatformExpressHandler");
-const PlatformExpressResponse_1 = require("../services/PlatformExpressResponse");
 const PlatformExpressRequest_1 = require("../services/PlatformExpressRequest");
-const staticsMiddleware_1 = require("../middlewares/staticsMiddleware");
+const PlatformExpressResponse_1 = require("../services/PlatformExpressResponse");
 /**
  * @platform
  * @express
@@ -100,8 +100,8 @@ class PlatformExpress {
         const invoke = (0, common_1.createContext)(this.injector);
         const app = this.injector.get(common_1.PlatformApplication);
         app.getApp().use(async (request, response, next) => {
-            const $ctx = await invoke({ request, response });
-            return $ctx.runInContext(next);
+            await invoke({ request, response });
+            return next();
         });
         return this;
     }

package/lib/cjs/components/PlatformExpress.js.map

@@ -1 +1 @@
-{"version":3,"file":"PlatformExpress.js","sourceRoot":"","sources":["../../../src/components/PlatformExpress.ts"],"names":[],"mappings":"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","sourcesContent":["import type multer from \"multer\";\nimport Express, {RouterOptions} from \"express\";\nimport type {PlatformViews} from \"@tsed/platform-views\";\nimport {\n  createContext,\n  InjectorService,\n  PlatformAdapter,\n  PlatformApplication,\n  PlatformBuilder,\n  PlatformContext,\n  PlatformExceptions,\n  PlatformHandler,\n  PlatformMulter,\n  PlatformMulterSettings,\n  PlatformRequest,\n  PlatformResponse,\n  PlatformStaticsOptions,\n  runInContext\n} from \"@tsed/common\";\nimport {promisify} from \"util\";\nimport {Env, isFunction, nameOf, Type} from \"@tsed/core\";\nimport {PlatformExpressHandler} from \"../services/PlatformExpressHandler\";\nimport {PlatformExpressResponse} from \"../services/PlatformExpressResponse\";\nimport {PlatformExpressRequest} from \"../services/PlatformExpressRequest\";\nimport {staticsMiddleware} from \"../middlewares/staticsMiddleware\";\nimport {PlatformExpressStaticsOptions} from \"../interfaces/PlatformExpressStaticsOptions\";\nimport {OptionsJson, OptionsText, OptionsUrlencoded} from \"body-parser\";\n\ndeclare module \"express\" {\n  export interface Request {\n    id: string;\n    $ctx: PlatformContext;\n  }\n}\n\ndeclare global {\n  namespace TsED {\n    export interface Router extends Express.Router {}\n\n    export interface Application extends Express.Application {}\n\n    export interface StaticsOptions extends PlatformExpressStaticsOptions {}\n\n    export interface Request extends Express.Request {\n      id: string;\n      $ctx: PlatformContext;\n    }\n  }\n}\n\n/**\n * @platform\n * @express\n */\nexport class PlatformExpress implements PlatformAdapter<Express.Application, Express.Router> {\n  readonly providers = [\n    {\n      provide: PlatformHandler,\n      useClass: PlatformExpressHandler\n    },\n    {\n      provide: PlatformResponse,\n      useClass: PlatformExpressResponse\n    },\n    {\n      provide: PlatformRequest,\n      useClass: PlatformExpressRequest\n    }\n  ];\n  #multer: typeof multer;\n\n  constructor(protected injector: InjectorService) {\n    import(\"multer\").then(({default: multer}) => (this.#multer = multer));\n  }\n\n  /**\n   * Create new serverless application. In this mode, the component scan are disabled.\n   * @param module\n   * @param settings\n   */\n  static create(module: Type<any>, settings: Partial<TsED.Configuration> = {}) {\n    return PlatformBuilder.create<Express.Application, Express.Router>(module, {\n      ...settings,\n      adapter: PlatformExpress\n    });\n  }\n\n  /**\n   * Bootstrap a server application\n   * @param module\n   * @param settings\n   */\n  static async bootstrap(module: Type<any>, settings: Partial<TsED.Configuration> = {}) {\n    return PlatformBuilder.bootstrap<Express.Application, Express.Router>(module, {\n      ...settings,\n      adapter: PlatformExpress\n    });\n  }\n\n  onInit() {\n    const middlewares = this.injector.settings.get(\"middlewares\", []);\n\n    this.injector.settings.set(\n      \"middlewares\",\n      middlewares.filter((middleware) => {\n        const name = nameOf(middleware);\n        if ([\"textParser\", \"jsonParser\", \"rawParser\", \"urlencodedParser\"].includes(name)) {\n          this.injector.settings.set(`express.bodyParser.${name.replace(\"Parser\", \"\")}`, () => middleware);\n          return false;\n        }\n\n        return true;\n      })\n    );\n  }\n\n  useRouter(): this {\n    const {logger} = this.injector;\n    const app = this.injector.get<PlatformApplication<Express.Application>>(PlatformApplication)!;\n\n    logger.debug(\"Mount app router\");\n    app.getApp().use(app.getRouter());\n\n    return this;\n  }\n\n  async beforeLoadRoutes() {\n    const injector = this.injector;\n    const app = this.injector.get<PlatformApplication<Express.Application>>(PlatformApplication)!;\n\n    // disable x-powered-by header\n    injector.settings.get(\"env\") === Env.PROD && app.getApp().disable(\"x-powered-by\");\n\n    await this.configureViewsEngine();\n  }\n\n  async afterLoadRoutes() {\n    const injector = this.injector;\n    const app = this.injector.get<PlatformApplication<Express.Application>>(PlatformApplication)!;\n\n    // NOT FOUND\n    app.use((req: any, res: any, next: any) => {\n      !res.headersSent && injector.get<PlatformExceptions>(PlatformExceptions)?.resourceNotFound(req.$ctx);\n    });\n\n    // EXCEPTION FILTERS\n    app.use((err: any, req: any, res: any, next: any) => {\n      !res.headersSent && injector.get<PlatformExceptions>(PlatformExceptions)?.catch(err, req.$ctx);\n    });\n  }\n\n  useContext(): this {\n    const {logger} = this.injector;\n\n    logger.debug(\"Mount app context\");\n\n    const invoke = createContext(this.injector);\n    const app = this.injector.get<PlatformApplication<Express.Application>>(PlatformApplication)!;\n\n    app.getApp().use(async (request: any, response: any, next: any) => {\n      const $ctx = await invoke({request, response});\n\n      return $ctx.runInContext(next);\n    });\n\n    return this;\n  }\n\n  multipart(options: PlatformMulterSettings): PlatformMulter {\n    const m = this.#multer(options);\n\n    const makePromise = (multer: any, name: string) => {\n      // istanbul ignore next\n      if (!multer[name]) return;\n\n      const fn = multer[name];\n\n      multer[name] = function apply(...args: any[]) {\n        const middleware = Reflect.apply(fn, this, args);\n\n        return (req: any, res: any) => promisify(middleware)(req, res);\n      };\n    };\n\n    makePromise(m, \"any\");\n    makePromise(m, \"array\");\n    makePromise(m, \"fields\");\n    makePromise(m, \"none\");\n    makePromise(m, \"single\");\n\n    return m;\n  }\n\n  app() {\n    const app = this.injector.settings.get(\"express.app\") || Express();\n    return {\n      app,\n      callback() {\n        return app;\n      }\n    };\n  }\n\n  router(routerOptions: Partial<RouterOptions> = {}) {\n    const options = Object.assign(\n      {\n        mergeParams: true\n      },\n      this.injector.settings.get(\"express.router\", {}),\n      routerOptions\n    );\n\n    const router = Express.Router(options);\n\n    return {\n      router,\n      callback() {\n        return router;\n      }\n    };\n  }\n\n  statics(endpoint: string, options: PlatformStaticsOptions) {\n    const {root, ...props} = options;\n\n    return staticsMiddleware(root, props);\n  }\n\n  bodyParser(type: \"json\" | \"raw\" | \"text\" | \"urlencoded\", additionalOptions: any = {}): any {\n    const opts = this.injector.settings.get(`express.bodyParser.${type}`);\n    let parser: any = Express[type];\n    let options: OptionsJson & OptionsText & OptionsUrlencoded = {};\n\n    if (isFunction(opts)) {\n      parser = opts;\n      options = {};\n    }\n\n    switch (type) {\n      case \"urlencoded\":\n        options.extended = true;\n        break;\n      case \"raw\":\n        options.type = () => true;\n        break;\n    }\n\n    return parser({...options, ...additionalOptions});\n  }\n\n  private async configureViewsEngine() {\n    const injector = this.injector;\n    const app = this.injector.get<PlatformApplication<Express.Application>>(PlatformApplication)!;\n\n    try {\n      const {exists, disabled} = this.injector.settings.get(\"views\") || {};\n\n      if (exists && !disabled) {\n        const {PlatformViews} = await import(\"@tsed/platform-views\");\n        const platformViews = injector.get<PlatformViews>(PlatformViews)!;\n        const express = app.getApp();\n\n        platformViews.getEngines().forEach(({extension, engine}) => {\n          express.engine(extension, engine.render);\n        });\n\n        platformViews.viewEngine && express.set(\"view engine\", platformViews.viewEngine);\n        platformViews.root && express.set(\"views\", platformViews.root);\n      }\n    } catch (error) {\n      // istanbul ignore next\n      injector.logger.warn({\n        event: \"PLATFORM_VIEWS_ERROR\",\n        message: \"Unable to configure the PlatformViews service on your environment.\",\n        error\n      });\n    }\n  }\n}\n"]}
+{"version":3,"file":"PlatformExpress.js","sourceRoot":"","sources":["../../../src/components/PlatformExpress.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  createContext,\n  InjectorService,\n  PlatformAdapter,\n  PlatformApplication,\n  PlatformBuilder,\n  PlatformContext,\n  PlatformExceptions,\n  PlatformHandler,\n  PlatformMulter,\n  PlatformMulterSettings,\n  PlatformRequest,\n  PlatformResponse,\n  PlatformStaticsOptions\n} from \"@tsed/common\";\nimport {Env, isFunction, nameOf, Type} from \"@tsed/core\";\nimport type {PlatformViews} from \"@tsed/platform-views\";\nimport {OptionsJson, OptionsText, OptionsUrlencoded} from \"body-parser\";\nimport Express, {RouterOptions} from \"express\";\nimport type multer from \"multer\";\nimport {promisify} from \"util\";\nimport {PlatformExpressStaticsOptions} from \"../interfaces/PlatformExpressStaticsOptions\";\nimport {staticsMiddleware} from \"../middlewares/staticsMiddleware\";\nimport {PlatformExpressHandler} from \"../services/PlatformExpressHandler\";\nimport {PlatformExpressRequest} from \"../services/PlatformExpressRequest\";\nimport {PlatformExpressResponse} from \"../services/PlatformExpressResponse\";\n\ndeclare module \"express\" {\n  export interface Request {\n    id: string;\n    $ctx: PlatformContext;\n  }\n}\n\ndeclare global {\n  namespace TsED {\n    export interface Router extends Express.Router {}\n\n    export interface Application extends Express.Application {}\n\n    export interface StaticsOptions extends PlatformExpressStaticsOptions {}\n\n    export interface Request extends Express.Request {\n      id: string;\n      $ctx: PlatformContext;\n    }\n  }\n}\n\n/**\n * @platform\n * @express\n */\nexport class PlatformExpress implements PlatformAdapter<Express.Application, Express.Router> {\n  readonly providers = [\n    {\n      provide: PlatformHandler,\n      useClass: PlatformExpressHandler\n    },\n    {\n      provide: PlatformResponse,\n      useClass: PlatformExpressResponse\n    },\n    {\n      provide: PlatformRequest,\n      useClass: PlatformExpressRequest\n    }\n  ];\n  #multer: typeof multer;\n\n  constructor(protected injector: InjectorService) {\n    import(\"multer\").then(({default: multer}) => (this.#multer = multer));\n  }\n\n  /**\n   * Create new serverless application. In this mode, the component scan are disabled.\n   * @param module\n   * @param settings\n   */\n  static create(module: Type<any>, settings: Partial<TsED.Configuration> = {}) {\n    return PlatformBuilder.create<Express.Application, Express.Router>(module, {\n      ...settings,\n      adapter: PlatformExpress\n    });\n  }\n\n  /**\n   * Bootstrap a server application\n   * @param module\n   * @param settings\n   */\n  static async bootstrap(module: Type<any>, settings: Partial<TsED.Configuration> = {}) {\n    return PlatformBuilder.bootstrap<Express.Application, Express.Router>(module, {\n      ...settings,\n      adapter: PlatformExpress\n    });\n  }\n\n  onInit() {\n    const middlewares = this.injector.settings.get(\"middlewares\", []);\n\n    this.injector.settings.set(\n      \"middlewares\",\n      middlewares.filter((middleware) => {\n        const name = nameOf(middleware);\n        if ([\"textParser\", \"jsonParser\", \"rawParser\", \"urlencodedParser\"].includes(name)) {\n          this.injector.settings.set(`express.bodyParser.${name.replace(\"Parser\", \"\")}`, () => middleware);\n          return false;\n        }\n\n        return true;\n      })\n    );\n  }\n\n  useRouter(): this {\n    const {logger} = this.injector;\n    const app = this.injector.get<PlatformApplication<Express.Application>>(PlatformApplication)!;\n\n    logger.debug(\"Mount app router\");\n    app.getApp().use(app.getRouter());\n\n    return this;\n  }\n\n  async beforeLoadRoutes() {\n    const injector = this.injector;\n    const app = this.injector.get<PlatformApplication<Express.Application>>(PlatformApplication)!;\n\n    // disable x-powered-by header\n    injector.settings.get(\"env\") === Env.PROD && app.getApp().disable(\"x-powered-by\");\n\n    await this.configureViewsEngine();\n  }\n\n  async afterLoadRoutes() {\n    const injector = this.injector;\n    const app = this.injector.get<PlatformApplication<Express.Application>>(PlatformApplication)!;\n\n    // NOT FOUND\n    app.use((req: any, res: any, next: any) => {\n      !res.headersSent && injector.get<PlatformExceptions>(PlatformExceptions)?.resourceNotFound(req.$ctx);\n    });\n\n    // EXCEPTION FILTERS\n    app.use((err: any, req: any, res: any, next: any) => {\n      !res.headersSent && injector.get<PlatformExceptions>(PlatformExceptions)?.catch(err, req.$ctx);\n    });\n  }\n\n  useContext(): this {\n    const {logger} = this.injector;\n\n    logger.debug(\"Mount app context\");\n\n    const invoke = createContext(this.injector);\n    const app = this.injector.get<PlatformApplication<Express.Application>>(PlatformApplication)!;\n\n    app.getApp().use(async (request: any, response: any, next: any) => {\n      await invoke({request, response});\n\n      return next();\n    });\n\n    return this;\n  }\n\n  multipart(options: PlatformMulterSettings): PlatformMulter {\n    const m = this.#multer(options);\n\n    const makePromise = (multer: any, name: string) => {\n      // istanbul ignore next\n      if (!multer[name]) return;\n\n      const fn = multer[name];\n\n      multer[name] = function apply(...args: any[]) {\n        const middleware = Reflect.apply(fn, this, args);\n\n        return (req: any, res: any) => promisify(middleware)(req, res);\n      };\n    };\n\n    makePromise(m, \"any\");\n    makePromise(m, \"array\");\n    makePromise(m, \"fields\");\n    makePromise(m, \"none\");\n    makePromise(m, \"single\");\n\n    return m;\n  }\n\n  app() {\n    const app = this.injector.settings.get(\"express.app\") || Express();\n    return {\n      app,\n      callback() {\n        return app;\n      }\n    };\n  }\n\n  router(routerOptions: Partial<RouterOptions> = {}) {\n    const options = Object.assign(\n      {\n        mergeParams: true\n      },\n      this.injector.settings.get(\"express.router\", {}),\n      routerOptions\n    );\n\n    const router = Express.Router(options);\n\n    return {\n      router,\n      callback() {\n        return router;\n      }\n    };\n  }\n\n  statics(endpoint: string, options: PlatformStaticsOptions) {\n    const {root, ...props} = options;\n\n    return staticsMiddleware(root, props);\n  }\n\n  bodyParser(type: \"json\" | \"raw\" | \"text\" | \"urlencoded\", additionalOptions: any = {}): any {\n    const opts = this.injector.settings.get(`express.bodyParser.${type}`);\n    let parser: any = Express[type];\n    let options: OptionsJson & OptionsText & OptionsUrlencoded = {};\n\n    if (isFunction(opts)) {\n      parser = opts;\n      options = {};\n    }\n\n    switch (type) {\n      case \"urlencoded\":\n        options.extended = true;\n        break;\n      case \"raw\":\n        options.type = () => true;\n        break;\n    }\n\n    return parser({...options, ...additionalOptions});\n  }\n\n  private async configureViewsEngine() {\n    const injector = this.injector;\n    const app = this.injector.get<PlatformApplication<Express.Application>>(PlatformApplication)!;\n\n    try {\n      const {exists, disabled} = this.injector.settings.get(\"views\") || {};\n\n      if (exists && !disabled) {\n        const {PlatformViews} = await import(\"@tsed/platform-views\");\n        const platformViews = injector.get<PlatformViews>(PlatformViews)!;\n        const express = app.getApp();\n\n        platformViews.getEngines().forEach(({extension, engine}) => {\n          express.engine(extension, engine.render);\n        });\n\n        platformViews.viewEngine && express.set(\"view engine\", platformViews.viewEngine);\n        platformViews.root && express.set(\"views\", platformViews.root);\n      }\n    } catch (error) {\n      // istanbul ignore next\n      injector.logger.warn({\n        event: \"PLATFORM_VIEWS_ERROR\",\n        message: \"Unable to configure the PlatformViews service on your environment.\",\n        error\n      });\n    }\n  }\n}\n"]}

package/lib/esm/components/PlatformExpress.js

@@ -1,11 +1,11 @@
-import Express from "express";
 import { createContext, PlatformApplication, PlatformBuilder, PlatformExceptions, PlatformHandler, PlatformRequest, PlatformResponse } from "@tsed/common";
-import { promisify } from "util";
 import { Env, isFunction, nameOf } from "@tsed/core";
+import Express from "express";
+import { promisify } from "util";
+import { staticsMiddleware } from "../middlewares/staticsMiddleware.js";
 import { PlatformExpressHandler } from "../services/PlatformExpressHandler.js";
-import { PlatformExpressResponse } from "../services/PlatformExpressResponse.js";
 import { PlatformExpressRequest } from "../services/PlatformExpressRequest.js";
-import { staticsMiddleware } from "../middlewares/staticsMiddleware.js";
+import { PlatformExpressResponse } from "../services/PlatformExpressResponse.js";
 /**
  * @platform
  * @express
@@ -96,8 +96,8 @@ export class PlatformExpress {
         const invoke = createContext(this.injector);
         const app = this.injector.get(PlatformApplication);
         app.getApp().use(async (request, response, next) => {
-            const $ctx = await invoke({ request, response });
-            return $ctx.runInContext(next);
+            await invoke({ request, response });
+            return next();
         });
         return this;
     }

package/lib/esm/components/PlatformExpress.js.map

@@ -1 +1 @@
-{"version":3,"file":"PlatformExpress.js","sourceRoot":"","sources":["../../../src/components/PlatformExpress.ts"],"names":[],"mappings":"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","sourcesContent":["import type multer from \"multer\";\nimport Express, {RouterOptions} from \"express\";\nimport type {PlatformViews} from \"@tsed/platform-views\";\nimport {\n  createContext,\n  InjectorService,\n  PlatformAdapter,\n  PlatformApplication,\n  PlatformBuilder,\n  PlatformContext,\n  PlatformExceptions,\n  PlatformHandler,\n  PlatformMulter,\n  PlatformMulterSettings,\n  PlatformRequest,\n  PlatformResponse,\n  PlatformStaticsOptions,\n  runInContext\n} from \"@tsed/common\";\nimport {promisify} from \"util\";\nimport {Env, isFunction, nameOf, Type} from \"@tsed/core\";\nimport {PlatformExpressHandler} from \"../services/PlatformExpressHandler\";\nimport {PlatformExpressResponse} from \"../services/PlatformExpressResponse\";\nimport {PlatformExpressRequest} from \"../services/PlatformExpressRequest\";\nimport {staticsMiddleware} from \"../middlewares/staticsMiddleware\";\nimport {PlatformExpressStaticsOptions} from \"../interfaces/PlatformExpressStaticsOptions\";\nimport {OptionsJson, OptionsText, OptionsUrlencoded} from \"body-parser\";\n\ndeclare module \"express\" {\n  export interface Request {\n    id: string;\n    $ctx: PlatformContext;\n  }\n}\n\ndeclare global {\n  namespace TsED {\n    export interface Router extends Express.Router {}\n\n    export interface Application extends Express.Application {}\n\n    export interface StaticsOptions extends PlatformExpressStaticsOptions {}\n\n    export interface Request extends Express.Request {\n      id: string;\n      $ctx: PlatformContext;\n    }\n  }\n}\n\n/**\n * @platform\n * @express\n */\nexport class PlatformExpress implements PlatformAdapter<Express.Application, Express.Router> {\n  readonly providers = [\n    {\n      provide: PlatformHandler,\n      useClass: PlatformExpressHandler\n    },\n    {\n      provide: PlatformResponse,\n      useClass: PlatformExpressResponse\n    },\n    {\n      provide: PlatformRequest,\n      useClass: PlatformExpressRequest\n    }\n  ];\n  #multer: typeof multer;\n\n  constructor(protected injector: InjectorService) {\n    import(\"multer\").then(({default: multer}) => (this.#multer = multer));\n  }\n\n  /**\n   * Create new serverless application. In this mode, the component scan are disabled.\n   * @param module\n   * @param settings\n   */\n  static create(module: Type<any>, settings: Partial<TsED.Configuration> = {}) {\n    return PlatformBuilder.create<Express.Application, Express.Router>(module, {\n      ...settings,\n      adapter: PlatformExpress\n    });\n  }\n\n  /**\n   * Bootstrap a server application\n   * @param module\n   * @param settings\n   */\n  static async bootstrap(module: Type<any>, settings: Partial<TsED.Configuration> = {}) {\n    return PlatformBuilder.bootstrap<Express.Application, Express.Router>(module, {\n      ...settings,\n      adapter: PlatformExpress\n    });\n  }\n\n  onInit() {\n    const middlewares = this.injector.settings.get(\"middlewares\", []);\n\n    this.injector.settings.set(\n      \"middlewares\",\n      middlewares.filter((middleware) => {\n        const name = nameOf(middleware);\n        if ([\"textParser\", \"jsonParser\", \"rawParser\", \"urlencodedParser\"].includes(name)) {\n          this.injector.settings.set(`express.bodyParser.${name.replace(\"Parser\", \"\")}`, () => middleware);\n          return false;\n        }\n\n        return true;\n      })\n    );\n  }\n\n  useRouter(): this {\n    const {logger} = this.injector;\n    const app = this.injector.get<PlatformApplication<Express.Application>>(PlatformApplication)!;\n\n    logger.debug(\"Mount app router\");\n    app.getApp().use(app.getRouter());\n\n    return this;\n  }\n\n  async beforeLoadRoutes() {\n    const injector = this.injector;\n    const app = this.injector.get<PlatformApplication<Express.Application>>(PlatformApplication)!;\n\n    // disable x-powered-by header\n    injector.settings.get(\"env\") === Env.PROD && app.getApp().disable(\"x-powered-by\");\n\n    await this.configureViewsEngine();\n  }\n\n  async afterLoadRoutes() {\n    const injector = this.injector;\n    const app = this.injector.get<PlatformApplication<Express.Application>>(PlatformApplication)!;\n\n    // NOT FOUND\n    app.use((req: any, res: any, next: any) => {\n      !res.headersSent && injector.get<PlatformExceptions>(PlatformExceptions)?.resourceNotFound(req.$ctx);\n    });\n\n    // EXCEPTION FILTERS\n    app.use((err: any, req: any, res: any, next: any) => {\n      !res.headersSent && injector.get<PlatformExceptions>(PlatformExceptions)?.catch(err, req.$ctx);\n    });\n  }\n\n  useContext(): this {\n    const {logger} = this.injector;\n\n    logger.debug(\"Mount app context\");\n\n    const invoke = createContext(this.injector);\n    const app = this.injector.get<PlatformApplication<Express.Application>>(PlatformApplication)!;\n\n    app.getApp().use(async (request: any, response: any, next: any) => {\n      const $ctx = await invoke({request, response});\n\n      return $ctx.runInContext(next);\n    });\n\n    return this;\n  }\n\n  multipart(options: PlatformMulterSettings): PlatformMulter {\n    const m = this.#multer(options);\n\n    const makePromise = (multer: any, name: string) => {\n      // istanbul ignore next\n      if (!multer[name]) return;\n\n      const fn = multer[name];\n\n      multer[name] = function apply(...args: any[]) {\n        const middleware = Reflect.apply(fn, this, args);\n\n        return (req: any, res: any) => promisify(middleware)(req, res);\n      };\n    };\n\n    makePromise(m, \"any\");\n    makePromise(m, \"array\");\n    makePromise(m, \"fields\");\n    makePromise(m, \"none\");\n    makePromise(m, \"single\");\n\n    return m;\n  }\n\n  app() {\n    const app = this.injector.settings.get(\"express.app\") || Express();\n    return {\n      app,\n      callback() {\n        return app;\n      }\n    };\n  }\n\n  router(routerOptions: Partial<RouterOptions> = {}) {\n    const options = Object.assign(\n      {\n        mergeParams: true\n      },\n      this.injector.settings.get(\"express.router\", {}),\n      routerOptions\n    );\n\n    const router = Express.Router(options);\n\n    return {\n      router,\n      callback() {\n        return router;\n      }\n    };\n  }\n\n  statics(endpoint: string, options: PlatformStaticsOptions) {\n    const {root, ...props} = options;\n\n    return staticsMiddleware(root, props);\n  }\n\n  bodyParser(type: \"json\" | \"raw\" | \"text\" | \"urlencoded\", additionalOptions: any = {}): any {\n    const opts = this.injector.settings.get(`express.bodyParser.${type}`);\n    let parser: any = Express[type];\n    let options: OptionsJson & OptionsText & OptionsUrlencoded = {};\n\n    if (isFunction(opts)) {\n      parser = opts;\n      options = {};\n    }\n\n    switch (type) {\n      case \"urlencoded\":\n        options.extended = true;\n        break;\n      case \"raw\":\n        options.type = () => true;\n        break;\n    }\n\n    return parser({...options, ...additionalOptions});\n  }\n\n  private async configureViewsEngine() {\n    const injector = this.injector;\n    const app = this.injector.get<PlatformApplication<Express.Application>>(PlatformApplication)!;\n\n    try {\n      const {exists, disabled} = this.injector.settings.get(\"views\") || {};\n\n      if (exists && !disabled) {\n        const {PlatformViews} = await import(\"@tsed/platform-views\");\n        const platformViews = injector.get<PlatformViews>(PlatformViews)!;\n        const express = app.getApp();\n\n        platformViews.getEngines().forEach(({extension, engine}) => {\n          express.engine(extension, engine.render);\n        });\n\n        platformViews.viewEngine && express.set(\"view engine\", platformViews.viewEngine);\n        platformViews.root && express.set(\"views\", platformViews.root);\n      }\n    } catch (error) {\n      // istanbul ignore next\n      injector.logger.warn({\n        event: \"PLATFORM_VIEWS_ERROR\",\n        message: \"Unable to configure the PlatformViews service on your environment.\",\n        error\n      });\n    }\n  }\n}\n"]}
+{"version":3,"file":"PlatformExpress.js","sourceRoot":"","sources":["../../../src/components/PlatformExpress.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  createContext,\n  InjectorService,\n  PlatformAdapter,\n  PlatformApplication,\n  PlatformBuilder,\n  PlatformContext,\n  PlatformExceptions,\n  PlatformHandler,\n  PlatformMulter,\n  PlatformMulterSettings,\n  PlatformRequest,\n  PlatformResponse,\n  PlatformStaticsOptions\n} from \"@tsed/common\";\nimport {Env, isFunction, nameOf, Type} from \"@tsed/core\";\nimport type {PlatformViews} from \"@tsed/platform-views\";\nimport {OptionsJson, OptionsText, OptionsUrlencoded} from \"body-parser\";\nimport Express, {RouterOptions} from \"express\";\nimport type multer from \"multer\";\nimport {promisify} from \"util\";\nimport {PlatformExpressStaticsOptions} from \"../interfaces/PlatformExpressStaticsOptions\";\nimport {staticsMiddleware} from \"../middlewares/staticsMiddleware\";\nimport {PlatformExpressHandler} from \"../services/PlatformExpressHandler\";\nimport {PlatformExpressRequest} from \"../services/PlatformExpressRequest\";\nimport {PlatformExpressResponse} from \"../services/PlatformExpressResponse\";\n\ndeclare module \"express\" {\n  export interface Request {\n    id: string;\n    $ctx: PlatformContext;\n  }\n}\n\ndeclare global {\n  namespace TsED {\n    export interface Router extends Express.Router {}\n\n    export interface Application extends Express.Application {}\n\n    export interface StaticsOptions extends PlatformExpressStaticsOptions {}\n\n    export interface Request extends Express.Request {\n      id: string;\n      $ctx: PlatformContext;\n    }\n  }\n}\n\n/**\n * @platform\n * @express\n */\nexport class PlatformExpress implements PlatformAdapter<Express.Application, Express.Router> {\n  readonly providers = [\n    {\n      provide: PlatformHandler,\n      useClass: PlatformExpressHandler\n    },\n    {\n      provide: PlatformResponse,\n      useClass: PlatformExpressResponse\n    },\n    {\n      provide: PlatformRequest,\n      useClass: PlatformExpressRequest\n    }\n  ];\n  #multer: typeof multer;\n\n  constructor(protected injector: InjectorService) {\n    import(\"multer\").then(({default: multer}) => (this.#multer = multer));\n  }\n\n  /**\n   * Create new serverless application. In this mode, the component scan are disabled.\n   * @param module\n   * @param settings\n   */\n  static create(module: Type<any>, settings: Partial<TsED.Configuration> = {}) {\n    return PlatformBuilder.create<Express.Application, Express.Router>(module, {\n      ...settings,\n      adapter: PlatformExpress\n    });\n  }\n\n  /**\n   * Bootstrap a server application\n   * @param module\n   * @param settings\n   */\n  static async bootstrap(module: Type<any>, settings: Partial<TsED.Configuration> = {}) {\n    return PlatformBuilder.bootstrap<Express.Application, Express.Router>(module, {\n      ...settings,\n      adapter: PlatformExpress\n    });\n  }\n\n  onInit() {\n    const middlewares = this.injector.settings.get(\"middlewares\", []);\n\n    this.injector.settings.set(\n      \"middlewares\",\n      middlewares.filter((middleware) => {\n        const name = nameOf(middleware);\n        if ([\"textParser\", \"jsonParser\", \"rawParser\", \"urlencodedParser\"].includes(name)) {\n          this.injector.settings.set(`express.bodyParser.${name.replace(\"Parser\", \"\")}`, () => middleware);\n          return false;\n        }\n\n        return true;\n      })\n    );\n  }\n\n  useRouter(): this {\n    const {logger} = this.injector;\n    const app = this.injector.get<PlatformApplication<Express.Application>>(PlatformApplication)!;\n\n    logger.debug(\"Mount app router\");\n    app.getApp().use(app.getRouter());\n\n    return this;\n  }\n\n  async beforeLoadRoutes() {\n    const injector = this.injector;\n    const app = this.injector.get<PlatformApplication<Express.Application>>(PlatformApplication)!;\n\n    // disable x-powered-by header\n    injector.settings.get(\"env\") === Env.PROD && app.getApp().disable(\"x-powered-by\");\n\n    await this.configureViewsEngine();\n  }\n\n  async afterLoadRoutes() {\n    const injector = this.injector;\n    const app = this.injector.get<PlatformApplication<Express.Application>>(PlatformApplication)!;\n\n    // NOT FOUND\n    app.use((req: any, res: any, next: any) => {\n      !res.headersSent && injector.get<PlatformExceptions>(PlatformExceptions)?.resourceNotFound(req.$ctx);\n    });\n\n    // EXCEPTION FILTERS\n    app.use((err: any, req: any, res: any, next: any) => {\n      !res.headersSent && injector.get<PlatformExceptions>(PlatformExceptions)?.catch(err, req.$ctx);\n    });\n  }\n\n  useContext(): this {\n    const {logger} = this.injector;\n\n    logger.debug(\"Mount app context\");\n\n    const invoke = createContext(this.injector);\n    const app = this.injector.get<PlatformApplication<Express.Application>>(PlatformApplication)!;\n\n    app.getApp().use(async (request: any, response: any, next: any) => {\n      await invoke({request, response});\n\n      return next();\n    });\n\n    return this;\n  }\n\n  multipart(options: PlatformMulterSettings): PlatformMulter {\n    const m = this.#multer(options);\n\n    const makePromise = (multer: any, name: string) => {\n      // istanbul ignore next\n      if (!multer[name]) return;\n\n      const fn = multer[name];\n\n      multer[name] = function apply(...args: any[]) {\n        const middleware = Reflect.apply(fn, this, args);\n\n        return (req: any, res: any) => promisify(middleware)(req, res);\n      };\n    };\n\n    makePromise(m, \"any\");\n    makePromise(m, \"array\");\n    makePromise(m, \"fields\");\n    makePromise(m, \"none\");\n    makePromise(m, \"single\");\n\n    return m;\n  }\n\n  app() {\n    const app = this.injector.settings.get(\"express.app\") || Express();\n    return {\n      app,\n      callback() {\n        return app;\n      }\n    };\n  }\n\n  router(routerOptions: Partial<RouterOptions> = {}) {\n    const options = Object.assign(\n      {\n        mergeParams: true\n      },\n      this.injector.settings.get(\"express.router\", {}),\n      routerOptions\n    );\n\n    const router = Express.Router(options);\n\n    return {\n      router,\n      callback() {\n        return router;\n      }\n    };\n  }\n\n  statics(endpoint: string, options: PlatformStaticsOptions) {\n    const {root, ...props} = options;\n\n    return staticsMiddleware(root, props);\n  }\n\n  bodyParser(type: \"json\" | \"raw\" | \"text\" | \"urlencoded\", additionalOptions: any = {}): any {\n    const opts = this.injector.settings.get(`express.bodyParser.${type}`);\n    let parser: any = Express[type];\n    let options: OptionsJson & OptionsText & OptionsUrlencoded = {};\n\n    if (isFunction(opts)) {\n      parser = opts;\n      options = {};\n    }\n\n    switch (type) {\n      case \"urlencoded\":\n        options.extended = true;\n        break;\n      case \"raw\":\n        options.type = () => true;\n        break;\n    }\n\n    return parser({...options, ...additionalOptions});\n  }\n\n  private async configureViewsEngine() {\n    const injector = this.injector;\n    const app = this.injector.get<PlatformApplication<Express.Application>>(PlatformApplication)!;\n\n    try {\n      const {exists, disabled} = this.injector.settings.get(\"views\") || {};\n\n      if (exists && !disabled) {\n        const {PlatformViews} = await import(\"@tsed/platform-views\");\n        const platformViews = injector.get<PlatformViews>(PlatformViews)!;\n        const express = app.getApp();\n\n        platformViews.getEngines().forEach(({extension, engine}) => {\n          express.engine(extension, engine.render);\n        });\n\n        platformViews.viewEngine && express.set(\"view engine\", platformViews.viewEngine);\n        platformViews.root && express.set(\"views\", platformViews.root);\n      }\n    } catch (error) {\n      // istanbul ignore next\n      injector.logger.warn({\n        event: \"PLATFORM_VIEWS_ERROR\",\n        message: \"Unable to configure the PlatformViews service on your environment.\",\n        error\n      });\n    }\n  }\n}\n"]}

package/lib/types/components/PlatformExpress.d.ts

@@ -1,10 +1,10 @@
-import Express, { RouterOptions } from "express";
 import { InjectorService, PlatformAdapter, PlatformBuilder, PlatformContext, PlatformHandler, PlatformMulter, PlatformMulterSettings, PlatformRequest, PlatformResponse, PlatformStaticsOptions } from "@tsed/common";
 import { Type } from "@tsed/core";
+import Express, { RouterOptions } from "express";
+import { PlatformExpressStaticsOptions } from "../interfaces/PlatformExpressStaticsOptions";
 import { PlatformExpressHandler } from "../services/PlatformExpressHandler";
-import { PlatformExpressResponse } from "../services/PlatformExpressResponse";
 import { PlatformExpressRequest } from "../services/PlatformExpressRequest";
-import { PlatformExpressStaticsOptions } from "../interfaces/PlatformExpressStaticsOptions";
+import { PlatformExpressResponse } from "../services/PlatformExpressResponse";
 declare module "express" {
     interface Request {
         id: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/platform-express",
-  "version": "6.116.3",
+  "version": "6.116.6",
   "description": "A TypeScript Framework on top of Express",
   "private": false,
   "source": "./src/index.ts",
@@ -57,11 +57,11 @@
     "tslib": "2.4.0"
   },
   "devDependencies": {
-    "@tsed/common": "6.116.3",
-    "@tsed/core": "6.116.3",
-    "@tsed/di": "6.116.3",
-    "@tsed/platform-test-utils": "6.116.3",
-    "@tsed/platform-views": "6.116.3",
+    "@tsed/common": "6.116.6",
+    "@tsed/core": "6.116.6",
+    "@tsed/di": "6.116.6",
+    "@tsed/platform-test-utils": "6.116.6",
+    "@tsed/platform-views": "6.116.6",
     "@types/body-parser": "1.19.2",
     "@types/compression": "1.7.2",
     "@types/cookie-parser": "1.4.2",
@@ -77,14 +77,14 @@
     "method-override": "3.0.0"
   },
   "peerDependencies": {
-    "@tsed/common": "^6.116.3",
-    "@tsed/core": "^6.116.3",
-    "@tsed/di": "^6.116.3",
-    "@tsed/json-mapper": "^6.116.3",
-    "@tsed/logger": ">=6.1.4",
-    "@tsed/openspec": "^6.116.3",
-    "@tsed/platform-views": "^6.116.3",
-    "@tsed/schema": "^6.116.3",
+    "@tsed/common": "^6.116.6",
+    "@tsed/core": "^6.116.6",
+    "@tsed/di": "^6.116.6",
+    "@tsed/json-mapper": "^6.116.6",
+    "@tsed/logger": ">=6.2.0",
+    "@tsed/openspec": "^6.116.6",
+    "@tsed/platform-views": "^6.116.6",
+    "@tsed/schema": "^6.116.6",
     "@types/multer": "^1.4.5",
     "body-parser": "^1.19.0",
     "multer": "^1.4.5-lts.1"