@miqro/core 1.3.4 → 1.3.5
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/handler/api-handler.d.ts +0 -1
- package/dist/handler/api-handler.js +1 -1
- package/dist/handler/api-handler.js.map +1 -1
- package/dist/handler/api-router-utils.d.ts +1 -8
- package/dist/handler/api-router-utils.js +16 -14
- package/dist/handler/api-router-utils.js.map +1 -1
- package/dist/handler/common/router-utils.d.ts +26 -1
- package/dist/handler/common/router-utils.js +52 -4
- package/dist/handler/common/router-utils.js.map +1 -1
- package/dist/handler/common/router.d.ts +9 -8
- package/dist/handler/common/router.js +20 -14
- package/dist/handler/common/router.js.map +1 -1
- package/dist/handler/feature-router.d.ts +2 -0
- package/dist/handler/feature-router.js +1 -1
- package/dist/handler/feature-router.js.map +1 -1
- package/package.json +1 -1
- package/src/handler/api-handler.ts +1 -2
- package/src/handler/api-router-utils.ts +17 -20
- package/src/handler/common/router-utils.ts +78 -5
- package/src/handler/common/router.ts +21 -15
- package/src/handler/feature-router.ts +3 -1
|
@@ -37,6 +37,6 @@ const APIHandler = (options) =>
|
|
|
37
37
|
// setup response parse
|
|
38
38
|
.concat(options.result ? (0, result_1.ResultParser)(options.result, options.parser) : [])
|
|
39
39
|
// setup response handler
|
|
40
|
-
.concat(
|
|
40
|
+
.concat((0, json_1.ResponseHandler)());
|
|
41
41
|
exports.APIHandler = APIHandler;
|
|
42
42
|
//# sourceMappingURL=api-handler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-handler.js","sourceRoot":"","sources":["../../src/handler/api-handler.ts"],"names":[],"mappings":";;;AACA,kDAA6E;AAC7E,8CAAwD;AAIxD,8CAAkD;AAClD,0CAAkD;AAClD,8CAAiD;
|
|
1
|
+
{"version":3,"file":"api-handler.js","sourceRoot":"","sources":["../../src/handler/api-handler.ts"],"names":[],"mappings":";;;AACA,kDAA6E;AAC7E,8CAAwD;AAIxD,8CAAkD;AAClD,0CAAkD;AAClD,8CAAiD;AAejD;;;;;;;;;;GAUG;AACI,MAAM,UAAU,GAAG,CAAC,OAA0B,EAAkB,EAAE;AACvE,2BAA2B;AAC3B,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5C,gBAAgB;KACf,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,OAAO,CAAC,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,wBAAc,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7H,eAAe;KACd,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAA,0BAAkB,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACnE,sBAAsB;KACrB,MAAM,CAAC,CAAC,IAAA,oBAAY,EAAC;QACpB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAC,CAAC;IACJ,wBAAwB;KACvB,MAAM,CAAC,OAAO,CAAC,OAAO,YAAY,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/E,uBAAuB;KACtB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAA,qBAAY,EAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3E,yBAAyB;KACxB,MAAM,CAAC,IAAA,sBAAe,GAAE,CAAC,CAAC;AApBlB,QAAA,UAAU,cAoBQ"}
|
|
@@ -1,10 +1,3 @@
|
|
|
1
1
|
import { Logger } from "../util/logger";
|
|
2
|
-
import { APIRoute } from "./api-router";
|
|
3
|
-
import { Method } from "./common";
|
|
4
2
|
import { FeatureRouterOptions } from "./feature-router";
|
|
5
|
-
|
|
6
|
-
method: Method | Method[];
|
|
7
|
-
path: string | string[];
|
|
8
|
-
}
|
|
9
|
-
export declare const traverseAPIRouteDir: (featureName: string, dirname: string, basePath?: string, features?: FeatureRouterOptions<TraversedAPIRoute>, logger?: Logger | undefined) => FeatureRouterOptions<TraversedAPIRoute>;
|
|
10
|
-
export {};
|
|
3
|
+
export declare const traverseAPIRouteDir: (featureName: string, dirname: string, basePath?: string, features?: FeatureRouterOptions<import("./feature-router").FeatureRouterPathOptions>, logger?: Logger | undefined) => FeatureRouterOptions<import("./feature-router").FeatureRouterPathOptions>;
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.traverseAPIRouteDir = void 0;
|
|
4
4
|
const fs_1 = require("fs");
|
|
5
5
|
const path_1 = require("path");
|
|
6
|
-
const api_handler_1 = require("./api-handler");
|
|
7
6
|
const tokenize_match_1 = require("./common/tokenize-match");
|
|
8
7
|
const traverseAPIRouteDir = (featureName, dirname, basePath = "/", features = {}, logger) => {
|
|
9
8
|
if (logger) {
|
|
@@ -64,21 +63,24 @@ const traverseAPIRouteDir = (featureName, dirname, basePath = "/", features = {}
|
|
|
64
63
|
throw new Error(`${___filePath} feature name collides with ${features[newFeatureSubPath].___filePath}`);
|
|
65
64
|
}
|
|
66
65
|
features[newFeatureSubPath] = {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
66
|
+
options: {
|
|
67
|
+
name: route.name,
|
|
68
|
+
description: route.description,
|
|
69
|
+
parser: route.parser,
|
|
70
|
+
middleware: route.middleware,
|
|
71
71
|
session: route.session,
|
|
72
72
|
policy: route.policy,
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
73
|
+
request: {
|
|
74
|
+
headers: route.headers,
|
|
75
|
+
query: route.query,
|
|
76
|
+
body: route.body,
|
|
77
|
+
params: route.params,
|
|
78
|
+
},
|
|
79
|
+
response: route.result ? route.result : true
|
|
80
|
+
},
|
|
81
|
+
path,
|
|
82
|
+
method: routeMethods,
|
|
83
|
+
handler: route.handler
|
|
82
84
|
};
|
|
83
85
|
features[newFeatureSubPath].___filePath = ___filePath;
|
|
84
86
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-router-utils.js","sourceRoot":"","sources":["../../src/handler/api-router-utils.ts"],"names":[],"mappings":";;;AAAA,2BAA4C;AAC5C,+BAA4C;
|
|
1
|
+
{"version":3,"file":"api-router-utils.js","sourceRoot":"","sources":["../../src/handler/api-router-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,13 +2,38 @@ import { Router } from "./router";
|
|
|
2
2
|
import { Context, Handler } from "./context";
|
|
3
3
|
import { Method } from "./context";
|
|
4
4
|
import { PathPartToken } from "./tokenize-match";
|
|
5
|
+
import { Parser, ParseOptions } from "../../util/parser";
|
|
6
|
+
import { SessionHandlerOptions } from "../middleware/session";
|
|
7
|
+
import { GroupPolicy } from "../../util/session";
|
|
8
|
+
export interface RouterJSONDoc {
|
|
9
|
+
[path: string]: {
|
|
10
|
+
[method: string]: RouterHandlerOptions;
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
export interface RouterHandlerOptions {
|
|
14
|
+
name?: string;
|
|
15
|
+
description?: string;
|
|
16
|
+
parser?: Parser;
|
|
17
|
+
middleware?: Handler | Handler[];
|
|
18
|
+
session?: SessionHandlerOptions | Handler;
|
|
19
|
+
policy?: GroupPolicy;
|
|
20
|
+
request?: {
|
|
21
|
+
headers?: ParseOptions | ParseOptions[];
|
|
22
|
+
query?: ParseOptions | false | ParseOptions[];
|
|
23
|
+
params?: ParseOptions | false | ParseOptions[];
|
|
24
|
+
body?: ParseOptions | false | ParseOptions[];
|
|
25
|
+
};
|
|
26
|
+
response?: true | ParseOptions | ParseOptions[];
|
|
27
|
+
}
|
|
5
28
|
export declare class RouterHandler {
|
|
6
29
|
private readonly path;
|
|
7
30
|
private readonly method;
|
|
31
|
+
private readonly options?;
|
|
8
32
|
private readonly tokens;
|
|
9
33
|
private readonly handler;
|
|
10
34
|
private readonly isRouter;
|
|
11
|
-
constructor(handler: Array<Handler> | Handler | Router, path: string | undefined, method: Method | undefined);
|
|
35
|
+
constructor(handler: Array<Handler> | Handler | Router, path: string | undefined, method: Method | undefined, options?: RouterHandlerOptions | undefined);
|
|
36
|
+
getJSONDoc(doc?: RouterJSONDoc, prePath?: string): RouterJSONDoc;
|
|
12
37
|
invoke(ctx: Context, pathTokens: {
|
|
13
38
|
value: string;
|
|
14
39
|
lower: string;
|
|
@@ -3,16 +3,64 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.RouterHandler = void 0;
|
|
4
4
|
const router_1 = require("./router");
|
|
5
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");
|
|
6
11
|
class RouterHandler {
|
|
7
|
-
constructor(handler, path, method) {
|
|
12
|
+
constructor(handler, path, method, options) {
|
|
8
13
|
this.path = path;
|
|
9
14
|
this.method = method;
|
|
15
|
+
this.options = options;
|
|
10
16
|
this.tokens = (0, tokenize_match_1.tokenizePath)(path);
|
|
11
|
-
|
|
17
|
+
const routeHandlers = handler instanceof Array ? handler : [handler];
|
|
18
|
+
let handlers = [];
|
|
12
19
|
this.isRouter = handler instanceof router_1.Router;
|
|
13
|
-
if (!this.isRouter &&
|
|
14
|
-
throw new Error("bad arguments
|
|
20
|
+
if ((!this.isRouter && routeHandlers.length !== routeHandlers.filter(h => typeof h === "function").length) || (this.isRouter && options)) {
|
|
21
|
+
throw new Error("bad arguments");
|
|
15
22
|
}
|
|
23
|
+
if (this.options && this.options.middleware) {
|
|
24
|
+
handlers = handlers.concat(this.options.middleware);
|
|
25
|
+
}
|
|
26
|
+
if (this.options && this.options.session) {
|
|
27
|
+
handlers.push(typeof this.options.session !== "function" ? (0, session_1.SessionHandler)(this.options.session) : this.options.session);
|
|
28
|
+
}
|
|
29
|
+
if (this.options && this.options.policy) {
|
|
30
|
+
handlers.push((0, group_1.GroupPolicyHandler)(this.options.policy));
|
|
31
|
+
}
|
|
32
|
+
if (this.options && this.options.request) {
|
|
33
|
+
handlers.push((0, parse_1.ParseRequest)(this.options.request));
|
|
34
|
+
}
|
|
35
|
+
handlers = handlers.concat(routeHandlers);
|
|
36
|
+
if (this.options && this.options.response) {
|
|
37
|
+
if (typeof this.options.response === "boolean") {
|
|
38
|
+
handlers.push((0, json_1.ResponseHandler)());
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
handlers.push((0, result_1.ResultParser)(this.options.response, this.options.parser));
|
|
42
|
+
handlers.push((0, json_1.ResponseHandler)());
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
this.handler = handlers;
|
|
46
|
+
}
|
|
47
|
+
getJSONDoc(doc = {}, prePath = "/") {
|
|
48
|
+
const nPath = this.path && this.path.length > 1 ? this.path.substring(1) : "";
|
|
49
|
+
const nMethod = this.method ? this.method : "";
|
|
50
|
+
if (this.isRouter) {
|
|
51
|
+
const router = this.handler[0];
|
|
52
|
+
router.getJSONDoc(doc, nPath);
|
|
53
|
+
}
|
|
54
|
+
else if (this.options) {
|
|
55
|
+
if (!doc[`${prePath}${nPath}`]) {
|
|
56
|
+
doc[`${prePath}${nPath}`] = {};
|
|
57
|
+
}
|
|
58
|
+
if (doc[`${prePath}${nPath}`][nMethod]) {
|
|
59
|
+
throw new Error("cannot create doc routes override each other");
|
|
60
|
+
}
|
|
61
|
+
doc[`${prePath}${nPath}`][nMethod] = this.options;
|
|
62
|
+
}
|
|
63
|
+
return doc;
|
|
16
64
|
}
|
|
17
65
|
async invoke(ctx, pathTokens, prePathTokens) {
|
|
18
66
|
for (let i = 0; i < this.handler.length; i++) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router-utils.js","sourceRoot":"","sources":["../../../src/handler/common/router-utils.ts"],"names":[],"mappings":";;;AAAA,qCAAkC;AAGlC,
|
|
1
|
+
{"version":3,"file":"router-utils.js","sourceRoot":"","sources":["../../../src/handler/common/router-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,20 @@
|
|
|
1
1
|
import { Method, Handler, Context, ErrorHandler } from "./context";
|
|
2
|
-
import { RouterHandler } from "./router-utils";
|
|
2
|
+
import { RouterHandler, RouterJSONDoc, RouterHandlerOptions } from "./router-utils";
|
|
3
3
|
import { PathPartToken } from "./tokenize-match";
|
|
4
4
|
export declare class Router {
|
|
5
5
|
protected readonly handlers: RouterHandler[];
|
|
6
6
|
protected readonly errorHandlers: ErrorHandler[];
|
|
7
|
-
get(path: string, handler: Array<Handler> | Handler | Router): Router;
|
|
8
|
-
post(path: string, handler: Array<Handler> | Handler | Router): Router;
|
|
9
|
-
patch(path: string, handler: Array<Handler> | Handler | Router): Router;
|
|
10
|
-
delete(path: string, handler: Array<Handler> | Handler | Router): Router;
|
|
11
|
-
put(path: string, handler: Array<Handler> | Handler | Router): Router;
|
|
12
|
-
options(path: string, handler: Array<Handler> | Handler | Router): Router;
|
|
13
|
-
use(handler: Array<Handler> | Handler | Router, path?: string, method?: Method): Router;
|
|
7
|
+
get(path: string, handler: Array<Handler> | Handler | Router, options?: RouterHandlerOptions): Router;
|
|
8
|
+
post(path: string, handler: Array<Handler> | Handler | Router, options?: RouterHandlerOptions): Router;
|
|
9
|
+
patch(path: string, handler: Array<Handler> | Handler | Router, options?: RouterHandlerOptions): Router;
|
|
10
|
+
delete(path: string, handler: Array<Handler> | Handler | Router, options?: RouterHandlerOptions): Router;
|
|
11
|
+
put(path: string, handler: Array<Handler> | Handler | Router, options?: RouterHandlerOptions): Router;
|
|
12
|
+
options(path: string, handler: Array<Handler> | Handler | Router, options?: RouterHandlerOptions): Router;
|
|
13
|
+
use(handler: Array<Handler> | Handler | Router, path?: string, method?: Method, options?: RouterHandlerOptions): Router;
|
|
14
14
|
catch(errorHandler: Array<ErrorHandler> | ErrorHandler): Router;
|
|
15
15
|
run(ctx: Context, pathTokens?: {
|
|
16
16
|
value: string;
|
|
17
17
|
lower: string;
|
|
18
18
|
}[], prePathTokens?: PathPartToken[]): Promise<boolean>;
|
|
19
|
+
getJSONDoc(doc?: RouterJSONDoc, prePath?: string): RouterJSONDoc;
|
|
19
20
|
}
|
|
@@ -8,28 +8,28 @@ class Router {
|
|
|
8
8
|
this.handlers = [];
|
|
9
9
|
this.errorHandlers = [];
|
|
10
10
|
}
|
|
11
|
-
get(path, handler) {
|
|
12
|
-
return this.use(handler, path, "get");
|
|
11
|
+
get(path, handler, options) {
|
|
12
|
+
return this.use(handler, path, "get", options);
|
|
13
13
|
}
|
|
14
|
-
post(path, handler) {
|
|
15
|
-
return this.use(handler, path, "post");
|
|
14
|
+
post(path, handler, options) {
|
|
15
|
+
return this.use(handler, path, "post", options);
|
|
16
16
|
}
|
|
17
|
-
patch(path, handler) {
|
|
18
|
-
return this.use(handler, path, "patch");
|
|
17
|
+
patch(path, handler, options) {
|
|
18
|
+
return this.use(handler, path, "patch", options);
|
|
19
19
|
}
|
|
20
|
-
delete(path, handler) {
|
|
21
|
-
return this.use(handler, path, "delete");
|
|
20
|
+
delete(path, handler, options) {
|
|
21
|
+
return this.use(handler, path, "delete", options);
|
|
22
22
|
}
|
|
23
|
-
put(path, handler) {
|
|
24
|
-
return this.use(handler, path, "put");
|
|
23
|
+
put(path, handler, options) {
|
|
24
|
+
return this.use(handler, path, "put", options);
|
|
25
25
|
}
|
|
26
|
-
options(path, handler) {
|
|
27
|
-
return this.use(handler, path, "options");
|
|
26
|
+
options(path, handler, options) {
|
|
27
|
+
return this.use(handler, path, "options", options);
|
|
28
28
|
}
|
|
29
|
-
use(handler, path, method) {
|
|
29
|
+
use(handler, path, method, options) {
|
|
30
30
|
const nPath = path !== undefined ? (0, tokenize_match_1.normalizePath)(path) : undefined;
|
|
31
31
|
const nMethod = method ? method.toUpperCase() : method;
|
|
32
|
-
this.handlers.push(new router_utils_1.RouterHandler(handler, nPath, nMethod));
|
|
32
|
+
this.handlers.push(new router_utils_1.RouterHandler(handler, nPath, nMethod, options));
|
|
33
33
|
return this;
|
|
34
34
|
}
|
|
35
35
|
catch(errorHandler) {
|
|
@@ -71,6 +71,12 @@ class Router {
|
|
|
71
71
|
throw e; // pass the error along
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
|
+
getJSONDoc(doc = {}, prePath = "/") {
|
|
75
|
+
for (const h of this.handlers) {
|
|
76
|
+
doc = h.getJSONDoc(doc, prePath);
|
|
77
|
+
}
|
|
78
|
+
return doc;
|
|
79
|
+
}
|
|
74
80
|
}
|
|
75
81
|
exports.Router = Router;
|
|
76
82
|
//# sourceMappingURL=router.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/handler/common/router.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/handler/common/router.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
11
|
export declare type FeatureRouterOptions<T extends FeatureRouterPathOptions = FeatureRouterPathOptions> = SimpleMap<T>;
|
|
10
12
|
export declare const FeatureRouter: (options: FeatureRouterOptions<FeatureRouterPathOptions>, 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;
|
|
1
|
+
{"version":3,"file":"feature-router.js","sourceRoot":"","sources":["../../src/handler/feature-router.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -19,7 +19,6 @@ export interface APIHandlerOptions {
|
|
|
19
19
|
middleware?: Handler[];
|
|
20
20
|
session?: SessionHandlerOptions | Handler;
|
|
21
21
|
policy?: GroupPolicy;
|
|
22
|
-
responseHandler?: Handler;
|
|
23
22
|
}
|
|
24
23
|
|
|
25
24
|
/**
|
|
@@ -53,4 +52,4 @@ export const APIHandler = (options: APIHandlerOptions): Array<Handler> =>
|
|
|
53
52
|
// setup response parse
|
|
54
53
|
.concat(options.result ? ResultParser(options.result, options.parser) : [])
|
|
55
54
|
// setup response handler
|
|
56
|
-
.concat(
|
|
55
|
+
.concat(ResponseHandler());
|
|
@@ -1,22 +1,16 @@
|
|
|
1
1
|
import { lstatSync, readdirSync } from "fs";
|
|
2
2
|
import { join, parse, resolve } from "path";
|
|
3
3
|
import { Logger } from "../util/logger";
|
|
4
|
-
import { APIHandler } from "./api-handler";
|
|
5
4
|
import { APIRoute } from "./api-router";
|
|
6
5
|
import { Method } from "./common";
|
|
7
6
|
import { normalizePath } from "./common/tokenize-match";
|
|
8
7
|
import { FeatureRouterOptions } from "./feature-router";
|
|
9
8
|
|
|
10
|
-
interface TraversedAPIRoute extends APIRoute {
|
|
11
|
-
method: Method | Method[];
|
|
12
|
-
path: string | string[];
|
|
13
|
-
}
|
|
14
|
-
|
|
15
9
|
export const traverseAPIRouteDir = (
|
|
16
10
|
featureName: string,
|
|
17
11
|
dirname: string,
|
|
18
12
|
basePath = "/",
|
|
19
|
-
features: FeatureRouterOptions
|
|
13
|
+
features: FeatureRouterOptions = {}, logger?: Logger): FeatureRouterOptions => {
|
|
20
14
|
if (logger) {
|
|
21
15
|
logger.trace("loading routes from [%s]", dirname);
|
|
22
16
|
}
|
|
@@ -77,21 +71,24 @@ export const traverseAPIRouteDir = (
|
|
|
77
71
|
throw new Error(`${___filePath} feature name collides with ${(features[newFeatureSubPath] as any).___filePath}`)
|
|
78
72
|
}
|
|
79
73
|
features[newFeatureSubPath] = {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
74
|
+
options: {
|
|
75
|
+
name: route.name,
|
|
76
|
+
description: route.description,
|
|
77
|
+
parser: route.parser,
|
|
78
|
+
middleware: route.middleware,
|
|
84
79
|
session: route.session,
|
|
85
80
|
policy: route.policy,
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
81
|
+
request: {
|
|
82
|
+
headers: route.headers,
|
|
83
|
+
query: route.query,
|
|
84
|
+
body: route.body,
|
|
85
|
+
params: route.params,
|
|
86
|
+
},
|
|
87
|
+
response: route.result ? route.result : true
|
|
88
|
+
},
|
|
89
|
+
path,
|
|
90
|
+
method: routeMethods,
|
|
91
|
+
handler: route.handler
|
|
95
92
|
};
|
|
96
93
|
(features[newFeatureSubPath] as any).___filePath = ___filePath;
|
|
97
94
|
}
|
|
@@ -1,7 +1,36 @@
|
|
|
1
1
|
import { Router } from "./router";
|
|
2
2
|
import { Context, Handler } from "./context";
|
|
3
3
|
import { Method } from "./context";
|
|
4
|
-
import { matchTokenizePath, PathPartToken, tokenizePath } from "./tokenize-match"
|
|
4
|
+
import { matchTokenizePath, PathPartToken, tokenizePath } from "./tokenize-match"
|
|
5
|
+
import { ParseRequest } from "../middleware/parse";
|
|
6
|
+
import { Parser, ParseOptions } from "../../util/parser";
|
|
7
|
+
import { SessionHandler, SessionHandlerOptions } from "../middleware/session";
|
|
8
|
+
import { GroupPolicyHandler } from "../middleware/group";
|
|
9
|
+
import { ResultParser } from "../response/result";
|
|
10
|
+
import { ResponseHandler } from "../response/json";
|
|
11
|
+
import { GroupPolicy } from "../../util/session";
|
|
12
|
+
|
|
13
|
+
export interface RouterJSONDoc {
|
|
14
|
+
[path: string]: {
|
|
15
|
+
[method: string]: RouterHandlerOptions
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
export interface RouterHandlerOptions {
|
|
20
|
+
name?: string;
|
|
21
|
+
description?: string;
|
|
22
|
+
parser?: Parser;
|
|
23
|
+
middleware?: Handler | Handler[];
|
|
24
|
+
session?: SessionHandlerOptions | Handler;
|
|
25
|
+
policy?: GroupPolicy;
|
|
26
|
+
request?: {
|
|
27
|
+
headers?: ParseOptions | ParseOptions[];
|
|
28
|
+
query?: ParseOptions | false | ParseOptions[];
|
|
29
|
+
params?: ParseOptions | false | ParseOptions[];
|
|
30
|
+
body?: ParseOptions | false | ParseOptions[];
|
|
31
|
+
};
|
|
32
|
+
response?: true | ParseOptions | ParseOptions[];
|
|
33
|
+
}
|
|
5
34
|
|
|
6
35
|
export class RouterHandler {
|
|
7
36
|
|
|
@@ -9,13 +38,57 @@ export class RouterHandler {
|
|
|
9
38
|
private readonly handler: Array<Handler | Handler | Router>;
|
|
10
39
|
private readonly isRouter: boolean;
|
|
11
40
|
|
|
12
|
-
public constructor(handler: Array<Handler> | Handler | Router, private readonly path: string | undefined, private readonly method: Method | undefined) {
|
|
41
|
+
public constructor(handler: Array<Handler> | Handler | Router, private readonly path: string | undefined, private readonly method: Method | undefined, private readonly options?: RouterHandlerOptions) {
|
|
13
42
|
this.tokens = tokenizePath(path);
|
|
14
|
-
|
|
43
|
+
const routeHandlers = handler instanceof Array ? handler : [handler];
|
|
44
|
+
let handlers: Array<Handler | Router> = []
|
|
15
45
|
this.isRouter = handler instanceof Router;
|
|
16
|
-
if (!this.isRouter &&
|
|
17
|
-
throw new Error("bad arguments
|
|
46
|
+
if ((!this.isRouter && routeHandlers.length !== routeHandlers.filter(h => typeof h === "function").length) || (this.isRouter && options)) {
|
|
47
|
+
throw new Error("bad arguments");
|
|
48
|
+
}
|
|
49
|
+
if (this.options && this.options.middleware) {
|
|
50
|
+
handlers = handlers.concat(this.options.middleware);
|
|
51
|
+
}
|
|
52
|
+
if (this.options && this.options.session) {
|
|
53
|
+
handlers.push(typeof this.options.session !== "function" ? SessionHandler(this.options.session) : this.options.session);
|
|
54
|
+
}
|
|
55
|
+
if (this.options && this.options.policy) {
|
|
56
|
+
handlers.push(GroupPolicyHandler(this.options.policy));
|
|
57
|
+
}
|
|
58
|
+
if (this.options && this.options.request) {
|
|
59
|
+
handlers.push(ParseRequest(this.options.request));
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
handlers = handlers.concat(routeHandlers);
|
|
63
|
+
|
|
64
|
+
if (this.options && this.options.response) {
|
|
65
|
+
if (typeof this.options.response === "boolean") {
|
|
66
|
+
(handlers as Handler[]).push(ResponseHandler());
|
|
67
|
+
} else {
|
|
68
|
+
(handlers as Handler[]).push(ResultParser(this.options.response, this.options.parser));
|
|
69
|
+
(handlers as Handler[]).push(ResponseHandler());
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
this.handler = handlers;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
public getJSONDoc(doc: RouterJSONDoc = {}, prePath = "/"): RouterJSONDoc {
|
|
76
|
+
const nPath = this.path && this.path.length > 1 ? this.path.substring(1) : "";
|
|
77
|
+
const nMethod = this.method ? this.method : "";
|
|
78
|
+
|
|
79
|
+
if (this.isRouter) {
|
|
80
|
+
const router: Router = this.handler[0] as Router;
|
|
81
|
+
router.getJSONDoc(doc, nPath);
|
|
82
|
+
} else if(this.options){
|
|
83
|
+
if (!doc[`${prePath}${nPath}`]) {
|
|
84
|
+
doc[`${prePath}${nPath}`] = {};
|
|
85
|
+
}
|
|
86
|
+
if (doc[`${prePath}${nPath}`][nMethod]) {
|
|
87
|
+
throw new Error("cannot create doc routes override each other");
|
|
88
|
+
}
|
|
89
|
+
doc[`${prePath}${nPath}`][nMethod] = this.options;
|
|
18
90
|
}
|
|
91
|
+
return doc;
|
|
19
92
|
}
|
|
20
93
|
|
|
21
94
|
public async invoke(ctx: Context, pathTokens: { value: string; lower: string; }[], prePathTokens: PathPartToken[]): Promise<boolean> {
|
|
@@ -1,32 +1,32 @@
|
|
|
1
1
|
import { Method, Handler, Context, ErrorHandler } from "./context";
|
|
2
|
-
import { RouterHandler } from "./router-utils";
|
|
2
|
+
import { RouterHandler, RouterJSONDoc, RouterHandlerOptions } from "./router-utils";
|
|
3
3
|
import { normalizePath, PathPartToken, splitPath } from "./tokenize-match";
|
|
4
4
|
|
|
5
5
|
export class Router {
|
|
6
6
|
protected readonly handlers: RouterHandler[] = [];
|
|
7
7
|
protected readonly errorHandlers: ErrorHandler[] = [];
|
|
8
|
-
public get(path: string, handler: Array<Handler> | Handler | Router): Router {
|
|
9
|
-
return this.use(handler, path, "get");
|
|
8
|
+
public get(path: string, handler: Array<Handler> | Handler | Router, options?: RouterHandlerOptions): Router {
|
|
9
|
+
return this.use(handler, path, "get", options);
|
|
10
10
|
}
|
|
11
|
-
public post(path: string, handler: Array<Handler> | Handler | Router): Router {
|
|
12
|
-
return this.use(handler, path, "post");
|
|
11
|
+
public post(path: string, handler: Array<Handler> | Handler | Router, options?: RouterHandlerOptions): Router {
|
|
12
|
+
return this.use(handler, path, "post", options);
|
|
13
13
|
}
|
|
14
|
-
public patch(path: string, handler: Array<Handler> | Handler | Router): Router {
|
|
15
|
-
return this.use(handler, path, "patch");
|
|
14
|
+
public patch(path: string, handler: Array<Handler> | Handler | Router, options?: RouterHandlerOptions): Router {
|
|
15
|
+
return this.use(handler, path, "patch", options);
|
|
16
16
|
}
|
|
17
|
-
public delete(path: string, handler: Array<Handler> | Handler | Router): Router {
|
|
18
|
-
return this.use(handler, path, "delete");
|
|
17
|
+
public delete(path: string, handler: Array<Handler> | Handler | Router, options?: RouterHandlerOptions): Router {
|
|
18
|
+
return this.use(handler, path, "delete", options);
|
|
19
19
|
}
|
|
20
|
-
public put(path: string, handler: Array<Handler> | Handler | Router): Router {
|
|
21
|
-
return this.use(handler, path, "put");
|
|
20
|
+
public put(path: string, handler: Array<Handler> | Handler | Router, options?: RouterHandlerOptions): Router {
|
|
21
|
+
return this.use(handler, path, "put", options);
|
|
22
22
|
}
|
|
23
|
-
public options(path: string, handler: Array<Handler> | Handler | Router): Router {
|
|
24
|
-
return this.use(handler, path, "options");
|
|
23
|
+
public options(path: string, handler: Array<Handler> | Handler | Router, options?: RouterHandlerOptions): Router {
|
|
24
|
+
return this.use(handler, path, "options", options);
|
|
25
25
|
}
|
|
26
|
-
public use(handler: Array<Handler> | Handler | Router, path?: string, method?: Method): Router {
|
|
26
|
+
public use(handler: Array<Handler> | Handler | Router, path?: string, method?: Method, options?: RouterHandlerOptions): Router {
|
|
27
27
|
const nPath = path !== undefined ? normalizePath(path) : undefined;
|
|
28
28
|
const nMethod = method ? method.toUpperCase() as Method : method;
|
|
29
|
-
this.handlers.push(new RouterHandler(handler, nPath, nMethod));
|
|
29
|
+
this.handlers.push(new RouterHandler(handler, nPath, nMethod, options));
|
|
30
30
|
return this;
|
|
31
31
|
}
|
|
32
32
|
public catch(errorHandler: Array<ErrorHandler> | ErrorHandler): Router {
|
|
@@ -67,4 +67,10 @@ export class Router {
|
|
|
67
67
|
throw e; // pass the error along
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
|
+
public getJSONDoc(doc: RouterJSONDoc = {}, prePath = "/"): RouterJSONDoc {
|
|
71
|
+
for (const h of this.handlers) {
|
|
72
|
+
doc = h.getJSONDoc(doc, prePath);
|
|
73
|
+
}
|
|
74
|
+
return doc;
|
|
75
|
+
}
|
|
70
76
|
}
|
|
@@ -3,11 +3,13 @@ import { Logger } from "../util/logger";
|
|
|
3
3
|
import { isFeatureEnabled } from "../util/config/featuretoggle";
|
|
4
4
|
import { normalizePath } from "./common/tokenize-match";
|
|
5
5
|
import { Router, Handler, Method } from "./common";
|
|
6
|
+
import { RouterHandlerOptions } from "./common/router-utils";
|
|
6
7
|
|
|
7
8
|
export interface FeatureRouterPathOptions {
|
|
8
9
|
path: string | string[];
|
|
9
10
|
method: Method | Method[];
|
|
10
11
|
handler: Array<Handler> | Handler;
|
|
12
|
+
options?: RouterHandlerOptions;
|
|
11
13
|
}
|
|
12
14
|
|
|
13
15
|
export type FeatureRouterOptions<T extends FeatureRouterPathOptions = FeatureRouterPathOptions> = SimpleMap<T>;
|
|
@@ -63,7 +65,7 @@ export const FeatureRouter = (options: FeatureRouterOptions, logger?: Logger): R
|
|
|
63
65
|
throw new Error(`${featureName} collides with feature ${enabledPaths[`${p}${m}`]} on path ${p} method ${m}`)
|
|
64
66
|
}
|
|
65
67
|
enabledPaths[`${p}${m}`] = featureName;
|
|
66
|
-
router.use(implementation, p, m.toLocaleLowerCase() as Method);
|
|
68
|
+
router.use(implementation, p, m.toLocaleLowerCase() as Method, handlerOptions.options);
|
|
67
69
|
}
|
|
68
70
|
}
|
|
69
71
|
} else {
|