@miqro/core 3.0.4 → 3.0.6

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.
@@ -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 } from "./router-types";
4
4
  /**
5
5
  * # APIRoute
6
6
  *
@@ -13,10 +13,11 @@ import { HandlerWithOptions } from "./router-types";
13
13
  *export default route;
14
14
  * ```
15
15
  */
16
- export interface APIRoute extends HandlerWithOptions {
16
+ export interface APIRoute extends RouterHandlerOptions {
17
17
  postFolder?: boolean;
18
18
  method?: Method | "use" | "USE";
19
19
  path?: string;
20
+ handler: Handler | Array<Handler> | MinimalRouter;
20
21
  }
21
22
  export interface APIRouterOptions {
22
23
  dirname: string;
@@ -8,9 +8,10 @@ exports.APIRouterParseOptions = {
8
8
  path: "string?"
9
9
  };
10
10
  exports.APIRouteValidator = {
11
- ...router_types_1.handlerWithOptionsParseOptions,
11
+ ...router_types_1.routerHandlerParseOptions,
12
12
  postFolder: "boolean?",
13
13
  method: "string?",
14
- path: "string?"
14
+ path: "string?",
15
+ handler: "function[]!|MinimalRouter",
15
16
  };
16
17
  //# 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":";;;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
+ {"version":3,"file":"api-router-types.js","sourceRoot":"","sources":["../../../src/common/api-router-types.ts"],"names":[],"mappings":";;;AAEA,iDAAgG;AA2BnF,QAAA,qBAAqB,GAAmB;IACnD,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,SAAS;CAChB,CAAC;AAEW,QAAA,iBAAiB,GAAmB;IAC/C,GAAG,wCAAyB;IAC5B,UAAU,EAAE,UAAU;IACtB,MAAM,EAAE,SAAS;IACjB,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,2BAA2B;CACrC,CAAC"}
@@ -7,6 +7,7 @@ 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
9
  const router_1 = require("../router");
10
+ const router_types_1 = require("./router-types");
10
11
  async function traverseAPIRouteDir(featureName, dirname, basePath = "/", router = new router_1.Router(), logger) {
11
12
  if (logger) {
12
13
  logger.trace("loading routes from [%s]", dirname);
@@ -49,7 +50,7 @@ async function traverseAPIRouteDir(featureName, dirname, basePath = "/", router
49
50
  //throw new Error(`${resolve(dirname, name)} doesnt export path as a string or a string array`);
50
51
  throw new Error(`${(0, path_1.resolve)(dirname, name)} doesnt export path as a string`);
51
52
  }
52
- if ((!(route.handler instanceof Array) && typeof route.handler !== "function") || typeof route.handler === "undefined") {
53
+ if ((!(route.handler instanceof Array) && typeof route.handler !== "function" && !(0, router_types_1.isMinimalRouter)(route.handler)) || typeof route.handler === "undefined") {
53
54
  throw new Error(`${(0, path_1.resolve)(dirname, name)} doesnt export handler as a function or an array`);
54
55
  }
55
56
  if (typeof route.name !== "string" && typeof route.name !== "undefined") {
@@ -64,7 +65,7 @@ async function traverseAPIRouteDir(featureName, dirname, basePath = "/", router
64
65
  if (typeof p !== "string" || !p) {
65
66
  throw new Error(`${(0, path_1.resolve)(dirname, name)} doesnt export path as a string or a string array`);
66
67
  }
67
- const path = (0, url_utils_1.normalizePath)(`${basePath}${p && p !== "/" ? `${p}` : ""}`);
68
+ const path = (0, url_utils_1.normalizePath)(`${basePath}${p && p !== "/" ? `${p}` : p}`);
68
69
  const subName = (p.charAt(0) === "/" ? p.substring(1) : p).replace(/[^a-z0-9+]+/gi, '_');
69
70
  const routeName = route.name ? route.name : name;
70
71
  //const identifier = route.identifier ? route.identifier : getPathIdentifier(path, routeMethod);
@@ -77,25 +78,7 @@ async function traverseAPIRouteDir(featureName, dirname, basePath = "/", router
77
78
  if (route.identifier && route.identifier === "__prototype__" || route.identifier === "__proto__") {
78
79
  throw new Error(`invalid feature name ${route.identifier}`);
79
80
  }
80
- if (route.postFolder) {
81
- postFolder.push([route.handler, path, routeMethod !== "use" && routeMethod !== "USE" ? routeMethod : undefined, {
82
- identifier: route.identifier,
83
- apiName: route.apiName,
84
- name: route.name,
85
- description: route.description,
86
- parser: route.parser,
87
- middleware: route.middleware,
88
- session: route.session,
89
- policy: route.policy,
90
- request: route.request,
91
- response: {
92
- body: route.response && route.response.body ? route.response.body : true,
93
- middleware: route.response && route.response.middleware ? route.response.middleware : undefined
94
- }
95
- }]);
96
- }
97
- else {
98
- router.use(route.handler, path, routeMethod !== "use" && routeMethod !== "USE" ? routeMethod : undefined, {
81
+ const useCallArgs = [route.handler, path, routeMethod !== "use" && routeMethod !== "USE" ? routeMethod : undefined, {
99
82
  identifier: route.identifier,
100
83
  apiName: route.apiName,
101
84
  name: route.name,
@@ -106,10 +89,15 @@ async function traverseAPIRouteDir(featureName, dirname, basePath = "/", router
106
89
  policy: route.policy,
107
90
  request: route.request,
108
91
  response: {
109
- body: route.response && route.response.body ? route.response.body : true,
110
- middleware: route.response && route.response.middleware ? route.response.middleware : undefined
92
+ body: route.response && route.response.body !== undefined ? route.response.body : !(0, router_types_1.isMinimalRouter)(route.handler),
93
+ middleware: route.response && route.response.middleware !== undefined ? route.response.middleware : undefined
111
94
  }
112
- });
95
+ }];
96
+ if (route.postFolder) {
97
+ postFolder.push(useCallArgs);
98
+ }
99
+ else {
100
+ router.use(...useCallArgs);
113
101
  }
114
102
  }
115
103
  }
@@ -1 +1 @@
1
- {"version":3,"file":"api-router-utils.js","sourceRoot":"","sources":["../../../src/common/api-router-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"api-router-utils.js","sourceRoot":"","sources":["../../../src/common/api-router-utils.ts"],"names":[],"mappings":"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"}
@@ -3,13 +3,14 @@ import { Context, Handler, Method } from "./context";
3
3
  import { MinimalRouter } from "./router-types";
4
4
  import { HandlerWithOptions, RouterHandlerOptions, RouterJSONDoc } from "./router-types";
5
5
  export declare class RouterHandler {
6
+ private readonly originalHandler;
6
7
  private readonly path;
7
8
  private readonly method;
8
9
  private readonly tokens;
9
10
  private readonly handler;
10
11
  private readonly isRouter;
11
12
  private readonly options?;
12
- constructor(handler: Array<Handler> | HandlerWithOptions | Handler | MinimalRouter, path: string | undefined, method: Method | undefined, options?: RouterHandlerOptions);
13
+ constructor(originalHandler: Array<Handler> | HandlerWithOptions | Handler | MinimalRouter, path: string | undefined, method: Method | undefined, options?: RouterHandlerOptions);
13
14
  getJSONDoc(doc?: RouterJSONDoc, prePath?: string): RouterJSONDoc;
14
15
  invoke(ctx: Context, pathTokens: PathPart[], prePathTokens: PathPartToken[]): Promise<boolean>;
15
16
  isMatch(method: string, requestParts: PathPart[], prePathTokens: PathPartToken[]): {
@@ -8,7 +8,8 @@ const middleware_1 = require("../middleware");
8
8
  const router_types_2 = require("./router-types");
9
9
  const _1 = require(".");
10
10
  class RouterHandler {
11
- constructor(handler, path, method, options) {
11
+ constructor(originalHandler, path, method, options) {
12
+ this.originalHandler = originalHandler;
12
13
  this.path = path;
13
14
  this.method = method;
14
15
  this.tokens = (0, tokenize_match_1.tokenizePath)(path);
@@ -16,28 +17,29 @@ class RouterHandler {
16
17
  options = (0, parser_1.parse)(options, router_types_2.routerHandlerParseOptions, "no_extra", "options");
17
18
  }
18
19
  let handlers = [];
19
- this.isRouter = (0, router_types_1.isMinimalRouter)(handler); //handler instanceof Router;
20
- if (!this.isRouter && !(handler instanceof Array) && typeof handler === "object") {
20
+ this.isRouter = (0, router_types_1.isMinimalRouter)(originalHandler); //handler instanceof Router;
21
+ if (!this.isRouter && !(originalHandler instanceof Array) && typeof originalHandler === "object") {
21
22
  // HandlerWithOptions
22
23
  if (options) {
23
24
  throw new Error("bad arguments. cannot send options with HandlerWithOptions");
24
25
  }
25
26
  //console.dir(handler);
26
- handler = (0, parser_1.parse)(handler, router_types_2.handlerWithOptionsParseOptions, "no_extra", "handler");
27
- const realHandler = handler.handler;
27
+ this.originalHandler = (0, parser_1.parse)(originalHandler, router_types_2.handlerWithOptionsParseOptions, "no_extra", "handler");
28
+ const realHandler = originalHandler.handler;
28
29
  const newOptions = {
29
- ...handler
30
+ ...originalHandler
30
31
  };
31
32
  delete newOptions.handler;
32
- handler = realHandler;
33
+ this.originalHandler = realHandler;
33
34
  this.options = newOptions;
34
35
  }
35
36
  else {
36
37
  this.options = options;
37
38
  }
38
- const routeHandlers = handler instanceof Array ? handler : [handler];
39
- if ((!this.isRouter && routeHandlers.length !== routeHandlers.filter(h => typeof h === "function").length) || (this.isRouter && this.options)) {
40
- throw new Error("bad arguments");
39
+ const routeHandlers = this.originalHandler instanceof Array ? this.originalHandler : [this.originalHandler];
40
+ //if ((!this.isRouter && routeHandlers.length !== routeHandlers.filter(h => typeof h === "function").length) || (this.isRouter && this.options)) {
41
+ if ((!this.isRouter && routeHandlers.length !== routeHandlers.filter(h => typeof h === "function").length)) {
42
+ throw new Error(`bad arguments isRouter[${this.isRouter}]`);
41
43
  }
42
44
  if (this.options && this.options.middleware) {
43
45
  handlers = handlers.concat(this.options.middleware);
@@ -73,7 +75,7 @@ class RouterHandler {
73
75
  const nPath = this.path && this.path.length > 1 ? this.path.substring(1) : "";
74
76
  const nMethod = this.method ? this.method : "";
75
77
  if (this.isRouter) {
76
- const router = this.handler[0];
78
+ const router = this.originalHandler;
77
79
  router.getJSONDoc(doc, `${prePath}${nPath}`);
78
80
  }
79
81
  else {
@@ -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,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 } from "./router-types";
4
4
  /**
5
5
  * # APIRoute
6
6
  *
@@ -13,10 +13,11 @@ import { HandlerWithOptions } from "./router-types";
13
13
  *export default route;
14
14
  * ```
15
15
  */
16
- export interface APIRoute extends HandlerWithOptions {
16
+ export interface APIRoute extends RouterHandlerOptions {
17
17
  postFolder?: boolean;
18
18
  method?: Method | "use" | "USE";
19
19
  path?: string;
20
+ handler: Handler | Array<Handler> | MinimalRouter;
20
21
  }
21
22
  export interface APIRouterOptions {
22
23
  dirname: string;
@@ -1,13 +1,14 @@
1
- import { handlerWithOptionsParseOptions } from "./router-types";
1
+ import { routerHandlerParseOptions } from "./router-types";
2
2
  export const APIRouterParseOptions = {
3
3
  dirname: "string",
4
4
  apiName: "string?",
5
5
  path: "string?"
6
6
  };
7
7
  export const APIRouteValidator = {
8
- ...handlerWithOptionsParseOptions,
8
+ ...routerHandlerParseOptions,
9
9
  postFolder: "boolean?",
10
10
  method: "string?",
11
- path: "string?"
11
+ path: "string?",
12
+ handler: "function[]!|MinimalRouter",
12
13
  };
13
14
  //# 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":"AAEA,OAAO,EAAE,8BAA8B,EAAsB,MAAM,gBAAgB,CAAC;AA0BpF,MAAM,CAAC,MAAM,qBAAqB,GAAmB;IACnD,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,SAAS;CAChB,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAmB;IAC/C,GAAG,8BAA8B;IACjC,UAAU,EAAE,UAAU;IACtB,MAAM,EAAE,SAAS;IACjB,IAAI,EAAE,SAAS;CAChB,CAAC"}
1
+ {"version":3,"file":"api-router-types.js","sourceRoot":"","sources":["../../../src/common/api-router-types.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuC,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AA2BhG,MAAM,CAAC,MAAM,qBAAqB,GAAmB;IACnD,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,SAAS;CAChB,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAmB;IAC/C,GAAG,yBAAyB;IAC5B,UAAU,EAAE,UAAU;IACtB,MAAM,EAAE,SAAS;IACjB,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,2BAA2B;CACrC,CAAC"}
@@ -4,6 +4,7 @@ import { APIRouteValidator } from "./api-router-types.js";
4
4
  import { parse } from "@miqro/parser";
5
5
  import { normalizePath } from "./url-utils";
6
6
  import { Router } from "../router";
7
+ import { isMinimalRouter } from "./router-types";
7
8
  export async function traverseAPIRouteDir(featureName, dirname, basePath = "/", router = new Router(), logger) {
8
9
  if (logger) {
9
10
  logger.trace("loading routes from [%s]", dirname);
@@ -46,7 +47,7 @@ export async function traverseAPIRouteDir(featureName, dirname, basePath = "/",
46
47
  //throw new Error(`${resolve(dirname, name)} doesnt export path as a string or a string array`);
47
48
  throw new Error(`${resolve(dirname, name)} doesnt export path as a string`);
48
49
  }
49
- if ((!(route.handler instanceof Array) && typeof route.handler !== "function") || typeof route.handler === "undefined") {
50
+ if ((!(route.handler instanceof Array) && typeof route.handler !== "function" && !isMinimalRouter(route.handler)) || typeof route.handler === "undefined") {
50
51
  throw new Error(`${resolve(dirname, name)} doesnt export handler as a function or an array`);
51
52
  }
52
53
  if (typeof route.name !== "string" && typeof route.name !== "undefined") {
@@ -61,7 +62,7 @@ export async function traverseAPIRouteDir(featureName, dirname, basePath = "/",
61
62
  if (typeof p !== "string" || !p) {
62
63
  throw new Error(`${resolve(dirname, name)} doesnt export path as a string or a string array`);
63
64
  }
64
- const path = normalizePath(`${basePath}${p && p !== "/" ? `${p}` : ""}`);
65
+ const path = normalizePath(`${basePath}${p && p !== "/" ? `${p}` : p}`);
65
66
  const subName = (p.charAt(0) === "/" ? p.substring(1) : p).replace(/[^a-z0-9+]+/gi, '_');
66
67
  const routeName = route.name ? route.name : name;
67
68
  //const identifier = route.identifier ? route.identifier : getPathIdentifier(path, routeMethod);
@@ -74,25 +75,7 @@ export async function traverseAPIRouteDir(featureName, dirname, basePath = "/",
74
75
  if (route.identifier && route.identifier === "__prototype__" || route.identifier === "__proto__") {
75
76
  throw new Error(`invalid feature name ${route.identifier}`);
76
77
  }
77
- if (route.postFolder) {
78
- postFolder.push([route.handler, path, routeMethod !== "use" && routeMethod !== "USE" ? routeMethod : undefined, {
79
- identifier: route.identifier,
80
- apiName: route.apiName,
81
- name: route.name,
82
- description: route.description,
83
- parser: route.parser,
84
- middleware: route.middleware,
85
- session: route.session,
86
- policy: route.policy,
87
- request: route.request,
88
- response: {
89
- body: route.response && route.response.body ? route.response.body : true,
90
- middleware: route.response && route.response.middleware ? route.response.middleware : undefined
91
- }
92
- }]);
93
- }
94
- else {
95
- router.use(route.handler, path, routeMethod !== "use" && routeMethod !== "USE" ? routeMethod : undefined, {
78
+ const useCallArgs = [route.handler, path, routeMethod !== "use" && routeMethod !== "USE" ? routeMethod : undefined, {
96
79
  identifier: route.identifier,
97
80
  apiName: route.apiName,
98
81
  name: route.name,
@@ -103,10 +86,15 @@ export async function traverseAPIRouteDir(featureName, dirname, basePath = "/",
103
86
  policy: route.policy,
104
87
  request: route.request,
105
88
  response: {
106
- body: route.response && route.response.body ? route.response.body : true,
107
- middleware: route.response && route.response.middleware ? route.response.middleware : undefined
89
+ body: route.response && route.response.body !== undefined ? route.response.body : !isMinimalRouter(route.handler),
90
+ middleware: route.response && route.response.middleware !== undefined ? route.response.middleware : undefined
108
91
  }
109
- });
92
+ }];
93
+ if (route.postFolder) {
94
+ postFolder.push(useCallArgs);
95
+ }
96
+ else {
97
+ router.use(...useCallArgs);
110
98
  }
111
99
  }
112
100
  }
@@ -1 +1 @@
1
- {"version":3,"file":"api-router-utils.js","sourceRoot":"","sources":["../../../src/common/api-router-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"api-router-utils.js","sourceRoot":"","sources":["../../../src/common/api-router-utils.ts"],"names":[],"mappings":"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"}
@@ -3,13 +3,14 @@ import { Context, Handler, Method } from "./context";
3
3
  import { MinimalRouter } from "./router-types";
4
4
  import { HandlerWithOptions, RouterHandlerOptions, RouterJSONDoc } from "./router-types";
5
5
  export declare class RouterHandler {
6
+ private readonly originalHandler;
6
7
  private readonly path;
7
8
  private readonly method;
8
9
  private readonly tokens;
9
10
  private readonly handler;
10
11
  private readonly isRouter;
11
12
  private readonly options?;
12
- constructor(handler: Array<Handler> | HandlerWithOptions | Handler | MinimalRouter, path: string | undefined, method: Method | undefined, options?: RouterHandlerOptions);
13
+ constructor(originalHandler: Array<Handler> | HandlerWithOptions | Handler | MinimalRouter, path: string | undefined, method: Method | undefined, options?: RouterHandlerOptions);
13
14
  getJSONDoc(doc?: RouterJSONDoc, prePath?: string): RouterJSONDoc;
14
15
  invoke(ctx: Context, pathTokens: PathPart[], prePathTokens: PathPartToken[]): Promise<boolean>;
15
16
  isMatch(method: string, requestParts: PathPart[], prePathTokens: PathPartToken[]): {
@@ -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,7 +72,7 @@ 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
78
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"router-handler.js","sourceRoot":"","sources":["../../../src/common/router-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAuC,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAExG,OAAO,EAAiB,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC/F,OAAO,EAEL,8BAA8B,EAE9B,yBAAyB,EAC1B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,GAAG,CAAC;AAEpC,MAAM,OAAO,aAAa;IAOxB,YACE,OAAsE,EACrD,IAAwB,EACxB,MAA0B,EAC3C,OAA8B;QAFb,SAAI,GAAJ,IAAI,CAAoB;QACxB,WAAM,GAAN,MAAM,CAAoB;QAE3C,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QAEjC,IAAI,OAAO,EAAE;YACX,OAAO,GAAG,KAAK,CAAC,OAAO,EAAE,yBAAyB,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;SAC5E;QAED,IAAI,QAAQ,GAAmC,EAAE,CAAA;QACjD,IAAI,CAAC,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,4BAA4B;QAEtE,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,OAAO,YAAY,KAAK,CAAC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAChF,qBAAqB;YACrB,IAAI,OAAO,EAAE;gBACX,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;aAC/E;YACD,uBAAuB;YACvB,OAAO,GAAG,KAAK,CAAC,OAAO,EAAE,8BAA8B,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;YAChF,MAAM,WAAW,GAAI,OAA8B,CAAC,OAAO,CAAC;YAC5D,MAAM,UAAU,GAAG;gBACjB,GAAI,OAA8B;aACnC,CAAC;YACF,OAAQ,UAAkB,CAAC,OAAO,CAAC;YACnC,OAAO,GAAG,WAAW,CAAC;YACtB,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC;SAC3B;aAAM;YACL,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;SACxB;QACD,MAAM,aAAa,GAAG,OAAO,YAAY,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAmC,CAAC;QAEvG,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,IAAI,aAAa,CAAC,MAAM,KAAK,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,UAAU,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE;YAC7I,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;SAClC;QAED,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YAC3C,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;SACrD;QACD,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACxC,QAAQ,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;SACzH;QACD,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACvC,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;SACxD;QACD,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACxC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;SACxE;QAED,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAE1C,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;YAEzC,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAC5D,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,YAAY,KAAK,CAAC,CAAC;gBACjD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;gBAClC,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CACrC,CAAC,CAAC;gBACD,CAAC,eAAe,EAAE,CAAC,CAAC;YAEtB,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE;gBACjF,kDAAkD;gBAClD,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;aAChD;iBAAM,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE;gBACpC,QAAsB,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;gBACvF,kDAAkD;gBAClD,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;aAChD;SACF;QACD,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC;IAC1B,CAAC;IAEM,UAAU,CAAC,MAAqB,EAAE,EAAE,OAAO,GAAG,GAAG;QACtD,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9E,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAE/C,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,MAAM,MAAM,GAAkB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAkB,CAAC;YAC/D,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,OAAO,GAAG,KAAK,EAAE,CAAC,CAAC;SAC9C;aAAM;YACL,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,GAAG,KAAK,EAAE,CAAC,EAAE;gBAC9B,GAAG,CAAC,GAAG,OAAO,GAAG,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aACjD;YACD,IAAI,GAAG,CAAC,GAAG,OAAO,GAAG,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE;gBACtC,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;aACjE;YACD,IAAG,IAAI,CAAC,OAAO,EAAE;gBACf,GAAG,CAAC,GAAG,OAAO,GAAG,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG;oBACnC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;oBACrC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;oBACvB,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,GAAG,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE;oBACnQ,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;oBAC3B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;wBAC9B,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI;wBAC/B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO;wBACrC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM;wBACnC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK;qBAClC,CAAC,CAAC,CAAC,SAAS;oBACb,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;wBAChC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI;qBACjC,CAAC,CAAC,CAAC,SAAS;iBACd,CAAC;aACH;iBAAM;gBACL,GAAG,CAAC,GAAG,OAAO,GAAG,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG;oBACnC,WAAW,EAAE,SAAS;oBACtB,IAAI,EAAE,SAAS;oBACf,UAAU,EAAE,GAAG,OAAO,GAAG,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE;oBAClK,MAAM,EAAE,SAAS;oBACjB,OAAO,EAAE,SAAS;oBAClB,QAAQ,EAAE,SAAS;iBACpB,CAAC;aACH;SACF;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,GAAY,EAAE,UAAsB,EAAE,aAA8B;QACtF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC5C,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAC1B,IAAI,eAAe,CAAC,CAAC,CAAC,EAAE;gBACtB,4BAA4B;gBAC5B,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,MAAO,CAAmB,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE;oBACvH,OAAO,KAAK,CAAC;iBACd;aACF;iBAAM;gBACL,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,MAAO,CAAa,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,EAAE;oBAC9D,OAAO,KAAK,CAAC;iBACd;aACF;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,OAAO,CACZ,MAAc,EACd,YAAwB,EACxB,aAA8B;QAI9B,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,EAAE;YACzD,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE;gBAC3B,OAAO;oBACL,KAAK,EAAE,IAAI;iBACZ,CAAC;aACH;YACD,OAAO,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,CAAC;SAC1F;QACD,OAAO;YACL,KAAK,EAAE,KAAK;SACb,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,WAAW,CAAC,MAAW,EAAE,GAAY;QAClD,IAAI,MAAM,KAAK,KAAK,EAAE;YACpB,8EAA8E;YAC9E,OAAO,KAAK,CAAC;SACd;aAAM,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,SAAS,EAAE;YAClD,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,MAAM,CAAC,CAAC;YACpD,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAC1B;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
1
+ {"version":3,"file":"router-handler.js","sourceRoot":"","sources":["../../../src/common/router-handler.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.4",
3
+ "version": "3.0.6",
4
4
  "description": "",
5
5
  "main": "build/cjs/index.js",
6
6
  "types": "build/cjs/index.d.ts",
@@ -27,7 +27,7 @@
27
27
  "npm": ">=6.0.0"
28
28
  },
29
29
  "dependencies": {
30
- "@miqro/parser": "^1.0.2",
30
+ "@miqro/parser": "^1.0.3",
31
31
  "@miqro/request": "^0.2.1",
32
32
  "cookie": "0.5.0"
33
33
  }
@@ -1,6 +1,6 @@
1
1
  import { ParseOptionMap } from "@miqro/parser";
2
- import { Method } from "./context";
3
- import { handlerWithOptionsParseOptions, 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,10 +14,11 @@ import { handlerWithOptionsParseOptions, HandlerWithOptions } from "./router-typ
14
14
  *export default route;
15
15
  * ```
16
16
  */
17
- export interface APIRoute extends HandlerWithOptions {
17
+ export interface APIRoute extends RouterHandlerOptions {
18
18
  postFolder?: boolean,
19
19
  method?: Method | "use" | "USE";
20
20
  path?: string;
21
+ handler: Handler | Array<Handler> | MinimalRouter;
21
22
  }
22
23
 
23
24
  export interface APIRouterOptions {
@@ -33,8 +34,9 @@ export const APIRouterParseOptions: ParseOptionMap = {
33
34
  };
34
35
 
35
36
  export const APIRouteValidator: ParseOptionMap = {
36
- ...handlerWithOptionsParseOptions,
37
+ ...routerHandlerParseOptions,
37
38
  postFolder: "boolean?",
38
39
  method: "string?",
39
- path: "string?"
40
+ path: "string?",
41
+ handler: "function[]!|MinimalRouter",
40
42
  };
@@ -7,7 +7,9 @@ import { parse } from "@miqro/parser";
7
7
  import { Handler, Method } from "./context.js";
8
8
  import { normalizePath } from "./url-utils";
9
9
  import { Router } from "../router";
10
- import { RouterHandlerOptions } from "./router-types";
10
+ import { RouterHandlerOptions, MinimalRouter, isMinimalRouter } from "./router-types";
11
+
12
+ type UseCallArg = [Handler | Handler[] | MinimalRouter, string | undefined, Method | undefined, RouterHandlerOptions];
11
13
 
12
14
  export async function traverseAPIRouteDir(
13
15
  featureName: string,
@@ -21,7 +23,7 @@ export async function traverseAPIRouteDir(
21
23
  const dirs = files.filter(f => lstatSync(join(dirname, f)).isDirectory());
22
24
  const methods = files.filter(f => !lstatSync(join(dirname, f)).isDirectory());
23
25
 
24
- const postFolder: [Handler | Handler[], string | undefined, Method | undefined, RouterHandlerOptions][] = [];
26
+ const postFolder: UseCallArg[] = [];
25
27
 
26
28
  for (const f of methods) {
27
29
  const { name, ext } = pathParse(f);
@@ -55,7 +57,7 @@ export async function traverseAPIRouteDir(
55
57
  //throw new Error(`${resolve(dirname, name)} doesnt export path as a string or a string array`);
56
58
  throw new Error(`${resolve(dirname, name)} doesnt export path as a string`);
57
59
  }
58
- 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") {
59
61
  throw new Error(`${resolve(dirname, name)} doesnt export handler as a function or an array`);
60
62
  }
61
63
  if (typeof route.name !== "string" && typeof route.name !== "undefined") {
@@ -70,7 +72,7 @@ export async function traverseAPIRouteDir(
70
72
  if (typeof p !== "string" || !p) {
71
73
  throw new Error(`${resolve(dirname, name)} doesnt export path as a string or a string array`);
72
74
  }
73
- const path = normalizePath(`${basePath}${p && p !== "/" ? `${p}` : ""}`)
75
+ const path = normalizePath(`${basePath}${p && p !== "/" ? `${p}` : p}`)
74
76
 
75
77
  const subName = (p.charAt(0) === "/" ? p.substring(1) : p).replace(/[^a-z0-9+]+/gi, '_');
76
78
  const routeName = route.name ? route.name : name;
@@ -86,38 +88,25 @@ export async function traverseAPIRouteDir(
86
88
  if (route.identifier && route.identifier === "__prototype__" || route.identifier === "__proto__") {
87
89
  throw new Error(`invalid feature name ${route.identifier}`);
88
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
104
+ }
105
+ }];
89
106
  if (route.postFolder) {
90
- postFolder.push([route.handler, path, routeMethod !== "use" && routeMethod !== "USE" ? routeMethod : undefined, {
91
- identifier: route.identifier,
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
- }]);
107
+ postFolder.push(useCallArgs);
105
108
  } else {
106
- router.use(route.handler, path, routeMethod !== "use" && routeMethod !== "USE" ? routeMethod : undefined, {
107
- identifier: route.identifier,
108
- apiName: route.apiName,
109
- name: route.name,
110
- description: route.description,
111
- parser: route.parser,
112
- middleware: route.middleware,
113
- session: route.session,
114
- policy: route.policy,
115
- request: route.request,
116
- response: {
117
- body: route.response && route.response.body ? route.response.body : true,
118
- middleware: route.response && route.response.middleware ? route.response.middleware : undefined
119
- }
120
- });
109
+ router.use(...useCallArgs);
121
110
  }
122
111
  }
123
112
  }
@@ -19,7 +19,7 @@ export class RouterHandler {
19
19
  private readonly options?: RouterHandlerOptions;
20
20
 
21
21
  public constructor(
22
- handler: Array<Handler> | HandlerWithOptions | Handler | MinimalRouter,
22
+ private readonly originalHandler: Array<Handler> | HandlerWithOptions | Handler | MinimalRouter,
23
23
  private readonly path: string | undefined,
24
24
  private readonly method: Method | undefined,
25
25
  options?: RouterHandlerOptions) {
@@ -30,29 +30,30 @@ export class RouterHandler {
30
30
  }
31
31
 
32
32
  let handlers: Array<Handler | MinimalRouter> = []
33
- this.isRouter = isMinimalRouter(handler); //handler instanceof Router;
33
+ this.isRouter = isMinimalRouter(originalHandler); //handler instanceof Router;
34
34
 
35
- if (!this.isRouter && !(handler instanceof Array) && typeof handler === "object") {
35
+ if (!this.isRouter && !(originalHandler instanceof Array) && typeof originalHandler === "object") {
36
36
  // HandlerWithOptions
37
37
  if (options) {
38
38
  throw new Error("bad arguments. cannot send options with HandlerWithOptions");
39
39
  }
40
40
  //console.dir(handler);
41
- handler = parse(handler, handlerWithOptionsParseOptions, "no_extra", "handler");
42
- const realHandler = (handler as HandlerWithOptions).handler;
41
+ this.originalHandler = parse(originalHandler, handlerWithOptionsParseOptions, "no_extra", "handler");
42
+ const realHandler = (originalHandler as HandlerWithOptions).handler;
43
43
  const newOptions = {
44
- ...(handler as HandlerWithOptions)
44
+ ...(originalHandler as HandlerWithOptions)
45
45
  };
46
46
  delete (newOptions as any).handler;
47
- handler = realHandler;
47
+ this.originalHandler = realHandler;
48
48
  this.options = newOptions;
49
49
  } else {
50
50
  this.options = options;
51
51
  }
52
- const routeHandlers = handler instanceof Array ? handler : [handler] as Array<Handler | MinimalRouter>;
52
+ const routeHandlers = this.originalHandler instanceof Array ? this.originalHandler : [this.originalHandler] as Array<Handler | MinimalRouter>;
53
53
 
54
- if ((!this.isRouter && routeHandlers.length !== routeHandlers.filter(h => typeof h === "function").length) || (this.isRouter && this.options)) {
55
- throw new Error("bad arguments");
54
+ //if ((!this.isRouter && routeHandlers.length !== routeHandlers.filter(h => typeof h === "function").length) || (this.isRouter && this.options)) {
55
+ if ((!this.isRouter && routeHandlers.length !== routeHandlers.filter(h => typeof h === "function").length)) {
56
+ throw new Error(`bad arguments isRouter[${this.isRouter}]`);
56
57
  }
57
58
 
58
59
  if (this.options && this.options.middleware) {
@@ -96,7 +97,7 @@ export class RouterHandler {
96
97
  const nMethod = this.method ? this.method : "";
97
98
 
98
99
  if (this.isRouter) {
99
- const router: MinimalRouter = this.handler[0] as MinimalRouter;
100
+ const router: MinimalRouter = this.originalHandler as MinimalRouter;
100
101
  router.getJSONDoc(doc, `${prePath}${nPath}`);
101
102
  } else {
102
103
  if (!doc[`${prePath}${nPath}`]) {