@effect-app/infra 1.3.4 → 1.3.6

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @effect-app/infra
 
+## 1.3.6
+
+### Patch Changes
+
+- 128f636: update packages
+- Updated dependencies [128f636]
+  - @effect-app/infra-adapters@1.1.2
+  - effect-app@1.2.2
+  - @effect-app/schema@1.1.2
+  - @effect-app/core@1.1.2
+
+## 1.3.5
+
+### Patch Changes
+
+- 6c18162: include spans with logs
+
 ## 1.3.4
 
 ### Patch Changes

package/_cjs/api/routing/makeRequestHandler.cjs

@@ -39,16 +39,18 @@ function makeRequestHandler(handler, errorHandler, middlewareLayer) {
   const parseRequest = (0, _base.parseRequestParams)(requestParsers);
   const getParams = _effectApp.Effect.map(_effectApp.Effect.all({
     rcx: _http.HttpRouter.RouteContext,
+    searchParms: _http.HttpServerRequest.ParsedSearchParams,
     req: _effectApp.Effect.flatMap(_http.HttpServerRequest.ServerRequest, req => req.json.pipe(_effectApp.Effect.map(body => ({
       body,
       headers: req.headers
     }))))
   }), ({
     rcx,
-    req
+    req,
+    searchParms
   }) => ({
     params: rcx.params,
-    query: rcx.searchParams,
+    query: searchParms,
     body: req.body,
     headers: req.headers,
     cookies: {} // req.cookies

package/_cjs/api/routing/makeRequestHandler.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"makeRequestHandler.cjs","names":["_utils","require","_RequestFiberSet","_util","_errorReporter","_effectApp","_http","_schema","_setupRequest","_base","RequestSettings","exports","FiberRef","unsafeMake","verbose","makeRequestHandler","handler","errorHandler","middlewareLayer","Request","Response","h","handle","response","S","Void","resp","encoder","fields","encode","rt","encodedSchema","Struct","requestParsers","makeRequestParsers","parseRequest","parseRequestParams","getParams","Effect","map","all","rcx","HttpRouter","RouteContext","req","flatMap","HttpServerRequest","ServerRequest","json","pipe","body","headers","params","query","searchParams","cookies","uninterruptibleMask","restore","gen","$","res","HttpServerResponse","empty","_","method","setHeader","pars","settings","get","eff","logInfo","annotateLogs","path","originalUrl","reqPath","pretty","reqQuery","reqBody","reqCookies","reqHeaders","undefined","andThen","suspend","handleRequest","hn","Option","getOrUndefined","tap","parsedReq","annotateCurrentSpan","Object","entries","reduce","prev","key","value","length","substring","Array","isArray","keys","provideService","Tag","r","setBody","HttpBody","unsafeJson","setStatus","uninterruptible","r2","provide","RequestFiberSet","register","catchAllCause","cause","sync","reportError","logError","statusCode","status","toString","resHeaders","snipString","concurrency","tapErrorCause","Console","error","updateRequestContext","copy","name","NonEmptyString255"],"sources":["../../../src/api/routing/makeRequestHandler.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"makeRequestHandler.cjs","names":["_utils","require","_RequestFiberSet","_util","_errorReporter","_effectApp","_http","_schema","_setupRequest","_base","RequestSettings","exports","FiberRef","unsafeMake","verbose","makeRequestHandler","handler","errorHandler","middlewareLayer","Request","Response","h","handle","response","S","Void","resp","encoder","fields","encode","rt","encodedSchema","Struct","requestParsers","makeRequestParsers","parseRequest","parseRequestParams","getParams","Effect","map","all","rcx","HttpRouter","RouteContext","searchParms","HttpServerRequest","ParsedSearchParams","req","flatMap","ServerRequest","json","pipe","body","headers","params","query","cookies","uninterruptibleMask","restore","gen","$","res","HttpServerResponse","empty","_","method","setHeader","pars","settings","get","eff","logInfo","annotateLogs","path","originalUrl","reqPath","pretty","reqQuery","reqBody","reqCookies","reqHeaders","undefined","andThen","suspend","handleRequest","hn","Option","getOrUndefined","tap","parsedReq","annotateCurrentSpan","Object","entries","reduce","prev","key","value","length","substring","Array","isArray","keys","provideService","Tag","r","setBody","HttpBody","unsafeJson","setStatus","uninterruptible","r2","provide","RequestFiberSet","register","catchAllCause","cause","sync","reportError","logError","statusCode","status","toString","resHeaders","snipString","concurrency","tapErrorCause","Console","error","updateRequestContext","copy","name","NonEmptyString255"],"sources":["../../../src/api/routing/makeRequestHandler.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/_cjs/logger/jsonLogger.cjs

@@ -36,5 +36,5 @@ const jsonLogger = exports.jsonLogger = _effectApp.Logger.make(({
   };
   globalThis.console.log(JSON.stringify(data));
 });
-const logJson = exports.logJson = _effectApp.Logger.replace(_effectApp.Logger.defaultLogger, jsonLogger);
+const logJson = exports.logJson = _effectApp.Logger.replace(_effectApp.Logger.defaultLogger, _effectApp.Logger.withSpanAnnotations(jsonLogger));
 //# sourceMappingURL=jsonLogger.cjs.map

package/_cjs/logger/jsonLogger.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"jsonLogger.cjs","names":["_effectApp","require","_shared","jsonLogger","exports","Logger","make","annotations","cause","context","fiberId","logLevel","message","spans","now","Date","nowMillis","getTime","c","getRequestContext","data","timestamp","level","label","fiber","FiberId","threadName","request","Option","getOrUndefined","Cause","empty","pretty","undefined","List","map","_","timing","startTime","pipe","toArray","HashMap","size","reduce","prev","k","v","globalThis","console","log","JSON","stringify","logJson","replace","defaultLogger"],"sources":["../../src/logger/jsonLogger.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AAEO,MAAME,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAGE,iBAAM,CAACC,IAAI,CACnC,CAAC;EAAEC,WAAW;EAAEC,KAAK;EAAEC,OAAO;EAAEC,OAAO;EAAEC,QAAQ;EAAEC,OAAO;EAAEC;AAAK,CAAE,KAAI;EACrE,MAAMC,GAAG,GAAG,IAAIC,IAAI,EAAE;EACtB,MAAMC,SAAS,GAAGF,GAAG,CAACG,OAAO,EAAE;EAE/B,MAAMC,CAAC,GAAG,IAAAC,yBAAiB,EAACV,OAAO,CAAC;EAEpC,MAAMW,IAAI,GAAG;IACXC,SAAS,EAAEP,GAAG;IACdQ,KAAK,EAAEX,QAAQ,CAACY,KAAK;IACrBC,KAAK,EAAEC,kBAAO,CAACC,UAAU,CAAChB,OAAO,CAAC;IAClCE,OAAO;IACPe,OAAO,EAAEC,iBAAM,CAACC,cAAc,CAACX,CAAC,CAAC;IACjCV,KAAK,EAAEA,KAAK,IAAI,IAAI,IAAIA,KAAK,IAAIsB,gBAAK,CAACC,KAAK,GAAGD,gBAAK,CAACE,MAAM,CAACxB,KAAK,CAAC,GAAGyB,SAAS;IAC9EpB,KAAK,EAAEqB,eAAI,CAACC,GAAG,CAACtB,KAAK,EAAGuB,CAAC,KAAM;MAAEb,KAAK,EAAEa,CAAC,CAACb,KAAK;MAAEc,MAAM,EAAErB,SAAS,GAAGoB,CAAC,CAACE;IAAS,CAAE,CAAC,CAAC,CAACC,IAAI,CAACL,eAAI,CAACM,OAAO,CAAC;IACvGjC,WAAW,EAAEkC,kBAAO,CAACC,IAAI,CAACnC,WAAW,CAAC,GAAG,CAAC,GACtC,CAAC,GAAGA,WAAW,CAAC,CAACoC,MAAM,CAAC,CAACC,IAAI,EAAE,CAACC,CAAC,EAAEC,CAAC,CAAC,KAAI;MACzCF,IAAI,CAACC,CAAC,CAAC,GAAGC,CAAC;MACX,OAAOF,IAAI;IACb,CAAC,EAAE,EAA6B,CAAC,GAC/BX;GACL;EAEDc,UAAU,CAACC,OAAO,CAACC,GAAG,CAACC,IAAI,CAACC,SAAS,CAAC/B,IAAI,CAAC,CAAC;AAC9C,CAAC,CACF;AAEM,MAAMgC,OAAO,GAAAhD,OAAA,CAAAgD,OAAA,GAAG/C,iBAAM,CAACgD,OAAO,CAAChD,iBAAM,CAACiD,aAAa,EAAEnD,UAAU,CAAC","ignoreList":[]}
+{"version":3,"file":"jsonLogger.cjs","names":["_effectApp","require","_shared","jsonLogger","exports","Logger","make","annotations","cause","context","fiberId","logLevel","message","spans","now","Date","nowMillis","getTime","c","getRequestContext","data","timestamp","level","label","fiber","FiberId","threadName","request","Option","getOrUndefined","Cause","empty","pretty","undefined","List","map","_","timing","startTime","pipe","toArray","HashMap","size","reduce","prev","k","v","globalThis","console","log","JSON","stringify","logJson","replace","defaultLogger","withSpanAnnotations"],"sources":["../../src/logger/jsonLogger.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AAEO,MAAME,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAGE,iBAAM,CAACC,IAAI,CACnC,CAAC;EAAEC,WAAW;EAAEC,KAAK;EAAEC,OAAO;EAAEC,OAAO;EAAEC,QAAQ;EAAEC,OAAO;EAAEC;AAAK,CAAE,KAAI;EACrE,MAAMC,GAAG,GAAG,IAAIC,IAAI,EAAE;EACtB,MAAMC,SAAS,GAAGF,GAAG,CAACG,OAAO,EAAE;EAE/B,MAAMC,CAAC,GAAG,IAAAC,yBAAiB,EAACV,OAAO,CAAC;EAEpC,MAAMW,IAAI,GAAG;IACXC,SAAS,EAAEP,GAAG;IACdQ,KAAK,EAAEX,QAAQ,CAACY,KAAK;IACrBC,KAAK,EAAEC,kBAAO,CAACC,UAAU,CAAChB,OAAO,CAAC;IAClCE,OAAO;IACPe,OAAO,EAAEC,iBAAM,CAACC,cAAc,CAACX,CAAC,CAAC;IACjCV,KAAK,EAAEA,KAAK,IAAI,IAAI,IAAIA,KAAK,IAAIsB,gBAAK,CAACC,KAAK,GAAGD,gBAAK,CAACE,MAAM,CAACxB,KAAK,CAAC,GAAGyB,SAAS;IAC9EpB,KAAK,EAAEqB,eAAI,CAACC,GAAG,CAACtB,KAAK,EAAGuB,CAAC,KAAM;MAAEb,KAAK,EAAEa,CAAC,CAACb,KAAK;MAAEc,MAAM,EAAErB,SAAS,GAAGoB,CAAC,CAACE;IAAS,CAAE,CAAC,CAAC,CAACC,IAAI,CAACL,eAAI,CAACM,OAAO,CAAC;IACvGjC,WAAW,EAAEkC,kBAAO,CAACC,IAAI,CAACnC,WAAW,CAAC,GAAG,CAAC,GACtC,CAAC,GAAGA,WAAW,CAAC,CAACoC,MAAM,CAAC,CAACC,IAAI,EAAE,CAACC,CAAC,EAAEC,CAAC,CAAC,KAAI;MACzCF,IAAI,CAACC,CAAC,CAAC,GAAGC,CAAC;MACX,OAAOF,IAAI;IACb,CAAC,EAAE,EAA6B,CAAC,GAC/BX;GACL;EAEDc,UAAU,CAACC,OAAO,CAACC,GAAG,CAACC,IAAI,CAACC,SAAS,CAAC/B,IAAI,CAAC,CAAC;AAC9C,CAAC,CACF;AAEM,MAAMgC,OAAO,GAAAhD,OAAA,CAAAgD,OAAA,GAAG/C,iBAAM,CAACgD,OAAO,CAAChD,iBAAM,CAACiD,aAAa,EAAEjD,iBAAM,CAACkD,mBAAmB,CAACpD,UAAU,CAAC,CAAC","ignoreList":[]}

package/_cjs/logger/logFmtLogger.cjs

@@ -22,5 +22,5 @@ const logfmtLogger = exports.logfmtLogger = _effectApp.Logger.make(_ => {
   });
   globalThis.console.log(formatted);
 });
-const logFmt = exports.logFmt = _effectApp.Logger.replace(_effectApp.Logger.defaultLogger, logfmtLogger);
+const logFmt = exports.logFmt = _effectApp.Logger.replace(_effectApp.Logger.defaultLogger, _effectApp.Logger.withSpanAnnotations(logfmtLogger));
 //# sourceMappingURL=logFmtLogger.cjs.map

package/_cjs/logger/logFmtLogger.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"logFmtLogger.cjs","names":["_effectApp","require","_RequestContext","_shared","logfmtLogger","exports","Logger","make","_","annotations","c","getRequestContext","context","requestContext","Option","getOrUndefined","name","HashMap","Object","entries","spanAttributes","formatted","log","globalThis","console","logFmt","replace","defaultLogger"],"sources":["../../src/logger/logFmtLogger.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AAEO,MAAMG,YAAY,GAAAC,OAAA,CAAAD,YAAA,GAAGE,iBAAM,CAACC,IAAI,CACpCC,CAAC,IAAI;EACJ,IAAI;IAAEC;EAAW,CAAE,GAAGD,CAAC;EACvB,MAAME,CAAC,GAAG,IAAAC,yBAAiB,EAACH,CAAC,CAACI,OAAO,CAAC;EACtC,MAAMC,cAAc,GAAGC,iBAAM,CAACC,cAAc,CAACL,CAAC,CAAC;EAC/C,IAAIG,cAAc,IAAIA,cAAc,CAACG,IAAI,KAAK,QAAQ,EAAE;IACtDP,WAAW,GAAGQ,kBAAO,CAACV,IAAI,CAAC,GAAG,CAC5B,GAAGE,WAAW,EACd,GAAGS,MAAM,CAACC,OAAO,CAAC,IAAAC,8BAAc,EAACP,cAAc,CAAC,CAAC,CAClD,CAAC;EACJ;EACA,MAAMQ,SAAS,GAAGf,iBAAM,CAACF,YAAY,CAACkB,GAAG,CAAC;IAAE,GAAGd,CAAC;IAAEC;EAAW,CAAE,CAAC;EAChEc,UAAU,CAACC,OAAO,CAACF,GAAG,CAACD,SAAS,CAAC;AACnC,CAAC,CACF;AAEM,MAAMI,MAAM,GAAApB,OAAA,CAAAoB,MAAA,GAAGnB,iBAAM,CAACoB,OAAO,CAACpB,iBAAM,CAACqB,aAAa,EAAEvB,YAAY,CAAC","ignoreList":[]}
+{"version":3,"file":"logFmtLogger.cjs","names":["_effectApp","require","_RequestContext","_shared","logfmtLogger","exports","Logger","make","_","annotations","c","getRequestContext","context","requestContext","Option","getOrUndefined","name","HashMap","Object","entries","spanAttributes","formatted","log","globalThis","console","logFmt","replace","defaultLogger","withSpanAnnotations"],"sources":["../../src/logger/logFmtLogger.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AAEO,MAAMG,YAAY,GAAAC,OAAA,CAAAD,YAAA,GAAGE,iBAAM,CAACC,IAAI,CACpCC,CAAC,IAAI;EACJ,IAAI;IAAEC;EAAW,CAAE,GAAGD,CAAC;EACvB,MAAME,CAAC,GAAG,IAAAC,yBAAiB,EAACH,CAAC,CAACI,OAAO,CAAC;EACtC,MAAMC,cAAc,GAAGC,iBAAM,CAACC,cAAc,CAACL,CAAC,CAAC;EAC/C,IAAIG,cAAc,IAAIA,cAAc,CAACG,IAAI,KAAK,QAAQ,EAAE;IACtDP,WAAW,GAAGQ,kBAAO,CAACV,IAAI,CAAC,GAAG,CAC5B,GAAGE,WAAW,EACd,GAAGS,MAAM,CAACC,OAAO,CAAC,IAAAC,8BAAc,EAACP,cAAc,CAAC,CAAC,CAClD,CAAC;EACJ;EACA,MAAMQ,SAAS,GAAGf,iBAAM,CAACF,YAAY,CAACkB,GAAG,CAAC;IAAE,GAAGd,CAAC;IAAEC;EAAW,CAAE,CAAC;EAChEc,UAAU,CAACC,OAAO,CAACF,GAAG,CAACD,SAAS,CAAC;AACnC,CAAC,CACF;AAEM,MAAMI,MAAM,GAAApB,OAAA,CAAAoB,MAAA,GAAGnB,iBAAM,CAACoB,OAAO,CAACpB,iBAAM,CAACqB,aAAa,EAAErB,iBAAM,CAACsB,mBAAmB,CAACxB,YAAY,CAAC,CAAC","ignoreList":[]}

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

@@ -16,5 +16,5 @@ export type Middleware<R, M, PathA extends Struct.Fields, CookieA extends Struct
     handler: RequestHandler<R2 | PR | RequestContextContainer | ContextMapContainer | RequestFiberSet, M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, ResE, PPath, CTX, Context, Config>;
     makeRequestLayer: Layer<PR, MiddlewareE, R2>;
 };
-export declare function makeRequestHandler<R, M, PathA extends Struct.Fields, CookieA extends Struct.Fields, QueryA extends Struct.Fields, BodyA extends Struct.Fields, HeaderA extends Struct.Fields, ReqA extends PathA & QueryA & BodyA, ResA extends Struct.Fields, ResE, MiddlewareE, R2, PR, RErr, PPath extends `/${string}`, Config>(handler: RequestHandlerBase<R, M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, ResE, PPath, Config>, errorHandler: <R>(req: HttpServerRequest.ServerRequest, res: HttpServerResponse.ServerResponse, r2: Effect<HttpServerResponse.ServerResponse, ValidationError | ResE | MiddlewareE, R>) => Effect<HttpServerResponse.ServerResponse, never, RErr | R>, middlewareLayer?: Layer<PR, MiddlewareE, R2>): Effect<HttpServerResponse.ServerResponse, HttpServerError.RequestError, HttpRouter.RouteContext | HttpServerRequest.ServerRequest | RequestContextContainer | ContextMapContainer | RequestFiberSet | RErr | Exclude<Exclude<R, EnforceNonEmptyRecord<M>>, PR> | R2>;
+export declare function makeRequestHandler<R, M, PathA extends Struct.Fields, CookieA extends Struct.Fields, QueryA extends Struct.Fields, BodyA extends Struct.Fields, HeaderA extends Struct.Fields, ReqA extends PathA & QueryA & BodyA, ResA extends Struct.Fields, ResE, MiddlewareE, R2, PR, RErr, PPath extends `/${string}`, Config>(handler: RequestHandlerBase<R, M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, ResE, PPath, Config>, errorHandler: <R>(req: HttpServerRequest.ServerRequest, res: HttpServerResponse.ServerResponse, r2: Effect<HttpServerResponse.ServerResponse, ValidationError | ResE | MiddlewareE, R>) => Effect<HttpServerResponse.ServerResponse, never, RErr | R>, middlewareLayer?: Layer<PR, MiddlewareE, R2>): Effect<HttpServerResponse.ServerResponse, HttpServerError.RequestError, HttpRouter.RouteContext | HttpServerRequest.ParsedSearchParams | HttpServerRequest.ServerRequest | RequestContextContainer | ContextMapContainer | RequestFiberSet | RErr | Exclude<Exclude<R, EnforceNonEmptyRecord<M>>, PR> | R2>;
 //# sourceMappingURL=makeRequestHandler.d.ts.map

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

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

package/dist/api/routing/makeRequestHandler.js

@@ -30,10 +30,11 @@ export function makeRequestHandler(handler, errorHandler, middlewareLayer) {
     const getParams = Effect.map(Effect
         .all({
         rcx: HttpRouter.RouteContext,
+        searchParms: HttpServerRequest.ParsedSearchParams,
         req: Effect.flatMap(HttpServerRequest.ServerRequest, (req) => req.json.pipe(Effect.map((body) => ({ body, headers: req.headers }))))
-    }), ({ rcx, req }) => ({
+    }), ({ rcx, req, searchParms }) => ({
         params: rcx.params,
-        query: rcx.searchParams,
+        query: searchParms,
         body: req.body,
         headers: req.headers,
         cookies: {} // req.cookies
@@ -149,4 +150,4 @@ export function makeRequestHandler(handler, errorHandler, middlewareLayer) {
         name: NonEmptyString255(handler.name)
     })))));
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"makeRequestHandler.js","sourceRoot":"","sources":["../../../src/api/routing/makeRequestHandler.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"makeRequestHandler.js","sourceRoot":"","sources":["../../../src/api/routing/makeRequestHandler.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAA;AAM7D,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,YAAY,CAAA;AAEjE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAC7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAErD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAGlE,MAAM,CAAC,MAAM,eAAe,GAAG,QAAQ,CAAC,UAAU,CAAC;IACjD,OAAO,EAAE,KAAK;CACf,CAAC,CAAA;AAyDF,MAAM,UAAU,kBAAkB,CAkBhC,OAaC,EACD,YAI+D,EAC/D,eAA4C;IAc5C,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAEhD,MAAM,QAAQ,GAA+B,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IACzE,MAAM,IAAI,GAAG,QAAwD,CAAA;IACrE,uFAAuF;IACvF,MAAM,OAAO,GAAG,QAAQ,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM;QAC7C,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACjG,kBAAkB;QAClB,yEAAyE;QACzE,iEAAiE;QACjE,IAAI;QACJ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IACjE,uCAAuC;IACvC,qDAAqD;IACrD,oBAAoB;IAEpB,MAAM,cAAc,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAA;IAClD,MAAM,YAAY,GAAG,kBAAkB,CAAC,cAAc,CAAC,CAAA;IAEvD,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAC1B,MAAM;SACH,GAAG,CAAC;QACH,GAAG,EAAE,UAAU,CAAC,YAAY;QAC5B,WAAW,EAAE,iBAAiB,CAAC,kBAAkB;QACjD,GAAG,EAAE,MAAM,CAAC,OAAO,CACjB,iBAAiB,CAAC,aAAa,EAC/B,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAC/E;KACF,CAAC,EACJ,CACE,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,EACzB,EAAE,CAAC,CAAC;QACJ,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,KAAK,EAAE,WAAW;QAClB,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,OAAO,EAAE,EAAE,CAAC,cAAc;KAC3B,CAAC,CACH,CAAA;IAED,OAAO,MAAM;SACV,mBAAmB,CAAC,CAAC,OAAO,EAAE,EAAE,CAC/B,MAAM;SACH,GAAG,CAAC,QAAQ,CAAC,EAAC,CAAC;QACd,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAA;QACrD,MAAM,GAAG,GAAG,kBAAkB;aAC3B,KAAK,EAAE;aACP,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,EAAE,eAAe,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAEvG,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;QAEhC,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;QAExD,MAAM,GAAG;QACP,8EAA8E;QAC9E,MAAM;aACH,OAAO,CAAC,kBAAkB,CAAC;aAC3B,IAAI,CACH,MAAM,CAAC,YAAY,CAAC;YAClB,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,IAAI,EAAE,GAAG,CAAC,WAAW;YACrB,GAAG,CAAC,QAAQ,CAAC,OAAO;gBAClB,CAAC,CAAC;oBACA,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;oBAC5B,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;oBAC5B,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;oBAC1B,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;oBAChC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;iBACjC;gBACD,CAAC,CAAC,SAAS,CAAC;SACf,CAAC,EACF,MAAM;aACH,OAAO,CACN,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;YAClB,MAAM,aAAa,GAAG,YAAY,CAAC,IAAI,CAAC;iBACrC,IAAI,CACH,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;gBACnC,MAAM,EAAE,GAAG;oBACT,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE;oBACzC,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE;oBAC1C,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE;iBACvB,CAAA;gBACpB,OAAO,EAAE,CAAA;YACX,CAAC,CAAC,EACF,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CACvB,MAAM,CAAC,mBAAmB,CACxB,cAAc,EACd,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,KAAK,CAAoB,EAAE,EAAE;gBACzE,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,KAAK,UAAU;oBAC5B,CAAC,CAAC,YAAY;oBACd,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,SAAS;wBACtF,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,GAAG;4BAC/C,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC;4BACnC,CAAC,CAAC,KAAK;wBACT,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;4BACtB,CAAC,CAAC,SAAS,KAAK,CAAC,MAAM,GAAG;4BAC1B,CAAC,CAAC,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;gCACvC,CAAC,CAAC,GAAG,KAAK,EAAE;gCACZ,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK;oCACpC,CAAC,CAAC,UAAU,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG;oCACxC,CAAC,CAAC,OAAO,KAAK,CAAA;gBAChB,OAAO,IAAI,CAAA;YACb,CAAC,EAAE,EAA+C,CAAC,CACpD,CACF,EACD,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CAC3B,MAAM,CAAC,SAAS,CAAC;iBACd,IAAI,CACH,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,SAAgB,CAAC,EAC5D,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EACvB,MAAM;iBACH,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACT,GAAG,CAAC,IAAI,CACN,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAClD,kBAAkB,CAAC,SAAS,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAC1D,CACF,CACJ,CACJ,CAKF,CAAA;YAEH,wCAAwC;YACxC,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA,CAAC,6CAA6C;YAC7I,MAAM,EAAE,GAAG,eAAe;gBACxB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,eAAe,CAAC;gBACpC,0BAA0B;gBAC1B,CAAC,CAAE,CAID,CAAA;YACJ,OAAO,YAAY,CACjB,GAAG,EACH,GAAG,EACH,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAClD,CAAA;QACH,CAAC,CAAC,CACH,EACH,MAAM;aACH,aAAa,CAAC,CAAC,KAAK,EAAE,EAAE,CACvB,MAAM;aACH,IAAI,CAAC,GAAG,EAAE,CAAC,kBAAkB,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;aAClD,IAAI,CAAC,MAAM;aACT,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACX,MAAM;aACH,GAAG,CAAC;YACH,WAAW,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE;gBAC5B,IAAI,EAAE,GAAG,CAAC,WAAW;gBACrB,MAAM,EAAE,GAAG,CAAC,MAAM;aACnB,CAAC;YACF,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;gBAClB,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;gBAC3B,OAAO,MAAM;qBACV,QAAQ,CAAC,kBAAkB,EAAE,KAAK,CAAC;qBACnC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;oBACxB,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,IAAI,EAAE,GAAG,CAAC,WAAW;oBACrB,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE;oBAEjC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;oBAC5B,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;oBAC5B,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;oBAC1B,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;oBAChC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;oBAEhC,UAAU,EAAE,MAAM,CAChB,MAAM;yBACH,OAAO,CAAC,OAAO,CAAC;yBAChB,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;wBAC7B,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;wBAC1E,OAAO,IAAI,CAAA;oBACb,CAAC,EAAE,EAAyB,CAAC,CAChC;iBACF,CAAC,CAAC,CAAA;YACP,CAAC,CAAC;SACH,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CACjC,CAAC;aACH,IAAI,CACH,MAAM,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,KAAK,CAAC,CAAC,CAC9F,CACJ,EACH,MAAM;aACH,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACX,MAAM;aACH,OAAO,CAAC,kBAAkB,CAAC;aAC3B,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;YACxB,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,IAAI,EAAE,GAAG,CAAC,WAAW;YACrB,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE;YACjC,GAAG,CAAC,QAAQ,CAAC,OAAO;gBAClB,CAAC,CAAC;oBACA,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC;iBAChC;gBACD,CAAC,CAAC,SAAS,CAAC;SACf,CAAC,CAAC,CACN,CACJ,CAAA;QAEL,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IACtB,CAAC,CAAC;SACD,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CACV,oBAAoB,CAClB,CAAC,EACD,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACX,IAAI,EAAE,iBAAiB,CACrB,OAAO,CAAC,IAAI,CACb;KACF,CAAC,CAAC,CACJ,CACF,CACJ,CAAA;AACL,CAAC"}

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

@@ -8,5 +8,5 @@ import type { HttpServerRequest, HttpServerResponse } from "effect-app/http";
 import type { RequestHandler } from "./base.js";
 import type { Middleware } from "./makeRequestHandler.js";
 export declare const RouteDescriptors: Context.Tag<Ref<RouteDescriptorAny[]>, Ref<RouteDescriptorAny[]>>;
-export declare function match<R, M, PathA extends Struct.Fields, CookieA extends Struct.Fields, QueryA extends Struct.Fields, BodyA extends Struct.Fields, HeaderA extends Struct.Fields, ReqA extends PathA & QueryA & BodyA, ResA extends Struct.Fields, ResE, MiddlewareE, PPath extends `/${string}`, R2, PR, RErr, CTX, Context, Config>(requestHandler: RequestHandler<R, M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, ResE, PPath, CTX, Context, Config>, errorHandler: <R>(req: HttpServerRequest.ServerRequest, res: HttpServerResponse.ServerResponse, r2: Effect<HttpServerResponse.ServerResponse, ValidationError | MiddlewareE | ResE, R>) => Effect<HttpServerResponse.ServerResponse, never, Exclude<RErr | R, HttpServerRequest.ServerRequest | HttpRouter.RouteContext | Scope>>, middleware?: Middleware<R, M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, ResE, MiddlewareE, PPath, R2, PR, CTX, Context, Config>): Effect.Effect<HttpRouter.Route<import("@effect/platform/Http/ServerError").RequestError, import("../../services/RequestContextContainer.js").RequestContextContainer | import("@effect-app/infra-adapters/RequestFiberSet").RequestFiberSet | import("../../services/Store/ContextMapContainer.js").ContextMapContainer | Exclude<R2, Scope.Scope | HttpServerRequest.ServerRequest | HttpRouter.RouteContext> | Exclude<RErr, Scope.Scope | HttpServerRequest.ServerRequest | HttpRouter.RouteContext> | Exclude<Exclude<Exclude<R, import("effect-app/utils").EnforceNonEmptyRecord<M>>, PR>, Scope.Scope | HttpServerRequest.ServerRequest | HttpRouter.RouteContext>>, never, never>;
+export declare function match<R, M, PathA extends Struct.Fields, CookieA extends Struct.Fields, QueryA extends Struct.Fields, BodyA extends Struct.Fields, HeaderA extends Struct.Fields, ReqA extends PathA & QueryA & BodyA, ResA extends Struct.Fields, ResE, MiddlewareE, PPath extends `/${string}`, R2, PR, RErr, CTX, Context, Config>(requestHandler: RequestHandler<R, M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, ResE, PPath, CTX, Context, Config>, errorHandler: <R>(req: HttpServerRequest.ServerRequest, res: HttpServerResponse.ServerResponse, r2: Effect<HttpServerResponse.ServerResponse, ValidationError | MiddlewareE | ResE, R>) => Effect<HttpServerResponse.ServerResponse, never, Exclude<RErr | R, HttpServerRequest.ServerRequest | HttpRouter.RouteContext | Scope>>, middleware?: Middleware<R, M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, ResE, MiddlewareE, PPath, R2, PR, CTX, Context, Config>): Effect.Effect<HttpRouter.Route<import("@effect/platform/Http/ServerError").RequestError, import("../../services/RequestContextContainer.js").RequestContextContainer | import("@effect-app/infra-adapters/RequestFiberSet").RequestFiberSet | import("../../services/Store/ContextMapContainer.js").ContextMapContainer | Exclude<R2, Scope.Scope | HttpServerRequest.ServerRequest | HttpRouter.RouteContext | HttpServerRequest.ParsedSearchParams> | Exclude<RErr, Scope.Scope | HttpServerRequest.ServerRequest | HttpRouter.RouteContext | HttpServerRequest.ParsedSearchParams> | Exclude<Exclude<Exclude<R, import("effect-app/utils").EnforceNonEmptyRecord<M>>, PR>, Scope.Scope | HttpServerRequest.ServerRequest | HttpRouter.RouteContext | HttpServerRequest.ParsedSearchParams>>, never, never>;
 //# sourceMappingURL=match.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"match.d.ts","sourceRoot":"","sources":["../../../src/api/routing/match.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC/D,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAE7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,KAAK,EAAS,GAAG,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAE/C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEzD,eAAO,MAAM,gBAAgB,mEAA8E,CAAA;AAE3G,wBAAgB,KAAK,CACnB,CAAC,EACD,CAAC,EACD,KAAK,SAAS,MAAM,CAAC,MAAM,EAC3B,OAAO,SAAS,MAAM,CAAC,MAAM,EAC7B,MAAM,SAAS,MAAM,CAAC,MAAM,EAC5B,KAAK,SAAS,MAAM,CAAC,MAAM,EAC3B,OAAO,SAAS,MAAM,CAAC,MAAM,EAC7B,IAAI,SAAS,KAAK,GAAG,MAAM,GAAG,KAAK,EACnC,IAAI,SAAS,MAAM,CAAC,MAAM,EAC1B,IAAI,EACJ,WAAW,EACX,KAAK,SAAS,IAAI,MAAM,EAAE,EAC1B,EAAE,EACF,EAAE,EACF,IAAI,EACJ,GAAG,EACH,OAAO,EACP,MAAM,EAEN,cAAc,EAAE,cAAc,CAC5B,CAAC,EACD,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,KAAK,EACL,GAAG,EACH,OAAO,EACP,MAAM,CACP,EACD,YAAY,EAAE,CAAC,CAAC,EACd,GAAG,EAAE,iBAAiB,CAAC,aAAa,EACpC,GAAG,EAAE,kBAAkB,CAAC,cAAc,EACtC,EAAE,EAAE,MAAM,CAAC,kBAAkB,CAAC,cAAc,EAAE,eAAe,GAAG,WAAW,GAAG,IAAI,EAAE,CAAC,CAAC,KACnF,MAAM,CACT,kBAAkB,CAAC,cAAc,EACjC,KAAK,EACL,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE,iBAAiB,CAAC,aAAa,GAAG,UAAU,CAAC,YAAY,GAAG,KAAK,CAAC,CACrF,EACD,UAAU,CAAC,EAAE,UAAU,CACrB,CAAC,EACD,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,WAAW,EACX,KAAK,EACL,EAAE,EACF,EAAE,EACF,GAAG,EACH,OAAO,EACP,MAAM,CACP,4pBA+CF"}
+{"version":3,"file":"match.d.ts","sourceRoot":"","sources":["../../../src/api/routing/match.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC/D,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAE7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,KAAK,EAAS,GAAG,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAE/C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEzD,eAAO,MAAM,gBAAgB,mEAA8E,CAAA;AAE3G,wBAAgB,KAAK,CACnB,CAAC,EACD,CAAC,EACD,KAAK,SAAS,MAAM,CAAC,MAAM,EAC3B,OAAO,SAAS,MAAM,CAAC,MAAM,EAC7B,MAAM,SAAS,MAAM,CAAC,MAAM,EAC5B,KAAK,SAAS,MAAM,CAAC,MAAM,EAC3B,OAAO,SAAS,MAAM,CAAC,MAAM,EAC7B,IAAI,SAAS,KAAK,GAAG,MAAM,GAAG,KAAK,EACnC,IAAI,SAAS,MAAM,CAAC,MAAM,EAC1B,IAAI,EACJ,WAAW,EACX,KAAK,SAAS,IAAI,MAAM,EAAE,EAC1B,EAAE,EACF,EAAE,EACF,IAAI,EACJ,GAAG,EACH,OAAO,EACP,MAAM,EAEN,cAAc,EAAE,cAAc,CAC5B,CAAC,EACD,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,KAAK,EACL,GAAG,EACH,OAAO,EACP,MAAM,CACP,EACD,YAAY,EAAE,CAAC,CAAC,EACd,GAAG,EAAE,iBAAiB,CAAC,aAAa,EACpC,GAAG,EAAE,kBAAkB,CAAC,cAAc,EACtC,EAAE,EAAE,MAAM,CAAC,kBAAkB,CAAC,cAAc,EAAE,eAAe,GAAG,WAAW,GAAG,IAAI,EAAE,CAAC,CAAC,KACnF,MAAM,CACT,kBAAkB,CAAC,cAAc,EACjC,KAAK,EACL,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE,iBAAiB,CAAC,aAAa,GAAG,UAAU,CAAC,YAAY,GAAG,KAAK,CAAC,CACrF,EACD,UAAU,CAAC,EAAE,UAAU,CACrB,CAAC,EACD,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,WAAW,EACX,KAAK,EACL,EAAE,EACF,EAAE,EACF,GAAG,EACH,OAAO,EACP,MAAM,CACP,ixBA+CF"}

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

@@ -1 +1 @@
-{"version":3,"file":"jsonLogger.d.ts","sourceRoot":"","sources":["../../src/logger/jsonLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,MAAM,EAAU,MAAM,YAAY,CAAA;AAG1E,eAAO,MAAM,UAAU,8BAyBtB,CAAA;AAED,eAAO,MAAM,OAAO,mDAAmD,CAAA"}
+{"version":3,"file":"jsonLogger.d.ts","sourceRoot":"","sources":["../../src/logger/jsonLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,MAAM,EAAU,MAAM,YAAY,CAAA;AAG1E,eAAO,MAAM,UAAU,8BAyBtB,CAAA;AAED,eAAO,MAAM,OAAO,mDAA+E,CAAA"}

package/dist/logger/jsonLogger.js

@@ -21,5 +21,5 @@ export const jsonLogger = Logger.make(({ annotations, cause, context, fiberId, l
     };
     globalThis.console.log(JSON.stringify(data));
 });
-export const logJson = Logger.replace(Logger.defaultLogger, jsonLogger);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoianNvbkxvZ2dlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2dnZXIvanNvbkxvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDMUUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sYUFBYSxDQUFBO0FBRS9DLE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUNuQyxDQUFDLEVBQUUsV0FBVyxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRTtJQUNyRSxNQUFNLEdBQUcsR0FBRyxJQUFJLElBQUksRUFBRSxDQUFBO0lBQ3RCLE1BQU0sU0FBUyxHQUFHLEdBQUcsQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUUvQixNQUFNLENBQUMsR0FBRyxpQkFBaUIsQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUVwQyxNQUFNLElBQUksR0FBRztRQUNYLFNBQVMsRUFBRSxHQUFHO1FBQ2QsS0FBSyxFQUFFLFFBQVEsQ0FBQyxLQUFLO1FBQ3JCLEtBQUssRUFBRSxPQUFPLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQztRQUNsQyxPQUFPO1FBQ1AsT0FBTyxFQUFFLE1BQU0sQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDO1FBQ2pDLEtBQUssRUFBRSxLQUFLLElBQUksSUFBSSxJQUFJLEtBQUssSUFBSSxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTO1FBQzlFLEtBQUssRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxTQUFTLEdBQUcsQ0FBQyxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztRQUN2RyxXQUFXLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDO1lBQ3hDLENBQUMsQ0FBQyxDQUFDLEdBQUcsV0FBVyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUU7Z0JBQ3pDLElBQUksQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUE7Z0JBQ1gsT0FBTyxJQUFJLENBQUE7WUFDYixDQUFDLEVBQUUsRUFBNkIsQ0FBQztZQUNqQyxDQUFDLENBQUMsU0FBUztLQUNkLENBQUE7SUFFRCxVQUFVLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUE7QUFDOUMsQ0FBQyxDQUNGLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxPQUFPLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsYUFBYSxFQUFFLFVBQVUsQ0FBQyxDQUFBIn0=
+export const logJson = Logger.replace(Logger.defaultLogger, Logger.withSpanAnnotations(jsonLogger));
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoianNvbkxvZ2dlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2dnZXIvanNvbkxvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDMUUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sYUFBYSxDQUFBO0FBRS9DLE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUNuQyxDQUFDLEVBQUUsV0FBVyxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRTtJQUNyRSxNQUFNLEdBQUcsR0FBRyxJQUFJLElBQUksRUFBRSxDQUFBO0lBQ3RCLE1BQU0sU0FBUyxHQUFHLEdBQUcsQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUUvQixNQUFNLENBQUMsR0FBRyxpQkFBaUIsQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUVwQyxNQUFNLElBQUksR0FBRztRQUNYLFNBQVMsRUFBRSxHQUFHO1FBQ2QsS0FBSyxFQUFFLFFBQVEsQ0FBQyxLQUFLO1FBQ3JCLEtBQUssRUFBRSxPQUFPLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQztRQUNsQyxPQUFPO1FBQ1AsT0FBTyxFQUFFLE1BQU0sQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDO1FBQ2pDLEtBQUssRUFBRSxLQUFLLElBQUksSUFBSSxJQUFJLEtBQUssSUFBSSxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTO1FBQzlFLEtBQUssRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxTQUFTLEdBQUcsQ0FBQyxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztRQUN2RyxXQUFXLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDO1lBQ3hDLENBQUMsQ0FBQyxDQUFDLEdBQUcsV0FBVyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUU7Z0JBQ3pDLElBQUksQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUE7Z0JBQ1gsT0FBTyxJQUFJLENBQUE7WUFDYixDQUFDLEVBQUUsRUFBNkIsQ0FBQztZQUNqQyxDQUFDLENBQUMsU0FBUztLQUNkLENBQUE7SUFFRCxVQUFVLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUE7QUFDOUMsQ0FBQyxDQUNGLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxPQUFPLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsYUFBYSxFQUFFLE1BQU0sQ0FBQyxtQkFBbUIsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFBIn0=

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

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

package/dist/logger/logFmtLogger.js

@@ -14,5 +14,5 @@ export const logfmtLogger = Logger.make((_) => {
     const formatted = Logger.logfmtLogger.log({ ..._, annotations });
     globalThis.console.log(formatted);
 });
-export const logFmt = Logger.replace(Logger.defaultLogger, logfmtLogger);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nRm10TG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZ2dlci9sb2dGbXRMb2dnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQ3BELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQTtBQUNyRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFFL0MsTUFBTSxDQUFDLE1BQU0sWUFBWSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQ3JDLENBQUMsQ0FBQyxFQUFFLEVBQUU7SUFDSixJQUFJLEVBQUUsV0FBVyxFQUFFLEdBQUcsQ0FBQyxDQUFBO0lBQ3ZCLE1BQU0sQ0FBQyxHQUFHLGlCQUFpQixDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUN0QyxNQUFNLGNBQWMsR0FBRyxNQUFNLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQy9DLElBQUksY0FBYyxJQUFJLGNBQWMsQ0FBQyxJQUFJLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDdkQsV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRztZQUM1QixHQUFHLFdBQVc7WUFDZCxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUMsY0FBYyxDQUFDLGNBQWMsQ0FBQyxDQUFDO1NBQ2xELENBQUMsQ0FBQTtJQUNKLENBQUM7SUFDRCxNQUFNLFNBQVMsR0FBRyxNQUFNLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxFQUFFLFdBQVcsRUFBRSxDQUFDLENBQUE7SUFDaEUsVUFBVSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUE7QUFDbkMsQ0FBQyxDQUNGLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsYUFBYSxFQUFFLFlBQVksQ0FBQyxDQUFBIn0=
+export const logFmt = Logger.replace(Logger.defaultLogger, Logger.withSpanAnnotations(logfmtLogger));
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nRm10TG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZ2dlci9sb2dGbXRMb2dnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQ3BELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQTtBQUNyRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFFL0MsTUFBTSxDQUFDLE1BQU0sWUFBWSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQ3JDLENBQUMsQ0FBQyxFQUFFLEVBQUU7SUFDSixJQUFJLEVBQUUsV0FBVyxFQUFFLEdBQUcsQ0FBQyxDQUFBO0lBQ3ZCLE1BQU0sQ0FBQyxHQUFHLGlCQUFpQixDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUN0QyxNQUFNLGNBQWMsR0FBRyxNQUFNLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQy9DLElBQUksY0FBYyxJQUFJLGNBQWMsQ0FBQyxJQUFJLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDdkQsV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRztZQUM1QixHQUFHLFdBQVc7WUFDZCxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUMsY0FBYyxDQUFDLGNBQWMsQ0FBQyxDQUFDO1NBQ2xELENBQUMsQ0FBQTtJQUNKLENBQUM7SUFDRCxNQUFNLFNBQVMsR0FBRyxNQUFNLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxFQUFFLFdBQVcsRUFBRSxDQUFDLENBQUE7SUFDaEUsVUFBVSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUE7QUFDbkMsQ0FBQyxDQUNGLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsYUFBYSxFQUFFLE1BQU0sQ0FBQyxtQkFBbUIsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFBIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "1.3.4",
+  "version": "1.3.6",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -18,16 +18,16 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "6.1.0",
     "redlock": "^4.2.0",
-    "@effect-app/core": "1.1.1",
-    "@effect-app/infra-adapters": "1.1.1",
-    "@effect-app/schema": "1.1.1",
-    "effect-app": "1.2.1"
+    "@effect-app/core": "1.1.2",
+    "@effect-app/infra-adapters": "1.1.2",
+    "effect-app": "1.2.2",
+    "@effect-app/schema": "1.1.2"
   },
   "devDependencies": {
     "@babel/cli": "^7.24.5",
     "@sentry/node": "^7.112.2",
     "@types/express": "^4.17.21",
-    "@types/node": "~20.12.7",
+    "@types/node": "~20.12.8",
     "@types/proper-lockfile": "^4.1.4",
     "@types/redis": "^2.8.32",
     "@types/redlock": "^4.0.7",
@@ -38,13 +38,13 @@
     "redis": "^3.1.2",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.5",
-    "vitest": "^1.5.2"
+    "vitest": "^1.5.3"
   },
   "peerDependencies": {
     "express": "^4.19.2",
-    "@effect/platform": "^0.51.0",
-    "@effect/schema": "^0.66.12",
-    "effect": "^3.1.0"
+    "@effect/platform": "^0.52.1",
+    "@effect/schema": "^0.66.13",
+    "effect": "^3.1.1"
   },
   "typesVersions": {
     "*": {

package/src/api/routing/makeRequestHandler.ts

@@ -120,6 +120,7 @@ export function makeRequestHandler<
   HttpServerResponse.ServerResponse,
   HttpServerError.RequestError,
   | HttpRouter.RouteContext
+  | HttpServerRequest.ParsedSearchParams
   | HttpServerRequest.ServerRequest
   | RequestContextContainer
   | ContextMapContainer
@@ -151,16 +152,17 @@ export function makeRequestHandler<
     Effect
       .all({
         rcx: HttpRouter.RouteContext,
+        searchParms: HttpServerRequest.ParsedSearchParams,
         req: Effect.flatMap(
           HttpServerRequest.ServerRequest,
           (req) => req.json.pipe(Effect.map((body) => ({ body, headers: req.headers })))
         )
       }),
     (
-      { rcx, req }
+      { rcx, req, searchParms }
     ) => ({
       params: rcx.params,
-      query: rcx.searchParams,
+      query: searchParms,
       body: req.body,
       headers: req.headers,
       cookies: {} // req.cookies

package/src/logger/jsonLogger.ts

@@ -28,4 +28,4 @@ export const jsonLogger = Logger.make<unknown, void>(
   }
 )
 
-export const logJson = Logger.replace(Logger.defaultLogger, jsonLogger)
+export const logJson = Logger.replace(Logger.defaultLogger, Logger.withSpanAnnotations(jsonLogger))

package/src/logger/logFmtLogger.ts

@@ -18,4 +18,4 @@ export const logfmtLogger = Logger.make<unknown, void>(
   }
 )
 
-export const logFmt = Logger.replace(Logger.defaultLogger, logfmtLogger)
+export const logFmt = Logger.replace(Logger.defaultLogger, Logger.withSpanAnnotations(logfmtLogger))