@miqro/core 1.5.14 → 1.5.17

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 (62) hide show
  1. package/dist/api-router.d.ts +6 -5
  2. package/dist/api-router.js +9 -3
  3. package/dist/api-router.js.map +1 -1
  4. package/dist/app-utils.d.ts +13 -0
  5. package/dist/app-utils.js +82 -0
  6. package/dist/app-utils.js.map +1 -0
  7. package/dist/app.js +6 -88
  8. package/dist/app.js.map +1 -1
  9. package/dist/common/api-router-utils.d.ts +1 -1
  10. package/dist/common/api-router-utils.js +7 -3
  11. package/dist/common/api-router-utils.js.map +1 -1
  12. package/dist/common/config/config.js +12 -0
  13. package/dist/common/config/config.js.map +1 -1
  14. package/dist/common/config/loader.js +2 -2
  15. package/dist/common/config/loader.js.map +1 -1
  16. package/dist/common/context.js +6 -3
  17. package/dist/common/context.js.map +1 -1
  18. package/dist/common/router-handler.d.ts +20 -0
  19. package/dist/common/router-handler.js +136 -0
  20. package/dist/common/router-handler.js.map +1 -0
  21. package/dist/common/router-utils.d.ts +7 -5
  22. package/dist/common/router-utils.js +37 -47
  23. package/dist/common/router-utils.js.map +1 -1
  24. package/dist/common/session/service.js +4 -1
  25. package/dist/common/session/service.js.map +1 -1
  26. package/dist/common/tokenize-match.d.ts +13 -20
  27. package/dist/common/tokenize-match.js +27 -59
  28. package/dist/common/tokenize-match.js.map +1 -1
  29. package/dist/middleware/group.js +2 -0
  30. package/dist/middleware/group.js.map +1 -1
  31. package/dist/middleware/index.d.ts +1 -0
  32. package/dist/middleware/index.js +1 -0
  33. package/dist/middleware/index.js.map +1 -1
  34. package/dist/middleware/result.d.ts +3 -0
  35. package/dist/middleware/result.js +51 -0
  36. package/dist/middleware/result.js.map +1 -0
  37. package/dist/router.d.ts +3 -30
  38. package/dist/router.js +5 -167
  39. package/dist/router.js.map +1 -1
  40. package/package.json +10 -8
  41. package/src/api-router.ts +16 -7
  42. package/src/api-router.unit.test.js +273 -0
  43. package/src/app-utils.ts +82 -0
  44. package/src/app-utils.unit.test.js +100 -0
  45. package/src/app.ts +4 -89
  46. package/src/app.unit.test.js +334 -0
  47. package/src/common/api-router-utils.ts +6 -3
  48. package/src/common/config/config.ts +12 -0
  49. package/src/common/config/loader.ts +2 -2
  50. package/src/common/context.ts +7 -3
  51. package/src/common/context.unit.test.js +286 -0
  52. package/src/common/router-handler.ts +159 -0
  53. package/src/common/router-utils.ts +46 -44
  54. package/src/common/session/service.ts +4 -1
  55. package/src/common/tokenize-match.ts +32 -54
  56. package/src/middleware/group.ts +2 -0
  57. package/src/middleware/index.ts +1 -0
  58. package/src/middleware/result.ts +43 -0
  59. package/src/proxy.unit.test.js +157 -0
  60. package/src/router.ts +7 -196
  61. package/src/router.unit.test.js +397 -0
  62. package/src/setup-test.js +5 -0
@@ -0,0 +1,51 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.ResultParser = void 0;
4
+ const parser_1 = require("@miqro/parser");
5
+ const ResultParser = (options, parser) => {
6
+ options = (0, parser_1.parse)(options, "ParseOptions[]!|string", undefined, "options");
7
+ return async function ResultParser(ctx) {
8
+ if (!ctx.results || ctx.results.length === 0) {
9
+ ctx.logger.debug(`not parsing results`);
10
+ return undefined;
11
+ }
12
+ else {
13
+ const index = ctx.results.length - 1;
14
+ const lastResult = ctx.results[index];
15
+ ctx.logger.trace(`parsing lastResult[%o]`, lastResult);
16
+ try {
17
+ if (options instanceof Array) {
18
+ for (let i = 0; i < options.length; i++) {
19
+ const o = options[i];
20
+ try {
21
+ const mappedResults = (parser ? parser : { parse: parser_1.parse }).parse(lastResult, o.options, o.mode, `ctx.results[${index}]`);
22
+ ctx.logger.trace(`ctx.results[%s] mapped to %o`, index, mappedResults);
23
+ return mappedResults;
24
+ }
25
+ catch (e) {
26
+ if (i === options.length - 1) {
27
+ throw e;
28
+ }
29
+ }
30
+ }
31
+ }
32
+ else if (typeof options !== "string") {
33
+ const mappedResults = (parser ? parser : { parse: parser_1.parse }).parse(lastResult, options.options, options.mode, `ctx.results[${index}]`);
34
+ ctx.logger.trace(`ctx.results[%s] mapped to %o`, index, mappedResults);
35
+ return mappedResults;
36
+ }
37
+ else {
38
+ const mappedResults = (parser ? parser : { parse: parser_1.parse }).parse(lastResult, options, "no_extra", `ctx.results[${index}]`);
39
+ ctx.logger.trace(`ctx.results[%s] mapped to %o`, index, mappedResults);
40
+ return mappedResults;
41
+ }
42
+ }
43
+ catch (e) {
44
+ ctx.logger.error(`error parsing lastResult[%o]`, lastResult);
45
+ throw e;
46
+ }
47
+ }
48
+ };
49
+ };
50
+ exports.ResultParser = ResultParser;
51
+ //# sourceMappingURL=result.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"result.js","sourceRoot":"","sources":["../../src/middleware/result.ts"],"names":[],"mappings":";;;AAAA,0CAAmE;AAG5D,MAAM,YAAY,GAAG,CAAC,OAA+C,EAAE,MAAwB,EAAW,EAAE;IACjH,OAAO,GAAG,IAAA,cAAK,EAAC,OAAO,EAAE,wBAAwB,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IACzE,OAAO,KAAK,UAAU,YAAY,CAAC,GAAY;QAC7C,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5C,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;YACxC,OAAO,SAAS,CAAC;SAClB;aAAM;YACL,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;YACrC,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACtC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,UAAU,CAAC,CAAC;YACvD,IAAI;gBACF,IAAI,OAAO,YAAY,KAAK,EAAE;oBAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;wBACvC,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;wBACrB,IAAI;4BACF,MAAM,aAAa,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAC,KAAK,EAAL,cAAK,EAAC,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,eAAe,KAAK,GAAG,CAAC,CAAC;4BAChH,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;4BACvE,OAAO,aAAa,CAAC;yBACtB;wBAAC,OAAO,CAAC,EAAE;4BACV,IAAI,CAAC,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;gCAC5B,MAAM,CAAC,CAAC;6BACT;yBACF;qBACF;iBACF;qBAAM,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;oBACtC,MAAM,aAAa,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAC,KAAK,EAAL,cAAK,EAAC,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,eAAe,KAAK,GAAG,CAAC,CAAC;oBAC5H,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;oBACvE,OAAO,aAAa,CAAC;iBACtB;qBAAM;oBACL,MAAM,aAAa,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAC,KAAK,EAAL,cAAK,EAAC,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,eAAe,KAAK,GAAG,CAAC,CAAC;oBAClH,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;oBACvE,OAAO,aAAa,CAAC;iBACtB;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,UAAU,CAAC,CAAC;gBAC7D,MAAM,CAAC,CAAC;aACT;SACF;IACH,CAAC,CAAA;AACH,CAAC,CAAA;AAvCY,QAAA,YAAY,gBAuCxB"}
package/dist/router.d.ts CHANGED
@@ -3,31 +3,8 @@ import { IncomingMessage, RequestListener } from "http";
3
3
  import { Logger } from "./common/logger";
4
4
  import { Context, ErrorHandler, Handler, Method } from "./common/context";
5
5
  import { HandlerWithOptions, RouterHandlerOptions, RouterJSONDoc } from "./common/router-utils";
6
- import { PathPartToken } from "./common/tokenize-match";
7
- declare class RouterHandler {
8
- private readonly path;
9
- private readonly method;
10
- private readonly tokens;
11
- private readonly handler;
12
- private readonly isRouter;
13
- private readonly options?;
14
- constructor(handler: Array<Handler> | HandlerWithOptions | Handler | Router, path: string | undefined, method: Method | undefined, options?: RouterHandlerOptions);
15
- getJSONDoc(doc?: RouterJSONDoc, prePath?: string): RouterJSONDoc;
16
- invoke(ctx: Context, pathTokens: {
17
- value: string;
18
- lower: string;
19
- }[], prePathTokens: PathPartToken[]): Promise<boolean>;
20
- isMatch(method: string, pathTokens: {
21
- value: string;
22
- lower: string;
23
- }[], prePathTokens: PathPartToken[]): {
24
- match: boolean;
25
- params?: {
26
- [name: string]: string | undefined;
27
- };
28
- };
29
- private static pushResults;
30
- }
6
+ import { PathPart, PathPartToken } from "./common/tokenize-match";
7
+ import { RouterHandler } from "./common/router-handler";
31
8
  export interface RouterOptions {
32
9
  loggerFactory?: (uuid: string, req: IncomingMessage) => Logger;
33
10
  }
@@ -45,10 +22,6 @@ export declare class Router {
45
22
  options(path: string, handler: Array<Handler> | Handler | Router | HandlerWithOptions, options?: RouterHandlerOptions): Router;
46
23
  use(handler: Array<Handler> | HandlerWithOptions | Handler | Router, path?: string, method?: Method, options?: RouterHandlerOptions): Router;
47
24
  catch(errorHandler: Array<ErrorHandler> | ErrorHandler): Router;
48
- run(ctx: Context, pathTokens?: {
49
- value: string;
50
- lower: string;
51
- }[], prePathTokens?: PathPartToken[]): Promise<boolean>;
25
+ run(ctx: Context, pathTokens?: PathPart[], prePathTokens?: PathPartToken[]): Promise<boolean>;
52
26
  getJSONDoc(doc?: RouterJSONDoc, prePath?: string): RouterJSONDoc;
53
27
  }
54
- export {};
package/dist/router.js CHANGED
@@ -3,174 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Router = void 0;
4
4
  const uuid_1 = require("uuid");
5
5
  const context_1 = require("./common/context");
6
- const router_utils_1 = require("./common/router-utils");
7
6
  const tokenize_match_1 = require("./common/tokenize-match");
8
7
  const router_helpers_1 = require("./common/router-helpers");
9
- const middleware_1 = require("./middleware");
10
- const parser_1 = require("@miqro/parser");
11
- const ROUTE_OPTIONS = {
12
- name: "string?",
13
- description: "string?",
14
- policy: "GroupPolicy?",
15
- response: {
16
- type: "nested?",
17
- nestedOptions: {
18
- options: {
19
- body: "boolean?|ParseOptions[]!?|string?"
20
- },
21
- mode: "no_extra"
22
- }
23
- },
24
- request: {
25
- type: "nested?",
26
- nestedOptions: {
27
- options: {
28
- headers: "ParseOptions[]!?",
29
- query: "boolean?|ParseOptions[]!?|string?",
30
- params: "boolean?|ParseOptions[]!?|string?",
31
- body: "boolean?|ParseOptions[]!?|string?"
32
- },
33
- mode: "no_extra"
34
- }
35
- }
36
- };
37
- class RouterHandler {
38
- constructor(handler, path, method, options) {
39
- this.path = path;
40
- this.method = method;
41
- this.tokens = (0, tokenize_match_1.tokenizePath)(path);
42
- if (options) {
43
- options = (0, parser_1.parse)(options, {
44
- parser: "ParserInterface?",
45
- middleware: "function[]!?",
46
- session: "SessionHandlerOptions?|function?",
47
- ...ROUTE_OPTIONS
48
- }, "no_extra", "options");
49
- }
50
- let handlers = [];
51
- this.isRouter = handler instanceof Router;
52
- if (!this.isRouter && !(handler instanceof Array) && typeof handler === "object") {
53
- // HandlerWithOptions
54
- if (options) {
55
- throw new Error("bad arguments. cannot send options with HandlerWithOptions");
56
- }
57
- handler = (0, parser_1.parse)(handler, {
58
- handler: "function[]!",
59
- parser: "ParserInterface?",
60
- middleware: "function[]!?",
61
- session: "SessionHandlerOptions?|function?",
62
- ...ROUTE_OPTIONS
63
- }, "no_extra", "handler");
64
- const realHandler = handler.handler;
65
- const newOptions = {
66
- ...handler
67
- };
68
- delete newOptions.handler;
69
- handler = realHandler;
70
- this.options = newOptions;
71
- }
72
- else {
73
- this.options = options;
74
- }
75
- const routeHandlers = handler instanceof Array ? handler : [handler];
76
- if ((!this.isRouter && routeHandlers.length !== routeHandlers.filter(h => typeof h === "function").length) || (this.isRouter && this.options)) {
77
- throw new Error("bad arguments");
78
- }
79
- if (this.options && this.options.middleware) {
80
- handlers = handlers.concat(this.options.middleware);
81
- }
82
- if (this.options && this.options.session) {
83
- handlers.push(typeof this.options.session !== "function" ? (0, middleware_1.SessionHandler)(this.options.session) : this.options.session);
84
- }
85
- if (this.options && this.options.policy) {
86
- handlers.push((0, middleware_1.GroupPolicyHandler)(this.options.policy));
87
- }
88
- if (this.options && this.options.request) {
89
- handlers.push((0, middleware_1.ParseRequest)(this.options.request, this.options.parser));
90
- }
91
- handlers = handlers.concat(routeHandlers);
92
- if (this.options && this.options.response) {
93
- if (typeof this.options.response.body === "boolean" && this.options.response.body) {
94
- handlers.push((0, router_utils_1.ResponseHandler)());
95
- }
96
- else if (this.options.response.body) {
97
- handlers.push((0, router_utils_1.ResultParser)(this.options.response.body, this.options.parser));
98
- handlers.push((0, router_utils_1.ResponseHandler)());
99
- }
100
- }
101
- this.handler = handlers;
102
- }
103
- getJSONDoc(doc = {}, prePath = "/") {
104
- const nPath = this.path && this.path.length > 1 ? this.path.substring(1) : "";
105
- const nMethod = this.method ? this.method : "";
106
- if (this.isRouter) {
107
- const router = this.handler[0];
108
- router.getJSONDoc(doc, `${prePath}${nPath}`);
109
- }
110
- else if (this.options) {
111
- if (!doc[`${prePath}${nPath}`]) {
112
- doc[`${prePath}${nPath}`] = {};
113
- }
114
- if (doc[`${prePath}${nPath}`][nMethod]) {
115
- throw new Error("cannot create doc routes override each other");
116
- }
117
- doc[`${prePath}${nPath}`][nMethod] = {
118
- description: this.options.description,
119
- name: this.options.name,
120
- 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(),
121
- policy: this.options.policy,
122
- request: this.options.request ? {
123
- body: this.options.request.body,
124
- headers: this.options.request.headers,
125
- params: this.options.request.params,
126
- query: this.options.request.query,
127
- } : undefined,
128
- response: this.options.response
129
- };
130
- }
131
- return doc;
132
- }
133
- async invoke(ctx, pathTokens, prePathTokens) {
134
- for (let i = 0; i < this.handler.length; i++) {
135
- const h = this.handler[i];
136
- if (h instanceof Router) {
137
- if (!RouterHandler.pushResults(await h.run(ctx, pathTokens, prePathTokens.concat(this.tokens)), ctx)) {
138
- return false;
139
- }
140
- }
141
- else {
142
- if (!RouterHandler.pushResults(await h(ctx), ctx)) {
143
- return false;
144
- }
145
- }
146
- }
147
- return true;
148
- }
149
- isMatch(method, pathTokens, prePathTokens) {
150
- if ((this.method === undefined || this.method === method)) {
151
- if (this.path === undefined) {
152
- return {
153
- match: true
154
- };
155
- }
156
- return (0, tokenize_match_1.matchTokenizePath)(this.isRouter, prePathTokens.concat(this.tokens), pathTokens);
157
- }
158
- return {
159
- match: false
160
- };
161
- }
162
- static pushResults(result, ctx) {
163
- if (result === false) {
164
- // ctx.logger.debug(`avoiding next handlers because handler returned false.`);
165
- return false;
166
- }
167
- else if (result !== true && result !== undefined) {
168
- ctx.logger.trace("pushing to results [%o]", result);
169
- ctx.results.push(result);
170
- }
171
- return true;
172
- }
173
- }
8
+ const router_handler_1 = require("./common/router-handler");
174
9
  class Router {
175
10
  constructor(config) {
176
11
  this.config = config;
@@ -206,12 +41,15 @@ class Router {
206
41
  use(handler, path, method, options) {
207
42
  const nPath = path !== undefined ? (0, tokenize_match_1.normalizePath)(path) : undefined;
208
43
  const nMethod = method ? method.toUpperCase() : method;
209
- this.handlers.push(new RouterHandler(handler, nPath, nMethod, options));
44
+ this.handlers.push(new router_handler_1.RouterHandler(handler, nPath, nMethod, options));
210
45
  return this;
211
46
  }
212
47
  catch(errorHandler) {
213
48
  const errorHandlers = errorHandler instanceof Array ? errorHandler : [errorHandler];
214
49
  for (const e of errorHandlers) {
50
+ if (typeof e !== "function") {
51
+ throw new Error(`errorHandler ${e} not a function!`);
52
+ }
215
53
  this.errorHandlers.push(e);
216
54
  }
217
55
  return this;
@@ -1 +1 @@
1
- {"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":";;;AACA,+BAAwB;AAExB,8CAAwE;AACxE,wDAM+B;AAC/B,4DAAiH;AACjH,4DAA6D;AAC7D,6CAA8E;AAC9E,0CAAoD;AAEpD,MAAM,aAAa,GAAmB;IACpC,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,SAAS;IACtB,MAAM,EAAE,cAAc;IACtB,QAAQ,EAAE;QACR,IAAI,EAAE,SAAS;QACf,aAAa,EAAE;YACb,OAAO,EAAE;gBACP,IAAI,EAAE,mCAAmC;aAC1C;YACD,IAAI,EAAE,UAAU;SACjB;KACF;IACD,OAAO,EAAE;QACP,IAAI,EAAE,SAAS;QACf,aAAa,EAAE;YACb,OAAO,EAAE;gBACP,OAAO,EAAE,kBAAkB;gBAC3B,KAAK,EAAE,mCAAmC;gBAC1C,MAAM,EAAE,mCAAmC;gBAC3C,IAAI,EAAE,mCAAmC;aAC1C;YACD,IAAI,EAAE,UAAU;SACjB;KACF;CACF,CAAC;AAEF,MAAM,aAAa;IAOjB,YACE,OAA+D,EAC9C,IAAwB,EACxB,MAA0B,EAC3C,OAA8B;QAFb,SAAI,GAAJ,IAAI,CAAoB;QACxB,WAAM,GAAN,MAAM,CAAoB;QAE3C,IAAI,CAAC,MAAM,GAAG,IAAA,6BAAY,EAAC,IAAI,CAAC,CAAC;QAEjC,IAAI,OAAO,EAAE;YACX,OAAO,GAAG,IAAA,cAAK,EAAC,OAAO,EAAE;gBACvB,MAAM,EAAE,kBAAkB;gBAC1B,UAAU,EAAE,cAAc;gBAC1B,OAAO,EAAE,kCAAkC;gBAC3C,GAAG,aAAa;aACjB,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;SAC3B;QAED,IAAI,QAAQ,GAA4B,EAAE,CAAA;QAC1C,IAAI,CAAC,QAAQ,GAAG,OAAO,YAAY,MAAM,CAAC;QAE1C,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,OAAO,GAAG,IAAA,cAAK,EAAC,OAAO,EAAE;gBACvB,OAAO,EAAE,aAAa;gBACtB,MAAM,EAAE,kBAAkB;gBAC1B,UAAU,EAAE,cAAc;gBAC1B,OAAO,EAAE,kCAAkC;gBAC3C,GAAG,aAAa;aACjB,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;YAC1B,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,CAA4B,CAAC;QAEhG,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,IAAA,2BAAc,EAAC,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,IAAA,+BAAkB,EAAC,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,IAAA,yBAAY,EAAC,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;YACzC,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE;gBAChF,QAAsB,CAAC,IAAI,CAAC,IAAA,8BAAe,GAAE,CAAC,CAAC;aACjD;iBAAM,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE;gBACpC,QAAsB,CAAC,IAAI,CAAC,IAAA,2BAAY,EAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;gBAC3F,QAAsB,CAAC,IAAI,CAAC,IAAA,8BAAe,GAAE,CAAC,CAAC;aACjD;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,GAAW,IAAI,CAAC,OAAO,CAAC,CAAC,CAAW,CAAC;YACjD,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,OAAO,GAAG,KAAK,EAAE,CAAC,CAAC;SAC9C;aAAM,IAAI,IAAI,CAAC,OAAO,EAAE;YACvB,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,GAAG,KAAK,EAAE,CAAC,EAAE;gBAC9B,GAAG,CAAC,GAAG,OAAO,GAAG,KAAK,EAAE,CAAC,GAAG,EAAE,CAAC;aAChC;YACD,IAAI,GAAG,CAAC,GAAG,OAAO,GAAG,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE;gBACtC,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;aACjE;YACD,GAAG,CAAC,GAAG,OAAO,GAAG,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG;gBACnC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;gBACrC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;gBACvB,UAAU,EAAE,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;gBAC/M,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;gBAC3B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;oBAC9B,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI;oBAC/B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO;oBACrC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM;oBACnC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK;iBAClC,CAAC,CAAC,CAAC,SAAS;gBACb,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;aAChC,CAAC;SACH;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,GAAY,EAAE,UAA+C,EAAE,aAA8B;QAC/G,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,CAAC,YAAY,MAAM,EAAE;gBACvB,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE;oBACpG,OAAO,KAAK,CAAC;iBACd;aACF;iBAAM;gBACL,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,EAAE;oBACjD,OAAO,KAAK,CAAC;iBACd;aACF;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,OAAO,CACZ,MAAc,EACd,UAA+C,EAC/C,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,IAAA,kCAAiB,EAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,CAAC;SACxF;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;AAMD,MAAa,MAAM;IAKjB,YAAsB,MAAsB;QAAtB,WAAM,GAAN,MAAM,CAAgB;QAJzB,aAAQ,GAAoB,EAAE,CAAC;QAC/B,kBAAa,GAAmB,EAAE,CAAC;QAIpD,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,qCAAoB,CAAC;QAClH,IAAI,CAAC,QAAQ,GAAG,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YACjC,MAAM,IAAI,GAAG,IAAA,SAAE,GAAE,CAAC,QAAQ,EAAE,CAAC;YAC7B,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACxC,MAAM,GAAG,GAAG,IAAI,iBAAO,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;YAChD,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YACrC,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC,CAAC;IACJ,CAAC;IAEM,GAAG,CAAC,IAAY,EAAE,OAA+D,EAAE,OAA8B;QACtH,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAEM,IAAI,CAAC,IAAY,EAAE,OAA+D,EAAE,OAA8B;QACvH,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAEM,KAAK,CAAC,IAAY,EAAE,OAA+D,EAAE,OAA8B;QACxH,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IAEM,MAAM,CAAC,IAAY,EAAE,OAA+D,EAAE,OAA8B;QACzH,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC;IAEM,GAAG,CAAC,IAAY,EAAE,OAA+D,EAAE,OAA8B;QACtH,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAEM,OAAO,CAAC,IAAY,EAAE,OAA+D,EAAE,OAA8B;QAC1H,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;IAEM,GAAG,CAAC,OAA+D,EAAE,IAAa,EAAE,MAAe,EAAE,OAA8B;QACxI,MAAM,KAAK,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAA,8BAAa,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnE,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,EAAY,CAAC,CAAC,CAAC,MAAM,CAAC;QACjE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,YAAgD;QAC3D,MAAM,aAAa,GAAG,YAAY,YAAY,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;QACpF,KAAK,MAAM,CAAC,IAAI,aAAa,EAAE;YAC7B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAC5B;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,GAAY,EAAE,UAAgD,EAAE,gBAAiC,EAAE;QAClH,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,0BAAS,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC3D,IAAI;YACF,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE;gBAC7B,IAAI,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE;oBACvB,MAAM;iBACP;gBACD,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;gBACjE,IAAI,OAAO,CAAC,KAAK,EAAE;oBACjB,IAAI,OAAO,CAAC,MAAM,EAAE;wBAClB,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;4BACxB,GAAG,GAAG,CAAC,MAAM;4BACb,GAAG,OAAO,CAAC,MAAM;yBAClB,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;qBACpB;oBACD,MAAM,cAAc,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;oBACtE,IAAI,CAAC,cAAc,EAAE;wBACnB,MAAM;qBACP;iBACF;aACF;YACD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC;SAC7B;QAAC,OAAO,CAAM,EAAE;YACf,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,aAAa,EAAE;gBACnC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;gBAC7B,IAAI,GAAG,KAAK,KAAK,IAAI,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE;oBACxC,OAAO,KAAK,CAAC;iBACd;aACF;YACD,MAAM,CAAC,CAAC,CAAC,uBAAuB;SACjC;IACH,CAAC;IAEM,UAAU,CAAC,MAAqB,EAAE,EAAE,OAAO,GAAG,GAAG;QACtD,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE;YAC7B,GAAG,GAAG,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;SAClC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;CACF;AA9FD,wBA8FC"}
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": "1.5.14",
3
+ "version": "1.5.17",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -8,16 +8,18 @@
8
8
  "prepare": "npm run build",
9
9
  "prebuild": "rm -Rf dist/;",
10
10
  "build": "tsc",
11
- "pretest:file": "npm run build",
12
- "test": "npm run pretest:file && LOG_LEVEL=debug NODE_ENV=test miqro-test test/*.test.js -n ",
13
- "test:file": "LOG_LEVEL=debug NODE_ENV=test miqro-test"
11
+ "pretest": "npm run build",
12
+ "test": "LOG_LEVEL=debug NODE_ENV=test npx miqro-test -r src/ test/*.test.js -n ",
13
+ "test:unit": "LOG_LEVEL=debug NODE_ENV=test npx miqro-test -r src/ -n ",
14
+ "test:func": "LOG_LEVEL=debug NODE_ENV=test npx miqro-test test/*.test.js -n "
14
15
  },
15
16
  "author": "claukers",
16
17
  "license": "ISC",
17
18
  "devDependencies": {
18
- "@miqro/test": "0.1.0",
19
+ "@miqro/test": "0.2.1",
20
+ "@miqro/test-http": "0.0.3",
19
21
  "@types/node": "17.0.23",
20
- "typescript": "4.6.3",
22
+ "typescript": "4.6.4",
21
23
  "@types/cookie": "0.4.1",
22
24
  "@types/uuid": "8.3.4"
23
25
  },
@@ -26,8 +28,8 @@
26
28
  "npm": ">=6.0.0"
27
29
  },
28
30
  "dependencies": {
29
- "@miqro/request": "^0.0.7",
30
- "@miqro/parser": "^0.1.1",
31
+ "@miqro/request": "^0.0.8",
32
+ "@miqro/parser": "^0.1.3",
31
33
  "cookie": "0.4.1",
32
34
  "uuid": "8.3.2"
33
35
  }
package/src/api-router.ts CHANGED
@@ -2,6 +2,19 @@ import {existsSync, lstatSync} from "fs";
2
2
  import {basename} from "path";
3
3
  import {FeatureRouter, traverseAPIRouteDir} from "./common/api-router-utils";
4
4
  import {Logger} from "./common/logger";
5
+ import {parse, ParseOptionMap} from "@miqro/parser";
6
+
7
+ export interface APIRouterOptions {
8
+ dirname: string;
9
+ apiName?: string;
10
+ path?: string;
11
+ }
12
+
13
+ const APIRouterParseOptions: ParseOptionMap = {
14
+ dirname: "string",
15
+ apiName: "string?",
16
+ path: "string?"
17
+ };
5
18
 
6
19
  /**
7
20
  * # APIRouter
@@ -33,12 +46,8 @@ import {Logger} from "./common/logger";
33
46
  *export default route;
34
47
  * ```
35
48
  */
36
- export const APIRouter = (options: {
37
- dirname: string;
38
- apiName?: string;
39
- path?: string;
40
- }, logger?: Logger) => {
41
- const {dirname} = options;
49
+ export function APIRouter(options: APIRouterOptions, logger?: Logger) {
50
+ const {dirname} = parse(options, APIRouterParseOptions, "no_extra", "options") as APIRouterOptions;
42
51
  if (typeof dirname !== "string") {
43
52
  throw new Error(`options.dirname must be defined!`);
44
53
  }
@@ -48,4 +57,4 @@ export const APIRouter = (options: {
48
57
  const apiName = options.apiName !== undefined ? options.apiName : basename(dirname);
49
58
  const apiPath = options.path !== undefined ? options.path : `/${apiName}`;
50
59
  return FeatureRouter(traverseAPIRouteDir(apiName.toUpperCase(), dirname, apiPath, undefined, logger), logger);
51
- };
60
+ }
@@ -0,0 +1,273 @@
1
+ const {fake, requireMock} = require("@miqro/test");
2
+ const {resolve} = require("path");
3
+ const {strictEqual} = require("assert");
4
+ const {distPath} = require("./setup-test.js");
5
+
6
+ const testFilePath = resolve(distPath, "api-router.js");
7
+
8
+ describe("api-router unit tests", () => {
9
+ it("directory doesnt exists", () => {
10
+ const parse = fake((args) => {
11
+ return args;
12
+ });
13
+ const existsSync = fake(() => {
14
+ return false;
15
+ });
16
+ const {APIRouter} = requireMock(testFilePath, {
17
+ fs: {
18
+ existsSync
19
+ },
20
+ path: {},
21
+ ["./common/api-router-utils"]: {},
22
+ ["./common/logger"]: {},
23
+ ["@miqro/parser"]: {
24
+ parse
25
+ }
26
+ }, distPath);
27
+ try {
28
+ APIRouter({
29
+ dirname: "dirname"
30
+ });
31
+ strictEqual(false, true);
32
+ } catch(e) {
33
+ strictEqual(parse.callCount, 1);
34
+ strictEqual(existsSync.callCount, 1);
35
+ strictEqual(e.message, "dirname not a directory!");
36
+ }
37
+
38
+ });
39
+ it("directory not directory", () => {
40
+ const parse = fake((args) => {
41
+ return args;
42
+ });
43
+ const existsSync = fake(() => {
44
+ return true;
45
+ });
46
+ const lstatSync = fake((arg) => {
47
+ return {
48
+ isDirectory: () => {
49
+ return false;
50
+ }
51
+ }
52
+ });
53
+ const {APIRouter} = requireMock(testFilePath, {
54
+ fs: {
55
+ existsSync,
56
+ lstatSync
57
+ },
58
+ path: {},
59
+ ["./common/api-router-utils"]: {},
60
+ ["./common/logger"]: {},
61
+ ["@miqro/parser"]: {
62
+ parse
63
+ }
64
+ }, distPath);
65
+
66
+ try {
67
+ APIRouter({
68
+ dirname: "dirname"
69
+ });
70
+ strictEqual(false, true);
71
+ } catch(e) {
72
+ strictEqual(parse.callCount, 1);
73
+ strictEqual(existsSync.callCount, 1);
74
+ strictEqual(lstatSync.callCount, 1);
75
+ strictEqual(e.message, "dirname not a directory!");
76
+ }
77
+ });
78
+ it("options.apiName undefined uses basename", () => {
79
+ const traverseAPIRouteDirRet = "traverseAPIRouteDirRet";
80
+ const FeatureRouterRet = "FeatureRouterRet";
81
+ const basenameRet = "basenameRet";
82
+ const parse = fake((args) => {
83
+ return args;
84
+ });
85
+ const existsSync = fake(() => {
86
+ return true;
87
+ });
88
+ const lstatSync = fake((arg) => {
89
+ return {
90
+ isDirectory: () => {
91
+ return true;
92
+ }
93
+ }
94
+ });
95
+ const basename = fake((arg)=>{
96
+ return basenameRet;
97
+ });
98
+ const traverseAPIRouteDir = fake(()=>{
99
+ return traverseAPIRouteDirRet;
100
+ });
101
+ const FeatureRouter = fake(()=>{
102
+ return FeatureRouterRet;
103
+ });
104
+ const {APIRouter} = requireMock(testFilePath, {
105
+ fs: {
106
+ existsSync,
107
+ lstatSync
108
+ },
109
+ path: {
110
+ basename
111
+ },
112
+ ["./common/api-router-utils"]: {
113
+ traverseAPIRouteDir,
114
+ FeatureRouter
115
+ },
116
+ ["./common/logger"]: {},
117
+ ["@miqro/parser"]: {
118
+ parse
119
+ }
120
+ }, distPath);
121
+
122
+ const apiOptions = {
123
+ dirname: "dirname"
124
+ };
125
+ const logger = "fakeLogger";
126
+ APIRouter(apiOptions, logger);
127
+
128
+ strictEqual(parse.callCount, 1);
129
+ strictEqual(parse.callArgs[0][0], apiOptions);
130
+ strictEqual(existsSync.callCount, 1);
131
+ strictEqual(existsSync.callArgs[0][0], apiOptions.dirname);
132
+ strictEqual(lstatSync.callCount, 1);
133
+ strictEqual(lstatSync.callArgs[0][0], apiOptions.dirname);
134
+ strictEqual(basename.callCount, 1);
135
+ strictEqual(basename.callArgs[0][0], apiOptions.dirname);
136
+ strictEqual(traverseAPIRouteDir.callCount, 1);
137
+ strictEqual(traverseAPIRouteDir.callArgs[0][0], basenameRet.toUpperCase());
138
+ strictEqual(traverseAPIRouteDir.callArgs[0][1], apiOptions.dirname);
139
+ strictEqual(traverseAPIRouteDir.callArgs[0][2], `/${basenameRet}`);
140
+ strictEqual(traverseAPIRouteDir.callArgs[0][3], undefined);
141
+ strictEqual(traverseAPIRouteDir.callArgs[0][4], logger);
142
+ strictEqual(FeatureRouter.callCount, 1);
143
+ strictEqual(FeatureRouter.callArgs[0][0], traverseAPIRouteDirRet);
144
+ strictEqual(FeatureRouter.callArgs[0][1], logger);
145
+ });
146
+ it("options.apiName defined", () => {
147
+ const traverseAPIRouteDirRet = "traverseAPIRouteDirRet";
148
+ const FeatureRouterRet = "FeatureRouterRet";
149
+ const parse = fake((args) => {
150
+ return args;
151
+ });
152
+ const existsSync = fake(() => {
153
+ return true;
154
+ });
155
+ const lstatSync = fake((arg) => {
156
+ return {
157
+ isDirectory: () => {
158
+ return true;
159
+ }
160
+ }
161
+ });
162
+ const traverseAPIRouteDir = fake(()=>{
163
+ return traverseAPIRouteDirRet;
164
+ });
165
+ const FeatureRouter = fake(()=>{
166
+ return FeatureRouterRet;
167
+ });
168
+ const {APIRouter} = requireMock(testFilePath, {
169
+ fs: {
170
+ existsSync,
171
+ lstatSync
172
+ },
173
+ path: {
174
+
175
+ },
176
+ ["./common/api-router-utils"]: {
177
+ traverseAPIRouteDir,
178
+ FeatureRouter
179
+ },
180
+ ["./common/logger"]: {},
181
+ ["@miqro/parser"]: {
182
+ parse
183
+ }
184
+ }, distPath);
185
+
186
+ const apiOptions = {
187
+ dirname: "dirname",
188
+ apiName: "apiName"
189
+ };
190
+ const logger = "fakeLogger";
191
+ APIRouter(apiOptions, logger);
192
+
193
+ strictEqual(parse.callCount, 1);
194
+ strictEqual(parse.callArgs[0][0], apiOptions);
195
+ strictEqual(existsSync.callCount, 1);
196
+ strictEqual(existsSync.callArgs[0][0], apiOptions.dirname);
197
+ strictEqual(lstatSync.callCount, 1);
198
+ strictEqual(lstatSync.callArgs[0][0], apiOptions.dirname);
199
+ strictEqual(traverseAPIRouteDir.callCount, 1);
200
+ strictEqual(traverseAPIRouteDir.callArgs[0][0], apiOptions.apiName.toUpperCase());
201
+ strictEqual(traverseAPIRouteDir.callArgs[0][1], apiOptions.dirname);
202
+ strictEqual(traverseAPIRouteDir.callArgs[0][2], `/${apiOptions.apiName}`);
203
+ strictEqual(traverseAPIRouteDir.callArgs[0][3], undefined);
204
+ strictEqual(traverseAPIRouteDir.callArgs[0][4], logger);
205
+ strictEqual(FeatureRouter.callCount, 1);
206
+ strictEqual(FeatureRouter.callArgs[0][0], traverseAPIRouteDirRet);
207
+ strictEqual(FeatureRouter.callArgs[0][1], logger);
208
+ });
209
+ it("options.path defined", () => {
210
+ const traverseAPIRouteDirRet = "traverseAPIRouteDirRet";
211
+ const FeatureRouterRet = "FeatureRouterRet";
212
+ const parse = fake((args) => {
213
+ return args;
214
+ });
215
+ const existsSync = fake(() => {
216
+ return true;
217
+ });
218
+ const lstatSync = fake((arg) => {
219
+ return {
220
+ isDirectory: () => {
221
+ return true;
222
+ }
223
+ }
224
+ });
225
+ const traverseAPIRouteDir = fake(()=>{
226
+ return traverseAPIRouteDirRet;
227
+ });
228
+ const FeatureRouter = fake(()=>{
229
+ return FeatureRouterRet;
230
+ });
231
+ const {APIRouter} = requireMock(testFilePath, {
232
+ fs: {
233
+ existsSync,
234
+ lstatSync
235
+ },
236
+ path: {
237
+
238
+ },
239
+ ["./common/api-router-utils"]: {
240
+ traverseAPIRouteDir,
241
+ FeatureRouter
242
+ },
243
+ ["./common/logger"]: {},
244
+ ["@miqro/parser"]: {
245
+ parse
246
+ }
247
+ }, distPath);
248
+
249
+ const apiOptions = {
250
+ dirname: "dirname",
251
+ apiName: "apiName",
252
+ path: "apiPath"
253
+ };
254
+ const logger = "fakeLogger";
255
+ APIRouter(apiOptions, logger);
256
+
257
+ strictEqual(parse.callCount, 1);
258
+ strictEqual(parse.callArgs[0][0], apiOptions);
259
+ strictEqual(existsSync.callCount, 1);
260
+ strictEqual(existsSync.callArgs[0][0], apiOptions.dirname);
261
+ strictEqual(lstatSync.callCount, 1);
262
+ strictEqual(lstatSync.callArgs[0][0], apiOptions.dirname);
263
+ strictEqual(traverseAPIRouteDir.callCount, 1);
264
+ strictEqual(traverseAPIRouteDir.callArgs[0][0], apiOptions.apiName.toUpperCase());
265
+ strictEqual(traverseAPIRouteDir.callArgs[0][1], apiOptions.dirname);
266
+ strictEqual(traverseAPIRouteDir.callArgs[0][2], `${apiOptions.path}`);
267
+ strictEqual(traverseAPIRouteDir.callArgs[0][3], undefined);
268
+ strictEqual(traverseAPIRouteDir.callArgs[0][4], logger);
269
+ strictEqual(FeatureRouter.callCount, 1);
270
+ strictEqual(FeatureRouter.callArgs[0][0], traverseAPIRouteDirRet);
271
+ strictEqual(FeatureRouter.callArgs[0][1], logger);
272
+ });
273
+ });