@effect-app/infra 0.13.0 → 0.14.0

package/dist/api/express/schema/routing.js

@@ -1,8 +1,6 @@
-import * as tracer_1 from "@effect/io/Debug";
-const fileName_1 = "packages/infra/_src/api/express/schema/routing.ts";
-import * as tsplus_module_1 from "@fp-ts/data/Option";
+import * as tsplus_module_1 from "@effect-app/core/Option";
 import * as tsplus_module_2 from "@effect/io/Effect";
-import * as tsplus_module_3 from "@effect-app/core/Option";
+import * as tsplus_module_3 from "@fp-ts/core/Option";
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import * as MO from "@effect-app/schema";
 import { isObjectSchema } from "@effect-app/infra-adapters/Openapi/atlas-plutus";
@@ -24,16 +22,16 @@ export function makeFromSchema(e) {
     const Res = r ? MO.extractSchema(r) : MO.Void;
     // TODO EffectOpt.fromNullable(Req.Headers).flatMapOpt(jsonSchema)
     // TODO: use the path vs body etc serialisation also in the Client.
-    const makeReqQuerySchema = tracer_1.withCallTrace(fileName_1 + ":102:66")(tsplus_module_2.flatMap(_ => tsplus_module_1.match(() => tracer_1.withCallTrace(fileName_1 + ":104:13")(tsplus_module_2.sync(() => tsplus_module_1.none)), _ => tracer_1.withCallTrace(fileName_1 + ":105:26")(tsplus_module_2.map(tsplus_module_1.some))(jsonSchema(_)))(_)))(tracer_1.withCallTrace(fileName_1 + ":102:30")(tsplus_module_2.sync(() => tsplus_module_1.fromNullable(Req.Query))));
-    const makeReqHeadersSchema = tracer_1.withCallTrace(fileName_1 + ":108:70")(tsplus_module_2.flatMap(_ => tsplus_module_1.match(() => tracer_1.withCallTrace(fileName_1 + ":110:13")(tsplus_module_2.sync(() => tsplus_module_1.none)), _ => tracer_1.withCallTrace(fileName_1 + ":111:26")(tsplus_module_2.map(tsplus_module_1.some))(jsonSchema(_)))(_)))(tracer_1.withCallTrace(fileName_1 + ":108:32")(tsplus_module_2.sync(() => tsplus_module_1.fromNullable(Req.Headers))));
-    const makeReqCookieSchema = tracer_1.withCallTrace(fileName_1 + ":114:68")(tsplus_module_2.flatMap(_ => tsplus_module_1.match(() => tracer_1.withCallTrace(fileName_1 + ":116:13")(tsplus_module_2.sync(() => tsplus_module_1.none)), _ => tracer_1.withCallTrace(fileName_1 + ":117:26")(tsplus_module_2.map(tsplus_module_1.some))(jsonSchema(_)))(_)))(tracer_1.withCallTrace(fileName_1 + ":114:31")(tsplus_module_2.sync(() => tsplus_module_1.fromNullable(Req.Cookie))));
-    const makeReqPathSchema = tracer_1.withCallTrace(fileName_1 + ":120:64")(tsplus_module_2.flatMap(_ => tsplus_module_1.match(() => tracer_1.withCallTrace(fileName_1 + ":122:13")(tsplus_module_2.sync(() => tsplus_module_1.none)), _ => tracer_1.withCallTrace(fileName_1 + ":123:26")(tsplus_module_2.map(tsplus_module_1.some))(jsonSchema(_)))(_)))(tracer_1.withCallTrace(fileName_1 + ":120:29")(tsplus_module_2.sync(() => tsplus_module_1.fromNullable(Req.Path))));
-    const makeReqBodySchema = tracer_1.withCallTrace(fileName_1 + ":126:64")(tsplus_module_2.flatMap(_ => tsplus_module_1.match(() => tracer_1.withCallTrace(fileName_1 + ":128:13")(tsplus_module_2.sync(() => tsplus_module_1.none)), _ => tracer_1.withCallTrace(fileName_1 + ":129:26")(tsplus_module_2.map(tsplus_module_1.some))(jsonSchema(_)))(_)))(tracer_1.withCallTrace(fileName_1 + ":126:29")(tsplus_module_2.sync(() => tsplus_module_1.fromNullable(Req.Body))));
+    const makeReqQuerySchema = tsplus_module_2.flatMap(tsplus_module_2.sync(() => tsplus_module_3.fromNullable(Req.Query)), _ => tsplus_module_3.match(() => tsplus_module_2.sync(() => tsplus_module_1.none), _ => tsplus_module_2.map(jsonSchema(_), tsplus_module_3.some))(_));
+    const makeReqHeadersSchema = tsplus_module_2.flatMap(tsplus_module_2.sync(() => tsplus_module_3.fromNullable(Req.Headers)), _ => tsplus_module_3.match(() => tsplus_module_2.sync(() => tsplus_module_1.none), _ => tsplus_module_2.map(jsonSchema(_), tsplus_module_3.some))(_));
+    const makeReqCookieSchema = tsplus_module_2.flatMap(tsplus_module_2.sync(() => tsplus_module_3.fromNullable(Req.Cookie)), _ => tsplus_module_3.match(() => tsplus_module_2.sync(() => tsplus_module_1.none), _ => tsplus_module_2.map(jsonSchema(_), tsplus_module_3.some))(_));
+    const makeReqPathSchema = tsplus_module_2.flatMap(tsplus_module_2.sync(() => tsplus_module_3.fromNullable(Req.Path)), _ => tsplus_module_3.match(() => tsplus_module_2.sync(() => tsplus_module_1.none), _ => tsplus_module_2.map(jsonSchema(_), tsplus_module_3.some))(_));
+    const makeReqBodySchema = tsplus_module_2.flatMap(tsplus_module_2.sync(() => tsplus_module_3.fromNullable(Req.Body)), _ => tsplus_module_3.match(() => tsplus_module_2.sync(() => tsplus_module_1.none), _ => tsplus_module_2.map(jsonSchema(_), tsplus_module_3.some))(_));
     // const makeReqSchema = schema(Req)
     const makeResSchema = jsonSchema_(Res);
     function makeParameters(inn) {
         return (a) => {
-            return tsplus_module_1.getOrElse(() => [])(tsplus_module_1.map(x => {
+            return tsplus_module_3.getOrElse(() => [])(tsplus_module_3.map(x => {
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 return Object.keys(x.properties).map(p => {
                     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -41,10 +39,18 @@ export function makeFromSchema(e) {
                     const required = Boolean(x.required?.includes(p));
                     return { name: p, in: inn, required, schema };
                 });
-            })(tsplus_module_1.flatMap(o => (isObjectSchema(o) ? tsplus_module_1.some(o) : tsplus_module_1.none))(a)));
+            })(tsplus_module_3.flatMap(o => (isObjectSchema(o) ? tsplus_module_3.some(o) : tsplus_module_1.none))(a)));
         };
     }
-    return tracer_1.withCallTrace(fileName_1 + ":161:6")(tsplus_module_2.map(_ => {
+    return tsplus_module_2.map(tsplus_module_2.struct({
+        req: jsonSchema(Req.Model),
+        reqQuery: makeReqQuerySchema,
+        reqHeaders: makeReqHeadersSchema,
+        reqBody: makeReqBodySchema,
+        reqPath: makeReqPathSchema,
+        reqCookie: makeReqCookieSchema,
+        res: makeResSchema
+    }), _ => {
         // console.log("$$$ REQ", _.req)
         const isEmpty = !e.handler.Response || e.handler.Response === MO.Void;
         return {
@@ -60,7 +66,7 @@ export function makeFromSchema(e) {
                 ...makeParameters("header")(_.reqHeaders),
                 ...makeParameters("cookie")(_.reqCookie)
             ],
-            requestBody: tsplus_module_3.getOrUndefined(tsplus_module_1.map(schema => ({
+            requestBody: tsplus_module_1.getOrUndefined(tsplus_module_3.map(schema => ({
                 content: { "application/json": { schema } }
             }))(_.reqBody)),
             responses: [
@@ -75,15 +81,7 @@ export function makeFromSchema(e) {
                 ? [new Response(404, { description: "NotFoundError" })]
                 : [])
         };
-    }))(tracer_1.withCallTrace(fileName_1 + ":153:17")(tsplus_module_2.struct({
-        req: jsonSchema(Req.Model),
-        reqQuery: makeReqQuerySchema,
-        reqHeaders: makeReqHeadersSchema,
-        reqBody: makeReqBodySchema,
-        reqPath: makeReqPathSchema,
-        reqCookie: makeReqCookieSchema,
-        res: makeResSchema
-    })));
+    });
 }
 class Response {
     constructor(statusCode, type // string | JSONSchema | SubSchema
@@ -92,4 +90,4 @@ class Response {
         this.type = type;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL19zcmMvYXBpL2V4cHJlc3Mvc2NoZW1hL3JvdXRpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSx1REFBdUQ7QUFDdkQsT0FBTyxLQUFLLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUl4QyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0saURBQWlELENBQUE7QUFDaEYsT0FBTyxLQUFLLE9BQU8sTUFBTSwwQ0FBMEMsQ0FBQTtBQUduRSxNQUFNLFVBQVUscUJBQXFCLENBQStCLENBQUk7SUFDdEUsT0FBTyxDQUF1QixDQUFBO0FBQ2hDLENBQUM7QUFFRCxNQUFNLFVBQVUsd0JBQXdCLENBQ3RDLEdBQXFCO0lBRXJCLE9BQU8sR0FBRyxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFBO0FBQ3ZDLENBQUM7QUFrQ0QsTUFBTSxVQUFVLG1CQUFtQixDQVlqQyxJQUFZLEVBQ1osTUFBYyxFQUNkLE9BVUM7SUFFRCxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFXN0MsQ0FBQTtBQUNILENBQUM7QUFFRCxNQUFNLFVBQVUsY0FBYyxDQUM1QixDQUFnRTtJQUVoRSxNQUFNLFdBQVcsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFBO0lBQy9CLE1BQU0sVUFBVSxHQUFHLENBQU8sQ0FBa0IsRUFBRSxFQUFFLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQy9ELE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsZUFBZSxFQUFFLEdBQUcsQ0FBQyxDQUFDLE9BQU8sQ0FBQTtJQUNuRSxNQUFNLENBQUMsR0FBRyxlQUFlLElBQUksSUFBSSxDQUFBO0lBQ2pDLE1BQU0sR0FBRyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLGFBQWEsQ0FB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL19zcmMvYXBpL2V4cHJlc3Mvc2NoZW1hL3JvdXRpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsdURBQXVEO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFJeEMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGlEQUFpRCxDQUFBO0FBQ2hGLE9BQU8sS0FBSyxPQUFPLE1BQU0sMENBQTBDLENBQUE7QUFHbkUsTUFBTSxVQUFVLHFCQUFxQixDQUErQixDQUFJO0lBQ3RFLE9BQU8sQ0FBdUIsQ0FBQTtBQUNoQyxDQUFDO0FBRUQsTUFBTSxVQUFVLHdCQUF3QixDQUN0QyxHQUFxQjtJQUVyQixPQUFPLEdBQUcsQ0FBQyxHQUFHLENBQUMscUJBQXFCLENBQUMsQ0FBQTtBQUN2QyxDQUFDO0FBa0NELE1BQU0sVUFBVSxtQkFBbUIsQ0FZakMsSUFBWSxFQUNaLE1BQWMsRUFDZCxPQVVDO0lBRUQsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxRQUFRLEVBVzdDLENBQUE7QUFDSCxDQUFDO0FBRUQsTUFBTSxVQUFVLGNBQWMsQ0FDNUIsQ0FBZ0U7SUFFaEUsTUFBTSxXQUFXLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQTtJQUMvQixNQUFNLFVBQVUsR0FBRyxDQUFPLENBQWtCLEVBQUUsRUFBRSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUMvRCxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLGVBQWUsRUFBRSxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUE7SUFDbkUsTUFBTSxDQUFDLEdBQUcsZUFBZSxJQUFJLElBQUksQ0FBQTtJQUNqQyxNQUFNLEdBQUcsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxhQUFhLENBQUMs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

package/dist/api/reportError.js

@@ -1,5 +1,3 @@
-import * as tracer_1 from "@effect/io/Debug";
-const fileName_1 = "packages/infra/_src/api/reportError.ts";
 import * as tsplus_module_1 from "@effect-app/infra/RequestContext";
 import * as tsplus_module_2 from "@effect/io/Effect";
 import * as tsplus_module_3 from "@effect/io/Cause";
@@ -12,19 +10,9 @@ export class RequestException extends CauseException {
     }
 }
 export const reportRequestError_ = reportError(cause => new RequestException(cause));
-export const reportRequestError = (cause, context) => tracer_1.withCallTrace(fileName_1 + ":13:22")(tsplus_module_2.serviceWithEffect(tsplus_module_1.tag, requestContext => reportRequestError_(cause, { requestContext, ...context })));
+export const reportRequestError = (cause, context) => tsplus_module_2.serviceWithEffect(tsplus_module_1.tag, requestContext => reportRequestError_(cause, { requestContext, ...context }));
 export const logRequestError_ = logError(cause => new RequestException(cause));
-export const logRequestError = (cause, context) => tracer_1.withCallTrace(fileName_1 + ":18:22")(tsplus_module_2.serviceWithEffect(tsplus_module_1.tag, requestContext => logRequestError_(cause, { requestContext, ...context }))
-/**
- * Forks the effect into a new fiber attached to the global scope. Because the
- * new fiber is attached to the global scope, when the fiber executing the
- * returned effect terminates, the forked fiber will continue running.
- *
- * Reports errors.
- *
- * @tsplus getter effect/io/Effect forkDaemonReportRequest
- */
-);
+export const logRequestError = (cause, context) => tsplus_module_2.serviceWithEffect(tsplus_module_1.tag, requestContext => logRequestError_(cause, { requestContext, ...context }));
 /**
  * Forks the effect into a new fiber attached to the global scope. Because the
  * new fiber is attached to the global scope, when the fiber executing the
@@ -35,7 +23,7 @@ export const logRequestError = (cause, context) => tracer_1.withCallTrace(fileNa
  * @tsplus getter effect/io/Effect forkDaemonReportRequest
  */
 export function forkDaemonReportRequest(self) {
-    return tsplus_module_2.daemonChildren(tsplus_module_2.fork(tracer_1.withCallTrace(fileName_1 + ":30:15")(tsplus_module_2.tapErrorCause(reportRequestError))(self)));
+    return tsplus_module_2.daemonChildren(tsplus_module_2.fork(tsplus_module_2.tapErrorCause(self, reportRequestError)));
 }
 /**
  * Forks the effect into a new fiber attached to the global scope. Because the
@@ -47,8 +35,8 @@ export function forkDaemonReportRequest(self) {
  * @tsplus getter effect/io/Effect forkDaemonReportRequestUnexpected
  */
 export function forkDaemonReportRequestUnexpected(self) {
-    return tsplus_module_2.daemonChildren(tsplus_module_2.fork(tracer_1.withCallTrace(fileName_1 + ":44:15")(tsplus_module_2.tapErrorCause(cause => tsplus_module_3.isInterruptedOnly(cause) || tsplus_module_3.isDie(cause)
+    return tsplus_module_2.daemonChildren(tsplus_module_2.fork(tsplus_module_2.tapErrorCause(self, cause => tsplus_module_3.isInterruptedOnly(cause) || tsplus_module_3.isDie(cause)
         ? reportRequestError(cause)
-        : logRequestError(cause)))(self)));
+        : logRequestError(cause))));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVwb3J0RXJyb3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9fc3JjL2FwaS9yZXBvcnRFcnJvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsV0FBVyxFQUFFLE1BQU0scUJBQXFCLENBQUE7QUFDM0QsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQUM3QyxPQUErQixzQkFBc0IsQ0FBQTtBQUVyRCxNQUFNLE9BQU8sZ0JBQW9CLFNBQVEsY0FBaUI7SUFDeEQsWUFBWSxLQUFlO1FBQ3pCLEtBQUssQ0FBQyxLQUFLLEVBQUUsU0FBUyxDQUFDLENBQUE7SUFDekIsQ0FBQztDQUNGO0FBQ0QsTUFBTSxDQUFDLE1BQU0sbUJBQW1CLEdBQUcsV0FBVyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsSUFBSSxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFBO0FBRXBGLE1BQU0sQ0FBQyxNQUFNLGtCQUFrQixHQUFHLENBQUMsS0FBcUIsRUFBRSxPQUE2QyxFQUFFLEVBQUUsK0NBQ3pHLHVEQUFvQyxjQUFjLENBQUMsRUFBRSxDQUFDLG1CQUFtQixDQUFDLEtBQUssRUFBRSxFQUFFLGNBQWMsRUFBRSxHQUFHLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQSxDQUFBO0FBRW5ILE1BQU0sQ0FBQyxNQUFNLGdCQUFnQixHQUFHLFFBQVEsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLElBQUksZ0JBQWdCLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQTtBQUU5RSxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsQ0FBQyxLQUFxQixFQUFFLE9BQTZDLEVBQUUsRUFBRSwrQ0FDdEcsdURBQW9DLGNBQWMsQ0FBQyxFQUFFLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLEVBQUUsY0FBYyxFQUFFLEdBQUcsT0FBTyxFQUFFLENBQUMsQ0FBQztBQUVoSDs7Ozs7Ozs7R0FRRztDQVY2RyxDQUFBO0FBRWhIOzs7Ozs7OztHQVFHO0FBQ0gsTUFBTSxVQUFVLHVCQUF1QixDQUFVLElBQXFCO0lBQ3BFLDJEQUFPLDRFQUFtQixrQkFBa0IsR0FBckMsSUFBSSxDQUFrQyxHQUN2QjtBQUN4QixDQUFDO0FBRUQ7Ozs7Ozs7O0dBUUc7QUFDSCxNQUFNLFVBQVUsaUNBQWlDLENBQVUsSUFBcUI7SUFDOUUsMkRBQU8sNEVBQW1CLEtBQUssQ0FBQyxFQUFFLENBQ2hDLGtDQUFBLEtBQUssQ0FBb0IsSUFBSSxzQkFBQSxLQUFLLENBQVE7UUFDeEMsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLEtBQUssQ0FBQztRQUMzQixDQUFDLENBQUMsZUFBZSxDQUFDLEtBQUssQ0FBQyxHQUhyQixJQUFJLENBSVYsR0FDcUI7QUFDeEIsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVwb3J0RXJyb3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9fc3JjL2FwaS9yZXBvcnRFcnJvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLFdBQVcsRUFBRSxNQUFNLHFCQUFxQixDQUFBO0FBQzNELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFDN0MsT0FBK0Isc0JBQXNCLENBQUE7QUFFckQsTUFBTSxPQUFPLGdCQUFvQixTQUFRLGNBQWlCO0lBQ3hELFlBQVksS0FBZTtRQUN6QixLQUFLLENBQUMsS0FBSyxFQUFFLFNBQVMsQ0FBQyxDQUFBO0lBQ3pCLENBQUM7Q0FDRjtBQUNELE1BQU0sQ0FBQyxNQUFNLG1CQUFtQixHQUFHLFdBQVcsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLElBQUksZ0JBQWdCLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQTtBQUVwRixNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBRyxDQUFDLEtBQXFCLEVBQUUsT0FBNkMsRUFBRSxFQUFFLENBQ3pHLHVEQUFvQyxjQUFjLENBQUMsRUFBRSxDQUFDLG1CQUFtQixDQUFDLEtBQUssRUFBRSxFQUFFLGNBQWMsRUFBRSxHQUFHLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQTtBQUVuSCxNQUFNLENBQUMsTUFBTSxnQkFBZ0IsR0FBRyxRQUFRLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxJQUFJLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUE7QUFFOUUsTUFBTSxDQUFDLE1BQU0sZUFBZSxHQUFHLENBQUMsS0FBcUIsRUFBRSxPQUE2QyxFQUFFLEVBQUUsQ0FDdEcsdURBQW9DLGNBQWMsQ0FBQyxFQUFFLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLEVBQUUsY0FBYyxFQUFFLEdBQUcsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUFBO0FBRWhIOzs7Ozs7OztHQVFHO0FBQ0gsTUFBTSxVQUFVLHVCQUF1QixDQUFVLElBQXFCO0lBQ3BFLDJEQUFPLDhCQUFBLElBQUksRUFBZSxrQkFBa0IsQ0FBQyxHQUN2QjtBQUN4QixDQUFDO0FBRUQ7Ozs7Ozs7O0dBUUc7QUFDSCxNQUFNLFVBQVUsaUNBQWlDLENBQVUsSUFBcUI7SUFDOUUsMkRBQU8sOEJBQUEsSUFBSSxFQUFlLEtBQUssQ0FBQyxFQUFFLENBQ2hDLGtDQUFBLEtBQUssQ0FBb0IsSUFBSSxzQkFBQSxLQUFLLENBQVE7UUFDeEMsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLEtBQUssQ0FBQztRQUMzQixDQUFDLENBQUMsZUFBZSxDQUFDLEtBQUssQ0FBQyxDQUMzQixHQUNxQjtBQUN4QixDQUFDIn0=

package/dist/api/routing.js

@@ -1,6 +1,6 @@
 import * as tracer_1 from "@effect/io/Debug";
 const fileName_1 = "packages/infra/_src/api/routing.ts";
-import * as tsplus_module_1 from "@fp-ts/data/Option";
+import * as tsplus_module_1 from "@fp-ts/core/Option";
 import * as tsplus_module_2 from "@effect/io/Effect";
 import * as tsplus_module_3 from "@effect-app/core/Effect";
 import * as tsplus_module_4 from "@effect-app/prelude/_ext/Schema.ext";
@@ -21,15 +21,15 @@ import { makeRouteDescriptor } from "./express/schema/routing.js";
 import { reportRequestError } from "./reportError.js";
 import { snipString, snipValue } from "./util.js";
 export function makeRequestParsers(Request) {
-    const ph = tracer_1.withCallTrace(fileName_1 + ":43:14")(tsplus_module_2.sync(() => tsplus_module_1.map(MO.condemnFail)(tsplus_module_1.map(MO.Parser.for)(tsplus_module_1.map(s => s)(tsplus_module_1.fromNullable(Request.Headers))))));
+    const ph = tsplus_module_2.sync(() => tsplus_module_1.map(MO.condemnFail)(tsplus_module_1.map(MO.Parser.for)(tsplus_module_1.map(s => s)(tsplus_module_1.fromNullable(Request.Headers)))));
     const parseHeaders = (u) => tracer_1.withCallTrace(fileName_1 + ":49:43")(tsplus_module_3.flatMapOpt(ph, d => d(u)));
-    const pq = tracer_1.withCallTrace(fileName_1 + ":51:14")(tsplus_module_2.sync(() => tsplus_module_1.map(MO.condemnFail)(tsplus_module_1.map(MO.Parser.for)(tsplus_module_1.map(s => s)(tsplus_module_1.fromNullable(Request.Query))))));
+    const pq = tsplus_module_2.sync(() => tsplus_module_1.map(MO.condemnFail)(tsplus_module_1.map(MO.Parser.for)(tsplus_module_1.map(s => s)(tsplus_module_1.fromNullable(Request.Query)))));
     const parseQuery = (u) => tracer_1.withCallTrace(fileName_1 + ":57:41")(tsplus_module_3.flatMapOpt(pq, d => d(u)));
-    const pb = tracer_1.withCallTrace(fileName_1 + ":59:14")(tsplus_module_2.sync(() => tsplus_module_1.map(MO.condemnFail)(tsplus_module_1.map(MO.Parser.for)(tsplus_module_1.map(s => s)(tsplus_module_1.fromNullable(Request.Body))))));
+    const pb = tsplus_module_2.sync(() => tsplus_module_1.map(MO.condemnFail)(tsplus_module_1.map(MO.Parser.for)(tsplus_module_1.map(s => s)(tsplus_module_1.fromNullable(Request.Body)))));
     const parseBody = (u) => tracer_1.withCallTrace(fileName_1 + ":65:40")(tsplus_module_3.flatMapOpt(pb, d => d(u)));
-    const pp = tracer_1.withCallTrace(fileName_1 + ":67:14")(tsplus_module_2.sync(() => tsplus_module_1.map(MO.condemnFail)(tsplus_module_1.map(MO.Parser.for)(tsplus_module_1.map(s => s)(tsplus_module_1.fromNullable(Request.Path))))));
+    const pp = tsplus_module_2.sync(() => tsplus_module_1.map(MO.condemnFail)(tsplus_module_1.map(MO.Parser.for)(tsplus_module_1.map(s => s)(tsplus_module_1.fromNullable(Request.Path)))));
     const parsePath = (u) => tracer_1.withCallTrace(fileName_1 + ":73:40")(tsplus_module_3.flatMapOpt(pp, d => d(u)));
-    const pc = tracer_1.withCallTrace(fileName_1 + ":75:14")(tsplus_module_2.sync(() => tsplus_module_1.map(MO.condemnFail)(tsplus_module_1.map(MO.Parser.for)(tsplus_module_1.map(s => s)(tsplus_module_1.fromNullable(Request.Cookie))))));
+    const pc = tsplus_module_2.sync(() => tsplus_module_1.map(MO.condemnFail)(tsplus_module_1.map(MO.Parser.for)(tsplus_module_1.map(s => s)(tsplus_module_1.fromNullable(Request.Cookie)))));
     const parseCookie = (u) => tracer_1.withCallTrace(fileName_1 + ":81:42")(tsplus_module_3.flatMapOpt(pc, d => d(u)));
     return {
         parseBody,
@@ -46,15 +46,15 @@ export function match(requestHandler, errorHandler, middleware) {
         requestHandler = handler;
         makeMiddlewareContext = makeContext;
     }
-    return tracer_1.withCallTrace(fileName_1 + ":175:5")(tsplus_module_2.zipRight(tracer_1.withCallTrace(fileName_1 + ":176:5")(tsplus_module_2.sync(() => makeRouteDescriptor(requestHandler.Request.path, requestHandler.Request.method, requestHandler)))))(Ex.match(requestHandler.Request.method.toLowerCase())(requestHandler.Request.path.split("?")[0], makeRequestHandler(requestHandler, errorHandler, makeMiddlewareContext)));
+    return tsplus_module_2.zipRight(Ex.match(requestHandler.Request.method.toLowerCase())(requestHandler.Request.path.split("?")[0], makeRequestHandler(requestHandler, errorHandler, makeMiddlewareContext)), tsplus_module_2.sync(() => makeRouteDescriptor(requestHandler.Request.path, requestHandler.Request.method, requestHandler)));
 }
 export function respondSuccess(encodeResponse) {
-    return (req, res, a) => tracer_1.withCallTrace(fileName_1 + ":191:8")(tsplus_module_2.flatMap(r => tracer_1.withCallTrace(fileName_1 + ":192:9")(tsplus_module_2.sync(() => {
+    return (req, res, a) => tsplus_module_2.flatMap(tsplus_module_2.sync(() => encodeResponse(req)(a)), r => tsplus_module_2.sync(() => {
         r === undefined
             ? res.status(204).send()
             : res.status(200)
                 .send(JSON.stringify(r));
-    }))))(tracer_1.withCallTrace(fileName_1 + ":190:5")(tsplus_module_2.sync(() => encodeResponse(req)(a))));
+    }));
 }
 export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
     const { Request, Response, adaptResponse, h: handle } = handler;
@@ -67,7 +67,7 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
     const parseRequest = parseRequestParams(requestParsers);
     const respond = respondSuccess(encodeResponse);
     function getParams(req) {
-        return tracer_1.withCallTrace(fileName_1 + ":246:12")(tsplus_module_2.sync(() => ({
+        return tsplus_module_2.sync(() => ({
             path: req.params,
             query: req.query,
             body: req.body,
@@ -85,7 +85,7 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
                     return prev;
                 }, {})
                 : req.cookies
-        })));
+        }));
     }
     function makeContext(req) {
         const start = new Date();
@@ -119,7 +119,49 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
         return requestContext;
     }
     return (req, res) => {
-        return tracer_1.withCallTrace(fileName_1 + ":316:8")(tsplus_module_2.flatMap(({ pars, requestContext }) => tsplus_module_9.setupRequest(tracer_1.withCallTrace(fileName_1 + ":398:12")(tsplus_module_2.provideService(tsplus_module_5.tag, requestContext))(tracer_1.withCallTrace(fileName_1 + ":383:12")(tsplus_module_2.tap(() => tracer_1.withCallTrace(fileName_1 + ":384:20")(tsplus_module_2.suspendSucceed(() => {
+        return tsplus_module_2.flatMap(tsplus_module_2.struct({
+            requestContext: tsplus_module_2.sync(() => {
+                const requestContext = makeContext(req);
+                if (req.method === "GET") {
+                    res.setHeader("Cache-Control", "no-store");
+                }
+                res.setHeader("Content-Language", requestContext.locale);
+                return requestContext;
+            }),
+            pars: getParams(req)
+        }), ({ pars, requestContext }) => tsplus_module_9.setupRequest(tsplus_module_2.provideService(tsplus_module_2.tap(tsplus_module_2.tapErrorCause(tsplus_module_2.zipRight(tsplus_module_7.logAnnotates({
+            method: req.method,
+            path: req.originalUrl,
+            reqPath: tsplus_module_6.RecordPretty(tsplus_module_6.object$(pars.path)),
+            reqQuery: tsplus_module_6.RecordPretty(tsplus_module_6.object$(pars.query)),
+            reqBody: pretty(pars.body),
+            reqCookies: pretty(pars.cookies),
+            reqHeaders: tsplus_module_6.RecordPretty(tsplus_module_6.object$(pars.headers))
+        })(tsplus_module_2.logInfo("Processing request")), tsplus_module_2.suspendSucceed(() => {
+            const handleRequest = tsplus_module_2.flatMap(tsplus_module_2.map(parseRequest(req), ({ body, path, query }) => {
+                const hn = {
+                    ...tsplus_module_8.getOrUndefined(body),
+                    ...tsplus_module_8.getOrUndefined(query),
+                    ...tsplus_module_8.getOrUndefined(path)
+                };
+                return hn;
+            }), parsedReq => tsplus_module_2.flatMap(handle(parsedReq), r => respond(parsedReq, res, r)));
+            // Commands should not be interruptable.
+            const r = req.method !== "GET" ? tsplus_module_2.uninterruptible(handleRequest) : handleRequest; // .instrument("Performance.RequestResponse")
+            // the first log entry should be of the request start.
+            const r2 = makeMiddlewareContext
+                ? tsplus_module_3.provideSomeContextEffect(makeMiddlewareContext(req, res, requestContext))(r)
+                // PR is not relevant here
+                : r;
+            return errorHandler(req, res, requestContext, r2);
+        })), cause => tsplus_module_2.tapErrorCause(tsplus_module_2.zipRight(tsplus_module_2.suspendSucceed(() => {
+            res.status(500).send();
+            return reportRequestError(cause, {
+                requestContext,
+                path: req.originalUrl,
+                method: req.method
+            });
+        }), tsplus_module_2.suspendSucceed(() => {
             const headers = res.getHeaders();
             return tsplus_module_7.logAnnotates({
                 method: req.method,
@@ -129,8 +171,8 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
                     prev[key] = value && typeof value === "string" ? snipString(value) : value;
                     return prev;
                 }, {})))
-            })(tracer_1.withCallTrace(fileName_1 + ":386:29")(tsplus_module_2.logInfo("Processed request")));
-        }))))(tracer_1.withCallTrace(fileName_1 + ":355:12")(tsplus_module_2.tapErrorCause(cause => tracer_1.withCallTrace(fileName_1 + ":381:16")(tsplus_module_2.tapErrorCause(cause => tracer_1.withCallTrace(fileName_1 + ":381:39")(tsplus_module_2.sync(() => console.error("Error occurred while reporting error", cause)))))(tracer_1.withCallTrace(fileName_1 + ":363:16")(tsplus_module_2.zipRight(tracer_1.withCallTrace(fileName_1 + ":364:22")(tsplus_module_2.suspendSucceed(() => {
+            })(tsplus_module_2.logErrorCauseMessage("Processed request", cause));
+        })), cause => tsplus_module_2.sync(() => console.error("Error occurred while reporting error", cause)))), () => tsplus_module_2.suspendSucceed(() => {
             const headers = res.getHeaders();
             return tsplus_module_7.logAnnotates({
                 method: req.method,
@@ -140,51 +182,9 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
                     prev[key] = value && typeof value === "string" ? snipString(value) : value;
                     return prev;
                 }, {})))
-            })(tracer_1.withCallTrace(fileName_1 + ":366:31")(tsplus_module_2.logErrorCauseMessage("Processed request", cause)));
-        }))))(tracer_1.withCallTrace(fileName_1 + ":356:20")(tsplus_module_2.suspendSucceed(() => {
-            res.status(500).send();
-            return reportRequestError(cause, {
-                requestContext,
-                path: req.originalUrl,
-                method: req.method
-            });
-        }))))))(tracer_1.withCallTrace(fileName_1 + ":325:13")(tsplus_module_2.zipRight(tracer_1.withCallTrace(fileName_1 + ":326:18")(tsplus_module_2.suspendSucceed(() => {
-            const handleRequest = tracer_1.withCallTrace(fileName_1 + ":336:16")(tsplus_module_2.flatMap(parsedReq => tracer_1.withCallTrace(fileName_1 + ":338:20")(tsplus_module_2.flatMap(r => respond(parsedReq, res, r)))(handle(parsedReq))))(tracer_1.withCallTrace(fileName_1 + ":328:16")(tsplus_module_2.map(({ body, path, query }) => {
-                const hn = {
-                    ...tsplus_module_8.getOrUndefined(body),
-                    ...tsplus_module_8.getOrUndefined(query),
-                    ...tsplus_module_8.getOrUndefined(path)
-                };
-                return hn;
-            }))(parseRequest(req)));
-            // Commands should not be interruptable.
-            const r = req.method !== "GET" ? tsplus_module_2.uninterruptible(handleRequest) : handleRequest; // .instrument("Performance.RequestResponse")
-            // the first log entry should be of the request start.
-            const r2 = makeMiddlewareContext
-                ? tsplus_module_3.provideSomeContextEffect(makeMiddlewareContext(req, res, requestContext))(r)
-                // PR is not relevant here
-                : r;
-            return errorHandler(req, res, requestContext, r2);
-        }))))(tsplus_module_7.logAnnotates({
-            method: req.method,
-            path: req.originalUrl,
-            reqPath: tsplus_module_6.RecordPretty(tsplus_module_6.object$(pars.path)),
-            reqQuery: tsplus_module_6.RecordPretty(tsplus_module_6.object$(pars.query)),
-            reqBody: pretty(pars.body),
-            reqCookies: pretty(pars.cookies),
-            reqHeaders: tsplus_module_6.RecordPretty(tsplus_module_6.object$(pars.headers))
-        })(tracer_1.withCallTrace(fileName_1 + ":317:16")(tsplus_module_2.logInfo("Processing request"))))))) // otherwise external error reporter breaks.
-        , requestContext)))(tracer_1.withCallTrace(fileName_1 + ":305:19")(tsplus_module_2.struct({
-            requestContext: tracer_1.withCallTrace(fileName_1 + ":306:23")(tsplus_module_2.sync(() => {
-                const requestContext = makeContext(req);
-                if (req.method === "GET") {
-                    res.setHeader("Cache-Control", "no-store");
-                }
-                res.setHeader("Content-Language", requestContext.locale);
-                return requestContext;
-            })),
-            pars: getParams(req)
-        })));
+            })(tsplus_module_2.logInfo("Processed request"));
+        })), tsplus_module_5.tag, requestContext) // otherwise external error reporter breaks.
+        , requestContext));
     };
 }
 /**
@@ -246,4 +246,4 @@ export function matchResource(mod) {
         return handler;
     };
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}

package/dist/api/setupRequest.js

@@ -1,5 +1,3 @@
-import * as tracer_1 from "@effect/io/Debug";
-const fileName_1 = "packages/infra/_src/api/setupRequest.ts";
 import * as tsplus_module_1 from "@effect/io/Effect";
 import * as tsplus_module_2 from "@effect-app/prelude/_ext/Prelude.ext";
 import * as tsplus_module_3 from "@effect-app/core/Function";
@@ -10,7 +8,7 @@ import "../RequestContext.js";
  * @tsplus fluent effect/io/Effect setupRequest
  */
 function setupRequest_1(self, requestContext) {
-    return tsplus_module_3.pipe(tracer_1.withCallTrace(fileName_1 + ":8:10")(tsplus_module_1.logSpan("request"))(self), tsplus_module_2.logAnnotates({
+    return tsplus_module_3.pipe(tsplus_module_1.logSpan(self, "request"), tsplus_module_2.logAnnotates({
         requestRootId: requestContext.rootId,
         requestId: requestContext.id,
         requestName: requestContext.name
@@ -20,6 +18,6 @@ function setupRequest_1(self, requestContext) {
  * @tsplus getter effect/io/Effect setupRequestFrom
  */
 export function setupRequestFrom(self) {
-    return tracer_1.withCallTrace(fileName_1 + ":21:29")(tsplus_module_1.serviceWithEffect(tsplus_module_4.tag, requestContext => setupRequest_1(self, requestContext)));
+    return tsplus_module_1.serviceWithEffect(tsplus_module_4.tag, requestContext => setupRequest_1(self, requestContext));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvc2V0dXBSZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OzthQUtnQixZQUFZO0FBTDVCLE9BQStCLHNCQUFzQixDQUFBO0FBRXJEOztHQUVHO0FBQ0gsd0JBQXNDLElBQXFCLEVBQUUsY0FBOEI7SUFDekYsT0FBTyxnQkFBQSxJQUFJLENBQ1QscUVBQWEsU0FBUyxHQUF0QixJQUFJLENBQW1CLEVBQ3ZCLDZCQUFvQjtRQUNsQixhQUFhLEVBQUUsY0FBYyxDQUFDLE1BQU07UUFDcEMsU0FBUyxFQUFFLGNBQWMsQ0FBQyxFQUFFO1FBQzVCLFdBQVcsRUFBRSxjQUFjLENBQUMsSUFBSTtLQUNqQyxDQUFDLENBQ0gsQ0FBQTtBQUNILENBQUM7QUFFRDs7R0FFRztBQUNILE1BQU0sVUFBVSxnQkFBZ0IsQ0FBVSxJQUFxQjtJQUM3RCxxREFBTyx1REFBb0MsY0FBYyxDQUFDLEVBQUUsQ0FBQyxlQUFBLElBQUksRUFBYyxjQUFjLENBQUMsQ0FBQyxFQUFBO0FBQ2pHLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvc2V0dXBSZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7YUFLZ0IsWUFBWTtBQUw1QixPQUErQixzQkFBc0IsQ0FBQTtBQUVyRDs7R0FFRztBQUNILHdCQUFzQyxJQUFxQixFQUFFLGNBQThCO0lBQ3pGLE9BQU8sZ0JBQUEsSUFBSSxDQUNULHdCQUFBLElBQUksRUFBUyxTQUFTLENBQUMsRUFDdkIsNkJBQW9CO1FBQ2xCLGFBQWEsRUFBRSxjQUFjLENBQUMsTUFBTTtRQUNwQyxTQUFTLEVBQUUsY0FBYyxDQUFDLEVBQUU7UUFDNUIsV0FBVyxFQUFFLGNBQWMsQ0FBQyxJQUFJO0tBQ2pDLENBQUMsQ0FDSCxDQUFBO0FBQ0gsQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLGdCQUFnQixDQUFVLElBQXFCO0lBQzdELE9BQU8sdURBQW9DLGNBQWMsQ0FBQyxFQUFFLENBQUMsZUFBQSxJQUFJLEVBQWMsY0FBYyxDQUFDLENBQUMsQ0FBQTtBQUNqRyxDQUFDIn0=

package/dist/api/writeDocs.js

@@ -1,5 +1,3 @@
-import * as tracer_1 from "@effect/io/Debug";
-const fileName_1 = "packages/infra/_src/api/writeDocs.ts";
 import * as tsplus_module_1 from "@effect/io/Effect";
 import * as tsplus_module_2 from "@effect-app/core/Order";
 import * as tsplus_module_3 from "@effect-app/core/_ext/ord.ext";
@@ -9,15 +7,15 @@ import { writeTextFile } from "@effect-app/infra-adapters/fileUtil";
 import * as Plutus from "@effect-app/infra-adapters/Openapi/atlas-plutus";
 import { makeOpenApiSpecs } from "./express/makeOpenApiSpecs.js";
 export function writeOpenapiDocs(rdescs) {
-    return tracer_1.withCallTrace(fileName_1 + ":24:6")(tsplus_module_1.flatMap(() => tracer_1.withCallTrace(fileName_1 + ":24:27")(tsplus_module_1.logInfo("OpenAPI spec written to './openapi.json'"))))(tracer_1.withCallTrace(fileName_1 + ":23:6")(tsplus_module_1.flatMap(_ => tsplus_module_1.orDie(writeTextFile("./openapi.json", JSON.stringify(_, undefined, 2)))))(tracer_1.withCallTrace(fileName_1 + ":17:6")(tsplus_module_1.map(_ => ({
+    return tsplus_module_1.flatMap(tsplus_module_1.flatMap(tsplus_module_1.map(makeOpenApiSpecs(tsplus_module_4.sortWith(tsplus_module_3.OrdContramap((a) => a.path)(tsplus_module_2.string))(typedValuesOf(rdescs).reduce((prev, cur) => prev.concat(typedValuesOf(cur)), [])), Plutus.info({
+        title: "api",
+        version: "X",
+        pageTitle: "api"
+    })), _ => ({
         ..._,
         tags: [
         // add the tags here
         ]
-    })))(makeOpenApiSpecs(tsplus_module_4.sortWith(tsplus_module_3.OrdContramap((a) => a.path)(tsplus_module_2.string))(typedValuesOf(rdescs).reduce((prev, cur) => prev.concat(typedValuesOf(cur)), [])), Plutus.info({
-        title: "api",
-        version: "X",
-        pageTitle: "api"
-    })))));
+    })), _ => tsplus_module_1.orDie(writeTextFile("./openapi.json", JSON.stringify(_, undefined, 2)))), () => tsplus_module_1.logInfo("OpenAPI spec written to './openapi.json'"));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid3JpdGVEb2NzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvd3JpdGVEb2NzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQTtBQUN0RCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0scUNBQXFDLENBQUE7QUFDbkUsT0FBTyxLQUFLLE1BQU0sTUFBTSxpREFBaUQsQ0FBQTtBQUN6RSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQTtBQUdoRSxNQUFNLFVBQVUsZ0JBQWdCLENBQUMsTUFBMEQ7SUFDekYsT0FBTyxxRUFnQkksR0FBRyxFQUFFLCtDQUFDLHdCQUFlLDBDQUEwQyxDQUFDLENBQUEsR0FoQnBFLHFFQWVJLENBQUMsQ0FBQyxFQUFFLHVCQUFDLGFBQWEsQ0FBQyxnQkFBZ0IsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBTSxHQWYvRSxpRUFTQSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDVCxHQUFHLENBQUM7UUFDSixJQUFJLEVBQUU7UUFDSixvQkFBb0I7U0FDckI7S0FDRixDQUFDLEdBZEcsZ0JBQWdCLENBQ3JCLHlCQUNZLDZCQUF1QixDQUFDLENBQXFCLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLHlCQUFDLEVBRHJFLGFBQWEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLEVBQW1DLENBQUMsQ0FDM0MsRUFDdEUsTUFBTSxDQUFDLElBQUksQ0FBQztRQUNWLEtBQUssRUFBRSxLQUFLO1FBQ1osT0FBTyxFQUFFLEdBQUc7UUFDWixTQUFTLEVBQUUsS0FBSztLQUNqQixDQUFDLENBQ0gsQ0FNSSxDQUNrRixDQUNYLENBQUE7QUFDOUUsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid3JpdGVEb2NzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvd3JpdGVEb2NzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7QUFBQSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sd0JBQXdCLENBQUE7QUFDdEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFDQUFxQyxDQUFBO0FBQ25FLE9BQU8sS0FBSyxNQUFNLE1BQU0saURBQWlELENBQUE7QUFDekUsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sK0JBQStCLENBQUE7QUFHaEUsTUFBTSxVQUFVLGdCQUFnQixDQUFDLE1BQTBEO0lBQ3pGLE9BQU8sd0JBQUEsd0JBQUEsb0JBQUEsZ0JBQWdCLENBQ3JCLHlCQUNZLDZCQUF1QixDQUFDLENBQXFCLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLHlCQUFDLEVBRHJFLGFBQWEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLEVBQW1DLENBQUMsQ0FDM0MsRUFDdEUsTUFBTSxDQUFDLElBQUksQ0FBQztRQUNWLEtBQUssRUFBRSxLQUFLO1FBQ1osT0FBTyxFQUFFLEdBQUc7UUFDWixTQUFTLEVBQUUsS0FBSztLQUNqQixDQUFDLENBQ0gsRUFDTSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDVCxHQUFHLENBQUM7UUFDSixJQUFJLEVBQUU7UUFDSixvQkFBb0I7U0FDckI7S0FDRixDQUFDLENBQUMsRUFDTSxDQUFDLENBQUMsRUFBRSx1QkFBQyxhQUFhLENBQUMsZ0JBQWdCLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQU0sQ0FBQyxFQUM1RSxHQUFHLEVBQUUsQ0FBQyx3QkFBZSwwQ0FBMEMsQ0FBQyxDQUFDLENBQUE7QUFDOUUsQ0FBQyJ9

package/dist/errorReporter.js

@@ -1,20 +1,18 @@
-import * as tracer_1 from "@effect/io/Debug";
-const fileName_1 = "packages/infra/_src/errorReporter.ts";
 import * as tsplus_module_1 from "@effect/io/Cause";
 import * as tsplus_module_2 from "@effect-app/prelude/utils";
 import * as tsplus_module_3 from "@effect/io/Effect";
 import * as Sentry from "@sentry/node";
 export function reportError(makeError) {
-    return (cause, context) => tracer_1.withCallTrace(fileName_1 + ":8:12")(tsplus_module_3.gen(function* ($) {
+    return (cause, context) => tsplus_module_3.gen(function* ($) {
         if (tsplus_module_1.isInterrupted(cause)) {
-            yield* $(tracer_1.withCallTrace(fileName_1 + ":10:25")(tsplus_module_3.logDebug("Interrupted: " + (context ? tsplus_module_2.RecordPretty(tsplus_module_2.object$(context)) : ""))));
+            yield* $(tsplus_module_3.logDebug("Interrupted: " + (context ? tsplus_module_2.RecordPretty(tsplus_module_2.object$(context)) : "")));
             return;
         }
         const error = makeError(cause);
         const extras = { context, error: error.toJSON() };
         reportSentry(error, extras);
-        yield* $(tracer_1.withCallTrace(fileName_1 + ":17:29")(tsplus_module_3.logAnnotate("extras", JSON.stringify({ context, error: { _tag: error._tag, message: error.message } })))(tsplus_module_3.logErrorCause(cause)));
-    }));
+        yield* $(tsplus_module_3.logAnnotate(tsplus_module_3.logErrorCause(cause), "extras", JSON.stringify({ context, error: { _tag: error._tag, message: error.message } })));
+    });
 }
 function reportSentry(error, extras) {
     const scope = new Sentry.Scope();
@@ -22,14 +20,14 @@ function reportSentry(error, extras) {
     Sentry.captureException(error, scope);
 }
 export function logError(makeError) {
-    return (cause, context) => tracer_1.withCallTrace(fileName_1 + ":35:12")(tsplus_module_3.gen(function* ($) {
+    return (cause, context) => tsplus_module_3.gen(function* ($) {
         if (tsplus_module_1.isInterrupted(cause)) {
-            yield* $(tracer_1.withCallTrace(fileName_1 + ":37:25")(tsplus_module_3.logDebug("Interrupted: " + (context ? tsplus_module_2.RecordPretty(tsplus_module_2.object$(context)) : ""))));
+            yield* $(tsplus_module_3.logDebug("Interrupted: " + (context ? tsplus_module_2.RecordPretty(tsplus_module_2.object$(context)) : "")));
             return;
         }
         const error = makeError(cause);
-        yield* $(tracer_1.withCallTrace(fileName_1 + ":42:31")(tsplus_module_3.logAnnotate("extras", JSON.stringify({ context, error: { _tag: error._tag, message: error.message } })))(tsplus_module_3.logWarningCause(cause)));
-    }));
+        yield* $(tsplus_module_3.logAnnotate(tsplus_module_3.logWarningCause(cause), "extras", JSON.stringify({ context, error: { _tag: error._tag, message: error.message } })));
+    });
 }
 export function captureException(error) {
     Sentry.captureException(error);
@@ -40,6 +38,6 @@ export function reportMessage(message) {
     console.warn(message);
 }
 export function reportMessageM(message) {
-    return tracer_1.withCallTrace(fileName_1 + ":62:10")(tsplus_module_3.sync(() => reportMessage(message)));
+    return tsplus_module_3.sync(() => reportMessage(message));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JSZXBvcnRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvZXJyb3JSZXBvcnRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLE9BQU8sS0FBSyxNQUFNLE1BQU0sY0FBYyxDQUFBO0FBR3RDLE1BQU0sVUFBVSxXQUFXLENBQ3pCLFNBQWtDO0lBRWxDLE9BQU8sQ0FBQyxLQUFlLEVBQUUsT0FBaUMsRUFBRSxFQUFFLDhDQUM1RCxvQkFBVyxRQUFRLENBQUMsRUFBQyxDQUFDO1FBQ3BCLElBQUksOEJBQUEsS0FBSyxDQUFnQixFQUFFO1lBQ3pCLEtBQUssQ0FBQyxDQUFDLENBQUMsK0NBQUMseUJBQWdCLGVBQWUsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDLHNEQUFDLE9BQU8sR0FBVyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBQyxDQUFBO1lBQy9FLE9BQU07U0FDUDtRQUNELE1BQU0sS0FBSyxHQUFHLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUM5QixNQUFNLE1BQU0sR0FBRyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsS0FBSyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUE7UUFDakQsWUFBWSxDQUFDLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQTtRQUMzQixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQ04sMEVBQ0UsUUFBUSxFQUNSLElBQUksQ0FBQyxTQUFTLENBQUMsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLEVBQUUsSUFBSSxFQUFFLEtBQUssQ0FBQyxJQUFJLEVBQUUsT0FBTyxFQUFFLEtBQUssQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLGlDQUZsRixLQUFLLEVBR0osQ0FDRixDQUFBO0lBQ0gsQ0FBQyxDQUFDLENBQUEsQ0FBQTtBQUNOLENBQUM7QUFFRCxTQUFTLFlBQVksQ0FBQyxLQUFjLEVBQUUsTUFBK0I7SUFDbkUsTUFBTSxLQUFLLEdBQUcsSUFBSSxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUE7SUFDaEMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQTtJQUN2QixNQUFNLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLEtBQUssQ0FBQyxDQUFBO0FBQ3ZDLENBQUM7QUFFRCxNQUFNLFVBQVUsUUFBUSxDQUN0QixTQUFrQztJQUVsQyxPQUFPLENBQUMsS0FBZSxFQUFFLE9BQWlDLEVBQUUsRUFBRSwrQ0FDNUQsb0JBQVcsUUFBUSxDQUFDLEVBQUMsQ0FBQztRQUNwQixJQUFJLDhCQUFBLEtBQUssQ0FBZ0IsRUFBRTtZQUN6QixLQUFLLENBQUMsQ0FBQyxDQUFDLCtDQUFDLHlCQUFnQixlQUFlLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQyxzREFBQyxPQUFPLEdBQVcsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUMsQ0FBQTtZQUMvRSxPQUFNO1NBQ1A7UUFDRCxNQUFNLEtBQUssR0FBRyxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDOUIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUNOLDBFQUNFLFFBQVEsRUFDUixJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxFQUFFLElBQUksRUFBRSxLQUFLLENBQUMsSUFBSSxFQUFFLE9BQU8sRUFBRSxLQUFLLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxtQ0FGbEYsS0FBSyxFQUdKLENBQ0YsQ0FBQTtJQUNILENBQUMsQ0FBQyxDQUFBLENBQUE7QUFDTixDQUFDO0FBRUQsTUFBTSxVQUFVLGdCQUFnQixDQUFDLEtBQWM7SUFDN0MsTUFBTSxDQUFDLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQzlCLE9BQU8sQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUE7QUFDdEIsQ0FBQztBQUVELE1BQU0sVUFBVSxhQUFhLENBQUMsT0FBZTtJQUMzQyxNQUFNLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBRTlCLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUE7QUFDdkIsQ0FBQztBQUVELE1BQU0sVUFBVSxjQUFjLENBQUMsT0FBZTtJQUM1QyxxREFBTywyQkFBTyxhQUFhLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBQTtBQUN2QyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JSZXBvcnRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvZXJyb3JSZXBvcnRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxPQUFPLEtBQUssTUFBTSxNQUFNLGNBQWMsQ0FBQTtBQUd0QyxNQUFNLFVBQVUsV0FBVyxDQUN6QixTQUFrQztJQUVsQyxPQUFPLENBQUMsS0FBZSxFQUFFLE9BQWlDLEVBQUUsRUFBRSxDQUM1RCxvQkFBVyxRQUFRLENBQUMsRUFBQyxDQUFDO1FBQ3BCLElBQUksOEJBQUEsS0FBSyxDQUFnQixFQUFFO1lBQ3pCLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyx5QkFBZ0IsZUFBZSxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUMsc0RBQUMsT0FBTyxHQUFXLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUE7WUFDL0UsT0FBTTtTQUNQO1FBQ0QsTUFBTSxLQUFLLEdBQUcsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQzlCLE1BQU0sTUFBTSxHQUFHLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQTtRQUNqRCxZQUFZLENBQUMsS0FBSyxFQUFFLE1BQU0sQ0FBQyxDQUFBO1FBQzNCLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FDTiwwREFBQSxLQUFLLEdBQ0gsUUFBUSxFQUNSLElBQUksQ0FBQyxTQUFTLENBQUMsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLEVBQUUsSUFBSSxFQUFFLEtBQUssQ0FBQyxJQUFJLEVBQUUsT0FBTyxFQUFFLEtBQUssQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQ2pGLENBQ0YsQ0FBQTtJQUNILENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQztBQUVELFNBQVMsWUFBWSxDQUFDLEtBQWMsRUFBRSxNQUErQjtJQUNuRSxNQUFNLEtBQUssR0FBRyxJQUFJLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUNoQyxLQUFLLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQ3ZCLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLENBQUE7QUFDdkMsQ0FBQztBQUVELE1BQU0sVUFBVSxRQUFRLENBQ3RCLFNBQWtDO0lBRWxDLE9BQU8sQ0FBQyxLQUFlLEVBQUUsT0FBaUMsRUFBRSxFQUFFLENBQzVELG9CQUFXLFFBQVEsQ0FBQyxFQUFDLENBQUM7UUFDcEIsSUFBSSw4QkFBQSxLQUFLLENBQWdCLEVBQUU7WUFDekIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLHlCQUFnQixlQUFlLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQyxzREFBQyxPQUFPLEdBQVcsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQTtZQUMvRSxPQUFNO1NBQ1A7UUFDRCxNQUFNLEtBQUssR0FBRyxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDOUIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUNOLDREQUFBLEtBQUssR0FDSCxRQUFRLEVBQ1IsSUFBSSxDQUFDLFNBQVMsQ0FBQyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsRUFBRSxJQUFJLEVBQUUsS0FBSyxDQUFDLElBQUksRUFBRSxPQUFPLEVBQUUsS0FBSyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsQ0FDakYsQ0FDRixDQUFBO0lBQ0gsQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDO0FBRUQsTUFBTSxVQUFVLGdCQUFnQixDQUFDLEtBQWM7SUFDN0MsTUFBTSxDQUFDLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQzlCLE9BQU8sQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUE7QUFDdEIsQ0FBQztBQUVELE1BQU0sVUFBVSxhQUFhLENBQUMsT0FBZTtJQUMzQyxNQUFNLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBRTlCLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUE7QUFDdkIsQ0FBQztBQUVELE1BQU0sVUFBVSxjQUFjLENBQUMsT0FBZTtJQUM1QyxPQUFPLDJCQUFPLGFBQWEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFBO0FBQ3ZDLENBQUMifQ==

package/dist/errors.js

@@ -41,7 +41,7 @@ export class CauseException extends Error {
         super(`An unexpected ${_tag} Exception occurred, see \`pretty\` for details.`);
         this.exitCause = exitCause;
         this._tag = _tag;
-        this.pretty = tsplus_module_1.pretty()(exitCause);
+        this.pretty = tsplus_module_1.pretty(exitCause);
     }
     toJSON() {
         return {
@@ -62,4 +62,4 @@ export class OptimisticConcurrencyException {
         this.message = `Existing ${type} ${id} record changed`;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vX3NyYy9lcnJvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQU0sT0FBTyxhQUFhO0lBR3hCLFlBQVksSUFBTyxFQUFFLEVBQVU7UUFGZixTQUFJLEdBQUcsZUFBZSxDQUFBO1FBR3BDLElBQUksQ0FBQyxPQUFPLEdBQUcsZUFBZSxJQUFJLElBQUksRUFBRSxFQUFFLENBQUE7SUFDNUMsQ0FBQztDQUNGO0FBRUQsTUFBTSxPQUFPLGVBQWU7SUFFMUIsWUFBNEIsTUFBOEI7UUFBOUIsV0FBTSxHQUFOLE1BQU0sQ0FBd0I7UUFEMUMsU0FBSSxHQUFHLGlCQUFpQixDQUFBO0lBQ3FCLENBQUM7Q0FDL0Q7QUFFRCxNQUFNLE9BQU8sZ0JBQWdCO0lBQTdCO1FBQ2tCLFNBQUksR0FBRyxrQkFBa0IsQ0FBQTtJQUMzQyxDQUFDO0NBQUE7QUFFRCxNQUFNLE9BQU8saUJBQWlCO0lBQTlCO1FBQ2tCLFNBQUksR0FBRyxtQkFBbUIsQ0FBQTtJQUM1QyxDQUFDO0NBQUE7QUFFRDs7R0FFRztBQUNILE1BQU0sT0FBTyxVQUFXLFNBQVEsZ0JBQWdCO0lBQzlDLFlBQXFCLE9BQWU7UUFDbEMsS0FBSyxFQUFFLENBQUE7UUFEWSxZQUFPLEdBQVAsT0FBTyxDQUFRO0lBRXBDLENBQUM7Q0FDRjtBQUVELE1BQU0sT0FBTyxpQkFBaUI7SUFFNUIsWUFBNEIsT0FBZTtRQUFmLFlBQU8sR0FBUCxPQUFPLENBQVE7UUFEM0IsU0FBSSxHQUFHLG1CQUFtQixDQUFBO0lBQ0ksQ0FBQztDQUNoRDtBQUVELE1BQU0sT0FBTyxjQUFrQixTQUFRLEtBQUs7SUFFMUMsWUFBcUIsU0FBbUIsRUFBVyxJQUFZO1FBQzdELEtBQUssQ0FBQyxpQkFBaUIsSUFBSSxrREFBa0QsQ0FBQyxDQUFBO1FBRDNELGNBQVMsR0FBVCxTQUFTLENBQVU7UUFBVyxTQUFJLEdBQUosSUFBSSxDQUFRO1FBRTdELElBQUksQ0FBQyxNQUFNLEdBQUcseUJBQUEsU0FBUyxDQUFTLENBQUE7SUFDbEMsQ0FBQztJQUVELE1BQU07UUFDSixPQUFPO1lBQ0wsSUFBSSxFQUFFLElBQUksQ0FBQyxJQUFJO1lBQ2YsT0FBTyxFQUFFLElBQUksQ0FBQyxPQUFPO1lBQ3JCLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTTtZQUNuQiwyREFBMkQ7U0FDNUQsQ0FBQTtJQUNILENBQUM7Q0FDRjtBQUVELE1BQU0sT0FBTyw4QkFBOEI7SUFHekMsWUFBcUIsSUFBWSxFQUFXLEVBQVUsRUFBVyxPQUFnQixFQUFXLEtBQWM7UUFBckYsU0FBSSxHQUFKLElBQUksQ0FBUTtRQUFXLE9BQUUsR0FBRixFQUFFLENBQVE7UUFBVyxZQUFPLEdBQVAsT0FBTyxDQUFTO1FBQVcsVUFBSyxHQUFMLEtBQUssQ0FBUztRQUZqRyxTQUFJLEdBQUcsZ0NBQWdDLENBQUE7UUFHOUMsSUFBSSxDQUFDLE9BQU8sR0FBRyxZQUFZLElBQUksSUFBSSxFQUFFLGlCQUFpQixDQUFBO0lBQ3hELENBQUM7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vX3NyYy9lcnJvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQU0sT0FBTyxhQUFhO0lBR3hCLFlBQVksSUFBTyxFQUFFLEVBQVU7UUFGZixTQUFJLEdBQUcsZUFBZSxDQUFBO1FBR3BDLElBQUksQ0FBQyxPQUFPLEdBQUcsZUFBZSxJQUFJLElBQUksRUFBRSxFQUFFLENBQUE7SUFDNUMsQ0FBQztDQUNGO0FBRUQsTUFBTSxPQUFPLGVBQWU7SUFFMUIsWUFBNEIsTUFBOEI7UUFBOUIsV0FBTSxHQUFOLE1BQU0sQ0FBd0I7UUFEMUMsU0FBSSxHQUFHLGlCQUFpQixDQUFBO0lBQ3FCLENBQUM7Q0FDL0Q7QUFFRCxNQUFNLE9BQU8sZ0JBQWdCO0lBQTdCO1FBQ2tCLFNBQUksR0FBRyxrQkFBa0IsQ0FBQTtJQUMzQyxDQUFDO0NBQUE7QUFFRCxNQUFNLE9BQU8saUJBQWlCO0lBQTlCO1FBQ2tCLFNBQUksR0FBRyxtQkFBbUIsQ0FBQTtJQUM1QyxDQUFDO0NBQUE7QUFFRDs7R0FFRztBQUNILE1BQU0sT0FBTyxVQUFXLFNBQVEsZ0JBQWdCO0lBQzlDLFlBQXFCLE9BQWU7UUFDbEMsS0FBSyxFQUFFLENBQUE7UUFEWSxZQUFPLEdBQVAsT0FBTyxDQUFRO0lBRXBDLENBQUM7Q0FDRjtBQUVELE1BQU0sT0FBTyxpQkFBaUI7SUFFNUIsWUFBNEIsT0FBZTtRQUFmLFlBQU8sR0FBUCxPQUFPLENBQVE7UUFEM0IsU0FBSSxHQUFHLG1CQUFtQixDQUFBO0lBQ0ksQ0FBQztDQUNoRDtBQUVELE1BQU0sT0FBTyxjQUFrQixTQUFRLEtBQUs7SUFFMUMsWUFBcUIsU0FBbUIsRUFBVyxJQUFZO1FBQzdELEtBQUssQ0FBQyxpQkFBaUIsSUFBSSxrREFBa0QsQ0FBQyxDQUFBO1FBRDNELGNBQVMsR0FBVCxTQUFTLENBQVU7UUFBVyxTQUFJLEdBQUosSUFBSSxDQUFRO1FBRTdELElBQUksQ0FBQyxNQUFNLDBCQUFHLFNBQVMsQ0FBTyxDQUFBO0lBQ2hDLENBQUM7SUFFRCxNQUFNO1FBQ0osT0FBTztZQUNMLElBQUksRUFBRSxJQUFJLENBQUMsSUFBSTtZQUNmLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTztZQUNyQixNQUFNLEVBQUUsSUFBSSxDQUFDLE1BQU07WUFDbkIsMkRBQTJEO1NBQzVELENBQUE7SUFDSCxDQUFDO0NBQ0Y7QUFFRCxNQUFNLE9BQU8sOEJBQThCO0lBR3pDLFlBQXFCLElBQVksRUFBVyxFQUFVLEVBQVcsT0FBZ0IsRUFBVyxLQUFjO1FBQXJGLFNBQUksR0FBSixJQUFJLENBQVE7UUFBVyxPQUFFLEdBQUYsRUFBRSxDQUFRO1FBQVcsWUFBTyxHQUFQLE9BQU8sQ0FBUztRQUFXLFVBQUssR0FBTCxLQUFLLENBQVM7UUFGakcsU0FBSSxHQUFHLGdDQUFnQyxDQUFBO1FBRzlDLElBQUksQ0FBQyxPQUFPLEdBQUcsWUFBWSxJQUFJLElBQUksRUFBRSxpQkFBaUIsQ0FBQTtJQUN4RCxDQUFDO0NBQ0YifQ==

package/dist/instrument.js

@@ -1,12 +1,10 @@
-import * as tracer_1 from "@effect/io/Debug";
-const fileName_1 = "packages/infra/_src/instrument.ts";
 import * as tsplus_module_1 from "@effect-app/prelude/utils";
 import * as tsplus_module_2 from "@effect/io/Effect";
 /**
  * @tsplus fluent effect/io/Effect instrument
  */
 export function instr(self, name, properties) {
-    return tracer_1.withCallTrace(fileName_1 + ":7:6")(tsplus_module_2.logSpan(name))(tracer_1.withCallTrace(fileName_1 + ":6:6")(tsplus_module_2.tap(() => tracer_1.withCallTrace(fileName_1 + ":6:48")(tsplus_module_2.logAnnotate("properties", tsplus_module_1.RecordPretty(tsplus_module_1.object$((properties || {})))))(tracer_1.withCallTrace(fileName_1 + ":6:23")(tsplus_module_2.logDebug(`instrumented`)))))(self));
+    return tsplus_module_2.logSpan(tsplus_module_2.tap(self, () => tsplus_module_2.logAnnotate(tsplus_module_2.logDebug(`instrumented`), "properties", tsplus_module_1.RecordPretty(tsplus_module_1.object$((properties || {}))))), name);
     // trackMetric(name, time, properties))
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1bWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvaW5zdHJ1bWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUE7O0dBRUc7QUFDSCxNQUFNLFVBQVUsS0FBSyxDQUFVLElBQXFCLEVBQUUsSUFBWSxFQUFFLFVBQW1DO0lBQ3JHLE9BQU8sb0VBRUksSUFBSSxHQUZSLGdFQUNBLEdBQUcsRUFBRSxDQUFDLHlFQUE0QyxZQUFZLHVEQUFFLENBQUMsVUFBVSxJQUFJLEVBQUUsQ0FBQyxrREFBNUUseUJBQWdCLGNBQWMsQ0FBQyxFQUF3RCxHQUQ3RixJQUFJLENBQzBGLENBQ3JGLENBQUE7SUFDaEIsdUNBQXVDO0FBQ3pDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1bWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvaW5zdHJ1bWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBOztHQUVHO0FBQ0gsTUFBTSxVQUFVLEtBQUssQ0FBVSxJQUFxQixFQUFFLElBQVksRUFBRSxVQUFtQztJQUNyRyxPQUFPLHdCQUFBLG9CQUFBLElBQUksRUFDSixHQUFHLEVBQUUsQ0FBQyw0QkFBQSx5QkFBZ0IsY0FBYyxDQUFDLEVBQWEsWUFBWSx1REFBRSxDQUFDLFVBQVUsSUFBSSxFQUFFLENBQUMsR0FBVyxDQUFDLEVBQzFGLElBQUksQ0FBQyxDQUFBO0lBQ2hCLHVDQUF1QztBQUN6QyxDQUFDIn0=