@miqro/core 3.0.3 → 3.0.5

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 (84) 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 +8 -5
  4. package/build/cjs/common/api-router-types.js +9 -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 +65 -59
  8. package/build/cjs/common/api-router-utils.js.map +1 -1
  9. package/build/cjs/common/index.d.ts +1 -1
  10. package/build/cjs/common/index.js +1 -2
  11. package/build/cjs/common/index.js.map +1 -1
  12. package/build/cjs/common/logger/constants.d.ts +1 -0
  13. package/build/cjs/common/logger/constants.js +1 -0
  14. package/build/cjs/common/logger/constants.js.map +1 -1
  15. package/build/cjs/common/logger/interfaces.d.ts +1 -1
  16. package/build/cjs/common/logger/logger.js +1 -1
  17. package/build/cjs/common/logger/logger.js.map +1 -1
  18. package/build/cjs/common/logger/transport/console.js +3 -1
  19. package/build/cjs/common/logger/transport/console.js.map +1 -1
  20. package/build/cjs/common/router-default-logger-factory.d.ts +1 -0
  21. package/build/cjs/common/router-default-logger-factory.js +7 -1
  22. package/build/cjs/common/router-default-logger-factory.js.map +1 -1
  23. package/build/cjs/common/router-handler.d.ts +2 -1
  24. package/build/cjs/common/router-handler.js +41 -27
  25. package/build/cjs/common/router-handler.js.map +1 -1
  26. package/build/cjs/router.d.ts +9 -6
  27. package/build/cjs/router.js +21 -0
  28. package/build/cjs/router.js.map +1 -1
  29. package/build/esm/api-router.js +2 -3
  30. package/build/esm/api-router.js.map +1 -1
  31. package/build/esm/common/api-router-types.d.ts +8 -5
  32. package/build/esm/common/api-router-types.js +8 -0
  33. package/build/esm/common/api-router-types.js.map +1 -1
  34. package/build/esm/common/api-router-utils.d.ts +2 -4
  35. package/build/esm/common/api-router-utils.js +63 -57
  36. package/build/esm/common/api-router-utils.js.map +1 -1
  37. package/build/esm/common/index.d.ts +1 -1
  38. package/build/esm/common/index.js +1 -1
  39. package/build/esm/common/index.js.map +1 -1
  40. package/build/esm/common/logger/constants.d.ts +1 -0
  41. package/build/esm/common/logger/constants.js +1 -0
  42. package/build/esm/common/logger/constants.js.map +1 -1
  43. package/build/esm/common/logger/interfaces.d.ts +1 -1
  44. package/build/esm/common/logger/logger.js +1 -1
  45. package/build/esm/common/logger/logger.js.map +1 -1
  46. package/build/esm/common/logger/transport/console.js +3 -1
  47. package/build/esm/common/logger/transport/console.js.map +1 -1
  48. package/build/esm/common/router-default-logger-factory.d.ts +1 -0
  49. package/build/esm/common/router-default-logger-factory.js +5 -0
  50. package/build/esm/common/router-default-logger-factory.js.map +1 -1
  51. package/build/esm/common/router-handler.d.ts +2 -1
  52. package/build/esm/common/router-handler.js +41 -27
  53. package/build/esm/common/router-handler.js.map +1 -1
  54. package/build/esm/router.d.ts +9 -6
  55. package/build/esm/router.js +21 -0
  56. package/build/esm/router.js.map +1 -1
  57. package/package.json +4 -4
  58. package/src/api-router.ts +2 -3
  59. package/src/common/api-router-types.ts +15 -5
  60. package/src/common/api-router-utils.ts +67 -60
  61. package/src/common/index.ts +1 -1
  62. package/src/common/logger/constants.ts +1 -0
  63. package/src/common/logger/interfaces.ts +1 -1
  64. package/src/common/logger/logger.ts +1 -1
  65. package/src/common/logger/transport/console.ts +6 -4
  66. package/src/common/router-default-logger-factory.ts +6 -0
  67. package/src/common/router-handler.ts +39 -27
  68. package/src/router.ts +33 -6
  69. package/test.out.txt +3535 -0
  70. package/build/cjs/common/feature-router-types.d.ts +0 -12
  71. package/build/cjs/common/feature-router-types.js +0 -5
  72. package/build/cjs/common/feature-router-types.js.map +0 -1
  73. package/build/cjs/feature-router.d.ts +0 -4
  74. package/build/cjs/feature-router.js +0 -90
  75. package/build/cjs/feature-router.js.map +0 -1
  76. package/build/esm/common/feature-router-types.d.ts +0 -12
  77. package/build/esm/common/feature-router-types.js +0 -2
  78. package/build/esm/common/feature-router-types.js.map +0 -1
  79. package/build/esm/feature-router.d.ts +0 -4
  80. package/build/esm/feature-router.js +0 -86
  81. package/build/esm/feature-router.js.map +0 -1
  82. package/src/api-router.unit.test.js +0 -280
  83. package/src/common/feature-router-types.ts +0 -13
  84. package/src/feature-router.ts +0 -82
@@ -5,7 +5,8 @@ import { GroupPolicyHandler, ParseRequest, SessionHandler, ResultParser } from "
5
5
  import { handlerWithOptionsParseOptions, routerHandlerParseOptions } from "./router-types";
6
6
  import { ResponseHandler } from ".";
7
7
  export class RouterHandler {
8
- constructor(handler, path, method, options) {
8
+ constructor(originalHandler, path, method, options) {
9
+ this.originalHandler = originalHandler;
9
10
  this.path = path;
10
11
  this.method = method;
11
12
  this.tokens = tokenizePath(path);
@@ -13,28 +14,29 @@ export class RouterHandler {
13
14
  options = parse(options, routerHandlerParseOptions, "no_extra", "options");
14
15
  }
15
16
  let handlers = [];
16
- this.isRouter = isMinimalRouter(handler); //handler instanceof Router;
17
- if (!this.isRouter && !(handler instanceof Array) && typeof handler === "object") {
17
+ this.isRouter = isMinimalRouter(originalHandler); //handler instanceof Router;
18
+ if (!this.isRouter && !(originalHandler instanceof Array) && typeof originalHandler === "object") {
18
19
  // HandlerWithOptions
19
20
  if (options) {
20
21
  throw new Error("bad arguments. cannot send options with HandlerWithOptions");
21
22
  }
22
23
  //console.dir(handler);
23
- handler = parse(handler, handlerWithOptionsParseOptions, "no_extra", "handler");
24
- const realHandler = handler.handler;
24
+ this.originalHandler = parse(originalHandler, handlerWithOptionsParseOptions, "no_extra", "handler");
25
+ const realHandler = originalHandler.handler;
25
26
  const newOptions = {
26
- ...handler
27
+ ...originalHandler
27
28
  };
28
29
  delete newOptions.handler;
29
- handler = realHandler;
30
+ this.originalHandler = realHandler;
30
31
  this.options = newOptions;
31
32
  }
32
33
  else {
33
34
  this.options = options;
34
35
  }
35
- const routeHandlers = handler instanceof Array ? handler : [handler];
36
- if ((!this.isRouter && routeHandlers.length !== routeHandlers.filter(h => typeof h === "function").length) || (this.isRouter && this.options)) {
37
- throw new Error("bad arguments");
36
+ const routeHandlers = this.originalHandler instanceof Array ? this.originalHandler : [this.originalHandler];
37
+ //if ((!this.isRouter && routeHandlers.length !== routeHandlers.filter(h => typeof h === "function").length) || (this.isRouter && this.options)) {
38
+ if ((!this.isRouter && routeHandlers.length !== routeHandlers.filter(h => typeof h === "function").length)) {
39
+ throw new Error(`bad arguments isRouter[${this.isRouter}]`);
38
40
  }
39
41
  if (this.options && this.options.middleware) {
40
42
  handlers = handlers.concat(this.options.middleware);
@@ -70,31 +72,43 @@ export class RouterHandler {
70
72
  const nPath = this.path && this.path.length > 1 ? this.path.substring(1) : "";
71
73
  const nMethod = this.method ? this.method : "";
72
74
  if (this.isRouter) {
73
- const router = this.handler[0];
75
+ const router = this.originalHandler;
74
76
  router.getJSONDoc(doc, `${prePath}${nPath}`);
75
77
  }
76
- else if (this.options) {
78
+ else {
77
79
  if (!doc[`${prePath}${nPath}`]) {
78
80
  doc[`${prePath}${nPath}`] = Object.create(null);
79
81
  }
80
82
  if (doc[`${prePath}${nPath}`][nMethod]) {
81
83
  throw new Error("cannot create doc routes override each other");
82
84
  }
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
- };
85
+ if (this.options) {
86
+ doc[`${prePath}${nPath}`][nMethod] = {
87
+ description: this.options.description,
88
+ name: this.options.name,
89
+ 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(),
90
+ policy: this.options.policy,
91
+ request: this.options.request ? {
92
+ body: this.options.request.body,
93
+ headers: this.options.request.headers,
94
+ params: this.options.request.params,
95
+ query: this.options.request.query,
96
+ } : undefined,
97
+ response: this.options.response ? {
98
+ body: this.options.response.body
99
+ } : undefined
100
+ };
101
+ }
102
+ else {
103
+ doc[`${prePath}${nPath}`][nMethod] = {
104
+ description: undefined,
105
+ name: undefined,
106
+ identifier: `${prePath}${nPath}${nMethod ? `_${nMethod}` : ""}`.replace(/[^a-z0-9+]+/gi, '_').split("_").map(s => s.trim()).filter(s => s).join("_").toUpperCase(),
107
+ policy: undefined,
108
+ request: undefined,
109
+ response: undefined
110
+ };
111
+ }
98
112
  }
99
113
  return doc;
100
114
  }
@@ -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,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.3",
3
+ "version": "3.0.5",
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",
@@ -27,7 +27,7 @@
27
27
  "npm": ">=6.0.0"
28
28
  },
29
29
  "dependencies": {
30
- "@miqro/parser": "^1.0.2",
30
+ "@miqro/parser": "../parser",
31
31
  "@miqro/request": "^0.2.1",
32
32
  "cookie": "0.5.0"
33
33
  }
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
- import { Method } from "./context";
3
- import { HandlerWithOptions } from "./router-types";
2
+ import { Handler, Method } from "./context";
3
+ import { MinimalRouter, RouterHandlerOptions, routerHandlerParseOptions } from "./router-types";
4
4
 
5
5
  /**
6
6
  * # APIRoute
@@ -14,9 +14,11 @@ 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 RouterHandlerOptions {
18
+ postFolder?: boolean,
19
+ method?: Method | "use" | "USE";
20
+ path?: string;
21
+ handler: Handler | Array<Handler> | MinimalRouter;
20
22
  }
21
23
 
22
24
  export interface APIRouterOptions {
@@ -30,3 +32,11 @@ export const APIRouterParseOptions: ParseOptionMap = {
30
32
  apiName: "string?",
31
33
  path: "string?"
32
34
  };
35
+
36
+ export const APIRouteValidator: ParseOptionMap = {
37
+ ...routerHandlerParseOptions,
38
+ postFolder: "boolean?",
39
+ method: "string?",
40
+ path: "string?",
41
+ handler: "function[]!|MinimalRouter",
42
+ };
@@ -1,34 +1,30 @@
1
1
  import { lstatSync, readdirSync } from "fs";
2
2
  import { join, parse as pathParse, resolve } from "path";
3
3
  import { Logger } from "./logger";
4
- import { APIRoute } from "./api-router-types.js";
5
- import { handlerWithOptionsParseOptions } from "./router-types";
6
- import { parse, ParseOptionMap } from "@miqro/parser";
7
- import { FeatureRouterOptions } from "./feature-router-types.js";
8
- import { Method } from "./context.js";
4
+ import { getPathIdentifier } from "./router-default-logger-factory.js";
5
+ import { APIRoute, APIRouteValidator } from "./api-router-types.js";
6
+ import { parse } from "@miqro/parser";
7
+ import { Handler, Method } from "./context.js";
9
8
  import { normalizePath } from "./url-utils";
9
+ import { Router } from "../router";
10
+ import { RouterHandlerOptions, MinimalRouter, isMinimalRouter } from "./router-types";
10
11
 
11
- export const APIRouteValidator: ParseOptionMap = {
12
- ...handlerWithOptionsParseOptions,
13
- method: "string?|string[]?",
14
- path: "string?|string[]?"
15
- };
12
+ type UseCallArg = [Handler | Handler[] | MinimalRouter, string | undefined, Method | undefined, RouterHandlerOptions];
16
13
 
17
14
  export async function traverseAPIRouteDir(
18
15
  featureName: string,
19
16
  dirname: string,
20
17
  basePath = "/",
21
- features: FeatureRouterOptions = {}, logger?: Logger): Promise<FeatureRouterOptions> {
18
+ router: Router = new Router(), logger?: Logger): Promise<Router> {
22
19
  if (logger) {
23
20
  logger.trace("loading routes from [%s]", dirname);
24
21
  }
25
22
  const files = readdirSync(dirname);
26
23
  const dirs = files.filter(f => lstatSync(join(dirname, f)).isDirectory());
27
24
  const methods = files.filter(f => !lstatSync(join(dirname, f)).isDirectory());
28
- for (const f of dirs) {
29
- const { name } = pathParse(f);
30
- features = await traverseAPIRouteDir(`${featureName}_${name}`.toUpperCase(), join(dirname, f), `${basePath}/${name}`, features, logger);
31
- }
25
+
26
+ const postFolder: UseCallArg[] = [];
27
+
32
28
  for (const f of methods) {
33
29
  const { name, ext } = pathParse(f);
34
30
  if (name !== "index" && ((ext === ".ts" || ext === ".js") && name.slice(-2) !== ".d")) {
@@ -44,21 +40,24 @@ export async function traverseAPIRouteDir(
44
40
  }
45
41
  //const ___filePath = filePath + ext;
46
42
  const ___filePath = filePath;
47
- let routeMethods: Method[] = [name] as Method[];
43
+ //let routeMethods: Method[] = [name] as Method[];
44
+ let routeMethod: Method | "use" | "USE" = name as Method;
48
45
  if (typeof route === "function") {
49
46
  route = {
50
47
  handler: route
51
48
  } as any;
52
49
  } else {
53
- if (typeof route.method !== "undefined" && (!(route.method instanceof Array) && (typeof route.method !== "string"))) {
54
- throw new Error(`${resolve(dirname, name)} doesnt export method as a string or string array`);
50
+ if (typeof route.method !== "undefined" && (/*!(route.method instanceof Array) &&*/ (typeof route.method !== "string"))) {
51
+ //throw new Error(`${resolve(dirname, name)} doesnt export method as a string or string array`);
52
+ throw new Error(`${resolve(dirname, name)} doesnt export method as a string`);
55
53
  } else if (typeof route.method !== "undefined") {
56
- routeMethods = route.method instanceof Array ? route.method : [route.method];
54
+ routeMethod = route.method;//route.method instanceof Array ? route.method : [route.method];
57
55
  }
58
- if (typeof route.path !== "string" && typeof route.path !== "undefined" && !(route.path instanceof Array)) {
59
- throw new Error(`${resolve(dirname, name)} doesnt export path as a string or a string array`);
56
+ if (typeof route.path !== "string" && typeof route.path !== "undefined"/* && !(route.path instanceof Array)*/) {
57
+ //throw new Error(`${resolve(dirname, name)} doesnt export path as a string or a string array`);
58
+ throw new Error(`${resolve(dirname, name)} doesnt export path as a string`);
60
59
  }
61
- if ((!(route.handler instanceof Array) && typeof route.handler !== "function") || typeof route.handler === "undefined") {
60
+ if ((!(route.handler instanceof Array) && typeof route.handler !== "function" && !isMinimalRouter(route.handler)) || typeof route.handler === "undefined") {
62
61
  throw new Error(`${resolve(dirname, name)} doesnt export handler as a function or an array`);
63
62
  }
64
63
  if (typeof route.name !== "string" && typeof route.name !== "undefined") {
@@ -66,49 +65,57 @@ export async function traverseAPIRouteDir(
66
65
  }
67
66
  }
68
67
  route = parse(route, APIRouteValidator, "no_extra", ___filePath) as APIRoute;
69
- const paths = route.path instanceof Array ? route.path : route.path === undefined ? [route.method && route.method.indexOf(name as Method) === -1 ? `/${name}` : "/"] : [route.path];
70
- for (let i = 0; i < paths.length; i++) {
71
- const p = paths[i];
72
- if (typeof p !== "string" || !p) {
73
- throw new Error(`${resolve(dirname, name)} doesnt export path as a string or a string array`);
74
- }
75
- const path = normalizePath(`${basePath}${p && p !== "/" ? `${p}` : ""}`)
68
+ //const paths = route.path instanceof Array ? route.path : route.path === undefined ? [route.method && route.method.indexOf(name as Method) === -1 ? `/${name}` : "/"] : [route.path];
69
+ const p = route.path === undefined ? route.method && route.method.indexOf(name as Method) === -1 ? `/${name}` : "/" : route.path;
70
+ //for (let i = 0; i < paths.length; i++) {
71
+ //const p = paths[i];
72
+ if (typeof p !== "string" || !p) {
73
+ throw new Error(`${resolve(dirname, name)} doesnt export path as a string or a string array`);
74
+ }
75
+ const path = normalizePath(`${basePath}${p && p !== "/" ? `${p}` : p}`)
76
76
 
77
- const subName = (p.charAt(0) === "/" ? p.substring(1) : p).replace(/[^a-z0-9+]+/gi, '_');
78
- const routeName = route.name ? route.name : name;
77
+ const subName = (p.charAt(0) === "/" ? p.substring(1) : p).replace(/[^a-z0-9+]+/gi, '_');
78
+ const routeName = route.name ? route.name : name;
79
79
 
80
- let newFeatureSubPath = `${featureName}_${route.name ? route.name : name}${routeName !== subName ? `_${subName}` : ""}`.toUpperCase();
80
+ //const identifier = route.identifier ? route.identifier : getPathIdentifier(path, routeMethod);
81
81
 
82
- newFeatureSubPath = newFeatureSubPath.length > 1 && newFeatureSubPath.charAt(newFeatureSubPath.length - 1) === "_" ? newFeatureSubPath.substring(0, newFeatureSubPath.length - 1) : newFeatureSubPath;
83
- if (features[newFeatureSubPath]) {
84
- throw new Error(`${___filePath} feature name collides with ${(features[newFeatureSubPath] as any).___filePath}`)
85
- }
86
- if (newFeatureSubPath === "__prototype__" || newFeatureSubPath === "__proto__") {
87
- throw new Error(`invalid feature name ${newFeatureSubPath}`);
82
+ /*let newFeatureSubPath = `${featureName}_${route.name ? route.name : name}${routeName !== subName ? `_${subName}` : ""}`.toUpperCase();
83
+
84
+ newFeatureSubPath = newFeatureSubPath.length > 1 && newFeatureSubPath.charAt(newFeatureSubPath.length - 1) === "_" ? newFeatureSubPath.substring(0, newFeatureSubPath.length - 1) : newFeatureSubPath;*/
85
+ /*if (features[identifier]) {
86
+ throw new Error(`${___filePath} feature name collides with ${(features[identifier] as any).___filePath}`)
87
+ }*/
88
+ if (route.identifier && route.identifier === "__prototype__" || route.identifier === "__proto__") {
89
+ throw new Error(`invalid feature name ${route.identifier}`);
90
+ }
91
+ const useCallArgs: UseCallArg = [route.handler, path, routeMethod !== "use" && routeMethod !== "USE" ? routeMethod : undefined, {
92
+ identifier: route.identifier,
93
+ apiName: route.apiName,
94
+ name: route.name,
95
+ description: route.description,
96
+ parser: route.parser,
97
+ middleware: route.middleware,
98
+ session: route.session,
99
+ policy: route.policy,
100
+ request: route.request,
101
+ response: {
102
+ body: route.response && route.response.body !== undefined ? route.response.body : !isMinimalRouter(route.handler),
103
+ middleware: route.response && route.response.middleware !== undefined ? route.response.middleware : undefined
88
104
  }
89
- features[newFeatureSubPath] = {
90
- options: {
91
- identifier: newFeatureSubPath,
92
- apiName: route.apiName,
93
- name: route.name,
94
- description: route.description,
95
- parser: route.parser,
96
- middleware: route.middleware,
97
- session: route.session,
98
- policy: route.policy,
99
- request: route.request,
100
- response: {
101
- body: route.response && route.response.body ? route.response.body : true,
102
- middleware: route.response && route.response.middleware ? route.response.middleware : undefined
103
- }
104
- },
105
- path,
106
- method: routeMethods,
107
- handler: route.handler
108
- };
109
- (features[newFeatureSubPath] as any).___filePath = ___filePath;
105
+ }];
106
+ if (route.postFolder) {
107
+ postFolder.push(useCallArgs);
108
+ } else {
109
+ router.use(...useCallArgs);
110
110
  }
111
111
  }
112
112
  }
113
- return features;
113
+ for (const f of dirs) {
114
+ const { name } = pathParse(f);
115
+ router = await traverseAPIRouteDir(`${featureName}_${name}`.toUpperCase(), join(dirname, f), `${basePath}/${name}`, router, logger);
116
+ }
117
+ for (const post of postFolder) {
118
+ router.use(...post);
119
+ }
120
+ return router;
114
121
  };
@@ -7,5 +7,5 @@ export * from "./error";
7
7
  export * from "./config";
8
8
  export * from "./logger";
9
9
  export { normalizePath, newURL } from "./url-utils";
10
- export { traverseAPIRouteDir, APIRouteValidator } from "./api-router-utils";
10
+ export { traverseAPIRouteDir } from "./api-router-utils";
11
11
  export { OldResponseHandler, ResponseHandler } from "./router-utils";
@@ -15,6 +15,7 @@ export const DEFAULT_LOGGER_FORMATTER: LoggerFormatter =
15
15
 
16
16
  export const LOG_LEVEL_MAP =
17
17
  {
18
+ "none": 0,
18
19
  "error": 1,
19
20
  "warn": 2,
20
21
  "info": 3,
@@ -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
 
3
3
  export interface WriteArgs {
4
4
  level: LogLevel;
@@ -43,7 +43,7 @@ export class Logger extends EventTarget implements Logger {
43
43
 
44
44
  constructor(protected readonly identifier: string, protected level: LogLevel = "info", options?: { transports?: LoggerTransport[]; formatter?: LoggerFormatter; }) {
45
45
  super();
46
- if (!LOG_LEVEL_MAP[level]) {
46
+ if (LOG_LEVEL_MAP[level] === undefined) {
47
47
  throw new Error(`Unknown level [${level}]`);
48
48
  }
49
49
  this.addEventListener(LoggerEvents.error, (ev: any) => {
@@ -1,9 +1,9 @@
1
- import {LoggerTransportWriteArgs, LogLevel} from "../interfaces.js";
1
+ import { LoggerTransportWriteArgs, LogLevel } from "../interfaces.js";
2
2
 
3
3
  export function ConsoleTransport(color: boolean = true, level?: LogLevel) {
4
4
  return {
5
5
  level,
6
- write: async ({level, out}: LoggerTransportWriteArgs): Promise<void> => {
6
+ write: async ({ level, out }: LoggerTransportWriteArgs): Promise<void> => {
7
7
  if (color) {
8
8
  switch (level) {
9
9
  case "warn":
@@ -18,14 +18,16 @@ export function ConsoleTransport(color: boolean = true, level?: LogLevel) {
18
18
  case "debug":
19
19
  console.log("\x1b[36m%s\x1b[0m", out);
20
20
  break;
21
+ case "none":
22
+ break;
21
23
  default:
22
24
  console[level](out);
23
25
  break;
24
26
  }
25
27
  } else {
26
- if(level === "trace" || level === "debug") {
28
+ if (level === "trace" || level === "debug") {
27
29
  console.log(out);
28
- } else {
30
+ } else if (level !== "none") {
29
31
  console[level](out);
30
32
  }
31
33
  }
@@ -34,3 +34,9 @@ export const defaultLoggerFactory = (uuid: string, req: IncomingMessage): Logger
34
34
 
35
35
  return logger;
36
36
  }
37
+
38
+ export function getPathIdentifier(path: string, method: string) {
39
+ const pathToEnv = path.replace(/[^a-z0-9+]+/gi, '_').toUpperCase();
40
+ const identifier = `${pathToEnv === "_" ? "" : pathToEnv.substring(1)}${method.toUpperCase()}`;
41
+ return identifier;
42
+ }