@miqro/core 3.0.3 → 3.0.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/build/cjs/api-router.js +2 -3
- package/build/cjs/api-router.js.map +1 -1
- package/build/cjs/common/api-router-types.d.ts +8 -5
- package/build/cjs/common/api-router-types.js +9 -1
- package/build/cjs/common/api-router-types.js.map +1 -1
- package/build/cjs/common/api-router-utils.d.ts +2 -4
- package/build/cjs/common/api-router-utils.js +65 -59
- package/build/cjs/common/api-router-utils.js.map +1 -1
- package/build/cjs/common/index.d.ts +1 -1
- package/build/cjs/common/index.js +1 -2
- package/build/cjs/common/index.js.map +1 -1
- package/build/cjs/common/logger/constants.d.ts +1 -0
- package/build/cjs/common/logger/constants.js +1 -0
- package/build/cjs/common/logger/constants.js.map +1 -1
- package/build/cjs/common/logger/interfaces.d.ts +1 -1
- package/build/cjs/common/logger/logger.js +1 -1
- package/build/cjs/common/logger/logger.js.map +1 -1
- package/build/cjs/common/logger/transport/console.js +3 -1
- package/build/cjs/common/logger/transport/console.js.map +1 -1
- package/build/cjs/common/router-default-logger-factory.d.ts +1 -0
- package/build/cjs/common/router-default-logger-factory.js +7 -1
- package/build/cjs/common/router-default-logger-factory.js.map +1 -1
- package/build/cjs/common/router-handler.d.ts +2 -1
- package/build/cjs/common/router-handler.js +41 -27
- package/build/cjs/common/router-handler.js.map +1 -1
- package/build/cjs/router.d.ts +9 -6
- package/build/cjs/router.js +21 -0
- package/build/cjs/router.js.map +1 -1
- package/build/esm/api-router.js +2 -3
- package/build/esm/api-router.js.map +1 -1
- package/build/esm/common/api-router-types.d.ts +8 -5
- package/build/esm/common/api-router-types.js +8 -0
- package/build/esm/common/api-router-types.js.map +1 -1
- package/build/esm/common/api-router-utils.d.ts +2 -4
- package/build/esm/common/api-router-utils.js +63 -57
- package/build/esm/common/api-router-utils.js.map +1 -1
- package/build/esm/common/index.d.ts +1 -1
- package/build/esm/common/index.js +1 -1
- package/build/esm/common/index.js.map +1 -1
- package/build/esm/common/logger/constants.d.ts +1 -0
- package/build/esm/common/logger/constants.js +1 -0
- package/build/esm/common/logger/constants.js.map +1 -1
- package/build/esm/common/logger/interfaces.d.ts +1 -1
- package/build/esm/common/logger/logger.js +1 -1
- package/build/esm/common/logger/logger.js.map +1 -1
- package/build/esm/common/logger/transport/console.js +3 -1
- package/build/esm/common/logger/transport/console.js.map +1 -1
- package/build/esm/common/router-default-logger-factory.d.ts +1 -0
- package/build/esm/common/router-default-logger-factory.js +5 -0
- package/build/esm/common/router-default-logger-factory.js.map +1 -1
- package/build/esm/common/router-handler.d.ts +2 -1
- package/build/esm/common/router-handler.js +41 -27
- package/build/esm/common/router-handler.js.map +1 -1
- package/build/esm/router.d.ts +9 -6
- package/build/esm/router.js +21 -0
- package/build/esm/router.js.map +1 -1
- package/package.json +4 -4
- package/src/api-router.ts +2 -3
- package/src/common/api-router-types.ts +15 -5
- package/src/common/api-router-utils.ts +67 -60
- package/src/common/index.ts +1 -1
- package/src/common/logger/constants.ts +1 -0
- package/src/common/logger/interfaces.ts +1 -1
- package/src/common/logger/logger.ts +1 -1
- package/src/common/logger/transport/console.ts +6 -4
- package/src/common/router-default-logger-factory.ts +6 -0
- package/src/common/router-handler.ts +39 -27
- package/src/router.ts +33 -6
- package/test.out.txt +3535 -0
- package/build/cjs/common/feature-router-types.d.ts +0 -12
- package/build/cjs/common/feature-router-types.js +0 -5
- package/build/cjs/common/feature-router-types.js.map +0 -1
- package/build/cjs/feature-router.d.ts +0 -4
- package/build/cjs/feature-router.js +0 -90
- package/build/cjs/feature-router.js.map +0 -1
- package/build/esm/common/feature-router-types.d.ts +0 -12
- package/build/esm/common/feature-router-types.js +0 -2
- package/build/esm/common/feature-router-types.js.map +0 -1
- package/build/esm/feature-router.d.ts +0 -4
- package/build/esm/feature-router.js +0 -86
- package/build/esm/feature-router.js.map +0 -1
- package/src/api-router.unit.test.js +0 -280
- package/src/common/feature-router-types.ts +0 -13
- package/src/feature-router.ts +0 -82
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router-handler.js","sourceRoot":"","sources":["../../../src/common/router-handler.ts"],"names":[],"mappings":";;;AAAA,qDAAwG;AAExG,iDAAgE;AAChE,0CAAsC;AACtC,8CAA+F;AAC/F,iDAKwB;AACxB,wBAAoC;AAEpC,MAAa,aAAa;IAOxB,
|
|
1
|
+
{"version":3,"file":"router-handler.js","sourceRoot":"","sources":["../../../src/common/router-handler.ts"],"names":[],"mappings":"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"}
|
package/build/cjs/router.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { RequestListener } from "http";
|
|
3
|
+
import { Logger } from "./common/logger";
|
|
3
4
|
import { Context, ErrorHandler, Handler, Method } from "./common/context";
|
|
4
5
|
import { HandlerWithOptions, MinimalRouter, RouterHandlerOptions, RouterJSONDoc, RouterOptions } from "./common/router-types";
|
|
5
6
|
import { PathPart, PathPartToken } from "./common/tokenize-match";
|
|
@@ -10,14 +11,16 @@ export declare class Router implements MinimalRouter {
|
|
|
10
11
|
protected readonly errorHandlers: ErrorHandler[];
|
|
11
12
|
readonly listener: RequestListener;
|
|
12
13
|
constructor(config?: RouterOptions | undefined);
|
|
13
|
-
get(path: string, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
|
|
14
|
-
post(path: string, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
|
|
15
|
-
patch(path: string, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
|
|
16
|
-
delete(path: string, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
|
|
17
|
-
put(path: string, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
|
|
18
|
-
options(path: string, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
|
|
14
|
+
get(path: string | undefined, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
|
|
15
|
+
post(path: string | undefined, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
|
|
16
|
+
patch(path: string | undefined, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
|
|
17
|
+
delete(path: string | undefined, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
|
|
18
|
+
put(path: string | undefined, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
|
|
19
|
+
options(path: string | undefined, handler: Array<Handler> | Handler | MinimalRouter | HandlerWithOptions, options?: RouterHandlerOptions): Router;
|
|
19
20
|
use(handler: Array<Handler> | HandlerWithOptions | Handler | MinimalRouter, path?: string, method?: Method, options?: RouterHandlerOptions): Router;
|
|
20
21
|
catch(errorHandler: Array<ErrorHandler> | ErrorHandler): Router;
|
|
21
22
|
run(ctx: Context, pathTokens?: PathPart[], prePathTokens?: PathPartToken[]): Promise<boolean>;
|
|
22
23
|
getJSONDoc(doc?: RouterJSONDoc, prePath?: string): RouterJSONDoc;
|
|
24
|
+
logPaths(logger: Logger): void;
|
|
25
|
+
toString(): string;
|
|
23
26
|
}
|
package/build/cjs/router.js
CHANGED
|
@@ -94,6 +94,27 @@ class Router {
|
|
|
94
94
|
}
|
|
95
95
|
return doc;
|
|
96
96
|
}
|
|
97
|
+
logPaths(logger) {
|
|
98
|
+
this.toString().split("\n").forEach(l => logger.info(l));
|
|
99
|
+
}
|
|
100
|
+
toString() {
|
|
101
|
+
let ret = "";
|
|
102
|
+
const doc = this.getJSONDoc();
|
|
103
|
+
const paths = Object.keys(doc);
|
|
104
|
+
for (const path of paths) {
|
|
105
|
+
if (path) {
|
|
106
|
+
const pathData = doc[path];
|
|
107
|
+
const methods = Object.keys(pathData);
|
|
108
|
+
for (const method of methods) {
|
|
109
|
+
if (method) {
|
|
110
|
+
const methodData = pathData[method];
|
|
111
|
+
ret += `${ret === "" ? "" : "\n"}${method}:${path}\n\t${methodData.identifier}${methodData.name ? `\n\t\t${methodData.name}` : ""}${methodData.description ? `\n\t\t${methodData.description}` : ""}`;
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
return ret;
|
|
117
|
+
}
|
|
97
118
|
}
|
|
98
119
|
exports.Router = Router;
|
|
99
120
|
//# sourceMappingURL=router.js.map
|
package/build/cjs/router.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/router.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/router.ts"],"names":[],"mappings":"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"}
|
package/build/esm/api-router.js
CHANGED
|
@@ -2,7 +2,6 @@ import { existsSync, lstatSync } from "fs";
|
|
|
2
2
|
import { basename } from "path";
|
|
3
3
|
import { traverseAPIRouteDir } from "./common/api-router-utils";
|
|
4
4
|
import { parse } from "@miqro/parser";
|
|
5
|
-
import { FeatureRouter } from "./feature-router";
|
|
6
5
|
import { APIRouterParseOptions } from "./common/api-router-types";
|
|
7
6
|
/**
|
|
8
7
|
* # APIRouter
|
|
@@ -43,7 +42,7 @@ export async function APIRouter(options, logger) {
|
|
|
43
42
|
throw new Error(`${dirname} not a directory!`);
|
|
44
43
|
}
|
|
45
44
|
const apiName = options.apiName !== undefined ? options.apiName : basename(dirname);
|
|
46
|
-
const apiPath = options.path !== undefined ? options.path :
|
|
47
|
-
return
|
|
45
|
+
const apiPath = options.path !== undefined ? options.path : "";
|
|
46
|
+
return await traverseAPIRouteDir(apiName.toUpperCase(), dirname, apiPath, undefined, logger);
|
|
48
47
|
}
|
|
49
48
|
//# sourceMappingURL=api-router.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-router.js","sourceRoot":"","sources":["../../src/api-router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAEhE,OAAO,EAAE,KAAK,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"api-router.js","sourceRoot":"","sources":["../../src/api-router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAEhE,OAAO,EAAE,KAAK,EAAC,MAAM,eAAe,CAAC;AAErC,OAAO,EAAoB,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAEpF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,OAAyB,EAAE,MAAe;IACxE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,qBAAqB,EAAE,UAAU,EAAE,SAAS,CAAqB,CAAC;IACrG,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;KACrD;IACD,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;QAC7D,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,mBAAmB,CAAC,CAAC;KAChD;IACD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACpF,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/D,OAAO,MAAM,mBAAmB,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;AAC/F,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ParseOptionMap } from "@miqro/parser";
|
|
2
|
-
import { Method } from "./context";
|
|
3
|
-
import {
|
|
2
|
+
import { Handler, Method } from "./context";
|
|
3
|
+
import { MinimalRouter, RouterHandlerOptions } from "./router-types";
|
|
4
4
|
/**
|
|
5
5
|
* # APIRoute
|
|
6
6
|
*
|
|
@@ -13,9 +13,11 @@ import { HandlerWithOptions } from "./router-types";
|
|
|
13
13
|
*export default route;
|
|
14
14
|
* ```
|
|
15
15
|
*/
|
|
16
|
-
export interface APIRoute extends
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
export interface APIRoute extends RouterHandlerOptions {
|
|
17
|
+
postFolder?: boolean;
|
|
18
|
+
method?: Method | "use" | "USE";
|
|
19
|
+
path?: string;
|
|
20
|
+
handler: Handler | Array<Handler> | MinimalRouter;
|
|
19
21
|
}
|
|
20
22
|
export interface APIRouterOptions {
|
|
21
23
|
dirname: string;
|
|
@@ -23,3 +25,4 @@ export interface APIRouterOptions {
|
|
|
23
25
|
path?: string;
|
|
24
26
|
}
|
|
25
27
|
export declare const APIRouterParseOptions: ParseOptionMap;
|
|
28
|
+
export declare const APIRouteValidator: ParseOptionMap;
|
|
@@ -1,6 +1,14 @@
|
|
|
1
|
+
import { routerHandlerParseOptions } from "./router-types";
|
|
1
2
|
export const APIRouterParseOptions = {
|
|
2
3
|
dirname: "string",
|
|
3
4
|
apiName: "string?",
|
|
4
5
|
path: "string?"
|
|
5
6
|
};
|
|
7
|
+
export const APIRouteValidator = {
|
|
8
|
+
...routerHandlerParseOptions,
|
|
9
|
+
postFolder: "boolean?",
|
|
10
|
+
method: "string?",
|
|
11
|
+
path: "string?",
|
|
12
|
+
handler: "function[]!|MinimalRouter",
|
|
13
|
+
};
|
|
6
14
|
//# sourceMappingURL=api-router-types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-router-types.js","sourceRoot":"","sources":["../../../src/common/api-router-types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"api-router-types.js","sourceRoot":"","sources":["../../../src/common/api-router-types.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuC,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AA2BhG,MAAM,CAAC,MAAM,qBAAqB,GAAmB;IACnD,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,SAAS;CAChB,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAmB;IAC/C,GAAG,yBAAyB;IAC5B,UAAU,EAAE,UAAU;IACtB,MAAM,EAAE,SAAS;IACjB,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,2BAA2B;CACrC,CAAC"}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
1
|
import { Logger } from "./logger";
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
export declare const APIRouteValidator: ParseOptionMap;
|
|
5
|
-
export declare function traverseAPIRouteDir(featureName: string, dirname: string, basePath?: string, features?: FeatureRouterOptions, logger?: Logger): Promise<FeatureRouterOptions>;
|
|
2
|
+
import { Router } from "../router";
|
|
3
|
+
export declare function traverseAPIRouteDir(featureName: string, dirname: string, basePath?: string, router?: Router, logger?: Logger): Promise<Router>;
|
|
@@ -1,24 +1,18 @@
|
|
|
1
1
|
import { lstatSync, readdirSync } from "fs";
|
|
2
2
|
import { join, parse as pathParse, resolve } from "path";
|
|
3
|
-
import {
|
|
3
|
+
import { APIRouteValidator } from "./api-router-types.js";
|
|
4
4
|
import { parse } from "@miqro/parser";
|
|
5
5
|
import { normalizePath } from "./url-utils";
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
path: "string?|string[]?"
|
|
10
|
-
};
|
|
11
|
-
export async function traverseAPIRouteDir(featureName, dirname, basePath = "/", features = {}, logger) {
|
|
6
|
+
import { Router } from "../router";
|
|
7
|
+
import { isMinimalRouter } from "./router-types";
|
|
8
|
+
export async function traverseAPIRouteDir(featureName, dirname, basePath = "/", router = new Router(), logger) {
|
|
12
9
|
if (logger) {
|
|
13
10
|
logger.trace("loading routes from [%s]", dirname);
|
|
14
11
|
}
|
|
15
12
|
const files = readdirSync(dirname);
|
|
16
13
|
const dirs = files.filter(f => lstatSync(join(dirname, f)).isDirectory());
|
|
17
14
|
const methods = files.filter(f => !lstatSync(join(dirname, f)).isDirectory());
|
|
18
|
-
|
|
19
|
-
const { name } = pathParse(f);
|
|
20
|
-
features = await traverseAPIRouteDir(`${featureName}_${name}`.toUpperCase(), join(dirname, f), `${basePath}/${name}`, features, logger);
|
|
21
|
-
}
|
|
15
|
+
const postFolder = [];
|
|
22
16
|
for (const f of methods) {
|
|
23
17
|
const { name, ext } = pathParse(f);
|
|
24
18
|
if (name !== "index" && ((ext === ".ts" || ext === ".js") && name.slice(-2) !== ".d")) {
|
|
@@ -34,23 +28,26 @@ export async function traverseAPIRouteDir(featureName, dirname, basePath = "/",
|
|
|
34
28
|
}
|
|
35
29
|
//const ___filePath = filePath + ext;
|
|
36
30
|
const ___filePath = filePath;
|
|
37
|
-
let routeMethods = [name];
|
|
31
|
+
//let routeMethods: Method[] = [name] as Method[];
|
|
32
|
+
let routeMethod = name;
|
|
38
33
|
if (typeof route === "function") {
|
|
39
34
|
route = {
|
|
40
35
|
handler: route
|
|
41
36
|
};
|
|
42
37
|
}
|
|
43
38
|
else {
|
|
44
|
-
if (typeof route.method !== "undefined" && (
|
|
45
|
-
throw new Error(`${resolve(dirname, name)} doesnt export method as a string or string array`);
|
|
39
|
+
if (typeof route.method !== "undefined" && ( /*!(route.method instanceof Array) &&*/(typeof route.method !== "string"))) {
|
|
40
|
+
//throw new Error(`${resolve(dirname, name)} doesnt export method as a string or string array`);
|
|
41
|
+
throw new Error(`${resolve(dirname, name)} doesnt export method as a string`);
|
|
46
42
|
}
|
|
47
43
|
else if (typeof route.method !== "undefined") {
|
|
48
|
-
|
|
44
|
+
routeMethod = route.method; //route.method instanceof Array ? route.method : [route.method];
|
|
49
45
|
}
|
|
50
|
-
if (typeof route.path !== "string" && typeof route.path !== "undefined" && !(route.path instanceof Array)) {
|
|
51
|
-
throw new Error(`${resolve(dirname, name)} doesnt export path as a string or a string array`);
|
|
46
|
+
if (typeof route.path !== "string" && typeof route.path !== "undefined" /* && !(route.path instanceof Array)*/) {
|
|
47
|
+
//throw new Error(`${resolve(dirname, name)} doesnt export path as a string or a string array`);
|
|
48
|
+
throw new Error(`${resolve(dirname, name)} doesnt export path as a string`);
|
|
52
49
|
}
|
|
53
|
-
if ((!(route.handler instanceof Array) && typeof route.handler !== "function") || typeof route.handler === "undefined") {
|
|
50
|
+
if ((!(route.handler instanceof Array) && typeof route.handler !== "function" && !isMinimalRouter(route.handler)) || typeof route.handler === "undefined") {
|
|
54
51
|
throw new Error(`${resolve(dirname, name)} doesnt export handler as a function or an array`);
|
|
55
52
|
}
|
|
56
53
|
if (typeof route.name !== "string" && typeof route.name !== "undefined") {
|
|
@@ -58,48 +55,57 @@ export async function traverseAPIRouteDir(featureName, dirname, basePath = "/",
|
|
|
58
55
|
}
|
|
59
56
|
}
|
|
60
57
|
route = parse(route, APIRouteValidator, "no_extra", ___filePath);
|
|
61
|
-
const paths = route.path instanceof Array ? route.path : route.path === undefined ? [route.method && route.method.indexOf(name) === -1 ? `/${name}` : "/"] : [route.path];
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
58
|
+
//const paths = route.path instanceof Array ? route.path : route.path === undefined ? [route.method && route.method.indexOf(name as Method) === -1 ? `/${name}` : "/"] : [route.path];
|
|
59
|
+
const p = route.path === undefined ? route.method && route.method.indexOf(name) === -1 ? `/${name}` : "/" : route.path;
|
|
60
|
+
//for (let i = 0; i < paths.length; i++) {
|
|
61
|
+
//const p = paths[i];
|
|
62
|
+
if (typeof p !== "string" || !p) {
|
|
63
|
+
throw new Error(`${resolve(dirname, name)} doesnt export path as a string or a string array`);
|
|
64
|
+
}
|
|
65
|
+
const path = normalizePath(`${basePath}${p && p !== "/" ? `${p}` : p}`);
|
|
66
|
+
const subName = (p.charAt(0) === "/" ? p.substring(1) : p).replace(/[^a-z0-9+]+/gi, '_');
|
|
67
|
+
const routeName = route.name ? route.name : name;
|
|
68
|
+
//const identifier = route.identifier ? route.identifier : getPathIdentifier(path, routeMethod);
|
|
69
|
+
/*let newFeatureSubPath = `${featureName}_${route.name ? route.name : name}${routeName !== subName ? `_${subName}` : ""}`.toUpperCase();
|
|
70
|
+
|
|
71
|
+
newFeatureSubPath = newFeatureSubPath.length > 1 && newFeatureSubPath.charAt(newFeatureSubPath.length - 1) === "_" ? newFeatureSubPath.substring(0, newFeatureSubPath.length - 1) : newFeatureSubPath;*/
|
|
72
|
+
/*if (features[identifier]) {
|
|
73
|
+
throw new Error(`${___filePath} feature name collides with ${(features[identifier] as any).___filePath}`)
|
|
74
|
+
}*/
|
|
75
|
+
if (route.identifier && route.identifier === "__prototype__" || route.identifier === "__proto__") {
|
|
76
|
+
throw new Error(`invalid feature name ${route.identifier}`);
|
|
77
|
+
}
|
|
78
|
+
const useCallArgs = [route.handler, path, routeMethod !== "use" && routeMethod !== "USE" ? routeMethod : undefined, {
|
|
79
|
+
identifier: route.identifier,
|
|
80
|
+
apiName: route.apiName,
|
|
81
|
+
name: route.name,
|
|
82
|
+
description: route.description,
|
|
83
|
+
parser: route.parser,
|
|
84
|
+
middleware: route.middleware,
|
|
85
|
+
session: route.session,
|
|
86
|
+
policy: route.policy,
|
|
87
|
+
request: route.request,
|
|
88
|
+
response: {
|
|
89
|
+
body: route.response && route.response.body !== undefined ? route.response.body : !isMinimalRouter(route.handler),
|
|
90
|
+
middleware: route.response && route.response.middleware !== undefined ? route.response.middleware : undefined
|
|
91
|
+
}
|
|
92
|
+
}];
|
|
93
|
+
if (route.postFolder) {
|
|
94
|
+
postFolder.push(useCallArgs);
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
router.use(...useCallArgs);
|
|
99
98
|
}
|
|
100
99
|
}
|
|
101
100
|
}
|
|
102
|
-
|
|
101
|
+
for (const f of dirs) {
|
|
102
|
+
const { name } = pathParse(f);
|
|
103
|
+
router = await traverseAPIRouteDir(`${featureName}_${name}`.toUpperCase(), join(dirname, f), `${basePath}/${name}`, router, logger);
|
|
104
|
+
}
|
|
105
|
+
for (const post of postFolder) {
|
|
106
|
+
router.use(...post);
|
|
107
|
+
}
|
|
108
|
+
return router;
|
|
103
109
|
}
|
|
104
110
|
;
|
|
105
111
|
//# sourceMappingURL=api-router-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-router-utils.js","sourceRoot":"","sources":["../../../src/common/api-router-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,KAAK,IAAI,SAAS,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAGzD,OAAO,
|
|
1
|
+
{"version":3,"file":"api-router-utils.js","sourceRoot":"","sources":["../../../src/common/api-router-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,5 +7,5 @@ export * from "./error";
|
|
|
7
7
|
export * from "./config";
|
|
8
8
|
export * from "./logger";
|
|
9
9
|
export { normalizePath, newURL } from "./url-utils";
|
|
10
|
-
export { traverseAPIRouteDir
|
|
10
|
+
export { traverseAPIRouteDir } from "./api-router-utils";
|
|
11
11
|
export { OldResponseHandler, ResponseHandler } from "./router-utils";
|
|
@@ -7,6 +7,6 @@ export * from "./error";
|
|
|
7
7
|
export * from "./config";
|
|
8
8
|
export * from "./logger";
|
|
9
9
|
export { normalizePath, newURL } from "./url-utils";
|
|
10
|
-
export { traverseAPIRouteDir
|
|
10
|
+
export { traverseAPIRouteDir } from "./api-router-utils";
|
|
11
11
|
export { OldResponseHandler, ResponseHandler } from "./router-utils";
|
|
12
12
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,iCAAiC,CAAC;AAChD,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,iCAAiC,CAAC;AAChD,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC"}
|
|
@@ -2,6 +2,7 @@ import { LoggerFormatter, LoggerTransport } from "./interfaces.js";
|
|
|
2
2
|
export declare const DEFAULT_LOGGER_TRANSPORTS: () => LoggerTransport[];
|
|
3
3
|
export declare const DEFAULT_LOGGER_FORMATTER: LoggerFormatter;
|
|
4
4
|
export declare const LOG_LEVEL_MAP: {
|
|
5
|
+
none: number;
|
|
5
6
|
error: number;
|
|
6
7
|
warn: number;
|
|
7
8
|
info: number;
|
|
@@ -9,6 +9,7 @@ export const DEFAULT_LOGGER_FORMATTER = ({ identifier, level, message }) => `${n
|
|
|
9
9
|
`${level !== "info" ? (level === "error" || level === "warn" ? `[${level.toUpperCase()}] ` : `[${level}] `) : ""}` +
|
|
10
10
|
`${message}`;
|
|
11
11
|
export const LOG_LEVEL_MAP = {
|
|
12
|
+
"none": 0,
|
|
12
13
|
"error": 1,
|
|
13
14
|
"warn": 2,
|
|
14
15
|
"info": 3,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/common/logger/constants.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAC;AAExD,MAAM,CAAC,MAAM,yBAAyB,GAA4B,GAAG,EAAE,CAAC;IACtE,gBAAgB,EAAE;IAClB,aAAa,EAAE;CAChB,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GACnC,CAAC,EAAC,UAAU,EAAE,KAAK,EAAE,OAAO,EAAC,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,IAAI,OAAO,CAAC,GAAG,GAAG;IAC7E,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;IACzC,GAAG,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;IAClH,GAAG,OAAO,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,aAAa,GACxB;IACE,OAAO,EAAE,CAAC;IACV,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,OAAO,EAAE,CAAC;CACX,CAAC;AAEJ,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,KAAK,EAAE,OAAO;CACf,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/common/logger/constants.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAC;AAExD,MAAM,CAAC,MAAM,yBAAyB,GAA4B,GAAG,EAAE,CAAC;IACtE,gBAAgB,EAAE;IAClB,aAAa,EAAE;CAChB,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GACnC,CAAC,EAAC,UAAU,EAAE,KAAK,EAAE,OAAO,EAAC,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,IAAI,OAAO,CAAC,GAAG,GAAG;IAC7E,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;IACzC,GAAG,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;IAClH,GAAG,OAAO,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,aAAa,GACxB;IACE,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,OAAO,EAAE,CAAC;CACX,CAAC;AAEJ,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,KAAK,EAAE,OAAO;CACf,CAAC"}
|
|
@@ -11,7 +11,7 @@ export class Logger extends EventTarget {
|
|
|
11
11
|
super();
|
|
12
12
|
this.identifier = identifier;
|
|
13
13
|
this.level = level;
|
|
14
|
-
if (
|
|
14
|
+
if (LOG_LEVEL_MAP[level] === undefined) {
|
|
15
15
|
throw new Error(`Unknown level [${level}]`);
|
|
16
16
|
}
|
|
17
17
|
this.addEventListener(LoggerEvents.error, (ev) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../src/common/logger/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,MAAM,CAAC;AAE5B,OAAO,EAAC,YAAY,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAUhH,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IAGzC,YAAY,KAAa,EAAE,IAA0B;QACnD,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACnB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;IAC1B,CAAC;CACF;AAoBD,MAAM,OAAO,MAAO,SAAQ,WAAW;IAIrC,YAA+B,UAAkB,EAAY,QAAkB,MAAM,EAAE,OAA0E;QAC/J,KAAK,EAAE,CAAC;QADqB,eAAU,GAAV,UAAU,CAAQ;QAAY,UAAK,GAAL,KAAK,CAAmB;QAEnF,IAAI,
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../src/common/logger/logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,8 @@ export function ConsoleTransport(color = true, level) {
|
|
|
16
16
|
case "debug":
|
|
17
17
|
console.log("\x1b[36m%s\x1b[0m", out);
|
|
18
18
|
break;
|
|
19
|
+
case "none":
|
|
20
|
+
break;
|
|
19
21
|
default:
|
|
20
22
|
console[level](out);
|
|
21
23
|
break;
|
|
@@ -25,7 +27,7 @@ export function ConsoleTransport(color = true, level) {
|
|
|
25
27
|
if (level === "trace" || level === "debug") {
|
|
26
28
|
console.log(out);
|
|
27
29
|
}
|
|
28
|
-
else {
|
|
30
|
+
else if (level !== "none") {
|
|
29
31
|
console[level](out);
|
|
30
32
|
}
|
|
31
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../../../../src/common/logger/transport/console.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,gBAAgB,CAAC,QAAiB,IAAI,EAAE,KAAgB;IACtE,OAAO;QACL,KAAK;QACL,KAAK,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../../../../src/common/logger/transport/console.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,gBAAgB,CAAC,QAAiB,IAAI,EAAE,KAAgB;IACtE,OAAO;QACL,KAAK;QACL,KAAK,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,GAAG,EAA4B,EAAiB,EAAE;YACvE,IAAI,KAAK,EAAE;gBACT,QAAQ,KAAK,EAAE;oBACb,KAAK,MAAM;wBACT,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;wBACvC,MAAM;oBACR,KAAK,OAAO;wBACV,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;wBACxC,MAAM;oBACR,KAAK,OAAO;wBACV,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;wBACtC,MAAM;oBACR,KAAK,OAAO;wBACV,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;wBACtC,MAAM;oBACR,KAAK,MAAM;wBACT,MAAM;oBACR;wBACE,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC;wBACpB,MAAM;iBACT;aACF;iBAAM;gBACL,IAAI,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,OAAO,EAAE;oBAC1C,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;iBAClB;qBAAM,IAAI,KAAK,KAAK,MAAM,EAAE;oBAC3B,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC;iBACrB;aACF;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -29,4 +29,9 @@ export const defaultLoggerFactory = (uuid, req) => {
|
|
|
29
29
|
}
|
|
30
30
|
return logger;
|
|
31
31
|
};
|
|
32
|
+
export function getPathIdentifier(path, method) {
|
|
33
|
+
const pathToEnv = path.replace(/[^a-z0-9+]+/gi, '_').toUpperCase();
|
|
34
|
+
const identifier = `${pathToEnv === "_" ? "" : pathToEnv.substring(1)}${method.toUpperCase()}`;
|
|
35
|
+
return identifier;
|
|
36
|
+
}
|
|
32
37
|
//# sourceMappingURL=router-default-logger-factory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router-default-logger-factory.js","sourceRoot":"","sources":["../../../src/common/router-default-logger-factory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,wBAAwB,EAAE,SAAS,EAAU,MAAM,UAAU,CAAC;AAEvE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,IAAY,EAAE,GAAoB,EAAU,EAAE;IACjF,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,IAAI,eAAe,CAAC;IACpB,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,aAAa,GAAuB,EAAE,CAAC;IAC3C,IAAI;QACF,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAQ,CAAC;QACnD,KAAK,GAAG,GAAG,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;QACpC,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,kBAAkB;QACtD,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAY,CAAC,CAAC,CAAC,KAAK,CAAC;QACjE,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC;KAC1C;IAAC,OAAO,CAAC,EAAE;QACV,eAAe,GAAG,CAAC,CAAC;KACrB;IACD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;IAC1D,MAAM,UAAU,GAAG,GAAG,SAAS,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;IAE/F,MAAM,MAAM,GAAG,SAAS,CAAC,UAAU,EAAE;QACnC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;YAClB,IAAI,CAAC,OAAO,GAAG,GAAG,MAAM,IAAI,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,aAAa,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACtJ,OAAO,wBAAwB,CAAC,IAAI,CAAC,CAAC;QACxC,CAAC;KACF,EAAE,KAAK,CAAC,CAAC;IAEV,IAAI,eAAe,EAAE;QACnB,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;KAC/B;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"router-default-logger-factory.js","sourceRoot":"","sources":["../../../src/common/router-default-logger-factory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,wBAAwB,EAAE,SAAS,EAAU,MAAM,UAAU,CAAC;AAEvE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,IAAY,EAAE,GAAoB,EAAU,EAAE;IACjF,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,IAAI,eAAe,CAAC;IACpB,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,aAAa,GAAuB,EAAE,CAAC;IAC3C,IAAI;QACF,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAQ,CAAC;QACnD,KAAK,GAAG,GAAG,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;QACpC,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,kBAAkB;QACtD,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAY,CAAC,CAAC,CAAC,KAAK,CAAC;QACjE,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC;KAC1C;IAAC,OAAO,CAAC,EAAE;QACV,eAAe,GAAG,CAAC,CAAC;KACrB;IACD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;IAC1D,MAAM,UAAU,GAAG,GAAG,SAAS,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;IAE/F,MAAM,MAAM,GAAG,SAAS,CAAC,UAAU,EAAE;QACnC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;YAClB,IAAI,CAAC,OAAO,GAAG,GAAG,MAAM,IAAI,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,aAAa,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACtJ,OAAO,wBAAwB,CAAC,IAAI,CAAC,CAAC;QACxC,CAAC;KACF,EAAE,KAAK,CAAC,CAAC;IAEV,IAAI,eAAe,EAAE;QACnB,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;KAC/B;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAA;AAED,MAAM,UAAU,iBAAiB,CAAC,IAAY,EAAE,MAAc;IAC5D,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;IACnE,MAAM,UAAU,GAAG,GAAG,SAAS,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;IAC/F,OAAO,UAAU,CAAC;AACpB,CAAC"}
|
|
@@ -3,13 +3,14 @@ import { Context, Handler, Method } from "./context";
|
|
|
3
3
|
import { MinimalRouter } from "./router-types";
|
|
4
4
|
import { HandlerWithOptions, RouterHandlerOptions, RouterJSONDoc } from "./router-types";
|
|
5
5
|
export declare class RouterHandler {
|
|
6
|
+
private readonly originalHandler;
|
|
6
7
|
private readonly path;
|
|
7
8
|
private readonly method;
|
|
8
9
|
private readonly tokens;
|
|
9
10
|
private readonly handler;
|
|
10
11
|
private readonly isRouter;
|
|
11
12
|
private readonly options?;
|
|
12
|
-
constructor(
|
|
13
|
+
constructor(originalHandler: Array<Handler> | HandlerWithOptions | Handler | MinimalRouter, path: string | undefined, method: Method | undefined, options?: RouterHandlerOptions);
|
|
13
14
|
getJSONDoc(doc?: RouterJSONDoc, prePath?: string): RouterJSONDoc;
|
|
14
15
|
invoke(ctx: Context, pathTokens: PathPart[], prePathTokens: PathPartToken[]): Promise<boolean>;
|
|
15
16
|
isMatch(method: string, requestParts: PathPart[], prePathTokens: PathPartToken[]): {
|