@glass-cannon/router 0.10.1 → 0.10.3
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/index.d.ts +6 -6
- package/dist/index.js +15 -10
- package/dist/index.js.map +1 -1
- package/package.json +2 -2
package/dist/index.d.ts
CHANGED
|
@@ -4,15 +4,15 @@ type StringWithSuggestions<T> = T | (string & {});
|
|
|
4
4
|
export type RouteHandler<Context = unknown> = (request: RouteContext<Context>) => Promise<Response> | Response;
|
|
5
5
|
export type RouteContext<Context = unknown> = Request & {
|
|
6
6
|
params: Record<string, string>;
|
|
7
|
-
route: Route
|
|
7
|
+
route: Route;
|
|
8
8
|
} & Context;
|
|
9
|
-
export interface Route
|
|
9
|
+
export interface Route {
|
|
10
10
|
method?: string;
|
|
11
11
|
path: string;
|
|
12
|
-
handler: RouteHandler
|
|
12
|
+
handler: RouteHandler;
|
|
13
13
|
}
|
|
14
14
|
export interface RouterGroup<Context = unknown> {
|
|
15
|
-
route<NewContext>(options: RouteOptions<Context, NewContext>):
|
|
15
|
+
route<NewContext>(options: RouteOptions<Context, NewContext>): Route;
|
|
16
16
|
group<NewContext>(options: GroupOptions<NewContext>): RouterGroup<Context & NewContext>;
|
|
17
17
|
}
|
|
18
18
|
export interface RouterOptions<Context = unknown> {
|
|
@@ -34,9 +34,9 @@ export declare class Router<Context = unknown> implements RouterGroup<Context> {
|
|
|
34
34
|
private readonly middleware;
|
|
35
35
|
private routes;
|
|
36
36
|
constructor(options?: RouterOptions<Context>);
|
|
37
|
-
matchingRoute(method: string, path: string): Route
|
|
37
|
+
matchingRoute(method: string, path: string): Route | undefined;
|
|
38
38
|
handle: Handler;
|
|
39
|
-
route<NewContext>(route: RouteOptions<Context, NewContext>):
|
|
39
|
+
route<NewContext>(route: RouteOptions<Context, NewContext>): Route;
|
|
40
40
|
group<NewContext>(options: GroupOptions<NewContext>): RouterGroup<Context & NewContext>;
|
|
41
41
|
private matchingRouteWithMetadata;
|
|
42
42
|
private matchingGeneralRouteWithMetadata;
|
package/dist/index.js
CHANGED
|
@@ -20,39 +20,44 @@ export class Router {
|
|
|
20
20
|
const { route, capturingRegex } = routeWithMetadata;
|
|
21
21
|
const params = { ...capturingRegex.exec(path).groups };
|
|
22
22
|
const context = { ...request, params, route };
|
|
23
|
-
return await
|
|
23
|
+
return await route.handler(context);
|
|
24
24
|
};
|
|
25
25
|
route(route) {
|
|
26
26
|
const handler = route.middleware
|
|
27
|
-
? applyMiddleware(route.middleware, route.handler)
|
|
28
|
-
: route.handler;
|
|
29
|
-
const
|
|
27
|
+
? applyMiddleware(this.middleware, applyMiddleware(route.middleware, route.handler))
|
|
28
|
+
: applyMiddleware(this.middleware, route.handler);
|
|
29
|
+
const path = route.path.endsWith('/') ? route.path.slice(0, -1) : route.path;
|
|
30
|
+
const metadata = this.computeMetadata({ method: route.method, path, handler });
|
|
30
31
|
const method = route.method?.toUpperCase() ?? ALL_METHODS;
|
|
31
32
|
this.routes[method] ??= [[], undefined];
|
|
32
33
|
binaryInsert(this.routes[method][0], metadata, (route) => route.score);
|
|
33
34
|
this.routes[method][1] = undefined;
|
|
35
|
+
return metadata.route;
|
|
34
36
|
}
|
|
35
37
|
group(options) {
|
|
38
|
+
const prefix = options.prefix?.endsWith('/')
|
|
39
|
+
? options.prefix.slice(0, -1)
|
|
40
|
+
: (options.prefix ?? '');
|
|
36
41
|
return {
|
|
37
42
|
route: (route) => {
|
|
38
|
-
const path =
|
|
43
|
+
const path = `${prefix}${route.path}`;
|
|
39
44
|
const middlewares = [];
|
|
40
45
|
if (options.middleware)
|
|
41
46
|
middlewares.push(options.middleware);
|
|
42
47
|
if (route.middleware)
|
|
43
48
|
middlewares.push(route.middleware);
|
|
44
49
|
const middleware = pipe(...middlewares);
|
|
45
|
-
this.route({ ...route, path, middleware });
|
|
50
|
+
return this.route({ ...route, path, middleware });
|
|
46
51
|
},
|
|
47
52
|
group: (group) => {
|
|
48
|
-
const
|
|
53
|
+
const newPrefix = `${prefix}${group.prefix}`;
|
|
49
54
|
const middlewares = [];
|
|
50
55
|
if (options.middleware)
|
|
51
56
|
middlewares.push(options.middleware);
|
|
52
57
|
if (group.middleware)
|
|
53
58
|
middlewares.push(group.middleware);
|
|
54
59
|
const middleware = pipe(...middlewares);
|
|
55
|
-
return this.group({ prefix, middleware });
|
|
60
|
+
return this.group({ prefix: newPrefix, middleware });
|
|
56
61
|
},
|
|
57
62
|
};
|
|
58
63
|
}
|
|
@@ -106,7 +111,7 @@ export class Router {
|
|
|
106
111
|
.replace(/\\:([a-zA-Z0-9_]+)\*/g, '(?:.*)')
|
|
107
112
|
.replace(/\\\*/g, '(?:.*)')
|
|
108
113
|
.replace(/\\:([a-zA-Z0-9_]+)/g, '(?:[^/]+)') +
|
|
109
|
-
')$');
|
|
114
|
+
'/?)$');
|
|
110
115
|
}
|
|
111
116
|
pathToCapturingRegex(path) {
|
|
112
117
|
return ('^' +
|
|
@@ -115,7 +120,7 @@ export class Router {
|
|
|
115
120
|
.replace(/\\:([a-zA-Z0-9_]+)\*/g, '(?<$1>.*)')
|
|
116
121
|
.replace(/\\\*/g, '(?:.*)')
|
|
117
122
|
.replace(/\\:([a-zA-Z0-9_]+)/g, '(?<$1>[^/]+)') +
|
|
118
|
-
'
|
|
123
|
+
'/?$');
|
|
119
124
|
}
|
|
120
125
|
compileRegex(method) {
|
|
121
126
|
const regex = this.routes[method][0].map((route) => route.regex).join('|');
|
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":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@glass-cannon/router",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.10.
|
|
4
|
+
"version": "0.10.3",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": {
|
|
7
7
|
"import": "./dist/index.js",
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
"dist"
|
|
17
17
|
],
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@glass-cannon/server": "0.10.
|
|
19
|
+
"@glass-cannon/server": "0.10.3"
|
|
20
20
|
},
|
|
21
21
|
"devDependencies": {
|
|
22
22
|
"@types/bun": "latest"
|