@tsed/common 7.0.0-beta.2 → 7.0.0-beta.20

package/lib/esm/utils/getConfiguration.js

@@ -1,11 +1,13 @@
-import { deepMerge, Env, Store } from "@tsed/core";
-import { ProviderScope, ProviderType } from "@tsed/di";
+import { Env, Store } from "@tsed/core";
+import { mergeMount, ProviderScope, ProviderType } from "@tsed/di";
 export function getConfiguration(configuration = {}, module = null) {
+    if (configuration.$$resolved) {
+        return configuration;
+    }
     const store = module ? Store.from(module).get("configuration") || {} : {};
     const env = configuration.env || store.env || process.env.NODE_ENV || Env.DEV;
-    const config = {
-        exclude: ["**/*.spec.ts", "**/*.spec.js"],
-        componentsScan: ["${rootDir}/mvc/**/*.ts", "${rootDir}/services/**/*.ts", "${rootDir}/middlewares/**/*.ts"],
+    return {
+        $$resolved: true,
         env,
         httpPort: 8080,
         httpsPort: false,
@@ -16,11 +18,7 @@ export function getConfiguration(configuration = {}, module = null) {
             ...store.scopes,
             ...configuration.scopes
         },
-        mount: store.mount || configuration.mount
-            ? deepMerge(store.mount || {}, configuration.mount || {})
-            : {
-                "/rest": "${rootDir}/controllers/**/*.ts"
-            },
+        mount: mergeMount(store.mount, configuration.mount),
         logger: {
             debug: false,
             level: env === Env.TEST ? "off" : "info",
@@ -30,9 +28,5 @@ export function getConfiguration(configuration = {}, module = null) {
             jsonIndentation: process.env.NODE_ENV === Env.PROD ? 0 : 2
         }
     };
-    if (!configuration.disableComponentsScan && store.componentsScan && configuration.componentsScan) {
-        config.componentsScan = [...store.componentsScan, ...configuration.componentsScan];
-    }
-    return config;
 }
 //# sourceMappingURL=getConfiguration.js.map

package/lib/esm/utils/getConfiguration.js.map

@@ -1 +1 @@
-{"version":3,"file":"getConfiguration.js","sourceRoot":"","sources":["../../../src/utils/getConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,GAAG,EAAE,KAAK,EAAO,MAAM,YAAY,CAAC;AACvD,OAAO,EAAC,aAAa,EAAE,YAAY,EAAC,MAAM,UAAU,CAAC;AAErD,MAAM,UAAU,gBAAgB,CAAC,gBAAqB,EAAE,EAAE,SAA2B,IAAI;IACvF,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1E,MAAM,GAAG,GAAG,aAAa,CAAC,GAAG,IAAI,KAAK,CAAC,GAAG,IAAK,OAAO,CAAC,GAAG,CAAC,QAAgB,IAAI,GAAG,CAAC,GAAG,CAAC;IAEvF,MAAM,MAAM,GAAG;QACb,OAAO,EAAE,CAAC,cAAc,EAAE,cAAc,CAAC;QACzC,cAAc,EAAE,CAAC,wBAAwB,EAAE,6BAA6B,EAAE,gCAAgC,CAAC;QAC3G,GAAG;QACH,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,KAAK;QAChB,GAAG,KAAK;QACR,GAAG,aAAa;QAChB,MAAM,EAAE;YACN,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC,SAAS;YAClD,GAAG,KAAK,CAAC,MAAM;YACf,GAAG,aAAa,CAAC,MAAM;SACxB;QACD,KAAK,EACH,KAAK,CAAC,KAAK,IAAI,aAAa,CAAC,KAAK;YAChC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,EAAE,aAAa,CAAC,KAAK,IAAI,EAAE,CAAC;YACzD,CAAC,CAAC;gBACE,OAAO,EAAE,gCAAgC;aAC1C;QACP,MAAM,EAAE;YACN,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM;YACxC,UAAU,EAAE,IAAI;YAChB,GAAG,KAAK,CAAC,MAAM;YACf,GAAG,aAAa,CAAC,MAAM;YACvB,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC3D;KACF,CAAC;IAEF,IAAI,CAAC,aAAa,CAAC,qBAAqB,IAAI,KAAK,CAAC,cAAc,IAAI,aAAa,CAAC,cAAc,EAAE;QAChG,MAAM,CAAC,cAAc,GAAG,CAAC,GAAG,KAAK,CAAC,cAAc,EAAE,GAAG,aAAa,CAAC,cAAc,CAAC,CAAC;KACpF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import {deepMerge, Env, Store, Type} from \"@tsed/core\";\nimport {ProviderScope, ProviderType} from \"@tsed/di\";\n\nexport function getConfiguration(configuration: any = {}, module: Type<any> | null = null) {\n  const store = module ? Store.from(module).get(\"configuration\") || {} : {};\n  const env = configuration.env || store.env || (process.env.NODE_ENV as Env) || Env.DEV;\n\n  const config = {\n    exclude: [\"**/*.spec.ts\", \"**/*.spec.js\"],\n    componentsScan: [\"${rootDir}/mvc/**/*.ts\", \"${rootDir}/services/**/*.ts\", \"${rootDir}/middlewares/**/*.ts\"],\n    env,\n    httpPort: 8080,\n    httpsPort: false,\n    ...store,\n    ...configuration,\n    scopes: {\n      [ProviderType.CONTROLLER]: ProviderScope.SINGLETON,\n      ...store.scopes,\n      ...configuration.scopes\n    },\n    mount:\n      store.mount || configuration.mount\n        ? deepMerge(store.mount || {}, configuration.mount || {})\n        : {\n            \"/rest\": \"${rootDir}/controllers/**/*.ts\"\n          },\n    logger: {\n      debug: false,\n      level: env === Env.TEST ? \"off\" : \"info\",\n      logRequest: true,\n      ...store.logger,\n      ...configuration.logger,\n      jsonIndentation: process.env.NODE_ENV === Env.PROD ? 0 : 2\n    }\n  };\n\n  if (!configuration.disableComponentsScan && store.componentsScan && configuration.componentsScan) {\n    config.componentsScan = [...store.componentsScan, ...configuration.componentsScan];\n  }\n\n  return config;\n}\n"]}
+{"version":3,"file":"getConfiguration.js","sourceRoot":"","sources":["../../../src/utils/getConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAE,KAAK,EAAO,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAC,UAAU,EAAE,aAAa,EAAE,YAAY,EAAC,MAAM,UAAU,CAAC;AAEjE,MAAM,UAAU,gBAAgB,CAAC,gBAAqB,EAAE,EAAE,SAA2B,IAAI;IACvF,IAAI,aAAa,CAAC,UAAU,EAAE;QAC5B,OAAO,aAAa,CAAC;KACtB;IAED,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1E,MAAM,GAAG,GAAG,aAAa,CAAC,GAAG,IAAI,KAAK,CAAC,GAAG,IAAK,OAAO,CAAC,GAAG,CAAC,QAAgB,IAAI,GAAG,CAAC,GAAG,CAAC;IAEvF,OAAO;QACL,UAAU,EAAE,IAAI;QAChB,GAAG;QACH,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,KAAK;QAChB,GAAG,KAAK;QACR,GAAG,aAAa;QAChB,MAAM,EAAE;YACN,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC,SAAS;YAClD,GAAG,KAAK,CAAC,MAAM;YACf,GAAG,aAAa,CAAC,MAAM;SACxB;QACD,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC;QACnD,MAAM,EAAE;YACN,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM;YACxC,UAAU,EAAE,IAAI;YAChB,GAAG,KAAK,CAAC,MAAM;YACf,GAAG,aAAa,CAAC,MAAM;YACvB,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC3D;KACF,CAAC;AACJ,CAAC","sourcesContent":["import {Env, Store, Type} from \"@tsed/core\";\nimport {mergeMount, ProviderScope, ProviderType} from \"@tsed/di\";\n\nexport function getConfiguration(configuration: any = {}, module: Type<any> | null = null) {\n  if (configuration.$$resolved) {\n    return configuration;\n  }\n\n  const store = module ? Store.from(module).get(\"configuration\") || {} : {};\n  const env = configuration.env || store.env || (process.env.NODE_ENV as Env) || Env.DEV;\n\n  return {\n    $$resolved: true,\n    env,\n    httpPort: 8080,\n    httpsPort: false,\n    ...store,\n    ...configuration,\n    scopes: {\n      [ProviderType.CONTROLLER]: ProviderScope.SINGLETON,\n      ...store.scopes,\n      ...configuration.scopes\n    },\n    mount: mergeMount(store.mount, configuration.mount),\n    logger: {\n      debug: false,\n      level: env === Env.TEST ? \"off\" : \"info\",\n      logRequest: true,\n      ...store.logger,\n      ...configuration.logger,\n      jsonIndentation: process.env.NODE_ENV === Env.PROD ? 0 : 2\n    }\n  };\n}\n"]}

package/lib/esm/utils/printRoutes.js

@@ -6,18 +6,20 @@ export function printRoutes(routes) {
         PUT: "blue",
         DELETE: "red",
         PATCH: "magenta",
-        ALL: "cyan"
+        ALL: "cyan",
+        STATICS: "white"
     };
     const list = routes.map((route) => {
-        const obj = route.toJSON();
-        const method = obj.method.toUpperCase();
-        obj.method = {
-            length: method.length,
-            toString: () => {
-                return colorize(method, mapColor[method]);
+        const method = route.method.toUpperCase();
+        return {
+            ...route,
+            method: {
+                length: method.length,
+                toString: () => {
+                    return colorize(method, mapColor[method]);
+                }
             }
         };
-        return obj;
     });
     const str = $log.drawTable(list, {
         padding: 1,

package/lib/esm/utils/printRoutes.js.map

@@ -1 +1 @@
-{"version":3,"file":"printRoutes.js","sourceRoot":"","sources":["../../../src/utils/printRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,QAAQ,EAAC,MAAM,cAAc,CAAC;AAG5C,MAAM,UAAU,WAAW,CAAC,MAA8B;IACxD,MAAM,QAAQ,GAA4B;QACxC,GAAG,EAAE,OAAO;QACZ,IAAI,EAAE,QAAQ;QACd,GAAG,EAAE,MAAM;QACX,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE,MAAM;KACZ,CAAC;IAEF,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAChC,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QAExC,GAAG,CAAC,MAAM,GAAG;YACX,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,QAAQ,EAAE,GAAG,EAAE;gBACb,OAAO,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;YAC5C,CAAC;SACK,CAAC;QAET,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE;QAC/B,OAAO,EAAE,CAAC;QACV,MAAM,EAAE;YACN,MAAM,EAAE,QAAQ;YAChB,GAAG,EAAE,UAAU;YACf,IAAI,EAAE,cAAc;SACrB;KACF,CAAC,CAAC;IAEH,OAAO,IAAI,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;AAC3B,CAAC","sourcesContent":["import {$log, colorize} from \"@tsed/logger\";\nimport {PlatformRouteDetails} from \"../domain/PlatformRouteDetails\";\n\nexport function printRoutes(routes: PlatformRouteDetails[]) {\n  const mapColor: {[key: string]: string} = {\n    GET: \"green\",\n    POST: \"yellow\",\n    PUT: \"blue\",\n    DELETE: \"red\",\n    PATCH: \"magenta\",\n    ALL: \"cyan\"\n  };\n\n  const list = routes.map((route) => {\n    const obj = route.toJSON();\n    const method = obj.method.toUpperCase();\n\n    obj.method = {\n      length: method.length,\n      toString: () => {\n        return colorize(method, mapColor[method]);\n      }\n    } as any;\n\n    return obj;\n  });\n\n  const str = $log.drawTable(list, {\n    padding: 1,\n    header: {\n      method: \"Method\",\n      url: \"Endpoint\",\n      name: \"Class method\"\n    }\n  });\n\n  return \"\\n\" + str.trim();\n}\n"]}
+{"version":3,"file":"printRoutes.js","sourceRoot":"","sources":["../../../src/utils/printRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,QAAQ,EAAC,MAAM,cAAc,CAAC;AAG5C,MAAM,UAAU,WAAW,CAAC,MAA8B;IACxD,MAAM,QAAQ,GAA4B;QACxC,GAAG,EAAE,OAAO;QACZ,IAAI,EAAE,QAAQ;QACd,GAAG,EAAE,MAAM;QACX,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE,MAAM;QACX,OAAO,EAAE,OAAO;KACjB,CAAC;IAEF,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAChC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QAE1C,OAAO;YACL,GAAG,KAAK;YACR,MAAM,EAAE;gBACN,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,QAAQ,EAAE,GAAG,EAAE;oBACb,OAAO,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;gBAC5C,CAAC;aACF;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE;QAC/B,OAAO,EAAE,CAAC;QACV,MAAM,EAAE;YACN,MAAM,EAAE,QAAQ;YAChB,GAAG,EAAE,UAAU;YACf,IAAI,EAAE,cAAc;SACrB;KACF,CAAC,CAAC;IAEH,OAAO,IAAI,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;AAC3B,CAAC","sourcesContent":["import {$log, colorize} from \"@tsed/logger\";\nimport {PlatformRouteDetails} from \"../domain/PlatformRouteDetails\";\n\nexport function printRoutes(routes: PlatformRouteDetails[]) {\n  const mapColor: {[key: string]: string} = {\n    GET: \"green\",\n    POST: \"yellow\",\n    PUT: \"blue\",\n    DELETE: \"red\",\n    PATCH: \"magenta\",\n    ALL: \"cyan\",\n    STATICS: \"white\"\n  };\n\n  const list = routes.map((route) => {\n    const method = route.method.toUpperCase();\n\n    return {\n      ...route,\n      method: {\n        length: method.length,\n        toString: () => {\n          return colorize(method, mapColor[method]);\n        }\n      }\n    };\n  });\n\n  const str = $log.drawTable(list, {\n    padding: 1,\n    header: {\n      method: \"Method\",\n      url: \"Endpoint\",\n      name: \"Class method\"\n    }\n  });\n\n  return \"\\n\" + str.trim();\n}\n"]}

package/lib/esm/utils/setResponseHeaders.js

@@ -1,19 +1,10 @@
-function mergeHeaders(specHeaders, headers) {
-    return Object.entries(specHeaders).reduce((headers, [key, item]) => {
-        key = key.toLowerCase();
-        return {
-            ...headers,
-            [key]: headers[key] === undefined ? String(item.example) : headers[key]
-        };
-    }, headers);
-}
 /**
  * @ignore
  */
 export function setResponseHeaders(ctx) {
     const { response, endpoint } = ctx;
     const { operation } = endpoint;
-    if (response.isDone()) {
+    if (ctx.isDone()) {
         return;
     }
     if (!response.hasStatus()) {
@@ -21,11 +12,14 @@ export function setResponseHeaders(ctx) {
         response.status(operation.getStatus());
     }
     const statusCode = response.statusCode;
-    const headers = operation.getHeadersOf(response.statusCode);
-    const mergedHeaders = mergeHeaders(headers, response.getHeaders());
-    response.setHeaders(mergedHeaders);
+    const headers = operation.getHeadersOf(statusCode);
+    Object.entries(headers).forEach(([key, item]) => {
+        if (!response.get(key)) {
+            response.setHeader(key, String(item.example));
+        }
+    });
     if (operation.isRedirection(statusCode)) {
-        response.redirect(statusCode, String(mergedHeaders["location"]));
+        response.redirect(statusCode, response.get("location"));
     }
 }
 //# sourceMappingURL=setResponseHeaders.js.map

package/lib/esm/utils/setResponseHeaders.js.map

@@ -1 +1 @@
-{"version":3,"file":"setResponseHeaders.js","sourceRoot":"","sources":["../../../src/utils/setResponseHeaders.ts"],"names":[],"mappings":"AAIA,SAAS,YAAY,CAAC,WAA2D,EAAE,OAAoC;IACrH,OAAO,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE;QACjE,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QACxB,OAAO;YACL,GAAG,OAAO;YACV,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC;SACxE,CAAC;IACJ,CAAC,EAAE,OAAO,CAAC,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,GAAoB;IACrD,MAAM,EAAC,QAAQ,EAAE,QAAQ,EAAC,GAAG,GAAG,CAAC;IACjC,MAAM,EAAC,SAAS,EAAC,GAAG,QAAQ,CAAC;IAE7B,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE;QACrB,OAAO;KACR;IAED,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE;QACzB,kDAAkD;QAClD,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC;KACxC;IAED,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;IACvC,MAAM,OAAO,GAAG,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,aAAa,GAAG,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;IAEnE,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IAEnC,IAAI,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE;QACvC,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;KAClE;AACH,CAAC","sourcesContent":["import {JsonHeader} from \"@tsed/schema\";\nimport {PlatformContext} from \"../domain/PlatformContext\";\nimport {HeaderValue} from \"../services/PlatformResponse\";\n\nfunction mergeHeaders(specHeaders: Record<string, JsonHeader & {example: string}>, headers: Record<string, HeaderValue>) {\n  return Object.entries(specHeaders).reduce((headers, [key, item]) => {\n    key = key.toLowerCase();\n    return {\n      ...headers,\n      [key]: headers[key] === undefined ? String(item.example) : headers[key]\n    };\n  }, headers);\n}\n\n/**\n * @ignore\n */\nexport function setResponseHeaders(ctx: PlatformContext) {\n  const {response, endpoint} = ctx;\n  const {operation} = endpoint;\n\n  if (response.isDone()) {\n    return;\n  }\n\n  if (!response.hasStatus()) {\n    // apply status only if the isn't already modified\n    response.status(operation.getStatus());\n  }\n\n  const statusCode = response.statusCode;\n  const headers = operation.getHeadersOf(response.statusCode);\n  const mergedHeaders = mergeHeaders(headers, response.getHeaders());\n\n  response.setHeaders(mergedHeaders);\n\n  if (operation.isRedirection(statusCode)) {\n    response.redirect(statusCode, String(mergedHeaders[\"location\"]));\n  }\n}\n"]}
+{"version":3,"file":"setResponseHeaders.js","sourceRoot":"","sources":["../../../src/utils/setResponseHeaders.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,GAAoB;IACrD,MAAM,EAAC,QAAQ,EAAE,QAAQ,EAAC,GAAG,GAAG,CAAC;IACjC,MAAM,EAAC,SAAS,EAAC,GAAG,QAAQ,CAAC;IAE7B,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE;QAChB,OAAO;KACR;IAED,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE;QACzB,kDAAkD;QAClD,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC;KACxC;IAED,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;IACvC,MAAM,OAAO,GAAG,SAAS,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IAEnD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAQ,EAAE,EAAE;QACrD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACtB,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;SAC/C;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE;QACvC,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;KACzD;AACH,CAAC","sourcesContent":["import {PlatformContext} from \"../domain/PlatformContext\";\n\n/**\n * @ignore\n */\nexport function setResponseHeaders(ctx: PlatformContext) {\n  const {response, endpoint} = ctx;\n  const {operation} = endpoint;\n\n  if (ctx.isDone()) {\n    return;\n  }\n\n  if (!response.hasStatus()) {\n    // apply status only if the isn't already modified\n    response.status(operation.getStatus());\n  }\n\n  const statusCode = response.statusCode;\n  const headers = operation.getHeadersOf(statusCode);\n\n  Object.entries(headers).forEach(([key, item]: any[]) => {\n    if (!response.get(key)) {\n      response.setHeader(key, String(item.example));\n    }\n  });\n\n  if (operation.isRedirection(statusCode)) {\n    response.redirect(statusCode, response.get(\"location\"));\n  }\n}\n"]}

package/lib/types/builder/PlatformBuilder.d.ts

@@ -1,24 +1,26 @@
 /// <reference types="node" />
 import { Type } from "@tsed/core";
-import { InjectorService, IProvider } from "@tsed/di";
+import { InjectorService, ProviderOpts, TokenProvider } from "@tsed/di";
+import { PlatformLayer } from "@tsed/platform-router";
+import type { IncomingMessage, ServerResponse } from "http";
 import { Platform } from "../services/Platform";
+import { PlatformAdapter, PlatformBuilderSettings } from "../services/PlatformAdapter";
 import { PlatformApplication } from "../services/PlatformApplication";
-import { IncomingMessage, ServerResponse } from "http";
-import { PlatformAdapter, PlatformBuilderSettings } from "../interfaces/PlatformAdapter";
 /**
  * @platform
  */
-export declare class PlatformBuilder<App = TsED.Application, Router = TsED.Router> {
+export declare class PlatformBuilder<App = TsED.Application> {
     #private;
-    static adapter: Type<PlatformAdapter>;
+    static adapter: Type<PlatformAdapter<any>>;
     readonly name: string;
     protected startedAt: Date;
     protected current: Date;
-    protected constructor(adapter: Type<PlatformAdapter<App, Router>> | undefined, module: Type, settings: Partial<TsED.Configuration>);
+    protected constructor(adapter: Type<PlatformAdapter<App>> | undefined, module: Type, settings: Partial<TsED.Configuration>);
     get injector(): InjectorService;
     get rootModule(): any;
-    get app(): PlatformApplication<App, Router>;
+    get app(): PlatformApplication<App>;
     get platform(): Platform;
+    get adapter(): PlatformAdapter<App>;
     /**
      * Return the settings configured by the decorator @@Configuration@@.
      *
@@ -40,17 +42,17 @@ export declare class PlatformBuilder<App = TsED.Application, Router = TsED.Route
      *
      * @returns {PlatformConfiguration}
      */
-    get settings(): TsED.Configuration & import("@tsed/di").DIConfiguration;
+    get settings(): import("@tsed/di").DIConfiguration;
     get logger(): import("@tsed/di").DILogger;
-    get disableBootstrapLog(): boolean | undefined;
-    static create<App = TsED.Application, Router = TsED.Router>(module: Type<any>, settings: PlatformBuilderSettings<App, Router>): PlatformBuilder<App, Router>;
-    static build<App = TsED.Application, Router = TsED.Router>(module: Type<any>, { adapter, ...settings }: PlatformBuilderSettings<App, Router>): PlatformBuilder<App, Router>;
+    get disableBootstrapLog(): any;
+    static create<App = TsED.Application>(module: Type<any>, settings: PlatformBuilderSettings<App>): PlatformBuilder<App>;
+    static build<App = TsED.Application>(module: Type<any>, { adapter, ...settings }: PlatformBuilderSettings<App>): PlatformBuilder<App>;
     /**
      * Bootstrap a server application
      * @param module
      * @param settings
      */
-    static bootstrap<App = TsED.Application, Router = TsED.Router>(module: Type<any>, settings: PlatformBuilderSettings<App, Router>): Promise<PlatformBuilder<App, Router>>;
+    static bootstrap<App = TsED.Application>(module: Type<any>, settings: PlatformBuilderSettings<App>): Promise<PlatformBuilder<App>>;
     callback(): (req: IncomingMessage, res: ServerResponse) => void;
     callback(req: IncomingMessage, res: ServerResponse): void;
     log(...data: any[]): any;
@@ -58,7 +60,7 @@ export declare class PlatformBuilder<App = TsED.Application, Router = TsED.Route
      * Add classes to the components list
      * @param classes
      */
-    addComponents(classes: any | any[]): this;
+    addComponents(classes: Type | Type[]): this;
     /**
      * Add classes decorated by @@Controller@@ to components container.
      *
@@ -79,7 +81,7 @@ export declare class PlatformBuilder<App = TsED.Application, Router = TsED.Route
      * @param {string} endpoint
      * @param {any[]} controllers
      */
-    addControllers(endpoint: string, controllers: any | string | (any | string)[]): void;
+    addControllers(endpoint: string, controllers: TokenProvider | TokenProvider[]): void;
     runLifecycle(): Promise<this>;
     loadInjector(): Promise<void>;
     listen(network?: boolean): Promise<void>;
@@ -87,11 +89,11 @@ export declare class PlatformBuilder<App = TsED.Application, Router = TsED.Route
     ready(): Promise<void>;
     callHook(hook: string, ...args: any[]): Promise<void>;
     loadStatics(hook: string): Promise<void>;
-    useProvider(token: Type<any>, settings?: Partial<IProvider>): this;
+    useProvider(token: Type<any>, settings?: Partial<ProviderOpts>): this;
     bootstrap(): Promise<this>;
     protected loadRoutes(): Promise<void>;
+    protected mapRouters(): Promise<void>;
     protected diff(): string;
-    protected importProviders(): Promise<void>;
     /**
      * Load middlewares from configuration for the given hook
      * @param hook
@@ -100,5 +102,5 @@ export declare class PlatformBuilder<App = TsED.Application, Router = TsED.Route
     protected loadMiddlewaresFor(hook: string): void;
     protected createHttpServers(): void;
     protected listenServers(): Promise<void>;
-    protected logRoutes(): Promise<void>;
+    protected logRoutes(layers: PlatformLayer[]): Promise<void>;
 }

package/lib/types/config/interfaces/PlatformLoggerSettings.d.ts

@@ -1,44 +1,3 @@
-export interface PlatformLoggerSettings {
-    /**
-     * Enable debug mode. By default debug is false.
-     */
-    debug?: boolean;
-    /**
-     * Enable info mode. By default debug is false.
-     */
-    level?: "debug" | "info" | "warn" | "error" | "off";
-    /**
-     * Enable log performance tracker and disable log server.
-     */
-    perf?: boolean;
-    /**
-     * List of regexp to ignore log.
-     */
-    ignoreUrlPatterns?: string[];
-    /**
-     * The number of space characters to use as white space in JSON output. Default is 2 (0 in production).
-     */
-    jsonIndentation?: number;
-    /**
-     * A function called for each incoming request to create a request id.
-     * @returns {number}
-     */
-    reqIdBuilder?: (req: TsED.Request) => string;
-    /**
-     * Disable routes table displayed in the logger. By default debug is `false`.
-     */
-    disableRoutesSummary?: boolean;
-    /**
-     * Disable bootstrap log displayed in the logger. By default debug is `false`.
-     */
-    disableBootstrapLog?: boolean;
-    /**
-     * Specify log format. Example: `%[%d{[yyyy-MM-dd hh:mm:ss,SSS}] %p%] %m`. See [@tsed/logger configuration](https://tsedio.github.io/logger/).
-     */
-    format?: string;
-    /**
-     * Specify the log stack size for the context.logger. When the stack.length is reach, the logger is flushed during the request.
-     * Default size is set to 30.
-     */
-    maxStackSize?: number;
+import { DILoggerOptions } from "@tsed/di";
+export interface PlatformLoggerSettings extends DILoggerOptions {
 }

package/lib/types/config/interfaces/PlatformMulterSettings.d.ts

@@ -1,135 +1,11 @@
-/// <reference types="node" />
-import { FileFilterCallback } from "multer";
-import { Readable } from "stream";
+import type multer from "multer";
 declare global {
     namespace TsED {
-        interface MulterFile {
-            /** Name of the form field associated with this file. */
-            fieldname: string;
-            /** Name of the file on the uploader's computer. */
-            originalname: string;
-            /** Value of the `Content-Type` header for this file. */
-            mimetype: string;
-            /** Size of the file in bytes. */
-            size: number;
-            /**
-             * A readable stream of this file. Only available to the `_handleFile`
-             * callback for custom `StorageEngine`s.
-             */
-            stream: Readable;
-            /** `DiskStorage` only: Directory to which this file has been uploaded. */
-            destination: string;
-            /** `DiskStorage` only: Name of this file within `destination`. */
-            filename: string;
-            /** `DiskStorage` only: Full path to the uploaded file. */
-            path: string;
-            /** `MemoryStorage` only: A Buffer containing the entire file. */
-            buffer: Buffer;
-        }
-        interface MulterStorageEngine {
-        }
-        interface MulterOptions {
-            /**
-             * A `StorageEngine` responsible for processing files uploaded via Multer.
-             * Takes precedence over `dest`.
-             */
-            storage?: MulterStorageEngine;
-            /**
-             * The destination directory for uploaded files. If `storage` is not set
-             * and `dest` is, Multer will create a `DiskStorage` instance configured
-             * to store files at `dest` with random filenames.
-             *
-             * Ignored if `storage` is set.
-             */
-            dest?: string;
-            /**
-             * An object specifying various limits on incoming data. This object is
-             * passed to Busboy directly, and the details of properties can be found
-             * at https://github.com/mscdex/busboy#busboy-methods.
-             */
-            limits?: {
-                /** Maximum size of each form field name in bytes. (Default: 100) */
-                fieldNameSize?: number;
-                /** Maximum size of each form field value in bytes. (Default: 1048576) */
-                fieldSize?: number;
-                /** Maximum number of non-file form fields. (Default: Infinity) */
-                fields?: number;
-                /** Maximum size of each file in bytes. (Default: Infinity) */
-                fileSize?: number;
-                /** Maximum number of file fields. (Default: Infinity) */
-                files?: number;
-                /** Maximum number of parts (non-file fields + files). (Default: Infinity) */
-                parts?: number;
-                /** Maximum number of headers. (Default: 2000) */
-                headerPairs?: number;
-            };
-            /** Preserve the full path of the original filename rather than the basename. (Default: false) */
-            preservePath?: boolean;
-            /**
-             * Optional function to control which files are uploaded. This is called
-             * for every file that is processed.
-             *
-             * @param req The Express `Request` object.
-             * @param file Object containing information about the processed file.
-             * @param callback  a function to control which files should be uploaded and which should be skipped.
-             */
-            fileFilter?(req: Request, file: MulterFile, callback: FileFilterCallback): void;
-        }
-        interface MulterField {
-            name: string;
-            maxCount?: number;
-        }
-        type MulterHandler = (req: any, res: any) => Promise<any>;
-        interface Multer {
-            /**
-             * Returns middleware that processes a single file associated with the
-             * given form field.
-             *
-             * The `Request` object will be populated with a `file` object containing
-             * information about the processed file.
-             *
-             * @param fieldName Name of the multipart form field to process.
-             */
-            single(fieldName: string): MulterHandler;
-            /**
-             * Returns middleware that processes multiple files sharing the same field
-             * name.
-             *
-             * The `Request` object will be populated with a `files` array containing
-             * an information object for each processed file.
-             *
-             * @param fieldName Shared name of the multipart form fields to process.
-             * @param maxCount Optional. Maximum number of files to process. (default: Infinity)
-             * @throws `MulterError('LIMIT_UNEXPECTED_FILE')` if more than `maxCount` files are associated with `fieldName`
-             */
-            array(fieldName: string, maxCount?: number): MulterHandler;
-            /**
-             * Returns middleware that processes multiple files associated with the
-             * given form fields.
-             *
-             * The `Request` object will be populated with a `files` object which
-             * maps each field name to an array of the associated file information
-             * objects.
-             *
-             * @param fields Array of `Field` objects describing multipart form fields to process.
-             * @throws `MulterError('LIMIT_UNEXPECTED_FILE')` if more than `maxCount` files are associated with `fieldName` for any field.
-             */
-            fields(fields: MulterField[]): MulterHandler;
-            /**
-             * Returns middleware that processes all files contained in the multipart
-             * request.
-             *
-             * The `Request` object will be populated with a `files` array containing
-             * an information object for each processed file.
-             */
-            any(): MulterHandler;
-            /**
-             * Returns middleware that accepts only non-file multipart form fields.
-             *
-             * @throws `MulterError('LIMIT_UNEXPECTED_FILE')` if any file is encountered.
-             */
-            none(): MulterHandler;
-        }
+        type MulterFile = Express.Multer.File;
+        type MulterStorageEngine = multer.StorageEngine;
+        type MulterOptions = multer.Options;
+        type MulterField = multer.Field;
+        type Multer = multer.Multer;
     }
 }
 export declare type PlatformMulter = TsED.Multer;

package/lib/types/config/services/PlatformConfiguration.d.ts

@@ -1,18 +1,13 @@
 /// <reference types="node" />
-import { Env, getHostInfoFromPort } from "@tsed/core";
-import { DIConfiguration } from "@tsed/di";
+import { getHostInfoFromPort } from "@tsed/core";
+import { DIConfiguration, TokenProvider } from "@tsed/di";
 import Https from "https";
-import { EndpointDirectoriesSettings, PlatformLoggerSettings } from "../interfaces";
 import { ConverterSettings } from "../interfaces/ConverterSettings";
 /**
  * `PlatformConfiguration` contains all information about your Server configuration.
  */
 export declare class PlatformConfiguration extends DIConfiguration {
     constructor();
-    get version(): string;
-    set version(v: string);
-    get rootDir(): string;
-    set rootDir(value: string);
     get port(): string | number | false;
     set port(value: string | number | false);
     get httpsOptions(): Https.ServerOptions;
@@ -21,24 +16,14 @@ export declare class PlatformConfiguration extends DIConfiguration {
     set httpPort(value: string | number | false);
     get httpsPort(): string | number | false;
     set httpsPort(value: string | number | false);
-    get env(): Env;
-    set env(value: Env);
-    get mount(): EndpointDirectoriesSettings;
-    set mount(value: EndpointDirectoriesSettings);
-    get componentsScan(): string[];
-    set componentsScan(value: string[]);
-    get statics(): EndpointDirectoriesSettings;
-    set statics(value: EndpointDirectoriesSettings);
+    get mount(): Record<string, TokenProvider[]>;
+    set mount(value: Record<string, TokenProvider[]>);
+    get statics(): Record<string, (any | string)[]>;
+    set statics(value: Record<string, (any | string)[]>);
     get acceptMimes(): string[];
     set acceptMimes(value: string[]);
-    get debug(): boolean;
-    set debug(debug: boolean);
     get converter(): Partial<ConverterSettings>;
     set converter(options: Partial<ConverterSettings>);
-    get logger(): Partial<PlatformLoggerSettings>;
-    set logger(value: Partial<PlatformLoggerSettings>);
-    get exclude(): string[];
-    set exclude(exclude: string[]);
     get additionalProperties(): boolean;
     /**
      *

package/lib/types/domain/AnyToPromiseWithCtx.d.ts

@@ -1,16 +1,8 @@
 import { AnyPromiseResult, AnyToPromise } from "@tsed/core";
 import { PlatformContext } from "./PlatformContext";
-/**
- * @ignore
- */
-export interface HandlerContextOptions {
-    $ctx: PlatformContext;
-    err?: any;
-}
 export declare class AnyToPromiseWithCtx extends AnyToPromise {
     $ctx: PlatformContext;
-    err: unknown;
-    constructor({ $ctx, err }: HandlerContextOptions);
+    constructor($ctx: PlatformContext);
     isDone(): boolean;
     call(cb: Function): Promise<AnyPromiseResult<any>>;
     destroy(): void;

package/lib/types/domain/EndpointMetadata.d.ts

@@ -1,50 +1 @@
-import { Type } from "@tsed/core";
-import { ParamMetadata } from "@tsed/platform-params";
-import { JsonMethodStore } from "@tsed/schema";
-export interface EndpointViewOptions {
-    path: string;
-    options: any;
-}
-export interface EndpointRedirectOptions {
-    status: number | undefined;
-    url: string;
-}
-/**
- * EndpointMetadata contains metadata about a controller and his method.
- * Each annotation (@Get, @Body...) attached to a method are stored in a endpoint.
- * EndpointMetadata convert this metadata to an array which contain arguments to call an Express method.
- *
- * Example :
- *
- *    @Controller("/my-path")
- *    provide MyClass {
- *
- *        @Get("/")
- *        @Authenticated()
- *        public myMethod(){}
- *    }
- *
- */
-export declare class EndpointMetadata extends JsonMethodStore {
-    get targetName(): string;
-    get params(): ParamMetadata[];
-    get view(): EndpointViewOptions;
-    set view(view: EndpointViewOptions);
-    get acceptMimes(): string[];
-    set acceptMimes(mimes: string[]);
-    /**
-     * Get an endpoint.
-     * @param target
-     * @param propertyKey
-     * @param descriptor
-     */
-    static get(target: Type<any>, propertyKey: string | symbol, descriptor?: PropertyDescriptor): EndpointMetadata;
-    addOperationPath(method: string, path: string | RegExp, options?: any): import("@tsed/schema").JsonOperation;
-    /**
-     * Find the a value at the controller level. Let this value be extended or overridden by the endpoint itself.
-     *
-     * @param key
-     * @returns {any}
-     */
-    get<T = any>(key: any): T;
-}
+export { EndpointMetadata } from "@tsed/schema";

package/lib/types/domain/PlatformContext.d.ts

@@ -1,7 +1,9 @@
 /// <reference types="node" />
-import { ContextMethods, DIContext, DIContextOptions } from "@tsed/di";
+import { DIContext, DIContextOptions } from "@tsed/di";
+import { PlatformHandlerMetadata } from "@tsed/platform-router";
+import { EndpointMetadata } from "@tsed/schema";
 import { IncomingMessage, ServerResponse } from "http";
-import { EndpointMetadata } from "./EndpointMetadata";
+import { IncomingEvent } from "../interfaces/IncomingEvent";
 import { PlatformApplication } from "../services/PlatformApplication";
 import { PlatformRequest } from "../services/PlatformRequest";
 import { PlatformResponse } from "../services/PlatformResponse";
@@ -12,36 +14,48 @@ declare global {
     }
 }
 export interface PlatformContextOptions extends DIContextOptions {
-    event: {
-        response?: ServerResponse;
-        request?: IncomingMessage;
-    };
+    event: IncomingEvent;
     ignoreUrlPatterns?: any[];
     endpoint?: EndpointMetadata;
 }
-export declare class PlatformContext extends DIContext implements ContextMethods {
-    /**
-     * The current @@EndpointMetadata@@ resolved by Ts.ED during the request.
-     */
-    endpoint: EndpointMetadata;
+export declare class PlatformContext<PReq extends PlatformRequest = PlatformRequest, PRes extends PlatformResponse = PlatformResponse> extends DIContext {
+    #private;
+    event: IncomingEvent;
     /**
      * The data return by the previous endpoint if you use multiple handler on the same route. By default data is empty.
      */
     data: any;
+    /**
+     * The error caught by the current handler
+     */
+    error?: unknown;
+    /**
+     *
+     */
+    next?: any;
     /**
      * The current @@PlatformResponse@@.
      */
-    response: PlatformResponse;
+    readonly response: PRes;
     /**
      * The current @@PlatformRequest@@.
      */
-    request: PlatformRequest;
-    private ignoreUrlPatterns;
-    constructor({ event, endpoint, ignoreUrlPatterns, ResponseKlass, RequestKlass, ...options }: PlatformContextOptions);
+    readonly request: PReq;
+    /**
+     * The current @@EndpointMetadata@@ resolved by Ts.ED during the request.
+     */
+    endpoint: EndpointMetadata;
+    /**
+     * The current @@PlatformHandlerMetadata@@ resolved by Ts.ED during the request.
+     */
+    handlerMetadata: PlatformHandlerMetadata;
+    constructor(options: PlatformContextOptions);
     get url(): string;
-    get app(): PlatformApplication<TsED.Application, TsED.Router>;
-    destroy(): Promise<void>;
-    isDone(): boolean;
+    get app(): PlatformApplication<TsED.Application>;
+    start(): Promise<void>;
+    finish(): Promise<void>;
+    isFinished(): boolean;
+    isDone(): any;
     /**
      * Return the framework request instance (Express, Koa, etc...)
      */