@effect-app/infra 0.164.3 → 0.164.4

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @effect-app/infra
 
+## 0.164.4
+
+### Patch Changes
+
+- Updated dependencies [b51e7b3]
+  - @effect-app/fluent-extensions@0.115.0
+  - @effect-app/prelude@0.142.0
+  - @effect-app/infra-adapters@0.111.4
+
 ## 0.164.3
 
 ### Patch Changes

package/_cjs/api/routing/base.cjs

@@ -148,15 +148,15 @@ function respondSuccess(encodeResponse) {
   })));
 }
 function makeRequestParsers(Request) {
-  const ph = tsplus_module_1.sync(() => tsplus_module_5.map(tsplus_module_5.map(tsplus_module_5.fromNullable(Request.Headers), s => s), S.decodeUnknown));
+  const ph = tsplus_module_1.sync(() => tsplus_module_5.fromNullable(Request.Headers).map(s => s).map(S.decodeUnknown));
   const parseHeaders = u => tsplus_module_6.flatMapOption(ph, d => d(u));
-  const pq = tsplus_module_1.sync(() => tsplus_module_5.map(tsplus_module_5.map(tsplus_module_5.fromNullable(Request.Query), s => s), S.decodeUnknown));
+  const pq = tsplus_module_1.sync(() => tsplus_module_5.fromNullable(Request.Query).map(s => s).map(S.decodeUnknown));
   const parseQuery = u => tsplus_module_6.flatMapOption(pq, d => d(u));
-  const pb = tsplus_module_1.sync(() => tsplus_module_5.map(tsplus_module_5.map(tsplus_module_5.fromNullable(Request.Body), s => s), S.decodeUnknown));
+  const pb = tsplus_module_1.sync(() => tsplus_module_5.fromNullable(Request.Body).map(s => s).map(S.decodeUnknown));
   const parseBody = u => tsplus_module_6.flatMapOption(pb, d => d(u));
-  const pp = tsplus_module_1.sync(() => tsplus_module_5.map(tsplus_module_5.map(tsplus_module_5.fromNullable(Request.Path), s => s), S.decodeUnknown));
+  const pp = tsplus_module_1.sync(() => tsplus_module_5.fromNullable(Request.Path).map(s => s).map(S.decodeUnknown));
   const parsePath = u => tsplus_module_6.flatMapOption(pp, d => d(u));
-  const pc = tsplus_module_1.sync(() => tsplus_module_5.map(tsplus_module_5.map(tsplus_module_5.fromNullable(Request.Cookie), s => s), S.decodeUnknown));
+  const pc = tsplus_module_1.sync(() => tsplus_module_5.fromNullable(Request.Cookie).map(s => s).map(S.decodeUnknown));
   const parseCookie = u => tsplus_module_6.flatMapOption(pc, d => d(u));
   return {
     parseBody,

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

@@ -1 +1 @@
-{"version":3,"file":"base.cjs","names":["S","_interopRequireWildcard","require","_errors","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","decodeErrors","x","parseRequestParams","parsers","body","cookies","headers","params","query","tsplus_module_1","flatMap","all","exit","parseBody","_","tsplus_module_2","isFailure","tsplus_module_3","cause","failCauseSync","sync","isSuccess","_tag","value","errors","failures","cookie","parseCookie","parseHeaders","parseQuery","path","parsePath","push","makeError","length","ValidationError","type","respondSuccess","encodeResponse","req","res","tsplus_module_4","flow","succeed","undefined","status","send","JSON","stringify","makeRequestParsers","Request","ph","tsplus_module_5","map","fromNullable","Headers","s","decodeUnknown","tsplus_module_6","flatMapOption","d","pq","Query","pb","Body","pp","Path","pc","Cookie"],"sources":["../../../_src/api/routing/base.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"base.cjs","names":["S","_interopRequireWildcard","require","_errors","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","decodeErrors","x","parseRequestParams","parsers","body","cookies","headers","params","query","tsplus_module_1","flatMap","all","exit","parseBody","_","tsplus_module_2","isFailure","tsplus_module_3","cause","failCauseSync","sync","isSuccess","_tag","value","errors","failures","cookie","parseCookie","parseHeaders","parseQuery","path","parsePath","push","makeError","length","ValidationError","type","respondSuccess","encodeResponse","req","res","tsplus_module_4","flow","succeed","undefined","status","send","JSON","stringify","makeRequestParsers","Request","ph","tsplus_module_5","fromNullable","Headers","map","s","decodeUnknown","tsplus_module_6","flatMapOption","d","pq","Query","pb","Body","pp","Path","pc","Cookie"],"sources":["../../../_src/api/routing/base.ts"],"sourcesContent":[null],"mappings":"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"}

package/_cjs/api/routing/defaultErrorHandler.cjs

@@ -30,7 +30,7 @@ function defaultBasicErrorHandler(_req, res, r2) {
 const optimisticConcurrencySchedule = tsplus_module_6.once && tsplus_module_6.recurWhile(a => a._tag === "OptimisticConcurrencyException");
 function defaultErrorHandler(req, res, r2) {
   const r3 = req.method === "PATCH" ? tsplus_module_4.retry(r2, optimisticConcurrencySchedule) : r2;
-  const sendError = (code, schema) => body => tsplus_module_4.andThen(tsplus_module_4.orDie(tsplus_module_7.encode(schema)(body)), body => tsplus_module_3.setBody(tsplus_module_3.setStatus(code)(res), tsplus_module_2.unsafeJson(body)));
+  const sendError = (code, schema) => body => tsplus_module_4.orDie(tsplus_module_7.encode(schema)(body)).andThen(body => tsplus_module_3.setBody(tsplus_module_3.setStatus(code)(res), tsplus_module_2.unsafeJson(body)));
   return tsplus_module_4.catchAll(tsplus_module_4.catchTags(tsplus_module_4.tapErrorCause(r3, cause => tsplus_module_5.isFailure(cause) ? logRequestError(cause) : tsplus_module_4.unit), {
     "JWTError": err => tsplus_module_4.succeed(tsplus_module_3.unsafeJson({
       message: err.error.message

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

@@ -1 +1 @@
-{"version":3,"file":"defaultErrorHandler.cjs","names":["_errorReporter","require","_errors","_http","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","JWTError","tsplus_module_1","TaggedClass","exports","logRequestError","logError","defaultBasicErrorHandler","_req","res","r2","sendError","code","body","tsplus_module_4","sync","tsplus_module_3","setStatus","setBody","tsplus_module_2","unsafeJson","catchAll","catchTag","tapErrorCause","cause","tsplus_module_5","isFailure","unit","err","errors","flatMap","map","die","optimisticConcurrencySchedule","tsplus_module_6","once","recurWhile","_tag","defaultErrorHandler","req","r3","method","retry","schema","andThen","orDie","tsplus_module_7","encode","catchTags","succeed","message","error","status","headers","HttpHeaders","fromInput","ValidationError","NotFoundError","NotLoggedInError","UnauthorizedError","InvalidStateError","OptimisticConcurrencyException"],"sources":["../../../_src/api/routing/defaultErrorHandler.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"defaultErrorHandler.cjs","names":["_errorReporter","require","_errors","_http","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","JWTError","tsplus_module_1","TaggedClass","exports","logRequestError","logError","defaultBasicErrorHandler","_req","res","r2","sendError","code","body","tsplus_module_4","sync","tsplus_module_3","setStatus","setBody","tsplus_module_2","unsafeJson","catchAll","catchTag","tapErrorCause","cause","tsplus_module_5","isFailure","unit","err","errors","flatMap","map","die","optimisticConcurrencySchedule","tsplus_module_6","once","recurWhile","_tag","defaultErrorHandler","req","r3","method","retry","schema","orDie","tsplus_module_7","encode","andThen","catchTags","succeed","message","error","status","headers","HttpHeaders","fromInput","ValidationError","NotFoundError","NotLoggedInError","UnauthorizedError","InvalidStateError","OptimisticConcurrencyException"],"sources":["../../../_src/api/routing/defaultErrorHandler.ts"],"sourcesContent":[null],"mappings":"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"}

package/_cjs/api/routing/makeRequestHandler.cjs

@@ -12,8 +12,7 @@ var tsplus_module_4 = _interopRequireWildcard(require("effect/Effect"));
 var tsplus_module_5 = _interopRequireWildcard(require("@effect-app/prelude/utils"));
 var tsplus_module_6 = _interopRequireWildcard(require("@effect/platform/Http/ServerResponse"));
 var tsplus_module_7 = _interopRequireWildcard(require("@effect/platform/Http/Body"));
-var tsplus_module_8 = _interopRequireWildcard(require("@effect-app/core/Option"));
-var tsplus_module_9 = _interopRequireWildcard(require("@effect-app/infra/api/setupRequest"));
+var tsplus_module_8 = _interopRequireWildcard(require("@effect-app/infra/api/setupRequest"));
 var _utils2 = require("@effect-app/core/utils");
 var _util = require("@effect-app/infra/api/util");
 var _errorReporter = require("@effect-app/infra/errorReporter");
@@ -60,14 +59,14 @@ function makeRequestHandler(handler, errorHandler, middlewareLayer) {
     headers: req.headers,
     cookies: {} // req.cookies
   }));
-  return tsplus_module_9.updateRequestContext(tsplus_module_4.gen(function* ($) {
+  return tsplus_module_8.updateRequestContext(tsplus_module_4.gen(function* ($) {
     const req = yield* $(_http.HttpServerRequest);
     const res = tsplus_module_6.empty().pipe(_ => req.method === "GET" ? tsplus_module_6.setHeader(_, "Cache-Control", "no-store") : _);
     const pars = yield* $(getParams);
     const settings = yield* $(tsplus_module_1.get(RequestSettings));
     const eff =
     // TODO: we don;t have access to user id here cause context is not yet created
-    tsplus_module_4.tap(tsplus_module_4.catchAllCause(tsplus_module_4.andThen(tsplus_module_4.annotateLogs(tsplus_module_4.logInfo("Incoming request"), {
+    tsplus_module_4.catchAllCause(tsplus_module_4.annotateLogs(tsplus_module_4.logInfo("Incoming request"), {
       method: req.method,
       path: req.originalUrl,
       ...(settings.verbose ? {
@@ -77,16 +76,16 @@ function makeRequestHandler(handler, errorHandler, middlewareLayer) {
         reqCookies: (0, _utils2.pretty)(pars.cookies),
         reqHeaders: (0, _utils2.pretty)(pars.headers)
       } : undefined)
-    }), tsplus_module_4.suspend(() => {
+    }).andThen(tsplus_module_4.suspend(() => {
       const handleRequest = tsplus_module_4.flatMap(tsplus_module_4.map(parseRequest(pars), ({
         body,
         path,
         query
       }) => {
         const hn = {
-          ...tsplus_module_8.getOrUndefined(body),
-          ...tsplus_module_8.getOrUndefined(query),
-          ...tsplus_module_8.getOrUndefined(path)
+          ...body.value,
+          ...query.value,
+          ...path.value
         };
         return hn;
       }), parsedReq => tsplus_module_4.map(tsplus_module_4.flatMap(tsplus_module_4.provideService(handle(parsedReq), handler.Request.Tag, parsedReq), encoder), r => tsplus_module_6.setStatus(r === undefined ? 204 : 200)(tsplus_module_6.setBody(res, tsplus_module_7.unsafeJson(r)))));
@@ -96,7 +95,7 @@ function makeRequestHandler(handler, errorHandler, middlewareLayer) {
       // PR is not relevant here
       : r;
       return errorHandler(req, res, r2);
-    })), cause => tsplus_module_4.tapErrorCause(tsplus_module_4.tap(tsplus_module_4.sync(() => tsplus_module_6.setStatus(500)(res)), res => tsplus_module_4.all([(0, _errorReporter.reportError)("request")(cause, {
+    })), cause => tsplus_module_4.tapErrorCause(tsplus_module_4.sync(() => tsplus_module_6.setStatus(500)(res)).tap(res => tsplus_module_4.all([(0, _errorReporter.reportError)("request")(cause, {
       path: req.originalUrl,
       method: req.method
     }), tsplus_module_4.suspend(() => {
@@ -117,7 +116,7 @@ function makeRequestHandler(handler, errorHandler, middlewareLayer) {
       });
     })], {
       concurrency: "inherit"
-    })), cause => tsplus_module_4.sync(() => console.error("Error occurred while reporting error", cause)))), res => tsplus_module_4.annotateLogs(tsplus_module_4.logInfo("Finished request"), {
+    })), cause => tsplus_module_4.sync(() => console.error("Error occurred while reporting error", cause)))).tap(res => tsplus_module_4.annotateLogs(tsplus_module_4.logInfo("Finished request"), {
       method: req.method,
       path: req.originalUrl,
       statusCode: res.status.toString(),

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

@@ -1 +1 @@
-{"version":3,"file":"makeRequestHandler.cjs","names":["_utils2","require","_util","_errorReporter","_http","_base","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","RequestSettings","exports","tsplus_module_1","unsafeMake","verbose","makeRequestHandler","handler","errorHandler","middlewareLayer","Request","Response","h","handle","response","tsplus_module_2","Void","resp","encoder","struct","tsplus_module_3","encode","requestParsers","makeRequestParsers","parseRequest","parseRequestParams","getParams","tsplus_module_4","map","all","rcx","HttpRouteContext","req","flatMap","HttpServerRequest","json","body","headers","params","query","searchParams","cookies","tsplus_module_9","updateRequestContext","gen","$","res","tsplus_module_6","empty","pipe","_","method","setHeader","pars","settings","eff","tap","catchAllCause","andThen","annotateLogs","logInfo","path","originalUrl","reqPath","tsplus_module_5","RecordPretty","object$","reqQuery","reqBody","pretty","reqCookies","reqHeaders","undefined","suspend","handleRequest","hn","tsplus_module_8","getOrUndefined","parsedReq","provideService","Tag","setStatus","setBody","tsplus_module_7","unsafeJson","uninterruptible","r2","provide","cause","tapErrorCause","sync","reportError","logError","statusCode","status","toString","resHeaders","entries","reduce","prev","key","value","snipString","concurrency","console","error","$copy","name","NonEmptyString255"],"sources":["../../../_src/api/routing/makeRequestHandler.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"makeRequestHandler.cjs","names":["_utils2","require","_util","_errorReporter","_http","_base","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","RequestSettings","exports","tsplus_module_1","unsafeMake","verbose","makeRequestHandler","handler","errorHandler","middlewareLayer","Request","Response","h","handle","response","tsplus_module_2","Void","resp","encoder","struct","tsplus_module_3","encode","requestParsers","makeRequestParsers","parseRequest","parseRequestParams","getParams","tsplus_module_4","map","all","rcx","HttpRouteContext","req","flatMap","HttpServerRequest","json","body","headers","params","query","searchParams","cookies","tsplus_module_8","updateRequestContext","gen","$","res","tsplus_module_6","empty","pipe","_","method","setHeader","pars","settings","eff","catchAllCause","annotateLogs","logInfo","path","originalUrl","reqPath","tsplus_module_5","RecordPretty","object$","reqQuery","reqBody","pretty","reqCookies","reqHeaders","undefined","andThen","suspend","handleRequest","hn","value","parsedReq","provideService","Tag","setStatus","setBody","tsplus_module_7","unsafeJson","uninterruptible","r2","provide","cause","tapErrorCause","sync","tap","reportError","logError","statusCode","status","toString","resHeaders","entries","reduce","prev","key","snipString","concurrency","console","error","$copy","name","NonEmptyString255"],"sources":["../../../_src/api/routing/makeRequestHandler.ts"],"sourcesContent":[null],"mappings":"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"}

package/_cjs/api/setupRequest.cjs

@@ -26,27 +26,27 @@ function makeInternalRequestContext(name) {
     });
   });
 }
-const withRequestSpan = f => tsplus_module_2.andThen(_RequestContextContainer2.RequestContextContainer.get, ctx => tsplus_module_2.withLogSpan(tsplus_module_2.withSpan(f, "request", {
+const withRequestSpan = f => _RequestContextContainer2.RequestContextContainer.get.andThen(ctx => tsplus_module_2.withLogSpan(tsplus_module_2.withSpan(f, "request", {
   attributes: tsplus_module_3.spanAttributes(ctx)
 })
 // request context info is picked up directly in the logger for annotations.
 , "request"));
-const setupContextMap = tsplus_module_4.effectDiscard(tsplus_module_2.andThen(_ContextMapContainer.ContextMapContainer, _ => _.start));
+const setupContextMap = tsplus_module_4.effectDiscard(_ContextMapContainer.ContextMapContainer.andThen(_ => _.start));
 // const RequestContextLiveFromRequestContext = (requestContext: RequestContext) =>
 //   RequestContext.Tag.makeLayer(requestContext)
 // memoization problem
 // const RequestContextLive = RequestContextContainer.get.toLayer(RequestContext.Tag)
 const RequestContextStartLiveFromRequestContext = requestContext => tsplus_module_4.provideMerge(setupContextMap
 // .provideMerge(RequestContextLiveFromRequestContext(requestContext))
-, tsplus_module_4.effectDiscard(tsplus_module_2.andThen(_RequestContextContainer2.RequestContextContainer, _ => _.start(requestContext))));
-const RequestContextStartLive = requestContext => typeof requestContext === "string" ? tsplus_module_4.unwrapEffect(tsplus_module_2.andThen(makeInternalRequestContext(requestContext), RequestContextStartLiveFromRequestContext)) : RequestContextStartLiveFromRequestContext(requestContext);
+, tsplus_module_4.effectDiscard(_RequestContextContainer2.RequestContextContainer.andThen(_ => _.start(requestContext))));
+const RequestContextStartLive = requestContext => typeof requestContext === "string" ? tsplus_module_4.unwrapEffect(makeInternalRequestContext(requestContext).andThen(RequestContextStartLiveFromRequestContext)) : RequestContextStartLiveFromRequestContext(requestContext);
 /**
  * @tsplus fluent effect/io/Effect setupRequestContext
  */
 function setupRequestContext(self, requestContext) {
   return tsplus_module_2.provide(self.pipe(withRequestSpan), RequestContextStartLive(requestContext));
 }
-const UpdateRequestContextLive = f => tsplus_module_4.effectDiscard(tsplus_module_2.andThen(_RequestContextContainer2.RequestContextContainer, rcc => rcc.update(f)));
+const UpdateRequestContextLive = f => tsplus_module_4.effectDiscard(_RequestContextContainer2.RequestContextContainer.andThen(rcc => rcc.update(f)));
 /**
  * @tsplus fluent effect/io/Effect updateRequestContext
  */

package/_cjs/api/setupRequest.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"setupRequest.cjs","names":["_ids","require","_RequestContext","_RequestContextContainer2","_ContextMapContainer","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","makeInternalRequestContext","name","tsplus_module_2","sync","id","RequestId","make","RequestContext","rootId","locale","tsplus_module_1","NonEmptyString255","withRequestSpan","f","andThen","RequestContextContainer","ctx","withLogSpan","withSpan","attributes","tsplus_module_3","spanAttributes","setupContextMap","tsplus_module_4","effectDiscard","ContextMapContainer","_","start","RequestContextStartLiveFromRequestContext","requestContext","provideMerge","RequestContextStartLive","unwrapEffect","setupRequestContext","self","provide","pipe","UpdateRequestContextLive","rcc","update","updateRequestContext"],"sources":["../../_src/api/setupRequest.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"setupRequest.cjs","names":["_ids","require","_RequestContext","_RequestContextContainer2","_ContextMapContainer","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","makeInternalRequestContext","name","tsplus_module_2","sync","id","RequestId","make","RequestContext","rootId","locale","tsplus_module_1","NonEmptyString255","withRequestSpan","f","RequestContextContainer","andThen","ctx","withLogSpan","withSpan","attributes","tsplus_module_3","spanAttributes","setupContextMap","tsplus_module_4","effectDiscard","ContextMapContainer","_","start","RequestContextStartLiveFromRequestContext","requestContext","provideMerge","RequestContextStartLive","unwrapEffect","setupRequestContext","self","provide","pipe","UpdateRequestContextLive","rcc","update","updateRequestContext"],"sources":["../../_src/api/setupRequest.ts"],"sourcesContent":[null],"mappings":"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"}

package/_cjs/errorReporter.cjs

@@ -10,7 +10,6 @@ exports.reportMessage = reportMessage;
 exports.reportMessageM = reportMessageM;
 var tsplus_module_1 = _interopRequireWildcard(require("effect/Cause"));
 var tsplus_module_2 = _interopRequireWildcard(require("effect/Effect"));
-var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/core/Option"));
 var _utils = require("@effect-app/core/utils");
 var Sentry = _interopRequireWildcard(require("@sentry/node"));
 var _errors = require("./errors.cjs");
@@ -34,7 +33,7 @@ function reportError(name) {
 }
 function reportSentry(cause, name, extras) {
   return tsplus_module_2.map(_RequestContextContainer.RequestContextContainer.getOption, ctx => {
-    const context = tsplus_module_3.getOrUndefined(ctx);
+    const context = ctx.value;
     const scope = new Sentry.Scope();
     if (context) scope.setContext("context", context);
     if (extras) scope.setContext("extras", extras);

package/_cjs/errorReporter.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"errorReporter.cjs","names":["_utils","require","Sentry","_interopRequireWildcard","_errors","_RequestContextContainer","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","reportError","name","cause","extras","tsplus_module_2","gen","$","tsplus_module_1","isInterrupted","annotateLogs","logDebug","JSON","stringify","reportSentry","error","CauseException","logError","dropUndefined","__cause__","toJSON","__error_name__","map","RequestContextContainer","getOption","ctx","context","tsplus_module_3","getOrUndefined","scope","Scope","setContext","captureException","logWarning","console","reportMessage","message","captureMessage","warn","reportMessageM","sync"],"sources":["../_src/errorReporter.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"errorReporter.cjs","names":["_utils","require","Sentry","_interopRequireWildcard","_errors","_RequestContextContainer","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","reportError","name","cause","extras","tsplus_module_2","gen","$","tsplus_module_1","isInterrupted","annotateLogs","logDebug","JSON","stringify","reportSentry","error","CauseException","logError","dropUndefined","__cause__","toJSON","__error_name__","map","RequestContextContainer","getOption","ctx","context","value","scope","Scope","setContext","captureException","logWarning","console","reportMessage","message","captureMessage","warn","reportMessageM","sync"],"sources":["../_src/errorReporter.ts"],"sourcesContent":[null],"mappings":"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"}

package/_cjs/logger/jsonLogger.cjs

@@ -5,15 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.logJson = exports.jsonLogger = void 0;
 var tsplus_module_1 = _interopRequireWildcard(require("effect/FiberId"));
-var tsplus_module_2 = _interopRequireWildcard(require("@effect-app/core/Option"));
-var tsplus_module_3 = _interopRequireWildcard(require("effect/Cause"));
-var tsplus_module_4 = _interopRequireWildcard(require("effect/List"));
-var tsplus_module_5 = _interopRequireWildcard(require("effect/HashMap"));
-var tsplus_module_6 = _interopRequireWildcard(require("effect/Logger"));
+var tsplus_module_2 = _interopRequireWildcard(require("effect/Cause"));
+var tsplus_module_3 = _interopRequireWildcard(require("effect/List"));
+var tsplus_module_4 = _interopRequireWildcard(require("effect/HashMap"));
+var tsplus_module_5 = _interopRequireWildcard(require("effect/Logger"));
 var _shared = require("./shared.cjs");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-const jsonLogger = exports.jsonLogger = tsplus_module_6.make(({
+const jsonLogger = exports.jsonLogger = tsplus_module_5.make(({
   annotations,
   cause,
   context,
@@ -30,18 +29,18 @@ const jsonLogger = exports.jsonLogger = tsplus_module_6.make(({
     level: logLevel.label,
     fiber: tsplus_module_1.threadName(fiberId),
     message,
-    request: tsplus_module_2.getOrUndefined(c),
-    cause: cause != null && cause != tsplus_module_3.empty ? tsplus_module_3.pretty(cause) : undefined,
-    spans: tsplus_module_4.toArray(tsplus_module_4.map(spans, _ => ({
+    request: c.value,
+    cause: cause != null && cause != tsplus_module_2.empty ? tsplus_module_2.pretty(cause) : undefined,
+    spans: tsplus_module_3.toArray(tsplus_module_3.map(spans, _ => ({
       label: _.label,
       timing: nowMillis - _.startTime
     }))),
-    annotations: tsplus_module_5.size(annotations) > 0 ? [...annotations].reduce((prev, [k, v]) => {
+    annotations: tsplus_module_4.size(annotations) > 0 ? [...annotations].reduce((prev, [k, v]) => {
       prev[k] = v;
       return prev;
     }, {}) : undefined
   };
   globalThis.console.log(JSON.stringify(data));
 });
-const logJson = exports.logJson = tsplus_module_6.replace(tsplus_module_6.defaultLogger, jsonLogger);
+const logJson = exports.logJson = tsplus_module_5.replace(tsplus_module_5.defaultLogger, jsonLogger);
 //# sourceMappingURL=jsonLogger.cjs.map

package/_cjs/logger/jsonLogger.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"jsonLogger.cjs","names":["_shared","require","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","jsonLogger","exports","tsplus_module_6","make","annotations","cause","context","fiberId","logLevel","message","spans","now","Date","nowMillis","getTime","c","getRequestContext","data","timestamp","level","label","fiber","tsplus_module_1","threadName","request","tsplus_module_2","getOrUndefined","tsplus_module_3","empty","pretty","undefined","tsplus_module_4","toArray","map","_","timing","startTime","tsplus_module_5","size","reduce","prev","k","v","globalThis","console","log","JSON","stringify","logJson","replace","defaultLogger"],"sources":["../../_src/logger/jsonLogger.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"jsonLogger.cjs","names":["_shared","require","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","jsonLogger","exports","tsplus_module_5","make","annotations","cause","context","fiberId","logLevel","message","spans","now","Date","nowMillis","getTime","c","getRequestContext","data","timestamp","level","label","fiber","tsplus_module_1","threadName","request","value","tsplus_module_2","empty","pretty","undefined","tsplus_module_3","toArray","map","_","timing","startTime","tsplus_module_4","size","reduce","prev","k","v","globalThis","console","log","JSON","stringify","logJson","replace","defaultLogger"],"sources":["../../_src/logger/jsonLogger.ts"],"sourcesContent":[null],"mappings":"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"}

package/_cjs/logger/logFmtLogger.cjs

@@ -4,21 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.logfmtLogger = exports.logFmt = void 0;
-var tsplus_module_1 = _interopRequireWildcard(require("@effect-app/core/Option"));
-var tsplus_module_2 = _interopRequireWildcard(require("@effect-app/prelude/utils"));
-var tsplus_module_3 = _interopRequireWildcard(require("effect/HashMap"));
-var tsplus_module_4 = _interopRequireWildcard(require("effect/Logger"));
+var tsplus_module_1 = _interopRequireWildcard(require("@effect-app/prelude/utils"));
+var tsplus_module_2 = _interopRequireWildcard(require("effect/HashMap"));
+var tsplus_module_3 = _interopRequireWildcard(require("effect/Logger"));
 var _shared = require("./shared.cjs");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-const logfmtLogger = exports.logfmtLogger = tsplus_module_4.make(_ => {
+const logfmtLogger = exports.logfmtLogger = tsplus_module_3.make(_ => {
   let {
     annotations
   } = _;
   const c = (0, _shared.getRequestContext)(_.context);
-  const requestContext = tsplus_module_1.getOrUndefined(c);
+  const requestContext = c.value;
   if (requestContext && requestContext.name !== "_root_") {
-    annotations = tsplus_module_3.make(...[...annotations, ...tsplus_module_2.RecordEntries(tsplus_module_2.object$({
+    annotations = tsplus_module_2.make(...[...annotations, ...tsplus_module_1.RecordEntries(tsplus_module_1.object$({
       "request.root.id": requestContext.rootId,
       "request.id": requestContext.id,
       "request.name": requestContext.name,
@@ -29,11 +28,11 @@ const logfmtLogger = exports.logfmtLogger = tsplus_module_4.make(_ => {
       } : {})
     }))]);
   }
-  const formatted = tsplus_module_4.logfmtLogger.log({
+  const formatted = tsplus_module_3.logfmtLogger.log({
     ..._,
     annotations
   });
   globalThis.console.log(formatted);
 });
-const logFmt = exports.logFmt = tsplus_module_4.replace(tsplus_module_4.defaultLogger, logfmtLogger);
+const logFmt = exports.logFmt = tsplus_module_3.replace(tsplus_module_3.defaultLogger, logfmtLogger);
 //# sourceMappingURL=logFmtLogger.cjs.map

package/_cjs/logger/logFmtLogger.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"logFmtLogger.cjs","names":["_shared","require","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","logfmtLogger","exports","tsplus_module_4","make","_","annotations","c","getRequestContext","context","requestContext","tsplus_module_1","getOrUndefined","name","tsplus_module_3","tsplus_module_2","RecordEntries","object$","rootId","id","namespace","locale","userProfile","sub","formatted","log","globalThis","console","logFmt","replace","defaultLogger"],"sources":["../../_src/logger/logFmtLogger.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AAA+C,SAAAC,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAI,wBAAAJ,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAM,OAAA,EAAAN,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAI,GAAA,CAAAP,CAAA,UAAAG,CAAA,CAAAK,GAAA,CAAAR,CAAA,OAAAS,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAf,CAAA,oBAAAe,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAlB,CAAA,EAAAe,CAAA,SAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAd,CAAA,EAAAe,CAAA,UAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAf,CAAA,CAAAe,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAN,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAiB,GAAA,CAAApB,CAAA,EAAAS,CAAA,GAAAA,CAAA;AAExC,MAAMY,YAAY,GAAAC,OAAA,CAAAD,YAAA,GAAGE,eAAA,CAAAC,IAAA,CACzBC,CAAC,IAAI;EACJ,IAAI;IAAEC;EAAW,CAAE,GAAGD,CAAC;EACvB,MAAME,CAAC,GAAG,IAAAC,yBAAiB,EAACH,CAAC,CAACI,OAAO,CAAC;EACtC,MAAMC,cAAc,GAAAC,eAAA,CAAAC,cAAA,CAAGL,CAAC,CAAM;EAC9B,IAAIG,cAAc,IAAIA,cAAc,CAACG,IAAI,KAAK,QAAQ,EAAE;IACtDP,WAAW,GAAGQ,eAAA,CAAAV,IAAA,CAAa,GAAG,CAC5B,GAAGE,WAAW,EACd,GAAAS,eAAA,CAAAC,aAAA,CAAAD,eAAA,CAAAE,OAAA,CAAG;MACD,iBAAiB,EAAEP,cAAc,CAACQ,MAAM;MACxC,YAAY,EAAER,cAAc,CAACS,EAAE;MAC/B,cAAc,EAAET,cAAc,CAACG,IAAI;MACnC,mBAAmB,EAAEH,cAAc,CAACU,SAAS;MAC7C,gBAAgB,EAAEV,cAAc,CAACW,MAAM;MACvC,IAAGX,cAAc,CAACY,WAAW,EAAEC,GAAG,GAAG;QAAE,kBAAkB,EAAEb,cAAc,CAACY,WAAW,CAACC;MAAG,CAAE,GAAG,EAAE;KACjG,EAES,CACX,CAAC;EACJ;EACA,MAAMC,SAAS,GAAGrB,eAAA,CAAAF,YAAA,CAAoBwB,GAAG,CAAC;IAAE,GAAGpB,CAAC;IAAEC;EAAW,CAAE,CAAC;EAChEoB,UAAU,CAACC,OAAO,CAACF,GAAG,CAACD,SAAS,CAAC;AACnC,CAAC,CACF;AAEM,MAAMI,MAAM,GAAA1B,OAAA,CAAA0B,MAAA,GAAGzB,eAAA,CAAA0B,OAAA,CAAA1B,eAAA,CAAA2B,aAAA,EAAqC7B,YAAY,CAAC"}
+{"version":3,"file":"logFmtLogger.cjs","names":["_shared","require","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","logfmtLogger","exports","tsplus_module_3","make","_","annotations","c","getRequestContext","context","requestContext","value","name","tsplus_module_2","tsplus_module_1","RecordEntries","object$","rootId","id","namespace","locale","userProfile","sub","formatted","log","globalThis","console","logFmt","replace","defaultLogger"],"sources":["../../_src/logger/logFmtLogger.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AAA+C,SAAAC,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAI,wBAAAJ,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAM,OAAA,EAAAN,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAI,GAAA,CAAAP,CAAA,UAAAG,CAAA,CAAAK,GAAA,CAAAR,CAAA,OAAAS,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAf,CAAA,oBAAAe,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAlB,CAAA,EAAAe,CAAA,SAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAd,CAAA,EAAAe,CAAA,UAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAf,CAAA,CAAAe,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAN,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAiB,GAAA,CAAApB,CAAA,EAAAS,CAAA,GAAAA,CAAA;AAExC,MAAMY,YAAY,GAAAC,OAAA,CAAAD,YAAA,GAAGE,eAAA,CAAAC,IAAA,CACzBC,CAAC,IAAI;EACJ,IAAI;IAAEC;EAAW,CAAE,GAAGD,CAAC;EACvB,MAAME,CAAC,GAAG,IAAAC,yBAAiB,EAACH,CAAC,CAACI,OAAO,CAAC;EACtC,MAAMC,cAAc,GAAGH,CAAC,CAACI,KAAK;EAC9B,IAAID,cAAc,IAAIA,cAAc,CAACE,IAAI,KAAK,QAAQ,EAAE;IACtDN,WAAW,GAAGO,eAAA,CAAAT,IAAA,CAAa,GAAG,CAC5B,GAAGE,WAAW,EACd,GAAAQ,eAAA,CAAAC,aAAA,CAAAD,eAAA,CAAAE,OAAA,CAAG;MACD,iBAAiB,EAAEN,cAAc,CAACO,MAAM;MACxC,YAAY,EAAEP,cAAc,CAACQ,EAAE;MAC/B,cAAc,EAAER,cAAc,CAACE,IAAI;MACnC,mBAAmB,EAAEF,cAAc,CAACS,SAAS;MAC7C,gBAAgB,EAAET,cAAc,CAACU,MAAM;MACvC,IAAGV,cAAc,CAACW,WAAW,EAAEC,GAAG,GAAG;QAAE,kBAAkB,EAAEZ,cAAc,CAACW,WAAW,CAACC;MAAG,CAAE,GAAG,EAAE;KACjG,EAES,CACX,CAAC;EACJ;EACA,MAAMC,SAAS,GAAGpB,eAAA,CAAAF,YAAA,CAAoBuB,GAAG,CAAC;IAAE,GAAGnB,CAAC;IAAEC;EAAW,CAAE,CAAC;EAChEmB,UAAU,CAACC,OAAO,CAACF,GAAG,CAACD,SAAS,CAAC;AACnC,CAAC,CACF;AAEM,MAAMI,MAAM,GAAAzB,OAAA,CAAAyB,MAAA,GAAGxB,eAAA,CAAAyB,OAAA,CAAAzB,eAAA,CAAA0B,aAAA,EAAqC5B,YAAY,CAAC"}

package/_cjs/logger/shared.cjs

@@ -7,7 +7,6 @@ exports.getRequestContext = getRequestContext;
 var tsplus_module_1 = _interopRequireWildcard(require("effect/FiberRef"));
 var tsplus_module_2 = _interopRequireWildcard(require("effect/Context"));
 var tsplus_module_3 = _interopRequireWildcard(require("effect/Runtime"));
-var tsplus_module_4 = _interopRequireWildcard(require("effect/Option"));
 var _effect = require("effect");
 var FiberRefs = _interopRequireWildcard(require("effect/FiberRefs"));
 var _RequestContextContainer = require("../services/RequestContextContainer.cjs");
@@ -16,7 +15,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 function getRequestContext(fiberRefs) {
   const context = FiberRefs.getOrDefault(fiberRefs, tsplus_module_1.currentContext);
   const a = tsplus_module_2.getOption(context, _RequestContextContainer.RequestContextContainer);
-  const c = tsplus_module_4.map(a, _ => {
+  const c = a.map(_ => {
     // TODO: perhaps a litle expensive?
     const rt = tsplus_module_3.make({
       context,

package/_cjs/logger/shared.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"shared.cjs","names":["_effect","require","FiberRefs","_interopRequireWildcard","_RequestContextContainer","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","getRequestContext","fiberRefs","context","getOrDefault","tsplus_module_1","currentContext","tsplus_module_2","getOption","RequestContextContainer","c","tsplus_module_4","map","_","rt","tsplus_module_3","make","runtimeFlags","RuntimeFlags","none","runSync","requestContext"],"sources":["../../_src/logger/shared.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAC,uBAAA,CAAAF,OAAA;AACA,IAAAG,wBAAA,GAAAH,OAAA;AAAgF,SAAAI,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAH,wBAAAG,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAjB,CAAA,EAAAc,CAAA,SAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAgB,GAAA,CAAAnB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAE1E,SAAUY,iBAAiBA,CAACC,SAA8B;EAC9D,MAAMC,OAAO,GAAG1B,SAAS,CAAC2B,YAAY,CAACF,SAAS,EAAAG,eAAA,CAAAC,cAAA,CAA0B;EAC1E,MAAMf,CAAC,GAAGgB,eAAA,CAAAC,SAAA,CAAAL,OAAO,EAAWM,gDAAuB,CAAC;EACpD,MAAMC,CAAC,GAAGC,eAAA,CAAAC,GAAA,CAAArB,CAAC,EAAMsB,CAAC,IAAI;IACpB;IACA,MAAMC,EAAE,GAAGC,eAAA,CAAAC,IAAA,CAAa;MAAEb,OAAO;MAAED,SAAS;MAAEe,YAAY,EAAEC,oBAAY,CAACC;IAAI,CAAE,CAAC;IAChF,OAAOJ,eAAA,CAAAK,OAAA,CAAAN,EAAE,EAASD,CAAC,CAACQ,cAAc,CAAC;EACrC,CAAC,CAAC;EACF,OAAOX,CAAC;AACV"}
+{"version":3,"file":"shared.cjs","names":["_effect","require","FiberRefs","_interopRequireWildcard","_RequestContextContainer","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","getRequestContext","fiberRefs","context","getOrDefault","tsplus_module_1","currentContext","tsplus_module_2","getOption","RequestContextContainer","c","map","_","rt","tsplus_module_3","make","runtimeFlags","RuntimeFlags","none","runSync","requestContext"],"sources":["../../_src/logger/shared.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAC,uBAAA,CAAAF,OAAA;AACA,IAAAG,wBAAA,GAAAH,OAAA;AAAgF,SAAAI,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAH,wBAAAG,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAjB,CAAA,EAAAc,CAAA,SAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAgB,GAAA,CAAAnB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAE1E,SAAUY,iBAAiBA,CAACC,SAA8B;EAC9D,MAAMC,OAAO,GAAG1B,SAAS,CAAC2B,YAAY,CAACF,SAAS,EAAAG,eAAA,CAAAC,cAAA,CAA0B;EAC1E,MAAMf,CAAC,GAAGgB,eAAA,CAAAC,SAAA,CAAAL,OAAO,EAAWM,gDAAuB,CAAC;EACpD,MAAMC,CAAC,GAAGnB,CAAC,CAACoB,GAAG,CAAEC,CAAC,IAAI;IACpB;IACA,MAAMC,EAAE,GAAGC,eAAA,CAAAC,IAAA,CAAa;MAAEZ,OAAO;MAAED,SAAS;MAAEc,YAAY,EAAEC,oBAAY,CAACC;IAAI,CAAE,CAAC;IAChF,OAAOJ,eAAA,CAAAK,OAAA,CAAAN,EAAE,EAASD,CAAC,CAACQ,cAAc,CAAC;EACrC,CAAC,CAAC;EACF,OAAOV,CAAC;AACV"}

package/_cjs/rateLimit.cjs

@@ -8,8 +8,8 @@ exports.batch = batch;
 exports.batchPar = batchPar;
 exports.naiveRateLimit = naiveRateLimit;
 var tsplus_module_1 = _interopRequireWildcard(require("effect/Effect"));
-var tsplus_module_2 = _interopRequireWildcard(require("@effect-app/core/_ext/Iterable"));
-var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/core/Array"));
+var tsplus_module_2 = _interopRequireWildcard(require("@effect-app/core/Array"));
+var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/core/_ext/Iterable"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 // /**
@@ -47,7 +47,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  */
 function SEM_withPermitsDuration(permits, duration) {
   return self => {
-    return effect => tsplus_module_1.uninterruptibleMask(restore => tsplus_module_1.andThen(restore(self.take(permits)), tsplus_module_1.ensuring(restore(effect), tsplus_module_1.delay(self.release(permits), duration))));
+    return effect => tsplus_module_1.uninterruptibleMask(restore => restore(self.take(permits)).andThen(tsplus_module_1.ensuring(restore(effect), tsplus_module_1.delay(self.release(permits), duration))));
   };
 }
 /**
@@ -55,7 +55,7 @@ function SEM_withPermitsDuration(permits, duration) {
  * @tsplus static Collection.Ops batchPar
  */
 function batchPar(n, forEachItem, forEachBatch) {
-  return items => tsplus_module_2.ext_forEach(tsplus_module_3.chunk_(items, n), (_, i) => tsplus_module_1.flatMap(tsplus_module_2.ext_forEach(_, (_, j) => forEachItem(_, j, i), {
+  return items => tsplus_module_3.ext_forEach(tsplus_module_2.chunk_(items, n), (_, i) => tsplus_module_1.flatMap(_.forEachEffect((_, j) => forEachItem(_, j, i), {
     concurrency: "inherit"
   }), _ => forEachBatch(_, i)), {
     concurrency: "inherit"
@@ -66,7 +66,7 @@ function batchPar(n, forEachItem, forEachBatch) {
  * @tsplus static Collection.Ops batch
  */
 function batch(n, forEachItem, forEachBatch) {
-  return items => tsplus_module_2.ext_forEach(tsplus_module_3.chunk_(items, n), (_, i) => tsplus_module_1.flatMap(tsplus_module_2.ext_forEach(_, (_, j) => forEachItem(_, j, i), {
+  return items => tsplus_module_3.ext_forEach(tsplus_module_2.chunk_(items, n), (_, i) => tsplus_module_1.flatMap(_.forEachEffect((_, j) => forEachItem(_, j, i), {
     concurrency: "inherit"
   }), _ => forEachBatch(_, i)));
 }
@@ -94,7 +94,7 @@ function batch(n, forEachItem, forEachBatch) {
  * @tsplus static Collection.Ops naiveRateLimit
  */
 function naiveRateLimit(n, d) {
-  return items => (forEachItem, forEachBatch) => tsplus_module_2.ext_forEach(tsplus_module_3.chunk_(items, n), (batch, i) => tsplus_module_1.zipRight(i === 0 ? tsplus_module_1.unit : tsplus_module_1.sleep(d), tsplus_module_1.flatMap(tsplus_module_2.ext_forEach(batch, forEachItem, {
+  return items => (forEachItem, forEachBatch) => tsplus_module_3.ext_forEach(tsplus_module_2.chunk_(items, n), (batch, i) => tsplus_module_1.zipRight(i === 0 ? tsplus_module_1.unit : tsplus_module_1.sleep(d), tsplus_module_1.flatMap(batch.forEachEffect(forEachItem, {
     concurrency: n
   }), forEachBatch)));
 }

package/_cjs/rateLimit.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"rateLimit.cjs","names":["SEM_withPermitsDuration","permits","duration","self","effect","tsplus_module_1","uninterruptibleMask","restore","andThen","take","ensuring","delay","release","batchPar","n","forEachItem","forEachBatch","items","tsplus_module_2","ext_forEach","tsplus_module_3","chunk_","_","i","flatMap","j","concurrency","batch","naiveRateLimit","d","zipRight","unit","sleep"],"sources":["../_src/rateLimit.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;;;;;;;;;AASM,SAAUA,uBAAuBA,CAACC,OAAe,EAAEC,QAAkB;EACzE,OAAQC,IAAe,IAA2D;IAChF,OAAQC,MAAM,IACZC,eAAA,CAAAC,mBAAA,CACGC,OAAO,IACNF,eAAA,CAAAG,OAAA,CAAAD,OAAO,CAACJ,IAAI,CAACM,IAAI,CAACR,OAAO,CAAC,CAAC,EAEvBI,eAAA,CAAAK,QAAA,CAAAH,OAAO,CAACH,MAAM,CAAC,EAEXC,eAAA,CAAAM,KAAA,CAAAR,IAAI,CACDS,OAAO,CAACX,OAAO,CAAC,EACVC,QAAQ,CAAC,CACnB,CACJ,CACN;EACL,CAAC;AACH;AAEA;;;;AAIM,SAAUW,QAAQA,CACtBC,CAAS,EACTC,WAA+E,EAC/EC,YAAoE;EAEpE,OAAQC,KAAkB,IACxBC,eAAA,CAAAC,WAAA,CAAAC,eAAA,CAAAC,MAAA,CAAAJ,KAAK,EACIH,CAAC,CAAC,EAEP,CAACQ,CAAC,EAAEC,CAAC,KACHlB,eAAA,CAAAmB,OAAA,CAAAN,eAAA,CAAAC,WAAA,CAAAG,CAAC,EACgB,CAACA,CAAC,EAAEG,CAAC,KAAKV,WAAW,CAACO,CAAC,EAAEG,CAAC,EAAEF,CAAC,CAAC,EAAE;IAAEG,WAAW,EAAE;EAAS,CAAE,CAAC,EAChEJ,CAAC,IAAKN,YAAY,CAACM,CAAqB,EAAEC,CAAC,CAAC,CAAC,EAC3D;IAAEG,WAAW,EAAE;EAAS,CAAE,CAC3B;AACP;AAEA;;;;AAIM,SAAUC,KAAKA,CACnBb,CAAS,EACTC,WAA+E,EAC/EC,YAAoE;EAEpE,OAAQC,KAAkB,IACxBC,eAAA,CAAAC,WAAA,CAAAC,eAAA,CAAAC,MAAA,CAAAJ,KAAK,EACIH,CAAC,CAAC,EACM,CAACQ,CAAC,EAAEC,CAAC,KAClBlB,eAAA,CAAAmB,OAAA,CAAAN,eAAA,CAAAC,WAAA,CAAAG,CAAC,EACgB,CAACA,CAAC,EAAEG,CAAC,KAAKV,WAAW,CAACO,CAAC,EAAEG,CAAC,EAAEF,CAAC,CAAC,EAAE;IAAEG,WAAW,EAAE;EAAS,CAAE,CAAC,EAChEJ,CAAC,IAAKN,YAAY,CAACM,CAAqB,EAAEC,CAAC,CAAC,CAAC,CAC1D;AACP;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;;;;AAKM,SAAUK,cAAcA,CAC5Bd,CAAS,EACTe,CAAM;EAEN,OAAWZ,KAAkB,IAAM,CACjCF,WAAsC,EACtCC,YAA4C,KAE5CE,eAAA,CAAAC,WAAA,CAAAC,eAAA,CAAAC,MAAA,CAAAJ,KAAK,EACIH,CAAC,CAAC,EACM,CAACa,KAAK,EAAEJ,CAAC,KACtBlB,eAAA,CAAAyB,QAAA,CAAEP,CAAC,KAAK,CAAC,GAAGlB,eAAA,CAAA0B,IAAA,GAAe1B,eAAA,CAAA2B,KAAA,CAAaH,CAAC,CAAC,EAEtCxB,eAAA,CAAAmB,OAAA,CAAAN,eAAA,CAAAC,WAAA,CAAAQ,KAAK,EACYZ,WAAW,EAAE;IAAEW,WAAW,EAAEZ;EAAC,CAAE,CAAC,EACtCE,YAAY,CAAC,CACzB,CACH;AACR"}
+{"version":3,"file":"rateLimit.cjs","names":["SEM_withPermitsDuration","permits","duration","self","effect","tsplus_module_1","uninterruptibleMask","restore","take","andThen","ensuring","delay","release","batchPar","n","forEachItem","forEachBatch","items","tsplus_module_3","ext_forEach","tsplus_module_2","chunk_","_","i","flatMap","forEachEffect","j","concurrency","batch","naiveRateLimit","d","zipRight","unit","sleep"],"sources":["../_src/rateLimit.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;;;;;;;;;AASM,SAAUA,uBAAuBA,CAACC,OAAe,EAAEC,QAAkB;EACzE,OAAQC,IAAe,IAA2D;IAChF,OAAQC,MAAM,IACZC,eAAA,CAAAC,mBAAA,CACGC,OAAO,IACNA,OAAO,CAACJ,IAAI,CAACK,IAAI,CAACP,OAAO,CAAC,CAAC,CACxBQ,OAAO,CACNJ,eAAA,CAAAK,QAAA,CAAAH,OAAO,CAACH,MAAM,CAAC,EAEXC,eAAA,CAAAM,KAAA,CAAAR,IAAI,CACDS,OAAO,CAACX,OAAO,CAAC,EACVC,QAAQ,CAAC,CACnB,CACJ,CACN;EACL,CAAC;AACH;AAEA;;;;AAIM,SAAUW,QAAQA,CACtBC,CAAS,EACTC,WAA+E,EAC/EC,YAAoE;EAEpE,OAAQC,KAAkB,IACxBC,eAAA,CAAAC,WAAA,CAAAC,eAAA,CAAAC,MAAA,CAAAJ,KAAK,EACIH,CAAC,CAAC,EAEP,CAACQ,CAAC,EAAEC,CAAC,KACHlB,eAAA,CAAAmB,OAAA,CAAAF,CAAC,CACEG,aAAa,CAAC,CAACH,CAAC,EAAEI,CAAC,KAAKX,WAAW,CAACO,CAAC,EAAEI,CAAC,EAAEH,CAAC,CAAC,EAAE;IAAEI,WAAW,EAAE;EAAS,CAAE,CAAC,EAChEL,CAAC,IAAKN,YAAY,CAACM,CAAqB,EAAEC,CAAC,CAAC,CAAC,EAC3D;IAAEI,WAAW,EAAE;EAAS,CAAE,CAC3B;AACP;AAEA;;;;AAIM,SAAUC,KAAKA,CACnBd,CAAS,EACTC,WAA+E,EAC/EC,YAAoE;EAEpE,OAAQC,KAAkB,IACxBC,eAAA,CAAAC,WAAA,CAAAC,eAAA,CAAAC,MAAA,CAAAJ,KAAK,EACIH,CAAC,CAAC,EACM,CAACQ,CAAC,EAAEC,CAAC,KAClBlB,eAAA,CAAAmB,OAAA,CAAAF,CAAC,CACEG,aAAa,CAAC,CAACH,CAAC,EAAEI,CAAC,KAAKX,WAAW,CAACO,CAAC,EAAEI,CAAC,EAAEH,CAAC,CAAC,EAAE;IAAEI,WAAW,EAAE;EAAS,CAAE,CAAC,EAChEL,CAAC,IAAKN,YAAY,CAACM,CAAqB,EAAEC,CAAC,CAAC,CAAC,CAC1D;AACP;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;;;;AAKM,SAAUM,cAAcA,CAC5Bf,CAAS,EACTgB,CAAM;EAEN,OAAWb,KAAkB,IAAM,CACjCF,WAAsC,EACtCC,YAA4C,KAE5CE,eAAA,CAAAC,WAAA,CAAAC,eAAA,CAAAC,MAAA,CAAAJ,KAAK,EACIH,CAAC,CAAC,EACM,CAACc,KAAK,EAAEL,CAAC,KACtBlB,eAAA,CAAA0B,QAAA,CAAER,CAAC,KAAK,CAAC,GAAGlB,eAAA,CAAA2B,IAAA,GAAe3B,eAAA,CAAA4B,KAAA,CAAaH,CAAC,CAAC,EAEtCzB,eAAA,CAAAmB,OAAA,CAAAI,KAAK,CACFH,aAAa,CAACV,WAAW,EAAE;IAAEY,WAAW,EAAEb;EAAC,CAAE,CAAC,EACtCE,YAAY,CAAC,CACzB,CACH;AACR"}