@effect-app/infra 0.12.6 → 0.14.0

package/dist/RequestContext.d.ts

@@ -4,13 +4,13 @@ export declare const RequestId: import("@effect-app/prelude/schema").StringIdSch
 };
 export type RequestId = ParsedShapeOfCustom<typeof RequestId>;
 declare const RequestContextParent_base: import("@effect-app/schema").MNModel<import("@effect-app/schema").SchemaProperties<{
-    _tag: import("@effect-app/schema").Property<import("@effect-app/schema").DefaultSchema<unknown, "RequestContext", "RequestContext", "RequestContext", import("@effect-app/schema").LiteralApi<["RequestContext"]>>, "required", import("@fp-ts/data/Option").None, import("@fp-ts/data/Option").None>;
+    _tag: import("@effect-app/schema").Property<import("@effect-app/schema").DefaultSchema<unknown, "RequestContext", "RequestContext", "RequestContext", import("@effect-app/schema").LiteralApi<["RequestContext"]>>, "required", import("@fp-ts/core/Option").None, import("@fp-ts/core/Option").None>;
     id: import("@effect-app/schema").Property<import("@effect-app/prelude/schema").StringIdSchema & import("@effect-app/schema").Utils<import("@effect-app/prelude/schema").StringIdSchema> & {
         make(this: void): import("@effect-app/prelude/schema").StringId;
-    }, "required", import("@fp-ts/data/Option").None, import("@fp-ts/data/Option").None>;
-    name: import("@effect-app/schema").Property<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>> & import("@effect-app/schema").Utils<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>>>, "required", import("@fp-ts/data/Option").None, import("@fp-ts/data/Option").None>;
-    locale: import("@effect-app/schema").Property<import("@effect-app/schema").DefaultSchema<unknown, "en" | "de", "en" | "de", "en" | "de", import("@effect-app/schema").LiteralApi<["en", "de"]>>, "required", import("@fp-ts/data/Option").None, import("@fp-ts/data/Option").None>;
-    createdAt: import("@effect-app/schema").FromProperty<import("@effect-app/schema").SchemaDefaultSchema<unknown, Date, Date, string, {}>, "required", import("@fp-ts/data/Option").None, import("@fp-ts/data/Option").Some<["constructor", () => Date]>>;
+    }, "required", import("@fp-ts/core/Option").None, import("@fp-ts/core/Option").None>;
+    name: import("@effect-app/schema").Property<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>> & import("@effect-app/schema").Utils<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>>>, "required", import("@fp-ts/core/Option").None, import("@fp-ts/core/Option").None>;
+    locale: import("@effect-app/schema").Property<import("@effect-app/schema").DefaultSchema<unknown, "en" | "de", "en" | "de", "en" | "de", import("@effect-app/schema").LiteralApi<["en", "de"]>>, "required", import("@fp-ts/core/Option").None, import("@fp-ts/core/Option").None>;
+    createdAt: import("@effect-app/schema").FromProperty<import("@effect-app/schema").SchemaDefaultSchema<unknown, Date, Date, string, {}>, "required", import("@fp-ts/core/Option").None, import("@fp-ts/core/Option").Some<["constructor", () => Date]>>;
 }>, RequestContextParent, RequestContextParent.ConstructorInput, RequestContextParent.Encoded, RequestContextParent.Props> & import("@effect-app/schema").PropsExtensions<RequestContextParent.Props>;
 export declare class RequestContextParent extends RequestContextParent_base {
 }
@@ -18,15 +18,15 @@ export declare class RequestContextParent extends RequestContextParent_base {
 export type RequestContextParentConstructor = typeof RequestContextParent;
 export declare function makeRequestId(): import("@effect-app/prelude/schema").StringId;
 declare const RequestContext_base: import("@effect-app/schema").MNModel<import("@effect-app/schema").SchemaProperties<{
-    id: import("@effect-app/schema").Property<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/prelude/schema").StringId, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/prelude/schema").StringId>>, "required", import("@fp-ts/data/Option").None, import("@fp-ts/data/Option").Some<["constructor", () => import("@effect-app/prelude/schema").StringId]>>;
+    id: import("@effect-app/schema").Property<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/prelude/schema").StringId, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/prelude/schema").StringId>>, "required", import("@fp-ts/core/Option").None, import("@fp-ts/core/Option").Some<["constructor", () => import("@effect-app/prelude/schema").StringId]>>;
     rootId: import("@effect-app/schema").Property<import("@effect-app/prelude/schema").StringIdSchema & import("@effect-app/schema").Utils<import("@effect-app/prelude/schema").StringIdSchema> & {
         make(this: void): import("@effect-app/prelude/schema").StringId;
-    }, "required", import("@fp-ts/data/Option").None, import("@fp-ts/data/Option").None>;
-    parent: import("@effect-app/schema").Property<typeof RequestContextParent, "optional", import("@fp-ts/data/Option").None, import("@fp-ts/data/Option").None>;
-    _tag: import("@effect-app/schema").Property<import("@effect-app/schema").DefaultSchema<unknown, "RequestContext", "RequestContext", "RequestContext", import("@effect-app/schema").LiteralApi<["RequestContext"]>>, "required", import("@fp-ts/data/Option").None, import("@fp-ts/data/Option").None>;
-    name: import("@effect-app/schema").Property<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>> & import("@effect-app/schema").Utils<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>>>, "required", import("@fp-ts/data/Option").None, import("@fp-ts/data/Option").None>;
-    locale: import("@effect-app/schema").Property<import("@effect-app/schema").DefaultSchema<unknown, "en" | "de", "en" | "de", "en" | "de", import("@effect-app/schema").LiteralApi<["en", "de"]>>, "required", import("@fp-ts/data/Option").None, import("@fp-ts/data/Option").None>;
-    createdAt: import("@effect-app/schema").FromProperty<import("@effect-app/schema").SchemaDefaultSchema<unknown, Date, Date, string, {}>, "required", import("@fp-ts/data/Option").None, import("@fp-ts/data/Option").Some<["constructor", () => Date]>>;
+    }, "required", import("@fp-ts/core/Option").None, import("@fp-ts/core/Option").None>;
+    parent: import("@effect-app/schema").Property<typeof RequestContextParent, "optional", import("@fp-ts/core/Option").None, import("@fp-ts/core/Option").None>;
+    _tag: import("@effect-app/schema").Property<import("@effect-app/schema").DefaultSchema<unknown, "RequestContext", "RequestContext", "RequestContext", import("@effect-app/schema").LiteralApi<["RequestContext"]>>, "required", import("@fp-ts/core/Option").None, import("@fp-ts/core/Option").None>;
+    name: import("@effect-app/schema").Property<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>> & import("@effect-app/schema").Utils<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>>>, "required", import("@fp-ts/core/Option").None, import("@fp-ts/core/Option").None>;
+    locale: import("@effect-app/schema").Property<import("@effect-app/schema").DefaultSchema<unknown, "en" | "de", "en" | "de", "en" | "de", import("@effect-app/schema").LiteralApi<["en", "de"]>>, "required", import("@fp-ts/core/Option").None, import("@fp-ts/core/Option").None>;
+    createdAt: import("@effect-app/schema").FromProperty<import("@effect-app/schema").SchemaDefaultSchema<unknown, Date, Date, string, {}>, "required", import("@fp-ts/core/Option").None, import("@fp-ts/core/Option").Some<["constructor", () => Date]>>;
 }>, RequestContext, RequestContext.ConstructorInput, RequestContext.Encoded, RequestContext.Props> & import("@effect-app/schema").PropsExtensions<RequestContext.Props>;
 /**
  * @tsplus type RequestContext

package/dist/api/codec.js

@@ -1,5 +1,3 @@
-import * as tracer_1 from "@effect/io/Debug";
-const fileName_1 = "packages/infra/_src/api/codec.ts";
 import * as tsplus_module_1 from "@effect/io/Effect";
 import * as tsplus_module_2 from "@effect-app/core/fluent/_ext/awesome/_files/Iterable";
 import * as MO from "@effect-app/schema";
@@ -9,11 +7,11 @@ export function makeCodec(self) {
     // TODO: strict
     const decode = (e, env) => parse(e, env);
     const enc = Encoder.for(self);
-    const encode = (u) => tracer_1.withCallTrace(fileName_1 + ":17:38")(tsplus_module_1.sync(() => enc(u)));
+    const encode = (u) => tsplus_module_1.sync(() => enc(u));
     const encodeToMap = toMap(encode);
     return [decode, encode, encodeToMap];
 }
 function toMap(encode) {
-    return (a) => tracer_1.withCallTrace(fileName_1 + ":26:8")(tsplus_module_1.map(_ => new Map(_)))(tsplus_module_2.ext_collectAll(a.map(task => tracer_1.withCallTrace(fileName_1 + ":24:26")(tsplus_module_1.tuple(tracer_1.withCallTrace(fileName_1 + ":24:32")(tsplus_module_1.sync(() => task.id)), encode(task))))));
+    return (a) => tsplus_module_1.map(tsplus_module_2.ext_collectAll(a.map(task => tsplus_module_1.tuple(tsplus_module_1.sync(() => task.id), encode(task)))), _ => new Map(_));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29kZWMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9fc3JjL2FwaS9jb2RlYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUEsT0FBTyxLQUFLLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUN4QyxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBR3BELE1BQU0sVUFBVSxTQUFTLENBTXZCLElBQXFFO0lBQ3JFLE1BQU0sS0FBSyxHQUFHLEVBQUUsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFBO0lBQzdDLGVBQWU7SUFDZixNQUFNLE1BQU0sR0FBRyxDQUFDLENBQVUsRUFBRSxHQUFlLEVBQUUsRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsR0FBRyxDQUFDLENBQUE7SUFDN0QsTUFBTSxHQUFHLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUU3QixNQUFNLE1BQU0sR0FBRyxDQUFDLENBQWMsRUFBRSxFQUFFLCtDQUFDLHFCQUFPLEdBQUcsRUFBRSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBLENBQUE7SUFDdkQsTUFBTSxXQUFXLEdBQUcsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQ2pDLE9BQU8sQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLFdBQVcsQ0FBVSxDQUFBO0FBQy9DLENBQUM7QUFFRCxTQUFTLEtBQUssQ0FBOEIsTUFBeUM7SUFDbkYsT0FBTyxDQUFDLENBQW1CLEVBQUUsRUFBRSxDQUM3QixpRUFFTyxDQUFDLENBQUMsRUFBRSxDQUFDLElBQUksR0FBRyxDQUFDLENBQUMsQ0FBQyxHQUZ0QiwrQkFBQSxDQUFDLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLCtDQUFDLG9FQUFhLDJCQUFPLElBQUksQ0FBQyxFQUFhLENBQUMsR0FBRSxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQSxDQUFDLENBQ3RELENBQ1EsQ0FBQTtBQUMzQixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29kZWMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9fc3JjL2FwaS9jb2RlYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLE9BQU8sS0FBSyxFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDeEMsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUdwRCxNQUFNLFVBQVUsU0FBUyxDQU12QixJQUFxRTtJQUNyRSxNQUFNLEtBQUssR0FBRyxFQUFFLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQTtJQUM3QyxlQUFlO0lBQ2YsTUFBTSxNQUFNLEdBQUcsQ0FBQyxDQUFVLEVBQUUsR0FBZSxFQUFFLEVBQUUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxDQUFBO0lBQzdELE1BQU0sR0FBRyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUE7SUFFN0IsTUFBTSxNQUFNLEdBQUcsQ0FBQyxDQUFjLEVBQUUsRUFBRSxDQUFDLHFCQUFPLEdBQUcsRUFBRSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3ZELE1BQU0sV0FBVyxHQUFHLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQTtJQUNqQyxPQUFPLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxXQUFXLENBQVUsQ0FBQTtBQUMvQyxDQUFDO0FBRUQsU0FBUyxLQUFLLENBQThCLE1BQXlDO0lBQ25GLE9BQU8sQ0FBQyxDQUFtQixFQUFFLEVBQUUsQ0FDN0Isb0JBQUEsK0JBQUEsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLHNCQUFhLDJCQUFPLElBQUksQ0FBQyxFQUFhLENBQUMsRUFBRSxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUN0RCxFQUNSLENBQUMsQ0FBQyxFQUFFLENBQUMsSUFBSSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtBQUMzQixDQUFDIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"defaultErrorHandler.d.ts","sourceRoot":"","sources":["../../_src/api/defaultErrorHandler.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAClC,OAAO,KAAK,EACV,iBAAiB,EACjB,aAAa,EACb,gBAAgB,EAChB,8BAA8B,EAC9B,iBAAiB,EACjB,eAAe,EAChB,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAG1D,wBAAgB,wBAAwB,CAAC,CAAC,EACxC,IAAI,EAAE,OAAO,CAAC,OAAO,EACrB,GAAG,EAAE,OAAO,CAAC,QAAQ,EACrB,eAAe,EAAE,cAAc,EAC/B,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,uEAgBrC;AAKD,wBAAgB,mBAAmB,CAAC,CAAC,EACnC,GAAG,EAAE,OAAO,CAAC,OAAO,EACpB,GAAG,EAAE,OAAO,CAAC,QAAQ,EACrB,CAAC,EAAE,cAAc,EACjB,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,uEA0CrC;AAED,MAAM,MAAM,eAAe,GACvB,eAAe,GACf,aAAa,GACb,gBAAgB,GAChB,iBAAiB,GACjB,iBAAiB,GACjB,8BAA8B,CAAA"}
+{"version":3,"file":"defaultErrorHandler.d.ts","sourceRoot":"","sources":["../../_src/api/defaultErrorHandler.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAClC,OAAO,KAAK,EACV,iBAAiB,EACjB,aAAa,EACb,gBAAgB,EAChB,8BAA8B,EAC9B,iBAAiB,EACjB,eAAe,EAChB,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAG1D,wBAAgB,wBAAwB,CAAC,CAAC,EACxC,IAAI,EAAE,OAAO,CAAC,OAAO,EACrB,GAAG,EAAE,OAAO,CAAC,QAAQ,EACrB,eAAe,EAAE,cAAc,EAC/B,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,uEAgBrC;AAKD,wBAAgB,mBAAmB,CAAC,CAAC,EACnC,GAAG,EAAE,OAAO,CAAC,OAAO,EACpB,GAAG,EAAE,OAAO,CAAC,QAAQ,EACrB,CAAC,EAAE,cAAc,EACjB,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,uEAwCrC;AAED,MAAM,MAAM,eAAe,GACvB,eAAe,GACf,aAAa,GACb,gBAAgB,GAChB,iBAAiB,GACjB,iBAAiB,GACjB,8BAA8B,CAAA"}

package/dist/api/defaultErrorHandler.js

@@ -1,37 +1,36 @@
-import * as tracer_1 from "@effect/io/Debug";
-const fileName_1 = "packages/infra/_src/api/defaultErrorHandler.ts";
 import * as tsplus_module_1 from "@effect/io/Effect";
 import * as tsplus_module_2 from "@effect/io/Cause";
 import * as tsplus_module_3 from "@effect-app/core/Effect";
 import * as tsplus_module_4 from "@effect/io/Schedule";
 import { logRequestError } from "./reportError.js";
 export function defaultBasicErrorHandler(_req, res, _requestContext, r2) {
-    return tracer_1.withCallTrace(fileName_1 + ":26:6")(tsplus_module_1.catchAll((err) => tracer_1.withCallTrace(fileName_1 + ":31:10")(tsplus_module_1.flatMap(tsplus_module_1.die))(tracer_1.withCallTrace(fileName_1 + ":30:10")(tsplus_module_1.map(() => err))(tracer_1.withCallTrace(fileName_1 + ":27:14")(tsplus_module_1.logError("Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err))))))(tracer_1.withCallTrace(fileName_1 + ":21:6")(tsplus_module_1.catchTag("ValidationError", err => tracer_1.withCallTrace(fileName_1 + ":22:7")(tsplus_module_1.sync(() => {
+    return tsplus_module_1.catchAll(tsplus_module_1.catchTag(tsplus_module_1.tapErrorCause(r2, cause => tsplus_module_2.isFailure(cause) ? logRequestError(cause) : tsplus_module_3.unit), "ValidationError", err => tsplus_module_1.sync(() => {
         res.status(400).send(err.errors);
-    }))))(tracer_1.withCallTrace(fileName_1 + ":20:6")(tsplus_module_1.tapErrorCause(cause => tsplus_module_2.isFailure(cause) ? logRequestError(cause) : tsplus_module_3.unit))(r2))
+    }))
     // final catch all; expecting never so that unhandled known errors will show up
-    );
+    , (err) => tsplus_module_1.flatMap(tsplus_module_1.map(tsplus_module_1.logError("Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err), () => err), tsplus_module_1.die));
 }
-const optimisticConcurrencySchedule = tsplus_module_4.intersect(tsplus_module_4.recurWhile(a => a._tag === "OptimisticConcurrencyException"))(tsplus_module_4.once());
+const optimisticConcurrencySchedule = tsplus_module_4.once() &&
+    tsplus_module_4.recurWhile(a => a._tag === "OptimisticConcurrencyException");
 export function defaultErrorHandler(req, res, _, r2) {
-    const r3 = (req.method === "PATCH"
-        ? tracer_1.withCallTrace(fileName_1 + ":46:12")(tsplus_module_1.retry(optimisticConcurrencySchedule))(r2)
-        : r2);
-    return tracer_1.withCallTrace(fileName_1 + ":77:6")(tsplus_module_1.catchAll((err) => tracer_1.withCallTrace(fileName_1 + ":82:10")(tsplus_module_1.flatMap(tsplus_module_1.die))(tracer_1.withCallTrace(fileName_1 + ":81:10")(tsplus_module_1.map(() => err))(tracer_1.withCallTrace(fileName_1 + ":78:14")(tsplus_module_1.logError("Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err))))))(tracer_1.withCallTrace(fileName_1 + ":71:6")(tsplus_module_1.catchTag("OptimisticConcurrencyException", err => tracer_1.withCallTrace(fileName_1 + ":72:7")(tsplus_module_1.sync(() => {
+    const r3 = req.method === "PATCH"
+        ? tsplus_module_1.retry(r2, optimisticConcurrencySchedule)
+        : r2;
+    return tsplus_module_1.catchAll(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.tapErrorCause(r3, cause => tsplus_module_2.isFailure(cause) ? logRequestError(cause) : tsplus_module_3.unit), "ValidationError", err => tsplus_module_1.sync(() => {
+        res.status(400).send(err.errors);
+    })), "NotFoundError", err => tsplus_module_1.sync(() => {
+        res.status(404).send(err);
+    })), "NotLoggedInError", err => tsplus_module_1.sync(() => {
+        res.status(401).send(err);
+    })), "UnauthorizedError", err => tsplus_module_1.sync(() => {
+        res.status(403).send(err);
+    })), "InvalidStateError", err => tsplus_module_1.sync(() => {
+        res.status(422).send(err);
+    })), "OptimisticConcurrencyException", err => tsplus_module_1.sync(() => {
         // 412 or 409.. https://stackoverflow.com/questions/19122088/which-http-status-code-to-use-to-reject-a-put-due-to-optimistic-locking-failure
         res.status(412).send(err);
-    }))))(tracer_1.withCallTrace(fileName_1 + ":67:6")(tsplus_module_1.catchTag("InvalidStateError", err => tracer_1.withCallTrace(fileName_1 + ":68:7")(tsplus_module_1.sync(() => {
-        res.status(422).send(err);
-    }))))(tracer_1.withCallTrace(fileName_1 + ":63:6")(tsplus_module_1.catchTag("UnauthorizedError", err => tracer_1.withCallTrace(fileName_1 + ":64:7")(tsplus_module_1.sync(() => {
-        res.status(403).send(err);
-    }))))(tracer_1.withCallTrace(fileName_1 + ":59:6")(tsplus_module_1.catchTag("NotLoggedInError", err => tracer_1.withCallTrace(fileName_1 + ":60:7")(tsplus_module_1.sync(() => {
-        res.status(401).send(err);
-    }))))(tracer_1.withCallTrace(fileName_1 + ":55:6")(tsplus_module_1.catchTag("NotFoundError", err => tracer_1.withCallTrace(fileName_1 + ":56:7")(tsplus_module_1.sync(() => {
-        res.status(404).send(err);
-    }))))(tracer_1.withCallTrace(fileName_1 + ":51:6")(tsplus_module_1.catchTag("ValidationError", err => tracer_1.withCallTrace(fileName_1 + ":52:7")(tsplus_module_1.sync(() => {
-        res.status(400).send(err.errors);
-    }))))(tracer_1.withCallTrace(fileName_1 + ":50:6")(tsplus_module_1.tapErrorCause(cause => tsplus_module_2.isFailure(cause) ? logRequestError(cause) : tsplus_module_3.unit))(r3)))))))
+    }))
     // final catch all; expecting never so that unhandled known errors will show up
-    );
+    , (err) => tsplus_module_1.flatMap(tsplus_module_1.map(tsplus_module_1.logError("Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err), () => err), tsplus_module_1.die));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmYXVsdEVycm9ySGFuZGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL19zcmMvYXBpL2RlZmF1bHRFcnJvckhhbmRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBVUEsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBRWxELE1BQU0sVUFBVSx3QkFBd0IsQ0FDdEMsSUFBcUIsRUFDckIsR0FBcUIsRUFDckIsZUFBK0IsRUFDL0IsRUFBb0M7SUFFcEMsT0FBTyxzRUFPSyxDQUFDLEdBQVUsRUFBRSxFQUFFLENBQ3ZCLDRGQUFBLGtFQUdPLEdBQUcsRUFBRSxDQUFDLEdBQWMsaURBSDNCLHlCQUNFLGdHQUFnRyxHQUFHLEdBQUcsQ0FDdkcsRUFDMkIsQ0FDTixHQVpuQixzRUFFSyxpQkFBaUIsRUFBRSxHQUFHLENBQUMsRUFBRSw4Q0FDakMscUJBQU8sR0FBRyxFQUFFO1FBQ1YsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQ2xDLENBQUMsQ0FBQyxDQUFBLEdBTEMsMkVBQ1UsS0FBSyxDQUFDLEVBQUUsQ0FBQywwQkFBQSxLQUFLLENBQVksQ0FBQyxDQUFDLENBQUMsZUFBZSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMscUJBQVksR0FEM0UsRUFBRSxDQUMwRSxDQUk1RTtJQUNMLCtFQUErRTtLQU85RSxDQUFBO0FBQ0wsQ0FBQztBQUVELE1BQU0sNkJBQTZCLDZCQUNqQywyQkFBcUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxLQUFLLGdDQUFnQyxDQUFDLEVBRGxELHNCQUFlLENBQ21DLENBQUE7QUFFeEYsTUFBTSxVQUFVLG1CQUFtQixDQUNqQyxHQUFvQixFQUNwQixHQUFxQixFQUNyQixDQUFpQixFQUNqQixFQUFvQztJQUVwQyxNQUFNLEVBQUUsR0FBRyxDQUNULEdBQUcsQ0FBQyxNQUFNLEtBQUssT0FBTztRQUNwQixDQUFDLENBQUMsb0VBQVMsNkJBQTZCLEdBQXRDLEVBQUUsQ0FBcUM7UUFDekMsQ0FBQyxDQUFDLEVBQUUsQ0FDUCxDQUFBO0lBQ0QsT0FBTyxzRUE0QkssQ0FBQyxHQUFVLEVBQUUsRUFBRSxDQUN2Qiw0RkFBQSxrRUFHTyxHQUFHLEVBQUUsQ0FBQyxHQUFjLGlEQUgzQix5QkFDRSxnR0FBZ0csR0FBRyxHQUFHLENBQ3ZHLEVBQzJCLENBQ04sR0FqQ25CLHNFQXNCSyxnQ0FBZ0MsRUFBRSxHQUFHLENBQUMsRUFBRSw4Q0FDaEQscUJBQU8sR0FBRyxFQUFFO1FBQ1YsNElBQTRJO1FBQzVJLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQzNCLENBQUMsQ0FBQyxDQUFBLEdBMUJDLHNFQWtCSyxtQkFBbUIsRUFBRSxHQUFHLENBQUMsRUFBRSw4Q0FDbkMscUJBQU8sR0FBRyxFQUFFO1FBQ1YsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDM0IsQ0FBQyxDQUFDLENBQUEsR0FyQkMsc0VBY0ssbUJBQW1CLEVBQUUsR0FBRyxDQUFDLEVBQUUsOENBQ25DLHFCQUFPLEdBQUcsRUFBRTtRQUNWLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQzNCLENBQUMsQ0FBQyxDQUFBLEdBakJDLHNFQVVLLGtCQUFrQixFQUFFLEdBQUcsQ0FBQyxFQUFFLDhDQUNsQyxxQkFBTyxHQUFHLEVBQUU7UUFDVixHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUMzQixDQUFDLENBQUMsQ0FBQSxHQWJDLHNFQU1LLGVBQWUsRUFBRSxHQUFHLENBQUMsRUFBRSw4Q0FDL0IscUJBQU8sR0FBRyxFQUFFO1FBQ1YsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDM0IsQ0FBQyxDQUFDLENBQUEsR0FUQyxzRUFFSyxpQkFBaUIsRUFBRSxHQUFHLENBQUMsRUFBRSw4Q0FDakMscUJBQU8sR0FBRyxFQUFFO1FBQ1YsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQ2xDLENBQUMsQ0FBQyxDQUFBLEdBTEMsMkVBQ1UsS0FBSyxDQUFDLEVBQUUsQ0FBQywwQkFBQSxLQUFLLENBQVksQ0FBQyxDQUFDLENBQUMsZUFBZSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMscUJBQVksR0FEM0UsRUFBRSxDQUMwRSxDQUk1RSxDQUlBLENBSUEsQ0FJQSxDQUlBLENBS0E7SUFDTCwrRUFBK0U7S0FPOUUsQ0FBQTtBQUNMLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmYXVsdEVycm9ySGFuZGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL19zcmMvYXBpL2RlZmF1bHRFcnJvckhhbmRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztBQVVBLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUVsRCxNQUFNLFVBQVUsd0JBQXdCLENBQ3RDLElBQXFCLEVBQ3JCLEdBQXFCLEVBQ3JCLGVBQStCLEVBQy9CLEVBQW9DO0lBRXBDLE9BQU8seUJBQUEseUJBQUEsOEJBQUEsRUFBRSxFQUNRLEtBQUssQ0FBQyxFQUFFLENBQUMsMEJBQUEsS0FBSyxDQUFZLENBQUMsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLHFCQUFZLENBQUMsRUFDdkUsaUJBQWlCLEVBQUUsR0FBRyxDQUFDLEVBQUUsQ0FDakMscUJBQU8sR0FBRyxFQUFFO1FBQ1YsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQ2xDLENBQUMsQ0FBQyxDQUFDO0lBQ0wsK0VBQStFO01BQ3JFLENBQUMsR0FBVSxFQUFFLEVBQUUsQ0FDdkIsd0JBQUEsb0JBQUEseUJBQ0UsZ0dBQWdHLEdBQUcsR0FBRyxDQUN2RyxFQUNNLEdBQUcsRUFBRSxDQUFDLEdBQWMsQ0FBQyxzQkFDTixDQUN2QixDQUFBO0FBQ0wsQ0FBQztBQUVELE1BQU0sNkJBQTZCLEdBQUcsc0JBQWU7SUFDbkQsMkJBQXFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksS0FBSyxnQ0FBZ0MsQ0FBQyxDQUFBO0FBRXhGLE1BQU0sVUFBVSxtQkFBbUIsQ0FDakMsR0FBb0IsRUFDcEIsR0FBcUIsRUFDckIsQ0FBaUIsRUFDakIsRUFBb0M7SUFFcEMsTUFBTSxFQUFFLEdBQUcsR0FBRyxDQUFDLE1BQU0sS0FBSyxPQUFPO1FBQy9CLENBQUMsQ0FBQyxzQkFBQSxFQUFFLEVBQU8sNkJBQTZCLENBQUM7UUFDekMsQ0FBQyxDQUFDLEVBQUUsQ0FBQTtJQUNOLE9BQU8seUJBQUEseUJBQUEseUJBQUEseUJBQUEseUJBQUEseUJBQUEseUJBQUEsOEJBQUEsRUFBRSxFQUNRLEtBQUssQ0FBQyxFQUFFLENBQUMsMEJBQUEsS0FBSyxDQUFZLENBQUMsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLHFCQUFZLENBQUMsRUFDdkUsaUJBQWlCLEVBQUUsR0FBRyxDQUFDLEVBQUUsQ0FDakMscUJBQU8sR0FBRyxFQUFFO1FBQ1YsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQ2xDLENBQUMsQ0FBQyxDQUFDLEVBQ0ssZUFBZSxFQUFFLEdBQUcsQ0FBQyxFQUFFLENBQy9CLHFCQUFPLEdBQUcsRUFBRTtRQUNWLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQzNCLENBQUMsQ0FBQyxDQUFDLEVBQ0ssa0JBQWtCLEVBQUUsR0FBRyxDQUFDLEVBQUUsQ0FDbEMscUJBQU8sR0FBRyxFQUFFO1FBQ1YsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDM0IsQ0FBQyxDQUFDLENBQUMsRUFDSyxtQkFBbUIsRUFBRSxHQUFHLENBQUMsRUFBRSxDQUNuQyxxQkFBTyxHQUFHLEVBQUU7UUFDVixHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUMzQixDQUFDLENBQUMsQ0FBQyxFQUNLLG1CQUFtQixFQUFFLEdBQUcsQ0FBQyxFQUFFLENBQ25DLHFCQUFPLEdBQUcsRUFBRTtRQUNWLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQzNCLENBQUMsQ0FBQyxDQUFDLEVBQ0ssZ0NBQWdDLEVBQUUsR0FBRyxDQUFDLEVBQUUsQ0FDaEQscUJBQU8sR0FBRyxFQUFFO1FBQ1YsNElBQTRJO1FBQzVJLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQzNCLENBQUMsQ0FBQyxDQUFDO0lBQ0wsK0VBQStFO01BQ3JFLENBQUMsR0FBVSxFQUFFLEVBQUUsQ0FDdkIsd0JBQUEsb0JBQUEseUJBQ0UsZ0dBQWdHLEdBQUcsR0FBRyxDQUN2RyxFQUNNLEdBQUcsRUFBRSxDQUFDLEdBQWMsQ0FBQyxzQkFDTixDQUN2QixDQUFBO0FBQ0wsQ0FBQyJ9

package/dist/api/express/makeJsonSchema.js

@@ -1,5 +1,3 @@
-import * as tracer_1 from "@effect/io/Debug";
-const fileName_1 = "packages/infra/_src/api/express/makeJsonSchema.ts";
 import * as tsplus_module_1 from "@fp-ts/data/Chunk";
 import * as tsplus_module_2 from "@effect-app/core/fluent/_ext/awesome/_files/Iterable";
 import * as tsplus_module_3 from "@effect/io/Effect";
@@ -10,7 +8,7 @@ const rx = /:(\w+)/g;
  * Work in progress JSONSchema generator.
  */
 export function makeJsonSchema(r) {
-    return tracer_1.withCallTrace(fileName_1 + ":17:6")(tsplus_module_3.map(e => {
+    return tsplus_module_3.map(tsplus_module_2.ext_forEach(tsplus_module_1.fromIterable(r), RS.makeFromSchema), e => {
         const map = ({ method, path, responses, ...rest }) => ({
             [method]: {
                 ...rest,
@@ -28,7 +26,7 @@ export function makeJsonSchema(r) {
             };
             return prev;
         })(e);
-    }))(tsplus_module_2.ext_forEach(tsplus_module_1.fromIterable(r), RS.makeFromSchema));
+    });
 }
 class Response {
     constructor(statusCode, type // string | JSONSchema | SubSchema
@@ -37,4 +35,4 @@ class Response {
         this.type = type;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZUpzb25TY2hlbWEuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9fc3JjL2FwaS9leHByZXNzL21ha2VKc29uU2NoZW1hLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsdURBQXVEO0FBRXZELE9BQU8sS0FBSyxFQUFFLE1BQU0scUJBQXFCLENBQUE7QUFJekMsTUFBTSxFQUFFLEdBQUcsU0FBUyxDQUFBO0FBSXBCOztHQUVHO0FBQ0gsTUFBTSxVQUFVLGNBQWMsQ0FBQyxDQUFrQztJQUMvRCxPQUFPLGlFQUVBLENBQUMsQ0FBQyxFQUFFO1FBQ1AsTUFBTSxHQUFHLEdBQUcsQ0FBQyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLEdBQUcsSUFBSSxFQUFnQixFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBQ25FLENBQUMsTUFBTSxDQUFDLEVBQUU7Z0JBQ1IsR0FBRyxJQUFJO2dCQUNQLFNBQVMsRUFBRyxTQUF3QixDQUFDLE1BQU0sQ0FDekMsQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQUU7b0JBQ1osSUFBSSxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsR0FBRyxHQUFHLENBQUMsSUFBSSxDQUFBO29CQUMvQixPQUFPLElBQUksQ0FBQTtnQkFDYixDQUFDLEVBQ0QsRUFBc0QsQ0FDdkQ7YUFDRjtTQUNGLENBQUMsQ0FBQTtRQUNGLE9BQU8sdUJBQ0wsRUFBNkQsRUFDN0QsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxFQUFFLEVBQUU7WUFDVixNQUFNLElBQUksR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsRUFBRSxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFBO1lBQ2xFLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRztnQkFDWCxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUM7Z0JBQ2IsR0FBRyxHQUFHLENBQUMsQ0FBQyxDQUFRO2FBQ2pCLENBQUE7WUFDRCxPQUFPLElBQUksQ0FBQTtRQUNiLENBQUMsRUFUSSxDQUFDLENBVVAsQ0FBQTtJQUNILENBQUMsR0ExQkksNEJBQUEsNkJBQW1CLENBQUMsQ0FBQyxFQUNYLEVBQUUsQ0FBQyxjQUFjLENBQUMsQ0F5Qi9CLENBQUE7QUFDTixDQUFDO0FBRUQsTUFBTSxRQUFRO0lBQ1osWUFDa0IsVUFBa0IsRUFDbEIsSUFBUyxDQUFDLGtDQUFrQzs7UUFENUMsZUFBVSxHQUFWLFVBQVUsQ0FBUTtRQUNsQixTQUFJLEdBQUosSUFBSSxDQUFLO0lBQ3hCLENBQUM7Q0FDTCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZUpzb25TY2hlbWEuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9fc3JjL2FwaS9leHByZXNzL21ha2VKc29uU2NoZW1hLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHVEQUF1RDtBQUV2RCxPQUFPLEtBQUssRUFBRSxNQUFNLHFCQUFxQixDQUFBO0FBSXpDLE1BQU0sRUFBRSxHQUFHLFNBQVMsQ0FBQTtBQUlwQjs7R0FFRztBQUNILE1BQU0sVUFBVSxjQUFjLENBQUMsQ0FBa0M7SUFDL0QsT0FBTyxvQkFBQSw0QkFBQSw2QkFBbUIsQ0FBQyxDQUFDLEVBQ1gsRUFBRSxDQUFDLGNBQWMsQ0FBQyxFQUM1QixDQUFDLENBQUMsRUFBRTtRQUNQLE1BQU0sR0FBRyxHQUFHLENBQUMsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxHQUFHLElBQUksRUFBZ0IsRUFBRSxFQUFFLENBQUMsQ0FBQztZQUNuRSxDQUFDLE1BQU0sQ0FBQyxFQUFFO2dCQUNSLEdBQUcsSUFBSTtnQkFDUCxTQUFTLEVBQUcsU0FBd0IsQ0FBQyxNQUFNLENBQ3pDLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUFFO29CQUNaLElBQUksQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQTtvQkFDL0IsT0FBTyxJQUFJLENBQUE7Z0JBQ2IsQ0FBQyxFQUNELEVBQXNELENBQ3ZEO2FBQ0Y7U0FDRixDQUFDLENBQUE7UUFDRixPQUFPLHVCQUNMLEVBQTZELEVBQzdELENBQUMsSUFBSSxFQUFFLENBQUMsRUFBRSxFQUFFO1lBQ1YsTUFBTSxJQUFJLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLEVBQUUsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtZQUNsRSxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUc7Z0JBQ1gsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDO2dCQUNiLEdBQUcsR0FBRyxDQUFDLENBQUMsQ0FBUTthQUNqQixDQUFBO1lBQ0QsT0FBTyxJQUFJLENBQUE7UUFDYixDQUFDLEVBVEksQ0FBQyxDQVVQLENBQUE7SUFDSCxDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUM7QUFFRCxNQUFNLFFBQVE7SUFDWixZQUNrQixVQUFrQixFQUNsQixJQUFTLENBQUMsa0NBQWtDOztRQUQ1QyxlQUFVLEdBQVYsVUFBVSxDQUFRO1FBQ2xCLFNBQUksR0FBSixJQUFJLENBQUs7SUFDeEIsQ0FBQztDQUNMIn0=

package/dist/api/express/makeOpenApiSpecs.js

@@ -1,13 +1,11 @@
-import * as tracer_1 from "@effect/io/Debug";
-const fileName_1 = "packages/infra/_src/api/express/makeOpenApiSpecs.ts";
 import * as tsplus_module_1 from "@effect/io/Ref";
 import * as tsplus_module_2 from "@effect/io/Effect";
 import { References } from "@effect-app/infra-adapters/Openapi/atlas-plutus/Schema/index";
 import { makeJsonSchema } from "./makeJsonSchema.js";
 export function makeOpenApiSpecs(rdescs, info) {
-    return tracer_1.withCallTrace(fileName_1 + ":12:17")(tsplus_module_2.gen(function* ($) {
-        const ref = yield* $(tracer_1.withCallTrace(fileName_1 + ":13:30")(tsplus_module_1.make(new Map())));
-        const paths = yield* $(tracer_1.withCallTrace(fileName_1 + ":14:51")(tsplus_module_2.provideService(References, { ref }))(makeJsonSchema(rdescs)));
+    return tsplus_module_2.gen(function* ($) {
+        const ref = yield* $(tsplus_module_1.make(new Map()));
+        const paths = yield* $(tsplus_module_2.provideService(makeJsonSchema(rdescs), References, { ref }));
         const refs = yield* $(tsplus_module_1.get(ref));
         const parameterRefs = {}; // todos
         const schemas = {};
@@ -49,6 +47,6 @@ export function makeOpenApiSpecs(rdescs, info) {
             components
             // test,
         };
-    }));
+    });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZU9wZW5BcGlTcGVjcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvYXBpL2V4cHJlc3MvbWFrZU9wZW5BcGlTcGVjcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBR0EsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDhEQUE4RCxDQUFBO0FBQ3pGLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQTtBQUdwRCxNQUFNLFVBQVUsZ0JBQWdCLENBQzlCLE1BQW9DLEVBQ3BDLElBQWlCO0lBRWpCLHFEQUFPLG9CQUFXLFFBQVEsQ0FBQyxFQUFDLENBQUM7UUFDM0IsTUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQywrQ0FBQyxxQkFBOEMsSUFBSSxHQUFHLEVBQUUsQ0FBQyxFQUFDLENBQUE7UUFDOUUsTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLDZFQUFzQyxVQUFVLEVBQUUsRUFBRSxHQUFHLEVBQUUsR0FBekQsY0FBYyxDQUFDLE1BQU0sQ0FBQyxDQUFvQyxDQUFDLENBQUE7UUFDbEYsTUFBTSxJQUFJLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxxQkFBQyxHQUFHLEVBQUssQ0FBQTtRQUM5QixNQUFNLGFBQWEsR0FBd0IsRUFBRSxDQUFBLENBQUMsUUFBUTtRQUN0RCxNQUFNLE9BQU8sR0FBd0IsRUFBRSxDQUFBO1FBQ3ZDLE1BQU0sZUFBZSxHQUFHO1lBQ3RCLFVBQVUsRUFBRTtnQkFDVixJQUFJLEVBQUUsTUFBTTtnQkFDWixNQUFNLEVBQUUsUUFBUTtnQkFDaEIsWUFBWSxFQUFFLEtBQUs7YUFDcEI7U0FDRixDQUFBLENBQUMsbURBQW1EO1FBQ3JELE1BQU0sVUFBVSxHQUFHLEVBQUUsZUFBZSxFQUFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsYUFBYSxFQUFFLENBQUE7UUFFMUUsS0FBSyxNQUFNLEtBQUssSUFBSSxJQUFJLENBQUMsT0FBTyxFQUFFLEVBQUU7WUFDbEMsZ0RBQWdEO1lBQ2hELE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUE7U0FDN0I7UUFFRCxPQUFPO1lBQ0wsT0FBTyxFQUFFLE9BQU87WUFDaEIsSUFBSSxFQUFFO2dCQUNKLEtBQUssRUFBRSxJQUFJLENBQUMsS0FBSztnQkFDakIsV0FBVyxFQUFFLElBQUksQ0FBQyxXQUFXO2dCQUM3QixjQUFjLEVBQUUsSUFBSSxDQUFDLEdBQUc7Z0JBQ3hCLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTztvQkFDbkIsQ0FBQyxDQUFDO3dCQUNBLElBQUksRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUk7d0JBQ3ZCLEtBQUssRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUs7d0JBQ3pCLEdBQUcsRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUc7cUJBQ3RCO29CQUNELENBQUMsQ0FBQyxTQUFTO2dCQUNiLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTztvQkFDbkIsQ0FBQyxDQUFDO3dCQUNBLElBQUksRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUk7d0JBQ3ZCLEdBQUcsRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUc7cUJBQ3RCO29CQUNELENBQUMsQ0FBQyxTQUFTO2dCQUNiLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTzthQUN0QjtZQUNELElBQUksRUFBRSxFQUFFO1lBQ1IsS0FBSztZQUNMLFVBQVU7WUFDVixRQUFRO1NBQ1QsQ0FBQTtJQUNILENBQUMsQ0FBQyxFQUFBO0FBQ0osQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZU9wZW5BcGlTcGVjcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvYXBpL2V4cHJlc3MvbWFrZU9wZW5BcGlTcGVjcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUdBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSw4REFBOEQsQ0FBQTtBQUN6RixPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0scUJBQXFCLENBQUE7QUFHcEQsTUFBTSxVQUFVLGdCQUFnQixDQUM5QixNQUFvQyxFQUNwQyxJQUFpQjtJQUVqQixPQUFPLG9CQUFXLFFBQVEsQ0FBQyxFQUFDLENBQUM7UUFDM0IsTUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLHFCQUE4QyxJQUFJLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQTtRQUM5RSxNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsK0JBQUEsY0FBYyxDQUFDLE1BQU0sQ0FBQyxFQUFnQixVQUFVLEVBQUUsRUFBRSxHQUFHLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDbEYsTUFBTSxJQUFJLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxxQkFBQyxHQUFHLEVBQUssQ0FBQTtRQUM5QixNQUFNLGFBQWEsR0FBd0IsRUFBRSxDQUFBLENBQUMsUUFBUTtRQUN0RCxNQUFNLE9BQU8sR0FBd0IsRUFBRSxDQUFBO1FBQ3ZDLE1BQU0sZUFBZSxHQUFHO1lBQ3RCLFVBQVUsRUFBRTtnQkFDVixJQUFJLEVBQUUsTUFBTTtnQkFDWixNQUFNLEVBQUUsUUFBUTtnQkFDaEIsWUFBWSxFQUFFLEtBQUs7YUFDcEI7U0FDRixDQUFBLENBQUMsbURBQW1EO1FBQ3JELE1BQU0sVUFBVSxHQUFHLEVBQUUsZUFBZSxFQUFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsYUFBYSxFQUFFLENBQUE7UUFFMUUsS0FBSyxNQUFNLEtBQUssSUFBSSxJQUFJLENBQUMsT0FBTyxFQUFFLEVBQUU7WUFDbEMsZ0RBQWdEO1lBQ2hELE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUE7U0FDN0I7UUFFRCxPQUFPO1lBQ0wsT0FBTyxFQUFFLE9BQU87WUFDaEIsSUFBSSxFQUFFO2dCQUNKLEtBQUssRUFBRSxJQUFJLENBQUMsS0FBSztnQkFDakIsV0FBVyxFQUFFLElBQUksQ0FBQyxXQUFXO2dCQUM3QixjQUFjLEVBQUUsSUFBSSxDQUFDLEdBQUc7Z0JBQ3hCLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTztvQkFDbkIsQ0FBQyxDQUFDO3dCQUNBLElBQUksRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUk7d0JBQ3ZCLEtBQUssRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUs7d0JBQ3pCLEdBQUcsRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUc7cUJBQ3RCO29CQUNELENBQUMsQ0FBQyxTQUFTO2dCQUNiLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTztvQkFDbkIsQ0FBQyxDQUFDO3dCQUNBLElBQUksRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUk7d0JBQ3ZCLEdBQUcsRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUc7cUJBQ3RCO29CQUNELENBQUMsQ0FBQyxTQUFTO2dCQUNiLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTzthQUN0QjtZQUNELElBQUksRUFBRSxFQUFFO1lBQ1IsS0FBSztZQUNMLFVBQVU7WUFDVixRQUFRO1NBQ1QsQ0FBQTtJQUNILENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyJ9

package/dist/api/express/schema/requestHandler.d.ts

@@ -27,11 +27,11 @@ export type Request2<Path extends string, Method extends Methods, ReqA> = MO.Req
 export type Encode<A, E> = (a: A) => E;
 export declare function decodeErrors(x: unknown): unknown[];
 export declare function parseRequestParams<PathA, CookieA, QueryA, BodyA, HeaderA>(parsers: RequestParsers<PathA, CookieA, QueryA, BodyA, HeaderA>): ({ body, cookies, headers, params, query }: express.Request) => import("@effect/io/Effect").Effect<never, ValidationError, {
-    body: import("@fp-ts/data/Option").Option<BodyA>;
-    cookie: import("@fp-ts/data/Option").Option<CookieA>;
-    headers: import("@fp-ts/data/Option").Option<HeaderA>;
-    path: import("@fp-ts/data/Option").Option<PathA>;
-    query: import("@fp-ts/data/Option").Option<QueryA>;
+    body: import("@fp-ts/core/Option").Option<BodyA>;
+    cookie: import("@fp-ts/core/Option").Option<CookieA>;
+    headers: import("@fp-ts/core/Option").Option<HeaderA>;
+    path: import("@fp-ts/core/Option").Option<PathA>;
+    query: import("@fp-ts/core/Option").Option<QueryA>;
 }>;
 export declare function respondSuccess<ReqA, A, E>(encodeResponse: (req: ReqA) => Encode<A, E>): (req: ReqA, res: express.Response) => (a: A) => import("@effect/io/Effect").Effect<never, never, void>;
 export interface RequestHandlerOptRes<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA, ResA, ResE> {

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

@@ -4,7 +4,7 @@ import * as tsplus_module_1 from "@effect/io/Effect";
 import * as tsplus_module_2 from "@effect/io/Exit";
 import * as tsplus_module_3 from "@effect/io/Cause";
 import * as tsplus_module_4 from "@effect-app/core/Function";
-import * as tsplus_module_5 from "@fp-ts/data/Option";
+import * as tsplus_module_5 from "@fp-ts/core/Option";
 import * as tsplus_module_6 from "@effect-app/core/Effect";
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/ban-types */
@@ -31,7 +31,38 @@ export function decodeErrors(x) {
 // )
 // const structValidation = DSL.structF(ValidationApplicative)
 export function parseRequestParams(parsers) {
-    return ({ body, cookies, headers, params, query }) => tracer_1.withCallTrace(fileName_1 + ":128:8")(tsplus_module_1.flatMap(({ body, cookie, headers, path, query }) => {
+    return ({ body, cookies, headers, params, query }) => tsplus_module_1.flatMap(tsplus_module_1.struct({
+        body: tsplus_module_1.flatMap(tsplus_module_1.exit(parsers
+            .parseBody(body)), _ => tsplus_module_2.isFailure(_) && !tsplus_module_3.isFailure(_.cause)
+            ? tsplus_module_1.failCauseSync(() => _.cause)
+            : tsplus_module_1.sync(() => tsplus_module_2.isSuccess(_)
+                ? { _tag: "Success", value: _.value }
+                : { _tag: "Failure", errors: tsplus_module_3.failures(_.cause) })),
+        cookie: tsplus_module_1.flatMap(tsplus_module_1.exit(parsers
+            .parseCookie(cookies)), _ => tsplus_module_2.isFailure(_) && !tsplus_module_3.isFailure(_.cause)
+            ? tsplus_module_1.failCauseSync(() => _.cause)
+            : tsplus_module_1.sync(() => tsplus_module_2.isSuccess(_)
+                ? { _tag: "Success", value: _.value }
+                : { _tag: "Failure", errors: tsplus_module_3.failures(_.cause) })),
+        headers: tsplus_module_1.flatMap(tsplus_module_1.exit(parsers
+            .parseHeaders(headers)), _ => tsplus_module_2.isFailure(_) && !tsplus_module_3.isFailure(_.cause)
+            ? tsplus_module_1.failCauseSync(() => _.cause)
+            : tsplus_module_1.sync(() => tsplus_module_2.isSuccess(_)
+                ? { _tag: "Success", value: _.value }
+                : { _tag: "Failure", errors: tsplus_module_3.failures(_.cause) })),
+        query: tsplus_module_1.flatMap(tsplus_module_1.exit(parsers
+            .parseQuery(query)), _ => tsplus_module_2.isFailure(_) && !tsplus_module_3.isFailure(_.cause)
+            ? tsplus_module_1.failCauseSync(() => _.cause)
+            : tsplus_module_1.sync(() => tsplus_module_2.isSuccess(_)
+                ? { _tag: "Success", value: _.value }
+                : { _tag: "Failure", errors: tsplus_module_3.failures(_.cause) })),
+        path: tsplus_module_1.flatMap(tsplus_module_1.exit(parsers
+            .parsePath(params)), _ => tsplus_module_2.isFailure(_) && !tsplus_module_3.isFailure(_.cause)
+            ? tsplus_module_1.failCauseSync(() => _.cause)
+            : tsplus_module_1.sync(() => tsplus_module_2.isSuccess(_)
+                ? { _tag: "Success", value: _.value }
+                : { _tag: "Failure", errors: tsplus_module_3.failures(_.cause) }))
+    }), ({ body, cookie, headers, path, query }) => {
         const errors = [];
         if (body._tag === "Failure") {
             errors.push(makeError("body")(body.errors));
@@ -49,47 +80,16 @@ export function parseRequestParams(parsers) {
             errors.push(makeError("path")(path.errors));
         }
         if (errors.length) {
-            return tracer_1.withCallTrace(fileName_1 + ":146:23")(tsplus_module_1.fail(new ValidationError(errors)));
+            return tsplus_module_1.fail(new ValidationError(errors));
         }
-        return tracer_1.withCallTrace(fileName_1 + ":148:14")(tsplus_module_1.sync(() => ({
+        return tsplus_module_1.sync(() => ({
             body: body.value,
             cookie: cookie.value,
             headers: headers.value,
             path: path.value,
             query: query.value
-        })));
-    }))(tracer_1.withCallTrace(fileName_1 + ":72:12")(tsplus_module_1.struct({
-        body: tracer_1.withCallTrace(fileName_1 + ":75:15")(tsplus_module_1.flatMap(_ => tsplus_module_2.isFailure(_) && !tsplus_module_3.isFailure(_.cause)
-            ? tracer_1.withCallTrace(fileName_1 + ":77:23")(tsplus_module_1.failCauseSync(() => _.cause))
-            : tracer_1.withCallTrace(fileName_1 + ":78:15")(tsplus_module_1.sync(() => tsplus_module_2.isSuccess(_)
-                ? { _tag: "Success", value: _.value }
-                : { _tag: "Failure", errors: tsplus_module_3.failures(_.cause) }))))(tsplus_module_1.exit(parsers
-            .parseBody(body))),
-        cookie: tracer_1.withCallTrace(fileName_1 + ":86:15")(tsplus_module_1.flatMap(_ => tsplus_module_2.isFailure(_) && !tsplus_module_3.isFailure(_.cause)
-            ? tracer_1.withCallTrace(fileName_1 + ":88:23")(tsplus_module_1.failCauseSync(() => _.cause))
-            : tracer_1.withCallTrace(fileName_1 + ":89:15")(tsplus_module_1.sync(() => tsplus_module_2.isSuccess(_)
-                ? { _tag: "Success", value: _.value }
-                : { _tag: "Failure", errors: tsplus_module_3.failures(_.cause) }))))(tsplus_module_1.exit(parsers
-            .parseCookie(cookies))),
-        headers: tracer_1.withCallTrace(fileName_1 + ":97:15")(tsplus_module_1.flatMap(_ => tsplus_module_2.isFailure(_) && !tsplus_module_3.isFailure(_.cause)
-            ? tracer_1.withCallTrace(fileName_1 + ":99:23")(tsplus_module_1.failCauseSync(() => _.cause))
-            : tracer_1.withCallTrace(fileName_1 + ":100:15")(tsplus_module_1.sync(() => tsplus_module_2.isSuccess(_)
-                ? { _tag: "Success", value: _.value }
-                : { _tag: "Failure", errors: tsplus_module_3.failures(_.cause) }))))(tsplus_module_1.exit(parsers
-            .parseHeaders(headers))),
-        query: tracer_1.withCallTrace(fileName_1 + ":108:15")(tsplus_module_1.flatMap(_ => tsplus_module_2.isFailure(_) && !tsplus_module_3.isFailure(_.cause)
-            ? tracer_1.withCallTrace(fileName_1 + ":110:23")(tsplus_module_1.failCauseSync(() => _.cause))
-            : tracer_1.withCallTrace(fileName_1 + ":111:15")(tsplus_module_1.sync(() => tsplus_module_2.isSuccess(_)
-                ? { _tag: "Success", value: _.value }
-                : { _tag: "Failure", errors: tsplus_module_3.failures(_.cause) }))))(tsplus_module_1.exit(parsers
-            .parseQuery(query))),
-        path: tracer_1.withCallTrace(fileName_1 + ":119:15")(tsplus_module_1.flatMap(_ => tsplus_module_2.isFailure(_) && !tsplus_module_3.isFailure(_.cause)
-            ? tracer_1.withCallTrace(fileName_1 + ":121:23")(tsplus_module_1.failCauseSync(() => _.cause))
-            : tracer_1.withCallTrace(fileName_1 + ":122:15")(tsplus_module_1.sync(() => tsplus_module_2.isSuccess(_)
-                ? { _tag: "Success", value: _.value }
-                : { _tag: "Failure", errors: tsplus_module_3.failures(_.cause) }))))(tsplus_module_1.exit(parsers
-            .parsePath(params)))
-    })));
+        }));
+    });
 }
 // // eslint-disable-next-line @typescript-eslint/no-explicit-any
 // function mapErrors_<E, NE, NER extends Record<string, Effect<any, E, any>>>(
@@ -112,22 +112,22 @@ function makeError(type) {
     return (e) => [{ type, errors: decodeErrors(e) }];
 }
 export function respondSuccess(encodeResponse) {
-    return (req, res) => tsplus_module_4.flow(encodeResponse(req), tsplus_module_1.succeed, _ => tracer_1.withCallTrace(fileName_1 + ":185:9")(tsplus_module_1.flatMap(r => tracer_1.withCallTrace(fileName_1 + ":186:9")(tsplus_module_1.sync(() => {
+    return (req, res) => tsplus_module_4.flow(encodeResponse(req), tsplus_module_1.succeed, _ => tsplus_module_1.flatMap(_, r => tsplus_module_1.sync(() => {
         r === undefined
             ? res.status(204).send()
             : res.status(200).send(r === null ? JSON.stringify(null) : r);
-    }))))(_));
+    })));
 }
 export function makeRequestParsers(Request) {
-    const ph = tracer_1.withCallTrace(fileName_1 + ":303:14")(tsplus_module_1.sync(() => tsplus_module_5.map(MO.condemn)(tsplus_module_5.map(Parser.for)(tsplus_module_5.map(s => s)(tsplus_module_5.fromNullable(Request.Headers))))));
+    const ph = tsplus_module_1.sync(() => tsplus_module_5.map(MO.condemn)(tsplus_module_5.map(Parser.for)(tsplus_module_5.map(s => s)(tsplus_module_5.fromNullable(Request.Headers)))));
     const parseHeaders = (u) => tracer_1.withCallTrace(fileName_1 + ":309:43")(tsplus_module_6.flatMapOpt(ph, d => d(u)));
-    const pq = tracer_1.withCallTrace(fileName_1 + ":311:14")(tsplus_module_1.sync(() => tsplus_module_5.map(MO.condemn)(tsplus_module_5.map(Parser.for)(tsplus_module_5.map(s => s)(tsplus_module_5.fromNullable(Request.Query))))));
+    const pq = tsplus_module_1.sync(() => tsplus_module_5.map(MO.condemn)(tsplus_module_5.map(Parser.for)(tsplus_module_5.map(s => s)(tsplus_module_5.fromNullable(Request.Query)))));
     const parseQuery = (u) => tracer_1.withCallTrace(fileName_1 + ":317:41")(tsplus_module_6.flatMapOpt(pq, d => d(u)));
-    const pb = tracer_1.withCallTrace(fileName_1 + ":319:14")(tsplus_module_1.sync(() => tsplus_module_5.map(MO.condemn)(tsplus_module_5.map(Parser.for)(tsplus_module_5.map(s => s)(tsplus_module_5.fromNullable(Request.Body))))));
+    const pb = tsplus_module_1.sync(() => tsplus_module_5.map(MO.condemn)(tsplus_module_5.map(Parser.for)(tsplus_module_5.map(s => s)(tsplus_module_5.fromNullable(Request.Body)))));
     const parseBody = (u) => tracer_1.withCallTrace(fileName_1 + ":325:40")(tsplus_module_6.flatMapOpt(pb, d => d(u)));
-    const pp = tracer_1.withCallTrace(fileName_1 + ":327:14")(tsplus_module_1.sync(() => tsplus_module_5.map(MO.condemn)(tsplus_module_5.map(Parser.for)(tsplus_module_5.map(s => s)(tsplus_module_5.fromNullable(Request.Path))))));
+    const pp = tsplus_module_1.sync(() => tsplus_module_5.map(MO.condemn)(tsplus_module_5.map(Parser.for)(tsplus_module_5.map(s => s)(tsplus_module_5.fromNullable(Request.Path)))));
     const parsePath = (u) => tracer_1.withCallTrace(fileName_1 + ":333:40")(tsplus_module_6.flatMapOpt(pp, d => d(u)));
-    const pc = tracer_1.withCallTrace(fileName_1 + ":335:14")(tsplus_module_1.sync(() => tsplus_module_5.map(MO.condemn)(tsplus_module_5.map(Parser.for)(tsplus_module_5.map(s => s)(tsplus_module_5.fromNullable(Request.Cookie))))));
+    const pc = tsplus_module_1.sync(() => tsplus_module_5.map(MO.condemn)(tsplus_module_5.map(Parser.for)(tsplus_module_5.map(s => s)(tsplus_module_5.fromNullable(Request.Cookie)))));
     const parseCookie = (u) => tracer_1.withCallTrace(fileName_1 + ":341:42")(tsplus_module_6.flatMapOpt(pc, d => d(u)));
     return {
         parseBody,
@@ -137,4 +137,4 @@ export function makeRequestParsers(Request) {
         parseQuery
     };
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"requestHandler.js","sourceRoot":"","sources":["../../../../_src/api/express/schema/requestHandler.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"requestHandler.js","sourceRoot":"","sources":["../../../../_src/api/express/schema/requestHandler.ts"],"names":[],"mappings":"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"}

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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