@effect-app/infra 0.133.0-next.32 → 0.133.0-next.33

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @effect-app/infra
 
+## 0.133.0-next.33
+
+### Patch Changes
+
+- 21482c6: cl
+- Updated dependencies [21482c6]
+  - @effect-app/prelude@0.107.0-next.31
+  - @effect-app/infra-adapters@0.85.0-next.31
+
 ## 0.133.0-next.32
 
 ### Patch Changes

package/_cjs/RequestContext.cjs

@@ -46,6 +46,7 @@ let RequestContext = exports.RequestContext = RequestContext_1 = class RequestCo
   //   namespace: NonEmptyString255.optional()
   // })
 }) {
+  // static Tag = Context.Tag<RequestContext>()
   static inherit(parent, newSelf) {
     return new RequestContext_1({
       namespace: parent?.namespace,

package/_cjs/RequestContext.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"RequestContext.cjs","names":["_prelude","require","_ids","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","RequestContextParent","exports","tsplus_module_1","TaggedClass","id","RequestId","name","NonEmptyString255","userProfile","tsplus_module_2","optional","struct","sub","UserProfileId","locale","literal","createdAt","withDefaultConstructor","S","Date","__decorate","useClassFeaturesForSchema","RequestContext","RequestContext_1","tsplus_module_3","RecordOmitold","object$","fields","withDefault","rootId","parent","namespace","inherit","newSelf","toMonitoring","self","operationName","parentOperationName","parentLocale","From","FromClass"],"sources":["../_src/RequestContext.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"RequestContext.cjs","names":["_prelude","require","_ids","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","RequestContextParent","exports","tsplus_module_1","TaggedClass","id","RequestId","name","NonEmptyString255","userProfile","tsplus_module_2","optional","struct","sub","UserProfileId","locale","literal","createdAt","withDefaultConstructor","S","Date","__decorate","useClassFeaturesForSchema","RequestContext","RequestContext_1","tsplus_module_3","RecordOmitold","object$","fields","withDefault","rootId","parent","namespace","inherit","newSelf","toMonitoring","self","operationName","parentOperationName","parentLocale","From","FromClass"],"sources":["../_src/RequestContext.ts"],"sourcesContent":[null],"mappings":"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"}

package/_cjs/api/setupRequest.cjs

@@ -3,55 +3,56 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setupRequestContext = void 0;
-exports.setupRequestContextFromName = setupRequestContextFromName;
-var tsplus_module_1 = _interopRequireWildcard(require("effect/Effect"));
-var tsplus_module_2 = _interopRequireWildcard(require("@effect-app/schema"));
+exports.setupRequestContext = setupRequestContext;
+exports.updateRequestContext = updateRequestContext;
+var tsplus_module_1 = _interopRequireWildcard(require("@effect-app/schema"));
+var tsplus_module_2 = _interopRequireWildcard(require("effect/Effect"));
+var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/infra/services/RequestContextContainer"));
+var tsplus_module_4 = _interopRequireWildcard(require("effect/Layer"));
 var _ids = require("@effect-app/prelude/ids");
 var _RequestContext = require("../RequestContext.cjs");
-var _RequestContextContainer = require("../services/RequestContextContainer.cjs");
+var _RequestContextContainer2 = require("../services/RequestContextContainer.cjs");
 var _ContextMapContainer = require("../services/Store/ContextMapContainer.cjs");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-const setupRequestContext = exports.setupRequestContext = setupRequestContext_1;
-/**
- * @tsplus fluent effect/io/Effect setupRequestContextFromName
- */
-function setupRequestContextFromName(self, name) {
-  return tsplus_module_1.flatMap(makeInternalRequestContext(name), rc => setupRequestContext_1(self, rc));
-}
 function makeInternalRequestContext(name) {
-  return tsplus_module_1.sync(() => {
+  return tsplus_module_2.sync(() => {
     const id = _ids.RequestId.make();
     return new _RequestContext.RequestContext({
       id,
       rootId: id,
       locale: "en",
-      name: tsplus_module_2.NonEmptyString255(name)
+      name: tsplus_module_1.NonEmptyString255(name)
     });
   });
 }
-const withRequestSpan = f => tsplus_module_1.flatMap(_RequestContextContainer.RequestContextContainer.get, ctx => tsplus_module_1.withLogSpan(tsplus_module_1.withSpan(f, "request", {
-  attributes: {
-    "request.id": ctx.id,
-    "request.name": ctx.name,
-    "request.locale": ctx.locale,
-    "request.namespace": ctx.namespace,
-    ...(ctx.userProfile?.sub ? {
-      "request.user.sub": ctx.userProfile.sub,
-      "request.user.roles": "roles" in ctx.userProfile ? ctx.userProfile.roles : undefined
-    } : {})
-  }
+const withRequestSpan = f => tsplus_module_2.andThen(_RequestContextContainer2.RequestContextContainer.get, ctx => tsplus_module_2.withLogSpan(tsplus_module_2.withSpan(f, "request", {
+  attributes: tsplus_module_3.spanAttributes(ctx)
 })
 // request context info is picked up directly in the logger for annotations.
 , "request"));
-function setupContextMap(self) {
-  return tsplus_module_1.zipRight(self)(tsplus_module_1.flatMap(_ContextMapContainer.ContextMapContainer, _ => _.start));
-}
+const setupContextMap = tsplus_module_4.effectDiscard(tsplus_module_2.andThen(_ContextMapContainer.ContextMapContainer, _ => _.start));
+// const RequestContextLiveFromRequestContext = (requestContext: RequestContext) =>
+//   RequestContext.Tag.makeLayer(requestContext)
+// memoization problem
+// const RequestContextLive = RequestContextContainer.get.toLayer(RequestContext.Tag)
+const RequestContextStartLiveFromRequestContext = requestContext => tsplus_module_4.provideMerge(setupContextMap
+// .provideMerge(RequestContextLiveFromRequestContext(requestContext))
+, tsplus_module_4.effectDiscard(tsplus_module_2.andThen(_RequestContextContainer2.RequestContextContainer, _ => _.start(requestContext))));
+const RequestContextStartLive = requestContext => typeof requestContext === "string" ? tsplus_module_4.unwrapEffect(tsplus_module_2.andThen(makeInternalRequestContext(requestContext), RequestContextStartLiveFromRequestContext)) : RequestContextStartLiveFromRequestContext(requestContext);
 /**
  * @tsplus fluent effect/io/Effect setupRequestContext
  */
-function setupRequestContext_1(self, requestContext) {
-  return tsplus_module_1.zipRight(withRequestSpan(setupContextMap(self)))(tsplus_module_1.flatMap(_RequestContextContainer.RequestContextContainer, _ => _.start(requestContext)));
+function setupRequestContext(self, requestContext) {
+  return tsplus_module_2.provide(self.pipe(withRequestSpan), RequestContextStartLive(requestContext));
+}
+const UpdateRequestContextLive = f => tsplus_module_4.effectDiscard(tsplus_module_2.andThen(_RequestContextContainer2.RequestContextContainer, rcc => rcc.update(f)));
+/**
+ * @tsplus fluent effect/io/Effect updateRequestContext
+ */
+function updateRequestContext(self, f) {
+  return tsplus_module_2.provide(self
+  // .provideServiceEffect(RequestContext.Tag, RequestContextContainer.get)
+  , UpdateRequestContextLive(f));
 }
 //# sourceMappingURL=setupRequest.cjs.map

package/_cjs/api/setupRequest.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"setupRequest.cjs","names":["_ids","require","_RequestContext","_RequestContextContainer","_ContextMapContainer","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","setupRequestContext","exports","setupRequestContext_1","setupRequestContextFromName","self","name","tsplus_module_1","flatMap","makeInternalRequestContext","rc","sync","id","RequestId","make","RequestContext","rootId","locale","tsplus_module_2","NonEmptyString255","withRequestSpan","f","RequestContextContainer","ctx","withLogSpan","withSpan","attributes","namespace","userProfile","sub","roles","undefined","setupContextMap","zipRight","ContextMapContainer","_","start","requestContext"],"sources":["../../_src/api/setupRequest.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;AAAA,IAAAA,IAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AACA,IAAAE,wBAAA,GAAAF,OAAA;AACA,IAAAG,oBAAA,GAAAH,OAAA;AAA8E,SAAAI,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAI,wBAAAJ,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAM,OAAA,EAAAN,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAI,GAAA,CAAAP,CAAA,UAAAG,CAAA,CAAAK,GAAA,CAAAR,CAAA,OAAAS,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAf,CAAA,oBAAAe,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAlB,CAAA,EAAAe,CAAA,SAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAd,CAAA,EAAAe,CAAA,UAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAf,CAAA,CAAAe,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAN,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAiB,GAAA,CAAApB,CAAA,EAAAS,CAAA,GAAAA,CAAA;MAyD9DY,mBAAmB,GAAAC,OAAA,CAAAD,mBAAA,GAAAE,qBAAA;AAvDnC;;;AAGM,SAAUC,2BAA2BA,CAAUC,IAAqB,EAAEC,IAAY;EACtF,OAAOC,eAAA,CAAAC,OAAA,CAAAC,0BAA0B,CAACH,IAAI,CAAC,EAAUI,EAAE,IAAKP,qBAAA,CAAoBE,IAAI,EAAEK,EAAE,CAAC,CAAC;AACxF;AAEA,SAASD,0BAA0BA,CAACH,IAAY;EAC9C,OAAOC,eAAA,CAAAI,IAAA,CAAY,MAAK;IACtB,MAAMC,EAAE,GAAGC,cAAS,CAACC,IAAI,EAAE;IAC3B,OAAO,IAAIC,8BAAc,CAAC;MACxBH,EAAE;MACFI,MAAM,EAAEJ,EAAE;MACVK,MAAM,EAAE,IAAI;MACZX,IAAI,EAAEY,eAAA,CAAAC,iBAAiB,CAACb,IAAI;KAC7B,CAAC;EACJ,CAAC,CAAC;AACJ;AAEA,MAAMc,eAAe,GAAaC,CAAkB,IAClDd,eAAA,CAAAC,OAAA,CAAAc,gDAAuB,CACpBlC,GAAG,EACMmC,GAAG,IACXhB,eAAA,CAAAiB,WAAA,CAAAjB,eAAA,CAAAkB,QAAA,CAAAJ,CAAC,EACW,SAAS,EAAE;EACnBK,UAAU,EAAE;IACV,YAAY,EAAEH,GAAG,CAACX,EAAE;IACpB,cAAc,EAAEW,GAAG,CAACjB,IAAI;IACxB,gBAAgB,EAAEiB,GAAG,CAACN,MAAM;IAC5B,mBAAmB,EAAEM,GAAG,CAACI,SAAS;IAClC,IAAGJ,GAAG,CAACK,WAAW,EAAEC,GAAG,GACnB;MACA,kBAAkB,EAAEN,GAAG,CACpBK,WAAW,CACXC,GAAG;MACN,oBAAoB,EAAE,OAAO,IAAIN,GAAG,CAC/BK,WAAW,GACZL,GAAG,CAACK,WAAW,CAACE,KAAK,GACrBC;KACL,GACC,EAAE;;CAET;AACD;AAAA,EACa,SAAS,CAAC,CAC1B;AAEL,SAASC,eAAeA,CAAU3B,IAAqB;EACrD,OAAOE,eAAA,CAAA0B,QAAA,CACH5B,IAAI,EADAE,eAAA,CAAAC,OAAA,CAAA0B,wCAAmB,EAAUC,CAAC,IAAKA,CAAC,CAACC,KAAK,CAAC;AAErD;AAEA;;;AAGA,SAAAjC,sBAA6CE,IAAqB,EAAEgC,cAA8B;EAChG,OAAA9B,eAAA,CAAA0B,QAAA,CACIb,eAAe,CAACY,eAAe,CAAC3B,IAAI,CAAC,CAAC,EADnCE,eAAA,CAAAC,OAAA,CAAAc,gDAAuB,EAAUa,CAAC,IAAKA,CAAC,CAACC,KAAK,CAACC,cAAc,CAAC,CAAC;AAExE"}
+{"version":3,"file":"setupRequest.cjs","names":["_ids","require","_RequestContext","_RequestContextContainer2","_ContextMapContainer","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","makeInternalRequestContext","name","tsplus_module_2","sync","id","RequestId","make","RequestContext","rootId","locale","tsplus_module_1","NonEmptyString255","withRequestSpan","f","andThen","RequestContextContainer","ctx","withLogSpan","withSpan","attributes","tsplus_module_3","spanAttributes","setupContextMap","tsplus_module_4","effectDiscard","ContextMapContainer","_","start","RequestContextStartLiveFromRequestContext","requestContext","provideMerge","RequestContextStartLive","unwrapEffect","setupRequestContext","self","provide","pipe","UpdateRequestContextLive","rcc","update","updateRequestContext"],"sources":["../../_src/api/setupRequest.ts"],"sourcesContent":[null],"mappings":"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"}

package/_cjs/services/RepositoryBase.cjs

@@ -87,7 +87,7 @@ function makeRepo() {
           function find(id) {
             return tsplus_module_5.flatMapOption(findE(id), parse);
           }
-          const saveAllE = a => tsplus_module_5.flatMapOption(tsplus_module_1.sync(() => tsplus_module_3.CollectionToNonEmptyReadonlyArray(a)), a => tsplus_module_1.flatMap(cms.get, ({
+          const saveAllE = a => tsplus_module_1.asUnit(tsplus_module_5.flatMapOption(tsplus_module_1.sync(() => tsplus_module_3.CollectionToNonEmptyReadonlyArray(a)), a => tsplus_module_1.flatMap(cms.get, ({
             get,
             set
           }) => {
@@ -95,14 +95,14 @@ function makeRepo() {
             return tsplus_module_1.map(store.batchSet(items), ret => {
               ret.forEach(_ => set(_.id, _._etag));
             });
-          }));
+          })));
           const encode = i => tsplus_module_2.encodeSync(schema)(i);
           const saveAll = a => saveAllE(tsplus_module_4.map(tsplus_module_3.ext_itToChunk(a), encode));
           const saveAndPublish = (items, events = []) => {
             const it = tsplus_module_3.ext_itToChunk(items);
-            return tsplus_module_1.zipRight(changeFeed.publish([tsplus_module_6.toArray(it), "save"]))(tsplus_module_1.zipRight(tsplus_module_5.flatMapOption(tsplus_module_1.sync(() => tsplus_module_3.CollectionToNonEmptyReadonlyArray(events))
+            return tsplus_module_1.asUnit(tsplus_module_1.andThen(tsplus_module_5.flatMapOption(tsplus_module_1.andThen(saveAll(it), tsplus_module_1.sync(() => tsplus_module_3.CollectionToNonEmptyReadonlyArray(events)))
             // TODO: for full consistency the events should be stored within the same database transaction, and then picked up.
-            , pub))(saveAll(it)));
+            , pub), changeFeed.publish([tsplus_module_6.toArray(it), "save"])));
           };
           function removeAndPublish(a, events = []) {
             return tsplus_module_1.gen(function* ($) {

package/_cjs/services/RepositoryBase.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"RepositoryBase.cjs","names":["_Store","require","_codec","_filter","_ContextMapContainer","_query","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","RepositoryBaseC","exports","RepositoryBaseC1","constructor","itemType","RepositoryBaseC2","impl","saveAndPublish","removeAndPublish","find","all","utils","changeFeed","makeRepo","name","schema","mapFrom","mapTo","where","makeWhere","mapToPersistenceModel","getEtag","id","mapReverse","_etag","setEtag","mkStore","makeStore","make","args","tsplus_module_1","withLogSpan","flatMap","makeInitial","config","store","ContextMapContainer","cms","context","pubCfg","pub","tsplus_module_10","flow","publishEvents","_","provide","unit","tsplus_module_9","unbounded","allE","items","map","parse","orDie","tsplus_module_2","tsplus_module_8","ext_forEach","findE","tsplus_module_7","tsplus_module_5","flatMapOption","saveAllE","sync","tsplus_module_3","CollectionToNonEmptyReadonlyArray","batchSet","ret","forEach","encode","encodeSync","saveAll","tsplus_module_4","ext_itToChunk","events","it","zipRight","publish","tsplus_module_6","toArray","gen","$","remove","undefined","p","parseSync","parseMany","cm","filter","tap","select","query","QueryBuilder","removeById","self","tsplus_module_11","f_","makeFilters","makeFilter_","mode","f","m","Array","isArray","pluralize","s","endsWith","substring","length","_dec","makeCodec","encodeToPM","StoreMaker","withSpan","attributes","partitionValue","RepositoryBaseImpl","jitM","mkRepo","pm","Cls","makeWith","b","type","tsplus_module_12","assignTag","RepositoryDefaultImpl"],"sources":["../../_src/services/RepositoryBase.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"RepositoryBase.cjs","names":["_Store","require","_codec","_filter","_ContextMapContainer","_query","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","RepositoryBaseC","exports","RepositoryBaseC1","constructor","itemType","RepositoryBaseC2","impl","saveAndPublish","removeAndPublish","find","all","utils","changeFeed","makeRepo","name","schema","mapFrom","mapTo","where","makeWhere","mapToPersistenceModel","getEtag","id","mapReverse","_etag","setEtag","mkStore","makeStore","make","args","tsplus_module_1","withLogSpan","flatMap","makeInitial","config","store","ContextMapContainer","cms","context","pubCfg","pub","tsplus_module_10","flow","publishEvents","_","provide","unit","tsplus_module_9","unbounded","allE","items","map","parse","orDie","tsplus_module_2","tsplus_module_8","ext_forEach","findE","tsplus_module_7","tsplus_module_5","flatMapOption","saveAllE","asUnit","sync","tsplus_module_3","CollectionToNonEmptyReadonlyArray","batchSet","ret","forEach","encode","encodeSync","saveAll","tsplus_module_4","ext_itToChunk","events","it","andThen","publish","tsplus_module_6","toArray","gen","$","remove","undefined","p","parseSync","parseMany","cm","filter","tap","select","query","QueryBuilder","removeById","self","tsplus_module_11","f_","makeFilters","makeFilter_","mode","f","m","Array","isArray","pluralize","s","endsWith","substring","length","_dec","makeCodec","encodeToPM","StoreMaker","withSpan","attributes","partitionValue","RepositoryBaseImpl","jitM","mkRepo","pm","Cls","makeWith","b","type","tsplus_module_12","assignTag","RepositoryDefaultImpl"],"sources":["../../_src/services/RepositoryBase.ts"],"sourcesContent":[null],"mappings":"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"}

package/_src/RequestContext.ts

@@ -32,6 +32,7 @@ export class RequestContext extends S.TaggedClass<
   //   namespace: NonEmptyString255.optional()
   // })
 }) {
+  // static Tag = Context.Tag<RequestContext>()
   static inherit(
     this: void,
     parent: RequestContext,

package/_src/api/setupRequest.ts

@@ -3,13 +3,6 @@ import { RequestContext } from "../RequestContext.js"
 import { RequestContextContainer } from "../services/RequestContextContainer.js"
 import { ContextMapContainer } from "../services/Store/ContextMapContainer.js"
 
-/**
- * @tsplus fluent effect/io/Effect setupRequestContextFromName
- */
-export function setupRequestContextFromName<R, E, A>(self: Effect<R, E, A>, name: string) {
-  return makeInternalRequestContext(name).flatMap((rc) => setupRequestContext(self, rc))
-}
-
 function makeInternalRequestContext(name: string) {
   return Effect.sync(() => {
     const id = RequestId.make()
@@ -25,40 +18,52 @@ function makeInternalRequestContext(name: string) {
 const withRequestSpan = <R, E, A>(f: Effect<R, E, A>) =>
   RequestContextContainer
     .get
-    .flatMap((ctx) =>
+    .andThen((ctx) =>
       f
-        .withSpan("request", {
-          attributes: {
-            "request.id": ctx.id,
-            "request.name": ctx.name,
-            "request.locale": ctx.locale,
-            "request.namespace": ctx.namespace,
-            ...ctx.userProfile?.sub
-              ? {
-                "request.user.sub": ctx
-                  .userProfile
-                  .sub,
-                "request.user.roles": "roles" in ctx
-                    .userProfile
-                  ? ctx.userProfile.roles
-                  : undefined
-              }
-              : {}
-          }
-        })
+        .withSpan("request", { attributes: ctx.spanAttributes })
         // request context info is picked up directly in the logger for annotations.
         .withLogSpan("request")
     )
 
-function setupContextMap<R, E, A>(self: Effect<R, E, A>) {
-  return (ContextMapContainer.flatMap((_) => _.start)
-    > self)
-}
+const setupContextMap = ContextMapContainer.andThen((_) => _.start).toLayerDiscard
+
+// const RequestContextLiveFromRequestContext = (requestContext: RequestContext) =>
+//   RequestContext.Tag.makeLayer(requestContext)
+// memoization problem
+// const RequestContextLive = RequestContextContainer.get.toLayer(RequestContext.Tag)
+const RequestContextStartLiveFromRequestContext = (requestContext: RequestContext) =>
+  setupContextMap
+    // .provideMerge(RequestContextLiveFromRequestContext(requestContext))
+    .provideMerge(
+      RequestContextContainer
+        .andThen((_) => _.start(requestContext))
+        .toLayerDiscard
+    )
+
+const RequestContextStartLive = (requestContext: RequestContext | string) =>
+  typeof requestContext === "string"
+    ? makeInternalRequestContext(requestContext)
+      .andThen(RequestContextStartLiveFromRequestContext)
+      .unwrapLayer
+    : RequestContextStartLiveFromRequestContext(requestContext)
 
 /**
  * @tsplus fluent effect/io/Effect setupRequestContext
  */
-export function setupRequestContext<R, E, A>(self: Effect<R, E, A>, requestContext: RequestContext) {
-  return RequestContextContainer.flatMap((_) => _.start(requestContext))
-    > withRequestSpan(setupContextMap(self))
+export function setupRequestContext<R, E, A>(self: Effect<R, E, A>, requestContext: RequestContext | string) {
+  return self
+    .pipe(withRequestSpan)
+    .provide(RequestContextStartLive(requestContext))
+}
+
+const UpdateRequestContextLive = (f: (rc: RequestContext) => RequestContext) =>
+  RequestContextContainer.andThen((rcc) => rcc.update(f)).toLayerDiscard
+
+/**
+ * @tsplus fluent effect/io/Effect updateRequestContext
+ */
+export function updateRequestContext<R, E, A>(self: Effect<R, E, A>, f: (rc: RequestContext) => RequestContext) {
+  return self
+    // .provideServiceEffect(RequestContext.Tag, RequestContextContainer.get)
+    .provide(UpdateRequestContextLive(f))
 }

package/_src/services/RepositoryBase.ts

@@ -172,6 +172,7 @@ export function makeRepo<
                 ret.forEach((_) => set(_.id, _._etag))
               })
             )
+            .asUnit
         const encode = (i: T) => schema.encodeSync(i)
 
         const saveAll = (a: Iterable<T>) => saveAllE(a.toChunk.map(encode))
@@ -179,10 +180,12 @@ export function makeRepo<
         const saveAndPublish = (items: Iterable<T>, events: Iterable<Evt> = []) => {
           const it = items.toChunk
           return saveAll(it)
-            > Effect(events.toNonEmptyArray)
-              // TODO: for full consistency the events should be stored within the same database transaction, and then picked up.
-              .flatMapOpt(pub)
-            > changeFeed.publish([it.toArray, "save"])
+            .andThen(Effect(events.toNonEmptyArray))
+            // TODO: for full consistency the events should be stored within the same database transaction, and then picked up.
+            .flatMapOpt(pub)
+            .andThen(changeFeed
+              .publish([it.toArray, "save"]))
+            .asUnit
         }
 
         function removeAndPublish(a: Iterable<T>, events: Iterable<Evt> = []) {

package/dist/RequestContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RequestContext.d.ts","sourceRoot":"","sources":["../_src/RequestContext.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,qBAAqB,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGvC,qBACa,oBAAqB,SAAQ,yBAQxC;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL;;;GAGG;AACH,qBACa,cAAe,SAAQ,mBAclC;IACA,MAAM,CAAC,OAAO,CACZ,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,qBAAqB,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAUhE,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc;;;;;;CASrD;AAKD,yBAAiB,oBAAoB,CAAC;;;;;;;;;;;IACpC;;;OAGG;IACH,MAAM,OAAO,IAAK,SAAQ,SAAwC;KAAG;;CACtE;AACD,yBAAiB,cAAc,CAAC;;;;;;;;;;;;;;;;;;;;;;;IAC9B;;;OAGG;IACH,MAAM,OAAO,IAAK,SAAQ,WAAkC;KAAG;;CAChE"}
+{"version":3,"file":"RequestContext.d.ts","sourceRoot":"","sources":["../_src/RequestContext.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,qBAAqB,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGvC,qBACa,oBAAqB,SAAQ,yBAQxC;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL;;;GAGG;AACH,qBACa,cAAe,SAAQ,mBAclC;IAEA,MAAM,CAAC,OAAO,CACZ,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,qBAAqB,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAUhE,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc;;;;;;CASrD;AAKD,yBAAiB,oBAAoB,CAAC;;;;;;;;;;;IACpC;;;OAGG;IACH,MAAM,OAAO,IAAK,SAAQ,SAAwC;KAAG;;CACtE;AACD,yBAAiB,cAAc,CAAC;;;;;;;;;;;;;;;;;;;;;;;IAC9B;;;OAGG;IACH,MAAM,OAAO,IAAK,SAAQ,WAAkC;KAAG;;CAChE"}

package/dist/RequestContext.js

@@ -39,6 +39,7 @@ let RequestContext = RequestContext_1 = class RequestContext extends S.TaggedCla
     //   namespace: NonEmptyString255.optional()
     // })
 }) {
+    // static Tag = Context.Tag<RequestContext>()
     static inherit(parent, newSelf) {
         return new RequestContext_1({
             namespace: parent?.namespace,
@@ -82,4 +83,4 @@ export { RequestContext };
     }
     RequestContext.From = From;
 })(RequestContext || (RequestContext = {}));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9fc3JjL1JlcXVlc3RDb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0scUJBQXFCLENBQUE7QUFDdkMsT0FBTyxFQUFFLFNBQVMsRUFBRSxhQUFhLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUczRCxJQUFNLG9CQUFvQixHQUExQixNQUFNLG9CQUFxQixTQUFRLGdCQUFBLFdBQVcsRUFFbEQsQ0FBQyxnQkFBZ0IsRUFBRTtJQUNwQixFQUFFLEVBQUUsU0FBUztJQUNiLElBQUksa0JBQUUsaUJBQWlCO0lBQ3ZCLFdBQVcsRUFBRSx5QkFBQSxnQkFBQSxNQUFNLENBQUMsRUFBRSxHQUFHLEVBQUUsYUFBYSxFQUFFLENBQUMsQ0FBVztJQUN0RCxNQUFNLEVBQUUsZ0JBQUEsT0FBTyxDQUFDLElBQUksRUFBRSxJQUFJLENBQUM7SUFDM0IsU0FBUyxFQUFFLHVDQUFBLENBQUMsQ0FBQyxJQUFJLEVBQWlCLEdBQUcsRUFBRSxDQUFDLElBQUksSUFBSSxFQUFFLENBQUMsQ0FBQyxPQUFPO0NBQzVELENBQUM7Q0FBRyxDQUFBO0FBUlEsb0JBQW9CO29CQURoQyx5QkFBeUI7R0FDYixvQkFBb0IsQ0FRNUI7O0FBRUw7OztHQUdHO0FBRUksSUFBTSxjQUFjLHNCQUFwQixNQUFNLGNBQWUsU0FBUSxDQUFDLENBQUMsV0FBVyxFQUU5QyxDQUFDLGdCQUFnQixFQUFFO0lBQ3BCLEdBQUcsc0RBQUEsb0JBQW9CLENBQUMsTUFBTSxHQUFTLElBQUksQ0FBQztJQUM1QyxFQUFFLEVBQUUsU0FBUyxDQUFDLFdBQVcsRUFBRTtJQUMzQixNQUFNLEVBQUUsU0FBUztJQUNqQixNQUFNLEVBQUUseUJBQUEsb0JBQW9CLENBQVc7SUFDdkMsU0FBUyxFQUFFLHlDQUFBLGlCQUFpQixDQUFXO0lBQ3ZDLDhDQUE4QztJQUM5QyxpQ0FBaUM7SUFDakMsdUJBQXVCO0lBQ3ZCLDZDQUE2QztJQUM3Qyw0Q0FBNEM7SUFDNUMsS0FBSztDQUNOLENBQUM7SUFDQSxNQUFNLENBQUMsT0FBTyxDQUVaLE1BQXNCLEVBQ3RCLE9BQThEO1FBRTlELE9BQU8sSUFBSSxnQkFBYyxDQUFDO1lBQ3hCLFNBQVMsRUFBRSxNQUFNLEVBQUUsU0FBUztZQUM1QixHQUFHLE9BQU87WUFDVixNQUFNLEVBQUUsTUFBTSxDQUFDLE1BQU07WUFDckIsTUFBTTtTQUNQLENBQUMsQ0FBQTtJQUNKLENBQUM7SUFFRCxNQUFNLENBQUMsWUFBWSxDQUFhLElBQW9CO1FBQ2xELE9BQU87WUFDTCxhQUFhLEVBQUUsSUFBSSxDQUFDLElBQUk7WUFDeEIsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNO1lBQ25CLEdBQUcsQ0FBQyxJQUFJLENBQUMsTUFBTTtnQkFDYixDQUFDLENBQUMsRUFBRSxtQkFBbUIsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxZQUFZLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUU7Z0JBQzdFLENBQUMsQ0FBQyxFQUFFLENBQUM7U0FDUixDQUFBO0lBQ0gsQ0FBQztDQUNGLENBQUE7QUFyQ1ksY0FBYztvQkFEMUIseUJBQXlCO0dBQ2IsY0FBYyxDQXFDMUI7O0FBRUQsZ0NBQWdDO0FBQ2hDLEVBQUU7QUFDRixvQkFBb0I7QUFDcEIsV0FBaUIsb0JBQW9CO0lBQ25DOzs7T0FHRztJQUNILE1BQWEsSUFBSyxTQUFRLGdCQUFBLFNBQVMsRUFBK0I7S0FBRztJQUF4RCx5QkFBSSxPQUFvRCxDQUFBO0FBQ3ZFLENBQUMsRUFOZ0Isb0JBQW9CLEtBQXBCLG9CQUFvQixRQU1wQztBQUNELFdBQWlCLGNBQWM7SUFDN0I7OztPQUdHO0lBQ0gsTUFBYSxJQUFLLFNBQVEsZ0JBQUEsU0FBUyxFQUF5QjtLQUFHO0lBQWxELG1CQUFJLE9BQThDLENBQUE7QUFDakUsQ0FBQyxFQU5nQixjQUFjLEtBQWQsY0FBYyxRQU05QiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9fc3JjL1JlcXVlc3RDb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0scUJBQXFCLENBQUE7QUFDdkMsT0FBTyxFQUFFLFNBQVMsRUFBRSxhQUFhLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUczRCxJQUFNLG9CQUFvQixHQUExQixNQUFNLG9CQUFxQixTQUFRLGdCQUFBLFdBQVcsRUFFbEQsQ0FBQyxnQkFBZ0IsRUFBRTtJQUNwQixFQUFFLEVBQUUsU0FBUztJQUNiLElBQUksa0JBQUUsaUJBQWlCO0lBQ3ZCLFdBQVcsRUFBRSx5QkFBQSxnQkFBQSxNQUFNLENBQUMsRUFBRSxHQUFHLEVBQUUsYUFBYSxFQUFFLENBQUMsQ0FBVztJQUN0RCxNQUFNLEVBQUUsZ0JBQUEsT0FBTyxDQUFDLElBQUksRUFBRSxJQUFJLENBQUM7SUFDM0IsU0FBUyxFQUFFLHVDQUFBLENBQUMsQ0FBQyxJQUFJLEVBQWlCLEdBQUcsRUFBRSxDQUFDLElBQUksSUFBSSxFQUFFLENBQUMsQ0FBQyxPQUFPO0NBQzVELENBQUM7Q0FBRyxDQUFBO0FBUlEsb0JBQW9CO29CQURoQyx5QkFBeUI7R0FDYixvQkFBb0IsQ0FRNUI7O0FBRUw7OztHQUdHO0FBRUksSUFBTSxjQUFjLHNCQUFwQixNQUFNLGNBQWUsU0FBUSxDQUFDLENBQUMsV0FBVyxFQUU5QyxDQUFDLGdCQUFnQixFQUFFO0lBQ3BCLEdBQUcsc0RBQUEsb0JBQW9CLENBQUMsTUFBTSxHQUFTLElBQUksQ0FBQztJQUM1QyxFQUFFLEVBQUUsU0FBUyxDQUFDLFdBQVcsRUFBRTtJQUMzQixNQUFNLEVBQUUsU0FBUztJQUNqQixNQUFNLEVBQUUseUJBQUEsb0JBQW9CLENBQVc7SUFDdkMsU0FBUyxFQUFFLHlDQUFBLGlCQUFpQixDQUFXO0lBQ3ZDLDhDQUE4QztJQUM5QyxpQ0FBaUM7SUFDakMsdUJBQXVCO0lBQ3ZCLDZDQUE2QztJQUM3Qyw0Q0FBNEM7SUFDNUMsS0FBSztDQUNOLENBQUM7SUFDQSw2Q0FBNkM7SUFDN0MsTUFBTSxDQUFDLE9BQU8sQ0FFWixNQUFzQixFQUN0QixPQUE4RDtRQUU5RCxPQUFPLElBQUksZ0JBQWMsQ0FBQztZQUN4QixTQUFTLEVBQUUsTUFBTSxFQUFFLFNBQVM7WUFDNUIsR0FBRyxPQUFPO1lBQ1YsTUFBTSxFQUFFLE1BQU0sQ0FBQyxNQUFNO1lBQ3JCLE1BQU07U0FDUCxDQUFDLENBQUE7SUFDSixDQUFDO0lBRUQsTUFBTSxDQUFDLFlBQVksQ0FBYSxJQUFvQjtRQUNsRCxPQUFPO1lBQ0wsYUFBYSxFQUFFLElBQUksQ0FBQyxJQUFJO1lBQ3hCLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTTtZQUNuQixHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU07Z0JBQ2IsQ0FBQyxDQUFDLEVBQUUsbUJBQW1CLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFO2dCQUM3RSxDQUFDLENBQUMsRUFBRSxDQUFDO1NBQ1IsQ0FBQTtJQUNILENBQUM7Q0FDRixDQUFBO0FBdENZLGNBQWM7b0JBRDFCLHlCQUF5QjtHQUNiLGNBQWMsQ0FzQzFCOztBQUVELGdDQUFnQztBQUNoQyxFQUFFO0FBQ0Ysb0JBQW9CO0FBQ3BCLFdBQWlCLG9CQUFvQjtJQUNuQzs7O09BR0c7SUFDSCxNQUFhLElBQUssU0FBUSxnQkFBQSxTQUFTLEVBQStCO0tBQUc7SUFBeEQseUJBQUksT0FBb0QsQ0FBQTtBQUN2RSxDQUFDLEVBTmdCLG9CQUFvQixLQUFwQixvQkFBb0IsUUFNcEM7QUFDRCxXQUFpQixjQUFjO0lBQzdCOzs7T0FHRztJQUNILE1BQWEsSUFBSyxTQUFRLGdCQUFBLFNBQVMsRUFBeUI7S0FBRztJQUFsRCxtQkFBSSxPQUE4QyxDQUFBO0FBQ2pFLENBQUMsRUFOZ0IsY0FBYyxLQUFkLGNBQWMsUUFNOUIifQ==

package/dist/api/setupRequest.d.ts

@@ -3,13 +3,13 @@ import { RequestContext } from "../RequestContext.js";
 import { RequestContextContainer } from "../services/RequestContextContainer.js";
 import { ContextMapContainer } from "../services/Store/ContextMapContainer.js";
 /**
- * @tsplus fluent effect/io/Effect setupRequestContextFromName
+ * @tsplus fluent effect/io/Effect setupRequestContext
  * @tsplus location "@effect-app/infra/api/setupRequest"
  */
-export declare function setupRequestContextFromName<R, E, A>(self: Effect<R, E, A>, name: string): import("effect/Effect").Effect<RequestContextContainer | ContextMapContainer | Exclude<R, import("effect/Tracer").ParentSpan>, E, A>;
+export declare function setupRequestContext<R, E, A>(self: Effect<R, E, A>, requestContext: RequestContext | string): import("effect/Effect").Effect<RequestContextContainer | ContextMapContainer | Exclude<Exclude<R, import("effect/Tracer").ParentSpan>, never>, E, A>;
 /**
- * @tsplus fluent effect/io/Effect setupRequestContext
+ * @tsplus fluent effect/io/Effect updateRequestContext
  * @tsplus location "@effect-app/infra/api/setupRequest"
  */
-export declare function setupRequestContext<R, E, A>(self: Effect<R, E, A>, requestContext: RequestContext): import("effect/Effect").Effect<RequestContextContainer | ContextMapContainer | Exclude<R, import("effect/Tracer").ParentSpan>, E, A>;
+export declare function updateRequestContext<R, E, A>(self: Effect<R, E, A>, f: (rc: RequestContext) => RequestContext): import("effect/Effect").Effect<RequestContextContainer | Exclude<R, never>, E, A>;
 //# sourceMappingURL=setupRequest.d.ts.map

package/dist/api/setupRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setupRequest.d.ts","sourceRoot":"","sources":["../../_src/api/setupRequest.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAA;AAChF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAA;;;;;AAK9E,wBAAgB,2BAA2B,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,wIAEvF;;;;;AAkDD,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,EAAE,cAAc,wIAGjG"}
+{"version":3,"file":"setupRequest.d.ts","sourceRoot":"","sources":["../../_src/api/setupRequest.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAA;AAChF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAA;;;;;AAiD9E,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,EAAE,cAAc,GAAG,MAAM,wJAI1G;;;;;AAQD,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,cAAc,KAAK,cAAc,qFAI7G"}

package/dist/api/setupRequest.js

@@ -1,56 +1,50 @@
-import * as tsplus_module_1 from "effect/Effect";
-import * as tsplus_module_2 from "@effect-app/schema";
-export const setupRequestContext = setupRequestContext_1;
+import * as tsplus_module_1 from "@effect-app/schema";
+import * as tsplus_module_2 from "effect/Effect";
+import * as tsplus_module_3 from "@effect-app/infra/services/RequestContextContainer";
+import * as tsplus_module_4 from "effect/Layer";
 import { RequestId } from "@effect-app/prelude/ids";
 import { RequestContext } from "../RequestContext.js";
 import { RequestContextContainer } from "../services/RequestContextContainer.js";
 import { ContextMapContainer } from "../services/Store/ContextMapContainer.js";
-/**
- * @tsplus fluent effect/io/Effect setupRequestContextFromName
- */
-export function setupRequestContextFromName(self, name) {
-    return tsplus_module_1.flatMap(makeInternalRequestContext(name), (rc) => setupRequestContext_1(self, rc));
-}
 function makeInternalRequestContext(name) {
-    return tsplus_module_1.sync(() => {
+    return tsplus_module_2.sync(() => {
         const id = RequestId.make();
         return new RequestContext({
             id,
             rootId: id,
             locale: "en",
-            name: tsplus_module_2.NonEmptyString255(name)
+            name: tsplus_module_1.NonEmptyString255(name)
         });
     });
 }
-const withRequestSpan = (f) => tsplus_module_1.flatMap(RequestContextContainer
-    .get, (ctx) => tsplus_module_1.withLogSpan(tsplus_module_1.withSpan(f, "request", {
-    attributes: {
-        "request.id": ctx.id,
-        "request.name": ctx.name,
-        "request.locale": ctx.locale,
-        "request.namespace": ctx.namespace,
-        ...ctx.userProfile?.sub
-            ? {
-                "request.user.sub": ctx
-                    .userProfile
-                    .sub,
-                "request.user.roles": "roles" in ctx
-                    .userProfile
-                    ? ctx.userProfile.roles
-                    : undefined
-            }
-            : {}
-    }
-})
+const withRequestSpan = (f) => tsplus_module_2.andThen(RequestContextContainer
+    .get, (ctx) => tsplus_module_2.withLogSpan(tsplus_module_2.withSpan(f, "request", { attributes: tsplus_module_3.spanAttributes(ctx) })
 // request context info is picked up directly in the logger for annotations.
 , "request"));
-function setupContextMap(self) {
-    return (tsplus_module_1.zipRight(self)(tsplus_module_1.flatMap(ContextMapContainer, (_) => _.start)));
-}
+const setupContextMap = tsplus_module_4.effectDiscard(tsplus_module_2.andThen(ContextMapContainer, (_) => _.start));
+// const RequestContextLiveFromRequestContext = (requestContext: RequestContext) =>
+//   RequestContext.Tag.makeLayer(requestContext)
+// memoization problem
+// const RequestContextLive = RequestContextContainer.get.toLayer(RequestContext.Tag)
+const RequestContextStartLiveFromRequestContext = (requestContext) => tsplus_module_4.provideMerge(setupContextMap
+// .provideMerge(RequestContextLiveFromRequestContext(requestContext))
+, tsplus_module_4.effectDiscard(tsplus_module_2.andThen(RequestContextContainer, (_) => _.start(requestContext))));
+const RequestContextStartLive = (requestContext) => typeof requestContext === "string"
+    ? tsplus_module_4.unwrapEffect(tsplus_module_2.andThen(makeInternalRequestContext(requestContext), RequestContextStartLiveFromRequestContext)) : RequestContextStartLiveFromRequestContext(requestContext);
 /**
  * @tsplus fluent effect/io/Effect setupRequestContext
  */
-function setupRequestContext_1(self, requestContext) {
-    return tsplus_module_1.zipRight(withRequestSpan(setupContextMap(self)))(tsplus_module_1.flatMap(RequestContextContainer, (_) => _.start(requestContext)));
+export function setupRequestContext(self, requestContext) {
+    return tsplus_module_2.provide(self
+        .pipe(withRequestSpan), RequestContextStartLive(requestContext));
+}
+const UpdateRequestContextLive = (f) => tsplus_module_4.effectDiscard(tsplus_module_2.andThen(RequestContextContainer, (rcc) => rcc.update(f)));
+/**
+ * @tsplus fluent effect/io/Effect updateRequestContext
+ */
+export function updateRequestContext(self, f) {
+    return tsplus_module_2.provide(self
+    // .provideServiceEffect(RequestContext.Tag, RequestContextContainer.get)
+    , UpdateRequestContextLive(f));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvc2V0dXBSZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O2FBNERnQixtQkFBbUI7QUE1RG5DLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUNuRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFDckQsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sd0NBQXdDLENBQUE7QUFDaEYsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMENBQTBDLENBQUE7QUFFOUU7O0dBRUc7QUFDSCxNQUFNLFVBQVUsMkJBQTJCLENBQVUsSUFBcUIsRUFBRSxJQUFZO0lBQ3RGLE9BQU8sd0JBQUEsMEJBQTBCLENBQUMsSUFBSSxDQUFDLEVBQVMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLHNCQUFvQixJQUFJLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQTtBQUN4RixDQUFDO0FBRUQsU0FBUywwQkFBMEIsQ0FBQyxJQUFZO0lBQzlDLE9BQU8scUJBQVksR0FBRyxFQUFFO1FBQ3RCLE1BQU0sRUFBRSxHQUFHLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtRQUMzQixPQUFPLElBQUksY0FBYyxDQUFDO1lBQ3hCLEVBQUU7WUFDRixNQUFNLEVBQUUsRUFBRTtZQUNWLE1BQU0sRUFBRSxJQUFJO1lBQ1osSUFBSSxFQUFFLGdCQUFBLGlCQUFpQixDQUFDLElBQUksQ0FBQztTQUM5QixDQUFDLENBQUE7SUFDSixDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUM7QUFFRCxNQUFNLGVBQWUsR0FBRyxDQUFVLENBQWtCLEVBQUUsRUFBRSxDQUN0RCx3QkFBQSx1QkFBdUI7S0FDcEIsR0FBRyxFQUNLLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FDZiw0QkFBQSx5QkFBQSxDQUFDLEVBQ1csU0FBUyxFQUFFO0lBQ25CLFVBQVUsRUFBRTtRQUNWLFlBQVksRUFBRSxHQUFHLENBQUMsRUFBRTtRQUNwQixjQUFjLEVBQUUsR0FBRyxDQUFDLElBQUk7UUFDeEIsZ0JBQWdCLEVBQUUsR0FBRyxDQUFDLE1BQU07UUFDNUIsbUJBQW1CLEVBQUUsR0FBRyxDQUFDLFNBQVM7UUFDbEMsR0FBRyxHQUFHLENBQUMsV0FBVyxFQUFFLEdBQUc7WUFDckIsQ0FBQyxDQUFDO2dCQUNBLGtCQUFrQixFQUFFLEdBQUc7cUJBQ3BCLFdBQVc7cUJBQ1gsR0FBRztnQkFDTixvQkFBb0IsRUFBRSxPQUFPLElBQUksR0FBRztxQkFDL0IsV0FBVztvQkFDZCxDQUFDLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxLQUFLO29CQUN2QixDQUFDLENBQUMsU0FBUzthQUNkO1lBQ0QsQ0FBQyxDQUFDLEVBQUU7S0FDUDtDQUNGLENBQUM7QUFDRiw0RUFBNEU7RUFDL0QsU0FBUyxDQUFDLENBQzFCLENBQUE7QUFFTCxTQUFTLGVBQWUsQ0FBVSxJQUFxQjtJQUNyRCxPQUFPLDBCQUNILElBQUksRUFEQSx3QkFBQSxtQkFBbUIsRUFBUyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxFQUMxQyxDQUFBO0FBQ1gsQ0FBQztBQUVEOztHQUVHO0FBQ0gsK0JBQTZDLElBQXFCLEVBQUUsY0FBOEI7SUFDaEcsZ0NBQ0ksZUFBZSxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQURuQyx3QkFBQSx1QkFBdUIsRUFBUyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxjQUFjLENBQUMsQ0FBQyxFQUM1QjtBQUM1QyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvc2V0dXBSZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7QUFBQSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0seUJBQXlCLENBQUE7QUFDbkQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHNCQUFzQixDQUFBO0FBQ3JELE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHdDQUF3QyxDQUFBO0FBQ2hGLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDBDQUEwQyxDQUFBO0FBRTlFLFNBQVMsMEJBQTBCLENBQUMsSUFBWTtJQUM5QyxPQUFPLHFCQUFZLEdBQUcsRUFBRTtRQUN0QixNQUFNLEVBQUUsR0FBRyxTQUFTLENBQUMsSUFBSSxFQUFFLENBQUE7UUFDM0IsT0FBTyxJQUFJLGNBQWMsQ0FBQztZQUN4QixFQUFFO1lBQ0YsTUFBTSxFQUFFLEVBQUU7WUFDVixNQUFNLEVBQUUsSUFBSTtZQUNaLElBQUksRUFBRSxnQkFBQSxpQkFBaUIsQ0FBQyxJQUFJLENBQUM7U0FDOUIsQ0FBQyxDQUFBO0lBQ0osQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDO0FBRUQsTUFBTSxlQUFlLEdBQUcsQ0FBVSxDQUFrQixFQUFFLEVBQUUsQ0FDdEQsd0JBQUEsdUJBQXVCO0tBQ3BCLEdBQUcsRUFDSyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQ2YsNEJBQUEseUJBQUEsQ0FBQyxFQUNXLFNBQVMsRUFBRSxFQUFFLFVBQVUsaUNBQUUsR0FBRyxDQUFlLEVBQUUsQ0FBQztBQUN4RCw0RUFBNEU7RUFDL0QsU0FBUyxDQUFDLENBQzFCLENBQUE7QUFFTCxNQUFNLGVBQWUsaUNBQUcsd0JBQUEsbUJBQW1CLEVBQVMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBZSxDQUFBO0FBRWxGLG1GQUFtRjtBQUNuRixpREFBaUQ7QUFDakQsc0JBQXNCO0FBQ3RCLHFGQUFxRjtBQUNyRixNQUFNLHlDQUF5QyxHQUFHLENBQUMsY0FBOEIsRUFBRSxFQUFFLENBQ25GLDZCQUFBLGVBQWU7QUFDYixzRUFBc0U7Z0NBRXBFLHdCQUFBLHVCQUF1QixFQUNaLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLGNBQWMsQ0FBQyxDQUFDLEVBRTNDLENBQUE7QUFFTCxNQUFNLHVCQUF1QixHQUFHLENBQUMsY0FBdUMsRUFBRSxFQUFFLENBQzFFLE9BQU8sY0FBYyxLQUFLLFFBQVE7SUFDaEMsQ0FBQyw4QkFBQyx3QkFBQSwwQkFBMEIsQ0FBQyxjQUFjLENBQUMsRUFDakMseUNBQXlDLENBQUMsRUFFckQsQ0FBQyxDQUFDLHlDQUF5QyxDQUFDLGNBQWMsQ0FBQyxDQUFBO0FBRS9EOztHQUVHO0FBQ0gsTUFBTSxVQUFVLG1CQUFtQixDQUFVLElBQXFCLEVBQUUsY0FBdUM7SUFDekcsT0FBTyx3QkFBQSxJQUFJO1NBQ1IsSUFBSSxDQUFDLGVBQWUsQ0FBQyxFQUNiLHVCQUF1QixDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUE7QUFDckQsQ0FBQztBQUVELE1BQU0sd0JBQXdCLEdBQUcsQ0FBQyxDQUF5QyxFQUFFLEVBQUUsK0JBQzdFLHdCQUFBLHVCQUF1QixFQUFTLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQWUsQ0FBQTtBQUV4RTs7R0FFRztBQUNILE1BQU0sVUFBVSxvQkFBb0IsQ0FBVSxJQUFxQixFQUFFLENBQXlDO0lBQzVHLE9BQU8sd0JBQUEsSUFBSTtJQUNULHlFQUF5RTtNQUNoRSx3QkFBd0IsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO0FBQ3pDLENBQUMifQ==

package/dist/services/QueueMaker/memQueue.d.ts

@@ -16,6 +16,6 @@ export declare function makeMemQueue<Evt extends {
     _tag: string;
 }, EvtE>(queueName: string, queueDrainName: string, schema: S.Schema<EvtE, Evt>, drainSchema: S.Schema<unknown, DrainEvt>): import("effect/Effect").Effect<RequestContextContainer | MemQueue, never, {
     publish: (messages_0: Evt, ...messages_1: Evt[]) => import("effect/Effect").Effect<never, never, import("effect/Fiber").RuntimeFiber<never, void[]>>;
-    makeDrain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<DrainR, DrainE, void>) => import("effect/Effect").Effect<import("effect/Scope").Scope | RequestContextContainer | import("../Store/ContextMapContainer.js").ContextMapContainer | Exclude<Exclude<DrainR, Tracer.ParentSpan>, Tracer.ParentSpan>, never, import("effect/Fiber").RuntimeFiber<never, never>>;
+    makeDrain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<DrainR, DrainE, void>) => import("effect/Effect").Effect<import("effect/Scope").Scope | RequestContextContainer | import("../Store/ContextMapContainer.js").ContextMapContainer | Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, never>, Tracer.ParentSpan>, never, import("effect/Fiber").RuntimeFiber<never, never>>;
 }>;
 //# sourceMappingURL=memQueue.d.ts.map

package/dist/services/QueueMaker/sbqueue.d.ts

@@ -14,7 +14,7 @@ export declare function makeServiceBusQueue<Evt extends {
     id: StringId;
     _tag: string;
 }, EvtE>(_queueName: string, queueDrainName: string, schema: S.Schema<EvtE, Evt>, drainSchema: S.Schema<unknown, DrainEvt>): import("effect/Effect").Effect<RequestContextContainer | import("@azure/service-bus").ServiceBusReceiver | import("@azure/service-bus").ServiceBusSender, never, {
-    makeDrain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<DrainR, DrainE, void>) => import("effect/Effect").Effect<import("effect/Scope").Scope | RequestContextContainer | import("../Store/ContextMapContainer.js").ContextMapContainer | Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, Tracer.ParentSpan>, import("@azure/service-bus").ServiceBusReceiver>, never, void>;
+    makeDrain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<DrainR, DrainE, void>) => import("effect/Effect").Effect<import("effect/Scope").Scope | RequestContextContainer | import("../Store/ContextMapContainer.js").ContextMapContainer | Exclude<Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, never>, Tracer.ParentSpan>, import("@azure/service-bus").ServiceBusReceiver>, never, void>;
     publish: (messages_0: Evt, ...messages_1: Evt[]) => import("effect/Effect").Effect<never, never, import("effect/Fiber").RuntimeFiber<never, void>>;
 }>;
 /**

package/dist/services/RepositoryBase.d.ts

@@ -99,7 +99,7 @@ export declare function makeRepo<PM extends {
             value: A_1;
             readonly S: PM;
         };
-    }) => Where | readonly [Where, ...Where[]], mode?: "and" | "or" | undefined) => Filter<PM>;
+    }) => Where | readonly [Where, ...Where[]], mode?: "or" | "and" | undefined) => Filter<PM>;
     query: (fn: (f: import("./Store/filterApi/query.js").FilterTest<PM>, fields: import("./Store/filterApi/proxy.js").Filter<PM, never>) => QueryBuilder<PM>) => QueryBuilder<PM>;
 };
 /**

package/dist/services/RepositoryBase.d.ts.map

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

package/dist/services/RepositoryBase.js

@@ -67,19 +67,20 @@ export function makeRepo() {
                     function find(id) {
                         return tsplus_module_5.flatMapOption(findE(id), parse);
                     }
-                    const saveAllE = (a) => tsplus_module_5.flatMapOption(tsplus_module_1.sync(() => tsplus_module_3.CollectionToNonEmptyReadonlyArray(a)), (a) => tsplus_module_1.flatMap(cms.get, ({ get, set }) => {
+                    const saveAllE = (a) => tsplus_module_1.asUnit(tsplus_module_5.flatMapOption(tsplus_module_1.sync(() => tsplus_module_3.CollectionToNonEmptyReadonlyArray(a)), (a) => tsplus_module_1.flatMap(cms.get, ({ get, set }) => {
                         const items = a.map((_) => mapToPersistenceModel(_, get));
                         return tsplus_module_1.map(store.batchSet(items), ret => {
                             ret.forEach((_) => set(_.id, _._etag));
                         });
-                    }));
+                    })));
                     const encode = (i) => tsplus_module_2.encodeSync(schema)(i);
                     const saveAll = (a) => saveAllE(tsplus_module_4.map(tsplus_module_3.ext_itToChunk(a), encode));
                     const saveAndPublish = (items, events = []) => {
                         const it = tsplus_module_3.ext_itToChunk(items);
-                        return tsplus_module_1.zipRight(changeFeed.publish([tsplus_module_6.toArray(it), "save"]))(tsplus_module_1.zipRight(tsplus_module_5.flatMapOption(tsplus_module_1.sync(() => tsplus_module_3.CollectionToNonEmptyReadonlyArray(events))
+                        return tsplus_module_1.asUnit(tsplus_module_1.andThen(tsplus_module_5.flatMapOption(tsplus_module_1.andThen(saveAll(it), tsplus_module_1.sync(() => tsplus_module_3.CollectionToNonEmptyReadonlyArray(events)))
                         // TODO: for full consistency the events should be stored within the same database transaction, and then picked up.
-                        , pub))(saveAll(it)));
+                        , pub), changeFeed
+                            .publish([tsplus_module_6.toArray(it), "save"])));
                     };
                     function removeAndPublish(a, events = []) {
                         return tsplus_module_1.gen(function* ($) {
@@ -211,4 +212,4 @@ export const RepositoryDefaultImpl = () => {
         return tsplus_module_12.assignTag()(Cls); // impl is missing, but its marked protected
     };
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"RepositoryBase.js","sourceRoot":"","sources":["../../_src/services/RepositoryBase.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"RepositoryBase.js","sourceRoot":"","sources":["../../_src/services/RepositoryBase.ts"],"names":[],"mappings":"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"}

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

@@ -7,8 +7,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) => Effect<REncode, never, EA>, decode: (d: EA) => Effect<RDecode, EDecode, A>, indexes: IndexingPolicy) => import("effect/Effect").Effect<Cosmos.CosmosClient, import("effect/Cause").UnknownException, {
-    find: (id: string) => import("effect/Effect").Effect<RDecode | Cosmos.CosmosClient | simpledb.RecordCache, import("effect/Cause").UnknownException | simpledb.InvalidStateError, import("effect/Option").Option<A>>;
+    find: (id: string) => import("effect/Effect").Effect<Cosmos.CosmosClient | simpledb.RecordCache | RDecode, import("effect/Cause").UnknownException | simpledb.InvalidStateError, import("effect/Option").Option<A>>;
     findBy: (parameters: Record<string, string>) => import("effect/Effect").Effect<Cosmos.CosmosClient, import("effect/Cause").UnknownException, import("effect/Option").Option<any>>;
-    save: (record: A) => import("effect/Effect").Effect<REncode | Cosmos.CosmosClient | simpledb.RecordCache, OptimisticLockException, A>;
+    save: (record: A) => import("effect/Effect").Effect<Cosmos.CosmosClient | simpledb.RecordCache | REncode, OptimisticLockException, A>;
 }>;
 //# sourceMappingURL=cosmosdb.d.ts.map

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

@@ -4,9 +4,9 @@ import type { DBRecord, Index } from "./shared.js";
 import { CouldNotAquireDbLockException } 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) => Effect<REncode, never, EA>, decode: (d: EA) => Effect<RDecode, EDecode, A>, schemaVersion: string, makeIndexKey: (r: A) => Index, dir?: string) => {
-    find: (id: string) => import("effect/Effect").Effect<RDecode | simpledb.RecordCache, simpledb.InvalidStateError, import("effect/Option").Option<A>>;
+    find: (id: string) => import("effect/Effect").Effect<simpledb.RecordCache | RDecode, simpledb.InvalidStateError, import("effect/Option").Option<A>>;
     findByIndex: (index: Index) => import("effect/Effect").Effect<never, never, import("effect/Option").Option<TKey & {}>>;
-    save: (record: A) => import("effect/Effect").Effect<REncode | simpledb.RecordCache, CouldNotAquireDbLockException | import("./shared.js").OptimisticLockException | simpledb.InvalidStateError, A>;
+    save: (record: A) => import("effect/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/memdb.d.ts

@@ -4,8 +4,8 @@ import { Option } from "@effect-app/core/Option";
 import type { DBRecord } 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) => Effect<REncode, never, EA>, decode: (d: EA) => Effect<RDecode, EDecode, A>) => {
-    find: (id: string) => import("effect/Effect").Effect<RDecode | simpledb.RecordCache, import("@effect/schema/ParseResult").ParseError | simpledb.InvalidStateError, import("effect/Option").Option<A>>;
+    find: (id: string) => import("effect/Effect").Effect<simpledb.RecordCache | RDecode, import("@effect/schema/ParseResult").ParseError | simpledb.InvalidStateError, import("effect/Option").Option<A>>;
     findBy: <V extends Partial<A>>(keys: V, eq: Equivalence<V>) => import("effect/Effect").Effect<RDecode, import("@effect/schema/ParseResult").ParseError, import("effect/Option").Option<A & {}>>;
-    save: (record: A) => import("effect/Effect").Effect<REncode | simpledb.RecordCache, import("@effect/schema/ParseResult").ParseError | import("./shared.js").OptimisticLockException | simpledb.InvalidStateError, A>;
+    save: (record: A) => import("effect/Effect").Effect<simpledb.RecordCache | REncode, import("@effect/schema/ParseResult").ParseError | import("./shared.js").OptimisticLockException | simpledb.InvalidStateError, A>;
 };
 //# sourceMappingURL=memdb.d.ts.map

package/dist/services/simpledb/mongodb.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) => Effect<REncode, never, EA>, decode: (d: EA) => Effect<RDecode, EDecode, A>, indexes: IndexDescription[]) => import("effect/Effect").Effect<MongoClient, import("effect/Cause").UnknownException, {
-    find: (id: string) => import("effect/Effect").Effect<RDecode | MongoClient | simpledb.RecordCache, import("effect/Cause").UnknownException | simpledb.InvalidStateError, import("effect/Option").Option<A>>;
+    find: (id: string) => import("effect/Effect").Effect<simpledb.RecordCache | RDecode | MongoClient, import("effect/Cause").UnknownException | simpledb.InvalidStateError, import("effect/Option").Option<A>>;
     findBy: (keys: Record<string, string>) => import("effect/Effect").Effect<MongoClient, import("effect/Cause").UnknownException, import("effect/Option").Option<TKey>>;
-    save: (record: A) => import("effect/Effect").Effect<REncode | MongoClient | simpledb.RecordCache, OptimisticLockException, A>;
+    save: (record: A) => import("effect/Effect").Effect<simpledb.RecordCache | REncode | MongoClient, OptimisticLockException, A>;
 }>;
 //# sourceMappingURL=mongodb.d.ts.map

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

@@ -6,22 +6,22 @@ import type { DBRecord, Index } from "./shared.js";
 import { CouldNotAquireDbLockException } 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) => Effect<REncode, never, EA>, decode: (d: EA) => Effect<RDecode, EDecode, A>, schemaVersion: string, makeIndexKey: (r: A) => Index) => {
-    find: (id: string) => import("effect/Effect").Effect<RDecode | RedisClient | simpledb.RecordCache, simpledb.InvalidStateError, import("effect/Option").Option<A>>;
+    find: (id: string) => import("effect/Effect").Effect<RedisClient | simpledb.RecordCache | RDecode, simpledb.InvalidStateError, import("effect/Option").Option<A>>;
     findByIndex: (index: Index) => import("effect/Effect").Effect<RedisClient, import("@effect-app/infra-adapters/redis-client").ConnectionException, import("effect/Option").Option<TKey>>;
-    save: (record: A) => import("effect/Effect").Effect<REncode | RedisClient | simpledb.RecordCache, CouldNotAquireDbLockException | import("./shared.js").OptimisticLockException | simpledb.InvalidStateError, A>;
+    save: (record: A) => import("effect/Effect").Effect<RedisClient | simpledb.RecordCache | REncode, CouldNotAquireDbLockException | import("./shared.js").OptimisticLockException | simpledb.InvalidStateError, A>;
 };
 declare const RedisSerializedDBRecord_base: S.Class<{
+    readonly data: string;
     readonly version: string;
     readonly timestamp: string;
-    readonly data: string;
 }, {
+    readonly data: string;
     readonly version: string;
     readonly timestamp: Date;
-    readonly data: string;
 }, {
+    readonly data: string;
     readonly version: string;
     readonly timestamp: Date;
-    readonly data: string;
 }, RedisSerializedDBRecord, {
     version: S.Schema<string, string>;
     timestamp: S.Schema<string, Date>;

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

@@ -38,17 +38,17 @@ export interface DBRecord<TKey extends string> {
     id: TKey;
 }
 declare const SerializedDBRecord_base: S.Class<{
+    readonly data: string;
     readonly version: string;
     readonly timestamp: string;
-    readonly data: string;
 }, {
+    readonly data: string;
     readonly version: string;
     readonly timestamp: Date;
-    readonly data: string;
 }, {
+    readonly data: string;
     readonly version: string;
     readonly timestamp: Date;
-    readonly data: string;
 }, SerializedDBRecord, {
     version: S.Schema<string, string>;
     timestamp: S.Schema<string, Date>;
@@ -57,13 +57,13 @@ declare const SerializedDBRecord_base: S.Class<{
 export declare class SerializedDBRecord extends SerializedDBRecord_base {
 }
 export declare function makeSerialisedDBRecord(s: Schema<any, any>): S.Schema<{
+    readonly data: any;
     readonly version: number;
     readonly timestamp: string;
-    readonly data: any;
 }, {
+    readonly data: any;
     readonly version: number;
     readonly timestamp: Date;
-    readonly data: any;
 }>;
 export interface CachedRecord<T> {
     version: string;

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

@@ -17,7 +17,7 @@ export interface RecordCache extends ReturnType<typeof makeLiveRecordCache> {
 }
 export declare const RecordCache: import("effect/Context").Tag<RecordCache, RecordCache>;
 export declare const LiveRecordCache: import("effect/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/Effect").Effect<R | RDecode | RecordCache, E | InvalidStateError, import("effect/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/Effect").Effect<R | RecordCache, 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/Effect").Effect<R | RecordCache | Exclude<R2, import("effect/Scope").Scope>, E | E2 | OptimisticLockException | InvalidStateError, 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/Effect").Effect<RecordCache | R | RDecode, InvalidStateError | E, import("effect/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/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/Effect").Effect<RecordCache | R | Exclude<R2, import("effect/Scope").Scope>, OptimisticLockException | InvalidStateError | E | E2, A>;
 //# sourceMappingURL=simpledb.d.ts.map

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.133.0-next.32",
+  "version": "0.133.0-next.33",
   "license": "MIT",
   "type": "module",
   "dependencies": {
     "@azure/cosmos": "^4.0.0",
     "@azure/service-bus": "^7.9.3",
-    "@effect/schema": "npm:@effect-app/schema-fork@0.0.0-20231228122817",
+    "@effect/schema": "npm:@effect-app/schema-fork@0.0.0-20231228152439",
     "effect": "^2.0.0-next.62",
     "@faker-js/faker": "^8.3.1",
     "@sendgrid/helpers": "^8.0.0",
@@ -20,9 +20,9 @@
     "pure-rand": "6.0.4",
     "redlock": "^4.2.0",
     "@effect-app/core": "0.97.0-next.4",
-    "@effect-app/infra-adapters": "0.85.0-next.30",
-    "@effect-app/prelude": "0.107.0-next.30",
-    "@effect-app/schema": "0.150.0-next.20"
+    "@effect-app/infra-adapters": "0.85.0-next.31",
+    "@effect-app/schema": "0.150.0-next.20",
+    "@effect-app/prelude": "0.107.0-next.31"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.4",