@effect-app/infra 0.32.2 → 0.34.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @effect-app/infra
 
+## 0.34.0
+
+### Minor Changes
+
+- Change rc
+
+## 0.33.0
+
+### Minor Changes
+
+- Add optional `userId` to `RequestContext`
+
 ## 0.32.2
 
 ### Patch Changes

package/_cjs/RequestContext.cjs

@@ -16,6 +16,7 @@ class RequestContextParent extends tsplus_module_1.MNModel()({
   _tag: tsplus_module_1.prop(tsplus_module_1.literal("RequestContext")),
   id: tsplus_module_1.prop(RequestId),
   name: tsplus_module_1.prop(tsplus_module_1.ReasonableString),
+  userId: tsplus_module_1.optProp(tsplus_module_1.ReasonableString),
   locale: tsplus_module_1.prop(tsplus_module_1.literal("en", "de")),
   createdAt: tsplus_module_1.defaultProp(tsplus_module_1.date)
 }) {}

package/_cjs/RequestContext.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"RequestContext.cjs","names":["RequestId","tsplus_module_1","StringId","exports","RequestContextParent","MNModel","_tag","prop","literal","id","name","ReasonableString","locale","createdAt","defaultProp","date","makeRequestId","make","RequestContext","omit","rootId","parent","optProp","namespace","inherit","newSelf","toMonitoring","self","operationName","parentOperationName","parentLocale","tag","tsplus_module_2","Tag","Encoded","EncodedClass"],"sources":["../_src/RequestContext.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;AAAO,MAAMA,SAAS,GAAAC,eAAA,CAAGC,QAAQ;AAAAC,OAAA,CAAAH,SAAA,GAAAA,SAAA;AAG3B,MAAOI,oBAAqB,SAAQH,eAAA,CAAAI,OAAO,EAK9C,CAAC;EACFC,IAAI,EAAEL,eAAA,CAAAM,IAAI,CAACN,eAAA,CAAAO,OAAO,CAAC,gBAAgB,CAAC,CAAC;EACrCC,EAAE,EAAER,eAAA,CAAAM,IAAI,CAACP,SAAS,CAAC;EACnBU,IAAI,EAAET,eAAA,CAAAM,IAAI,CAAAN,eAAA,CAACU,gBAAgB,CAAC;EAC5BC,MAAM,EAAEX,eAAA,CAAAM,IAAI,CAACN,eAAA,CAAAO,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;EACjCK,SAAS,EAAEZ,eAAA,CAAAa,WAAW,CAAAb,eAAA,CAACc,IAAI;CAC5B,CAAC;AAAGZ,OAAA,CAAAC,oBAAA,GAAAA,oBAAA;AAIC,SAAUY,aAAaA,CAAA;EAC3B,OAAOhB,SAAS,CAACiB,IAAI,EAAE;AACzB;AAEA;;;;AAIM,MAAOC,cAAe,SAAQjB,eAAA,CAAAI,OAAO,EAKxC,CAAC;EACF,GAAGD,oBAAoB,CAACe,IAAI,CAAC,IAAI,CAAC;EAClCV,EAAE,EAAER,eAAA,CAAAa,WAAW,CAACd,SAAS,EAAEgB,aAAa,CAAC;EACzCI,MAAM,EAAEnB,eAAA,CAAAM,IAAI,CAACP,SAAS,CAAC;EACvBqB,MAAM,EAAEpB,eAAA,CAAAqB,OAAO,CAAClB,oBAAoB,CAAC;EACrCmB,SAAS,EAAEtB,eAAA,CAAAqB,OAAO,CAAArB,eAAA,CAACU,gBAAgB;CACpC,CAAC;EACA,OAAOa,OAAOA,CAEZH,MAAsB,EACtBI,OAA8C;IAE9C,OAAO,IAAIP,cAAc,CAAC;MACxBK,SAAS,EAAEF,MAAM,EAAEE,SAAS;MAC5B,GAAGE,OAAO;MACVL,MAAM,EAAEC,MAAM,CAACD,MAAM;MACrBC;KACD,CAAC;EACJ;EAEA,OAAOK,YAAYA,CAAaC,IAAoB;IAClD,OAAO;MACLC,aAAa,EAAED,IAAI,CAACjB,IAAI;MACxBE,MAAM,EAAEe,IAAI,CAACf,MAAM;MACnB,IAAIe,IAAI,CAACN,MAAM,GACX;QAAEQ,mBAAmB,EAAEF,IAAI,CAACN,MAAM,CAACX,IAAI;QAAEoB,YAAY,EAAEH,IAAI,CAACN,MAAM,CAACT;MAAM,CAAE,GAC3E,EAAE;KACP;EACH;;AAMF;;;AAAAT,OAAA,CAAAe,cAAA,GAAAA,cAAA;AAGO,MAAMa,GAAG,GAAGC,eAAA,CAAAC,GAAG,EAAkB;AAExC;AACA;AACA;AAAA9B,OAAA,CAAA4B,GAAA,GAAAA,GAAA;AACA,WAAiB3B,oBAAoB;EACnC;;;;EAIA,MAAa8B,OAAQ,SAAQjC,eAAA,CAAAkC,YAAY,EAA+B;EAA3D/B,oBAAA,CAAA8B,OAAO,GAAAA,OAAuD;AAI7E,CAAC,EATgB9B,oBAAoB,KAAAD,OAAA,CAAAC,oBAAA,GAApBA,oBAAoB;AAUrC,WAAiBc,cAAc;EAC7B;;;;EAIA,MAAagB,OAAQ,SAAQjC,eAAA,CAAAkC,YAAY,EAAyB;EAArDjB,cAAA,CAAAgB,OAAO,GAAAA,OAAiD;AAIvE,CAAC,EATgBhB,cAAc,KAAAf,OAAA,CAAAe,cAAA,GAAdA,cAAc"}
+{"version":3,"file":"RequestContext.cjs","names":["RequestId","tsplus_module_1","StringId","exports","RequestContextParent","MNModel","_tag","prop","literal","id","name","ReasonableString","userId","optProp","locale","createdAt","defaultProp","date","makeRequestId","make","RequestContext","omit","rootId","parent","namespace","inherit","newSelf","toMonitoring","self","operationName","parentOperationName","parentLocale","tag","tsplus_module_2","Tag","Encoded","EncodedClass"],"sources":["../_src/RequestContext.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;AAAO,MAAMA,SAAS,GAAAC,eAAA,CAAGC,QAAQ;AAAAC,OAAA,CAAAH,SAAA,GAAAA,SAAA;AAG3B,MAAOI,oBAAqB,SAAQH,eAAA,CAAAI,OAAO,EAK9C,CAAC;EACFC,IAAI,EAAEL,eAAA,CAAAM,IAAI,CAACN,eAAA,CAAAO,OAAO,CAAC,gBAAgB,CAAC,CAAC;EACrCC,EAAE,EAAER,eAAA,CAAAM,IAAI,CAACP,SAAS,CAAC;EACnBU,IAAI,EAAET,eAAA,CAAAM,IAAI,CAAAN,eAAA,CAACU,gBAAgB,CAAC;EAC5BC,MAAM,EAAEX,eAAA,CAAAY,OAAO,CAAAZ,eAAA,CAACU,gBAAgB,CAAC;EACjCG,MAAM,EAAEb,eAAA,CAAAM,IAAI,CAACN,eAAA,CAAAO,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;EACjCO,SAAS,EAAEd,eAAA,CAAAe,WAAW,CAAAf,eAAA,CAACgB,IAAI;CAC5B,CAAC;AAAGd,OAAA,CAAAC,oBAAA,GAAAA,oBAAA;AAIC,SAAUc,aAAaA,CAAA;EAC3B,OAAOlB,SAAS,CAACmB,IAAI,EAAE;AACzB;AAEA;;;;AAIM,MAAOC,cAAe,SAAQnB,eAAA,CAAAI,OAAO,EAKxC,CAAC;EACF,GAAGD,oBAAoB,CAACiB,IAAI,CAAC,IAAI,CAAC;EAClCZ,EAAE,EAAER,eAAA,CAAAe,WAAW,CAAChB,SAAS,EAAEkB,aAAa,CAAC;EACzCI,MAAM,EAAErB,eAAA,CAAAM,IAAI,CAACP,SAAS,CAAC;EACvBuB,MAAM,EAAEtB,eAAA,CAAAY,OAAO,CAACT,oBAAoB,CAAC;EACrCoB,SAAS,EAAEvB,eAAA,CAAAY,OAAO,CAAAZ,eAAA,CAACU,gBAAgB;CACpC,CAAC;EACA,OAAOc,OAAOA,CAEZF,MAAsB,EACtBG,OAA8C;IAE9C,OAAO,IAAIN,cAAc,CAAC;MACxBI,SAAS,EAAED,MAAM,EAAEC,SAAS;MAC5B,GAAGE,OAAO;MACVJ,MAAM,EAAEC,MAAM,CAACD,MAAM;MACrBC;KACD,CAAC;EACJ;EAEA,OAAOI,YAAYA,CAAaC,IAAoB;IAClD,OAAO;MACLC,aAAa,EAAED,IAAI,CAAClB,IAAI;MACxBI,MAAM,EAAEc,IAAI,CAACd,MAAM;MACnB,IAAIc,IAAI,CAACL,MAAM,GACX;QAAEO,mBAAmB,EAAEF,IAAI,CAACL,MAAM,CAACb,IAAI;QAAEqB,YAAY,EAAEH,IAAI,CAACL,MAAM,CAACT;MAAM,CAAE,GAC3E,EAAE;KACP;EACH;;AAMF;;;AAAAX,OAAA,CAAAiB,cAAA,GAAAA,cAAA;AAGO,MAAMY,GAAG,GAAGC,eAAA,CAAAC,GAAG,EAAkB;AAExC;AACA;AACA;AAAA/B,OAAA,CAAA6B,GAAA,GAAAA,GAAA;AACA,WAAiB5B,oBAAoB;EACnC;;;;EAIA,MAAa+B,OAAQ,SAAQlC,eAAA,CAAAmC,YAAY,EAA+B;EAA3DhC,oBAAA,CAAA+B,OAAO,GAAAA,OAAuD;AAI7E,CAAC,EATgB/B,oBAAoB,KAAAD,OAAA,CAAAC,oBAAA,GAApBA,oBAAoB;AAUrC,WAAiBgB,cAAc;EAC7B;;;;EAIA,MAAae,OAAQ,SAAQlC,eAAA,CAAAmC,YAAY,EAAyB;EAArDhB,cAAA,CAAAe,OAAO,GAAAA,OAAiD;AAIvE,CAAC,EATgBf,cAAc,KAAAjB,OAAA,CAAAiB,cAAA,GAAdA,cAAc"}

package/_cjs/api/routing.cjs

@@ -144,7 +144,7 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
     }), ({
       pars,
       requestContext
-    }) => tsplus_module_10.setupRequest(tsplus_module_3.provideService(tsplus_module_3.tap(tsplus_module_3.tapErrorCause(tsplus_module_3.zipRight(tsplus_module_3.flatMap(tsplus_module_1.get(RequestSettings), s => tsplus_module_8.logAnnotates({
+    }) => tsplus_module_3.provideService(tsplus_module_10.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_8.logAnnotates({
       method: req.method,
       path: req.originalUrl,
       ...(s.verbose ? {
@@ -167,11 +167,10 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
         };
         return hn;
       }), parsedReq => tsplus_module_3.flatMap(restore(() => handle(parsedReq))(), r => respond(parsedReq, res, r)));
-      const setNamespace = tsplus_module_3.provideService(_Memory.restoreFromRequestContext, tsplus_module_6.tag, requestContext);
       // 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(setNamespace, tsplus_module_4.provideSomeContextEffect(makeMiddlewareContext(req, res, requestContext))(r)) : tsplus_module_3.zipRight(setNamespace
+      const r2 = makeMiddlewareContext ? tsplus_module_4.provideSomeContextEffect(makeMiddlewareContext(req, res, requestContext))(tsplus_module_3.zipRight(_Memory.restoreFromRequestContext, r)) : tsplus_module_3.zipRight(_Memory.restoreFromRequestContext
       // PR is not relevant here
       , r);
       return errorHandler(req, res, requestContext, r2);
@@ -205,8 +204,8 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
           resHeaders: tsplus_module_7.RecordPretty(tsplus_module_7.object$(headers))
         } : undefined)
       })(tsplus_module_3.logInfo("Finished request"));
-    })), tsplus_module_6.tag, requestContext) // otherwise external error reporter breaks.
-    , requestContext)));
+    }))), tsplus_module_6.tag, requestContext) // otherwise external error reporter breaks.
+    ));
   };
 }
 /**

package/_cjs/api/routing.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"routing.cjs","names":["Ex","_interopRequireWildcard","require","MO","_RequestContext2","_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_11","untraced","restore","all","setHeader","pars","tsplus_module_10","setupRequest","provideService","tap","tapErrorCause","tsplus_module_8","logAnnotates","originalUrl","reqPath","tsplus_module_7","RecordPretty","object$","reqQuery","reqBody","pretty","reqCookies","reqHeaders","logInfo","suspendSucceed","handleRequest","hn","tsplus_module_9","getOrUndefined","parsedReq","setNamespace","restoreFromRequestContext","tsplus_module_6","tag","uninterruptible","r2","provideSomeContextEffect","cause","allPar","reportRequestError","getHeaders","statusCode","toString","resHeaders","entries","reduce","prev","value","snipString","logErrorCauseMessage","console","error","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;AAGA,IAAAC,EAAA,GAAAF,uBAAA,CAAAC,OAAA;AAKA,IAAAE,gBAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AAEA,IAAAI,oBAAA,GAAAJ,OAAA;AAEA,IAAAK,eAAA,GAAAL,OAAA;AAEA,IAAAM,QAAA,GAAAN,OAAA;AACA,IAAAO,YAAA,GAAAP,OAAA;AACA,IAAAQ,KAAA,GAAAR,OAAA;AAAsC,SAAAS,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,SAAAX,wBAAAe,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;AAlBtC;;AAoBO,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,CAAoBN,OAAO,CAACO,OAAO,CAAC,EAC7BC,CAAC,IAAIA,CAAC,CAAC,EACP5C,EA7CG,CA6CH6C,MAAM,CAACC,GAAG,CAAC,EACX9C,EAAE,CAAC+C,WAAW,CAAC,CACvB;EACD,MAAMC,YAAY,GAAIC,CAAU,IAAKC,eAAA,CAAAC,aAAA,CAAAd,EAAE,EAAYe,CAAC,IAAIA,CAAC,CAACH,CAAC,CAAC,CAAC;EAE7D,MAAMI,EAAE,GAAGf,eAAA,CAAAC,IAAA,OACTC,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAE,YAAA,CAAoBN,OAAO,CAACkB,KAAK,CAAC,EAC3BV,CAAC,IAAIA,CAAC,CAAC,EACP5C,EArDG,CAqDH6C,MAAM,CAACC,GAAG,CAAC,EACX9C,EAAE,CAAC+C,WAAW,CAAC,CACvB;EACD,MAAMQ,UAAU,GAAIN,CAAU,IAAKC,eAAA,CAAAC,aAAA,CAAAE,EAAE,EAAYD,CAAC,IAAIA,CAAC,CAACH,CAAC,CAAC,CAAC;EAE3D,MAAMO,EAAE,GAAGlB,eAAA,CAAAC,IAAA,OACTC,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAE,YAAA,CAAoBN,OAAO,CAACqB,IAAI,CAAC,EAC1Bb,CAAC,IAAIA,CAAC,CAAC,EACP5C,EA7DG,CA6DH6C,MAAM,CAACC,GAAG,CAAC,EACX9C,EAAE,CAAC+C,WAAW,CAAC,CACvB;EACD,MAAMW,SAAS,GAAIT,CAAU,IAAKC,eAAA,CAAAC,aAAA,CAAAK,EAAE,EAAYJ,CAAC,IAAIA,CAAC,CAACH,CAAC,CAAC,CAAC;EAE1D,MAAMU,EAAE,GAAGrB,eAAA,CAAAC,IAAA,OACTC,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAE,YAAA,CAAoBN,OAAO,CAACwB,IAAI,CAAC,EAC1BhB,CAAC,IAAIA,CAAC,CAAC,EACP5C,EArEG,CAqEH6C,MAAM,CAACC,GAAG,CAAC,EACX9C,EAAE,CAAC+C,WAAW,CAAC,CACvB;EACD,MAAMc,SAAS,GAAIZ,CAAU,IAAKC,eAAA,CAAAC,aAAA,CAAAQ,EAAE,EAAYP,CAAC,IAAIA,CAAC,CAACH,CAAC,CAAC,CAAC;EAE1D,MAAMa,EAAE,GAAGxB,eAAA,CAAAC,IAAA,OACTC,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAC,GAAA,CAAAD,eAAA,CAAAE,YAAA,CAAoBN,OAAO,CAAC2B,MAAM,CAAC,EAC5BnB,CAAC,IAAIA,CAAC,CAAC,EACP5C,EA7EG,CA6EH6C,MAAM,CAACC,GAAG,CAAC,EACX9C,EAAE,CAAC+C,WAAW,CAAC,CACvB;EACD,MAAMiB,WAAW,GAAIf,CAAU,IAAKC,eAAA,CAAAC,aAAA,CAAAW,EAAE,EAAYV,CAAC,IAAIA,CAAC,CAACH,CAAC,CAAC,CAAC;EAE5D,OAAO;IACLS,SAAS;IACTM,WAAW;IACXhB,YAAY;IACZa,SAAS;IACTN;GACD;AACH;AA2BM,SAAUU,KAAKA,CAcnBC,cAUC,EACDC,YAK8B,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,CAAA5E,EAAE,CAACoE,KAAK,CAACC,cAAc,CAAC9B,OAAO,CAACsC,MAAM,CAACC,WAAW,EAAS,CAAC,CACjET,cAAc,CAAC9B,OAAO,CAACwC,IAAI,CAACC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EACzCC,kBAAkB,CAChBZ,cAAc,EACdC,YAAY,EACZE,qBAAqB,CACtB,CACF,EACC/B,eAAA,CAAAC,IAAA,OACE,IAAAwC,4BAAmB,EACjBb,cAAc,CAAC9B,OAAO,CAACwC,IAAI,EAC3BV,cAAc,CAAC9B,OAAO,CAACsC,MAAM,EAC7BR,cAAc,CACf,CACF,CACF;AACH;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,EACnBE,CAAC,IACRhD,eAAA,CAAAC,IAAA,CAAY,MAAK;IACf+C,CAAC,KAAKhB,SAAS,GACXa,GAAG,CAACI,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,EAAE,GACtBL,GAAG,CAACI,MAAM,CAAC,GAAG,CAAC,CACdC,IAAI,CAACC,IAAI,CAACC,SAAS,CAACJ,CAAC,CAAC,CAAC;EAC9B,CAAC,CAAC,CACH;AACP;AAEM,SAAUR,kBAAkBA,CAchCP,OAUC,EACDJ,YAKkC,EAClCE,qBAAwD;EAExD,MAAM;IAAEjC,OAAO;IAAEuD,QAAQ;IAAEC,aAAa;IAAEC,CAAC,EAAEC;EAAM,CAAE,GAAGvB,OAAO;EAC/D,MAAMwB,QAAQ,GAAGJ,QAAQ,GAAG,IAAAK,gBAAa,EAACL,QAAe,CAAC,GA1OhD3F,EAAE,CA0OiDiG,IAAI;EACjE,MAAMC,OAAO,GAAGlG,EA3OJ,CA2OImG,OAAO,CAACrD,GAAG,CAACiD,QAAQ,CAAC;EACrC,MAAMd,cAAc,GAAGW,aAAa,GAC/BV,GAAS,IAAKlF,EA7OP,CA6OOmG,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,0BAAS,EAAaJ,SAAS,CAAC,GAAGI,0BAAS,CAACC,IAAI,EAAE;IAE9E,MAAMC,OAAO,GAAGxC,GAAG,CAAC0B,OAAO,CAAC,YAAY,CAAC;IACzC,MAAMe,SAAS,GAAG3H,EA/QR,CA+QQ4H,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,+BAAc,CAAC;MACxCX,MAAM;MACNY,IAAI,EAAEjI,EAnRE,CAmRF4H,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,gBAAA,CAAAC,QAAA,CAAeC,OAAO,IAC3BjG,eAAA,CAAA+C,OAAA,CAAA/C,eAAA,CAAAkG,GAAA,CAAW;MACTT,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,EACS,CAAC;MAAEwD,IAAI;MAAEX;IAAc,CAAE,KAChCY,gBAAA,CAAAC,YAAA,CAAAtG,eAAA,CAAAuG,cAAA,CAAAvG,eAAA,CAAAwG,GAAA,CAAAxG,eAAA,CAAAyG,aAAA,CAAAzG,eAAA,CAAAmC,QAAA,CAAAnC,eAAA,CAAA+C,OAAA,CAAAtD,eAAA,CAAAb,GAAA,CAAAY,eAAe,GAAac,CAAC,IAEzBoG,eAAA,CAAAC,YAAA,CAAoB;MAClBvE,MAAM,EAAEQ,GAAG,CAACR,MAAM;MAClBE,IAAI,EAAEM,GAAG,CAACgE,WAAW;MACrB,IAAGtG,CAAC,CAACX,OAAO,GACR;QACAkH,OAAO,EAAAC,eAAA,CAAAC,YAAA,CAAAD,eAAA,CAAAE,OAAA,CAAEZ,IAAI,CAAC9D,IAAI,EAAU;QAC5B2E,QAAQ,EAAAH,eAAA,CAAAC,YAAA,CAAAD,eAAA,CAAAE,OAAA,CAAEZ,IAAI,CAAChC,KAAK,EAAU;QAC9B8C,OAAO,EAAE,IAAAC,sBAAM,EAACf,IAAI,CAAC/B,IAAI,CAAC;QAC1B+C,UAAU,EAAE,IAAAD,sBAAM,EAACf,IAAI,CAAC7B,OAAO,CAAC;QAChC8C,UAAU,EAAAP,eAAA,CAAAC,YAAA,CAAAD,eAAA,CAAAE,OAAA,CAAEZ,IAAI,CAAC9B,OAAO;OACzB,GACDtC,SAAS;KACZ,CAAC,CAbJhC,eAAA,CAAAsH,OAAA,CAAe,kBAAkB,CAAC,CAcjC,CACF,EACCtH,eAAA,CAAAuH,cAAA,CAAsB,MAAK;MACzB,MAAMC,aAAa,GAAGxH,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,MAAMqD,EAAE,GAAG;UACT,GAAAC,eAAA,CAAAC,cAAA,CAAGtD,IAAI,CAAM;UACb,GAAAqD,eAAA,CAAAC,cAAA,CAAGvD,KAAK,CAAM;UACd,GAAAsD,eAAA,CAAAC,cAAA,CAAGrF,IAAI;SACW;QACpB,OAAOmF,EAAE;MACX,CAAC,CAAC,EACOG,SAAS,IAChB5H,eAAA,CAAA+C,OAAA,CAAAkD,OAAO,CAAC,MAAMzC,MAAM,CAACoE,SAAgB,CAAC,CAAC,EAAE,EAC9B5E,CAAC,IAAIiB,OAAO,CAAC2D,SAAS,EAAE/E,GAAG,EAAEG,CAAC,CAAC,CAAC,CAC5C;MAEH,MAAM6E,YAAY,GAAG7H,eAAA,CAAAuG,cAAA,CAAAuB,iCAAyB,EAAAC,eAAA,CAAAC,GAAA,EACRvC,cAAc,CAAC;MACrD;MACA,MAAMzC,CAAC,GAAGJ,GAAG,CAACR,MAAM,KAAK,KAAK,GAAEpC,eAAA,CAAAiI,eAAA,CAACT,aAAa,IAAmBA,aAAa,EAAC;MAC/E;MACA,MAAMU,EAAE,GAAGnG,qBAAqB,GAC5B/B,eAAA,CAAAmC,QAAA,CAAA0F,YAAY,EACFjH,eAAA,CAAAuH,wBAAA,CAA2BpG,qBAAqB,CAACa,GAAG,EAAEC,GAAG,EAAE4C,cAAc,CAAC,EAA1EzC,CAAC,CAA0E,CAAC,GACtFhD,eAAA,CAAAmC,QAAA,CAAA0F;MACA;MAAA,EACU7E,CAAC,CAAyC;MACxD,OAAOnB,YAAY,CACjBe,GAAG,EACHC,GAAG,EACH4C,cAAc,EACdyC,EAAE,CACH;IACH,CAAC,CAAC,CACH,EACgBE,KAAK,IAClBpI,eAAA,CAAAyG,aAAA,CAAAzG,eAAA,CAAAqI,MAAA,CACErI,eAAA,CAAAC,IAAA,OAAO4C,GAAG,CAACI,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,EAAE,CAAC,EAC9B,IAAAoF,+BAAkB,EAACF,KAAK,EAAE;MACxB3C,cAAc;MACdnD,IAAI,EAAEM,GAAG,CAACgE,WAAW;MACrBxE,MAAM,EAAEQ,GAAG,CAACR;KACb,CAAC,EACFpC,eAAA,CAAAuH,cAAA,CAAsB,MAAK;MACzB,MAAMjD,OAAO,GAAGzB,GAAG,CAAC0F,UAAU,EAAE;MAChC,OAGQ7B,eAAA,CAAAC,YAAA,CAAoB;QAC1BvE,MAAM,EAAEQ,GAAG,CAACR,MAAM;QAClBE,IAAI,EAAEM,GAAG,CAACgE,WAAW;QACrB4B,UAAU,EAAE3F,GAAG,CAAC2F,UAAU,CAACC,QAAQ,EAAE;QAErC5B,OAAO,EAAAC,eAAA,CAAAC,YAAA,CAAAD,eAAA,CAAAE,OAAA,CAAEZ,IAAI,CAAC9D,IAAI,EAAU;QAC5B2E,QAAQ,EAAAH,eAAA,CAAAC,YAAA,CAAAD,eAAA,CAAAE,OAAA,CAAEZ,IAAI,CAAChC,KAAK,EAAU;QAC9B8C,OAAO,EAAE,IAAAC,sBAAM,EAACf,IAAI,CAAC/B,IAAI,CAAC;QAC1B+C,UAAU,EAAE,IAAAD,sBAAM,EAACf,IAAI,CAAC7B,OAAO,CAAC;QAChC8C,UAAU,EAAAP,eAAA,CAAAC,YAAA,CAAAD,eAAA,CAAAE,OAAA,CAAEZ,IAAI,CAAC9B,OAAO,EAAU;QAElCoE,UAAU,EAAA5B,eAAA,CAAAC,YAAA,CAAAD,eAAA,CAAAE,OAAA,CAAEjI,MAAM,CAAC4J,OAAO,CAACrE,OAAO,CAAC,CAACsE,MAAM,CAAC,CAACC,IAAI,EAAE,CAAC3J,GAAG,EAAE4J,KAAK,CAAC,KAAI;UAChED,IAAI,CAAC3J,GAAG,CAAC,GAAG4J,KAAK,IAAI,OAAOA,KAAK,KAAK,QAAQ,GAAG,IAAAC,gBAAU,EAACD,KAAK,CAAC,GAAGA,KAAK;UAC1E,OAAOD,IAAI;QACb,CAAC,EAAE,EAAyB,CAAC;OAE9B,CAAC,CAnBK7I,eAAA,CAAAgJ,oBAAA,CACL,kBAAkB,EAClBZ,KAAK,CACN;IAiBH,CAAC,CAAC,CACH,EACgBA,KAAK,IAAIpI,eAAA,CAAAC,IAAA,OAAOgJ,OAAO,CAACC,KAAK,CAAC,sCAAsC,EAAEd,KAAK,CAAC,CAAC,CAAC,CAChG,EACI,MACHpI,eAAA,CAAA+C,OAAA,CAAAtD,eAAA,CAAAb,GAAA,CAAAY,eAAe,GAAac,CAAC,IAAG;MAC9B,MAAMgE,OAAO,GAAGzB,GAAG,CAAC0F,UAAU,EAAE;MAChC,OAAgD7B,eAAA,CAAAC,YAAA,CAAoB;QAClEvE,MAAM,EAAEQ,GAAG,CAACR,MAAM;QAClBE,IAAI,EAAEM,GAAG,CAACgE,WAAW;QACrB4B,UAAU,EAAE3F,GAAG,CAAC2F,UAAU,CAACC,QAAQ,EAAE;QACrC,IAAGnI,CAAC,CAACX,OAAO,GACR;UACA+I,UAAU,EAAA5B,eAAA,CAAAC,YAAA,CAAAD,eAAA,CAAAE,OAAA,CAAE1C,OAAO;SACpB,GACDtC,SAAS;OACZ,CAAC,CATKhC,eAAA,CAAAsH,OAAA,CAAe,kBAAkB,CAAC;IAU3C,CAAC,CAAC,CACH,EAAAS,eAAA,CAAAC,GAAA,EACmCvC,cAAc,CAAC,CAAC;IAAA,EACtCA,cAAc,CAAC,CAChC,CACJ;EACH,CAAC;AACH;AA2CA;;;;AAIM,SAAU0D,QAAQA,CAA4BC,QAAW;EAC7D,MAAMC,MAAM,GAAGvC,eAAA,CAAAwC,UAAA,CAAAxC,eAAA,CAAAE,OAAA,CAAAoC,QAAQ,GAASR,MAAM,CAAC,CAACC,IAAI,EAAEU,GAAG,KAAI;IACnDV,IAAI,CAACU,GAAG,CAAC,GAAG5H,KAAK,CAACyH,QAAQ,CAACG,GAAG,CAAsB,EAAEC,6CAAwB,CAAC;IAC/E,OAAOX,IAAI;EACb,CAAC,EAAE,EAAS,CAA8B;EAE1C,OAAOQ,MAAM;AACf;AAEA;;;;AAIM,SAAUI,WAAWA,CAAgCL,QAAW;EACpE,MAAMC,MAAM,GAAGvC,eAAA,CAAAwC,UAAA,CAAAxC,eAAA,CAAAE,OAAA,CAAAoC,QAAQ,GAASR,MAAM,CAAC,CAACC,IAAI,EAAEU,GAAG,KAAI;IACnD,MAAMG,OAAO,GAAGP,QAAQ,CAACC,QAAQ,CAACG,GAAG,CAAC,CAAC;IACvCzC,eAAA,CAAAwC,UAAA,CAAAxC,eAAA,CAAAE,OAAA,CAAA0C,OAAO,GAASC,OAAO,CAACzK,GAAG,IAAI2J,IAAI,CAAC,GAAGU,GAAa,IAAIrK,GAAa,EAAE,CAAC,GAAGwK,OAAO,CAACxK,GAAG,CAAC,CAAC;IACxF,OAAO2J,IAAI;EACb,CAAC,EAAE,EAAS,CAA2C;EAEvD,OAAOQ,MAAM;AACf;AAwCM,SAAU7F,MAAMA,CAMpBoG,CAAsC,EACtCtG,aAAmB;EAEnB;EACA,MAAMxD,OAAO,GAAGpC,EAAE,CAACmM,cAAc,CAACD,CAAC,CAAC;EACpC,MAAMvG,QAAQ,GAAG3F,EAAE,CAACoM,eAAe,CAACF,CAAC,CAAC;EAUtC,OACErG,CAAgC,KAC5B;IACJD,aAAa;IACbC,CAAC;IACDzD,OAAO;IACPuD,QAAQ;IACR0G,eAAe,EAAEH,CAAC,CAACG,eAAe,IAAI1G;GAQtC;AACJ;AAqBA;;;;;;;;;;;;;;;AAeM,SAAU2G,aAAaA,CAAuDC,GAAa;EAE/F,OAOEb,QAAmB,IACjB;IACF,MAAMnH,OAAO,GAAG6E,eAAA,CAAAwC,UAAA,CAAAxC,eAAA,CAAAE,OAAA,CAAAiD,GAAG,GAASrB,MAAM,CAAC,CAACC,IAAI,EAAEU,GAAG,KAAI;MAC/CV,IAAI,CAACU,GAAG,CAAC,GAAG/F,MAAM,CAACyG,GAAG,CAACV,GAAG,CAAC,CAAC,CAACH,QAAQ,CAACG,GAAG,CAAQ,CAAC;MAClD,OAAOV,IAAI;IACb,CAAC,EAAE,EAAS,CAAC;IAEb,OAAO5G,OASN;EACH,CAAC;AACH"}
+{"version":3,"file":"routing.cjs","names":["Ex","_interopRequireWildcard","require","MO","_RequestContext2","_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_11","untraced","restore","all","setHeader","pars","provideService","tsplus_module_10","setupRequestFrom","tap","tapErrorCause","tsplus_module_8","logAnnotates","originalUrl","reqPath","tsplus_module_7","RecordPretty","object$","reqQuery","reqBody","pretty","reqCookies","reqHeaders","logInfo","suspendSucceed","handleRequest","hn","tsplus_module_9","getOrUndefined","parsedReq","uninterruptible","r2","provideSomeContextEffect","restoreFromRequestContext","cause","allPar","reportRequestError","getHeaders","statusCode","toString","resHeaders","entries","reduce","prev","value","snipString","logErrorCauseMessage","console","error","tsplus_module_6","tag","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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"}

package/_cjs/api/setupRequest.cjs

@@ -25,7 +25,10 @@ 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
+    requestName: requestContext.name,
+    ...(requestContext.userId ? {
+      requestUserId: requestContext.userId
+    } : {})
   })));
 }
 /**

package/_cjs/api/setupRequest.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"setupRequest.cjs","names":["_RequestContext2","require","_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","serviceWithEffect","tsplus_module_5","tag","setupReq3","provideService","makeInternalRequestContext","tsplus_module_6","StringId","make","RequestContext","locale","ReasonableString"],"sources":["../../_src/api/setupRequest.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;AAAA,IAAAA,gBAAA,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;MAKrCW,YAAY,GAAAC,cAAA;AAAAC,OAAA,CAAAF,YAAA,GAAAA,YAAA;MAgBZG,gBAAgB,GAAAC,kBAAA;AAAAF,OAAA,CAAAC,gBAAA,GAAAA,gBAAA;AAnBhC;;;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;GAC7B,CAAC,CACH,CACF;AACH;AAEA;;;AAGA,SAAAhB,mBAA0CC,IAAqB;EAC7D,OAAOE,eAAA,CAAAC,QAAA,CAAe,MAAMG,eAAA,CAAAU,iBAAA,CAAAC,eAAA,CAAAC,GAAA,EAAoCjB,cAAc,IAAIL,cAAA,CAAAI,IAAI,EAAcC,cAAc,CAAC,CAAC,CAAC;AACvH;AAEA;;;AAGM,SAAUkB,SAASA,CAAUnB,IAAqB,EAAEe,IAAY;EACpE,OAAOb,eAAA,CAAAC,QAAA,CAAe,MACpBG,eAAA,CAAAc,cAAA,CAAArB,kBAAA,CAAAC,IAAI,GAAAiB,eAAA,CAAAC,GAAA,EAEkCG,0BAA0B,CAACN,IAAI,CAAC,CAAC,CACxE;AACH;AAEA,SAASM,0BAA0BA,CAACN,IAAY;EAC9C,MAAMF,EAAE,GAAGS,eAAA,CAAAC,QAAQ,CAACC,IAAI,EAAE;EAC1B,OAAO,IAAIC,+BAAc,CAAC;IACxBZ,EAAE;IACFF,MAAM,EAAEE,EAAE;IACVa,MAAM,EAAE,IAAI;IACZX,IAAI,EAAEO,eAAA,CAAAK,gBAAgB,CAACZ,IAAI;GAC5B,CAAC;AACJ"}
+{"version":3,"file":"setupRequest.cjs","names":["_RequestContext2","require","_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","userId","requestUserId","serviceWithEffect","tsplus_module_5","tag","setupReq3","provideService","makeInternalRequestContext","tsplus_module_6","StringId","make","RequestContext","locale","ReasonableString"],"sources":["../../_src/api/setupRequest.ts"],"sourcesContent":[null],"mappings":"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"}

package/_src/RequestContext.ts

@@ -10,6 +10,7 @@ export class RequestContextParent extends MNModel<
   _tag: prop(literal("RequestContext")),
   id: prop(RequestId),
   name: prop(ReasonableString),
+  userId: optProp(ReasonableString),
   locale: prop(literal("en", "de")),
   createdAt: defaultProp(date)
 }) {}

package/_src/api/routing.ts

@@ -344,15 +344,14 @@ export function makeRequestHandler<
                     .flatMap(r => respond(parsedReq, res, r))
                 )
 
-              const setNamespace = restoreFromRequestContext
-                .provideService(RequestContext.Tag, requestContext)
               // Commands should not be interruptable.
               const r = req.method !== "GET" ? handleRequest.uninterruptible : handleRequest // .instrument("Performance.RequestResponse")
               // the first log entry should be of the request start.
               const r2 = makeMiddlewareContext
-                ? setNamespace
-                  .zipRight(r.provideSomeContextEffect(makeMiddlewareContext(req, res, requestContext)))
-                : setNamespace
+                ? restoreFromRequestContext
+                  .zipRight(r)
+                  .provideSomeContextEffect(makeMiddlewareContext(req, res, requestContext))
+                : restoreFromRequestContext
                   // PR is not relevant here
                   .zipRight(r) as Effect<R, E | ValidationError, void>
               return errorHandler(
@@ -412,8 +411,8 @@ export function makeRequestHandler<
                 }))
               })
             )
+            .setupRequestFrom
             .provideService(RequestContext.Tag, requestContext) // otherwise external error reporter breaks.
-            .setupRequest(requestContext)
         )
     )
   }

package/_src/api/setupRequest.ts

@@ -10,7 +10,8 @@ export function setupRequest<R, E, A>(self: Effect<R, E, A>, requestContext: Req
       Effect.logAnnotates({
         requestRootId: requestContext.rootId,
         requestId: requestContext.id,
-        requestName: requestContext.name
+        requestName: requestContext.name,
+        ...requestContext.userId ? { requestUserId: requestContext.userId } : {}
       })
     )
   )

package/dist/RequestContext.d.ts

@@ -1,4 +1,4 @@
-import { ParsedShapeOfCustom, MNModel, prop, literal, ReasonableString, defaultProp, date, optProp, EncodedClass, ConstructorInputFromApi, GetProvidedProps } from "@effect-app/prelude/schema";
+import { ParsedShapeOfCustom, MNModel, prop, literal, ReasonableString, optProp, defaultProp, date, EncodedClass, ConstructorInputFromApi, GetProvidedProps } from "@effect-app/prelude/schema";
 export declare const RequestId: import("@effect-app/prelude/schema").StringIdSchema & import("@effect-app/schema").Utils<import("@effect-app/prelude/schema").StringIdSchema> & {
     make(this: void): import("@effect-app/prelude/schema").StringId;
 };
@@ -9,6 +9,7 @@ declare const RequestContextParent_base: import("@effect-app/schema").MNModel<im
         make(this: void): import("@effect-app/prelude/schema").StringId;
     }, "required", import("@effect/data/Option").None, import("@effect/data/Option").None>;
     name: import("@effect-app/schema").Property<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>> & import("@effect-app/schema").Utils<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>>>, "required", import("@effect/data/Option").None, import("@effect/data/Option").None>;
+    userId: import("@effect-app/schema").Property<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>> & import("@effect-app/schema").Utils<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>>>, "optional", import("@effect/data/Option").None, import("@effect/data/Option").None>;
     locale: import("@effect-app/schema").Property<import("@effect-app/schema").DefaultSchema<unknown, "en" | "de", "en" | "de", "en" | "de", import("@effect-app/schema").LiteralApi<["en", "de"]>>, "required", import("@effect/data/Option").None, import("@effect/data/Option").None>;
     createdAt: import("@effect-app/schema").FromProperty<import("@effect-app/schema").SchemaDefaultSchema<unknown, Date, Date, string, {}>, "required", import("@effect/data/Option").None, import("@effect/data/Option").Some<["constructor", () => Date]>>;
 }>, RequestContextParent, RequestContextParent.ConstructorInput, RequestContextParent.Encoded, RequestContextParent.Props> & import("@effect-app/schema").PropsExtensions<RequestContextParent.Props>;
@@ -26,6 +27,7 @@ declare const RequestContext_base: import("@effect-app/schema").MNModel<import("
     namespace: import("@effect-app/schema").Property<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>> & import("@effect-app/schema").Utils<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>>>, "optional", import("@effect/data/Option").None, import("@effect/data/Option").None>;
     _tag: import("@effect-app/schema").Property<import("@effect-app/schema").DefaultSchema<unknown, "RequestContext", "RequestContext", "RequestContext", import("@effect-app/schema").LiteralApi<["RequestContext"]>>, "required", import("@effect/data/Option").None, import("@effect/data/Option").None>;
     name: import("@effect-app/schema").Property<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>> & import("@effect-app/schema").Utils<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>>>, "required", import("@effect/data/Option").None, import("@effect/data/Option").None>;
+    userId: import("@effect-app/schema").Property<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>> & import("@effect-app/schema").Utils<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>>>, "optional", import("@effect/data/Option").None, import("@effect/data/Option").None>;
     locale: import("@effect-app/schema").Property<import("@effect-app/schema").DefaultSchema<unknown, "en" | "de", "en" | "de", "en" | "de", import("@effect-app/schema").LiteralApi<["en", "de"]>>, "required", import("@effect/data/Option").None, import("@effect/data/Option").None>;
     createdAt: import("@effect-app/schema").FromProperty<import("@effect-app/schema").SchemaDefaultSchema<unknown, Date, Date, string, {}>, "required", import("@effect/data/Option").None, import("@effect/data/Option").Some<["constructor", () => Date]>>;
 }>, RequestContext, RequestContext.ConstructorInput, RequestContext.Encoded, RequestContext.Props> & import("@effect-app/schema").PropsExtensions<RequestContext.Props>;
@@ -54,6 +56,7 @@ export declare namespace RequestContextParent {
         readonly _tag: "RequestContext";
         readonly id: string;
         readonly name: string;
+        readonly userId?: string | undefined;
         readonly locale: "en" | "de";
         readonly createdAt: string;
     }>;
@@ -74,6 +77,7 @@ export declare namespace RequestContext {
         readonly _tag: "RequestContext";
         readonly id: string;
         readonly name: string;
+        readonly userId?: string | undefined;
         readonly locale: "en" | "de";
         readonly createdAt: string;
         readonly rootId: string;

package/dist/RequestContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RequestContext.d.ts","sourceRoot":"","sources":["../_src/RequestContext.ts"],"names":[],"mappings":";AAAA,eAAO,MAAM,SAAS;;CAAW,CAAA;AACjC,MAAM,MAAM,SAAS,GAAG,mBAAmB,CAAC,OAAO,SAAS,CAAC,CAAA;;;;;;;;;;AAE7D,qBAAa,oBAAqB,SAAQ,yBAWxC;CAAG;AACL,oCAAoC;AACpC,MAAM,MAAM,+BAA+B,GAAG,OAAO,oBAAoB,CAAA;AAEzE,wBAAgB,aAAa,kDAE5B;;;;;;;;;;;;;AAED;;;GAGG;AACH,qBAAa,cAAe,SAAQ,mBAWlC;IACA,MAAM,CAAC,OAAO,CACZ,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,oBAAoB,CAAC,gBAAgB;IAUhD,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc;;;;;;CASrD;AAED,oCAAoC;AACpC,MAAM,MAAM,yBAAyB,GAAG,OAAO,cAAc,CAAA;;;;;AAK7D,eAAO,MAAM,GAAG,oDAAwB,CAAA;AAKxC,yBAAiB,oBAAoB,CAAC;;;;;;;;IACpC;;;OAGG;IACH,MAAM,OAAO,OAAQ,SAAQ,YAA2C;KAAG;IAC3E,MAAM,WAAW,gBACf,SAAQ,uBAAuB,CAAC,OAAO,oBAAoB,CAAC;KAAG;IACjE,MAAM,WAAW,KAAM,SAAQ,gBAAgB,CAAC,OAAO,oBAAoB,CAAC;KAAG;;CAChF;AACD,yBAAiB,cAAc,CAAC;;;;;;;;;;;IAC9B;;;OAGG;IACH,MAAM,OAAO,OAAQ,SAAQ,cAAqC;KAAG;IACrE,MAAM,WAAW,gBACf,SAAQ,uBAAuB,CAAC,OAAO,cAAc,CAAC;KAAG;IAC3D,MAAM,WAAW,KAAM,SAAQ,gBAAgB,CAAC,OAAO,cAAc,CAAC;KAAG;;CAC1E"}
+{"version":3,"file":"RequestContext.d.ts","sourceRoot":"","sources":["../_src/RequestContext.ts"],"names":[],"mappings":";AAAA,eAAO,MAAM,SAAS;;CAAW,CAAA;AACjC,MAAM,MAAM,SAAS,GAAG,mBAAmB,CAAC,OAAO,SAAS,CAAC,CAAA;;;;;;;;;;;AAE7D,qBAAa,oBAAqB,SAAQ,yBAYxC;CAAG;AACL,oCAAoC;AACpC,MAAM,MAAM,+BAA+B,GAAG,OAAO,oBAAoB,CAAA;AAEzE,wBAAgB,aAAa,kDAE5B;;;;;;;;;;;;;;AAED;;;GAGG;AACH,qBAAa,cAAe,SAAQ,mBAWlC;IACA,MAAM,CAAC,OAAO,CACZ,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,oBAAoB,CAAC,gBAAgB;IAUhD,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc;;;;;;CASrD;AAED,oCAAoC;AACpC,MAAM,MAAM,yBAAyB,GAAG,OAAO,cAAc,CAAA;;;;;AAK7D,eAAO,MAAM,GAAG,oDAAwB,CAAA;AAKxC,yBAAiB,oBAAoB,CAAC;;;;;;;;;IACpC;;;OAGG;IACH,MAAM,OAAO,OAAQ,SAAQ,YAA2C;KAAG;IAC3E,MAAM,WAAW,gBACf,SAAQ,uBAAuB,CAAC,OAAO,oBAAoB,CAAC;KAAG;IACjE,MAAM,WAAW,KAAM,SAAQ,gBAAgB,CAAC,OAAO,oBAAoB,CAAC;KAAG;;CAChF;AACD,yBAAiB,cAAc,CAAC;;;;;;;;;;;;IAC9B;;;OAGG;IACH,MAAM,OAAO,OAAQ,SAAQ,cAAqC;KAAG;IACrE,MAAM,WAAW,gBACf,SAAQ,uBAAuB,CAAC,OAAO,cAAc,CAAC;KAAG;IAC3D,MAAM,WAAW,KAAM,SAAQ,gBAAgB,CAAC,OAAO,cAAc,CAAC;KAAG;;CAC1E"}

package/dist/RequestContext.js

@@ -5,6 +5,7 @@ export class RequestContextParent extends tsplus_module_1.MNModel()({
     _tag: tsplus_module_1.prop(tsplus_module_1.literal("RequestContext")),
     id: tsplus_module_1.prop(RequestId),
     name: tsplus_module_1.prop(tsplus_module_1.ReasonableString),
+    userId: tsplus_module_1.optProp(tsplus_module_1.ReasonableString),
     locale: tsplus_module_1.prop(tsplus_module_1.literal("en", "de")),
     createdAt: tsplus_module_1.defaultProp(tsplus_module_1.date)
 }) {
@@ -66,4 +67,4 @@ export const tag = tsplus_module_2.Tag();
     }
     RequestContext.Encoded = Encoded;
 })(RequestContext || (RequestContext = {}));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9fc3JjL1JlcXVlc3RDb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsTUFBTSxDQUFDLE1BQU0sU0FBUyxtQkFBRyxRQUFRLENBQUE7QUFHakMsTUFBTSxPQUFPLG9CQUFxQixTQUFRLGdCQUFBLE9BQU8sRUFLOUMsQ0FBQztJQUNGLElBQUksRUFBRSxnQkFBQSxJQUFJLENBQUMsZ0JBQUEsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBQUM7SUFDckMsRUFBRSxFQUFFLGdCQUFBLElBQUksQ0FBQyxTQUFTLENBQUM7SUFDbkIsSUFBSSxFQUFFLGdCQUFBLElBQUksaUJBQUMsZ0JBQWdCLENBQUM7SUFDNUIsTUFBTSxFQUFFLGdCQUFBLElBQUksQ0FBQyxnQkFBQSxPQUFPLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQ2pDLFNBQVMsRUFBRSxnQkFBQSxXQUFXLGlCQUFDLElBQUksQ0FBQztDQUM3QixDQUFDO0NBQUc7QUFJTCxNQUFNLFVBQVUsYUFBYTtJQUMzQixPQUFPLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtBQUN6QixDQUFDO0FBRUQ7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLGNBQWUsU0FBUSxnQkFBQSxPQUFPLEVBS3hDLENBQUM7SUFDRixHQUFHLG9CQUFvQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUM7SUFDbEMsRUFBRSxFQUFFLGdCQUFBLFdBQVcsQ0FBQyxTQUFTLEVBQUUsYUFBYSxDQUFDO0lBQ3pDLE1BQU0sRUFBRSxnQkFBQSxJQUFJLENBQUMsU0FBUyxDQUFDO0lBQ3ZCLE1BQU0sRUFBRSxnQkFBQSxPQUFPLENBQUMsb0JBQW9CLENBQUM7SUFDckMsU0FBUyxFQUFFLGdCQUFBLE9BQU8saUJBQUMsZ0JBQWdCLENBQUM7Q0FDckMsQ0FBQztJQUNBLE1BQU0sQ0FBQyxPQUFPLENBRVosTUFBc0IsRUFDdEIsT0FBOEM7UUFFOUMsT0FBTyxJQUFJLGNBQWMsQ0FBQztZQUN4QixTQUFTLEVBQUUsTUFBTSxFQUFFLFNBQVM7WUFDNUIsR0FBRyxPQUFPO1lBQ1YsTUFBTSxFQUFFLE1BQU0sQ0FBQyxNQUFNO1lBQ3JCLE1BQU07U0FDUCxDQUFDLENBQUE7SUFDSixDQUFDO0lBRUQsTUFBTSxDQUFDLFlBQVksQ0FBYSxJQUFvQjtRQUNsRCxPQUFPO1lBQ0wsYUFBYSxFQUFFLElBQUksQ0FBQyxJQUFJO1lBQ3hCLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTTtZQUNuQixHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU07Z0JBQ2IsQ0FBQyxDQUFDLEVBQUUsbUJBQW1CLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFO2dCQUM3RSxDQUFDLENBQUMsRUFBRSxDQUFDO1NBQ1IsQ0FBQTtJQUNILENBQUM7Q0FDRjtBQUtEOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sR0FBRyxHQUFHLGdCQUFBLEdBQUcsRUFBa0IsQ0FBQTtBQUV4QyxnQ0FBZ0M7QUFDaEMsRUFBRTtBQUNGLG9CQUFvQjtBQUNwQixXQUFpQixvQkFBb0I7SUFDbkM7OztPQUdHO0lBQ0gsTUFBYSxPQUFRLFNBQVEsZ0JBQUEsWUFBWSxFQUErQjtLQUFHO0lBQTlELDRCQUFPLFVBQXVELENBQUE7QUFJN0UsQ0FBQyxFQVRnQixvQkFBb0IsS0FBcEIsb0JBQW9CLFFBU3BDO0FBQ0QsV0FBaUIsY0FBYztJQUM3Qjs7O09BR0c7SUFDSCxNQUFhLE9BQVEsU0FBUSxnQkFBQSxZQUFZLEVBQXlCO0tBQUc7SUFBeEQsc0JBQU8sVUFBaUQsQ0FBQTtBQUl2RSxDQUFDLEVBVGdCLGNBQWMsS0FBZCxjQUFjLFFBUzlCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9fc3JjL1JlcXVlc3RDb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsTUFBTSxDQUFDLE1BQU0sU0FBUyxtQkFBRyxRQUFRLENBQUE7QUFHakMsTUFBTSxPQUFPLG9CQUFxQixTQUFRLGdCQUFBLE9BQU8sRUFLOUMsQ0FBQztJQUNGLElBQUksRUFBRSxnQkFBQSxJQUFJLENBQUMsZ0JBQUEsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBQUM7SUFDckMsRUFBRSxFQUFFLGdCQUFBLElBQUksQ0FBQyxTQUFTLENBQUM7SUFDbkIsSUFBSSxFQUFFLGdCQUFBLElBQUksaUJBQUMsZ0JBQWdCLENBQUM7SUFDNUIsTUFBTSxFQUFFLGdCQUFBLE9BQU8saUJBQUMsZ0JBQWdCLENBQUM7SUFDakMsTUFBTSxFQUFFLGdCQUFBLElBQUksQ0FBQyxnQkFBQSxPQUFPLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQ2pDLFNBQVMsRUFBRSxnQkFBQSxXQUFXLGlCQUFDLElBQUksQ0FBQztDQUM3QixDQUFDO0NBQUc7QUFJTCxNQUFNLFVBQVUsYUFBYTtJQUMzQixPQUFPLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtBQUN6QixDQUFDO0FBRUQ7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLGNBQWUsU0FBUSxnQkFBQSxPQUFPLEVBS3hDLENBQUM7SUFDRixHQUFHLG9CQUFvQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUM7SUFDbEMsRUFBRSxFQUFFLGdCQUFBLFdBQVcsQ0FBQyxTQUFTLEVBQUUsYUFBYSxDQUFDO0lBQ3pDLE1BQU0sRUFBRSxnQkFBQSxJQUFJLENBQUMsU0FBUyxDQUFDO0lBQ3ZCLE1BQU0sRUFBRSxnQkFBQSxPQUFPLENBQUMsb0JBQW9CLENBQUM7SUFDckMsU0FBUyxFQUFFLGdCQUFBLE9BQU8saUJBQUMsZ0JBQWdCLENBQUM7Q0FDckMsQ0FBQztJQUNBLE1BQU0sQ0FBQyxPQUFPLENBRVosTUFBc0IsRUFDdEIsT0FBOEM7UUFFOUMsT0FBTyxJQUFJLGNBQWMsQ0FBQztZQUN4QixTQUFTLEVBQUUsTUFBTSxFQUFFLFNBQVM7WUFDNUIsR0FBRyxPQUFPO1lBQ1YsTUFBTSxFQUFFLE1BQU0sQ0FBQyxNQUFNO1lBQ3JCLE1BQU07U0FDUCxDQUFDLENBQUE7SUFDSixDQUFDO0lBRUQsTUFBTSxDQUFDLFlBQVksQ0FBYSxJQUFvQjtRQUNsRCxPQUFPO1lBQ0wsYUFBYSxFQUFFLElBQUksQ0FBQyxJQUFJO1lBQ3hCLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTTtZQUNuQixHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU07Z0JBQ2IsQ0FBQyxDQUFDLEVBQUUsbUJBQW1CLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFO2dCQUM3RSxDQUFDLENBQUMsRUFBRSxDQUFDO1NBQ1IsQ0FBQTtJQUNILENBQUM7Q0FDRjtBQUtEOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sR0FBRyxHQUFHLGdCQUFBLEdBQUcsRUFBa0IsQ0FBQTtBQUV4QyxnQ0FBZ0M7QUFDaEMsRUFBRTtBQUNGLG9CQUFvQjtBQUNwQixXQUFpQixvQkFBb0I7SUFDbkM7OztPQUdHO0lBQ0gsTUFBYSxPQUFRLFNBQVEsZ0JBQUEsWUFBWSxFQUErQjtLQUFHO0lBQTlELDRCQUFPLFVBQXVELENBQUE7QUFJN0UsQ0FBQyxFQVRnQixvQkFBb0IsS0FBcEIsb0JBQW9CLFFBU3BDO0FBQ0QsV0FBaUIsY0FBYztJQUM3Qjs7O09BR0c7SUFDSCxNQUFhLE9BQVEsU0FBUSxnQkFBQSxZQUFZLEVBQXlCO0tBQUc7SUFBeEQsc0JBQU8sVUFBaUQsQ0FBQTtBQUl2RSxDQUFDLEVBVGdCLGNBQWMsS0FBZCxjQUFjLFFBUzlCIn0=

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<"GET" | "POST" | "PUT" | "PATCH" | "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

@@ -124,7 +124,7 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
                 return requestContext;
             }),
             pars: getParams(req)
-        }), ({ pars, requestContext }) => tsplus_module_10.setupRequest(tsplus_module_3.provideService(tsplus_module_3.tap(tsplus_module_3.tapErrorCause(tsplus_module_3.zipRight(tsplus_module_3.flatMap(tsplus_module_1.get(RequestSettings), s => tsplus_module_8.logAnnotates({
+        }), ({ pars, requestContext }) => tsplus_module_3.provideService(tsplus_module_10.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_8.logAnnotates({
             method: req.method,
             path: req.originalUrl,
             ...s.verbose
@@ -145,13 +145,12 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
                 };
                 return hn;
             }), parsedReq => tsplus_module_3.flatMap(restore(() => handle(parsedReq))(), r => respond(parsedReq, res, r)));
-            const setNamespace = tsplus_module_3.provideService(restoreFromRequestContext, tsplus_module_6.tag, requestContext);
             // 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(setNamespace, tsplus_module_4.provideSomeContextEffect(makeMiddlewareContext(req, res, requestContext))(r))
-                : tsplus_module_3.zipRight(setNamespace
+                ? tsplus_module_4.provideSomeContextEffect(makeMiddlewareContext(req, res, requestContext))(tsplus_module_3.zipRight(restoreFromRequestContext, r))
+                : tsplus_module_3.zipRight(restoreFromRequestContext
                 // PR is not relevant here
                 , r);
             return errorHandler(req, res, requestContext, r2);
@@ -187,8 +186,8 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
                     } :
                     undefined
             })(tsplus_module_3.logInfo("Finished request"));
-        })), tsplus_module_6.tag, requestContext) // otherwise external error reporter breaks.
-        , requestContext)));
+        }))), tsplus_module_6.tag, requestContext) // otherwise external error reporter breaks.
+        ));
     };
 }
 /**
@@ -250,4 +249,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":";;;;;;;;;;;AAAA,uDAAuD;AACvD,OAAO,KAAK,EAAE,MAAM,oCAAoC,CAAA;AAGxD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAGlD,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAChE,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;AAEvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAA;AAEnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAA;AAEvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,MAAM,CAAC,MAAM,eAAe,GAAG,2BAAoB;IACjD,OAAO,EAAE,KAAK;CACf,CAAC,CAAA;AAEF,MAAM,UAAU,kBAAkB,CAWhC,OAUY;IAEZ,MAAM,EAAE,GAAG,2BACT,oBAAA,oBAAA,oBAAA,6BAAoB,OAAO,CAAC,OAAO,CAAC,EAC7B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EACP,AA7CC,EAAE,CA6CH,MAAM,CAAC,GAAG,CAAC,EACX,EAAE,CAAC,WAAW,CAAC,CACvB,CAAA;IACD,MAAM,YAAY,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,8BAAA,EAAE,EAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAE7D,MAAM,EAAE,GAAG,2BACT,oBAAA,oBAAA,oBAAA,6BAAoB,OAAO,CAAC,KAAK,CAAC,EAC3B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EACP,AArDC,EAAE,CAqDH,MAAM,CAAC,GAAG,CAAC,EACX,EAAE,CAAC,WAAW,CAAC,CACvB,CAAA;IACD,MAAM,UAAU,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,8BAAA,EAAE,EAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAE3D,MAAM,EAAE,GAAG,2BACT,oBAAA,oBAAA,oBAAA,6BAAoB,OAAO,CAAC,IAAI,CAAC,EAC1B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EACP,AA7DC,EAAE,CA6DH,MAAM,CAAC,GAAG,CAAC,EACX,EAAE,CAAC,WAAW,CAAC,CACvB,CAAA;IACD,MAAM,SAAS,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,8BAAA,EAAE,EAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAE1D,MAAM,EAAE,GAAG,2BACT,oBAAA,oBAAA,oBAAA,6BAAoB,OAAO,CAAC,IAAI,CAAC,EAC1B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EACP,AArEC,EAAE,CAqEH,MAAM,CAAC,GAAG,CAAC,EACX,EAAE,CAAC,WAAW,CAAC,CACvB,CAAA;IACD,MAAM,SAAS,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,8BAAA,EAAE,EAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAE1D,MAAM,EAAE,GAAG,2BACT,oBAAA,oBAAA,oBAAA,6BAAoB,OAAO,CAAC,MAAM,CAAC,EAC5B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EACP,AA7EC,EAAE,CA6EH,MAAM,CAAC,GAAG,CAAC,EACX,EAAE,CAAC,WAAW,CAAC,CACvB,CAAA;IACD,MAAM,WAAW,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,8BAAA,EAAE,EAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAE5D,OAAO;QACL,SAAS;QACT,WAAW;QACX,YAAY;QACZ,SAAS;QACT,UAAU;KACX,CAAA;AACH,CAAC;AA2BD,MAAM,UAAU,KAAK,CAcnB,cAUC,EACD,YAK8B,EAC9B,UAYC;IAED,IAAI,qBAAqB,GAAG,SAAS,CAAA;IACrC,IAAI,UAAU,EAAE;QACd,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,UAAU,CAAC,cAAc,CAAC,CAAA;QAC3D,cAAc,GAAG,OAAO,CAAA;QACxB,qBAAqB,GAAG,WAAW,CAAA;KACpC;IACD,OAAO,yBAAA,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAS,CAAC,CACjE,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EACzC,kBAAkB,CAChB,cAAc,EACd,YAAY,EACZ,qBAAqB,CACtB,CACF,EACC,2BACE,mBAAmB,CACjB,cAAc,CAAC,OAAO,CAAC,IAAI,EAC3B,cAAc,CAAC,OAAO,CAAC,MAAM,EAC7B,cAAc,CACf,CACF,CACF,CAAA;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,cAA2C;IAE3C,OAAO,CAAC,GAAS,EAAE,GAAqB,EAAE,CAAI,EAAE,EAAE,CAChD,wBAAA,2BAAO,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EACnB,CAAC,CAAC,EAAE,CACX,qBAAY,GAAG,EAAE;QACf,CAAC,KAAK,SAAS;YACb,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE;YACxB,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC;iBACd,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;IAC9B,CAAC,CAAC,CACH,CAAA;AACP,CAAC;AAED,MAAM,UAAU,kBAAkB,CAchC,OAUC,EACD,YAKkC,EAClC,qBAAwD;IAExD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAC/D,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,QAAe,CAAC,CAAC,CAAC,CA1OlD,EAAE,CA0OiD,IAAI,CAAA;IACjE,MAAM,OAAO,GAAG,AA3ON,EAAE,CA2OI,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IACrC,MAAM,cAAc,GAAG,aAAa;QAClC,CAAC,CAAC,CAAC,GAAS,EAAE,EAAE,CAAC,AA7OT,EAAE,CA6OO,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QAChD,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAA;IAEjB,MAAM,cAAc,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAA;IAClD,MAAM,YAAY,GAAG,kBAAkB,CAAC,cAAc,CAAC,CAAA;IACvD,MAAM,OAAO,GAAG,cAAc,CAAC,cAAc,CAAC,CAAA;IAE9C,SAAS,SAAS,CAAC,GAAoB;QACrC,OAAO,2BAAO,CAAA;YACZ,IAAI,EAAE,GAAG,CAAC,MAAM;YAChB,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,OAAO,EAAE,GAAG,CAAC,OAAO;SACrB,CAAA,CAAC,CAAA;IACJ,CAAC;IAED,SAAS,WAAW,CAAC,GAAoB;QACvC,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAA;QACxB,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE,IAAI,CAAU,CAAA;QACvC,MAAM,aAAa,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;QAC7C,MAAM,MAAM,GAAG,aAAa,IAAI,SAAS,CAAC,QAAQ,CAAC,aAAoB,CAAC;YACtE,CAAC,CAAE,aAA0C;YAC7C,CAAC,CAAE,IAAc,CAAA;QAEnB,0CAA0C;QAC1C,kBAAkB;QAClB,0CAA0C;QAC1C,IAAI;QAEJ,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;QAC3C,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,4BAAA,SAAS,EAAa,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,CAAA;QAE9E,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;QACzC,MAAM,SAAS,GAAG,AA/QV,EAAE,CA+QQ,gBAAgB,CAAC,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,SAAS,CAAC,CAAA;QAE7G,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC;YACxC,MAAM;YACN,IAAI,EAAE,AAnRA,EAAE,CAmRF,gBAAgB,CACpB,OAAO,CAAC,KAAK,YAAY,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CACzE;YACD,MAAM;YACN,SAAS,EAAE,KAAK;YAChB,SAAS;YACT,iCAAiC;YACjC,QAAQ;YACR,yCAAyC;YACzC,mDAAmD;YACnD,gBAAgB;YAChB,8CAA8C;YAC9C,SAAS;YACT,MAAM;YACN,UAAU;SACX,CAAC,CAAA;QACF,0CAA0C;QAC1C,OAAO,cAAc,CAAA;IACvB,CAAC;IAED,OAAO,CAAC,GAAoB,EAAE,GAAqB,EAAE,EAAE;QACrD,OAAO,0BAAe,OAAO,CAAC,EAAE,CAC9B,wBAAA,oBAAW;YACT,cAAc,EAAE,qBAAY,GAAG,EAAE;gBAC/B,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,CAAC,CAAA;gBACvC,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,EAAE;oBACxB,GAAG,CAAC,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;iBAC3C;gBACD,GAAG,CAAC,SAAS,CAAC,kBAAkB,EAAE,cAAc,CAAC,MAAM,CAAC,CAAA;gBACxD,OAAO,cAAc,CAAA;YACvB,CAAC,CAAC;YACF,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC;SACrB,CAAC,EACS,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,CACpC,iEAAA,oBAAA,8BAAA,yBAAA,4CAAA,eAAe,GAAa,CAAC,CAAC,EAAE,CAE5B,6BAAoB;YAClB,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,IAAI,EAAE,GAAG,CAAC,WAAW;YACrB,GAAG,CAAC,CAAC,OAAO;gBACV,CAAC,CAAC;oBACA,OAAO,uDAAE,IAAI,CAAC,IAAI,EAAU;oBAC5B,QAAQ,uDAAE,IAAI,CAAC,KAAK,EAAU;oBAC9B,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;oBAC1B,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;oBAChC,UAAU,uDAAE,IAAI,CAAC,OAAO,EAAU;iBACnC,CAAC,CAAC;gBACH,SAAS;SACZ,CAAC,CAbJ,wBAAe,kBAAkB,CAAC,CAcjC,CACF,EACC,+BAAsB,GAAG,EAAE;YACzB,MAAM,aAAa,GAAG,wBAAA,oBAAA,YAAY,CAAC,GAAG,CAAC,EAChC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;gBAC7B,MAAM,EAAE,GAAG;oBACT,kCAAG,IAAI,CAAM;oBACb,kCAAG,KAAK,CAAM;oBACd,kCAAG,IAAI,CAAM;iBACK,CAAA;gBACpB,OAAO,EAAE,CAAA;YACX,CAAC,CAAC,EACO,SAAS,CAAC,EAAE,CACnB,wBAAA,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,SAAgB,CAAC,CAAC,EAAE,EAC9B,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAC5C,CAAA;YAEH,wCAAwC;YACxC,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,iCAAC,aAAa,EAAiB,CAAC,CAAC,aAAa,CAAA,CAAC,6CAA6C;YAC5H,sDAAsD;YACtD,MAAM,EAAE,GAAG,qBAAqB;gBAC9B,CAAC,CAAC,yCAE0B,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,cAAc,CAAC,EAFzE,yBAAA,yBAAyB,EACf,CAAC,CAAC,CAC8D;gBAC5E,CAAC,CAAC,yBAAA,yBAAyB;gBACzB,0BAA0B;kBAChB,CAAC,CAAyC,CAAA;YACxD,OAAO,YAAY,CACjB,GAAG,EACH,GAAG,EACH,cAAc,EACd,EAAE,CACH,CAAA;QACH,CAAC,CAAC,CACH,EACgB,KAAK,CAAC,EAAE,CACrB,8BAAA,uBACE,2BAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAC9B,kBAAkB,CAAC,KAAK,EAAE;YACxB,cAAc;YACd,IAAI,EAAE,GAAG,CAAC,WAAW;YACrB,MAAM,EAAE,GAAG,CAAC,MAAM;SACnB,CAAC,EACF,+BAAsB,GAAG,EAAE;YACzB,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU,EAAE,CAAA;YAChC,OAGQ,6BAAoB;gBAC1B,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,IAAI,EAAE,GAAG,CAAC,WAAW;gBACrB,UAAU,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,EAAE;gBAErC,OAAO,uDAAE,IAAI,CAAC,IAAI,EAAU;gBAC5B,QAAQ,uDAAE,IAAI,CAAC,KAAK,EAAU;gBAC9B,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;gBAC1B,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;gBAChC,UAAU,uDAAE,IAAI,CAAC,OAAO,EAAU;gBAElC,UAAU,uDAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;oBAChE,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;oBAC1E,OAAO,IAAI,CAAA;gBACb,CAAC,EAAE,EAAyB,CAAC,EACjB;aACb,CAAC,CAnBK,qCACL,kBAAkB,EAClB,KAAK,CACN,EAgBE;QACL,CAAC,CAAC,CACH,EACgB,KAAK,CAAC,EAAE,CAAC,2BAAO,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,KAAK,CAAC,CAAC,CAAC,CAChG,EACI,GAAG,EAAE,CACR,4CAAA,eAAe,GAAa,CAAC,CAAC,EAAE;YAC9B,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU,EAAE,CAAA;YAChC,OAAgD,6BAAoB;gBAClE,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,IAAI,EAAE,GAAG,CAAC,WAAW;gBACrB,UAAU,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,EAAE;gBACrC,GAAG,CAAC,CAAC,OAAO;oBACV,CAAC,CAAC;wBACA,UAAU,uDAAE,OAAO,EAAU;qBAC9B,CAAC,CAAC;oBACH,SAAS;aACZ,CAAC,CATK,wBAAe,kBAAkB,CAAC,EAStC;QACL,CAAC,CAAC,CACH,wBAEmC,cAAc,CAAC,CAAC,4CAA4C;SACnG,CACJ,CAAA;IACH,CAAC,CAAA;AACH,CAAC;AA2CD;;;GAGG;AACH,MAAM,UAAU,QAAQ,CAA4B,QAAW;IAC7D,MAAM,MAAM,GAAG,mDAAA,QAAQ,GAAS,MAAM,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QACnD,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAsB,EAAE,wBAAwB,CAAC,CAAA;QAC/E,OAAO,IAAI,CAAA;IACb,CAAC,EAAE,EAAS,CAA8B,CAAA;IAE1C,OAAO,MAAM,CAAA;AACf,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAgC,QAAW;IACpE,MAAM,MAAM,GAAG,mDAAA,QAAQ,GAAS,MAAM,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QACnD,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA;QACvC,mDAAA,OAAO,GAAS,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,GAAa,IAAI,GAAa,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAA;QACxF,OAAO,IAAI,CAAA;IACb,CAAC,EAAE,EAAS,CAA2C,CAAA;IAEvD,OAAO,MAAM,CAAA;AACf,CAAC;AAwCD,MAAM,UAAU,MAAM,CAMpB,CAAsC,EACtC,aAAmB;IAEnB,wDAAwD;IACxD,MAAM,OAAO,GAAG,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,CAAA;IACpC,MAAM,QAAQ,GAAG,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;IAUtC,OAAO,CACL,CAAgC,EAChC,EAAE,CAAC,CAAC;QACJ,aAAa;QACb,CAAC;QACD,OAAO;QACP,QAAQ;QACR,eAAe,EAAE,CAAC,CAAC,eAAe,IAAI,QAAQ;KAQ9C,CAAA,CAAA;AACJ,CAAC;AAqBD;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,aAAa,CAAuD,GAAa;IAE/F,OAAO,CAOL,QAAmB,EACnB,EAAE;QACF,MAAM,OAAO,GAAG,mDAAA,GAAG,GAAS,MAAM,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;YAC/C,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAQ,CAAC,CAAA;YAClD,OAAO,IAAI,CAAA;QACb,CAAC,EAAE,EAAS,CAAC,CAAA;QAEb,OAAO,OASN,CAAA;IACH,CAAC,CAAA;AACH,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"setupRequest.d.ts","sourceRoot":"","sources":["../../_src/api/setupRequest.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;;;;;AAKrD,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,EAAE,cAAc,+CAW1F;;;;;AAKD,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,gEAE9D;;;;;AAKD,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,wEAMrE"}
+{"version":3,"file":"setupRequest.d.ts","sourceRoot":"","sources":["../../_src/api/setupRequest.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;;;;;AAKrD,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,gEAE9D;;;;;AAKD,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,wEAMrE"}

package/dist/api/setupRequest.js

@@ -14,7 +14,8 @@ 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
+        requestName: requestContext.name,
+        ...requestContext.userId ? { requestUserId: requestContext.userId } : {}
     })));
 }
 /**
@@ -38,4 +39,4 @@ function makeInternalRequestContext(name) {
         name: tsplus_module_6.ReasonableString(name)
     });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvc2V0dXBSZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OzthQUtnQixZQUFZO2FBZ0JaLGdCQUFnQjtBQXJCaEMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHNCQUFzQixDQUFBO0FBRXJEOztHQUVHO0FBQ0gsd0JBQXNDLElBQXFCLEVBQUUsY0FBOEI7SUFDekYsT0FBTyx5QkFBZSxHQUFHLEVBQUUsQ0FDekIsZ0JBQUEsSUFBSSxDQUNGLHdCQUFBLElBQUksRUFBUyxTQUFTLENBQUMsRUFDdkIsNkJBQW9CO1FBQ2xCLGFBQWEsRUFBRSxjQUFjLENBQUMsTUFBTTtRQUNwQyxTQUFTLEVBQUUsY0FBYyxDQUFDLEVBQUU7UUFDNUIsV0FBVyxFQUFFLGNBQWMsQ0FBQyxJQUFJO0tBQ2pDLENBQUMsQ0FDSCxDQUNGLENBQUE7QUFDSCxDQUFDO0FBRUQ7O0dBRUc7QUFDSCw0QkFBMEMsSUFBcUI7SUFDN0QsT0FBTyx5QkFBZSxHQUFHLEVBQUUsQ0FBQyx1REFBb0MsY0FBYyxDQUFDLEVBQUUsQ0FBQyxlQUFBLElBQUksRUFBYyxjQUFjLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFDdkgsQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLFNBQVMsQ0FBVSxJQUFxQixFQUFFLElBQVk7SUFDcEUsT0FBTyx5QkFBZSxHQUFHLEVBQUUsQ0FDekIsa0RBQUEsSUFBSSx3QkFFa0MsMEJBQTBCLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FDeEUsQ0FBQTtBQUNILENBQUM7QUFFRCxTQUFTLDBCQUEwQixDQUFDLElBQVk7SUFDOUMsTUFBTSxFQUFFLEdBQUcsZ0JBQUEsUUFBUSxDQUFDLElBQUksRUFBRSxDQUFBO0lBQzFCLE9BQU8sSUFBSSxjQUFjLENBQUM7UUFDeEIsRUFBRTtRQUNGLE1BQU0sRUFBRSxFQUFFO1FBQ1YsTUFBTSxFQUFFLElBQUk7UUFDWixJQUFJLEVBQUUsZ0JBQUEsZ0JBQWdCLENBQUMsSUFBSSxDQUFDO0tBQzdCLENBQUMsQ0FBQTtBQUNKLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvc2V0dXBSZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OzthQUtnQixZQUFZO2FBaUJaLGdCQUFnQjtBQXRCaEMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHNCQUFzQixDQUFBO0FBRXJEOztHQUVHO0FBQ0gsd0JBQXNDLElBQXFCLEVBQUUsY0FBOEI7SUFDekYsT0FBTyx5QkFBZSxHQUFHLEVBQUUsQ0FDekIsZ0JBQUEsSUFBSSxDQUNGLHdCQUFBLElBQUksRUFBUyxTQUFTLENBQUMsRUFDdkIsNkJBQW9CO1FBQ2xCLGFBQWEsRUFBRSxjQUFjLENBQUMsTUFBTTtRQUNwQyxTQUFTLEVBQUUsY0FBYyxDQUFDLEVBQUU7UUFDNUIsV0FBVyxFQUFFLGNBQWMsQ0FBQyxJQUFJO1FBQ2hDLEdBQUcsY0FBYyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxhQUFhLEVBQUUsY0FBYyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFO0tBQ3pFLENBQUMsQ0FDSCxDQUNGLENBQUE7QUFDSCxDQUFDO0FBRUQ7O0dBRUc7QUFDSCw0QkFBMEMsSUFBcUI7SUFDN0QsT0FBTyx5QkFBZSxHQUFHLEVBQUUsQ0FBQyx1REFBb0MsY0FBYyxDQUFDLEVBQUUsQ0FBQyxlQUFBLElBQUksRUFBYyxjQUFjLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFDdkgsQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLFNBQVMsQ0FBVSxJQUFxQixFQUFFLElBQVk7SUFDcEUsT0FBTyx5QkFBZSxHQUFHLEVBQUUsQ0FDekIsa0RBQUEsSUFBSSx3QkFFa0MsMEJBQTBCLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FDeEUsQ0FBQTtBQUNILENBQUM7QUFFRCxTQUFTLDBCQUEwQixDQUFDLElBQVk7SUFDOUMsTUFBTSxFQUFFLEdBQUcsZ0JBQUEsUUFBUSxDQUFDLElBQUksRUFBRSxDQUFBO0lBQzFCLE9BQU8sSUFBSSxjQUFjLENBQUM7UUFDeEIsRUFBRTtRQUNGLE1BQU0sRUFBRSxFQUFFO1FBQ1YsTUFBTSxFQUFFLElBQUk7UUFDWixJQUFJLEVBQUUsZ0JBQUEsZ0JBQWdCLENBQUMsSUFBSSxDQUFDO0tBQzdCLENBQUMsQ0FBQTtBQUNKLENBQUMifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.32.2",
+  "version": "0.34.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -20,9 +20,9 @@
     "pure-rand": "^6.0.0",
     "redlock": "^4.2.0",
     "@effect-app/prelude": "0.25.1",
-    "@effect-app/core": "0.32.1",
+    "@effect-app/infra-adapters": "0.25.1",
     "@effect-app/schema": "0.23.1",
-    "@effect-app/infra-adapters": "0.25.1"
+    "@effect-app/core": "0.32.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.21.0",