@glass-cannon/router 0.10.7 → 0.12.0

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 CHANGED
@@ -1,49 +1,4 @@
1
- import type { Handler, Request, Response } from '@glass-cannon/server';
2
- import { type Middleware } from './middleware/index.js';
3
- type StringWithSuggestions<T> = T | (string & {});
4
- export type RouteHandler<Context = unknown> = (request: RouteContext<Context>) => Promise<Response> | Response;
5
- export type RouteContext<Context = unknown> = Request & {
6
- params: Record<string, string>;
7
- route: Route;
8
- } & Context;
9
- export interface Route {
10
- method?: string;
11
- path: string;
12
- handler: RouteHandler;
13
- }
14
- export interface RouterGroup<Context = unknown> {
15
- route<NewContext>(options: RouteOptions<Context, NewContext>): Route;
16
- group<NewContext>(options: GroupOptions<NewContext>): RouterGroup<Context & NewContext>;
17
- }
18
- export interface RouterOptions<Context = unknown> {
19
- fallback?: Handler;
20
- middleware?: Middleware<Context>;
21
- }
22
- export interface RouteOptions<Context = unknown, NewContext = unknown> {
23
- method?: StringWithSuggestions<'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'OPTIONS'>;
24
- path: string;
25
- middleware?: Middleware<NewContext>;
26
- handler: RouteHandler<Context & NewContext>;
27
- }
28
- export interface GroupOptions<Context = unknown> {
29
- prefix?: string;
30
- middleware?: Middleware<Context>;
31
- }
32
- export declare class Router<Context = unknown> implements RouterGroup<Context> {
33
- private readonly fallback;
34
- private readonly middleware;
35
- private routes;
36
- constructor(options?: RouterOptions<Context>);
37
- matchingRoute(method: string, path: string): Route | undefined;
38
- handle: Handler;
39
- route<NewContext>(route: RouteOptions<Context, NewContext>): Route;
40
- group<NewContext>(options: GroupOptions<NewContext>): RouterGroup<Context & NewContext>;
41
- private matchingRouteWithMetadata;
42
- private matchingGeneralRouteWithMetadata;
43
- private computeMetadata;
44
- private computeScore;
45
- private pathToRegex;
46
- private pathToCapturingRegex;
47
- private compileRegex;
48
- }
49
- export {};
1
+ export * from './router.js';
2
+ export * from './node.js';
3
+ export * from './nodeBuilder.js';
4
+ export * from './plugin.js';
package/dist/index.js CHANGED
@@ -1,145 +1,5 @@
1
- import { applyMiddleware, noop, pipe } from './middleware/index.js';
2
- const ALL_METHODS = '*';
3
- export class Router {
4
- fallback;
5
- middleware;
6
- // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
7
- routes = Object.create(null);
8
- constructor(options) {
9
- this.fallback = options?.fallback ?? (() => ({ status: 404 }));
10
- this.middleware = options?.middleware ?? noop;
11
- }
12
- matchingRoute(method, path) {
13
- return this.matchingRouteWithMetadata(method, path)?.route;
14
- }
15
- handle = async (request) => {
16
- const path = request.url.pathname;
17
- const routeWithMetadata = this.matchingRouteWithMetadata(request.method, path);
18
- if (!routeWithMetadata)
19
- return await this.fallback(request);
20
- const { route, capturingRegex } = routeWithMetadata;
21
- const params = { ...capturingRegex.exec(path).groups };
22
- const context = { ...request, params, route };
23
- return await route.handler(context);
24
- };
25
- route(route) {
26
- const handler = route.middleware
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 });
31
- const method = route.method?.toUpperCase() ?? ALL_METHODS;
32
- this.routes[method] ??= [[], undefined];
33
- binaryInsert(this.routes[method][0], metadata, (route) => route.score);
34
- this.routes[method][1] = undefined;
35
- return metadata.route;
36
- }
37
- group(options) {
38
- const prefix = options.prefix?.endsWith('/')
39
- ? options.prefix.slice(0, -1)
40
- : (options.prefix ?? '');
41
- return {
42
- route: (route) => {
43
- const path = `${prefix}${route.path}`;
44
- const middlewares = [];
45
- if (options.middleware)
46
- middlewares.push(options.middleware);
47
- if (route.middleware)
48
- middlewares.push(route.middleware);
49
- const middleware = pipe(...middlewares);
50
- return this.route({ ...route, path, middleware });
51
- },
52
- group: (group) => {
53
- const newPrefix = `${prefix}${group.prefix}`;
54
- const middlewares = [];
55
- if (options.middleware)
56
- middlewares.push(options.middleware);
57
- if (group.middleware)
58
- middlewares.push(group.middleware);
59
- const middleware = pipe(...middlewares);
60
- return this.group({ prefix: newPrefix, middleware });
61
- },
62
- };
63
- }
64
- matchingRouteWithMetadata(method, path) {
65
- const routes = this.routes[method];
66
- if (!routes)
67
- return this.matchingGeneralRouteWithMetadata(path);
68
- routes[1] ??= this.compileRegex(method);
69
- const match = routes[1].exec(path);
70
- if (!match)
71
- return this.matchingGeneralRouteWithMetadata(path);
72
- const matchIndex = match.findLastIndex(Boolean) - 1;
73
- return routes[0][matchIndex];
74
- }
75
- matchingGeneralRouteWithMetadata(path) {
76
- const routes = this.routes[ALL_METHODS];
77
- if (!routes)
78
- return;
79
- routes[1] ??= this.compileRegex(ALL_METHODS);
80
- const match = routes[1].exec(path);
81
- if (!match)
82
- return;
83
- const matchIndex = match.findLastIndex(Boolean) - 1;
84
- return routes[0][matchIndex];
85
- }
86
- computeMetadata(route) {
87
- const score = this.computeScore(route.path);
88
- const regex = this.pathToRegex(route.path);
89
- const capturingRegex = new RegExp(this.pathToCapturingRegex(route.path));
90
- return { route, regex, score, capturingRegex };
91
- }
92
- computeScore(path) {
93
- let score = 0;
94
- for (const c of path) {
95
- if (c === '/') {
96
- score += 2;
97
- }
98
- else if (c === ':') {
99
- score -= 1;
100
- }
101
- else if (c === '*') {
102
- score -= 2;
103
- }
104
- }
105
- return score;
106
- }
107
- pathToRegex(path) {
108
- return ('^(' +
109
- path
110
- .replace(/([.+?^=!:${}()[\]|/\\])/g, '\\$1')
111
- .replace(/\\:([a-zA-Z0-9_]+)\*/g, '(?:.*)')
112
- .replace(/\\\*/g, '(?:.*)')
113
- .replace(/\\:([a-zA-Z0-9_]+)/g, '(?:[^/]+)') +
114
- '/?)$');
115
- }
116
- pathToCapturingRegex(path) {
117
- return ('^' +
118
- path
119
- .replace(/([.+?^=!:${}()[\]|/\\])/g, '\\$1')
120
- .replace(/\\:([a-zA-Z0-9_]+)\*/g, '(?<$1>.*)')
121
- .replace(/\\\*/g, '(?:.*)')
122
- .replace(/\\:([a-zA-Z0-9_]+)/g, '(?<$1>[^/]+)') +
123
- '/?$');
124
- }
125
- compileRegex(method) {
126
- const regex = this.routes[method][0].map((route) => route.regex).join('|');
127
- return new RegExp(regex);
128
- }
129
- }
130
- function binaryInsert(array, value, score) {
131
- let low = 0;
132
- let high = array.length;
133
- while (low < high) {
134
- const mid = Math.floor((low + high) / 2);
135
- if (score(value) < score(array[mid])) {
136
- low = mid + 1;
137
- }
138
- else {
139
- high = mid;
140
- }
141
- }
142
- array.splice(low, 0, value);
143
- return low;
144
- }
1
+ export * from './router.js';
2
+ export * from './node.js';
3
+ export * from './nodeBuilder.js';
4
+ export * from './plugin.js';
145
5
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC"}
@@ -1,5 +1,4 @@
1
- import { type RequestBody, type Response } from '@glass-cannon/server';
2
- import type { Middleware } from './index.js';
1
+ import { type MiddlewareWrapper } from './index.js';
3
2
  import type { RouteContext } from '../index.js';
4
3
  export interface ContentTypeOptions {
5
4
  allowNoContent?: boolean;
@@ -7,13 +6,13 @@ export interface ContentTypeOptions {
7
6
  }
8
7
  export declare function contentType<T>({ contentType, deserializeRequest, allowNoContent, onInvalidContentType, }: {
9
8
  contentType: string;
10
- deserializeRequest: (body?: RequestBody) => Promise<T> | T;
11
- } & ContentTypeOptions): Middleware<{
9
+ deserializeRequest: (request?: Request) => Promise<T> | T;
10
+ } & ContentTypeOptions): MiddlewareWrapper<{
12
11
  body: T;
13
12
  }>;
14
- export declare function textBody(options?: ContentTypeOptions): Middleware<{
13
+ export declare function textBody(options?: ContentTypeOptions): MiddlewareWrapper<{
15
14
  body: string;
16
15
  }>;
17
- export declare function jsonBody(options?: ContentTypeOptions): Middleware<{
16
+ export declare function jsonBody(options?: ContentTypeOptions): MiddlewareWrapper<{
18
17
  body: unknown;
19
18
  }>;
@@ -1,11 +1,11 @@
1
- import { readJson, readText } from '@glass-cannon/server';
2
- export function contentType({ contentType, deserializeRequest, allowNoContent = true, onInvalidContentType = () => ({ status: 415 }), }) {
3
- return async (next, context) => {
4
- const contentTypeHeader = context.headers.get('Content-Type');
5
- if (!contentTypeHeader) {
1
+ import { middleware } from './index.js';
2
+ export function contentType({ contentType, deserializeRequest, allowNoContent = true, onInvalidContentType = () => new Response(null, { status: 415 }), }) {
3
+ return middleware(async (next, context) => {
4
+ const contentTypeHeader = context.request.headers.get('Content-Type');
5
+ if (!contentTypeHeader || !context.request.body) {
6
6
  if (allowNoContent) {
7
7
  const body = await deserializeRequest();
8
- return await next({ body });
8
+ return await next({ ...context, body });
9
9
  }
10
10
  else {
11
11
  return await onInvalidContentType(context);
@@ -15,25 +15,25 @@ export function contentType({ contentType, deserializeRequest, allowNoContent =
15
15
  return await onInvalidContentType(context);
16
16
  let body;
17
17
  try {
18
- body = await deserializeRequest(context.stream);
18
+ body = await deserializeRequest(context.request);
19
19
  }
20
20
  catch {
21
21
  return await onInvalidContentType(context);
22
22
  }
23
- return await next({ body });
24
- };
23
+ return await next({ ...context, body });
24
+ });
25
25
  }
26
26
  export function textBody(options) {
27
27
  return contentType({
28
28
  contentType: 'text/plain',
29
- deserializeRequest: (body) => (body ? readText(body, 'utf-8') : ''),
29
+ deserializeRequest: (request) => (request ? request.text() : ''),
30
30
  ...options,
31
31
  });
32
32
  }
33
33
  export function jsonBody(options) {
34
34
  return contentType({
35
35
  contentType: 'application/json',
36
- deserializeRequest: (body) => body && readJson(body),
36
+ deserializeRequest: (request) => request?.json(),
37
37
  ...options,
38
38
  });
39
39
  }
@@ -1 +1 @@
1
- {"version":3,"file":"contentType.js","sourceRoot":"","sources":["../../src/middleware/contentType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAmC,MAAM,sBAAsB,CAAC;AAS3F,MAAM,UAAU,WAAW,CAAI,EAC7B,WAAW,EACX,kBAAkB,EAClB,cAAc,GAAG,IAAI,EACrB,oBAAoB,GAAG,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,GAI1B;IACpB,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;QAC7B,MAAM,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC9D,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,IAAI,cAAc,EAAE,CAAC;gBACnB,MAAM,IAAI,GAAG,MAAM,kBAAkB,EAAE,CAAC;gBACxC,OAAO,MAAM,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;YAC9B,CAAC;iBAAM,CAAC;gBACN,OAAO,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;QAED,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,WAAW,CAAC;YAAE,OAAO,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAC3F,IAAI,IAAO,CAAC;QACZ,IAAI,CAAC;YACH,IAAI,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAClD,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9B,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,OAA4B;IACnD,OAAO,WAAW,CAAC;QACjB,WAAW,EAAE,YAAY;QACzB,kBAAkB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACnE,GAAG,OAAO;KACX,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,OAA4B;IACnD,OAAO,WAAW,CAAC;QACjB,WAAW,EAAE,kBAAkB;QAC/B,kBAAkB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC;QACpD,GAAG,OAAO;KACX,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"contentType.js","sourceRoot":"","sources":["../../src/middleware/contentType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA0B,MAAM,GAAG,CAAC;AAQvD,MAAM,UAAU,WAAW,CAAI,EAC7B,WAAW,EACX,kBAAkB,EAClB,cAAc,GAAG,IAAI,EACrB,oBAAoB,GAAG,GAAG,EAAE,CAAC,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,GAI5C;IACpB,OAAO,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;QACxC,MAAM,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACtE,IAAI,CAAC,iBAAiB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAChD,IAAI,cAAc,EAAE,CAAC;gBACnB,MAAM,IAAI,GAAG,MAAM,kBAAkB,EAAE,CAAC;gBACxC,OAAO,MAAM,IAAI,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,CAAC;iBAAM,CAAC;gBACN,OAAO,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;QAED,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,WAAW,CAAC;YAAE,OAAO,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAC3F,IAAI,IAAO,CAAC;QACZ,IAAI,CAAC;YACH,IAAI,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACnD,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,OAA4B;IACnD,OAAO,WAAW,CAAC;QACjB,WAAW,EAAE,YAAY;QACzB,kBAAkB,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChE,GAAG,OAAO;KACX,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,OAA4B;IACnD,OAAO,WAAW,CAAC;QACjB,WAAW,EAAE,kBAAkB;QAC/B,kBAAkB,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE;QAChD,GAAG,OAAO;KACX,CAAC,CAAC;AACL,CAAC"}
@@ -1,11 +1,10 @@
1
- import type { Response } from '@glass-cannon/server';
2
1
  import type { RouteContext, RouteHandler } from '../index.js';
3
2
  export * from './contentType.js';
4
- export type Middleware<T = unknown> = (next: (context: T) => Promise<Response> | Response, request: RouteContext) => Promise<Response> | Response;
5
- export type PipeMiddlewares<Middlewares extends Middleware[]> = Middlewares extends [
6
- infer First,
7
- ...infer Rest
8
- ] ? First extends Middleware<infer FirstContext> ? Rest extends Middleware[] ? PipeMiddlewares<Rest> extends Middleware<infer RestContext> ? Middleware<FirstContext & RestContext> : never : never : never : Middleware;
9
- export declare function pipe<Middlewares extends Middleware[]>(...middlewares: Middlewares): PipeMiddlewares<Middlewares>;
10
- export declare function applyMiddleware<Context, NewContext>(middleware: Middleware<NewContext>, handler: RouteHandler<Context & NewContext>): RouteHandler<Context>;
11
- export declare const noop: Middleware;
3
+ export type MergeRequires<Provides, Requires, NextRequires> = Provides & Requires extends NextRequires ? Requires : Requires & Omit<NextRequires, keyof Provides>;
4
+ export type Middleware<Provides = unknown, Requires = unknown> = (next: RouteHandler<Provides & NoInfer<Requires>>, context: RouteContext & Requires) => Promise<Response> | Response;
5
+ export interface MiddlewareWrapper<Provides = unknown, Requires = unknown> extends Middleware<Provides, Requires> {
6
+ pipe<NextProvides, NextRequires = unknown>(other: Middleware<NextProvides, NextRequires>): MiddlewareWrapper<Provides & NextProvides, MergeRequires<Provides, Requires, NextRequires>>;
7
+ }
8
+ export declare function apply<Provides = unknown, Requires = unknown, HandlerRequires = Provides & Requires>(fn: Middleware<Provides, Requires>, handler: RouteHandler<HandlerRequires>): RouteHandler<MergeRequires<Provides, Requires, HandlerRequires>>;
9
+ export declare function pipe<Provides = unknown, Requires = unknown, NextProvides = unknown, NextRequires = unknown>(first: Middleware<Provides, Requires>, second: Middleware<NextProvides, NextRequires>): MiddlewareWrapper<Provides & NextProvides, MergeRequires<Provides, Requires, NextRequires>>;
10
+ export declare function middleware<Provides = unknown, Requires = unknown>(fn: Middleware<Provides, Requires> | MiddlewareWrapper<Provides, Requires>): MiddlewareWrapper<Provides, Requires>;
@@ -1,23 +1,17 @@
1
1
  export * from './contentType.js';
2
- export function pipe(...middlewares) {
3
- return middlewares.reduce(pipeTwo, noop);
2
+ export function apply(fn, handler) {
3
+ return (context) => fn(handler, context);
4
4
  }
5
- function pipeTwo(middleware1, middleware2) {
6
- return (next, context) => {
7
- return middleware1((newContext1) => {
8
- return middleware2((newContext2) => next({ ...newContext1, ...newContext2 }), {
9
- ...context,
10
- ...newContext1,
11
- });
12
- }, context);
13
- };
5
+ export function pipe(first, second) {
6
+ return middleware((next, context) => first((nextContext) => second(next, nextContext), context));
14
7
  }
15
- export function applyMiddleware(middleware, handler) {
16
- return async (context) => {
17
- return await middleware((newContext) => handler({ ...context, ...newContext }), context);
18
- };
8
+ export function middleware(fn) {
9
+ if ('pipe' in fn)
10
+ return fn;
11
+ return Object.assign(fn, {
12
+ pipe(other) {
13
+ return pipe(fn, other);
14
+ },
15
+ });
19
16
  }
20
- export const noop = (next) => {
21
- return next({});
22
- };
23
17
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":"AAGA,cAAc,eAAe,CAAC;AAoB9B,MAAM,UAAU,IAAI,CAClB,GAAG,WAAwB;IAE3B,OAAO,WAAW,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAiC,CAAC;AAC3E,CAAC;AAED,SAAS,OAAO,CACd,WAAiC,EACjC,WAAiC;IAEjC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,OAAO,WAAW,CAAC,CAAC,WAAW,EAAE,EAAE;YACjC,OAAO,WAAW,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,WAAW,EAAE,GAAG,WAAW,EAAE,CAAC,EAAE;gBAC5E,GAAG,OAAO;gBACV,GAAG,WAAW;aACf,CAAC,CAAC;QACL,CAAC,EAAE,OAAO,CAAC,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,UAAkC,EAClC,OAA2C;IAE3C,OAAO,KAAK,EAAE,OAAO,EAAE,EAAE;QACvB,OAAO,MAAM,UAAU,CACrB,CAAC,UAAU,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,EAAE,GAAG,UAAU,EAAwC,CAAC,EAC5F,OAAuB,CACxB,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,IAAI,GAAe,CAAC,IAAI,EAAE,EAAE;IACvC,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC;AAClB,CAAC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":"AAEA,cAAc,eAAe,CAAC;AAmB9B,MAAM,UAAU,KAAK,CAKnB,EAAkC,EAClC,OAAsC;IAEtC,OAAO,CAAC,OAAO,EAAE,EAAE,CACjB,EAAE,CACA,OAAuD,EACvD,OAA6C,CAC9C,CAAC;AACN,CAAC;AAED,MAAM,UAAU,IAAI,CAMlB,KAAqC,EACrC,MAA8C;IAE9C,OAAO,UAAU,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAClC,KAAK,CACH,CAAC,WAAW,EAAE,EAAE,CACd,MAAM,CACJ,IAA4D,EAC5D,WAAqD,CACtD,EACH,OAA6C,CAC9C,CACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,UAAU,CACxB,EAA0E;IAE1E,IAAI,MAAM,IAAI,EAAE;QAAE,OAAO,EAAE,CAAC;IAC5B,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE;QACvB,IAAI,CACF,KAA6C;YAE7C,OAAO,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QACzB,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
package/dist/node.d.ts ADDED
@@ -0,0 +1,14 @@
1
+ import type { Middleware } from './middleware/index.js';
2
+ export interface RouteContext {
3
+ url: URL;
4
+ method: string;
5
+ params: Record<string, string>;
6
+ request: Request;
7
+ }
8
+ export type RouteHandler<Requires = unknown> = (context: RouteContext & Requires) => Promise<Response> | Response;
9
+ export interface RouteNode<Requires = unknown> {
10
+ children: Record<string, RouteNode>;
11
+ methods: Record<string, RouteHandler<Requires>>;
12
+ middleware?: Middleware<unknown, Requires>;
13
+ }
14
+ export declare const ALL_METHODS = "*";
package/dist/node.js ADDED
@@ -0,0 +1,2 @@
1
+ export const ALL_METHODS = '*';
2
+ //# sourceMappingURL=node.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"node.js","sourceRoot":"","sources":["../src/node.ts"],"names":[],"mappings":"AAmBA,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,CAAC"}
@@ -0,0 +1,28 @@
1
+ import { type MergeRequires, type Middleware } from './middleware/index.js';
2
+ import { type RouteHandler, type RouteNode } from './node.js';
3
+ import type { Plugin } from './plugin.js';
4
+ export interface RouteOptions<HandlerRequires = unknown, Provides = unknown, MiddlewareRequires = unknown, ContextRequires = unknown> {
5
+ method?: string;
6
+ path: string;
7
+ middleware?: Middleware<Provides, MiddlewareRequires>;
8
+ handler: RouteHandler<NoInfer<Provides & MiddlewareRequires & ContextRequires> & HandlerRequires>;
9
+ }
10
+ export interface GroupOptions<Provides = unknown, MiddlewareRequires = unknown> {
11
+ prefix?: string;
12
+ middleware?: Middleware<Provides, MiddlewareRequires>;
13
+ }
14
+ export declare class NodeBuilder<Requires = unknown, Provides = unknown> {
15
+ private segments;
16
+ 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>;
17
+ 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>;
18
+ use<NodeRequires = unknown, NodeProvides = unknown>(node: NodeBuilder<NodeRequires, NodeProvides>): NodeBuilder<MergeRequires<Provides, Requires, NodeRequires>, Provides>;
19
+ apply<PluginProvides = unknown, PluginRequires = unknown>(plugin: Plugin<PluginProvides, PluginRequires>): NodeBuilder<MergeRequires<Provides, Requires, PluginRequires>, Provides & PluginProvides>;
20
+ apply(plugin: Plugin | undefined | null): NodeBuilder<Requires, Provides>;
21
+ build(): RouteNode<Requires>;
22
+ private currentSegment;
23
+ private currentNode;
24
+ private getOrCreateNode;
25
+ private merge;
26
+ }
27
+ export declare function route<HandlerRequires = unknown, Provides = unknown, MiddlewareRequires = unknown>(options: RouteOptions<HandlerRequires, Provides, MiddlewareRequires>): NodeBuilder<MergeRequires<Provides, MiddlewareRequires, HandlerRequires>>;
28
+ export declare function routes<Requires = unknown>(): NodeBuilder<Requires>;
@@ -0,0 +1,137 @@
1
+ import { apply, pipe } from './middleware/index.js';
2
+ import { ALL_METHODS } from './node.js';
3
+ export class NodeBuilder {
4
+ segments = [{ plugins: [], node: { children: {}, methods: {} } }];
5
+ route({ method, path, middleware: routeMiddleware, handler, }) {
6
+ method ??= ALL_METHODS;
7
+ const target = this.getOrCreateNode(this.currentNode(), path);
8
+ target.methods[method] = routeMiddleware
9
+ ? wrapHandler(routeMiddleware, handler)
10
+ : handler;
11
+ return this;
12
+ }
13
+ group({ prefix, middleware: groupMiddleware }, node) {
14
+ const built = cloneNode(node.build());
15
+ if (groupMiddleware) {
16
+ built.middleware = built.middleware
17
+ ? pipe(groupMiddleware, built.middleware)
18
+ : groupMiddleware;
19
+ }
20
+ flushMiddleware(built);
21
+ const target = this.getOrCreateNode(this.currentNode(), prefix);
22
+ this.merge(target, built);
23
+ return this;
24
+ }
25
+ use(node) {
26
+ const built = cloneNode(node.build());
27
+ flushMiddleware(built);
28
+ this.merge(this.currentNode(), built);
29
+ return this;
30
+ }
31
+ apply(plugin) {
32
+ if (plugin) {
33
+ const current = this.currentSegment();
34
+ if (isNodeEmpty(current.node)) {
35
+ current.plugins.push(plugin);
36
+ }
37
+ else {
38
+ this.segments.push({
39
+ plugins: [plugin],
40
+ node: { children: {}, methods: {} },
41
+ });
42
+ }
43
+ }
44
+ return this;
45
+ }
46
+ build() {
47
+ let acc = { children: {}, methods: {} };
48
+ for (let i = this.segments.length - 1; i >= 0; i--) {
49
+ const segment = this.segments[i];
50
+ const current = cloneNode(segment.node);
51
+ flushMiddleware(acc);
52
+ this.merge(current, acc);
53
+ let transformed = current;
54
+ for (let j = segment.plugins.length - 1; j >= 0; j--) {
55
+ transformed = segment.plugins[j](transformed);
56
+ }
57
+ acc = transformed;
58
+ }
59
+ return acc;
60
+ }
61
+ currentSegment() {
62
+ return this.segments[this.segments.length - 1];
63
+ }
64
+ currentNode() {
65
+ return this.currentSegment().node;
66
+ }
67
+ getOrCreateNode(root, path) {
68
+ const segments = path?.split('/').filter(Boolean) ?? [];
69
+ let current = root;
70
+ for (const segment of segments) {
71
+ current.children[segment] ??= { children: {}, methods: {} };
72
+ current = current.children[segment];
73
+ }
74
+ return current;
75
+ }
76
+ merge(target, source) {
77
+ if (source.middleware) {
78
+ target.middleware = target.middleware
79
+ ? pipe(target.middleware, source.middleware)
80
+ : source.middleware;
81
+ }
82
+ for (const [method, handler] of Object.entries(source.methods)) {
83
+ target.methods[method] = handler;
84
+ }
85
+ for (const [segment, child] of Object.entries(source.children)) {
86
+ target.children[segment] ??= { children: {}, methods: {} };
87
+ this.merge(target.children[segment], child);
88
+ }
89
+ }
90
+ }
91
+ function isNodeEmpty(node) {
92
+ return (Object.keys(node.methods).length === 0 &&
93
+ Object.keys(node.children).length === 0 &&
94
+ node.middleware === undefined);
95
+ }
96
+ function cloneNode(node) {
97
+ const children = {};
98
+ for (const [segment, child] of Object.entries(node.children)) {
99
+ children[segment] = cloneNode(child);
100
+ }
101
+ return {
102
+ children,
103
+ methods: { ...node.methods },
104
+ ...(node.middleware ? { middleware: node.middleware } : {}),
105
+ };
106
+ }
107
+ function wrapHandler(middleware, handler) {
108
+ const wrapped = Object.assign(apply(middleware, handler), handler);
109
+ if ('configure' in handler && typeof handler.configure === 'function') {
110
+ wrapped.configure = (options) => wrapHandler(middleware, handler.configure(options));
111
+ }
112
+ return wrapped;
113
+ }
114
+ function flushMiddleware(node, inherited) {
115
+ const middleware = inherited
116
+ ? node.middleware
117
+ ? pipe(inherited, node.middleware)
118
+ : inherited
119
+ : node.middleware;
120
+ delete node.middleware;
121
+ if (middleware) {
122
+ for (const [method, handler] of Object.entries(node.methods)) {
123
+ node.methods[method] = wrapHandler(middleware, handler);
124
+ }
125
+ }
126
+ for (const child of Object.values(node.children)) {
127
+ flushMiddleware(child, middleware);
128
+ }
129
+ }
130
+ export function route(options) {
131
+ const builder = new NodeBuilder();
132
+ return builder.route(options);
133
+ }
134
+ export function routes() {
135
+ return new NodeBuilder();
136
+ }
137
+ //# sourceMappingURL=nodeBuilder.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"nodeBuilder.js","sourceRoot":"","sources":["../src/nodeBuilder.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ import type { RouteNode } from './node.js';
2
+ export type Plugin<Provides = unknown, Requires = unknown> = (node: RouteNode<Provides & NoInfer<Requires>>) => RouteNode<Requires>;
package/dist/plugin.js ADDED
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=plugin.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":""}
@@ -0,0 +1,14 @@
1
+ import type { Handler } from '@glass-cannon/server';
2
+ import { type RouteNode } from './node.js';
3
+ import type { NodeBuilder } from './nodeBuilder.js';
4
+ export interface RouterOptions {
5
+ fallback?: Handler;
6
+ }
7
+ export declare class Router {
8
+ private readonly routes;
9
+ private readonly fallback;
10
+ private constructor();
11
+ static from<Provides = unknown>(node: RouteNode | NodeBuilder<unknown, Provides>, options?: RouterOptions): Router;
12
+ handle: Handler;
13
+ private matchMethod;
14
+ }
package/dist/router.js ADDED
@@ -0,0 +1,153 @@
1
+ import { apply, pipe } from './middleware/index.js';
2
+ import { ALL_METHODS } from './node.js';
3
+ export class Router {
4
+ routes;
5
+ fallback;
6
+ constructor(routes, fallback) {
7
+ this.routes = routes;
8
+ this.fallback = fallback;
9
+ }
10
+ static from(node, options) {
11
+ const rootNode = 'build' in node ? node.build() : node;
12
+ const routes = compileRouteNode(rootNode);
13
+ const fallback = options?.fallback ?? (() => new Response(null, { status: 404 }));
14
+ return new Router(routes, fallback);
15
+ }
16
+ handle = async (request) => {
17
+ const url = new URL(request.url);
18
+ const rawPath = url.pathname;
19
+ const path = rawPath.length > 1 && rawPath.endsWith('/') ? rawPath.slice(0, -1) : rawPath;
20
+ const method = request.method.toUpperCase();
21
+ const match = this.matchMethod(method, path) ?? this.matchMethod(ALL_METHODS, path);
22
+ if (!match)
23
+ return await this.fallback(request);
24
+ return await match.handler({
25
+ url,
26
+ method,
27
+ params: match.params,
28
+ request,
29
+ });
30
+ };
31
+ matchMethod(method, path) {
32
+ const methodRoutes = this.routes[method];
33
+ if (!methodRoutes)
34
+ return undefined;
35
+ const staticHandler = methodRoutes.static[path];
36
+ if (staticHandler) {
37
+ return { handler: staticHandler, params: {} };
38
+ }
39
+ const dynamic = methodRoutes.dynamic;
40
+ if (!dynamic)
41
+ return undefined;
42
+ const match = dynamic.regex.exec(path);
43
+ if (!match)
44
+ return undefined;
45
+ const matchIndex = match.findLastIndex(Boolean) - 1;
46
+ const route = dynamic.routes[matchIndex];
47
+ const params = { ...route.capturingRegex.exec(path)?.groups };
48
+ return { handler: route.handler, params };
49
+ }
50
+ }
51
+ function compileRouteNode(root) {
52
+ const staticByMethod = Object.create(null);
53
+ const dynamicByMethod = Object.create(null);
54
+ function visit(node, currentPath, inheritedMiddleware) {
55
+ const middleware = inheritedMiddleware
56
+ ? node.middleware
57
+ ? pipe(inheritedMiddleware, node.middleware)
58
+ : inheritedMiddleware
59
+ : node.middleware;
60
+ const isDynamic = currentPath.includes(':') || currentPath.includes('*');
61
+ for (const [rawMethod, rawHandler] of Object.entries(node.methods)) {
62
+ const method = rawMethod.toUpperCase();
63
+ const handler = middleware ? apply(middleware, rawHandler) : rawHandler;
64
+ if (isDynamic) {
65
+ dynamicByMethod[method] ??= [];
66
+ const metadata = computeMetadata(currentPath, handler);
67
+ binaryInsert(dynamicByMethod[method], metadata, (item) => item.score);
68
+ }
69
+ else {
70
+ staticByMethod[method] ??= Object.create(null);
71
+ staticByMethod[method][currentPath || '/'] = handler;
72
+ }
73
+ }
74
+ for (const [segment, child] of Object.entries(node.children)) {
75
+ visit(child, `${currentPath}/${segment}`, middleware);
76
+ }
77
+ }
78
+ visit(root, '');
79
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
80
+ const compiled = Object.create(null);
81
+ const methods = new Set([...Object.keys(staticByMethod), ...Object.keys(dynamicByMethod)]);
82
+ for (const method of methods) {
83
+ const dynamicRoutes = dynamicByMethod[method];
84
+ compiled[method] = {
85
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
86
+ static: staticByMethod[method] ?? Object.create(null),
87
+ ...(dynamicRoutes && dynamicRoutes.length > 0
88
+ ? {
89
+ dynamic: {
90
+ routes: dynamicRoutes,
91
+ regex: new RegExp(dynamicRoutes.map((r) => r.regex).join('|')),
92
+ },
93
+ }
94
+ : {}),
95
+ };
96
+ }
97
+ return compiled;
98
+ }
99
+ function computeMetadata(path, handler) {
100
+ const score = computeScore(path);
101
+ const regex = pathToRegex(path);
102
+ const capturingRegex = new RegExp(pathToCapturingRegex(path));
103
+ return { handler, regex, score, capturingRegex };
104
+ }
105
+ function computeScore(path) {
106
+ let score = 0;
107
+ for (const c of path) {
108
+ if (c === '/') {
109
+ score += 2;
110
+ }
111
+ else if (c === ':') {
112
+ score -= 1;
113
+ }
114
+ else if (c === '*') {
115
+ score -= 2;
116
+ }
117
+ }
118
+ return score;
119
+ }
120
+ function pathToRegex(path) {
121
+ return ('^(' +
122
+ path
123
+ .replace(/([.+?^=!:${}()[\]|/\\])/g, '\\$1')
124
+ .replace(/\\:([a-zA-Z0-9_]+)\*/g, '(?:.*)')
125
+ .replace(/\\\*/g, '(?:.*)')
126
+ .replace(/\\:([a-zA-Z0-9_]+)/g, '(?:[^/]+)') +
127
+ '/?)$');
128
+ }
129
+ function pathToCapturingRegex(path) {
130
+ return ('^' +
131
+ path
132
+ .replace(/([.+?^=!:${}()[\]|/\\])/g, '\\$1')
133
+ .replace(/\\:([a-zA-Z0-9_]+)\*/g, '(?<$1>.*)')
134
+ .replace(/\\\*/g, '(?:.*)')
135
+ .replace(/\\:([a-zA-Z0-9_]+)/g, '(?<$1>[^/]+)') +
136
+ '/?$');
137
+ }
138
+ function binaryInsert(array, value, score) {
139
+ let low = 0;
140
+ let high = array.length;
141
+ while (low < high) {
142
+ const mid = Math.floor((low + high) / 2);
143
+ if (score(value) < score(array[mid])) {
144
+ low = mid + 1;
145
+ }
146
+ else {
147
+ high = mid;
148
+ }
149
+ }
150
+ array.splice(low, 0, value);
151
+ return low;
152
+ }
153
+ //# sourceMappingURL=router.js.map
@@ -0,0 +1 @@
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.10.7",
4
+ "version": "0.12.0",
5
5
  "exports": {
6
6
  ".": {
7
7
  "import": "./dist/index.js",
@@ -16,13 +16,13 @@
16
16
  "dist"
17
17
  ],
18
18
  "dependencies": {
19
- "@glass-cannon/server": "0.10.7"
19
+ "@glass-cannon/server": "0.12.0"
20
20
  },
21
21
  "devDependencies": {
22
22
  "@types/bun": "latest"
23
23
  },
24
24
  "peerDependencies": {
25
- "typescript": "^5 || ^6"
25
+ "typescript": "^5 || ^6 || ^7"
26
26
  },
27
27
  "scripts": {
28
28
  "build": "tsc && tsc-alias"