@effect-app/infra 0.233.2 → 0.233.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @effect-app/infra
 
+## 0.233.4
+
+### Patch Changes
+
+- 4b4e40a: fix: recording updated requestcontext attributes
+
+## 0.233.3
+
+### Patch Changes
+
+- 9a20c41: improve query trace
+
 ## 0.233.2
 
 ### Patch Changes

package/_cjs/logger/logFmtLogger.cjs

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.logfmtLogger = exports.logFmt = void 0;
 var _effectApp = require("effect-app");
+var _RequestContextContainer = require("src/services/RequestContextContainer.js");
 var _shared = require("./shared.cjs");
 const logfmtLogger = exports.logfmtLogger = _effectApp.Logger.make(_ => {
   let {
@@ -13,16 +14,7 @@ const logfmtLogger = exports.logfmtLogger = _effectApp.Logger.make(_ => {
   const c = (0, _shared.getRequestContext)(_.context);
   const requestContext = _effectApp.Option.getOrUndefined(c);
   if (requestContext && requestContext.name !== "_root_") {
-    annotations = _effectApp.HashMap.make(...[...annotations, ...Object.entries({
-      "request.root.id": requestContext.rootId,
-      "request.id": requestContext.id,
-      "request.name": requestContext.name,
-      "request.namespace": requestContext.namespace,
-      "request.locale": requestContext.locale,
-      ...(requestContext.userProfile?.sub ? {
-        "request.user.sub": requestContext.userProfile.sub
-      } : {})
-    })]);
+    annotations = _effectApp.HashMap.make(...[...annotations, ...Object.entries((0, _RequestContextContainer.spanAttributes)(requestContext))]);
   }
   const formatted = _effectApp.Logger.logfmtLogger.log({
     ..._,

package/_cjs/logger/logFmtLogger.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"logFmtLogger.cjs","names":["_effectApp","require","_shared","logfmtLogger","exports","Logger","make","_","annotations","c","getRequestContext","context","requestContext","Option","getOrUndefined","name","HashMap","Object","entries","rootId","id","namespace","locale","userProfile","sub","formatted","log","globalThis","console","logFmt","replace","defaultLogger"],"sources":["../../src/logger/logFmtLogger.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AAEO,MAAME,YAAY,GAAAC,OAAA,CAAAD,YAAA,GAAGE,iBAAM,CAACC,IAAI,CACpCC,CAAC,IAAI;EACJ,IAAI;IAAEC;EAAW,CAAE,GAAGD,CAAC;EACvB,MAAME,CAAC,GAAG,IAAAC,yBAAiB,EAACH,CAAC,CAACI,OAAO,CAAC;EACtC,MAAMC,cAAc,GAAGC,iBAAM,CAACC,cAAc,CAACL,CAAC,CAAC;EAC/C,IAAIG,cAAc,IAAIA,cAAc,CAACG,IAAI,KAAK,QAAQ,EAAE;IACtDP,WAAW,GAAGQ,kBAAO,CAACV,IAAI,CAAC,GAAG,CAC5B,GAAGE,WAAW,EACd,GAAGS,MAAM,CAACC,OAAO,CAAC;MAChB,iBAAiB,EAAEN,cAAc,CAACO,MAAM;MACxC,YAAY,EAAEP,cAAc,CAACQ,EAAE;MAC/B,cAAc,EAAER,cAAc,CAACG,IAAI;MACnC,mBAAmB,EAAEH,cAAc,CAACS,SAAS;MAC7C,gBAAgB,EAAET,cAAc,CAACU,MAAM;MACvC,IAAIV,cAAc,CAACW,WAAW,EAAEC,GAAG,GAAG;QAAE,kBAAkB,EAAEZ,cAAc,CAACW,WAAW,CAACC;MAAG,CAAE,GAAG,EAAE;KAClG,CAAC,CACH,CAAC;EACJ;EACA,MAAMC,SAAS,GAAGpB,iBAAM,CAACF,YAAY,CAACuB,GAAG,CAAC;IAAE,GAAGnB,CAAC;IAAEC;EAAW,CAAE,CAAC;EAChEmB,UAAU,CAACC,OAAO,CAACF,GAAG,CAACD,SAAS,CAAC;AACnC,CAAC,CACF;AAEM,MAAMI,MAAM,GAAAzB,OAAA,CAAAyB,MAAA,GAAGxB,iBAAM,CAACyB,OAAO,CAACzB,iBAAM,CAAC0B,aAAa,EAAE5B,YAAY,CAAC","ignoreList":[]}
+{"version":3,"file":"logFmtLogger.cjs","names":["_effectApp","require","_RequestContextContainer","_shared","logfmtLogger","exports","Logger","make","_","annotations","c","getRequestContext","context","requestContext","Option","getOrUndefined","name","HashMap","Object","entries","spanAttributes","formatted","log","globalThis","console","logFmt","replace","defaultLogger"],"sources":["../../src/logger/logFmtLogger.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,wBAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AAEO,MAAMG,YAAY,GAAAC,OAAA,CAAAD,YAAA,GAAGE,iBAAM,CAACC,IAAI,CACpCC,CAAC,IAAI;EACJ,IAAI;IAAEC;EAAW,CAAE,GAAGD,CAAC;EACvB,MAAME,CAAC,GAAG,IAAAC,yBAAiB,EAACH,CAAC,CAACI,OAAO,CAAC;EACtC,MAAMC,cAAc,GAAGC,iBAAM,CAACC,cAAc,CAACL,CAAC,CAAC;EAC/C,IAAIG,cAAc,IAAIA,cAAc,CAACG,IAAI,KAAK,QAAQ,EAAE;IACtDP,WAAW,GAAGQ,kBAAO,CAACV,IAAI,CAAC,GAAG,CAC5B,GAAGE,WAAW,EACd,GAAGS,MAAM,CAACC,OAAO,CAAC,IAAAC,uCAAc,EAACP,cAAc,CAAC,CAAC,CAClD,CAAC;EACJ;EACA,MAAMQ,SAAS,GAAGf,iBAAM,CAACF,YAAY,CAACkB,GAAG,CAAC;IAAE,GAAGd,CAAC;IAAEC;EAAW,CAAE,CAAC;EAChEc,UAAU,CAACC,OAAO,CAACF,GAAG,CAACD,SAAS,CAAC;AACnC,CAAC,CACF;AAEM,MAAMI,MAAM,GAAApB,OAAA,CAAAoB,MAAA,GAAGnB,iBAAM,CAACoB,OAAO,CAACpB,iBAAM,CAACqB,aAAa,EAAEvB,YAAY,CAAC","ignoreList":[]}

package/_cjs/services/RepositoryBase.cjs

@@ -204,7 +204,8 @@ function makeRepo() {
               "repository.model_name": name,
               query: {
                 ...a,
-                schema: a.schema ? "__SCHEMA__" : a.schema
+                schema: a.schema ? "__SCHEMA__" : a.schema,
+                filter: a.filter.build()
               }
             }
           }));
@@ -227,9 +228,20 @@ function makeRepo() {
             return {
               all: allE.pipe(_effectApp.Effect.flatMap(decMany), _effectApp.Effect.map(_ => _)),
               find: id => (0, _Effect.flatMapOption)(findE(id), dec),
-              query: b => filter({
-                filter: b
-              }).pipe(_effectApp.Effect.flatMap(decMany), _effectApp.Effect.map(_ => _)),
+              // query: (q: any) => {
+              //   const a = Q.toFilter(q)
+              //   return filter(a)
+              //     .pipe(
+              //       Effect.flatMap(decMany),
+              //       Effect.map((_) => _ as any[]),
+              //       Effect.withSpan("Repository.mapped.query [effect-app/infra]", {
+              //         attributes: {
+              //           "repository.model_name": name,
+              //           query: { ...a, schema: a.schema ? "__SCHEMA__" : a.schema, filter: a.filter.build() }
+              //         }
+              //       })
+              //     )
+              // },
               save: (...xes) => _effectApp.Effect.flatMap(encMany(xes), _ => saveAllE(_)).pipe(_effectApp.Effect.withSpan("mapped.save"))
             };
           }

package/_cjs/services/RepositoryBase.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"RepositoryBase.cjs","names":["_Repository","require","_Store","_Array","_Effect","_schema","_effectApp","_Pure","_errors","_query","_interopRequireWildcard","Q","_ContextMapContainer","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","RepositoryBaseC","exports","RepositoryBaseC1","itemType","constructor","RepositoryBaseC2","impl","saveAndPublish","removeAndPublish","find","all","changeFeed","mapped","query","RepositoryBaseC3","id","Effect","andThen","_","mapError","NotFoundError","type","log","evt","AnyPureDSL","removeById","save","items","saveWithEvents","events","queryAndSavePure","q","pure","batch","pipe","Array","isArray","undefined","saveManyWithPure_","saveManyWithPureBatched_","saveWithPure_","handleByIdAndSaveWithPure","req","ctx","byIdAndSaveWithPure","saveManyWithPure","forEach","ReadonlyArray","chunk_","saveAllWithEffectInt","runTerm","flatMap","item","saveWithPure","map","makeRepo","name","schema","mapFrom","mapTo","mapToPersistenceModel","getEtag","mapReverse","_etag","setEtag","mkStore","makeStore","make","args","gen","$","rctx","context","encodeMany","flow","S","encode","array","provide","withSpan","decode","decodeMany","store","makeInitial","config","ContextMapContainer","cms","etag","pubCfg","pub","publishEvents","unit","PubSub","unbounded","allE","cm","orDie","fieldsSchema","struct","ast","_tag","union","types","from","pick","encodeId","findEId","Option","findE","flatMapOption","saveAllE","sync","toNonEmptyArray","ret","batchSet","asUnit","saveAll","suspend","it","Chunk","fromIterable","publish","toArray","remove","parseMany","parseMany2","filter","tap","select","toFilter","eff","mode","getSomes","Unify","unify","ttype","head","NonNegativeInt","length","catchTag","die","attributes","makeQuery","dec","encMany","decMany","b","xes","withLogSpan","pluralize","s","endsWith","substring","encodeToEncoded","StoreMaker","partitionValue","makeRepoFunctions","tag","serviceConstants","serviceFunctions","use","body","RepositoryBaseImpl","jitM","mkRepo","pm","Cls","makeWith","limit","Error","stackTraceLimit","creationError","Context","assignTag","assign","RepositoryDefaultImpl","makeRequest","repo","_request","Request","tagged","requestResolver","RequestResolver","makeBatched","requests","where","complete","findFirst","match","onNone","Exit","fail","onSome","succeed","discard","catchAllCause","cause","failCause","batchN","contextFromServices","request"],"sources":["../../src/services/RepositoryBase.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"RepositoryBase.cjs","names":["_Repository","require","_Store","_Array","_Effect","_schema","_effectApp","_Pure","_errors","_query","_interopRequireWildcard","Q","_ContextMapContainer","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","RepositoryBaseC","exports","RepositoryBaseC1","itemType","constructor","RepositoryBaseC2","impl","saveAndPublish","removeAndPublish","find","all","changeFeed","mapped","query","RepositoryBaseC3","id","Effect","andThen","_","mapError","NotFoundError","type","log","evt","AnyPureDSL","removeById","save","items","saveWithEvents","events","queryAndSavePure","q","pure","batch","pipe","Array","isArray","undefined","saveManyWithPure_","saveManyWithPureBatched_","saveWithPure_","handleByIdAndSaveWithPure","req","ctx","byIdAndSaveWithPure","saveManyWithPure","forEach","ReadonlyArray","chunk_","saveAllWithEffectInt","runTerm","flatMap","item","saveWithPure","map","makeRepo","name","schema","mapFrom","mapTo","mapToPersistenceModel","getEtag","mapReverse","_etag","setEtag","mkStore","makeStore","make","args","gen","$","rctx","context","encodeMany","flow","S","encode","array","provide","withSpan","decode","decodeMany","store","makeInitial","config","ContextMapContainer","cms","etag","pubCfg","pub","publishEvents","unit","PubSub","unbounded","allE","cm","orDie","fieldsSchema","struct","ast","_tag","union","types","from","pick","encodeId","findEId","Option","findE","flatMapOption","saveAllE","sync","toNonEmptyArray","ret","batchSet","asUnit","saveAll","suspend","it","Chunk","fromIterable","publish","toArray","remove","parseMany","parseMany2","filter","tap","select","toFilter","eff","mode","getSomes","Unify","unify","ttype","head","NonNegativeInt","length","catchTag","die","attributes","build","makeQuery","dec","encMany","decMany","xes","withLogSpan","pluralize","s","endsWith","substring","encodeToEncoded","StoreMaker","partitionValue","makeRepoFunctions","tag","serviceConstants","serviceFunctions","use","body","RepositoryBaseImpl","jitM","mkRepo","pm","Cls","makeWith","b","limit","Error","stackTraceLimit","creationError","Context","assignTag","assign","RepositoryDefaultImpl","makeRequest","repo","_request","Request","tagged","requestResolver","RequestResolver","makeBatched","requests","where","complete","findFirst","match","onNone","Exit","fail","onSome","succeed","discard","catchAllCause","cause","failCause","batchN","contextFromServices","request"],"sources":["../../src/services/RepositoryBase.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/_cjs/services/RequestContextContainer.cjs

@@ -26,7 +26,7 @@ class RequestContextContainer extends _effectApp.Context.TagId("effect-app/Reque
     locale: "en"
   })), _effectApp.FiberRef.make).pipe(_effectApp.Effect.map(ref => RequestContextContainer.of({
     requestContext: _effectApp.FiberRef.get(ref),
-    update: f => _effectApp.Effect.tap(_effectApp.FiberRef.getAndUpdate(ref, f), rc => _effectApp.Effect.annotateCurrentSpan(spanAttributes(rc))),
+    update: f => _effectApp.Effect.tap(_effectApp.FiberRef.updateAndGet(ref, f), rc => _effectApp.Effect.annotateCurrentSpan(spanAttributes(rc))),
     start: a => _effectApp.Effect.zipRight(_effectApp.FiberRef.set(ref, a), (0, _Memory.restoreFromRequestContext)(a))
   })), _effectApp.Layer.scoped(this));
 }
@@ -38,6 +38,7 @@ const RCTag = exports.RCTag = _effectApp.Context.GenericTag("@services/RCTag");
  */
 const spanAttributes = ctx => ({
   "request.id": ctx.id,
+  "request.root.id": ctx.rootId,
   "request.name": ctx.name,
   "request.locale": ctx.locale,
   "request.namespace": ctx.namespace,

package/_cjs/services/RequestContextContainer.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"RequestContextContainer.cjs","names":["_schema","require","_effectApp","_ids","_RequestContext","_Memory","RequestContextContainer","Context","TagId","get","Effect","flatMap","_","requestContext","getOption","contextWith","Option","isSome","map","value","some","sync","none","live","andThen","RequestContext","name","NonEmptyString255","rootId","RequestId","locale","FiberRef","make","pipe","ref","of","update","f","tap","getAndUpdate","rc","annotateCurrentSpan","spanAttributes","start","a","zipRight","set","restoreFromRequestContext","Layer","scoped","exports","RCTag","GenericTag","ctx","id","namespace","userProfile","sub","roles","undefined"],"sources":["../../src/services/RequestContextContainer.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,IAAA,GAAAF,OAAA;AACA,IAAAG,eAAA,GAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AAEA;;;;AAIM,MAAgBK,uBACpB,SAAQC,kBAAO,CAACC,KAAK,CAAC,oCAAoC,CAAC,EAIvD;EAEJ,WAAWC,GAAGA,CAAA;IACZ,OAAOC,iBAAM,CAACC,OAAO,CAACL,uBAAuB,EAAGM,CAAC,IAAKA,CAAC,CAACC,cAAc,CAAC;EACzE;EACA,WAAWC,SAASA,CAAA;IAClB,OAAOJ,iBAAM,CAACC,OAAO,CACnBD,iBAAM,CACHK,WAAW,CAAEH,CAAiB,IAAKL,kBAAO,CAACO,SAAS,CAACF,CAAC,EAAEN,uBAAuB,CAAC,CAAC,EACnFO,cAAc,IACbG,iBAAM,CAACC,MAAM,CAACJ,cAAc,CAAC,GACzBH,iBAAM,CAACQ,GAAG,CAACL,cAAc,CAACM,KAAK,CAACN,cAAc,EAAEG,iBAAM,CAACI,IAAI,CAAC,GAC5DV,iBAAM,CAACW,IAAI,CAAC,MAAML,iBAAM,CAACM,IAAI,EAAE,CAAC,CACvC;EACH;EACA,OAAgBC,IAAI,GAAGb,iBAAM,CAC1Bc,OAAO,CACNd,iBAAM,CACHW,IAAI,CAAC,MACJ,IAAII,8BAAc,CAAC;IAAEC,IAAI,EAAE,IAAAC,yBAAiB,EAAC,QAAQ,CAAC;IAAEC,MAAM,EAAE,IAAAC,cAAS,EAAC,QAAQ,CAAC;IAAEC,MAAM,EAAE;EAAI,CAAE,CAAC,CACrG,EACHC,mBAAQ,CAACC,IAAoB,CAC9B,CACAC,IAAI,CACHvB,iBAAM,CAACQ,GAAG,CAAEgB,GAAG,IACb5B,uBAAuB,CAAC6B,EAAE,CAAC;IACzBtB,cAAc,EAAEkB,mBAAQ,CAACtB,GAAG,CAACyB,GAAG,CAAC;IACjCE,MAAM,EAAGC,CAAwC,IAC/C3B,iBAAM,CAAC4B,GAAG,CAACP,mBAAQ,CAACQ,YAAY,CAACL,GAAG,EAAEG,CAAC,CAAC,EAAGG,EAAE,IAAK9B,iBAAM,CAAC+B,mBAAmB,CAACC,cAAc,CAACF,EAAE,CAAC,CAAC,CAAC;IACnGG,KAAK,EAAGC,CAAiB,IAAKlC,iBAAM,CAACmC,QAAQ,CAACd,mBAAQ,CAACe,GAAG,CAACZ,GAAG,EAAEU,CAAC,CAAC,EAAE,IAAAG,iCAAyB,EAACH,CAAC,CAAC;GACjG,CAAC,CACH,EACDI,gBAAK,CAACC,MAAM,CAAC,IAAI,CAAC,CACnB;;AAGL;AAAAC,OAAA,CAAA5C,uBAAA,GAAAA,uBAAA;AACO,MAAM6C,KAAK,GAAAD,OAAA,CAAAC,KAAA,GAAG5C,kBAAO,CAAC6C,UAAU,CAAiB,iBAAiB,CAAC;AAE1E;;;AAGO,MAAMV,cAAc,GAAIW,GAAmB,KAAM;EACtD,YAAY,EAAEA,GAAG,CAACC,EAAE;EACpB,cAAc,EAAED,GAAG,CAAC3B,IAAI;EACxB,gBAAgB,EAAE2B,GAAG,CAACvB,MAAM;EAC5B,mBAAmB,EAAEuB,GAAG,CAACE,SAAS;EAClC,IAAIF,GAAG,CAACG,WAAW,EAAEC,GAAG,GACpB;IACA,kBAAkB,EAAEJ,GAAG,CACpBG,WAAW,CACXC,GAAG;IACN,oBAAoB,EAAE,OAAO,IAAIJ,GAAG,CAC/BG,WAAW,GACZH,GAAG,CAACG,WAAW,CAACE,KAAK,GACrBC;GACL,GACC,EAAE;CACP,CAAC;AAAAT,OAAA,CAAAR,cAAA,GAAAA,cAAA","ignoreList":[]}
+{"version":3,"file":"RequestContextContainer.cjs","names":["_schema","require","_effectApp","_ids","_RequestContext","_Memory","RequestContextContainer","Context","TagId","get","Effect","flatMap","_","requestContext","getOption","contextWith","Option","isSome","map","value","some","sync","none","live","andThen","RequestContext","name","NonEmptyString255","rootId","RequestId","locale","FiberRef","make","pipe","ref","of","update","f","tap","updateAndGet","rc","annotateCurrentSpan","spanAttributes","start","a","zipRight","set","restoreFromRequestContext","Layer","scoped","exports","RCTag","GenericTag","ctx","id","namespace","userProfile","sub","roles","undefined"],"sources":["../../src/services/RequestContextContainer.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,IAAA,GAAAF,OAAA;AACA,IAAAG,eAAA,GAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AAEA;;;;AAIM,MAAgBK,uBACpB,SAAQC,kBAAO,CAACC,KAAK,CAAC,oCAAoC,CAAC,EAIvD;EAEJ,WAAWC,GAAGA,CAAA;IACZ,OAAOC,iBAAM,CAACC,OAAO,CAACL,uBAAuB,EAAGM,CAAC,IAAKA,CAAC,CAACC,cAAc,CAAC;EACzE;EACA,WAAWC,SAASA,CAAA;IAClB,OAAOJ,iBAAM,CAACC,OAAO,CACnBD,iBAAM,CACHK,WAAW,CAAEH,CAAiB,IAAKL,kBAAO,CAACO,SAAS,CAACF,CAAC,EAAEN,uBAAuB,CAAC,CAAC,EACnFO,cAAc,IACbG,iBAAM,CAACC,MAAM,CAACJ,cAAc,CAAC,GACzBH,iBAAM,CAACQ,GAAG,CAACL,cAAc,CAACM,KAAK,CAACN,cAAc,EAAEG,iBAAM,CAACI,IAAI,CAAC,GAC5DV,iBAAM,CAACW,IAAI,CAAC,MAAML,iBAAM,CAACM,IAAI,EAAE,CAAC,CACvC;EACH;EACA,OAAgBC,IAAI,GAAGb,iBAAM,CAC1Bc,OAAO,CACNd,iBAAM,CACHW,IAAI,CAAC,MACJ,IAAII,8BAAc,CAAC;IAAEC,IAAI,EAAE,IAAAC,yBAAiB,EAAC,QAAQ,CAAC;IAAEC,MAAM,EAAE,IAAAC,cAAS,EAAC,QAAQ,CAAC;IAAEC,MAAM,EAAE;EAAI,CAAE,CAAC,CACrG,EACHC,mBAAQ,CAACC,IAAoB,CAC9B,CACAC,IAAI,CACHvB,iBAAM,CAACQ,GAAG,CAAEgB,GAAG,IACb5B,uBAAuB,CAAC6B,EAAE,CAAC;IACzBtB,cAAc,EAAEkB,mBAAQ,CAACtB,GAAG,CAACyB,GAAG,CAAC;IACjCE,MAAM,EAAGC,CAAwC,IAC/C3B,iBAAM,CAAC4B,GAAG,CAACP,mBAAQ,CAACQ,YAAY,CAACL,GAAG,EAAEG,CAAC,CAAC,EAAGG,EAAE,IAAK9B,iBAAM,CAAC+B,mBAAmB,CAACC,cAAc,CAACF,EAAE,CAAC,CAAC,CAAC;IACnGG,KAAK,EAAGC,CAAiB,IAAKlC,iBAAM,CAACmC,QAAQ,CAACd,mBAAQ,CAACe,GAAG,CAACZ,GAAG,EAAEU,CAAC,CAAC,EAAE,IAAAG,iCAAyB,EAACH,CAAC,CAAC;GACjG,CAAC,CACH,EACDI,gBAAK,CAACC,MAAM,CAAC,IAAI,CAAC,CACnB;;AAGL;AAAAC,OAAA,CAAA5C,uBAAA,GAAAA,uBAAA;AACO,MAAM6C,KAAK,GAAAD,OAAA,CAAAC,KAAA,GAAG5C,kBAAO,CAAC6C,UAAU,CAAiB,iBAAiB,CAAC;AAE1E;;;AAGO,MAAMV,cAAc,GAAIW,GAAmB,KAAM;EACtD,YAAY,EAAEA,GAAG,CAACC,EAAE;EACpB,iBAAiB,EAAED,GAAG,CAACzB,MAAM;EAC7B,cAAc,EAAEyB,GAAG,CAAC3B,IAAI;EACxB,gBAAgB,EAAE2B,GAAG,CAACvB,MAAM;EAC5B,mBAAmB,EAAEuB,GAAG,CAACE,SAAS;EAClC,IAAIF,GAAG,CAACG,WAAW,EAAEC,GAAG,GACpB;IACA,kBAAkB,EAAEJ,GAAG,CACpBG,WAAW,CACXC,GAAG;IACN,oBAAoB,EAAE,OAAO,IAAIJ,GAAG,CAC/BG,WAAW,GACZH,GAAG,CAACG,WAAW,CAACE,KAAK,GACrBC;GACL,GACC,EAAE;CACP,CAAC;AAAAT,OAAA,CAAAR,cAAA,GAAAA,cAAA","ignoreList":[]}

package/dist/logger/logFmtLogger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logFmtLogger.d.ts","sourceRoot":"","sources":["../../src/logger/logFmtLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,MAAM,EAAU,MAAM,YAAY,CAAA;AAGpD,eAAO,MAAM,YAAY,8BAqBxB,CAAA;AAED,eAAO,MAAM,MAAM,mDAAqD,CAAA"}
+{"version":3,"file":"logFmtLogger.d.ts","sourceRoot":"","sources":["../../src/logger/logFmtLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,MAAM,EAAU,MAAM,YAAY,CAAA;AAIpD,eAAO,MAAM,YAAY,8BAcxB,CAAA;AAED,eAAO,MAAM,MAAM,mDAAqD,CAAA"}

package/dist/logger/logFmtLogger.js

@@ -1,4 +1,5 @@
 import { HashMap, Logger, Option } from "effect-app";
+import { spanAttributes } from "src/services/RequestContextContainer.js";
 import { getRequestContext } from "./shared.js";
 export const logfmtLogger = Logger.make((_) => {
     let { annotations } = _;
@@ -7,18 +8,11 @@ export const logfmtLogger = Logger.make((_) => {
     if (requestContext && requestContext.name !== "_root_") {
         annotations = HashMap.make(...[
             ...annotations,
-            ...Object.entries({
-                "request.root.id": requestContext.rootId,
-                "request.id": requestContext.id,
-                "request.name": requestContext.name,
-                "request.namespace": requestContext.namespace,
-                "request.locale": requestContext.locale,
-                ...(requestContext.userProfile?.sub ? { "request.user.sub": requestContext.userProfile.sub } : {})
-            })
+            ...Object.entries(spanAttributes(requestContext))
         ]);
     }
     const formatted = Logger.logfmtLogger.log({ ..._, annotations });
     globalThis.console.log(formatted);
 });
 export const logFmt = Logger.replace(Logger.defaultLogger, logfmtLogger);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nRm10TG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZ2dlci9sb2dGbXRMb2dnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQ3BELE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUUvQyxNQUFNLENBQUMsTUFBTSxZQUFZLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FDckMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtJQUNKLElBQUksRUFBRSxXQUFXLEVBQUUsR0FBRyxDQUFDLENBQUE7SUFDdkIsTUFBTSxDQUFDLEdBQUcsaUJBQWlCLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQ3RDLE1BQU0sY0FBYyxHQUFHLE1BQU0sQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDL0MsSUFBSSxjQUFjLElBQUksY0FBYyxDQUFDLElBQUksS0FBSyxRQUFRLEVBQUUsQ0FBQztRQUN2RCxXQUFXLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHO1lBQzVCLEdBQUcsV0FBVztZQUNkLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQztnQkFDaEIsaUJBQWlCLEVBQUUsY0FBYyxDQUFDLE1BQU07Z0JBQ3hDLFlBQVksRUFBRSxjQUFjLENBQUMsRUFBRTtnQkFDL0IsY0FBYyxFQUFFLGNBQWMsQ0FBQyxJQUFJO2dCQUNuQyxtQkFBbUIsRUFBRSxjQUFjLENBQUMsU0FBUztnQkFDN0MsZ0JBQWdCLEVBQUUsY0FBYyxDQUFDLE1BQU07Z0JBQ3ZDLEdBQUcsQ0FBQyxjQUFjLENBQUMsV0FBVyxFQUFFLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxrQkFBa0IsRUFBRSxjQUFjLENBQUMsV0FBVyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7YUFDbkcsQ0FBQztTQUNILENBQUMsQ0FBQTtJQUNKLENBQUM7SUFDRCxNQUFNLFNBQVMsR0FBRyxNQUFNLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxFQUFFLFdBQVcsRUFBRSxDQUFDLENBQUE7SUFDaEUsVUFBVSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUE7QUFDbkMsQ0FBQyxDQUNGLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsYUFBYSxFQUFFLFlBQVksQ0FBQyxDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nRm10TG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZ2dlci9sb2dGbXRMb2dnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQ3BELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQTtBQUN4RSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFFL0MsTUFBTSxDQUFDLE1BQU0sWUFBWSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQ3JDLENBQUMsQ0FBQyxFQUFFLEVBQUU7SUFDSixJQUFJLEVBQUUsV0FBVyxFQUFFLEdBQUcsQ0FBQyxDQUFBO0lBQ3ZCLE1BQU0sQ0FBQyxHQUFHLGlCQUFpQixDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUN0QyxNQUFNLGNBQWMsR0FBRyxNQUFNLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQy9DLElBQUksY0FBYyxJQUFJLGNBQWMsQ0FBQyxJQUFJLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDdkQsV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRztZQUM1QixHQUFHLFdBQVc7WUFDZCxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUMsY0FBYyxDQUFDLGNBQWMsQ0FBQyxDQUFDO1NBQ2xELENBQUMsQ0FBQTtJQUNKLENBQUM7SUFDRCxNQUFNLFNBQVMsR0FBRyxNQUFNLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxFQUFFLFdBQVcsRUFBRSxDQUFDLENBQUE7SUFDaEUsVUFBVSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUE7QUFDbkMsQ0FBQyxDQUNGLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsYUFBYSxFQUFFLFlBQVksQ0FBQyxDQUFBIn0=

package/dist/services/Operations.d.ts

@@ -46,7 +46,7 @@ declare const Operations_base: (abstract new (service: {
         all: Effect.Effect<Operation[], never, never>;
         find: (id: StringId) => Effect.Effect<Option.Option<Operation>, never, never>;
         update: (id: StringId, progress: OperationProgress) => Effect.Effect<void, never, never>;
-    }) => X) => X extends Effect<infer A_3, infer E_5, infer R_5> ? Effect<A_3, E_5, R_5 | Operations> : Effect<X, never, Operations>;
+    }) => X) => X extends Effect<infer A_3, infer E_5, infer R_5> ? Effect<A_3, E_5, Operations | R_5> : Effect<X, never, Operations>;
 };
 export declare class Operations extends Operations_base {
     private static readonly CleanupLive;

package/dist/services/RepositoryBase.d.ts

@@ -11,32 +11,27 @@ import type { FieldValues } from "../filter/types.js";
 import type { QAll, Query, QueryEnd, QueryProjection, QueryWhere } from "./query.js";
 import * as Q from "./query.js";
 import { ContextMapContainer } from "./Store/ContextMapContainer.js";
-import type * as QB from "./Store/filterApi/query.js";
 export interface Mapped1<A, Encoded extends {
     id: string;
 }, R> {
     all: Effect<A[], ParseResult.ParseError, R>;
     save: (...xes: readonly A[]) => Effect<void, OptimisticConcurrencyException | ParseResult.ParseError, R>;
-    query: (b: (fn: QB.FilterTest<Encoded>, fields: QB.Filter<Encoded, never>) => QB.QueryBuilder<Encoded>) => Effect<A[], ParseResult.ParseError, R>;
     find: (id: Encoded["id"]) => Effect<Option<A>, ParseResult.ParseError, R>;
 }
-export interface Mapped2<A, Encoded extends {
-    id: string;
-}, R> {
+export interface Mapped2<A, R> {
     all: Effect<A[], ParseResult.ParseError, R>;
-    query: (b: (fn: QB.FilterTest<Encoded>, fields: QB.Filter<Encoded, never>) => QB.QueryBuilder<Encoded>) => Effect<A[], ParseResult.ParseError, R>;
 }
 export interface Mapped<Encoded extends {
     id: string;
 }> {
     <A, R>(schema: S.Schema<A, Encoded, R>): Mapped1<A, Encoded, R>;
-    <A, Encoded2, R>(schema: S.Schema<A, Encoded2, R>): Mapped2<A, Encoded, R>;
+    <A, Encoded2, R>(schema: S.Schema<A, Encoded2, R>): Mapped2<A, R>;
 }
 export interface MM<Repo, Encoded extends {
     id: string;
 }> {
     <A, R>(schema: S.Schema<A, Encoded, R>): Effect<Mapped1<A, Encoded, R>, never, Repo>;
-    <A, Encoded2, R>(schema: S.Schema<A, Encoded2, R>): Effect<Mapped2<A, Encoded, R>, never, Repo>;
+    <A, Encoded2, R>(schema: S.Schema<A, Encoded2, R>): Effect<Mapped2<A, R>, never, Repo>;
 }
 /**
  * @tsplus type Repository

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

@@ -1 +1 @@
-{"version":3,"file":"RepositoryBase.d.ts","sourceRoot":"","sources":["../../src/services/RepositoryBase.ts"],"names":[],"mappings":"AAMA,OAAO,EAIL,KAAK,UAAU,EAKhB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AACvC,OAAO,KAAK,EAAc,oBAAoB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAK/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,KAAK,EAAiB,qBAAqB,EAAE,MAAM,YAAY,CAAA;AACtE,OAAO,EAEL,OAAO,EACP,MAAM,EAGN,MAAM,EAEN,MAAM,EAIN,CAAC,EAEF,MAAM,YAAY,CAAA;AAEnB,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAEtD,OAAO,EAAE,KAAK,iBAAiB,EAAE,aAAa,EAAE,KAAK,8BAA8B,EAAE,MAAM,cAAc,CAAA;AACzG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAErD,OAAO,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AACpF,OAAO,KAAK,CAAC,MAAM,YAAY,CAAA;AAC/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAA;AACpE,OAAO,KAAK,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAErD,MAAM,WAAW,OAAO,CAAC,CAAC,EAAE,OAAO,SAAS;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC;IAC3D,GAAG,EAAE,MAAM,CAAC,CAAC,EAAE,EAAE,WAAW,CAAC,UAAU,EAAE,CAAC,CAAC,CAAA;IAC3C,IAAI,EAAE,CAAC,GAAG,GAAG,EAAE,SAAS,CAAC,EAAE,KAAK,MAAM,CAAC,IAAI,EAAE,8BAA8B,GAAG,WAAW,CAAC,UAAU,EAAE,CAAC,CAAC,CAAA;IACxG,KAAK,EAAE,CACL,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,KAC3F,MAAM,CAAC,CAAC,EAAE,EAAE,WAAW,CAAC,UAAU,EAAE,CAAC,CAAC,CAAA;IAC3C,IAAI,EAAE,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,UAAU,EAAE,CAAC,CAAC,CAAA;CAC1E;AAGD,MAAM,WAAW,OAAO,CAAC,CAAC,EAAE,OAAO,SAAS;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC;IAC3D,GAAG,EAAE,MAAM,CAAC,CAAC,EAAE,EAAE,WAAW,CAAC,UAAU,EAAE,CAAC,CAAC,CAAA;IAC3C,KAAK,EAAE,CACL,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,KAC3F,MAAM,CAAC,CAAC,EAAE,EAAE,WAAW,CAAC,UAAU,EAAE,CAAC,CAAC,CAAA;CAC5C;AAED,MAAM,WAAW,MAAM,CAAC,OAAO,SAAS;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE;IACpD,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;IAE/D,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;CAC3E;AAED,MAAM,WAAW,EAAE,CAAC,IAAI,EAAE,OAAO,SAAS;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE;IACtD,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAEpF,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;CAChG;AAED;;GAEG;AACH,8BAAsB,eAAe,CACnC,CAAC,SAAS;IAAE,EAAE,EAAE,OAAO,CAAA;CAAE,EACzB,OAAO,SAAS;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAC9B,GAAG,EACH,QAAQ,SAAS,MAAM;IAEvB,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAA;IACpC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;IAC1D,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,CAAA;IAClC,QAAQ,CAAC,QAAQ,CAAC,cAAc,EAAE,CAChC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,EAClB,MAAM,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,KACnB,MAAM,CAAC,IAAI,EAAE,iBAAiB,GAAG,8BAA8B,CAAC,CAAA;IACrE,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAA;IACrE,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAClC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,EAClB,MAAM,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,KACnB,MAAM,CAAC,IAAI,CAAC,CAAA;IAEjB,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE;QACvB,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,SAAS,WAAW,EAAE,KAAK,SAAS,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,EAClF,CAAC,EAAE,CACD,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,KACpB,eAAe,CAAC,OAAO,SAAS,QAAQ,GAAG,QAAQ,GAAG,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,GAC7E,MAAM,CAAC,MAAM,CACd,KAAK,SAAS,MAAM,GAAG,SAAS,CAAC,EAAE,GAAG,KAAK,SAAS,OAAO,GAAG,cAAc,GAAG,CAAC,EAC9E,CAAC,KAAK,SAAS,MAAM,GAAG,KAAK,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC,GACxD,CAAC,KAAK,SAAS,OAAO,GAAG,KAAK,GAAG,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,EAC5D,CAAC,CACF,CAAA;QACD,CAAC,CAAC,GAAG,KAAK,EAAE,KAAK,SAAS,KAAK,GAAG,MAAM,GAAG,MAAM,EAC/C,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,GACzD,MAAM,CAAC,MAAM,CAAC,KAAK,SAAS,MAAM,GAAG,SAAS,CAAC,EAAE,GAAG,CAAC,EAAE,KAAK,SAAS,MAAM,GAAG,KAAK,GAAG,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAA;KAKrH,CAAA;IAED,4BAA4B;IAC5B,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;CAC1C;AAED,8BAAsB,gBAAgB,CACpC,CAAC,SAAS;IAAE,EAAE,EAAE,OAAO,CAAA;CAAE,EACzB,OAAO,SAAS;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAC9B,GAAG,EACH,QAAQ,SAAS,MAAM,CACvB,SAAQ,eAAe,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC;aAEhC,QAAQ,EAAE,QAAQ;gBAAlB,QAAQ,EAAE,QAAQ;CAIrC;AAED,qBAAa,gBAAgB,CAC3B,CAAC,SAAS;IAAE,EAAE,EAAE,OAAO,CAAA;CAAE,EACzB,OAAO,SAAS;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAC9B,GAAG,EACH,QAAQ,SAAS,MAAM,CACvB,SAAQ,gBAAgB,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC;IAGjD,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC;gBAD9D,QAAQ,EAAE,QAAQ,EACC,IAAI,EAAE,UAAU,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC;IAYvD,cAAc,+HAAA;IACd,gBAAgB,2EAAA;IAChB,IAAI,qCAAA;IACJ,GAAG,cAAA;IACH,UAAU,0CAAA;IACV,MAAM,kBAAA;IACN,KAAK;;;MAAA;CACf;AAED,qBAAa,gBAAgB,CAC3B,CAAC,SAAS;IAAE,EAAE,EAAE,OAAO,CAAA;CAAE,EACzB,OAAO,SAAS;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAC9B,GAAG,EACH,QAAQ,SAAS,MAAM,CACvB,SAAQ,gBAAgB,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC;IACnD,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC;IAQf,QAAQ,CAAC,GAAG,QAAS,GAAG,6CAAwB;IAEhD,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC;IAItB,QAAQ,CAAC,IAAI,oGAA6D;IAE1E,QAAQ,CAAC,cAAc,WAAY,SAAS,GAAG,CAAC,uGACZ;IAEpC,QAAQ,CAAC,gBAAgB,EAAE;QACzB,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,EACtB,CAAC,EAAE,CACD,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,KACd,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,EAC7B,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAC1C,MAAM,CAAC,MAAM,CACd,CAAC,EACD,iBAAiB,GAAG,8BAA8B,GAAG,aAAa,CAAC,QAAQ,CAAC,GAAG,EAAE,EACjF,OAAO,CAAC,EAAE,EAAE;YACV,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;SACzB,CAAC,CACH,CAAA;QACD,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,EACtB,CAAC,EAAE,CACD,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,KAEf,KAAK,CAAC,OAAO,CAAC,GACd,UAAU,CAAC,OAAO,CAAC,GACnB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,EAC7B,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,GAChE,MAAM,CAAC,MAAM,CACd,CAAC,EACD,iBAAiB,GAAG,8BAA8B,GAAG,EAAE,EACvD,OAAO,CAAC,EAAE,EAAE;YACV,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;SAC/C,CAAC,CACH,CAAA;QACD,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,EACtB,CAAC,EAAE,CACD,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,KAEf,KAAK,CAAC,OAAO,CAAC,GACd,UAAU,CAAC,OAAO,CAAC,GACnB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,EAC7B,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,EACjE,KAAK,EAAE,SAAS,GAAG,MAAM,GACxB,MAAM,CAAC,MAAM,CACd,CAAC,EAAE,EACH,iBAAiB,GAAG,8BAA8B,GAAG,EAAE,EACvD,OAAO,CAAC,EAAE,EAAE;YACV,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;SAC/C,CAAC,CACH,CAAA;KACF,CASS;IAEV;;OAEG;IACH,QAAQ,CAAC,yBAAyB;YAAsB,CAAC,CAAC,IAAI,CAAC;6CACvD,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,WAEjE,GAAG,OAAO,OAAO;;QAAsD;IAE7E,gBAAgB,EAAE;QAChB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,SAAS,CAAC,EAClC,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC,EACnB,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,GAC/D,MAAM,CAAC,MAAM,CACd,CAAC,EACD,iBAAiB,GAAG,8BAA8B,GAAG,CAAC,EACtD,OAAO,CAAC,CAAC,EAAE;YACT,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;SAChD,CAAC,CACH,CAAA;QACD,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,SAAS,CAAC,EAClC,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC,EACnB,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,EAChE,KAAK,EAAE,SAAS,GAAG,MAAM,GACxB,MAAM,CAAC,MAAM,CACd,CAAC,EAAE,EACH,iBAAiB,GAAG,8BAA8B,GAAG,CAAC,EACtD,OAAO,CAAC,CAAC,EAAE;YACT,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;SAChD,CAAC,CACH,CAAA;KACF,CAaI;IAEL,mBAAmB,EAAE;QACnB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,CAAC,EACpB,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EACX,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GACxC,MAAM,CACP,CAAC,EACD,iBAAiB,GAAG,8BAA8B,GAAG,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,EAChF,OAAO,CAAC,CAAC,EAAE;YACT,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;SACzB,CAAC,CACH,CAAA;KACF,CAAmG;IAEpG,YAAY,CACV,CAAC,EACD,CAAC,EACD,CAAC,EACD,EAAE,SAAS,CAAC,EACZ,EAAE,SAAS,CAAC,EAEZ,IAAI,EAAE,EAAE,EACR,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;;;CAQ7C;AAED;;GAEG;AACH,wBAAgB,QAAQ,CACtB,GAAG,GAAG,KAAK;QAKa,MAAM;;QACZ,OAAO;SAEjB,QAAQ,UACN,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,WACtB,CAAC,EAAE,EAAE,OAAO,KAAK,OAAO,SAC1B,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,KAAK,qBAAqB,OAAO,CAAC;0DAqBtE,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG;QAC1B,WAAW,CAAC,EAAE,OAAO,SAAS,CAAC,EAAE,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAA;QAC/C,MAAM,CAAC,EAAE,KAAK,YAAY,OAAO,CAAC,EAAE,gBAAgB,CAAC,GAAG;YACtD,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,MAAM,CAAA;SACxC,CAAA;KACF,GACC;QACA,aAAa,EAAE,CAAC,GAAG,EAAE,sBAAsB,GAAG,CAAC,KAAK,OAAO,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;QAC3E,WAAW,CAAC,EAAE,OAAO,SAAS,CAAC,EAAE,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAA;QAC/C,MAAM,CAAC,EAAE,KAAK,YAAY,OAAO,CAAC,EAAE,gBAAgB,CAAC,GAAG;YACtD,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,MAAM,CAAA;SACxC,CAAA;KACF;;EA4QR;AASD,wBAAgB,SAAS,CACvB,OAAO,SAAS;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE;QAKZ,MAAM;;QACN,OAAO;SAEjB,QAAQ,UACN,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,SAClB,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,KAAK,OAAO,wDAmBlC,OAAO,SAAS,CAAC,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,WAC7C,KAAK,YAAY,OAAO,CAAC,EAAE,gBAAgB,CAAC,GAAG;IACtD,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,MAAM,CAAA;CACxC,oIA8BN;AAED,MAAM,WAAW,KAAK,CACpB,CAAC,SAAS;IAAE,EAAE,EAAE,OAAO,CAAA;CAAE,EACzB,OAAO,SAAS;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAC9B,CAAC,EACD,GAAG,EACH,QAAQ,SAAS,MAAM;IAEvB,IAAI,CAAC,QAAQ,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK,EAAE,EAAE,GAAG,KAAK,EAC1C,IAAI,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG;QAC1B,WAAW,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAA;QAC/C,MAAM,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC,GAAG;YACtD,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,MAAM,CAAA;SACxC,CAAA;KACF,GACC;QACA,aAAa,EAAE,CAAC,GAAG,EAAE,qBAAqB,CAAC,GAAG,CAAC,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;QAC3E,WAAW,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAA;QAC/C,MAAM,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC,GAAG;YACtD,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,MAAM,CAAA;SACxC,CAAA;KACF,GACF,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,EAAE,UAAU,GAAG,mBAAmB,GAAG,CAAC,GAAG,QAAQ,GAAG,EAAE,CAAC,CAAA;IACzG,QAAQ,CAAC,GAAG,EAAE,QAAQ,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK,EAAE,EAAE,GAAG,KAAK,EACnD,IAAI,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG;QAC1B,WAAW,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAA;QAC/C,MAAM,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC,GAAG;YACtD,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,MAAM,CAAA;SACxC,CAAA;KACF,GACC;QACA,aAAa,EAAE,CAAC,GAAG,EAAE,qBAAqB,CAAC,GAAG,CAAC,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;QAC3E,WAAW,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAA;QAC/C,MAAM,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC,GAAG;YACtD,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,MAAM,CAAA;SACxC,CAAA;KACF,EACH,CAAC,EAAE,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC,KAAK,GAAG,GACnD,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,UAAU,GAAG,mBAAmB,GAAG,CAAC,GAAG,QAAQ,GAAG,EAAE,CAAC,CAAA;IACvE,QAAQ,CAAC,CAAC,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;IAC9C,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAA;CACrD;AAED,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG,CAAC,GAAG,KAAK,CAAA;AAEpE,MAAM,WAAW,aAAa,CAAC,CAAC,SAAS;IAAE,EAAE,EAAE,OAAO,CAAA;CAAE,EAAE,OAAO,SAAS;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO;IAC9G,QAAQ,EAAE,QAAQ,CAAA;IAClB,CAAC,EAAE,CAAC,CAAA;IACJ,GAAG,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;IACzC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;IACxD,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAA;IAC3E,cAAc,EAAE,CACd,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,EAClB,MAAM,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,KACnB,MAAM,CAAC,IAAI,EAAE,iBAAiB,GAAG,8BAA8B,EAAE,OAAO,CAAC,CAAA;IAC9E,gBAAgB,EAAE,CAChB,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,EAClB,MAAM,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,KACnB,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;IACjC,IAAI,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,KAAK,MAAM,CAAC,IAAI,EAAE,iBAAiB,GAAG,8BAA8B,EAAE,OAAO,CAAC,CAAA;IAClG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAA;IAEjE,gBAAgB,EAAE;QAChB,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,EACtB,CAAC,EAAE,CACD,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,KACd,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,EAC7B,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAC1C,MAAM,CAAC,MAAM,CACd,CAAC,EACD,iBAAiB,GAAG,8BAA8B,GAAG,aAAa,CAAC,QAAQ,CAAC,GAAG,EAAE,EAC/E,OAAO,GACP,OAAO,CAAC,EAAE,EAAE;YACZ,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;SACzB,CAAC,CACH,CAAA;QACD,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,EACtB,CAAC,EAAE,CACD,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,KAEf,KAAK,CAAC,OAAO,CAAC,GACd,UAAU,CAAC,OAAO,CAAC,GACnB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,EAC7B,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,GAChE,MAAM,CAAC,MAAM,CACd,CAAC,EACD,iBAAiB,GAAG,8BAA8B,GAAG,EAAE,EACrD,OAAO,GACP,OAAO,CAAC,EAAE,EAAE;YACZ,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;SAC/C,CAAC,CACH,CAAA;QACD,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,EACtB,CAAC,EAAE,CACD,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,KAEf,KAAK,CAAC,OAAO,CAAC,GACd,UAAU,CAAC,OAAO,CAAC,GACnB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,EAC7B,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,EACjE,SAAS,EAAE,MAAM,GAChB,MAAM,CAAC,MAAM,CACd,CAAC,EAAE,EACH,iBAAiB,GAAG,8BAA8B,GAAG,EAAE,EACrD,OAAO,GACP,OAAO,CAAC,EAAE,EAAE;YACZ,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;SAC/C,CAAC,CACH,CAAA;KACF,CAAA;IAED,QAAQ,CAAC,KAAK,EAAE;QACd,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,SAAS,WAAW,EAAE,KAAK,SAAS,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,EAC9E,CAAC,EAAE,CACD,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,KACpB,eAAe,CAAC,OAAO,SAAS,IAAI,GAAG,IAAI,GAAG,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,GACrE,MAAM,CAAC,MAAM,CACd,KAAK,SAAS,MAAM,GAAG,SAAS,CAAC,EAAE,GAAG,KAAK,SAAS,OAAO,GAAG,cAAc,GAAG,CAAC,EAC9E,CAAC,KAAK,SAAS,MAAM,GAAG,KAAK,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC,GACxD,CAAC,KAAK,SAAS,OAAO,GAAG,KAAK,GAAG,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,EAC5D,OAAO,GAAG,CAAC,CACZ,CAAA;QACD,CAAC,CAAC,GAAG,KAAK,EAAE,KAAK,SAAS,KAAK,GAAG,MAAM,GAAG,MAAM,EAC/C,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,GACzD,MAAM,CAAC,MAAM,CACd,KAAK,SAAS,MAAM,GAAG,SAAS,CAAC,EAAE,GAAG,CAAC,EACvC,KAAK,SAAS,MAAM,GAAG,KAAK,GAAG,aAAa,CAAC,QAAQ,CAAC,EACtD,OAAO,GAAG,CAAC,CACZ,CAAA;KAKF,CAAA;IAED,mBAAmB,EAAE;QACnB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,CAAC,EACpB,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EACX,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GACxC,MAAM,CACP,CAAC,EACD,iBAAiB,GAAG,8BAA8B,GAAG,CAAC,GAAG,aAAa,CAAC,QAAQ,CAAC,EAC9E,OAAO,GACP,OAAO,CAAC,CAAC,EAAE;YACX,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;SACzB,CAAC,CACH,CAAA;KACF,CAAA;IAED,gBAAgB,EAAE;QAChB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,SAAS,CAAC,EAClC,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC,EACnB,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,GAC/D,MAAM,CAAC,MAAM,CACd,CAAC,EACD,iBAAiB,GAAG,8BAA8B,GAAG,CAAC,EACtD,OAAO,CAAC,CAAC,EAAE;YACT,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;SAChD,CAAC,CACH,CAAA;QACD,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,SAAS,CAAC,EAClC,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC,EACnB,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,EAChE,KAAK,EAAE,SAAS,GAAG,MAAM,GACxB,MAAM,CAAC,MAAM,CACd,CAAC,EAAE,EACH,iBAAiB,GAAG,8BAA8B,GAAG,CAAC,EACtD,OAAO,CAAC,CAAC,EAAE;YACT,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;SAChD,CAAC,CACH,CAAA;KACF,CAAA;IAED,oBAAoB;IACpB,MAAM,EAAE,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAE5B,GAAG,EAAE,CAAC,CAAC,EACL,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,CAAC,KACpB,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;CACzG;AAqCD,eAAO,MAAM,kBAAkB;QAIsB,MAAM;;QAAoB,OAAO;aACxE,QAAQ,UACV,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,SACxB,CAAC,EAAE,EAAE,OAAO,KAAK,OAAO,KAE7B,CAAC,QAAQ,WAAU,iBAAiB,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,GAC/D,QAAQ,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,GAC7B,MACA,CAAC,EACD,OAAO,EACP,CAAC,EACD,GAAG,EACH,QAAQ,CACT,GACC,cAAc,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,CA0BrD,CAAA;AAED,eAAO,MAAM,qBAAqB;QAC0B,MAAM;;QAAoB,OAAO;aAC/E,QAAQ,UACV,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,SACxB,CAAC,EAAE,EAAE,OAAO,KAAK,OAAO,KAE7B,CAAC,QAAQ,MACT,IAAI,EAAE,WAAW,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC,KACxC,iBAAiB,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,GAC/C,QAAQ,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,GAC7B,MACA,CAAC,EACD,OAAO,EACP,CAAC,EACD,GAAG,EACH,QAAQ,CACT,GACC,cAAc,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,CA6BrD,CAAA;AAGD,eAAO,MAAM,WAAW;QAEN,OAAO;;QACD,MAAM;qCAGtB,QAAQ,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,cAAc,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,UAkC3E,CAAC,CAAC,IAAI,CAAC,uDACpB,CAAA"}
+{"version":3,"file":"RepositoryBase.d.ts","sourceRoot":"","sources":["../../src/services/RepositoryBase.ts"],"names":[],"mappings":"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"}

package/dist/services/RepositoryBase.js

@@ -220,7 +220,7 @@ export function makeRepo() {
                             : eff, Effect.withSpan("Repository.query [effect-app/infra]", {
                         attributes: {
                             "repository.model_name": name,
-                            query: { ...a, schema: a.schema ? "__SCHEMA__" : a.schema }
+                            query: { ...a, schema: a.schema ? "__SCHEMA__" : a.schema, filter: a.filter.build() }
                         }
                     }));
                 });
@@ -242,8 +242,20 @@ export function makeRepo() {
                         return {
                             all: allE.pipe(Effect.flatMap(decMany), Effect.map((_) => _)),
                             find: (id) => flatMapOption(findE(id), dec),
-                            query: (b) => filter({ filter: b })
-                                .pipe(Effect.flatMap(decMany), Effect.map((_) => _)),
+                            // query: (q: any) => {
+                            //   const a = Q.toFilter(q)
+                            //   return filter(a)
+                            //     .pipe(
+                            //       Effect.flatMap(decMany),
+                            //       Effect.map((_) => _ as any[]),
+                            //       Effect.withSpan("Repository.mapped.query [effect-app/infra]", {
+                            //         attributes: {
+                            //           "repository.model_name": name,
+                            //           query: { ...a, schema: a.schema ? "__SCHEMA__" : a.schema, filter: a.filter.build() }
+                            //         }
+                            //       })
+                            //     )
+                            // },
                             save: (...xes) => Effect.flatMap(encMany(xes), (_) => saveAllE(_)).pipe(Effect.withSpan("mapped.save"))
                         };
                     }
@@ -368,4 +380,4 @@ export const makeRequest = (repo) => {
         .pipe(RequestResolver.batchN(20), RequestResolver.contextFromServices(repo));
     return (id) => Effect.request(_request({ id }), requestResolver);
 };
-//# 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/RequestContextContainer.d.ts

@@ -26,7 +26,7 @@ declare const RequestContextContainer_base: (abstract new (service: {
         requestContext: Effect<RequestContext>;
         update: (f: (rc: RequestContext) => RequestContext) => Effect<RequestContext>;
         start: (f: RequestContext) => Effect<void>;
-    }) => X) => X extends Effect<infer A_3, infer E_4, infer R_4> ? Effect<A_3, E_4, R_4 | RequestContextContainer> : Effect<X, never, RequestContextContainer>;
+    }) => X) => X extends Effect<infer A_3, infer E_4, infer R_4> ? Effect<A_3, E_4, RequestContextContainer | R_4> : Effect<X, never, RequestContextContainer>;
 };
 /**
  * @tsplus type RequestContextContainer
@@ -46,6 +46,7 @@ export declare const spanAttributes: (ctx: RequestContext) => {
     "request.user.sub"?: string & import("effect-app/ids").UserProfileIdBrand;
     "request.user.roles"?: unknown;
     "request.id": NonEmptyString255;
+    "request.root.id": NonEmptyString255;
     "request.name": string & import("@effect-app/schema").NonEmptyString255Brand;
     "request.locale": "en" | "de";
     "request.namespace": (string & import("@effect-app/schema").NonEmptyString255Brand) | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"RequestContextContainer.d.ts","sourceRoot":"","sources":["../../src/services/RequestContextContainer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAY,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAErE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;;oBASjC,OAAO,cAAc,CAAC;YAC9B,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,cAAc,KAAK,cAAc,KAAK,OAAO,cAAc,CAAC;WACtE,CAAC,CAAC,EAAE,cAAc,KAAK,OAAO,IAAI,CAAC;;oBAF1B,OAAO,cAAc,CAAC;YAC9B,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,cAAc,KAAK,cAAc,KAAK,OAAO,cAAc,CAAC;WACtE,CAAC,CAAC,EAAE,cAAc,KAAK,OAAO,IAAI,CAAC;;oBAF1B,OAAO,cAAc,CAAC;YAC9B,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,cAAc,KAAK,cAAc,KAAK,OAAO,cAAc,CAAC;WACtE,CAAC,CAAC,EAAE,cAAc,KAAK,OAAO,IAAI,CAAC;;;;;;;qBADzB,cAAc,KAAK,cAAc;;;;wBADlC,OAAO,cAAc,CAAC;gBAC9B,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,cAAc,KAAK,cAAc,KAAK,OAAO,cAAc,CAAC;eACtE,CAAC,CAAC,EAAE,cAAc,KAAK,OAAO,IAAI,CAAC;;;AAR9C;;;GAGG;AACH,8BAAsB,uBACpB,SAAQ,4BAIJ;IAEJ,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,cAAc,EAAE,KAAK,EAAE,uBAAuB,CAAC,CAEvE;IACD,MAAM,KAAK,SAAS,+DASnB;IACD,MAAM,CAAC,QAAQ,CAAC,IAAI,qDAkBjB;CACJ;AAED,4CAA4C;AAC5C,eAAO,MAAM,KAAK,6CAAwD,CAAA;AAE1E;;GAEG;AACH,eAAO,MAAM,cAAc,QAAS,cAAc;;;;;;;CAgBhD,CAAA"}
+{"version":3,"file":"RequestContextContainer.d.ts","sourceRoot":"","sources":["../../src/services/RequestContextContainer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAY,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAErE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;;oBASjC,OAAO,cAAc,CAAC;YAC9B,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,cAAc,KAAK,cAAc,KAAK,OAAO,cAAc,CAAC;WACtE,CAAC,CAAC,EAAE,cAAc,KAAK,OAAO,IAAI,CAAC;;oBAF1B,OAAO,cAAc,CAAC;YAC9B,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,cAAc,KAAK,cAAc,KAAK,OAAO,cAAc,CAAC;WACtE,CAAC,CAAC,EAAE,cAAc,KAAK,OAAO,IAAI,CAAC;;oBAF1B,OAAO,cAAc,CAAC;YAC9B,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,cAAc,KAAK,cAAc,KAAK,OAAO,cAAc,CAAC;WACtE,CAAC,CAAC,EAAE,cAAc,KAAK,OAAO,IAAI,CAAC;;;;;;;qBADzB,cAAc,KAAK,cAAc;;;;wBADlC,OAAO,cAAc,CAAC;gBAC9B,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,cAAc,KAAK,cAAc,KAAK,OAAO,cAAc,CAAC;eACtE,CAAC,CAAC,EAAE,cAAc,KAAK,OAAO,IAAI,CAAC;;;AAR9C;;;GAGG;AACH,8BAAsB,uBACpB,SAAQ,4BAIJ;IAEJ,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,cAAc,EAAE,KAAK,EAAE,uBAAuB,CAAC,CAEvE;IACD,MAAM,KAAK,SAAS,+DASnB;IACD,MAAM,CAAC,QAAQ,CAAC,IAAI,qDAkBjB;CACJ;AAED,4CAA4C;AAC5C,eAAO,MAAM,KAAK,6CAAwD,CAAA;AAE1E;;GAEG;AACH,eAAO,MAAM,cAAc,QAAS,cAAc;;;;;;;;CAiBhD,CAAA"}

package/dist/services/RequestContextContainer.js

@@ -22,7 +22,7 @@ export class RequestContextContainer extends Context.TagId("effect-app/RequestCo
         .sync(() => new RequestContext({ name: NonEmptyString255("_root_"), rootId: RequestId("_root_"), locale: "en" })), (FiberRef.make))
         .pipe(Effect.map((ref) => RequestContextContainer.of({
         requestContext: FiberRef.get(ref),
-        update: (f) => Effect.tap(FiberRef.getAndUpdate(ref, f), (rc) => Effect.annotateCurrentSpan(spanAttributes(rc))),
+        update: (f) => Effect.tap(FiberRef.updateAndGet(ref, f), (rc) => Effect.annotateCurrentSpan(spanAttributes(rc))),
         start: (a) => Effect.zipRight(FiberRef.set(ref, a), restoreFromRequestContext(a))
     })), Layer.scoped(this));
 }
@@ -33,6 +33,7 @@ export const RCTag = Context.GenericTag("@services/RCTag");
  */
 export const spanAttributes = (ctx) => ({
     "request.id": ctx.id,
+    "request.root.id": ctx.rootId,
     "request.name": ctx.name,
     "request.locale": ctx.locale,
     "request.namespace": ctx.namespace,
@@ -48,4 +49,4 @@ export const spanAttributes = (ctx) => ({
         }
         : {})
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHRDb250YWluZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VydmljZXMvUmVxdWVzdENvbnRleHRDb250YWluZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDdEQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDckUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBQzFDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQTtBQUNyRCxPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUU3RDs7O0dBR0c7QUFDSCxNQUFNLE9BQWdCLHVCQUNwQixTQUFRLE9BQU8sQ0FBQyxLQUFLLENBQUMsb0NBQW9DLENBQUMsRUFJdkQ7SUFFSixNQUFNLEtBQUssR0FBRztRQUNaLE9BQU8sTUFBTSxDQUFDLE9BQU8sQ0FBQyx1QkFBdUIsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxDQUFBO0lBQ3pFLENBQUM7SUFDRCxNQUFNLEtBQUssU0FBUztRQUNsQixPQUFPLE1BQU0sQ0FBQyxPQUFPLENBQ25CLE1BQU07YUFDSCxXQUFXLENBQUMsQ0FBQyxDQUFpQixFQUFFLEVBQUUsQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSx1QkFBdUIsQ0FBQyxDQUFDLEVBQ3BGLENBQUMsY0FBYyxFQUFFLEVBQUUsQ0FDakIsTUFBTSxDQUFDLE1BQU0sQ0FBQyxjQUFjLENBQUM7WUFDM0IsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLEtBQUssQ0FBQyxjQUFjLEVBQUUsTUFBTSxDQUFDLElBQUksQ0FBQztZQUM5RCxDQUFDLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FDdkMsQ0FBQTtJQUNILENBQUM7SUFDRCxNQUFNLENBQVUsSUFBSSxHQUFHLE1BQU07U0FDMUIsT0FBTyxDQUNOLE1BQU07U0FDSCxJQUFJLENBQUMsR0FBRyxFQUFFLENBQ1QsSUFBSSxjQUFjLENBQUMsRUFBRSxJQUFJLEVBQUUsaUJBQWlCLENBQUMsUUFBUSxDQUFDLEVBQUUsTUFBTSxFQUFFLFNBQVMsQ0FBQyxRQUFRLENBQUMsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FDckcsRUFDSCxDQUFBLFFBQVEsQ0FBQyxJQUFvQixDQUFBLENBQzlCO1NBQ0EsSUFBSSxDQUNILE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUNqQix1QkFBdUIsQ0FBQyxFQUFFLENBQUM7UUFDekIsY0FBYyxFQUFFLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDO1FBQ2pDLE1BQU0sRUFBRSxDQUFDLENBQXdDLEVBQUUsRUFBRSxDQUNuRCxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsbUJBQW1CLENBQUMsY0FBYyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDbkcsS0FBSyxFQUFFLENBQUMsQ0FBaUIsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsRUFBRSx5QkFBeUIsQ0FBQyxDQUFDLENBQUMsQ0FBQztLQUNsRyxDQUFDLENBQ0gsRUFDRCxLQUFLLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUNuQixDQUFBOztBQUdMLDRDQUE0QztBQUM1QyxNQUFNLENBQUMsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBaUIsaUJBQWlCLENBQUMsQ0FBQTtBQUUxRTs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLGNBQWMsR0FBRyxDQUFDLEdBQW1CLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDdEQsWUFBWSxFQUFFLEdBQUcsQ0FBQyxFQUFFO0lBQ3BCLGNBQWMsRUFBRSxHQUFHLENBQUMsSUFBSTtJQUN4QixnQkFBZ0IsRUFBRSxHQUFHLENBQUMsTUFBTTtJQUM1QixtQkFBbUIsRUFBRSxHQUFHLENBQUMsU0FBUztJQUNsQyxHQUFHLENBQUMsR0FBRyxDQUFDLFdBQVcsRUFBRSxHQUFHO1FBQ3RCLENBQUMsQ0FBQztZQUNBLGtCQUFrQixFQUFFLEdBQUc7aUJBQ3BCLFdBQVc7aUJBQ1gsR0FBRztZQUNOLG9CQUFvQixFQUFFLE9BQU8sSUFBSSxHQUFHO2lCQUMvQixXQUFXO2dCQUNkLENBQUMsQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLEtBQUs7Z0JBQ3ZCLENBQUMsQ0FBQyxTQUFTO1NBQ2Q7UUFDRCxDQUFDLENBQUMsRUFBRSxDQUFDO0NBQ1IsQ0FBQyxDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHRDb250YWluZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VydmljZXMvUmVxdWVzdENvbnRleHRDb250YWluZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDdEQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDckUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBQzFDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQTtBQUNyRCxPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUU3RDs7O0dBR0c7QUFDSCxNQUFNLE9BQWdCLHVCQUNwQixTQUFRLE9BQU8sQ0FBQyxLQUFLLENBQUMsb0NBQW9DLENBQUMsRUFJdkQ7SUFFSixNQUFNLEtBQUssR0FBRztRQUNaLE9BQU8sTUFBTSxDQUFDLE9BQU8sQ0FBQyx1QkFBdUIsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxDQUFBO0lBQ3pFLENBQUM7SUFDRCxNQUFNLEtBQUssU0FBUztRQUNsQixPQUFPLE1BQU0sQ0FBQyxPQUFPLENBQ25CLE1BQU07YUFDSCxXQUFXLENBQUMsQ0FBQyxDQUFpQixFQUFFLEVBQUUsQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSx1QkFBdUIsQ0FBQyxDQUFDLEVBQ3BGLENBQUMsY0FBYyxFQUFFLEVBQUUsQ0FDakIsTUFBTSxDQUFDLE1BQU0sQ0FBQyxjQUFjLENBQUM7WUFDM0IsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLEtBQUssQ0FBQyxjQUFjLEVBQUUsTUFBTSxDQUFDLElBQUksQ0FBQztZQUM5RCxDQUFDLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FDdkMsQ0FBQTtJQUNILENBQUM7SUFDRCxNQUFNLENBQVUsSUFBSSxHQUFHLE1BQU07U0FDMUIsT0FBTyxDQUNOLE1BQU07U0FDSCxJQUFJLENBQUMsR0FBRyxFQUFFLENBQ1QsSUFBSSxjQUFjLENBQUMsRUFBRSxJQUFJLEVBQUUsaUJBQWlCLENBQUMsUUFBUSxDQUFDLEVBQUUsTUFBTSxFQUFFLFNBQVMsQ0FBQyxRQUFRLENBQUMsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FDckcsRUFDSCxDQUFBLFFBQVEsQ0FBQyxJQUFvQixDQUFBLENBQzlCO1NBQ0EsSUFBSSxDQUNILE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUNqQix1QkFBdUIsQ0FBQyxFQUFFLENBQUM7UUFDekIsY0FBYyxFQUFFLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDO1FBQ2pDLE1BQU0sRUFBRSxDQUFDLENBQXdDLEVBQUUsRUFBRSxDQUNuRCxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsbUJBQW1CLENBQUMsY0FBYyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDbkcsS0FBSyxFQUFFLENBQUMsQ0FBaUIsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsRUFBRSx5QkFBeUIsQ0FBQyxDQUFDLENBQUMsQ0FBQztLQUNsRyxDQUFDLENBQ0gsRUFDRCxLQUFLLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUNuQixDQUFBOztBQUdMLDRDQUE0QztBQUM1QyxNQUFNLENBQUMsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBaUIsaUJBQWlCLENBQUMsQ0FBQTtBQUUxRTs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLGNBQWMsR0FBRyxDQUFDLEdBQW1CLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDdEQsWUFBWSxFQUFFLEdBQUcsQ0FBQyxFQUFFO0lBQ3BCLGlCQUFpQixFQUFFLEdBQUcsQ0FBQyxNQUFNO0lBQzdCLGNBQWMsRUFBRSxHQUFHLENBQUMsSUFBSTtJQUN4QixnQkFBZ0IsRUFBRSxHQUFHLENBQUMsTUFBTTtJQUM1QixtQkFBbUIsRUFBRSxHQUFHLENBQUMsU0FBUztJQUNsQyxHQUFHLENBQUMsR0FBRyxDQUFDLFdBQVcsRUFBRSxHQUFHO1FBQ3RCLENBQUMsQ0FBQztZQUNBLGtCQUFrQixFQUFFLEdBQUc7aUJBQ3BCLFdBQVc7aUJBQ1gsR0FBRztZQUNOLG9CQUFvQixFQUFFLE9BQU8sSUFBSSxHQUFHO2lCQUMvQixXQUFXO2dCQUNkLENBQUMsQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLEtBQUs7Z0JBQ3ZCLENBQUMsQ0FBQyxTQUFTO1NBQ2Q7UUFDRCxDQUFDLENBQUMsRUFBRSxDQUFDO0NBQ1IsQ0FBQyxDQUFBIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.233.2",
+  "version": "0.233.4",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -19,15 +19,15 @@
     "pure-rand": "6.1.0",
     "redlock": "^4.2.0",
     "@effect-app/core": "0.169.0",
-    "effect-app": "0.201.3",
     "@effect-app/infra-adapters": "0.154.0",
-    "@effect-app/schema": "0.220.3"
+    "@effect-app/schema": "0.220.3",
+    "effect-app": "0.201.3"
   },
   "devDependencies": {
     "@babel/cli": "^7.24.1",
     "@sentry/node": "^7.109.0",
     "@types/express": "^4.17.21",
-    "@types/node": "~20.12.5",
+    "@types/node": "~20.12.7",
     "@types/proper-lockfile": "^4.1.4",
     "@types/redis": "^2.8.32",
     "@types/redlock": "^4.0.7",

package/src/logger/logFmtLogger.ts

@@ -1,4 +1,5 @@
 import { HashMap, Logger, Option } from "effect-app"
+import { spanAttributes } from "src/services/RequestContextContainer.js"
 import { getRequestContext } from "./shared.js"
 
 export const logfmtLogger = Logger.make<unknown, void>(
@@ -9,14 +10,7 @@ export const logfmtLogger = Logger.make<unknown, void>(
     if (requestContext && requestContext.name !== "_root_") {
       annotations = HashMap.make(...[
         ...annotations,
-        ...Object.entries({
-          "request.root.id": requestContext.rootId,
-          "request.id": requestContext.id,
-          "request.name": requestContext.name,
-          "request.namespace": requestContext.namespace,
-          "request.locale": requestContext.locale,
-          ...(requestContext.userProfile?.sub ? { "request.user.sub": requestContext.userProfile.sub } : {})
-        })
+        ...Object.entries(spanAttributes(requestContext))
       ])
     }
     const formatted = Logger.logfmtLogger.log({ ..._, annotations })

package/src/services/RepositoryBase.ts

@@ -47,35 +47,34 @@ import { make as makeQuery } from "./query.js"
 import type { QAll, Query, QueryEnd, QueryProjection, QueryWhere } from "./query.js"
 import * as Q from "./query.js"
 import { ContextMapContainer } from "./Store/ContextMapContainer.js"
-import type * as QB from "./Store/filterApi/query.js"
 
 export interface Mapped1<A, Encoded extends { id: string }, R> {
   all: Effect<A[], ParseResult.ParseError, R>
   save: (...xes: readonly A[]) => Effect<void, OptimisticConcurrencyException | ParseResult.ParseError, R>
-  query: (
-    b: (fn: QB.FilterTest<Encoded>, fields: QB.Filter<Encoded, never>) => QB.QueryBuilder<Encoded>
-  ) => Effect<A[], ParseResult.ParseError, R>
+  // query: (
+  //   b: (fn: QB.FilterTest<Encoded>, fields: QB.Filter<Encoded, never>) => QB.QueryBuilder<Encoded>
+  // ) => Effect<A[], ParseResult.ParseError, R>
   find: (id: Encoded["id"]) => Effect<Option<A>, ParseResult.ParseError, R>
 }
 
 // TODO: auto use project, and select fields from the From side of schema only
-export interface Mapped2<A, Encoded extends { id: string }, R> {
+export interface Mapped2<A, R> {
   all: Effect<A[], ParseResult.ParseError, R>
-  query: (
-    b: (fn: QB.FilterTest<Encoded>, fields: QB.Filter<Encoded, never>) => QB.QueryBuilder<Encoded>
-  ) => Effect<A[], ParseResult.ParseError, R>
+  // query: (
+  //   b: (fn: QB.FilterTest<Encoded>, fields: QB.Filter<Encoded, never>) => QB.QueryBuilder<Encoded>
+  // ) => Effect<A[], ParseResult.ParseError, R>
 }
 
 export interface Mapped<Encoded extends { id: string }> {
   <A, R>(schema: S.Schema<A, Encoded, R>): Mapped1<A, Encoded, R>
   // TODO: constrain on Encoded2 having to contain only fields that fit Encoded
-  <A, Encoded2, R>(schema: S.Schema<A, Encoded2, R>): Mapped2<A, Encoded, R>
+  <A, Encoded2, R>(schema: S.Schema<A, Encoded2, R>): Mapped2<A, R>
 }
 
 export interface MM<Repo, Encoded extends { id: string }> {
   <A, R>(schema: S.Schema<A, Encoded, R>): Effect<Mapped1<A, Encoded, R>, never, Repo>
   // TODO: constrain on Encoded2 having to contain only fields that fit Encoded
-  <A, Encoded2, R>(schema: S.Schema<A, Encoded2, R>): Effect<Mapped2<A, Encoded, R>, never, Repo>
+  <A, Encoded2, R>(schema: S.Schema<A, Encoded2, R>): Effect<Mapped2<A, R>, never, Repo>
 }
 
 /**
@@ -587,7 +586,7 @@ export function makeRepo<
               Effect.withSpan("Repository.query [effect-app/infra]", {
                 attributes: {
                   "repository.model_name": name,
-                  query: { ...a, schema: a.schema ? "__SCHEMA__" : a.schema }
+                  query: { ...a, schema: a.schema ? "__SCHEMA__" : a.schema, filter: a.filter.build() }
                 }
               })
             )
@@ -615,12 +614,21 @@ export function makeRepo<
                   Effect.map((_) => _ as any[])
                 ),
                 find: (id: Encoded["id"]) => flatMapOption(findE(id), dec),
-                query: (b: any) =>
-                  filter({ filter: b })
-                    .pipe(
-                      Effect.flatMap(decMany),
-                      Effect.map((_) => _ as any[])
-                    ),
+                // query: (q: any) => {
+                //   const a = Q.toFilter(q)
+
+                //   return filter(a)
+                //     .pipe(
+                //       Effect.flatMap(decMany),
+                //       Effect.map((_) => _ as any[]),
+                //       Effect.withSpan("Repository.mapped.query [effect-app/infra]", {
+                //         attributes: {
+                //           "repository.model_name": name,
+                //           query: { ...a, schema: a.schema ? "__SCHEMA__" : a.schema, filter: a.filter.build() }
+                //         }
+                //       })
+                //     )
+                // },
                 save: (...xes: any[]) =>
                   Effect.flatMap(encMany(xes), (_) => saveAllE(_)).pipe(Effect.withSpan("mapped.save"))
               }

package/src/services/RequestContextContainer.ts

@@ -41,7 +41,7 @@ export abstract class RequestContextContainer
         RequestContextContainer.of({
           requestContext: FiberRef.get(ref),
           update: (f: (a: RequestContext) => RequestContext) =>
-            Effect.tap(FiberRef.getAndUpdate(ref, f), (rc) => Effect.annotateCurrentSpan(spanAttributes(rc))),
+            Effect.tap(FiberRef.updateAndGet(ref, f), (rc) => Effect.annotateCurrentSpan(spanAttributes(rc))),
           start: (a: RequestContext) => Effect.zipRight(FiberRef.set(ref, a), restoreFromRequestContext(a))
         })
       ),
@@ -57,6 +57,7 @@ export const RCTag = Context.GenericTag<RequestContext>("@services/RCTag")
  */
 export const spanAttributes = (ctx: RequestContext) => ({
   "request.id": ctx.id,
+  "request.root.id": ctx.rootId,
   "request.name": ctx.name,
   "request.locale": ctx.locale,
   "request.namespace": ctx.namespace,