@miqro/core 3.0.1 → 3.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (105) hide show
  1. package/build/cjs/api-router.js +2 -3
  2. package/build/cjs/api-router.js.map +1 -1
  3. package/build/cjs/common/api-router-types.d.ts +4 -2
  4. package/build/cjs/common/api-router-types.js +8 -1
  5. package/build/cjs/common/api-router-types.js.map +1 -1
  6. package/build/cjs/common/api-router-utils.d.ts +2 -4
  7. package/build/cjs/common/api-router-utils.js +64 -46
  8. package/build/cjs/common/api-router-utils.js.map +1 -1
  9. package/build/cjs/common/context.d.ts +1 -1
  10. package/build/cjs/common/context.js +3 -3
  11. package/build/cjs/common/context.js.map +1 -1
  12. package/build/cjs/common/index.d.ts +2 -2
  13. package/build/cjs/common/index.js +2 -2
  14. package/build/cjs/common/index.js.map +1 -1
  15. package/build/cjs/common/logger/constants.d.ts +1 -0
  16. package/build/cjs/common/logger/constants.js +3 -2
  17. package/build/cjs/common/logger/constants.js.map +1 -1
  18. package/build/cjs/common/logger/interfaces.d.ts +1 -1
  19. package/build/cjs/common/logger/logger.js +1 -1
  20. package/build/cjs/common/logger/logger.js.map +1 -1
  21. package/build/cjs/common/logger/transport/console.d.ts +1 -1
  22. package/build/cjs/common/logger/transport/console.js +6 -4
  23. package/build/cjs/common/logger/transport/console.js.map +1 -1
  24. package/build/cjs/common/logger/transport/file.d.ts +1 -1
  25. package/build/cjs/common/logger/transport/file.js +3 -3
  26. package/build/cjs/common/logger/transport/file.js.map +1 -1
  27. package/build/cjs/common/router-default-logger-factory.d.ts +1 -0
  28. package/build/cjs/common/router-default-logger-factory.js +10 -2
  29. package/build/cjs/common/router-default-logger-factory.js.map +1 -1
  30. package/build/cjs/common/router-handler.js +28 -16
  31. package/build/cjs/common/router-handler.js.map +1 -1
  32. package/build/cjs/common/url-utils.d.ts +0 -1
  33. package/build/cjs/common/url-utils.js +8 -7
  34. package/build/cjs/common/url-utils.js.map +1 -1
  35. package/build/cjs/router.d.ts +9 -6
  36. package/build/cjs/router.js +21 -0
  37. package/build/cjs/router.js.map +1 -1
  38. package/build/esm/api-router.js +2 -3
  39. package/build/esm/api-router.js.map +1 -1
  40. package/build/esm/common/api-router-types.d.ts +4 -2
  41. package/build/esm/common/api-router-types.js +7 -0
  42. package/build/esm/common/api-router-types.js.map +1 -1
  43. package/build/esm/common/api-router-utils.d.ts +2 -4
  44. package/build/esm/common/api-router-utils.js +62 -44
  45. package/build/esm/common/api-router-utils.js.map +1 -1
  46. package/build/esm/common/context.d.ts +1 -1
  47. package/build/esm/common/context.js +2 -2
  48. package/build/esm/common/context.js.map +1 -1
  49. package/build/esm/common/index.d.ts +2 -2
  50. package/build/esm/common/index.js +2 -2
  51. package/build/esm/common/index.js.map +1 -1
  52. package/build/esm/common/logger/constants.d.ts +1 -0
  53. package/build/esm/common/logger/constants.js +5 -4
  54. package/build/esm/common/logger/constants.js.map +1 -1
  55. package/build/esm/common/logger/interfaces.d.ts +1 -1
  56. package/build/esm/common/logger/logger.js +1 -1
  57. package/build/esm/common/logger/logger.js.map +1 -1
  58. package/build/esm/common/logger/transport/console.d.ts +1 -1
  59. package/build/esm/common/logger/transport/console.js +4 -2
  60. package/build/esm/common/logger/transport/console.js.map +1 -1
  61. package/build/esm/common/logger/transport/file.d.ts +1 -1
  62. package/build/esm/common/logger/transport/file.js +1 -1
  63. package/build/esm/common/logger/transport/file.js.map +1 -1
  64. package/build/esm/common/router-default-logger-factory.d.ts +1 -0
  65. package/build/esm/common/router-default-logger-factory.js +8 -1
  66. package/build/esm/common/router-default-logger-factory.js.map +1 -1
  67. package/build/esm/common/router-handler.js +28 -16
  68. package/build/esm/common/router-handler.js.map +1 -1
  69. package/build/esm/common/url-utils.d.ts +0 -1
  70. package/build/esm/common/url-utils.js +8 -7
  71. package/build/esm/common/url-utils.js.map +1 -1
  72. package/build/esm/router.d.ts +9 -6
  73. package/build/esm/router.js +21 -0
  74. package/build/esm/router.js.map +1 -1
  75. package/package.json +3 -3
  76. package/src/api-router.ts +2 -3
  77. package/src/common/api-router-types.ts +12 -4
  78. package/src/common/api-router-utils.ts +79 -61
  79. package/src/common/context.ts +3 -2
  80. package/src/common/index.ts +2 -2
  81. package/src/common/logger/constants.ts +5 -4
  82. package/src/common/logger/interfaces.ts +1 -1
  83. package/src/common/logger/logger.ts +1 -1
  84. package/src/common/logger/transport/console.ts +7 -5
  85. package/src/common/logger/transport/file.ts +1 -1
  86. package/src/common/router-default-logger-factory.ts +9 -1
  87. package/src/common/router-handler.ts +27 -16
  88. package/src/common/url-utils.ts +8 -9
  89. package/src/router.ts +33 -6
  90. package/test.out.txt +3535 -0
  91. package/build/cjs/common/feature-router-types.d.ts +0 -12
  92. package/build/cjs/common/feature-router-types.js +0 -5
  93. package/build/cjs/common/feature-router-types.js.map +0 -1
  94. package/build/cjs/feature-router.d.ts +0 -4
  95. package/build/cjs/feature-router.js +0 -90
  96. package/build/cjs/feature-router.js.map +0 -1
  97. package/build/esm/common/feature-router-types.d.ts +0 -12
  98. package/build/esm/common/feature-router-types.js +0 -2
  99. package/build/esm/common/feature-router-types.js.map +0 -1
  100. package/build/esm/feature-router.d.ts +0 -4
  101. package/build/esm/feature-router.js +0 -86
  102. package/build/esm/feature-router.js.map +0 -1
  103. package/src/api-router.unit.test.js +0 -280
  104. package/src/common/feature-router-types.ts +0 -13
  105. package/src/feature-router.ts +0 -82
@@ -5,7 +5,6 @@ const fs_1 = require("fs");
5
5
  const path_1 = require("path");
6
6
  const api_router_utils_1 = require("./common/api-router-utils");
7
7
  const parser_1 = require("@miqro/parser");
8
- const feature_router_1 = require("./feature-router");
9
8
  const api_router_types_1 = require("./common/api-router-types");
10
9
  /**
11
10
  * # APIRouter
@@ -46,8 +45,8 @@ async function APIRouter(options, logger) {
46
45
  throw new Error(`${dirname} not a directory!`);
47
46
  }
48
47
  const apiName = options.apiName !== undefined ? options.apiName : (0, path_1.basename)(dirname);
49
- const apiPath = options.path !== undefined ? options.path : `/${apiName}`;
50
- return (0, feature_router_1.FeatureRouter)(await (0, api_router_utils_1.traverseAPIRouteDir)(apiName.toUpperCase(), dirname, apiPath, undefined, logger), logger);
48
+ const apiPath = options.path !== undefined ? options.path : "";
49
+ return await (0, api_router_utils_1.traverseAPIRouteDir)(apiName.toUpperCase(), dirname, apiPath, undefined, logger);
51
50
  }
52
51
  exports.APIRouter = APIRouter;
53
52
  //# sourceMappingURL=api-router.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"api-router.js","sourceRoot":"","sources":["../../src/api-router.ts"],"names":[],"mappings":";;;AAAA,2BAA2C;AAC3C,+BAAgC;AAChC,gEAAgE;AAEhE,0CAAqC;AACrC,qDAAiD;AAEjD,gEAAoF;AAEpF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACI,KAAK,UAAU,SAAS,CAAC,OAAyB,EAAE,MAAe;IACxE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,cAAK,EAAC,OAAO,EAAE,wCAAqB,EAAE,UAAU,EAAE,SAAS,CAAqB,CAAC;IACrG,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;KACrD;IACD,IAAI,CAAC,IAAA,eAAU,EAAC,OAAO,CAAC,IAAI,CAAC,IAAA,cAAS,EAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;QAC7D,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,mBAAmB,CAAC,CAAC;KAChD;IACD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,eAAQ,EAAC,OAAO,CAAC,CAAC;IACpF,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,OAAO,EAAE,CAAC;IAC1E,OAAO,IAAA,8BAAa,EAAC,MAAM,IAAA,sCAAmB,EAAC,OAAO,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;AACtH,CAAC;AAXD,8BAWC"}
1
+ {"version":3,"file":"api-router.js","sourceRoot":"","sources":["../../src/api-router.ts"],"names":[],"mappings":";;;AAAA,2BAA2C;AAC3C,+BAAgC;AAChC,gEAAgE;AAEhE,0CAAqC;AAErC,gEAAoF;AAEpF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACI,KAAK,UAAU,SAAS,CAAC,OAAyB,EAAE,MAAe;IACxE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,cAAK,EAAC,OAAO,EAAE,wCAAqB,EAAE,UAAU,EAAE,SAAS,CAAqB,CAAC;IACrG,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;KACrD;IACD,IAAI,CAAC,IAAA,eAAU,EAAC,OAAO,CAAC,IAAI,CAAC,IAAA,cAAS,EAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;QAC7D,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,mBAAmB,CAAC,CAAC;KAChD;IACD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,eAAQ,EAAC,OAAO,CAAC,CAAC;IACpF,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/D,OAAO,MAAM,IAAA,sCAAmB,EAAC,OAAO,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;AAC/F,CAAC;AAXD,8BAWC"}
@@ -14,8 +14,9 @@ import { HandlerWithOptions } from "./router-types";
14
14
  * ```
15
15
  */
16
16
  export interface APIRoute extends HandlerWithOptions {
17
- method?: Method | Method[];
18
- path?: string | string[];
17
+ postFolder?: boolean;
18
+ method?: Method | "use" | "USE";
19
+ path?: string;
19
20
  }
20
21
  export interface APIRouterOptions {
21
22
  dirname: string;
@@ -23,3 +24,4 @@ export interface APIRouterOptions {
23
24
  path?: string;
24
25
  }
25
26
  export declare const APIRouterParseOptions: ParseOptionMap;
27
+ export declare const APIRouteValidator: ParseOptionMap;
@@ -1,9 +1,16 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.APIRouterParseOptions = void 0;
3
+ exports.APIRouteValidator = exports.APIRouterParseOptions = void 0;
4
+ const router_types_1 = require("./router-types");
4
5
  exports.APIRouterParseOptions = {
5
6
  dirname: "string",
6
7
  apiName: "string?",
7
8
  path: "string?"
8
9
  };
10
+ exports.APIRouteValidator = {
11
+ ...router_types_1.handlerWithOptionsParseOptions,
12
+ postFolder: "boolean?",
13
+ method: "string?",
14
+ path: "string?"
15
+ };
9
16
  //# sourceMappingURL=api-router-types.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"api-router-types.js","sourceRoot":"","sources":["../../../src/common/api-router-types.ts"],"names":[],"mappings":";;;AA2Ba,QAAA,qBAAqB,GAAmB;IACnD,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,SAAS;CAChB,CAAC"}
1
+ {"version":3,"file":"api-router-types.js","sourceRoot":"","sources":["../../../src/common/api-router-types.ts"],"names":[],"mappings":";;;AAEA,iDAAoF;AA0BvE,QAAA,qBAAqB,GAAmB;IACnD,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,SAAS;CAChB,CAAC;AAEW,QAAA,iBAAiB,GAAmB;IAC/C,GAAG,6CAA8B;IACjC,UAAU,EAAE,UAAU;IACtB,MAAM,EAAE,SAAS;IACjB,IAAI,EAAE,SAAS;CAChB,CAAC"}
@@ -1,5 +1,3 @@
1
1
  import { Logger } from "./logger";
2
- import { ParseOptionMap } from "@miqro/parser";
3
- import { FeatureRouterOptions } from "./feature-router-types.js";
4
- export declare const APIRouteValidator: ParseOptionMap;
5
- export declare function traverseAPIRouteDir(featureName: string, dirname: string, basePath?: string, features?: FeatureRouterOptions, logger?: Logger): Promise<FeatureRouterOptions>;
2
+ import { Router } from "../router";
3
+ export declare function traverseAPIRouteDir(featureName: string, dirname: string, basePath?: string, router?: Router, logger?: Logger): Promise<Router>;
@@ -1,27 +1,20 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.traverseAPIRouteDir = exports.APIRouteValidator = void 0;
3
+ exports.traverseAPIRouteDir = void 0;
4
4
  const fs_1 = require("fs");
5
5
  const path_1 = require("path");
6
- const router_types_1 = require("./router-types");
6
+ const api_router_types_js_1 = require("./api-router-types.js");
7
7
  const parser_1 = require("@miqro/parser");
8
8
  const url_utils_1 = require("./url-utils");
9
- exports.APIRouteValidator = {
10
- ...router_types_1.handlerWithOptionsParseOptions,
11
- method: "string?|string[]?",
12
- path: "string?|string[]?"
13
- };
14
- async function traverseAPIRouteDir(featureName, dirname, basePath = "/", features = {}, logger) {
9
+ const router_1 = require("../router");
10
+ async function traverseAPIRouteDir(featureName, dirname, basePath = "/", router = new router_1.Router(), logger) {
15
11
  if (logger) {
16
12
  logger.trace("loading routes from [%s]", dirname);
17
13
  }
18
14
  const files = (0, fs_1.readdirSync)(dirname);
19
15
  const dirs = files.filter(f => (0, fs_1.lstatSync)((0, path_1.join)(dirname, f)).isDirectory());
20
16
  const methods = files.filter(f => !(0, fs_1.lstatSync)((0, path_1.join)(dirname, f)).isDirectory());
21
- for (const f of dirs) {
22
- const { name } = (0, path_1.parse)(f);
23
- features = await traverseAPIRouteDir(`${featureName}_${name}`.toUpperCase(), (0, path_1.join)(dirname, f), `${basePath}/${name}`, features, logger);
24
- }
17
+ const postFolder = [];
25
18
  for (const f of methods) {
26
19
  const { name, ext } = (0, path_1.parse)(f);
27
20
  if (name !== "index" && ((ext === ".ts" || ext === ".js") && name.slice(-2) !== ".d")) {
@@ -37,21 +30,24 @@ async function traverseAPIRouteDir(featureName, dirname, basePath = "/", feature
37
30
  }
38
31
  //const ___filePath = filePath + ext;
39
32
  const ___filePath = filePath;
40
- let routeMethods = [name];
33
+ //let routeMethods: Method[] = [name] as Method[];
34
+ let routeMethod = name;
41
35
  if (typeof route === "function") {
42
36
  route = {
43
37
  handler: route
44
38
  };
45
39
  }
46
40
  else {
47
- if (typeof route.method !== "undefined" && (!(route.method instanceof Array) && (typeof route.method !== "string"))) {
48
- throw new Error(`${(0, path_1.resolve)(dirname, name)} doesnt export method as a string or string array`);
41
+ if (typeof route.method !== "undefined" && ( /*!(route.method instanceof Array) &&*/(typeof route.method !== "string"))) {
42
+ //throw new Error(`${resolve(dirname, name)} doesnt export method as a string or string array`);
43
+ throw new Error(`${(0, path_1.resolve)(dirname, name)} doesnt export method as a string`);
49
44
  }
50
45
  else if (typeof route.method !== "undefined") {
51
- routeMethods = route.method instanceof Array ? route.method : [route.method];
46
+ routeMethod = route.method; //route.method instanceof Array ? route.method : [route.method];
52
47
  }
53
- if (typeof route.path !== "string" && typeof route.path !== "undefined" && !(route.path instanceof Array)) {
54
- throw new Error(`${(0, path_1.resolve)(dirname, name)} doesnt export path as a string or a string array`);
48
+ if (typeof route.path !== "string" && typeof route.path !== "undefined" /* && !(route.path instanceof Array)*/) {
49
+ //throw new Error(`${resolve(dirname, name)} doesnt export path as a string or a string array`);
50
+ throw new Error(`${(0, path_1.resolve)(dirname, name)} doesnt export path as a string`);
55
51
  }
56
52
  if ((!(route.handler instanceof Array) && typeof route.handler !== "function") || typeof route.handler === "undefined") {
57
53
  throw new Error(`${(0, path_1.resolve)(dirname, name)} doesnt export handler as a function or an array`);
@@ -60,27 +56,30 @@ async function traverseAPIRouteDir(featureName, dirname, basePath = "/", feature
60
56
  throw new Error(`${(0, path_1.resolve)(dirname, name)} doesnt export name as a string`);
61
57
  }
62
58
  }
63
- route = (0, parser_1.parse)(route, exports.APIRouteValidator, "no_extra", ___filePath);
64
- const paths = route.path instanceof Array ? route.path : route.path === undefined ? [route.method && route.method.indexOf(name) === -1 ? `/${name}` : "/"] : [route.path];
65
- for (let i = 0; i < paths.length; i++) {
66
- const p = paths[i];
67
- if (typeof p !== "string" || !p) {
68
- throw new Error(`${(0, path_1.resolve)(dirname, name)} doesnt export path as a string or a string array`);
69
- }
70
- const path = (0, url_utils_1.normalizePath)(`${basePath}${p && p !== "/" ? `${p}` : ""}`);
71
- const subName = (p.charAt(0) === "/" ? p.substring(1) : p).replace(/[^a-z0-9+]+/gi, '_');
72
- const routeName = route.name ? route.name : name;
73
- let newFeatureSubPath = `${featureName}_${route.name ? route.name : name}${routeName !== subName ? `_${subName}` : ""}`.toUpperCase();
74
- newFeatureSubPath = newFeatureSubPath.length > 1 && newFeatureSubPath.charAt(newFeatureSubPath.length - 1) === "_" ? newFeatureSubPath.substring(0, newFeatureSubPath.length - 1) : newFeatureSubPath;
75
- if (features[newFeatureSubPath]) {
76
- throw new Error(`${___filePath} feature name collides with ${features[newFeatureSubPath].___filePath}`);
77
- }
78
- if (newFeatureSubPath === "__prototype__" || newFeatureSubPath === "__proto__") {
79
- throw new Error(`invalid feature name ${newFeatureSubPath}`);
80
- }
81
- features[newFeatureSubPath] = {
82
- options: {
83
- identifier: newFeatureSubPath,
59
+ route = (0, parser_1.parse)(route, api_router_types_js_1.APIRouteValidator, "no_extra", ___filePath);
60
+ //const paths = route.path instanceof Array ? route.path : route.path === undefined ? [route.method && route.method.indexOf(name as Method) === -1 ? `/${name}` : "/"] : [route.path];
61
+ const p = route.path === undefined ? route.method && route.method.indexOf(name) === -1 ? `/${name}` : "/" : route.path;
62
+ //for (let i = 0; i < paths.length; i++) {
63
+ //const p = paths[i];
64
+ if (typeof p !== "string" || !p) {
65
+ throw new Error(`${(0, path_1.resolve)(dirname, name)} doesnt export path as a string or a string array`);
66
+ }
67
+ const path = (0, url_utils_1.normalizePath)(`${basePath}${p && p !== "/" ? `${p}` : ""}`);
68
+ const subName = (p.charAt(0) === "/" ? p.substring(1) : p).replace(/[^a-z0-9+]+/gi, '_');
69
+ const routeName = route.name ? route.name : name;
70
+ //const identifier = route.identifier ? route.identifier : getPathIdentifier(path, routeMethod);
71
+ /*let newFeatureSubPath = `${featureName}_${route.name ? route.name : name}${routeName !== subName ? `_${subName}` : ""}`.toUpperCase();
72
+
73
+ newFeatureSubPath = newFeatureSubPath.length > 1 && newFeatureSubPath.charAt(newFeatureSubPath.length - 1) === "_" ? newFeatureSubPath.substring(0, newFeatureSubPath.length - 1) : newFeatureSubPath;*/
74
+ /*if (features[identifier]) {
75
+ throw new Error(`${___filePath} feature name collides with ${(features[identifier] as any).___filePath}`)
76
+ }*/
77
+ if (route.identifier && route.identifier === "__prototype__" || route.identifier === "__proto__") {
78
+ throw new Error(`invalid feature name ${route.identifier}`);
79
+ }
80
+ if (route.postFolder) {
81
+ postFolder.push([route.handler, path, routeMethod !== "use" && routeMethod !== "USE" ? routeMethod : undefined, {
82
+ identifier: route.identifier,
84
83
  apiName: route.apiName,
85
84
  name: route.name,
86
85
  description: route.description,
@@ -93,16 +92,35 @@ async function traverseAPIRouteDir(featureName, dirname, basePath = "/", feature
93
92
  body: route.response && route.response.body ? route.response.body : true,
94
93
  middleware: route.response && route.response.middleware ? route.response.middleware : undefined
95
94
  }
96
- },
97
- path,
98
- method: routeMethods,
99
- handler: route.handler
100
- };
101
- features[newFeatureSubPath].___filePath = ___filePath;
95
+ }]);
96
+ }
97
+ else {
98
+ router.use(route.handler, path, routeMethod !== "use" && routeMethod !== "USE" ? routeMethod : undefined, {
99
+ identifier: route.identifier,
100
+ apiName: route.apiName,
101
+ name: route.name,
102
+ description: route.description,
103
+ parser: route.parser,
104
+ middleware: route.middleware,
105
+ session: route.session,
106
+ policy: route.policy,
107
+ request: route.request,
108
+ response: {
109
+ body: route.response && route.response.body ? route.response.body : true,
110
+ middleware: route.response && route.response.middleware ? route.response.middleware : undefined
111
+ }
112
+ });
102
113
  }
103
114
  }
104
115
  }
105
- return features;
116
+ for (const f of dirs) {
117
+ const { name } = (0, path_1.parse)(f);
118
+ router = await traverseAPIRouteDir(`${featureName}_${name}`.toUpperCase(), (0, path_1.join)(dirname, f), `${basePath}/${name}`, router, logger);
119
+ }
120
+ for (const post of postFolder) {
121
+ router.use(...post);
122
+ }
123
+ return router;
106
124
  }
107
125
  exports.traverseAPIRouteDir = traverseAPIRouteDir;
108
126
  ;
@@ -1 +1 @@
1
- {"version":3,"file":"api-router-utils.js","sourceRoot":"","sources":["../../../src/common/api-router-utils.ts"],"names":[],"mappings":";;;AAAA,2BAA4C;AAC5C,+BAAyD;AAGzD,iDAAgE;AAChE,0CAAsD;AAGtD,2CAA4C;AAE/B,QAAA,iBAAiB,GAAmB;IAC/C,GAAG,6CAA8B;IACjC,MAAM,EAAE,mBAAmB;IAC3B,IAAI,EAAE,mBAAmB;CAC1B,CAAC;AAEK,KAAK,UAAU,mBAAmB,CACvC,WAAmB,EACnB,OAAe,EACf,QAAQ,GAAG,GAAG,EACd,WAAiC,EAAE,EAAE,MAAe;IACpD,IAAI,MAAM,EAAE;QACV,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,OAAO,CAAC,CAAC;KACnD;IACD,MAAM,KAAK,GAAG,IAAA,gBAAW,EAAC,OAAO,CAAC,CAAC;IACnC,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,cAAS,EAAC,IAAA,WAAI,EAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAA,cAAS,EAAC,IAAA,WAAI,EAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IAC9E,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE;QACpB,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,YAAS,EAAC,CAAC,CAAC,CAAC;QAC9B,QAAQ,GAAG,MAAM,mBAAmB,CAAC,GAAG,WAAW,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,IAAA,WAAI,EAAC,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,QAAQ,IAAI,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;KACzI;IACD,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;QACvB,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,IAAA,YAAS,EAAC,CAAC,CAAC,CAAC;QACnC,IAAI,IAAI,KAAK,OAAO,IAAI,CAAC,CAAC,GAAG,KAAK,KAAK,IAAI,GAAG,KAAK,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,EAAE;YACrF,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YAClC,IAAI,KAAK,GAAa,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC7C,qEAAqE;YACrE,IAAK,KAAa,CAAC,OAAO,EAAE;gBAC1B,KAAK,GAAI,KAAa,CAAC,OAAO,CAAC;gBAC/B,qEAAqE;gBACrE,IAAK,KAAa,CAAC,OAAO,EAAE;oBAC1B,KAAK,GAAI,KAAa,CAAC,OAAO,CAAC;iBAChC;aACF;YACD,qCAAqC;YACrC,MAAM,WAAW,GAAG,QAAQ,CAAC;YAC7B,IAAI,YAAY,GAAa,CAAC,IAAI,CAAa,CAAC;YAChD,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;gBAC/B,KAAK,GAAG;oBACN,OAAO,EAAE,KAAK;iBACR,CAAC;aACV;iBAAM;gBACL,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,WAAW,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,YAAY,KAAK,CAAC,IAAI,CAAC,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,EAAE;oBACnH,MAAM,IAAI,KAAK,CAAC,GAAG,IAAA,cAAO,EAAC,OAAO,EAAE,IAAI,CAAC,mDAAmD,CAAC,CAAC;iBAC/F;qBAAM,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,WAAW,EAAE;oBAC9C,YAAY,GAAG,KAAK,CAAC,MAAM,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;iBAC9E;gBACD,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE;oBACzG,MAAM,IAAI,KAAK,CAAC,GAAG,IAAA,cAAO,EAAC,OAAO,EAAE,IAAI,CAAC,mDAAmD,CAAC,CAAC;iBAC/F;gBACD,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,UAAU,CAAC,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,WAAW,EAAE;oBACtH,MAAM,IAAI,KAAK,CAAC,GAAG,IAAA,cAAO,EAAC,OAAO,EAAE,IAAI,CAAC,kDAAkD,CAAC,CAAC;iBAC9F;gBACD,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE;oBACvE,MAAM,IAAI,KAAK,CAAC,GAAG,IAAA,cAAO,EAAC,OAAO,EAAE,IAAI,CAAC,iCAAiC,CAAC,CAAC;iBAC7E;aACF;YACD,KAAK,GAAG,IAAA,cAAK,EAAC,KAAK,EAAE,yBAAiB,EAAE,UAAU,EAAE,WAAW,CAAa,CAAC;YAC7E,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,IAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACpL,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACrC,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACnB,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,EAAE;oBAC/B,MAAM,IAAI,KAAK,CAAC,GAAG,IAAA,cAAO,EAAC,OAAO,EAAE,IAAI,CAAC,mDAAmD,CAAC,CAAC;iBAC/F;gBACD,MAAM,IAAI,GAAG,IAAA,yBAAa,EAAC,GAAG,QAAQ,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;gBAExE,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;gBACzF,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;gBAEjD,IAAI,iBAAiB,GAAG,GAAG,WAAW,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,SAAS,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,EAAE,CAAC;gBAEtI,iBAAiB,GAAG,iBAAiB,CAAC,MAAM,GAAG,CAAC,IAAI,iBAAiB,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,EAAE,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC;gBACtM,IAAI,QAAQ,CAAC,iBAAiB,CAAC,EAAE;oBAC/B,MAAM,IAAI,KAAK,CAAC,GAAG,WAAW,+BAAgC,QAAQ,CAAC,iBAAiB,CAAS,CAAC,WAAW,EAAE,CAAC,CAAA;iBACjH;gBACD,IAAI,iBAAiB,KAAK,eAAe,IAAI,iBAAiB,KAAK,WAAW,EAAE;oBAC9E,MAAM,IAAI,KAAK,CAAC,wBAAwB,iBAAiB,EAAE,CAAC,CAAC;iBAC9D;gBACD,QAAQ,CAAC,iBAAiB,CAAC,GAAG;oBAC5B,OAAO,EAAE;wBACP,UAAU,EAAE,iBAAiB;wBAC7B,OAAO,EAAE,KAAK,CAAC,OAAO;wBACtB,IAAI,EAAE,KAAK,CAAC,IAAI;wBAChB,WAAW,EAAE,KAAK,CAAC,WAAW;wBAC9B,MAAM,EAAE,KAAK,CAAC,MAAM;wBACpB,UAAU,EAAE,KAAK,CAAC,UAAU;wBAC5B,OAAO,EAAE,KAAK,CAAC,OAAO;wBACtB,MAAM,EAAE,KAAK,CAAC,MAAM;wBACpB,OAAO,EAAE,KAAK,CAAC,OAAO;wBACtB,QAAQ,EAAE;4BACR,IAAI,EAAE,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;4BACxE,UAAU,EAAE,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;yBAChG;qBACF;oBACD,IAAI;oBACJ,MAAM,EAAE,YAAY;oBACpB,OAAO,EAAE,KAAK,CAAC,OAAO;iBACvB,CAAC;gBACD,QAAQ,CAAC,iBAAiB,CAAS,CAAC,WAAW,GAAG,WAAW,CAAC;aAChE;SACF;KACF;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAjGD,kDAiGC;AAAA,CAAC"}
1
+ {"version":3,"file":"api-router-utils.js","sourceRoot":"","sources":["../../../src/common/api-router-utils.ts"],"names":[],"mappings":";;;AAAA,2BAA4C;AAC5C,+BAAyD;AAGzD,+DAAoE;AACpE,0CAAsC;AAEtC,2CAA4C;AAC5C,sCAAmC;AAG5B,KAAK,UAAU,mBAAmB,CACvC,WAAmB,EACnB,OAAe,EACf,QAAQ,GAAG,GAAG,EACd,SAAiB,IAAI,eAAM,EAAE,EAAE,MAAe;IAC9C,IAAI,MAAM,EAAE;QACV,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,OAAO,CAAC,CAAC;KACnD;IACD,MAAM,KAAK,GAAG,IAAA,gBAAW,EAAC,OAAO,CAAC,CAAC;IACnC,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,cAAS,EAAC,IAAA,WAAI,EAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAA,cAAS,EAAC,IAAA,WAAI,EAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IAE9E,MAAM,UAAU,GAA0F,EAAE,CAAC;IAE7G,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;QACvB,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,IAAA,YAAS,EAAC,CAAC,CAAC,CAAC;QACnC,IAAI,IAAI,KAAK,OAAO,IAAI,CAAC,CAAC,GAAG,KAAK,KAAK,IAAI,GAAG,KAAK,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,EAAE;YACrF,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YAClC,IAAI,KAAK,GAAa,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC7C,qEAAqE;YACrE,IAAK,KAAa,CAAC,OAAO,EAAE;gBAC1B,KAAK,GAAI,KAAa,CAAC,OAAO,CAAC;gBAC/B,qEAAqE;gBACrE,IAAK,KAAa,CAAC,OAAO,EAAE;oBAC1B,KAAK,GAAI,KAAa,CAAC,OAAO,CAAC;iBAChC;aACF;YACD,qCAAqC;YACrC,MAAM,WAAW,GAAG,QAAQ,CAAC;YAC7B,kDAAkD;YAClD,IAAI,WAAW,GAA2B,IAAc,CAAC;YACzD,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;gBAC/B,KAAK,GAAG;oBACN,OAAO,EAAE,KAAK;iBACR,CAAC;aACV;iBAAM;gBACL,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,WAAW,IAAI,EAAC,uCAAwC,CAAC,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,EAAE;oBACvH,gGAAgG;oBAChG,MAAM,IAAI,KAAK,CAAC,GAAG,IAAA,cAAO,EAAC,OAAO,EAAE,IAAI,CAAC,mCAAmC,CAAC,CAAC;iBAC/E;qBAAM,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,WAAW,EAAE;oBAC9C,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,CAAA,gEAAgE;iBAC5F;gBACD,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,WAAW,CAAA,sCAAsC,EAAE;oBAC7G,gGAAgG;oBAChG,MAAM,IAAI,KAAK,CAAC,GAAG,IAAA,cAAO,EAAC,OAAO,EAAE,IAAI,CAAC,iCAAiC,CAAC,CAAC;iBAC7E;gBACD,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,UAAU,CAAC,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,WAAW,EAAE;oBACtH,MAAM,IAAI,KAAK,CAAC,GAAG,IAAA,cAAO,EAAC,OAAO,EAAE,IAAI,CAAC,kDAAkD,CAAC,CAAC;iBAC9F;gBACD,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE;oBACvE,MAAM,IAAI,KAAK,CAAC,GAAG,IAAA,cAAO,EAAC,OAAO,EAAE,IAAI,CAAC,iCAAiC,CAAC,CAAC;iBAC7E;aACF;YACD,KAAK,GAAG,IAAA,cAAK,EAAC,KAAK,EAAE,uCAAiB,EAAE,UAAU,EAAE,WAAW,CAAa,CAAC;YAC7E,sLAAsL;YACtL,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,IAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;YACjI,0CAA0C;YAC1C,qBAAqB;YACrB,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,EAAE;gBAC/B,MAAM,IAAI,KAAK,CAAC,GAAG,IAAA,cAAO,EAAC,OAAO,EAAE,IAAI,CAAC,mDAAmD,CAAC,CAAC;aAC/F;YACD,MAAM,IAAI,GAAG,IAAA,yBAAa,EAAC,GAAG,QAAQ,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;YAExE,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;YACzF,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;YAEjD,gGAAgG;YAEhG;;oNAEwM;YACxM;;eAEG;YACH,IAAI,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,UAAU,KAAK,eAAe,IAAI,KAAK,CAAC,UAAU,KAAK,WAAW,EAAE;gBAChG,MAAM,IAAI,KAAK,CAAC,wBAAwB,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;aAC7D;YACD,IAAI,KAAK,CAAC,UAAU,EAAE;gBACpB,UAAU,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,WAAW,KAAK,KAAK,IAAI,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,EAAE;wBAC9G,UAAU,EAAE,KAAK,CAAC,UAAU;wBAC5B,OAAO,EAAE,KAAK,CAAC,OAAO;wBACtB,IAAI,EAAE,KAAK,CAAC,IAAI;wBAChB,WAAW,EAAE,KAAK,CAAC,WAAW;wBAC9B,MAAM,EAAE,KAAK,CAAC,MAAM;wBACpB,UAAU,EAAE,KAAK,CAAC,UAAU;wBAC5B,OAAO,EAAE,KAAK,CAAC,OAAO;wBACtB,MAAM,EAAE,KAAK,CAAC,MAAM;wBACpB,OAAO,EAAE,KAAK,CAAC,OAAO;wBACtB,QAAQ,EAAE;4BACR,IAAI,EAAE,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;4BACxE,UAAU,EAAE,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;yBAChG;qBACF,CAAC,CAAC,CAAC;aACL;iBAAM;gBACL,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,WAAW,KAAK,KAAK,IAAI,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,EAAE;oBACxG,UAAU,EAAE,KAAK,CAAC,UAAU;oBAC5B,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,WAAW,EAAE,KAAK,CAAC,WAAW;oBAC9B,MAAM,EAAE,KAAK,CAAC,MAAM;oBACpB,UAAU,EAAE,KAAK,CAAC,UAAU;oBAC5B,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,MAAM,EAAE,KAAK,CAAC,MAAM;oBACpB,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,QAAQ,EAAE;wBACR,IAAI,EAAE,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;wBACxE,UAAU,EAAE,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;qBAChG;iBACF,CAAC,CAAC;aACJ;SACF;KACF;IACD,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE;QACpB,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,YAAS,EAAC,CAAC,CAAC,CAAC;QAC9B,MAAM,GAAG,MAAM,mBAAmB,CAAC,GAAG,WAAW,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,IAAA,WAAI,EAAC,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,QAAQ,IAAI,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;KACrI;IACD,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE;QAC7B,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;KACrB;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAxHD,kDAwHC;AAAA,CAAC"}
@@ -6,7 +6,6 @@ import { Session } from "./session";
6
6
  import { IncomingHttpHeaders, IncomingMessage, OutgoingHttpHeaders, ServerResponse } from "http";
7
7
  import { CookieSerializeOptions } from "cookie";
8
8
  export type Method = "get" | "post" | "put" | "delete" | "patch" | "options" | "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "OPTIONS";
9
- export declare const IGNORE_HEADER: string[];
10
9
  export interface HandlerResponse {
11
10
  status?: number;
12
11
  headers?: OutgoingHttpHeaders;
@@ -19,6 +18,7 @@ export declare class Context {
19
18
  readonly req: IncomingMessage;
20
19
  readonly res: ServerResponse;
21
20
  readonly logger: Logger;
21
+ static IGNORE_HEADER: string[];
22
22
  readonly startMS: number;
23
23
  session?: Session;
24
24
  results: any[];
@@ -1,9 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.Context = exports.IGNORE_HEADER = void 0;
3
+ exports.Context = void 0;
4
4
  const url_utils_js_1 = require("./url-utils.js");
5
5
  const cookie_1 = require("cookie");
6
- exports.IGNORE_HEADER = ["keep-alive", "connection"];
7
6
  class Context {
8
7
  constructor(uuid, req, res, logger) {
9
8
  this.uuid = uuid;
@@ -76,7 +75,7 @@ class Context {
76
75
  this.res.statusCode = status !== undefined ? status : 200;
77
76
  const keys = Object.keys(headers);
78
77
  for (const key of keys) {
79
- if (exports.IGNORE_HEADER.indexOf(key.toLocaleLowerCase()) !== -1) {
78
+ if (Context.IGNORE_HEADER.indexOf(key.toLocaleLowerCase()) !== -1) {
80
79
  this.logger.warn("ignoring " + key);
81
80
  continue;
82
81
  }
@@ -138,4 +137,5 @@ class Context {
138
137
  }
139
138
  }
140
139
  exports.Context = Context;
140
+ Context.IGNORE_HEADER = ["keep-alive", "connection"];
141
141
  //# sourceMappingURL=context.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/common/context.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/common/context.ts"],"names":[],"mappings":"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"}
@@ -6,6 +6,6 @@ export * from "./session";
6
6
  export * from "./error";
7
7
  export * from "./config";
8
8
  export * from "./logger";
9
- export { normalizePath } from "./url-utils";
10
- export { traverseAPIRouteDir, APIRouteValidator } from "./api-router-utils";
9
+ export { normalizePath, newURL } from "./url-utils";
10
+ export { traverseAPIRouteDir } from "./api-router-utils";
11
11
  export { OldResponseHandler, ResponseHandler } from "./router-utils";
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
14
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
- exports.ResponseHandler = exports.OldResponseHandler = exports.APIRouteValidator = exports.traverseAPIRouteDir = exports.normalizePath = void 0;
17
+ exports.ResponseHandler = exports.OldResponseHandler = exports.traverseAPIRouteDir = exports.newURL = exports.normalizePath = void 0;
18
18
  __exportStar(require("./context"), exports);
19
19
  __exportStar(require("./router-default-logger-factory"), exports);
20
20
  __exportStar(require("./api-router-types"), exports);
@@ -25,9 +25,9 @@ __exportStar(require("./config"), exports);
25
25
  __exportStar(require("./logger"), exports);
26
26
  var url_utils_1 = require("./url-utils");
27
27
  Object.defineProperty(exports, "normalizePath", { enumerable: true, get: function () { return url_utils_1.normalizePath; } });
28
+ Object.defineProperty(exports, "newURL", { enumerable: true, get: function () { return url_utils_1.newURL; } });
28
29
  var api_router_utils_1 = require("./api-router-utils");
29
30
  Object.defineProperty(exports, "traverseAPIRouteDir", { enumerable: true, get: function () { return api_router_utils_1.traverseAPIRouteDir; } });
30
- Object.defineProperty(exports, "APIRouteValidator", { enumerable: true, get: function () { return api_router_utils_1.APIRouteValidator; } });
31
31
  var router_utils_1 = require("./router-utils");
32
32
  Object.defineProperty(exports, "OldResponseHandler", { enumerable: true, get: function () { return router_utils_1.OldResponseHandler; } });
33
33
  Object.defineProperty(exports, "ResponseHandler", { enumerable: true, get: function () { return router_utils_1.ResponseHandler; } });
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,kEAAgD;AAChD,qDAAmC;AACnC,iDAA+B;AAC/B,4CAA0B;AAC1B,0CAAwB;AACxB,2CAAyB;AACzB,2CAAyB;AACzB,yCAA4C;AAAnC,0GAAA,aAAa,OAAA;AACtB,uDAA4E;AAAnE,uHAAA,mBAAmB,OAAA;AAAE,qHAAA,iBAAiB,OAAA;AAC/C,+CAAqE;AAA5D,kHAAA,kBAAkB,OAAA;AAAE,+GAAA,eAAe,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,kEAAgD;AAChD,qDAAmC;AACnC,iDAA+B;AAC/B,4CAA0B;AAC1B,0CAAwB;AACxB,2CAAyB;AACzB,2CAAyB;AACzB,yCAAoD;AAA3C,0GAAA,aAAa,OAAA;AAAE,mGAAA,MAAM,OAAA;AAC9B,uDAAyD;AAAhD,uHAAA,mBAAmB,OAAA;AAC5B,+CAAqE;AAA5D,kHAAA,kBAAkB,OAAA;AAAE,+GAAA,eAAe,OAAA"}
@@ -2,6 +2,7 @@ import { LoggerFormatter, LoggerTransport } from "./interfaces.js";
2
2
  export declare const DEFAULT_LOGGER_TRANSPORTS: () => LoggerTransport[];
3
3
  export declare const DEFAULT_LOGGER_FORMATTER: LoggerFormatter;
4
4
  export declare const LOG_LEVEL_MAP: {
5
+ none: number;
5
6
  error: number;
6
7
  warn: number;
7
8
  info: number;
@@ -4,8 +4,8 @@ exports.LoggerEvents = exports.LOG_LEVEL_MAP = exports.DEFAULT_LOGGER_FORMATTER
4
4
  const file_js_1 = require("./transport/file.js");
5
5
  const console_js_1 = require("./transport/console.js");
6
6
  const DEFAULT_LOGGER_TRANSPORTS = () => [
7
- (0, console_js_1.Console)(),
8
- (0, file_js_1.File)()
7
+ (0, console_js_1.ConsoleTransport)(),
8
+ (0, file_js_1.FileTransport)()
9
9
  ];
10
10
  exports.DEFAULT_LOGGER_TRANSPORTS = DEFAULT_LOGGER_TRANSPORTS;
11
11
  const DEFAULT_LOGGER_FORMATTER = ({ identifier, level, message }) => `${new Date().toISOString()} ${process.pid} ` +
@@ -14,6 +14,7 @@ const DEFAULT_LOGGER_FORMATTER = ({ identifier, level, message }) => `${new Date
14
14
  `${message}`;
15
15
  exports.DEFAULT_LOGGER_FORMATTER = DEFAULT_LOGGER_FORMATTER;
16
16
  exports.LOG_LEVEL_MAP = {
17
+ "none": 0,
17
18
  "error": 1,
18
19
  "warn": 2,
19
20
  "info": 3,
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/common/logger/constants.ts"],"names":[],"mappings":";;;AACA,iDAAyC;AACzC,uDAA+C;AAExC,MAAM,yBAAyB,GAA4B,GAAG,EAAE,CAAC;IACtE,IAAA,oBAAO,GAAE;IACT,IAAA,cAAI,GAAE;CACP,CAAC;AAHW,QAAA,yBAAyB,6BAGpC;AAEK,MAAM,wBAAwB,GACnC,CAAC,EAAC,UAAU,EAAE,KAAK,EAAE,OAAO,EAAC,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,IAAI,OAAO,CAAC,GAAG,GAAG;IAC7E,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;IACzC,GAAG,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;IAClH,GAAG,OAAO,EAAE,CAAC;AAJJ,QAAA,wBAAwB,4BAIpB;AAEJ,QAAA,aAAa,GACxB;IACE,OAAO,EAAE,CAAC;IACV,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,OAAO,EAAE,CAAC;CACX,CAAC;AAES,QAAA,YAAY,GAAG;IAC1B,KAAK,EAAE,OAAO;CACf,CAAC"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/common/logger/constants.ts"],"names":[],"mappings":";;;AACA,iDAAkD;AAClD,uDAAwD;AAEjD,MAAM,yBAAyB,GAA4B,GAAG,EAAE,CAAC;IACtE,IAAA,6BAAgB,GAAE;IAClB,IAAA,uBAAa,GAAE;CAChB,CAAC;AAHW,QAAA,yBAAyB,6BAGpC;AAEK,MAAM,wBAAwB,GACnC,CAAC,EAAC,UAAU,EAAE,KAAK,EAAE,OAAO,EAAC,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,IAAI,OAAO,CAAC,GAAG,GAAG;IAC7E,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;IACzC,GAAG,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;IAClH,GAAG,OAAO,EAAE,CAAC;AAJJ,QAAA,wBAAwB,4BAIpB;AAEJ,QAAA,aAAa,GACxB;IACE,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,OAAO,EAAE,CAAC;CACX,CAAC;AAES,QAAA,YAAY,GAAG;IAC1B,KAAK,EAAE,OAAO;CACf,CAAC"}
@@ -1,4 +1,4 @@
1
- export type LogLevel = "error" | "warn" | "info" | "debug" | "trace";
1
+ export type LogLevel = "error" | "warn" | "info" | "debug" | "trace" | "none";
2
2
  export interface WriteArgs {
3
3
  level: LogLevel;
4
4
  message?: any;
@@ -15,7 +15,7 @@ class Logger extends EventTarget {
15
15
  super();
16
16
  this.identifier = identifier;
17
17
  this.level = level;
18
- if (!constants_js_1.LOG_LEVEL_MAP[level]) {
18
+ if (constants_js_1.LOG_LEVEL_MAP[level] === undefined) {
19
19
  throw new Error(`Unknown level [${level}]`);
20
20
  }
21
21
  this.addEventListener(constants_js_1.LoggerEvents.error, (ev) => {
@@ -1 +1 @@
1
- {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../src/common/logger/logger.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../src/common/logger/logger.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { LoggerTransportWriteArgs, LogLevel } from "../interfaces.js";
2
- export declare function Console(color?: boolean, level?: LogLevel): {
2
+ export declare function ConsoleTransport(color?: boolean, level?: LogLevel): {
3
3
  level: LogLevel | undefined;
4
4
  write: ({ level, out }: LoggerTransportWriteArgs) => Promise<void>;
5
5
  };
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.Console = void 0;
4
- function Console(color = true, level) {
3
+ exports.ConsoleTransport = void 0;
4
+ function ConsoleTransport(color = true, level) {
5
5
  return {
6
6
  level,
7
7
  write: async ({ level, out }) => {
@@ -19,6 +19,8 @@ function Console(color = true, level) {
19
19
  case "debug":
20
20
  console.log("\x1b[36m%s\x1b[0m", out);
21
21
  break;
22
+ case "none":
23
+ break;
22
24
  default:
23
25
  console[level](out);
24
26
  break;
@@ -28,12 +30,12 @@ function Console(color = true, level) {
28
30
  if (level === "trace" || level === "debug") {
29
31
  console.log(out);
30
32
  }
31
- else {
33
+ else if (level !== "none") {
32
34
  console[level](out);
33
35
  }
34
36
  }
35
37
  }
36
38
  };
37
39
  }
38
- exports.Console = Console;
40
+ exports.ConsoleTransport = ConsoleTransport;
39
41
  //# sourceMappingURL=console.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"console.js","sourceRoot":"","sources":["../../../../../src/common/logger/transport/console.ts"],"names":[],"mappings":";;;AAEA,SAAgB,OAAO,CAAC,QAAiB,IAAI,EAAE,KAAgB;IAC7D,OAAO;QACL,KAAK;QACL,KAAK,EAAE,KAAK,EAAE,EAAC,KAAK,EAAE,GAAG,EAA2B,EAAiB,EAAE;YACrE,IAAI,KAAK,EAAE;gBACT,QAAQ,KAAK,EAAE;oBACb,KAAK,MAAM;wBACT,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;wBACvC,MAAM;oBACR,KAAK,OAAO;wBACV,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;wBACxC,MAAM;oBACR,KAAK,OAAO;wBACV,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;wBACtC,MAAM;oBACR,KAAK,OAAO;wBACV,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;wBACtC,MAAM;oBACR;wBACE,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC;wBACpB,MAAM;iBACT;aACF;iBAAM;gBACL,IAAG,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,OAAO,EAAE;oBACzC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;iBAClB;qBAAM;oBACL,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC;iBACrB;aACF;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AA/BD,0BA+BC"}
1
+ {"version":3,"file":"console.js","sourceRoot":"","sources":["../../../../../src/common/logger/transport/console.ts"],"names":[],"mappings":";;;AAEA,SAAgB,gBAAgB,CAAC,QAAiB,IAAI,EAAE,KAAgB;IACtE,OAAO;QACL,KAAK;QACL,KAAK,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,GAAG,EAA4B,EAAiB,EAAE;YACvE,IAAI,KAAK,EAAE;gBACT,QAAQ,KAAK,EAAE;oBACb,KAAK,MAAM;wBACT,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;wBACvC,MAAM;oBACR,KAAK,OAAO;wBACV,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;wBACxC,MAAM;oBACR,KAAK,OAAO;wBACV,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;wBACtC,MAAM;oBACR,KAAK,OAAO;wBACV,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;wBACtC,MAAM;oBACR,KAAK,MAAM;wBACT,MAAM;oBACR;wBACE,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC;wBACpB,MAAM;iBACT;aACF;iBAAM;gBACL,IAAI,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,OAAO,EAAE;oBAC1C,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;iBAClB;qBAAM,IAAI,KAAK,KAAK,MAAM,EAAE;oBAC3B,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC;iBACrB;aACF;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAjCD,4CAiCC"}
@@ -1,2 +1,2 @@
1
1
  import { LoggerTransport, LogLevel } from "../interfaces.js";
2
- export declare const File: (filePath?: string | null, level?: LogLevel) => LoggerTransport;
2
+ export declare const FileTransport: (filePath?: string | null, level?: LogLevel) => LoggerTransport;
@@ -1,10 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.File = void 0;
3
+ exports.FileTransport = void 0;
4
4
  const fs_1 = require("fs");
5
5
  const path_1 = require("path");
6
6
  const FILE_TRANSPORT_ENVVAR = "LOG_FILE";
7
- const File = (filePath = process.env[FILE_TRANSPORT_ENVVAR] ? process.env[FILE_TRANSPORT_ENVVAR] : null, level) => {
7
+ const FileTransport = (filePath = process.env[FILE_TRANSPORT_ENVVAR] ? process.env[FILE_TRANSPORT_ENVVAR] : null, level) => {
8
8
  const fileHandler = filePath ? (0, fs_1.createWriteStream)((0, path_1.resolve)(filePath), { flags: "a" }) : null;
9
9
  return {
10
10
  level,
@@ -25,5 +25,5 @@ const File = (filePath = process.env[FILE_TRANSPORT_ENVVAR] ? process.env[FILE_T
25
25
  }
26
26
  };
27
27
  };
28
- exports.File = File;
28
+ exports.FileTransport = FileTransport;
29
29
  //# sourceMappingURL=file.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"file.js","sourceRoot":"","sources":["../../../../../src/common/logger/transport/file.ts"],"names":[],"mappings":";;;AAAA,2BAAqC;AACrC,+BAA6B;AAG7B,MAAM,qBAAqB,GAAG,UAAU,CAAC;AAElC,MAAM,IAAI,GAAoE,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,KAAgB,EAAE,EAAE;IACnM,MAAM,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,sBAAiB,EAAC,IAAA,cAAO,EAAC,QAAQ,CAAC,EAAE,EAAC,KAAK,EAAE,GAAG,EAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACzF,OAAO;QACL,KAAK;QACL,KAAK,EAAE,KAAK,EAAE,EAAC,GAAG,EAA2B,EAAiB,EAAE;YAC9D,IAAI,WAAW,EAAE;gBACf,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBACrC,WAAW,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE;wBACpC,IAAI,GAAG,EAAE;4BACP,MAAM,CAAC,GAAG,CAAC,CAAC;yBACb;6BAAM;4BACL,OAAO,EAAE,CAAC;yBACX;oBACH,CAAC,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;aACJ;YACD,OAAO;QACT,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,IAAI,QAmBf"}
1
+ {"version":3,"file":"file.js","sourceRoot":"","sources":["../../../../../src/common/logger/transport/file.ts"],"names":[],"mappings":";;;AAAA,2BAAqC;AACrC,+BAA6B;AAG7B,MAAM,qBAAqB,GAAG,UAAU,CAAC;AAElC,MAAM,aAAa,GAAoE,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,KAAgB,EAAE,EAAE;IAC5M,MAAM,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,sBAAiB,EAAC,IAAA,cAAO,EAAC,QAAQ,CAAC,EAAE,EAAC,KAAK,EAAE,GAAG,EAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACzF,OAAO;QACL,KAAK;QACL,KAAK,EAAE,KAAK,EAAE,EAAC,GAAG,EAA2B,EAAiB,EAAE;YAC9D,IAAI,WAAW,EAAE;gBACf,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBACrC,WAAW,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE;wBACpC,IAAI,GAAG,EAAE;4BACP,MAAM,CAAC,GAAG,CAAC,CAAC;yBACb;6BAAM;4BACL,OAAO,EAAE,CAAC;yBACX;oBACH,CAAC,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;aACJ;YACD,OAAO;QACT,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,aAAa,iBAmBxB"}
@@ -1,3 +1,4 @@
1
1
  import { IncomingMessage } from "http";
2
2
  import { Logger } from "./logger";
3
3
  export declare const defaultLoggerFactory: (uuid: string, req: IncomingMessage) => Logger;
4
+ export declare function getPathIdentifier(path: string, method: string): string;
@@ -1,15 +1,17 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.defaultLoggerFactory = void 0;
3
+ exports.getPathIdentifier = exports.defaultLoggerFactory = void 0;
4
4
  const url_utils_1 = require("./url-utils");
5
5
  const logger_1 = require("./logger");
6
6
  const defaultLoggerFactory = (uuid, req) => {
7
7
  let path = "";
8
+ let query = "";
8
9
  let urlParsingError;
9
10
  let method = "GET";
10
11
  let remoteAddress = "";
11
12
  try {
12
13
  const url = (0, url_utils_1.newURL)(req.url ? req.url : "/");
14
+ query = url.searchParams.toString();
13
15
  path = (0, url_utils_1.normalizePath)(url.pathname); // normalized path
14
16
  method = req.method ? req.method.toUpperCase() : "GET";
15
17
  remoteAddress = req.socket.remoteAddress;
@@ -21,7 +23,7 @@ const defaultLoggerFactory = (uuid, req) => {
21
23
  const identifier = `${pathToEnv === "_" ? "" : pathToEnv.substring(1)}${method.toUpperCase()}`;
22
24
  const logger = (0, logger_1.getLogger)(identifier, {
23
25
  formatter: (args) => {
24
- args.message = `${method} ${path}${uuid ? ` [${uuid}]` : ""}${remoteAddress ? ` (${remoteAddress})` : ""} ${args.message}`;
26
+ args.message = `${method} ${path}${query ? `?${query}` : ""}${uuid ? ` [${uuid}]` : ""}${remoteAddress ? ` (${remoteAddress})` : ""} ${args.message}`;
25
27
  return (0, logger_1.DEFAULT_LOGGER_FORMATTER)(args);
26
28
  }
27
29
  }, false);
@@ -31,4 +33,10 @@ const defaultLoggerFactory = (uuid, req) => {
31
33
  return logger;
32
34
  };
33
35
  exports.defaultLoggerFactory = defaultLoggerFactory;
36
+ function getPathIdentifier(path, method) {
37
+ const pathToEnv = path.replace(/[^a-z0-9+]+/gi, '_').toUpperCase();
38
+ const identifier = `${pathToEnv === "_" ? "" : pathToEnv.substring(1)}${method.toUpperCase()}`;
39
+ return identifier;
40
+ }
41
+ exports.getPathIdentifier = getPathIdentifier;
34
42
  //# sourceMappingURL=router-default-logger-factory.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"router-default-logger-factory.js","sourceRoot":"","sources":["../../../src/common/router-default-logger-factory.ts"],"names":[],"mappings":";;;AAEA,2CAAoD;AACpD,qCAAuE;AAEhE,MAAM,oBAAoB,GAAG,CAAC,IAAY,EAAE,GAAoB,EAAU,EAAE;IACjF,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,IAAI,eAAe,CAAC;IACpB,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,aAAa,GAAuB,EAAE,CAAC;IAC3C,IAAI;QACF,MAAM,GAAG,GAAG,IAAA,kBAAM,EAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAQ,CAAC;QACnD,IAAI,GAAG,IAAA,yBAAa,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,kBAAkB;QACtD,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAY,CAAC,CAAC,CAAC,KAAK,CAAC;QACjE,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC;KAC1C;IAAC,OAAO,CAAC,EAAE;QACV,eAAe,GAAG,CAAC,CAAC;KACrB;IACD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;IAC1D,MAAM,UAAU,GAAG,GAAG,SAAS,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;IAE/F,MAAM,MAAM,GAAG,IAAA,kBAAS,EAAC,UAAU,EAAE;QACnC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;YAClB,IAAI,CAAC,OAAO,GAAG,GAAG,MAAM,IAAI,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,aAAa,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAC3H,OAAO,IAAA,iCAAwB,EAAC,IAAI,CAAC,CAAC;QACxC,CAAC;KACF,EAAE,KAAK,CAAC,CAAC;IAEV,IAAI,eAAe,EAAE;QACnB,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;KAC/B;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAA;AA5BY,QAAA,oBAAoB,wBA4BhC"}
1
+ {"version":3,"file":"router-default-logger-factory.js","sourceRoot":"","sources":["../../../src/common/router-default-logger-factory.ts"],"names":[],"mappings":";;;AAEA,2CAAoD;AACpD,qCAAuE;AAEhE,MAAM,oBAAoB,GAAG,CAAC,IAAY,EAAE,GAAoB,EAAU,EAAE;IACjF,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,IAAI,eAAe,CAAC;IACpB,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,aAAa,GAAuB,EAAE,CAAC;IAC3C,IAAI;QACF,MAAM,GAAG,GAAG,IAAA,kBAAM,EAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAQ,CAAC;QACnD,KAAK,GAAG,GAAG,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;QACpC,IAAI,GAAG,IAAA,yBAAa,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,kBAAkB;QACtD,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAY,CAAC,CAAC,CAAC,KAAK,CAAC;QACjE,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC;KAC1C;IAAC,OAAO,CAAC,EAAE;QACV,eAAe,GAAG,CAAC,CAAC;KACrB;IACD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;IAC1D,MAAM,UAAU,GAAG,GAAG,SAAS,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;IAE/F,MAAM,MAAM,GAAG,IAAA,kBAAS,EAAC,UAAU,EAAE;QACnC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;YAClB,IAAI,CAAC,OAAO,GAAG,GAAG,MAAM,IAAI,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,aAAa,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACtJ,OAAO,IAAA,iCAAwB,EAAC,IAAI,CAAC,CAAC;QACxC,CAAC;KACF,EAAE,KAAK,CAAC,CAAC;IAEV,IAAI,eAAe,EAAE;QACnB,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;KAC/B;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAA;AA9BY,QAAA,oBAAoB,wBA8BhC;AAED,SAAgB,iBAAiB,CAAC,IAAY,EAAE,MAAc;IAC5D,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;IACnE,MAAM,UAAU,GAAG,GAAG,SAAS,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;IAC/F,OAAO,UAAU,CAAC;AACpB,CAAC;AAJD,8CAIC"}