@glass-cannon/router 0.8.0 → 0.8.2

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.
@@ -1,11 +1,11 @@
1
1
  import { readJson, readText } from '@glass-cannon/server';
2
2
  export function contentType({ contentType, deserializeRequest, allowNoContent = true, onInvalidContentType = () => ({ status: 415 }), }) {
3
- return async (handler, context) => {
3
+ return async (next, context) => {
4
4
  const contentTypeHeader = context.headers.get('Content-Type');
5
5
  if (!contentTypeHeader) {
6
6
  if (allowNoContent) {
7
7
  const body = await deserializeRequest();
8
- return await handler({ body });
8
+ return await next({ body });
9
9
  }
10
10
  else {
11
11
  return await onInvalidContentType(context);
@@ -20,7 +20,7 @@ export function contentType({ contentType, deserializeRequest, allowNoContent =
20
20
  catch {
21
21
  return await onInvalidContentType(context);
22
22
  }
23
- return await handler({ body });
23
+ return await next({ body });
24
24
  };
25
25
  }
26
26
  export function textBody(options) {
@@ -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,OAAO,EAAE,OAAO,EAAE,EAAE;QAChC,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,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;YACjC,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,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IACjC,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,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,10 +1,15 @@
1
1
  export * from './contentType.js';
2
2
  export function pipe(...middlewares) {
3
- return middlewares.reduceRight(pipeTwo, noop);
3
+ return middlewares.reduce(pipeTwo, noop);
4
4
  }
5
5
  function pipeTwo(middleware1, middleware2) {
6
6
  return (next, context) => {
7
- return middleware1((context1) => middleware2((context2) => next({ ...context1, ...context2 }), context), context);
7
+ return middleware1((newContext1) => {
8
+ return middleware2((newContext2) => next({ ...newContext1, ...newContext2 }), {
9
+ ...context,
10
+ ...newContext1,
11
+ });
12
+ }, context);
8
13
  };
9
14
  }
10
15
  export function applyMiddleware(middleware, handler) {
@@ -12,7 +17,7 @@ export function applyMiddleware(middleware, handler) {
12
17
  return await middleware((newContext) => handler({ ...context, ...newContext }), context);
13
18
  };
14
19
  }
15
- export const noop = (handler, context) => {
16
- return handler({});
20
+ export const noop = (next) => {
21
+ return next({});
17
22
  };
18
23
  //# 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,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"}
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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@glass-cannon/router",
3
3
  "type": "module",
4
- "version": "0.8.0",
4
+ "version": "0.8.2",
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.8.0"
19
+ "@glass-cannon/server": "0.8.2"
20
20
  },
21
21
  "devDependencies": {
22
22
  "@types/bun": "latest"