@effect-app/infra 1.14.4 → 1.16.0

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @effect-app/infra
 
+## 1.16.0
+
+### Minor Changes
+
+- feat: add new router support
+
+### Patch Changes
+
+- Updated dependencies
+  - effect-app@1.15.0
+  - @effect-app/infra-adapters@1.10.1
+
+## 1.15.0
+
+### Minor Changes
+
+- b3d9a3e: update packages
+
+### Patch Changes
+
+- Updated dependencies [b3d9a3e]
+  - @effect-app/infra-adapters@1.10.0
+  - effect-app@1.14.0
+  - @effect-app/schema@1.11.0
+  - @effect-app/core@1.9.0
+
 ## 1.14.4
 
 ### Patch Changes

package/_cjs/router.cjs

@@ -0,0 +1,150 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.makeRouter = void 0;
+var _Effect = require("@effect-app/core/Effect");
+var _utils = require("@effect-app/core/utils");
+var _routing = require("@effect-app/infra/api/routing");
+var _effectApp = require("effect-app");
+var _http = require("effect-app/http");
+var _schema = require("effect-app/schema");
+// TODO: support FLIP
+const makeRouter = (handleRequestEnv /* Middleware */) => {
+  function match(requestHandler, errorHandler, middleware) {
+    let middlewareLayer = undefined;
+    if (middleware) {
+      const {
+        handler,
+        makeRequestLayer
+      } = middleware(requestHandler);
+      requestHandler = handler; // todo
+      middlewareLayer = makeRequestLayer;
+    }
+    // const rdesc = yield* RouteDescriptors.flatMap((_) => _.get)
+    const handler = (0, _routing.makeRequestHandler)(requestHandler,
+    // one argument if no middleware, 2 if has middleware. TODO: clean this shit up
+    errorHandler, middlewareLayer);
+    const route = _http.HttpRouter.makeRoute(requestHandler.Request.method, requestHandler.Request.path, handler);
+    // TODO
+    // rdesc.push(makeRouteDescriptor(
+    //   requestHandler.Request.path,
+    //   requestHandler.Request.method,
+    //   requestHandler
+    // ))
+    return route;
+  }
+  function handle(_, name, adaptResponse) {
+    const Request = _effectApp.S.REST.extractRequest(_);
+    const Response = _effectApp.S.REST.extractResponse(_);
+    return h => ({
+      adaptResponse,
+      h: h.handler,
+      name,
+      Request,
+      Response,
+      ResponseOpenApi: _.ResponseOpenApi ?? Response,
+      Context: null,
+      CTX: null,
+      rt: h._tag
+    });
+  }
+  function matchFor(rsc) {
+    const filtered = (0, _utils.typedKeysOf)(rsc).reduce((acc, cur) => {
+      if (_effectApp.Predicate.isObject(rsc[cur]) && rsc[cur].Request) {
+        acc[cur] = rsc[cur];
+      }
+      return acc;
+    }, {});
+    const matchWithServices = action => {
+      return (services, f) => (req, ctx) => _effectApp.Effect.andThen((0, _Effect.allLower)(services), svc2 => f(req, {
+        ...ctx,
+        ...svc2,
+        Response: rsc[action].Response
+      }));
+    };
+    const controllers = controllers => {
+      const handlers = (0, _utils.typedKeysOf)(filtered).reduce((acc, cur) => {
+        if (cur === "meta") return acc;
+        const m = rsc.meta;
+        if (!m) throw new Error("Resource has no meta specified");
+        acc[cur] = handle(rsc[cur], m.moduleName + "." + cur)(controllers[cur]);
+        return acc;
+      }, {});
+      const mapped = (0, _utils.typedKeysOf)(handlers).reduce((acc, cur) => {
+        const handler = handlers[cur];
+        const req = handler.Request;
+        class Request extends req {
+          static path = "/" + handler.name + (req.path === "/" ? "" : req.path);
+          static method = req.method === "AUTO" ? _schema.REST.determineMethod(handler.name.split(".")[1], req) : req.method;
+        }
+        if (req.method === "AUTO") {
+          Object.assign(Request, {
+            [Request.method === "GET" || Request.method === "DELETE" ? "Query" : "Body"]: req.Auto
+          });
+        }
+        Object.assign(handler, {
+          Request
+        });
+        acc[cur] = match(handler, errorHandler(req), handleRequestEnv // TODO
+        );
+        return acc;
+      }, {});
+      return _http.HttpRouter.fromIterable(Object.values(mapped));
+    };
+    const r = {
+      controllers,
+      ...(0, _utils.typedKeysOf)(filtered).reduce((prev, cur) => {
+        ;
+        prev[cur] = (svcOrFnOrEffect, fnOrNone) => _effectApp.Effect.isEffect(svcOrFnOrEffect) ? class {
+          static _tag = "d";
+          static handler = () => svcOrFnOrEffect;
+        } : typeof svcOrFnOrEffect === "function" ? class {
+          static _tag = "d";
+          static handler = (req, ctx) => svcOrFnOrEffect(req, {
+            ...ctx,
+            Response: rsc[cur].Response
+          });
+        } : class {
+          static _tag = "d";
+          static handler = matchWithServices(cur)(svcOrFnOrEffect, fnOrNone);
+        };
+        prev[cur + "Raw"] = (svcOrFnOrEffect, fnOrNone) => _effectApp.Effect.isEffect(svcOrFnOrEffect) ? class {
+          static _tag = "raw";
+          static handler = () => svcOrFnOrEffect;
+        } : typeof svcOrFnOrEffect === "function" ? class {
+          static _tag = "raw";
+          static handler = (req, ctx) => svcOrFnOrEffect(req, {
+            ...ctx,
+            Response: rsc[cur].Response
+          });
+        } : class {
+          static _tag = "raw";
+          static handler = matchWithServices(cur)(svcOrFnOrEffect, fnOrNone);
+        };
+        return prev;
+      }, {})
+    };
+    return r;
+  }
+  const errorHandler = resourceRequest => {
+    return (req, res, r2) => (0, _routing.defaultErrorHandler)(req, res, _effectApp.Effect.catchTag(r2, "ParseError", _ => _effectApp.Effect.die(_)), resourceRequest.failure);
+  };
+  /**
+   * Gather all handlers of a module and attach them to the Server.
+   * If no `allowAnonymous` flag is on the Request, will require a valid authenticated user.
+   */
+  function matchAll(handlers) {
+    const r = (0, _utils.typedKeysOf)(handlers).reduce((acc, cur) => {
+      return _http.HttpRouter.concat(acc, handlers[cur]);
+    }, _http.HttpRouter.empty);
+    return r;
+  }
+  return {
+    matchFor,
+    matchAll
+  };
+};
+exports.makeRouter = makeRouter;
+//# sourceMappingURL=router.cjs.map

package/_cjs/router.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"router.cjs","names":["_Effect","require","_utils","_routing","_effectApp","_http","_schema","makeRouter","handleRequestEnv","match","requestHandler","errorHandler","middleware","middlewareLayer","undefined","handler","makeRequestLayer","makeRequestHandler","route","HttpRouter","makeRoute","Request","method","path","handle","_","name","adaptResponse","S","REST","extractRequest","Response","extractResponse","h","ResponseOpenApi","Context","CTX","rt","_tag","matchFor","rsc","filtered","typedKeysOf","reduce","acc","cur","Predicate","isObject","matchWithServices","action","services","f","req","ctx","Effect","andThen","allLower","svc2","controllers","handlers","m","meta","Error","moduleName","mapped","determineMethod","split","Object","assign","Auto","fromIterable","values","r","prev","svcOrFnOrEffect","fnOrNone","isEffect","resourceRequest","res","r2","defaultErrorHandler","catchTag","die","failure","matchAll","concat","empty","exports"],"sources":["../src/router.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

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

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

package/dist/router.d.ts

@@ -0,0 +1,121 @@
+import type { EffectUnunified, LowerServices } from "@effect-app/core/Effect";
+import type { EnforceNonEmptyRecord } from "@effect-app/core/utils";
+import type { _R, EffectDeps, Extr, ReqFromSchema } from "@effect-app/infra/api/routing";
+import type { Types } from "effect-app";
+import { Effect, S } from "effect-app";
+import type { ValidationError } from "effect-app/client/errors";
+import { HttpRouter } from "effect-app/http";
+import { REST } from "effect-app/schema";
+export type RouteMatch<R, M, PR = never> = HttpRouter.Route<never, Exclude<Exclude<R, EnforceNonEmptyRecord<M>>, PR>>;
+export interface Hint<Err extends string> {
+    Err: Err;
+}
+export declare const makeRouter: <CTX, CTXMap extends Record<string, [string, any, boolean]>>(handleRequestEnv: any) => {
+    matchFor: <Rsc extends Record<string, any>>(rsc: Rsc) => {
+        controllers: <THandlers extends { [K in keyof { [K_1 in keyof Rsc as Rsc[K_1] extends {
+            Response: any;
+        } ? K_1 : never]: Rsc[K_1] extends {
+            Response: any;
+        } ? Rsc[K_1] : never; }]: {
+            new (): {};
+            _tag: "raw";
+            handler: (req: S.Schema.Type<REST.GetRequest<Rsc[K]>>, ctx: CTX & { [key in keyof CTXMap as key extends keyof REST.GetRequest<Rsc[K]> ? REST.GetRequest<Rsc[K]>[key] extends true ? CTXMap[key][0] : never : never]?: CTXMap[key][1]; } & { [key_1 in keyof CTXMap as key_1 extends keyof REST.GetRequest<Rsc[K]> ? REST.GetRequest<Rsc[K]>[key_1] extends false ? CTXMap[key_1][0] : never : CTXMap[key_1][0]]: CTXMap[key_1][1]; }) => Effect<S.Schema.Encoded<Extr<REST.GetResponse<Rsc[K]>>>, import("effect-app/client/errors").OptimisticConcurrencyException | S.ParseResult.ParseError | ValidationError | import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").NotFoundError<ItemType> | import("effect-app/client/errors").NotLoggedInError | import("effect-app/client/errors").LoginError | import("effect-app/client/errors").UnauthorizedError | import("effect-app/client/errors").ServiceUnavailableError | S.Schema.Type<REST.GetRequest<Rsc[K]>["failure"]>, any>;
+        } | {
+            new (): {};
+            _tag: "d";
+            handler: (req: S.Schema.Type<REST.GetRequest<Rsc[K]>>, ctx: CTX & { [key in keyof CTXMap as key extends keyof REST.GetRequest<Rsc[K]> ? REST.GetRequest<Rsc[K]>[key] extends true ? CTXMap[key][0] : never : never]?: CTXMap[key][1]; } & { [key_1 in keyof CTXMap as key_1 extends keyof REST.GetRequest<Rsc[K]> ? REST.GetRequest<Rsc[K]>[key_1] extends false ? CTXMap[key_1][0] : never : CTXMap[key_1][0]]: CTXMap[key_1][1]; }) => Effect<S.Schema.Type<Extr<REST.GetResponse<Rsc[K]>>>, import("effect-app/client/errors").OptimisticConcurrencyException | S.ParseResult.ParseError | ValidationError | import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").NotFoundError<ItemType> | import("effect-app/client/errors").NotLoggedInError | import("effect-app/client/errors").LoginError | import("effect-app/client/errors").UnauthorizedError | import("effect-app/client/errors").ServiceUnavailableError | S.Schema.Type<REST.GetRequest<Rsc[K]>["failure"]>, any>;
+        }; }>(controllers: THandlers) => HttpRouter.HttpRouter<[(keyof { [K_1 in keyof Rsc as Rsc[K_1] extends {
+            Response: any;
+        } ? K_1 : never]: Rsc[K_1] extends {
+            Response: any;
+        } ? Rsc[K_1] : never; } extends infer T extends keyof { [K_1 in keyof Rsc as Rsc[K_1] extends {
+            Response: any;
+        } ? K_1 : never]: Rsc[K_1] extends {
+            Response: any;
+        } ? Rsc[K_1] : never; } ? { [K in T]: RouteMatch<_R<ReturnType<THandlers[K]["handler"]>>, ReqFromSchema<REST.GetRequest<Rsc[K]>>, { [key in keyof CTXMap as key extends keyof REST.GetRequest<Rsc[K]> ? REST.GetRequest<Rsc[K]>[key] extends true ? never : CTXMap[key][0] : CTXMap[key][0]]: CTXMap[key][1]; }[keyof { [key in keyof CTXMap as key extends keyof REST.GetRequest<Rsc[K]> ? REST.GetRequest<Rsc[K]>[key] extends true ? never : CTXMap[key][0] : CTXMap[key][0]]: CTXMap[key][1]; }]>; } : never)[keyof { [K_1 in keyof Rsc as Rsc[K_1] extends {
+            Response: any;
+        } ? K_1 : never]: Rsc[K_1] extends {
+            Response: any;
+        } ? Rsc[K_1] : never; }]] extends [HttpRouter.Route<infer E, any>] ? E : never, [(keyof { [K_1 in keyof Rsc as Rsc[K_1] extends {
+            Response: any;
+        } ? K_1 : never]: Rsc[K_1] extends {
+            Response: any;
+        } ? Rsc[K_1] : never; } extends infer T extends keyof { [K_1 in keyof Rsc as Rsc[K_1] extends {
+            Response: any;
+        } ? K_1 : never]: Rsc[K_1] extends {
+            Response: any;
+        } ? Rsc[K_1] : never; } ? { [K in T]: RouteMatch<_R<ReturnType<THandlers[K]["handler"]>>, ReqFromSchema<REST.GetRequest<Rsc[K]>>, { [key in keyof CTXMap as key extends keyof REST.GetRequest<Rsc[K]> ? REST.GetRequest<Rsc[K]>[key] extends true ? never : CTXMap[key][0] : CTXMap[key][0]]: CTXMap[key][1]; }[keyof { [key in keyof CTXMap as key extends keyof REST.GetRequest<Rsc[K]> ? REST.GetRequest<Rsc[K]>[key] extends true ? never : CTXMap[key][0] : CTXMap[key][0]]: CTXMap[key][1]; }]>; } : never)[keyof { [K_1 in keyof Rsc as Rsc[K_1] extends {
+            Response: any;
+        } ? K_1 : never]: Rsc[K_1] extends {
+            Response: any;
+        } ? Rsc[K_1] : never; }]] extends [HttpRouter.Route<any, infer R>] ? R : never>;
+    } & { [Key in keyof { [K_1 in keyof Rsc as Rsc[K_1] extends {
+        Response: any;
+    } ? K_1 : never]: Rsc[K_1] extends {
+        Response: any;
+    } ? Rsc[K_1] : never; }]: {
+        <R2, E, A>(f: Effect<A, E, R2>): S.Schema.Type<REST.GetResponse<Rsc[Key]>> extends infer T ? T extends S.Schema.Type<REST.GetResponse<Rsc[Key]>> ? T extends void ? A extends void ? {
+            new (): {};
+            _tag: "d";
+            handler: (req: S.Schema.Type<REST.GetRequest<Rsc[Key]>>, ctx: Types.Simplify<CTX & { [key in keyof CTXMap as key extends keyof REST.GetRequest<Rsc[Key]> ? REST.GetRequest<Rsc[Key]>[key] extends true ? CTXMap[key][0] : never : never]?: CTXMap[key][1]; } & { [key_1 in keyof CTXMap as key_1 extends keyof REST.GetRequest<Rsc[Key]> ? REST.GetRequest<Rsc[Key]>[key_1] extends false ? CTXMap[key_1][0] : never : CTXMap[key_1][0]]: CTXMap[key_1][1]; }>) => Effect<A, E, R2>;
+        } : Hint<"You're returning non void for a void Response, please fix"> : {
+            new (): {};
+            _tag: "d";
+            handler: (req: S.Schema.Type<REST.GetRequest<Rsc[Key]>>, ctx: Types.Simplify<CTX & { [key in keyof CTXMap as key extends keyof REST.GetRequest<Rsc[Key]> ? REST.GetRequest<Rsc[Key]>[key] extends true ? CTXMap[key][0] : never : never]?: CTXMap[key][1]; } & { [key_1 in keyof CTXMap as key_1 extends keyof REST.GetRequest<Rsc[Key]> ? REST.GetRequest<Rsc[Key]>[key_1] extends false ? CTXMap[key_1][0] : never : CTXMap[key_1][0]]: CTXMap[key_1][1]; }>) => Effect<A, E, R2>;
+        } : never : never;
+        <R2, E_1, A_1>(f: (req: S.Schema.Type<REST.GetRequest<Rsc[Key]>>, ctx: CTX & { [key in keyof CTXMap as key extends keyof REST.GetRequest<Rsc[Key]> ? REST.GetRequest<Rsc[Key]>[key] extends true ? CTXMap[key][0] : never : never]?: CTXMap[key][1]; } & { [key_1 in keyof CTXMap as key_1 extends keyof REST.GetRequest<Rsc[Key]> ? REST.GetRequest<Rsc[Key]>[key_1] extends false ? CTXMap[key_1][0] : never : CTXMap[key_1][0]]: CTXMap[key_1][1]; } & Pick<Rsc[Key], "Response">) => Effect<A_1, E_1, R2>): S.Schema.Type<REST.GetResponse<Rsc[Key]>> extends infer T ? T extends S.Schema.Type<REST.GetResponse<Rsc[Key]>> ? T extends void ? A_1 extends void ? {
+            new (): {};
+            _tag: "d";
+            handler: (req: S.Schema.Type<REST.GetRequest<Rsc[Key]>>, ctx: Types.Simplify<CTX & { [key in keyof CTXMap as key extends keyof REST.GetRequest<Rsc[Key]> ? REST.GetRequest<Rsc[Key]>[key] extends true ? CTXMap[key][0] : never : never]?: CTXMap[key][1]; } & { [key_1 in keyof CTXMap as key_1 extends keyof REST.GetRequest<Rsc[Key]> ? REST.GetRequest<Rsc[Key]>[key_1] extends false ? CTXMap[key_1][0] : never : CTXMap[key_1][0]]: CTXMap[key_1][1]; }>) => Effect<A_1, E_1, R2>;
+        } : Hint<"You're returning non void for a void Response, please fix"> : {
+            new (): {};
+            _tag: "d";
+            handler: (req: S.Schema.Type<REST.GetRequest<Rsc[Key]>>, ctx: Types.Simplify<CTX & { [key in keyof CTXMap as key extends keyof REST.GetRequest<Rsc[Key]> ? REST.GetRequest<Rsc[Key]>[key] extends true ? CTXMap[key][0] : never : never]?: CTXMap[key][1]; } & { [key_1 in keyof CTXMap as key_1 extends keyof REST.GetRequest<Rsc[Key]> ? REST.GetRequest<Rsc[Key]>[key_1] extends false ? CTXMap[key_1][0] : never : CTXMap[key_1][0]]: CTXMap[key_1][1]; }>) => Effect<A_1, E_1, R2>;
+        } : never : never;
+        <SVC extends Record<string, EffectUnunified<any, any, any>>, R2, E_2, A_2>(services: SVC, f: (req: S.Schema.Type<REST.GetRequest<Rsc[Key]>>, ctx: import("@effect-app/core/utils").ComputeFlat<LowerServices<EffectDeps<SVC>> & CTX & { [key in keyof CTXMap as key extends keyof REST.GetRequest<Rsc[Key]> ? REST.GetRequest<Rsc[Key]>[key] extends true ? CTXMap[key][0] : never : never]?: CTXMap[key][1]; } & { [key_1 in keyof CTXMap as key_1 extends keyof REST.GetRequest<Rsc[Key]> ? REST.GetRequest<Rsc[Key]>[key_1] extends false ? CTXMap[key_1][0] : never : CTXMap[key_1][0]]: CTXMap[key_1][1]; } & Pick<Rsc[Key], "Response">>) => Effect<A_2, E_2, R2>): S.Schema.Type<REST.GetResponse<Rsc[Key]>> extends infer T ? T extends S.Schema.Type<REST.GetResponse<Rsc[Key]>> ? T extends void ? A_2 extends void ? {
+            new (): {};
+            _tag: "d";
+            handler: (req: S.Schema.Type<REST.GetRequest<Rsc[Key]>>, ctx: Types.Simplify<CTX & { [key in keyof CTXMap as key extends keyof REST.GetRequest<Rsc[Key]> ? REST.GetRequest<Rsc[Key]>[key] extends true ? CTXMap[key][0] : never : never]?: CTXMap[key][1]; } & { [key_1 in keyof CTXMap as key_1 extends keyof REST.GetRequest<Rsc[Key]> ? REST.GetRequest<Rsc[Key]>[key_1] extends false ? CTXMap[key_1][0] : never : CTXMap[key_1][0]]: CTXMap[key_1][1]; }>) => Effect<A_2, E_2, R2>;
+        } : Hint<"You're returning non void for a void Response, please fix"> : {
+            new (): {};
+            _tag: "d";
+            handler: (req: S.Schema.Type<REST.GetRequest<Rsc[Key]>>, ctx: Types.Simplify<CTX & { [key in keyof CTXMap as key extends keyof REST.GetRequest<Rsc[Key]> ? REST.GetRequest<Rsc[Key]>[key] extends true ? CTXMap[key][0] : never : never]?: CTXMap[key][1]; } & { [key_1 in keyof CTXMap as key_1 extends keyof REST.GetRequest<Rsc[Key]> ? REST.GetRequest<Rsc[Key]>[key_1] extends false ? CTXMap[key_1][0] : never : CTXMap[key_1][0]]: CTXMap[key_1][1]; }>) => Effect<A_2, E_2, R2>;
+        } : never : never;
+    }; } & { [Key_1 in keyof { [K_1 in keyof Rsc as Rsc[K_1] extends {
+        Response: any;
+    } ? K_1 : never]: Rsc[K_1] extends {
+        Response: any;
+    } ? Rsc[K_1] : never; } as Key_1 extends string ? `${Key_1}Raw` : never]: {
+        <R2_1, E, A>(f: Effect<A, E, R2_1>): S.Schema.Type<REST.GetResponse<Rsc[Key_1]>> extends infer T ? T extends S.Schema.Type<REST.GetResponse<Rsc[Key_1]>> ? T extends void ? A extends void ? {
+            new (): {};
+            _tag: "raw";
+            handler: (req: S.Schema.Type<REST.GetRequest<Rsc[Key_1]>>, ctx: Types.Simplify<CTX & { [key in keyof CTXMap as key extends keyof REST.GetRequest<Rsc[Key_1]> ? REST.GetRequest<Rsc[Key_1]>[key] extends true ? CTXMap[key][0] : never : never]?: CTXMap[key][1]; } & { [key_1 in keyof CTXMap as key_1 extends keyof REST.GetRequest<Rsc[Key_1]> ? REST.GetRequest<Rsc[Key_1]>[key_1] extends false ? CTXMap[key_1][0] : never : CTXMap[key_1][0]]: CTXMap[key_1][1]; }>) => Effect<A, E, R2_1>;
+        } : Hint<"You're returning non void for a void Response, please fix"> : {
+            new (): {};
+            _tag: "raw";
+            handler: (req: S.Schema.Type<REST.GetRequest<Rsc[Key_1]>>, ctx: Types.Simplify<CTX & { [key in keyof CTXMap as key extends keyof REST.GetRequest<Rsc[Key_1]> ? REST.GetRequest<Rsc[Key_1]>[key] extends true ? CTXMap[key][0] : never : never]?: CTXMap[key][1]; } & { [key_1 in keyof CTXMap as key_1 extends keyof REST.GetRequest<Rsc[Key_1]> ? REST.GetRequest<Rsc[Key_1]>[key_1] extends false ? CTXMap[key_1][0] : never : CTXMap[key_1][0]]: CTXMap[key_1][1]; }>) => Effect<A, E, R2_1>;
+        } : never : never;
+        <R2_1, E_1, A_1>(f: (req: S.Schema.Type<REST.GetRequest<Rsc[Key_1]>>, ctx: CTX & { [key in keyof CTXMap as key extends keyof REST.GetRequest<Rsc[Key_1]> ? REST.GetRequest<Rsc[Key_1]>[key] extends true ? CTXMap[key][0] : never : never]?: CTXMap[key][1]; } & { [key_1 in keyof CTXMap as key_1 extends keyof REST.GetRequest<Rsc[Key_1]> ? REST.GetRequest<Rsc[Key_1]>[key_1] extends false ? CTXMap[key_1][0] : never : CTXMap[key_1][0]]: CTXMap[key_1][1]; } & Pick<Rsc[Key_1], "Response">) => Effect<A_1, E_1, R2_1>): S.Schema.Type<REST.GetResponse<Rsc[Key_1]>> extends infer T ? T extends S.Schema.Type<REST.GetResponse<Rsc[Key_1]>> ? T extends void ? A_1 extends void ? {
+            new (): {};
+            _tag: "raw";
+            handler: (req: S.Schema.Type<REST.GetRequest<Rsc[Key_1]>>, ctx: Types.Simplify<CTX & { [key in keyof CTXMap as key extends keyof REST.GetRequest<Rsc[Key_1]> ? REST.GetRequest<Rsc[Key_1]>[key] extends true ? CTXMap[key][0] : never : never]?: CTXMap[key][1]; } & { [key_1 in keyof CTXMap as key_1 extends keyof REST.GetRequest<Rsc[Key_1]> ? REST.GetRequest<Rsc[Key_1]>[key_1] extends false ? CTXMap[key_1][0] : never : CTXMap[key_1][0]]: CTXMap[key_1][1]; }>) => Effect<A_1, E_1, R2_1>;
+        } : Hint<"You're returning non void for a void Response, please fix"> : {
+            new (): {};
+            _tag: "raw";
+            handler: (req: S.Schema.Type<REST.GetRequest<Rsc[Key_1]>>, ctx: Types.Simplify<CTX & { [key in keyof CTXMap as key extends keyof REST.GetRequest<Rsc[Key_1]> ? REST.GetRequest<Rsc[Key_1]>[key] extends true ? CTXMap[key][0] : never : never]?: CTXMap[key][1]; } & { [key_1 in keyof CTXMap as key_1 extends keyof REST.GetRequest<Rsc[Key_1]> ? REST.GetRequest<Rsc[Key_1]>[key_1] extends false ? CTXMap[key_1][0] : never : CTXMap[key_1][0]]: CTXMap[key_1][1]; }>) => Effect<A_1, E_1, R2_1>;
+        } : never : never;
+        <SVC extends Record<string, EffectUnunified<any, any, any>>, R2, E_2, A_2>(services: SVC, f: (req: S.Schema.Type<REST.GetRequest<Rsc[Key_1]>>, ctx: import("@effect-app/core/utils").ComputeFlat<LowerServices<EffectDeps<SVC>> & CTX & { [key in keyof CTXMap as key extends keyof REST.GetRequest<Rsc[Key_1]> ? REST.GetRequest<Rsc[Key_1]>[key] extends true ? CTXMap[key][0] : never : never]?: CTXMap[key][1]; } & { [key_1 in keyof CTXMap as key_1 extends keyof REST.GetRequest<Rsc[Key_1]> ? REST.GetRequest<Rsc[Key_1]>[key_1] extends false ? CTXMap[key_1][0] : never : CTXMap[key_1][0]]: CTXMap[key_1][1]; } & Pick<Rsc[Key_1], "Response">>) => Effect<A_2, E_2, R2>): S.Schema.Type<REST.GetResponse<Rsc[Key_1]>> extends infer T ? T extends S.Schema.Type<REST.GetResponse<Rsc[Key_1]>> ? T extends void ? A_2 extends void ? {
+            new (): {};
+            _tag: "raw";
+            handler: (req: S.Schema.Type<REST.GetRequest<Rsc[Key_1]>>, ctx: Types.Simplify<CTX & { [key in keyof CTXMap as key extends keyof REST.GetRequest<Rsc[Key_1]> ? REST.GetRequest<Rsc[Key_1]>[key] extends true ? CTXMap[key][0] : never : never]?: CTXMap[key][1]; } & { [key_1 in keyof CTXMap as key_1 extends keyof REST.GetRequest<Rsc[Key_1]> ? REST.GetRequest<Rsc[Key_1]>[key_1] extends false ? CTXMap[key_1][0] : never : CTXMap[key_1][0]]: CTXMap[key_1][1]; }>) => Effect<A_2, E_2, R2>;
+        } : Hint<"You're returning non void for a void Response, please fix"> : {
+            new (): {};
+            _tag: "raw";
+            handler: (req: S.Schema.Type<REST.GetRequest<Rsc[Key_1]>>, ctx: Types.Simplify<CTX & { [key in keyof CTXMap as key extends keyof REST.GetRequest<Rsc[Key_1]> ? REST.GetRequest<Rsc[Key_1]>[key] extends true ? CTXMap[key][0] : never : never]?: CTXMap[key][1]; } & { [key_1 in keyof CTXMap as key_1 extends keyof REST.GetRequest<Rsc[Key_1]> ? REST.GetRequest<Rsc[Key_1]>[key_1] extends false ? CTXMap[key_1][0] : never : CTXMap[key_1][0]]: CTXMap[key_1][1]; }>) => Effect<A_2, E_2, R2>;
+        } : never : never;
+    }; };
+    matchAll: <T extends {
+        [key: string]: HttpRouter.HttpRouter<any, any>;
+    }>(handlers: T) => HttpRouter.HttpRouter<[T[keyof T]] extends [HttpRouter.HttpRouter<infer R, any>] ? R : never, [T[keyof T]] extends [HttpRouter.HttpRouter<any, infer E_3>] ? E_3 : never>;
+};
+//# sourceMappingURL=router.d.ts.map

package/dist/router.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AAG7E,OAAO,KAAK,EAAW,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAC5E,OAAO,KAAK,EAEV,EAAE,EACF,UAAU,EACV,IAAI,EAGJ,aAAa,EAId,MAAM,+BAA+B,CAAA;AAEtC,OAAO,KAAK,EAAgB,KAAK,EAAE,MAAM,YAAY,CAAA;AACrD,OAAO,EAAE,MAAM,EAAa,CAAC,EAAE,MAAM,YAAY,CAAA;AACjD,OAAO,KAAK,EAAmB,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAChF,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAG5C,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAGxC,MAAM,MAAM,UAAU,CACpB,CAAC,EACD,CAAC,EAGD,EAAE,GAAG,KAAK,IAET,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;AAE7E,MAAM,WAAW,IAAI,CAAC,GAAG,SAAS,MAAM;IACtC,GAAG,EAAE,GAAG,CAAA;CACT;AAGD,eAAO,MAAM,UAAU,GAAI,GAAG,EAAE,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,oBACjE,GAAG;eAoLH,GAAG,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,OAC1C,GAAG;sBAsIN,SAAS,SAAS,GAEf,CAAS;sBArIkC,GAAG;;sBAA4C,GAAG;+BAqIpF;oBAjCL,EAAE;;iFAvRR,GAAG;;oBAuRG,EAAE;;iFAvRR,GAAG;YAyTH,eAEY,SAAS,KAoEmC,UAAU,CAAC,UAAU;sBA5MhC,GAAG;;sBAA4C,GAAG;;sBAAlD,GAAG;;sBAA4C,GAAG;qCA0L7F,CAAC,uGAjWH,GAAG,iLAAH,GAAG;sBAuK0C,GAAG;;sBAA4C,GAAG;kEAwMvE,CAAC;sBAxMoB,GAAG;;sBAA4C,GAAG;;sBAAlD,GAAG;;sBAA4C,GAAG;qCA0L7F,CAAC,uGAjWH,GAAG,iLAAH,GAAG;sBAuK0C,GAAG;;sBAA4C,GAAG;uEAmMlE,CAAC,eAY9B;WA4CM,GAAG;kBA3PoC,GAAG;;kBAA4C,GAAG;;SAmC/F,EAAE,EAAE,CAAC,EAAE,CAAC;oBAiEF,EAAE;;kGAvRR,GAAG;;oBAuRG,EAAE;;kGAvRR,GAAG;;SAoOH,EAAE,6EApOF,GAAG;oBAuRG,EAAE;;kGAvRR,GAAG;;oBAuRG,EAAE;;kGAvRR,GAAG;;SAuPF,GAAG,SAAS,MAAM,CAChB,MAAM,EACN,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAC/B,EACD,EAAE,0KA3PH,GAAG;oBAuRG,EAAE;;kGAvRR,GAAG;;oBAuRG,EAAE;;kGAvRR,GAAG;;;kBAmL0C,GAAG;;kBAA4C,GAAG;;eAmC3F,CAAC,EAAE,CAAC;oBAiEF,EAAE;;oGAvRR,GAAG;;oBAuRG,EAAE;;oGAvRR,GAAG;;4FAAH,GAAG;oBAuRG,EAAE;;oGAvRR,GAAG;;oBAuRG,EAAE;;oGAvRR,GAAG;;SAuPF,GAAG,SAAS,MAAM,CAChB,MAAM,EACN,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAC/B,EACD,EAAE,4KA3PH,GAAG;oBAuRG,EAAE;;oGAvRR,GAAG;;oBAuRG,EAAE;;oGAvRR,GAAG;;;eAscU,CAAC;;iBAAwC,CAAC,KAe9C,UAAU,CAAC,UAAU,mDATH,CAAC,gGAY9B;CA0BJ,CAAA"}

package/dist/router.js

@@ -0,0 +1,136 @@
+import { allLower } from "@effect-app/core/Effect";
+import { typedKeysOf } from "@effect-app/core/utils";
+import { defaultErrorHandler, makeRequestHandler } from "@effect-app/infra/api/routing";
+import { Effect, Predicate, S } from "effect-app";
+import { HttpRouter } from "effect-app/http";
+import { REST } from "effect-app/schema";
+// TODO: support FLIP
+export const makeRouter = (handleRequestEnv /* Middleware */) => {
+    function match(requestHandler, errorHandler, middleware) {
+        let middlewareLayer = undefined;
+        if (middleware) {
+            const { handler, makeRequestLayer } = middleware(requestHandler);
+            requestHandler = handler; // todo
+            middlewareLayer = makeRequestLayer;
+        }
+        // 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 = HttpRouter.makeRoute(requestHandler.Request.method, requestHandler.Request.path, handler);
+        // TODO
+        // rdesc.push(makeRouteDescriptor(
+        //   requestHandler.Request.path,
+        //   requestHandler.Request.method,
+        //   requestHandler
+        // ))
+        return route;
+    }
+    function handle(_, name, adaptResponse) {
+        const Request = S.REST.extractRequest(_);
+        const Response = S.REST.extractResponse(_);
+        return (h) => ({
+            adaptResponse,
+            h: h.handler,
+            name,
+            Request,
+            Response,
+            ResponseOpenApi: _.ResponseOpenApi ?? Response,
+            Context: null,
+            CTX: null,
+            rt: h._tag
+        });
+    }
+    function matchFor(rsc) {
+        const filtered = typedKeysOf(rsc).reduce((acc, cur) => {
+            if (Predicate.isObject(rsc[cur]) && rsc[cur].Request) {
+                acc[cur] = rsc[cur];
+            }
+            return acc;
+        }, {});
+        const matchWithServices = (action) => {
+            return (services, f) => (req, ctx) => Effect.andThen(allLower(services), (svc2) => f(req, { ...ctx, ...svc2, Response: rsc[action].Response }));
+        };
+        const controllers = (controllers) => {
+            const handlers = typedKeysOf(filtered).reduce((acc, cur) => {
+                if (cur === "meta")
+                    return acc;
+                const m = rsc.meta;
+                if (!m)
+                    throw new Error("Resource has no meta specified");
+                acc[cur] = handle(rsc[cur], m.moduleName + "." + cur)(controllers[cur]);
+                return acc;
+            }, {});
+            const mapped = typedKeysOf(handlers).reduce((acc, cur) => {
+                const handler = handlers[cur];
+                const req = handler.Request;
+                class Request extends req {
+                    static path = "/" + handler.name + (req.path === "/" ? "" : req.path);
+                    static method = req.method === "AUTO"
+                        ? REST.determineMethod(handler.name.split(".")[1], req)
+                        : req.method;
+                }
+                if (req.method === "AUTO") {
+                    Object.assign(Request, {
+                        [Request.method === "GET" || Request.method === "DELETE" ? "Query" : "Body"]: req.Auto
+                    });
+                }
+                Object.assign(handler, { Request });
+                acc[cur] = match(handler, errorHandler(req), handleRequestEnv // TODO
+                );
+                return acc;
+            }, {});
+            return HttpRouter.fromIterable(Object.values(mapped));
+        };
+        const r = {
+            controllers,
+            ...typedKeysOf(filtered).reduce((prev, cur) => {
+                ;
+                prev[cur] = (svcOrFnOrEffect, fnOrNone) => Effect.isEffect(svcOrFnOrEffect)
+                    ? class {
+                        static _tag = "d";
+                        static handler = () => svcOrFnOrEffect;
+                    }
+                    : typeof svcOrFnOrEffect === "function"
+                        ? class {
+                            static _tag = "d";
+                            static handler = (req, ctx) => svcOrFnOrEffect(req, { ...ctx, Response: rsc[cur].Response });
+                        }
+                        : class {
+                            static _tag = "d";
+                            static handler = matchWithServices(cur)(svcOrFnOrEffect, fnOrNone);
+                        };
+                prev[cur + "Raw"] = (svcOrFnOrEffect, fnOrNone) => Effect.isEffect(svcOrFnOrEffect)
+                    ? class {
+                        static _tag = "raw";
+                        static handler = () => svcOrFnOrEffect;
+                    }
+                    : typeof svcOrFnOrEffect === "function"
+                        ? class {
+                            static _tag = "raw";
+                            static handler = (req, ctx) => svcOrFnOrEffect(req, { ...ctx, Response: rsc[cur].Response });
+                        }
+                        : class {
+                            static _tag = "raw";
+                            static handler = matchWithServices(cur)(svcOrFnOrEffect, fnOrNone);
+                        };
+                return prev;
+            }, {})
+        };
+        return r;
+    }
+    const errorHandler = (resourceRequest) => {
+        return (req, res, r2) => defaultErrorHandler(req, res, Effect.catchTag(r2, "ParseError", (_) => Effect.die(_)), resourceRequest.failure);
+    };
+    /**
+     * Gather all handlers of a module and attach them to the Server.
+     * If no `allowAnonymous` flag is on the Request, will require a valid authenticated user.
+     */
+    function matchAll(handlers) {
+        const r = typedKeysOf(handlers).reduce((acc, cur) => {
+            return HttpRouter.concat(acc, handlers[cur]);
+        }, HttpRouter.empty);
+        return r;
+    }
+    return { matchFor, matchAll };
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3JvdXRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUE7QUFDbEQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLHdCQUF3QixDQUFBO0FBY3BELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLCtCQUErQixDQUFBO0FBRXZGLE9BQU8sRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLENBQUMsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUVqRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFHNUMsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBZ0J4QyxxQkFBcUI7QUFDckIsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHLENBQ3hCLGdCQUFxQixDQUFDLGdCQUFnQixFQUN0QyxFQUFFO0lBb0JGLFNBQVMsS0FBSyxDQW9CWixjQWVDLEVBQ0QsWUFRQyxFQUNELFVBa0JDO1FBRUQsSUFBSSxlQUFlLEdBQTJDLFNBQVMsQ0FBQTtRQUN2RSxJQUFJLFVBQVUsRUFBRSxDQUFDO1lBQ2YsTUFBTSxFQUFFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxHQUFHLFVBQVUsQ0FBQyxjQUFjLENBQUMsQ0FBQTtZQUNoRSxjQUFjLEdBQUcsT0FBYyxDQUFBLENBQUMsT0FBTztZQUN2QyxlQUFlLEdBQUcsZ0JBQWdCLENBQUE7UUFDcEMsQ0FBQztRQUNELDhEQUE4RDtRQUU5RCxNQUFNLE9BQU8sR0FBRyxrQkFBa0IsQ0FrQmhDLGNBQXFCLEVBQUUsK0VBQStFO1FBQ3RHLFlBQVksRUFDWixlQUFlLENBQ2hCLENBQUE7UUFFRCxNQUFNLEtBQUssR0FBRyxVQUFVLENBQUMsU0FBUyxDQUNoQyxjQUFjLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFDN0IsY0FBYyxDQUFDLE9B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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "1.14.4",
+  "version": "1.16.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -18,10 +18,10 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "6.1.0",
     "redlock": "^4.2.0",
-    "@effect-app/core": "1.8.1",
-    "effect-app": "1.13.4",
-    "@effect-app/schema": "1.10.1",
-    "@effect-app/infra-adapters": "1.9.4"
+    "@effect-app/core": "1.9.0",
+    "effect-app": "1.15.0",
+    "@effect-app/schema": "1.11.0",
+    "@effect-app/infra-adapters": "1.10.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.25.6",
@@ -42,9 +42,9 @@
   },
   "peerDependencies": {
     "express": "^4.21.0",
-    "@effect/platform": "^0.65.2",
-    "@effect/schema": "^0.73.1",
-    "effect": "^3.8.1"
+    "@effect/platform": "^0.65.5",
+    "@effect/schema": "^0.73.4",
+    "effect": "^3.8.3"
   },
   "typesVersions": {
     "*": {
@@ -334,6 +334,16 @@
         "default": "./_cjs/rateLimit.cjs"
       }
     },
+    "./router": {
+      "import": {
+        "types": "./dist/router.d.ts",
+        "default": "./dist/router.js"
+      },
+      "require": {
+        "types": "./dist/router.d.ts",
+        "default": "./_cjs/router.cjs"
+      }
+    },
     "./services/Emailer": {
       "import": {
         "types": "./dist/services/Emailer.d.ts",

package/src/router.ts

@@ -0,0 +1,547 @@
+/* eslint-disable @typescript-eslint/no-empty-object-type */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import type { EffectUnunified, LowerServices } from "@effect-app/core/Effect"
+import { allLower } from "@effect-app/core/Effect"
+import { typedKeysOf } from "@effect-app/core/utils"
+import type { Compute, EnforceNonEmptyRecord } from "@effect-app/core/utils"
+import type {
+  _E,
+  _R,
+  EffectDeps,
+  Extr,
+  JWTError,
+  Middleware,
+  ReqFromSchema,
+  ReqHandler,
+  RequestHandler,
+  ResFromSchema
+} from "@effect-app/infra/api/routing"
+import { defaultErrorHandler, makeRequestHandler } from "@effect-app/infra/api/routing"
+import type { Layer, Scope, Types } from "effect-app"
+import { Effect, Predicate, S } from "effect-app"
+import type { SupportedErrors, ValidationError } from "effect-app/client/errors"
+import { HttpRouter } from "effect-app/http"
+import type { HttpServerRequest, HttpServerResponse } from "effect-app/http"
+import type { Struct } from "effect-app/schema"
+import { REST } from "effect-app/schema"
+import type {} from "@effect/schema/ParseResult"
+
+export type RouteMatch<
+  R,
+  M,
+  // TODO: specific errors
+  // Err extends SupportedErrors | S.ParseResult.ParseError,
+  PR = never
+> // RErr = never,
+ = HttpRouter.Route<never, Exclude<Exclude<R, EnforceNonEmptyRecord<M>>, PR>>
+
+export interface Hint<Err extends string> {
+  Err: Err
+}
+
+// TODO: support FLIP
+export const makeRouter = <CTX, CTXMap extends Record<string, [string, any, boolean]>>(
+  handleRequestEnv: any /* Middleware */
+) => {
+  type GetCTX<T> =
+    & CTX
+    & {
+      [key in keyof CTXMap as key extends keyof T ? T[key] extends true ? CTXMap[key][0] : never : never]?:
+        CTXMap[key][1]
+    }
+    & {
+      [key in keyof CTXMap as key extends keyof T ? T[key] extends false ? CTXMap[key][0] : never : CTXMap[key][0]]:
+        CTXMap[key][1]
+    }
+
+  type Values<T extends Record<any, any>> = T[keyof T]
+
+  type GetContext<T> = Values<
+    {
+      [key in keyof CTXMap as key extends keyof T ? T[key] extends true ? never : CTXMap[key][0] : CTXMap[key][0]]: // TODO: or as an Optional available?
+        CTXMap[key][1]
+    }
+  >
+  function match<
+    R,
+    M,
+    PathA extends Struct.Fields,
+    CookieA extends Struct.Fields,
+    QueryA extends Struct.Fields,
+    BodyA extends Struct.Fields,
+    HeaderA extends Struct.Fields,
+    ReqA extends PathA & QueryA & BodyA,
+    ResA extends Struct.Fields,
+    ResE,
+    MiddlewareE,
+    PPath extends `/${string}`,
+    R2,
+    PR,
+    RErr,
+    CTX,
+    Context,
+    Config
+  >(
+    requestHandler: RequestHandler<
+      R,
+      M,
+      PathA,
+      CookieA,
+      QueryA,
+      BodyA,
+      HeaderA,
+      ReqA,
+      ResA,
+      ResE,
+      PPath,
+      CTX,
+      Context,
+      Config
+    >,
+    errorHandler: <R>(
+      req: HttpServerRequest.HttpServerRequest,
+      res: HttpServerResponse.HttpServerResponse,
+      r2: Effect<HttpServerResponse.HttpServerResponse, ValidationError | MiddlewareE | ResE, R>
+    ) => Effect<
+      HttpServerResponse.HttpServerResponse,
+      never,
+      Exclude<RErr | R, HttpServerRequest.HttpServerRequest | HttpRouter.RouteContext | Scope>
+    >,
+    middleware?: Middleware<
+      R,
+      M,
+      PathA,
+      CookieA,
+      QueryA,
+      BodyA,
+      HeaderA,
+      ReqA,
+      ResA,
+      ResE,
+      MiddlewareE,
+      PPath,
+      R2,
+      PR,
+      CTX,
+      Context,
+      Config
+    >
+  ) {
+    let middlewareLayer: Layer<PR, MiddlewareE, R2> | undefined = undefined
+    if (middleware) {
+      const { handler, makeRequestLayer } = middleware(requestHandler)
+      requestHandler = handler as any // todo
+      middlewareLayer = makeRequestLayer
+    }
+    // const rdesc = yield* RouteDescriptors.flatMap((_) => _.get)
+
+    const handler = makeRequestHandler<
+      R,
+      M,
+      PathA,
+      CookieA,
+      QueryA,
+      BodyA,
+      HeaderA,
+      ReqA,
+      ResA,
+      ResE,
+      MiddlewareE,
+      R2,
+      PR,
+      RErr,
+      PPath,
+      Config
+    >(
+      requestHandler as any, // one argument if no middleware, 2 if has middleware. TODO: clean this shit up
+      errorHandler,
+      middlewareLayer
+    )
+
+    const route = HttpRouter.makeRoute(
+      requestHandler.Request.method,
+      requestHandler.Request.path,
+      handler
+    )
+    // TODO
+    // rdesc.push(makeRouteDescriptor(
+    //   requestHandler.Request.path,
+    //   requestHandler.Request.method,
+    //   requestHandler
+    // ))
+    return route
+  }
+
+  function handle<
+    TModule extends Record<
+      string,
+      any
+    >
+  >(
+    _: TModule & { ResponseOpenApi?: any },
+    name: string,
+    adaptResponse?: any
+  ) {
+    const Request = S.REST.extractRequest(_)
+    const Response = S.REST.extractResponse(_)
+
+    type ReqSchema = S.REST.GetRequest<TModule>
+    type ResSchema = S.REST.GetResponse<TModule>
+    type Req = InstanceType<
+      ReqSchema extends { new(...args: any[]): any } ? ReqSchema
+        : never
+    >
+    type Res = S.Schema.Type<Extr<ResSchema>>
+
+    return <R, E>(
+      h: { _tag: "raw" | "d"; handler: (r: Req) => Effect<Res, E, R> }
+    ) => ({
+      adaptResponse,
+      h: h.handler,
+      name,
+      Request,
+      Response,
+      ResponseOpenApi: _.ResponseOpenApi ?? Response,
+      Context: null as any,
+      CTX: null as any,
+      rt: h._tag
+    } as ReqHandler<
+      Req,
+      R,
+      E,
+      Res,
+      ReqSchema,
+      ResSchema,
+      GetCTX<Req>,
+      GetContext<Req>
+    >)
+  }
+
+  type HandleVoid<Expected, Actual, Result> = Expected extends void
+    ? Actual extends void ? Result : Hint<"You're returning non void for a void Response, please fix">
+    : Result
+
+  function matchFor<Rsc extends Record<string, any>>(
+    rsc: Rsc
+  ) {
+    type Filtered = {
+      [K in keyof Rsc as Rsc[K] extends { Response: any } ? K : never]: Rsc[K] extends { Response: any } ? Rsc[K]
+        : never
+    }
+    const filtered = typedKeysOf(rsc).reduce((acc, cur) => {
+      if (Predicate.isObject(rsc[cur]) && rsc[cur].Request) {
+        acc[cur as keyof Filtered] = rsc[cur]
+      }
+      return acc
+    }, {} as Filtered)
+
+    const matchWithServices = <Key extends keyof Filtered>(action: Key) => {
+      type Req = ReqFromSchema<REST.GetRequest<Rsc[Key]>>
+      return <
+        SVC extends Record<
+          string,
+          Effect<any, any, any>
+        >,
+        R2,
+        E,
+        A
+      >(
+        services: SVC,
+        f: (
+          req: Req,
+          ctx: Compute<
+            LowerServices<EffectDeps<SVC>> & GetCTX<Req>,
+            "flat"
+          >
+        ) => Effect<A, E, R2>
+      ) =>
+      (req: any, ctx: any) =>
+        Effect.andThen(allLower(services), (svc2) => f(req, { ...ctx, ...svc2 as any, Response: rsc[action].Response }))
+    }
+
+    type MatchWithServicesNew<RT extends "raw" | "d", Key extends keyof Rsc> = {
+      <R2, E, A>(
+        f: Effect<A, E, R2>
+      ): HandleVoid<
+        S.Schema.Type<REST.GetResponse<Rsc[Key]>>,
+        A,
+        Handler<
+          ReqFromSchema<REST.GetRequest<Rsc[Key]>>,
+          Types.Simplify<GetCTX<REST.GetRequest<Rsc[Key]>>>,
+          RT,
+          A,
+          E,
+          R2
+        >
+      >
+      <R2, E, A>(
+        f: (
+          req: ReqFromSchema<REST.GetRequest<Rsc[Key]>>,
+          ctx: GetCTX<REST.GetRequest<Rsc[Key]>> & Pick<Rsc[Key], "Response">
+        ) => Effect<A, E, R2>
+      ): HandleVoid<
+        S.Schema.Type<REST.GetResponse<Rsc[Key]>>,
+        A,
+        Handler<
+          ReqFromSchema<REST.GetRequest<Rsc[Key]>>,
+          Types.Simplify<GetCTX<REST.GetRequest<Rsc[Key]>>>,
+          RT,
+          A,
+          E,
+          R2
+        >
+      >
+
+      <
+        SVC extends Record<
+          string,
+          EffectUnunified<any, any, any>
+        >,
+        R2,
+        E,
+        A
+      >(
+        services: SVC,
+        f: (
+          req: ReqFromSchema<REST.GetRequest<Rsc[Key]>>,
+          ctx: Compute<
+            LowerServices<EffectDeps<SVC>> & GetCTX<REST.GetRequest<Rsc[Key]>> & Pick<Rsc[Key], "Response">,
+            "flat"
+          >
+        ) => Effect<A, E, R2>
+      ): HandleVoid<
+        S.Schema.Type<REST.GetResponse<Rsc[Key]>>,
+        A,
+        Handler<
+          ReqFromSchema<REST.GetRequest<Rsc[Key]>>,
+          Types.Simplify<GetCTX<REST.GetRequest<Rsc[Key]>>>,
+          RT,
+          A,
+          E,
+          R2
+        >
+      >
+    }
+
+    type Keys = keyof Filtered
+    type Handler<Req, Context, RT extends "raw" | "d", A, E, R> = {
+      new(): {}
+      _tag: RT
+      handler: (
+        req: Req,
+        ctx: Context
+      ) => Effect<
+        A,
+        E,
+        R
+      >
+    }
+
+    type AHandler<Action extends Record<string, any>> =
+      | Handler<
+        ReqFromSchema<REST.GetRequest<Action>>,
+        GetCTX<REST.GetRequest<Action>>,
+        "raw",
+        ResRawFromSchema<REST.GetResponse<Action>>,
+        SupportedErrors | S.ParseResult.ParseError | S.Schema.Type<REST.GetRequest<Action>["failure"]>,
+        any
+      >
+      | Handler<
+        ReqFromSchema<REST.GetRequest<Action>>,
+        GetCTX<REST.GetRequest<Action>>,
+        "d",
+        ResFromSchema<REST.GetResponse<Action>>,
+        SupportedErrors | S.ParseResult.ParseError | S.Schema.Type<REST.GetRequest<Action>["failure"]>,
+        any
+      >
+
+    const controllers = <
+      THandlers extends {
+        // import to keep them separate via | for type checking!!
+        [K in Keys]: AHandler<Rsc[K]>
+      }
+    >(
+      controllers: THandlers
+    ) => {
+      const handlers = typedKeysOf(filtered).reduce(
+        (acc, cur) => {
+          if (cur === "meta") return acc
+          const m = (rsc as any).meta as { moduleName: string }
+          if (!m) throw new Error("Resource has no meta specified")
+          ;(acc as any)[cur] = handle(
+            rsc[cur],
+            m.moduleName + "." + (cur as string)
+          )(controllers[cur as keyof typeof controllers] as any)
+          return acc
+        },
+        {} as {
+          [K in Keys]: ReqHandler<
+            ReqFromSchema<REST.GetRequest<Rsc[K]>>,
+            _R<ReturnType<THandlers[K]["handler"]>>,
+            _E<ReturnType<THandlers[K]["handler"]>>,
+            ResFromSchema<REST.GetResponse<Rsc[K]>>,
+            REST.GetRequest<Rsc[K]>,
+            REST.GetResponse<Rsc[K]>,
+            GetCTX<REST.GetRequest<Rsc[K]>>,
+            GetContext<REST.GetRequest<Rsc[K]>>
+          >
+        }
+      )
+
+      const mapped = typedKeysOf(handlers).reduce((acc, cur) => {
+        const handler = handlers[cur]
+        const req = handler.Request
+
+        class Request extends (req as any) {
+          static path = "/" + handler.name + (req.path === "/" ? "" : req.path)
+          static method = req.method === "AUTO"
+            ? REST.determineMethod(handler.name.split(".")[1]!, req)
+            : req.method
+        }
+        if (req.method === "AUTO") {
+          Object.assign(Request, {
+            [Request.method === "GET" || Request.method === "DELETE" ? "Query" : "Body"]: req.Auto
+          })
+        }
+        Object.assign(handler, { Request })
+        acc[cur] = match(
+          handler as any,
+          errorHandler(req),
+          handleRequestEnv // TODO
+        )
+        return acc
+      }, {} as any) as {
+        [K in Keys]: RouteMatch<
+          _R<ReturnType<THandlers[K]["handler"]>>,
+          ReqFromSchema<REST.GetRequest<Rsc[K]>>,
+          //        _E<ReturnType<THandlers[K]["handler"]>>,
+          GetContext<REST.GetRequest<Rsc[K]>>
+        >
+      }
+
+      type _RRoute<T extends HttpRouter.Route<any, any>> = [T] extends [
+        HttpRouter.Route<any, infer R>
+      ] ? R
+        : never
+
+      type _ERoute<T extends HttpRouter.Route<any, any>> = [T] extends [
+        HttpRouter.Route<infer E, any>
+      ] ? E
+        : never
+
+      return HttpRouter.fromIterable(Object.values(mapped)) as HttpRouter.HttpRouter<
+        _ERoute<typeof mapped[keyof typeof mapped]>,
+        _RRoute<typeof mapped[keyof typeof mapped]>
+      >
+    }
+
+    type ResRawFromSchema<ResSchema> = S.Schema.Encoded<Extr<ResSchema>>
+
+    const r = {
+      controllers,
+      ...typedKeysOf(filtered).reduce(
+        (prev, cur) => {
+          ;(prev as any)[cur] = (svcOrFnOrEffect: any, fnOrNone: any) =>
+            Effect.isEffect(svcOrFnOrEffect)
+              ? class {
+                static _tag = "d"
+                static handler = () => svcOrFnOrEffect
+              }
+              : typeof svcOrFnOrEffect === "function"
+              ? class {
+                static _tag = "d"
+                static handler = (req: any, ctx: any) => svcOrFnOrEffect(req, { ...ctx, Response: rsc[cur].Response })
+              }
+              : class {
+                static _tag = "d"
+                static handler = matchWithServices(cur)(svcOrFnOrEffect, fnOrNone)
+              }
+          ;(prev as any)[(cur as any) + "Raw"] = (svcOrFnOrEffect: any, fnOrNone: any) =>
+            Effect.isEffect(svcOrFnOrEffect)
+              ? class {
+                static _tag = "raw"
+                static handler = () => svcOrFnOrEffect
+              }
+              : typeof svcOrFnOrEffect === "function"
+              ? class {
+                static _tag = "raw"
+                static handler = (req: any, ctx: any) => svcOrFnOrEffect(req, { ...ctx, Response: rsc[cur].Response })
+              }
+              : class {
+                static _tag = "raw"
+                static handler = matchWithServices(cur)(svcOrFnOrEffect, fnOrNone)
+              }
+          return prev
+        },
+        {} as
+          & {
+            // use Rsc as Key over using Keys, so that the Go To on X.Action remain in tact in Controllers files
+            [Key in keyof Filtered]: MatchWithServicesNew<"d", Key>
+          }
+          & {
+            // use Rsc as Key over using Keys, so that the Go To on X.Action remain in tact in Controllers files
+            [Key in keyof Filtered as Key extends string ? `${Key}Raw` : never]: MatchWithServicesNew<"raw", Key>
+          }
+      )
+    }
+    return r
+  }
+
+  const errorHandler = (resourceRequest: { failure?: S.Schema.AnyNoContext }) => {
+    return <R>(
+      req: HttpServerRequest.HttpServerRequest,
+      res: HttpServerResponse.HttpServerResponse,
+      r2: Effect<HttpServerResponse.HttpServerResponse, SupportedErrors | JWTError | S.ParseResult.ParseError, R>
+    ) => defaultErrorHandler(req, res, Effect.catchTag(r2, "ParseError", (_) => Effect.die(_)), resourceRequest.failure)
+  }
+
+  /**
+   * Gather all handlers of a module and attach them to the Server.
+   * If no `allowAnonymous` flag is on the Request, will require a valid authenticated user.
+   */
+
+  function matchAll<T extends RequestHandlersTest>(handlers: T) {
+    const r = typedKeysOf(handlers).reduce((acc, cur) => {
+      return HttpRouter.concat(acc, handlers[cur] as any)
+    }, HttpRouter.empty)
+
+    type _RRouter<T extends HttpRouter.HttpRouter<any, any>> = [T] extends [
+      HttpRouter.HttpRouter<infer R, any>
+    ] ? R
+      : never
+
+    type _ERouter<T extends HttpRouter.HttpRouter<any, any>> = [T] extends [
+      HttpRouter.HttpRouter<any, infer E>
+    ] ? E
+      : never
+
+    return r as HttpRouter.HttpRouter<
+      _RRouter<typeof handlers[keyof typeof handlers]>,
+      _ERouter<typeof handlers[keyof typeof handlers]>
+    >
+  }
+
+  // type SupportedRequestHandler = RequestHandler<
+  //   any,
+  //   any,
+  //   any,
+  //   any,
+  //   any,
+  //   any,
+  //   any,
+  //   any,
+  //   any,
+  //   SupportedErrors | S.ParseResult.ParseError,
+  //   any,
+  //   any,
+  //   any,
+  //   any
+  // >
+
+  // type RequestHandlers = { [key: string]: SupportedRequestHandler }
+  type RequestHandlersTest = {
+    [key: string]: HttpRouter.HttpRouter<any, any>
+  }
+
+  return { matchFor, matchAll }
+}

package/vitest.config.ts.timestamp-1711744615239-dcf257a844e01.mjs

@@ -0,0 +1,37 @@
+// packages/infra/vitest.config.ts
+import { defineConfig } from "file:///Users/patrickroza/pj/effect-app/libs/node_modules/.pnpm/vite@5.2.6_@types+node@20.11.30/node_modules/vite/dist/node/index.js";
+
+// vite.config.base.ts
+import path from "path";
+import fs from "fs";
+var __vite_injected_original_dirname = "/Users/patrickroza/pj/effect-app/libs";
+function makeConfig(dirName) {
+  const prefix = path.resolve(__vite_injected_original_dirname, "packages");
+  const packages = fs.readdirSync(prefix).map((f) => prefix + "/" + f).filter((f) => fs.lstatSync(f).isDirectory());
+  const cfg = {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    //plugins: [autoImport],
+    test: {
+      include: ["./test/**/*.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"],
+      reporters: "verbose",
+      globals: true
+    },
+    resolve: {
+      alias: packages.reduce((acc, cur) => {
+        acc[JSON.parse(fs.readFileSync(cur + "/package.json", "utf-8")).name] = path.resolve(cur, cur.endsWith("core") ? "dist" : "src");
+        return acc;
+      }, {})
+      // "@effect-app/core/Prelude": path.join(__dirname, "packages/core/src/Prelude.code.ts")
+    }
+  };
+  console.log(cfg);
+  return cfg;
+}
+
+// packages/infra/vitest.config.ts
+var __vite_injected_original_dirname2 = "/Users/patrickroza/pj/effect-app/libs/packages/infra";
+var vitest_config_default = defineConfig(makeConfig(__vite_injected_original_dirname2));
+export {
+  vitest_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsicGFja2FnZXMvaW5mcmEvdml0ZXN0LmNvbmZpZy50cyIsICJ2aXRlLmNvbmZpZy5iYXNlLnRzIl0sCiAgInNvdXJjZXNDb250ZW50IjogWyJjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZGlybmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlicy9wYWNrYWdlcy9pbmZyYVwiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlicy9wYWNrYWdlcy9pbmZyYS92aXRlc3QuY29uZmlnLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9Vc2Vycy9wYXRyaWNrcm96YS9wai9lZmZlY3QtYXBwL2xpYnMvcGFja2FnZXMvaW5mcmEvdml0ZXN0LmNvbmZpZy50c1wiOy8vLyA8cmVmZXJlbmNlIHR5cGVzPVwidml0ZXN0XCIgLz5cbmltcG9ydCB7IGRlZmluZUNvbmZpZyB9IGZyb20gXCJ2aXRlXCJcbmltcG9ydCBtYWtlQ29uZmlnIGZyb20gXCIuLi8uLi92aXRlLmNvbmZpZy5iYXNlXCJcblxuZXhwb3J0IGRlZmF1bHQgZGVmaW5lQ29uZmlnKG1ha2VDb25maWcoX19kaXJuYW1lKSlcbiIsICJjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZGlybmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlic1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlicy92aXRlLmNvbmZpZy5iYXNlLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9Vc2Vycy9wYXRyaWNrcm96YS9wai9lZmZlY3QtYXBwL2xpYnMvdml0ZS5jb25maWcuYmFzZS50c1wiOy8vLyA8cmVmZXJlbmNlIHR5cGVzPVwidml0ZXN0XCIgLz5cbmltcG9ydCBwYXRoIGZyb20gXCJwYXRoXCJcbmltcG9ydCBmcyBmcm9tIFwiZnNcIlxuaW1wb3J0IEF1dG9JbXBvcnQgZnJvbSBcInVucGx1Z2luLWF1dG8taW1wb3J0L3ZpdGVcIlxuaW1wb3J0IHsgZGVmaW5lQ29uZmlnIH0gZnJvbSBcInZpdGVzdC9jb25maWdcIlxuXG4vLyBjb25zdCBhdXRvSW1wb3J0ID0gQXV0b0ltcG9ydCh7XG4vLyAgIGR0czogXCIuL3Rlc3QvYXV0by1pbXBvcnRzLmQudHNcIixcbi8vICAgLy8gaW5jbHVkZTogW1xuLy8gICAvLyAgIC9cXC50ZXN0XFwuW3RqXXN4PyQvIC8vIC50cywgLnRzeCwgLmpzLCAuanN4XG4vLyAgIC8vIF0sXG4vLyAgIGltcG9ydHM6IFtcbi8vICAgICBcInZpdGVzdFwiXG4vLyAgIF1cbi8vIH0pXG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIG1ha2VDb25maWcoZGlyTmFtZT86IHN0cmluZykge1xuICBjb25zdCBwcmVmaXggPSBwYXRoLnJlc29sdmUoX19kaXJuYW1lLCBcInBhY2thZ2VzXCIpXG4gIGNvbnN0IHBhY2thZ2VzID0gZnMucmVhZGRpclN5bmMocHJlZml4KS5tYXAoZiA9PiBwcmVmaXggKyBcIi9cIiArIGYpLmZpbHRlcihmID0+IGZzLmxzdGF0U3luYyhmKS5pc0RpcmVjdG9yeSgpIClcbiAgY29uc3QgY2ZnID0ge1xuICAgIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBAdHlwZXNjcmlwdC1lc2xpbnQvbm8tdmFyLXJlcXVpcmVzXG4gICAgLy9wbHVnaW5zOiBbYXV0b0ltcG9ydF0sXG4gICAgdGVzdDoge1xuICAgICAgaW5jbHVkZTogIFtcIi4vdGVzdC8qKi8qLnRlc3Que2pzLG1qcyxjanMsdHMsbXRzLGN0cyxqc3gsdHN4fVwiXSxcbiAgICAgIHJlcG9ydGVyczogXCJ2ZXJib3NlXCIsXG4gICAgICBnbG9iYWxzOiB0cnVlXG4gICAgfSxcbiAgICByZXNvbHZlOiB7XG4gICAgICBhbGlhczogcGFja2FnZXMucmVkdWNlKChhY2MsIGN1cikgPT4geyAvLyB3b3JrYXJvdW5kIGZvciAvUHJlbHVkZSBpc3N1ZVxuICAgICAgYWNjW0pTT04ucGFyc2UoZnMucmVhZEZpbGVTeW5jKGN1ciArIFwiL3BhY2thZ2UuanNvblwiLCBcInV0Zi04XCIpKS5uYW1lXSA9IHBhdGgucmVzb2x2ZShjdXIsIGN1ci5lbmRzV2l0aChcImNvcmVcIikgPyBcImRpc3RcIiA6IFwic3JjXCIpXG4gICAgICByZXR1cm4gYWNjXG4gICAgfSwgeyB9KSAvLyBcIkBlZmZlY3QtYXBwL2NvcmUvUHJlbHVkZVwiOiBwYXRoLmpvaW4oX19kaXJuYW1lLCBcInBhY2thZ2VzL2NvcmUvc3JjL1ByZWx1ZGUuY29kZS50c1wiKVxuICB9XG4gIH1cbiAgY29uc29sZS5sb2coY2ZnKVxuICByZXR1cm4gY2ZnXG59XG4iXSwKICAibWFwcGluZ3MiOiAiO0FBQ0EsU0FBUyxvQkFBb0I7OztBQ0E3QixPQUFPLFVBQVU7QUFDakIsT0FBTyxRQUFRO0FBRmYsSUFBTSxtQ0FBbUM7QUFnQjFCLFNBQVIsV0FBNEIsU0FBa0I7QUFDbkQsUUFBTSxTQUFTLEtBQUssUUFBUSxrQ0FBVyxVQUFVO0FBQ2pELFFBQU0sV0FBVyxHQUFHLFlBQVksTUFBTSxFQUFFLElBQUksT0FBSyxTQUFTLE1BQU0sQ0FBQyxFQUFFLE9BQU8sT0FBSyxHQUFHLFVBQVUsQ0FBQyxFQUFFLFlBQVksQ0FBRTtBQUM3RyxRQUFNLE1BQU07QUFBQTtBQUFBO0FBQUEsSUFHVixNQUFNO0FBQUEsTUFDSixTQUFVLENBQUMsa0RBQWtEO0FBQUEsTUFDN0QsV0FBVztBQUFBLE1BQ1gsU0FBUztBQUFBLElBQ1g7QUFBQSxJQUNBLFNBQVM7QUFBQSxNQUNQLE9BQU8sU0FBUyxPQUFPLENBQUMsS0FBSyxRQUFRO0FBQ3JDLFlBQUksS0FBSyxNQUFNLEdBQUcsYUFBYSxNQUFNLGlCQUFpQixPQUFPLENBQUMsRUFBRSxJQUFJLElBQUksS0FBSyxRQUFRLEtBQUssSUFBSSxTQUFTLE1BQU0sSUFBSSxTQUFTLEtBQUs7QUFDL0gsZUFBTztBQUFBLE1BQ1QsR0FBRyxDQUFFLENBQUM7QUFBQTtBQUFBLElBQ1I7QUFBQSxFQUNBO0FBQ0EsVUFBUSxJQUFJLEdBQUc7QUFDZixTQUFPO0FBQ1Q7OztBRHBDQSxJQUFNQSxvQ0FBbUM7QUFJekMsSUFBTyx3QkFBUSxhQUFhLFdBQVdDLGlDQUFTLENBQUM7IiwKICAibmFtZXMiOiBbIl9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lIiwgIl9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lIl0KfQo=