@glass-cannon/router 0.0.3 → 0.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/dist/index.d.ts CHANGED
@@ -1,27 +1,29 @@
1
1
  import type { Handler, Request, Response } from '@glass-cannon/server';
2
- import { type Middleware } from './middleware/index.js';
3
- export type RouteHandler<Context> = (request: RouteContext & Context) => Promise<Response> | Response;
4
- export type RouteContext = Request & {
2
+ import { type Middleware } from './middleware';
3
+ type StringWithSuggestions<T> = T | (string & {});
4
+ export type RouteHandler<Context> = (request: RouteContext<Context>) => Promise<Response> | Response;
5
+ export type RouteContext<Context = unknown> = Request & {
5
6
  params: Record<string, string>;
6
- route: Route<any>;
7
- };
7
+ route: Route<Context>;
8
+ } & Context;
8
9
  export interface Route<Context> {
9
10
  method?: string;
10
11
  path: string;
11
12
  handler: RouteHandler<Context>;
12
13
  }
13
14
  export interface RouterGroup<Context> {
14
- route(options: RouteOptions<Context>): void;
15
+ route<NewContext>(options: RouteOptions<Context, NewContext>): void;
15
16
  group<NewContext>(options: GroupOptions<NewContext>): RouterGroup<Context & NewContext>;
16
17
  }
17
18
  export interface RouterOptions<Context = unknown> {
18
19
  fallback?: Handler;
19
20
  middleware?: Middleware<Context>;
20
21
  }
21
- export interface RouteOptions<Context> {
22
- method?: string;
22
+ export interface RouteOptions<Context, NewContext> {
23
+ method?: StringWithSuggestions<'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'OPTIONS'>;
23
24
  path: string;
24
- handler: RouteHandler<Context>;
25
+ middleware: Middleware<NewContext>;
26
+ handler: RouteHandler<Context & NewContext>;
25
27
  }
26
28
  export interface GroupOptions<Context> {
27
29
  prefix?: string;
@@ -31,16 +33,17 @@ export declare class Router<Context = unknown> implements RouterGroup<Context> {
31
33
  private readonly fallback;
32
34
  private readonly middleware;
33
35
  private routes;
34
- private regex;
35
36
  constructor(options?: RouterOptions<Context>);
36
- matchingRoute(request: Pick<Request, 'method' | 'path'>): Route<Context> | undefined;
37
+ matchingRoute(method: string, path: string): Route<Context> | undefined;
37
38
  handle: Handler;
38
- route(route: RouteOptions<Context>): void;
39
+ route<NewContext>(route: RouteOptions<Context, NewContext>): void;
39
40
  group<NewContext>(options: GroupOptions<NewContext>): RouterGroup<Context & NewContext>;
40
41
  private matchingRouteWithMetadata;
42
+ private matchingGeneralRouteWithMetadata;
41
43
  private computeMetadata;
42
44
  private computeScore;
43
45
  private pathToRegex;
44
46
  private pathToCapturingRegex;
45
47
  private compileRegex;
46
48
  }
49
+ export {};
package/dist/index.js CHANGED
@@ -1,36 +1,40 @@
1
- import { pipe } from './middleware/index.js';
1
+ import { applyMiddleware, noop, pipe } from './middleware';
2
+ const ALL_METHODS = '*';
2
3
  export class Router {
3
4
  fallback;
4
5
  middleware;
5
- routes = [];
6
- regex;
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
- this.middleware = options?.middleware ?? ((x) => x);
10
+ this.middleware = options?.middleware ?? noop;
10
11
  }
11
- matchingRoute(request) {
12
- return this.matchingRouteWithMetadata(request)?.route;
12
+ matchingRoute(method, path) {
13
+ return this.matchingRouteWithMetadata(method, path)?.route;
13
14
  }
14
15
  handle = async (request) => {
15
- const routeWithMetadata = this.matchingRouteWithMetadata(request);
16
+ const path = request.url.pathname;
17
+ const routeWithMetadata = this.matchingRouteWithMetadata(request.method, path);
16
18
  if (!routeWithMetadata)
17
19
  return await this.fallback(request);
18
20
  const { route, capturingRegex } = routeWithMetadata;
19
- const params = { ...capturingRegex.exec(request.path).groups };
21
+ const params = { ...capturingRegex.exec(path).groups };
20
22
  const context = { ...request, params, route };
21
23
  return await this.middleware(route.handler, context);
22
24
  };
23
25
  route(route) {
24
- const metadata = this.computeMetadata(route);
25
- binaryInsert(this.routes, metadata, (route) => route.score);
26
+ const handler = applyMiddleware(route.middleware, route.handler);
27
+ const metadata = this.computeMetadata({ method: route.method, path: route.path, handler });
28
+ const method = route.method?.toUpperCase() ?? ALL_METHODS;
29
+ this.routes[method] ??= [[], undefined];
30
+ binaryInsert(this.routes[method][0], metadata, (route) => route.score);
31
+ this.routes[method][1] = undefined;
26
32
  }
27
33
  group(options) {
28
34
  return {
29
35
  route: (route) => {
30
36
  const path = options.prefix ? `${options.prefix}${route.path}` : route.path;
31
- const handler = async (context) =>
32
- // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
33
- options.middleware(route.handler, context);
37
+ const handler = applyMiddleware(options.middleware, route.handler);
34
38
  this.route({ ...route, path, handler });
35
39
  },
36
40
  group: (group) => {
@@ -40,13 +44,27 @@ export class Router {
40
44
  },
41
45
  };
42
46
  }
43
- matchingRouteWithMetadata(request) {
44
- this.regex ??= this.compileRegex();
45
- const match = this.regex.exec(request.path);
47
+ matchingRouteWithMetadata(method, path) {
48
+ const routes = this.routes[method];
49
+ if (!routes)
50
+ return this.matchingGeneralRouteWithMetadata(path);
51
+ routes[1] ??= this.compileRegex(method);
52
+ const match = routes[1].exec(path);
53
+ if (!match)
54
+ return this.matchingGeneralRouteWithMetadata(path);
55
+ const matchIndex = match.findLastIndex(Boolean) - 1;
56
+ return routes[0][matchIndex];
57
+ }
58
+ matchingGeneralRouteWithMetadata(path) {
59
+ const routes = this.routes[ALL_METHODS];
60
+ if (!routes)
61
+ return;
62
+ routes[1] ??= this.compileRegex(ALL_METHODS);
63
+ const match = routes[1].exec(path);
46
64
  if (!match)
47
65
  return;
48
66
  const matchIndex = match.findLastIndex(Boolean) - 1;
49
- return this.routes[matchIndex];
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
- if (this.routes.length === 0)
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":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  import { type Response } from '@glass-cannon/server';
2
- import type { Middleware } from './index.js';
3
- import type { RouteContext } from '../index.js';
2
+ import type { Middleware } from '.';
3
+ import type { RouteContext } from '..';
4
4
  export interface ContentTypeOptions {
5
5
  allowNoConent?: boolean;
6
6
  onInvalidContentType?: (context: RouteContext) => Promise<Response> | Response;
@@ -1,11 +1,10 @@
1
1
  import type { Response } from '@glass-cannon/server';
2
- import type { RouteContext, RouteHandler } from '../index.js';
3
- export type Middleware<T = unknown> = (handler: RouteHandler<T>, request: RouteContext) => Promise<Response> | Response;
2
+ import type { RouteContext, RouteHandler } from '..';
3
+ export type Middleware<T = unknown> = (next: (context: T) => Promise<Response> | Response, request: RouteContext) => Promise<Response> | Response;
4
4
  export type PipeMiddlewares<Middlewares extends Middleware[]> = Middlewares extends [
5
5
  infer First,
6
6
  ...infer Rest
7
7
  ] ? First extends Middleware<infer FirstContext> ? Rest extends Middleware[] ? PipeMiddlewares<Rest> extends Middleware<infer RestContext> ? Middleware<FirstContext & RestContext> : never : never : never : Middleware;
8
8
  export declare function pipe<Middlewares extends Middleware[]>(...middlewares: Middlewares): PipeMiddlewares<Middlewares>;
9
- export declare const authenticated: Middleware<{
10
- accessToken: string;
11
- }>;
9
+ export declare function applyMiddleware<Context, NewContext>(middleware: Middleware<NewContext>, handler: RouteHandler<Context & NewContext>): RouteHandler<Context>;
10
+ export declare const noop: Middleware;
@@ -1,17 +1,17 @@
1
1
  export function pipe(...middlewares) {
2
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
3
- return ((handler, request) => {
4
- // eslint-disable-next-line @typescript-eslint/no-unsafe-return
5
- return middlewares.reduceRight((acc, middleware) => {
6
- // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
7
- return middleware(acc, request);
8
- }, handler);
9
- });
2
+ return middlewares.reduceRight(pipeTwo, noop);
10
3
  }
11
- export const authenticated = async (handler, request) => {
12
- const accessToken = request.headers.get('Authorization')?.split(' ')[1];
13
- if (!accessToken)
14
- throw new Error('Unauthorized');
15
- return await handler({ ...request, accessToken });
4
+ function pipeTwo(middleware1, middleware2) {
5
+ return (next, context) => {
6
+ return middleware1((context1) => middleware2((context2) => next({ ...context1, ...context2 }), context), context);
7
+ };
8
+ }
9
+ export function applyMiddleware(middleware, handler) {
10
+ return async (context) => {
11
+ return await middleware((newContext) => handler({ ...context, ...newContext }), context);
12
+ };
13
+ }
14
+ export const noop = (handler, context) => {
15
+ return handler({});
16
16
  };
17
17
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":"AAqBA,MAAM,UAAU,IAAI,CAClB,GAAG,WAAwB;IAE3B,8DAA8D;IAC9D,OAAO,CAAC,CAAC,OAAY,EAAE,OAAY,EAAE,EAAE;QACrC,+DAA+D;QAC/D,OAAO,WAAW,CAAC,WAAW,CAAC,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE;YACjD,iEAAiE;YACjE,OAAO,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAClC,CAAC,EAAE,OAAO,CAAC,CAAC;IACd,CAAC,CAA4C,CAAC;AAChD,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAwC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAC3F,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACxE,IAAI,CAAC,WAAW;QAAE,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IAClD,OAAO,MAAM,OAAO,CAAC,EAAE,GAAG,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;AACpD,CAAC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":"AAqBA,MAAM,UAAU,IAAI,CAClB,GAAG,WAAwB;IAE3B,OAAO,WAAW,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAiC,CAAC;AAChF,CAAC;AAED,SAAS,OAAO,CACd,WAAiC,EACjC,WAAiC;IAEjC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,OAAO,WAAW,CAChB,CAAC,QAAQ,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,QAAQ,EAAE,GAAG,QAAQ,EAAE,CAAC,EAAE,OAAO,CAAC,EACpF,OAAO,CACR,CAAC;IACJ,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,OAAO,EAAE,OAAO,EAAE,EAAE;IACnD,OAAO,OAAO,CAAC,EAAE,CAAC,CAAC;AACrB,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@glass-cannon/router",
3
3
  "type": "module",
4
- "version": "0.0.3",
4
+ "version": "0.0.5",
5
5
  "exports": {
6
6
  ".": {
7
7
  "import": "./dist/index.js",
@@ -18,7 +18,7 @@
18
18
  },
19
19
  "files": ["dist"],
20
20
  "dependencies": {
21
- "@glass-cannon/server": "^0.0.1"
21
+ "@glass-cannon/server": "0.0.5"
22
22
  },
23
23
  "devDependencies": {
24
24
  "@types/bun": "latest"