@effect-app/infra 2.26.0 → 2.27.0

package/src/api/routing.ts

@@ -2,14 +2,24 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-empty-object-type */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-/*
-TODO: Effect.retry(r2, optimisticConcurrencySchedule) / was for PATCH only
-TODO: uninteruptible commands! was for All except GET.
-*/
 import type * as HttpApp from "@effect/platform/HttpApp"
 import { Rpc, RpcRouter } from "@effect/rpc"
 import type { NonEmptyArray, NonEmptyReadonlyArray } from "effect-app"
-import { Array, Cause, Chunk, Context, Effect, FiberRef, flow, Layer, Predicate, S, Schema, Stream } from "effect-app"
+import {
+  Array,
+  Cause,
+  Chunk,
+  Context,
+  Effect,
+  FiberRef,
+  flow,
+  Layer,
+  Predicate,
+  S,
+  Schedule,
+  Schema,
+  Stream
+} from "effect-app"
 import type { GetEffectContext, RPCContextMap } from "effect-app/client/req"
 import type { HttpServerError } from "effect-app/http"
 import { HttpRouter, HttpServerRequest, HttpServerResponse } from "effect-app/http"
@@ -19,6 +29,10 @@ import { logError, reportError } from "../errorReporter.js"
 import { InfraLogger } from "../logger.js"
 import type { Middleware } from "./routing/DynamicMiddleware.js"
 import { makeRpc } from "./routing/DynamicMiddleware.js"
+import { determineMethod } from "./routing/utils.js"
+
+const optimisticConcurrencySchedule = Schedule.once
+  && Schedule.recurWhile<{ _tag: string }>((a) => a._tag === "OptimisticConcurrencyException")
 
 const logRequestError = logError("Request")
 const reportRequestError = reportError("Request")
@@ -88,7 +102,12 @@ 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
 
-type AnyRequestModule = S.Schema.Any & { _tag: string; success?: S.Schema.Any; failure?: S.Schema.Any }
+export type AnyRequestModule = S.Schema.Any & {
+  _tag: string
+  config: any
+  success: S.Schema.Any
+  failure: S.Schema.Any
+}
 export interface AddAction<Actions extends AnyRequestModule, Accum extends Record<string, any> = {}> {
   accum: Accum
   add<A extends Handler<Actions, any, any>>(
@@ -364,6 +383,13 @@ export const makeRouter = <
             const handler = controllers[cur as keyof typeof controllers]
             const req = rsc[cur]
 
+            const method = determineMethod(String(cur), req)
+            const isCommand = method._tag === "command"
+
+            const handle = isCommand
+              ? (req: any) => Effect.retry(handler.handler(req) as any, optimisticConcurrencySchedule)
+              : (req: any) => Effect.interruptible(handler.handler(req) as any)
+
             acc[cur] = rpc.effect(
               handler._tag === "raw"
                 ? class extends (req as any) {
@@ -403,7 +429,7 @@ export const makeRouter = <
                   )
                   .pipe(
                     // can't use andThen due to some being a function and effect
-                    Effect.zipRight(handler.handler(req as any) as any),
+                    Effect.zipRight(handle(req)),
                     Effect.tapErrorCause((cause) => Cause.isFailure(cause) ? logRequestError(cause) : Effect.void),
                     Effect.tapDefect((cause) =>
                       Effect
@@ -458,7 +484,6 @@ export const makeRouter = <
             .all(
               "/",
               httpApp as any,
-              // TODO: not queries.
               { uninterruptible: true }
             )
         })
@@ -722,7 +747,88 @@ export const makeRouter = <
         return this as any
       }
     }
-    return Object.assign(effect, items, { router })
+
+    type HndlrWithInput<Action extends AnyRequestModule, Mode extends "d" | "raw"> = (
+      req: S.Schema.Type<Action>
+    ) => Effect<
+      GetSuccessShape<Action, Mode>,
+      S.Schema.Type<GetFailure<Action>> | S.ParseResult.ParseError,
+      any
+    >
+
+    type Hndlr<Action extends AnyRequestModule, Mode extends "d" | "raw"> = Effect<
+      GetSuccessShape<Action, Mode>,
+      S.Schema.Type<GetFailure<Action>> | S.ParseResult.ParseError,
+      any
+    >
+
+    type Hndlrs<Action extends AnyRequestModule, Mode extends "d" | "raw"> =
+      | HndlrWithInput<Action, Mode>
+      | Hndlr<Action, Mode>
+
+    type DHndlrs<Action extends AnyRequestModule> = Hndlrs<Action, "d">
+
+    type RawHndlrs<Action extends AnyRequestModule> =
+      | { raw: HndlrWithInput<Action, "raw"> }
+      | { raw: Hndlr<Action, "raw"> }
+
+    type AnyHndlrs<Action extends AnyRequestModule> = RawHndlrs<Action> | DHndlrs<Action>
+
+    type CheckAction<Action extends AnyRequestModule, Impl, Mode extends "raw" | "d", Default> = Impl extends
+      (...args: any[]) => any ? [Effect.Success<ReturnType<Impl>>] extends [void] ? HndlrWithInput<Action, Mode>
+      : Hint<"You're returning non void for a void Response, please fix">
+      // this is insane this works...
+      : Impl extends Effect.Effect<any, any, any> ? [Effect.Success<Impl>] extends [void] ? Hndlr<Action, Mode>
+        : Effect<
+          Hint<"You're returning non void for a void Response, please fix">,
+          S.Schema.Type<GetFailure<Action>> | S.ParseResult.ParseError,
+          any
+        >
+      : Default
+
+    const router3: <
+      const Impl extends {
+        [K in keyof Filter<Rsc>]:
+          // incase we expect a void return, we want to make sure the return really is only void
+          // the problem is that anything is assignable to void. This helps catch accidental return of e.g Errors instead of yielding them
+          // Note: the alternative branches must always include AnyHndlrs, or inference will not work in certain cases
+          // but somehow especially when released (as opposed to local tests)
+          Impl[K] extends { raw: any } ? [GetSuccessShape<Rsc[K], "raw">] extends [void]
+              // this is insane this works...
+              ? { raw: CheckAction<Rsc[K], Impl[K]["raw"], "raw", AnyHndlrs<Rsc[K]>> }
+            : AnyHndlrs<Rsc[K]>
+            : [GetSuccessShape<Rsc[K], "d">] extends [void]
+            // this is insane this works...
+              ? CheckAction<Rsc[K], Impl[K], "d", AnyHndlrs<Rsc[K]>>
+            : AnyHndlrs<Rsc[K]>
+      }
+    >(
+      impl: Impl
+    ) => {
+      [K in keyof Impl & keyof Filter<Rsc>]: Handler<
+        Filter<Rsc>[K],
+        Impl[K] extends { raw: any } ? "raw" : "d",
+        Exclude<
+          | Context
+          | Exclude<
+            Impl[K] extends { raw: any } ? Impl[K]["raw"] extends (...args: any[]) => Effect<any, any, infer R> ? R
+              : Impl[K]["raw"] extends Effect<any, any, infer R> ? R
+              : never
+              : Impl[K] extends (...args: any[]) => Effect<any, any, infer R> ? R
+              : Impl[K] extends Effect<any, any, infer R> ? R
+              : never,
+            GetEffectContext<CTXMap, Rsc[K]["config"]>
+          >,
+          HttpRouter.HttpRouter.Provided
+        >
+      >
+    } = (obj: Record<keyof Filtered, any>) =>
+      typedKeysOf(obj).reduce((acc, cur) => {
+        acc[cur] = "raw" in obj[cur] ? items[cur].raw(obj[cur].raw) : items[cur](obj[cur])
+        return acc
+      }, {} as any)
+
+    return Object.assign(effect, items, { router, router3 })
   }
 
   type HR<T> = T extends HttpRouter.HttpRouter<any, infer R> ? R : never
@@ -778,7 +884,16 @@ export const makeRouter = <
     }
   }
 
-  return { matchAll, matchFor }
+  return {
+    matchAll,
+    matchFor: <
+      const ModuleName extends string,
+      const Rsc extends Record<string, any>
+    >(
+      rsc: Rsc & { meta: { moduleName: ModuleName } }
+    ) => matchFor(rsc).router3,
+    Router: matchFor
+  }
 }
 
 export type MakeDeps<Make> = Make extends { readonly dependencies: ReadonlyArray<Layer.Layer.Any> }

package/test/{controller7.test.ts → controller.legacy2.test.ts}

@@ -1,6 +1,5 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-import { makeMiddleware, makeRouter } from "@effect-app/infra/api/routing7"
+import { makeMiddleware, makeRouter } from "@effect-app/infra/api/routing.legacy2"
 import type { RequestContext } from "@effect-app/infra/RequestContext"
 import { Rpc } from "@effect/rpc"
 import type { Request } from "effect-app"
@@ -120,7 +119,7 @@ const middleware = makeMiddleware({
   })
 })
 
-export const { Router, matchAll, matchFor } = makeRouter(middleware, true)
+export const { matchAll, matchFor } = makeRouter(middleware, true)
 
 export type RequestConfig = {
   /** Disable authentication requirement */
@@ -133,19 +132,15 @@ export const { TaggedRequest: Req } = makeRpcClient<RequestConfig, CTXMap>({
   requireRoles: UnauthorizedError
 })
 
-export class DoSomething extends Req<DoSomething>()("DoSomething", {
+export class GetSomething extends Req<GetSomething>()("GetSomething", {
   id: S.String
 }, { success: S.Void }) {}
 
-export class GetSomething extends Req<GetSomething>()("GetSomething", {
+export class GetSomethingElse extends Req<GetSomethingElse>()("GetSomethingElse", {
   id: S.String
 }, { success: S.String }) {}
 
-export class GetSomething2 extends Req<GetSomething2>()("GetSomething2", {
-  id: S.String
-}, { success: S.NumberFromString }) {}
-
-const Something = { DoSomething, GetSomething, GetSomething2, meta: { moduleName: "Something" as const } }
+const Something = { GetSomething, GetSomethingElse, meta: { moduleName: "Something" as const } }
 
 export class SomethingService extends Effect.Service<SomethingService>()("SomethingService", {
   dependencies: [],
@@ -177,8 +172,8 @@ export class SomethingService2 extends Effect.Service<SomethingService2>()("Some
   })
 }) {}
 
-it("router6", () => {
-  const routes = Router(Something)({
+it("router.legacy2", () => {
+  const routes = matchFor(Something)({
     dependencies: [
       SomethingRepo.Default,
       SomethingService.Default,
@@ -191,54 +186,12 @@ it("router6", () => {
 
       console.log({ repo, smth, smth2 })
 
-      return matchFor(Something)({
-        DoSomething: Effect.void,
-        GetSomething: Effect.succeed("12"),
-        GetSomething2: Effect.succeed(12)
-      })
+      const { GetSomething, GetSomethingElse } = matchFor(Something)
+      return {
+        GetSomething: GetSomething(Effect.void),
+        GetSomethingElse: GetSomethingElse(Effect.succeed("12"))
+      }
     })
   })
   console.log({ routes })
 })
-
-export default Router(Something)({
-  dependencies: [
-    SomethingRepo.Default,
-    SomethingService.Default,
-    SomethingService2.Default
-  ],
-  effect: Effect.gen(function*() {
-    const repo = yield* SomethingRepo
-    const smth = yield* SomethingService
-    const smth2 = yield* SomethingService2
-
-    console.log({ repo, smth, smth2 })
-
-    return matchFor(Something)({
-      GetSomething: Effect.succeed("12"),
-      DoSomething: Effect.void, // Effect.succeed(2) should fail
-      GetSomething2: Effect.succeed(12)
-    })
-  })
-})
-
-export const RawTest = Router(Something)({
-  dependencies: [
-    SomethingRepo.Default,
-    SomethingService.Default,
-    SomethingService2.Default
-  ],
-  effect: Effect.gen(function*() {
-    const repo = yield* SomethingRepo
-    const smth = yield* SomethingService
-    const smth2 = yield* SomethingService2
-
-    console.log({ repo, smth, smth2 })
-
-    return matchFor(Something)({
-      GetSomething: SomethingService2.use(() => Effect.succeed("12")),
-      DoSomething: { raw: Effect.void }, // Effect.succeed(2) should fail
-      GetSomething2: { raw: SomethingService2.use(() => Effect.succeed("12")) }
-    })
-  })
-})

package/test/{controller6.test.ts → controller.legacy3.test.ts}

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-import { makeMiddleware, makeRouter } from "@effect-app/infra/api/routing6"
+import { makeMiddleware, makeRouter } from "@effect-app/infra/api/routing.legacy3"
 import type { RequestContext } from "@effect-app/infra/RequestContext"
 import { Rpc } from "@effect/rpc"
 import type { Request } from "effect-app"
@@ -172,7 +172,7 @@ export class SomethingService2 extends Effect.Service<SomethingService2>()("Some
   })
 }) {}
 
-it("router6", () => {
+it("router.legacy3 fluent", () => {
   const routes = matchFor(Something)({
     dependencies: [
       SomethingRepo.Default,

package/test/controller.test.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import { makeMiddleware, makeRouter } from "@effect-app/infra/api/routing"
 import type { RequestContext } from "@effect-app/infra/RequestContext"
@@ -119,7 +120,7 @@ const middleware = makeMiddleware({
   })
 })
 
-export const { matchAll, matchFor } = makeRouter(middleware, true)
+export const { Router, matchAll, matchFor } = makeRouter(middleware, true)
 
 export type RequestConfig = {
   /** Disable authentication requirement */
@@ -132,15 +133,19 @@ export const { TaggedRequest: Req } = makeRpcClient<RequestConfig, CTXMap>({
   requireRoles: UnauthorizedError
 })
 
-export class GetSomething extends Req<GetSomething>()("GetSomething", {
+export class DoSomething extends Req<DoSomething>()("DoSomething", {
   id: S.String
 }, { success: S.Void }) {}
 
-export class GetSomethingElse extends Req<GetSomethingElse>()("GetSomethingElse", {
+export class GetSomething extends Req<GetSomething>()("GetSomething", {
   id: S.String
 }, { success: S.String }) {}
 
-const Something = { GetSomething, GetSomethingElse, meta: { moduleName: "Something" as const } }
+export class GetSomething2 extends Req<GetSomething2>()("GetSomething2", {
+  id: S.String
+}, { success: S.NumberFromString }) {}
+
+const Something = { DoSomething, GetSomething, GetSomething2, meta: { moduleName: "Something" as const } }
 
 export class SomethingService extends Effect.Service<SomethingService>()("SomethingService", {
   dependencies: [],
@@ -173,7 +178,7 @@ export class SomethingService2 extends Effect.Service<SomethingService2>()("Some
 }) {}
 
 it("router", () => {
-  const routes = matchFor(Something)({
+  const routes = Router(Something)({
     dependencies: [
       SomethingRepo.Default,
       SomethingService.Default,
@@ -186,12 +191,54 @@ it("router", () => {
 
       console.log({ repo, smth, smth2 })
 
-      const { GetSomething, GetSomethingElse, router } = matchFor(Something)
-      return router
-        .add(GetSomething(() => Effect.void))
-        .add(GetSomethingElse(Effect.succeed("12")))
+      return matchFor(Something)({
+        DoSomething: Effect.void,
+        GetSomething: Effect.succeed("12"),
+        GetSomething2: Effect.succeed(12)
+      })
     })
   })
-
   console.log({ routes })
 })
+
+export default Router(Something)({
+  dependencies: [
+    SomethingRepo.Default,
+    SomethingService.Default,
+    SomethingService2.Default
+  ],
+  effect: Effect.gen(function*() {
+    const repo = yield* SomethingRepo
+    const smth = yield* SomethingService
+    const smth2 = yield* SomethingService2
+
+    console.log({ repo, smth, smth2 })
+
+    return matchFor(Something)({
+      GetSomething: Effect.succeed("12"),
+      DoSomething: Effect.void, // Effect.succeed(2) should fail
+      GetSomething2: Effect.succeed(12)
+    })
+  })
+})
+
+export const RawTest = Router(Something)({
+  dependencies: [
+    SomethingRepo.Default,
+    SomethingService.Default,
+    SomethingService2.Default
+  ],
+  effect: Effect.gen(function*() {
+    const repo = yield* SomethingRepo
+    const smth = yield* SomethingService
+    const smth2 = yield* SomethingService2
+
+    console.log({ repo, smth, smth2 })
+
+    return matchFor(Something)({
+      GetSomething: SomethingService2.use(() => Effect.succeed("12")),
+      DoSomething: { raw: Effect.void }, // Effect.succeed(2) should fail
+      GetSomething2: { raw: SomethingService2.use(() => Effect.succeed("12")) }
+    })
+  })
+})

package/test/dist/controller.legacy2.test.d.ts.map

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

package/test/dist/controller.legacy3.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"controller.legacy3.test.d.ts","sourceRoot":"","sources":["../controller.legacy3.test.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AACtE,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAEjC,OAAO,EAAW,MAAM,EAAY,KAAK,EAAE,CAAC,EAAY,MAAM,YAAY,CAAA;AAC1E,OAAO,EAAwC,KAAK,aAAa,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAC/G,OAAO,EAAe,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAOhE,MAAM,WAAW,GAAG;IAClB,OAAO,EAAE,cAAc,CAAA;CACxB;AAED,MAAM,MAAM,MAAM,GAAG;IAGnB,YAAY,EAAE,aAAa,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,iBAAiB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;CACvF,CAAA;AAmGD,eAAO,MAAQ,QAAQ;;;;;sBA0EuwD,KAAK;;;;;;GA1E1wD,QAAQ;;;;;;uDA0E20F,KAAK,CAAC,GAAG;;;;;;;;;;;;uDAAw0D,KAAK,CAAC,GAAG;;;;;;;;;;;;uDAAw0D,KAAK,CAAC,GAAG;;;;;;;;;;;;uDAAw0D,KAAK,CAAC,GAAG;;;;;;;;;;;;uDAAmyD,KAAK,CAAC,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;CA1EllU,CAAA;AAElE,MAAM,MAAM,aAAa,GAAG;IAC1B,yCAAyC;IACzC,cAAc,CAAC,EAAE,IAAI,CAAA;IACrB,iEAAiE;IACjE,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAC/B,CAAA;AACD,eAAO,MAAuB,GAAG;2CAxEF,MAAM,CAAC,MAAM;mBAC7B,MACb,CA8BQ,GA9BJ,KAAK,MAEV,CA4BS,MA5BF;mBAAyB,MAC9B,CA2BO,GA3BH,KAAM,MAAK,CAAC,MAAM;;;;;;6CASqB,MAAM,CAAC,MAAM;mBAkBjD,MAjBA,CAAC,GAAG,KAAK,MAAM,CAAC,MAAM;;;;;;6CAUf,MAAC,CAAC,MAAM;mBACG,MAAM,CAAC,GAAG,KAAK,MAAM,CAAC,MAAM;;;;;;6CAc1C,MAAL,CAAK,MAAE;;;;;6CAMwC,MAAM,CAAC,MAAM;;;;;CA6BnE,CAAA;;;;;;;;;;AAEF,qBAAa,YAAa,SAAQ,iBAEX;CAAG;;;;;;;;;;AAE1B,qBAAa,gBAAiB,SAAQ,qBAEb;CAAG;;;;;AAI5B,qBAAa,gBAAiB,SAAQ,qBAKpC;CAAG;;;;;AASL,qBAAa,aAAc,SAAQ,kBAOjC;CAAG;;;;;AAEL,qBAAa,iBAAkB,SAAQ,sBAKrC;CAAG"}

package/test/dist/controller.test copy.d.ts

@@ -0,0 +1,169 @@
+import type { RequestContext } from "@effect-app/infra/RequestContext";
+import { Rpc } from "@effect/rpc";
+import { Effect, Layer, S } from "effect-app";
+import { type RPCContextMap, UnauthorizedError } from "effect-app/client";
+import { HttpServerRequest } from "effect-app/http";
+export interface CTX {
+    context: RequestContext;
+}
+export type CTXMap = {
+    requireRoles: RPCContextMap.Custom<"", never, typeof UnauthorizedError, Array<string>>;
+};
+export declare const matchAll: <T extends {
+    [key: string]: {
+        Router: {
+            router: Effect<import("@effect/platform/HttpRouter").HttpRouter<any, any>, any, any>;
+        };
+        routes: Layer.Layer<any, any, any>;
+        moduleName: string;
+    };
+}, A, E, R>(handlers: T, requestLayer: Layer.Layer<A, E, R>) => {
+    layer: Layer.Layer<never, Layer.Layer.Error<T[keyof T]["routes"]>, Layer.Layer.Context<T[keyof T]["routes"]>>;
+    Router: import("@effect/platform/HttpRouter").HttpRouter.TagClass<"RootRouter", "RootRouter", Effect.Effect.Success<T[keyof T]["Router"]["router"]> extends infer T_1 ? T_1 extends T_1 & Effect.Effect.Success<T[keyof T]["Router"]["router"]> ? T_1 extends import("@effect/platform/HttpRouter").HttpRouter<infer E_1, any> ? E_1 : never : never : never, R | Exclude<Effect.Effect.Success<T[keyof T]["Router"]["router"]> extends infer T_2 ? T_2 extends T_2 & Effect.Effect.Success<T[keyof T]["Router"]["router"]> ? T_2 extends import("@effect/platform/HttpRouter").HttpRouter<any, infer R_1> ? R_1 : never : never : never, A>>;
+}, matchFor: <const ModuleName extends string, const Rsc extends Record<string, any>>(rsc: Rsc & {
+    meta: {
+        moduleName: ModuleName;
+    };
+}) => {
+    <const Make extends {
+        dependencies: import("effect-app").Array<Layer.Layer.Any>;
+        effect: Effect<{ [K_1 in keyof { [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; }]: import("@effect-app/infra/api/routing").Handler<Rsc[K_1], any, any>; }, any, Make["strict"] extends false ? any : Make["dependencies"] extends infer T ? T extends Make["dependencies"] ? T extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k in keyof T]: Layer.Layer.Success<T[k]>; }[number] : never : never : never>;
+        strict?: boolean;
+        readonly ಠ_ಠ: never;
+    }>(make: Make): {
+        moduleName: ModuleName;
+        Router: import("@effect/platform/HttpRouter").HttpRouter.TagClass<import("@effect-app/infra/api/routing").RouterShape<Rsc>, `${ModuleName}Router`, never, Exclude<[{ [K_2 in keyof { [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; }]: Rpc.Rpc<Rsc[K_2], import("@effect-app/infra/api/routing")._R<ReturnType<import("@effect-app/infra/api/routing").MakeHandlers<Make, { [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; }>[K_2]["handler"]>>>; }[keyof { [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; }]] extends [Rpc.Rpc<any, infer R>] ? R : never, import("@effect/platform/HttpRouter").HttpRouter.Provided>>;
+        routes: Layer.Layer<import("@effect-app/infra/api/routing").RouterShape<Rsc>, import("@effect-app/infra/api/routing").MakeErrors<Make> | (Make["dependencies"] extends infer T_1 ? T_1 extends Make["dependencies"] ? T_1 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_1 in keyof T_1]: Layer.Layer.Error<T_1[k_1]>; }[number] : never : never : never), (Make["dependencies"] extends infer T_2 ? T_2 extends Make["dependencies"] ? T_2 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_2 in keyof T_2]: Layer.Layer.Context<T_2[k_2]>; }[number] : never : never : never) | Exclude<import("@effect-app/infra/api/routing").MakeContext<Make>, Make["dependencies"] extends infer T_3 ? T_3 extends Make["dependencies"] ? T_3 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_3 in keyof T_3]: Layer.Layer.Success<T_3[k_3]>; }[number] : never : never : never>>;
+    };
+    <const Make extends {
+        dependencies: import("effect-app").Array<Layer.Layer.Any>;
+        effect: Effect<{ [K in keyof { [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; }]: import("@effect-app/infra/api/routing").Handler<Rsc[K], any, any>; }, any, Make["strict"] extends false ? any : Make["dependencies"] extends infer T ? T extends Make["dependencies"] ? T extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k in keyof T]: Layer.Layer.Success<T[k]>; }[number] : never : never : never>;
+        strict?: boolean;
+        readonly ಠ_ಠ: never;
+    }>(make: Make): {
+        moduleName: ModuleName;
+        Router: import("@effect/platform/HttpRouter").HttpRouter.TagClass<import("@effect-app/infra/api/routing").RouterShape<Rsc>, `${ModuleName}Router`, never, Exclude<[{ [K_1 in keyof { [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; }]: Rpc.Rpc<Rsc[K_1], import("@effect-app/infra/api/routing")._R<ReturnType<import("@effect-app/infra/api/routing").MakeHandlers<Make, { [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; }>[K_1]["handler"]>>>; }[keyof { [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; }]] extends [Rpc.Rpc<any, infer R>] ? R : never, import("@effect/platform/HttpRouter").HttpRouter.Provided>>;
+        routes: Layer.Layer<import("@effect-app/infra/api/routing").RouterShape<Rsc>, import("@effect-app/infra/api/routing").MakeErrors<Make> | (Make["dependencies"] extends infer T_1 ? T_1 extends Make["dependencies"] ? T_1 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_1 in keyof T_1]: Layer.Layer.Error<T_1[k_1]>; }[number] : never : never : never), (Make["dependencies"] extends infer T_2 ? T_2 extends Make["dependencies"] ? T_2 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_2 in keyof T_2]: Layer.Layer.Context<T_2[k_2]>; }[number] : never : never : never) | Exclude<import("@effect-app/infra/api/routing").MakeContext<Make>, Make["dependencies"] extends infer T_3 ? T_3 extends Make["dependencies"] ? T_3 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_3 in keyof T_3]: Layer.Layer.Success<T_3[k_3]>; }[number] : never : never : never>>;
+    };
+    <const Make extends {
+        dependencies: import("effect-app").Array<Layer.Layer.Any>;
+        effect: Effect<{ [K in keyof { [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; }]: import("@effect-app/infra/api/routing").Handler<Rsc[K], any, any>; }, any, Make["strict"] extends false ? any : Make["dependencies"] extends infer T ? T extends Make["dependencies"] ? T extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k in keyof T]: Layer.Layer.Success<T[k]>; }[number] : never : never : never>;
+        strict?: boolean;
+        readonly ಠ_ಠ: never;
+    }>(make: Make): {
+        moduleName: ModuleName;
+        Router: import("@effect/platform/HttpRouter").HttpRouter.TagClass<import("@effect-app/infra/api/routing").RouterShape<Rsc>, `${ModuleName}Router`, never, Exclude<[{ [K_1 in keyof { [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; }]: Rpc.Rpc<Rsc[K_1], import("@effect-app/infra/api/routing")._R<ReturnType<import("@effect-app/infra/api/routing").MakeHandlers<Make, { [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; }>[K_1]["handler"]>>>; }[keyof { [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; }]] extends [Rpc.Rpc<any, infer R>] ? R : never, import("@effect/platform/HttpRouter").HttpRouter.Provided>>;
+        routes: Layer.Layer<import("@effect-app/infra/api/routing").RouterShape<Rsc>, import("@effect-app/infra/api/routing").MakeErrors<Make> | (Make["dependencies"] extends infer T_1 ? T_1 extends Make["dependencies"] ? T_1 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_1 in keyof T_1]: Layer.Layer.Error<T_1[k_1]>; }[number] : never : never : never), (Make["dependencies"] extends infer T_2 ? T_2 extends Make["dependencies"] ? T_2 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_2 in keyof T_2]: Layer.Layer.Context<T_2[k_2]>; }[number] : never : never : never) | Exclude<import("@effect-app/infra/api/routing").MakeContext<Make>, Make["dependencies"] extends infer T_3 ? T_3 extends Make["dependencies"] ? T_3 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_3 in keyof T_3]: Layer.Layer.Success<T_3[k_3]>; }[number] : never : never : never>>;
+    };
+    <const Make extends {
+        dependencies: import("effect-app").Array<Layer.Layer.Any>;
+        effect: Effect<{ [K in keyof { [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; }]: import("@effect-app/infra/api/routing").Handler<Rsc[K], any, any>; }, any, Make["dependencies"] extends infer T ? T extends Make["dependencies"] ? T extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k in keyof T]: Layer.Layer.Success<T[k]>; }[number] : never : never : never>;
+        strict?: boolean;
+        readonly ಠ_ಠ: never;
+    }>(make: Make): {
+        moduleName: ModuleName;
+        Router: import("@effect/platform/HttpRouter").HttpRouter.TagClass<import("@effect-app/infra/api/routing").RouterShape<Rsc>, `${ModuleName}Router`, never, Exclude<[{ [K_1 in keyof { [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; }]: Rpc.Rpc<Rsc[K_1], import("@effect-app/infra/api/routing")._R<ReturnType<import("@effect-app/infra/api/routing").MakeHandlers<Make, { [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; }>[K_1]["handler"]>>>; }[keyof { [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; }]] extends [Rpc.Rpc<any, infer R>] ? R : never, import("@effect/platform/HttpRouter").HttpRouter.Provided>>;
+        routes: Layer.Layer<import("@effect-app/infra/api/routing").RouterShape<Rsc>, import("@effect-app/infra/api/routing").MakeErrors<Make> | (Make["dependencies"] extends infer T_1 ? T_1 extends Make["dependencies"] ? T_1 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_1 in keyof T_1]: Layer.Layer.Error<T_1[k_1]>; }[number] : never : never : never), (Make["dependencies"] extends infer T_2 ? T_2 extends Make["dependencies"] ? T_2 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_2 in keyof T_2]: Layer.Layer.Context<T_2[k_2]>; }[number] : never : never : never) | Exclude<import("@effect-app/infra/api/routing").MakeContext<Make>, Make["dependencies"] extends infer T_3 ? T_3 extends Make["dependencies"] ? T_3 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_3 in keyof T_3]: Layer.Layer.Success<T_3[k_3]>; }[number] : never : never : never>>;
+    };
+    <const Make extends {
+        dependencies: import("effect-app").Array<Layer.Layer.Any>;
+        effect: Effect<{ [K in keyof { [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; }]: import("@effect-app/infra/api/routing").Handler<Rsc[K], any, any>; }, any, Make["dependencies"] extends infer T ? T extends Make["dependencies"] ? T extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k in keyof T]: Layer.Layer.Success<T[k]>; }[number] : never : never : never>;
+        strict?: boolean;
+    }>(make: Make): {
+        moduleName: ModuleName;
+        Router: import("@effect/platform/HttpRouter").HttpRouter.TagClass<import("@effect-app/infra/api/routing").RouterShape<Rsc>, `${ModuleName}Router`, never, Exclude<[{ [K_1 in keyof { [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; }]: Rpc.Rpc<Rsc[K_1], import("@effect-app/infra/api/routing")._R<ReturnType<import("@effect-app/infra/api/routing").MakeHandlers<Make, { [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; }>[K_1]["handler"]>>>; }[keyof { [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; }]] extends [Rpc.Rpc<any, infer R>] ? R : never, import("@effect/platform/HttpRouter").HttpRouter.Provided>>;
+        routes: Layer.Layer<import("@effect-app/infra/api/routing").RouterShape<Rsc>, import("@effect-app/infra/api/routing").MakeErrors<Make> | (Make["dependencies"] extends infer T_1 ? T_1 extends Make["dependencies"] ? T_1 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_1 in keyof T_1]: Layer.Layer.Error<T_1[k_1]>; }[number] : never : never : never), (Make["dependencies"] extends infer T_2 ? T_2 extends Make["dependencies"] ? T_2 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_2 in keyof T_2]: Layer.Layer.Context<T_2[k_2]>; }[number] : never : never : never) | Exclude<import("@effect-app/infra/api/routing").MakeContext<Make>, Make["dependencies"] extends infer T_3 ? T_3 extends Make["dependencies"] ? T_3 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_3 in keyof T_3]: Layer.Layer.Success<T_3[k_3]>; }[number] : never : never : never>>;
+    };
+    <const Make extends {
+        dependencies: [...Make["dependencies"], ...Exclude<Effect.Effect.Context<Make["effect"]>, import("effect/Types").Contravariant.Type<import("@effect-app/infra/api/routing").MakeDeps<Make>[typeof Layer.LayerTypeId]["_ROut"]>> extends never ? [] : [Layer.Layer<Exclude<Effect.Effect.Context<Make["effect"]>, import("effect/Types").Contravariant.Type<import("@effect-app/infra/api/routing").MakeDeps<Make>[typeof Layer.LayerTypeId]["_ROut"]>>, never, never>]];
+        effect: Effect<{ [K in keyof { [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; }]: import("@effect-app/infra/api/routing").Handler<Rsc[K], any, any>; }, any, any>;
+        strict?: boolean;
+    }>(make: Make): {
+        moduleName: ModuleName;
+        Router: import("@effect/platform/HttpRouter").HttpRouter.TagClass<import("@effect-app/infra/api/routing").RouterShape<Rsc>, `${ModuleName}Router`, never, never>;
+        routes: any;
+    };
+} & import("@effect-app/infra/api/routing").RouteMatcher<CTXMap, Rsc, HttpServerRequest.HttpServerRequest> & {
+    router: import("@effect-app/infra/api/routing").AddAction<{ [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; }[keyof { [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; }], {}>;
+    router2: { [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; } extends infer T extends Record<string, import("@effect-app/infra/api/routing").AnyRequestModule> ? { [K in keyof T]: import("@effect-app/infra/api/routing").Method<{ [K in keyof Rsc as Rsc[K] extends import("@effect-app/infra/api/routing").AnyRequestModule ? K : never]: Rsc[K]; }, K, "d", {}>; } : never;
+};
+export type RequestConfig = {
+    /** Disable authentication requirement */
+    allowAnonymous?: true;
+    /** Control the roles that are required to access the resource */
+    allowRoles?: readonly string[];
+};
+export declare const Req: <Self>() => {
+    <Tag extends string, Payload extends S.Struct.Fields, C extends {
+        success: S.Schema.Any | S.Struct.Fields;
+        failure: S.Schema.Any | S.Struct.Fields;
+    }>(tag: Tag, fields: Payload, config: RequestConfig & C): S.TaggedRequestClass<Self, Tag, {
+        readonly _tag: S.tag<Tag>;
+    } & Payload, (RequestConfig & C)["success"] extends infer T ? T extends (RequestConfig & C)["success"] ? T extends import("effect/Schema").Struct.Fields ? S.TypeLiteral<T, []> : T extends S.Schema.Any ? T : never : never : never, ([((RequestConfig & C)["failure"] extends infer T_1 ? T_1 extends (RequestConfig & C)["failure"] ? T_1 extends import("effect/Schema").Struct.Fields ? S.TypeLiteral<T_1, []> : T_1 extends S.Schema.Any ? T_1 : never : never : never) | import("effect-app/client").GetEffectError<CTXMap, C>] extends [never] ? [] : [((RequestConfig & C)["failure"] extends infer T_1 ? T_1 extends (RequestConfig & C)["failure"] ? T_1 extends import("effect/Schema").Struct.Fields ? S.TypeLiteral<T_1, []> : T_1 extends S.Schema.Any ? T_1 : never : never : never) | import("effect-app/client").GetEffectError<CTXMap, C>]) extends infer T_2 ? T_2 extends ([((RequestConfig & C)["failure"] extends infer T_1 ? T_1 extends (RequestConfig & C)["failure"] ? T_1 extends import("effect/Schema").Struct.Fields ? S.TypeLiteral<T_1, []> : T_1 extends S.Schema.Any ? T_1 : never : never : never) | import("effect-app/client").GetEffectError<CTXMap, C>] extends [never] ? [] : [((RequestConfig & C)["failure"] extends infer T_1 ? T_1 extends (RequestConfig & C)["failure"] ? T_1 extends import("effect/Schema").Struct.Fields ? S.TypeLiteral<T_1, []> : T_1 extends S.Schema.Any ? T_1 : never : never : never) | import("effect-app/client").GetEffectError<CTXMap, C>]) ? T_2 extends readonly S.Schema.All[] ? S.Union<T_2> : typeof S.Never : never : never> & {
+        config: Omit<C, "success" | "failure">;
+    };
+    <Tag extends string, Payload_1 extends S.Struct.Fields, C_1 extends {
+        success: S.Schema.Any | S.Struct.Fields;
+    }>(tag: Tag, fields: Payload_1, config: RequestConfig & C_1): S.TaggedRequestClass<Self, Tag, {
+        readonly _tag: S.tag<Tag>;
+    } & Payload_1, (RequestConfig & C_1)["success"] extends infer T ? T extends (RequestConfig & C_1)["success"] ? T extends import("effect/Schema").Struct.Fields ? S.TypeLiteral<T, []> : T extends S.Schema.Any ? T : never : never : never, ([import("effect-app/client").GetEffectError<CTXMap, C_1>] extends [never] ? [] : [import("effect-app/client").GetEffectError<CTXMap, C_1>]) extends infer T_1 ? T_1 extends ([import("effect-app/client").GetEffectError<CTXMap, C_1>] extends [never] ? [] : [import("effect-app/client").GetEffectError<CTXMap, C_1>]) ? T_1 extends readonly S.Schema.All[] ? S.Union<T_1> : typeof S.Never : never : never> & {
+        config: Omit<C_1, "success" | "failure">;
+    };
+    <Tag extends string, Payload_2 extends S.Struct.Fields, C_2 extends {
+        failure: S.Schema.Any | S.Struct.Fields;
+    }>(tag: Tag, fields: Payload_2, config: RequestConfig & C_2): S.TaggedRequestClass<Self, Tag, {
+        readonly _tag: S.tag<Tag>;
+    } & Payload_2, typeof S.Void, ([((RequestConfig & C_2)["failure"] extends infer T ? T extends (RequestConfig & C_2)["failure"] ? T extends import("effect/Schema").Struct.Fields ? S.TypeLiteral<T, []> : T extends S.Schema.Any ? T : never : never : never) | import("effect-app/client").GetEffectError<CTXMap, C_2>] extends [never] ? [] : [((RequestConfig & C_2)["failure"] extends infer T ? T extends (RequestConfig & C_2)["failure"] ? T extends import("effect/Schema").Struct.Fields ? S.TypeLiteral<T, []> : T extends S.Schema.Any ? T : never : never : never) | import("effect-app/client").GetEffectError<CTXMap, C_2>]) extends infer T_1 ? T_1 extends ([((RequestConfig & C_2)["failure"] extends infer T ? T extends (RequestConfig & C_2)["failure"] ? T extends import("effect/Schema").Struct.Fields ? S.TypeLiteral<T, []> : T extends S.Schema.Any ? T : never : never : never) | import("effect-app/client").GetEffectError<CTXMap, C_2>] extends [never] ? [] : [((RequestConfig & C_2)["failure"] extends infer T ? T extends (RequestConfig & C_2)["failure"] ? T extends import("effect/Schema").Struct.Fields ? S.TypeLiteral<T, []> : T extends S.Schema.Any ? T : never : never : never) | import("effect-app/client").GetEffectError<CTXMap, C_2>]) ? T_1 extends readonly S.Schema.All[] ? S.Union<T_1> : typeof S.Never : never : never> & {
+        config: Omit<C_2, "success" | "failure">;
+    };
+    <Tag extends string, Payload_3 extends S.Struct.Fields, C_3 extends Record<string, any>>(tag: Tag, fields: Payload_3, config: C_3 & RequestConfig): S.TaggedRequestClass<Self, Tag, {
+        readonly _tag: S.tag<Tag>;
+    } & Payload_3, typeof S.Void, ([import("effect-app/client").GetEffectError<CTXMap, C_3>] extends [never] ? [] : [import("effect-app/client").GetEffectError<CTXMap, C_3>]) extends infer T ? T extends ([import("effect-app/client").GetEffectError<CTXMap, C_3>] extends [never] ? [] : [import("effect-app/client").GetEffectError<CTXMap, C_3>]) ? T extends readonly S.Schema.All[] ? S.Union<T> : typeof S.Never : never : never> & {
+        config: Omit<C_3, "success" | "failure">;
+    };
+    <Tag extends string, Payload_4 extends S.Struct.Fields>(tag: Tag, fields: Payload_4): S.TaggedRequestClass<Self, Tag, {
+        readonly _tag: S.tag<Tag>;
+    } & Payload_4, typeof S.Void, never>;
+};
+declare const GetSomething_base: S.TaggedRequestClass<GetSomething, "GetSomething", {
+    readonly _tag: S.tag<"GetSomething">;
+} & {
+    id: typeof S.String;
+}, typeof S.Void, S.Union<[typeof UnauthorizedError]>> & {
+    config: Omit<{
+        success: typeof S.Void;
+    }, "success" | "failure">;
+};
+export declare class GetSomething extends GetSomething_base {
+}
+declare const GetSomethingElse_base: S.TaggedRequestClass<GetSomethingElse, "GetSomethingElse", {
+    readonly _tag: S.tag<"GetSomethingElse">;
+} & {
+    id: typeof S.String;
+}, typeof S.String, S.Union<[typeof UnauthorizedError]>> & {
+    config: Omit<{
+        success: typeof S.String;
+    }, "success" | "failure">;
+};
+export declare class GetSomethingElse extends GetSomethingElse_base {
+}
+declare const SomethingService_base: import("effect/Effect").Service.Class<SomethingService, "SomethingService", {
+    readonly dependencies: readonly [];
+    readonly effect: Effect.Effect<{}, never, never>;
+}>;
+export declare class SomethingService extends SomethingService_base {
+}
+declare const SomethingRepo_base: import("effect/Effect").Service.Class<SomethingRepo, "SomethingRepo", {
+    readonly dependencies: readonly [Layer.Layer<SomethingService, never, never>];
+    readonly effect: Effect.Effect<{}, never, SomethingService>;
+}>;
+export declare class SomethingRepo extends SomethingRepo_base {
+}
+declare const SomethingService2_base: import("effect/Effect").Service.Class<SomethingService2, "SomethingService2", {
+    readonly dependencies: readonly [];
+    readonly effect: Effect.Effect<{}, never, never>;
+}>;
+export declare class SomethingService2 extends SomethingService2_base {
+}
+export {};
+//# sourceMappingURL=controller.test%20copy.d.ts.map

package/test/dist/controller.test copy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"controller.test copy.d.ts","sourceRoot":"","sources":["../controller.test copy.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AACtE,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAEjC,OAAO,EAAW,MAAM,EAAY,KAAK,EAAE,CAAC,EAAY,MAAM,YAAY,CAAA;AAC1E,OAAO,EAAwC,KAAK,aAAa,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAC/G,OAAO,EAAe,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAOhE,MAAM,WAAW,GAAG;IAClB,OAAO,EAAE,cAAc,CAAA;CACxB;AAED,MAAM,MAAM,MAAM,GAAG;IAGnB,YAAY,EAAE,aAAa,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,iBAAiB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;CACvF,CAAA;AAmGD,eAAO,MAAQ,QAAQ;;;;;sBA2DnB,KACH;;;;;;GA5DwB,QAAQ;;;;;;uDAmG8B,KAAK,CAAC,GAAG;;;;;;;;;;uDAAkyD,KAAK,CAAC,GAAG;;;;;;;;;;uDAAkyD,KAAK,CAAC,GAAG;;;;;;;;;;uDAAkyD,KAAK,CAAC,GAAG;;;;;;;;;;uDAA6vD,KAAK,CAAC,GAAG;;;;;;;;;;;;;;;;;;;;CAnG7oO,CAAA;AAElE,MAAM,MAAM,aAAa,GAAG;IAC1B,yCAAyC;IACzC,cAAc,CAAC,EAAE,IAAI,CAAA;IACrB,iEAAiE;IACjE,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAC/B,CAAA;AACD,eAAO,MAAuB,GAAG;2CAxEM,MAAM,CAAC,MAAM;mBAgC1C,MA9BA,CAAC,GAAG,KA8BJ,MA5BD,CA4BC,MA5BM;mBA4BN,MA3BC,CAAE,GAAE,KAAM,MAAK,CAAC,MAAM;;;;;;6CASqB,MAAM,CAAC,MAAM;mBACtD,MAAK,CAAC,GAAG,KAAK,MAAM,CAAC,MAAM;;;;;;6CAUpB,MAAM,CAAC,MAAM;mBACG,MAAM,CAAC,GAAG,KAAK,MAAM,CAAE,MAAK;;;;;;6CAclD,MAAG,CAAC,MAAM;;;;;6CAMwC,MAAM,CAAC,MACrE;;;CA4BA,CAAA;;;;;;;;;;AAEF,qBAAa,YAAa,SAAQ,iBAEX;CAAG;;;;;;;;;;AAE1B,qBAAa,gBAAiB,SAAQ,qBAEb;CAAG;;;;;AAI5B,qBAAa,gBAAiB,SAAQ,qBAKpC;CAAG;;;;;AASL,qBAAa,aAAc,SAAQ,kBAOjC;CAAG;;;;;AAEL,qBAAa,iBAAkB,SAAQ,sBAKrC;CAAG"}