@effect-app/infra 0.51.2 → 0.51.4

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @effect-app/infra
 
+## 0.51.4
+
+### Patch Changes
+
+- fix: Should create a new RequestContext on each invocation.
+
+## 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

package/_cjs/api/setupRequest.cjs

@@ -41,15 +41,17 @@ function setupRequestFrom_1(self) {
  * @tsplus fluent effect/io/Effect setupRequestFromWith
  */
 function setupReq3(self, name) {
-  return tsplus_module_4.untraced(() => tsplus_module_1.provideService(setupRequestFrom_1(self), _RequestContextContainer.RequestContextContainer, new _RequestContextContainer.RequestContextContainerImpl(makeInternalRequestContext(name))));
+  return tsplus_module_4.untraced(() => tsplus_module_1.flatMap(makeInternalRequestContext(name), rc => tsplus_module_1.provideService(setupRequestFrom_1(self), _RequestContextContainer.RequestContextContainer, new _RequestContextContainer.RequestContextContainerImpl(rc))));
 }
 function makeInternalRequestContext(name) {
-  const id = tsplus_module_5.StringId.make();
-  return new _RequestContext.RequestContext({
-    id,
-    rootId: id,
-    locale: "en",
-    name: tsplus_module_5.ReasonableString(name)
+  return tsplus_module_1.sync(() => {
+    const id = tsplus_module_5.StringId.make();
+    return new _RequestContext.RequestContext({
+      id,
+      rootId: id,
+      locale: "en",
+      name: tsplus_module_5.ReasonableString(name)
+    });
   });
 }
 //# sourceMappingURL=setupRequest.cjs.map

package/_cjs/api/setupRequest.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"setupRequest.cjs","names":["_RequestContext","require","_RequestContextContainer","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","_interopRequireWildcard","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","setupRequest","setupRequest_1","exports","setupRequestFrom","setupRequestFrom_1","self","requestContext","tsplus_module_4","untraced","tsplus_module_3","pipe","tsplus_module_1","logSpan","tsplus_module_2","logAnnotates","requestRootId","rootId","requestId","id","requestName","name","user","requestUserId","flatMap","RequestContextContainer","setupReq3","provideService","RequestContextContainerImpl","makeInternalRequestContext","tsplus_module_5","StringId","make","RequestContext","locale","ReasonableString"],"sources":["../../_src/api/setupRequest.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"setupRequest.cjs","names":["_RequestContext","require","_RequestContextContainer","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","_interopRequireWildcard","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","setupRequest","setupRequest_1","exports","setupRequestFrom","setupRequestFrom_1","self","requestContext","tsplus_module_4","untraced","tsplus_module_3","pipe","tsplus_module_1","logSpan","tsplus_module_2","logAnnotates","requestRootId","rootId","requestId","id","requestName","name","user","requestUserId","flatMap","RequestContextContainer","setupReq3","makeInternalRequestContext","rc","provideService","RequestContextContainerImpl","sync","tsplus_module_5","StringId","make","RequestContext","locale","ReasonableString"],"sources":["../../_src/api/setupRequest.ts"],"sourcesContent":[null],"mappings":"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"}

package/_src/api/setupRequest.ts

@@ -32,18 +32,22 @@ export function setupRequestFrom<R, E, A>(self: Effect<R, E, A>) {
  */
 export function setupReq3<R, E, A>(self: Effect<R, E, A>, name: string) {
   return Debug.untraced(() =>
-    self
-      .setupRequestFrom
-      .provideService(RequestContextContainer, new RequestContextContainerImpl(makeInternalRequestContext(name)))
+    makeInternalRequestContext(name).flatMap((rc) =>
+      self
+        .setupRequestFrom
+        .provideService(RequestContextContainer, new RequestContextContainerImpl(rc))
+    )
   )
 }
 
 function makeInternalRequestContext(name: string) {
-  const id = StringId.make()
-  return new RequestContext({
-    id,
-    rootId: id,
-    locale: "en",
-    name: ReasonableString(name)
+  return Effect.sync(() => {
+    const id = StringId.make()
+    return new RequestContext({
+      id,
+      rootId: id,
+      locale: "en",
+      name: ReasonableString(name)
+    })
   })
 }

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/api/setupRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setupRequest.d.ts","sourceRoot":"","sources":["../../_src/api/setupRequest.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,uBAAuB,EAA+B,MAAM,wCAAwC,CAAA;;;;;AAK7G,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,EAAE,cAAc,+CAY1F;;;;;AAKD,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,yEAI9D;;;;;AAKD,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,iFAMrE"}
+{"version":3,"file":"setupRequest.d.ts","sourceRoot":"","sources":["../../_src/api/setupRequest.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,uBAAuB,EAA+B,MAAM,wCAAwC,CAAA;;;;;AAK7G,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,EAAE,cAAc,+CAY1F;;;;;AAKD,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,yEAI9D;;;;;AAKD,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,iFAQrE"}

package/dist/api/setupRequest.js

@@ -28,15 +28,17 @@ function setupRequestFrom_1(self) {
  * @tsplus fluent effect/io/Effect setupRequestFromWith
  */
 export function setupReq3(self, name) {
-    return tsplus_module_4.untraced(() => tsplus_module_1.provideService(setupRequestFrom_1(self), RequestContextContainer, new RequestContextContainerImpl(makeInternalRequestContext(name))));
+    return tsplus_module_4.untraced(() => tsplus_module_1.flatMap(makeInternalRequestContext(name), (rc) => tsplus_module_1.provideService(setupRequestFrom_1(self), RequestContextContainer, new RequestContextContainerImpl(rc))));
 }
 function makeInternalRequestContext(name) {
-    const id = tsplus_module_5.StringId.make();
-    return new RequestContext({
-        id,
-        rootId: id,
-        locale: "en",
-        name: tsplus_module_5.ReasonableString(name)
+    return tsplus_module_1.sync(() => {
+        const id = tsplus_module_5.StringId.make();
+        return new RequestContext({
+            id,
+            rootId: id,
+            locale: "en",
+            name: tsplus_module_5.ReasonableString(name)
+        });
     });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvc2V0dXBSZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O2FBTWdCLFlBQVk7YUFpQlosZ0JBQWdCO0FBdkJoQyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFDckQsT0FBTyxFQUFFLHVCQUF1QixFQUFFLDJCQUEyQixFQUFFLE1BQU0sd0NBQXdDLENBQUE7QUFFN0c7O0dBRUc7QUFDSCx3QkFBc0MsSUFBcUIsRUFBRSxjQUE4QjtJQUN6RixPQUFPLHlCQUFlLEdBQUcsRUFBRSxDQUN6QixnQkFBQSxJQUFJLENBQ0Ysd0JBQUEsSUFBSSxFQUFTLFNBQVMsQ0FBQyxFQUN2Qiw2QkFBb0I7UUFDbEIsYUFBYSxFQUFFLGNBQWMsQ0FBQyxNQUFNO1FBQ3BDLFNBQVMsRUFBRSxjQUFjLENBQUMsRUFBRTtRQUM1QixXQUFXLEVBQUUsY0FBYyxDQUFDLElBQUk7UUFDaEMsR0FBRyxjQUFjLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxhQUFhLEVBQUUsY0FBYyxDQUFDLElBQUksQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRTtLQUM1RSxDQUFDLENBQ0gsQ0FDRixDQUFBO0FBQ0gsQ0FBQztBQUVEOztHQUVHO0FBQ0gsNEJBQTBDLElBQXFCO0lBQzdELE9BQU8seUJBQWUsR0FBRyxFQUFFLENBQ3pCLHdCQUFBLHVCQUF1QixDQUFDLEdBQUcsRUFBUyxDQUFDLGNBQWMsRUFBRSxFQUFFLENBQUMsZUFBQSxJQUFJLEVBQWMsY0FBYyxDQUFDLENBQUMsQ0FDM0YsQ0FBQTtBQUNILENBQUM7QUFFRDs7R0FFRztBQUNILE1BQU0sVUFBVSxTQUFTLENBQVUsSUFBcUIsRUFBRSxJQUFZO0lBQ3BFLE9BQU8seUJBQWUsR0FBRyxFQUFFLENBQ3pCLGtEQUFBLElBQUksR0FFYyx1QkFBdUIsRUFBRSxJQUFJLDJCQUEyQixDQUFDLDBCQUEwQixDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FDOUcsQ0FBQTtBQUNILENBQUM7QUFFRCxTQUFTLDBCQUEwQixDQUFDLElBQVk7SUFDOUMsTUFBTSxFQUFFLEdBQUcsZ0JBQUEsUUFBUSxDQUFDLElBQUksRUFBRSxDQUFBO0lBQzFCLE9BQU8sSUFBSSxjQUFjLENBQUM7UUFDeEIsRUFBRTtRQUNGLE1BQU0sRUFBRSxFQUFFO1FBQ1YsTUFBTSxFQUFFLElBQUk7UUFDWixJQUFJLEVBQUUsZ0JBQUEsZ0JBQWdCLENBQUMsSUFBSSxDQUFDO0tBQzdCLENBQUMsQ0FBQTtBQUNKLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvc2V0dXBSZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O2FBTWdCLFlBQVk7YUFpQlosZ0JBQWdCO0FBdkJoQyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFDckQsT0FBTyxFQUFFLHVCQUF1QixFQUFFLDJCQUEyQixFQUFFLE1BQU0sd0NBQXdDLENBQUE7QUFFN0c7O0dBRUc7QUFDSCx3QkFBc0MsSUFBcUIsRUFBRSxjQUE4QjtJQUN6RixPQUFPLHlCQUFlLEdBQUcsRUFBRSxDQUN6QixnQkFBQSxJQUFJLENBQ0Ysd0JBQUEsSUFBSSxFQUFTLFNBQVMsQ0FBQyxFQUN2Qiw2QkFBb0I7UUFDbEIsYUFBYSxFQUFFLGNBQWMsQ0FBQyxNQUFNO1FBQ3BDLFNBQVMsRUFBRSxjQUFjLENBQUMsRUFBRTtRQUM1QixXQUFXLEVBQUUsY0FBYyxDQUFDLElBQUk7UUFDaEMsR0FBRyxjQUFjLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxhQUFhLEVBQUUsY0FBYyxDQUFDLElBQUksQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRTtLQUM1RSxDQUFDLENBQ0gsQ0FDRixDQUFBO0FBQ0gsQ0FBQztBQUVEOztHQUVHO0FBQ0gsNEJBQTBDLElBQXFCO0lBQzdELE9BQU8seUJBQWUsR0FBRyxFQUFFLENBQ3pCLHdCQUFBLHVCQUF1QixDQUFDLEdBQUcsRUFBUyxDQUFDLGNBQWMsRUFBRSxFQUFFLENBQUMsZUFBQSxJQUFJLEVBQWMsY0FBYyxDQUFDLENBQUMsQ0FDM0YsQ0FBQTtBQUNILENBQUM7QUFFRDs7R0FFRztBQUNILE1BQU0sVUFBVSxTQUFTLENBQVUsSUFBcUIsRUFBRSxJQUFZO0lBQ3BFLE9BQU8seUJBQWUsR0FBRyxFQUFFLENBQ3pCLHdCQUFBLDBCQUEwQixDQUFDLElBQUksQ0FBQyxFQUFTLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FDOUMsa0RBQUEsSUFBSSxHQUVjLHVCQUF1QixFQUFFLElBQUksMkJBQTJCLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FDaEYsQ0FDRixDQUFBO0FBQ0gsQ0FBQztBQUVELFNBQVMsMEJBQTBCLENBQUMsSUFBWTtJQUM5QyxPQUFPLHFCQUFZLEdBQUcsRUFBRTtRQUN0QixNQUFNLEVBQUUsR0FBRyxnQkFBQSxRQUFRLENBQUMsSUFBSSxFQUFFLENBQUE7UUFDMUIsT0FBTyxJQUFJLGNBQWMsQ0FBQztZQUN4QixFQUFFO1lBQ0YsTUFBTSxFQUFFLEVBQUU7WUFDVixNQUFNLEVBQUUsSUFBSTtZQUNaLElBQUksRUFBRSxnQkFBQSxnQkFBZ0IsQ0FBQyxJQUFJLENBQUM7U0FDN0IsQ0FBQyxDQUFBO0lBQ0osQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDIn0=

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.2",
+  "version": "0.51.4",
   "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/infra-adapters": "0.37.2",
+    "@effect-app/schema": "0.36.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.21.0",