@miqro/core 1.3.2 → 1.3.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.
Files changed (46) hide show
  1. package/README.md +79 -193
  2. package/dist/handler/api-handler.d.ts +1 -1
  3. package/dist/handler/api-handler.js +2 -1
  4. package/dist/handler/api-handler.js.map +1 -1
  5. package/dist/handler/api-router-utils.d.ts +1 -8
  6. package/dist/handler/api-router-utils.js +16 -14
  7. package/dist/handler/api-router-utils.js.map +1 -1
  8. package/dist/handler/app.d.ts +3 -9
  9. package/dist/handler/app.js +10 -14
  10. package/dist/handler/app.js.map +1 -1
  11. package/dist/handler/common/context.d.ts +1 -1
  12. package/dist/handler/common/router-utils.d.ts +59 -0
  13. package/dist/handler/common/router-utils.js +134 -0
  14. package/dist/handler/common/router-utils.js.map +1 -0
  15. package/dist/handler/common/router.d.ts +23 -21
  16. package/dist/handler/common/router.js +55 -81
  17. package/dist/handler/common/router.js.map +1 -1
  18. package/dist/handler/common/tokenize-match.d.ts +18 -9
  19. package/dist/handler/common/tokenize-match.js +34 -28
  20. package/dist/handler/common/tokenize-match.js.map +1 -1
  21. package/dist/handler/feature-router.d.ts +4 -2
  22. package/dist/handler/feature-router.js +1 -1
  23. package/dist/handler/feature-router.js.map +1 -1
  24. package/dist/handler/middleware/parse.d.ts +1 -0
  25. package/dist/handler/middleware/parse.js +10 -0
  26. package/dist/handler/middleware/parse.js.map +1 -1
  27. package/dist/util/client.d.ts +17 -0
  28. package/dist/util/client.js +55 -0
  29. package/dist/util/client.js.map +1 -0
  30. package/dist/util/cookie/cookie.d.ts +0 -1
  31. package/dist/util/parser/get.js +3 -6
  32. package/dist/util/parser/get.js.map +1 -1
  33. package/dist/util/request/common.d.ts +0 -1
  34. package/package.json +1 -2
  35. package/src/handler/api-handler.ts +3 -2
  36. package/src/handler/api-router-utils.ts +17 -20
  37. package/src/handler/app.ts +11 -19
  38. package/src/handler/common/context.ts +1 -1
  39. package/src/handler/common/router-utils.ts +184 -0
  40. package/src/handler/common/router.ts +66 -95
  41. package/src/handler/common/tokenize-match.ts +40 -40
  42. package/src/handler/feature-router.ts +4 -2
  43. package/src/handler/middleware/parse.ts +11 -1
  44. package/src/util/client.ts +64 -0
  45. package/src/util/parser/get.ts +3 -5
  46. package/tsconfig.json +2 -2
@@ -0,0 +1,134 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.RouterHandler = void 0;
4
+ const router_1 = require("./router");
5
+ const tokenize_match_1 = require("./tokenize-match");
6
+ const parse_1 = require("../middleware/parse");
7
+ const session_1 = require("../middleware/session");
8
+ const group_1 = require("../middleware/group");
9
+ const result_1 = require("../response/result");
10
+ const json_1 = require("../response/json");
11
+ class RouterHandler {
12
+ constructor(handler, path, method, options) {
13
+ this.path = path;
14
+ this.method = method;
15
+ this.tokens = (0, tokenize_match_1.tokenizePath)(path);
16
+ let handlers = [];
17
+ this.isRouter = handler instanceof router_1.Router;
18
+ if (!this.isRouter && !(handler instanceof Array) && typeof handler === "object") {
19
+ // HandlerWithOptions
20
+ if (options) {
21
+ throw new Error("bad arguments. cannot send options with HandlerWithOptions");
22
+ }
23
+ const realHandler = handler.handler;
24
+ const newOptions = {
25
+ ...handler
26
+ };
27
+ delete newOptions.handler;
28
+ handler = realHandler;
29
+ this.options = newOptions;
30
+ }
31
+ else {
32
+ this.options = options;
33
+ }
34
+ const routeHandlers = handler instanceof Array ? handler : [handler];
35
+ if ((!this.isRouter && routeHandlers.length !== routeHandlers.filter(h => typeof h === "function").length) || (this.isRouter && this.options)) {
36
+ throw new Error("bad arguments");
37
+ }
38
+ if (this.options && this.options.middleware) {
39
+ handlers = handlers.concat(this.options.middleware);
40
+ }
41
+ if (this.options && this.options.session) {
42
+ handlers.push(typeof this.options.session !== "function" ? (0, session_1.SessionHandler)(this.options.session) : this.options.session);
43
+ }
44
+ if (this.options && this.options.policy) {
45
+ handlers.push((0, group_1.GroupPolicyHandler)(this.options.policy));
46
+ }
47
+ if (this.options && this.options.request) {
48
+ handlers.push((0, parse_1.ParseRequest)(this.options.request));
49
+ }
50
+ handlers = handlers.concat(routeHandlers);
51
+ if (this.options && this.options.response) {
52
+ if (typeof this.options.response === "boolean") {
53
+ handlers.push((0, json_1.ResponseHandler)());
54
+ }
55
+ else {
56
+ handlers.push((0, result_1.ResultParser)(this.options.response, this.options.parser));
57
+ handlers.push((0, json_1.ResponseHandler)());
58
+ }
59
+ }
60
+ this.handler = handlers;
61
+ }
62
+ getJSONDoc(doc = {}, prePath = "/") {
63
+ const nPath = this.path && this.path.length > 1 ? this.path.substring(1) : "";
64
+ const nMethod = this.method ? this.method : "";
65
+ if (this.isRouter) {
66
+ const router = this.handler[0];
67
+ router.getJSONDoc(doc, `${prePath}${nPath}`);
68
+ }
69
+ else if (this.options) {
70
+ if (!doc[`${prePath}${nPath}`]) {
71
+ doc[`${prePath}${nPath}`] = {};
72
+ }
73
+ if (doc[`${prePath}${nPath}`][nMethod]) {
74
+ throw new Error("cannot create doc routes override each other");
75
+ }
76
+ doc[`${prePath}${nPath}`][nMethod] = {
77
+ description: this.options.description,
78
+ name: this.options.name,
79
+ 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(),
80
+ policy: this.options.policy,
81
+ request: this.options.request ? {
82
+ body: this.options.request.body,
83
+ headers: this.options.request.headers,
84
+ params: this.options.request.params,
85
+ query: this.options.request.query,
86
+ } : undefined,
87
+ response: this.options.response
88
+ };
89
+ }
90
+ return doc;
91
+ }
92
+ async invoke(ctx, pathTokens, prePathTokens) {
93
+ for (let i = 0; i < this.handler.length; i++) {
94
+ const h = this.handler[i];
95
+ if (h instanceof router_1.Router) {
96
+ if (!this.pushResults(await h.run(ctx, pathTokens, prePathTokens.concat(this.tokens)), ctx)) {
97
+ return false;
98
+ }
99
+ }
100
+ else {
101
+ if (!this.pushResults(await h(ctx), ctx)) {
102
+ return false;
103
+ }
104
+ }
105
+ }
106
+ return true;
107
+ }
108
+ isMatch(method, pathTokens, prePathTokens) {
109
+ if ((this.method === undefined || this.method === method)) {
110
+ if (this.path === undefined) {
111
+ return {
112
+ match: true
113
+ };
114
+ }
115
+ return (0, tokenize_match_1.matchTokenizePath)(this.isRouter, prePathTokens.concat(this.tokens), pathTokens);
116
+ }
117
+ return {
118
+ match: false
119
+ };
120
+ }
121
+ pushResults(result, ctx) {
122
+ if (result === false) {
123
+ // ctx.logger.debug(`avoiding next handlers because handler returned false.`);
124
+ return false;
125
+ }
126
+ else if (result !== true && result !== undefined) {
127
+ ctx.logger.trace("pushing to results [%o]", result);
128
+ ctx.results.push(result);
129
+ }
130
+ return true;
131
+ }
132
+ }
133
+ exports.RouterHandler = RouterHandler;
134
+ //# sourceMappingURL=router-utils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"router-utils.js","sourceRoot":"","sources":["../../../src/handler/common/router-utils.ts"],"names":[],"mappings":"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"}
@@ -1,28 +1,30 @@
1
+ /// <reference types="node" />
2
+ import { IncomingMessage, RequestListener, ServerResponse } from "http";
3
+ import { Logger } from "../../util/logger";
1
4
  import { Method, Handler, Context, ErrorHandler } from "./context";
2
- interface RouterHandler {
3
- handler: Handler | Router;
4
- method?: Method;
5
- path?: string;
6
- tokens: {
7
- optional: boolean;
8
- wild: boolean;
9
- token: string;
10
- }[];
5
+ import { RouterHandler, RouterJSONDoc, RouterHandlerOptions, HandlerWithOptions } from "./router-utils";
6
+ import { PathPartToken } from "./tokenize-match";
7
+ export interface RouterOptions {
8
+ newRequestLogger?: (req: IncomingMessage) => Logger;
9
+ newContext?: (req: IncomingMessage, res: ServerResponse) => Context;
11
10
  }
12
11
  export declare class Router {
12
+ protected config?: RouterOptions | undefined;
13
13
  protected readonly handlers: RouterHandler[];
14
14
  protected readonly errorHandlers: ErrorHandler[];
15
- get(path: string, handler: Array<Handler> | Handler | Router): Router;
16
- post(path: string, handler: Array<Handler> | Handler | Router): Router;
17
- patch(path: string, handler: Array<Handler> | Handler | Router): Router;
18
- delete(path: string, handler: Array<Handler> | Handler | Router): Router;
19
- put(path: string, handler: Array<Handler> | Handler | Router): Router;
20
- options(path: string, handler: Array<Handler> | Handler | Router): Router;
21
- use(handler: Array<Handler> | Handler | Router, path?: string, method?: Method): Router;
15
+ readonly listener: RequestListener;
16
+ constructor(config?: RouterOptions | undefined);
17
+ get(path: string, handler: Array<Handler> | Handler | Router | HandlerWithOptions, options?: RouterHandlerOptions): Router;
18
+ post(path: string, handler: Array<Handler> | Handler | Router | HandlerWithOptions, options?: RouterHandlerOptions): Router;
19
+ patch(path: string, handler: Array<Handler> | Handler | Router | HandlerWithOptions, options?: RouterHandlerOptions): Router;
20
+ delete(path: string, handler: Array<Handler> | Handler | Router | HandlerWithOptions, options?: RouterHandlerOptions): Router;
21
+ put(path: string, handler: Array<Handler> | Handler | Router | HandlerWithOptions, options?: RouterHandlerOptions): Router;
22
+ options(path: string, handler: Array<Handler> | Handler | Router | HandlerWithOptions, options?: RouterHandlerOptions): Router;
23
+ use(handler: Array<Handler> | HandlerWithOptions | Handler | Router, path?: string, method?: Method, options?: RouterHandlerOptions): Router;
22
24
  catch(errorHandler: Array<ErrorHandler> | ErrorHandler): Router;
23
- protected isMatch(ctx: Context, h: RouterHandler, prePath?: string): boolean;
24
- protected callHandler: (ctx: Context, handler: Handler | Router, prePath?: string | undefined) => Promise<boolean>;
25
- protected handleError(e: unknown, ctx: Context): Promise<boolean>;
26
- run(ctx: Context, prePath?: string): Promise<boolean>;
25
+ run(ctx: Context, pathTokens?: {
26
+ value: string;
27
+ lower: string;
28
+ }[], prePathTokens?: PathPartToken[]): Promise<boolean>;
29
+ getJSONDoc(doc?: RouterJSONDoc, prePath?: string): RouterJSONDoc;
27
30
  }
28
- export {};
@@ -1,102 +1,57 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Router = void 0;
4
+ const context_1 = require("./context");
5
+ const router_utils_1 = require("./router-utils");
4
6
  const tokenize_match_1 = require("./tokenize-match");
5
7
  class Router {
6
- constructor() {
8
+ constructor(config) {
9
+ this.config = config;
7
10
  this.handlers = [];
8
11
  this.errorHandlers = [];
9
- this.callHandler = async (ctx, handler, prePath) => {
10
- const shouldContinue = typeof handler === "function" ?
11
- await handler(ctx) : await handler.run(ctx, prePath);
12
- if (shouldContinue === false) {
13
- // ctx.logger.debug(`avoiding next handlers because handler returned false.`);
14
- return false;
15
- }
16
- else if (shouldContinue !== true && shouldContinue !== undefined) {
17
- ctx.logger.trace("pushing to results [%o]", shouldContinue);
18
- ctx.results.push(shouldContinue);
19
- } /*else {
20
- // ctx.logger.debug("NOT pushing to results [%s]", String(shouldContinue));
21
- }*/
22
- return true;
12
+ this.listener = async (req, res) => {
13
+ const ctx = this.config && this.config.newContext ?
14
+ this.config.newContext(req, res) :
15
+ new context_1.Context(req, res, this.config && this.config.newRequestLogger ?
16
+ this.config.newRequestLogger(req) :
17
+ undefined);
18
+ ctx.logger.trace(`request received`);
19
+ await this.run(ctx);
23
20
  };
24
21
  }
25
- get(path, handler) {
26
- return this.use(handler, path, "get");
22
+ get(path, handler, options) {
23
+ return this.use(handler, path, "get", options);
27
24
  }
28
- post(path, handler) {
29
- return this.use(handler, path, "post");
25
+ post(path, handler, options) {
26
+ return this.use(handler, path, "post", options);
30
27
  }
31
- patch(path, handler) {
32
- return this.use(handler, path, "patch");
28
+ patch(path, handler, options) {
29
+ return this.use(handler, path, "patch", options);
33
30
  }
34
- delete(path, handler) {
35
- return this.use(handler, path, "delete");
31
+ delete(path, handler, options) {
32
+ return this.use(handler, path, "delete", options);
36
33
  }
37
- put(path, handler) {
38
- return this.use(handler, path, "put");
34
+ put(path, handler, options) {
35
+ return this.use(handler, path, "put", options);
39
36
  }
40
- options(path, handler) {
41
- return this.use(handler, path, "options");
37
+ options(path, handler, options) {
38
+ return this.use(handler, path, "options", options);
42
39
  }
43
- use(handler, path, method) {
44
- if (handler instanceof Array) {
45
- for (const h of handler) {
46
- const nPath = path !== undefined ? (0, tokenize_match_1.normalizePath)(path) : undefined;
47
- this.handlers.push({
48
- handler: h,
49
- method: method ? method.toUpperCase() : method,
50
- path: nPath,
51
- tokens: (0, tokenize_match_1.tokenizePath)(nPath)
52
- });
53
- }
54
- }
55
- else {
56
- const nPath = path !== undefined ? (0, tokenize_match_1.normalizePath)(path) : undefined;
57
- this.handlers.push({
58
- handler,
59
- method: method ? method.toUpperCase() : method,
60
- path: nPath,
61
- tokens: (0, tokenize_match_1.tokenizePath)(nPath)
62
- });
63
- }
40
+ use(handler, path, method, options) {
41
+ const nPath = path !== undefined ? (0, tokenize_match_1.normalizePath)(path) : undefined;
42
+ const nMethod = method ? method.toUpperCase() : method;
43
+ this.handlers.push(new router_utils_1.RouterHandler(handler, nPath, nMethod, options));
64
44
  return this;
65
45
  }
66
46
  catch(errorHandler) {
67
- if (errorHandler instanceof Array) {
68
- for (const e of errorHandler) {
69
- this.errorHandlers.push(e);
70
- }
71
- }
72
- else {
73
- this.errorHandlers.push(errorHandler);
47
+ const errorHandlers = errorHandler instanceof Array ? errorHandler : [errorHandler];
48
+ for (const e of errorHandlers) {
49
+ this.errorHandlers.push(e);
74
50
  }
75
51
  return this;
76
52
  }
77
- isMatch(ctx, h, prePath) {
78
- if ((h.method === undefined || h.method === ctx.method)) {
79
- if (h.path === undefined) {
80
- return true;
81
- }
82
- const ret = typeof h.handler === "function" || h.handler instanceof Array ?
83
- (0, tokenize_match_1.matchTokenizePath)(false, h.tokens, ctx.path, prePath) :
84
- (0, tokenize_match_1.matchTokenizePath)(true, h.tokens, ctx.path, prePath);
85
- ctx.params = ret.params;
86
- return ret.match;
87
- }
88
- return false;
89
- }
90
- async handleError(e, ctx) {
91
- for (const eH of this.errorHandlers) {
92
- const ret = await eH(e, ctx);
93
- if (ret === false || ctx.res.headersSent) {
94
- return false;
95
- }
96
- }
97
- throw e; // pass the error along
98
- }
99
- async run(ctx, prePath) {
53
+ async run(ctx, pathTokens, prePathTokens = []) {
54
+ pathTokens = pathTokens ? pathTokens : (0, tokenize_match_1.splitPath)(ctx.path);
100
55
  try {
101
56
  let shouldContinue = true;
102
57
  for (const h of this.handlers) {
@@ -104,15 +59,34 @@ class Router {
104
59
  shouldContinue = false;
105
60
  break;
106
61
  }
107
- if (this.isMatch(ctx, h, prePath)) {
108
- shouldContinue = await this.callHandler(ctx, h.handler, `${prePath ? prePath : "/"}${h.path ? h.path.substring(1) : ""}`);
62
+ const isMatch = h.isMatch(ctx.method, pathTokens, prePathTokens);
63
+ if (isMatch.match) {
64
+ if (isMatch.params) {
65
+ ctx.params = ctx.params ? {
66
+ ...ctx.params,
67
+ ...isMatch.params
68
+ } : isMatch.params;
69
+ }
70
+ shouldContinue = await h.invoke(ctx, pathTokens, prePathTokens);
109
71
  }
110
72
  }
111
73
  return !ctx.res.headersSent;
112
74
  }
113
75
  catch (e) {
114
- return this.handleError(e, ctx);
76
+ for (const eH of this.errorHandlers) {
77
+ const ret = await eH(e, ctx);
78
+ if (ret === false || ctx.res.headersSent) {
79
+ return false;
80
+ }
81
+ }
82
+ throw e; // pass the error along
83
+ }
84
+ }
85
+ getJSONDoc(doc = {}, prePath = "/") {
86
+ for (const h of this.handlers) {
87
+ doc = h.getJSONDoc(doc, prePath);
115
88
  }
89
+ return doc;
116
90
  }
117
91
  }
118
92
  exports.Router = Router;
@@ -1 +1 @@
1
- {"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/handler/common/router.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/handler/common/router.ts"],"names":[],"mappings":";;;AAEA,uCAAmE;AACnE,iDAAwG;AACxG,qDAA2E;AAO3E,MAAa,MAAM;IAIjB,YAAsB,MAAsB;QAAtB,WAAM,GAAN,MAAM,CAAgB;QAHzB,aAAQ,GAAoB,EAAE,CAAC;QAC/B,kBAAa,GAAmB,EAAE,CAAC;QAGpD,IAAI,CAAC,QAAQ,GAAG,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YACjC,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;gBACjD,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;gBAClC,IAAI,iBAAO,CACT,GAAG,EACH,GAAG,EACH,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;oBAC3C,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC;oBACnC,SAAS,CAAC,CAAC;YACjB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YACrC,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC,CAAC;IACJ,CAAC;IACM,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;IACM,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;IACM,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;IACM,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;IACM,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;IACM,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;IACM,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,4BAAa,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC;IACd,CAAC;IACM,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;IACM,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,IAAI,cAAc,GAAG,IAAI,CAAC;YAC1B,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE;gBAC7B,IAAI,CAAC,cAAc,IAAI,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE;oBAC1C,cAAc,GAAG,KAAK,CAAC;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,cAAc,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;iBACjE;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;IACM,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;AAtFD,wBAsFC"}
@@ -6,18 +6,27 @@ export declare const mergeSearchParams: (search: URLSearchParams, append?: {
6
6
  [name: string]: string | number | boolean | string[] | number[] | boolean[];
7
7
  } | undefined) => URLSearchParams;
8
8
  export declare const normalizePath: (path: string) => string;
9
- export declare const tokenizePath: (path?: string | undefined) => {
9
+ export interface PathPartToken {
10
10
  optional: boolean;
11
- wild: boolean;
11
+ wild?: string;
12
12
  token: string;
13
+ lower: string;
14
+ }
15
+ export declare const pathPartTokenize: (token: {
16
+ value: string;
17
+ lower: string;
18
+ }) => PathPartToken;
19
+ export declare const splitPath: (path?: string | undefined) => {
20
+ value: string;
21
+ lower: string;
13
22
  }[];
14
- export declare const matchTokenizePath: (checkOnlyTokens: boolean, tokens: {
15
- optional: boolean;
16
- wild: boolean;
17
- token: string;
18
- }[], normalizePath: string, prePath?: string | undefined) => {
23
+ export declare const tokenizePath: (path?: string | undefined) => PathPartToken[];
24
+ export declare const matchTokenizePath: (checkAsRouter: boolean, tokens: PathPartToken[], ctxTokens: {
25
+ value: string;
26
+ lower: string;
27
+ }[]) => {
19
28
  match: boolean;
20
- params: {
29
+ params?: {
21
30
  [name: string]: string | undefined;
22
- };
31
+ } | undefined;
23
32
  };
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.matchTokenizePath = exports.tokenizePath = exports.normalizePath = exports.mergeSearchParams = exports.parseSearchParams = void 0;
3
+ exports.matchTokenizePath = exports.tokenizePath = exports.splitPath = exports.pathPartTokenize = exports.normalizePath = exports.mergeSearchParams = exports.parseSearchParams = void 0;
4
4
  const helpers_1 = require("./helpers");
5
5
  const parseSearchParams = (search) => {
6
6
  const query = {};
@@ -65,19 +65,30 @@ const normalizePath = (path) => {
65
65
  }
66
66
  };
67
67
  exports.normalizePath = normalizePath;
68
+ const pathPartTokenize = (token) => {
69
+ const isWild = token.value[0] === ":";
70
+ const optional = token.value[token.value.length - 1] === "?";
71
+ const wild = isWild ? token.value.substring(1, token.value.length - (optional ? 1 : 0)) : undefined;
72
+ return {
73
+ optional,
74
+ wild,
75
+ token: token.value,
76
+ lower: token.lower
77
+ };
78
+ };
79
+ exports.pathPartTokenize = pathPartTokenize;
80
+ const splitPath = (path) => path === undefined ? [] : path.split("/").filter(p => p).map(p => {
81
+ return {
82
+ value: p,
83
+ lower: p.toLocaleLowerCase()
84
+ };
85
+ });
86
+ exports.splitPath = splitPath;
68
87
  const tokenizePath = (path) => {
69
88
  if (path === undefined) {
70
89
  return [];
71
90
  }
72
- const tokens = path.split("/").filter(p => p).map(token => {
73
- const wild = token[0] === ":";
74
- const optional = token[token.length - 1] === "?";
75
- return {
76
- optional,
77
- wild,
78
- token
79
- };
80
- });
91
+ const tokens = (0, exports.splitPath)(path).map(token => (0, exports.pathPartTokenize)(token));
81
92
  for (let i = 0; i < tokens.length; i++) {
82
93
  if (tokens[i].optional && i != tokens.length - 1) {
83
94
  throw new Error("cannot set a path token as optional that's not the last one");
@@ -86,34 +97,29 @@ const tokenizePath = (path) => {
86
97
  return tokens;
87
98
  };
88
99
  exports.tokenizePath = tokenizePath;
89
- const matchTokenizePath = (checkOnlyTokens, tokens, normalizePath, prePath) => {
90
- if (prePath !== "/" && prePath !== undefined) {
91
- tokens = prePath.split("/").filter(p => p).map(s => {
92
- return {
93
- optional: false,
94
- token: s,
95
- wild: false
96
- };
97
- }).concat(tokens);
100
+ const matchTokenizePath = (checkAsRouter, tokens, ctxTokens) => {
101
+ for (let i = 0; i < tokens.length; i++) {
102
+ if (tokens[i].optional && i != tokens.length - 1) {
103
+ throw new Error("cannot set a path token as optional that's not the last one");
104
+ }
98
105
  }
99
- const ctxTokens = normalizePath.split("/").filter(p => p);
100
106
  const lastTokenIsOptional = tokens.length > 0 ? tokens[tokens.length - 1].optional : false;
101
107
  const couldBeUsingOptional = (lastTokenIsOptional &&
102
- ((!checkOnlyTokens && tokens.length - 1 === ctxTokens.length) ||
103
- (checkOnlyTokens && tokens.length - 1 <= ctxTokens.length)));
108
+ ((!checkAsRouter && tokens.length - 1 === ctxTokens.length) ||
109
+ (checkAsRouter && tokens.length - 1 <= ctxTokens.length)));
104
110
  const params = {};
105
- if ((!checkOnlyTokens && tokens.length === ctxTokens.length) || couldBeUsingOptional || (checkOnlyTokens && tokens.length <= ctxTokens.length)) {
111
+ if ((!checkAsRouter && tokens.length === ctxTokens.length) || couldBeUsingOptional || (checkAsRouter && tokens.length <= ctxTokens.length)) {
106
112
  // similiar count of tokens
107
113
  for (let i = 0; i < ctxTokens.length; i++) {
108
114
  const ctxToken = ctxTokens[i];
109
- if (checkOnlyTokens && i >= tokens.length) {
115
+ if (checkAsRouter && i >= tokens.length) {
110
116
  break;
111
117
  }
112
- if (tokens[i].wild || ctxToken.toLocaleLowerCase() === tokens[i].token.toLocaleLowerCase()) {
118
+ if (tokens[i].wild || ctxToken.lower === tokens[i].lower) {
113
119
  // check pass
114
- if (tokens[i].wild) {
115
- const paramKey = tokens[i].token.substring(1, tokens[i].token.length - (tokens[i].optional ? 1 : 0));
116
- params[paramKey] = ctxToken;
120
+ const wild = tokens[i].wild;
121
+ if (wild) {
122
+ params[wild] = ctxToken.value;
117
123
  }
118
124
  continue;
119
125
  }
@@ -1 +1 @@
1
- {"version":3,"file":"tokenize-match.js","sourceRoot":"","sources":["../../../src/handler/common/tokenize-match.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tokenize-match.js","sourceRoot":"","sources":["../../../src/handler/common/tokenize-match.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,12 @@
1
1
  import { SimpleMap } from "../util/parser/common";
2
2
  import { Logger } from "../util/logger";
3
3
  import { Router, Handler, Method } from "./common";
4
+ import { RouterHandlerOptions } from "./common/router-utils";
4
5
  export interface FeatureRouterPathOptions {
5
6
  path: string | string[];
6
7
  method: Method | Method[];
7
8
  handler: Array<Handler> | Handler;
9
+ options?: RouterHandlerOptions;
8
10
  }
9
- export declare type FeatureRouterOptions<T extends FeatureRouterPathOptions = FeatureRouterPathOptions> = SimpleMap<T>;
10
- export declare const FeatureRouter: (options: FeatureRouterOptions<FeatureRouterPathOptions>, logger?: Logger | undefined) => Router;
11
+ export declare type FeatureRouterOptions = SimpleMap<FeatureRouterPathOptions>;
12
+ export declare const FeatureRouter: (options: FeatureRouterOptions, logger?: Logger | undefined) => Router;
@@ -59,7 +59,7 @@ const FeatureRouter = (options, logger) => {
59
59
  throw new Error(`${featureName} collides with feature ${enabledPaths[`${p}${m}`]} on path ${p} method ${m}`);
60
60
  }
61
61
  enabledPaths[`${p}${m}`] = featureName;
62
- router.use(implementation, p, m.toLocaleLowerCase());
62
+ router.use(implementation, p, m.toLocaleLowerCase(), handlerOptions.options);
63
63
  }
64
64
  }
65
65
  }
@@ -1 +1 @@
1
- {"version":3,"file":"feature-router.js","sourceRoot":"","sources":["../../src/handler/feature-router.ts"],"names":[],"mappings":";;;AAEA,gEAAgE;AAChE,4DAAwD;AACxD,qCAAmD;AAUnD,MAAM,sBAAsB,GAAa,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;AAEvF,MAAM,aAAa,GAAG,CAAC,OAA6B,EAAE,MAAe,EAAU,EAAE;IACtF,MAAM,MAAM,GAAW,IAAI,eAAM,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACrC,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,YAAY,GAAsB,EAAE,CAAC;IAC3C,KAAK,MAAM,WAAW,IAAI,OAAO,EAAE;QACjC,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QAC5C,IAAI,CAAC,cAAc,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,mCAAmC,WAAW,GAAG,CAAC,CAAC;SACpE;aAAM;YACL,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC;YACjE,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,IAAI,KAAK,CAAC,2BAA2B,WAAW,GAAG,CAAC,CAAC;aAC5D;iBAAM,IAAI,CAAC,cAAc,EAAE;gBAC1B,MAAM,IAAI,KAAK,CAAC,kCAAkC,WAAW,GAAG,CAAC,CAAC;aACnE;iBAAM,IAAI,CAAC,IAAI,EAAE;gBAChB,MAAM,IAAI,KAAK,CAAC,wBAAwB,WAAW,GAAG,CAAC,CAAC;aACzD;iBAAM;gBACL,IAAI,MAAM,YAAY,KAAK,EAAE;oBAC3B,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE;wBACtB,IAAI,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,EAAY,CAAC,KAAK,CAAC,CAAC,EAAE;4BACpE,MAAM,IAAI,KAAK,CAAC,YAAY,WAAW,aAAa,CAAC,CAAC,WAAW,EAAE,4BAA4B,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;yBACrI;qBACF;iBACF;qBAAM,IAAI,sBAAsB,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAY,CAAC,KAAK,CAAC,CAAC,EAAE;oBAChF,MAAM,IAAI,KAAK,CAAC,YAAY,WAAW,aAAa,MAAM,CAAC,WAAW,EAAE,4BAA4B,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;iBAC1I;gBACD,MAAM,OAAO,GAAG,MAAM,YAAY,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;gBAC5D,IAAI,IAAA,gCAAgB,EAAC,WAAW,CAAC,EAAE;oBACjC,IAAI,MAAM,EAAE;wBACV,MAAM,CAAC,KAAK,CAAC,YAAY,WAAW,WAAW,CAAC,CAAC;qBAClD;oBACD,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;oBAC1B,MAAM,KAAK,GAAG,IAAI,YAAY,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;oBACpD,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;wBACvB,MAAM,CAAC,GAAG,IAAA,8BAAa,EAAC,GAAG,CAAC,CAAC;wBAC7B,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;4BACvB,IAAI,MAAM,EAAE;gCACV,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;gCAC/B,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;gCAC3C,IAAK,cAAsB,CAAC,WAAW,EAAE;oCACvC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAG,cAAsB,CAAC,WAAW,CAAC,CAAC;iCAC1D;6BACF;4BACD,IAAI,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,SAAS,EAAE;gCAC1C,MAAM,IAAI,KAAK,CAAC,GAAG,WAAW,0BAA0B,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;6BAC7G;4BACD,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC;4BACvC,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC,iBAAiB,EAAY,CAAC,CAAC;yBAChE;qBACF;iBACF;qBAAM;oBACL,IAAI,MAAM,EAAE;wBACV,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,WAAW,CAAC,CAAC;qBACpD;oBACD,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;iBAC5B;aACF;SACF;KACF;IACD,IAAI,MAAM,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QAChC,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;KAC1D;IACD,IAAI,MAAM,EAAE;QACV,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1D,MAAM,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;SACnE;aAAM;YACL,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;SACtC;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAzEW,QAAA,aAAa,iBAyExB"}
1
+ {"version":3,"file":"feature-router.js","sourceRoot":"","sources":["../../src/handler/feature-router.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,7 @@ import { Parser } from "../../util/parser";
2
2
  import { ParseOptions } from "../../util/parser/common";
3
3
  import { Handler } from "../common";
4
4
  export interface ParseRequestOptions {
5
+ headers?: ParseOptions | ParseOptions[];
5
6
  query?: ParseOptions | false | ParseOptions[];
6
7
  params?: ParseOptions | false | ParseOptions[];
7
8
  body?: ParseOptions | false | ParseOptions[];