@effect-app/infra 4.0.0-beta.104 → 4.0.0-beta.105

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @effect-app/infra
 
+## 4.0.0-beta.105
+
+### Minor Changes
+
+- 3d732b1: Rewrite `withRequestResolverCache` to use official `RequestResolver.withCache`, creating a cached resolver per ContextMap via `getOrCreateStoreEffect` with semaphore-guarded initialization.
+
+### Patch Changes
+
+- 47e53f5: Fix `withRequestResolverCache` causing "RequestResolver did not complete request" errors by using the `preCheck` hook instead of handling cache in `runAll`. Cache hits for in-flight or completed requests are now handled before entries enter the batch, preventing uncompleted entries.
+- 5773159: Add `itemType` annotation to all repository spans
+  - effect-app@4.0.0-beta.105
+
 ## 4.0.0-beta.104
 
 ### Patch Changes

package/dist/CUPS.d.ts

@@ -1,9 +1,9 @@
 import { type FileOptions } from "@effect-app/infra/fileUtil";
 import { Config, Context, Effect, Layer, Option, S } from "effect-app";
-export declare const PrinterId: S.WithDefaults<S.brand<import("effect/Schema").NonEmptyString, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255">> & S.brand<import("effect/Schema").NonEmptyString, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255">;
+export declare const PrinterId: S.WithDefaults<S.brand<import("effect/Schema").NonEmptyString, "NonEmptyString255" | "NonEmptyString2k" | "NonEmptyString64k" | "NonEmptyString">> & S.brand<import("effect/Schema").NonEmptyString, "NonEmptyString255" | "NonEmptyString2k" | "NonEmptyString64k" | "NonEmptyString">;
 export type PrinterId = S.NonEmptyString255;
 export declare const prepareTempDir: Effect.Effect<void, never, never>;
-export declare const makePrintJobTempFile: (data: string | NodeJS.ArrayBufferView<ArrayBufferLike> | Iterable<string | NodeJS.ArrayBufferView<ArrayBufferLike>> | AsyncIterable<string | NodeJS.ArrayBufferView<ArrayBufferLike>> | import("node:stream"), options?: FileOptions) => Effect.Effect<string, import("effect/Cause").UnknownError, import("effect/Scope").Scope>;
+export declare const makePrintJobTempFile: (data: string | import("node:stream") | NodeJS.ArrayBufferView<ArrayBufferLike> | Iterable<string | NodeJS.ArrayBufferView<ArrayBufferLike>> | AsyncIterable<string | NodeJS.ArrayBufferView<ArrayBufferLike>>, options?: FileOptions) => Effect.Effect<string, import("effect/Cause").UnknownError, import("effect/Scope").Scope>;
 export declare const makePrintJobTempFileArrayBuffer: (buffer: ArrayBuffer, options?: FileOptions) => Effect.Effect<string, import("effect/Cause").UnknownError, import("effect/Scope").Scope>;
 export declare const CUPSConfig: Config.Config<{
     server: Option.Option<import("node:url").URL>;
@@ -17,7 +17,7 @@ declare const CUPS_base: Context.ServiceClass<CUPS, "effect-app/CUPS", {
         stdout: string;
         stderr: string;
     }, import("effect/Cause").UnknownError, never>;
-    getAvailablePrinters: Effect.Effect<(string & S.B.Brand<"NonEmptyString"> & S.B.Brand<"NonEmptyString64k"> & S.B.Brand<"NonEmptyString2k"> & S.B.Brand<"NonEmptyString255">)[], import("effect/Cause").UnknownError, never>;
+    getAvailablePrinters: Effect.Effect<(string & S.B.Brand<"NonEmptyString255"> & S.B.Brand<"NonEmptyString2k"> & S.B.Brand<"NonEmptyString64k"> & S.B.Brand<"NonEmptyString">)[], import("effect/Cause").UnknownError, never>;
 }> & {
     readonly make: Effect.Effect<{
         print: (buffer: ArrayBuffer, printerId: PrinterId, ...options: string[]) => Effect.Effect<{
@@ -28,7 +28,7 @@ declare const CUPS_base: Context.ServiceClass<CUPS, "effect-app/CUPS", {
             stdout: string;
             stderr: string;
         }, import("effect/Cause").UnknownError, never>;
-        getAvailablePrinters: Effect.Effect<(string & S.B.Brand<"NonEmptyString"> & S.B.Brand<"NonEmptyString64k"> & S.B.Brand<"NonEmptyString2k"> & S.B.Brand<"NonEmptyString255">)[], import("effect/Cause").UnknownError, never>;
+        getAvailablePrinters: Effect.Effect<(string & S.B.Brand<"NonEmptyString255"> & S.B.Brand<"NonEmptyString2k"> & S.B.Brand<"NonEmptyString64k"> & S.B.Brand<"NonEmptyString">)[], import("effect/Cause").UnknownError, never>;
     }, Config.ConfigError, never>;
 };
 export declare class CUPS extends CUPS_base {

package/dist/Emailer/Sendgrid.d.ts

@@ -10,10 +10,6 @@ export declare function renderMessage(forceFake: boolean): (msg: EmailMsg) => {
     to: EmailData | EmailData[];
     cc: EmailData | EmailData[];
     bcc: EmailData | EmailData[];
-    attachments?: import("@sendgrid/helpers/classes/attachment.js").AttachmentData[];
-    headers?: {
-        [key: string]: string;
-    };
     replyTo?: EmailData;
     sendAt?: number;
     subject?: string;
@@ -21,11 +17,15 @@ export declare function renderMessage(forceFake: boolean): (msg: EmailMsg) => {
     html?: string;
     templateId?: string;
     personalizations?: import("@sendgrid/helpers/classes/personalization.js").PersonalizationData[];
+    attachments?: import("@sendgrid/helpers/classes/attachment.js").AttachmentData[];
     ipPoolName?: string;
     batchId?: string;
     sections?: {
         [key: string]: string;
     };
+    headers?: {
+        [key: string]: string;
+    };
     categories?: string[];
     category?: string;
     customArgs?: {
@@ -49,10 +49,6 @@ export declare function renderMessage(forceFake: boolean): (msg: EmailMsg) => {
     to: EmailData | EmailData[];
     cc: EmailData | EmailData[];
     bcc: EmailData | EmailData[];
-    attachments?: import("@sendgrid/helpers/classes/attachment.js").AttachmentData[];
-    headers?: {
-        [key: string]: string;
-    };
     replyTo?: EmailData;
     sendAt?: number;
     subject?: string;
@@ -60,11 +56,15 @@ export declare function renderMessage(forceFake: boolean): (msg: EmailMsg) => {
     html: string;
     templateId?: string;
     personalizations?: import("@sendgrid/helpers/classes/personalization.js").PersonalizationData[];
+    attachments?: import("@sendgrid/helpers/classes/attachment.js").AttachmentData[];
     ipPoolName?: string;
     batchId?: string;
     sections?: {
         [key: string]: string;
     };
+    headers?: {
+        [key: string]: string;
+    };
     categories?: string[];
     category?: string;
     customArgs?: {
@@ -88,10 +88,6 @@ export declare function renderMessage(forceFake: boolean): (msg: EmailMsg) => {
     to: EmailData | EmailData[];
     cc: EmailData | EmailData[];
     bcc: EmailData | EmailData[];
-    attachments?: import("@sendgrid/helpers/classes/attachment.js").AttachmentData[];
-    headers?: {
-        [key: string]: string;
-    };
     replyTo?: EmailData;
     sendAt?: number;
     subject?: string;
@@ -99,11 +95,15 @@ export declare function renderMessage(forceFake: boolean): (msg: EmailMsg) => {
     html?: string;
     templateId: string;
     personalizations?: import("@sendgrid/helpers/classes/personalization.js").PersonalizationData[];
+    attachments?: import("@sendgrid/helpers/classes/attachment.js").AttachmentData[];
     ipPoolName?: string;
     batchId?: string;
     sections?: {
         [key: string]: string;
     };
+    headers?: {
+        [key: string]: string;
+    };
     categories?: string[];
     category?: string;
     customArgs?: {
@@ -127,10 +127,6 @@ export declare function renderMessage(forceFake: boolean): (msg: EmailMsg) => {
     to: EmailData | EmailData[];
     cc: EmailData | EmailData[];
     bcc: EmailData | EmailData[];
-    attachments?: import("@sendgrid/helpers/classes/attachment.js").AttachmentData[];
-    headers?: {
-        [key: string]: string;
-    };
     replyTo?: EmailData;
     sendAt?: number;
     subject?: string;
@@ -138,11 +134,15 @@ export declare function renderMessage(forceFake: boolean): (msg: EmailMsg) => {
     html?: string;
     templateId?: string;
     personalizations?: import("@sendgrid/helpers/classes/personalization.js").PersonalizationData[];
+    attachments?: import("@sendgrid/helpers/classes/attachment.js").AttachmentData[];
     ipPoolName?: string;
     batchId?: string;
     sections?: {
         [key: string]: string;
     };
+    headers?: {
+        [key: string]: string;
+    };
     categories?: string[];
     category?: string;
     customArgs?: {

package/dist/Model/Repository/internal/internal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../../../../src/Model/Repository/internal/internal.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../../../../src/Model/Repository/internal/internal.ts"],"names":[],"mappings":"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"}

package/dist/Model/Repository/internal/internal.js

@@ -27,7 +27,7 @@ export function makeRepoInternal() {
                 .gen(function* () {
                 const rctx = args.schemaContext ?? Context.empty();
                 const provideRctx = Effect.provide(rctx);
-                const encodeMany = flow(S.encodeEffect(S.Array(schema)), provideRctx, Effect.withSpan("encodeMany", {}, { captureStackTrace: false }));
+                const encodeMany = flow(S.encodeEffect(S.Array(schema)), provideRctx, Effect.withSpan("encodeMany", { attributes: { itemType: name } }, { captureStackTrace: false }));
                 const decode = flow(S.decodeEffect(schema), provideRctx);
                 const decodeMany = flow(S.decodeEffect(S.Array(schema)), provideRctx);
                 const store = yield* mkStore(args.makeInitial, args.config);
@@ -85,7 +85,7 @@ export function makeRepoInternal() {
                     yield* Effect.annotateCurrentSpan({ itemId: id });
                     return yield* pipe(encodeId({ [idKey]: id }), Effect.orDie, Effect.map((_) => _[idKey]), Effect.flatMap(findEId));
                 });
-                const find = Effect.fn("find")(function* (id) {
+                const find = Effect.fn("find", { attributes: { itemType: name } })(function* (id) {
                     yield* Effect.annotateCurrentSpan({ itemId: id });
                     return yield* flatMapOption(findE(id), (_) => Effect.orDie(decode(_)));
                 });
@@ -99,7 +99,7 @@ export function makeRepoInternal() {
                     .pipe(Effect.asVoid);
                 const saveAll = (a) => encodeMany(Array.fromIterable(a))
                     .pipe(Effect.orDie, Effect.andThen(saveAllE));
-                const saveAndPublish = Effect.fn("saveAndPublish")(function* (items, events = []) {
+                const saveAndPublish = Effect.fn("saveAndPublish", { attributes: { itemType: name } })(function* (items, events = []) {
                     const it = Chunk.fromIterable(items);
                     const evts = [...events];
                     yield* Effect.annotateCurrentSpan({ itemIds: [...Chunk.map(it, (_) => _[idKey])], events: evts.length });
@@ -108,7 +108,7 @@ export function makeRepoInternal() {
                     // TODO: for full consistency the events should be stored within the same database transaction, and then picked up.
                     (_) => flatMapOption(_, pub), Effect.andThen(PubSub.publish(changeFeed, [Chunk.toArray(it), "save"])), Effect.asVoid);
                 });
-                const removeAndPublish = Effect.fn("removeAndPublish")(function* (a, events = []) {
+                const removeAndPublish = Effect.fn("removeAndPublish", { attributes: { itemType: name } })(function* (a, events = []) {
                     const { set } = yield* cms;
                     const it = [...a];
                     const evts = [...events];
@@ -126,7 +126,7 @@ export function makeRepoInternal() {
                         yield* PubSub.publish(changeFeed, [it, "remove"]);
                     }
                 });
-                const removeById = Effect.fn("removeById")(function* (...ids) {
+                const removeById = Effect.fn("removeById", { attributes: { itemType: name } })(function* (...ids) {
                     if (!Array.isReadonlyArrayNonEmpty(ids)) {
                         return;
                     }
@@ -141,11 +141,11 @@ export function makeRepoInternal() {
                 });
                 const parseMany = (items) => Effect
                     .flatMap(cms, (cm) => decodeMany(items.map((_) => mapReverse(_, cm.set)))
-                    .pipe(Effect.orDie, Effect.withSpan("parseMany", {}, { captureStackTrace: false })));
+                    .pipe(Effect.orDie, Effect.withSpan("parseMany", { attributes: { itemType: name } }, { captureStackTrace: false })));
                 const parseMany2 = (items, schema) => Effect
                     .flatMap(cms, (cm) => S
                     .decodeEffect(S.Array(schema))(items.map((_) => mapReverse(_, cm.set)))
-                    .pipe(Effect.orDie, Effect.withSpan("parseMany2", {}, { captureStackTrace: false })));
+                    .pipe(Effect.orDie, Effect.withSpan("parseMany2", { attributes: { itemType: name } }, { captureStackTrace: false })));
                 const filter = (args) => store
                     .filter(
                 // always enforce id and _etag because they are system fields, required for etag tracking etc
@@ -182,12 +182,13 @@ export function makeRepoInternal() {
                                 .pipe(Effect.catchTag("SchemaError", (e) => Effect.die(e)))
                             : eff, Effect.withSpan("Repository.query [effect-app/infra]", {
                         attributes: {
+                            itemType: name,
                             "repository.model_name": name,
                             query: { ...a, schema: a.schema ? "__SCHEMA__" : a.schema, filter: a.filter }
                         }
                     }, { captureStackTrace: false }));
                 });
-                const validateSample = Effect.fn("validateSample")(function* (options) {
+                const validateSample = Effect.fn("validateSample", { attributes: { itemType: name } })(function* (options) {
                     const percentage = options?.percentage ?? 0.1; // default 10%
                     const maxItems = options?.maxItems;
                     // 1. get all IDs with projection (bypasses main schema decode)
@@ -268,7 +269,7 @@ export function makeRepoInternal() {
                             //       })
                             //     )
                             // },
-                            save: (...xes) => Effect.flatMap(encMany(xes), (_) => saveAllE(_)).pipe(Effect.withSpan("mapped.save", {}, { captureStackTrace: false }))
+                            save: (...xes) => Effect.flatMap(encMany(xes), (_) => saveAllE(_)).pipe(Effect.withSpan("mapped.save", { attributes: { itemType: name } }, { captureStackTrace: false }))
                         };
                     }
                 };
@@ -317,4 +318,4 @@ export function makeStore() {
         return makeStore;
     };
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../../src/Model/Repository/internal/internal.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../../src/Model/Repository/internal/internal.ts"],"names":[],"mappings":"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"}

package/dist/Operations.d.ts

@@ -37,7 +37,7 @@ declare const Operations_base: Context.OpaqueClass<Operations, "effect-app/Opera
         all: Effect.Effect<Operation[], never, never>;
         find: (id: OperationId) => Effect.Effect<Option.Option<Operation>, never, never>;
         update: (id: OperationId, progress: OperationProgress) => Effect.Effect<void, never, never>;
-    }, never, OperationsRepo | RequestFiberSet>;
+    }, never, RequestFiberSet | OperationsRepo>;
 };
 export declare class Operations extends Operations_base {
     private static readonly CleanupLive;

package/dist/RequestContext.d.ts

@@ -22,7 +22,7 @@ declare const RequestContext_base: S.EnhancedClass<RequestContext, S.Struct<{
             withDecodingDefaultType: S.withDecodingDefaultType<import("effect/Schema").Boolean>;
         };
     }>;
-    name: S.WithDefaults<S.brand<import("effect/Schema").NonEmptyString, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255">> & S.brand<import("effect/Schema").NonEmptyString, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255">;
+    name: S.WithDefaults<S.brand<import("effect/Schema").NonEmptyString, "NonEmptyString255" | "NonEmptyString2k" | "NonEmptyString64k" | "NonEmptyString">> & S.brand<import("effect/Schema").NonEmptyString, "NonEmptyString255" | "NonEmptyString2k" | "NonEmptyString64k" | "NonEmptyString">;
     locale: import("effect/Schema").Literals<readonly ["en", "de"]> & {
         changeDefault: <A extends "en" | "de">(a: A) => import("effect/Schema").Literals<readonly ["en", "de"]> & {
             Default: A;
@@ -33,8 +33,8 @@ declare const RequestContext_base: S.EnhancedClass<RequestContext, S.Struct<{
         withDefault: S.withConstructorDefault<import("effect/Schema").Literals<readonly ["en", "de"]>>;
         withDecodingDefaultType: S.withDecodingDefaultType<import("effect/Schema").Literals<readonly ["en", "de"]>>;
     };
-    sourceId: S.optional<S.WithDefaults<S.brand<import("effect/Schema").NonEmptyString, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255">> & S.brand<import("effect/Schema").NonEmptyString, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255">>;
-    namespace: S.WithDefaults<S.brand<import("effect/Schema").NonEmptyString, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255">> & S.brand<import("effect/Schema").NonEmptyString, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255">;
+    sourceId: S.optional<S.WithDefaults<S.brand<import("effect/Schema").NonEmptyString, "NonEmptyString255" | "NonEmptyString2k" | "NonEmptyString64k" | "NonEmptyString">> & S.brand<import("effect/Schema").NonEmptyString, "NonEmptyString255" | "NonEmptyString2k" | "NonEmptyString64k" | "NonEmptyString">>;
+    namespace: S.WithDefaults<S.brand<import("effect/Schema").NonEmptyString, "NonEmptyString255" | "NonEmptyString2k" | "NonEmptyString64k" | "NonEmptyString">> & S.brand<import("effect/Schema").NonEmptyString, "NonEmptyString255" | "NonEmptyString2k" | "NonEmptyString64k" | "NonEmptyString">;
     /** @deprecated */
     userProfile: S.optional<S.Struct<{
         readonly sub: S.WithDefaults<S.Codec<string & S.StringIdBrand & import("effect-app/ids").UserProfileIdBrand, string, never, never> & {
@@ -48,17 +48,17 @@ declare const RequestContext_base: S.EnhancedClass<RequestContext, S.Struct<{
 }>, {}>;
 export declare class RequestContext extends RequestContext_base {
     static toMonitoring(this: void, self: RequestContext): {
-        operationName: string & S.B.Brand<"NonEmptyString"> & S.B.Brand<"NonEmptyString64k"> & S.B.Brand<"NonEmptyString2k"> & S.B.Brand<"NonEmptyString255">;
+        operationName: string & S.B.Brand<"NonEmptyString255"> & S.B.Brand<"NonEmptyString2k"> & S.B.Brand<"NonEmptyString64k"> & S.B.Brand<"NonEmptyString">;
         locale: "en" | "de";
     };
 }
 export declare const spanAttributes: (ctx: Pick<RequestContext, "locale" | "namespace"> & Partial<RequestContext>) => {
     "request.user.sub"?: string & S.StringIdBrand & import("effect-app/ids").UserProfileIdBrand;
     "request.user.roles"?: unknown;
-    "request.source.id"?: string & S.B.Brand<"NonEmptyString"> & S.B.Brand<"NonEmptyString64k"> & S.B.Brand<"NonEmptyString2k"> & S.B.Brand<"NonEmptyString255">;
-    "request.name": (string & S.B.Brand<"NonEmptyString"> & S.B.Brand<"NonEmptyString64k"> & S.B.Brand<"NonEmptyString2k"> & S.B.Brand<"NonEmptyString255">) | undefined;
+    "request.source.id"?: string & S.B.Brand<"NonEmptyString255"> & S.B.Brand<"NonEmptyString2k"> & S.B.Brand<"NonEmptyString64k"> & S.B.Brand<"NonEmptyString">;
+    "request.name": (string & S.B.Brand<"NonEmptyString255"> & S.B.Brand<"NonEmptyString2k"> & S.B.Brand<"NonEmptyString64k"> & S.B.Brand<"NonEmptyString">) | undefined;
     "request.locale": "en" | "de";
-    "request.namespace": string & S.B.Brand<"NonEmptyString"> & S.B.Brand<"NonEmptyString64k"> & S.B.Brand<"NonEmptyString2k"> & S.B.Brand<"NonEmptyString255">;
+    "request.namespace": string & S.B.Brand<"NonEmptyString255"> & S.B.Brand<"NonEmptyString2k"> & S.B.Brand<"NonEmptyString64k"> & S.B.Brand<"NonEmptyString">;
 };
 export declare namespace RequestContext {
     interface Encoded extends S.Struct.Encoded<typeof RequestContext["fields"]> {

package/dist/Store/ContextMapContainer.d.ts

@@ -1,7 +1,7 @@
 import { Context, Effect, Layer, RequestResolver } from "effect-app";
 import type * as Request from "effect/Request";
 import { ContextMap } from "./service.js";
-declare const ContextMapContainer_base: Context.Reference<"root" | ContextMap>;
+declare const ContextMapContainer_base: Context.Reference<ContextMap | "root">;
 export declare class ContextMapContainer extends ContextMapContainer_base {
     static readonly layer: Layer.Layer<never, never, never>;
 }
@@ -11,15 +11,20 @@ declare const ContextMapNotStartedError_base: new <A extends Record<string, any>
 export declare class ContextMapNotStartedError extends ContextMapNotStartedError_base {
 }
 export declare const getContextMap: Effect.Effect<ContextMap, ContextMapNotStartedError, never>;
+/**
+ * Uses the official `RequestResolver.withCache` internally,
+ * creating one cached resolver per ContextMap (i.e. per request).
+ * Uses a shared semaphore in the ContextMap to ensure safe single initialization.
+ */
 export declare const withRequestResolverCache: {
     <A extends Request.Request<any, any>>(options: {
         readonly capacity: number;
         readonly strategy?: "lru" | "fifo" | undefined;
-    }): (self: RequestResolver.RequestResolver<A>) => RequestResolver.RequestResolver<A>;
+    }): (self: RequestResolver.RequestResolver<A>) => Effect.Effect<RequestResolver.RequestResolver<A>, ContextMapNotStartedError>;
     <A extends Request.Request<any, any>>(self: RequestResolver.RequestResolver<A>, options: {
         readonly capacity: number;
         readonly strategy?: "lru" | "fifo" | undefined;
-    }): RequestResolver.RequestResolver<A>;
+    }): Effect.Effect<RequestResolver.RequestResolver<A>, ContextMapNotStartedError>;
 };
 export {};
 //# sourceMappingURL=ContextMapContainer.d.ts.map

package/dist/Store/ContextMapContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ContextMapContainer.d.ts","sourceRoot":"","sources":["../../src/Store/ContextMapContainer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAQ,MAAM,EAAa,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAIrF,OAAO,KAAK,KAAK,OAAO,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;;AAQzC,qBAAa,mBAAoB,SAAQ,wBAEvC;IACA,MAAM,CAAC,QAAQ,CAAC,KAAK,mCAAsE;CAC5F;;;;AAED,qBAAa,yBAA0B,SAAQ,8BAA6C;CAAG;AAE/F,eAAO,MAAM,aAAa,6DAEzB,CAAA;AAED,eAAO,MAAM,wBAAwB,EAAE;IACrC,CAAC,CAAC,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE;QAC7C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;QACzB,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS,CAAA;KAC/C,GAAG,CAAC,IAAI,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,eAAe,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;IACpF,CAAC,CAAC,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,EAClC,IAAI,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC,CAAC,EACxC,OAAO,EAAE;QACP,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;QACzB,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS,CAAA;KAC/C,GACA,eAAe,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;CA+ErC,CAAA"}
+{"version":3,"file":"ContextMapContainer.d.ts","sourceRoot":"","sources":["../../src/Store/ContextMapContainer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAQ,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE1E,OAAO,KAAK,KAAK,OAAO,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;;AAQzC,qBAAa,mBAAoB,SAAQ,wBAEvC;IACA,MAAM,CAAC,QAAQ,CAAC,KAAK,mCAAsE;CAC5F;;;;AAED,qBAAa,yBAA0B,SAAQ,8BAA6C;CAAG;AAE/F,eAAO,MAAM,aAAa,6DAEzB,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,EAAE;IACrC,CAAC,CAAC,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE;QAC7C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;QACzB,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS,CAAA;KAC/C,GAAG,CACF,IAAI,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC,CAAC,KACrC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,yBAAyB,CAAC,CAAA;IACjF,CAAC,CAAC,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,EAClC,IAAI,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC,CAAC,EACxC,OAAO,EAAE;QACP,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;QACzB,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS,CAAA;KAC/C,GACA,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,yBAAyB,CAAC,CAAA;CAiB/E,CAAA"}

package/dist/Store/ContextMapContainer.js

@@ -1,6 +1,5 @@
 import { Context, Data, Effect, Layer, RequestResolver } from "effect-app";
 import { dual } from "effect/Function";
-import * as MutableHashMap from "effect/MutableHashMap";
 import { ContextMap } from "./service.js";
 // TODO: we have to create a new contextmap on every request.
 // we want to share one map during startup
@@ -15,63 +14,13 @@ export class ContextMapContainer extends Context.Reference("ContextMapContainer"
 export class ContextMapNotStartedError extends Data.TaggedError("ContextMapNotStartedError") {
 }
 export const getContextMap = ContextMapContainer.asEffect().pipe(Effect.filterOrFail((_) => _ !== "root", () => new ContextMapNotStartedError()));
+/**
+ * Uses the official `RequestResolver.withCache` internally,
+ * creating one cached resolver per ContextMap (i.e. per request).
+ * Uses a shared semaphore in the ContextMap to ensure safe single initialization.
+ */
 export const withRequestResolverCache = dual(2, (self, options) => {
     const cacheKey = Symbol();
-    const strategy = options.strategy ?? "lru";
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-    return RequestResolver.makeWith({
-        ...self,
-        runAll(entries, key) {
-            return Effect.flatMap(getContextMap.pipe(Effect.orDie), (contextMap) => {
-                const cache = contextMap.getOrCreateStore(cacheKey, () => MutableHashMap.empty());
-                const uncached = [];
-                for (const entry of entries) {
-                    const ocached = MutableHashMap.get(cache, entry.request);
-                    if (ocached._tag === "None") {
-                        const cached = { entry, exit: undefined };
-                        MutableHashMap.set(cache, entry.request, cached);
-                        const prevComplete = entry.completeUnsafe.bind(entry);
-                        entry.completeUnsafe = (exit) => {
-                            cached.exit = exit;
-                            prevComplete(exit);
-                        };
-                        uncached.push(entry);
-                    }
-                    else {
-                        const cached = ocached.value;
-                        if (cached.exit) {
-                            if (strategy === "lru") {
-                                MutableHashMap.remove(cache, cached.entry.request);
-                                MutableHashMap.set(cache, cached.entry.request, cached);
-                            }
-                            entry.completeUnsafe(cached.exit);
-                        }
-                        else {
-                            cached.entry.uninterruptible = true;
-                            const prevComplete = cached.entry.completeUnsafe.bind(cached.entry);
-                            cached.entry.completeUnsafe = (exit) => {
-                                prevComplete(exit);
-                                entry.completeUnsafe(exit);
-                            };
-                        }
-                    }
-                }
-                if (uncached.length === 0)
-                    return Effect.void;
-                return Effect.onExit(self.runAll(uncached, key), () => {
-                    let toRemove = MutableHashMap.size(cache) - options.capacity;
-                    if (toRemove <= 0)
-                        return Effect.void;
-                    for (const k of MutableHashMap.keys(cache)) {
-                        MutableHashMap.remove(cache, k);
-                        toRemove--;
-                        if (toRemove <= 0)
-                            break;
-                    }
-                    return Effect.void;
-                });
-            });
-        }
-    });
+    return getContextMap.pipe(Effect.flatMap((ctxMap) => ctxMap.getOrCreateStoreEffect(cacheKey, RequestResolver.withCache(self, options))));
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29udGV4dE1hcENvbnRhaW5lci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9TdG9yZS9Db250ZXh0TWFwQ29udGFpbmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBYSxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBRXJGLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQTtBQUN0QyxPQUFPLEtBQUssY0FBYyxNQUFNLHVCQUF1QixDQUFBO0FBRXZELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFFekMsNkRBQTZEO0FBQzdELDBDQUEwQztBQUMxQyx5RUFBeUU7QUFDekUsNEdBQTRHO0FBQzVHLHlGQUF5RjtBQUV6RixNQUFNLE9BQU8sbUJBQW9CLFNBQVEsT0FBTyxDQUFDLFNBQVMsQ0FBQyxxQkFBcUIsRUFBRTtJQUNoRixZQUFZLEVBQUUsR0FBd0IsRUFBRSxDQUFDLE1BQU07Q0FDaEQsQ0FBQztJQUNBLE1BQU0sQ0FBVSxLQUFLLEdBQUcsS0FBSyxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsVUFBVSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFBOztBQUc3RixNQUFNLE9BQU8seUJBQTBCLFNBQVEsSUFBSSxDQUFDLFdBQVcsQ0FBQywyQkFBMkIsQ0FBQztDQUFHO0FBRS9GLE1BQU0sQ0FBQyxNQUFNLGFBQWEsR0FBRyxtQkFBbUIsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxJQUFJLENBQzlELE1BQU0sQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsS0FBSyxNQUFNLEVBQUUsR0FBRyxFQUFFLENBQUMsSUFBSSx5QkFBeUIsRUFBRSxDQUFDLENBQ2hGLENBQUE7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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29udGV4dE1hcENvbnRhaW5lci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9TdG9yZS9Db250ZXh0TWFwQ29udGFpbmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQzFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQTtBQUV0QyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBRXpDLDZEQUE2RDtBQUM3RCwwQ0FBMEM7QUFDMUMseUVBQXlFO0FBQ3pFLDRHQUE0RztBQUM1Ryx5RkFBeUY7QUFFekYsTUFBTSxPQUFPLG1CQUFvQixTQUFRLE9BQU8sQ0FBQyxTQUFTLENBQUMscUJBQXFCLEVBQUU7SUFDaEYsWUFBWSxFQUFFLEdBQXdCLEVBQUUsQ0FBQyxNQUFNO0NBQ2hELENBQUM7SUFDQSxNQUFNLENBQVUsS0FBSyxHQUFHLEtBQUssQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQTs7QUFHN0YsTUFBTSxPQUFPLHlCQUEwQixTQUFRLElBQUksQ0FBQyxXQUFXLENBQUMsMkJBQTJCLENBQUM7Q0FBRztBQUUvRixNQUFNLENBQUMsTUFBTSxhQUFhLEdBQUcsbUJBQW1CLENBQUMsUUFBUSxFQUFFLENBQUMsSUFBSSxDQUM5RCxNQUFNLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEtBQUssTUFBTSxFQUFFLEdBQUcsRUFBRSxDQUFDLElBQUkseUJBQXlCLEVBQUUsQ0FBQyxDQUNoRixDQUFBO0FBRUQ7Ozs7R0FJRztBQUNILE1BQU0sQ0FBQyxNQUFNLHdCQUF3QixHQWNqQyxJQUFJLENBQUMsQ0FBQyxFQUFFLENBQ1YsSUFBd0MsRUFDeEMsT0FHQyxFQUM2RSxFQUFFO0lBQ2hGLE1BQU0sUUFBUSxHQUFHLE1BQU0sRUFBRSxDQUFBO0lBQ3pCLE9BQU8sYUFBYSxDQUFDLElBQUksQ0FDdkIsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQ3hCLE1BQU0sQ0FBQyxzQkFBc0IsQ0FDM0IsUUFBUSxFQUNSLGVBQWUsQ0FBQyxTQUFTLENBQUMsSUFBSSxFQUFFLE9BQU8sQ0FBQyxDQUN6QyxDQUNGLENBQ0YsQ0FBQTtBQUNILENBQUMsQ0FBQyxDQUFBIn0=

package/dist/Store/service.d.ts

@@ -85,16 +85,19 @@ export declare const makeContextMap: () => {
     get: (id: string) => string | undefined;
     set: (id: string, eTag: string | undefined) => void;
     getOrCreateStore: <T>(key: symbol, make: () => T) => T;
+    getOrCreateStoreEffect: <T, E, R>(key: symbol, make: Effect.Effect<T, E, R>) => Effect.Effect<T, E, R>;
 };
 declare const ContextMap_base: Context.OpaqueClass<ContextMap, "effect-app/ContextMap", {
     get: (id: string) => string | undefined;
     set: (id: string, eTag: string | undefined) => void;
     getOrCreateStore: <T>(key: symbol, make: () => T) => T;
+    getOrCreateStoreEffect: <T, E, R>(key: symbol, make: Effect.Effect<T, E, R>) => Effect.Effect<T, E, R>;
 }> & {
     readonly make: Effect.Effect<{
         get: (id: string) => string | undefined;
         set: (id: string, eTag: string | undefined) => void;
         getOrCreateStore: <T>(key: symbol, make: () => T) => T;
+        getOrCreateStoreEffect: <T, E, R>(key: symbol, make: Effect.Effect<T, E, R>) => Effect.Effect<T, E, R>;
     }, never, never>;
 };
 export declare class ContextMap extends ContextMap_base {

package/dist/Store/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/Store/service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/Store/service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,qBAAqB,EAAE,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAA;AAEpG,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,cAAc,CAAA;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAA;AACpE,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAEjD,MAAM,WAAW,WAAW,CAAC,CAAC;IAC5B,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,CAAA;IACjC;;;OAGG;IACH,cAAc,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAA;IAC/C;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;IAE1B;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB;;OAEG;IACH,UAAU,CAAC,EAAE,SAAS,EAAE,CAAA;CACzB;AAED,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI,CAAA;AAC9D,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAA;AAGxD,MAAM,MAAM,KAAK,GACb;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,IAAI,GAAG,QAAQ,CAAC;IAAC,KAAK,EAAE,eAAe,CAAA;CAAE,GAC5D;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,IAAI,GAAG,IAAI,GAAG,KAAK,GAAG,KAAK,CAAC;IAAC,KAAK,EAAE,gBAAgB,CAAA;CAAE,GACxE;IACA,GAAG,EAAE,MAAM,CAAA;IACX,CAAC,EAAE,UAAU,GAAG,aAAa,GAAG,WAAW,GAAG,cAAc,GAAG,iBAAiB,GAAG,eAAe,CAAA;IAClG,KAAK,EAAE,MAAM,CAAA;CACd,GACC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,UAAU,GAAG,cAAc,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC9D;IACA,GAAG,EAAE,MAAM,CAAA;IACX,CAAC,EAAE,IAAI,GAAG,QAAQ,CAAA;IAClB,KAAK,EAAE,SAAS,CAAC,eAAe,CAAC,EAAE,CAAA;CACpC,CAAA;AAEH,MAAM,MAAM,MAAM,GAAG,SAAS,YAAY,EAAE,CAAA;AAE5C,MAAM,WAAW,CAAC,CAAC,YAAY,SAAS,WAAW;IACjD,GAAG,EAAE,SAAS,CAAC,YAAY,CAAC,CAAA;IAC5B,SAAS,EAAE,KAAK,GAAG,MAAM,CAAA;CAC1B;AAED,MAAM,WAAW,UAAU,CAAC,OAAO,SAAS,WAAW,EAAE,CAAC,SAAS,MAAM,OAAO,GAAG,KAAK;IACtF,CAAC,EAAE,OAAO,CAAA;IACV,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,MAAM,CAAC,EAAE,qBAAqB,CAAC,CAAC,GAAG;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,CAAC,GAAG,SAAS,CAAA;IAC3F,KAAK,CAAC,EAAE,qBAAqB,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;IAClD,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1B;AAED,MAAM,MAAM,UAAU,CAAC,OAAO,SAAS,WAAW,IAAI,CAAC,CAAC,SAAS,MAAM,OAAO,GAAG,KAAK,EACpF,IAAI,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,KACzB,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,SAAS,GAAG,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;AAExE,MAAM,WAAW,KAAK,CACpB,KAAK,SAAS,MAAM,OAAO,EAC3B,OAAO,SAAS,WAAW,EAC3B,EAAE,SAAS,oBAAoB,CAAC,OAAO,CAAC,GAAG,oBAAoB,CAAC,OAAO,CAAC;IAExE,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAA;IACxB,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,CAAA;IAC3B,IAAI,EAAE,CAAC,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IAC9D,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,KAAK,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,8BAA8B,CAAC,CAAA;IACjE,QAAQ,EAAE,CACR,KAAK,EAAE,qBAAqB,CAAC,EAAE,CAAC,KAC7B,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE,CAAC,EAAE,8BAA8B,CAAC,CAAA;IAC7E,OAAO,EAAE,CACP,KAAK,EAAE,qBAAqB,CAAC,EAAE,CAAC,KAC7B,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE,CAAC,EAAE,8BAA8B,CAAC,CAAA;IAC7E,WAAW,EAAE,CAAC,GAAG,EAAE,qBAAqB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACvG,QAAQ,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,SAAS,GAAG,EAAE,CAAC,CAAA;CAChF;;UAGO,CAAC,KAAK,SAAS,MAAM,OAAO,EAAE,OAAO,SAAS,WAAW,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK,EACnF,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,KAAK,EACZ,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC7C,MAAM,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,KAC1B,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;;AANjD,qBAAa,UAAW,SAAQ,eAOH;CAC5B;AAED,eAAO,MAAM,cAAc;cAEJ,MAAM;cACN,MAAM,QAAQ,MAAM,GAAG,SAAS;uBAiEhC,CAAC,OAAO,MAAM,QAAQ,MAAM,CAAC,KAAG,CAAC;6BAQ3B,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,MAAM,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;CAUvG,CAAA;;cApFsB,MAAM;cACN,MAAM,QAAQ,MAAM,GAAG,SAAS;uBAiEhC,CAAC,OAAO,MAAM,QAAQ,MAAM,CAAC,KAAG,CAAC;6BAQ3B,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,MAAM,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;;;kBA1EjF,MAAM;kBACN,MAAM,QAAQ,MAAM,GAAG,SAAS;2BAiEhC,CAAC,OAAO,MAAM,QAAQ,MAAM,CAAC,KAAG,CAAC;iCAQ3B,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,MAAM,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;;;AAcxG,qBAAa,UAAW,SAAQ,eAAwE;CACvG;AAED,MAAM,MAAM,oBAAoB,CAAC,OAAO,SAAS,MAAM,IAAI,OAAO,GAAG;IACnE,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC3B,CAAA;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IAC9B,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf"}

package/dist/Store/service.js

@@ -1,4 +1,5 @@
 import { Context, Effect } from "effect-app";
+import * as Semaphore from "effect/Semaphore";
 export class StoreMaker extends Context.Opaque()("effect-app/StoreMaker") {
 }
 export const makeContextMap = () => {
@@ -60,6 +61,7 @@ export const makeContextMap = () => {
     //   }
     // }
     const store = new Map();
+    const sem = Semaphore.makeUnsafe(1);
     return {
         get: getEtag,
         set: setEtag,
@@ -70,10 +72,19 @@ export const makeContextMap = () => {
                 store.set(key, value);
             }
             return value;
-        }
+        },
+        getOrCreateStoreEffect: (key, make) => sem.withPermits(1)(Effect.suspend(() => {
+            const value = store.get(key);
+            if (value !== undefined)
+                return Effect.succeed(value);
+            return Effect.flatMap(make, (v) => {
+                store.set(key, v);
+                return Effect.succeed(v);
+            });
+        }))
     };
 };
 const makeMap = Effect.sync(() => makeContextMap());
 export class ContextMap extends Context.Opaque()("effect-app/ContextMap", { make: makeMap }) {
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9TdG9yZS9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUEwRCxNQUFNLFlBQVksQ0FBQTtBQXlGcEcsTUFBTSxPQUFPLFVBQVcsU0FBUSxPQUFPLENBQUMsTUFBTSxFQU8xQyxDQUFDLHVCQUF1QixDQUFDO0NBQzVCO0FBRUQsTUFBTSxDQUFDLE1BQU0sY0FBYyxHQUFHLEdBQUcsRUFBRTtJQUNqQyxNQUFNLEtBQUssR0FBRyxJQUFJLEdBQUcsRUFBa0IsQ0FBQTtJQUN2QyxNQUFNLE9BQU8sR0FBRyxDQUFDLEVBQVUsRUFBRSxFQUFFLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQTtJQUM3QyxNQUFNLE9BQU8sR0FBRyxDQUFDLEVBQVUsRUFBRSxJQUF3QixFQUFFLEVBQUU7UUFDdkQsSUFBSSxJQUFJLEtBQUssU0FBUyxFQUFFLENBQUM7WUFDdkIsS0FBSyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQTtRQUNsQixDQUFDO2FBQU0sQ0FBQztZQUNOLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRSxFQUFFLElBQUksQ0FBQyxDQUFBO1FBQ3JCLENBQUM7SUFDSCxDQUFDLENBQUE7SUFFRCwrQkFBK0I7SUFDL0IsMkJBQTJCO0lBQzNCLGdEQUFnRDtJQUNoRCxNQUFNO0lBRU4sK0JBQStCO0lBQy9CLDJCQUEyQjtJQUMzQixzQ0FBc0M7SUFDdEMsTUFBTTtJQUVOLGtDQUFrQztJQUNsQyx3QkFBd0I7SUFDeEIsb0NBQW9DO0lBQ3BDLFNBQVM7SUFDVCwyQkFBMkI7SUFDM0IsY0FBYztJQUNkLElBQUk7SUFFSixpQ0FBaUM7SUFDakMsb0ZBQW9GO0lBQ3BGLG9JQUFvSTtJQUNwSSxnQkFBZ0I7SUFDaEIsYUFBYTtJQUNiLDRHQUE0RztJQUM1RyxzQ0FBc0M7SUFDdEMsa0VBQWtFO0lBQ2xFLHVEQUF1RDtJQUN2RCxzQkFBc0I7SUFDdEIsc0JBQXNCO0lBQ3RCLFNBQVM7SUFDVCxxQ0FBcUM7SUFDckMseUNBQXlDO0lBQ3pDLGlCQUFpQjtJQUNqQiw2QkFBNkI7SUFDN0IsbUJBQW1CO0lBQ25CLCtDQUErQztJQUMvQyxxQkFBcUI7SUFDckIsbUJBQW1CO0lBQ25CLDJDQUEyQztJQUMzQyx5QkFBeUI7SUFDekIsc0JBQXNCO0lBQ3RCLFlBQVk7SUFDWixpQkFBaUI7SUFDakIseUNBQXlDO0lBQ3pDLHFEQUFxRDtJQUNyRCxvQkFBb0I7SUFDcEIsVUFBVTtJQUNWLFFBQVE7SUFDUixNQUFNO0lBQ04sSUFBSTtJQUVKLE1BQU0sS0FBSyxHQUFHLElBQUksR0FBRyxFQUFtQixDQUFBO0lBRXhDLE9BQU87UUFDTCxHQUFHLEVBQUUsT0FBTztRQUNaLEdBQUcsRUFBRSxPQUFPO1FBQ1osZ0JBQWdCLEVBQUUsQ0FBSSxHQUFXLEVBQUUsSUFBYSxFQUFLLEVBQUU7WUFDckQsSUFBSSxLQUFLLEdBQUcsS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQWtCLENBQUE7WUFDM0MsSUFBSSxLQUFLLEtBQUssU0FBUyxFQUFFLENBQUM7Z0JBQ3hCLEtBQUssR0FBRyxJQUFJLEVBQUUsQ0FBQTtnQkFDZCxLQUFLLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxLQUFLLENBQUMsQ0FBQTtZQUN2QixDQUFDO1lBQ0QsT0FBTyxLQUFLLENBQUE7UUFDZCxDQUFDO0tBQ0YsQ0FBQTtBQUNILENBQUMsQ0FBQTtBQUVELE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsY0FBYyxFQUFFLENBQUMsQ0FBQTtBQUVuRCxNQUFNLE9BQU8sVUFBVyxTQUFRLE9BQU8sQ0FBQyxNQUFNLEVBQWMsQ0FBQyx1QkFBdUIsRUFBRSxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsQ0FBQztDQUN2RyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9TdG9yZS9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUEwRCxNQUFNLFlBQVksQ0FBQTtBQUNwRyxPQUFPLEtBQUssU0FBUyxNQUFNLGtCQUFrQixDQUFBO0FBeUY3QyxNQUFNLE9BQU8sVUFBVyxTQUFRLE9BQU8sQ0FBQyxNQUFNLEVBTzFDLENBQUMsdUJBQXVCLENBQUM7Q0FDNUI7QUFFRCxNQUFNLENBQUMsTUFBTSxjQUFjLEdBQUcsR0FBRyxFQUFFO0lBQ2pDLE1BQU0sS0FBSyxHQUFHLElBQUksR0FBRyxFQUFrQixDQUFBO0lBQ3ZDLE1BQU0sT0FBTyxHQUFHLENBQUMsRUFBVSxFQUFFLEVBQUUsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFBO0lBQzdDLE1BQU0sT0FBTyxHQUFHLENBQUMsRUFBVSxFQUFFLElBQXdCLEVBQUUsRUFBRTtRQUN2RCxJQUFJLElBQUksS0FBSyxTQUFTLEVBQUUsQ0FBQztZQUN2QixLQUFLLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxDQUFBO1FBQ2xCLENBQUM7YUFBTSxDQUFDO1lBQ04sS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFLEVBQUUsSUFBSSxDQUFDLENBQUE7UUFDckIsQ0FBQztJQUNILENBQUMsQ0FBQTtJQUVELCtCQUErQjtJQUMvQiwyQkFBMkI7SUFDM0IsZ0RBQWdEO0lBQ2hELE1BQU07SUFFTiwrQkFBK0I7SUFDL0IsMkJBQTJCO0lBQzNCLHNDQUFzQztJQUN0QyxNQUFNO0lBRU4sa0NBQWtDO0lBQ2xDLHdCQUF3QjtJQUN4QixvQ0FBb0M7SUFDcEMsU0FBUztJQUNULDJCQUEyQjtJQUMzQixjQUFjO0lBQ2QsSUFBSTtJQUVKLGlDQUFpQztJQUNqQyxvRkFBb0Y7SUFDcEYsb0lBQW9JO0lBQ3BJLGdCQUFnQjtJQUNoQixhQUFhO0lBQ2IsNEdBQTRHO0lBQzVHLHNDQUFzQztJQUN0QyxrRUFBa0U7SUFDbEUsdURBQXVEO0lBQ3ZELHNCQUFzQjtJQUN0QixzQkFBc0I7SUFDdEIsU0FBUztJQUNULHFDQUFxQztJQUNyQyx5Q0FBeUM7SUFDekMsaUJBQWlCO0lBQ2pCLDZCQUE2QjtJQUM3QixtQkFBbUI7SUFDbkIsK0NBQStDO0lBQy9DLHFCQUFxQjtJQUNyQixtQkFBbUI7SUFDbkIsMkNBQTJDO0lBQzNDLHlCQUF5QjtJQUN6QixzQkFBc0I7SUFDdEIsWUFBWTtJQUNaLGlCQUFpQjtJQUNqQix5Q0FBeUM7SUFDekMscURBQXFEO0lBQ3JELG9CQUFvQjtJQUNwQixVQUFVO0lBQ1YsUUFBUTtJQUNSLE1BQU07SUFDTixJQUFJO0lBRUosTUFBTSxLQUFLLEdBQUcsSUFBSSxHQUFHLEVBQW1CLENBQUE7SUFDeEMsTUFBTSxHQUFHLEdBQUcsU0FBUyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUVuQyxPQUFPO1FBQ0wsR0FBRyxFQUFFLE9BQU87UUFDWixHQUFHLEVBQUUsT0FBTztRQUNaLGdCQUFnQixFQUFFLENBQUksR0FBVyxFQUFFLElBQWEsRUFBSyxFQUFFO1lBQ3JELElBQUksS0FBSyxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFrQixDQUFBO1lBQzNDLElBQUksS0FBSyxLQUFLLFNBQVMsRUFBRSxDQUFDO2dCQUN4QixLQUFLLEdBQUcsSUFBSSxFQUFFLENBQUE7Z0JBQ2QsS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLENBQUE7WUFDdkIsQ0FBQztZQUNELE9BQU8sS0FBSyxDQUFBO1FBQ2QsQ0FBQztRQUNELHNCQUFzQixFQUFFLENBQVUsR0FBVyxFQUFFLElBQTRCLEVBQTBCLEVBQUUsQ0FDckcsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRTtZQUNyQyxNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBa0IsQ0FBQTtZQUM3QyxJQUFJLEtBQUssS0FBSyxTQUFTO2dCQUFFLE9BQU8sTUFBTSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQTJCLENBQUE7WUFDL0UsT0FBTyxNQUFNLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFO2dCQUNoQyxLQUFLLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQTtnQkFDakIsT0FBTyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFBO1lBQzFCLENBQUMsQ0FBQyxDQUFBO1FBQ0osQ0FBQyxDQUFDLENBQUM7S0FDTixDQUFBO0FBQ0gsQ0FBQyxDQUFBO0FBRUQsTUFBTSxPQUFPLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxjQUFjLEVBQUUsQ0FBQyxDQUFBO0FBRW5ELE1BQU0sT0FBTyxVQUFXLFNBQVEsT0FBTyxDQUFDLE1BQU0sRUFBYyxDQUFDLHVCQUF1QixFQUFFLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxDQUFDO0NBQ3ZHIn0=

package/dist/api/internal/RequestContextMiddleware.d.ts

@@ -1,5 +1,5 @@
 import { Effect } from "effect-app";
 import { HttpServerRequest, HttpServerResponse } from "effect-app/http";
 import { Locale } from "../../RequestContext.js";
-export declare const RequestContextMiddleware: (defaultLocale?: Locale) => <E, R>(app: Effect.Effect<HttpServerResponse.HttpServerResponse, E, HttpServerRequest.HttpServerRequest | R>) => Effect.Effect<HttpServerResponse.HttpServerResponse, E, HttpServerRequest.HttpServerRequest | Exclude<Exclude<R, import("effect/Tracer").ParentSpan>, never>>;
+export declare const RequestContextMiddleware: (defaultLocale?: Locale) => <E, R>(app: Effect.Effect<HttpServerResponse.HttpServerResponse, E, R | HttpServerRequest.HttpServerRequest>) => Effect.Effect<HttpServerResponse.HttpServerResponse, E, HttpServerRequest.HttpServerRequest | Exclude<Exclude<R, import("effect/Tracer").ParentSpan>, never>>;
 //# sourceMappingURL=RequestContextMiddleware.d.ts.map

package/dist/api/internal/auth.d.ts

@@ -3,7 +3,7 @@ import { HttpHeaders, HttpServerRequest, HttpServerResponse } from "effect-app/h
 import { auth, InsufficientScopeError, InvalidRequestError, InvalidTokenError, UnauthorizedError } from "express-oauth2-jwt-bearer";
 type Config = Parameters<typeof auth>[0];
 export declare const checkJWTI: (config: Config) => (headers: HttpHeaders.Headers) => Effect.Effect<void, InsufficientScopeError | InvalidRequestError | InvalidTokenError | UnauthorizedError, never>;
-export declare const checkJwt: (config: Config) => <E, R>(app: Effect.Effect<HttpServerResponse.HttpServerResponse, E, R | HttpServerRequest.HttpServerRequest>) => Effect.Effect<HttpServerResponse.HttpServerResponse, E | import("effect/unstable/http/HttpBody").HttpBodyError, R | HttpServerRequest.HttpServerRequest>;
+export declare const checkJwt: (config: Config) => <E, R>(app: Effect.Effect<HttpServerResponse.HttpServerResponse, E, HttpServerRequest.HttpServerRequest | R>) => Effect.Effect<HttpServerResponse.HttpServerResponse, E | import("effect/unstable/http/HttpBody").HttpBodyError, HttpServerRequest.HttpServerRequest | R>;
 declare const JWTError_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]; }>) => Readonly<A> & {
     readonly _tag: "JWTError";
 } & import("effect/Pipeable").Pipeable;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "4.0.0-beta.104",
+  "version": "4.0.0-beta.105",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -13,7 +13,7 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "7.0.1",
     "query-string": "^9.3.1",
-    "effect-app": "4.0.0-beta.104"
+    "effect-app": "4.0.0-beta.105"
   },
   "devDependencies": {
     "@azure/cosmos": "^4.9.2",

package/src/Model/Repository/internal/internal.ts

@@ -77,7 +77,7 @@ export function makeRepoInternal<
           const encodeMany = flow(
             S.encodeEffect(S.Array(schema)),
             provideRctx,
-            Effect.withSpan("encodeMany", {}, { captureStackTrace: false })
+            Effect.withSpan("encodeMany", { attributes: { itemType: name } }, { captureStackTrace: false })
           )
           const decode = flow(S.decodeEffect(schema), provideRctx)
           const decodeMany = flow(
@@ -164,7 +164,7 @@ export function makeRepoInternal<
             )
           })
 
-          const find = Effect.fn("find")(function*(id: T[IdKey]) {
+          const find = Effect.fn("find", { attributes: { itemType: name } })(function*(id: T[IdKey]) {
             yield* Effect.annotateCurrentSpan({ itemId: id })
 
             return yield* flatMapOption(findE(id), (_) => Effect.orDie(decode(_)))
@@ -191,62 +191,71 @@ export function makeRepoInternal<
                 Effect.andThen(saveAllE)
               )
 
-          const saveAndPublish = Effect.fn("saveAndPublish")(function*(items: Iterable<T>, events: Iterable<Evt> = []) {
-            const it = Chunk.fromIterable(items)
-            const evts = [...events]
-            yield* Effect.annotateCurrentSpan({ itemIds: [...Chunk.map(it, (_) => _[idKey])], events: evts.length })
-            return yield* saveAll(it)
-              .pipe(
-                Effect.andThen(Effect.sync(() => toNonEmptyArray(evts))),
-                // TODO: for full consistency the events should be stored within the same database transaction, and then picked up.
-                (_) => flatMapOption(_, pub),
-                Effect.andThen(PubSub.publish(changeFeed, [Chunk.toArray(it), "save"] as [T[], "save" | "remove"])),
-                Effect.asVoid
-              )
-          })
+          const saveAndPublish = Effect.fn("saveAndPublish", { attributes: { itemType: name } })(
+            function*(items: Iterable<T>, events: Iterable<Evt> = []) {
+              const it = Chunk.fromIterable(items)
+              const evts = [...events]
+              yield* Effect.annotateCurrentSpan({ itemIds: [...Chunk.map(it, (_) => _[idKey])], events: evts.length })
+              return yield* saveAll(it)
+                .pipe(
+                  Effect.andThen(Effect.sync(() => toNonEmptyArray(evts))),
+                  // TODO: for full consistency the events should be stored within the same database transaction, and then picked up.
+                  (_) => flatMapOption(_, pub),
+                  Effect.andThen(PubSub.publish(changeFeed, [Chunk.toArray(it), "save"] as [T[], "save" | "remove"])),
+                  Effect.asVoid
+                )
+            }
+          )
 
-          const removeAndPublish = Effect.fn("removeAndPublish")(function*(a: Iterable<T>, events: Iterable<Evt> = []) {
-            const { set } = yield* cms
-            const it = [...a]
-            const evts = [...events]
-            yield* Effect.annotateCurrentSpan({ itemIds: it.map((_) => _[idKey]), eventCount: evts.length })
-            const items = yield* encodeMany(it).pipe(Effect.orDie)
-            if (Array.isReadonlyArrayNonEmpty(items)) {
-              yield* store.batchRemove(
-                items.map((_) => (_[idKey])),
-                args.config?.partitionValue?.(items[0])
-              )
-              for (const e of items) {
-                set(e[idKey], undefined)
-              }
-              yield* Effect
-                .sync(() => toNonEmptyArray(evts))
-                // TODO: for full consistency the events should be stored within the same database transaction, and then picked up.
-                .pipe((_) => flatMapOption(_, pub))
+          const removeAndPublish = Effect.fn("removeAndPublish", { attributes: { itemType: name } })(
+            function*(a: Iterable<T>, events: Iterable<Evt> = []) {
+              const { set } = yield* cms
+              const it = [...a]
+              const evts = [...events]
+              yield* Effect.annotateCurrentSpan({ itemIds: it.map((_) => _[idKey]), eventCount: evts.length })
+              const items = yield* encodeMany(it).pipe(Effect.orDie)
+              if (Array.isReadonlyArrayNonEmpty(items)) {
+                yield* store.batchRemove(
+                  items.map((_) => (_[idKey])),
+                  args.config?.partitionValue?.(items[0])
+                )
+                for (const e of items) {
+                  set(e[idKey], undefined)
+                }
+                yield* Effect
+                  .sync(() => toNonEmptyArray(evts))
+                  // TODO: for full consistency the events should be stored within the same database transaction, and then picked up.
+                  .pipe((_) => flatMapOption(_, pub))
 
-              yield* PubSub.publish(changeFeed, [it, "remove"] as [T[], "save" | "remove"])
+                yield* PubSub.publish(changeFeed, [it, "remove"] as [T[], "save" | "remove"])
+              }
             }
-          })
+          )
 
-          const removeById = Effect.fn("removeById")(function*(...ids: readonly T[IdKey][]) {
-            if (!Array.isReadonlyArrayNonEmpty(ids)) {
-              return
-            }
-            const { set } = yield* cms
-            const eids = yield* Effect.forEach(ids, (_) => encodeIdOnly(_ as any)).pipe(Effect.orDie)
-            yield* Effect.annotateCurrentSpan({ itemIds: eids })
-            yield* store.batchRemove(eids)
-            for (const id of eids) {
-              set(id, undefined)
+          const removeById = Effect.fn("removeById", { attributes: { itemType: name } })(
+            function*(...ids: readonly T[IdKey][]) {
+              if (!Array.isReadonlyArrayNonEmpty(ids)) {
+                return
+              }
+              const { set } = yield* cms
+              const eids = yield* Effect.forEach(ids, (_) => encodeIdOnly(_ as any)).pipe(Effect.orDie)
+              yield* Effect.annotateCurrentSpan({ itemIds: eids })
+              yield* store.batchRemove(eids)
+              for (const id of eids) {
+                set(id, undefined)
+              }
+              yield* PubSub.publish(changeFeed, [[], "remove"] as [T[], "save" | "remove"])
             }
-            yield* PubSub.publish(changeFeed, [[], "remove"] as [T[], "save" | "remove"])
-          })
+          )
 
           const parseMany = (items: readonly PM[]) =>
             Effect
               .flatMap(cms, (cm) =>
                 decodeMany(items.map((_) => mapReverse(_, cm.set)))
-                  .pipe(Effect.orDie, Effect.withSpan("parseMany", {}, { captureStackTrace: false })))
+                  .pipe(
+                    Effect.orDie,
+                    Effect.withSpan("parseMany", { attributes: { itemType: name } }, { captureStackTrace: false })
+                  ))
           const parseMany2 = <A, R>(
             items: readonly PM[],
             schema: S.Codec<A, Encoded, R>
@@ -257,7 +266,10 @@ export function makeRepoInternal<
                   .decodeEffect(S.Array(schema))(
                     items.map((_) => mapReverse(_, cm.set))
                   )
-                  .pipe(Effect.orDie, Effect.withSpan("parseMany2", {}, { captureStackTrace: false })))
+                  .pipe(
+                    Effect.orDie,
+                    Effect.withSpan("parseMany2", { attributes: { itemType: name } }, { captureStackTrace: false })
+                  ))
           const filter = <U extends keyof Encoded = keyof Encoded>(args: FilterArgs<Encoded, U>) =>
             store
               .filter(
@@ -330,6 +342,7 @@ export function makeRepoInternal<
                 : eff,
               Effect.withSpan("Repository.query [effect-app/infra]", {
                 attributes: {
+                  itemType: name,
                   "repository.model_name": name,
                   query: { ...a, schema: a.schema ? "__SCHEMA__" : a.schema, filter: a.filter }
                 }
@@ -337,7 +350,7 @@ export function makeRepoInternal<
             )
           }) as any
 
-          const validateSample = Effect.fn("validateSample")(function*(options?: {
+          const validateSample = Effect.fn("validateSample", { attributes: { itemType: name } })(function*(options?: {
             percentage?: number
             maxItems?: number
           }) {
@@ -444,7 +457,7 @@ export function makeRepoInternal<
                 // },
                 save: (...xes: any[]) =>
                   Effect.flatMap(encMany(xes), (_) => saveAllE(_)).pipe(
-                    Effect.withSpan("mapped.save", {}, { captureStackTrace: false })
+                    Effect.withSpan("mapped.save", { attributes: { itemType: name } }, { captureStackTrace: false })
                   )
               }
             }

package/src/Store/ContextMapContainer.ts

@@ -1,7 +1,5 @@
-import { Context, Data, Effect, type Exit, Layer, RequestResolver } from "effect-app"
-import type { NonEmptyArray } from "effect/Array"
+import { Context, Data, Effect, Layer, RequestResolver } from "effect-app"
 import { dual } from "effect/Function"
-import * as MutableHashMap from "effect/MutableHashMap"
 import type * as Request from "effect/Request"
 import { ContextMap } from "./service.js"
 
@@ -23,94 +21,39 @@ export const getContextMap = ContextMapContainer.asEffect().pipe(
   Effect.filterOrFail((_) => _ !== "root", () => new ContextMapNotStartedError())
 )
 
+/**
+ * Uses the official `RequestResolver.withCache` internally,
+ * creating one cached resolver per ContextMap (i.e. per request).
+ * Uses a shared semaphore in the ContextMap to ensure safe single initialization.
+ */
 export const withRequestResolverCache: {
   <A extends Request.Request<any, any>>(options: {
     readonly capacity: number
     readonly strategy?: "lru" | "fifo" | undefined
-  }): (self: RequestResolver.RequestResolver<A>) => RequestResolver.RequestResolver<A>
+  }): (
+    self: RequestResolver.RequestResolver<A>
+  ) => Effect.Effect<RequestResolver.RequestResolver<A>, ContextMapNotStartedError>
   <A extends Request.Request<any, any>>(
     self: RequestResolver.RequestResolver<A>,
     options: {
       readonly capacity: number
       readonly strategy?: "lru" | "fifo" | undefined
     }
-  ): RequestResolver.RequestResolver<A>
+  ): Effect.Effect<RequestResolver.RequestResolver<A>, ContextMapNotStartedError>
 } = dual(2, <A extends Request.Request<any, any>>(
   self: RequestResolver.RequestResolver<A>,
   options: {
     readonly capacity: number
     readonly strategy?: "lru" | "fifo" | undefined
   }
-): RequestResolver.RequestResolver<A> => {
+): Effect.Effect<RequestResolver.RequestResolver<A>, ContextMapNotStartedError> => {
   const cacheKey = Symbol()
-  const strategy = options.strategy ?? "lru"
-  type CacheEntry = {
-    readonly entry: Request.Entry<A>
-    exit: Exit.Exit<Request.Success<A>, Request.Error<A>> | undefined
-  }
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-  return RequestResolver.makeWith({
-    ...(self as any),
-    runAll(
-      entries: NonEmptyArray<Request.Entry<A>>,
-      key: unknown
-    ) {
-      return Effect.flatMap(
-        getContextMap.pipe(Effect.orDie),
-        (contextMap) => {
-          const cache = contextMap.getOrCreateStore<MutableHashMap.MutableHashMap<A, CacheEntry>>(
-            cacheKey,
-            () => MutableHashMap.empty()
-          )
-
-          const uncached: Array<Request.Entry<A>> = []
-          for (const entry of entries) {
-            const ocached = MutableHashMap.get(cache, entry.request)
-            if (ocached._tag === "None") {
-              const cached: CacheEntry = { entry, exit: undefined }
-              MutableHashMap.set(cache, entry.request, cached)
-              const prevComplete = entry.completeUnsafe.bind(entry)
-              entry.completeUnsafe = (exit) => {
-                cached.exit = exit
-                prevComplete(exit)
-              }
-              uncached.push(entry)
-            } else {
-              const cached = ocached.value
-              if (cached.exit) {
-                if (strategy === "lru") {
-                  MutableHashMap.remove(cache, cached.entry.request)
-                  MutableHashMap.set(cache, cached.entry.request, cached)
-                }
-                entry.completeUnsafe(cached.exit as any)
-              } else {
-                cached.entry.uninterruptible = true
-                const prevComplete = cached.entry.completeUnsafe.bind(cached.entry)
-                cached.entry.completeUnsafe = (exit) => {
-                  prevComplete(exit)
-                  entry.completeUnsafe(exit)
-                }
-              }
-            }
-          }
-
-          if (uncached.length === 0) return Effect.void
-
-          return Effect.onExit(
-            (self as any).runAll(uncached, key),
-            () => {
-              let toRemove = MutableHashMap.size(cache) - options.capacity
-              if (toRemove <= 0) return Effect.void
-              for (const k of MutableHashMap.keys(cache)) {
-                MutableHashMap.remove(cache, k)
-                toRemove--
-                if (toRemove <= 0) break
-              }
-              return Effect.void
-            }
-          )
-        }
+  return getContextMap.pipe(
+    Effect.flatMap((ctxMap) =>
+      ctxMap.getOrCreateStoreEffect(
+        cacheKey,
+        RequestResolver.withCache(self, options)
       )
-    }
-  })
+    )
+  )
 })

package/src/Store/service.ts

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type { UniqueKey } from "@azure/cosmos"
 import { Context, Effect, type NonEmptyReadonlyArray, type Option, type Redacted } from "effect-app"
+import * as Semaphore from "effect/Semaphore"
 import type { OptimisticConcurrencyException } from "../errors.js"
 import type { FilterResult } from "../Model/filter/filterApi.js"
 import type { FieldValues } from "../Model/filter/types.js"
@@ -162,6 +163,7 @@ export const makeContextMap = () => {
   // }
 
   const store = new Map<symbol, unknown>()
+  const sem = Semaphore.makeUnsafe(1)
 
   return {
     get: getEtag,
@@ -173,7 +175,16 @@ export const makeContextMap = () => {
         store.set(key, value)
       }
       return value
-    }
+    },
+    getOrCreateStoreEffect: <T, E, R>(key: symbol, make: Effect.Effect<T, E, R>): Effect.Effect<T, E, R> =>
+      sem.withPermits(1)(Effect.suspend(() => {
+        const value = store.get(key) as T | undefined
+        if (value !== undefined) return Effect.succeed(value) as Effect.Effect<T, E, R>
+        return Effect.flatMap(make, (v) => {
+          store.set(key, v)
+          return Effect.succeed(v)
+        })
+      }))
   }
 }