@glass-cannon/router 0.11.0 → 0.12.1
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/nodeBuilder.d.ts +12 -7
- package/dist/nodeBuilder.js +101 -14
- package/dist/nodeBuilder.js.map +1 -1
- package/dist/plugin.d.ts +1 -1
- package/dist/router.d.ts +1 -1
- package/dist/router.js.map +1 -1
- package/package.json +2 -2
package/dist/nodeBuilder.d.ts
CHANGED
|
@@ -11,15 +11,20 @@ export interface GroupOptions<Provides = unknown, MiddlewareRequires = unknown>
|
|
|
11
11
|
prefix?: string;
|
|
12
12
|
middleware?: Middleware<Provides, MiddlewareRequires>;
|
|
13
13
|
}
|
|
14
|
-
export declare class NodeBuilder<Requires = unknown> {
|
|
15
|
-
private
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
14
|
+
export declare class NodeBuilder<Requires = unknown, Provides = unknown> {
|
|
15
|
+
private readonly options?;
|
|
16
|
+
private segments;
|
|
17
|
+
constructor(options?: GroupOptions<Provides, Requires> | undefined);
|
|
18
|
+
route<HandlerRequires = unknown, RouteProvides = unknown, MiddlewareRequires = unknown>({ method, path, middleware: routeMiddleware, handler, }: RouteOptions<HandlerRequires, RouteProvides, MiddlewareRequires, Requires & Provides>): NodeBuilder<MergeRequires<Provides, Requires, MergeRequires<RouteProvides, MiddlewareRequires, HandlerRequires>>, Provides>;
|
|
19
|
+
group<GroupProvides = unknown, MiddlewareRequires = unknown, NodeRequires = unknown, NodeProvides = unknown>({ prefix, middleware: groupMiddleware }: GroupOptions<GroupProvides, MiddlewareRequires>, node: NodeBuilder<NodeRequires, NodeProvides>): NodeBuilder<MergeRequires<Provides, Requires, MergeRequires<GroupProvides, MiddlewareRequires, NodeRequires>>, Provides>;
|
|
20
|
+
use<NodeRequires = unknown, NodeProvides = unknown>(node: NodeBuilder<NodeRequires, NodeProvides>): NodeBuilder<MergeRequires<Provides, Requires, NodeRequires>, Provides>;
|
|
21
|
+
apply<PluginProvides = unknown, PluginRequires = unknown>(plugin: Plugin<PluginProvides, PluginRequires>): NodeBuilder<MergeRequires<Provides, Requires, PluginRequires>, Provides & PluginProvides>;
|
|
22
|
+
apply(plugin: Plugin | undefined | null): NodeBuilder<Requires, Provides>;
|
|
20
23
|
build(): RouteNode<Requires>;
|
|
24
|
+
private currentSegment;
|
|
25
|
+
private currentNode;
|
|
21
26
|
private getOrCreateNode;
|
|
22
27
|
private merge;
|
|
23
28
|
}
|
|
24
29
|
export declare function route<HandlerRequires = unknown, Provides = unknown, MiddlewareRequires = unknown>(options: RouteOptions<HandlerRequires, Provides, MiddlewareRequires>): NodeBuilder<MergeRequires<Provides, MiddlewareRequires, HandlerRequires>>;
|
|
25
|
-
export declare function routes<Requires = unknown>(): NodeBuilder<Requires>;
|
|
30
|
+
export declare function routes<Requires = unknown, Provides = unknown, MiddlewareRequires = unknown>(options?: GroupOptions<Provides, MiddlewareRequires>): NodeBuilder<Requires & MiddlewareRequires, Provides>;
|
package/dist/nodeBuilder.js
CHANGED
|
@@ -1,39 +1,87 @@
|
|
|
1
1
|
import { apply, pipe } from './middleware/index.js';
|
|
2
2
|
import { ALL_METHODS } from './node.js';
|
|
3
3
|
export class NodeBuilder {
|
|
4
|
-
|
|
4
|
+
options;
|
|
5
|
+
segments = [{ plugins: [], node: { children: {}, methods: {} } }];
|
|
6
|
+
constructor(options) {
|
|
7
|
+
this.options = options;
|
|
8
|
+
}
|
|
5
9
|
route({ method, path, middleware: routeMiddleware, handler, }) {
|
|
6
10
|
method ??= ALL_METHODS;
|
|
7
|
-
const target = this.getOrCreateNode(path);
|
|
11
|
+
const target = this.getOrCreateNode(this.currentNode(), path);
|
|
8
12
|
target.methods[method] = routeMiddleware
|
|
9
|
-
?
|
|
13
|
+
? wrapHandler(routeMiddleware, handler)
|
|
10
14
|
: handler;
|
|
11
15
|
return this;
|
|
12
16
|
}
|
|
13
17
|
group({ prefix, middleware: groupMiddleware }, node) {
|
|
14
|
-
const
|
|
18
|
+
const built = cloneNode(node.build());
|
|
15
19
|
if (groupMiddleware) {
|
|
16
|
-
|
|
17
|
-
? pipe(
|
|
20
|
+
built.middleware = built.middleware
|
|
21
|
+
? pipe(groupMiddleware, built.middleware)
|
|
18
22
|
: groupMiddleware;
|
|
19
23
|
}
|
|
20
|
-
|
|
24
|
+
flushMiddleware(built);
|
|
25
|
+
const target = this.getOrCreateNode(this.currentNode(), prefix);
|
|
26
|
+
this.merge(target, built);
|
|
21
27
|
return this;
|
|
22
28
|
}
|
|
23
29
|
use(node) {
|
|
24
|
-
|
|
30
|
+
const built = cloneNode(node.build());
|
|
31
|
+
flushMiddleware(built);
|
|
32
|
+
this.merge(this.currentNode(), built);
|
|
25
33
|
return this;
|
|
26
34
|
}
|
|
27
35
|
apply(plugin) {
|
|
28
|
-
|
|
36
|
+
if (plugin) {
|
|
37
|
+
const current = this.currentSegment();
|
|
38
|
+
if (isNodeEmpty(current.node)) {
|
|
39
|
+
current.plugins.push(plugin);
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
this.segments.push({
|
|
43
|
+
plugins: [plugin],
|
|
44
|
+
node: { children: {}, methods: {} },
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
}
|
|
29
48
|
return this;
|
|
30
49
|
}
|
|
31
50
|
build() {
|
|
32
|
-
|
|
51
|
+
let acc = { children: {}, methods: {} };
|
|
52
|
+
for (let i = this.segments.length - 1; i >= 0; i--) {
|
|
53
|
+
const segment = this.segments[i];
|
|
54
|
+
const current = cloneNode(segment.node);
|
|
55
|
+
flushMiddleware(acc);
|
|
56
|
+
this.merge(current, acc);
|
|
57
|
+
let transformed = current;
|
|
58
|
+
for (let j = segment.plugins.length - 1; j >= 0; j--) {
|
|
59
|
+
transformed = segment.plugins[j](transformed);
|
|
60
|
+
}
|
|
61
|
+
acc = transformed;
|
|
62
|
+
}
|
|
63
|
+
if (this.options?.middleware) {
|
|
64
|
+
acc.middleware = acc.middleware
|
|
65
|
+
? pipe(this.options.middleware, acc.middleware)
|
|
66
|
+
: this.options.middleware;
|
|
67
|
+
}
|
|
68
|
+
if (this.options?.prefix) {
|
|
69
|
+
const root = { children: {}, methods: {} };
|
|
70
|
+
const target = this.getOrCreateNode(root, this.options.prefix);
|
|
71
|
+
this.merge(target, acc);
|
|
72
|
+
acc = root;
|
|
73
|
+
}
|
|
74
|
+
return acc;
|
|
75
|
+
}
|
|
76
|
+
currentSegment() {
|
|
77
|
+
return this.segments[this.segments.length - 1];
|
|
33
78
|
}
|
|
34
|
-
|
|
79
|
+
currentNode() {
|
|
80
|
+
return this.currentSegment().node;
|
|
81
|
+
}
|
|
82
|
+
getOrCreateNode(root, path) {
|
|
35
83
|
const segments = path?.split('/').filter(Boolean) ?? [];
|
|
36
|
-
let current =
|
|
84
|
+
let current = root;
|
|
37
85
|
for (const segment of segments) {
|
|
38
86
|
current.children[segment] ??= { children: {}, methods: {} };
|
|
39
87
|
current = current.children[segment];
|
|
@@ -55,11 +103,50 @@ export class NodeBuilder {
|
|
|
55
103
|
}
|
|
56
104
|
}
|
|
57
105
|
}
|
|
106
|
+
function isNodeEmpty(node) {
|
|
107
|
+
return (Object.keys(node.methods).length === 0 &&
|
|
108
|
+
Object.keys(node.children).length === 0 &&
|
|
109
|
+
node.middleware === undefined);
|
|
110
|
+
}
|
|
111
|
+
function cloneNode(node) {
|
|
112
|
+
const children = {};
|
|
113
|
+
for (const [segment, child] of Object.entries(node.children)) {
|
|
114
|
+
children[segment] = cloneNode(child);
|
|
115
|
+
}
|
|
116
|
+
return {
|
|
117
|
+
children,
|
|
118
|
+
methods: { ...node.methods },
|
|
119
|
+
...(node.middleware ? { middleware: node.middleware } : {}),
|
|
120
|
+
};
|
|
121
|
+
}
|
|
122
|
+
function wrapHandler(middleware, handler) {
|
|
123
|
+
const wrapped = Object.assign(apply(middleware, handler), handler);
|
|
124
|
+
if ('configure' in handler && typeof handler.configure === 'function') {
|
|
125
|
+
wrapped.configure = (options) => wrapHandler(middleware, handler.configure(options));
|
|
126
|
+
}
|
|
127
|
+
return wrapped;
|
|
128
|
+
}
|
|
129
|
+
function flushMiddleware(node, inherited) {
|
|
130
|
+
const middleware = inherited
|
|
131
|
+
? node.middleware
|
|
132
|
+
? pipe(inherited, node.middleware)
|
|
133
|
+
: inherited
|
|
134
|
+
: node.middleware;
|
|
135
|
+
delete node.middleware;
|
|
136
|
+
if (middleware) {
|
|
137
|
+
for (const [method, handler] of Object.entries(node.methods)) {
|
|
138
|
+
node.methods[method] = wrapHandler(middleware, handler);
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
for (const child of Object.values(node.children)) {
|
|
142
|
+
flushMiddleware(child, middleware);
|
|
143
|
+
}
|
|
144
|
+
}
|
|
58
145
|
export function route(options) {
|
|
59
146
|
const builder = new NodeBuilder();
|
|
60
147
|
return builder.route(options);
|
|
61
148
|
}
|
|
62
|
-
export function routes() {
|
|
63
|
-
return new NodeBuilder();
|
|
149
|
+
export function routes(options) {
|
|
150
|
+
return new NodeBuilder(options);
|
|
64
151
|
}
|
|
65
152
|
//# sourceMappingURL=nodeBuilder.js.map
|
package/dist/nodeBuilder.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nodeBuilder.js","sourceRoot":"","sources":["../src/nodeBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAuC,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,WAAW,EAAqC,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"nodeBuilder.js","sourceRoot":"","sources":["../src/nodeBuilder.ts"],"names":[],"mappings":"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"}
|
package/dist/plugin.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import type { RouteNode } from './node.js';
|
|
2
|
-
export type Plugin<
|
|
2
|
+
export type Plugin<Provides = unknown, Requires = unknown> = (node: RouteNode<Provides & NoInfer<Requires>>) => RouteNode<Requires>;
|
package/dist/router.d.ts
CHANGED
|
@@ -8,7 +8,7 @@ export declare class Router {
|
|
|
8
8
|
private readonly routes;
|
|
9
9
|
private readonly fallback;
|
|
10
10
|
private constructor();
|
|
11
|
-
static from(node: RouteNode | NodeBuilder, options?: RouterOptions): Router;
|
|
11
|
+
static from<Provides = unknown>(node: RouteNode | NodeBuilder<unknown, Provides>, options?: RouterOptions): Router;
|
|
12
12
|
handle: Handler;
|
|
13
13
|
private matchMethod;
|
|
14
14
|
}
|
package/dist/router.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAmB,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAqC,MAAM,QAAQ,CAAC;AAsBxE,MAAM,OAAO,MAAM;IAEE;IACA;IAFnB,YACmB,MAA4C,EAC5C,QAAiB;QADjB,WAAM,GAAN,MAAM,CAAsC;QAC5C,aAAQ,GAAR,QAAQ,CAAS;IACjC,CAAC;IAEJ,MAAM,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.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.
|
|
4
|
+
"version": "0.12.1",
|
|
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.
|
|
19
|
+
"@glass-cannon/server": "0.12.1"
|
|
20
20
|
},
|
|
21
21
|
"devDependencies": {
|
|
22
22
|
"@types/bun": "latest"
|