@miqro/core 1.5.12 → 1.5.15
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.
- package/dist/api-router.d.ts +6 -5
- package/dist/api-router.js +9 -3
- package/dist/api-router.js.map +1 -1
- package/dist/common/api-router-utils.d.ts +1 -1
- package/dist/common/api-router-utils.js +4 -3
- package/dist/common/api-router-utils.js.map +1 -1
- package/dist/common/config/index.js +5 -1
- package/dist/common/config/index.js.map +1 -1
- package/dist/common/error/index.js +5 -1
- package/dist/common/error/index.js.map +1 -1
- package/dist/common/index.js +5 -1
- package/dist/common/index.js.map +1 -1
- package/dist/common/logger/index.js +5 -1
- package/dist/common/logger/index.js.map +1 -1
- package/dist/common/router-handler.d.ts +20 -0
- package/dist/common/router-handler.js +136 -0
- package/dist/common/router-handler.js.map +1 -0
- package/dist/common/router-utils.d.ts +7 -5
- package/dist/common/router-utils.js +37 -47
- package/dist/common/router-utils.js.map +1 -1
- package/dist/common/session/common.d.ts +5 -2
- package/dist/common/session/index.js +5 -1
- package/dist/common/session/index.js.map +1 -1
- package/dist/common/tokenize-match.d.ts +13 -20
- package/dist/common/tokenize-match.js +25 -57
- package/dist/common/tokenize-match.js.map +1 -1
- package/dist/index.js +5 -1
- package/dist/index.js.map +1 -1
- package/dist/middleware/group.js +2 -0
- package/dist/middleware/group.js.map +1 -1
- package/dist/middleware/index.d.ts +1 -0
- package/dist/middleware/index.js +6 -1
- package/dist/middleware/index.js.map +1 -1
- package/dist/middleware/result.d.ts +3 -0
- package/dist/middleware/result.js +51 -0
- package/dist/middleware/result.js.map +1 -0
- package/dist/router.d.ts +3 -30
- package/dist/router.js +2 -167
- package/dist/router.js.map +1 -1
- package/dist/static.d.ts +1 -0
- package/dist/static.js +8 -3
- package/dist/static.js.map +1 -1
- package/package.json +11 -9
- package/src/api-router.ts +16 -7
- package/src/api-router.unit.test.js +273 -0
- package/src/common/api-router-utils.ts +3 -3
- package/src/common/router-handler.ts +159 -0
- package/src/common/router-utils.ts +46 -44
- package/src/common/session/common.ts +5 -2
- package/src/common/tokenize-match.ts +30 -52
- package/src/middleware/group.ts +2 -0
- package/src/middleware/index.ts +1 -0
- package/src/middleware/result.ts +43 -0
- package/src/router.ts +4 -196
- package/src/setup-test.js +3 -0
- package/src/static.ts +11 -4
|
@@ -1,48 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.matchTokenizePath = exports.tokenizePath = exports.splitPath = exports.
|
|
4
|
-
|
|
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
|
-
|
|
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
|
-
|
|
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
|
-
|
|
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
|
-
|
|
55
|
+
function tokenizePath(path) {
|
|
88
56
|
if (path === undefined) {
|
|
89
57
|
return [];
|
|
90
58
|
}
|
|
91
|
-
const tokens = (0, exports.splitPath)(path).map(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
|
-
|
|
101
|
-
for (let i = 0; i <
|
|
102
|
-
if (
|
|
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 =
|
|
74
|
+
const lastTokenIsOptional = pathTokens.length > 0 ? pathTokens[pathTokens.length - 1].optional : false;
|
|
107
75
|
const couldBeUsingOptional = (lastTokenIsOptional &&
|
|
108
|
-
((!checkAsRouter &&
|
|
109
|
-
(checkAsRouter &&
|
|
76
|
+
((!checkAsRouter && pathTokens.length - 1 === requestParts.length) ||
|
|
77
|
+
(checkAsRouter && pathTokens.length - 1 <= requestParts.length)));
|
|
110
78
|
const params = {};
|
|
111
|
-
if ((!checkAsRouter &&
|
|
112
|
-
//
|
|
113
|
-
for (let i = 0; i <
|
|
114
|
-
const ctxToken =
|
|
115
|
-
if (checkAsRouter && i >=
|
|
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 (
|
|
86
|
+
if (pathTokens[i].wild || ctxToken.lower === pathTokens[i].lower) {
|
|
119
87
|
// check pass
|
|
120
|
-
const 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":";;;
|
|
1
|
+
{"version":3,"file":"tokenize-match.js","sourceRoot":"","sources":["../../src/common/tokenize-match.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,2CAAyB;AACzB,2CAAyB;AACzB,+CAA6B;AAC7B,2CAAyB;AACzB,0CAAwB;AACxB,+CAA6B"}
|
package/dist/middleware/group.js
CHANGED
|
@@ -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;
|
|
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"}
|
package/dist/middleware/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -24,6 +28,7 @@ __exportStar(require("./json"), exports);
|
|
|
24
28
|
__exportStar(require("./text"), exports);
|
|
25
29
|
__exportStar(require("./form"), exports);
|
|
26
30
|
__exportStar(require("./cors"), exports);
|
|
31
|
+
__exportStar(require("./result"), exports);
|
|
27
32
|
__exportStar(require("./session"), exports);
|
|
28
33
|
__exportStar(require("./group"), exports);
|
|
29
34
|
__exportStar(require("./parse"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":"
|
|
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,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
|
-
|
|
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
|
|
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,7 +41,7 @@ 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) {
|
package/dist/router.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":";;;AACA,+BAAwB;AAExB,8CAAwE;
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"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"}
|
package/dist/static.d.ts
CHANGED
package/dist/static.js
CHANGED
|
@@ -5,14 +5,14 @@ const fs_1 = require("fs");
|
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const parser_1 = require("@miqro/parser");
|
|
7
7
|
const router_1 = require("./router");
|
|
8
|
-
const outputFile = async (path, contentType, ctx, allowGetJSON) => {
|
|
8
|
+
const outputFile = async (path, contentType, ctx, allowGetJSON, status = 200) => {
|
|
9
9
|
const buffer = (0, fs_1.readFileSync)(path);
|
|
10
10
|
return allowGetJSON && ctx.query.format && ctx.query.format === "json" ?
|
|
11
11
|
ctx.json({
|
|
12
12
|
buffer
|
|
13
13
|
}) :
|
|
14
14
|
ctx.end({
|
|
15
|
-
status
|
|
15
|
+
status,
|
|
16
16
|
headers: {
|
|
17
17
|
["Content-Type"]: contentType
|
|
18
18
|
},
|
|
@@ -65,6 +65,11 @@ class StaticRouter extends router_1.Router {
|
|
|
65
65
|
type: "string",
|
|
66
66
|
required: false
|
|
67
67
|
},
|
|
68
|
+
index404Status: {
|
|
69
|
+
type: "number",
|
|
70
|
+
required: false,
|
|
71
|
+
defaultValue: 404
|
|
72
|
+
},
|
|
68
73
|
contentTypes: {
|
|
69
74
|
type: "object",
|
|
70
75
|
required: false,
|
|
@@ -198,7 +203,7 @@ class StaticRouter extends router_1.Router {
|
|
|
198
203
|
if ((0, fs_1.existsSync)(realPath)) {
|
|
199
204
|
const ext = (0, path_1.extname)(realPath);
|
|
200
205
|
const contentType = contentTypes[ext] ? contentTypes[ext] : defaultContentType;
|
|
201
|
-
await outputFile(realPath, contentType, ctx, allowGetJSON);
|
|
206
|
+
await outputFile(realPath, contentType, ctx, allowGetJSON, this.staticOptions.index404Status);
|
|
202
207
|
}
|
|
203
208
|
}
|
|
204
209
|
return !ctx.res.headersSent ? super.run(ctx, pathTokens, prePathTokens) : false;
|