@effect-app/infra 0.233.4 → 0.233.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @effect-app/infra
 
+## 0.233.5
+
+### Patch Changes
+
+- ac89979: fix typo
+
 ## 0.233.4
 
 ### Patch Changes

package/_cjs/RequestContext.cjs

@@ -3,11 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.RequestContextParent = exports.RequestContext = void 0;
+exports.spanAttributes = exports.RequestContextParent = exports.RequestContext = void 0;
 var _schema = require("@effect-app/schema");
 var _effectApp = require("effect-app");
 var _ids = require("effect-app/ids");
-class RequestContextParent extends (0, _schema.TaggedClass)()("RequestContext", {
+class RequestContextParent extends (0, _schema.ExtendedTaggedClass)()("RequestContext", {
   id: _ids.RequestId,
   name: _schema.NonEmptyString255,
   userProfile: _effectApp.S.optional((0, _schema.struct)({
@@ -21,7 +21,7 @@ class RequestContextParent extends (0, _schema.TaggedClass)()("RequestContext",
  * @tsplus companion RequestContext.Ops
  */
 exports.RequestContextParent = RequestContextParent;
-class RequestContext extends (0, _schema.TaggedClass)()("RequestContext", {
+class RequestContext extends (0, _schema.ExtendedTaggedClass)()("RequestContext", {
   ...RequestContextParent.omit("_tag", "id"),
   id: _ids.RequestId.withDefault,
   rootId: _ids.RequestId,
@@ -54,12 +54,21 @@ class RequestContext extends (0, _schema.TaggedClass)()("RequestContext", {
     };
   }
 }
-// codegen:start {preset: model}
-//
-/* eslint-disable */
+exports.RequestContext = RequestContext;
+const spanAttributes = ctx => ({
+  "request.id": ctx.id,
+  "request.root.id": ctx.rootId,
+  "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
+  } : {})
+});
 /* eslint-enable */
 //
 // codegen:end
 //
-exports.RequestContext = RequestContext;
+exports.spanAttributes = spanAttributes;
 //# sourceMappingURL=RequestContext.cjs.map

package/_cjs/RequestContext.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"RequestContext.cjs","names":["_schema","require","_effectApp","_ids","RequestContextParent","TaggedClass","id","RequestId","name","NonEmptyString255","userProfile","S","optional","struct","sub","UserProfileId","locale","literal","createdAt","Date","withDefault","exports","RequestContext","omit","rootId","parent","namespace","inherit","newSelf","toMonitoring","self","operationName","parentOperationName","parentLocale"],"sources":["../src/RequestContext.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,IAAA,GAAAF,OAAA;AAEM,MAAOG,oBAAqB,SAAQ,IAAAC,mBAAW,GAElD,CAAC,gBAAgB,EAAE;EACpBC,EAAE,EAAEC,cAAS;EACbC,IAAI,EAAEC,yBAAiB;EACvBC,WAAW,EAAEC,YAAC,CAACC,QAAQ,CAAC,IAAAC,cAAM,EAAC;IAAEC,GAAG,EAAEC;EAAa,CAAE,CAAC,CAAC;EACvDC,MAAM,EAAE,IAAAC,eAAO,EAAC,IAAI,EAAE,IAAI,CAAC;EAC3BC,SAAS,EAAEP,YAAC,CAACQ,IAAI,CAACC;CACnB,CAAC;AAEF;;;;AAAAC,OAAA,CAAAjB,oBAAA,GAAAA,oBAAA;AAIM,MAAOkB,cAAe,SAAQ,IAAAjB,mBAAW,GAE5C,CAAC,gBAAgB,EAAE;EACpB,GAAGD,oBAAoB,CAACmB,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC;EAC1CjB,EAAE,EAAEC,cAAS,CAACa,WAAW;EACzBI,MAAM,EAAEjB,cAAS;EACjBkB,MAAM,EAAEd,YAAC,CAACC,QAAQ,CAACR,oBAAoB,CAAC;EACxCsB,SAAS,EAAEf,YAAC,CAACC,QAAQ,CAACH,yBAAiB;EACvC;EACA;EACA;EACA;EACA;EACA;CACD,CAAC;EACA;EACA,OAAOkB,OAAOA,CAEZF,MAAsB,EACtBG,OAA8D;IAE9D,OAAO,IAAIN,cAAc,CAAC;MACxBI,SAAS,EAAED,MAAM,EAAEC,SAAS;MAC5B,GAAGE,OAAO;MACVJ,MAAM,EAAEC,MAAM,CAACD,MAAM;MACrBC;KACD,CAAC;EACJ;EAEA,OAAOI,YAAYA,CAAaC,IAAoB;IAClD,OAAO;MACLC,aAAa,EAAED,IAAI,CAACtB,IAAI;MACxBQ,MAAM,EAAEc,IAAI,CAACd,MAAM;MACnB,IAAIc,IAAI,CAACL,MAAM,GACX;QAAEO,mBAAmB,EAAEF,IAAI,CAACL,MAAM,CAACjB,IAAI;QAAEyB,YAAY,EAAEH,IAAI,CAACL,MAAM,CAACT;MAAM,CAAE,GAC3E,EAAE;KACP;EACH;;AAGF;AACA;AACA;AACA;AACA;AACA;AACA;AAAAK,OAAA,CAAAC,cAAA,GAAAA,cAAA","ignoreList":[]}
+{"version":3,"file":"RequestContext.cjs","names":["_schema","require","_effectApp","_ids","RequestContextParent","ExtendedTaggedClass","id","RequestId","name","NonEmptyString255","userProfile","S","optional","struct","sub","UserProfileId","locale","literal","createdAt","Date","withDefault","exports","RequestContext","omit","rootId","parent","namespace","inherit","newSelf","toMonitoring","self","operationName","parentOperationName","parentLocale","spanAttributes","ctx","roles","undefined"],"sources":["../src/RequestContext.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,IAAA,GAAAF,OAAA;AAEM,MAAOG,oBAAqB,SAAQ,IAAAC,2BAAmB,GAG1D,CAAC,gBAAgB,EAAE;EACpBC,EAAE,EAAEC,cAAS;EACbC,IAAI,EAAEC,yBAAiB;EACvBC,WAAW,EAAEC,YAAC,CAACC,QAAQ,CAAC,IAAAC,cAAM,EAAC;IAAEC,GAAG,EAAEC;EAAa,CAAE,CAAC,CAAC;EACvDC,MAAM,EAAE,IAAAC,eAAO,EAAC,IAAI,EAAE,IAAI,CAAC;EAC3BC,SAAS,EAAEP,YAAC,CAACQ,IAAI,CAACC;CACnB,CAAC;AAEF;;;;AAAAC,OAAA,CAAAjB,oBAAA,GAAAA,oBAAA;AAIM,MAAOkB,cAAe,SAAQ,IAAAjB,2BAAmB,GAGpD,CAAC,gBAAgB,EAAE;EACpB,GAAGD,oBAAoB,CAACmB,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC;EAC1CjB,EAAE,EAAEC,cAAS,CAACa,WAAW;EACzBI,MAAM,EAAEjB,cAAS;EACjBkB,MAAM,EAAEd,YAAC,CAACC,QAAQ,CAACR,oBAAoB,CAAC;EACxCsB,SAAS,EAAEf,YAAC,CAACC,QAAQ,CAACH,yBAAiB;EACvC;EACA;EACA;EACA;EACA;EACA;CACD,CAAC;EACA;EACA,OAAOkB,OAAOA,CAEZF,MAAsB,EACtBG,OAA8D;IAE9D,OAAO,IAAIN,cAAc,CAAC;MACxBI,SAAS,EAAED,MAAM,EAAEC,SAAS;MAC5B,GAAGE,OAAO;MACVJ,MAAM,EAAEC,MAAM,CAACD,MAAM;MACrBC;KACD,CAAC;EACJ;EAEA,OAAOI,YAAYA,CAAaC,IAAoB;IAClD,OAAO;MACLC,aAAa,EAAED,IAAI,CAACtB,IAAI;MACxBQ,MAAM,EAAEc,IAAI,CAACd,MAAM;MACnB,IAAIc,IAAI,CAACL,MAAM,GACX;QAAEO,mBAAmB,EAAEF,IAAI,CAACL,MAAM,CAACjB,IAAI;QAAEyB,YAAY,EAAEH,IAAI,CAACL,MAAM,CAACT;MAAM,CAAE,GAC3E,EAAE;KACP;EACH;;AACDK,OAAA,CAAAC,cAAA,GAAAA,cAAA;AAEM,MAAMY,cAAc,GAAIC,GAAmB,KAAM;EACtD,YAAY,EAAEA,GAAG,CAAC7B,EAAE;EACpB,iBAAiB,EAAE6B,GAAG,CAACX,MAAM;EAC7B,cAAc,EAAEW,GAAG,CAAC3B,IAAI;EACxB,gBAAgB,EAAE2B,GAAG,CAACnB,MAAM;EAC5B,mBAAmB,EAAEmB,GAAG,CAACT,SAAS;EAClC,IAAIS,GAAG,CAACzB,WAAW,EAAEI,GAAG,GACpB;IACA,kBAAkB,EAAEqB,GAAG,CACpBzB,WAAW,CACXI,GAAG;IACN,oBAAoB,EAAE,OAAO,IAAIqB,GAAG,CAC/BzB,WAAW,GACZyB,GAAG,CAACzB,WAAW,CAAC0B,KAAK,GACrBC;GACL,GACC,EAAE;CACP,CAAC;AAWF;AACA;AACA;AACA;AAAAhB,OAAA,CAAAa,cAAA,GAAAA,cAAA","ignoreList":[]}

package/_cjs/api/setupRequest.cjs

@@ -23,7 +23,7 @@ function makeInternalRequestContext(name) {
   });
 }
 const withRequestSpan = f => _effectApp.Effect.andThen(_RequestContextContainer.RequestContextContainer.get, ctx => f.pipe(_effectApp.Effect.withSpan("request " + ctx.name, {
-  attributes: (0, _RequestContextContainer.spanAttributes)(ctx)
+  attributes: (0, _RequestContext.spanAttributes)(ctx)
 }),
 // request context info is picked up directly in the logger for annotations.
 _effectApp.Effect.withLogSpan("request")));

package/_cjs/api/setupRequest.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"setupRequest.cjs","names":["_schema","require","_effectApp","_ids","_RequestContext","_RequestContextContainer","_ContextMapContainer","makeInternalRequestContext","name","Effect","sync","id","RequestId","make","RequestContext","rootId","locale","NonEmptyString255","withRequestSpan","f","andThen","RequestContextContainer","get","ctx","pipe","withSpan","attributes","spanAttributes","withLogSpan","setupContextMap","ContextMapContainer","_","start","Layer","effectDiscard","RequestContextStartLiveFromRequestContext","requestContext","provideMerge","RequestContextStartLive","unwrapEffect","setupRequestContext","self","provide","UpdateRequestContextLive","rcc","update","updateRequestContext"],"sources":["../../src/api/setupRequest.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,wBAAA,GAAAJ,OAAA;AACA,IAAAK,oBAAA,GAAAL,OAAA;AAEA,SAASM,0BAA0BA,CAACC,IAAY;EAC9C,OAAOC,iBAAM,CAACC,IAAI,CAAC,MAAK;IACtB,MAAMC,EAAE,GAAGC,cAAS,CAACC,IAAI,EAAE;IAC3B,OAAO,IAAIC,8BAAc,CAAC;MACxBH,EAAE;MACFI,MAAM,EAAEJ,EAAE;MACVK,MAAM,EAAE,IAAI;MACZR,IAAI,EAAE,IAAAS,yBAAiB,EAACT,IAAI;KAC7B,CAAC;EACJ,CAAC,CAAC;AACJ;AAEA,MAAMU,eAAe,GAAaC,CAAkB,IAClDV,iBAAM,CAACW,OAAO,CACZC,gDAAuB,CACpBC,GAAG,EACLC,GAAG,IACFJ,CAAC,CAACK,IAAI,CACJf,iBAAM,CAACgB,QAAQ,CAAC,UAAU,GAAGF,GAAG,CAACf,IAAI,EAAE;EAAEkB,UAAU,EAAE,IAAAC,uCAAc,EAACJ,GAAG;AAAC,CAAE,CAAC;AAC3E;AACAd,iBAAM,CAACmB,WAAW,CAAC,SAAS,CAAC,CAC9B,CACJ;AAEH,MAAMC,eAAe,GAAGpB,iBAAM,CAACW,OAAO,CAACU,wCAAmB,EAAGC,CAAC,IAAKA,CAAC,CAACC,KAAK,CAAC,CAACR,IAAI,CAACS,gBAAK,CAACC,aAAa,CAAC;AAErG;AACA;AACA;AACA;AACA,MAAMC,yCAAyC,GAAIC,cAA8B,IAC/EH,gBAAK,CAACI,YAAY,CAChBR,eAAe;AACf;AACApB,iBAAM,CACHW,OAAO,CAACC,gDAAuB,EAAGU,CAAC,IAAKA,CAAC,CAACC,KAAK,CAACI,cAAc,CAAC,CAAC,CAChEZ,IAAI,CAACS,gBAAK,CAACC,aAAa,CAAC,CAC7B;AAEH,MAAMI,uBAAuB,GAAIF,cAAuC,IACtE,OAAOA,cAAc,KAAK,QAAQ,GAC9B,IAAAZ,eAAI,EACJjB,0BAA0B,CAAC6B,cAAc,CAAC,EAC1C3B,iBAAM,CAACW,OAAO,CAACe,yCAAyC,CAAC,EACzDF,gBAAK,CAACM,YAAY,CACnB,GACCJ,yCAAyC,CAACC,cAAc,CAAC;AAE/D;;;AAGM,SAAUI,mBAAmBA,CAAUC,IAAqB,EAAEL,cAAuC;EACzG,OAAOK,IAAI,CACRjB,IAAI,CACHN,eAAe,EACfT,iBAAM,CAACiC,OAAO,CAACJ,uBAAuB,CAACF,cAAc,CAAC,CAAC,CACxD;AACL;AAEA,MAAMO,wBAAwB,GAAIxB,CAAyC,IACzEV,iBAAM,CAACW,OAAO,CAACC,gDAAuB,EAAGuB,GAAG,IAAKA,GAAG,CAACC,MAAM,CAAC1B,CAAC,CAAC,CAAC,CAACK,IAAI,CAACS,gBAAK,CAACC,aAAa,CAAC;AAE3F;;;AAGM,SAAUY,oBAAoBA,CAAUL,IAAqB,EAAEtB,CAAyC;EAC5G,OAAOV,iBAAM,CAACiC,OAAO,CAACD,IAAI,EAAEE,wBAAwB,CAACxB,CAAC,CAAC,CAAC;AAC1D","ignoreList":[]}
+{"version":3,"file":"setupRequest.cjs","names":["_schema","require","_effectApp","_ids","_RequestContext","_RequestContextContainer","_ContextMapContainer","makeInternalRequestContext","name","Effect","sync","id","RequestId","make","RequestContext","rootId","locale","NonEmptyString255","withRequestSpan","f","andThen","RequestContextContainer","get","ctx","pipe","withSpan","attributes","spanAttributes","withLogSpan","setupContextMap","ContextMapContainer","_","start","Layer","effectDiscard","RequestContextStartLiveFromRequestContext","requestContext","provideMerge","RequestContextStartLive","unwrapEffect","setupRequestContext","self","provide","UpdateRequestContextLive","rcc","update","updateRequestContext"],"sources":["../../src/api/setupRequest.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,wBAAA,GAAAJ,OAAA;AACA,IAAAK,oBAAA,GAAAL,OAAA;AAEA,SAASM,0BAA0BA,CAACC,IAAY;EAC9C,OAAOC,iBAAM,CAACC,IAAI,CAAC,MAAK;IACtB,MAAMC,EAAE,GAAGC,cAAS,CAACC,IAAI,EAAE;IAC3B,OAAO,IAAIC,8BAAc,CAAC;MACxBH,EAAE;MACFI,MAAM,EAAEJ,EAAE;MACVK,MAAM,EAAE,IAAI;MACZR,IAAI,EAAE,IAAAS,yBAAiB,EAACT,IAAI;KAC7B,CAAC;EACJ,CAAC,CAAC;AACJ;AAEA,MAAMU,eAAe,GAAaC,CAAkB,IAClDV,iBAAM,CAACW,OAAO,CACZC,gDAAuB,CACpBC,GAAG,EACLC,GAAG,IACFJ,CAAC,CAACK,IAAI,CACJf,iBAAM,CAACgB,QAAQ,CAAC,UAAU,GAAGF,GAAG,CAACf,IAAI,EAAE;EAAEkB,UAAU,EAAE,IAAAC,8BAAc,EAACJ,GAAG;AAAC,CAAE,CAAC;AAC3E;AACAd,iBAAM,CAACmB,WAAW,CAAC,SAAS,CAAC,CAC9B,CACJ;AAEH,MAAMC,eAAe,GAAGpB,iBAAM,CAACW,OAAO,CAACU,wCAAmB,EAAGC,CAAC,IAAKA,CAAC,CAACC,KAAK,CAAC,CAACR,IAAI,CAACS,gBAAK,CAACC,aAAa,CAAC;AAErG;AACA;AACA;AACA;AACA,MAAMC,yCAAyC,GAAIC,cAA8B,IAC/EH,gBAAK,CAACI,YAAY,CAChBR,eAAe;AACf;AACApB,iBAAM,CACHW,OAAO,CAACC,gDAAuB,EAAGU,CAAC,IAAKA,CAAC,CAACC,KAAK,CAACI,cAAc,CAAC,CAAC,CAChEZ,IAAI,CAACS,gBAAK,CAACC,aAAa,CAAC,CAC7B;AAEH,MAAMI,uBAAuB,GAAIF,cAAuC,IACtE,OAAOA,cAAc,KAAK,QAAQ,GAC9B,IAAAZ,eAAI,EACJjB,0BAA0B,CAAC6B,cAAc,CAAC,EAC1C3B,iBAAM,CAACW,OAAO,CAACe,yCAAyC,CAAC,EACzDF,gBAAK,CAACM,YAAY,CACnB,GACCJ,yCAAyC,CAACC,cAAc,CAAC;AAE/D;;;AAGM,SAAUI,mBAAmBA,CAAUC,IAAqB,EAAEL,cAAuC;EACzG,OAAOK,IAAI,CACRjB,IAAI,CACHN,eAAe,EACfT,iBAAM,CAACiC,OAAO,CAACJ,uBAAuB,CAACF,cAAc,CAAC,CAAC,CACxD;AACL;AAEA,MAAMO,wBAAwB,GAAIxB,CAAyC,IACzEV,iBAAM,CAACW,OAAO,CAACC,gDAAuB,EAAGuB,GAAG,IAAKA,GAAG,CAACC,MAAM,CAAC1B,CAAC,CAAC,CAAC,CAACK,IAAI,CAACS,gBAAK,CAACC,aAAa,CAAC;AAE3F;;;AAGM,SAAUY,oBAAoBA,CAAUL,IAAqB,EAAEtB,CAAyC;EAC5G,OAAOV,iBAAM,CAACiC,OAAO,CAACD,IAAI,EAAEE,wBAAwB,CAACxB,CAAC,CAAC,CAAC;AAC1D","ignoreList":[]}

package/_cjs/logger/logFmtLogger.cjs

@@ -5,7 +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 _RequestContext = require("../RequestContext.cjs");
 var _shared = require("./shared.cjs");
 const logfmtLogger = exports.logfmtLogger = _effectApp.Logger.make(_ => {
   let {
@@ -14,7 +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((0, _RequestContextContainer.spanAttributes)(requestContext))]);
+    annotations = _effectApp.HashMap.make(...[...annotations, ...Object.entries((0, _RequestContext.spanAttributes)(requestContext))]);
   }
   const formatted = _effectApp.Logger.logfmtLogger.log({
     ..._,

package/_cjs/logger/logFmtLogger.cjs.map

@@ -1 +1 @@
-{"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":[]}
+{"version":3,"file":"logFmtLogger.cjs","names":["_effectApp","require","_RequestContext","_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,eAAA,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,8BAAc,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/RequestContextContainer.cjs

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.spanAttributes = exports.RequestContextContainer = exports.RCTag = void 0;
+exports.RequestContextContainer = exports.RCTag = void 0;
 var _schema = require("@effect-app/schema");
 var _effectApp = require("effect-app");
 var _ids = require("effect-app/ids");
@@ -26,26 +26,11 @@ 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.updateAndGet(ref, f), rc => _effectApp.Effect.annotateCurrentSpan(spanAttributes(rc))),
+    update: f => _effectApp.Effect.tap(_effectApp.FiberRef.updateAndGet(ref, f), rc => _effectApp.Effect.annotateCurrentSpan((0, _RequestContext.spanAttributes)(rc))),
     start: a => _effectApp.Effect.zipRight(_effectApp.FiberRef.set(ref, a), (0, _Memory.restoreFromRequestContext)(a))
   })), _effectApp.Layer.scoped(this));
 }
 /** @tsplus static RequestContext.Ops Tag */
 exports.RequestContextContainer = RequestContextContainer;
 const RCTag = exports.RCTag = _effectApp.Context.GenericTag("@services/RCTag");
-/**
- * @tsplus getter RequestContext spanAttributes
- */
-const spanAttributes = ctx => ({
-  "request.id": ctx.id,
-  "request.root.id": ctx.rootId,
-  "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
-  } : {})
-});
-exports.spanAttributes = spanAttributes;
 //# sourceMappingURL=RequestContextContainer.cjs.map

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","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":[]}
+{"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"],"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,CAAC,IAAAC,8BAAc,EAACF,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","ignoreList":[]}

package/dist/RequestContext.d.ts

@@ -29,16 +29,7 @@ declare const RequestContextParent_base: S.EnhancedClass<RequestContextParent, {
     } | undefined;
     readonly locale: "en" | "de";
     readonly createdAt: Date;
-}, {
-    readonly _tag: "RequestContext";
-    readonly id: string;
-    readonly name: string;
-    readonly locale: "en" | "de";
-    readonly createdAt: string;
-    readonly userProfile?: {
-        readonly sub: string;
-    } | undefined;
-}, never, {
+}, RequestContextParent.From, never, {
     readonly id: NonEmptyString255;
     readonly name: string & S.NonEmptyString255Brand;
     readonly locale: "en" | "de";
@@ -60,16 +51,7 @@ declare const RequestContext_base: S.EnhancedClass<RequestContext, {
         make: () => NonEmptyString255;
         withDefault: S.PropertySignature<":", NonEmptyString255, never, ":", string, true, never>;
     };
-    parent: S.PropertySignature<"?:", RequestContextParent | undefined, never, "?:", {
-        readonly _tag: "RequestContext";
-        readonly id: string;
-        readonly name: string;
-        readonly locale: "en" | "de";
-        readonly createdAt: string;
-        readonly userProfile?: {
-            readonly sub: string;
-        } | undefined;
-    } | undefined, false, never>;
+    parent: S.PropertySignature<"?:", RequestContextParent | undefined, never, "?:", RequestContextParent.From | undefined, false, never>;
     namespace: S.PropertySignature<"?:", (string & S.NonEmptyString255Brand) | undefined, never, "?:", string | undefined, false, never>;
     name: S.WithDefaults<S.Schema<string & S.NonEmptyString255Brand, string, never>> & S.Schema<string & S.NonEmptyString255Brand, string, never>;
     userProfile: S.PropertySignature<"?:", {
@@ -93,28 +75,7 @@ declare const RequestContext_base: S.EnhancedClass<RequestContext, {
     readonly rootId: NonEmptyString255;
     readonly parent?: RequestContextParent | undefined;
     readonly namespace?: (string & S.NonEmptyString255Brand) | undefined;
-}, {
-    readonly _tag: "RequestContext";
-    readonly id: string;
-    readonly name: string;
-    readonly locale: "en" | "de";
-    readonly createdAt: string;
-    readonly rootId: string;
-    readonly userProfile?: {
-        readonly sub: string;
-    } | undefined;
-    readonly parent?: {
-        readonly _tag: "RequestContext";
-        readonly id: string;
-        readonly name: string;
-        readonly locale: "en" | "de";
-        readonly createdAt: string;
-        readonly userProfile?: {
-            readonly sub: string;
-        } | undefined;
-    } | undefined;
-    readonly namespace?: string | undefined;
-}, never, {
+}, RequestContext.From, never, {
     readonly name: string & S.NonEmptyString255Brand;
     readonly locale: "en" | "de";
     readonly rootId: NonEmptyString255;
@@ -139,5 +100,22 @@ export declare class RequestContext extends RequestContext_base {
         locale: "en" | "de";
     };
 }
+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 & S.NonEmptyString255Brand;
+    "request.locale": "en" | "de";
+    "request.namespace": (string & S.NonEmptyString255Brand) | undefined;
+};
+export declare namespace RequestContextParent {
+    interface From extends S.Struct.Encoded<typeof RequestContextParent["fields"]> {
+    }
+}
+export declare namespace RequestContext {
+    interface From extends S.Struct.Encoded<typeof RequestContext["fields"]> {
+    }
+}
 export {};
 //# sourceMappingURL=RequestContext.d.ts.map

package/dist/RequestContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RequestContext.d.ts","sourceRoot":"","sources":["../src/RequestContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAuB,MAAM,oBAAoB,CAAA;AACpF,OAAO,EAAE,CAAC,EAAE,MAAM,YAAY,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAG9B,qBAAa,oBAAqB,SAAQ,yBAQxC;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL;;;GAGG;AACH,qBAAa,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"}
+{"version":3,"file":"RequestContext.d.ts","sourceRoot":"","sources":["../src/RequestContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,iBAAiB,EAAU,MAAM,oBAAoB,CAAA;AAC5F,OAAO,EAAE,CAAC,EAAE,MAAM,YAAY,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAG9B,qBAAa,oBAAqB,SAAQ,yBASxC;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL;;;GAGG;AACH,qBAAa,cAAe,SAAQ,mBAelC;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;AAED,eAAO,MAAM,cAAc,QAAS,cAAc;;;;;;;;CAiBhD,CAAA;AAKF,yBAAiB,oBAAoB,CAAC;IACpC,UAAiB,IAAK,SAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,oBAAoB,CAAC,QAAQ,CAAC,CAAC;KAAG;CACzF;AACD,yBAAiB,cAAc,CAAC;IAC9B,UAAiB,IAAK,SAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;KAAG;CACnF"}

package/dist/RequestContext.js

@@ -1,7 +1,7 @@
-import { literal, NonEmptyString255, struct, TaggedClass } from "@effect-app/schema";
+import { ExtendedTaggedClass, literal, NonEmptyString255, struct } from "@effect-app/schema";
 import { S } from "effect-app";
 import { RequestId, UserProfileId } from "effect-app/ids";
-export class RequestContextParent extends TaggedClass()("RequestContext", {
+export class RequestContextParent extends ExtendedTaggedClass()("RequestContext", {
     id: RequestId,
     name: NonEmptyString255,
     userProfile: S.optional(struct({ sub: UserProfileId })),
@@ -13,7 +13,7 @@ export class RequestContextParent extends TaggedClass()("RequestContext", {
  * @tsplus type RequestContext
  * @tsplus companion RequestContext.Ops
  */
-export class RequestContext extends TaggedClass()("RequestContext", {
+export class RequestContext extends ExtendedTaggedClass()("RequestContext", {
     ...RequestContextParent.omit("_tag", "id"),
     id: RequestId.withDefault,
     rootId: RequestId,
@@ -45,11 +45,26 @@ export class RequestContext extends TaggedClass()("RequestContext", {
         };
     }
 }
-// codegen:start {preset: model}
-//
-/* eslint-disable */
+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,
+    ...(ctx.userProfile?.sub
+        ? {
+            "request.user.sub": ctx
+                .userProfile
+                .sub,
+            "request.user.roles": "roles" in ctx
+                .userProfile
+                ? ctx.userProfile.roles
+                : undefined
+        }
+        : {})
+});
 /* eslint-enable */
 //
 // codegen:end
 //
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvUmVxdWVzdENvbnRleHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDcEYsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUM5QixPQUFPLEVBQUUsU0FBUyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBRXpELE1BQU0sT0FBTyxvQkFBcUIsU0FBUSxXQUFXLEVBRWxELENBQUMsZ0JBQWdCLEVBQUU7SUFDcEIsRUFBRSxFQUFFLFNBQVM7SUFDYixJQUFJLEVBQUUsaUJBQWlCO0lBQ3ZCLFdBQVcsRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxFQUFFLEdBQUcsRUFBRSxhQUFhLEVBQUUsQ0FBQyxDQUFDO0lBQ3ZELE1BQU0sRUFBRSxPQUFPLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQztJQUMzQixTQUFTLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxXQUFXO0NBQzlCLENBQUM7Q0FBRztBQUVMOzs7R0FHRztBQUNILE1BQU0sT0FBTyxjQUFlLFNBQVEsV0FBVyxFQUU1QyxDQUFDLGdCQUFnQixFQUFFO0lBQ3BCLEdBQUcsb0JBQW9CLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUM7SUFDMUMsRUFBRSxFQUFFLFNBQVMsQ0FBQyxXQUFXO0lBQ3pCLE1BQU0sRUFBRSxTQUFTO0lBQ2pCLE1BQU0sRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLG9CQUFvQixDQUFDO0lBQ3hDLFNBQVMsRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLGlCQUFpQixDQUFDO0lBQ3hDLDhDQUE4QztJQUM5QywrQkFBK0I7SUFDL0IsdUJBQXVCO0lBQ3ZCLDZDQUE2QztJQUM3Qyw0Q0FBNEM7SUFDNUMsS0FBSztDQUNOLENBQUM7SUFDQSw2Q0FBNkM7SUFDN0MsTUFBTSxDQUFDLE9BQU8sQ0FFWixNQUFzQixFQUN0QixPQUE4RDtRQUU5RCxPQUFPLElBQUksY0FBYyxDQUFDO1lBQ3hCLFNBQVMsRUFBRSxNQUFNLEVBQUUsU0FBUztZQUM1QixHQUFHLE9BQU87WUFDVixNQUFNLEVBQUUsTUFBTSxDQUFDLE1BQU07WUFDckIsTUFBTTtTQUNQLENBQUMsQ0FBQTtJQUNKLENBQUM7SUFFRCxNQUFNLENBQUMsWUFBWSxDQUFhLElBQW9CO1FBQ2xELE9BQU87WUFDTCxhQUFhLEVBQUUsSUFBSSxDQUFDLElBQUk7WUFDeEIsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNO1lBQ25CLEdBQUcsQ0FBQyxJQUFJLENBQUMsTUFBTTtnQkFDYixDQUFDLENBQUMsRUFBRSxtQkFBbUIsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxZQUFZLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUU7Z0JBQzdFLENBQUMsQ0FBQyxFQUFFLENBQUM7U0FDUixDQUFBO0lBQ0gsQ0FBQztDQUNGO0FBRUQsZ0NBQWdDO0FBQ2hDLEVBQUU7QUFDRixvQkFBb0I7QUFDcEIsbUJBQW1CO0FBQ25CLEVBQUU7QUFDRixjQUFjO0FBQ2QsRUFBRSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvUmVxdWVzdENvbnRleHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUM1RixPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQzlCLE9BQU8sRUFBRSxTQUFTLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0JBQWdCLENBQUE7QUFFekQsTUFBTSxPQUFPLG9CQUFxQixTQUFRLG1CQUFtQixFQUcxRCxDQUFDLGdCQUFnQixFQUFFO0lBQ3BCLEVBQUUsRUFBRSxTQUFTO0lBQ2IsSUFBSSxFQUFFLGlCQUFpQjtJQUN2QixXQUFXLEVBQUUsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsRUFBRSxHQUFHLEVBQUUsYUFBYSxFQUFFLENBQUMsQ0FBQztJQUN2RCxNQUFNLEVBQUUsT0FBTyxDQUFDLElBQUksRUFBRSxJQUFJLENBQUM7SUFDM0IsU0FBUyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsV0FBVztDQUM5QixDQUFDO0NBQUc7QUFFTDs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sY0FBZSxTQUFRLG1CQUFtQixFQUdwRCxDQUFDLGdCQUFnQixFQUFFO0lBQ3BCLEdBQUcsb0JBQW9CLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUM7SUFDMUMsRUFBRSxFQUFFLFNBQVMsQ0FBQyxXQUFXO0lBQ3pCLE1BQU0sRUFBRSxTQUFTO0lBQ2pCLE1BQU0sRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLG9CQUFvQixDQUFDO0lBQ3hDLFNBQVMsRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLGlCQUFpQixDQUFDO0lBQ3hDLDhDQUE4QztJQUM5QywrQkFBK0I7SUFDL0IsdUJBQXVCO0lBQ3ZCLDZDQUE2QztJQUM3Qyw0Q0FBNEM7SUFDNUMsS0FBSztDQUNOLENBQUM7SUFDQSw2Q0FBNkM7SUFDN0MsTUFBTSxDQUFDLE9BQU8sQ0FFWixNQUFzQixFQUN0QixPQUE4RDtRQUU5RCxPQUFPLElBQUksY0FBYyxDQUFDO1lBQ3hCLFNBQVMsRUFBRSxNQUFNLEVBQUUsU0FBUztZQUM1QixHQUFHLE9BQU87WUFDVixNQUFNLEVBQUUsTUFBTSxDQUFDLE1BQU07WUFDckIsTUFBTTtTQUNQLENBQUMsQ0FBQTtJQUNKLENBQUM7SUFFRCxNQUFNLENBQUMsWUFBWSxDQUFhLElBQW9CO1FBQ2xELE9BQU87WUFDTCxhQUFhLEVBQUUsSUFBSSxDQUFDLElBQUk7WUFDeEIsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNO1lBQ25CLEdBQUcsQ0FBQyxJQUFJLENBQUMsTUFBTTtnQkFDYixDQUFDLENBQUMsRUFBRSxtQkFBbUIsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxZQUFZLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUU7Z0JBQzdFLENBQUMsQ0FBQyxFQUFFLENBQUM7U0FDUixDQUFBO0lBQ0gsQ0FBQztDQUNGO0FBRUQsTUFBTSxDQUFDLE1BQU0sY0FBYyxHQUFHLENBQUMsR0FBbUIsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUN0RCxZQUFZLEVBQUUsR0FBRyxDQUFDLEVBQUU7SUFDcEIsaUJBQWlCLEVBQUUsR0FBRyxDQUFDLE1BQU07SUFDN0IsY0FBYyxFQUFFLEdBQUcsQ0FBQyxJQUFJO0lBQ3hCLGdCQUFnQixFQUFFLEdBQUcsQ0FBQyxNQUFNO0lBQzVCLG1CQUFtQixFQUFFLEdBQUcsQ0FBQyxTQUFTO0lBQ2xDLEdBQUcsQ0FBQyxHQUFHLENBQUMsV0FBVyxFQUFFLEdBQUc7UUFDdEIsQ0FBQyxDQUFDO1lBQ0Esa0JBQWtCLEVBQUUsR0FBRztpQkFDcEIsV0FBVztpQkFDWCxHQUFHO1lBQ04sb0JBQW9CLEVBQUUsT0FBTyxJQUFJLEdBQUc7aUJBQy9CLFdBQVc7Z0JBQ2QsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsS0FBSztnQkFDdkIsQ0FBQyxDQUFDLFNBQVM7U0FDZDtRQUNELENBQUMsQ0FBQyxFQUFFLENBQUM7Q0FDUixDQUFDLENBQUE7QUFXRixtQkFBbUI7QUFDbkIsRUFBRTtBQUNGLGNBQWM7QUFDZCxFQUFFIn0=

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,MAAM,EAAe,MAAM,YAAY,CAAA;AAEhD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,uBAAuB,EAAkB,MAAM,wCAAwC,CAAA;AAChG,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAA;AAkD9E;;GAEG;AACH,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,uIAM1G;AAKD;;GAEG;AACH,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,oEAE7G"}
+{"version":3,"file":"setupRequest.d.ts","sourceRoot":"","sources":["../../src/api/setupRequest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAe,MAAM,YAAY,CAAA;AAEhD,OAAO,EAAE,cAAc,EAAkB,MAAM,sBAAsB,CAAA;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAA;AAChF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAA;AAkD9E;;GAEG;AACH,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,uIAM1G;AAKD;;GAEG;AACH,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,oEAE7G"}

package/dist/api/setupRequest.js

@@ -1,8 +1,8 @@
 import { NonEmptyString255 } from "@effect-app/schema";
 import { Effect, Layer, pipe } from "effect-app";
 import { RequestId } from "effect-app/ids";
-import { RequestContext } from "../RequestContext.js";
-import { RequestContextContainer, spanAttributes } from "../services/RequestContextContainer.js";
+import { RequestContext, spanAttributes } from "../RequestContext.js";
+import { RequestContextContainer } from "../services/RequestContextContainer.js";
 import { ContextMapContainer } from "../services/Store/ContextMapContainer.js";
 function makeInternalRequestContext(name) {
     return Effect.sync(() => {
@@ -46,4 +46,4 @@ const UpdateRequestContextLive = (f) => Effect.andThen(RequestContextContainer,
 export function updateRequestContext(self, f) {
     return Effect.provide(self, UpdateRequestContextLive(f));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FwaS9zZXR1cFJlcXVlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDdEQsT0FBTyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQ2hELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQTtBQUMxQyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFDckQsT0FBTyxFQUFFLHVCQUF1QixFQUFFLGNBQWMsRUFBRSxNQUFNLHdDQUF3QyxDQUFBO0FBQ2hHLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDBDQUEwQyxDQUFBO0FBRTlFLFNBQVMsMEJBQTBCLENBQUMsSUFBWTtJQUM5QyxPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFO1FBQ3RCLE1BQU0sRUFBRSxHQUFHLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtRQUMzQixPQUFPLElBQUksY0FBYyxDQUFDO1lBQ3hCLEVBQUU7WUFDRixNQUFNLEVBQUUsRUFBRTtZQUNWLE1BQU0sRUFBRSxJQUFJO1lBQ1osSUFBSSxFQUFFLGlCQUFpQixDQUFDLElBQUksQ0FBQztTQUM5QixDQUFDLENBQUE7SUFDSixDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUM7QUFFRCxNQUFNLGVBQWUsR0FBRyxDQUFVLENBQWtCLEVBQUUsRUFBRSxDQUN0RCxNQUFNLENBQUMsT0FBTyxDQUNaLHVCQUF1QjtLQUNwQixHQUFHLEVBQ04sQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUNOLENBQUMsQ0FBQyxJQUFJLENBQ0osTUFBTSxDQUFDLFFBQVEsQ0FBQyxVQUFVLEdBQUcsR0FBRyxDQUFDLElBQUksRUFBRSxFQUFFLFVBQVUsRUFBRSxjQUFjLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQztBQUMzRSw0RUFBNEU7QUFDNUUsTUFBTSxDQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FDOUIsQ0FDSixDQUFBO0FBRUgsTUFBTSxlQUFlLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxtQkFBbUIsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLENBQUE7QUFFckcsbUZBQW1GO0FBQ25GLGlEQUFpRDtBQUNqRCxzQkFBc0I7QUFDdEIscUZBQXFGO0FBQ3JGLE1BQU0seUNBQXlDLEdBQUcsQ0FBQyxjQUE4QixFQUFFLEVBQUUsQ0FDbkYsS0FBSyxDQUFDLFlBQVksQ0FDaEIsZUFBZTtBQUNmLHNFQUFzRTtBQUN0RSxNQUFNO0tBQ0gsT0FBTyxDQUFDLHVCQUF1QixFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLGNBQWMsQ0FBQyxDQUFDO0tBQ2hFLElBQUksQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLENBQzdCLENBQUE7QUFFSCxNQUFNLHVCQUF1QixHQUFHLENBQUMsY0FBdUMsRUFBRSxFQUFFLENBQzFFLE9BQU8sY0FBYyxLQUFLLFFBQVE7SUFDaEMsQ0FBQyxDQUFDLElBQUksQ0FDSiwwQkFBMEIsQ0FBQyxjQUFjLENBQUMsRUFDMUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyx5Q0FBeUMsQ0FBQyxFQUN6RCxLQUFLLENBQUMsWUFBWSxDQUNuQjtJQUNELENBQUMsQ0FBQyx5Q0FBeUMsQ0FBQyxjQUFjLENBQUMsQ0FBQTtBQUUvRDs7R0FFRztBQUNILE1BQU0sVUFBVSxtQkFBbUIsQ0FBVSxJQUFxQixFQUFFLGNBQXVDO0lBQ3pHLE9BQU8sSUFBSTtTQUNSLElBQUksQ0FDSCxlQUFlLEVBQ2YsTUFBTSxDQUFDLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUN4RCxDQUFBO0FBQ0wsQ0FBQztBQUVELE1BQU0sd0JBQXdCLEdBQUcsQ0FBQyxDQUF5QyxFQUFFLEVBQUUsQ0FDN0UsTUFBTSxDQUFDLE9BQU8sQ0FBQyx1QkFBdUIsRUFBRSxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLENBQUE7QUFFM0Y7O0dBRUc7QUFDSCxNQUFNLFVBQVUsb0JBQW9CLENBQVUsSUFBcUIsRUFBRSxDQUF5QztJQUM1RyxPQUFPLE1BQU0sQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLHdCQUF3QixDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFDMUQsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FwaS9zZXR1cFJlcXVlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDdEQsT0FBTyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQ2hELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQTtBQUMxQyxPQUFPLEVBQUUsY0FBYyxFQUFFLGNBQWMsRUFBRSxNQUFNLHNCQUFzQixDQUFBO0FBQ3JFLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHdDQUF3QyxDQUFBO0FBQ2hGLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDBDQUEwQyxDQUFBO0FBRTlFLFNBQVMsMEJBQTBCLENBQUMsSUFBWTtJQUM5QyxPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFO1FBQ3RCLE1BQU0sRUFBRSxHQUFHLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtRQUMzQixPQUFPLElBQUksY0FBYyxDQUFDO1lBQ3hCLEVBQUU7WUFDRixNQUFNLEVBQUUsRUFBRTtZQUNWLE1BQU0sRUFBRSxJQUFJO1lBQ1osSUFBSSxFQUFFLGlCQUFpQixDQUFDLElBQUksQ0FBQztTQUM5QixDQUFDLENBQUE7SUFDSixDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUM7QUFFRCxNQUFNLGVBQWUsR0FBRyxDQUFVLENBQWtCLEVBQUUsRUFBRSxDQUN0RCxNQUFNLENBQUMsT0FBTyxDQUNaLHVCQUF1QjtLQUNwQixHQUFHLEVBQ04sQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUNOLENBQUMsQ0FBQyxJQUFJLENBQ0osTUFBTSxDQUFDLFFBQVEsQ0FBQyxVQUFVLEdBQUcsR0FBRyxDQUFDLElBQUksRUFBRSxFQUFFLFVBQVUsRUFBRSxjQUFjLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQztBQUMzRSw0RUFBNEU7QUFDNUUsTUFBTSxDQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FDOUIsQ0FDSixDQUFBO0FBRUgsTUFBTSxlQUFlLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxtQkFBbUIsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLENBQUE7QUFFckcsbUZBQW1GO0FBQ25GLGlEQUFpRDtBQUNqRCxzQkFBc0I7QUFDdEIscUZBQXFGO0FBQ3JGLE1BQU0seUNBQXlDLEdBQUcsQ0FBQyxjQUE4QixFQUFFLEVBQUUsQ0FDbkYsS0FBSyxDQUFDLFlBQVksQ0FDaEIsZUFBZTtBQUNmLHNFQUFzRTtBQUN0RSxNQUFNO0tBQ0gsT0FBTyxDQUFDLHVCQUF1QixFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLGNBQWMsQ0FBQyxDQUFDO0tBQ2hFLElBQUksQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLENBQzdCLENBQUE7QUFFSCxNQUFNLHVCQUF1QixHQUFHLENBQUMsY0FBdUMsRUFBRSxFQUFFLENBQzFFLE9BQU8sY0FBYyxLQUFLLFFBQVE7SUFDaEMsQ0FBQyxDQUFDLElBQUksQ0FDSiwwQkFBMEIsQ0FBQyxjQUFjLENBQUMsRUFDMUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyx5Q0FBeUMsQ0FBQyxFQUN6RCxLQUFLLENBQUMsWUFBWSxDQUNuQjtJQUNELENBQUMsQ0FBQyx5Q0FBeUMsQ0FBQyxjQUFjLENBQUMsQ0FBQTtBQUUvRDs7R0FFRztBQUNILE1BQU0sVUFBVSxtQkFBbUIsQ0FBVSxJQUFxQixFQUFFLGNBQXVDO0lBQ3pHLE9BQU8sSUFBSTtTQUNSLElBQUksQ0FDSCxlQUFlLEVBQ2YsTUFBTSxDQUFDLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUN4RCxDQUFBO0FBQ0wsQ0FBQztBQUVELE1BQU0sd0JBQXdCLEdBQUcsQ0FBQyxDQUF5QyxFQUFFLEVBQUUsQ0FDN0UsTUFBTSxDQUFDLE9BQU8sQ0FBQyx1QkFBdUIsRUFBRSxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLENBQUE7QUFFM0Y7O0dBRUc7QUFDSCxNQUFNLFVBQVUsb0JBQW9CLENBQVUsSUFBcUIsRUFBRSxDQUF5QztJQUM1RyxPQUFPLE1BQU0sQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLHdCQUF3QixDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFDMUQsQ0FBQyJ9

package/dist/logger/logFmtLogger.js

@@ -1,5 +1,5 @@
 import { HashMap, Logger, Option } from "effect-app";
-import { spanAttributes } from "src/services/RequestContextContainer.js";
+import { spanAttributes } from "../RequestContext.js";
 import { getRequestContext } from "./shared.js";
 export const logfmtLogger = Logger.make((_) => {
     let { annotations } = _;
@@ -15,4 +15,4 @@ export const logfmtLogger = Logger.make((_) => {
     globalThis.console.log(formatted);
 });
 export const logFmt = Logger.replace(Logger.defaultLogger, logfmtLogger);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nRm10TG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZ2dlci9sb2dGbXRMb2dnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQ3BELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQTtBQUN4RSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFFL0MsTUFBTSxDQUFDLE1BQU0sWUFBWSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQ3JDLENBQUMsQ0FBQyxFQUFFLEVBQUU7SUFDSixJQUFJLEVBQUUsV0FBVyxFQUFFLEdBQUcsQ0FBQyxDQUFBO0lBQ3ZCLE1BQU0sQ0FBQyxHQUFHLGlCQUFpQixDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUN0QyxNQUFNLGNBQWMsR0FBRyxNQUFNLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQy9DLElBQUksY0FBYyxJQUFJLGNBQWMsQ0FBQyxJQUFJLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDdkQsV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRztZQUM1QixHQUFHLFdBQVc7WUFDZCxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUMsY0FBYyxDQUFDLGNBQWMsQ0FBQyxDQUFDO1NBQ2xELENBQUMsQ0FBQTtJQUNKLENBQUM7SUFDRCxNQUFNLFNBQVMsR0FBRyxNQUFNLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxFQUFFLFdBQVcsRUFBRSxDQUFDLENBQUE7SUFDaEUsVUFBVSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUE7QUFDbkMsQ0FBQyxDQUNGLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsYUFBYSxFQUFFLFlBQVksQ0FBQyxDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nRm10TG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZ2dlci9sb2dGbXRMb2dnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQ3BELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQTtBQUNyRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFFL0MsTUFBTSxDQUFDLE1BQU0sWUFBWSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQ3JDLENBQUMsQ0FBQyxFQUFFLEVBQUU7SUFDSixJQUFJLEVBQUUsV0FBVyxFQUFFLEdBQUcsQ0FBQyxDQUFBO0lBQ3ZCLE1BQU0sQ0FBQyxHQUFHLGlCQUFpQixDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUN0QyxNQUFNLGNBQWMsR0FBRyxNQUFNLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQy9DLElBQUksY0FBYyxJQUFJLGNBQWMsQ0FBQyxJQUFJLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDdkQsV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRztZQUM1QixHQUFHLFdBQVc7WUFDZCxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUMsY0FBYyxDQUFDLGNBQWMsQ0FBQyxDQUFDO1NBQ2xELENBQUMsQ0FBQTtJQUNKLENBQUM7SUFDRCxNQUFNLFNBQVMsR0FBRyxNQUFNLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxFQUFFLFdBQVcsRUFBRSxDQUFDLENBQUE7SUFDaEUsVUFBVSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUE7QUFDbkMsQ0FBQyxDQUNGLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsYUFBYSxFQUFFLFlBQVksQ0FBQyxDQUFBIn0=

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, Operations | R_5> : Effect<X, never, Operations>;
+    }) => 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>;
 };
 export declare class Operations extends Operations_base {
     private static readonly CleanupLive;

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

@@ -12,7 +12,7 @@ export declare function makeServiceBusQueue<Evt extends {
     id: StringId;
     _tag: string;
 }, EvtE, DrainEvtE>(_queueName: string, queueDrainName: string, schema: S.Schema<Evt, EvtE>, drainSchema: S.Schema<DrainEvt, DrainEvtE>): Effect.Effect<{
-    drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, RequestContextContainer | import("effect/Scope").Scope | import("../Store/ContextMapContainer.js").ContextMapContainer | Exclude<Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, never>, Tracer.ParentSpan>, {
+    drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, import("effect/Scope").Scope | RequestContextContainer | import("../Store/ContextMapContainer.js").ContextMapContainer | Exclude<Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, never>, Tracer.ParentSpan>, {
         make: Effect<import("@azure/service-bus").ServiceBusReceiver, never, import("effect/Scope").Scope>;
         makeSession: (sessionId: string) => Effect<import("@azure/service-bus").ServiceBusReceiver, never, import("effect/Scope").Scope>;
     }>>;

package/dist/services/RequestContextContainer.d.ts

@@ -1,4 +1,3 @@
-import { NonEmptyString255 } from "@effect-app/schema";
 import { Context, Effect, Layer, Option } from "effect-app";
 import { RequestContext } from "../RequestContext.js";
 declare const RequestContextContainer_base: (abstract new (service: {
@@ -26,7 +25,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, RequestContextContainer | R_4> : Effect<X, never, RequestContextContainer>;
+    }) => 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>;
 };
 /**
  * @tsplus type RequestContextContainer
@@ -39,17 +38,5 @@ export declare abstract class RequestContextContainer extends RequestContextCont
 }
 /** @tsplus static RequestContext.Ops Tag */
 export declare const RCTag: Context.Tag<RequestContext, RequestContext>;
-/**
- * @tsplus getter RequestContext spanAttributes
- */
-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;
-};
 export {};
 //# sourceMappingURL=RequestContextContainer.d.ts.map

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;;;;;;;;CAiBhD,CAAA"}
+{"version":3,"file":"RequestContextContainer.d.ts","sourceRoot":"","sources":["../../src/services/RequestContextContainer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAY,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAErE,OAAO,EAAE,cAAc,EAAkB,MAAM,sBAAsB,CAAA;;oBASjD,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"}

package/dist/services/RequestContextContainer.js

@@ -1,7 +1,7 @@
 import { NonEmptyString255 } from "@effect-app/schema";
 import { Context, Effect, FiberRef, Layer, Option } from "effect-app";
 import { RequestId } from "effect-app/ids";
-import { RequestContext } from "../RequestContext.js";
+import { RequestContext, spanAttributes } from "../RequestContext.js";
 import { restoreFromRequestContext } from "./Store/Memory.js";
 /**
  * @tsplus type RequestContextContainer
@@ -28,25 +28,4 @@ export class RequestContextContainer extends Context.TagId("effect-app/RequestCo
 }
 /** @tsplus static RequestContext.Ops Tag */
 export const RCTag = Context.GenericTag("@services/RCTag");
-/**
- * @tsplus getter RequestContext spanAttributes
- */
-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,
-    ...(ctx.userProfile?.sub
-        ? {
-            "request.user.sub": ctx
-                .userProfile
-                .sub,
-            "request.user.roles": "roles" in ctx
-                .userProfile
-                ? ctx.userProfile.roles
-                : undefined
-        }
-        : {})
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHRDb250YWluZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VydmljZXMvUmVxdWVzdENvbnRleHRDb250YWluZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDdEQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDckUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBQzFDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQTtBQUNyRCxPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUU3RDs7O0dBR0c7QUFDSCxNQUFNLE9BQWdCLHVCQUNwQixTQUFRLE9BQU8sQ0FBQyxLQUFLLENBQUMsb0NBQW9DLENBQUMsRUFJdkQ7SUFFSixNQUFNLEtBQUssR0FBRztRQUNaLE9BQU8sTUFBTSxDQUFDLE9BQU8sQ0FBQyx1QkFBdUIsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxDQUFBO0lBQ3pFLENBQUM7SUFDRCxNQUFNLEtBQUssU0FBUztRQUNsQixPQUFPLE1BQU0sQ0FBQyxPQUFPLENBQ25CLE1BQU07YUFDSCxXQUFXLENBQUMsQ0FBQyxDQUFpQixFQUFFLEVBQUUsQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSx1QkFBdUIsQ0FBQyxDQUFDLEVBQ3BGLENBQUMsY0FBYyxFQUFFLEVBQUUsQ0FDakIsTUFBTSxDQUFDLE1BQU0sQ0FBQyxjQUFjLENBQUM7WUFDM0IsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLEtBQUssQ0FBQyxjQUFjLEVBQUUsTUFBTSxDQUFDLElBQUksQ0FBQztZQUM5RCxDQUFDLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FDdkMsQ0FBQTtJQUNILENBQUM7SUFDRCxNQUFNLENBQVUsSUFBSSxHQUFHLE1BQU07U0FDMUIsT0FBTyxDQUNOLE1BQU07U0FDSCxJQUFJLENBQUMsR0FBRyxFQUFFLENBQ1QsSUFBSSxjQUFjLENBQUMsRUFBRSxJQUFJLEVBQUUsaUJBQWlCLENBQUMsUUFBUSxDQUFDLEVBQUUsTUFBTSxFQUFFLFNBQVMsQ0FBQyxRQUFRLENBQUMsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FDckcsRUFDSCxDQUFBLFFBQVEsQ0FBQyxJQUFvQixDQUFBLENBQzlCO1NBQ0EsSUFBSSxDQUNILE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUNqQix1QkFBdUIsQ0FBQyxFQUFFLENBQUM7UUFDekIsY0FBYyxFQUFFLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDO1FBQ2pDLE1BQU0sRUFBRSxDQUFDLENBQXdDLEVBQUUsRUFBRSxDQUNuRCxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsbUJBQW1CLENBQUMsY0FBYyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDbkcsS0FBSyxFQUFFLENBQUMsQ0FBaUIsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsRUFBRSx5QkFBeUIsQ0FBQyxDQUFDLENBQUMsQ0FBQztLQUNsRyxDQUFDLENBQ0gsRUFDRCxLQUFLLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUNuQixDQUFBOztBQUdMLDRDQUE0QztBQUM1QyxNQUFNLENBQUMsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBaUIsaUJBQWlCLENBQUMsQ0FBQTtBQUUxRTs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLGNBQWMsR0FBRyxDQUFDLEdBQW1CLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDdEQsWUFBWSxFQUFFLEdBQUcsQ0FBQyxFQUFFO0lBQ3BCLGlCQUFpQixFQUFFLEdBQUcsQ0FBQyxNQUFNO0lBQzdCLGNBQWMsRUFBRSxHQUFHLENBQUMsSUFBSTtJQUN4QixnQkFBZ0IsRUFBRSxHQUFHLENBQUMsTUFBTTtJQUM1QixtQkFBbUIsRUFBRSxHQUFHLENBQUMsU0FBUztJQUNsQyxHQUFHLENBQUMsR0FBRyxDQUFDLFdBQVcsRUFBRSxHQUFHO1FBQ3RCLENBQUMsQ0FBQztZQUNBLGtCQUFrQixFQUFFLEdBQUc7aUJBQ3BCLFdBQVc7aUJBQ1gsR0FBRztZQUNOLG9CQUFvQixFQUFFLE9BQU8sSUFBSSxHQUFHO2lCQUMvQixXQUFXO2dCQUNkLENBQUMsQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLEtBQUs7Z0JBQ3ZCLENBQUMsQ0FBQyxTQUFTO1NBQ2Q7UUFDRCxDQUFDLENBQUMsRUFBRSxDQUFDO0NBQ1IsQ0FBQyxDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHRDb250YWluZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VydmljZXMvUmVxdWVzdENvbnRleHRDb250YWluZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDdEQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDckUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBQzFDLE9BQU8sRUFBRSxjQUFjLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFDckUsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sbUJBQW1CLENBQUE7QUFFN0Q7OztHQUdHO0FBQ0gsTUFBTSxPQUFnQix1QkFDcEIsU0FBUSxPQUFPLENBQUMsS0FBSyxDQUFDLG9DQUFvQyxDQUFDLEVBSXZEO0lBRUosTUFBTSxLQUFLLEdBQUc7UUFDWixPQUFPLE1BQU0sQ0FBQyxPQUFPLENBQUMsdUJBQXVCLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxjQUFjLENBQUMsQ0FBQTtJQUN6RSxDQUFDO0lBQ0QsTUFBTSxLQUFLLFNBQVM7UUFDbEIsT0FBTyxNQUFNLENBQUMsT0FBTyxDQUNuQixNQUFNO2FBQ0gsV0FBVyxDQUFDLENBQUMsQ0FBaUIsRUFBRSxFQUFFLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsdUJBQXVCLENBQUMsQ0FBQyxFQUNwRixDQUFDLGNBQWMsRUFBRSxFQUFFLENBQ2pCLE1BQU0sQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDO1lBQzNCLENBQUMsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsY0FBYyxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUM7WUFDOUQsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxDQUFDLENBQ3ZDLENBQUE7SUFDSCxDQUFDO0lBQ0QsTUFBTSxDQUFVLElBQUksR0FBRyxNQUFNO1NBQzFCLE9BQU8sQ0FDTixNQUFNO1NBQ0gsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUNULElBQUksY0FBYyxDQUFDLEVBQUUsSUFBSSxFQUFFLGlCQUFpQixDQUFDLFFBQVEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxTQUFTLENBQUMsUUFBUSxDQUFDLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxDQUFDLENBQ3JHLEVBQ0gsQ0FBQSxRQUFRLENBQUMsSUFBb0IsQ0FBQSxDQUM5QjtTQUNBLElBQUksQ0FDSCxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FDakIsdUJBQXVCLENBQUMsRUFBRSxDQUFDO1FBQ3pCLGNBQWMsRUFBRSxRQUFRLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQztRQUNqQyxNQUFNLEVBQUUsQ0FBQyxDQUF3QyxFQUFFLEVBQUUsQ0FDbkQsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLG1CQUFtQixDQUFDLGNBQWMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ25HLEtBQUssRUFBRSxDQUFDLENBQWlCLEVBQUUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLEVBQUUseUJBQXlCLENBQUMsQ0FBQyxDQUFDLENBQUM7S0FDbEcsQ0FBQyxDQUNILEVBQ0QsS0FBSyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FDbkIsQ0FBQTs7QUFHTCw0Q0FBNEM7QUFDNUMsTUFBTSxDQUFDLE1BQU0sS0FBSyxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQWlCLGlCQUFpQixDQUFDLENBQUEifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.233.4",
+  "version": "0.233.5",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -37,7 +37,7 @@
     "mongodb": "6.5.0",
     "redis": "^3.1.2",
     "ts-node": "^10.9.2",
-    "typescript": "^5.4.4",
+    "typescript": "^5.4.5",
     "vitest": "^1.4.0"
   },
   "peerDependencies": {

package/src/RequestContext.ts

@@ -1,9 +1,10 @@
-import { literal, NonEmptyString255, struct, TaggedClass } from "@effect-app/schema"
+import { ExtendedTaggedClass, literal, NonEmptyString255, struct } from "@effect-app/schema"
 import { S } from "effect-app"
 import { RequestId, UserProfileId } from "effect-app/ids"
 
-export class RequestContextParent extends TaggedClass<
-  RequestContextParent
+export class RequestContextParent extends ExtendedTaggedClass<
+  RequestContextParent,
+  RequestContextParent.From
 >()("RequestContext", {
   id: RequestId,
   name: NonEmptyString255,
@@ -16,8 +17,9 @@ export class RequestContextParent extends TaggedClass<
  * @tsplus type RequestContext
  * @tsplus companion RequestContext.Ops
  */
-export class RequestContext extends TaggedClass<
-  RequestContext
+export class RequestContext extends ExtendedTaggedClass<
+  RequestContext,
+  RequestContext.From
 >()("RequestContext", {
   ...RequestContextParent.omit("_tag", "id"),
   id: RequestId.withDefault,
@@ -56,9 +58,34 @@ export class RequestContext extends TaggedClass<
   }
 }
 
+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,
+  ...(ctx.userProfile?.sub
+    ? {
+      "request.user.sub": ctx
+        .userProfile
+        .sub,
+      "request.user.roles": "roles" in ctx
+          .userProfile
+        ? ctx.userProfile.roles
+        : undefined
+    }
+    : {})
+})
+
 // codegen:start {preset: model}
 //
 /* eslint-disable */
+export namespace RequestContextParent {
+  export interface From extends S.Struct.Encoded<typeof RequestContextParent["fields"]> {}
+}
+export namespace RequestContext {
+  export interface From extends S.Struct.Encoded<typeof RequestContext["fields"]> {}
+}
 /* eslint-enable */
 //
 // codegen:end

package/src/api/setupRequest.ts

@@ -1,8 +1,8 @@
 import { NonEmptyString255 } from "@effect-app/schema"
 import { Effect, Layer, pipe } from "effect-app"
 import { RequestId } from "effect-app/ids"
-import { RequestContext } from "../RequestContext.js"
-import { RequestContextContainer, spanAttributes } from "../services/RequestContextContainer.js"
+import { RequestContext, spanAttributes } from "../RequestContext.js"
+import { RequestContextContainer } from "../services/RequestContextContainer.js"
 import { ContextMapContainer } from "../services/Store/ContextMapContainer.js"
 
 function makeInternalRequestContext(name: string) {

package/src/logger/logFmtLogger.ts

@@ -1,5 +1,5 @@
 import { HashMap, Logger, Option } from "effect-app"
-import { spanAttributes } from "src/services/RequestContextContainer.js"
+import { spanAttributes } from "../RequestContext.js"
 import { getRequestContext } from "./shared.js"
 
 export const logfmtLogger = Logger.make<unknown, void>(

package/src/services/RequestContextContainer.ts

@@ -1,7 +1,7 @@
 import { NonEmptyString255 } from "@effect-app/schema"
 import { Context, Effect, FiberRef, Layer, Option } from "effect-app"
 import { RequestId } from "effect-app/ids"
-import { RequestContext } from "../RequestContext.js"
+import { RequestContext, spanAttributes } from "../RequestContext.js"
 import { restoreFromRequestContext } from "./Store/Memory.js"
 
 /**
@@ -51,25 +51,3 @@ export abstract class RequestContextContainer
 
 /** @tsplus static RequestContext.Ops Tag */
 export const RCTag = Context.GenericTag<RequestContext>("@services/RCTag")
-
-/**
- * @tsplus getter RequestContext spanAttributes
- */
-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,
-  ...(ctx.userProfile?.sub
-    ? {
-      "request.user.sub": ctx
-        .userProfile
-        .sub,
-      "request.user.roles": "roles" in ctx
-          .userProfile
-        ? ctx.userProfile.roles
-        : undefined
-    }
-    : {})
-})