@effect-app/infra 0.51.1 → 0.51.3

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @effect-app/infra
 
+## 0.51.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @effect-app/core@0.44.0
+  - @effect-app/infra-adapters@0.37.2
+  - @effect-app/prelude@0.40.1
+  - @effect-app/schema@0.36.1
+
+## 0.51.2
+
+### Patch Changes
+
+- Improve sentry error info
+
 ## 0.51.1
 
 ### Patch Changes

package/_cjs/errorReporter.cjs

@@ -44,6 +44,7 @@ function reportSentry(error, context, extras) {
   const scope = new Sentry.Scope();
   if (context) scope.setContext("context", context);
   if (extras) scope.setContext("extras", extras);
+  scope.setContext("error", error.toJSON());
   Sentry.captureException(error, scope);
 }
 function logError(makeError) {

package/_cjs/errorReporter.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"errorReporter.cjs","names":["Sentry","_interopRequireWildcard","require","_RequestContextContainer","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","reportError","makeError","cause","extras","tsplus_module_5","untraced","tsplus_module_3","gen","$","context","RequestContextContainer","getOption","tsplus_module_1","isInterrupted","data","logDebug","tsplus_module_2","RecordPretty","object$","error","reportSentry","tsplus_module_4","getOrUndefined","logAnnotate","logErrorCause","JSON","stringify","_tag","message","scope","Scope","setContext","captureException","logError","logWarningCause","console","reportMessage","captureMessage","warn","reportMessageM","sync"],"sources":["../_src/errorReporter.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"errorReporter.cjs","names":["Sentry","_interopRequireWildcard","require","_RequestContextContainer","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","reportError","makeError","cause","extras","tsplus_module_5","untraced","tsplus_module_3","gen","$","context","RequestContextContainer","getOption","tsplus_module_1","isInterrupted","data","logDebug","tsplus_module_2","RecordPretty","object$","error","reportSentry","tsplus_module_4","getOrUndefined","logAnnotate","logErrorCause","JSON","stringify","_tag","message","scope","Scope","setContext","toJSON","captureException","logError","logWarningCause","console","reportMessage","captureMessage","warn","reportMessageM","sync"],"sources":["../_src/errorReporter.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAGA,IAAAC,wBAAA,GAAAD,OAAA;AAA+E,SAAAE,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAJ,wBAAAQ,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AAEzE,SAAUW,WAAWA,CACzBC,SAAkC;EAElC,OAAO,CAACC,KAAe,EAAEC,MAAgC,KACvDC,eAAA,CAAAC,QAAA,CAAe,MACbC,eAAA,CAAAC,GAAA,CAAW,WAAUC,CAAC;IACpB,MAAMC,OAAO,GAAG,OAAOD,CAAC,CAACE,gDAAuB,CAACC,SAAS,CAAC;IAC3D,IAAIC,eAAA,CAAAC,aAAA,CAAAX,KAAK,CAAgB,EAAE;MACzB,MAAMY,IAAI,GAAG;QAAEL,OAAO;QAAE,GAAGN;MAAM,CAAE;MACnC,OAAOK,CAAC,CAACF,eAAA,CAAAS,QAAA,CAAgB,eAAe,IAAID,IAAI,GAAEE,eAAA,CAAAC,YAAA,CAAAD,eAAA,CAAAE,OAAA,CAACJ,IAAI,KAAa,EAAE,CAAC,CAAC,CAAC;MACzE;;IAEF,MAAMK,KAAK,GAAGlB,SAAS,CAACC,KAAK,CAAC;IAC9BkB,YAAY,CAACD,KAAK,EAAAE,eAAA,CAAAC,cAAA,CAAEb,OAAO,GAAQN,MAAM,CAAC;IAC1C,OAAOK,CAAC,CACNF,eAAA,CAAAiB,WAAA,CAAAjB,eAAA,CAAAkB,aAAA,CAAAtB,KAAK,GACH,QAAQ,EACRuB,IAAI,CAACC,SAAS,CAAC;MAAEjB,OAAO;MAAEN,MAAM;MAAEgB,KAAK,EAAE;QAAEQ,IAAI,EAAER,KAAK,CAACQ,IAAI;QAAEC,OAAO,EAAET,KAAK,CAACS;MAAO;IAAE,CAAE,CAAC,CACzF,CACF;EACH,CAAC,CAAC,CACH;AACL;AAEA,SAASR,YAAYA,CACnBD,KAAS,EACTV,OAAmC,EACnCN,MAA2C;EAE3C,MAAM0B,KAAK,GAAG,IAAIvD,MAAM,CAACwD,KAAK,EAAE;EAChC,IAAIrB,OAAO,EAAEoB,KAAK,CAACE,UAAU,CAAC,SAAS,EAAEtB,OAA6C,CAAC;EACvF,IAAIN,MAAM,EAAE0B,KAAK,CAACE,UAAU,CAAC,QAAQ,EAAE5B,MAAM,CAAC;EAC9C0B,KAAK,CAACE,UAAU,CAAC,OAAO,EAAEZ,KAAK,CAACa,MAAM,EAAE,CAAC;EACzC1D,MAAM,CAAC2D,gBAAgB,CAACd,KAAK,EAAEU,KAAK,CAAC;AACvC;AAEM,SAAUK,QAAQA,CACtBjC,SAAkC;EAElC,OAAO,CAACC,KAAe,EAAEO,OAAiC,KACxDL,eAAA,CAAAC,QAAA,CAAe,MACbC,eAAA,CAAAC,GAAA,CAAW,WAAUC,CAAC;IACpB,IAAII,eAAA,CAAAC,aAAA,CAAAX,KAAK,CAAgB,EAAE;MACzB,OAAOM,CAAC,CAACF,eAAA,CAAAS,QAAA,CAAgB,eAAe,IAAIN,OAAO,GAAEO,eAAA,CAAAC,YAAA,CAAAD,eAAA,CAAAE,OAAA,CAACT,OAAO,KAAa,EAAE,CAAC,CAAC,CAAC;MAC/E;;IAEF,MAAMU,KAAK,GAAGlB,SAAS,CAACC,KAAK,CAAC;IAC9B,OAAOM,CAAC,CACNF,eAAA,CAAAiB,WAAA,CAAAjB,eAAA,CAAA6B,eAAA,CAAAjC,KAAK,GACH,QAAQ,EACRuB,IAAI,CAACC,SAAS,CAAC;MAAEjB,OAAO;MAAEU,KAAK,EAAE;QAAEQ,IAAI,EAAER,KAAK,CAACQ,IAAI;QAAEC,OAAO,EAAET,KAAK,CAACS;MAAO;IAAE,CAAE,CAAC,CACjF,CACF;EACH,CAAC,CAAC,CACH;AACL;AAEM,SAAUK,gBAAgBA,CAACd,KAAc;EAC7C7C,MAAM,CAAC2D,gBAAgB,CAACd,KAAK,CAAC;EAC9BiB,OAAO,CAACjB,KAAK,CAACA,KAAK,CAAC;AACtB;AAEM,SAAUkB,aAAaA,CAACT,OAAe;EAC3CtD,MAAM,CAACgE,cAAc,CAACV,OAAO,CAAC;EAE9BQ,OAAO,CAACG,IAAI,CAACX,OAAO,CAAC;AACvB;AAEM,SAAUY,cAAcA,CAACZ,OAAe;EAC5C,OAAOtB,eAAA,CAAAmC,IAAA,OAAOJ,aAAa,CAACT,OAAO,CAAC,CAAC;AACvC"}

package/_src/errorReporter.ts

@@ -27,14 +27,15 @@ export function reportError<E, E2 extends CauseException<unknown>>(
     )
 }
 
-function reportSentry(
-  error: unknown,
+function reportSentry<E2 extends CauseException<unknown>>(
+  error: E2,
   context: RequestContext | undefined,
   extras: Record<string, unknown> | undefined
 ) {
   const scope = new Sentry.Scope()
   if (context) scope.setContext("context", context as unknown as Record<string, unknown>)
   if (extras) scope.setContext("extras", extras)
+  scope.setContext("error", error.toJSON())
   Sentry.captureException(error, scope)
 }
 

package/dist/api/express/makeOpenApiSpecs.d.ts

@@ -18,7 +18,7 @@ export declare function makeOpenApiSpecs(rdescs: Iterable<RouteDescriptorAny>, i
         version: string;
     };
     tags: never[];
-    paths: Record<string, Record<"PATCH" | "GET" | "PUT" | "POST" | "DELETE", {
+    paths: Record<string, Record<"PATCH" | "GET" | "POST" | "PUT" | "DELETE", {
         [x: string]: {
             responses: any;
             tags: readonly string[] | undefined;

package/dist/errorReporter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errorReporter.d.ts","sourceRoot":"","sources":["../_src/errorReporter.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAIjD,wBAAgB,WAAW,CAAC,CAAC,EAAE,EAAE,SAAS,cAAc,CAAC,OAAO,CAAC,EAC/D,SAAS,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,WAEnB,MAAM,CAAC,CAAC,WAAW,OAAO,MAAM,EAAE,OAAO,CAAC,4DAmB1D;AAaD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,EAAE,SAAS,cAAc,CAAC,OAAO,CAAC,EAC5D,SAAS,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,WAEnB,MAAM,CAAC,CAAC,YAAY,OAAO,MAAM,EAAE,OAAO,CAAC,4DAgB3D;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,QAG9C;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,QAI5C;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,0DAE7C"}
+{"version":3,"file":"errorReporter.d.ts","sourceRoot":"","sources":["../_src/errorReporter.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAIjD,wBAAgB,WAAW,CAAC,CAAC,EAAE,EAAE,SAAS,cAAc,CAAC,OAAO,CAAC,EAC/D,SAAS,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,WAEnB,MAAM,CAAC,CAAC,WAAW,OAAO,MAAM,EAAE,OAAO,CAAC,4DAmB1D;AAcD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,EAAE,SAAS,cAAc,CAAC,OAAO,CAAC,EAC5D,SAAS,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,WAEnB,MAAM,CAAC,CAAC,YAAY,OAAO,MAAM,EAAE,OAAO,CAAC,4DAgB3D;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,QAG9C;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,QAI5C;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,0DAE7C"}

package/dist/errorReporter.js

@@ -24,6 +24,7 @@ function reportSentry(error, context, extras) {
         scope.setContext("context", context);
     if (extras)
         scope.setContext("extras", extras);
+    scope.setContext("error", error.toJSON());
     Sentry.captureException(error, scope);
 }
 export function logError(makeError) {
@@ -47,4 +48,4 @@ export function reportMessage(message) {
 export function reportMessageM(message) {
     return tsplus_module_3.sync(() => reportMessage(message));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JSZXBvcnRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvZXJyb3JSZXBvcnRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLE9BQU8sS0FBSyxNQUFNLE1BQU0sY0FBYyxDQUFBO0FBR3RDLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHVDQUF1QyxDQUFBO0FBRS9FLE1BQU0sVUFBVSxXQUFXLENBQ3pCLFNBQWtDO0lBRWxDLE9BQU8sQ0FBQyxLQUFlLEVBQUUsTUFBZ0MsRUFBRSxFQUFFLENBQzNELHlCQUFlLEdBQUcsRUFBRSxDQUNsQixvQkFBVyxRQUFRLENBQUMsRUFBQyxDQUFDO1FBQ3BCLE1BQU0sT0FBTyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyx1QkFBdUIsQ0FBQyxTQUFTLENBQUMsQ0FBQTtRQUMzRCxJQUFJLDhCQUFBLEtBQUssQ0FBZ0IsRUFBRTtZQUN6QixNQUFNLElBQUksR0FBRyxFQUFFLE9BQU8sRUFBRSxHQUFHLE1BQU0sRUFBRSxDQUFBO1lBQ25DLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyx5QkFBZ0IsZUFBZSxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUMsc0RBQUMsSUFBSSxHQUFXLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUE7WUFDekUsT0FBTTtTQUNQO1FBQ0QsTUFBTSxLQUFLLEdBQUcsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQzlCLFlBQVksQ0FBQyxLQUFLLGlDQUFFLE9BQU8sR0FBUSxNQUFNLENBQUMsQ0FBQTtRQUMxQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQ04sMERBQUEsS0FBSyxHQUNILFFBQVEsRUFDUixJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsRUFBRSxJQUFJLEVBQUUsS0FBSyxDQUFDLElBQUksRUFBRSxPQUFPLEVBQUUsS0FBSyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsQ0FDekYsQ0FDRixDQUFBO0lBQ0gsQ0FBQyxDQUFDLENBQ0gsQ0FBQTtBQUNMLENBQUM7QUFFRCxTQUFTLFlBQVksQ0FDbkIsS0FBYyxFQUNkLE9BQW1DLEVBQ25DLE1BQTJDO0lBRTNDLE1BQU0sS0FBSyxHQUFHLElBQUksTUFBTSxDQUFDLEtBQUssRUFBRSxDQUFBO0lBQ2hDLElBQUksT0FBTztRQUFFLEtBQUssQ0FBQyxVQUFVLENBQUMsU0FBUyxFQUFFLE9BQTZDLENBQUMsQ0FBQTtJQUN2RixJQUFJLE1BQU07UUFBRSxLQUFLLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQTtJQUM5QyxNQUFNLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLEtBQUssQ0FBQyxDQUFBO0FBQ3ZDLENBQUM7QUFFRCxNQUFNLFVBQVUsUUFBUSxDQUN0QixTQUFrQztJQUVsQyxPQUFPLENBQUMsS0FBZSxFQUFFLE9BQWlDLEVBQUUsRUFBRSxDQUM1RCx5QkFBZSxHQUFHLEVBQUUsQ0FDbEIsb0JBQVcsUUFBUSxDQUFDLEVBQUMsQ0FBQztRQUNwQixJQUFJLDhCQUFBLEtBQUssQ0FBZ0IsRUFBRTtZQUN6QixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMseUJBQWdCLGVBQWUsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDLHNEQUFDLE9BQU8sR0FBVyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFBO1lBQy9FLE9BQU07U0FDUDtRQUNELE1BQU0sS0FBSyxHQUFHLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUM5QixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQ04sNERBQUEsS0FBSyxHQUNILFFBQVEsRUFDUixJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxFQUFFLElBQUksRUFBRSxLQUFLLENBQUMsSUFBSSxFQUFFLE9BQU8sRUFBRSxLQUFLLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxDQUNqRixDQUNGLENBQUE7SUFDSCxDQUFDLENBQUMsQ0FDSCxDQUFBO0FBQ0wsQ0FBQztBQUVELE1BQU0sVUFBVSxnQkFBZ0IsQ0FBQyxLQUFjO0lBQzdDLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsQ0FBQTtJQUM5QixPQUFPLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFBO0FBQ3RCLENBQUM7QUFFRCxNQUFNLFVBQVUsYUFBYSxDQUFDLE9BQWU7SUFDM0MsTUFBTSxDQUFDLGNBQWMsQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUU5QixPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0FBQ3ZCLENBQUM7QUFFRCxNQUFNLFVBQVUsY0FBYyxDQUFDLE9BQWU7SUFDNUMsT0FBTywyQkFBTyxhQUFhLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQTtBQUN2QyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JSZXBvcnRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvZXJyb3JSZXBvcnRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLE9BQU8sS0FBSyxNQUFNLE1BQU0sY0FBYyxDQUFBO0FBR3RDLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHVDQUF1QyxDQUFBO0FBRS9FLE1BQU0sVUFBVSxXQUFXLENBQ3pCLFNBQWtDO0lBRWxDLE9BQU8sQ0FBQyxLQUFlLEVBQUUsTUFBZ0MsRUFBRSxFQUFFLENBQzNELHlCQUFlLEdBQUcsRUFBRSxDQUNsQixvQkFBVyxRQUFRLENBQUMsRUFBQyxDQUFDO1FBQ3BCLE1BQU0sT0FBTyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyx1QkFBdUIsQ0FBQyxTQUFTLENBQUMsQ0FBQTtRQUMzRCxJQUFJLDhCQUFBLEtBQUssQ0FBZ0IsRUFBRTtZQUN6QixNQUFNLElBQUksR0FBRyxFQUFFLE9BQU8sRUFBRSxHQUFHLE1BQU0sRUFBRSxDQUFBO1lBQ25DLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyx5QkFBZ0IsZUFBZSxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUMsc0RBQUMsSUFBSSxHQUFXLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUE7WUFDekUsT0FBTTtTQUNQO1FBQ0QsTUFBTSxLQUFLLEdBQUcsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQzlCLFlBQVksQ0FBQyxLQUFLLGlDQUFFLE9BQU8sR0FBUSxNQUFNLENBQUMsQ0FBQTtRQUMxQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQ04sMERBQUEsS0FBSyxHQUNILFFBQVEsRUFDUixJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsRUFBRSxJQUFJLEVBQUUsS0FBSyxDQUFDLElBQUksRUFBRSxPQUFPLEVBQUUsS0FBSyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsQ0FDekYsQ0FDRixDQUFBO0lBQ0gsQ0FBQyxDQUFDLENBQ0gsQ0FBQTtBQUNMLENBQUM7QUFFRCxTQUFTLFlBQVksQ0FDbkIsS0FBUyxFQUNULE9BQW1DLEVBQ25DLE1BQTJDO0lBRTNDLE1BQU0sS0FBSyxHQUFHLElBQUksTUFBTSxDQUFDLEtBQUssRUFBRSxDQUFBO0lBQ2hDLElBQUksT0FBTztRQUFFLEtBQUssQ0FBQyxVQUFVLENBQUMsU0FBUyxFQUFFLE9BQTZDLENBQUMsQ0FBQTtJQUN2RixJQUFJLE1BQU07UUFBRSxLQUFLLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQTtJQUM5QyxLQUFLLENBQUMsVUFBVSxDQUFDLE9BQU8sRUFBRSxLQUFLLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQTtJQUN6QyxNQUFNLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLEtBQUssQ0FBQyxDQUFBO0FBQ3ZDLENBQUM7QUFFRCxNQUFNLFVBQVUsUUFBUSxDQUN0QixTQUFrQztJQUVsQyxPQUFPLENBQUMsS0FBZSxFQUFFLE9BQWlDLEVBQUUsRUFBRSxDQUM1RCx5QkFBZSxHQUFHLEVBQUUsQ0FDbEIsb0JBQVcsUUFBUSxDQUFDLEVBQUMsQ0FBQztRQUNwQixJQUFJLDhCQUFBLEtBQUssQ0FBZ0IsRUFBRTtZQUN6QixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMseUJBQWdCLGVBQWUsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDLHNEQUFDLE9BQU8sR0FBVyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFBO1lBQy9FLE9BQU07U0FDUDtRQUNELE1BQU0sS0FBSyxHQUFHLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUM5QixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQ04sNERBQUEsS0FBSyxHQUNILFFBQVEsRUFDUixJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxFQUFFLElBQUksRUFBRSxLQUFLLENBQUMsSUFBSSxFQUFFLE9BQU8sRUFBRSxLQUFLLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxDQUNqRixDQUNGLENBQUE7SUFDSCxDQUFDLENBQUMsQ0FDSCxDQUFBO0FBQ0wsQ0FBQztBQUVELE1BQU0sVUFBVSxnQkFBZ0IsQ0FBQyxLQUFjO0lBQzdDLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsQ0FBQTtJQUM5QixPQUFPLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFBO0FBQ3RCLENBQUM7QUFFRCxNQUFNLFVBQVUsYUFBYSxDQUFDLE9BQWU7SUFDM0MsTUFBTSxDQUFDLGNBQWMsQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUU5QixPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0FBQ3ZCLENBQUM7QUFFRCxNQUFNLFVBQVUsY0FBYyxDQUFDLE9BQWU7SUFDNUMsT0FBTywyQkFBTyxhQUFhLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQTtBQUN2QyxDQUFDIn0=

package/dist/services/RepositoryBase.d.ts

@@ -102,7 +102,7 @@ export declare function makeRepo<PM extends {
             value: A_1;
             readonly S: PM;
         };
-    }) => Where | readonly [Where, ...Where[]], mode?: "or" | "and" | undefined) => Filter<PM>;
+    }) => Where | readonly [Where, ...Where[]], mode?: "and" | "or" | undefined) => Filter<PM>;
 };
 /**
  * @tsplus fluent Repository removeById

package/dist/services/simpledb/cosmosdb.d.ts

@@ -6,8 +6,8 @@ import type { DBRecord } from "./shared.js";
 import { OptimisticLockException } from "./shared.js";
 import * as simpledb from "./simpledb.js";
 export declare function createContext<TKey extends string, EA, A extends DBRecord<TKey>>(): <REncode, RDecode, EDecode>(type: string, encode: (record: A) => import("@effect/io/Effect").Effect<REncode, never, EA>, decode: (d: EA) => import("@effect/io/Effect").Effect<RDecode, EDecode, A>, indexes: IndexingPolicy) => import("@effect/io/Effect").Effect<Cosmos.CosmosClient, unknown, {
-    find: (id: string) => import("@effect/io/Effect").Effect<Cosmos.CosmosClient | RDecode | simpledb.RecordCache, unknown, import("@effect/data/Option").Option<A>>;
+    find: (id: string) => import("@effect/io/Effect").Effect<Cosmos.CosmosClient | simpledb.RecordCache | RDecode, unknown, import("@effect/data/Option").Option<A>>;
     findBy: (parameters: Record<string, string>) => import("@effect/io/Effect").Effect<Cosmos.CosmosClient, unknown, import("@effect/data/Option").Option<any>>;
-    save: (record: A) => import("@effect/io/Effect").Effect<Cosmos.CosmosClient | REncode | simpledb.RecordCache, OptimisticLockException, A>;
+    save: (record: A) => import("@effect/io/Effect").Effect<Cosmos.CosmosClient | simpledb.RecordCache | REncode, OptimisticLockException, A>;
 }>;
 //# sourceMappingURL=cosmosdb.d.ts.map

package/dist/services/simpledb/diskdb.d.ts

@@ -6,7 +6,7 @@ import * as simpledb from "./simpledb.js";
 export declare function createContext<TKey extends string, EA, A extends DBRecord<TKey>>(): <REncode, RDecode, EDecode>(type: string, encode: (record: A) => import("@effect/io/Effect").Effect<REncode, never, EA>, decode: (d: EA) => import("@effect/io/Effect").Effect<RDecode, EDecode, A>, schemaVersion: string, makeIndexKey: (r: A) => Index, dir?: string) => {
     find: (id: string) => import("@effect/io/Effect").Effect<simpledb.RecordCache | RDecode, simpledb.InvalidStateError, import("@effect/data/Option").Option<A>>;
     findByIndex: (index: Index) => import("@effect/io/Effect").Effect<never, never, import("@effect/data/Option").Option<TKey & {}>>;
-    save: (record: A) => import("@effect/io/Effect").Effect<simpledb.RecordCache | REncode, import("./shared.js").OptimisticLockException | simpledb.InvalidStateError | CouldNotAquireDbLockException, A>;
+    save: (record: A) => import("@effect/io/Effect").Effect<simpledb.RecordCache | REncode, CouldNotAquireDbLockException | import("./shared.js").OptimisticLockException | simpledb.InvalidStateError, A>;
 };
 export declare function initialise(dir: string): void;
 //# sourceMappingURL=diskdb.d.ts.map

package/dist/services/simpledb/redisdb.d.ts

@@ -8,7 +8,7 @@ import * as simpledb from "./simpledb.js";
 export declare function createContext<TKey extends string, EA, A extends DBRecord<TKey>>(): <REncode, RDecode, EDecode>(type: string, encode: (record: A) => import("@effect/io/Effect").Effect<REncode, never, EA>, decode: (d: EA) => import("@effect/io/Effect").Effect<RDecode, EDecode, A>, schemaVersion: string, makeIndexKey: (r: A) => Index) => {
     find: (id: string) => import("@effect/io/Effect").Effect<RedisClient | simpledb.RecordCache | RDecode, simpledb.InvalidStateError, import("@effect/data/Option").Option<A>>;
     findByIndex: (index: Index) => import("@effect/io/Effect").Effect<RedisClient, import("@effect-app/infra-adapters/redis-client").ConnectionException, import("@effect/data/Option").Option<TKey>>;
-    save: (record: A) => import("@effect/io/Effect").Effect<RedisClient | simpledb.RecordCache | REncode, import("./shared.js").OptimisticLockException | simpledb.InvalidStateError | CouldNotAquireDbLockException, A>;
+    save: (record: A) => import("@effect/io/Effect").Effect<RedisClient | simpledb.RecordCache | REncode, CouldNotAquireDbLockException | import("./shared.js").OptimisticLockException | simpledb.InvalidStateError, A>;
 };
 declare const RedisSerializedDBRecord_base: MO.Model<RedisSerializedDBRecord, MO.SchemaProperties<{
     version: MO.Property<MO.SchemaDefaultSchema<unknown, string, string, string, {}>, "required", import("@effect/data/Option").None<any>, import("@effect/data/Option").None<any>>;

package/dist/services/simpledb/simpledb.d.ts

@@ -17,7 +17,7 @@ export interface RecordCache extends ReturnType<typeof makeLiveRecordCache> {
 }
 export declare const RecordCache: import("@effect/data/Context").Tag<RecordCache, RecordCache>;
 export declare const LiveRecordCache: import("@effect/io/Layer").Layer<never, never, RecordCache>;
-export declare function find<R, RDecode, EDecode, E, EA, A>(tryRead: (id: string) => Effect<R, E, Option<CachedRecord<EA>>>, decode: (d: EA) => Effect<RDecode, EDecode, A>, type: string): (id: string) => import("@effect/io/Effect").Effect<R | RDecode | RecordCache, E | InvalidStateError, import("@effect/data/Option").Option<A>>;
-export declare function storeDirectly<R, E, TKey extends string, A extends DBRecord<TKey>>(save: (r: A, version: Option<Version>) => Effect<R, E, CachedRecord<A>>, type: string): (record: A) => import("@effect/io/Effect").Effect<R | RecordCache, E, A>;
+export declare function find<R, RDecode, EDecode, E, EA, A>(tryRead: (id: string) => Effect<R, E, Option<CachedRecord<EA>>>, decode: (d: EA) => Effect<RDecode, EDecode, A>, type: string): (id: string) => import("@effect/io/Effect").Effect<RecordCache | R | RDecode, InvalidStateError | E, import("@effect/data/Option").Option<A>>;
+export declare function storeDirectly<R, E, TKey extends string, A extends DBRecord<TKey>>(save: (r: A, version: Option<Version>) => Effect<R, E, CachedRecord<A>>, type: string): (record: A) => import("@effect/io/Effect").Effect<RecordCache | R, E, A>;
 export declare function store<R, E, R2, E2, TKey extends string, EA, A extends DBRecord<TKey>>(tryRead: (id: string) => Effect<R, E, Option<CachedRecord<EA>>>, save: (r: A, version: Option<Version>) => Effect<R, E, CachedRecord<A>>, lock: (id: string) => Effect<R2 | Scope, E2, unknown>, type: string): (record: A) => import("@effect/io/Effect").Effect<RecordCache | R | Exclude<R2, import("@effect/io/Scope").Scope>, OptimisticLockException | InvalidStateError | E | E2, A>;
 //# sourceMappingURL=simpledb.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.51.1",
+  "version": "0.51.3",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -19,10 +19,10 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "^6.0.1",
     "redlock": "^4.2.0",
-    "@effect-app/prelude": "0.40.0",
-    "@effect-app/core": "0.43.0",
-    "@effect-app/infra-adapters": "0.37.1",
-    "@effect-app/schema": "0.36.0"
+    "@effect-app/prelude": "0.40.1",
+    "@effect-app/core": "0.44.0",
+    "@effect-app/schema": "0.36.1",
+    "@effect-app/infra-adapters": "0.37.2"
   },
   "devDependencies": {
     "@babel/cli": "^7.21.0",