@konker.dev/middleware-fp 0.11.0 → 0.12.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (44) hide show
  1. package/dist/http/HttpApiError.d.ts +1 -1
  2. package/dist/http/RequestW.test.js +1 -1
  3. package/dist/http/RequestW.test.js.map +1 -1
  4. package/dist/http/contrib/bodyValidator.d.ts.map +1 -1
  5. package/dist/http/contrib/bodyValidator.js +1 -1
  6. package/dist/http/contrib/bodyValidator.js.map +1 -1
  7. package/dist/http/contrib/headersValidator.d.ts.map +1 -1
  8. package/dist/http/contrib/headersValidator.js +1 -1
  9. package/dist/http/contrib/headersValidator.js.map +1 -1
  10. package/dist/http/contrib/index.d.ts +1 -1
  11. package/dist/http/contrib/index.d.ts.map +1 -1
  12. package/dist/http/contrib/index.js +1 -1
  13. package/dist/http/contrib/index.js.map +1 -1
  14. package/dist/http/contrib/queryStringValidator.d.ts.map +1 -1
  15. package/dist/http/contrib/queryStringValidator.js +1 -1
  16. package/dist/http/contrib/queryStringValidator.js.map +1 -1
  17. package/dist/http/contrib/requestSpan.d.ts +4 -0
  18. package/dist/http/contrib/requestSpan.d.ts.map +1 -0
  19. package/dist/http/contrib/requestSpan.js +8 -0
  20. package/dist/http/contrib/requestSpan.js.map +1 -0
  21. package/dist/http/contrib/requestSpan.test.d.ts +2 -0
  22. package/dist/http/contrib/requestSpan.test.d.ts.map +1 -0
  23. package/dist/http/contrib/requestSpan.test.js +27 -0
  24. package/dist/http/contrib/requestSpan.test.js.map +1 -0
  25. package/dist/lib/MiddlewareError.d.ts +1 -1
  26. package/dist/test/fixtures/honoRequestFactory.js +6 -6
  27. package/dist/test/fixtures/honoRequestFactory.js.map +1 -1
  28. package/package.json +41 -37
  29. package/dist/http/contrib/sqlClientInitPg/index.d.ts +0 -10
  30. package/dist/http/contrib/sqlClientInitPg/index.d.ts.map +0 -1
  31. package/dist/http/contrib/sqlClientInitPg/index.js +0 -12
  32. package/dist/http/contrib/sqlClientInitPg/index.js.map +0 -1
  33. package/dist/http/contrib/sqlClientInitPg/index.test.d.ts +0 -4
  34. package/dist/http/contrib/sqlClientInitPg/index.test.d.ts.map +0 -1
  35. package/dist/http/contrib/sqlClientInitPg/index.test.js +0 -93
  36. package/dist/http/contrib/sqlClientInitPg/index.test.js.map +0 -1
  37. package/dist/http/contrib/sqlClientInitPg/lib.d.ts +0 -16
  38. package/dist/http/contrib/sqlClientInitPg/lib.d.ts.map +0 -1
  39. package/dist/http/contrib/sqlClientInitPg/lib.js +0 -38
  40. package/dist/http/contrib/sqlClientInitPg/lib.js.map +0 -1
  41. package/dist/http/contrib/sqlClientInitPg/lib.test.d.ts +0 -2
  42. package/dist/http/contrib/sqlClientInitPg/lib.test.d.ts.map +0 -1
  43. package/dist/http/contrib/sqlClientInitPg/lib.test.js +0 -101
  44. package/dist/http/contrib/sqlClientInitPg/lib.test.js.map +0 -1
package/dist/http/HttpApiError.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import * as Effect from 'effect/Effect';
2
2
  import { type ResponseW } from './ResponseW.js';
3
3
  export declare const ERROR_TAG: "HttpApiError";
4
- declare const HttpApiError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => import("effect/Cause").YieldableError & {
4
+ declare const HttpApiError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {
5
5
  readonly _tag: "HttpApiError";
6
6
  } & Readonly<A>;
7
7
  export declare class HttpApiError extends HttpApiError_base<{
package/dist/http/RequestW.test.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { describe, expect, it } from 'vitest';
2
- import { EMPTY_REQUEST_W } from './RequestW.js';
3
2
  import * as unit from './RequestW.js';
3
+ import { EMPTY_REQUEST_W } from './RequestW.js';
4
4
  describe('http/request', () => {
5
5
  describe('makeRequestW', () => {
6
6
  const TEST_REQUEST_W_1 = {
package/dist/http/RequestW.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"RequestW.test.js","sourceRoot":"","sources":["../../src/http/RequestW.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,IAAI,MAAM,eAAe,CAAC;AAEtC,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC5B,MAAM,gBAAgB,GAAG;YACvB,GAAG,EAAE,GAAG;YACR,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;YACD,cAAc,EAAE;gBACd,EAAE,EAAE,QAAQ;aACb;YACD,qBAAqB,EAAE;gBACrB,IAAI,EAAE,KAAK;aACZ;SACF,CAAC;QAEF,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;YACrE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,aAAa,CAAC;gBACvD,GAAG,EAAE,GAAG;gBACR,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,EAAE;gBACX,cAAc,EAAE,EAAE;gBAClB,qBAAqB,EAAE,EAAE;aAC1B,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;YAC/D,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;QAC9E,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;YAClE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;gBACvE,GAAG,EAAE,GAAG;gBACR,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,EAAE;gBACX,cAAc,EAAE,EAAE;gBAClB,qBAAqB,EAAE,EAAE;gBACzB,GAAG,EAAE,KAAK;aACX,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;YAC5D,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;gBACxE,GAAG,EAAE,GAAG;gBACR,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;iBACnC;gBACD,cAAc,EAAE;oBACd,EAAE,EAAE,QAAQ;iBACb;gBACD,qBAAqB,EAAE;oBACrB,IAAI,EAAE,KAAK;iBACZ;gBACD,GAAG,EAAE,KAAK;aACX,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mFAAmF,EAAE,GAAG,EAAE;YAC3F,MAAM,CACJ,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE,EAAE,CAAC,CAC7F,CAAC,aAAa,CAAC;gBACd,GAAG,EAAE,GAAG;gBACR,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,UAAU;iBAC3B;gBACD,cAAc,EAAE;oBACd,EAAE,EAAE,QAAQ;iBACb;gBACD,qBAAqB,EAAE;oBACrB,IAAI,EAAE,KAAK;iBACZ;gBACD,GAAG,EAAE,KAAK;aACX,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"RequestW.test.js","sourceRoot":"","sources":["../../src/http/RequestW.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,KAAK,IAAI,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC5B,MAAM,gBAAgB,GAAG;YACvB,GAAG,EAAE,GAAG;YACR,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;YACD,cAAc,EAAE;gBACd,EAAE,EAAE,QAAQ;aACb;YACD,qBAAqB,EAAE;gBACrB,IAAI,EAAE,KAAK;aACZ;SACF,CAAC;QAEF,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;YACrE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,aAAa,CAAC;gBACvD,GAAG,EAAE,GAAG;gBACR,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,EAAE;gBACX,cAAc,EAAE,EAAE;gBAClB,qBAAqB,EAAE,EAAE;aAC1B,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;YAC/D,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;QAC9E,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;YAClE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;gBACvE,GAAG,EAAE,GAAG;gBACR,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,EAAE;gBACX,cAAc,EAAE,EAAE;gBAClB,qBAAqB,EAAE,EAAE;gBACzB,GAAG,EAAE,KAAK;aACX,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;YAC5D,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;gBACxE,GAAG,EAAE,GAAG;gBACR,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;iBACnC;gBACD,cAAc,EAAE;oBACd,EAAE,EAAE,QAAQ;iBACb;gBACD,qBAAqB,EAAE;oBACrB,IAAI,EAAE,KAAK;iBACZ;gBACD,GAAG,EAAE,KAAK;aACX,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mFAAmF,EAAE,GAAG,EAAE;YAC3F,MAAM,CACJ,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE,EAAE,CAAC,CAC7F,CAAC,aAAa,CAAC;gBACd,GAAG,EAAE,GAAG;gBACR,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,UAAU;iBAC3B;gBACD,cAAc,EAAE;oBACd,EAAE,EAAE,QAAQ;iBACb;gBACD,qBAAqB,EAAE;oBACrB,IAAI,EAAE,KAAK;iBACZ;gBACD,GAAG,EAAE,KAAK;aACX,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
package/dist/http/contrib/bodyValidator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"bodyValidator.d.ts","sourceRoot":"","sources":["../../../src/http/contrib/bodyValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpE,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAK/D,MAAM,MAAM,iBAAiB,CAAC,CAAC,IAAI;IACjC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IACjB,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;CACpC,CAAC;AAEF,eAAO,MAAM,UAAU,GACpB,EAAE,EAAE,EAAE,EAAE,QAAQ,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,MACrC,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,EACjC,SAAS,sBAAsB,CAAC,CAAC,GAAG,iBAAiB,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAClE,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAcnD,CAAC"}
1
+ {"version":3,"file":"bodyValidator.d.ts","sourceRoot":"","sources":["../../../src/http/contrib/bodyValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpE,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAK/D,MAAM,MAAM,iBAAiB,CAAC,CAAC,IAAI;IACjC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IACjB,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;CACpC,CAAC;AAEF,eAAO,MAAM,UAAU,GACpB,EAAE,EAAE,EAAE,EAAE,QAAQ,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,MACrC,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,EACjC,SAAS,sBAAsB,CAAC,CAAC,GAAG,iBAAiB,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAClE,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAenD,CAAC"}
package/dist/http/contrib/bodyValidator.js CHANGED
@@ -6,5 +6,5 @@ const TAG = 'bodyValidator';
6
6
  export const middleware = (schema) => (wrapped) => (i) => pipe(Effect.succeed(i), Effect.tap(Effect.logDebug(`[${TAG}] IN`)), Effect.flatMap((i) => pipe(i.body, Schema.decodeUnknown(schema, { errors: 'all', onExcessProperty: 'ignore' }))), Effect.mapError((e) => toMiddlewareError(e)), Effect.map((validatedBody) => makeRequestW(i, {
7
7
  body: validatedBody,
8
8
  bodyValidatorRaw: i.body,
9
- })), Effect.flatMap(wrapped));
9
+ })), Effect.flatMap(wrapped), Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
10
10
  //# sourceMappingURL=bodyValidator.js.map
package/dist/http/contrib/bodyValidator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"bodyValidator.js","sourceRoot":"","sources":["../../../src/http/contrib/bodyValidator.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;AAEjE,OAAO,EAAE,YAAY,EAAiB,MAAM,gBAAgB,CAAC;AAE7D,MAAM,GAAG,GAAG,eAAe,CAAC;AAO5B,MAAM,CAAC,MAAM,UAAU,GACrB,CAAS,MAA6B,EAAE,EAAE,CAC1C,CACE,OAAmE,EACb,EAAE,CAC1D,CAAC,CAAc,EAAE,EAAE,CACjB,IAAI,CACF,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EACjB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,EAC1C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAChH,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAC5C,MAAM,CAAC,GAAG,CAAC,CAAC,aAAiB,EAAE,EAAE,CAC/B,YAAY,CAAC,CAAC,EAAE;IACd,IAAI,EAAE,aAAa;IACnB,gBAAgB,EAAE,CAAC,CAAC,IAAI;CACzB,CAAC,CACH,EACD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CACxB,CAAC"}
1
+ {"version":3,"file":"bodyValidator.js","sourceRoot":"","sources":["../../../src/http/contrib/bodyValidator.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;AAEjE,OAAO,EAAE,YAAY,EAAiB,MAAM,gBAAgB,CAAC;AAE7D,MAAM,GAAG,GAAG,eAAe,CAAC;AAO5B,MAAM,CAAC,MAAM,UAAU,GACrB,CAAS,MAA6B,EAAE,EAAE,CAC1C,CACE,OAAmE,EACb,EAAE,CAC1D,CAAC,CAAc,EAAE,EAAE,CACjB,IAAI,CACF,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EACjB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,EAC1C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAChH,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAC5C,MAAM,CAAC,GAAG,CAAC,CAAC,aAAiB,EAAE,EAAE,CAC/B,YAAY,CAAC,CAAC,EAAE;IACd,IAAI,EAAE,aAAa;IACnB,gBAAgB,EAAE,CAAC,CAAC,IAAI;CACzB,CAAC,CACH,EACD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EACvB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAC5C,CAAC"}
package/dist/http/contrib/headersValidator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"headersValidator.d.ts","sourceRoot":"","sources":["../../../src/http/contrib/headersValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpE,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAgB,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAI7D,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAAI;IACpC,OAAO,EAAE,CAAC,CAAC;IACX,mBAAmB,EAAE,QAAQ,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;CACtD,CAAC;AAEF,eAAO,MAAM,UAAU,GACpB,EAAE,EAAE,EAAE,EAAE,QAAQ,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,MACrC,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,EACjC,SAAS,sBAAsB,CAAC,CAAC,GAAG,oBAAoB,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KACrE,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAgBnD,CAAC"}
1
+ {"version":3,"file":"headersValidator.d.ts","sourceRoot":"","sources":["../../../src/http/contrib/headersValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpE,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAgB,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAI7D,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAAI;IACpC,OAAO,EAAE,CAAC,CAAC;IACX,mBAAmB,EAAE,QAAQ,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;CACtD,CAAC;AAEF,eAAO,MAAM,UAAU,GACpB,EAAE,EAAE,EAAE,EAAE,QAAQ,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,MACrC,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,EACjC,SAAS,sBAAsB,CAAC,CAAC,GAAG,oBAAoB,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KACrE,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAiBnD,CAAC"}
package/dist/http/contrib/headersValidator.js CHANGED
@@ -6,5 +6,5 @@ const TAG = 'headersValidator';
6
6
  export const middleware = (schema) => (wrapped) => (i) => pipe(Effect.succeed(i), Effect.tap(Effect.logDebug(`[${TAG}] IN`)), Effect.flatMap((i) => pipe(i.headers, Schema.decodeUnknown(schema, { errors: 'all', onExcessProperty: 'ignore' }))), Effect.mapError((e) => toMiddlewareError(e)), Effect.map((validatedHeaders) => makeRequestW(i, {
7
7
  headers: validatedHeaders,
8
8
  headersValidatorRaw: i.headers,
9
- })), Effect.flatMap(wrapped));
9
+ })), Effect.flatMap(wrapped), Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
10
10
  //# sourceMappingURL=headersValidator.js.map
package/dist/http/contrib/headersValidator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"headersValidator.js","sourceRoot":"","sources":["../../../src/http/contrib/headersValidator.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;AAEjE,OAAO,EAAE,YAAY,EAAiB,MAAM,gBAAgB,CAAC;AAE7D,MAAM,GAAG,GAAG,kBAAkB,CAAC;AAO/B,MAAM,CAAC,MAAM,UAAU,GACrB,CAAS,MAA6B,EAAE,EAAE,CAC1C,CACE,OAAsE,EAChB,EAAE,CAC1D,CAAC,CAAc,EAAE,EAAE,CACjB,IAAI,CACF,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EACjB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,EAC1C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACnB,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC,CAAC,CAC7F,EACD,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAC5C,MAAM,CAAC,GAAG,CAAC,CAAC,gBAAoB,EAAE,EAAE,CAClC,YAAY,CAAC,CAAC,EAAE;IACd,OAAO,EAAE,gBAAgB;IACzB,mBAAmB,EAAE,CAAC,CAAC,OAAO;CAC/B,CAAC,CACH,EACD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CACxB,CAAC"}
1
+ {"version":3,"file":"headersValidator.js","sourceRoot":"","sources":["../../../src/http/contrib/headersValidator.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;AAEjE,OAAO,EAAE,YAAY,EAAiB,MAAM,gBAAgB,CAAC;AAE7D,MAAM,GAAG,GAAG,kBAAkB,CAAC;AAO/B,MAAM,CAAC,MAAM,UAAU,GACrB,CAAS,MAA6B,EAAE,EAAE,CAC1C,CACE,OAAsE,EAChB,EAAE,CAC1D,CAAC,CAAc,EAAE,EAAE,CACjB,IAAI,CACF,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EACjB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,EAC1C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACnB,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC,CAAC,CAC7F,EACD,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAC5C,MAAM,CAAC,GAAG,CAAC,CAAC,gBAAoB,EAAE,EAAE,CAClC,YAAY,CAAC,CAAC,EAAE;IACd,OAAO,EAAE,gBAAgB;IACzB,mBAAmB,EAAE,CAAC,CAAC,OAAO;CAC/B,CAAC,CACH,EACD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EACvB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAC5C,CAAC"}
package/dist/http/contrib/index.d.ts CHANGED
@@ -23,7 +23,7 @@ export * as pathTokenAuthorizer from './pathTokenAuthorizer.js';
23
23
  export * as queryStringValidator from './queryStringValidator.js';
24
24
  export * as responseProcessor from './responseProcessor.js';
25
25
  export * as requestResponseLogger from './requestResponseLogger.js';
26
- export * as sqlClientInitPg from './sqlClientInitPg/index.js';
26
+ export * as requestSpan from './requestSpan.js';
27
27
  export * as standardRequestResponseAdapter from './standardRequestResponseAdapter.js';
28
28
  export * as trivial from './trivial.js';
29
29
  //# sourceMappingURL=index.d.ts.map
package/dist/http/contrib/index.d.ts.map CHANGED
@@ -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,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"}
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,WAAW,MAAM,kBAAkB,CAAC;AAChD,OAAO,KAAK,8BAA8B,MAAM,qCAAqC,CAAC;AACtF,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC"}
package/dist/http/contrib/index.js CHANGED
@@ -23,7 +23,7 @@ export * as pathTokenAuthorizer from './pathTokenAuthorizer.js';
23
23
  export * as queryStringValidator from './queryStringValidator.js';
24
24
  export * as responseProcessor from './responseProcessor.js';
25
25
  export * as requestResponseLogger from './requestResponseLogger.js';
26
- export * as sqlClientInitPg from './sqlClientInitPg/index.js';
26
+ export * as requestSpan from './requestSpan.js';
27
27
  export * as standardRequestResponseAdapter from './standardRequestResponseAdapter.js';
28
28
  export * as trivial from './trivial.js';
29
29
  //# sourceMappingURL=index.js.map
package/dist/http/contrib/index.js.map CHANGED
@@ -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,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"}
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,WAAW,MAAM,kBAAkB,CAAC;AAChD,OAAO,KAAK,8BAA8B,MAAM,qCAAqC,CAAC;AACtF,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC"}
package/dist/http/contrib/queryStringValidator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"queryStringValidator.d.ts","sourceRoot":"","sources":["../../../src/http/contrib/queryStringValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpE,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAK/D,MAAM,MAAM,kCAAkC,CAAC,CAAC,IAAI;IAClD,qBAAqB,EAAE,CAAC,CAAC;IACzB,uBAAuB,EAAE,OAAO,CAAC;CAClC,CAAC;AAEF,eAAO,MAAM,UAAU,GACpB,EAAE,EAAE,EAAE,EAAE,QAAQ,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,MACrC,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,EACjC,SAAS,sBAAsB,CAAC,CAAC,GAAG,kCAAkC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KACnF,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAgBnD,CAAC"}
1
+ {"version":3,"file":"queryStringValidator.d.ts","sourceRoot":"","sources":["../../../src/http/contrib/queryStringValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpE,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAK/D,MAAM,MAAM,kCAAkC,CAAC,CAAC,IAAI;IAClD,qBAAqB,EAAE,CAAC,CAAC;IACzB,uBAAuB,EAAE,OAAO,CAAC;CAClC,CAAC;AAEF,eAAO,MAAM,UAAU,GACpB,EAAE,EAAE,EAAE,EAAE,QAAQ,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,MACrC,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,EACjC,SAAS,sBAAsB,CAAC,CAAC,GAAG,kCAAkC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KACnF,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAiBnD,CAAC"}
package/dist/http/contrib/queryStringValidator.js CHANGED
@@ -6,5 +6,5 @@ const TAG = 'queryStringValidator';
6
6
  export const middleware = (schema) => (wrapped) => (i) => pipe(Effect.succeed(i), Effect.tap(Effect.logDebug(`[${TAG}] IN`)), Effect.flatMap((i) => pipe(i.queryStringParameters, Schema.decodeUnknown(schema, { errors: 'all', onExcessProperty: 'ignore' }))), Effect.mapError((e) => toMiddlewareError(e)), Effect.map((validatedQueryStringParameters) => makeRequestW(i, {
7
7
  queryStringParameters: validatedQueryStringParameters,
8
8
  queryStringValidatorRaw: i.queryStringParameters,
9
- })), Effect.flatMap(wrapped));
9
+ })), Effect.flatMap(wrapped), Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
10
10
  //# sourceMappingURL=queryStringValidator.js.map
package/dist/http/contrib/queryStringValidator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"queryStringValidator.js","sourceRoot":"","sources":["../../../src/http/contrib/queryStringValidator.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;AAEjE,OAAO,EAAE,YAAY,EAAiB,MAAM,gBAAgB,CAAC;AAE7D,MAAM,GAAG,GAAG,sBAAsB,CAAC;AAOnC,MAAM,CAAC,MAAM,UAAU,GACrB,CAAS,MAA6B,EAAE,EAAE,CAC1C,CACE,OAAoF,EAC9B,EAAE,CAC1D,CAAC,CAAc,EAAE,EAAE,CACjB,IAAI,CACF,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EACjB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,EAC1C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACnB,IAAI,CAAC,CAAC,CAAC,qBAAqB,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC,CAAC,CAC3G,EACD,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAC5C,MAAM,CAAC,GAAG,CAAC,CAAC,8BAAkC,EAAE,EAAE,CAChD,YAAY,CAAC,CAAC,EAAE;IACd,qBAAqB,EAAE,8BAA8B;IACrD,uBAAuB,EAAE,CAAC,CAAC,qBAAqB;CACjD,CAAC,CACH,EACD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CACxB,CAAC"}
1
+ {"version":3,"file":"queryStringValidator.js","sourceRoot":"","sources":["../../../src/http/contrib/queryStringValidator.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;AAEjE,OAAO,EAAE,YAAY,EAAiB,MAAM,gBAAgB,CAAC;AAE7D,MAAM,GAAG,GAAG,sBAAsB,CAAC;AAOnC,MAAM,CAAC,MAAM,UAAU,GACrB,CAAS,MAA6B,EAAE,EAAE,CAC1C,CACE,OAAoF,EAC9B,EAAE,CAC1D,CAAC,CAAc,EAAE,EAAE,CACjB,IAAI,CACF,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EACjB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,EAC1C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACnB,IAAI,CAAC,CAAC,CAAC,qBAAqB,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC,CAAC,CAC3G,EACD,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAC5C,MAAM,CAAC,GAAG,CAAC,CAAC,8BAAkC,EAAE,EAAE,CAChD,YAAY,CAAC,CAAC,EAAE;IACd,qBAAqB,EAAE,8BAA8B;IACrD,uBAAuB,EAAE,CAAC,CAAC,qBAAqB;CACjD,CAAC,CACH,EACD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EACvB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAC5C,CAAC"}
package/dist/http/contrib/requestSpan.d.ts ADDED
@@ -0,0 +1,4 @@
1
+ import type { Rec, RequestResponseHandler } from '../index.js';
2
+ export declare const TAG = "requestSpan";
3
+ export declare const middleware: (name: string) => <I extends Rec, O extends Rec, E, R>(wrapped: RequestResponseHandler<I, O, E, R>) => RequestResponseHandler<I, O, E, R>;
4
+ //# sourceMappingURL=requestSpan.d.ts.map
package/dist/http/contrib/requestSpan.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"requestSpan.d.ts","sourceRoot":"","sources":["../../../src/http/contrib/requestSpan.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAG/D,eAAO,MAAM,GAAG,gBAAgB,CAAC;AAEjC,eAAO,MAAM,UAAU,GACpB,MAAM,MAAM,MACZ,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,EACjC,SAAS,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC1C,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAUjC,CAAC"}
package/dist/http/contrib/requestSpan.js ADDED
@@ -0,0 +1,8 @@
1
+ import { pipe } from 'effect';
2
+ import * as Effect from 'effect/Effect';
3
+ import {} from '../RequestW.js';
4
+ export const TAG = 'requestSpan';
5
+ export const middleware = (name) => (wrapped) => (i) => pipe(Effect.succeed(i), Effect.tap(Effect.logDebug(`[${TAG}] IN`)), Effect.flatMap(wrapped), Effect.withSpan(name, {
6
+ attributes: { 'http.method': i.method, 'http.url': i.url },
7
+ }), Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
8
+ //# sourceMappingURL=requestSpan.js.map
package/dist/http/contrib/requestSpan.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"requestSpan.js","sourceRoot":"","sources":["../../../src/http/contrib/requestSpan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAiB,MAAM,gBAAgB,CAAC;AAE/C,MAAM,CAAC,MAAM,GAAG,GAAG,aAAa,CAAC;AAEjC,MAAM,CAAC,MAAM,UAAU,GACrB,CAAC,IAAY,EAAE,EAAE,CACjB,CACE,OAA2C,EACP,EAAE,CACxC,CAAC,CAAc,EAAE,EAAE,CACjB,IAAI,CACF,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EACjB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,EAC1C,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EACvB,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE;IACpB,UAAU,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC,GAAG,EAAE;CAC3D,CAAC,EACF,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAC5C,CAAC"}
package/dist/http/contrib/requestSpan.test.d.ts ADDED
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=requestSpan.test.d.ts.map
package/dist/http/contrib/requestSpan.test.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"requestSpan.test.d.ts","sourceRoot":"","sources":["../../../src/http/contrib/requestSpan.test.ts"],"names":[],"mappings":""}
package/dist/http/contrib/requestSpan.test.js ADDED
@@ -0,0 +1,27 @@
1
+ import { pipe } from 'effect';
2
+ import * as Effect from 'effect/Effect';
3
+ import { describe, expect, it } from 'vitest';
4
+ import { echoCoreIn200W } from '../../test/test-common.js';
5
+ import { EMPTY_REQUEST_W, makeRequestW } from '../RequestW.js';
6
+ import * as unit from './requestSpan.js';
7
+ const TEST_IN = makeRequestW(EMPTY_REQUEST_W, { foo: 'foo' });
8
+ describe('middleware/requestSpan', () => {
9
+ it('should work as expected', async () => {
10
+ const egHandler = pipe(echoCoreIn200W, unit.middleware('test-name'));
11
+ const result = pipe(egHandler(TEST_IN), Effect.runPromise);
12
+ await expect(result).resolves.toStrictEqual({
13
+ statusCode: 200,
14
+ body: 'OK',
15
+ headers: {},
16
+ in: {
17
+ url: '/',
18
+ method: 'GET',
19
+ headers: {},
20
+ pathParameters: {},
21
+ queryStringParameters: {},
22
+ foo: 'foo',
23
+ },
24
+ });
25
+ });
26
+ });
27
+ //# sourceMappingURL=requestSpan.test.js.map
package/dist/http/contrib/requestSpan.test.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"requestSpan.test.js","sourceRoot":"","sources":["../../../src/http/contrib/requestSpan.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,kBAAkB,CAAC;AAEzC,MAAM,OAAO,GAAG,YAAY,CAAC,eAAe,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;AAE9D,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACtC,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;QACvC,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC;QACrE,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAC3D,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,GAAG,EAAE,KAAK;aACX;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
package/dist/lib/MiddlewareError.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  export declare const ERROR_TAG: "MiddlewareError";
2
- declare const MiddlewareError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => import("effect/Cause").YieldableError & {
2
+ declare const MiddlewareError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {
3
3
  readonly _tag: "MiddlewareError";
4
4
  } & Readonly<A>;
5
5
  export declare class MiddlewareError extends MiddlewareError_base<{
package/dist/test/fixtures/honoRequestFactory.js CHANGED
@@ -17,19 +17,19 @@ export function honoRequestFactory(url, options) {
17
17
  return '';
18
18
  },
19
19
  addValidatedData() { },
20
- arrayBuffer() {
20
+ async arrayBuffer() {
21
21
  return Promise.resolve(Buffer.from(options.body ?? '').buffer);
22
22
  },
23
- blob() {
23
+ async blob() {
24
24
  return Promise.resolve(new Blob([Buffer.from(options.body ?? '').buffer]));
25
25
  },
26
- formData() {
26
+ async formData() {
27
27
  return Promise.resolve(new FormData());
28
28
  },
29
29
  header() {
30
30
  return options.headers ?? {};
31
31
  },
32
- json() {
32
+ async json() {
33
33
  return Promise.resolve(JSON.parse(options.body ?? ''));
34
34
  },
35
35
  param() {
@@ -37,7 +37,7 @@ export function honoRequestFactory(url, options) {
37
37
  id: '123',
38
38
  };
39
39
  },
40
- parseBody() {
40
+ async parseBody() {
41
41
  return Promise.resolve(options.body ?? '');
42
42
  },
43
43
  queries() {
@@ -46,7 +46,7 @@ export function honoRequestFactory(url, options) {
46
46
  query() {
47
47
  return Object.fromEntries(new URL(url).searchParams.entries());
48
48
  },
49
- text() {
49
+ async text() {
50
50
  return Promise.resolve(options.body ?? '');
51
51
  },
52
52
  get url() {
package/dist/test/fixtures/honoRequestFactory.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"honoRequestFactory.js","sourceRoot":"","sources":["../../../src/test/fixtures/honoRequestFactory.ts"],"names":[],"mappings":"AAAA,iFAAiF;AACjF,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,EAAoB,MAAM,MAAM,CAAC;AAGxC,MAAM,UAAU,kBAAkB,CAChC,GAAW,EACX,OAIC;IAED,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE;QAC3B,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,KAAK;QAC/B,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,EAAE;QAC9B,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,IAAI;KAC3B,CAAC,CAAC;IAEH,OAAO;QACL,GAAG;QACH,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,SAAS,EAAE,EAAE;QACb,IAAI,EAAE,EAAE;QACR,UAAU,EAAE,CAAC;QACb,KAAK,CAAI,OAAU;YACjB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,gBAAgB,KAAU,CAAC;QAC3B,WAAW;YACT,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;QACjE,CAAC;QACD,IAAI;YACF,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC7E,CAAC;QACD,QAAQ;YACN,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,QAAQ,EAAE,CAAC,CAAC;QACzC,CAAC;QACD,MAAM;YACJ,OAAO,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;QAC/B,CAAC;QACD,IAAI;YACF,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;QACzD,CAAC;QACD,KAAK;YACH,OAAO;gBACL,EAAE,EAAE,KAAK;aACV,CAAC;QACJ,CAAC;QACD,SAAS;YACP,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO;YACL,OAAO,MAAM,CAAC,WAAW,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC;QACjE,CAAC;QACD,KAAK;YACH,OAAO,MAAM,CAAC,WAAW,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC;QACjE,CAAC;QACD,IAAI;YACF,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QAC7C,CAAC;QACD,IAAI,GAAG;YACL,OAAO,GAAG,CAAC;QACb,CAAC;QACD,IAAI,aAAa;YACf,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,IAAI,SAAS;YACX,OAAO,GAAG,CAAC;QACb,CAAC;KACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"honoRequestFactory.js","sourceRoot":"","sources":["../../../src/test/fixtures/honoRequestFactory.ts"],"names":[],"mappings":"AAAA,iFAAiF;AACjF,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,EAAoB,MAAM,MAAM,CAAC;AAGxC,MAAM,UAAU,kBAAkB,CAChC,GAAW,EACX,OAIC;IAED,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE;QAC3B,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,KAAK;QAC/B,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,EAAE;QAC9B,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,IAAI;KAC3B,CAAC,CAAC;IAEH,OAAO;QACL,GAAG;QACH,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,SAAS,EAAE,EAAE;QACb,IAAI,EAAE,EAAE;QACR,UAAU,EAAE,CAAC;QACb,KAAK,CAAI,OAAU;YACjB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,gBAAgB,KAAU,CAAC;QAC3B,KAAK,CAAC,WAAW;YACf,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;QACjE,CAAC;QACD,KAAK,CAAC,IAAI;YACR,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC7E,CAAC;QACD,KAAK,CAAC,QAAQ;YACZ,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,QAAQ,EAAE,CAAC,CAAC;QACzC,CAAC;QACD,MAAM;YACJ,OAAO,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;QAC/B,CAAC;QACD,KAAK,CAAC,IAAI;YACR,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;QACzD,CAAC;QACD,KAAK;YACH,OAAO;gBACL,EAAE,EAAE,KAAK;aACV,CAAC;QACJ,CAAC;QACD,KAAK,CAAC,SAAS;YACb,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO;YACL,OAAO,MAAM,CAAC,WAAW,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC;QACjE,CAAC;QACD,KAAK;YACH,OAAO,MAAM,CAAC,WAAW,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC;QACjE,CAAC;QACD,KAAK,CAAC,IAAI;YACR,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QAC7C,CAAC;QACD,IAAI,GAAG;YACL,OAAO,GAAG,CAAC;QACb,CAAC;QACD,IAAI,aAAa;YACf,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,IAAI,SAAS;YACX,OAAO,GAAG,CAAC;QACb,CAAC;KACF,CAAC;AACJ,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@konker.dev/middleware-fp",
3
- "version": "0.11.0",
3
+ "version": "0.12.0",
4
4
  "type": "module",
5
5
  "author": "Konrad Markus <mail@konker.dev>",
6
6
  "license": "ISC",
@@ -136,18 +136,14 @@
136
136
  "types": "./dist/http/contrib/requestResponseLogger.d.ts",
137
137
  "import": "./dist/http/contrib/requestResponseLogger.js"
138
138
  },
139
+ "./http/contrib/requestSpan": {
140
+ "types": "./dist/http/contrib/requestSpan.d.ts",
141
+ "import": "./dist/http/contrib/requestSpan.js"
142
+ },
139
143
  "./http/contrib/responseProcessor": {
140
144
  "types": "./dist/http/contrib/responseProcessor.d.ts",
141
145
  "import": "./dist/http/contrib/responseProcessor.js"
142
146
  },
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
- },
151
147
  "./http/contrib/standardRequestResponseAdapter": {
152
148
  "types": "./dist/http/contrib/standardRequestResponseAdapter.d.ts",
153
149
  "import": "./dist/http/contrib/standardRequestResponseAdapter.js"
@@ -235,54 +231,62 @@
235
231
  ],
236
232
  "peerDependencies": {
237
233
  "@aws-sdk/client-dynamodb": "^3.637.0",
234
+ "@effect/opentelemetry": "^0.61.0",
238
235
  "@effect/platform": "^0.94.1",
239
236
  "@effect/platform-node": "^0.104.0",
240
237
  "@effect/sql": "^0.49.0",
241
238
  "@effect/sql-pg": "^0.50.1",
242
239
  "@gomomento/sdk": "^1.102.0",
240
+ "@opentelemetry/exporter-trace-otlp-http": "^0.211.0",
241
+ "@opentelemetry/sdk-trace-base": "^2.5.0",
242
+ "@opentelemetry/sdk-trace-node": "^2.5.0",
243
243
  "aws-lambda": "^1.0.7",
244
244
  "hono": "^4.9.9"
245
245
  },
246
246
  "dependencies": {
247
- "@effect/sql": "^0.49.0",
248
- "@effect/sql-pg": "^0.50.1",
249
- "effect": "^3.19.14",
247
+ "@effect/sql": "^0.51.1",
248
+ "@effect/sql-pg": "^0.52.1",
249
+ "effect": "^3.21.4",
250
250
  "lesslog": "^1.0.2",
251
- "@konker.dev/tiny-auth-utils-fp": "0.1.12",
252
- "@konker.dev/tiny-cache-fp": "0.1.13",
253
- "@konker.dev/tiny-utils-fp": "0.1.13",
254
- "@konker.dev/momento-cache-client-effect": "0.1.12"
251
+ "@konker.dev/momento-cache-client-effect": "0.2.0",
252
+ "@konker.dev/tiny-auth-utils-fp": "0.3.0",
253
+ "@konker.dev/tiny-cache-fp": "0.2.0",
254
+ "@konker.dev/tiny-utils-fp": "0.2.0"
255
255
  },
256
256
  "devDependencies": {
257
- "@arethetypeswrong/cli": "^0.18.2",
258
- "@aws-sdk/client-dynamodb": "^3.966.0",
259
- "@aws-sdk/types": "^3.965.0",
260
- "@effect/language-service": "^0.64.1",
261
- "@eslint/js": "^9.39.2",
262
- "@gomomento/sdk": "^1.117.1",
263
- "@konker.dev/common-config": "^0.7.0",
264
- "@smithy/smithy-client": "^4.10.4",
265
- "@swc/core": "^1.15.8",
266
- "@types/aws-lambda": "^8.10.159",
257
+ "@arethetypeswrong/cli": "^0.18.4",
258
+ "@aws-sdk/client-dynamodb": "^3.1079.0",
259
+ "@aws-sdk/types": "^3.973.15",
260
+ "@effect/language-service": "^0.86.4",
261
+ "@effect/opentelemetry": "^0.63.0",
262
+ "@eslint/js": "^10.0.1",
263
+ "@gomomento/sdk": "^1.118.0",
264
+ "@konker.dev/common-config": "^0.10.0",
265
+ "@opentelemetry/exporter-trace-otlp-http": "^0.220.0",
266
+ "@opentelemetry/sdk-trace-base": "^2.9.0",
267
+ "@opentelemetry/sdk-trace-node": "^2.9.0",
268
+ "@smithy/smithy-client": "^4.14.6",
269
+ "@swc/core": "^1.15.43",
270
+ "@types/aws-lambda": "^8.10.162",
267
271
  "@types/micromatch": "^4.0.10",
268
- "@types/node": "^25.0.6",
269
- "@vitest/coverage-istanbul": "^4.0.16",
272
+ "@types/node": "^26.1.0",
273
+ "@vitest/coverage-istanbul": "^4.1.9",
270
274
  "aws-lambda": "^1.0.7",
271
275
  "aws-sdk-client-mock": "^4.1.0",
272
- "eslint": "^9.39.2",
276
+ "eslint": "^10.6.0",
273
277
  "eslint-plugin-fp": "^2.3.0",
274
- "eslint-plugin-prettier": "^5.5.4",
275
- "eslint-plugin-simple-import-sort": "^12.1.1",
276
- "eslint-plugin-sort-destructure-keys": "^2.0.0",
277
- "hono": "^4.11.3",
278
+ "eslint-plugin-prettier": "^5.5.6",
279
+ "eslint-plugin-simple-import-sort": "^13.0.0",
280
+ "eslint-plugin-sort-destructure-keys": "^3.0.0",
281
+ "hono": "4.12.27",
278
282
  "leasot": "^14.4.0",
279
283
  "madge": "^8.0.0",
280
284
  "micromatch": "^4.0.8",
281
- "prettier": "^3.7.4",
285
+ "prettier": "^3.9.4",
282
286
  "type-coverage": "^2.29.7",
283
- "typescript": "^5.9.3",
284
- "typescript-eslint": "^8.52.0",
285
- "vitest": "^4.0.16"
287
+ "typescript": "^6.0.3",
288
+ "typescript-eslint": "^8.62.1",
289
+ "vitest": "^4.1.9"
286
290
  },
287
291
  "scripts": {
288
292
  "test": "vitest run --coverage",
package/dist/http/contrib/sqlClientInitPg/index.d.ts DELETED
@@ -1,10 +0,0 @@
1
- import type { FileSystem } from '@effect/platform';
2
- import type { SqlClient } from '@effect/sql/SqlClient';
3
- import type { SqlError } from '@effect/sql/SqlError';
4
- import { type ConfigError, type Layer } from 'effect';
5
- import type { Rec, RequestResponseHandler } from '../../index.js';
6
- import { type CheckServerIdentityFunction } from './lib.js';
7
- export type Adapted<R> = Exclude<R, SqlClient> | FileSystem.FileSystem;
8
- export { type CheckServerIdentityFunction, ignoreCheckServerIdentity, SslConfigSchema, type SslConfig } from './lib.js';
9
- export declare const middleware: (caBundleFilePath?: string, checkServerIdentityFunction?: CheckServerIdentityFunction, 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>>;
10
- //# sourceMappingURL=index.d.ts.map
package/dist/http/contrib/sqlClientInitPg/index.d.ts.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,KAAK,EAAQ,MAAM,QAAQ,CAAC;AAG5D,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAElE,OAAO,EAAE,KAAK,2BAA2B,EAAiC,MAAM,UAAU,CAAC;AAI3F,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG,UAAU,CAAC,UAAU,CAAC;AAEvE,OAAO,EAAE,KAAK,2BAA2B,EAAE,yBAAyB,EAAE,eAAe,EAAE,KAAK,SAAS,EAAE,MAAM,UAAU,CAAC;AAExH,eAAO,MAAM,UAAU,GAEnB,mBAAmB,MAAM,EACzB,8BAA8B,2BAA2B,EACzD,mBAAmB,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,WAAW,CAAC,WAAW,GAAG,QAAQ,CAAC,MAE9E,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,CAWjF,CAAC"}
package/dist/http/contrib/sqlClientInitPg/index.js DELETED
@@ -1,12 +0,0 @@
1
- import { pipe } from 'effect';
2
- import * as Effect from 'effect/Effect';
3
- import { createDefaultPgSqlClientLayer } from './lib.js';
4
- const TAG = 'sqlClientInitPg';
5
- export { ignoreCheckServerIdentity, SslConfigSchema } from './lib.js';
6
- export const middleware = (caBundleFilePath, checkServerIdentityFunction, pgSqlClientLayer) => (wrapped) => (i) => {
7
- if (pgSqlClientLayer) {
8
- return pipe(wrapped(i), Effect.provide(pgSqlClientLayer), Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
9
- }
10
- return pipe(wrapped(i), Effect.provide(createDefaultPgSqlClientLayer(caBundleFilePath, checkServerIdentityFunction)), Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
11
- };
12
- //# sourceMappingURL=index.js.map
package/dist/http/contrib/sqlClientInitPg/index.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgC,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC5D,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,EAAoC,6BAA6B,EAAE,MAAM,UAAU,CAAC;AAE3F,MAAM,GAAG,GAAG,iBAAiB,CAAC;AAI9B,OAAO,EAAoC,yBAAyB,EAAE,eAAe,EAAkB,MAAM,UAAU,CAAC;AAExH,MAAM,CAAC,MAAM,UAAU,GACrB,CACE,gBAAyB,EACzB,2BAAyD,EACzD,gBAA6E,EAC7E,EAAE,CACJ,CACE,OAAuD,EAC2B,EAAE,CACtF,CAAC,CAAc,EAAE,EAAE;IACjB,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACzG,CAAC;IAED,OAAO,IAAI,CACT,OAAO,CAAC,CAAC,CAAC,EACV,MAAM,CAAC,OAAO,CAAC,6BAA6B,CAAC,gBAAgB,EAAE,2BAA2B,CAAC,CAAC,EAC5F,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAC5C,CAAC;AACJ,CAAC,CAAC"}
package/dist/http/contrib/sqlClientInitPg/index.test.d.ts DELETED
@@ -1,4 +0,0 @@
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
package/dist/http/contrib/sqlClientInitPg/index.test.d.ts.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.test.d.ts","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/index.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,KAAK,EAAQ,MAAM,QAAQ,CAAC;AAWrC,eAAO,MAAM,oBAAoB,sCAAsC,CAAC"}
package/dist/http/contrib/sqlClientInitPg/index.test.js DELETED
@@ -1,93 +0,0 @@
1
- import { NodeFileSystem } from '@effect/platform-node';
2
- import { SqlClient } from '@effect/sql/SqlClient';
3
- import { Layer, pipe } from 'effect';
4
- import * as Effect from 'effect/Effect';
5
- import { afterEach, describe, expect, it, vi } from 'vitest';
6
- import { echoCoreIn200W } from '../../../test/test-common.js';
7
- import { EMPTY_REQUEST_W } from '../../RequestW.js';
8
- import * as unit from './index.js';
9
- import * as unitLib from './lib.js';
10
- import { ignoreCheckServerIdentity } from './lib.js';
11
- // Create a mock PgDrizzle layer for testing
12
- export const MockPgSqlClientLayer = Layer.succeed(SqlClient, {});
13
- describe('middleware/sql-client-pg-init', () => {
14
- describe('middleware', () => {
15
- afterEach(() => {
16
- vi.restoreAllMocks();
17
- });
18
- it('should work as expected with custom layer', async () => {
19
- const egHandler = pipe(echoCoreIn200W, unit.middleware(undefined, undefined, MockPgSqlClientLayer));
20
- const result = await pipe(egHandler(EMPTY_REQUEST_W), Effect.provide(NodeFileSystem.layer), Effect.runPromise);
21
- expect(result).toMatchObject({
22
- body: 'OK',
23
- headers: {},
24
- in: {
25
- url: '/',
26
- headers: {},
27
- method: 'GET',
28
- pathParameters: {},
29
- queryStringParameters: {},
30
- },
31
- statusCode: 200,
32
- });
33
- });
34
- it('should work as expected with default layer', async () => {
35
- const spy = vi.spyOn(unitLib, 'createDefaultPgSqlClientLayer').mockReturnValue(MockPgSqlClientLayer);
36
- const egHandler = pipe(echoCoreIn200W, unit.middleware());
37
- const result = await pipe(egHandler(EMPTY_REQUEST_W), Effect.provide(NodeFileSystem.layer), Effect.runPromise);
38
- expect(spy).toHaveBeenCalledTimes(1);
39
- expect(spy).toHaveBeenCalledWith(undefined, undefined);
40
- expect(result).toMatchObject({
41
- body: 'OK',
42
- headers: {},
43
- in: {
44
- url: '/',
45
- headers: {},
46
- method: 'GET',
47
- pathParameters: {},
48
- queryStringParameters: {},
49
- },
50
- statusCode: 200,
51
- });
52
- });
53
- it('should work as expected with ca bundle file path', async () => {
54
- const spy = vi.spyOn(unitLib, 'createDefaultPgSqlClientLayer').mockReturnValue(MockPgSqlClientLayer);
55
- const egHandler = pipe(echoCoreIn200W, unit.middleware('/path/to/ca-bundle.pem'));
56
- const result = await pipe(egHandler(EMPTY_REQUEST_W), Effect.provide(NodeFileSystem.layer), Effect.runPromise);
57
- expect(spy).toHaveBeenCalledTimes(1);
58
- expect(spy).toHaveBeenCalledWith('/path/to/ca-bundle.pem', undefined);
59
- expect(result).toMatchObject({
60
- body: 'OK',
61
- headers: {},
62
- in: {
63
- url: '/',
64
- headers: {},
65
- method: 'GET',
66
- pathParameters: {},
67
- queryStringParameters: {},
68
- },
69
- statusCode: 200,
70
- });
71
- });
72
- it('should work as expected with ca bundle file path and CheckServerIdentityFunction', async () => {
73
- const spy = vi.spyOn(unitLib, 'createDefaultPgSqlClientLayer').mockReturnValue(MockPgSqlClientLayer);
74
- const egHandler = pipe(echoCoreIn200W, unit.middleware('/path/to/ca-bundle.pem', ignoreCheckServerIdentity));
75
- const result = await pipe(egHandler(EMPTY_REQUEST_W), Effect.provide(NodeFileSystem.layer), Effect.runPromise);
76
- expect(spy).toHaveBeenCalledTimes(1);
77
- expect(spy).toHaveBeenCalledWith('/path/to/ca-bundle.pem', ignoreCheckServerIdentity);
78
- expect(result).toMatchObject({
79
- body: 'OK',
80
- headers: {},
81
- in: {
82
- url: '/',
83
- headers: {},
84
- method: 'GET',
85
- pathParameters: {},
86
- queryStringParameters: {},
87
- },
88
- statusCode: 200,
89
- });
90
- });
91
- });
92
- });
93
- //# sourceMappingURL=index.test.js.map
package/dist/http/contrib/sqlClientInitPg/index.test.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/index.test.ts"],"names":[],"mappings":"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"}
package/dist/http/contrib/sqlClientInitPg/lib.d.ts DELETED
@@ -1,16 +0,0 @@
1
- import type { PeerCertificate } from 'node:tls';
2
- import { FileSystem } from '@effect/platform';
3
- import type { SqlClient } from '@effect/sql/SqlClient';
4
- import type { SqlError } from '@effect/sql/SqlError';
5
- import { PgClient } from '@effect/sql-pg';
6
- import { Config, ConfigError, Effect, Layer, Schema } from 'effect';
7
- export declare const SslConfigSchema: Schema.transform<Schema.SchemaClass<unknown, string, never>, Schema.Union<[typeof Schema.Boolean, Schema.Struct<{
8
- ca: typeof Schema.String;
9
- }>, Schema.Record$<typeof Schema.String, typeof Schema.Unknown>]>>;
10
- export type SslConfig = typeof SslConfigSchema.Type;
11
- export type CheckServerIdentityFunction = (_hostname: string, _cert: PeerCertificate) => Error | undefined;
12
- export declare function ignoreCheckServerIdentity(_hostname: string, _cert: PeerCertificate): Error | undefined;
13
- export declare function resolveSslConfigDirect(defaultValue: SslConfig): Effect.Effect<Config.Config<SslConfig>, ConfigError.ConfigError>;
14
- export declare function resolveSslConfigCaBundle(caBundleFilePath: string, checkServerIdentityFunction?: CheckServerIdentityFunction): Effect.Effect<Config.Config<SslConfig>, ConfigError.ConfigError, FileSystem.FileSystem>;
15
- export declare function createDefaultPgSqlClientLayer(caBundleFilePath?: string, checkServerIdentityFunction?: CheckServerIdentityFunction): Layer.Layer<SqlClient | PgClient.PgClient, SqlError | ConfigError.ConfigError, FileSystem.FileSystem>;
16
- //# sourceMappingURL=lib.d.ts.map
package/dist/http/contrib/sqlClientInitPg/lib.d.ts.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/lib.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAEhD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAU,KAAK,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIlF,eAAO,MAAM,eAAe;;kEAM3B,CAAC;AACF,MAAM,MAAM,SAAS,GAAG,OAAO,eAAe,CAAC,IAAI,CAAC;AAGpD,MAAM,MAAM,2BAA2B,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,KAAK,KAAK,GAAG,SAAS,CAAC;AAE3G,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,GAAG,KAAK,GAAG,SAAS,CAEtG;AAGD,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,SAAS,GACtB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,WAAW,CAAC,WAAW,CAAC,CAelE;AAGD,wBAAgB,wBAAwB,CACtC,gBAAgB,EAAE,MAAM,EACxB,2BAA2B,CAAC,EAAE,2BAA2B,GACxD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,WAAW,CAAC,WAAW,EAAE,UAAU,CAAC,UAAU,CAAC,CAYzF;AAGD,wBAAgB,6BAA6B,CAC3C,gBAAgB,CAAC,EAAE,MAAM,EACzB,2BAA2B,CAAC,EAAE,2BAA2B,GACxD,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,WAAW,CAAC,WAAW,EAAE,UAAU,CAAC,UAAU,CAAC,CAiBvG"}
package/dist/http/contrib/sqlClientInitPg/lib.js DELETED
@@ -1,38 +0,0 @@
1
- import { FileSystem } from '@effect/platform';
2
- import { PgClient } from '@effect/sql-pg';
3
- import { Config, ConfigError, Effect, Either, Layer, pipe, Schema } from 'effect';
4
- import { TreeFormatter } from 'effect/ParseResult';
5
- // --------------------------------------------------------------------------
6
- export const SslConfigSchema = Schema.parseJson(Schema.Union(Schema.Boolean, Schema.Struct({ ca: Schema.String }), Schema.Record({ key: Schema.String, value: Schema.Unknown })));
7
- export function ignoreCheckServerIdentity(_hostname, _cert) {
8
- return undefined;
9
- }
10
- // --------------------------------------------------------------------------
11
- export function resolveSslConfigDirect(defaultValue) {
12
- return Config.string('DATABASE_SSL')
13
- .pipe(Config.mapOrFail((str) => pipe(str, Schema.decodeUnknownEither(SslConfigSchema), Either.mapLeft((err) => ConfigError.InvalidData([], `[${str}]` + TreeFormatter.formatErrorSync(err))))))
14
- .pipe(Config.withDefault(defaultValue))
15
- .pipe(Effect.succeed);
16
- }
17
- // --------------------------------------------------------------------------
18
- export function resolveSslConfigCaBundle(caBundleFilePath, checkServerIdentityFunction) {
19
- return pipe(FileSystem.FileSystem, Effect.flatMap((fs) => fs.readFileString(caBundleFilePath, 'utf8')), Effect.mapError((err) => ConfigError.InvalidData([], err.message)), Effect.map((ca) => Config.succeed({
20
- ca,
21
- checkServerIdentity: checkServerIdentityFunction,
22
- })));
23
- }
24
- // --------------------------------------------------------------------------
25
- export function createDefaultPgSqlClientLayer(caBundleFilePath, checkServerIdentityFunction) {
26
- const sslConfigEffect = caBundleFilePath
27
- ? resolveSslConfigCaBundle(caBundleFilePath, checkServerIdentityFunction)
28
- : resolveSslConfigDirect(false);
29
- return Layer.unwrapEffect(Effect.map(sslConfigEffect, (sslConfig) => PgClient.layerConfig({
30
- host: Config.string('DATABASE_HOST'),
31
- port: Config.number('DATABASE_PORT'),
32
- username: Config.string('DATABASE_USER'),
33
- password: Config.redacted('DATABASE_PASSWORD'),
34
- database: Config.string('DATABASE_NAME'),
35
- ssl: sslConfig,
36
- })));
37
- }
38
- //# sourceMappingURL=lib.js.map
package/dist/http/contrib/sqlClientInitPg/lib.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"lib.js","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/lib.ts"],"names":[],"mappings":"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"}
package/dist/http/contrib/sqlClientInitPg/lib.test.d.ts DELETED
@@ -1,2 +0,0 @@
1
- export {};
2
- //# sourceMappingURL=lib.test.d.ts.map
package/dist/http/contrib/sqlClientInitPg/lib.test.d.ts.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"lib.test.d.ts","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/lib.test.ts"],"names":[],"mappings":""}
package/dist/http/contrib/sqlClientInitPg/lib.test.js DELETED
@@ -1,101 +0,0 @@
1
- import { NodeFileSystem } from '@effect/platform-node';
2
- import { Effect, Layer, pipe } from 'effect';
3
- import { afterAll, afterEach, beforeAll, describe, expect, it } from 'vitest';
4
- import * as unit from './lib.js';
5
- import { ignoreCheckServerIdentity } from './lib.js';
6
- describe('middleware/sql-client-pg-init/lib', () => {
7
- describe('ignoreCheckServerIdentity', () => {
8
- it('should always return undefined', async () => {
9
- const actual = unit.ignoreCheckServerIdentity('test-host', 'test-cert');
10
- expect(actual).toStrictEqual(undefined);
11
- });
12
- });
13
- describe('resolveSslConfigDirect', () => {
14
- let _oldEnv;
15
- beforeAll(() => {
16
- _oldEnv = process.env;
17
- process.env = {};
18
- });
19
- afterEach(() => {
20
- process.env = {};
21
- });
22
- afterAll(() => {
23
- process.env = _oldEnv;
24
- });
25
- it('should work as expected with boolean value', async () => {
26
- process.env.DATABASE_SSL = 'true';
27
- const actual = await pipe(unit.resolveSslConfigDirect(false), Effect.flatMap((config) => config), Effect.runPromise);
28
- expect(actual).toEqual(true);
29
- });
30
- it('should work as expected with record value', async () => {
31
- process.env.DATABASE_SSL = '{ "rejectUnauthorized": false }';
32
- const actual = await pipe(unit.resolveSslConfigDirect(false), Effect.flatMap((config) => config), Effect.runPromise);
33
- expect(actual).toStrictEqual({ rejectUnauthorized: false });
34
- });
35
- it('should work as expected with default value', async () => {
36
- const actual = await pipe(unit.resolveSslConfigDirect({ foo: 123 }), Effect.flatMap((config) => config), Effect.runPromise);
37
- expect(actual).toStrictEqual({ foo: 123 });
38
- });
39
- it('should work as expected with an invalid value', async () => {
40
- process.env.DATABASE_SSL = '123';
41
- const actual = async () => pipe(unit.resolveSslConfigDirect(false), Effect.flatMap((config) => config), Effect.runPromise);
42
- await expect(actual).rejects.toThrow('Invalid data at DATABASE_SSL');
43
- });
44
- });
45
- describe('resolveSslConfigCaBundle', () => {
46
- it('should work as expected with a valid file path', async () => {
47
- const actual = await pipe(unit.resolveSslConfigCaBundle(`${__dirname}/fixtures/test-ca-bundle.pem`), Effect.flatMap((config) => config), Effect.provide(NodeFileSystem.layer), Effect.runPromise);
48
- expect(actual).toStrictEqual({ ca: 'test-ca-bundle-content', checkServerIdentity: undefined });
49
- });
50
- it('should work as expected with a valid file path and a checkServerIdentity function', async () => {
51
- const actual = await pipe(unit.resolveSslConfigCaBundle(`${__dirname}/fixtures/test-ca-bundle.pem`, ignoreCheckServerIdentity), Effect.flatMap((config) => config), Effect.provide(NodeFileSystem.layer), Effect.runPromise);
52
- expect(actual).toStrictEqual({ ca: 'test-ca-bundle-content', checkServerIdentity: ignoreCheckServerIdentity });
53
- });
54
- it('should fail with a non-existent file path', async () => {
55
- const actual = async () => pipe(unit.resolveSslConfigCaBundle('/non-existent-path/ca-bundle.pem'), Effect.flatMap((config) => config), Effect.provide(NodeFileSystem.layer), Effect.runPromise);
56
- await expect(actual).rejects.toThrow('ENOENT');
57
- });
58
- });
59
- describe('createDefaultPgSqlClientLayer', () => {
60
- let _oldEnv;
61
- beforeAll(() => {
62
- _oldEnv = process.env;
63
- process.env = {};
64
- });
65
- afterEach(() => {
66
- process.env = {};
67
- });
68
- afterAll(() => {
69
- process.env = _oldEnv;
70
- });
71
- it('should work as expected', async () => {
72
- const layer = unit.createDefaultPgSqlClientLayer();
73
- expect(layer).toBeDefined();
74
- });
75
- it('should attempt to build layer with config', async () => {
76
- process.env.DATABASE_HOST = 'localhost';
77
- process.env.DATABASE_PORT = '5432';
78
- process.env.DATABASE_USER = 'test';
79
- process.env.DATABASE_PASSWORD = 'test';
80
- process.env.DATABASE_NAME = 'test';
81
- const layer = unit.createDefaultPgSqlClientLayer();
82
- // Building the layer will fail because there's no actual database,
83
- // but this covers the PgClient.layerConfig code path
84
- const actual = async () => pipe(layer, Layer.build, Effect.scoped, Effect.provide(NodeFileSystem.layer), Effect.runPromise);
85
- await expect(actual).rejects.toThrow();
86
- });
87
- it('should attempt to build layer with ca bundle', async () => {
88
- process.env.DATABASE_HOST = 'localhost';
89
- process.env.DATABASE_PORT = '5432';
90
- process.env.DATABASE_USER = 'test';
91
- process.env.DATABASE_PASSWORD = 'test';
92
- process.env.DATABASE_NAME = 'test';
93
- const layer = unit.createDefaultPgSqlClientLayer(`${__dirname}/fixtures/test-ca-bundle.pem`);
94
- // Building the layer will fail because there's no actual database,
95
- // but this covers the PgClient.layerConfig code path with CA bundle
96
- const actual = async () => pipe(layer, Layer.build, Effect.scoped, Effect.provide(NodeFileSystem.layer), Effect.runPromise);
97
- await expect(actual).rejects.toThrow();
98
- });
99
- });
100
- });
101
- //# sourceMappingURL=lib.test.js.map
package/dist/http/contrib/sqlClientInitPg/lib.test.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"lib.test.js","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/lib.test.ts"],"names":[],"mappings":"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"}