@miqro/core 1.5.13 → 1.5.16

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 (55) 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 +4 -3
  11. package/dist/common/api-router-utils.js.map +1 -1
  12. package/dist/common/context.js +4 -1
  13. package/dist/common/context.js.map +1 -1
  14. package/dist/common/router-handler.d.ts +20 -0
  15. package/dist/common/router-handler.js +136 -0
  16. package/dist/common/router-handler.js.map +1 -0
  17. package/dist/common/router-utils.d.ts +7 -5
  18. package/dist/common/router-utils.js +37 -47
  19. package/dist/common/router-utils.js.map +1 -1
  20. package/dist/common/session/common.d.ts +5 -2
  21. package/dist/common/tokenize-match.d.ts +13 -20
  22. package/dist/common/tokenize-match.js +25 -57
  23. package/dist/common/tokenize-match.js.map +1 -1
  24. package/dist/middleware/group.js +2 -0
  25. package/dist/middleware/group.js.map +1 -1
  26. package/dist/middleware/index.d.ts +1 -0
  27. package/dist/middleware/index.js +1 -0
  28. package/dist/middleware/index.js.map +1 -1
  29. package/dist/middleware/result.d.ts +3 -0
  30. package/dist/middleware/result.js +51 -0
  31. package/dist/middleware/result.js.map +1 -0
  32. package/dist/router.d.ts +3 -30
  33. package/dist/router.js +5 -167
  34. package/dist/router.js.map +1 -1
  35. package/package.json +8 -6
  36. package/src/api-router.ts +16 -7
  37. package/src/api-router.unit.test.js +273 -0
  38. package/src/app-utils.ts +82 -0
  39. package/src/app-utils.unit.test.js +100 -0
  40. package/src/app.ts +4 -89
  41. package/src/app.unit.test.js +334 -0
  42. package/src/common/api-router-utils.ts +3 -3
  43. package/src/common/context.ts +4 -1
  44. package/src/common/context.unit.test.js +286 -0
  45. package/src/common/router-handler.ts +159 -0
  46. package/src/common/router-utils.ts +46 -44
  47. package/src/common/session/common.ts +5 -2
  48. package/src/common/tokenize-match.ts +30 -52
  49. package/src/middleware/group.ts +2 -0
  50. package/src/middleware/index.ts +1 -0
  51. package/src/middleware/result.ts +43 -0
  52. package/src/proxy.unit.test.js +157 -0
  53. package/src/router.ts +7 -196
  54. package/src/router.unit.test.js +397 -0
  55. package/src/setup-test.js +5 -0
@@ -1,52 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.ResponseHandler = exports.ResultParser = void 0;
4
- const parser_1 = require("@miqro/parser");
5
- const ResultParser = (options, parser) => {
6
- return async function ResultParser(ctx) {
7
- if (!ctx.results || ctx.results.length === 0) {
8
- ctx.logger.debug(`not parsing results`);
9
- return undefined;
10
- }
11
- else {
12
- const index = ctx.results.length - 1;
13
- const lastResult = ctx.results[index];
14
- ctx.logger.trace(`parsing lastResult[%o]`, lastResult);
15
- try {
16
- if (options instanceof Array) {
17
- for (let i = 0; i < options.length; i++) {
18
- const o = options[i];
19
- try {
20
- const mappedResults = (parser ? parser : { parse: parser_1.parse }).parse(lastResult, o.options, o.mode, `ctx.results[${index}]`);
21
- ctx.logger.trace(`ctx.results[%s] mapped to %o`, index, mappedResults);
22
- return mappedResults;
23
- }
24
- catch (e) {
25
- if (i === options.length - 1) {
26
- throw e;
27
- }
28
- }
29
- }
30
- }
31
- else if (typeof options !== "string") {
32
- const mappedResults = (parser ? parser : { parse: parser_1.parse }).parse(lastResult, options.options, options.mode, `ctx.results[${index}]`);
33
- ctx.logger.trace(`ctx.results[%s] mapped to %o`, index, mappedResults);
34
- return mappedResults;
35
- }
36
- else {
37
- const mappedResults = (parser ? parser : { parse: parser_1.parse }).parse(lastResult, options, "no_extra", `ctx.results[${index}]`);
38
- ctx.logger.trace(`ctx.results[%s] mapped to %o`, index, mappedResults);
39
- return mappedResults;
40
- }
41
- }
42
- catch (e) {
43
- ctx.logger.error(`error parsing lastResult[%o]`, lastResult);
44
- throw e;
45
- }
46
- }
47
- };
48
- };
49
- exports.ResultParser = ResultParser;
3
+ exports.handlerWithOptionsParseOptions = exports.routerHandlerParseOptions = exports.routeParseOptions = exports.ResponseHandler = void 0;
50
4
  const ResponseHandler = () => async (ctx) => {
51
5
  ctx.logger.trace("results [%o]", ctx.results);
52
6
  if (!ctx.results || ctx.results.length === 0) {
@@ -64,4 +18,40 @@ const ResponseHandler = () => async (ctx) => {
64
18
  }
65
19
  };
66
20
  exports.ResponseHandler = ResponseHandler;
21
+ exports.routeParseOptions = {
22
+ name: "string?",
23
+ description: "string?",
24
+ policy: "GroupPolicy?",
25
+ response: {
26
+ type: "nested?",
27
+ nestedOptions: {
28
+ options: {
29
+ body: "boolean?|ParseOptions[]!?|string?"
30
+ },
31
+ mode: "no_extra"
32
+ }
33
+ },
34
+ request: {
35
+ type: "nested?",
36
+ nestedOptions: {
37
+ options: {
38
+ headers: "ParseOptions[]!?",
39
+ query: "boolean?|ParseOptions[]!?|string?",
40
+ params: "boolean?|ParseOptions[]!?|string?",
41
+ body: "boolean?|ParseOptions[]!?|string?"
42
+ },
43
+ mode: "no_extra"
44
+ }
45
+ }
46
+ };
47
+ exports.routerHandlerParseOptions = {
48
+ ...exports.routeParseOptions,
49
+ parser: "ParserInterface?",
50
+ middleware: "function[]!?",
51
+ session: "SessionHandlerOptions?|function?"
52
+ };
53
+ exports.handlerWithOptionsParseOptions = {
54
+ ...exports.routerHandlerParseOptions,
55
+ handler: "function[]!",
56
+ };
67
57
  //# sourceMappingURL=router-utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"router-utils.js","sourceRoot":"","sources":["../../src/common/router-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"router-utils.js","sourceRoot":"","sources":["../../src/common/router-utils.ts"],"names":[],"mappings":";;;AAIO,MAAM,eAAe,GAAG,GAAkB,EAAE,CAAC,KAAK,EAAE,GAAY,EAAiB,EAAE;IACxF,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IAC9C,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5C,MAAM,IAAI,KAAK,CAAC,+FAA+F,CAAC,CAAC;KAClH;SAAM;QACL,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACvD,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;QAC9C,IAAI,UAAU,KAAK,SAAS,EAAE;YAC5B,MAAM,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SAC5B;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,+FAA+F,CAAC,CAAC;SAClH;KACF;AACH,CAAC,CAAC;AAbW,QAAA,eAAe,mBAa1B;AAGW,QAAA,iBAAiB,GAAmB;IAC/C,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;AA2BW,QAAA,yBAAyB,GAAmB;IACvD,GAAG,yBAAiB;IACpB,MAAM,EAAE,kBAAkB;IAC1B,UAAU,EAAE,cAAc;IAC1B,OAAO,EAAE,kCAAkC;CAC5C,CAAC;AAQW,QAAA,8BAA8B,GAAmB;IAC5D,GAAG,iCAAyB;IAC5B,OAAO,EAAE,aAAa;CACvB,CAAC"}
@@ -1,4 +1,3 @@
1
- import { Dict } from "@miqro/parser";
2
1
  import { Context } from "../context";
3
2
  export interface SessionHandlerOptions {
4
3
  authService: {
@@ -18,7 +17,10 @@ export interface SessionHandlerOptions {
18
17
  };
19
18
  };
20
19
  }
21
- export interface NoTokenSession extends Dict<any> {
20
+ declare type Dict<T = any> = {
21
+ [key: string]: T;
22
+ };
23
+ export interface NoTokenSession extends Dict {
22
24
  account: string;
23
25
  username: string;
24
26
  groups: string[];
@@ -32,3 +34,4 @@ export interface GroupPolicy {
32
34
  groups: GroupPolicyGroups[];
33
35
  groupPolicy: GroupPolicyType;
34
36
  }
37
+ export {};
@@ -1,32 +1,25 @@
1
+ /// <reference types="node" />
1
2
  import { URLSearchParams } from "url";
2
- export declare const parseSearchParams: (search: URLSearchParams) => {
3
+ export declare function parseSearchParams(search: URLSearchParams): {
3
4
  [name: string]: string | string[];
4
5
  };
5
- export declare const mergeSearchParams: (search: URLSearchParams, append?: {
6
- [name: string]: string | number | boolean | string[] | number[] | boolean[];
7
- } | undefined) => URLSearchParams;
8
- export declare const normalizePath: (path: string) => string;
9
- export interface PathPartToken {
6
+ export declare function normalizePath(path: string): string;
7
+ export interface PathParams {
8
+ [name: string]: string | undefined;
9
+ }
10
+ export interface PathPartToken extends PathPart {
10
11
  optional: boolean;
11
12
  wild?: string;
12
- token: string;
13
- lower: string;
14
13
  }
15
- export declare const pathPartTokenize: (token: {
16
- value: string;
17
- lower: string;
18
- }) => PathPartToken;
19
- export declare const splitPath: (path?: string | undefined) => {
14
+ export interface PathPart {
20
15
  value: string;
21
16
  lower: string;
22
- }[];
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
- }[]) => {
17
+ }
18
+ export declare const splitPath: (path?: string | undefined) => PathPart[];
19
+ export declare function tokenizePath(path?: string): PathPartToken[];
20
+ export declare function matchTokenizePath(checkAsRouter: boolean, pathTokens: PathPartToken[], requestParts: PathPart[]): {
28
21
  match: boolean;
29
22
  params?: {
30
23
  [name: string]: string | undefined;
31
- } | undefined;
24
+ };
32
25
  };
@@ -1,48 +1,17 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.matchTokenizePath = exports.tokenizePath = exports.splitPath = exports.pathPartTokenize = exports.normalizePath = exports.mergeSearchParams = exports.parseSearchParams = void 0;
4
- const helpers_1 = require("./helpers");
5
- const parseSearchParams = (search) => {
3
+ exports.matchTokenizePath = exports.tokenizePath = exports.splitPath = exports.normalizePath = exports.parseSearchParams = void 0;
4
+ function parseSearchParams(search) {
6
5
  const query = {};
7
6
  search.forEach((value, key) => {
8
7
  query[key] = query[key] instanceof Array ? query[key].concat([value]) : query[key] ? [query[key], value] : value;
9
8
  });
10
9
  return query;
11
- };
10
+ }
12
11
  exports.parseSearchParams = parseSearchParams;
13
- // appends query params to URLSearchParams and returns a copy
14
- const mergeSearchParams = (search, append) => {
15
- const copy = (0, helpers_1.newURLSearchParams)(search.toString());
16
- if (!append) {
17
- return copy;
18
- }
19
- const keys = Object.keys(append);
20
- for (const k of keys) {
21
- if (append[k] instanceof Array) {
22
- for (const a of append[k]) {
23
- if (copy.has(k)) {
24
- copy.append(k, String(a));
25
- }
26
- else {
27
- copy.set(k, String(a));
28
- }
29
- }
30
- }
31
- else {
32
- if (copy.has(k)) {
33
- copy.append(k, String(append[k]));
34
- }
35
- else {
36
- copy.set(k, String(append[k]));
37
- }
38
- }
39
- }
40
- return copy;
41
- };
42
- exports.mergeSearchParams = mergeSearchParams;
43
12
  // adds "/" to the final of path
44
13
  // cannot account for query or hash params so send only new URL().pathname
45
- const normalizePath = (path) => {
14
+ function normalizePath(path) {
46
15
  if (typeof path !== "string") {
47
16
  throw new Error("path not string");
48
17
  }
@@ -63,20 +32,19 @@ const normalizePath = (path) => {
63
32
  else {
64
33
  return path; // "/"
65
34
  }
66
- };
35
+ }
67
36
  exports.normalizePath = normalizePath;
68
- const pathPartTokenize = (token) => {
37
+ function pathPartTokenize(token) {
69
38
  const isWild = token.value[0] === ":";
70
39
  const optional = token.value[token.value.length - 1] === "?";
71
40
  const wild = isWild ? token.value.substring(1, token.value.length - (optional ? 1 : 0)) : undefined;
72
41
  return {
73
42
  optional,
74
43
  wild,
75
- token: token.value,
44
+ value: token.value,
76
45
  lower: token.lower
77
46
  };
78
- };
79
- exports.pathPartTokenize = pathPartTokenize;
47
+ }
80
48
  const splitPath = (path) => path === undefined ? [] : path.split("/").filter(p => p).map(p => {
81
49
  return {
82
50
  value: p,
@@ -84,40 +52,40 @@ const splitPath = (path) => path === undefined ? [] : path.split("/").filter(p =
84
52
  };
85
53
  });
86
54
  exports.splitPath = splitPath;
87
- const tokenizePath = (path) => {
55
+ function tokenizePath(path) {
88
56
  if (path === undefined) {
89
57
  return [];
90
58
  }
91
- const tokens = (0, exports.splitPath)(path).map(token => (0, exports.pathPartTokenize)(token));
59
+ const tokens = (0, exports.splitPath)(path).map(token => pathPartTokenize(token));
92
60
  for (let i = 0; i < tokens.length; i++) {
93
61
  if (tokens[i].optional && i != tokens.length - 1) {
94
62
  throw new Error("cannot set a path token as optional that's not the last one");
95
63
  }
96
64
  }
97
65
  return tokens;
98
- };
66
+ }
99
67
  exports.tokenizePath = tokenizePath;
100
- const matchTokenizePath = (checkAsRouter, tokens, ctxTokens) => {
101
- for (let i = 0; i < tokens.length; i++) {
102
- if (tokens[i].optional && i != tokens.length - 1) {
68
+ function matchTokenizePath(checkAsRouter, pathTokens, requestParts) {
69
+ for (let i = 0; i < pathTokens.length; i++) {
70
+ if (pathTokens[i].optional && i != pathTokens.length - 1) {
103
71
  throw new Error("cannot set a path token as optional that's not the last one");
104
72
  }
105
73
  }
106
- const lastTokenIsOptional = tokens.length > 0 ? tokens[tokens.length - 1].optional : false;
74
+ const lastTokenIsOptional = pathTokens.length > 0 ? pathTokens[pathTokens.length - 1].optional : false;
107
75
  const couldBeUsingOptional = (lastTokenIsOptional &&
108
- ((!checkAsRouter && tokens.length - 1 === ctxTokens.length) ||
109
- (checkAsRouter && tokens.length - 1 <= ctxTokens.length)));
76
+ ((!checkAsRouter && pathTokens.length - 1 === requestParts.length) ||
77
+ (checkAsRouter && pathTokens.length - 1 <= requestParts.length)));
110
78
  const params = {};
111
- if ((!checkAsRouter && tokens.length === ctxTokens.length) || couldBeUsingOptional || (checkAsRouter && tokens.length <= ctxTokens.length)) {
112
- // similiar count of tokens
113
- for (let i = 0; i < ctxTokens.length; i++) {
114
- const ctxToken = ctxTokens[i];
115
- if (checkAsRouter && i >= tokens.length) {
79
+ if ((!checkAsRouter && pathTokens.length === requestParts.length) || couldBeUsingOptional || (checkAsRouter && pathTokens.length <= requestParts.length)) {
80
+ // similar count of tokens
81
+ for (let i = 0; i < requestParts.length; i++) {
82
+ const ctxToken = requestParts[i];
83
+ if (checkAsRouter && i >= pathTokens.length) {
116
84
  break;
117
85
  }
118
- if (tokens[i].wild || ctxToken.lower === tokens[i].lower) {
86
+ if (pathTokens[i].wild || ctxToken.lower === pathTokens[i].lower) {
119
87
  // check pass
120
- const wild = tokens[i].wild;
88
+ const wild = pathTokens[i].wild;
121
89
  if (wild) {
122
90
  params[wild] = ctxToken.value;
123
91
  }
@@ -139,6 +107,6 @@ const matchTokenizePath = (checkAsRouter, tokens, ctxTokens) => {
139
107
  params: {}
140
108
  };
141
109
  }
142
- };
110
+ }
143
111
  exports.matchTokenizePath = matchTokenizePath;
144
112
  //# sourceMappingURL=tokenize-match.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"tokenize-match.js","sourceRoot":"","sources":["../../src/common/tokenize-match.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tokenize-match.js","sourceRoot":"","sources":["../../src/common/tokenize-match.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.GroupPolicyHandler = void 0;
4
4
  const common_1 = require("../common");
5
+ const parser_1 = require("@miqro/parser");
5
6
  const policyCheck = (session, options) => {
6
7
  switch (options.groupPolicy) {
7
8
  case "at_least_one":
@@ -46,6 +47,7 @@ const policyCheck = (session, options) => {
46
47
  }
47
48
  };
48
49
  const GroupPolicyHandler = (options) => {
50
+ options = (0, parser_1.parse)(options, "GroupPolicy", undefined, "options");
49
51
  return function GroupPolicyHandler(ctx) {
50
52
  try {
51
53
  if (!ctx.session) {
@@ -1 +1 @@
1
- {"version":3,"file":"group.js","sourceRoot":"","sources":["../../src/middleware/group.ts"],"names":[],"mappings":";;;AAAA,sCAAqH;AAErH,MAAM,WAAW,GAAG,CAAC,OAAgB,EAAE,OAAoB,EAAW,EAAE;IACtE,QAAQ,OAAO,CAAC,WAAW,EAAE;QAC3B,KAAK,cAAc;YACjB,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE;gBAClC,IAAI,KAAK,YAAY,KAAK,EAAE;oBAC1B,IAAI,GAAG,GAAG,IAAI,CAAC;oBACf,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;wBACrB,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE;4BACpC,GAAG,GAAG,KAAK,CAAC;4BACZ,MAAM;yBACP;qBACF;oBACD,IAAI,GAAG,EAAE;wBACP,OAAO,IAAI,CAAC;qBACb;iBACF;qBAAM;oBACL,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE;wBACxC,OAAO,IAAI,CAAC;qBACb;iBACF;aACF;YACD,OAAO,KAAK,CAAC;QACf,KAAK,KAAK;YACR,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE;gBAClC,IAAI,KAAK,YAAY,KAAK,EAAE;oBAC1B,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;wBACrB,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE;4BACpC,OAAO,KAAK,CAAC;yBACd;qBACF;iBACF;qBAAM;oBACL,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE;wBACxC,OAAO,KAAK,CAAC;qBACd;iBACF;aACF;YACD,OAAO,IAAI,CAAC;QACd;YACE,MAAM,IAAI,wBAAe,CAAC,WAAW,OAAO,CAAC,WAAW,qBAAqB,CAAC,CAAC;KAClF;AACH,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAG,CAAC,OAAoB,EAAiB,EAAE;IACxE,OAAO,SAAS,kBAAkB,CAAC,GAAY;QAC7C,IAAI;YACF,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;gBAChB,MAAM,IAAI,0BAAiB,CAAC,aAAa,CAAC,CAAC;aAC5C;iBAAM;gBACL,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACjD,IAAI,MAAM,EAAE;oBACV,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;iBACvC;qBAAM;oBACL,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,EAAE,GAAG,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBACrI,MAAM,IAAI,uBAAc,CAAC,oDAAoD,CAAC,CAAC;iBAChF;aACF;SACF;QAAC,OAAO,CAAM,EAAE;YACf,0FAA0F;YAC1F,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE;gBAChC,MAAM,CAAC,CAAC;aACT;iBAAM;gBACL,MAAM,IAAI,0BAAiB,CAAC,oDAAoD,CAAC,CAAC;aACnF;SACF;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAvBW,QAAA,kBAAkB,sBAuB7B"}
1
+ {"version":3,"file":"group.js","sourceRoot":"","sources":["../../src/middleware/group.ts"],"names":[],"mappings":";;;AAAA,sCAAqH;AACrH,0CAAoC;AAEpC,MAAM,WAAW,GAAG,CAAC,OAAgB,EAAE,OAAoB,EAAW,EAAE;IACtE,QAAQ,OAAO,CAAC,WAAW,EAAE;QAC3B,KAAK,cAAc;YACjB,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE;gBAClC,IAAI,KAAK,YAAY,KAAK,EAAE;oBAC1B,IAAI,GAAG,GAAG,IAAI,CAAC;oBACf,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;wBACrB,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE;4BACpC,GAAG,GAAG,KAAK,CAAC;4BACZ,MAAM;yBACP;qBACF;oBACD,IAAI,GAAG,EAAE;wBACP,OAAO,IAAI,CAAC;qBACb;iBACF;qBAAM;oBACL,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE;wBACxC,OAAO,IAAI,CAAC;qBACb;iBACF;aACF;YACD,OAAO,KAAK,CAAC;QACf,KAAK,KAAK;YACR,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE;gBAClC,IAAI,KAAK,YAAY,KAAK,EAAE;oBAC1B,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;wBACrB,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE;4BACpC,OAAO,KAAK,CAAC;yBACd;qBACF;iBACF;qBAAM;oBACL,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE;wBACxC,OAAO,KAAK,CAAC;qBACd;iBACF;aACF;YACD,OAAO,IAAI,CAAC;QACd;YACE,MAAM,IAAI,wBAAe,CAAC,WAAW,OAAO,CAAC,WAAW,qBAAqB,CAAC,CAAC;KAClF;AACH,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAG,CAAC,OAAoB,EAAiB,EAAE;IACxE,OAAO,GAAG,IAAA,cAAK,EAAC,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IAC9D,OAAO,SAAS,kBAAkB,CAAC,GAAY;QAC7C,IAAI;YACF,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;gBAChB,MAAM,IAAI,0BAAiB,CAAC,aAAa,CAAC,CAAC;aAC5C;iBAAM;gBACL,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACjD,IAAI,MAAM,EAAE;oBACV,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;iBACvC;qBAAM;oBACL,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,EAAE,GAAG,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBACrI,MAAM,IAAI,uBAAc,CAAC,oDAAoD,CAAC,CAAC;iBAChF;aACF;SACF;QAAC,OAAO,CAAM,EAAE;YACf,0FAA0F;YAC1F,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE;gBAChC,MAAM,CAAC,CAAC;aACT;iBAAM;gBACL,MAAM,IAAI,0BAAiB,CAAC,oDAAoD,CAAC,CAAC;aACnF;SACF;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAxBW,QAAA,kBAAkB,sBAwB7B"}
@@ -4,6 +4,7 @@ export * from "./json";
4
4
  export * from "./text";
5
5
  export * from "./form";
6
6
  export * from "./cors";
7
+ export * from "./result";
7
8
  export * from "./session";
8
9
  export * from "./group";
9
10
  export * from "./parse";
@@ -28,6 +28,7 @@ __exportStar(require("./json"), exports);
28
28
  __exportStar(require("./text"), exports);
29
29
  __exportStar(require("./form"), exports);
30
30
  __exportStar(require("./cors"), exports);
31
+ __exportStar(require("./result"), exports);
31
32
  __exportStar(require("./session"), exports);
32
33
  __exportStar(require("./group"), exports);
33
34
  __exportStar(require("./parse"), exports);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,sCAAoD;AAEpD,qCAAuC;AACvC,+BAAkC;AAClC,iCAA4B;AAC5B,qCAAsC;AACtC,iCAAkC;AAClC,iCAAkC;AAClC,iCAAwC;AAExC,2CAAyB;AACzB,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,4CAA0B;AAC1B,0CAAwB;AACxB,0CAAwB;AACxB,wCAAsB;AACtB,2CAAyB;AACzB,mCAAoC;AAA5B,oGAAA,UAAU,OAAA;AAEX,MAAM,UAAU,GAAG,GAAc,EAAE;IACxC,MAAM,GAAG,GAAc,EAAE,CAAC;IAC1B,IAAI,IAAA,yBAAgB,EAAC,gBAAgB,EAAE,IAAI,CAAC,EAAE;QAC5C,GAAG,CAAC,IAAI,CAAC,IAAA,sBAAa,GAAE,CAAC,CAAC;KAC3B;IACD,IAAI,IAAA,yBAAgB,EAAC,cAAc,EAAE,KAAK,CAAC,EAAE;QAC3C,GAAG,CAAC,IAAI,CAAC,IAAA,iBAAW,GAAE,CAAC,CAAC;KACzB;IACD,IAAI,IAAA,yBAAgB,EAAC,MAAM,EAAE,KAAK,CAAC,EAAE;QACnC,GAAG,CAAC,IAAI,CAAC,IAAA,WAAI,GAAE,CAAC,CAAC;KAClB;IACD,IAAI,IAAA,yBAAgB,EAAC,eAAe,EAAE,IAAI,CAAC,EAAE;QAC3C,GAAG,CAAC,IAAI,CAAC,IAAA,qBAAY,GAAE,CAAC,CAAC;KAC1B;IACD,IAAI,IAAA,yBAAgB,EAAC,aAAa,EAAE,IAAI,CAAC,EAAE;QACzC,GAAG,CAAC,IAAI,CAAC,IAAA,iBAAU,GAAE,CAAC,CAAC;KACxB;IACD,IAAI,IAAA,yBAAgB,EAAC,oBAAoB,EAAE,IAAI,CAAC,EAAE;QAChD,GAAG,CAAC,IAAI,CAAC,IAAA,uBAAgB,GAAE,CAAC,CAAC;KAC9B;IACD,IAAI,IAAA,yBAAgB,EAAC,aAAa,EAAE,IAAI,CAAC,EAAE;QACzC,GAAG,CAAC,IAAI,CAAC,IAAA,iBAAU,GAAE,CAAC,CAAC;KACxB;IACD,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAxBW,QAAA,UAAU,cAwBrB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,sCAAoD;AAEpD,qCAAuC;AACvC,+BAAkC;AAClC,iCAA4B;AAC5B,qCAAsC;AACtC,iCAAkC;AAClC,iCAAkC;AAClC,iCAAwC;AAExC,2CAAyB;AACzB,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,2CAAyB;AACzB,4CAA0B;AAC1B,0CAAwB;AACxB,0CAAwB;AACxB,wCAAsB;AACtB,2CAAyB;AACzB,mCAAoC;AAA5B,oGAAA,UAAU,OAAA;AAEX,MAAM,UAAU,GAAG,GAAc,EAAE;IACxC,MAAM,GAAG,GAAc,EAAE,CAAC;IAC1B,IAAI,IAAA,yBAAgB,EAAC,gBAAgB,EAAE,IAAI,CAAC,EAAE;QAC5C,GAAG,CAAC,IAAI,CAAC,IAAA,sBAAa,GAAE,CAAC,CAAC;KAC3B;IACD,IAAI,IAAA,yBAAgB,EAAC,cAAc,EAAE,KAAK,CAAC,EAAE;QAC3C,GAAG,CAAC,IAAI,CAAC,IAAA,iBAAW,GAAE,CAAC,CAAC;KACzB;IACD,IAAI,IAAA,yBAAgB,EAAC,MAAM,EAAE,KAAK,CAAC,EAAE;QACnC,GAAG,CAAC,IAAI,CAAC,IAAA,WAAI,GAAE,CAAC,CAAC;KAClB;IACD,IAAI,IAAA,yBAAgB,EAAC,eAAe,EAAE,IAAI,CAAC,EAAE;QAC3C,GAAG,CAAC,IAAI,CAAC,IAAA,qBAAY,GAAE,CAAC,CAAC;KAC1B;IACD,IAAI,IAAA,yBAAgB,EAAC,aAAa,EAAE,IAAI,CAAC,EAAE;QACzC,GAAG,CAAC,IAAI,CAAC,IAAA,iBAAU,GAAE,CAAC,CAAC;KACxB;IACD,IAAI,IAAA,yBAAgB,EAAC,oBAAoB,EAAE,IAAI,CAAC,EAAE;QAChD,GAAG,CAAC,IAAI,CAAC,IAAA,uBAAgB,GAAE,CAAC,CAAC;KAC9B;IACD,IAAI,IAAA,yBAAgB,EAAC,aAAa,EAAE,IAAI,CAAC,EAAE;QACzC,GAAG,CAAC,IAAI,CAAC,IAAA,iBAAU,GAAE,CAAC,CAAC;KACxB;IACD,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAxBW,QAAA,UAAU,cAwBrB"}
@@ -0,0 +1,3 @@
1
+ import { ParseOptions, ParserInterface } from "@miqro/parser";
2
+ import { Handler } from "../common/context";
3
+ export declare const ResultParser: (options: ParseOptions | ParseOptions[] | string, parser?: ParserInterface | undefined) => Handler;
@@ -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 {};