@effect-app/infra 0.61.1 → 0.63.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @effect-app/infra
 
+## 0.63.0
+
+### Minor Changes
+
+- Improve Request setup
+
+### Patch Changes
+
+- d52191c5: Add loggers
+
+## 0.62.0
+
+### Minor Changes
+
+- Update packages
+
+### Patch Changes
+
+- Updated dependencies
+  - @effect-app/infra-adapters@0.44.0
+  - @effect-app/prelude@0.51.0
+  - @effect-app/schema@0.45.0
+  - @effect-app/core@0.51.0
+
 ## 0.61.1
 
 ### Patch Changes

package/_cjs/api/routing.cjs

@@ -19,9 +19,8 @@ var tsplus_module_4 = _interopRequireWildcard(require("@effect-app/core/Effect")
 var tsplus_module_5 = _interopRequireWildcard(require("@effect-app/schema/ext"));
 var tsplus_module_6 = _interopRequireWildcard(require("@effect-app/prelude/utils"));
 var tsplus_module_7 = _interopRequireWildcard(require("@effect-app/prelude/_ext/misc"));
-var tsplus_module_8 = _interopRequireWildcard(require("@effect-app/infra/api/setupRequest"));
-var tsplus_module_9 = _interopRequireWildcard(require("@effect-app/core/Option"));
-var tsplus_module_10 = _interopRequireWildcard(require("@effect/data/Debug"));
+var tsplus_module_8 = _interopRequireWildcard(require("@effect-app/core/Option"));
+var tsplus_module_9 = _interopRequireWildcard(require("@effect/data/Debug"));
 var Ex = _interopRequireWildcard(require("@effect-app/infra-adapters/express"));
 var _ids = require("@effect-app/prelude/ids");
 var MO = _interopRequireWildcard(require("@effect-app/prelude/schema"));
@@ -132,7 +131,7 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
     return requestContext;
   }
   return (req, res) => {
-    return tsplus_module_10.untraced(restore => tsplus_module_3.flatMap(tsplus_module_3.all({
+    return tsplus_module_9.untraced(restore => tsplus_module_3.flatMap(tsplus_module_3.all({
       requestContext: tsplus_module_3.sync(() => {
         const requestContext = makeContext(req);
         if (req.method === "GET") {
@@ -145,7 +144,7 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
     }), ({
       pars,
       requestContext
-    }) => tsplus_module_3.provideService(tsplus_module_8.setupRequestFrom(tsplus_module_3.tap(tsplus_module_3.tapErrorCause(tsplus_module_3.zipRight(tsplus_module_3.flatMap(tsplus_module_1.get(RequestSettings), s => tsplus_module_7.logAnnotates({
+    }) => tsplus_module_3.provideService(tsplus_module_3.logSpan(tsplus_module_3.tap(tsplus_module_3.tapErrorCause(tsplus_module_3.zipRight(tsplus_module_3.flatMap(tsplus_module_1.get(RequestSettings), s => tsplus_module_7.logAnnotates({
       method: req.method,
       path: req.originalUrl,
       ...(s.verbose ? {
@@ -164,20 +163,22 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
         query
       }) => {
         const hn = {
-          ...tsplus_module_9.getOrUndefined(body),
-          ...tsplus_module_9.getOrUndefined(query),
-          ...tsplus_module_9.getOrUndefined(path)
+          ...tsplus_module_8.getOrUndefined(body),
+          ...tsplus_module_8.getOrUndefined(query),
+          ...tsplus_module_8.getOrUndefined(path)
         };
         return hn;
       }), parsedReq => tsplus_module_3.flatMap(restore(() => handle(parsedReq))(), r => respond(parsedReq, res, r)));
       // Commands should not be interruptable.
       const r = req.method !== "GET" ? tsplus_module_3.uninterruptible(handleRequest) : handleRequest; // .instrument("Performance.RequestResponse")
       // the first log entry should be of the request start.
-      const r2 = makeMiddlewareContext ? tsplus_module_3.zipRight(_Memory.restoreFromRequestContext, tsplus_module_4.provideSomeContextEffect(makeMiddlewareContext(req, res))(tsplus_module_8.setupRequestFrom(r))) : tsplus_module_3.zipRight(_Memory.restoreFromRequestContext
+      const r2 = makeMiddlewareContext ? tsplus_module_3.zipRight(_Memory.restoreFromRequestContext, tsplus_module_4.provideSomeContextEffect(makeMiddlewareContext(req, res))(r
+      // the db namespace must be restored, before calling provide here
+      )) : tsplus_module_3.zipRight(_Memory.restoreFromRequestContext
       // PR is not relevant here
       , r);
       return errorHandler(req, res, r2);
-    })), cause => tsplus_module_8.setupRequestFrom(tsplus_module_3.tapErrorCause(tsplus_module_3.allPar(tsplus_module_3.sync(() => res.status(500).send()), tsplus_module_3.sync(() => (0, _reportError.reportRequestError)(cause, {
+    })), cause => tsplus_module_3.tapErrorCause(tsplus_module_3.allPar(tsplus_module_3.sync(() => res.status(500).send()), tsplus_module_3.sync(() => (0, _reportError.reportRequestError)(cause, {
       path: req.originalUrl,
       method: req.method
     })), tsplus_module_3.suspend(() => {
@@ -196,7 +197,7 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
           return prev;
         }, {})))
       })(tsplus_module_3.logErrorCauseMessage("Finished request", cause));
-    })), cause => tsplus_module_3.sync(() => console.error("Error occurred while reporting error", cause))))), () => tsplus_module_8.setupRequestFrom(tsplus_module_3.flatMap(tsplus_module_1.get(RequestSettings), s => {
+    })), cause => tsplus_module_3.sync(() => console.error("Error occurred while reporting error", cause)))), () => tsplus_module_3.flatMap(tsplus_module_1.get(RequestSettings), s => {
       const headers = res.getHeaders();
       return tsplus_module_7.logAnnotates({
         method: req.method,
@@ -206,7 +207,7 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
           resHeaders: tsplus_module_6.RecordPretty(tsplus_module_6.object$(headers))
         } : undefined)
       })(tsplus_module_3.logInfo("Finished request"));
-    })))), _RequestContextContainer.RequestContextContainer, new _RequestContextContainer.RequestContextContainerImpl(requestContext)) // otherwise external error reporter breaks.
+    })), "request"), _RequestContextContainer.RequestContextContainer, new _RequestContextContainer.RequestContextContainerImpl(requestContext)) // otherwise external error reporter breaks.
     ));
   };
 }

package/_cjs/api/routing.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"routing.cjs","names":["Ex","_interopRequireWildcard","require","_ids","MO","_RequestContext","_RequestContextContainer","_Memory","_defaultErrorHandler","_requestHandler","_routing","_reportError","_util","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","RequestSettings","tsplus_module_1","unsafeMake","verbose","exports","makeRequestParsers","Request","ph","tsplus_module_3","sync","tsplus_module_2","map","fromNullable","Headers","s","Parser","for","condemnFail","parseHeaders","u","tsplus_module_4","flatMapOption","d","pq","Query","parseQuery","pb","Body","parseBody","pp","Path","parsePath","pc","Cookie","parseCookie","match","requestHandler","errorHandler","middleware","makeMiddlewareContext","undefined","handler","makeContext","zipRight","method","toLowerCase","path","split","makeRequestHandler","makeRouteDescriptor","respondSuccess","encodeResponse","req","res","a","flatMap","r","status","send","JSON","stringify","Response","adaptResponse","h","handle","response","extractSchema","Void","encoder","Encoder","requestParsers","parseRequest","parseRequestParams","respond","getParams","params","query","body","headers","cookies","start","Date","supported","desiredLocale","locale","includes","requestId","rootId","tsplus_module_5","parseUnsafe","RequestId","make","storeId","namespace","ReasonableString","Array","isArray","requestContext","RequestContext","name","Model","SchemaNamed","createdAt","tsplus_module_10","untraced","restore","all","setHeader","pars","provideService","tsplus_module_8","setupRequestFrom","tap","tapErrorCause","tsplus_module_7","logAnnotates","originalUrl","reqPath","tsplus_module_6","RecordPretty","object$","reqQuery","reqBody","pretty","reqCookies","reqHeaders","logInfo","suspend","handleRequest","hn","tsplus_module_9","getOrUndefined","parsedReq","uninterruptible","r2","restoreFromRequestContext","provideSomeContextEffect","cause","allPar","reportRequestError","getHeaders","statusCode","toString","resHeaders","entries","reduce","prev","value","snipString","logErrorCauseMessage","console","error","RequestContextContainer","RequestContextContainerImpl","matchAll","handlers","mapped","RecordKeys","cur","defaultBasicErrorHandler","matchAllAlt","matches","forEach","_","extractRequest","extractResponse","ResponseOpenApi","matchResource","mod"],"sources":["../../_src/api/routing.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"routing.cjs","names":["Ex","_interopRequireWildcard","require","_ids","MO","_RequestContext","_RequestContextContainer","_Memory","_defaultErrorHandler","_requestHandler","_routing","_reportError","_util","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","RequestSettings","tsplus_module_1","unsafeMake","verbose","exports","makeRequestParsers","Request","ph","tsplus_module_3","sync","tsplus_module_2","map","fromNullable","Headers","s","Parser","for","condemnFail","parseHeaders","u","tsplus_module_4","flatMapOption","d","pq","Query","parseQuery","pb","Body","parseBody","pp","Path","parsePath","pc","Cookie","parseCookie","match","requestHandler","errorHandler","middleware","makeMiddlewareContext","undefined","handler","makeContext","zipRight","method","toLowerCase","path","split","makeRequestHandler","makeRouteDescriptor","respondSuccess","encodeResponse","req","res","a","flatMap","r","status","send","JSON","stringify","Response","adaptResponse","h","handle","response","extractSchema","Void","encoder","Encoder","requestParsers","parseRequest","parseRequestParams","respond","getParams","params","query","body","headers","cookies","start","Date","supported","desiredLocale","locale","includes","requestId","rootId","tsplus_module_5","parseUnsafe","RequestId","make","storeId","namespace","ReasonableString","Array","isArray","requestContext","RequestContext","name","Model","SchemaNamed","createdAt","tsplus_module_9","untraced","restore","all","setHeader","pars","provideService","logSpan","tap","tapErrorCause","tsplus_module_7","logAnnotates","originalUrl","reqPath","tsplus_module_6","RecordPretty","object$","reqQuery","reqBody","pretty","reqCookies","reqHeaders","logInfo","suspend","handleRequest","hn","tsplus_module_8","getOrUndefined","parsedReq","uninterruptible","r2","restoreFromRequestContext","provideSomeContextEffect","cause","allPar","reportRequestError","getHeaders","statusCode","toString","resHeaders","entries","reduce","prev","value","snipString","logErrorCauseMessage","console","error","RequestContextContainer","RequestContextContainerImpl","matchAll","handlers","mapped","RecordKeys","cur","defaultBasicErrorHandler","matchAllAlt","matches","forEach","_","extractRequest","extractResponse","ResponseOpenApi","matchResource","mod"],"sources":["../../_src/api/routing.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AACA,IAAAA,EAAA,GAAAC,uBAAA,CAAAC,OAAA;AAEA,IAAAC,IAAA,GAAAD,OAAA;AAEA,IAAAE,EAAA,GAAAH,uBAAA,CAAAC,OAAA;AAKA,IAAAG,eAAA,GAAAH,OAAA;AACA,IAAAI,wBAAA,GAAAJ,OAAA;AACA,IAAAK,OAAA,GAAAL,OAAA;AAEA,IAAAM,oBAAA,GAAAN,OAAA;AAEA,IAAAO,eAAA,GAAAP,OAAA;AAEA,IAAAQ,QAAA,GAAAR,OAAA;AACA,IAAAS,YAAA,GAAAT,OAAA;AACA,IAAAU,KAAA,GAAAV,OAAA;AAAsC,SAAAW,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAb,wBAAAiB,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AApBtC;;AAsBO,MAAMW,eAAe,GAAGC,eAAA,CAAAC,UAAA,CAAoB;EACjDC,OAAO,EAAE;CACV,CAAC;AAAAC,OAAA,CAAAJ,eAAA,GAAAA,eAAA;AAEI,SAAUK,kBAAkBA,CAWhCC,OAUY;EAEZ,MAAMC,EAAE,GAAGC,eAAA,CAAAC,IAAA,OACTC,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAE,YAAA,CACgBN,OAAO,CAACO,OAAO,CAAC,EACxBC,CAAC,IAAKA,CAAC,CAAC,EACT7C,EA/CG,CA+CH8C,MAAM,CAACC,GAAG,CAAC,EACX/C,EAAE,CAACgD,WAAW,CAAC,CACvB;EACD,MAAMC,YAAY,GAAIC,CAAU,IAAKC,eAAA,CAAAC,aAAA,CAAAd,EAAE,EAAae,CAAC,IAAKA,CAAC,CAACH,CAAC,CAAC,CAAC;EAE/D,MAAMI,EAAE,GAAGf,eAAA,CAAAC,IAAA,OACTC,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAE,YAAA,CACgBN,OAAO,CAACkB,KAAK,CAAC,EACtBV,CAAC,IAAKA,CAAC,CAAC,EACT7C,EAxDG,CAwDH8C,MAAM,CAACC,GAAG,CAAC,EACX/C,EAAE,CAACgD,WAAW,CAAC,CACvB;EACD,MAAMQ,UAAU,GAAIN,CAAU,IAAKC,eAAA,CAAAC,aAAA,CAAAE,EAAE,EAAaD,CAAC,IAAKA,CAAC,CAACH,CAAC,CAAC,CAAC;EAE7D,MAAMO,EAAE,GAAGlB,eAAA,CAAAC,IAAA,OACTC,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAE,YAAA,CACgBN,OAAO,CAACqB,IAAI,CAAC,EACrBb,CAAC,IAAKA,CAAC,CAAC,EACT7C,EAjEG,CAiEH8C,MAAM,CAACC,GAAG,CAAC,EACX/C,EAAE,CAACgD,WAAW,CAAC,CACvB;EACD,MAAMW,SAAS,GAAIT,CAAU,IAAKC,eAAA,CAAAC,aAAA,CAAAK,EAAE,EAAaJ,CAAC,IAAKA,CAAC,CAACH,CAAC,CAAC,CAAC;EAE5D,MAAMU,EAAE,GAAGrB,eAAA,CAAAC,IAAA,OACTC,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAE,YAAA,CACgBN,OAAO,CAACwB,IAAI,CAAC,EACrBhB,CAAC,IAAKA,CAAC,CAAC,EACT7C,EA1EG,CA0EH8C,MAAM,CAACC,GAAG,CAAC,EACX/C,EAAE,CAACgD,WAAW,CAAC,CACvB;EACD,MAAMc,SAAS,GAAIZ,CAAU,IAAKC,eAAA,CAAAC,aAAA,CAAAQ,EAAE,EAAaP,CAAC,IAAKA,CAAC,CAACH,CAAC,CAAC,CAAC;EAE5D,MAAMa,EAAE,GAAGxB,eAAA,CAAAC,IAAA,OACTC,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAE,YAAA,CACgBN,OAAO,CAAC2B,MAAM,CAAC,EACvBnB,CAAC,IAAKA,CAAC,CAAC,EACT7C,EAnFG,CAmFH8C,MAAM,CAACC,GAAG,CAAC,EACX/C,EAAE,CAACgD,WAAW,CAAC,CACvB;EACD,MAAMiB,WAAW,GAAIf,CAAU,IAAKC,eAAA,CAAAC,aAAA,CAAAW,EAAE,EAAaV,CAAC,IAAKA,CAAC,CAACH,CAAC,CAAC,CAAC;EAE9D,OAAO;IACLS,SAAS;IACTM,WAAW;IACXhB,YAAY;IACZa,SAAS;IACTN;GACD;AACH;AA0BM,SAAUU,KAAKA,CAcnBC,cAUC,EACDC,YAI8B,EAC9BC,UAYC;EAED,IAAIC,qBAAqB,GAAGC,SAAS;EACrC,IAAIF,UAAU,EAAE;IACd,MAAM;MAAEG,OAAO;MAAEC;IAAW,CAAE,GAAGJ,UAAU,CAACF,cAAc,CAAC;IAC3DA,cAAc,GAAGK,OAAO;IACxBF,qBAAqB,GAAGG,WAAW;;EAErC,OAAOlC,eAAA,CAAAmC,QAAA,CAAA9E,EAAE,CACNsE,KAAK,CAACC,cAAc,CAAC9B,OAAO,CAACsC,MAAM,CAACC,WAAW,EAAS,CAAC,CACxDT,cAAc,CAAC9B,OAAO,CAACwC,IAAI,CAACC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EACzCC,kBAAkB,CAChBZ,cAAc,EACdC,YAAY,EACZE,qBAAqB,CACtB,CACF,EAEC/B,eAAA,CAAAC,IAAA,OACE,IAAAwC,4BAAmB,EACjBb,cAAc,CAAC9B,OAAO,CAACwC,IAAI,EAC3BV,cAAc,CAAC9B,OAAO,CAACsC,MAAM,EAC7BR,cAAc,CACf,CACF,CACF;AACL;AAEM,SAAUc,cAAcA,CAC5BC,cAA2C;EAE3C,OAAO,CAACC,GAAS,EAAEC,GAAqB,EAAEC,CAAI,KAC5C9C,eAAA,CAAA+C,OAAA,CAAA/C,eAAA,CAAAC,IAAA,OAAO0C,cAAc,CAACC,GAAG,CAAC,CAACE,CAAC,CAAC,CAAC,EAClBE,CAAC,IACThD,eAAA,CAAAC,IAAA,CAAY,MAAK;IACf+C,CAAC,KAAKhB,SAAS,GACXa,GAAG,CAACI,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,EAAE,GACtBL,GAAG,CACFI,MAAM,CAAC,GAAG,CAAC,CACXC,IAAI,CAACC,IAAI,CAACC,SAAS,CAACJ,CAAC,CAAC,CAAC;EAC9B,CAAC,CAAC,CACH;AACP;AAEM,SAAUR,kBAAkBA,CAchCP,OAUC,EACDJ,YAI4D,EAC5DE,qBAAwD;EAKxD,MAAM;IAAEjC,OAAO;IAAEuD,QAAQ;IAAEC,aAAa;IAAEC,CAAC,EAAEC;EAAM,CAAE,GAAGvB,OAAO;EAC/D,MAAMwB,QAAQ,GAAGJ,QAAQ,GAAG,IAAAK,gBAAa,EAACL,QAAQ,CAAC,GAnPzC5F,EAAE,CAmP0CkG,IAAI;EAC1D,MAAMC,OAAO,GAAGnG,EApPJ,CAoPIoG,OAAO,CAACrD,GAAG,CAACiD,QAAe,CAAC;EAC5C,MAAMd,cAAc,GAAGW,aAAa,GAC/BV,GAAS,IAAKnF,EAtPP,CAsPOoG,OAAO,CAACrD,GAAG,CAAC8C,aAAa,CAACV,GAAG,CAAC,CAAC,GAC9C,MAAMgB,OAAO;EAEjB,MAAME,cAAc,GAAGjE,kBAAkB,CAACC,OAAO,CAAC;EAClD,MAAMiE,YAAY,GAAG,IAAAC,kCAAkB,EAACF,cAAc,CAAC;EACvD,MAAMG,OAAO,GAAGvB,cAAc,CAACC,cAAc,CAAC;EAE9C,SAASuB,SAASA,CAACtB,GAAoB;IACrC,OAAO5C,eAAA,CAAAC,IAAA,QAAO;MACZqC,IAAI,EAAEM,GAAG,CAACuB,MAAM;MAChBC,KAAK,EAAExB,GAAG,CAACwB,KAAK;MAChBC,IAAI,EAAEzB,GAAG,CAACyB,IAAI;MACdC,OAAO,EAAE1B,GAAG,CAAC0B,OAAO;MACpBC,OAAO,EAAE3B,GAAG,CAAC2B;KACd,EAAC;EACJ;EAEA,SAASrC,WAAWA,CAACU,GAAoB;IACvC,MAAM4B,KAAK,GAAG,IAAIC,IAAI,EAAE;IACxB,MAAMC,SAAS,GAAG,CAAC,IAAI,EAAE,IAAI,CAAU;IACvC,MAAMC,aAAa,GAAG/B,GAAG,CAAC0B,OAAO,CAAC,UAAU,CAAC;IAC7C,MAAMM,MAAM,GAAGD,aAAa,IAAID,SAAS,CAACG,QAAQ,CAACF,aAAoB,CAAC,GACnEA,aAA0C,GAC1C,IAAc;IAEnB;IACA;IACA;IACA;IAEA,MAAMG,SAAS,GAAGlC,GAAG,CAAC0B,OAAO,CAAC,YAAY,CAAC;IAC3C,MAAMS,MAAM,GAAGD,SAAS,GAAGE,eAAA,CAAAC,WAAA,CAAAC,cAAS,EAAaJ,SAAS,CAAC,GAAGI,cAAS,CAACC,IAAI,EAAE;IAE9E,MAAMC,OAAO,GAAGxC,GAAG,CAAC0B,OAAO,CAAC,YAAY,CAAC;IACzC,MAAMe,SAAS,GAAG5H,EAxRR,CAwRQ6H,gBAAgB,CAAEF,OAAO,KAAKG,KAAK,CAACC,OAAO,CAACJ,OAAO,CAAC,GAAGA,OAAO,CAAC,CAAC,CAAC,GAAGA,OAAO,CAAC,IAAK,SAAS,CAAC;IAE7G,MAAMK,cAAc,GAAG,IAAIC,8BAAc,CAAC;MACxCX,MAAM;MACNY,IAAI,EAAElI,EA5RE,CA4RF6H,gBAAgB,CACpBxF,OAAO,CAAC8F,KAAK,YAAYC,cAAW,GAAG/F,OAAO,CAAC8F,KAAK,CAACD,IAAI,GAAG7F,OAAO,CAAC6F,IAAI,CACzE;MACDf,MAAM;MACNkB,SAAS,EAAEtB,KAAK;MAChBa;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;KACD,CAAC;IACF;IACA,OAAOI,cAAc;EACvB;EAEA,OAAO,CAAC7C,GAAoB,EAAEC,GAAqB,KAAI;IACrD,OAAOkD,eAAA,CAAAC,QAAA,CAAgBC,OAAO,IAC5BjG,eAAA,CAAA+C,OAAA,CAAA/C,eAAA,CAAAkG,GAAA,CACO;MACHT,cAAc,EAAEzF,eAAA,CAAAC,IAAA,CAAY,MAAK;QAC/B,MAAMwF,cAAc,GAAGvD,WAAW,CAACU,GAAG,CAAC;QACvC,IAAIA,GAAG,CAACR,MAAM,KAAK,KAAK,EAAE;UACxBS,GAAG,CAACsD,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC;;QAE5CtD,GAAG,CAACsD,SAAS,CAAC,kBAAkB,EAAEV,cAAc,CAACb,MAAM,CAAC;QACxD,OAAOa,cAAc;MACvB,CAAC,CAAC;MACFW,IAAI,EAAElC,SAAS,CAACtB,GAAG;KACpB,CAAC,EACO,CAAC;MAAEwD,IAAI;MAAEX;IAAc,CAAE,KAChCzF,eAAA,CAAAqG,cAAA,CAAArG,eAAA,CAAAsG,OAAA,CAAAtG,eAAA,CAAAuG,GAAA,CAAAvG,eAAA,CAAAwG,aAAA,CAAAxG,eAAA,CAAAmC,QAAA,CAAAnC,eAAA,CAAA+C,OAAA,CAAAtD,eAAA,CAAAb,GAAA,CAAAY,eAAe,GAEHc,CAAC,IAGPmG,eAAA,CAAAC,YAAA,CAAoB;MAClBtE,MAAM,EAAEQ,GAAG,CAACR,MAAM;MAClBE,IAAI,EAAEM,GAAG,CAAC+D,WAAW;MACrB,IAAGrG,CAAC,CAACX,OAAO,GACR;QACAiH,OAAO,EAAAC,eAAA,CAAAC,YAAA,CAAAD,eAAA,CAAAE,OAAA,CAAEX,IAAI,CAAC9D,IAAI,EAAU;QAC5B0E,QAAQ,EAAAH,eAAA,CAAAC,YAAA,CAAAD,eAAA,CAAAE,OAAA,CAAEX,IAAI,CAAChC,KAAK,EAAU;QAC9B6C,OAAO,EAAE,IAAAC,sBAAM,EAACd,IAAI,CAAC/B,IAAI,CAAC;QAC1B8C,UAAU,EAAE,IAAAD,sBAAM,EAACd,IAAI,CAAC7B,OAAO,CAAC;QAChC6C,UAAU,EAAAP,eAAA,CAAAC,YAAA,CAAAD,eAAA,CAAAE,OAAA,CAAEX,IAAI,CAAC9B,OAAO;OACzB,GACCtC,SAAS;KACd,CAAC;IAdJ;IACAhC,eAAA,CAAAqH,OAAA,CAAe,kBAAkB,CAAC,CAcjC,CACF,EAECrH,eAAA,CAAAsH,OAAA,CAAe,MAAK;MAClB,MAAMC,aAAa,GAAGvH,eAAA,CAAA+C,OAAA,CAAA/C,eAAA,CAAAG,GAAA,CAAA4D,YAAY,CAACnB,GAAG,CAAC,EAChC,CAAC;QAAEyB,IAAI;QAAE/B,IAAI;QAAE8B;MAAK,CAAE,KAAI;QAC7B,MAAMoD,EAAE,GAAG;UACT,GAAAC,eAAA,CAAAC,cAAA,CAAGrD,IAAI,CAAM;UACb,GAAAoD,eAAA,CAAAC,cAAA,CAAGtD,KAAK,CAAM;UACd,GAAAqD,eAAA,CAAAC,cAAA,CAAGpF,IAAI;SACW;QACpB,OAAOkF,EAAE;MACX,CAAC,CAAC,EACQG,SAAS,IACjB3H,eAAA,CAAA+C,OAAA,CAAAkD,OAAO,CAAC,MAAMzC,MAAM,CAACmE,SAAgB,CAAC,CAAC,EAAE,EAC7B3E,CAAC,IAAKiB,OAAO,CAAC0D,SAAS,EAAE9E,GAAG,EAAEG,CAAC,CAAC,CAAC,CAC9C;MAEH;MACA,MAAMA,CAAC,GAAGJ,GAAG,CAACR,MAAM,KAAK,KAAK,GAAEpC,eAAA,CAAA4H,eAAA,CAACL,aAAa,IAAmBA,aAAa,EAAC;MAC/E;MACA,MAAMM,EAAE,GAAG9F,qBAAqB,GAC5B/B,eAAA,CAAAmC,QAAA,CAAA2F,iCAAyB,EACflH,eAAA,CAAAmH,wBAAA,CAEkBhG,qBAAqB,CAACa,GAAG,EAAEC,GAAG,CAAC,EAFjDG;MACR;MAAA,CAC0D,CAAC,GAC7DhD,eAAA,CAAAmC,QAAA,CAAA2F;MACA;MAAA,EACU9E,CAAC,CAAyC;MACxD,OAAOnB,YAAY,CACjBe,GAAG,EACHC,GAAG,EACHgF,EAAE,CACH;IACH,CAAC,CAAC,CACH,EACeG,KAAK,IACnBhI,eAAA,CAAAwG,aAAA,CAAAxG,eAAA,CAAAiI,MAAA,CAEIjI,eAAA,CAAAC,IAAA,OAAO4C,GAAG,CAACI,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,EAAE,CAAC,EAC9BlD,eAAA,CAAAC,IAAA,OACE,IAAAiI,+BAAkB,EAACF,KAAK,EAAE;MACxB1F,IAAI,EAAEM,GAAG,CAAC+D,WAAW;MACrBvE,MAAM,EAAEQ,GAAG,CAACR;KACb,CAAC,CACH,EACDpC,eAAA,CAAAsH,OAAA,CAAe,MAAK;MAClB,MAAMhD,OAAO,GAAGzB,GAAG,CAACsF,UAAU,EAAE;MAChC,OAKS1B,eAAA,CAAAC,YAAA,CAAoB;QACzBtE,MAAM,EAAEQ,GAAG,CAACR,MAAM;QAClBE,IAAI,EAAEM,GAAG,CAAC+D,WAAW;QACrByB,UAAU,EAAEvF,GAAG,CAACuF,UAAU,CAACC,QAAQ,EAAE;QAErCzB,OAAO,EAAAC,eAAA,CAAAC,YAAA,CAAAD,eAAA,CAAAE,OAAA,CAAEX,IAAI,CAAC9D,IAAI,EAAU;QAC5B0E,QAAQ,EAAAH,eAAA,CAAAC,YAAA,CAAAD,eAAA,CAAAE,OAAA,CAAEX,IAAI,CAAChC,KAAK,EAAU;QAC9B6C,OAAO,EAAE,IAAAC,sBAAM,EAACd,IAAI,CAAC/B,IAAI,CAAC;QAC1B8C,UAAU,EAAE,IAAAD,sBAAM,EAACd,IAAI,CAAC7B,OAAO,CAAC;QAChC6C,UAAU,EAAAP,eAAA,CAAAC,YAAA,CAAAD,eAAA,CAAAE,OAAA,CAAEX,IAAI,CAAC9B,OAAO,EAAU;QAElCgE,UAAU,EAAAzB,eAAA,CAAAC,YAAA,CAAAD,eAAA,CAAAE,OAAA,CAAEhI,MAAM,CACfwJ,OAAO,CAACjE,OAAO,CAAC,CAChBkE,MAAM,CAAC,CAACC,IAAI,EAAE,CAACvJ,GAAG,EAAEwJ,KAAK,CAAC,KAAI;UAC7BD,IAAI,CAACvJ,GAAG,CAAC,GAAGwJ,KAAK,IAAI,OAAOA,KAAK,KAAK,QAAQ,GAAG,IAAAC,gBAAU,EAACD,KAAK,CAAC,GAAGA,KAAK;UAC1E,OAAOD,IAAI;QACb,CAAC,EAAE,EAAyB,CAAC;OAGhC,CAAC,CAxBGzI,eAAA,CAAA4I,oBAAA,CAEH,kBAAkB,EAClBZ,KAAK,CACN;IAqBL,CAAC,CAAC,CACH,EACeA,KAAK,IAAKhI,eAAA,CAAAC,IAAA,OAAO4I,OAAO,CAACC,KAAK,CAAC,sCAAsC,EAAEd,KAAK,CAAC,CAAC,CAAC,CAClG,EACI,MACHhI,eAAA,CAAA+C,OAAA,CAAAtD,eAAA,CAAAb,GAAA,CAAAY,eAAe,GAEHc,CAAC,IAAI;MACb,MAAMgE,OAAO,GAAGzB,GAAG,CAACsF,UAAU,EAAE;MAChC,OAAgD1B,eAAA,CAAAC,YAAA,CAAoB;QAClEtE,MAAM,EAAEQ,GAAG,CAACR,MAAM;QAClBE,IAAI,EAAEM,GAAG,CAAC+D,WAAW;QACrByB,UAAU,EAAEvF,GAAG,CAACuF,UAAU,CAACC,QAAQ,EAAE;QACrC,IAAG/H,CAAC,CAACX,OAAO,GACR;UACA2I,UAAU,EAAAzB,eAAA,CAAAC,YAAA,CAAAD,eAAA,CAAAE,OAAA,CAAEzC,OAAO;SACpB,GACCtC,SAAS;OACd,CAAC,CATKhC,eAAA,CAAAqH,OAAA,CAAe,kBAAkB,CAAC;IAU3C,CAAC,CAAC,CACL,EACQ,SAAS,CAAC,EACH0B,gDAAuB,EAAE,IAAIC,oDAA2B,CAACvD,cAAc,CAAC,CAAC,CAAC;IAAA,CAC7F,CACJ;EACH,CAAC;AACH;AA2CA;;;;AAIM,SAAUwD,QAAQA,CAA4BC,QAAW;EAC7D,MAAMC,MAAM,GAAGtC,eAAA,CAAAuC,UAAA,CAAAvC,eAAA,CAAAE,OAAA,CAAAmC,QAAQ,GAASV,MAAM,CAAC,CAACC,IAAI,EAAEY,GAAG,KAAI;IACnDZ,IAAI,CAACY,GAAG,CAAC,GAAG1H,KAAK,CAACuH,QAAQ,CAACG,GAAG,CAAsB,EAAEC,6CAAwB,CAAC;IAC/E,OAAOb,IAAI;EACb,CAAC,EAAE,EAAS,CAA8B;EAE1C,OAAOU,MAAM;AACf;AAEA;;;;AAIM,SAAUI,WAAWA,CAAgCL,QAAW;EACpE,MAAMC,MAAM,GAAGtC,eAAA,CAAAuC,UAAA,CAAAvC,eAAA,CAAAE,OAAA,CAAAmC,QAAQ,GAASV,MAAM,CAAC,CAACC,IAAI,EAAEY,GAAG,KAAI;IACnD,MAAMG,OAAO,GAAGP,QAAQ,CAACC,QAAQ,CAACG,GAAG,CAAC,CAAC;IACvCxC,eAAA,CAAAuC,UAAA,CAAAvC,eAAA,CAAAE,OAAA,CAAAyC,OAAO,GAASC,OAAO,CAAEvK,GAAG,IAAKuJ,IAAI,CAAC,GAAGY,GAAa,IAAInK,GAAa,EAAE,CAAC,GAAGsK,OAAO,CAACtK,GAAG,CAAC,CAAC;IAC1F,OAAOuJ,IAAI;EACb,CAAC,EAAE,EAAS,CAA2C;EAEvD,OAAOU,MAAM;AACf;AAwCM,SAAU3F,MAAMA,CAMpBkG,CAAsC,EACtCpG,aAAmB;EAEnB;EACA,MAAMxD,OAAO,GAAGrC,EAAE,CAACkM,cAAc,CAACD,CAAC,CAAC;EACpC,MAAMrG,QAAQ,GAAG5F,EAAE,CAACmM,eAAe,CAACF,CAAC,CAAC;EAUtC,OACEnG,CAAgC,KAC5B;IACJD,aAAa;IACbC,CAAC;IACDzD,OAAO;IACPuD,QAAQ;IACRwG,eAAe,EAAEH,CAAC,CAACG,eAAe,IAAIxG;GAQtC;AACJ;AAqBA;;;;;;;;;;;;;;;AAeM,SAAUyG,aAAaA,CAAuDC,GAAa;EAE/F,OAOEb,QAAmB,IACjB;IACF,MAAMjH,OAAO,GAAG4E,eAAA,CAAAuC,UAAA,CAAAvC,eAAA,CAAAE,OAAA,CAAAgD,GAAG,GAASvB,MAAM,CAAC,CAACC,IAAI,EAAEY,GAAG,KAAI;MAC/CZ,IAAI,CAACY,GAAG,CAAC,GAAG7F,MAAM,CAACuG,GAAG,CAACV,GAAG,CAAC,CAAC,CAACH,QAAQ,CAACG,GAAG,CAAQ,CAAC;MAClD,OAAOZ,IAAI;IACb,CAAC,EAAE,EAAS,CAAC;IAEb,OAAOxG,OASN;EACH,CAAC;AACH"}

package/_cjs/api/setupRequest.cjs

@@ -4,45 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.setupReq3 = setupReq3;
-exports.setupRequestFrom = exports.setupRequest = void 0;
 var tsplus_module_1 = _interopRequireWildcard(require("@effect/io/Effect"));
-var tsplus_module_2 = _interopRequireWildcard(require("@effect-app/prelude/_ext/misc"));
-var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/core/Function"));
-var tsplus_module_4 = _interopRequireWildcard(require("@effect/data/Debug"));
-var tsplus_module_5 = _interopRequireWildcard(require("@effect-app/prelude/schema"));
+var tsplus_module_2 = _interopRequireWildcard(require("@effect/data/Debug"));
+var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/prelude/schema"));
 var _ids = require("@effect-app/prelude/ids");
 var _RequestContext = require("../RequestContext.cjs");
 var _RequestContextContainer = require("../services/RequestContextContainer.cjs");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-const setupRequest = setupRequest_1;
-exports.setupRequest = setupRequest;
-const setupRequestFrom = setupRequestFrom_1;
-exports.setupRequestFrom = setupRequestFrom;
-/**
- * @tsplus fluent effect/io/Effect setupRequest
- */
-function setupRequest_1(self, requestContext) {
-  return tsplus_module_4.untraced(() => tsplus_module_3.pipe(tsplus_module_1.logSpan(self, "request"), tsplus_module_2.logAnnotates({
-    requestRootId: requestContext.rootId,
-    requestId: requestContext.id,
-    requestName: requestContext.name,
-    ...(requestContext.userProfile?.sub ? {
-      requestUserSub: requestContext.userProfile.sub
-    } : {})
-  })));
-}
-/**
- * @tsplus getter effect/io/Effect setupRequestFrom
- */
-function setupRequestFrom_1(self) {
-  return tsplus_module_4.untraced(() => tsplus_module_1.flatMap(_RequestContextContainer.RequestContextContainer.get, requestContext => setupRequest_1(self, requestContext)));
-}
 /**
  * @tsplus fluent effect/io/Effect setupRequestFromWith
  */
 function setupReq3(self, name) {
-  return tsplus_module_4.untraced(() => tsplus_module_1.flatMap(makeInternalRequestContext(name), rc => tsplus_module_1.provideService(setupRequestFrom_1(self), _RequestContextContainer.RequestContextContainer, new _RequestContextContainer.RequestContextContainerImpl(rc))));
+  return tsplus_module_2.untraced(() => tsplus_module_1.flatMap(makeInternalRequestContext(name), rc => tsplus_module_1.provideService(tsplus_module_1.logSpan(self, "request"), _RequestContextContainer.RequestContextContainer, new _RequestContextContainer.RequestContextContainerImpl(rc))));
 }
 function makeInternalRequestContext(name) {
   return tsplus_module_1.sync(() => {
@@ -51,7 +25,7 @@ function makeInternalRequestContext(name) {
       id,
       rootId: id,
       locale: "en",
-      name: tsplus_module_5.ReasonableString(name)
+      name: tsplus_module_3.ReasonableString(name)
     });
   });
 }

package/_cjs/api/setupRequest.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"setupRequest.cjs","names":["_ids","require","_RequestContext","_RequestContextContainer","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","_interopRequireWildcard","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","setupRequest","setupRequest_1","exports","setupRequestFrom","setupRequestFrom_1","self","requestContext","tsplus_module_4","untraced","tsplus_module_3","pipe","tsplus_module_1","logSpan","tsplus_module_2","logAnnotates","requestRootId","rootId","requestId","id","requestName","name","userProfile","sub","requestUserSub","flatMap","RequestContextContainer","setupReq3","makeInternalRequestContext","rc","provideService","RequestContextContainerImpl","sync","RequestId","make","RequestContext","locale","tsplus_module_5","ReasonableString"],"sources":["../../_src/api/setupRequest.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;AAAA,IAAAA,IAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AACA,IAAAE,wBAAA,GAAAF,OAAA;AAA6G,SAAAG,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAI,wBAAAC,GAAA,EAAAL,WAAA,SAAAA,WAAA,IAAAK,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAT,wBAAA,CAAAC,WAAA,OAAAQ,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;MAK7FW,YAAY,GAAAC,cAAA;AAAAC,OAAA,CAAAF,YAAA,GAAAA,YAAA;MAiBZG,gBAAgB,GAAAC,kBAAA;AAAAF,OAAA,CAAAC,gBAAA,GAAAA,gBAAA;AApBhC;;;AAGA,SAAAF,eAAsCI,IAAqB,EAAEC,cAA8B;EACzF,OAAOC,eAAA,CAAAC,QAAA,CAAe,MACpBC,eAAA,CAAAC,IAAI,CACFC,eAAA,CAAAC,OAAA,CAAAP,IAAI,EAAS,SAAS,CAAC,EACvBQ,eAAA,CAAAC,YAAA,CAAoB;IAClBC,aAAa,EAAET,cAAc,CAACU,MAAM;IACpCC,SAAS,EAAEX,cAAc,CAACY,EAAE;IAC5BC,WAAW,EAAEb,cAAc,CAACc,IAAI;IAChC,IAAGd,cAAc,CAACe,WAAW,EAAEC,GAAG,GAAG;MAAEC,cAAc,EAAEjB,cAAc,CAACe,WAAW,CAACC;IAAG,CAAE,GAAG,EAAE;GAC7F,CAAC,CACH,CACF;AACH;AAEA;;;AAGA,SAAAlB,mBAA0CC,IAAqB;EAC7D,OAAOE,eAAA,CAAAC,QAAA,CAAe,MACpBG,eAAA,CAAAa,OAAA,CAAAC,gDAAuB,CAACrC,GAAG,EAAUkB,cAAc,IAAKL,cAAA,CAAAI,IAAI,EAAcC,cAAc,CAAC,CAAC,CAC3F;AACH;AAEA;;;AAGM,SAAUoB,SAASA,CAAUrB,IAAqB,EAAEe,IAAY;EACpE,OAAOb,eAAA,CAAAC,QAAA,CAAe,MACpBG,eAAA,CAAAa,OAAA,CAAAG,0BAA0B,CAACP,IAAI,CAAC,EAAUQ,EAAE,IAC1CjB,eAAA,CAAAkB,cAAA,CAAAzB,kBAAA,CAAAC,IAAI,GAEcoB,gDAAuB,EAAE,IAAIK,oDAA2B,CAACF,EAAE,CAAC,CAAC,CAChF,CACF;AACH;AAEA,SAASD,0BAA0BA,CAACP,IAAY;EAC9C,OAAOT,eAAA,CAAAoB,IAAA,CAAY,MAAK;IACtB,MAAMb,EAAE,GAAGc,cAAS,CAACC,IAAI,EAAE;IAC3B,OAAO,IAAIC,8BAAc,CAAC;MACxBhB,EAAE;MACFF,MAAM,EAAEE,EAAE;MACViB,MAAM,EAAE,IAAI;MACZf,IAAI,EAAEgB,eAAA,CAAAC,gBAAgB,CAACjB,IAAI;KAC5B,CAAC;EACJ,CAAC,CAAC;AACJ"}
+{"version":3,"file":"setupRequest.cjs","names":["_ids","require","_RequestContext","_RequestContextContainer","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","_interopRequireWildcard","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","setupReq3","self","name","tsplus_module_2","untraced","tsplus_module_1","flatMap","makeInternalRequestContext","rc","provideService","logSpan","RequestContextContainer","RequestContextContainerImpl","sync","id","RequestId","make","RequestContext","rootId","locale","tsplus_module_3","ReasonableString"],"sources":["../../_src/api/setupRequest.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;AAAA,IAAAA,IAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AACA,IAAAE,wBAAA,GAAAF,OAAA;AAA6G,SAAAG,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAI,wBAAAC,GAAA,EAAAL,WAAA,SAAAA,WAAA,IAAAK,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAT,wBAAA,CAAAC,WAAA,OAAAQ,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AAE7G;;;AAGM,SAAUW,SAASA,CAAUC,IAAqB,EAAEC,IAAY;EACpE,OAAOC,eAAA,CAAAC,QAAA,CAAe,MACpBC,eAAA,CAAAC,OAAA,CAAAC,0BAA0B,CAACL,IAAI,CAAC,EAAUM,EAAE,IAC1CH,eAAA,CAAAI,cAAA,CAAAJ,eAAA,CAAAK,OAAA,CAAAT,IAAI,EACO,SAAS,CAAC,EACHU,gDAAuB,EAAE,IAAIC,oDAA2B,CAACJ,EAAE,CAAC,CAAC,CAChF,CACF;AACH;AAEA,SAASD,0BAA0BA,CAACL,IAAY;EAC9C,OAAOG,eAAA,CAAAQ,IAAA,CAAY,MAAK;IACtB,MAAMC,EAAE,GAAGC,cAAS,CAACC,IAAI,EAAE;IAC3B,OAAO,IAAIC,8BAAc,CAAC;MACxBH,EAAE;MACFI,MAAM,EAAEJ,EAAE;MACVK,MAAM,EAAE,IAAI;MACZjB,IAAI,EAAEkB,eAAA,CAAAC,gBAAgB,CAACnB,IAAI;KAC5B,CAAC;EACJ,CAAC,CAAC;AACJ"}

package/_cjs/logger/jsonLogger.cjs

@@ -0,0 +1,42 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.logJson = exports.jsonLogger = void 0;
+var tsplus_module_1 = _interopRequireWildcard(require("@effect/io/Fiber/Id"));
+var tsplus_module_2 = _interopRequireWildcard(require("@effect-app/core/Option"));
+var tsplus_module_3 = _interopRequireWildcard(require("@effect/io/Cause"));
+var tsplus_module_4 = _interopRequireWildcard(require("@effect/data/Chunk"));
+var tsplus_module_5 = _interopRequireWildcard(require("@effect-app/core/Chunk"));
+var tsplus_module_6 = _interopRequireWildcard(require("@effect/data/HashMap"));
+var tsplus_module_7 = _interopRequireWildcard(require("@effect/io/Logger"));
+var _shared = require("./shared.cjs");
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+const jsonLogger = tsplus_module_7.make((fiberId, logLevel, message, cause, context, spans, annotations) => {
+  const now = new Date();
+  const nowMillis = now.getTime();
+  const c = (0, _shared.getRequestContext)(context);
+  const data = {
+    timestamp: now,
+    level: logLevel.label,
+    fiber: tsplus_module_1.threadName(fiberId),
+    message,
+    request: tsplus_module_2.getOrUndefined(c),
+    cause: cause != null && cause != tsplus_module_3.empty ? tsplus_module_3.pretty(cause) : undefined,
+    spans: tsplus_module_4.isNonEmpty(spans) ? tsplus_module_5.toArray(tsplus_module_4.map(spans, _ => ({
+      label: _.label,
+      timing: nowMillis - _.startTime
+    }))) : undefined,
+    annotations: tsplus_module_6.size(annotations) > 0 ? [...annotations].reduce((prev, [k, v]) => {
+      prev[k] = v;
+      return prev;
+    }, {}) : undefined
+  };
+  globalThis.console.log(JSON.stringify(data));
+});
+exports.jsonLogger = jsonLogger;
+const logJson = tsplus_module_7.replace(tsplus_module_7.defaultLogger, jsonLogger);
+exports.logJson = logJson;
+//# sourceMappingURL=jsonLogger.cjs.map

package/_cjs/logger/jsonLogger.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"jsonLogger.cjs","names":["_shared","require","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","_interopRequireWildcard","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","jsonLogger","tsplus_module_7","make","fiberId","logLevel","message","cause","context","spans","annotations","now","Date","nowMillis","getTime","c","getRequestContext","data","timestamp","level","label","fiber","tsplus_module_1","threadName","request","tsplus_module_2","getOrUndefined","tsplus_module_3","empty","pretty","undefined","tsplus_module_4","isNonEmpty","tsplus_module_5","toArray","map","_","timing","startTime","tsplus_module_6","size","reduce","prev","k","v","globalThis","console","log","JSON","stringify","exports","logJson","replace","defaultLogger"],"sources":["../../_src/logger/jsonLogger.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AAA+C,SAAAC,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAI,wBAAAC,GAAA,EAAAL,WAAA,SAAAA,WAAA,IAAAK,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAT,wBAAA,CAAAC,WAAA,OAAAQ,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AAExC,MAAMW,UAAU,GAAGC,eAAA,CAAAC,IAAA,CACxB,CAACC,OAAO,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,KAAK,EAAEC,OAAO,EAAEC,KAAK,EAAEC,WAAW,KAAI;EACjE,MAAMC,GAAG,GAAG,IAAIC,IAAI,EAAE;EACtB,MAAMC,SAAS,GAAGF,GAAG,CAACG,OAAO,EAAE;EAE/B,MAAMC,CAAC,GAAG,IAAAC,yBAAiB,EAACR,OAAO,CAAC;EAEpC,MAAMS,IAAI,GAAG;IACXC,SAAS,EAAEP,GAAG;IACdQ,KAAK,EAAEd,QAAQ,CAACe,KAAK;IACrBC,KAAK,EAAAC,eAAA,CAAAC,UAAA,CAAEnB,OAAO,CAAW;IACzBE,OAAO;IACPkB,OAAO,EAAAC,eAAA,CAAAC,cAAA,CAAEX,CAAC,CAAM;IAChBR,KAAK,EAAEA,KAAK,IAAI,IAAI,IAAIA,KAAK,IAAAoB,eAAA,CAAAC,KAAe,GAAED,eAAA,CAAAE,MAAA,CAACtB,KAAK,IAAUuB,SAAS;IACvErB,KAAK,EAAEsB,eAAA,CAAAC,UAAA,CAAiBvB,KAAK,CAAC,GAC3BwB,eAAA,CAAAC,OAAA,CAACH,eAAA,CAAAI,GAAA,CAAA1B,KAAK,EAAM2B,CAAC,KAAM;MAAEhB,KAAK,EAAEgB,CAAC,CAAChB,KAAK;MAAEiB,MAAM,EAAExB,SAAS,GAAGuB,CAAC,CAACE;IAAS,CAAE,CAAC,CAAC,IACvER,SAAS;IACbpB,WAAW,EAAE6B,eAAA,CAAAC,IAAA,CAAA9B,WAAW,IAAQ,CAAC,GAC7B,CAAC,GAAGA,WAAW,CAAC,CAAC+B,MAAM,CAAC,CAACC,IAAI,EAAE,CAACC,CAAC,EAAEC,CAAC,CAAC,KAAI;MACzCF,IAAI,CAACC,CAAC,CAAC,GAAGC,CAAC;MACX,OAAOF,IAAI;IACb,CAAC,EAAE,EAA4B,CAAC,GAC9BZ;GACL;EAEDe,UAAU,CAACC,OAAO,CAACC,GAAG,CAACC,IAAI,CAACC,SAAS,CAAChC,IAAI,CAAC,CAAC;AAC9C,CAAC,CACF;AAAAiC,OAAA,CAAAjD,UAAA,GAAAA,UAAA;AAEM,MAAMkD,OAAO,GAAGjD,eAAA,CAAAkD,OAAA,CAAAlD,eAAA,CAAAmD,aAAA,EAAqCpD,UAAU,CAAC;AAAAiD,OAAA,CAAAC,OAAA,GAAAA,OAAA"}

package/_cjs/logger/logFmtLogger.cjs

@@ -0,0 +1,33 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.logfmtLogger = exports.logFmt = void 0;
+var tsplus_module_1 = _interopRequireWildcard(require("@effect-app/core/Option"));
+var tsplus_module_2 = _interopRequireWildcard(require("@effect-app/prelude/utils"));
+var tsplus_module_3 = _interopRequireWildcard(require("@effect/data/HashMap"));
+var tsplus_module_4 = _interopRequireWildcard(require("@effect/io/Logger"));
+var _shared = require("./shared.cjs");
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+const logfmtLogger = tsplus_module_4.make((fiberId, logLevel, message, cause, context, spans, annotations) => {
+  const c = (0, _shared.getRequestContext)(context);
+  const requestContext = tsplus_module_1.getOrUndefined(c);
+  if (requestContext) {
+    annotations = tsplus_module_3.make(...[...annotations, ...tsplus_module_2.RecordEntries(tsplus_module_2.object$({
+      requestRootId: requestContext.rootId,
+      requestId: requestContext.id,
+      requestName: requestContext.name,
+      ...(requestContext.userProfile?.sub ? {
+        requestUserSub: requestContext.userProfile.sub
+      } : {})
+    }))]);
+  }
+  const formatted = tsplus_module_4.logfmtLogger.log(fiberId, logLevel, message, cause, context, spans, annotations);
+  globalThis.console.log(formatted);
+});
+exports.logfmtLogger = logfmtLogger;
+const logFmt = tsplus_module_4.replace(tsplus_module_4.defaultLogger, logfmtLogger);
+exports.logFmt = logFmt;
+//# sourceMappingURL=logFmtLogger.cjs.map

package/_cjs/logger/logFmtLogger.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"logFmtLogger.cjs","names":["_shared","require","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","_interopRequireWildcard","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","logfmtLogger","tsplus_module_4","make","fiberId","logLevel","message","cause","context","spans","annotations","c","getRequestContext","requestContext","tsplus_module_1","getOrUndefined","tsplus_module_3","tsplus_module_2","RecordEntries","object$","requestRootId","rootId","requestId","id","requestName","name","userProfile","sub","requestUserSub","formatted","log","globalThis","console","exports","logFmt","replace","defaultLogger"],"sources":["../../_src/logger/logFmtLogger.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AAA+C,SAAAC,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAI,wBAAAC,GAAA,EAAAL,WAAA,SAAAA,WAAA,IAAAK,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAT,wBAAA,CAAAC,WAAA,OAAAQ,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AAExC,MAAMW,YAAY,GAAGC,eAAA,CAAAC,IAAA,CAC1B,CAACC,OAAO,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,KAAK,EAAEC,OAAO,EAAEC,KAAK,EAAEC,WAAW,KAAI;EACjE,MAAMC,CAAC,GAAG,IAAAC,yBAAiB,EAACJ,OAAO,CAAC;EACpC,MAAMK,cAAc,GAAAC,eAAA,CAAAC,cAAA,CAAGJ,CAAC,CAAM;EAC9B,IAAIE,cAAc,EAAE;IAClBH,WAAW,GAAGM,eAAA,CAAAb,IAAA,CAAa,GAAG,CAC5B,GAAGO,WAAW,EACd,GAAAO,eAAA,CAAAC,aAAA,CAAAD,eAAA,CAAAE,OAAA,CAAG;MACDC,aAAa,EAAEP,cAAc,CAACQ,MAAM;MACpCC,SAAS,EAAET,cAAc,CAACU,EAAE;MAC5BC,WAAW,EAAEX,cAAc,CAACY,IAAI;MAChC,IAAGZ,cAAc,CAACa,WAAW,EAAEC,GAAG,GAAG;QAAEC,cAAc,EAAEf,cAAc,CAACa,WAAW,CAACC;MAAG,CAAE,GAAG,EAAE;KAC7F,EAES,CACX,CAAC;;EAEJ,MAAME,SAAS,GAAG3B,eAAA,CAAAD,YAAA,CAAoB6B,GAAG,CAAC1B,OAAO,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,KAAK,EAAEC,OAAO,EAAEC,KAAK,EAAEC,WAAW,CAAC;EACzGqB,UAAU,CAACC,OAAO,CAACF,GAAG,CAACD,SAAS,CAAC;AACnC,CAAC,CACF;AAAAI,OAAA,CAAAhC,YAAA,GAAAA,YAAA;AAEM,MAAMiC,MAAM,GAAGhC,eAAA,CAAAiC,OAAA,CAAAjC,eAAA,CAAAkC,aAAA,EAAqCnC,YAAY,CAAC;AAAAgC,OAAA,CAAAC,MAAA,GAAAA,MAAA"}

package/_cjs/logger/shared.cjs

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getRequestContext = getRequestContext;
+var tsplus_module_1 = _interopRequireWildcard(require("@effect/io/FiberRef"));
+var tsplus_module_2 = _interopRequireWildcard(require("@effect/data/Context"));
+var tsplus_module_3 = _interopRequireWildcard(require("@effect/io/Effect"));
+var tsplus_module_4 = _interopRequireWildcard(require("@effect/data/Option"));
+var FiberRefs = _interopRequireWildcard(require("@effect/io/FiberRefs"));
+var _RequestContextContainer = require("../services/RequestContextContainer.cjs");
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function getRequestContext(context) {
+  const ctx = FiberRefs.getOrDefault(context, tsplus_module_1.currentContext);
+  // TODO: use `RequestContext.Tag` once switched?
+  const a = tsplus_module_2.getOption(ctx, _RequestContextContainer.RequestContextContainer);
+  const c = tsplus_module_4.map(a, _ => tsplus_module_3.runSync(_.requestContext));
+  return c;
+}
+//# sourceMappingURL=shared.cjs.map

package/_cjs/logger/shared.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"shared.cjs","names":["FiberRefs","_interopRequireWildcard","require","_RequestContextContainer","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","getRequestContext","context","ctx","getOrDefault","tsplus_module_1","currentContext","a","tsplus_module_2","getOption","RequestContextContainer","c","tsplus_module_4","map","_","tsplus_module_3","runSync","requestContext"],"sources":["../../_src/logger/shared.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;AAAA,IAAAA,SAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,wBAAA,GAAAD,OAAA;AAAgF,SAAAE,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAJ,wBAAAQ,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AAE1E,SAAUW,iBAAiBA,CAACC,OAA4B;EAC5D,MAAMC,GAAG,GAAG5B,SAAS,CAAC6B,YAAY,CAACF,OAAO,EAAAG,eAAA,CAAAC,cAAA,CAA0B;EACpE;EACA,MAAMC,CAAC,GAAGC,eAAA,CAAAC,SAAA,CAAAN,GAAG,EAAWO,gDAAuB,CAAC;EAChD,MAAMC,CAAC,GAAGC,eAAA,CAAAC,GAAA,CAAAN,CAAC,EAAMO,CAAC,IAAIC,eAAA,CAAAC,OAAA,CAACF,CAAC,CAACG,cAAc,CAAQ,CAAC;EAChD,OAAON,CAAC;AACV"}

package/_cjs/services/RequestContextContainer.cjs

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.RequestContextContainerImpl = exports.RequestContextContainer = void 0;
+exports.RequestContextContainerImpl = exports.RequestContextContainer = exports.RCTag = void 0;
 exports.live = live;
 var tsplus_module_1 = _interopRequireWildcard(require("@effect-app/prelude/service"));
 var tsplus_module_2 = _interopRequireWildcard(require("@effect/data/Option"));
@@ -57,4 +57,7 @@ _RequestContextContainerImpl_ref = new WeakMap();
 function live(inp) {
   return new RequestContextContainerImpl(inp);
 }
+/** @tsplus static RequestContext.Ops Tag */
+const RCTag = tsplus_module_5.Tag();
+exports.RCTag = RCTag;
 //# sourceMappingURL=RequestContextContainer.cjs.map

package/_cjs/services/RequestContextContainer.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"RequestContextContainer.cjs","names":["_RequestContext","require","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","_interopRequireWildcard","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","RequestContextContainer","tsplus_module_1","TagClass","flatMap","_","requestContext","getOption","tsplus_module_3","contextWith","tsplus_module_5","tsplus_module_2","isSome","map","value","some","sync","tsplus_module_4","none","exports","RequestContextContainerImpl","constructor","inp","_RequestContextContainerImpl_ref","update","f","tsplus_module_6","getAndUpdate","__classPrivateFieldGet","__classPrivateFieldSet","unsafeMake","RequestContext","live"],"sources":["../../_src/services/RequestContextContainer.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;AAAA,IAAAA,eAAA,GAAAC,OAAA;AAAqD,SAAAC,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAI,wBAAAC,GAAA,EAAAL,WAAA,SAAAA,WAAA,IAAAK,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAT,wBAAA,CAAAC,WAAA,OAAAQ,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;;;;;;;;;;;;;AAErD;;;AAGM,MAAgBW,uBAAwB,SAAQC,eAAA,CAAAC,QAAQ,EAA2B;EAGvF,WAAWd,GAAGA,CAAA;IACZ,OAAOY,uBAAuB,CAACG,OAAO,CAAEC,CAAC,IAAKA,CAAC,CAACC,cAAc,CAAC;EACjE;EACA,WAAWC,SAASA,CAAA;IAClB,OAAOC,eAAA,CAAAJ,OAAA,CAAAI,eAAA,CAAAC,WAAA,CACSJ,CAAiB,IAAKK,eAAA,CAAAH,SAAA,CAAkBF,CAAC,EAAEJ,uBAAuB,CAAC,CAAC,EACxEK,cAAc,IACtBK,eAAA,CAAAC,MAAA,CAAAN,cAAc,CAAS,GACnBE,eAAA,CAAAK,GAAA,CAAAP,cAAc,CAACQ,KAAK,CAACR,cAAc,EAAAK,eAAA,CAAAI,IAAA,CAAiB,GACpDP,eAAA,CAAAQ,IAAA,OAAAC,eAAA,CAAAC,IAAA,CAAmB,CACxB;EACL;;AACDC,OAAA,CAAAlB,uBAAA,GAAAA,uBAAA;AAEK,MAAOmB,2BAA4B,SAAQnB,uBAAuB;EAEtEoB,YAAYC,GAAoC;IAC9C,KAAK,EAAE;IAFTC,gCAAA,CAAAvB,GAAA;IAUS,KAAAwB,MAAM,GAAIC,CAAwC,IAAKC,eAAA,CAAAC,YAAA,CAAAC,sBAAA,KAAI,EAAAL,gCAAA,MAAK,EAAcE,CAAC,CAAC;IAPvFI,sBAAA,KAAI,EAAAN,gCAAA,EAAQG,eAAA,CAAAI,UAAA,CAA+B,IAAIC,8BAAc,CAACT,GAAG,CAAC,CAAC;EACrE;EAEA,IAAahB,cAAcA,CAAA;IACzB,OAAAoB,eAAA,CAAArC,GAAA,CAAOuC,sBAAA,KAAI,EAAAL,gCAAA,MAAK;EAClB;;AAGDJ,OAAA,CAAAC,2BAAA,GAAAA,2BAAA;;AAED;;;AAGM,SAAUY,IAAIA,CAACV,GAAoC;EACvD,OAAO,IAAIF,2BAA2B,CAACE,GAAG,CAAC;AAC7C"}
+{"version":3,"file":"RequestContextContainer.cjs","names":["_RequestContext","require","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","_interopRequireWildcard","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","RequestContextContainer","tsplus_module_1","TagClass","flatMap","_","requestContext","getOption","tsplus_module_3","contextWith","tsplus_module_5","tsplus_module_2","isSome","map","value","some","sync","tsplus_module_4","none","exports","RequestContextContainerImpl","constructor","inp","_RequestContextContainerImpl_ref","update","f","tsplus_module_6","getAndUpdate","__classPrivateFieldGet","__classPrivateFieldSet","unsafeMake","RequestContext","live","RCTag","Tag"],"sources":["../../_src/services/RequestContextContainer.ts"],"sourcesContent":[null],"mappings":"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"}

package/_src/api/routing.ts

@@ -365,7 +365,6 @@ export function makeRequestHandler<
                 const r2 = makeMiddlewareContext
                   ? restoreFromRequestContext
                     .zipRight(r
-                      .setupRequestFrom
                       // the db namespace must be restored, before calling provide here
                       .provideSomeContextEffect(makeMiddlewareContext(req, res)))
                   : restoreFromRequestContext
@@ -418,7 +417,6 @@ export function makeRequestHandler<
                   })
                 )
                 .tapErrorCause((cause) => Effect(console.error("Error occurred while reporting error", cause)))
-                .setupRequestFrom
             )
             .tap(() =>
               RequestSettings
@@ -436,9 +434,8 @@ export function makeRequestHandler<
                       : undefined
                   }))
                 })
-                .setupRequestFrom
             )
-            .setupRequestFrom
+            .logSpan("request")
             .provideService(RequestContextContainer, new RequestContextContainerImpl(requestContext)) // otherwise external error reporter breaks.
         )
     )

package/_src/api/setupRequest.ts

@@ -2,32 +2,6 @@ import { RequestId } from "@effect-app/prelude/ids"
 import { RequestContext } from "../RequestContext.js"
 import { RequestContextContainer, RequestContextContainerImpl } from "../services/RequestContextContainer.js"
 
-/**
- * @tsplus fluent effect/io/Effect setupRequest
- */
-export function setupRequest<R, E, A>(self: Effect<R, E, A>, requestContext: RequestContext) {
-  return Debug.untraced(() =>
-    pipe(
-      self.logSpan("request"),
-      Effect.logAnnotates({
-        requestRootId: requestContext.rootId,
-        requestId: requestContext.id,
-        requestName: requestContext.name,
-        ...requestContext.userProfile?.sub ? { requestUserSub: requestContext.userProfile.sub } : {}
-      })
-    )
-  )
-}
-
-/**
- * @tsplus getter effect/io/Effect setupRequestFrom
- */
-export function setupRequestFrom<R, E, A>(self: Effect<R, E, A>) {
-  return Debug.untraced(() =>
-    RequestContextContainer.get.flatMap((requestContext) => self.setupRequest(requestContext))
-  )
-}
-
 /**
  * @tsplus fluent effect/io/Effect setupRequestFromWith
  */
@@ -35,7 +9,7 @@ export function setupReq3<R, E, A>(self: Effect<R, E, A>, name: string) {
   return Debug.untraced(() =>
     makeInternalRequestContext(name).flatMap((rc) =>
       self
-        .setupRequestFrom
+        .logSpan("request")
         .provideService(RequestContextContainer, new RequestContextContainerImpl(rc))
     )
   )

package/_src/logger/jsonLogger.ts

@@ -0,0 +1,32 @@
+import { getRequestContext } from "./shared.js"
+
+export const jsonLogger = Logger.make<string, void>(
+  (fiberId, logLevel, message, cause, context, spans, annotations) => {
+    const now = new Date()
+    const nowMillis = now.getTime()
+
+    const c = getRequestContext(context)
+
+    const data = {
+      timestamp: now,
+      level: logLevel.label,
+      fiber: fiberId.threadName,
+      message,
+      request: c.value,
+      cause: cause != null && cause != Cause.empty ? cause.pretty : undefined,
+      spans: Chunk.isNonEmpty(spans)
+        ? spans.map((_) => ({ label: _.label, timing: nowMillis - _.startTime })).toArray
+        : undefined,
+      annotations: annotations.size > 0
+        ? [...annotations].reduce((prev, [k, v]) => {
+          prev[k] = v
+          return prev
+        }, {} as Record<string, string>)
+        : undefined
+    }
+
+    globalThis.console.log(JSON.stringify(data))
+  }
+)
+
+export const logJson = Logger.replace(Logger.defaultLogger, jsonLogger)

package/_src/logger/logFmtLogger.ts

@@ -0,0 +1,25 @@
+import { getRequestContext } from "./shared.js"
+
+export const logfmtLogger = Logger.make<string, void>(
+  (fiberId, logLevel, message, cause, context, spans, annotations) => {
+    const c = getRequestContext(context)
+    const requestContext = c.value
+    if (requestContext) {
+      annotations = HashMap.make(...[
+        ...annotations,
+        ...{
+          requestRootId: requestContext.rootId,
+          requestId: requestContext.id,
+          requestName: requestContext.name,
+          ...requestContext.userProfile?.sub ? { requestUserSub: requestContext.userProfile.sub } : {}
+        }
+          .$$
+          .entries
+      ])
+    }
+    const formatted = Logger.logfmtLogger.log(fiberId, logLevel, message, cause, context, spans, annotations)
+    globalThis.console.log(formatted)
+  }
+)
+
+export const logFmt = Logger.replace(Logger.defaultLogger, logfmtLogger)

package/_src/logger/shared.ts

@@ -0,0 +1,10 @@
+import * as FiberRefs from "@effect/io/FiberRefs"
+import { RequestContextContainer } from "../services/RequestContextContainer.js"
+
+export function getRequestContext(context: FiberRefs.FiberRefs) {
+  const ctx = FiberRefs.getOrDefault(context, FiberRef.currentContext)
+  // TODO: use `RequestContext.Tag` once switched?
+  const a = ctx.getOption(RequestContextContainer)
+  const c = a.map((_) => _.requestContext.runSync)
+  return c
+}

package/_src/services/RequestContextContainer.ts

@@ -40,3 +40,6 @@ export class RequestContextContainerImpl extends RequestContextContainer {
 export function live(inp: RequestContext.ConstructorInput) {
   return new RequestContextContainerImpl(inp)
 }
+
+/** @tsplus static RequestContext.Ops Tag */
+export const RCTag = Tag<RequestContext>()

package/dist/api/express/makeOpenApiSpecs.d.ts

@@ -18,7 +18,7 @@ export declare function makeOpenApiSpecs(rdescs: Iterable<RouteDescriptorAny>, i
         version: string;
     };
     tags: never[];
-    paths: Record<string, Record<"PATCH" | "GET" | "PUT" | "POST" | "DELETE", {
+    paths: Record<string, Record<"PATCH" | "GET" | "POST" | "PUT" | "DELETE", {
         [x: string]: {
             responses: any;
             tags: readonly string[] | undefined;

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

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

package/dist/api/routing.js

@@ -5,9 +5,8 @@ import * as tsplus_module_4 from "@effect-app/core/Effect";
 import * as tsplus_module_5 from "@effect-app/schema/ext";
 import * as tsplus_module_6 from "@effect-app/prelude/utils";
 import * as tsplus_module_7 from "@effect-app/prelude/_ext/misc";
-import * as tsplus_module_8 from "@effect-app/infra/api/setupRequest";
-import * as tsplus_module_9 from "@effect-app/core/Option";
-import * as tsplus_module_10 from "@effect/data/Debug";
+import * as tsplus_module_8 from "@effect-app/core/Option";
+import * as tsplus_module_9 from "@effect/data/Debug";
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import * as Ex from "@effect-app/infra-adapters/express";
 import { RequestId } from "@effect-app/prelude/ids";
@@ -117,7 +116,7 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
         return requestContext;
     }
     return (req, res) => {
-        return tsplus_module_10.untraced((restore) => tsplus_module_3.flatMap(tsplus_module_3.all({
+        return tsplus_module_9.untraced((restore) => tsplus_module_3.flatMap(tsplus_module_3.all({
             requestContext: tsplus_module_3.sync(() => {
                 const requestContext = makeContext(req);
                 if (req.method === "GET") {
@@ -127,7 +126,7 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
                 return requestContext;
             }),
             pars: getParams(req)
-        }), ({ pars, requestContext }) => tsplus_module_3.provideService(tsplus_module_8.setupRequestFrom(tsplus_module_3.tap(tsplus_module_3.tapErrorCause(tsplus_module_3.zipRight(tsplus_module_3.flatMap(tsplus_module_1.get(RequestSettings), (s) => tsplus_module_7.logAnnotates({
+        }), ({ pars, requestContext }) => tsplus_module_3.provideService(tsplus_module_3.logSpan(tsplus_module_3.tap(tsplus_module_3.tapErrorCause(tsplus_module_3.zipRight(tsplus_module_3.flatMap(tsplus_module_1.get(RequestSettings), (s) => tsplus_module_7.logAnnotates({
             method: req.method,
             path: req.originalUrl,
             ...s.verbose
@@ -144,9 +143,9 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
         tsplus_module_3.logInfo("Incoming request"))), tsplus_module_3.suspend(() => {
             const handleRequest = tsplus_module_3.flatMap(tsplus_module_3.map(parseRequest(req), ({ body, path, query }) => {
                 const hn = {
-                    ...tsplus_module_9.getOrUndefined(body),
-                    ...tsplus_module_9.getOrUndefined(query),
-                    ...tsplus_module_9.getOrUndefined(path)
+                    ...tsplus_module_8.getOrUndefined(body),
+                    ...tsplus_module_8.getOrUndefined(query),
+                    ...tsplus_module_8.getOrUndefined(path)
                 };
                 return hn;
             }), (parsedReq) => tsplus_module_3.flatMap(restore(() => handle(parsedReq))(), (r) => respond(parsedReq, res, r)));
@@ -154,12 +153,14 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
             const r = req.method !== "GET" ? tsplus_module_3.uninterruptible(handleRequest) : handleRequest; // .instrument("Performance.RequestResponse")
             // the first log entry should be of the request start.
             const r2 = makeMiddlewareContext
-                ? tsplus_module_3.zipRight(restoreFromRequestContext, tsplus_module_4.provideSomeContextEffect(makeMiddlewareContext(req, res))(tsplus_module_8.setupRequestFrom(r)))
+                ? tsplus_module_3.zipRight(restoreFromRequestContext, tsplus_module_4.provideSomeContextEffect(makeMiddlewareContext(req, res))(r
+                // the db namespace must be restored, before calling provide here
+                ))
                 : tsplus_module_3.zipRight(restoreFromRequestContext
                 // PR is not relevant here
                 , r);
             return errorHandler(req, res, r2);
-        })), (cause) => tsplus_module_8.setupRequestFrom(tsplus_module_3.tapErrorCause(tsplus_module_3.allPar(tsplus_module_3.sync(() => res.status(500).send()), tsplus_module_3.sync(() => reportRequestError(cause, {
+        })), (cause) => tsplus_module_3.tapErrorCause(tsplus_module_3.allPar(tsplus_module_3.sync(() => res.status(500).send()), tsplus_module_3.sync(() => reportRequestError(cause, {
             path: req.originalUrl,
             method: req.method
         })), tsplus_module_3.suspend(() => {
@@ -180,7 +181,7 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
                     return prev;
                 }, {})))
             })(tsplus_module_3.logErrorCauseMessage("Finished request", cause));
-        })), (cause) => tsplus_module_3.sync(() => console.error("Error occurred while reporting error", cause))))), () => tsplus_module_8.setupRequestFrom(tsplus_module_3.flatMap(tsplus_module_1.get(RequestSettings), (s) => {
+        })), (cause) => tsplus_module_3.sync(() => console.error("Error occurred while reporting error", cause)))), () => tsplus_module_3.flatMap(tsplus_module_1.get(RequestSettings), (s) => {
             const headers = res.getHeaders();
             return tsplus_module_7.logAnnotates({
                 method: req.method,
@@ -192,7 +193,7 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
                     }
                     : undefined
             })(tsplus_module_3.logInfo("Finished request"));
-        })))), RequestContextContainer, new RequestContextContainerImpl(requestContext)) // otherwise external error reporter breaks.
+        })), "request"), RequestContextContainer, new RequestContextContainerImpl(requestContext)) // otherwise external error reporter breaks.
         ));
     };
 }
@@ -255,4 +256,4 @@ export function matchResource(mod) {
         return handler;
     };
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}

package/dist/api/setupRequest.d.ts

@@ -1,16 +1,5 @@
 import { Effect } from "@effect/io/Effect";
-import { RequestContext } from "../RequestContext.js";
 import { RequestContextContainer } from "../services/RequestContextContainer.js";
-/**
- * @tsplus fluent effect/io/Effect setupRequest
- * @tsplus location "@effect-app/infra/api/setupRequest"
- */
-export declare function setupRequest<R, E, A>(self: Effect<R, E, A>, requestContext: RequestContext): import("@effect/io/Effect").Effect<R, E, A>;
-/**
- * @tsplus getter effect/io/Effect setupRequestFrom
- * @tsplus location "@effect-app/infra/api/setupRequest"
- */
-export declare function setupRequestFrom<R, E, A>(self: Effect<R, E, A>): import("@effect/io/Effect").Effect<RequestContextContainer | R, E, A>;
 /**
  * @tsplus fluent effect/io/Effect setupRequestFromWith
  * @tsplus location "@effect-app/infra/api/setupRequest"

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

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

package/dist/api/setupRequest.js

@@ -1,35 +1,14 @@
 import * as tsplus_module_1 from "@effect/io/Effect";
-import * as tsplus_module_2 from "@effect-app/prelude/_ext/misc";
-import * as tsplus_module_3 from "@effect-app/core/Function";
-import * as tsplus_module_4 from "@effect/data/Debug";
-import * as tsplus_module_5 from "@effect-app/prelude/schema";
-export const setupRequest = setupRequest_1;
-export const setupRequestFrom = setupRequestFrom_1;
+import * as tsplus_module_2 from "@effect/data/Debug";
+import * as tsplus_module_3 from "@effect-app/prelude/schema";
 import { RequestId } from "@effect-app/prelude/ids";
 import { RequestContext } from "../RequestContext.js";
 import { RequestContextContainer, RequestContextContainerImpl } from "../services/RequestContextContainer.js";
-/**
- * @tsplus fluent effect/io/Effect setupRequest
- */
-function setupRequest_1(self, requestContext) {
-    return tsplus_module_4.untraced(() => tsplus_module_3.pipe(tsplus_module_1.logSpan(self, "request"), tsplus_module_2.logAnnotates({
-        requestRootId: requestContext.rootId,
-        requestId: requestContext.id,
-        requestName: requestContext.name,
-        ...requestContext.userProfile?.sub ? { requestUserSub: requestContext.userProfile.sub } : {}
-    })));
-}
-/**
- * @tsplus getter effect/io/Effect setupRequestFrom
- */
-function setupRequestFrom_1(self) {
-    return tsplus_module_4.untraced(() => tsplus_module_1.flatMap(RequestContextContainer.get, (requestContext) => setupRequest_1(self, requestContext)));
-}
 /**
  * @tsplus fluent effect/io/Effect setupRequestFromWith
  */
 export function setupReq3(self, name) {
-    return tsplus_module_4.untraced(() => tsplus_module_1.flatMap(makeInternalRequestContext(name), (rc) => tsplus_module_1.provideService(setupRequestFrom_1(self), RequestContextContainer, new RequestContextContainerImpl(rc))));
+    return tsplus_module_2.untraced(() => tsplus_module_1.flatMap(makeInternalRequestContext(name), (rc) => tsplus_module_1.provideService(tsplus_module_1.logSpan(self, "request"), RequestContextContainer, new RequestContextContainerImpl(rc))));
 }
 function makeInternalRequestContext(name) {
     return tsplus_module_1.sync(() => {
@@ -38,8 +17,8 @@ function makeInternalRequestContext(name) {
             id,
             rootId: id,
             locale: "en",
-            name: tsplus_module_5.ReasonableString(name)
+            name: tsplus_module_3.ReasonableString(name)
         });
     });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvc2V0dXBSZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O2FBT2dCLFlBQVk7YUFpQlosZ0JBQWdCO0FBeEJoQyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0seUJBQXlCLENBQUE7QUFDbkQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHNCQUFzQixDQUFBO0FBQ3JELE9BQU8sRUFBRSx1QkFBdUIsRUFBRSwyQkFBMkIsRUFBRSxNQUFNLHdDQUF3QyxDQUFBO0FBRTdHOztHQUVHO0FBQ0gsd0JBQXNDLElBQXFCLEVBQUUsY0FBOEI7SUFDekYsT0FBTyx5QkFBZSxHQUFHLEVBQUUsQ0FDekIsZ0JBQUEsSUFBSSxDQUNGLHdCQUFBLElBQUksRUFBUyxTQUFTLENBQUMsRUFDdkIsNkJBQW9CO1FBQ2xCLGFBQWEsRUFBRSxjQUFjLENBQUMsTUFBTTtRQUNwQyxTQUFTLEVBQUUsY0FBYyxDQUFDLEVBQUU7UUFDNUIsV0FBVyxFQUFFLGNBQWMsQ0FBQyxJQUFJO1FBQ2hDLEdBQUcsY0FBYyxDQUFDLFdBQVcsRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsY0FBYyxFQUFFLGNBQWMsQ0FBQyxXQUFXLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUU7S0FDN0YsQ0FBQyxDQUNILENBQ0YsQ0FBQTtBQUNILENBQUM7QUFFRDs7R0FFRztBQUNILDRCQUEwQyxJQUFxQjtJQUM3RCxPQUFPLHlCQUFlLEdBQUcsRUFBRSxDQUN6Qix3QkFBQSx1QkFBdUIsQ0FBQyxHQUFHLEVBQVMsQ0FBQyxjQUFjLEVBQUUsRUFBRSxDQUFDLGVBQUEsSUFBSSxFQUFjLGNBQWMsQ0FBQyxDQUFDLENBQzNGLENBQUE7QUFDSCxDQUFDO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFVBQVUsU0FBUyxDQUFVLElBQXFCLEVBQUUsSUFBWTtJQUNwRSxPQUFPLHlCQUFlLEdBQUcsRUFBRSxDQUN6Qix3QkFBQSwwQkFBMEIsQ0FBQyxJQUFJLENBQUMsRUFBUyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQzlDLGtEQUFBLElBQUksR0FFYyx1QkFBdUIsRUFBRSxJQUFJLDJCQUEyQixDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQ2hGLENBQ0YsQ0FBQTtBQUNILENBQUM7QUFFRCxTQUFTLDBCQUEwQixDQUFDLElBQVk7SUFDOUMsT0FBTyxxQkFBWSxHQUFHLEVBQUU7UUFDdEIsTUFBTSxFQUFFLEdBQUcsU0FBUyxDQUFDLElBQUksRUFBRSxDQUFBO1FBQzNCLE9BQU8sSUFBSSxjQUFjLENBQUM7WUFDeEIsRUFBRTtZQUNGLE1BQU0sRUFBRSxFQUFFO1lBQ1YsTUFBTSxFQUFFLElBQUk7WUFDWixJQUFJLEVBQUUsZ0JBQUEsZ0JBQWdCLENBQUMsSUFBSSxDQUFDO1NBQzdCLENBQUMsQ0FBQTtJQUNKLENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvc2V0dXBSZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUNuRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFDckQsT0FBTyxFQUFFLHVCQUF1QixFQUFFLDJCQUEyQixFQUFFLE1BQU0sd0NBQXdDLENBQUE7QUFFN0c7O0dBRUc7QUFDSCxNQUFNLFVBQVUsU0FBUyxDQUFVLElBQXFCLEVBQUUsSUFBWTtJQUNwRSxPQUFPLHlCQUFlLEdBQUcsRUFBRSxDQUN6Qix3QkFBQSwwQkFBMEIsQ0FBQyxJQUFJLENBQUMsRUFBUyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQzlDLCtCQUFBLHdCQUFBLElBQUksRUFDTyxTQUFTLENBQUMsRUFDSCx1QkFBdUIsRUFBRSxJQUFJLDJCQUEyQixDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQ2hGLENBQ0YsQ0FBQTtBQUNILENBQUM7QUFFRCxTQUFTLDBCQUEwQixDQUFDLElBQVk7SUFDOUMsT0FBTyxxQkFBWSxHQUFHLEVBQUU7UUFDdEIsTUFBTSxFQUFFLEdBQUcsU0FBUyxDQUFDLElBQUksRUFBRSxDQUFBO1FBQzNCLE9BQU8sSUFBSSxjQUFjLENBQUM7WUFDeEIsRUFBRTtZQUNGLE1BQU0sRUFBRSxFQUFFO1lBQ1YsTUFBTSxFQUFFLElBQUk7WUFDWixJQUFJLEVBQUUsZ0JBQUEsZ0JBQWdCLENBQUMsSUFBSSxDQUFDO1NBQzdCLENBQUMsQ0FBQTtJQUNKLENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyJ9

package/dist/logger/jsonLogger.d.ts

@@ -0,0 +1,3 @@
+export declare const jsonLogger: import("@effect/io/Logger").Logger<string, void>;
+export declare const logJson: import("@effect/io/Layer").Layer<never, never, never>;
+//# sourceMappingURL=jsonLogger.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"jsonLogger.d.ts","sourceRoot":"","sources":["../../_src/logger/jsonLogger.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU,kDA2BtB,CAAA;AAED,eAAO,MAAM,OAAO,uDAAmD,CAAA"}

package/dist/logger/jsonLogger.js

@@ -0,0 +1,32 @@
+import * as tsplus_module_1 from "@effect/io/Fiber/Id";
+import * as tsplus_module_2 from "@effect-app/core/Option";
+import * as tsplus_module_3 from "@effect/io/Cause";
+import * as tsplus_module_4 from "@effect/data/Chunk";
+import * as tsplus_module_5 from "@effect-app/core/Chunk";
+import * as tsplus_module_6 from "@effect/data/HashMap";
+import * as tsplus_module_7 from "@effect/io/Logger";
+import { getRequestContext } from "./shared.js";
+export const jsonLogger = tsplus_module_7.make((fiberId, logLevel, message, cause, context, spans, annotations) => {
+    const now = new Date();
+    const nowMillis = now.getTime();
+    const c = getRequestContext(context);
+    const data = {
+        timestamp: now,
+        level: logLevel.label,
+        fiber: tsplus_module_1.threadName(fiberId),
+        message,
+        request: tsplus_module_2.getOrUndefined(c),
+        cause: cause != null && cause != tsplus_module_3.empty ? tsplus_module_3.pretty(cause) : undefined,
+        spans: tsplus_module_4.isNonEmpty(spans)
+            ? tsplus_module_5.toArray(tsplus_module_4.map(spans, (_) => ({ label: _.label, timing: nowMillis - _.startTime }))) : undefined,
+        annotations: tsplus_module_6.size(annotations) > 0
+            ? [...annotations].reduce((prev, [k, v]) => {
+                prev[k] = v;
+                return prev;
+            }, {})
+            : undefined
+    };
+    globalThis.console.log(JSON.stringify(data));
+});
+export const logJson = tsplus_module_7.replace(tsplus_module_7.defaultLogger, jsonLogger);
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoianNvbkxvZ2dlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL19zcmMvbG9nZ2VyL2pzb25Mb2dnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7OztBQUFBLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUUvQyxNQUFNLENBQUMsTUFBTSxVQUFVLEdBQUcscUJBQ3hCLENBQUMsT0FBTyxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsV0FBVyxFQUFFLEVBQUU7SUFDakUsTUFBTSxHQUFHLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQTtJQUN0QixNQUFNLFNBQVMsR0FBRyxHQUFHLENBQUMsT0FBTyxFQUFFLENBQUE7SUFFL0IsTUFBTSxDQUFDLEdBQUcsaUJBQWlCLENBQUMsT0FBTyxDQUFDLENBQUE7SUFFcEMsTUFBTSxJQUFJLEdBQUc7UUFDWCxTQUFTLEVBQUUsR0FBRztRQUNkLEtBQUssRUFBRSxRQUFRLENBQUMsS0FBSztRQUNyQixLQUFLLDZCQUFFLE9BQU8sQ0FBVztRQUN6QixPQUFPO1FBQ1AsT0FBTyxpQ0FBRSxDQUFDLENBQU07UUFDaEIsS0FBSyxFQUFFLEtBQUssSUFBSSxJQUFJLElBQUksS0FBSyx5QkFBZSxDQUFDLENBQUMsd0JBQUMsS0FBSyxFQUFRLENBQUMsQ0FBQyxTQUFTO1FBQ3ZFLEtBQUssRUFBRSwyQkFBaUIsS0FBSyxDQUFDO1lBQzVCLENBQUMseUJBQUMsb0JBQUEsS0FBSyxFQUFLLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLFNBQVMsR0FBRyxDQUFDLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQyxFQUN6RSxDQUFDLENBQUMsU0FBUztRQUNiLFdBQVcsRUFBRSxxQkFBQSxXQUFXLElBQVEsQ0FBQztZQUMvQixDQUFDLENBQUMsQ0FBQyxHQUFHLFdBQVcsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFO2dCQUN6QyxJQUFJLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFBO2dCQUNYLE9BQU8sSUFBSSxDQUFBO1lBQ2IsQ0FBQyxFQUFFLEVBQTRCLENBQUM7WUFDaEMsQ0FBQyxDQUFDLFNBQVM7S0FDZCxDQUFBO0lBRUQsVUFBVSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFBO0FBQzlDLENBQUMsQ0FDRixDQUFBO0FBRUQsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFHLHVEQUFxQyxVQUFVLENBQUMsQ0FBQSJ9

package/dist/logger/logFmtLogger.d.ts

@@ -0,0 +1,3 @@
+export declare const logfmtLogger: import("@effect/io/Logger").Logger<string, void>;
+export declare const logFmt: import("@effect/io/Layer").Layer<never, never, never>;
+//# sourceMappingURL=logFmtLogger.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"logFmtLogger.d.ts","sourceRoot":"","sources":["../../_src/logger/logFmtLogger.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,YAAY,kDAoBxB,CAAA;AAED,eAAO,MAAM,MAAM,uDAAqD,CAAA"}

package/dist/logger/logFmtLogger.js

@@ -0,0 +1,24 @@
+import * as tsplus_module_1 from "@effect-app/core/Option";
+import * as tsplus_module_2 from "@effect-app/prelude/utils";
+import * as tsplus_module_3 from "@effect/data/HashMap";
+import * as tsplus_module_4 from "@effect/io/Logger";
+import { getRequestContext } from "./shared.js";
+export const logfmtLogger = tsplus_module_4.make((fiberId, logLevel, message, cause, context, spans, annotations) => {
+    const c = getRequestContext(context);
+    const requestContext = tsplus_module_1.getOrUndefined(c);
+    if (requestContext) {
+        annotations = tsplus_module_3.make(...[
+            ...annotations,
+            ...tsplus_module_2.RecordEntries(tsplus_module_2.object$({
+                requestRootId: requestContext.rootId,
+                requestId: requestContext.id,
+                requestName: requestContext.name,
+                ...requestContext.userProfile?.sub ? { requestUserSub: requestContext.userProfile.sub } : {}
+            }))
+        ]);
+    }
+    const formatted = tsplus_module_4.logfmtLogger.log(fiberId, logLevel, message, cause, context, spans, annotations);
+    globalThis.console.log(formatted);
+});
+export const logFmt = tsplus_module_4.replace(tsplus_module_4.defaultLogger, logfmtLogger);
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nRm10TG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9sb2dnZXIvbG9nRm10TG9nZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7QUFBQSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFFL0MsTUFBTSxDQUFDLE1BQU0sWUFBWSxHQUFHLHFCQUMxQixDQUFDLE9BQU8sRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLFdBQVcsRUFBRSxFQUFFO0lBQ2pFLE1BQU0sQ0FBQyxHQUFHLGlCQUFpQixDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQ3BDLE1BQU0sY0FBYyxrQ0FBRyxDQUFDLENBQU0sQ0FBQTtJQUM5QixJQUFJLGNBQWMsRUFBRTtRQUNsQixXQUFXLEdBQUcscUJBQWEsR0FBRztZQUM1QixHQUFHLFdBQVc7WUFDZCx5REFBRztnQkFDRCxhQUFhLEVBQUUsY0FBYyxDQUFDLE1BQU07Z0JBQ3BDLFNBQVMsRUFBRSxjQUFjLENBQUMsRUFBRTtnQkFDNUIsV0FBVyxFQUFFLGNBQWMsQ0FBQyxJQUFJO2dCQUNoQyxHQUFHLGNBQWMsQ0FBQyxXQUFXLEVBQUUsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLGNBQWMsRUFBRSxjQUFjLENBQUMsV0FBVyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFO2FBQzdGLEVBRVM7U0FDWCxDQUFDLENBQUE7S0FDSDtJQUNELE1BQU0sU0FBUyxHQUFHLDZCQUFvQixHQUFHLENBQUMsT0FBTyxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsV0FBVyxDQUFDLENBQUE7SUFDekcsVUFBVSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUE7QUFDbkMsQ0FBQyxDQUNGLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxNQUFNLEdBQUcsdURBQXFDLFlBQVksQ0FBQyxDQUFBIn0=

package/dist/logger/shared.d.ts

@@ -0,0 +1,3 @@
+import * as FiberRefs from "@effect/io/FiberRefs";
+export declare function getRequestContext(context: FiberRefs.FiberRefs): import("@effect/data/Option").Option<import("../RequestContext.js").RequestContext>;
+//# sourceMappingURL=shared.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../_src/logger/shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,sBAAsB,CAAA;AAGjD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,SAAS,CAAC,SAAS,uFAM7D"}

package/dist/logger/shared.js

@@ -0,0 +1,14 @@
+import * as tsplus_module_1 from "@effect/io/FiberRef";
+import * as tsplus_module_2 from "@effect/data/Context";
+import * as tsplus_module_3 from "@effect/io/Effect";
+import * as tsplus_module_4 from "@effect/data/Option";
+import * as FiberRefs from "@effect/io/FiberRefs";
+import { RequestContextContainer } from "../services/RequestContextContainer.js";
+export function getRequestContext(context) {
+    const ctx = FiberRefs.getOrDefault(context, tsplus_module_1.currentContext);
+    // TODO: use `RequestContext.Tag` once switched?
+    const a = tsplus_module_2.getOption(ctx, RequestContextContainer);
+    const c = tsplus_module_4.map(a, (_) => tsplus_module_3.runSync(_.requestContext));
+    return c;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9sb2dnZXIvc2hhcmVkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7QUFBQSxPQUFPLEtBQUssU0FBUyxNQUFNLHNCQUFzQixDQUFBO0FBQ2pELE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHdDQUF3QyxDQUFBO0FBRWhGLE1BQU0sVUFBVSxpQkFBaUIsQ0FBQyxPQUE0QjtJQUM1RCxNQUFNLEdBQUcsR0FBRyxTQUFTLENBQUMsWUFBWSxDQUFDLE9BQU8saUNBQTBCLENBQUE7SUFDcEUsZ0RBQWdEO0lBQ2hELE1BQU0sQ0FBQyxHQUFHLDBCQUFBLEdBQUcsRUFBVyx1QkFBdUIsQ0FBQyxDQUFBO0lBQ2hELE1BQU0sQ0FBQyxHQUFHLG9CQUFBLENBQUMsRUFBSyxDQUFDLENBQUMsRUFBRSxFQUFFLHlCQUFDLENBQUMsQ0FBQyxjQUFjLENBQVEsQ0FBQyxDQUFBO0lBQ2hELE9BQU8sQ0FBQyxDQUFBO0FBQ1YsQ0FBQyJ9

package/dist/services/RepositoryBase.d.ts

@@ -103,7 +103,7 @@ export declare function makeRepo<PM extends {
             value: A_1;
             readonly S: PM;
         };
-    }) => Where | readonly [Where, ...Where[]], mode?: "or" | "and" | undefined) => Filter<PM>;
+    }) => Where | readonly [Where, ...Where[]], mode?: "and" | "or" | undefined) => Filter<PM>;
 };
 /**
  * @tsplus fluent Repository removeById

package/dist/services/RequestContextContainer.d.ts

@@ -29,5 +29,10 @@ export declare class RequestContextContainerImpl extends RequestContextContainer
  * @tsplus location "@effect-app/infra/services/RequestContextContainer"
  */
 export declare function live(inp: RequestContext.ConstructorInput): RequestContextContainerImpl;
+/**
+ * @tsplus static RequestContext.Ops Tag
+ * @tsplus location "@effect-app/infra/services/RequestContextContainer"
+ */
+export declare const RCTag: import("@effect/data/Context").Tag<RequestContext, RequestContext>;
 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,cAAc,EAAE,MAAM,sBAAsB,CAAA;;;;;;AAErD;;GAEG;AACH,8BAAsB,uBAAwB,SAAQ,4BAAmC;IACvF,QAAQ,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC,CAAA;IACtE,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,cAAc,KAAK,cAAc,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IACnG,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,uBAAuB,EAAE,KAAK,EAAE,cAAc,CAAC,CAEvE;IACD,MAAM,KAAK,SAAS,2GAQnB;CACF;AAED,qBAAa,2BAA4B,SAAQ,uBAAuB;;gBAE1D,GAAG,EAAE,cAAc,CAAC,gBAAgB;IAKhD,IAAa,cAAc,qEAE1B;IAEQ,MAAM,UAAW,cAAc,KAAK,cAAc,sEAA8B;CAC1F;;;;;AAKD,wBAAgB,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,gBAAgB,+BAExD"}
+{"version":3,"file":"RequestContextContainer.d.ts","sourceRoot":"","sources":["../../_src/services/RequestContextContainer.ts"],"names":[],"mappings":";;;;;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;;;;;;AAErD;;GAEG;AACH,8BAAsB,uBAAwB,SAAQ,4BAAmC;IACvF,QAAQ,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC,CAAA;IACtE,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,cAAc,KAAK,cAAc,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IACnG,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,uBAAuB,EAAE,KAAK,EAAE,cAAc,CAAC,CAEvE;IACD,MAAM,KAAK,SAAS,2GAQnB;CACF;AAED,qBAAa,2BAA4B,SAAQ,uBAAuB;;gBAE1D,GAAG,EAAE,cAAc,CAAC,gBAAgB;IAKhD,IAAa,cAAc,qEAE1B;IAEQ,MAAM,UAAW,cAAc,KAAK,cAAc,sEAA8B;CAC1F;;;;;AAKD,wBAAgB,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,gBAAgB,+BAExD;;;;;AAGD,eAAO,MAAM,KAAK,oEAAwB,CAAA"}

package/dist/services/RequestContextContainer.js

@@ -48,4 +48,6 @@ _RequestContextContainerImpl_ref = new WeakMap();
 export function live(inp) {
     return new RequestContextContainerImpl(inp);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHRDb250YWluZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9fc3JjL3NlcnZpY2VzL1JlcXVlc3RDb250ZXh0Q29udGFpbmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQTtBQUVyRDs7R0FFRztBQUNILE1BQU0sT0FBZ0IsdUJBQXdCLFNBQVEsZ0JBQUEsUUFBUSxFQUEyQjtJQUd2RixNQUFNLEtBQUssR0FBRztRQUNaLE9BQU8sdUJBQXVCLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsY0FBYyxDQUFDLENBQUE7SUFDakUsQ0FBQztJQUNELE1BQU0sS0FBSyxTQUFTO1FBQ2xCLE9BQU8sd0JBQUEsNEJBQ1EsQ0FBQyxDQUFpQixFQUFFLEVBQUUsQ0FBQywwQkFBa0IsQ0FBQyxFQUFFLHVCQUF1QixDQUFDLENBQUMsRUFDekUsQ0FBQyxjQUFjLEVBQUUsRUFBRSxDQUMxQix1QkFBQSxjQUFjLENBQVM7WUFDckIsQ0FBQyxDQUFDLG9CQUFBLGNBQWMsQ0FBQyxLQUFLLENBQUMsY0FBYyx1QkFBaUI7WUFDdEQsQ0FBQyxDQUFDLGdEQUFtQixDQUN4QixDQUFBO0lBQ0wsQ0FBQztDQUNGO0FBRUQsTUFBTSxPQUFPLDJCQUE0QixTQUFRLHVCQUF1QjtJQUV0RSxZQUFZLEdBQW9DO1FBQzlDLEtBQUssRUFBRSxDQUFBO1FBRlQsbURBQXlCO1FBVWhCLFdBQU0sR0FBRyxDQUFDLENBQXdDLEVBQUUsRUFBRSxDQUFDLDZCQUFBLHVCQUFBLElBQUksd0NBQUssRUFBYyxDQUFDLENBQUMsQ0FBQTtRQVB2Rix1QkFBQSxJQUFJLG9DQUFRLDJCQUErQixJQUFJLGNBQWMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxNQUFBLENBQUE7SUFDckUsQ0FBQztJQUVELElBQWEsY0FBYztRQUN6QiwyQkFBTyx1QkFBQSxJQUFJLHdDQUFLLEVBQUk7SUFDdEIsQ0FBQztDQUdGOztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLElBQUksQ0FBQyxHQUFvQztJQUN2RCxPQUFPLElBQUksMkJBQTJCLENBQUMsR0FBRyxDQUFDLENBQUE7QUFDN0MsQ0FBQyJ9
+/** @tsplus static RequestContext.Ops Tag */
+export const RCTag = tsplus_module_5.Tag();
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHRDb250YWluZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9fc3JjL3NlcnZpY2VzL1JlcXVlc3RDb250ZXh0Q29udGFpbmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQTtBQUVyRDs7R0FFRztBQUNILE1BQU0sT0FBZ0IsdUJBQXdCLFNBQVEsZ0JBQUEsUUFBUSxFQUEyQjtJQUd2RixNQUFNLEtBQUssR0FBRztRQUNaLE9BQU8sdUJBQXVCLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsY0FBYyxDQUFDLENBQUE7SUFDakUsQ0FBQztJQUNELE1BQU0sS0FBSyxTQUFTO1FBQ2xCLE9BQU8sd0JBQUEsNEJBQ1EsQ0FBQyxDQUFpQixFQUFFLEVBQUUsQ0FBQywwQkFBa0IsQ0FBQyxFQUFFLHVCQUF1QixDQUFDLENBQUMsRUFDekUsQ0FBQyxjQUFjLEVBQUUsRUFBRSxDQUMxQix1QkFBQSxjQUFjLENBQVM7WUFDckIsQ0FBQyxDQUFDLG9CQUFBLGNBQWMsQ0FBQyxLQUFLLENBQUMsY0FBYyx1QkFBaUI7WUFDdEQsQ0FBQyxDQUFDLGdEQUFtQixDQUN4QixDQUFBO0lBQ0wsQ0FBQztDQUNGO0FBRUQsTUFBTSxPQUFPLDJCQUE0QixTQUFRLHVCQUF1QjtJQUV0RSxZQUFZLEdBQW9DO1FBQzlDLEtBQUssRUFBRSxDQUFBO1FBRlQsbURBQXlCO1FBVWhCLFdBQU0sR0FBRyxDQUFDLENBQXdDLEVBQUUsRUFBRSxDQUFDLDZCQUFBLHVCQUFBLElBQUksd0NBQUssRUFBYyxDQUFDLENBQUMsQ0FBQTtRQVB2Rix1QkFBQSxJQUFJLG9DQUFRLDJCQUErQixJQUFJLGNBQWMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxNQUFBLENBQUE7SUFDckUsQ0FBQztJQUVELElBQWEsY0FBYztRQUN6QiwyQkFBTyx1QkFBQSxJQUFJLHdDQUFLLEVBQUk7SUFDdEIsQ0FBQztDQUdGOztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLElBQUksQ0FBQyxHQUFvQztJQUN2RCxPQUFPLElBQUksMkJBQTJCLENBQUMsR0FBRyxDQUFDLENBQUE7QUFDN0MsQ0FBQztBQUVELDRDQUE0QztBQUM1QyxNQUFNLENBQUMsTUFBTSxLQUFLLEdBQUcsZ0JBQUEsR0FBRyxFQUFrQixDQUFBIn0=

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

@@ -6,8 +6,8 @@ import type { DBRecord } from "./shared.js";
 import { OptimisticLockException } from "./shared.js";
 import * as simpledb from "./simpledb.js";
 export declare function createContext<TKey extends string, EA, A extends DBRecord<TKey>>(): <REncode, RDecode, EDecode>(type: string, encode: (record: A) => import("@effect/io/Effect").Effect<REncode, never, EA>, decode: (d: EA) => import("@effect/io/Effect").Effect<RDecode, EDecode, A>, indexes: IndexingPolicy) => import("@effect/io/Effect").Effect<Cosmos.CosmosClient, unknown, {
-    find: (id: string) => import("@effect/io/Effect").Effect<Cosmos.CosmosClient | RDecode | simpledb.RecordCache, unknown, import("@effect/data/Option").Option<A>>;
+    find: (id: string) => import("@effect/io/Effect").Effect<Cosmos.CosmosClient | simpledb.RecordCache | RDecode, unknown, import("@effect/data/Option").Option<A>>;
     findBy: (parameters: Record<string, string>) => import("@effect/io/Effect").Effect<Cosmos.CosmosClient, unknown, import("@effect/data/Option").Option<any>>;
-    save: (record: A) => import("@effect/io/Effect").Effect<Cosmos.CosmosClient | REncode | simpledb.RecordCache, OptimisticLockException, A>;
+    save: (record: A) => import("@effect/io/Effect").Effect<Cosmos.CosmosClient | simpledb.RecordCache | REncode, OptimisticLockException, A>;
 }>;
 //# sourceMappingURL=cosmosdb.d.ts.map

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

@@ -6,7 +6,7 @@ import * as simpledb from "./simpledb.js";
 export declare function createContext<TKey extends string, EA, A extends DBRecord<TKey>>(): <REncode, RDecode, EDecode>(type: string, encode: (record: A) => import("@effect/io/Effect").Effect<REncode, never, EA>, decode: (d: EA) => import("@effect/io/Effect").Effect<RDecode, EDecode, A>, schemaVersion: string, makeIndexKey: (r: A) => Index, dir?: string) => {
     find: (id: string) => import("@effect/io/Effect").Effect<simpledb.RecordCache | RDecode, simpledb.InvalidStateError, import("@effect/data/Option").Option<A>>;
     findByIndex: (index: Index) => import("@effect/io/Effect").Effect<never, never, import("@effect/data/Option").Option<TKey & {}>>;
-    save: (record: A) => import("@effect/io/Effect").Effect<simpledb.RecordCache | REncode, import("./shared.js").OptimisticLockException | simpledb.InvalidStateError | CouldNotAquireDbLockException, A>;
+    save: (record: A) => import("@effect/io/Effect").Effect<simpledb.RecordCache | REncode, CouldNotAquireDbLockException | import("./shared.js").OptimisticLockException | simpledb.InvalidStateError, A>;
 };
 export declare function initialise(dir: string): void;
 //# sourceMappingURL=diskdb.d.ts.map

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

@@ -8,7 +8,7 @@ import * as simpledb from "./simpledb.js";
 export declare function createContext<TKey extends string, EA, A extends DBRecord<TKey>>(): <REncode, RDecode, EDecode>(type: string, encode: (record: A) => import("@effect/io/Effect").Effect<REncode, never, EA>, decode: (d: EA) => import("@effect/io/Effect").Effect<RDecode, EDecode, A>, schemaVersion: string, makeIndexKey: (r: A) => Index) => {
     find: (id: string) => import("@effect/io/Effect").Effect<RedisClient | simpledb.RecordCache | RDecode, simpledb.InvalidStateError, import("@effect/data/Option").Option<A>>;
     findByIndex: (index: Index) => import("@effect/io/Effect").Effect<RedisClient, import("@effect-app/infra-adapters/redis-client").ConnectionException, import("@effect/data/Option").Option<TKey>>;
-    save: (record: A) => import("@effect/io/Effect").Effect<RedisClient | simpledb.RecordCache | REncode, import("./shared.js").OptimisticLockException | simpledb.InvalidStateError | CouldNotAquireDbLockException, A>;
+    save: (record: A) => import("@effect/io/Effect").Effect<RedisClient | simpledb.RecordCache | REncode, CouldNotAquireDbLockException | import("./shared.js").OptimisticLockException | simpledb.InvalidStateError, A>;
 };
 declare const RedisSerializedDBRecord_base: MO.Model<RedisSerializedDBRecord, MO.SchemaProperties<MO.ToProps<{
     version: MO.Property<MO.SchemaDefaultSchema<unknown, string, string, string, {}>, "required", import("@effect/data/Option").None<any>, import("@effect/data/Option").None<any>>;

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

@@ -17,7 +17,7 @@ export interface RecordCache extends ReturnType<typeof makeLiveRecordCache> {
 }
 export declare const RecordCache: import("@effect/data/Context").Tag<RecordCache, RecordCache>;
 export declare const LiveRecordCache: import("@effect/io/Layer").Layer<never, never, RecordCache>;
-export declare function find<R, RDecode, EDecode, E, EA, A>(tryRead: (id: string) => Effect<R, E, Option<CachedRecord<EA>>>, decode: (d: EA) => Effect<RDecode, EDecode, A>, type: string): (id: string) => import("@effect/io/Effect").Effect<R | RDecode | RecordCache, E | InvalidStateError, import("@effect/data/Option").Option<A>>;
-export declare function storeDirectly<R, E, TKey extends string, A extends DBRecord<TKey>>(save: (r: A, version: Option<Version>) => Effect<R, E, CachedRecord<A>>, type: string): (record: A) => import("@effect/io/Effect").Effect<R | RecordCache, E, A>;
+export declare function find<R, RDecode, EDecode, E, EA, A>(tryRead: (id: string) => Effect<R, E, Option<CachedRecord<EA>>>, decode: (d: EA) => Effect<RDecode, EDecode, A>, type: string): (id: string) => import("@effect/io/Effect").Effect<RecordCache | R | RDecode, InvalidStateError | E, import("@effect/data/Option").Option<A>>;
+export declare function storeDirectly<R, E, TKey extends string, A extends DBRecord<TKey>>(save: (r: A, version: Option<Version>) => Effect<R, E, CachedRecord<A>>, type: string): (record: A) => import("@effect/io/Effect").Effect<RecordCache | R, E, A>;
 export declare function store<R, E, R2, E2, TKey extends string, EA, A extends DBRecord<TKey>>(tryRead: (id: string) => Effect<R, E, Option<CachedRecord<EA>>>, save: (r: A, version: Option<Version>) => Effect<R, E, CachedRecord<A>>, lock: (id: string) => Effect<R2 | Scope, E2, unknown>, type: string): (record: A) => import("@effect/io/Effect").Effect<RecordCache | R | Exclude<R2, import("@effect/io/Scope").Scope>, OptimisticLockException | InvalidStateError | E | E2, A>;
 //# sourceMappingURL=simpledb.d.ts.map

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.61.1",
+  "version": "0.63.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
     "@azure/cosmos": "^3.17.3",
     "@azure/service-bus": "^7.9.0",
     "@effect/data": "^0.12.2",
-    "@effect/io": "^0.25.5",
+    "@effect/io": "^0.25.7",
     "@sendgrid/helpers": "^7.7.0",
     "@sendgrid/mail": "^7.7.0",
     "change-case": "^4.1.2",
@@ -17,18 +17,18 @@
     "object-hash": "^3.0.0",
     "path-parser": "^6.1.0",
     "proper-lockfile": "^4.1.2",
-    "pure-rand": "^6.0.1",
+    "pure-rand": "^6.0.2",
     "redlock": "^4.2.0",
-    "@effect-app/core": "0.50.0",
-    "@effect-app/prelude": "0.50.1",
-    "@effect-app/infra-adapters": "0.43.3",
-    "@effect-app/schema": "0.44.0"
+    "@effect-app/prelude": "0.51.0",
+    "@effect-app/core": "0.51.0",
+    "@effect-app/schema": "0.45.0",
+    "@effect-app/infra-adapters": "0.44.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.21.0",
     "@sentry/node": "^7.49.0",
     "@types/express": "^4.17.17",
-    "@types/node": "~18.16.0",
+    "@types/node": "~18.16.1",
     "@types/proper-lockfile": "^4.1.2",
     "@types/redis": "^2.8.32",
     "@types/redlock": "^4.0.4",
@@ -42,7 +42,7 @@
     "ts-node": "^10.9.1",
     "typescript": "https://cdn.jsdelivr.net/npm/@tsplus/installer@0.0.176/compiler/typescript.tgz",
     "vitest": "^0.30.1",
-    "@effect-app/compiler": "0.25.0"
+    "@effect-app/compiler": "0.26.0"
   },
   "typesVersions": {
     "*": {
@@ -362,6 +362,36 @@
         "default": "./_cjs/instrument.cjs"
       }
     },
+    "./logger/jsonLogger": {
+      "import": {
+        "types": "./dist/logger/jsonLogger.d.ts",
+        "default": "./dist/logger/jsonLogger.js"
+      },
+      "require": {
+        "types": "./dist/logger/jsonLogger.d.ts",
+        "default": "./_cjs/logger/jsonLogger.cjs"
+      }
+    },
+    "./logger/logFmtLogger": {
+      "import": {
+        "types": "./dist/logger/logFmtLogger.d.ts",
+        "default": "./dist/logger/logFmtLogger.js"
+      },
+      "require": {
+        "types": "./dist/logger/logFmtLogger.d.ts",
+        "default": "./_cjs/logger/logFmtLogger.cjs"
+      }
+    },
+    "./logger/shared": {
+      "import": {
+        "types": "./dist/logger/shared.d.ts",
+        "default": "./dist/logger/shared.js"
+      },
+      "require": {
+        "types": "./dist/logger/shared.d.ts",
+        "default": "./_cjs/logger/shared.cjs"
+      }
+    },
     "./rateLimit": {
       "import": {
         "types": "./dist/rateLimit.d.ts",