@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
@@ -1,14 +1,15 @@
1
- import { File } from "./transport/file.js";
2
- import { Console } from "./transport/console.js";
1
+ import { FileTransport } from "./transport/file.js";
2
+ import { ConsoleTransport } from "./transport/console.js";
3
3
  export const DEFAULT_LOGGER_TRANSPORTS = () => [
4
- Console(),
5
- File()
4
+ ConsoleTransport(),
5
+ FileTransport()
6
6
  ];
7
7
  export const DEFAULT_LOGGER_FORMATTER = ({ identifier, level, message }) => `${new Date().toISOString()} ${process.pid} ` +
8
8
  `${identifier ? `[${identifier}] ` : ""}` +
9
9
  `${level !== "info" ? (level === "error" || level === "warn" ? `[${level.toUpperCase()}] ` : `[${level}] `) : ""}` +
10
10
  `${message}`;
11
11
  export const LOG_LEVEL_MAP = {
12
+ "none": 0,
12
13
  "error": 1,
13
14
  "warn": 2,
14
15
  "info": 3,
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/common/logger/constants.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,qBAAqB,CAAC;AACzC,OAAO,EAAC,OAAO,EAAC,MAAM,wBAAwB,CAAC;AAE/C,MAAM,CAAC,MAAM,yBAAyB,GAA4B,GAAG,EAAE,CAAC;IACtE,OAAO,EAAE;IACT,IAAI,EAAE;CACP,CAAC;AAEF,MAAM,CAAC,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;AAEjB,MAAM,CAAC,MAAM,aAAa,GACxB;IACE,OAAO,EAAE,CAAC;IACV,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,OAAO,EAAE,CAAC;CACX,CAAC;AAEJ,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,KAAK,EAAE,OAAO;CACf,CAAC"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/common/logger/constants.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAC;AAExD,MAAM,CAAC,MAAM,yBAAyB,GAA4B,GAAG,EAAE,CAAC;IACtE,gBAAgB,EAAE;IAClB,aAAa,EAAE;CAChB,CAAC;AAEF,MAAM,CAAC,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;AAEjB,MAAM,CAAC,MAAM,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;AAEJ,MAAM,CAAC,MAAM,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;
@@ -11,7 +11,7 @@ export class Logger extends EventTarget {
11
11
  super();
12
12
  this.identifier = identifier;
13
13
  this.level = level;
14
- if (!LOG_LEVEL_MAP[level]) {
14
+ if (LOG_LEVEL_MAP[level] === undefined) {
15
15
  throw new Error(`Unknown level [${level}]`);
16
16
  }
17
17
  this.addEventListener(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,4 +1,4 @@
1
- export function Console(color = true, level) {
1
+ export function ConsoleTransport(color = true, level) {
2
2
  return {
3
3
  level,
4
4
  write: async ({ level, out }) => {
@@ -16,6 +16,8 @@ export function Console(color = true, level) {
16
16
  case "debug":
17
17
  console.log("\x1b[36m%s\x1b[0m", out);
18
18
  break;
19
+ case "none":
20
+ break;
19
21
  default:
20
22
  console[level](out);
21
23
  break;
@@ -25,7 +27,7 @@ export function Console(color = true, level) {
25
27
  if (level === "trace" || level === "debug") {
26
28
  console.log(out);
27
29
  }
28
- else {
30
+ else if (level !== "none") {
29
31
  console[level](out);
30
32
  }
31
33
  }
@@ -1 +1 @@
1
- {"version":3,"file":"console.js","sourceRoot":"","sources":["../../../../../src/common/logger/transport/console.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,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"}
1
+ {"version":3,"file":"console.js","sourceRoot":"","sources":["../../../../../src/common/logger/transport/console.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,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"}
@@ -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,7 +1,7 @@
1
1
  import { createWriteStream } from "fs";
2
2
  import { resolve } from "path";
3
3
  const FILE_TRANSPORT_ENVVAR = "LOG_FILE";
4
- export const File = (filePath = process.env[FILE_TRANSPORT_ENVVAR] ? process.env[FILE_TRANSPORT_ENVVAR] : null, level) => {
4
+ export const FileTransport = (filePath = process.env[FILE_TRANSPORT_ENVVAR] ? process.env[FILE_TRANSPORT_ENVVAR] : null, level) => {
5
5
  const fileHandler = filePath ? createWriteStream(resolve(filePath), { flags: "a" }) : null;
6
6
  return {
7
7
  level,
@@ -1 +1 @@
1
- {"version":3,"file":"file.js","sourceRoot":"","sources":["../../../../../src/common/logger/transport/file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,IAAI,CAAC;AACrC,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAC;AAG7B,MAAM,qBAAqB,GAAG,UAAU,CAAC;AAEzC,MAAM,CAAC,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,iBAAiB,CAAC,OAAO,CAAC,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"}
1
+ {"version":3,"file":"file.js","sourceRoot":"","sources":["../../../../../src/common/logger/transport/file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,IAAI,CAAC;AACrC,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAC;AAG7B,MAAM,qBAAqB,GAAG,UAAU,CAAC;AAEzC,MAAM,CAAC,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,iBAAiB,CAAC,OAAO,CAAC,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"}
@@ -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;
@@ -2,11 +2,13 @@ import { newURL, normalizePath } from "./url-utils";
2
2
  import { DEFAULT_LOGGER_FORMATTER, getLogger } from "./logger";
3
3
  export const defaultLoggerFactory = (uuid, req) => {
4
4
  let path = "";
5
+ let query = "";
5
6
  let urlParsingError;
6
7
  let method = "GET";
7
8
  let remoteAddress = "";
8
9
  try {
9
10
  const url = newURL(req.url ? req.url : "/");
11
+ query = url.searchParams.toString();
10
12
  path = normalizePath(url.pathname); // normalized path
11
13
  method = req.method ? req.method.toUpperCase() : "GET";
12
14
  remoteAddress = req.socket.remoteAddress;
@@ -18,7 +20,7 @@ export const defaultLoggerFactory = (uuid, req) => {
18
20
  const identifier = `${pathToEnv === "_" ? "" : pathToEnv.substring(1)}${method.toUpperCase()}`;
19
21
  const logger = getLogger(identifier, {
20
22
  formatter: (args) => {
21
- args.message = `${method} ${path}${uuid ? ` [${uuid}]` : ""}${remoteAddress ? ` (${remoteAddress})` : ""} ${args.message}`;
23
+ args.message = `${method} ${path}${query ? `?${query}` : ""}${uuid ? ` [${uuid}]` : ""}${remoteAddress ? ` (${remoteAddress})` : ""} ${args.message}`;
22
24
  return DEFAULT_LOGGER_FORMATTER(args);
23
25
  }
24
26
  }, false);
@@ -27,4 +29,9 @@ export const defaultLoggerFactory = (uuid, req) => {
27
29
  }
28
30
  return logger;
29
31
  };
32
+ export function getPathIdentifier(path, method) {
33
+ const pathToEnv = path.replace(/[^a-z0-9+]+/gi, '_').toUpperCase();
34
+ const identifier = `${pathToEnv === "_" ? "" : pathToEnv.substring(1)}${method.toUpperCase()}`;
35
+ return identifier;
36
+ }
30
37
  //# 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,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,wBAAwB,EAAE,SAAS,EAAU,MAAM,UAAU,CAAC;AAEvE,MAAM,CAAC,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,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAQ,CAAC;QACnD,IAAI,GAAG,aAAa,CAAC,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,SAAS,CAAC,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,wBAAwB,CAAC,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"}
1
+ {"version":3,"file":"router-default-logger-factory.js","sourceRoot":"","sources":["../../../src/common/router-default-logger-factory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,wBAAwB,EAAE,SAAS,EAAU,MAAM,UAAU,CAAC;AAEvE,MAAM,CAAC,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,MAAM,CAAC,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,aAAa,CAAC,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,SAAS,CAAC,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,wBAAwB,CAAC,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;AAED,MAAM,UAAU,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"}
@@ -73,28 +73,40 @@ export class RouterHandler {
73
73
  const router = this.handler[0];
74
74
  router.getJSONDoc(doc, `${prePath}${nPath}`);
75
75
  }
76
- else if (this.options) {
76
+ else {
77
77
  if (!doc[`${prePath}${nPath}`]) {
78
78
  doc[`${prePath}${nPath}`] = Object.create(null);
79
79
  }
80
80
  if (doc[`${prePath}${nPath}`][nMethod]) {
81
81
  throw new Error("cannot create doc routes override each other");
82
82
  }
83
- doc[`${prePath}${nPath}`][nMethod] = {
84
- description: this.options.description,
85
- name: this.options.name,
86
- identifier: this.options.identifier ? this.options.identifier : `${prePath}${nPath}${this.options.name ? this.options.name : ""}${nMethod ? `_${nMethod}` : ""}`.replace(/[^a-z0-9+]+/gi, '_').split("_").map(s => s.trim()).filter(s => s).join("_").toUpperCase(),
87
- policy: this.options.policy,
88
- request: this.options.request ? {
89
- body: this.options.request.body,
90
- headers: this.options.request.headers,
91
- params: this.options.request.params,
92
- query: this.options.request.query,
93
- } : undefined,
94
- response: this.options.response ? {
95
- body: this.options.response.body
96
- } : undefined
97
- };
83
+ if (this.options) {
84
+ doc[`${prePath}${nPath}`][nMethod] = {
85
+ description: this.options.description,
86
+ name: this.options.name,
87
+ identifier: this.options.identifier ? this.options.identifier : `${prePath}${nPath}${this.options.name ? this.options.name : ""}${nMethod ? `_${nMethod}` : ""}`.replace(/[^a-z0-9+]+/gi, '_').split("_").map(s => s.trim()).filter(s => s).join("_").toUpperCase(),
88
+ policy: this.options.policy,
89
+ request: this.options.request ? {
90
+ body: this.options.request.body,
91
+ headers: this.options.request.headers,
92
+ params: this.options.request.params,
93
+ query: this.options.request.query,
94
+ } : undefined,
95
+ response: this.options.response ? {
96
+ body: this.options.response.body
97
+ } : undefined
98
+ };
99
+ }
100
+ else {
101
+ doc[`${prePath}${nPath}`][nMethod] = {
102
+ description: undefined,
103
+ name: undefined,
104
+ identifier: `${prePath}${nPath}${nMethod ? `_${nMethod}` : ""}`.replace(/[^a-z0-9+]+/gi, '_').split("_").map(s => s.trim()).filter(s => s).join("_").toUpperCase(),
105
+ policy: undefined,
106
+ request: undefined,
107
+ response: undefined
108
+ };
109
+ }
98
110
  }
99
111
  return doc;
100
112
  }
@@ -1 +1 @@
1
- {"version":3,"file":"router-handler.js","sourceRoot":"","sources":["../../../src/common/router-handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"router-handler.js","sourceRoot":"","sources":["../../../src/common/router-handler.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,4 @@
1
1
  /// <reference types="node" />
2
- import { URLSearchParams } from "url";
3
2
  export declare const newURL: (input: string) => URL;
4
3
  export declare function normalizePath(path: string): string;
5
4
  export declare function parseSearchParams(search: URLSearchParams): {
@@ -1,16 +1,17 @@
1
1
  export const newURL = (input) => {
2
2
  /*
3
- fix the case where input can be only /+
3
+ remove /+ at the start of the input before using new URL ( it changes the host )
4
4
  */
5
- let isOnlyTrailing = true;
6
- for (let i = 0; i < input.length; i++) {
7
- const c = input.charAt(i);
8
- if (c !== "/") {
9
- isOnlyTrailing = false;
5
+ let slashIndex = 0;
6
+ for (slashIndex = 0; slashIndex < input.length; slashIndex++) {
7
+ if (input.charAt(slashIndex) !== "/") {
10
8
  break;
11
9
  }
12
10
  }
13
- const ret = new URL(isOnlyTrailing ? "/" : input, "http://localhost");
11
+ const removedSlashes = input.substring(0, slashIndex - 1);
12
+ const ret = new URL(input.substring(slashIndex), "http://localhost");
13
+ // restore path
14
+ ret.pathname = `${slashIndex > 0 ? removedSlashes : ""}${ret.pathname}`;
14
15
  return ret;
15
16
  };
16
17
  // adds "/" to the final of path
@@ -1 +1 @@
1
- {"version":3,"file":"url-utils.js","sourceRoot":"","sources":["../../../src/common/url-utils.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,KAAa,EAAO,EAAE;IAC3C;;MAEE;IACF,IAAI,cAAc,GAAG,IAAI,CAAC;IAC1B,KAAI,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAChC,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAG,CAAC,KAAK,GAAG,EAAE;YACZ,cAAc,GAAG,KAAK,CAAC;YACvB,MAAM;SACP;KACF;IACD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IACtE,OAAO,GAAG,CAAC;AACb,CAAC,CAAA;AAED,iCAAiC;AACjC,2EAA2E;AAC3E,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;KACpC;IACD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACnB,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;QACD,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE;YACjC,OAAO,GAAG,IAAI,GAAG,CAAC;SACnB;aAAM;YACL,OAAO,IAAI,CAAC,CAAC,qBAAqB;SACnC;KACF;SAAM,IAAI,IAAI,KAAK,GAAG,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;KAC3C;SAAM;QACL,OAAO,IAAI,CAAC,CAAC,MAAM;KACpB;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,MAAuB;IACvD,MAAM,KAAK,GAA0C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACzE,MAAM,CAAC,OAAO,CAAC,CAAC,KAAa,EAAE,GAAW,EAAE,EAAE;QAC5C,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAE,KAAK,CAAC,GAAG,CAAc,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAW,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAC3I,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC"}
1
+ {"version":3,"file":"url-utils.js","sourceRoot":"","sources":["../../../src/common/url-utils.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,KAAa,EAAO,EAAE;IAC3C;;MAEE;IACF,IAAI,UAAU,GAAG,CAAC,CAAA;IAClB,KAAK,UAAU,GAAG,CAAC,EAAE,UAAU,GAAG,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE;QAC5D,IAAI,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,GAAG,EAAE;YACpC,MAAM;SACP;KACF;IACD,MAAM,cAAc,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC;IAC1D,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,kBAAkB,CAAC,CAAC;IACrE,eAAe;IACf,GAAG,CAAC,QAAQ,GAAG,GAAG,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;IACxE,OAAO,GAAG,CAAC;AACb,CAAC,CAAA;AAED,iCAAiC;AACjC,2EAA2E;AAC3E,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;KACpC;IACD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACnB,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;QACD,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE;YACjC,OAAO,GAAG,IAAI,GAAG,CAAC;SACnB;aAAM;YACL,OAAO,IAAI,CAAC,CAAC,qBAAqB;SACnC;KACF;SAAM,IAAI,IAAI,KAAK,GAAG,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;KAC3C;SAAM;QACL,OAAO,IAAI,CAAC,CAAC,MAAM;KACpB;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,MAAuB;IACvD,MAAM,KAAK,GAA0C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACzE,MAAM,CAAC,OAAO,CAAC,CAAC,KAAa,EAAE,GAAW,EAAE,EAAE;QAC5C,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAE,KAAK,CAAC,GAAG,CAAc,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAW,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAC3I,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC"}
@@ -1,5 +1,6 @@
1
1
  /// <reference types="node" />
2
2
  import { RequestListener } from "http";
3
+ import { Logger } from "./common/logger";
3
4
  import { Context, ErrorHandler, Handler, Method } from "./common/context";
4
5
  import { HandlerWithOptions, MinimalRouter, RouterHandlerOptions, RouterJSONDoc, RouterOptions } from "./common/router-types";
5
6
  import { PathPart, PathPartToken } from "./common/tokenize-match";
@@ -10,14 +11,16 @@ export declare class Router implements MinimalRouter {
10
11
  protected readonly errorHandlers: ErrorHandler[];
11
12
  readonly listener: RequestListener;
12
13
  constructor(config?: RouterOptions | undefined);
13
- get(path: string, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
14
- post(path: string, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
15
- patch(path: string, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
16
- delete(path: string, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
17
- put(path: string, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
18
- options(path: string, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
14
+ get(path: string | undefined, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
15
+ post(path: string | undefined, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
16
+ patch(path: string | undefined, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
17
+ delete(path: string | undefined, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
18
+ put(path: string | undefined, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
19
+ options(path: string | undefined, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
19
20
  use(handler: Array<Handler> | HandlerWithOptions | Handler | MinimalRouter, path?: string, method?: Method, options?: RouterHandlerOptions): Router;
20
21
  catch(errorHandler: Array<ErrorHandler> | ErrorHandler): Router;
21
22
  run(ctx: Context, pathTokens?: PathPart[], prePathTokens?: PathPartToken[]): Promise<boolean>;
22
23
  getJSONDoc(doc?: RouterJSONDoc, prePath?: string): RouterJSONDoc;
24
+ logPaths(logger: Logger): void;
25
+ toString(): string;
23
26
  }
@@ -91,5 +91,26 @@ export class Router {
91
91
  }
92
92
  return doc;
93
93
  }
94
+ logPaths(logger) {
95
+ this.toString().split("\n").forEach(l => logger.info(l));
96
+ }
97
+ toString() {
98
+ let ret = "";
99
+ const doc = this.getJSONDoc();
100
+ const paths = Object.keys(doc);
101
+ for (const path of paths) {
102
+ if (path) {
103
+ const pathData = doc[path];
104
+ const methods = Object.keys(pathData);
105
+ for (const method of methods) {
106
+ if (method) {
107
+ const methodData = pathData[method];
108
+ ret += `${ret === "" ? "" : "\n"}${method}:${path}\n\t${methodData.identifier}${methodData.name ? `\n\t\t${methodData.name}` : ""}${methodData.description ? `\n\t\t${methodData.description}` : ""}`;
109
+ }
110
+ }
111
+ }
112
+ }
113
+ return ret;
114
+ }
94
115
  }
95
116
  //# sourceMappingURL=router.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/router.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/router.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@miqro/core",
3
- "version": "3.0.1",
3
+ "version": "3.0.4",
4
4
  "description": "",
5
5
  "main": "build/cjs/index.js",
6
6
  "types": "build/cjs/index.d.ts",
@@ -10,8 +10,8 @@
10
10
  "prebuild": "rm -Rf build/;",
11
11
  "build": "tsc && tsc -p tsconfig-esm.json",
12
12
  "pretest": "npm run build",
13
- "test": "LOG_LEVEL=debug NODE_ENV=test node --enable-source-maps --test src/**/*.test.js src/*.test.js test/*.test.js",
14
- "coverage": "node --enable-source-maps --experimental-test-coverage --test src/**/*.test.js src/*.test.js test/*.test.js"
13
+ "test": "LOG_LEVEL=none NODE_ENV=test node --enable-source-maps --test src/**/*.test.js src/*.test.js test/*.test.js",
14
+ "coverage": "LOG_LEVEL=none node --enable-source-maps --experimental-test-coverage --test src/**/*.test.js src/*.test.js test/*.test.js"
15
15
  },
16
16
  "author": "claukers",
17
17
  "license": "ISC",
package/src/api-router.ts CHANGED
@@ -3,7 +3,6 @@ import { basename } from "path";
3
3
  import { traverseAPIRouteDir } from "./common/api-router-utils";
4
4
  import { Logger } from "./common/logger/index.js";
5
5
  import { parse} from "@miqro/parser";
6
- import { FeatureRouter } from "./feature-router";
7
6
  import { MinimalRouter } from "./common/router-types";
8
7
  import { APIRouterOptions, APIRouterParseOptions } from "./common/api-router-types";
9
8
 
@@ -46,6 +45,6 @@ export async function APIRouter(options: APIRouterOptions, logger?: Logger): Pro
46
45
  throw new Error(`${dirname} not a directory!`);
47
46
  }
48
47
  const apiName = options.apiName !== undefined ? options.apiName : basename(dirname);
49
- const apiPath = options.path !== undefined ? options.path : `/${apiName}`;
50
- return FeatureRouter(await traverseAPIRouteDir(apiName.toUpperCase(), dirname, apiPath, undefined, logger), logger);
48
+ const apiPath = options.path !== undefined ? options.path : "";
49
+ return await traverseAPIRouteDir(apiName.toUpperCase(), dirname, apiPath, undefined, logger);
51
50
  }
@@ -1,6 +1,6 @@
1
1
  import { ParseOptionMap } from "@miqro/parser";
2
2
  import { Method } from "./context";
3
- import { HandlerWithOptions } from "./router-types";
3
+ import { handlerWithOptionsParseOptions, HandlerWithOptions } from "./router-types";
4
4
 
5
5
  /**
6
6
  * # APIRoute
@@ -14,9 +14,10 @@ import { HandlerWithOptions } from "./router-types";
14
14
  *export default route;
15
15
  * ```
16
16
  */
17
- export interface APIRoute extends HandlerWithOptions{
18
- method?: Method | Method[];
19
- path?: string | string[];
17
+ export interface APIRoute extends HandlerWithOptions {
18
+ postFolder?: boolean,
19
+ method?: Method | "use" | "USE";
20
+ path?: string;
20
21
  }
21
22
 
22
23
  export interface APIRouterOptions {
@@ -30,3 +31,10 @@ export const APIRouterParseOptions: ParseOptionMap = {
30
31
  apiName: "string?",
31
32
  path: "string?"
32
33
  };
34
+
35
+ export const APIRouteValidator: ParseOptionMap = {
36
+ ...handlerWithOptionsParseOptions,
37
+ postFolder: "boolean?",
38
+ method: "string?",
39
+ path: "string?"
40
+ };