@glass-cannon/router 0.0.4 → 0.0.6

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,28 +1,29 @@
1
1
  import type { Handler, Request, Response } from '@glass-cannon/server';
2
2
  import { type Middleware } from './middleware/index.js';
3
3
  type StringWithSuggestions<T> = T | (string & {});
4
- export type RouteHandler<Context> = (request: RouteContext & Context) => Promise<Response> | Response;
5
- export type RouteContext = Request & {
4
+ export type RouteHandler<Context> = (request: RouteContext<Context>) => Promise<Response> | Response;
5
+ export type RouteContext<Context = unknown> = Request & {
6
6
  params: Record<string, string>;
7
- route: Route<any>;
8
- };
7
+ route: Route<Context>;
8
+ } & Context;
9
9
  export interface Route<Context> {
10
10
  method?: string;
11
11
  path: string;
12
12
  handler: RouteHandler<Context>;
13
13
  }
14
14
  export interface RouterGroup<Context> {
15
- route(options: RouteOptions<Context>): void;
15
+ route<NewContext>(options: RouteOptions<Context, NewContext>): void;
16
16
  group<NewContext>(options: GroupOptions<NewContext>): RouterGroup<Context & NewContext>;
17
17
  }
18
18
  export interface RouterOptions<Context = unknown> {
19
19
  fallback?: Handler;
20
20
  middleware?: Middleware<Context>;
21
21
  }
22
- export interface RouteOptions<Context> {
22
+ export interface RouteOptions<Context, NewContext = undefined> {
23
23
  method?: StringWithSuggestions<'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'OPTIONS'>;
24
24
  path: string;
25
- handler: RouteHandler<Context>;
25
+ middleware?: Middleware<NewContext>;
26
+ handler: RouteHandler<Context & NewContext>;
26
27
  }
27
28
  export interface GroupOptions<Context> {
28
29
  prefix?: string;
@@ -33,9 +34,9 @@ export declare class Router<Context = unknown> implements RouterGroup<Context> {
33
34
  private readonly middleware;
34
35
  private routes;
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;
41
42
  private matchingGeneralRouteWithMetadata;
package/dist/index.js CHANGED
@@ -1,4 +1,4 @@
1
- import { pipe } from './middleware/index.js';
1
+ import { applyMiddleware, noop, pipe } from './middleware/index.js';
2
2
  const ALL_METHODS = '*';
3
3
  export class Router {
4
4
  fallback;
@@ -7,23 +7,27 @@ export class Router {
7
7
  routes = Object.create(null);
8
8
  constructor(options) {
9
9
  this.fallback = options?.fallback ?? (() => ({ status: 404 }));
10
- this.middleware = options?.middleware ?? ((x) => x);
10
+ this.middleware = options?.middleware ?? noop;
11
11
  }
12
- matchingRoute(request) {
13
- return this.matchingRouteWithMetadata(request)?.route;
12
+ matchingRoute(method, path) {
13
+ return this.matchingRouteWithMetadata(method, path)?.route;
14
14
  }
15
15
  handle = async (request) => {
16
- const routeWithMetadata = this.matchingRouteWithMetadata(request);
16
+ const path = request.url.pathname;
17
+ const routeWithMetadata = this.matchingRouteWithMetadata(request.method, path);
17
18
  if (!routeWithMetadata)
18
19
  return await this.fallback(request);
19
20
  const { route, capturingRegex } = routeWithMetadata;
20
- const params = { ...capturingRegex.exec(request.path).groups };
21
+ const params = { ...capturingRegex.exec(path).groups };
21
22
  const context = { ...request, params, route };
22
23
  return await this.middleware(route.handler, context);
23
24
  };
24
25
  route(route) {
25
- const metadata = this.computeMetadata(route);
26
- const method = route.method ?? ALL_METHODS;
26
+ const handler = route.middleware
27
+ ? applyMiddleware(route.middleware, route.handler)
28
+ : route.handler;
29
+ const metadata = this.computeMetadata({ method: route.method, path: route.path, handler });
30
+ const method = route.method?.toUpperCase() ?? ALL_METHODS;
27
31
  this.routes[method] ??= [[], undefined];
28
32
  binaryInsert(this.routes[method][0], metadata, (route) => route.score);
29
33
  this.routes[method][1] = undefined;
@@ -32,10 +36,10 @@ export class Router {
32
36
  return {
33
37
  route: (route) => {
34
38
  const path = options.prefix ? `${options.prefix}${route.path}` : route.path;
35
- const handler = async (context) =>
36
- // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
37
- options.middleware(route.handler, context);
38
- this.route({ ...route, path, handler });
39
+ const middleware = route.middleware
40
+ ? pipe(options.middleware, route.middleware)
41
+ : options.middleware;
42
+ this.route({ ...route, path, middleware });
39
43
  },
40
44
  group: (group) => {
41
45
  const prefix = options.prefix ? `${options.prefix}${group.prefix}` : group.prefix;
@@ -44,23 +48,23 @@ export class Router {
44
48
  },
45
49
  };
46
50
  }
47
- matchingRouteWithMetadata(request) {
48
- const routes = this.routes[request.method];
51
+ matchingRouteWithMetadata(method, path) {
52
+ const routes = this.routes[method];
49
53
  if (!routes)
50
- return this.matchingGeneralRouteWithMetadata(request);
51
- routes[1] ??= this.compileRegex(request.method);
52
- const match = routes[1].exec(request.path);
54
+ return this.matchingGeneralRouteWithMetadata(path);
55
+ routes[1] ??= this.compileRegex(method);
56
+ const match = routes[1].exec(path);
53
57
  if (!match)
54
- return this.matchingGeneralRouteWithMetadata(request);
58
+ return this.matchingGeneralRouteWithMetadata(path);
55
59
  const matchIndex = match.findLastIndex(Boolean) - 1;
56
60
  return routes[0][matchIndex];
57
61
  }
58
- matchingGeneralRouteWithMetadata(request) {
62
+ matchingGeneralRouteWithMetadata(path) {
59
63
  const routes = this.routes[ALL_METHODS];
60
64
  if (!routes)
61
65
  return;
62
- routes[1] ??= this.compileRegex(request.method);
63
- const match = routes[1].exec(request.path);
66
+ routes[1] ??= this.compileRegex(ALL_METHODS);
67
+ const match = routes[1].exec(path);
64
68
  if (!match)
65
69
  return;
66
70
  const matchIndex = match.findLastIndex(Boolean) - 1;
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;AAErD,MAAM,WAAW,GAAG,GAAG,CAAC;AA8CxB,MAAM,OAAO,MAAM;IACA,QAAQ,CAAU;IAClB,UAAU,CAAsB;IAEjD,mEAAmE;IAC3D,MAAM,GACZ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAEtB,YAAY,OAAgC;QAC1C,IAAI,CAAC,QAAQ,GAAG,OAAO,EAAE,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;QAC/D,IAAI,CAAC,UAAU,GAAG,OAAO,EAAE,UAAU,IAAI,CAAC,CAAC,CAAC,EAAO,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,aAAa,CAAC,OAAyC;QACrD,OAAO,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC;IACxD,CAAC;IAED,MAAM,GAAY,KAAK,EAAE,OAAO,EAAE,EAAE;QAClC,MAAM,iBAAiB,GAAG,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;QAElE,IAAI,CAAC,iBAAiB;YAAE,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE5D,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,iBAAiB,CAAC;QAEpD,MAAM,MAAM,GAAG,EAAE,GAAG,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAE,CAAC,MAAM,EAAE,CAAC;QAChE,MAAM,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;QAC9C,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACvD,CAAC,CAAC;IAEF,KAAK,CAAC,KAA4B;QAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAC7C,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,WAAW,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QACxC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACvE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IACrC,CAAC;IAED,KAAK,CAAa,OAAiC;QACjD,OAAO;YACL,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;gBACf,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;gBAC5E,MAAM,OAAO,GAA0B,KAAK,EAAE,OAAO,EAAE,EAAE;gBACvD,iEAAiE;gBACjE,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,OAAc,EAAE,OAAO,CAAC,CAAC;gBACpD,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;YAC1C,CAAC;YACD,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;gBACf,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;gBAClF,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;gBAC9D,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;YAC5C,CAAC;SACF,CAAC;IACJ,CAAC;IAEO,yBAAyB,CAC/B,OAAyC;QAEzC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,gCAAgC,CAAC,OAAO,CAAC,CAAC;QAEnE,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE3C,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC,gCAAgC,CAAC,OAAO,CAAC,CAAC;QAElE,MAAM,UAAU,GAAG,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACpD,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IAC/B,CAAC;IAEO,gCAAgC,CACtC,OAAyC;QAEzC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACxC,IAAI,CAAC,MAAM;YAAE,OAAO;QAEpB,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE3C,IAAI,CAAC,KAAK;YAAE,OAAO;QAEnB,MAAM,UAAU,GAAG,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACpD,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IAC/B,CAAC;IAEO,eAAe,CAAC,KAAqB;QAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5C,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QAEzE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC;IACjD,CAAC;IAEO,YAAY,CAAC,IAAY;QAC/B,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;YACrB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;gBACd,KAAK,IAAI,CAAC,CAAC;YACb,CAAC;iBAAM,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;gBACrB,KAAK,IAAI,CAAC,CAAC;YACb,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,WAAW,CAAC,IAAY;QAC9B,OAAO,CACL,IAAI;YACJ,IAAI;iBACD,OAAO,CAAC,0BAA0B,EAAE,MAAM,CAAC;iBAC3C,OAAO,CAAC,uBAAuB,EAAE,QAAQ,CAAC;iBAC1C,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC;iBAC1B,OAAO,CAAC,qBAAqB,EAAE,WAAW,CAAC;YAC9C,IAAI,CACL,CAAC;IACJ,CAAC;IAEO,oBAAoB,CAAC,IAAY;QACvC,OAAO,CACL,GAAG;YACH,IAAI;iBACD,OAAO,CAAC,0BAA0B,EAAE,MAAM,CAAC;iBAC3C,OAAO,CAAC,uBAAuB,EAAE,WAAW,CAAC;iBAC7C,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC;iBAC1B,OAAO,CAAC,qBAAqB,EAAE,cAAc,CAAC;YACjD,GAAG,CACJ,CAAC;IACJ,CAAC;IAEO,YAAY,CAAC,MAAc;QACjC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC5E,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;CACF;AAED,SAAS,YAAY,CAAI,KAAU,EAAE,KAAQ,EAAE,KAA2B;IACxE,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,IAAI,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC;IAExB,OAAO,GAAG,GAAG,IAAI,EAAE,CAAC;QAClB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAEzC,IAAI,KAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAE,CAAC,EAAE,CAAC;YACtC,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC;QAChB,CAAC;aAAM,CAAC;YACN,IAAI,GAAG,GAAG,CAAC;QACb,CAAC;IACH,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IAC5B,OAAO,GAAG,CAAC;AACb,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
@@ -6,7 +6,7 @@ export function text(options) {
6
6
  const contentType = context.headers.get('Content-Type');
7
7
  if (!contentType) {
8
8
  if (allowNoContent) {
9
- return await handler({ ...context, text: '' });
9
+ return await handler({ text: '' });
10
10
  }
11
11
  else {
12
12
  return await onInvalidContentType(context);
@@ -17,7 +17,7 @@ export function text(options) {
17
17
  const charsetMatch = /charset=([^;]*)/i.exec(contentType);
18
18
  const encoding = (charsetMatch?.[1]?.trim().toLowerCase() ?? 'utf-8');
19
19
  const text = await readText(context.body, encoding);
20
- return await handler({ ...context, text });
20
+ return await handler({ text });
21
21
  };
22
22
  }
23
23
  export function json(options) {
@@ -27,7 +27,7 @@ export function json(options) {
27
27
  const contentType = context.headers.get('Content-Type');
28
28
  if (!contentType) {
29
29
  if (allowNoContent) {
30
- return await handler({ ...context, json: undefined });
30
+ return await handler({ json: undefined });
31
31
  }
32
32
  else {
33
33
  return await onInvalidContentType(context);
@@ -36,7 +36,7 @@ export function json(options) {
36
36
  if (!contentType.startsWith('application/json'))
37
37
  return await onInvalidContentType(context);
38
38
  const json = await readJson(context.body, 'utf-8');
39
- return await handler({ ...context, json });
39
+ return await handler({ json });
40
40
  };
41
41
  }
42
42
  //# sourceMappingURL=contentType.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"contentType.js","sourceRoot":"","sources":["../../src/middleware/contentType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAiB,MAAM,sBAAsB,CAAC;AASzE,MAAM,UAAU,IAAI,CAAC,OAA4B;IAC/C,MAAM,cAAc,GAAG,OAAO,EAAE,aAAa,IAAI,IAAI,CAAC;IACtD,MAAM,oBAAoB,GAAG,OAAO,EAAE,oBAAoB,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IAExF,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;QAChC,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACxD,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,IAAI,cAAc,EAAE,CAAC;gBACnB,OAAO,MAAM,OAAO,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;YACjD,CAAC;iBAAM,CAAC;gBACN,OAAO,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC;YAAE,OAAO,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACtF,MAAM,YAAY,GAAG,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC1D,MAAM,QAAQ,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,IAAI,OAAO,CAAmB,CAAC;QACxF,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACpD,OAAO,MAAM,OAAO,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7C,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,IAAI,CAAC,OAA4B;IAC/C,MAAM,cAAc,GAAG,OAAO,EAAE,aAAa,IAAI,IAAI,CAAC;IACtD,MAAM,oBAAoB,GAAG,OAAO,EAAE,oBAAoB,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IAExF,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;QAChC,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACxD,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,IAAI,cAAc,EAAE,CAAC;gBACnB,OAAO,MAAM,OAAO,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;YACxD,CAAC;iBAAM,CAAC;gBACN,OAAO,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,kBAAkB,CAAC;YAAE,OAAO,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAC5F,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACnD,OAAO,MAAM,OAAO,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7C,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"contentType.js","sourceRoot":"","sources":["../../src/middleware/contentType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAiB,MAAM,sBAAsB,CAAC;AASzE,MAAM,UAAU,IAAI,CAAC,OAA4B;IAC/C,MAAM,cAAc,GAAG,OAAO,EAAE,aAAa,IAAI,IAAI,CAAC;IACtD,MAAM,oBAAoB,GAAG,OAAO,EAAE,oBAAoB,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IAExF,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;QAChC,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACxD,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,IAAI,cAAc,EAAE,CAAC;gBACnB,OAAO,MAAM,OAAO,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACN,OAAO,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC;YAAE,OAAO,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACtF,MAAM,YAAY,GAAG,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC1D,MAAM,QAAQ,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,IAAI,OAAO,CAAmB,CAAC;QACxF,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACpD,OAAO,MAAM,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IACjC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,IAAI,CAAC,OAA4B;IAC/C,MAAM,cAAc,GAAG,OAAO,EAAE,aAAa,IAAI,IAAI,CAAC;IACtD,MAAM,oBAAoB,GAAG,OAAO,EAAE,oBAAoB,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IAExF,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;QAChC,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACxD,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,IAAI,cAAc,EAAE,CAAC;gBACnB,OAAO,MAAM,OAAO,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;YAC5C,CAAC;iBAAM,CAAC;gBACN,OAAO,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,kBAAkB,CAAC;YAAE,OAAO,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAC5F,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACnD,OAAO,MAAM,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IACjC,CAAC,CAAC;AACJ,CAAC"}
@@ -1,11 +1,10 @@
1
1
  import type { Response } from '@glass-cannon/server';
2
2
  import type { RouteContext, RouteHandler } from '../index.js';
3
- export type Middleware<T = unknown> = (handler: RouteHandler<T>, request: RouteContext) => Promise<Response> | Response;
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.4",
4
+ "version": "0.0.6",
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"