@glass-cannon/router 0.0.3 → 0.0.4
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 +4 -2
- package/dist/index.js +26 -10
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
package/dist/index.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { Handler, Request, Response } from '@glass-cannon/server';
|
|
2
2
|
import { type Middleware } from './middleware/index.js';
|
|
3
|
+
type StringWithSuggestions<T> = T | (string & {});
|
|
3
4
|
export type RouteHandler<Context> = (request: RouteContext & Context) => Promise<Response> | Response;
|
|
4
5
|
export type RouteContext = Request & {
|
|
5
6
|
params: Record<string, string>;
|
|
@@ -19,7 +20,7 @@ export interface RouterOptions<Context = unknown> {
|
|
|
19
20
|
middleware?: Middleware<Context>;
|
|
20
21
|
}
|
|
21
22
|
export interface RouteOptions<Context> {
|
|
22
|
-
method?:
|
|
23
|
+
method?: StringWithSuggestions<'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'OPTIONS'>;
|
|
23
24
|
path: string;
|
|
24
25
|
handler: RouteHandler<Context>;
|
|
25
26
|
}
|
|
@@ -31,16 +32,17 @@ export declare class Router<Context = unknown> implements RouterGroup<Context> {
|
|
|
31
32
|
private readonly fallback;
|
|
32
33
|
private readonly middleware;
|
|
33
34
|
private routes;
|
|
34
|
-
private regex;
|
|
35
35
|
constructor(options?: RouterOptions<Context>);
|
|
36
36
|
matchingRoute(request: Pick<Request, 'method' | 'path'>): Route<Context> | undefined;
|
|
37
37
|
handle: Handler;
|
|
38
38
|
route(route: RouteOptions<Context>): void;
|
|
39
39
|
group<NewContext>(options: GroupOptions<NewContext>): RouterGroup<Context & NewContext>;
|
|
40
40
|
private matchingRouteWithMetadata;
|
|
41
|
+
private matchingGeneralRouteWithMetadata;
|
|
41
42
|
private computeMetadata;
|
|
42
43
|
private computeScore;
|
|
43
44
|
private pathToRegex;
|
|
44
45
|
private pathToCapturingRegex;
|
|
45
46
|
private compileRegex;
|
|
46
47
|
}
|
|
48
|
+
export {};
|
package/dist/index.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { pipe } from './middleware/index.js';
|
|
2
|
+
const ALL_METHODS = '*';
|
|
2
3
|
export class Router {
|
|
3
4
|
fallback;
|
|
4
5
|
middleware;
|
|
5
|
-
|
|
6
|
-
|
|
6
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
|
7
|
+
routes = Object.create(null);
|
|
7
8
|
constructor(options) {
|
|
8
9
|
this.fallback = options?.fallback ?? (() => ({ status: 404 }));
|
|
9
10
|
this.middleware = options?.middleware ?? ((x) => x);
|
|
@@ -22,7 +23,10 @@ export class Router {
|
|
|
22
23
|
};
|
|
23
24
|
route(route) {
|
|
24
25
|
const metadata = this.computeMetadata(route);
|
|
25
|
-
|
|
26
|
+
const method = route.method ?? ALL_METHODS;
|
|
27
|
+
this.routes[method] ??= [[], undefined];
|
|
28
|
+
binaryInsert(this.routes[method][0], metadata, (route) => route.score);
|
|
29
|
+
this.routes[method][1] = undefined;
|
|
26
30
|
}
|
|
27
31
|
group(options) {
|
|
28
32
|
return {
|
|
@@ -41,12 +45,26 @@ export class Router {
|
|
|
41
45
|
};
|
|
42
46
|
}
|
|
43
47
|
matchingRouteWithMetadata(request) {
|
|
44
|
-
|
|
45
|
-
|
|
48
|
+
const routes = this.routes[request.method];
|
|
49
|
+
if (!routes)
|
|
50
|
+
return this.matchingGeneralRouteWithMetadata(request);
|
|
51
|
+
routes[1] ??= this.compileRegex(request.method);
|
|
52
|
+
const match = routes[1].exec(request.path);
|
|
53
|
+
if (!match)
|
|
54
|
+
return this.matchingGeneralRouteWithMetadata(request);
|
|
55
|
+
const matchIndex = match.findLastIndex(Boolean) - 1;
|
|
56
|
+
return routes[0][matchIndex];
|
|
57
|
+
}
|
|
58
|
+
matchingGeneralRouteWithMetadata(request) {
|
|
59
|
+
const routes = this.routes[ALL_METHODS];
|
|
60
|
+
if (!routes)
|
|
61
|
+
return;
|
|
62
|
+
routes[1] ??= this.compileRegex(request.method);
|
|
63
|
+
const match = routes[1].exec(request.path);
|
|
46
64
|
if (!match)
|
|
47
65
|
return;
|
|
48
66
|
const matchIndex = match.findLastIndex(Boolean) - 1;
|
|
49
|
-
return
|
|
67
|
+
return routes[0][matchIndex];
|
|
50
68
|
}
|
|
51
69
|
computeMetadata(route) {
|
|
52
70
|
const score = this.computeScore(route.path);
|
|
@@ -84,10 +102,8 @@ export class Router {
|
|
|
84
102
|
.replace(/\\:([a-zA-Z0-9_]+)/g, '(?<$1>[^/]+)') +
|
|
85
103
|
'$');
|
|
86
104
|
}
|
|
87
|
-
compileRegex() {
|
|
88
|
-
|
|
89
|
-
return new RegExp('$^');
|
|
90
|
-
const regex = this.routes.map((route) => route.regex).join('|');
|
|
105
|
+
compileRegex(method) {
|
|
106
|
+
const regex = this.routes[method][0].map((route) => route.regex).join('|');
|
|
91
107
|
return new RegExp(regex);
|
|
92
108
|
}
|
|
93
109
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAmB,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|