@konker.dev/middleware-fp 0.4.1 → 0.8.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.
Files changed (49) hide show
  1. package/dist/http/contrib/index.d.ts +3 -1
  2. package/dist/http/contrib/index.d.ts.map +1 -1
  3. package/dist/http/contrib/index.js +3 -1
  4. package/dist/http/contrib/index.js.map +1 -1
  5. package/dist/http/contrib/jsonBodyParserRequest.d.ts +8 -0
  6. package/dist/http/contrib/jsonBodyParserRequest.d.ts.map +1 -0
  7. package/dist/http/contrib/{jsonBodyParser.js → jsonBodyParserRequest.js} +4 -8
  8. package/dist/http/contrib/jsonBodyParserRequest.js.map +1 -0
  9. package/dist/http/contrib/jsonBodyParserRequest.test.d.ts +2 -0
  10. package/dist/http/contrib/jsonBodyParserRequest.test.d.ts.map +1 -0
  11. package/dist/http/contrib/{jsonBodyParser.test.js → jsonBodyParserRequest.test.js} +3 -21
  12. package/dist/http/contrib/jsonBodyParserRequest.test.js.map +1 -0
  13. package/dist/http/contrib/jsonBodySerializerResponse.d.ts +7 -0
  14. package/dist/http/contrib/jsonBodySerializerResponse.d.ts.map +1 -0
  15. package/dist/http/contrib/jsonBodySerializerResponse.js +20 -0
  16. package/dist/http/contrib/jsonBodySerializerResponse.js.map +1 -0
  17. package/dist/http/contrib/jsonBodySerializerResponse.test.d.ts +2 -0
  18. package/dist/http/contrib/jsonBodySerializerResponse.test.d.ts.map +1 -0
  19. package/dist/http/contrib/jsonBodySerializerResponse.test.js +61 -0
  20. package/dist/http/contrib/jsonBodySerializerResponse.test.js.map +1 -0
  21. package/dist/http/contrib/sqlClientInitPg/index.d.ts +8 -0
  22. package/dist/http/contrib/sqlClientInitPg/index.d.ts.map +1 -0
  23. package/dist/http/contrib/sqlClientInitPg/index.js +10 -0
  24. package/dist/http/contrib/sqlClientInitPg/index.js.map +1 -0
  25. package/dist/http/contrib/sqlClientInitPg/index.test.d.ts +4 -0
  26. package/dist/http/contrib/sqlClientInitPg/index.test.d.ts.map +1 -0
  27. package/dist/http/contrib/sqlClientInitPg/index.test.js +49 -0
  28. package/dist/http/contrib/sqlClientInitPg/index.test.js.map +1 -0
  29. package/dist/http/contrib/sqlClientInitPg/lib.d.ts +25 -0
  30. package/dist/http/contrib/sqlClientInitPg/lib.d.ts.map +1 -0
  31. package/dist/http/contrib/sqlClientInitPg/lib.js +40 -0
  32. package/dist/http/contrib/sqlClientInitPg/lib.js.map +1 -0
  33. package/dist/http/contrib/sqlClientInitPg/lib.test.d.ts +2 -0
  34. package/dist/http/contrib/sqlClientInitPg/lib.test.d.ts.map +1 -0
  35. package/dist/http/contrib/sqlClientInitPg/lib.test.js +45 -0
  36. package/dist/http/contrib/sqlClientInitPg/lib.test.js.map +1 -0
  37. package/dist/test/test-common.d.ts +4 -1
  38. package/dist/test/test-common.d.ts.map +1 -1
  39. package/dist/test/test-common.js +9 -0
  40. package/dist/test/test-common.js.map +1 -1
  41. package/dist/test/unit/kitchen-sink.test.js +3 -3
  42. package/dist/test/unit/kitchen-sink.test.js.map +1 -1
  43. package/package.json +30 -14
  44. package/dist/http/contrib/jsonBodyParser.d.ts +0 -10
  45. package/dist/http/contrib/jsonBodyParser.d.ts.map +0 -1
  46. package/dist/http/contrib/jsonBodyParser.js.map +0 -1
  47. package/dist/http/contrib/jsonBodyParser.test.d.ts +0 -2
  48. package/dist/http/contrib/jsonBodyParser.test.d.ts.map +0 -1
  49. package/dist/http/contrib/jsonBodyParser.test.js.map +0 -1
@@ -12,7 +12,8 @@ export * as headersValidator from './headersValidator.js';
12
12
  export * as helmetJsHeaders from './helmetJsHeaders.js';
13
13
  export * as honoAdapter from './honoAdapter.js';
14
14
  export * as identity from './identity.js';
15
- export * as jsonBodyParser from './jsonBodyParser.js';
15
+ export * as jsonBodyParserRequest from './jsonBodyParserRequest.js';
16
+ export * as jsonBodySerializerResponse from './jsonBodySerializerResponse.js';
16
17
  export * as jwtAuthenticator from './jwtAuthenticator.js';
17
18
  export * as jwtAuthenticatorRsa from './jwtAuthenticatorRsa.js';
18
19
  export * as jwtDecoder from './jwtDecoder.js';
@@ -22,6 +23,7 @@ export * as pathTokenAuthorizer from './pathTokenAuthorizer.js';
22
23
  export * as queryStringValidator from './queryStringValidator.js';
23
24
  export * as responseProcessor from './responseProcessor.js';
24
25
  export * as requestResponseLogger from './requestResponseLogger.js';
26
+ export * as sqlClientInitPg from './sqlClientInitPg/index.js';
25
27
  export * as standardRequestResponseAdapter from './standardRequestResponseAdapter.js';
26
28
  export * as trivial from './trivial.js';
27
29
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/http/contrib/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,6BAA6B,MAAM,oCAAoC,CAAC;AACpF,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,sBAAsB,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,yBAAyB,MAAM,sCAAsC,CAAC;AAClF,OAAO,KAAK,iBAAiB,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAC;AAChD,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,mBAAmB,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,uBAAuB,MAAM,8BAA8B,CAAC;AACxE,OAAO,KAAK,mBAAmB,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,oBAAoB,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAC;AACpE,OAAO,KAAK,8BAA8B,MAAM,qCAAqC,CAAC;AACtF,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/http/contrib/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,6BAA6B,MAAM,oCAAoC,CAAC;AACpF,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,sBAAsB,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,yBAAyB,MAAM,sCAAsC,CAAC;AAClF,OAAO,KAAK,iBAAiB,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAC;AAChD,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAC;AACpE,OAAO,KAAK,0BAA0B,MAAM,iCAAiC,CAAC;AAC9E,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,mBAAmB,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,uBAAuB,MAAM,8BAA8B,CAAC;AACxE,OAAO,KAAK,mBAAmB,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,oBAAoB,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAC;AACpE,OAAO,KAAK,eAAe,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,8BAA8B,MAAM,qCAAqC,CAAC;AACtF,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC"}
@@ -12,7 +12,8 @@ export * as headersValidator from './headersValidator.js';
12
12
  export * as helmetJsHeaders from './helmetJsHeaders.js';
13
13
  export * as honoAdapter from './honoAdapter.js';
14
14
  export * as identity from './identity.js';
15
- export * as jsonBodyParser from './jsonBodyParser.js';
15
+ export * as jsonBodyParserRequest from './jsonBodyParserRequest.js';
16
+ export * as jsonBodySerializerResponse from './jsonBodySerializerResponse.js';
16
17
  export * as jwtAuthenticator from './jwtAuthenticator.js';
17
18
  export * as jwtAuthenticatorRsa from './jwtAuthenticatorRsa.js';
18
19
  export * as jwtDecoder from './jwtDecoder.js';
@@ -22,6 +23,7 @@ export * as pathTokenAuthorizer from './pathTokenAuthorizer.js';
22
23
  export * as queryStringValidator from './queryStringValidator.js';
23
24
  export * as responseProcessor from './responseProcessor.js';
24
25
  export * as requestResponseLogger from './requestResponseLogger.js';
26
+ export * as sqlClientInitPg from './sqlClientInitPg/index.js';
25
27
  export * as standardRequestResponseAdapter from './standardRequestResponseAdapter.js';
26
28
  export * as trivial from './trivial.js';
27
29
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/http/contrib/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,6BAA6B,MAAM,oCAAoC,CAAC;AACpF,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,sBAAsB,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,yBAAyB,MAAM,sCAAsC,CAAC;AAClF,OAAO,KAAK,iBAAiB,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAC;AAChD,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,mBAAmB,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,uBAAuB,MAAM,8BAA8B,CAAC;AACxE,OAAO,KAAK,mBAAmB,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,oBAAoB,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAC;AACpE,OAAO,KAAK,8BAA8B,MAAM,qCAAqC,CAAC;AACtF,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/http/contrib/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,6BAA6B,MAAM,oCAAoC,CAAC;AACpF,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,sBAAsB,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,yBAAyB,MAAM,sCAAsC,CAAC;AAClF,OAAO,KAAK,iBAAiB,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAC;AAChD,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAC;AACpE,OAAO,KAAK,0BAA0B,MAAM,iCAAiC,CAAC;AAC9E,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,mBAAmB,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,uBAAuB,MAAM,8BAA8B,CAAC;AACxE,OAAO,KAAK,mBAAmB,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,oBAAoB,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAC;AACpE,OAAO,KAAK,eAAe,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,8BAA8B,MAAM,qCAAqC,CAAC;AACtF,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC"}
@@ -0,0 +1,8 @@
1
+ import type { MiddlewareError } from '../../lib/MiddlewareError.js';
2
+ import { type BodyRec, type RequestResponseHandler, type StrBodyRec } from '../index.js';
3
+ export type WithParsedBody = {
4
+ readonly body: unknown;
5
+ readonly jsonBodyParserRaw: string | undefined;
6
+ };
7
+ export declare const middleware: () => <I extends StrBodyRec, O extends BodyRec, E, R>(wrapped: RequestResponseHandler<I & WithParsedBody, O, E, R>) => RequestResponseHandler<I, O, E | MiddlewareError, R>;
8
+ //# sourceMappingURL=jsonBodyParserRequest.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"jsonBodyParserRequest.d.ts","sourceRoot":"","sources":["../../../src/http/contrib/jsonBodyParserRequest.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpE,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,sBAAsB,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAKzF,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;CAChD,CAAC;AAEF,eAAO,MAAM,UAAU,SAEpB,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,OAAO,EAAE,CAAC,EAAE,CAAC,EAC5C,SAAS,sBAAsB,CAAC,CAAC,GAAG,cAAc,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC3D,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAsBnD,CAAC"}
@@ -1,10 +1,10 @@
1
1
  import { pipe, Schema } from 'effect';
2
2
  import * as Effect from 'effect/Effect';
3
3
  import { toMiddlewareError } from '../../lib/MiddlewareError.js';
4
- import { makeResponseW } from '../index.js';
4
+ import {} from '../index.js';
5
5
  import { makeRequestW } from '../RequestW.js';
6
- const TAG = 'jsonBodyParser';
7
- export const middleware = ({ encodeResponseBody = true } = {}) => (wrapped) => (i) => pipe(
6
+ const TAG = 'jsonBodyParserRequest';
7
+ export const middleware = () => (wrapped) => (i) => pipe(
8
8
  // Lift the input
9
9
  Effect.succeed(i),
10
10
  // Log before
@@ -16,10 +16,6 @@ Effect.flatMap((i) => (i.body ? pipe(i.body, Schema.decode(Schema.parseJson()))
16
16
  })),
17
17
  // Call the next middleware in the stack
18
18
  Effect.flatMap(wrapped),
19
- // Encode the response body
20
- Effect.flatMap((o) => o.body && encodeResponseBody
21
- ? pipe(o.body, Schema.encode(Schema.parseJson()), Effect.mapError(toMiddlewareError), Effect.map((encodedBody) => makeResponseW(o, { body: encodedBody })))
22
- : Effect.succeed(o)),
23
19
  // Log after
24
20
  Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
25
- //# sourceMappingURL=jsonBodyParser.js.map
21
+ //# sourceMappingURL=jsonBodyParserRequest.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"jsonBodyParserRequest.js","sourceRoot":"","sources":["../../../src/http/contrib/jsonBodyParserRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAA8D,MAAM,aAAa,CAAC;AACzF,OAAO,EAAE,YAAY,EAAiB,MAAM,gBAAgB,CAAC;AAE7D,MAAM,GAAG,GAAG,uBAAuB,CAAC;AAOpC,MAAM,CAAC,MAAM,UAAU,GACrB,GAAG,EAAE,CACL,CACE,OAA4D,EACN,EAAE,CAC1D,CAAC,CAAc,EAAE,EAAE,CACjB,IAAI;AACF,iBAAiB;AACjB,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;AACjB,aAAa;AACb,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC;AAC1C,uCAAuC;AACvC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAC1G,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAClC,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CACxB,YAAY,CAAC,CAAC,EAAE;IACd,IAAI,EAAE,UAAU;IAChB,iBAAiB,EAAE,CAAC,CAAC,IAAI;CAC1B,CAAC,CACH;AAED,wCAAwC;AACxC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;AAEvB,YAAY;AACZ,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAC5C,CAAC"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=jsonBodyParserRequest.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"jsonBodyParserRequest.test.d.ts","sourceRoot":"","sources":["../../../src/http/contrib/jsonBodyParserRequest.test.ts"],"names":[],"mappings":""}
@@ -3,31 +3,13 @@ import * as Effect from 'effect/Effect';
3
3
  import { describe, expect, it } from 'vitest';
4
4
  import { echoCoreIn200W } from '../../test/test-common.js';
5
5
  import { EMPTY_REQUEST_W, makeRequestW } from '../RequestW.js';
6
- import * as unit from './jsonBodyParser.js';
6
+ import * as unit from './jsonBodyParserRequest.js';
7
7
  const TEST_IN_1 = makeRequestW(EMPTY_REQUEST_W, { body: '{"foo":"ABC"}' });
8
8
  const TEST_IN_2 = makeRequestW(EMPTY_REQUEST_W, { body: 'NOT_JSON' });
9
9
  describe('middleware/json-body-parser', () => {
10
10
  it('should work as expected with default params', async () => {
11
11
  const egHandler = pipe(echoCoreIn200W, unit.middleware());
12
12
  const result = pipe(egHandler(TEST_IN_1), Effect.runPromise);
13
- await expect(result).resolves.toStrictEqual({
14
- statusCode: 200,
15
- body: '{"foo":"ABC"}',
16
- headers: {},
17
- in: {
18
- url: '/',
19
- method: 'GET',
20
- headers: {},
21
- pathParameters: {},
22
- queryStringParameters: {},
23
- jsonBodyParserRaw: '{"foo":"ABC"}',
24
- body: { foo: 'ABC' },
25
- },
26
- });
27
- });
28
- it('should work as expected with encodeResponseBody=false', async () => {
29
- const egHandler = pipe(echoCoreIn200W, unit.middleware({ encodeResponseBody: false }));
30
- const result = pipe(egHandler(TEST_IN_1), Effect.runPromise);
31
13
  await expect(result).resolves.toStrictEqual({
32
14
  statusCode: 200,
33
15
  body: { foo: 'ABC' },
@@ -53,7 +35,7 @@ describe('middleware/json-body-parser', () => {
53
35
  const result = pipe(egHandler(EMPTY_REQUEST_W), Effect.runPromise);
54
36
  await expect(result).resolves.toStrictEqual({
55
37
  statusCode: 200,
56
- body: '"OK"',
38
+ body: 'OK',
57
39
  headers: {},
58
40
  in: {
59
41
  url: '/',
@@ -67,4 +49,4 @@ describe('middleware/json-body-parser', () => {
67
49
  });
68
50
  });
69
51
  });
70
- //# sourceMappingURL=jsonBodyParser.test.js.map
52
+ //# sourceMappingURL=jsonBodyParserRequest.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"jsonBodyParserRequest.test.js","sourceRoot":"","sources":["../../../src/http/contrib/jsonBodyParserRequest.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,KAAK,IAAI,MAAM,4BAA4B,CAAC;AAEnD,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;AAC3E,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;AAEtE,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;IAC3C,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;QAC3D,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAC7D,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;YAC1C,UAAU,EAAE,GAAG;YACf,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE;YACpB,OAAO,EAAE,EAAE;YACX,EAAE,EAAE;gBACF,GAAG,EAAE,GAAG;gBACR,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,EAAE;gBACX,cAAc,EAAE,EAAE;gBAClB,qBAAqB,EAAE,EAAE;gBACzB,iBAAiB,EAAE,eAAe;gBAClC,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE;aACrB;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;QACrD,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAC7D,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;QACzD,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QACnE,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;YAC1C,UAAU,EAAE,GAAG;YACf,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,EAAE;YACX,EAAE,EAAE;gBACF,GAAG,EAAE,GAAG;gBACR,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,EAAE;gBACX,cAAc,EAAE,EAAE;gBAClB,qBAAqB,EAAE,EAAE;gBACzB,IAAI,EAAE,SAAS;gBACf,iBAAiB,EAAE,SAAS;aAC7B;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -0,0 +1,7 @@
1
+ import type { MiddlewareError } from '../../lib/MiddlewareError.js';
2
+ import { type BodyRec, type RequestResponseHandler, type StrBodyRec } from '../index.js';
3
+ export type WithSerializedBody = {
4
+ readonly body?: string;
5
+ };
6
+ export declare const middleware: () => <I extends StrBodyRec, O extends BodyRec, E, R>(wrapped: RequestResponseHandler<I, O, E, R>) => RequestResponseHandler<I, O & WithSerializedBody, E | MiddlewareError, R>;
7
+ //# sourceMappingURL=jsonBodySerializerResponse.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"jsonBodySerializerResponse.d.ts","sourceRoot":"","sources":["../../../src/http/contrib/jsonBodySerializerResponse.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpE,OAAO,EAAE,KAAK,OAAO,EAAiB,KAAK,sBAAsB,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAKxG,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,UAAU,SAEpB,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,OAAO,EAAE,CAAC,EAAE,CAAC,EAC5C,SAAS,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC1C,sBAAsB,CAAC,CAAC,EAAE,CAAC,GAAG,kBAAkB,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CA0BxE,CAAC"}
@@ -0,0 +1,20 @@
1
+ import { pipe, Schema } from 'effect';
2
+ import * as Effect from 'effect/Effect';
3
+ import { toMiddlewareError } from '../../lib/MiddlewareError.js';
4
+ import { makeResponseW } from '../index.js';
5
+ import {} from '../RequestW.js';
6
+ const TAG = 'jsonBodySerializerResponse';
7
+ export const middleware = () => (wrapped) => (i) => pipe(
8
+ // Lift the input
9
+ Effect.succeed(i),
10
+ // Log before
11
+ Effect.tap(Effect.logDebug(`[${TAG}] IN`)),
12
+ // Call the next middleware in the stack
13
+ Effect.flatMap(wrapped),
14
+ // Encode the response body
15
+ Effect.flatMap((o) => o.body
16
+ ? pipe(o.body, Schema.encode(Schema.parseJson()), Effect.mapError(toMiddlewareError), Effect.map((encodedBody) => makeResponseW(o, { body: encodedBody })), (x) => x)
17
+ : Effect.succeed(makeResponseW(o, { body: '' }))),
18
+ // Log after
19
+ Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
20
+ //# sourceMappingURL=jsonBodySerializerResponse.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"jsonBodySerializerResponse.js","sourceRoot":"","sources":["../../../src/http/contrib/jsonBodySerializerResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAgB,aAAa,EAAgD,MAAM,aAAa,CAAC;AACxG,OAAO,EAAiB,MAAM,gBAAgB,CAAC;AAE/C,MAAM,GAAG,GAAG,4BAA4B,CAAC;AAMzC,MAAM,CAAC,MAAM,UAAU,GACrB,GAAG,EAAE,CACL,CACE,OAA2C,EACgC,EAAE,CAC/E,CAAC,CAAc,EAAE,EAAE,CACjB,IAAI;AACF,iBAAiB;AACjB,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;AACjB,aAAa;AACb,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC;AAE1C,wCAAwC;AACxC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;AAEvB,2BAA2B;AAC3B,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACnB,CAAC,CAAC,IAAI;IACJ,CAAC,CAAC,IAAI,CACF,CAAC,CAAC,IAAI,EACN,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,EACjC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAClC,MAAM,CAAC,GAAG,CAAC,CAAC,WAAmB,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,EAC5E,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CACT;IACH,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CACnD;AAED,YAAY;AACZ,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAC5C,CAAC"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=jsonBodySerializerResponse.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"jsonBodySerializerResponse.test.d.ts","sourceRoot":"","sources":["../../../src/http/contrib/jsonBodySerializerResponse.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,61 @@
1
+ import { pipe } from 'effect';
2
+ import * as Effect from 'effect/Effect';
3
+ import { describe, expect, it } from 'vitest';
4
+ import { echoCoreIn200W, echoCoreInStrict200W } from '../../test/test-common.js';
5
+ import { EMPTY_REQUEST_W, makeRequestW } from '../RequestW.js';
6
+ import * as unit from './jsonBodySerializerResponse.js';
7
+ const TEST_IN_1 = makeRequestW(EMPTY_REQUEST_W, { body: { foo: 'ABC' } });
8
+ const TEST_IN_2 = makeRequestW(EMPTY_REQUEST_W, { body: 'NOT_JSON' });
9
+ describe('middleware/json-body-serializer', () => {
10
+ it('should work as expected with default params', async () => {
11
+ const egHandler = pipe(echoCoreIn200W, unit.middleware());
12
+ const result = pipe(egHandler(TEST_IN_1), Effect.runPromise);
13
+ await expect(result).resolves.toStrictEqual({
14
+ statusCode: 200,
15
+ body: '{"foo":"ABC"}',
16
+ headers: {},
17
+ in: {
18
+ url: '/',
19
+ method: 'GET',
20
+ headers: {},
21
+ pathParameters: {},
22
+ queryStringParameters: {},
23
+ body: { foo: 'ABC' },
24
+ },
25
+ });
26
+ });
27
+ it('should work as expected with string body', async () => {
28
+ const egHandler = pipe(echoCoreIn200W, unit.middleware());
29
+ const result = pipe(egHandler(TEST_IN_2), Effect.runPromise);
30
+ await expect(result).resolves.toStrictEqual({
31
+ statusCode: 200,
32
+ body: '"NOT_JSON"',
33
+ headers: {},
34
+ in: {
35
+ url: '/',
36
+ method: 'GET',
37
+ headers: {},
38
+ pathParameters: {},
39
+ queryStringParameters: {},
40
+ body: 'NOT_JSON',
41
+ },
42
+ });
43
+ });
44
+ it('should work as expected with missing body', async () => {
45
+ const egHandler = pipe(echoCoreInStrict200W, unit.middleware());
46
+ const result = pipe(egHandler(EMPTY_REQUEST_W), Effect.runPromise);
47
+ await expect(result).resolves.toStrictEqual({
48
+ statusCode: 200,
49
+ body: '',
50
+ headers: {},
51
+ in: {
52
+ url: '/',
53
+ method: 'GET',
54
+ headers: {},
55
+ pathParameters: {},
56
+ queryStringParameters: {},
57
+ },
58
+ });
59
+ });
60
+ });
61
+ //# sourceMappingURL=jsonBodySerializerResponse.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"jsonBodySerializerResponse.test.js","sourceRoot":"","sources":["../../../src/http/contrib/jsonBodySerializerResponse.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,8 @@
1
+ import type { SqlClient } from '@effect/sql/SqlClient';
2
+ import type { SqlError } from '@effect/sql/SqlError';
3
+ import type { ConfigError, Layer } from 'effect';
4
+ import type { Rec, RequestResponseHandler } from '../../index.js';
5
+ export type Adapted<R> = Exclude<R, SqlClient>;
6
+ export { SslConfigSchema, type SslConfig } from './lib.js';
7
+ export declare const middleware: (pgSqlClientLayer?: Layer.Layer<SqlClient, ConfigError.ConfigError | SqlError>) => <I extends Rec, O extends Rec, E, R>(wrapped: RequestResponseHandler<I, O, E, R | SqlClient>) => RequestResponseHandler<I, O, E | ConfigError.ConfigError | SqlError, Adapted<R>>;
8
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAIjD,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAMlE,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;AAE/C,OAAO,EAAE,eAAe,EAAE,KAAK,SAAS,EAAE,MAAM,UAAU,CAAC;AAE3D,eAAO,MAAM,UAAU,GACpB,mBAAmB,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,WAAW,CAAC,WAAW,GAAG,QAAQ,CAAC,MAC7E,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,EACjC,SAAS,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,KACtD,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,WAAW,GAAG,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAKjF,CAAC"}
@@ -0,0 +1,10 @@
1
+ import { pipe } from 'effect';
2
+ import * as Effect from 'effect/Effect';
3
+ import { createDefaultPgSqlClientLayer } from './lib.js';
4
+ const TAG = 'sqlClientInitPg';
5
+ export { SslConfigSchema } from './lib.js';
6
+ export const middleware = (pgSqlClientLayer) => (wrapped) => (i) => {
7
+ const layer = pgSqlClientLayer ?? createDefaultPgSqlClientLayer();
8
+ return pipe(wrapped(i), Effect.provide(layer), Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
9
+ };
10
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,EAAE,6BAA6B,EAAE,MAAM,UAAU,CAAC;AAEzD,MAAM,GAAG,GAAG,iBAAiB,CAAC;AAI9B,OAAO,EAAE,eAAe,EAAkB,MAAM,UAAU,CAAC;AAE3D,MAAM,CAAC,MAAM,UAAU,GACrB,CAAC,gBAA6E,EAAE,EAAE,CAClF,CACE,OAAuD,EAC2B,EAAE,CACtF,CAAC,CAAc,EAAE,EAAE;IACjB,MAAM,KAAK,GAAG,gBAAgB,IAAI,6BAA6B,EAAE,CAAC;IAElE,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAC9F,CAAC,CAAC"}
@@ -0,0 +1,4 @@
1
+ import { SqlClient } from '@effect/sql/SqlClient';
2
+ import { Layer } from 'effect';
3
+ export declare const MockPgSqlClientLayer: Layer.Layer<SqlClient, never, never>;
4
+ //# sourceMappingURL=index.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.test.d.ts","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/index.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,KAAK,EAAQ,MAAM,QAAQ,CAAC;AAUrC,eAAO,MAAM,oBAAoB,sCAAsC,CAAC"}
@@ -0,0 +1,49 @@
1
+ import { SqlClient } from '@effect/sql/SqlClient';
2
+ import { Layer, pipe } from 'effect';
3
+ import * as Effect from 'effect/Effect';
4
+ import { describe, expect, it, vi } from 'vitest';
5
+ import { echoCoreIn200W } from '../../../test/test-common.js';
6
+ import { EMPTY_REQUEST_W } from '../../RequestW.js';
7
+ import * as unit from './index.js';
8
+ import * as unitLib from './lib.js';
9
+ // Create a mock PgDrizzle layer for testing
10
+ export const MockPgSqlClientLayer = Layer.succeed(SqlClient, {});
11
+ describe('middleware/sql-client-pg-init', () => {
12
+ describe('middleware', () => {
13
+ it('should work as expected', async () => {
14
+ const egHandler = pipe(echoCoreIn200W, unit.middleware(MockPgSqlClientLayer));
15
+ const result = await pipe(egHandler(EMPTY_REQUEST_W), Effect.runPromise);
16
+ expect(result).toMatchObject({
17
+ body: 'OK',
18
+ headers: {},
19
+ in: {
20
+ url: '/',
21
+ headers: {},
22
+ method: 'GET',
23
+ pathParameters: {},
24
+ queryStringParameters: {},
25
+ },
26
+ statusCode: 200,
27
+ });
28
+ });
29
+ it('should work as expected with default layer', async () => {
30
+ const spy = vi.spyOn(unitLib, 'createDefaultPgSqlClientLayer').mockReturnValue(MockPgSqlClientLayer);
31
+ const egHandler = pipe(echoCoreIn200W, unit.middleware());
32
+ const result = await pipe(egHandler(EMPTY_REQUEST_W), Effect.runPromise);
33
+ expect(spy).toHaveBeenCalledTimes(1);
34
+ expect(result).toMatchObject({
35
+ body: 'OK',
36
+ headers: {},
37
+ in: {
38
+ url: '/',
39
+ headers: {},
40
+ method: 'GET',
41
+ pathParameters: {},
42
+ queryStringParameters: {},
43
+ },
44
+ statusCode: 200,
45
+ });
46
+ });
47
+ });
48
+ });
49
+ //# sourceMappingURL=index.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/index.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAElD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,IAAI,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,OAAO,MAAM,UAAU,CAAC;AAEpC,4CAA4C;AAC5C,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,EAAS,CAAC,CAAC;AAExE,QAAQ,CAAC,+BAA+B,EAAE,GAAG,EAAE;IAC7C,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QAC1B,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;YACvC,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,CAAC;YAE9E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;YAEzE,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC;gBAC3B,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE,EAAE;gBACX,EAAE,EAAE;oBACF,GAAG,EAAE,GAAG;oBACR,OAAO,EAAE,EAAE;oBACX,MAAM,EAAE,KAAK;oBACb,cAAc,EAAE,EAAE;oBAClB,qBAAqB,EAAE,EAAE;iBAC1B;gBACD,UAAU,EAAE,GAAG;aAChB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;YAC1D,MAAM,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,+BAA+B,CAAC,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAC;YACrG,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;YAE1D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;YAEzE,MAAM,CAAC,GAAG,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAErC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC;gBAC3B,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE,EAAE;gBACX,EAAE,EAAE;oBACF,GAAG,EAAE,GAAG;oBACR,OAAO,EAAE,EAAE;oBACX,MAAM,EAAE,KAAK;oBACb,cAAc,EAAE,EAAE;oBAClB,qBAAqB,EAAE,EAAE;iBAC1B;gBACD,UAAU,EAAE,GAAG;aAChB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -0,0 +1,25 @@
1
+ import type { SqlClient } from '@effect/sql/SqlClient';
2
+ import type { SqlError } from '@effect/sql/SqlError';
3
+ import { Config, ConfigError, type Layer, Schema } from 'effect';
4
+ export declare const SslConfigSchema: Schema.transform<Schema.SchemaClass<unknown, string, never>, Schema.Union<[typeof Schema.Boolean, Schema.Record$<typeof Schema.String, typeof Schema.Unknown>]>>;
5
+ export type SslConfig = typeof SslConfigSchema.Type;
6
+ /**
7
+ * Resolves the SSL configuration for the database by reading and decoding the `DATABASE_SSL` environment variable.
8
+ * If the variable is not set or cannot be decoded, a default value will be applied.
9
+ *
10
+ * @param {SslConfig} [defaultValue=false] - The default SSL configuration to use if no valid configuration is provided.
11
+ * @return {Config.Config<SslConfig>} A configuration object for the SSL configuration, derived from the environment variable or fallback value.
12
+ */
13
+ export declare function resolveSslConfig(defaultValue: SslConfig): Config.Config<SslConfig>;
14
+ /**
15
+ * Creates a default postgresql client layer configured using environment variables.
16
+ *
17
+ * The configuration includes parameters such as host, port, username, password,
18
+ * database name, and SSL settings. These values are retrieved from the environment
19
+ * or configuration system.
20
+ *
21
+ * @return {Layer.Layer<SqlClient, ConfigError.ConfigError | SqlError>} A layer encapsulating the
22
+ * postgresql client, which can potentially fail due to configuration or SQL-related errors.
23
+ */
24
+ export declare function createDefaultPgSqlClientLayer(): Layer.Layer<SqlClient, ConfigError.ConfigError | SqlError>;
25
+ //# sourceMappingURL=lib.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/lib.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAErD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAU,KAAK,KAAK,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAC;AAK/E,eAAO,MAAM,eAAe,kKAE3B,CAAC;AACF,MAAM,MAAM,SAAS,GAAG,OAAO,eAAe,CAAC,IAAI,CAAC;AAGpD;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAclF;AAGD;;;;;;;;;GASG;AACH,wBAAgB,6BAA6B,IAAI,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,WAAW,CAAC,WAAW,GAAG,QAAQ,CAAC,CAS1G"}
@@ -0,0 +1,40 @@
1
+ import { PgClient } from '@effect/sql-pg';
2
+ import { Config, ConfigError, Either, pipe, Schema } from 'effect';
3
+ import { TreeFormatter } from 'effect/ParseResult';
4
+ // --------------------------------------------------------------------------
5
+ export const SslConfigSchema = Schema.parseJson(Schema.Union(Schema.Boolean, Schema.Record({ key: Schema.String, value: Schema.Unknown })));
6
+ // --------------------------------------------------------------------------
7
+ /**
8
+ * Resolves the SSL configuration for the database by reading and decoding the `DATABASE_SSL` environment variable.
9
+ * If the variable is not set or cannot be decoded, a default value will be applied.
10
+ *
11
+ * @param {SslConfig} [defaultValue=false] - The default SSL configuration to use if no valid configuration is provided.
12
+ * @return {Config.Config<SslConfig>} A configuration object for the SSL configuration, derived from the environment variable or fallback value.
13
+ */
14
+ export function resolveSslConfig(defaultValue) {
15
+ return Config.string('DATABASE_SSL')
16
+ .pipe(Config.mapOrFail((str) => pipe(str, Schema.decodeUnknownEither(SslConfigSchema), Either.mapLeft((err) => ConfigError.InvalidData([], `[${str}]` + TreeFormatter.formatErrorSync(err))))))
17
+ .pipe(Config.withDefault(defaultValue));
18
+ }
19
+ // --------------------------------------------------------------------------
20
+ /**
21
+ * Creates a default postgresql client layer configured using environment variables.
22
+ *
23
+ * The configuration includes parameters such as host, port, username, password,
24
+ * database name, and SSL settings. These values are retrieved from the environment
25
+ * or configuration system.
26
+ *
27
+ * @return {Layer.Layer<SqlClient, ConfigError.ConfigError | SqlError>} A layer encapsulating the
28
+ * postgresql client, which can potentially fail due to configuration or SQL-related errors.
29
+ */
30
+ export function createDefaultPgSqlClientLayer() {
31
+ return PgClient.layerConfig({
32
+ host: Config.string('DATABASE_HOST'),
33
+ port: Config.number('DATABASE_PORT'),
34
+ username: Config.string('DATABASE_USER'),
35
+ password: Config.redacted('DATABASE_PASSWORD'),
36
+ database: Config.string('DATABASE_NAME'),
37
+ ssl: resolveSslConfig(false),
38
+ });
39
+ }
40
+ //# sourceMappingURL=lib.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"lib.js","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/lib.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAc,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE/E,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,6EAA6E;AAC7E,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,SAAS,CAC7C,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAC3F,CAAC;AAGF,6EAA6E;AAC7E;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAAC,YAAuB;IACtD,OAAO,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;SACjC,IAAI,CACH,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CACvB,IAAI,CACF,GAAG,EACH,MAAM,CAAC,mBAAmB,CAAC,eAAe,CAAC,EAC3C,MAAM,CAAC,OAAO,CAAC,CAAC,GAAe,EAAE,EAAE,CACjC,WAAW,CAAC,WAAW,CAAC,EAAE,EAAE,IAAI,GAAG,GAAG,GAAG,aAAa,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAC7E,CACF,CACF,CACF;SACA,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC;AAC5C,CAAC;AAED,6EAA6E;AAC7E;;;;;;;;;GASG;AACH,MAAM,UAAU,6BAA6B;IAC3C,OAAO,QAAQ,CAAC,WAAW,CAAC;QAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC;QACpC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC;QACpC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC;QACxC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAC;QAC9C,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC;QACxC,GAAG,EAAE,gBAAgB,CAAC,KAAK,CAAC;KAC7B,CAAC,CAAC;AACL,CAAC"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=lib.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"lib.test.d.ts","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/lib.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,45 @@
1
+ import { Effect, pipe } from 'effect';
2
+ import { afterAll, afterEach, beforeAll, describe, expect, it } from 'vitest';
3
+ import * as unit from './lib.js';
4
+ describe('middleware/sql-client-pg-init/lib', () => {
5
+ describe('resolveSslConfig', () => {
6
+ let _oldEnv;
7
+ beforeAll(() => {
8
+ _oldEnv = process.env;
9
+ process.env = {};
10
+ });
11
+ afterEach(() => {
12
+ process.env = {};
13
+ });
14
+ afterAll(() => {
15
+ process.env = _oldEnv;
16
+ });
17
+ it('should work as expected with boolean value', async () => {
18
+ process.env.DATABASE_SSL = 'true';
19
+ const actual = await pipe(unit.resolveSslConfig(false), Effect.runPromise);
20
+ expect(actual).toEqual(true);
21
+ });
22
+ it('should work as expected with record value', async () => {
23
+ process.env.DATABASE_SSL = '{ "rejectUnauthorized": false }';
24
+ const actual = await pipe(unit.resolveSslConfig(false), Effect.runPromise);
25
+ expect(actual).toStrictEqual({ rejectUnauthorized: false });
26
+ });
27
+ it('should work as expected with default value', async () => {
28
+ const actual = await pipe(unit.resolveSslConfig({ foo: 123 }), Effect.runPromise);
29
+ expect(actual).toStrictEqual({ foo: 123 });
30
+ });
31
+ it('should work as expected with an invalid value', async () => {
32
+ process.env.DATABASE_SSL = '123';
33
+ const actual = async () => pipe(unit.resolveSslConfig(false), Effect.runPromise);
34
+ await expect(actual).rejects.toThrow('Invalid data at DATABASE_SSL');
35
+ });
36
+ });
37
+ describe('createDefaultPgSqlClientLayer', () => {
38
+ it('should work as expected', async () => {
39
+ const layer = unit.createDefaultPgSqlClientLayer();
40
+ // TODO: better assertion?
41
+ expect(layer).toBeDefined();
42
+ });
43
+ });
44
+ });
45
+ //# sourceMappingURL=lib.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"lib.test.js","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/lib.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9E,OAAO,KAAK,IAAI,MAAM,UAAU,CAAC;AAEjC,QAAQ,CAAC,mCAAmC,EAAE,GAAG,EAAE;IACjD,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAChC,IAAI,OAA0B,CAAC;QAC/B,SAAS,CAAC,GAAG,EAAE;YACb,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;YACtB,OAAO,CAAC,GAAG,GAAG,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;QACH,SAAS,CAAC,GAAG,EAAE;YACb,OAAO,CAAC,GAAG,GAAG,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;QACH,QAAQ,CAAC,GAAG,EAAE;YACZ,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;YAC1D,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,MAAM,CAAC;YAClC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;YAE3E,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;YACzD,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,iCAAiC,CAAC;YAC7D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;YAE3E,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;YAC1D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;YAElF,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;YAC7D,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,KAAK,CAAC;YACjC,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;YAEjF,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,+BAA+B,EAAE,GAAG,EAAE;QAC7C,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;YACvC,MAAM,KAAK,GAAG,IAAI,CAAC,6BAA6B,EAAE,CAAC;YAEnD,0BAA0B;YAC1B,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;QAC9B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -7,7 +7,10 @@ export declare const TestDepsW: Context.Tag<any, any>;
7
7
  export declare function echoCoreIn200W<I extends RequestW>(i: I): Effect.Effect<ResponseW<{
8
8
  in: I;
9
9
  }>>;
10
- export declare const echoCoreInDepsW: <I extends RequestW, E, R extends Record<string, unknown>>(Deps: Context.Tag<R, R>) => (i: I) => Effect.Effect<ResponseW<{
10
+ export declare function echoCoreInStrict200W<I extends RequestW>(i: I): Effect.Effect<ResponseW<{
11
+ in: I;
12
+ }>>;
13
+ export declare const echoCoreInDepsW: <I extends RequestW, E, R>(Deps: Context.Tag<R, R>) => (i: I) => Effect.Effect<ResponseW<{
11
14
  in: I;
12
15
  deps: R;
13
16
  }>, E, R>;
@@ -1 +1 @@
1
- {"version":3,"file":"test-common.d.ts","sourceRoot":"","sources":["../../src/test/test-common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAQ,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAiB,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAErE,MAAM,MAAM,SAAS,GAAG,GAAG,CAAC;AAC5B,eAAO,MAAM,SAAS,uBAAmC,CAAC;AAG1D,wBAAgB,cAAc,CAAC,CAAC,SAAS,QAAQ,EAAE,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC;IAAE,EAAE,EAAE,CAAC,CAAA;CAAE,CAAC,CAAC,CAa5F;AAGD,eAAO,MAAM,eAAe,GACzB,CAAC,SAAS,QAAQ,EAAE,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,MACjF,GAAG,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC;IAAE,EAAE,EAAE,CAAC,CAAC;IAAC,IAAI,EAAE,CAAC,CAAA;CAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAgBxD,CAAC"}
1
+ {"version":3,"file":"test-common.d.ts","sourceRoot":"","sources":["../../src/test/test-common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAQ,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAiB,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAErE,MAAM,MAAM,SAAS,GAAG,GAAG,CAAC;AAC5B,eAAO,MAAM,SAAS,uBAAmC,CAAC;AAG1D,wBAAgB,cAAc,CAAC,CAAC,SAAS,QAAQ,EAAE,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC;IAAE,EAAE,EAAE,CAAC,CAAA;CAAE,CAAC,CAAC,CAa5F;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,QAAQ,EAAE,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC;IAAE,EAAE,EAAE,CAAC,CAAA;CAAE,CAAC,CAAC,CAalG;AAGD,eAAO,MAAM,eAAe,GACzB,CAAC,SAAS,QAAQ,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,MACjD,GAAG,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC;IAAE,EAAE,EAAE,CAAC,CAAC;IAAC,IAAI,EAAE,CAAC,CAAA;CAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAgBxD,CAAC"}
@@ -12,6 +12,15 @@ export function echoCoreIn200W(i) {
12
12
  body: i.body ?? 'OK',
13
13
  }, { in: i }));
14
14
  }
15
+ export function echoCoreInStrict200W(i) {
16
+ return Effect.succeed(makeResponseW({
17
+ statusCode: 200,
18
+ headers: {
19
+ ...i.headers,
20
+ },
21
+ body: i.body,
22
+ }, { in: i }));
23
+ }
15
24
  // TODO: type annotation comment
16
25
  export const echoCoreInDepsW = (Deps) => (i) => {
17
26
  return pipe(Deps, Effect.map((deps) => makeResponseW({
@@ -1 +1 @@
1
- {"version":3,"file":"test-common.js","sourceRoot":"","sources":["../../src/test/test-common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,aAAa,EAAkB,MAAM,sBAAsB,CAAC;AAGrE,MAAM,CAAC,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAM,OAAO,CAAC,CAAC;AAE1D,gCAAgC;AAChC,MAAM,UAAU,cAAc,CAAqB,CAAI;IACrD,OAAO,MAAM,CAAC,OAAO,CACnB,aAAa,CACX;QACE,UAAU,EAAE,GAAG;QACf,OAAO,EAAE;YACP,GAAG,CAAC,CAAC,OAAO;SACb;QACD,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI;KACrB,EACD,EAAE,EAAE,EAAE,CAAC,EAAE,CACV,CACF,CAAC;AACJ,CAAC;AAED,gCAAgC;AAChC,MAAM,CAAC,MAAM,eAAe,GAC1B,CAA2D,IAAuB,EAAE,EAAE,CACtF,CAAC,CAAI,EAAsD,EAAE;IAC3D,OAAO,IAAI,CACT,IAAI,EACJ,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAClB,aAAa,CACX;QACE,UAAU,EAAE,GAAG;QACf,OAAO,EAAE;YACP,GAAG,CAAC,CAAC,OAAO;SACb;QACD,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI;KACrB,EACD,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAChB,CACF,CACF,CAAC;AACJ,CAAC,CAAC"}
1
+ {"version":3,"file":"test-common.js","sourceRoot":"","sources":["../../src/test/test-common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,aAAa,EAAkB,MAAM,sBAAsB,CAAC;AAGrE,MAAM,CAAC,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAM,OAAO,CAAC,CAAC;AAE1D,gCAAgC;AAChC,MAAM,UAAU,cAAc,CAAqB,CAAI;IACrD,OAAO,MAAM,CAAC,OAAO,CACnB,aAAa,CACX;QACE,UAAU,EAAE,GAAG;QACf,OAAO,EAAE;YACP,GAAG,CAAC,CAAC,OAAO;SACb;QACD,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI;KACrB,EACD,EAAE,EAAE,EAAE,CAAC,EAAE,CACV,CACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAqB,CAAI;IAC3D,OAAO,MAAM,CAAC,OAAO,CACnB,aAAa,CACX;QACE,UAAU,EAAE,GAAG;QACf,OAAO,EAAE;YACP,GAAG,CAAC,CAAC,OAAO;SACb;QACD,IAAI,EAAE,CAAC,CAAC,IAAI;KACb,EACD,EAAE,EAAE,EAAE,CAAC,EAAE,CACV,CACF,CAAC;AACJ,CAAC;AAED,gCAAgC;AAChC,MAAM,CAAC,MAAM,eAAe,GAC1B,CAA2B,IAAuB,EAAE,EAAE,CACtD,CAAC,CAAI,EAAsD,EAAE;IAC3D,OAAO,IAAI,CACT,IAAI,EACJ,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAClB,aAAa,CACX;QACE,UAAU,EAAE,GAAG;QACf,OAAO,EAAE;YACP,GAAG,CAAC,CAAC,OAAO;SACb;QACD,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI;KACrB,EACD,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAChB,CACF,CACF,CAAC;AACJ,CAAC,CAAC"}
@@ -66,7 +66,7 @@ describe('kitchen sink', () => {
66
66
  multiValueHeaders: {},
67
67
  isBase64Encoded: false,
68
68
  i: JSON.stringify(i, null, 2),
69
- body: JSON.stringify({
69
+ body: {
70
70
  foo: i.body.foo.toUpperCase(),
71
71
  bar: i.body.bar * 2,
72
72
  baz: !i.body.baz,
@@ -74,10 +74,10 @@ describe('kitchen sink', () => {
74
74
  q: i.queryStringParameters.q,
75
75
  h: i.headers['content-type'].toUpperCase(),
76
76
  u: i.userId,
77
- }),
77
+ },
78
78
  }));
79
79
  }
80
- const stack = pipe(echoCore, M.bodyValidator.middleware(Body), M.jsonBodyParser.middleware({ encodeResponseBody: false }), M.base64BodyDecoder.middleware(() => false), M.jwtAuthenticator.middleware(), M.headersValidator.middleware(Headers), M.headersNormalizer.middleware(), M.queryStringValidator.middleware(QueryParams), M.pathTokenAuthorizer.middleware(), M.pathParametersValidator.middleware(PathParams), M.identity.middleware(), M.trivial.middleware(), M.helmetJsHeaders.middleware(), M.responseProcessor.middleware(), M.requestResponseLogger.middleware(), M.cacheInMemory.middleware(JsonHashCacheKeyResolver()), M.cacheMomento.middleware(JsonHashCacheKeyResolver(), JsonCache(MomentoStringCache)), M.momentoClientInit.middleware({}), M.envValidator.middleware(Env));
80
+ const stack = pipe(echoCore, M.bodyValidator.middleware(Body), M.jsonBodyParserRequest.middleware(), M.jsonBodySerializerResponse.middleware(), M.base64BodyDecoder.middleware(() => false), M.jwtAuthenticator.middleware(), M.headersValidator.middleware(Headers), M.headersNormalizer.middleware(), M.queryStringValidator.middleware(QueryParams), M.pathTokenAuthorizer.middleware(), M.pathParametersValidator.middleware(PathParams), M.identity.middleware(), M.trivial.middleware(), M.helmetJsHeaders.middleware(), M.responseProcessor.middleware(), M.requestResponseLogger.middleware(), M.cacheInMemory.middleware(JsonHashCacheKeyResolver()), M.cacheMomento.middleware(JsonHashCacheKeyResolver(), JsonCache(MomentoStringCache)), M.momentoClientInit.middleware({}), M.envValidator.middleware(Env));
81
81
  const actual1 = stack({
82
82
  url: '/',
83
83
  // version: 'string',
@@ -1 +1 @@
1
- {"version":3,"file":"kitchen-sink.test.js","sourceRoot":"","sources":["../../../src/test/unit/kitchen-sink.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"kitchen-sink.test.js","sourceRoot":"","sources":["../../../src/test/unit/kitchen-sink.test.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@konker.dev/middleware-fp",
3
- "version": "0.4.1",
3
+ "version": "0.8.0",
4
4
  "type": "module",
5
5
  "author": "Konrad Markus <mail@konker.dev>",
6
6
  "license": "ISC",
@@ -96,9 +96,13 @@
96
96
  "types": "./dist/http/contrib/index.d.ts",
97
97
  "import": "./dist/http/contrib/index.js"
98
98
  },
99
- "./http/contrib/jsonBodyParser": {
100
- "types": "./dist/http/contrib/jsonBodyParser.d.ts",
101
- "import": "./dist/http/contrib/jsonBodyParser.js"
99
+ "./http/contrib/jsonBodyParserRequest": {
100
+ "types": "./dist/http/contrib/jsonBodyParserRequest.d.ts",
101
+ "import": "./dist/http/contrib/jsonBodyParserRequest.js"
102
+ },
103
+ "./http/contrib/jsonBodySerializerResponse": {
104
+ "types": "./dist/http/contrib/jsonBodySerializerResponse.d.ts",
105
+ "import": "./dist/http/contrib/jsonBodySerializerResponse.js"
102
106
  },
103
107
  "./http/contrib/jwtAuthenticator": {
104
108
  "types": "./dist/http/contrib/jwtAuthenticator.d.ts",
@@ -136,6 +140,14 @@
136
140
  "types": "./dist/http/contrib/responseProcessor.d.ts",
137
141
  "import": "./dist/http/contrib/responseProcessor.js"
138
142
  },
143
+ "./http/contrib/sqlClientInitPg": {
144
+ "types": "./dist/http/contrib/sqlClientInitPg/index.d.ts",
145
+ "import": "./dist/http/contrib/sqlClientInitPg/index.js"
146
+ },
147
+ "./http/contrib/sqlClientInitPg/lib": {
148
+ "types": "./dist/http/contrib/sqlClientInitPg/lib.d.ts",
149
+ "import": "./dist/http/contrib/sqlClientInitPg/lib.js"
150
+ },
139
151
  "./http/contrib/standardRequestResponseAdapter": {
140
152
  "types": "./dist/http/contrib/standardRequestResponseAdapter.d.ts",
141
153
  "import": "./dist/http/contrib/standardRequestResponseAdapter.js"
@@ -223,32 +235,36 @@
223
235
  ],
224
236
  "peerDependencies": {
225
237
  "@aws-sdk/client-dynamodb": "^3.637.0",
238
+ "@effect/sql": "^0.49.0",
239
+ "@effect/sql-pg": "^0.50.1",
226
240
  "@gomomento/sdk": "^1.102.0",
227
241
  "aws-lambda": "^1.0.7",
228
242
  "hono": "^4.9.9"
229
243
  },
230
244
  "dependencies": {
231
- "effect": "^3.19.13",
245
+ "@effect/sql": "^0.49.0",
246
+ "@effect/sql-pg": "^0.50.1",
247
+ "effect": "^3.19.14",
232
248
  "lesslog": "^1.0.2",
233
- "@konker.dev/momento-cache-client-effect": "0.1.12",
234
249
  "@konker.dev/tiny-auth-utils-fp": "0.1.12",
235
250
  "@konker.dev/tiny-cache-fp": "0.1.13",
251
+ "@konker.dev/tiny-utils-fp": "0.1.13",
236
252
  "@konker.dev/tiny-error-fp": "0.1.12",
237
- "@konker.dev/tiny-utils-fp": "0.1.13"
253
+ "@konker.dev/momento-cache-client-effect": "0.1.12"
238
254
  },
239
255
  "devDependencies": {
240
256
  "@arethetypeswrong/cli": "^0.18.2",
241
- "@aws-sdk/client-dynamodb": "^3.958.0",
242
- "@aws-sdk/types": "^3.957.0",
243
- "@effect/language-service": "^0.62.5",
257
+ "@aws-sdk/client-dynamodb": "^3.966.0",
258
+ "@aws-sdk/types": "^3.965.0",
259
+ "@effect/language-service": "^0.64.1",
244
260
  "@eslint/js": "^9.39.2",
245
261
  "@gomomento/sdk": "^1.117.1",
246
262
  "@konker.dev/common-config": "^0.7.0",
247
- "@smithy/smithy-client": "^4.10.2",
248
- "@swc/core": "^1.15.7",
263
+ "@smithy/smithy-client": "^4.10.4",
264
+ "@swc/core": "^1.15.8",
249
265
  "@types/aws-lambda": "^8.10.159",
250
266
  "@types/micromatch": "^4.0.10",
251
- "@types/node": "^25.0.3",
267
+ "@types/node": "^25.0.6",
252
268
  "@vitest/coverage-istanbul": "^4.0.16",
253
269
  "aws-lambda": "^1.0.7",
254
270
  "aws-sdk-client-mock": "^4.1.0",
@@ -264,7 +280,7 @@
264
280
  "prettier": "^3.7.4",
265
281
  "type-coverage": "^2.29.7",
266
282
  "typescript": "^5.9.3",
267
- "typescript-eslint": "^8.50.1",
283
+ "typescript-eslint": "^8.52.0",
268
284
  "vitest": "^4.0.16"
269
285
  },
270
286
  "scripts": {
@@ -1,10 +0,0 @@
1
- import type { MiddlewareError } from '../../lib/MiddlewareError.js';
2
- import { type BodyRec, type RequestResponseHandler, type StrBodyRec } from '../index.js';
3
- export type WithParsedBody = {
4
- readonly body: unknown;
5
- readonly jsonBodyParserRaw: string | undefined;
6
- };
7
- export declare const middleware: ({ encodeResponseBody }?: {
8
- encodeResponseBody?: boolean | undefined;
9
- }) => <I extends StrBodyRec, O extends BodyRec, E, R>(wrapped: RequestResponseHandler<I & WithParsedBody, O, E, R>) => RequestResponseHandler<I, O, E | MiddlewareError, R>;
10
- //# sourceMappingURL=jsonBodyParser.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"jsonBodyParser.d.ts","sourceRoot":"","sources":["../../../src/http/contrib/jsonBodyParser.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpE,OAAO,EAAE,KAAK,OAAO,EAAiB,KAAK,sBAAsB,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAKxG,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;CAChD,CAAC;AAEF,eAAO,MAAM,UAAU,GACpB;;CAAkC,MAClC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,OAAO,EAAE,CAAC,EAAE,CAAC,EAC5C,SAAS,sBAAsB,CAAC,CAAC,GAAG,cAAc,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC3D,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAkCnD,CAAC"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"jsonBodyParser.js","sourceRoot":"","sources":["../../../src/http/contrib/jsonBodyParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAgB,aAAa,EAAgD,MAAM,aAAa,CAAC;AACxG,OAAO,EAAE,YAAY,EAAiB,MAAM,gBAAgB,CAAC;AAE7D,MAAM,GAAG,GAAG,gBAAgB,CAAC;AAO7B,MAAM,CAAC,MAAM,UAAU,GACrB,CAAC,EAAE,kBAAkB,GAAG,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,CACvC,CACE,OAA4D,EACN,EAAE,CAC1D,CAAC,CAAc,EAAE,EAAE,CACjB,IAAI;AACF,iBAAiB;AACjB,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;AACjB,aAAa;AACb,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC;AAC1C,uCAAuC;AACvC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAC1G,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAClC,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CACxB,YAAY,CAAC,CAAC,EAAE;IACd,IAAI,EAAE,UAAU;IAChB,iBAAiB,EAAE,CAAC,CAAC,IAAI;CAC1B,CAAC,CACH;AAED,wCAAwC;AACxC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;AAEvB,2BAA2B;AAC3B,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACnB,CAAC,CAAC,IAAI,IAAI,kBAAkB;IAC1B,CAAC,CAAC,IAAI,CACF,CAAC,CAAC,IAAI,EACN,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,EACjC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAClC,MAAM,CAAC,GAAG,CAAC,CAAC,WAAmB,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,CAC7E;IACH,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CACtB;AAED,YAAY;AACZ,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAC5C,CAAC"}
@@ -1,2 +0,0 @@
1
- export {};
2
- //# sourceMappingURL=jsonBodyParser.test.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"jsonBodyParser.test.d.ts","sourceRoot":"","sources":["../../../src/http/contrib/jsonBodyParser.test.ts"],"names":[],"mappings":""}
@@ -1 +0,0 @@
1
- {"version":3,"file":"jsonBodyParser.test.js","sourceRoot":"","sources":["../../../src/http/contrib/jsonBodyParser.test.ts"],"names":[],"mappings":"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"}