@effect-app/infra 0.198.1 → 0.199.0

package/dist/api/routing/makeRequestHandler.js

@@ -1,115 +1,124 @@
-import * as tsplus_module_1 from "effect/FiberRef";
-import * as tsplus_module_2 from "effect-app/schema";
-import * as tsplus_module_3 from "@effect/schema/Schema";
-import * as tsplus_module_4 from "effect/Effect";
-import * as tsplus_module_5 from "@effect-app/core/utils";
-import * as tsplus_module_6 from "@effect/platform/Http/ServerResponse";
-import * as tsplus_module_7 from "@effect/platform/Http/Body";
-import * as tsplus_module_8 from "@effect-app/infra/api/setupRequest";
-import { pretty } from "@effect-app/core/utils";
+import { copy, pretty } from "@effect-app/core/utils";
 import { snipString } from "@effect-app/infra/api/util";
 import { reportError } from "@effect-app/infra/errorReporter";
-import { HttpRouteContext, HttpServerRequest } from "../http.js";
+import { Effect, FiberRef, Option, S } from "effect-app";
+import { HttpBody, HttpRouter, HttpServerRequest, HttpServerResponse } from "effect-app/http";
+import { NonEmptyString255 } from "effect-app/schema";
+import { updateRequestContext } from "../setupRequest.js";
 import { makeRequestParsers, parseRequestParams } from "./base.js";
-export const RequestSettings = tsplus_module_1.unsafeMake({
+export const RequestSettings = FiberRef.unsafeMake({
     verbose: false
 });
 export function makeRequestHandler(handler, errorHandler, middlewareLayer) {
     const { Request, Response, h: handle } = handler;
-    const response = Response ? Response : tsplus_module_2.Void;
+    const response = Response ? Response : S.void;
     const resp = response;
     // TODO: consider if the alternative of using the struct schema is perhaps just better.
     const encoder = "struct" in resp && resp.struct
-        ? tsplus_module_3.encode(resp.struct) 
-    // ? (i: any) => {
-    //   if (i instanceof (response as any)) return response.encodeSync(i)
-    //   else return response.encodeSync(new (response as any)(i))
-    // }
-    : tsplus_module_3.encode(resp);
+        ? S.encode(resp.struct)
+        // ? (i: any) => {
+        //   if (i instanceof (response as any)) return S.encodeSync(response)(i)
+        //   else return S.encodeSync(response)(new (response as any)(i))
+        // }
+        : S.encode(resp);
     // const encodeResponse = adaptResponse
     //   ? (req: ReqA) => Encoder.for(adaptResponse(req))
     //   : () => encoder
     const requestParsers = makeRequestParsers(Request);
     const parseRequest = parseRequestParams(requestParsers);
-    const getParams = tsplus_module_4.all({
-        rcx: HttpRouteContext,
-        req: HttpServerRequest.flatMap((req) => req.json.map((body) => ({ body, headers: req.headers })))
-    })
-        .map(({ rcx, req }) => ({
+    const getParams = Effect.map(Effect
+        .all({
+        rcx: HttpRouter.RouteContext,
+        req: Effect.flatMap(HttpServerRequest.ServerRequest, (req) => req.json.pipe(Effect.map((body) => ({ body, headers: req.headers }))))
+    }), ({ rcx, req }) => ({
         params: rcx.params,
         query: rcx.searchParams,
         body: req.body,
         headers: req.headers,
         cookies: {} // req.cookies
     }));
-    return tsplus_module_8.updateRequestContext(tsplus_module_4.gen(function* ($) {
-        const req = yield* $(HttpServerRequest);
-        const res = tsplus_module_6.empty()
-            .pipe((_) => req.method === "GET" ? tsplus_module_6.setHeader(_, "Cache-Control", "no-store") : _);
+    return Effect
+        .gen(function* ($) {
+        const req = yield* $(HttpServerRequest.ServerRequest);
+        const res = HttpServerResponse
+            .empty()
+            .pipe((_) => req.method === "GET" ? HttpServerResponse.setHeader(_, "Cache-Control", "no-store") : _);
         const pars = yield* $(getParams);
-        const settings = yield* $(tsplus_module_1.get(RequestSettings));
+        const settings = yield* $(FiberRef.get(RequestSettings));
         const eff = 
         // TODO: we don;t have access to user id here cause context is not yet created
-        tsplus_module_4.catchAllCause(tsplus_module_4.annotateLogs(tsplus_module_4.logInfo("Incoming request"), {
+        Effect
+            .logInfo("Incoming request")
+            .pipe(Effect.annotateLogs({
             method: req.method,
             path: req.originalUrl,
             ...(settings.verbose
                 ? {
-                    reqPath: tsplus_module_5.RecordPretty(tsplus_module_5.object$(pars.params)),
-                    reqQuery: tsplus_module_5.RecordPretty(tsplus_module_5.object$(pars.query)),
+                    reqPath: pretty(pars.params),
+                    reqQuery: pretty(pars.query),
                     reqBody: pretty(pars.body),
                     reqCookies: pretty(pars.cookies),
                     reqHeaders: pretty(pars.headers)
                 }
                 : undefined)
-        })
-            .andThen(tsplus_module_4.suspend(() => {
+        }), Effect
+            .andThen(Effect.suspend(() => {
             const handleRequest = parseRequest(pars)
-                .map(({ body, path, query }) => {
+                .pipe(Effect.map(({ body, path, query }) => {
                 const hn = {
-                    ...body.value,
-                    ...query.value,
-                    ...path.value
+                    ...body.pipe(Option.getOrUndefined) ?? {},
+                    ...query.pipe(Option.getOrUndefined) ?? {},
+                    ...path.pipe(Option.getOrUndefined) ?? {}
                 };
                 return hn;
-            })
-                .flatMap((parsedReq) => tsplus_module_4.provideService(handle(parsedReq), handler.Request.Tag, parsedReq)
-                .flatMap(encoder)
-                .map((r) => tsplus_module_6.setStatus(r === undefined ? 204 : 200)(tsplus_module_6.setBody(res, tsplus_module_7.unsafeJson(r)))));
+            }), Effect
+                .flatMap((parsedReq) => handle(parsedReq)
+                .pipe(Effect.provideService(handler.Request.Tag, parsedReq), Effect
+                .flatMap(encoder), Effect
+                .map((r) => res.pipe(HttpServerResponse.setBody(HttpBody.unsafeJson(r)), HttpServerResponse.setStatus(r === undefined ? 204 : 200))))));
             // Commands should not be interruptable.
-            const r = req.method !== "GET" ? tsplus_module_4.uninterruptible(handleRequest) : handleRequest; // .instrument("Performance.RequestResponse")
+            const r = req.method !== "GET" ? Effect.uninterruptible(handleRequest) : handleRequest; // .instrument("Performance.RequestResponse")
             const r2 = middlewareLayer
-                ? tsplus_module_4.provide(r, middlewareLayer)
+                ? Effect.provide(r, middlewareLayer)
                 // PR is not relevant here
                 : r;
             return errorHandler(req, res, r2);
-        })), (cause) => tsplus_module_4.tapErrorCause(tsplus_module_4.sync(() => tsplus_module_6.setStatus(500)(res))
-            .tap((res) => tsplus_module_4.all([
+        })), Effect
+            .catchAllCause((cause) => Effect
+            .sync(() => HttpServerResponse.setStatus(res, 500))
+            .pipe(Effect
+            .tap((res) => Effect
+            .all([
             reportError("request")(cause, {
                 path: req.originalUrl,
                 method: req.method
             }),
-            tsplus_module_4.suspend(() => {
+            Effect.suspend(() => {
                 const headers = res.headers;
-                return tsplus_module_4.annotateLogs(tsplus_module_4.logError("Finished request", cause), {
+                return Effect
+                    .logError("Finished request", cause)
+                    .pipe(Effect.annotateLogs({
                     method: req.method,
                     path: req.originalUrl,
                     statusCode: res.status.toString(),
-                    reqPath: tsplus_module_5.RecordPretty(tsplus_module_5.object$(pars.params)),
-                    reqQuery: tsplus_module_5.RecordPretty(tsplus_module_5.object$(pars.query)),
+                    reqPath: pretty(pars.params),
+                    reqQuery: pretty(pars.query),
                     reqBody: pretty(pars.body),
                     reqCookies: pretty(pars.cookies),
                     reqHeaders: pretty(pars.headers),
-                    resHeaders: tsplus_module_5.RecordPretty(tsplus_module_5.object$(Object
+                    resHeaders: pretty(Object
                         .entries(headers)
                         .reduce((prev, [key, value]) => {
                         prev[key] = value && typeof value === "string" ? snipString(value) : value;
                         return prev;
-                    }, {})))
-                });
+                    }, {}))
+                }));
             })
-        ], { concurrency: "inherit" })), (cause) => tsplus_module_4.sync(() => console.error("Error occurred while reporting error", cause))))
-            .tap((res) => tsplus_module_4.annotateLogs(tsplus_module_4.logInfo("Finished request"), {
+        ], { concurrency: "inherit" })))
+            .pipe(Effect.tapErrorCause((cause) => Effect.sync(() => console.error("Error occurred while reporting error", cause))))), Effect
+            .tap((res) => Effect
+            .logInfo("Finished request")
+            .pipe(Effect.annotateLogs({
             method: req.method,
             path: req.originalUrl,
             statusCode: res.status.toString(),
@@ -118,10 +127,11 @@ export function makeRequestHandler(handler, errorHandler, middlewareLayer) {
                     resHeaders: pretty(res.headers)
                 }
                 : undefined)
-        }));
+        }))));
         return yield* $(eff);
-    }), (_) => tsplus_module_5.$copy(tsplus_module_5.object$(_), {
-        name: tsplus_module_2.NonEmptyString255(handler.name)
-    }));
+    })
+        .pipe((_) => updateRequestContext(_, copy((_) => ({
+        name: NonEmptyString255(handler.name)
+    }))));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZVJlcXVlc3RIYW5kbGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2FwaS9yb3V0aW5nL21ha2VSZXF1ZXN0SGFuZGxlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7OztBQUdBLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQTtBQUMvQyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sNEJBQTRCLENBQUE7QUFDdkQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFBO0FBTTdELE9BQU8sRUFBWSxnQkFBZ0IsRUFBRSxpQkFBaUIsRUFBc0IsTUFBTSxZQUFZLENBQUE7QUFDOUYsT0FBTyxFQUFFLGtCQUFrQixFQUFFLGtCQUFrQixFQUFFLE1BQU0sV0FBVyxDQUFBO0FBR2xFLE1BQU0sQ0FBQyxNQUFNLGVBQWUsR0FBRywyQkFBb0I7SUFDakQsT0FBTyxFQUFFLEtBQUs7Q0FDZixDQUFDLENBQUE7QUEwQ0YsTUFBTSxVQUFVLGtCQUFrQixDQWtCaEMsT0FhQyxFQUNELFlBSWdELEVBQ2hELGVBQTRDO0lBWTVDLE1BQU0sRUFBRSxPQUFPLEVBQUUsUUFBUSxFQUFFLENBQUMsRUFBRSxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUE7SUFFaEQsTUFBTSxRQUFRLEdBQStCLFFBQVEsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsaUJBQUMsSUFBSSxDQUFBO0lBQ3ZFLE1BQU0sSUFBSSxHQUFHLFFBQWdFLENBQUE7SUFDN0UsdUZBQXVGO0lBQ3ZGLE1BQU0sT0FBTyxHQUFHLFFBQVEsSUFBSSxJQUFJLElBQUksSUFBSSxDQUFDLE1BQU07UUFDN0MsQ0FBQyx3QkFBQyxJQUFJLENBQUMsTUFBTTtJQUNiLGtCQUFrQjtJQUNsQixzRUFBc0U7SUFDdEUsOERBQThEO0lBQzlELElBQUk7SUFDSixDQUFDLHdCQUFDLElBQUksQ0FBTyxDQUFBO0lBQ2YsdUNBQXVDO0lBQ3ZDLHFE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
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"makeRequestHandler.js","sourceRoot":"","sources":["../../../src/api/routing/makeRequestHandler.ts"],"names":[],"mappings":"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"}

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

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

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

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

package/dist/api/routing/match.js

@@ -1,12 +1,8 @@
-import * as tsplus_module_1 from "effect/Context";
-import * as tsplus_module_2 from "@effect/platform/Http/Router";
-import * as tsplus_module_3 from "effect/Effect";
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/ban-types */
-import "@effect-app/infra/api/express/schema/routing";
-import "../http.js";
+import "./schema/routing.js";
+import { Context, Effect } from "effect-app";
+import { HttpRouter } from "effect-app/http";
 import { makeRequestHandler } from "./makeRequestHandler.js";
-export const RouteDescriptors = tsplus_module_1.GenericTag("@services/RouteDescriptors");
+export const RouteDescriptors = Context.GenericTag("@services/RouteDescriptors");
 export function match(requestHandler, errorHandler, middleware) {
     let middlewareLayer = undefined;
     if (middleware) {
@@ -14,11 +10,11 @@ export function match(requestHandler, errorHandler, middleware) {
         requestHandler = handler; // todo
         middlewareLayer = makeRequestLayer;
     }
-    return tsplus_module_3.gen(function* () {
+    return Effect.gen(function* () {
         // const rdesc = yield* $(RouteDescriptors.flatMap((_) => _.get))
         const handler = makeRequestHandler(requestHandler, // one argument if no middleware, 2 if has middleware. TODO: clean this shit up
         errorHandler, middlewareLayer);
-        const route = tsplus_module_2.makeRoute(requestHandler.Request.method, requestHandler.Request.path, handler);
+        const route = HttpRouter.makeRoute(requestHandler.Request.method, requestHandler.Request.path, handler);
         // TODO
         // rdesc.push(makeRouteDescriptor(
         //   requestHandler.Request.path,
@@ -28,4 +24,4 @@ export function match(requestHandler, errorHandler, middleware) {
         return route;
     });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWF0Y2guanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXBpL3JvdXRpbmcvbWF0Y2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsdURBQXVEO0FBQ3ZELGlEQUFpRDtBQUNqRCxPQUF3Qyw4Q0FBOEMsQ0FBQTtBQUl0RixPQUEyQixZQUFZLENBQUE7QUFHdkMsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0seUJBQXlCLENBQUE7QUFHNUQsTUFBTSxDQUFDLE1BQU0sZ0JBQWdCLEdBQUcsZ0JBQUEsVUFBVSxDQUE0Qiw0QkFBNEIsQ0FBQyxDQUFBO0FBRW5HLE1BQU0sVUFBVSxLQUFLLENBb0JuQixjQWVDLEVBQ0QsWUFJdUcsRUFDdkcsVUFrQkM7SUFFRCxJQUFJLGVBQWUsR0FBMkMsU0FBUyxDQUFBO0lBQ3ZFLElBQUksVUFBVSxFQUFFLENBQUM7UUFDZixNQUFNLEVBQUUsT0FBTyxFQUFFLGdCQUFnQixFQUFFLEdBQUcsVUFBVSxDQUFDLGNBQWMsQ0FBQyxDQUFBO1FBQ2hFLGNBQWMsR0FBRyxPQUFjLENBQUEsQ0FBQyxPQUFPO1FBQ3ZDLGVBQWUsR0FBRyxnQkFBZ0IsQ0FBQTtJQUNwQyxDQUFDO0lBQ0QsT0FBTyxvQkFBVyxRQUFRLENBQUM7UUFDekIsaUVBQWlFO1FBRWpFLE1BQU0sT0FBTyxHQUFHLGtCQUFrQixDQWtCaEMsY0FBcUIsRUFBRSwrRUFBK0U7UUFDdEcsWUFBWSxFQUNaLGVBQWUsQ0FDaEIsQ0FBQTtRQUVELE1BQU0sS0FBSyxHQUFHLDBCQUNaLGNBQWMsQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUM3QixjQUFjLENBQUMsT0FBTyxDQUFDLElBQUksRUFDM0IsT0FBTyxDQUNSLENBQUE7UUFDRCxPQUFPO1FBQ1Asa0NBQWtDO1FBQ2xDLGlDQUFpQztRQUNqQyxtQ0FBbUM7UUFDbkMsbUJBQW1CO1FBQ25CLEtBQUs7UUFDTCxPQUFPLEtBQUssQ0FBQTtJQUNkLENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWF0Y2guanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXBpL3JvdXRpbmcvbWF0Y2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBSUEsT0FBd0MscUJBQXFCLENBQUE7QUFHN0QsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDNUMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlCQUFpQixDQUFBO0FBRzVDLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBRzVELE1BQU0sQ0FBQyxNQUFNLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQTRCLDRCQUE0QixDQUFDLENBQUE7QUFFM0csTUFBTSxVQUFVLEtBQUssQ0FvQm5CLGNBZUMsRUFDRCxZQVFDLEVBQ0QsVUFrQkM7SUFFRCxJQUFJLGVBQWUsR0FBMkMsU0FBUyxDQUFBO0lBQ3ZFLElBQUksVUFBVSxFQUFFLENBQUM7UUFDZixNQUFNLEVBQUUsT0FBTyxFQUFFLGdCQUFnQixFQUFFLEdBQUcsVUFBVSxDQUFDLGNBQWMsQ0FBQyxDQUFBO1FBQ2hFLGNBQWMsR0FBRyxPQUFjLENBQUEsQ0FBQyxPQUFPO1FBQ3ZDLGVBQWUsR0FBRyxnQkFBZ0IsQ0FBQTtJQUNwQyxDQUFDO0lBQ0QsT0FBTyxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQztRQUN6QixpRUFBaUU7UUFFakUsTUFBTSxPQUFPLEdBQUcsa0JBQWtCLENBa0JoQyxjQUFxQixFQUFFLCtFQUErRTtRQUN0RyxZQUFZLEVBQ1osZUFBZSxDQUNoQixDQUFBO1FBRUQsTUFBTSxLQUFLLEdBQUcsVUFBVSxDQUFDLFNBQVMsQ0FDaEMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxNQUFNLEVBQzdCLGNBQWMsQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUMzQixPQUFPLENBQ1IsQ0FBQTtRQUNELE9BQU87UUFDUCxrQ0FBa0M7UUFDbEMsaUNBQWlDO1FBQ2pDLG1DQUFtQztRQUNuQyxtQkFBbUI7UUFDbkIsS0FBSztRQUNMLE9BQU8sS0FBSyxDQUFBO0lBQ2QsQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDIn0=

package/dist/api/routing/schema/jwt.d.ts

@@ -0,0 +1,4 @@
+import * as S from "effect-app/schema";
+import { type JwtDecodeOptions } from "jwt-decode";
+export declare const parseJwt: <R, I, A>(schema: S.Schema<A, I, R>, options?: JwtDecodeOptions | undefined) => S.Schema<A, string, R>;
+//# sourceMappingURL=jwt.d.ts.map

package/dist/api/routing/schema/jwt.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"jwt.d.ts","sourceRoot":"","sources":["../../../../src/api/routing/schema/jwt.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,CAAC,MAAM,mBAAmB,CAAA;AACtC,OAAO,EAAa,KAAK,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAE7D,eAAO,MAAM,QAAQ,iDAET,gBAAgB,GAAG,SAAS,2BAeO,CAAA"}

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

@@ -0,0 +1,11 @@
+import * as S from "effect-app/schema";
+import { jwtDecode } from "jwt-decode";
+export const parseJwt = (schema, options) => S
+    .transformOrFail(S.string, S.unknown, (s, __, ast) => S.ParseResult.try({
+    try: () => jwtDecode(s, options),
+    catch: (e) => S.ParseResult.type(ast, s, e?.message)
+}), (_) => {
+    throw new Error("not implemented");
+})
+    .pipe(S.compose(schema, { strict: false }));
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiand0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2FwaS9yb3V0aW5nL3NjaGVtYS9qd3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBS0EsT0FBTyxLQUFLLENBQUMsTUFBTSxtQkFBbUIsQ0FBQTtBQUN0QyxPQUFPLEVBQUUsU0FBUyxFQUF5QixNQUFNLFlBQVksQ0FBQTtBQUU3RCxNQUFNLENBQUMsTUFBTSxRQUFRLEdBQUcsQ0FDdEIsTUFBeUIsRUFDekIsT0FBc0MsRUFDZCxFQUFFLENBQzFCLENBQUM7S0FDRSxlQUFlLENBQ2QsQ0FBQyxDQUFDLE1BQU0sRUFDUixDQUFDLENBQUMsT0FBTyxFQUNULENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxHQUFHLEVBQUUsRUFBRSxDQUNiLENBQUMsQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDO0lBQ2hCLEdBQUcsRUFBRSxHQUFHLEVBQUUsQ0FBQyxTQUFTLENBQUMsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUNoQyxLQUFLLEVBQUUsQ0FBQyxDQUFNLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLEVBQUUsQ0FBQyxFQUFFLE9BQU8sQ0FBQztDQUMxRCxDQUFDLEVBQ0osQ0FBQyxDQUFDLEVBQThCLEVBQUU7SUFDaEMsTUFBTSxJQUFJLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxDQUFBO0FBQ3BDLENBQUMsQ0FDRjtLQUNBLElBQUksQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUEifQ==

package/dist/api/{express → routing}/schema/routing.d.ts

@@ -1,4 +1,4 @@
-import { Tag } from "effect/Context";
+import type { Context } from "effect-app";
 import type { REST } from "effect-app/schema";
 export type Request<M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA, PPath extends `/${string}`> = REST.ReqRes<any, unknown, ReqA> & {
     method: REST.SupportedMethods;
@@ -8,7 +8,7 @@ export type Request<M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends Path
     Body?: REST.ReqRes<BodyA, unknown, any>;
     Query?: REST.ReqRes<QueryA, Record<string, string>, any>;
     Headers?: REST.ReqRes<HeaderA, Record<string, string>, any>;
-    Tag: Tag<M, M>;
+    Tag: Context.Tag<M, M>;
 };
 export interface RouteRequestHandler<M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA, ResA, PPath extends `/${string}`> {
     Request: Request<M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, PPath>;

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

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

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

@@ -0,0 +1,123 @@
+export function asRouteDescriptionAny(i) {
+    return i;
+}
+export function arrAsRouteDescriptionAny(arr) {
+    return arr.map(asRouteDescriptionAny);
+}
+export function makeRouteDescriptor(path, method, handler) {
+    return { path, handler, method, _tag: "Schema" };
+}
+// export function makeFromSchema<ResA>(
+//   e: RouteDescriptor<any, any, any, any, any, any, ResA, any>
+// ) {
+//   const jsonSchema_ = OpenApi.for
+//   const jsonSchema = <E, A>(r: REST.ReqRes<A, E, any>) => jsonSchema_(r)
+//   const { Request: Req, Response: Res_, ResponseOpenApi } = e.handler
+//   const r = ResponseOpenApi ?? Res_
+//   const Res = r ? S.extractSchema(r) : S.Void
+//   // TODO EffectOption.fromNullable(Req.Headers).flatMapOpt(jsonSchema)
+//   // TODO: use the path vs body etc serialisation also in the Client.
+//   const makeReqQuerySchema = Effect.sync(() => Option.fromNullable(Req.Query)).flatMap((_) =>
+//     _.match({
+//       onNone: () => Effect.sync(() => Option.none()),
+//       onSome: (_) => jsonSchema(_).map(Option.some)
+//     })
+//   )
+//   const makeReqHeadersSchema = Effect.sync(() => Option.fromNullable(Req.Headers)).flatMap((_) =>
+//     _.match({
+//       onNone: () => Effect.sync(() => Option.none()),
+//       onSome: (_) => jsonSchema(_).map(Option.some)
+//     })
+//   )
+//   const makeReqCookieSchema = Effect.sync(() => Option.fromNullable(Req.Cookie)).flatMap((_) =>
+//     _.match({
+//       onNone: () => Effect.sync(() => Option.none()),
+//       onSome: (_) => jsonSchema(_).map(Option.some)
+//     })
+//   )
+//   const makeReqPathSchema = Effect.sync(() => Option.fromNullable(Req.Path)).flatMap((_) =>
+//     _.match({
+//       onNone: () => Effect.sync(() => Option.none()),
+//       onSome: (_) => jsonSchema(_).map(Option.some)
+//     })
+//   )
+//   const makeReqBodySchema = Effect.sync(() => Option.fromNullable(Req.Body)).flatMap((_) =>
+//     _.match({
+//       onNone: () => Effect.sync(() => Option.none()),
+//       onSome: (_) => jsonSchema(_).map(Option.some)
+//     })
+//   )
+//   // const makeReqSchema = schema(Req)
+//   const makeResSchema = jsonSchema_(Res)
+//   function makeParameters(inn: ParameterLocation) {
+//     return (a: Option<JSONSchema | SubSchema>) => {
+//       return a
+//         .flatMap((o) => (isObjectSchema(o) ? Option.some(o) : Option.none()))
+//         .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
+//             const schema = x.properties![p]
+//             const required = Boolean(x.required?.includes(p))
+//             return { name: p, in: inn, required, schema }
+//           })
+//         })
+//         .getOrElse(() => [])
+//     }
+//   }
+//   return Effect
+//     .all({
+//       req: jsonSchema(Req.Model),
+//       reqQuery: makeReqQuerySchema,
+//       reqHeaders: makeReqHeadersSchema,
+//       reqBody: makeReqBodySchema,
+//       reqPath: makeReqPathSchema,
+//       reqCookie: makeReqCookieSchema,
+//       res: makeResSchema
+//     })
+//     .map((_) => {
+//       // console.log("$$$ REQ", _.req)
+//       const isEmpty = !e.handler.Response || e.handler.Response === S.Void
+//       return {
+//         path: e.path,
+//         method: e.method.toLowerCase(),
+//         tags: e.info?.tags,
+//         description: _.req?.description,
+//         summary: _.req?.summary,
+//         operationId: _.req?.title,
+//         parameters: [
+//           ...makeParameters("path")(_.reqPath),
+//           ...makeParameters("query")(_.reqQuery),
+//           ...makeParameters("header")(_.reqHeaders),
+//           ...makeParameters("cookie")(_.reqCookie)
+//         ],
+//         requestBody: _
+//           .reqBody
+//           .map((schema) => ({
+//             content: { "application/json": { schema } }
+//           }))
+//           .value,
+//         responses: [
+//           isEmpty
+//             ? new Response(204, { description: "Empty" })
+//             : new Response(200, {
+//               description: "OK",
+//               content: { "application/json": { schema: _.res } }
+//             }),
+//           new Response(400, { description: "ValidationError" })
+//         ]
+//           .concat(
+//             e.path.includes(":") && isEmpty
+//               ? [new Response(404, { description: "NotFoundError" })]
+//               : []
+//           )
+//       }
+//     })
+// }
+// class Response {
+//   constructor(
+//     public readonly statusCode: number,
+//     public readonly type: any // string | JSONSchema | SubSchema
+//   ) {}
+// }
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9hcGkvcm91dGluZy9zY2hlbWEvcm91dGluZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUF5Q0EsTUFBTSxVQUFVLHFCQUFxQixDQUErQixDQUFJO0lBQ3RFLE9BQU8sQ0FBdUIsQ0FBQTtBQUNoQyxDQUFDO0FBRUQsTUFBTSxVQUFVLHdCQUF3QixDQUN0QyxHQUFxQjtJQUVyQixPQUFPLEdBQUcsQ0FBQyxHQUFHLENBQUMscUJBQXFCLENBQUMsQ0FBQTtBQUN2QyxDQUFDO0FBaUNELE1BQU0sVUFBVSxtQkFBbUIsQ0FXakMsSUFBa0IsRUFDbEIsTUFBYyxFQUNkLE9BVUM7SUFZRCxPQUFPLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxDQUFBO0FBQ2xELENBQUM7QUFFRCx3Q0FBd0M7QUFDeEMsZ0VBQWdFO0FBQ2hFLE1BQU07QUFDTixvQ0FBb0M7QUFDcEMsMkVBQTJFO0FBQzNFLHdFQUF3RTtBQUN4RSxzQ0FBc0M7QUFDdEMsZ0RBQWdEO0FBQ2hELDBFQUEwRTtBQUMxRSx3RUFBd0U7QUFDeEUsZ0dBQWdHO0FBQ2hHLGdCQUFnQjtBQUNoQix3REFBd0Q7QUFDeEQsc0RBQXNEO0FBQ3RELFNBQVM7QUFDVCxNQUFNO0FBQ04sb0dBQW9HO0FBQ3BHLGdCQUFnQjtBQUNoQix3REFBd0Q7QUFDeEQsc0RBQXNEO0FBQ3RELFNBQVM7QUFDVCxNQUFNO0FBQ04sa0dBQWtHO0FBQ2xHLGdCQUFnQjtBQUNoQix3REFBd0Q7QUFDeEQsc0RBQXNEO0FBQ3RELFNBQVM7QUFDVCxNQUFNO0FBQ04sOEZBQThGO0FBQzlGLGdCQUFnQjtBQUNoQix3REFBd0Q7QUFDeEQsc0RBQXNEO0FBQ3RELFNBQVM7QUFDVCxNQUFNO0FBQ04sOEZBQThGO0FBQzlGLGdCQUFnQjtBQUNoQix3REFBd0Q7QUFDeEQsc0RBQXNEO0FBQ3RELFNBQVM7QUFDVCxNQUFNO0FBQ04seUNBQXlDO0FBRXpDLDJDQUEyQztBQUUzQyxzREFBc0Q7QUFDdEQsc0RBQXNEO0FBQ3RELGlCQUFpQjtBQUNqQixnRkFBZ0Y7QUFDaEYsd0JBQXdCO0FBQ3hCLGlGQUFpRjtBQUNqRiwyREFBMkQ7QUFDM0QsbUZBQW1GO0FBQ25GLDhDQUE4QztBQUM5QyxnRUFBZ0U7QUFDaEUsNERBQTREO0FBQzVELGVBQWU7QUFDZixhQUFhO0FBQ2IsK0JBQStCO0FBQy9CLFFBQVE7QUFDUixNQUFNO0FBRU4sa0JBQWtCO0FBQ2xCLGFBQWE7QUFDYixvQ0FBb0M7QUFDcEMsc0NBQXNDO0FBQ3RDLDBDQUEwQztBQUMxQyxvQ0FBb0M7QUFDcEMsb0NBQW9DO0FBQ3BDLHdDQUF3QztBQUN4QywyQkFBMkI7QUFDM0IsU0FBUztBQUNULG9CQUFvQjtBQUNwQix5Q0FBeUM7QUFDekMsNkVBQTZFO0FBQzdFLGlCQUFpQjtBQUNqQix3QkFBd0I7QUFDeEIsMENBQTBDO0FBQzFDLDhCQUE4QjtBQUM5QiwyQ0FBMkM7QUFDM0MsbUNBQW1DO0FBQ25DLHFDQUFxQztBQUNyQyx3QkFBd0I7QUFDeEIsa0RBQWtEO0FBQ2xELG9EQUFvRDtBQUNwRCx1REFBdUQ7QUFDdkQscURBQXFEO0FBQ3JELGFBQWE7QUFDYix5QkFBeUI7QUFDekIscUJBQXFCO0FBQ3JCLGdDQUFnQztBQUNoQywwREFBMEQ7QUFDMUQsZ0JBQWdCO0FBQ2hCLG9CQUFvQjtBQUNwQix1QkFBdUI7QUFDdkIsb0JBQW9CO0FBQ3BCLDREQUE0RDtBQUM1RCxvQ0FBb0M7QUFDcEMsbUNBQW1DO0FBQ25DLG1FQUFtRTtBQUNuRSxrQkFBa0I7QUFDbEIsa0VBQWtFO0FBQ2xFLFlBQVk7QUFDWixxQkFBcUI7QUFDckIsOENBQThDO0FBQzlDLHdFQUF3RTtBQUN4RSxxQkFBcUI7QUFDckIsY0FBYztBQUNkLFVBQVU7QUFDVixTQUFTO0FBQ1QsSUFBSTtBQUVKLG1CQUFtQjtBQUNuQixpQkFBaUI7QUFDakIsMENBQTBDO0FBQzFDLG1FQUFtRTtBQUNuRSxTQUFTO0FBQ1QsSUFBSSJ9

package/dist/api/routing.js

@@ -5,4 +5,6 @@ export * from "./routing/base.js";
 export * from "./routing/defaultErrorHandler.js";
 export * from "./routing/makeRequestHandler.js";
 export * from "./routing/match.js";
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hcGkvcm91dGluZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsaURBQWlEO0FBRWpELHlEQUF5RDtBQUN6RCxjQUFjLG1CQUFtQixDQUFBO0FBQ2pDLGNBQWMsa0NBQWtDLENBQUE7QUFDaEQsY0FBYyxpQ0FBaUMsQ0FBQTtBQUMvQyxjQUFjLG9CQUFvQixDQUFBIn0=
+// codegen:end
+// export * from "@effect-app/infra/api/routing"
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hcGkvcm91dGluZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsaURBQWlEO0FBRWpELHlEQUF5RDtBQUN6RCxjQUFjLG1CQUFtQixDQUFBO0FBQ2pDLGNBQWMsa0NBQWtDLENBQUE7QUFDaEQsY0FBYyxpQ0FBaUMsQ0FBQTtBQUMvQyxjQUFjLG9CQUFvQixDQUFBO0FBQ2xDLGNBQWM7QUFFZCxnREFBZ0QifQ==

package/dist/api/setupRequest.d.ts

@@ -1,15 +1,13 @@
-import { Effect } from "effect/Effect";
+import { Effect } from "effect-app";
 import { RequestContext } from "../RequestContext.js";
 import { RequestContextContainer } from "../services/RequestContextContainer.js";
 import { ContextMapContainer } from "../services/Store/ContextMapContainer.js";
 /**
  * @tsplus fluent effect/io/Effect setupRequestContext
- * @tsplus location "@effect-app/infra/api/setupRequest"
  */
-export declare function setupRequestContext<R, E, A>(self: Effect<A, E, R>, requestContext: RequestContext | string): import("effect/Effect").Effect<A, E, RequestContextContainer | ContextMapContainer | Exclude<Exclude<R, import("effect/Tracer").ParentSpan>, never>>;
+export declare function setupRequestContext<R, E, A>(self: Effect<A, E, R>, requestContext: RequestContext | string): Effect.Effect<A, E, RequestContextContainer | ContextMapContainer | Exclude<Exclude<R, import("effect/Tracer").ParentSpan>, never>>;
 /**
  * @tsplus fluent effect/io/Effect updateRequestContext
- * @tsplus location "@effect-app/infra/api/setupRequest"
  */
-export declare function updateRequestContext<R, E, A>(self: Effect<A, E, R>, f: (rc: RequestContext) => RequestContext): import("effect/Effect").Effect<A, E, RequestContextContainer | Exclude<R, never>>;
+export declare function updateRequestContext<R, E, A>(self: Effect<A, E, R>, f: (rc: RequestContext) => RequestContext): Effect.Effect<A, E, RequestContextContainer | Exclude<R, never>>;
 //# sourceMappingURL=setupRequest.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"setupRequest.d.ts","sourceRoot":"","sources":["../../src/api/setupRequest.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAA;AAChF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAA;;;;;AAiD9E,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,EAAE,cAAc,GAAG,MAAM,wJAI1G;;;;;AAQD,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,cAAc,KAAK,cAAc,qFAI7G"}
+{"version":3,"file":"setupRequest.d.ts","sourceRoot":"","sources":["../../src/api/setupRequest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAe,MAAM,YAAY,CAAA;AAEhD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,uBAAuB,EAAkB,MAAM,wCAAwC,CAAA;AAChG,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAA;AAkD9E;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,EAAE,cAAc,GAAG,MAAM,uIAM1G;AAKD;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,cAAc,KAAK,cAAc,oEAE7G"}

package/dist/api/setupRequest.js

@@ -1,53 +1,49 @@
-import * as tsplus_module_1 from "effect-app/schema";
-import * as tsplus_module_2 from "effect/Effect";
-import * as tsplus_module_3 from "@effect-app/infra/services/RequestContextContainer";
-import * as tsplus_module_4 from "effect/Layer";
+import { NonEmptyString255 } from "@effect-app/schema";
+import { Effect, Layer, pipe } from "effect-app";
 import { RequestId } from "effect-app/ids";
 import { RequestContext } from "../RequestContext.js";
-import { RequestContextContainer } from "../services/RequestContextContainer.js";
+import { RequestContextContainer, spanAttributes } from "../services/RequestContextContainer.js";
 import { ContextMapContainer } from "../services/Store/ContextMapContainer.js";
 function makeInternalRequestContext(name) {
-    return tsplus_module_2.sync(() => {
+    return Effect.sync(() => {
         const id = RequestId.make();
         return new RequestContext({
             id,
             rootId: id,
             locale: "en",
-            name: tsplus_module_1.NonEmptyString255(name)
+            name: NonEmptyString255(name)
         });
     });
 }
-const withRequestSpan = (f) => RequestContextContainer
-    .get
-    .andThen((ctx) => tsplus_module_2.withLogSpan(tsplus_module_2.withSpan(f, "request", { attributes: tsplus_module_3.spanAttributes(ctx) })
+const withRequestSpan = (f) => Effect.andThen(RequestContextContainer
+    .get, (ctx) => f.pipe(Effect.withSpan("request", { attributes: spanAttributes(ctx) }), 
 // request context info is picked up directly in the logger for annotations.
-, "request"));
-const setupContextMap = tsplus_module_4.effectDiscard(ContextMapContainer.andThen((_) => _.start));
+Effect.withLogSpan("request")));
+const setupContextMap = Effect.andThen(ContextMapContainer, (_) => _.start).pipe(Layer.effectDiscard);
 // const RequestContextLiveFromRequestContext = (requestContext: RequestContext) =>
 //   RequestContext.Tag.makeLayer(requestContext)
 // memoization problem
 // const RequestContextLive = RequestContextContainer.get.toLayer(RequestContext.Tag)
-const RequestContextStartLiveFromRequestContext = (requestContext) => tsplus_module_4.provideMerge(setupContextMap
+const RequestContextStartLiveFromRequestContext = (requestContext) => Layer.provideMerge(setupContextMap, 
 // .provideMerge(RequestContextLiveFromRequestContext(requestContext))
-, tsplus_module_4.effectDiscard(RequestContextContainer
-    .andThen((_) => _.start(requestContext))));
+Effect
+    .andThen(RequestContextContainer, (_) => _.start(requestContext))
+    .pipe(Layer.effectDiscard));
 const RequestContextStartLive = (requestContext) => typeof requestContext === "string"
-    ? tsplus_module_4.unwrapEffect(makeInternalRequestContext(requestContext)
-        .andThen(RequestContextStartLiveFromRequestContext)) : RequestContextStartLiveFromRequestContext(requestContext);
+    ? pipe(makeInternalRequestContext(requestContext), Effect.andThen(RequestContextStartLiveFromRequestContext), Layer.unwrapEffect)
+    : RequestContextStartLiveFromRequestContext(requestContext);
 /**
  * @tsplus fluent effect/io/Effect setupRequestContext
  */
 export function setupRequestContext(self, requestContext) {
-    return tsplus_module_2.provide(self
-        .pipe(withRequestSpan), RequestContextStartLive(requestContext));
+    return self
+        .pipe(withRequestSpan, Effect.provide(RequestContextStartLive(requestContext)));
 }
-const UpdateRequestContextLive = (f) => tsplus_module_4.effectDiscard(RequestContextContainer.andThen((rcc) => rcc.update(f)));
+const UpdateRequestContextLive = (f) => Effect.andThen(RequestContextContainer, (rcc) => rcc.update(f)).pipe(Layer.effectDiscard);
 /**
  * @tsplus fluent effect/io/Effect updateRequestContext
  */
 export function updateRequestContext(self, f) {
-    return tsplus_module_2.provide(self
-    // .provideServiceEffect(RequestContext.Tag, RequestContextContainer.get)
-    , UpdateRequestContextLive(f));
+    return Effect.provide(self, UpdateRequestContextLive(f));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FwaS9zZXR1cFJlcXVlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQTtBQUMxQyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFDckQsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sd0NBQXdDLENBQUE7QUFDaEYsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMENBQTBDLENBQUE7QUFFOUUsU0FBUywwQkFBMEIsQ0FBQyxJQUFZO0lBQzlDLE9BQU8scUJBQVksR0FBRyxFQUFFO1FBQ3RCLE1BQU0sRUFBRSxHQUFHLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtRQUMzQixPQUFPLElBQUksY0FBYyxDQUFDO1lBQ3hCLEVBQUU7WUFDRixNQUFNLEVBQUUsRUFBRTtZQUNWLE1BQU0sRUFBRSxJQUFJO1lBQ1osSUFBSSxFQUFFLGdCQUFBLGlCQUFpQixDQUFDLElBQUksQ0FBQztTQUM5QixDQUFDLENBQUE7SUFDSixDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUM7QUFFRCxNQUFNLGVBQWUsR0FBRyxDQUFVLENBQWtCLEVBQUUsRUFBRSxDQUN0RCx1QkFBdUI7S0FDcEIsR0FBRztLQUNILE9BQU8sQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQ2YsNEJBQUEseUJBQUEsQ0FBQyxFQUNXLFNBQVMsRUFBRSxFQUFFLFVBQVUsaUNBQUUsR0FBRyxDQUFlLEVBQUUsQ0FBQztBQUN4RCw0RUFBNEU7RUFDL0QsU0FBUyxDQUFDLENBQzFCLENBQUE7QUFFTCxNQUFNLGVBQWUsaUNBQUcsbUJBQW1CLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQWUsQ0FBQTtBQUVsRixtRkFBbUY7QUFDbkYsaURBQWlEO0FBQ2pELHNCQUFzQjtBQUN0QixxRkFBcUY7QUFDckYsTUFBTSx5Q0FBeUMsR0FBRyxDQUFDLGNBQThCLEVBQUUsRUFBRSxDQUNuRiw2QkFBQSxlQUFlO0FBQ2Isc0VBQXNFO2dDQUVwRSx1QkFBdUI7S0FDcEIsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLGNBQWMsQ0FBQyxDQUFDLEVBRTNDLENBQUE7QUFFTCxNQUFNLHVCQUF1QixHQUFHLENBQUMsY0FBdUMsRUFBRSxFQUFFLENBQzFFLE9BQU8sY0FBYyxLQUFLLFFBQVE7SUFDaEMsQ0FBQyw4QkFBQywwQkFBMEIsQ0FBQyxjQUFjLENBQUM7U0FDekMsT0FBTyxDQUFDLHlDQUF5QyxDQUFDLEVBRXJELENBQUMsQ0FBQyx5Q0FBeUMsQ0FBQyxjQUFjLENBQUMsQ0FBQTtBQUUvRDs7R0FFRztBQUNILE1BQU0sVUFBVSxtQkFBbUIsQ0FBVSxJQUFxQixFQUFFLGNBQXVDO0lBQ3pHLE9BQU8sd0JBQUEsSUFBSTtTQUNSLElBQUksQ0FBQyxlQUFlLENBQUMsRUFDYix1QkFBdUIsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFBO0FBQ3JELENBQUM7QUFFRCxNQUFNLHdCQUF3QixHQUFHLENBQUMsQ0FBeUMsRUFBRSxFQUFFLCtCQUM3RSx1QkFBdUIsQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBZSxDQUFBO0FBRXhFOztHQUVHO0FBQ0gsTUFBTSxVQUFVLG9CQUFvQixDQUFVLElBQXFCLEVBQUUsQ0FBeUM7SUFDNUcsT0FBTyx3QkFBQSxJQUFJO0lBQ1QseUVBQXlFO01BQ2hFLHdCQUF3QixDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFDekMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FwaS9zZXR1cFJlcXVlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDdEQsT0FBTyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQ2hELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQTtBQUMxQyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFDckQsT0FBTyxFQUFFLHVCQUF1QixFQUFFLGNBQWMsRUFBRSxNQUFNLHdDQUF3QyxDQUFBO0FBQ2hHLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDBDQUEwQyxDQUFBO0FBRTlFLFNBQVMsMEJBQTBCLENBQUMsSUFBWTtJQUM5QyxPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFO1FBQ3RCLE1BQU0sRUFBRSxHQUFHLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtRQUMzQixPQUFPLElBQUksY0FBYyxDQUFDO1lBQ3hCLEVBQUU7WUFDRixNQUFNLEVBQUUsRUFBRTtZQUNWLE1BQU0sRUFBRSxJQUFJO1lBQ1osSUFBSSxFQUFFLGlCQUFpQixDQUFDLElBQUksQ0FBQztTQUM5QixDQUFDLENBQUE7SUFDSixDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUM7QUFFRCxNQUFNLGVBQWUsR0FBRyxDQUFVLENBQWtCLEVBQUUsRUFBRSxDQUN0RCxNQUFNLENBQUMsT0FBTyxDQUNaLHVCQUF1QjtLQUNwQixHQUFHLEVBQ04sQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUNOLENBQUMsQ0FBQyxJQUFJLENBQ0osTUFBTSxDQUFDLFFBQVEsQ0FBQyxTQUFTLEVBQUUsRUFBRSxVQUFVLEVBQUUsY0FBYyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUM7QUFDL0QsNEVBQTRFO0FBQzVFLE1BQU0sQ0FBQyxXQUFXLENBQUMsU0FBUyxDQUFDLENBQzlCLENBQ0osQ0FBQTtBQUVILE1BQU0sZUFBZSxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUMsbUJBQW1CLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxDQUFBO0FBRXJHLG1GQUFtRjtBQUNuRixpREFBaUQ7QUFDakQsc0JBQXNCO0FBQ3RCLHFGQUFxRjtBQUNyRixNQUFNLHlDQUF5QyxHQUFHLENBQUMsY0FBOEIsRUFBRSxFQUFFLENBQ25GLEtBQUssQ0FBQyxZQUFZLENBQ2hCLGVBQWU7QUFDZixzRUFBc0U7QUFDdEUsTUFBTTtLQUNILE9BQU8sQ0FBQyx1QkFBdUIsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxjQUFjLENBQUMsQ0FBQztLQUNoRSxJQUFJLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxDQUM3QixDQUFBO0FBRUgsTUFBTSx1QkFBdUIsR0FBRyxDQUFDLGNBQXVDLEVBQUUsRUFBRSxDQUMxRSxPQUFPLGNBQWMsS0FBSyxRQUFRO0lBQ2hDLENBQUMsQ0FBQyxJQUFJLENBQ0osMEJBQTBCLENBQUMsY0FBYyxDQUFDLEVBQzFDLE1BQU0sQ0FBQyxPQUFPLENBQUMseUNBQXlDLENBQUMsRUFDekQsS0FBSyxDQUFDLFlBQVksQ0FDbkI7SUFDRCxDQUFDLENBQUMseUNBQXlDLENBQUMsY0FBYyxDQUFDLENBQUE7QUFFL0Q7O0dBRUc7QUFDSCxNQUFNLFVBQVUsbUJBQW1CLENBQVUsSUFBcUIsRUFBRSxjQUF1QztJQUN6RyxPQUFPLElBQUk7U0FDUixJQUFJLENBQ0gsZUFBZSxFQUNmLE1BQU0sQ0FBQyxPQUFPLENBQUMsdUJBQXVCLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FDeEQsQ0FBQTtBQUNMLENBQUM7QUFFRCxNQUFNLHdCQUF3QixHQUFHLENBQUMsQ0FBeUMsRUFBRSxFQUFFLENBQzdFLE1BQU0sQ0FBQyxPQUFPLENBQUMsdUJBQXVCLEVBQUUsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxDQUFBO0FBRTNGOztHQUVHO0FBQ0gsTUFBTSxVQUFVLG9CQUFvQixDQUFVLElBQXFCLEVBQUUsQ0FBeUM7SUFDNUcsT0FBTyxNQUFNLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSx3QkFBd0IsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO0FBQzFELENBQUMifQ==