@effect-app/infra 2.17.0 → 2.19.0

package/src/api/routing.ts

@@ -14,6 +14,7 @@ import type { GetEffectContext, RPCContextMap } from "effect-app/client/req"
 import type { HttpServerError } from "effect-app/http"
 import { HttpRouter, HttpServerRequest, HttpServerResponse } from "effect-app/http"
 import { pretty, typedKeysOf, typedValuesOf } from "effect-app/utils"
+import type { Contravariant } from "effect/Types"
 import { logError, reportError } from "../errorReporter.js"
 import { InfraLogger } from "../logger.js"
 import type { Middleware } from "./routing/DynamicMiddleware.js"
@@ -314,7 +315,7 @@ export const makeRouter = <
       TLayers extends NonEmptyReadonlyArray<Layer.Layer.Any> | never[]
     >(
       layers: TLayers,
-      make: (requests: typeof items) => Effect<THandlers, E, R>
+      make: Effect<THandlers, E, R>
     ) => {
       type ProvidedLayers =
         | { [k in keyof Layers]: Layer.Layer.Success<Layers[k]> }[number]
@@ -335,7 +336,7 @@ export const makeRouter = <
 
       const layer = r.use((router) =>
         Effect.gen(function*() {
-          const controllers = yield* make(items)
+          const controllers = yield* make
           const rpc = yield* makeRpc(middleware)
 
           // return make.pipe(Effect.map((c) => controllers(c, layers)))
@@ -470,23 +471,57 @@ export const makeRouter = <
 
     const effect: {
       // Multiple times duplicated the "good" overload, so that errors will only mention the last overload when failing
+      // <
+      //   E,
+      //   R,
+      //   Make extends (
+      //     requests: RouteMatcher<CTXMap, Rsc, Context>
+      //   ) => Effect<
+      //     { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]> },
+      //     any,
+      //     Strict extends true ? GetSuccess<MakeLayers["dependencies"]> : any
+      //   >,
+      //   THandlers extends { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]> },
+      //   MakeLayers extends { dependencies: NonEmptyReadonlyArray<Layer.Layer.Any> | never[] },
+      //   Strict extends boolean = true
+      // >(
+      //   layers: MakeLayers,
+      //   make: Make & ((requests: RouteMatcher<CTXMap, Rsc, Context>) => Effect<THandlers, E, R>),
+      //   strict?: Strict
+      // ): {
+      //   moduleName: ModuleName
+      //   Router: HttpRouter.HttpRouter.TagClass<
+      //     RouterShape<Rsc>,
+      //     `${ModuleName}Router`,
+      //     never,
+      //     | Exclude<Context, HttpRouter.HttpRouter.Provided>
+      //     | Exclude<
+      //       RPCRouteR<
+      //         { [K in keyof Filter<Rsc>]: Rpc.Rpc<Rsc[K], _R<ReturnType<THandlers[K]["handler"]>>> }[keyof Filter<Rsc>]
+      //       >,
+      //       HttpRouter.HttpRouter.Provided
+      //     >
+      //   >
+      //   routes: Layer.Layer<
+      //     RouterShape<Rsc>,
+      //     E | GetError<MakeLayers["dependencies"]>,
+      //     | GetContext<MakeLayers["dependencies"]>
+      //     // | GetContext<Layers> // elsewhere provided
+      //     | Exclude<R | RMW, GetSuccess<MakeLayers["dependencies"]> | GetSuccess<Layers>>
+      //   >
+      // }
       <
-        E,
-        R,
-        Make extends (
-          requests: RouteMatcher<CTXMap, Rsc, Context>
-        ) => Effect<
-          { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]> },
-          any,
-          Strict extends true ? GetSuccess<TLayers> : any
-        >,
-        THandlers extends { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]> },
-        TLayers extends NonEmptyReadonlyArray<Layer.Layer.Any> | never[],
-        Strict extends boolean = true
+        const Make extends {
+          dependencies: Array<Layer.Layer.Any>
+          effect: Effect<
+            { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]> },
+            any,
+            Make["strict"] extends false ? any : GetSuccess<Make["dependencies"]>
+          >
+          strict?: boolean
+        }
       >(
-        layers: TLayers,
-        make: Make & ((requests: RouteMatcher<CTXMap, Rsc, Context>) => Effect<THandlers, E, R>),
-        strict?: Strict
+        make: Make
       ): {
         moduleName: ModuleName
         Router: HttpRouter.HttpRouter.TagClass<
@@ -496,36 +531,33 @@ export const makeRouter = <
           | Exclude<Context, HttpRouter.HttpRouter.Provided>
           | Exclude<
             RPCRouteR<
-              { [K in keyof Filter<Rsc>]: Rpc.Rpc<Rsc[K], _R<ReturnType<THandlers[K]["handler"]>>> }[keyof Filter<Rsc>]
+              {
+                [K in keyof Filter<Rsc>]: Rpc.Rpc<Rsc[K], _R<ReturnType<MakeHandlers<Make, Filter<Rsc>>[K]["handler"]>>>
+              }[keyof Filter<Rsc>]
             >,
             HttpRouter.HttpRouter.Provided
           >
         >
         routes: Layer.Layer<
           RouterShape<Rsc>,
-          E | GetError<TLayers>,
-          | GetContext<TLayers>
+          MakeErrors<Make> | GetError<Make["dependencies"]>,
+          | GetContext<Make["dependencies"]>
           // | GetContext<Layers> // elsewhere provided
-          | Exclude<R | RMW, GetSuccess<TLayers> | GetSuccess<Layers>>
+          | Exclude<MakeContext<Make> | RMW, GetSuccess<Make["dependencies"]> | GetSuccess<Layers>>
         >
       }
       <
-        E,
-        R,
-        Make extends (
-          requests: RouteMatcher<CTXMap, Rsc, Context>
-        ) => Effect<
-          { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]> },
-          any,
-          Strict extends true ? GetSuccess<TLayers> : any
-        >,
-        THandlers extends { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]> },
-        TLayers extends NonEmptyReadonlyArray<Layer.Layer.Any> | never[],
-        Strict extends boolean = true
+        const Make extends {
+          dependencies: Array<Layer.Layer.Any>
+          effect: Effect<
+            { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]> },
+            any,
+            GetSuccess<Make["dependencies"]>
+          >
+          strict?: boolean
+        }
       >(
-        layers: TLayers,
-        make: Make & ((requests: RouteMatcher<CTXMap, Rsc, Context>) => Effect<THandlers, E, R>),
-        strict?: Strict
+        make: Make
       ): {
         moduleName: ModuleName
         Router: HttpRouter.HttpRouter.TagClass<
@@ -535,36 +567,33 @@ export const makeRouter = <
           | Exclude<Context, HttpRouter.HttpRouter.Provided>
           | Exclude<
             RPCRouteR<
-              { [K in keyof Filter<Rsc>]: Rpc.Rpc<Rsc[K], _R<ReturnType<THandlers[K]["handler"]>>> }[keyof Filter<Rsc>]
+              {
+                [K in keyof Filter<Rsc>]: Rpc.Rpc<Rsc[K], _R<ReturnType<MakeHandlers<Make, Filter<Rsc>>[K]["handler"]>>>
+              }[keyof Filter<Rsc>]
             >,
             HttpRouter.HttpRouter.Provided
           >
         >
         routes: Layer.Layer<
           RouterShape<Rsc>,
-          E | GetError<TLayers>,
-          | GetContext<TLayers>
+          MakeErrors<Make> | GetError<Make["dependencies"]>,
+          | GetContext<Make["dependencies"]>
           // | GetContext<Layers> // elsewhere provided
-          | Exclude<R | RMW, GetSuccess<TLayers> | GetSuccess<Layers>>
+          | Exclude<MakeContext<Make> | RMW, GetSuccess<Make["dependencies"]> | GetSuccess<Layers>>
         >
       }
       <
-        E,
-        R,
-        Make extends (
-          requests: RouteMatcher<CTXMap, Rsc, Context>
-        ) => Effect<
-          { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]> },
-          any,
-          Strict extends true ? GetSuccess<TLayers> : any
-        >,
-        THandlers extends { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]> },
-        TLayers extends NonEmptyReadonlyArray<Layer.Layer.Any> | never[],
-        Strict extends boolean = true
+        const Make extends {
+          dependencies: Array<Layer.Layer.Any>
+          effect: Effect<
+            { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]> },
+            any,
+            GetSuccess<Make["dependencies"]>
+          >
+          strict?: boolean
+        }
       >(
-        layers: TLayers,
-        make: Make & ((requests: RouteMatcher<CTXMap, Rsc, Context>) => Effect<THandlers, E, R>),
-        strict?: Strict
+        make: Make
       ): {
         moduleName: ModuleName
         Router: HttpRouter.HttpRouter.TagClass<
@@ -574,57 +603,55 @@ export const makeRouter = <
           | Exclude<Context, HttpRouter.HttpRouter.Provided>
           | Exclude<
             RPCRouteR<
-              { [K in keyof Filter<Rsc>]: Rpc.Rpc<Rsc[K], _R<ReturnType<THandlers[K]["handler"]>>> }[keyof Filter<Rsc>]
+              {
+                [K in keyof Filter<Rsc>]: Rpc.Rpc<Rsc[K], _R<ReturnType<MakeHandlers<Make, Filter<Rsc>>[K]["handler"]>>>
+              }[keyof Filter<Rsc>]
             >,
             HttpRouter.HttpRouter.Provided
           >
         >
         routes: Layer.Layer<
           RouterShape<Rsc>,
-          E | GetError<TLayers>,
-          | GetContext<TLayers>
+          MakeErrors<Make> | GetError<Make["dependencies"]>,
+          | GetContext<Make["dependencies"]>
           // | GetContext<Layers> // elsewhere provided
-          | Exclude<R | RMW, GetSuccess<TLayers> | GetSuccess<Layers>>
+          | Exclude<MakeContext<Make> | RMW, GetSuccess<Make["dependencies"]> | GetSuccess<Layers>>
         >
       }
       <
-        E,
-        R,
-        THandlers extends { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]> },
-        TLayers extends NonEmptyReadonlyArray<Layer.Layer.Any> | never[],
-        Strict extends boolean = true
+        const Make extends {
+          dependencies: [
+            ...Make["dependencies"],
+            ...Exclude<Effect.Context<Make["effect"]>, MakeDepsOut<Make>> extends never ? []
+              : [Layer.Layer<Exclude<Effect.Context<Make["effect"]>, MakeDepsOut<Make>>, never, never>]
+          ]
+          effect: Effect<
+            { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]> },
+            any,
+            any
+          >
+          strict?: boolean
+        }
       >(
-        layers: [
-          ...TLayers,
-          Layer.Layer<Exclude<R, GetSuccess<TLayers>>, never, never>
-        ],
-        make: (requests: RouteMatcher<CTXMap, Rsc, Context>) => Effect<THandlers, E, R>,
-        strict?: Strict
+        make: Make
       ): {
         moduleName: ModuleName
         Router: HttpRouter.HttpRouter.TagClass<
           RouterShape<Rsc>,
           `${ModuleName}Router`,
           never,
-          | Exclude<Context, HttpRouter.HttpRouter.Provided>
-          | Exclude<
-            RPCRouteR<
-              { [K in keyof Filter<Rsc>]: Rpc.Rpc<Rsc[K], _R<ReturnType<THandlers[K]["handler"]>>> }[keyof Filter<Rsc>]
-            >,
-            HttpRouter.HttpRouter.Provided
-          >
-        >
-        routes: Layer.Layer<
-          RouterShape<Rsc>,
-          E | GetError<TLayers>,
-          // | GetContext<Layers> // elsewhere provided
-          | GetContext<TLayers>
-          | Exclude<R | RMW, GetSuccess<TLayers> | GetSuccess<Layers>>
-        >
+          Exclude<Context, HttpRouter.HttpRouter.Provided>
+        > // | Exclude<
+        //   RPCRouteR<
+        //     { [K in keyof Filter<Rsc>]: Rpc.Rpc<Rsc[K], _R<ReturnType<THandlers[K]["handler"]>>> }[keyof Filter<Rsc>]
+        //   >,
+        //   HttpRouter.HttpRouter.Provided
+        // >
+        routes: any
       }
-    } = f as any
+    } = ((m: { dependencies: any; effect: any; strict?: any }) => f(m.dependencies, m.effect)) as any
 
-    return effect
+    return Object.assign(effect, items)
   }
 
   type HR<T> = T extends HttpRouter.HttpRouter<any, infer R> ? R : never
@@ -682,3 +709,23 @@ export const makeRouter = <
 
   return { matchAll, matchFor }
 }
+
+export type MakeDeps<Make> = Make extends { readonly dependencies: ReadonlyArray<Layer.Layer.Any> }
+  ? Make["dependencies"][number]
+  : never
+
+export type MakeErrors<Make> = Make extends { readonly effect: Effect<any, infer E, any> } ? E
+  : never
+
+export type MakeContext<Make> = Make extends { readonly effect: Effect<any, any, infer R> } ? R
+  : never
+
+export type MakeHandlers<Make, Handlers extends Record<string, any>> = Make extends
+  { readonly effect: Effect<{ [K in keyof Handlers]: AHandler<Handlers[K]> }, any, any> }
+  ? Effect.Success<Make["effect"]>
+  : never
+
+/**
+ * @since 3.9.0
+ */
+export type MakeDepsOut<Make> = Contravariant.Type<MakeDeps<Make>[Layer.LayerTypeId]["_ROut"]>

package/test/controller.test.ts

@@ -1,12 +1,13 @@
 /* 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"
 import { Rpc } from "@effect/rpc"
 import type { Request } from "effect-app"
 import { Context, Effect, FiberRef, Layer, S, Schedule } from "effect-app"
 import { type GetEffectContext, makeRpcClient, type RPCContextMap, UnauthorizedError } from "effect-app/client"
 import { HttpHeaders, HttpServerRequest } from "effect-app/http"
 import type * as EffectRequest from "effect/Request"
-import { makeMiddleware, makeRouter } from "../src/api/routing.js"
-import type { RequestContext } from "../src/RequestContext.js"
+import { it } from "vitest"
 
 const optimisticConcurrencySchedule = Schedule.once
   && Schedule.recurWhile<any>((a) => a?._tag === "OptimisticConcurrencyException")
@@ -135,17 +136,61 @@ export class GetSomething extends Req<GetSomething>()("GetSomething", {
   id: S.String
 }, { success: S.Void }) {}
 
-const Something = { GetSomething, meta: { moduleName: "Something" as const } }
+export class GetSomethingElse extends Req<GetSomethingElse>()("GetSomethingElse", {
+  id: S.String
+}, { success: S.String }) {}
+
+const Something = { GetSomething, GetSomethingElse, meta: { moduleName: "Something" as const } }
+
+export class SomethingService extends Effect.Service<SomethingService>()("SomethingService", {
+  dependencies: [],
+  effect: Effect.gen(function*() {
+    return {}
+  })
+}) {}
+
+declare const a: {
+  (opt: { a: 1 }): void
+  (opt: { a: 2 }): void
+  (opt: { b: 3 }): void
+  (opt: { b: 3 }): void
+}
 
 export class SomethingRepo extends Effect.Service<SomethingRepo>()("SomethingRepo", {
+  dependencies: [SomethingService.Default],
+  effect: Effect.gen(function*() {
+    const smth = yield* SomethingService
+    console.log({ smth })
+    return {}
+  })
+}) {}
+
+export class SomethingService2 extends Effect.Service<SomethingService2>()("SomethingService2", {
   dependencies: [],
   effect: Effect.gen(function*() {
     return {}
   })
 }) {}
 
-matchFor(Something)([], ({ GetSomething }) =>
-  Effect.gen(function*() {
-    // const repo = yield* SomethingRepo
-    return { GetSomething: GetSomething(Effect.void) }
-  }))
+export const routes = matchFor(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 })
+
+    const { GetSomething, GetSomethingElse } = matchFor(Something)
+    return {
+      GetSomething: GetSomething(Effect.void),
+      GetSomethingElse: GetSomethingElse(Effect.succeed("12"))
+    }
+  })
+})
+
+it("works", () => {})

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

@@ -1 +1 @@
-{"version":3,"file":"controller.test.d.ts","sourceRoot":"","sources":["../controller.test.ts"],"names":[],"mappings":"AACA,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;AAGhE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAK9D,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;;;;;sBAVH,KAAC;;;;;;GAUI,QAAQ;;;;;;mBA3DpB,MAAM,CAAE,GAAE;mBA2Bb,MA1BM,CAAC,GAAG;;mBADP,MAAM,CAAE,GAAE;mBA2Bb,MA1BM,CAAC,GAAG;iKAyFuT,KAAK,CAAC,GAAG;;;uBA1FvU,MAAM,CAAE,GAAE;uBA2Bb,MA1BM,CAAC,GAAG;;uBADP,MAAM,CAAE,GAAE;uBA2Bb,MA1BM,CAAC,GAAG;;;;;mBADP,MAAM,CAAE,GAAE;mBA2Bb,MA1BM,CAAC,GAAG;;mBADP,MAAM,CAAE,GAAE;mBA2Bb,MA1BM,CAAC,GAAG;mKAyFm6D,KAAK,CAAC,GAAG;;;uBA1Fn7D,MAAM,CAAE,GAAE;uBA2Bb,MA1BM,CAAC,GAAG;;uBADP,MAAM,CAAE,GAAE;uBA2Bb,MA1BM,CAAC,GAAG;;;;;mBADP,MAAM,CAAE,GAAE;mBA2Bb,MA1BM,CAAC,GAAG;;mBADP,MAAM,CAAE,GAAE;mBA2Bb,MA1BM,CAAC,GAAG;mKAyF6iH,KAAK,CAAC,GAAG;;;uBA1F7jH,MAAM,CAAE,GAAE;uBA2Bb,MA1BM,CAAC,GAAG;;uBADP,MAAM,CAAE,GAAE;uBA2Bb,MA1BM,CAAC,GAAG;;;;;mBADP,MAAM,CAAE,GAAE;mBA2Bb,MA1BM,CAAC,GAAG;mKAyFq4J,KAAK,CAAC,GAAG;;;uBA1Fr5J,MAAM,CAAE,GAAE;uBA2Bb,MA1BM,CAAC,GAAG;;uBADP,MAAM,CAAE,GAAE;uBA2Bb,MA1BM,CAAC,GAAG;;;;CA0D8C,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;2CAvElB,MACX,CA8BM,MA9BC;mBAEqB,MAC9B,CA2BQ,GA3BJ,KAAK,MAAM,CAAE,MAAK;mBACT,MAAM,CAAC,GAAG,KAAK,MAAM,CAAC,MAAM;;;;;;6CA0BjC,MAjBA,CAAC,MAAM;mBAiBP,MAhBK,CAAC,GAAG,KAAM,MAAK,CAAC,MAAM;;;;;;6CAUT,MAAM,CAAC,MAAM;mBAAuC,MAAM,CAAC,GAAG,KAAK,MAAM,CAM3F,MALL;;;;;;6CAckB,MAAK,CAAC,MAAM;;;;;6CAMF,MAAM,CAAC,MAAM;;;CA4B5C,CAAA;;;;;;;;;;AAEF,qBAAa,YAAa,SAAQ,iBAEX;CAAG;;;;;AAI1B,qBAAa,aAAc,SAAQ,kBAKjC;CAAG"}
+{"version":3,"file":"controller.test.d.ts","sourceRoot":"","sources":["../controller.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;;;;;sBATP,KAAH;;;;;;GASY,QAAQ;;;;;;uDA8B3B,KAAK,CAAC,GAAG;;uBAzFY,MAAM,CA2BvB,GA1BP;uBAAqB,MAAM,CAAC,GAAG;;;;;;uBADP,MAAM,CA2BvB,GA1BP;uBAAqB,MAAM,CAAC,GAAG;;uBADP,MAAM,CA2BvB,GA1BP;uBAAqB,MAAM,CAAC,GAAG;;uBADP,MAAM,CA2BvB,GA1BP;uBAAqB,MAAM,CAAC,GAAG;;;;;uDAqIimB,KAAK,CAAC,GAAG;;uBAtIjnB,MAAM,CA2BvB,GA1BP;uBAAqB,MAAM,CAAC,GAAG;;;;;;uBADP,MAAM,CA2BvB,GA1BP;uBAAqB,MAAM,CAAC,GAAG;;uBADP,MAAM,CA2BvB,GA1BP;uBAAqB,MAAM,CAAC,GAAG;;uBADP,MAAM,CA2BvB,GA1BP;uBAAqB,MAAM,CAAC,GAAG;;;;;uDAqIuyE,KAAK,CAAC,GAAG;;uBAtIvzE,MAAM,CA2BvB,GA1BP;uBAAqB,MAAM,CAAC,GAAG;;;;;;uBADP,MAAM,CA2BvB,GA1BP;uBAAqB,MAAM,CAAC,GAAG;;uBADP,MAAM,CA2BvB,GA1BP;uBAAqB,MAAM,CAAC,GAAG;;uBADP,MAAM,CA2BvB,GA1BP;uBAAqB,MAAM,CAAC,GAAG;;;;;;;uBADP,MAAM,CA2BvB,GA1BP;uBAAqB,MAAM,CAAC,GAAG;;;;;;;;0GA0DgC,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;AAEL,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;CAmBjB,CAAA"}

package/test/dist/controller5.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller5.test.d.ts","sourceRoot":"","sources":["../controller5.test.ts"],"names":[],"mappings":"AACA,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;AAGhE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAK9D,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;;;;;sBAPP,KAAK;;;;;;GAOI,QAAQ;;;;;;uDAgC3B,KAAK,CAAE,GAAE;;uBA1FqB,MAAM,CAAC,GAAG;uBA0BpC,MAzBH,CAyBG,GAzBC;;;;;;uBADyB,MAAM,CAAC,GAAG;uBA0BpC,MAzBH,CAyBG,GAzBC;;uBADyB,MAAM,CAAC,GAAG;uBA0BpC,MAzBH,CAyBG,GAzBC;;uBADyB,MAAM,CAAC,GAAG;uBA0BpC,MAzBH,CAyBG,GAzBC;;;;;uDAkI0rB,KAAK,CAAC,GAAG;;uBAnI1qB,MAAM,CAAC,GAAG;uBA0BpC,MAzBH,CAyBG,GAzBC;;;;;;uBADyB,MAAM,CAAC,GAAG;uBA0BpC,MAzBH,CAyBG,GAzBC;;uBADyB,MAAM,CAAC,GAAG;uBA0BpC,MAzBH,CAyBG,GAzBC;;uBADyB,MAAM,CAAC,GAAG;uBA0BpC,MAzBH,CAyBG,GAzBC;;;;;uDAkIg4E,KAAK,CAAC,GAAG;;uBAnIh3E,MAAM,CAAC,GAAG;uBA0BpC,MAzBH,CAyBG,GAzBC;;;;;;uBADyB,MAAM,CAAC,GAAG;uBA0BpC,MAzBH,CAyBG,GAzBC;;uBADyB,MAAM,CAAC,GAAG;uBA0BpC,MAzBH,CAyBG,GAzBC;;uBADyB,MAAM,CAAC,GAAG;uBA0BpC,MAzBH,CAyBG,GAzBC;;;;;;;uBADyB,MAAM,CAAC,GAAG;uBA0BpC,MAzBH,CAyBG,GAzBC;;;;;;;;mGAyDuD,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;2CAvElB,MACZ,CA8BO,MA9BA;mBAEqB,MAC9B,CA2BS,GA3BL,KA2BK,MA3BM,CAAC,MAAM;mBACR,MAAK,CAAC,GAAG,KAAK,MAAM,CAAC,MAAM;;;;;;6CA0BhC,MAjBD,CAiBC,MAjBM;mBAiBN,MAhBI,CAgBJ,GAhBQ,KAAK,MAAM,CAAC,MAAM;;;;;;6CAUT,MAAM,CAAC,MAAM;mBAAuC,MAAM,CAAC,GAAG,KAAK,MAAM,CAAC,MACjG;;;;;;6CAciB,MAAM,CAAC,MAAM;;;;;6CAMF,MAAM,CAAC,MAAM;;;CA4B3C,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;AAEL,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;CAmBjB,CAAA"}
+{"version":3,"file":"controller5.test.d.ts","sourceRoot":"","sources":["../controller5.test.ts"],"names":[],"mappings":"AAGA,OAAO,EAAW,MAAM,EAAY,KAAK,EAAE,CAAC,EAAY,MAAM,YAAY,CAAA;AAC1E,OAAO,EAAwC,KAAK,aAAa,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAI/G,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAK9D,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,OAAE,QAAQ,KAAiC,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;2CAvElB,MACZ,CA8BO,MA9BA;mBAEqB,MAC9B,CA2BS,GA3BL,KA2BK,MA3BM,CAAC,MAAM;mBACR,MAAK,CAAC,GAAG,KAAK,MAAM,CAAC,MAAM;;;;;;6CA0BhC,MAjBD,CAiBC,MAjBM;mBAiBN,MAhBI,CAgBJ,GAhBQ,KAAK,MAAM,CAAC,MAAM;;;;;;6CAUT,MAAM,CAAC,MAAM;mBAAuC,MAAM,CAAC,GAAG,KAAK,MAAM,CAAC,MACjG;;;;;;6CAciB,MAAM,CAAC,MAAM;;;;;6CAMF,MAAM,CAAC,MAAM;;;CA4B3C,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;AAEL,eAAO,MAAM,MAAM,KAmBjB,CAAA"}

package/_cjs/api/routing copy.cjs

@@ -1,196 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.toHttpApp = exports.makeRouter = exports.makeMiddleware = exports.RouterSymbol = void 0;
-var _rpc = require("@effect/rpc");
-var _effectApp = require("effect-app");
-var _http = require("effect-app/http");
-var _utils = require("effect-app/utils");
-var _errorReporter = require("../errorReporter.cjs");
-var _logger = require("../logger.cjs");
-var _DynamicMiddleware = require("./routing/DynamicMiddleware.cjs");
-const logRequestError = (0, _errorReporter.logError)("Request");
-const reportRequestError = (0, _errorReporter.reportError)("Request");
-/**
- *   Plain jane JSON version
- * @deprecated use HttpRpcRouterNoStream.toHttpApp once support options
- */
-const toHttpApp = (self, options) => {
-  const handler = _rpc.RpcRouter.toHandler(self, options);
-  return _effectApp.Effect.withFiberRuntime(fiber => {
-    const context = fiber.getFiberRef(_effectApp.FiberRef.currentContext);
-    const request = _effectApp.Context.unsafeGet(context, _http.HttpServerRequest.HttpServerRequest);
-    return _effectApp.Effect.flatMap(request.json, _ => handler(_).pipe(_effectApp.Stream.provideContext(context), _effectApp.Stream.runCollect, _effectApp.Effect.map(_ => _effectApp.Chunk.toReadonlyArray(_)), _effectApp.Effect.andThen(_ => {
-      let status = 200;
-      for (const r of _.flat()) {
-        if (typeof r === "number") continue;
-        const results = _effectApp.Array.isArray(r) ? r : [r];
-        if (results.some(_ => _._tag === "Failure" && _.cause._tag === "Die")) {
-          status = 500;
-          break;
-        }
-        if (results.some(_ => _._tag === "Failure" && _.cause._tag === "Fail")) {
-          status = 422; // 418
-          break;
-        }
-      }
-      return _http.HttpServerResponse.json(_, {
-        status
-      });
-    }), _effectApp.Effect.orDie, _effectApp.Effect.tapDefect((0, _errorReporter.reportError)("RPCHttpApp"))));
-  });
-};
-exports.toHttpApp = toHttpApp;
-const RouterSymbol = exports.RouterSymbol = Symbol();
-// export interface RouteMatcher<
-//   Filtered extends Record<string, any>,
-//   CTXMap extends Record<string, any>,
-//   Rsc extends Filtered
-// > extends RouteMatcherInt<Filtered, CTXMap, Rsc> {}
-const makeMiddleware = content => content;
-exports.makeMiddleware = makeMiddleware;
-const makeRouter = (middleware, devMode) => {
-  function matchFor(rsc) {
-    const meta = rsc.meta;
-    const filtered = (0, _utils.typedKeysOf)(rsc).reduce((acc, cur) => {
-      if (_effectApp.Predicate.isObject(rsc[cur]) && rsc[cur]["success"]) {
-        acc[cur] = rsc[cur];
-      }
-      return acc;
-    }, {});
-    const items = (0, _utils.typedKeysOf)(filtered).reduce((prev, cur) => {
-      ;
-      prev[cur] = Object.assign(fnOrEffect => {
-        const stack = new Error().stack?.split("\n").slice(2).join("\n");
-        return _effectApp.Effect.isEffect(fnOrEffect) ? class {
-          static stack = stack;
-          static _tag = "d";
-          static handler = () => fnOrEffect;
-        } : class {
-          static stack = stack;
-          static _tag = "d";
-          static handler = fnOrEffect;
-        };
-      }, {
-        success: rsc[cur].success,
-        successRaw: _effectApp.S.encodedSchema(rsc[cur].success),
-        failure: rsc[cur].failure,
-        raw:
-        // "Raw" variations are for when you don't want to decode just to encode it again on the response
-        // e.g for direct projection from DB
-        // but more importantly, to skip Effectful decoders, like to resolve relationships from the database or remote client.
-        fnOrEffect => {
-          const stack = new Error().stack?.split("\n").slice(2).join("\n");
-          return _effectApp.Effect.isEffect(fnOrEffect) ? class {
-            static stack = stack;
-            static _tag = "raw";
-            static handler = () => fnOrEffect;
-          } : class {
-            static stack = stack;
-            static _tag = "raw";
-            static handler = (req, ctx) => fnOrEffect(req, {
-              ...ctx,
-              Response: rsc[cur].success
-            });
-          };
-        }
-      });
-      return prev;
-    }, {});
-    const f = (layers, make) => {
-      const r = class Router extends _http.HttpRouter.Tag(`${meta.moduleName}Router`)() {};
-      const layer = r.use(router => _effectApp.Effect.gen(function* () {
-        const controllers = yield* make(items);
-        const rpc = yield* (0, _DynamicMiddleware.makeRpc)(middleware);
-        // return make.pipe(Effect.map((c) => controllers(c, layers)))
-        const mapped = (0, _utils.typedKeysOf)(filtered).reduce((acc, cur) => {
-          const handler = controllers[cur];
-          const req = rsc[cur];
-          acc[cur] = rpc.effect(handler._tag === "raw" ? class extends req {
-            static success = _effectApp.S.encodedSchema(req.success);
-            get [_effectApp.Schema.symbolSerializable]() {
-              return this.constructor;
-            }
-            get [_effectApp.Schema.symbolWithResult]() {
-              return {
-                failure: req.failure,
-                success: _effectApp.S.encodedSchema(req.success)
-              };
-            }
-          } : req, req =>
-          // TODO: render more data... similar to console?
-          _effectApp.Effect.annotateCurrentSpan("requestInput", Object.entries(req).reduce((prev, [key, value]) => {
-            prev[key] = key === "password" ? "<redacted>" : typeof value === "string" || typeof value === "number" || typeof value === "boolean" ? typeof value === "string" && value.length > 256 ? value.substring(0, 253) + "..." : value : _effectApp.Array.isArray(value) ? `Array[${value.length}]` : value === null || value === undefined ? `${value}` : typeof value === "object" && value ? `Object[${Object.keys(value).length}]` : typeof value;
-            return prev;
-          }, {})).pipe(
-          // can't use andThen due to some being a function and effect
-          _effectApp.Effect.zipRight(handler.handler(req)), _effectApp.Effect.tapErrorCause(cause => _effectApp.Cause.isFailure(cause) ? logRequestError(cause) : _effectApp.Effect.void), _effectApp.Effect.tapDefect(cause => _effectApp.Effect.all([reportRequestError(cause, {
-            action: `${meta.moduleName}.${req._tag}`
-          }), _rpc.Rpc.currentHeaders.pipe(_effectApp.Effect.andThen(headers => {
-            return _logger.InfraLogger.logError("Finished request", cause).pipe(_effectApp.Effect.annotateLogs({
-              action: `${meta.moduleName}.${req._tag}`,
-              req: (0, _utils.pretty)(req),
-              headers: (0, _utils.pretty)(headers)
-              // resHeaders: pretty(
-              //   Object
-              //     .entries(headers)
-              //     .reduce((prev, [key, value]) => {
-              //       prev[key] = value && typeof value === "string" ? snipString(value) : value
-              //       return prev
-              //     }, {} as Record<string, any>)
-              // )
-            }));
-          }))])), devMode ? _ => _ : _effectApp.Effect.catchAllDefect(() => _effectApp.Effect.die("Internal Server Error")), _effectApp.Effect.withSpan("Request." + meta.moduleName + "." + req._tag, {
-            captureStackTrace: () => handler.stack
-          })), meta.moduleName); // TODO
-          return acc;
-        }, {});
-        const rpcRouter = _rpc.RpcRouter.make(...Object.values(mapped));
-        const httpApp = toHttpApp(rpcRouter, {
-          spanPrefix: rsc.meta.moduleName + "."
-        });
-        yield* router.all("/", httpApp,
-        // TODO: not queries.
-        {
-          uninterruptible: true
-        });
-      }));
-      // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-      const routes = layer.pipe(_effectApp.Layer.provideMerge(r.Live), layers && _effectApp.Array.isNonEmptyReadonlyArray(layers) ? _effectApp.Layer.provide(layers) : _ => _,
-      // TODO: only provide to the middleware?
-      middleware.dependencies ? _effectApp.Layer.provide(middleware.dependencies) : _ => _);
-      // Effect.Effect<HttpRouter.HttpRouter<unknown, HttpRouter.HttpRouter.DefaultServices>, never, UserRouter>
-      return {
-        moduleName: meta.moduleName,
-        Router: r,
-        routes
-      };
-    };
-    const effect = f;
-    return {
-      handle: effect,
-      routes: items
-    };
-  }
-  function matchAll(handlers, requestLayer) {
-    const routers = (0, _utils.typedValuesOf)(handlers);
-    const rootRouter = class extends _http.HttpRouter.Tag("RootRouter")() {};
-    const r = rootRouter.use(router => _effectApp.Effect.gen(function* () {
-      for (const route of routers) {
-        yield* router.mount("/rpc/" + route.moduleName, yield* route.Router.router.pipe(_effectApp.Effect.map(_http.HttpRouter.use((0, _effectApp.flow)(_effectApp.Effect.provide(requestLayer))))));
-      }
-    })).pipe(_effectApp.Layer.provide(routers.map(r => r.routes).flat()));
-    return {
-      layer: r,
-      Router: rootRouter
-    };
-  }
-  return {
-    matchAll,
-    matchFor
-  };
-};
-exports.makeRouter = makeRouter;
-//# sourceMappingURL=routing copy.cjs.map

package/_cjs/api/routing copy.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"routing copy.cjs","names":["_rpc","require","_effectApp","_http","_utils","_errorReporter","_logger","_DynamicMiddleware","logRequestError","logError","reportRequestError","reportError","toHttpApp","self","options","handler","RpcRouter","toHandler","Effect","withFiberRuntime","fiber","context","getFiberRef","FiberRef","currentContext","request","Context","unsafeGet","HttpServerRequest","flatMap","json","_","pipe","Stream","provideContext","runCollect","map","Chunk","toReadonlyArray","andThen","status","r","flat","results","Array","isArray","some","_tag","cause","HttpServerResponse","orDie","tapDefect","exports","RouterSymbol","Symbol","makeMiddleware","content","makeRouter","middleware","devMode","matchFor","rsc","meta","filtered","typedKeysOf","reduce","acc","cur","Predicate","isObject","items","prev","Object","assign","fnOrEffect","stack","Error","split","slice","join","isEffect","success","successRaw","S","encodedSchema","failure","raw","req","ctx","Response","f","layers","make","Router","HttpRouter","Tag","moduleName","layer","use","router","gen","controllers","rpc","makeRpc","mapped","effect","Schema","symbolSerializable","constructor","symbolWithResult","annotateCurrentSpan","entries","key","value","length","substring","undefined","keys","zipRight","tapErrorCause","Cause","isFailure","void","all","action","Rpc","currentHeaders","headers","InfraLogger","annotateLogs","pretty","catchAllDefect","die","withSpan","captureStackTrace","rpcRouter","values","httpApp","spanPrefix","uninterruptible","routes","Layer","provideMerge","Live","isNonEmptyReadonlyArray","provide","dependencies","handle","matchAll","handlers","requestLayer","routers","typedValuesOf","rootRouter","route","mount","flow"],"sources":["../../src/api/routing copy.ts"],"sourcesContent":[null],"mappings":";;;;;;AASA,IAAAA,IAAA,GAAAC,OAAA;AAEA,IAAAC,UAAA,GAAAD,OAAA;AAGA,IAAAE,KAAA,GAAAF,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AAEA,IAAAI,cAAA,GAAAJ,OAAA;AACA,IAAAK,OAAA,GAAAL,OAAA;AAEA,IAAAM,kBAAA,GAAAN,OAAA;AAEA,MAAMO,eAAe,GAAG,IAAAC,uBAAQ,EAAC,SAAS,CAAC;AAC3C,MAAMC,kBAAkB,GAAG,IAAAC,0BAAW,EAAC,SAAS,CAAC;AAejD;;;;AAIO,MAAMC,SAAS,GAAGA,CAA0CC,IAAO,EAAEC,OAE3E,KAGG;EACF,MAAMC,OAAO,GAAGC,cAAS,CAACC,SAAS,CAACJ,IAAI,EAAEC,OAAO,CAAC;EAClD,OAAOI,iBAAM,CAACC,gBAAgB,CAAEC,KAAK,IAAI;IACvC,MAAMC,OAAO,GAAGD,KAAK,CAACE,WAAW,CAACC,mBAAQ,CAACC,cAAc,CAAC;IAC1D,MAAMC,OAAO,GAAGC,kBAAO,CAACC,SAAS,CAACN,OAAO,EAAEO,uBAAiB,CAACA,iBAAiB,CAAC;IAC/E,OAAOV,iBAAM,CAACW,OAAO,CACnBJ,OAAO,CAACK,IAAI,EACXC,CAAC,IACAhB,OAAO,CAACgB,CAAC,CAAC,CAACC,IAAI,CACbC,iBAAM,CAACC,cAAc,CAACb,OAAO,CAAC,EAC9BY,iBAAM,CAACE,UAAU,EACjBjB,iBAAM,CAACkB,GAAG,CAAEL,CAAC,IAAKM,gBAAK,CAACC,eAAe,CAACP,CAAC,CAAC,CAAC,EAC3Cb,iBAAM,CAACqB,OAAO,CAAER,CAAC,IAAI;MACnB,IAAIS,MAAM,GAAG,GAAG;MAChB,KAAK,MAAMC,CAAC,IAAIV,CAAC,CAACW,IAAI,EAAE,EAAE;QACxB,IAAI,OAAOD,CAAC,KAAK,QAAQ,EAAE;QAC3B,MAAME,OAAO,GAAGC,gBAAK,CAACC,OAAO,CAACJ,CAAC,CAAC,GAAGA,CAAC,GAAG,CAACA,CAAC,CAAC;QAC1C,IAAIE,OAAO,CAACG,IAAI,CAAEf,CAA+B,IAAKA,CAAC,CAACgB,IAAI,KAAK,SAAS,IAAIhB,CAAC,CAACiB,KAAK,CAACD,IAAI,KAAK,KAAK,CAAC,EAAE;UACrGP,MAAM,GAAG,GAAG;UACZ;QACF;QACA,IAAIG,OAAO,CAACG,IAAI,CAAEf,CAA+B,IAAKA,CAAC,CAACgB,IAAI,KAAK,SAAS,IAAIhB,CAAC,CAACiB,KAAK,CAACD,IAAI,KAAK,MAAM,CAAC,EAAE;UACtGP,MAAM,GAAG,GAAG,EAAC;UACb;QACF;MACF;MACA,OAAOS,wBAAkB,CAACnB,IAAI,CAACC,CAAC,EAAE;QAAES;MAAM,CAAE,CAAC;IAC/C,CAAC,CAAC,EACFtB,iBAAM,CAACgC,KAAK,EACZhC,iBAAM,CAACiC,SAAS,CAAC,IAAAxC,0BAAW,EAAC,YAAY,CAAC,CAAC,CAC5C,CACJ;EACH,CAAC,CAAC;AACJ,CAAC;AAAAyC,OAAA,CAAAxC,SAAA,GAAAA,SAAA;AAqDM,MAAMyC,YAAY,GAAAD,OAAA,CAAAC,YAAA,GAAGC,MAAM,EAAE;AA6EpC;AACA;AACA;AACA;AACA;AAEO,MAAMC,cAAc,GAKzBC,OAAiD,IAA+CA,OAAO;AAAAJ,OAAA,CAAAG,cAAA,GAAAA,cAAA;AAElG,MAAME,UAAU,GAAGA,CAMxBC,UAAoD,EACpDC,OAAgB,KACd;EACF,SAASC,QAAQA,CAIfC,GAA+C;IAE/C,MAAMC,IAAI,GAAGD,GAAG,CAACC,IAAI;IAErB,MAAMC,QAAQ,GAAG,IAAAC,kBAAW,EAACH,GAAG,CAAC,CAACI,MAAM,CAAC,CAACC,GAAG,EAAEC,GAAG,KAAI;MACpD,IAAIC,oBAAS,CAACC,QAAQ,CAACR,GAAG,CAACM,GAAG,CAAC,CAAC,IAAIN,GAAG,CAACM,GAAG,CAAC,CAAC,SAAS,CAAC,EAAE;QACvDD,GAAG,CAACC,GAAqB,CAAC,GAAGN,GAAG,CAACM,GAAG,CAAC;MACvC;MACA,OAAOD,GAAG;IACZ,CAAC,EAAE,EAAc,CAAC;IAElB,MAAMI,KAAK,GAAG,IAAAN,kBAAW,EAACD,QAAQ,CAAC,CAACE,MAAM,CACxC,CAACM,IAAI,EAAEJ,GAAG,KAAI;MACZ;MAAEI,IAAY,CAACJ,GAAG,CAAC,GAAGK,MAAM,CAACC,MAAM,CAAEC,UAAe,IAAI;QACtD,MAAMC,KAAK,GAAG,IAAIC,KAAK,EAAE,CAACD,KAAK,EAAEE,KAAK,CAAC,IAAI,CAAC,CAACC,KAAK,CAAC,CAAC,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC;QAChE,OAAO7D,iBAAM,CAAC8D,QAAQ,CAACN,UAAU,CAAC,GAC9B;UACA,OAAOC,KAAK,GAAGA,KAAK;UACpB,OAAO5B,IAAI,GAAG,GAAG;UACjB,OAAOhC,OAAO,GAAGA,CAAA,KAAM2D,UAAU;SAClC,GACC;UACA,OAAOC,KAAK,GAAGA,KAAK;UACpB,OAAO5B,IAAI,GAAG,GAAG;UACjB,OAAOhC,OAAO,GAAG2D,UAAU;SAC5B;MACL,CAAC,EAAE;QACDO,OAAO,EAAEpB,GAAG,CAACM,GAAG,CAAC,CAACc,OAAO;QACzBC,UAAU,EAAEC,YAAC,CAACC,aAAa,CAACvB,GAAG,CAACM,GAAG,CAAC,CAACc,OAAO,CAAC;QAC7CI,OAAO,EAAExB,GAAG,CAACM,GAAG,CAAC,CAACkB,OAAO;QACzBC,GAAG;QAAE;QACH;QACA;QACCZ,UAAe,IAAI;UAClB,MAAMC,KAAK,GAAG,IAAIC,KAAK,EAAE,CAACD,KAAK,EAAEE,KAAK,CAAC,IAAI,CAAC,CAACC,KAAK,CAAC,CAAC,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC;UAChE,OAAO7D,iBAAM,CAAC8D,QAAQ,CAACN,UAAU,CAAC,GAC9B;YACA,OAAOC,KAAK,GAAGA,KAAK;YACpB,OAAO5B,IAAI,GAAG,KAAK;YACnB,OAAOhC,OAAO,GAAGA,CAAA,KAAM2D,UAAU;WAClC,GACC;YACA,OAAOC,KAAK,GAAGA,KAAK;YACpB,OAAO5B,IAAI,GAAG,KAAK;YACnB,OAAOhC,OAAO,GAAGA,CAACwE,GAAQ,EAAEC,GAAQ,KAAKd,UAAU,CAACa,GAAG,EAAE;cAAE,GAAGC,GAAG;cAAEC,QAAQ,EAAE5B,GAAG,CAACM,GAAG,CAAC,CAACc;YAAO,CAAE,CAAC;WACjG;QACL;OACH,CAAC;MACF,OAAOV,IAAI;IACb,CAAC,EACD,EAAwC,CACzC;IAoBD,MAAMmB,CAAC,GAAGA,CASRC,MAAe,EACfC,IAAyD,KACvD;MAKF,MAAMnD,CAAC,GAWF,MAAMoD,MAAO,SAAQC,gBAAU,CAACC,GAAG,CAAC,GAAGjC,IAAI,CAACkC,UAAU,QAAQ,CAAC,EAAU,GAAW;MAEzF,MAAMC,KAAK,GAAGxD,CAAC,CAACyD,GAAG,CAAEC,MAAM,IACzBjF,iBAAM,CAACkF,GAAG,CAAC,aAAS;QAClB,MAAMC,WAAW,GAAG,OAAOT,IAAI,CAACtB,KAAK,CAAC;QACtC,MAAMgC,GAAG,GAAG,OAAO,IAAAC,0BAAO,EAAC7C,UAAU,CAAC;QAEtC;QACA,MAAM8C,MAAM,GAAG,IAAAxC,kBAAW,EAACD,QAAQ,CAAC,CAACE,MAAM,CAAC,CAACC,GAAG,EAAEC,GAAG,KAAI;UACvD,MAAMpD,OAAO,GAAGsF,WAAW,CAAClC,GAA+B,CAAC;UAC5D,MAAMoB,GAAG,GAAG1B,GAAG,CAACM,GAAG,CAAC;UAEpBD,GAAG,CAACC,GAAG,CAAC,GAAGmC,GAAG,CAACG,MAAM,CACnB1F,OAAO,CAACgC,IAAI,KAAK,KAAK,GAClB,cAAewC,GAAW;YAC1B,OAAON,OAAO,GAAGE,YAAC,CAACC,aAAa,CAACG,GAAG,CAACN,OAAO,CAAC;YAC7C,KAAKyB,iBAAM,CAACC,kBAAkB,IAAC;cAC7B,OAAO,IAAI,CAACC,WAAW;YACzB;YACA,KAAKF,iBAAM,CAACG,gBAAgB,IAAC;cAC3B,OAAO;gBACLxB,OAAO,EAAEE,GAAG,CAACF,OAAO;gBACpBJ,OAAO,EAAEE,YAAC,CAACC,aAAa,CAACG,GAAG,CAACN,OAAO;eACrC;YACH;WACM,GACNM,GAAG,EACNA,GAAG;UACF;UACArE,iBAAM,CACH4F,mBAAmB,CAClB,cAAc,EACdtC,MAAM,CAACuC,OAAO,CAACxB,GAAG,CAAC,CAACtB,MAAM,CAAC,CAACM,IAAI,EAAE,CAACyC,GAAG,EAAEC,KAAK,CAAoB,KAAI;YACnE1C,IAAI,CAACyC,GAAG,CAAC,GAAGA,GAAG,KAAK,UAAU,GAC1B,YAAY,GACZ,OAAOC,KAAK,KAAK,QAAQ,IAAI,OAAOA,KAAK,KAAK,QAAQ,IAAI,OAAOA,KAAK,KAAK,SAAS,GACpF,OAAOA,KAAK,KAAK,QAAQ,IAAIA,KAAK,CAACC,MAAM,GAAG,GAAG,GAC5CD,KAAK,CAACE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,KAAK,GAChCF,KAAK,GACPrE,gBAAK,CAACC,OAAO,CAACoE,KAAK,CAAC,GACpB,SAASA,KAAK,CAACC,MAAM,GAAG,GACxBD,KAAK,KAAK,IAAI,IAAIA,KAAK,KAAKG,SAAS,GACrC,GAAGH,KAAK,EAAE,GACV,OAAOA,KAAK,KAAK,QAAQ,IAAIA,KAAK,GAClC,UAAUzC,MAAM,CAAC6C,IAAI,CAACJ,KAAK,CAAC,CAACC,MAAM,GAAG,GACtC,OAAOD,KAAK;YAChB,OAAO1C,IAAI;UACb,CAAC,EAAE,EAA+C,CAAC,CACpD,CACAvC,IAAI;UACH;UACAd,iBAAM,CAACoG,QAAQ,CAACvG,OAAO,CAACA,OAAO,CAACwE,GAAU,CAAQ,CAAC,EACnDrE,iBAAM,CAACqG,aAAa,CAAEvE,KAAK,IAAKwE,gBAAK,CAACC,SAAS,CAACzE,KAAK,CAAC,GAAGxC,eAAe,CAACwC,KAAK,CAAC,GAAG9B,iBAAM,CAACwG,IAAI,CAAC,EAC9FxG,iBAAM,CAACiC,SAAS,CAAEH,KAAK,IACrB9B,iBAAM,CACHyG,GAAG,CAAC,CACHjH,kBAAkB,CAACsC,KAAK,EAAE;YACxB4E,MAAM,EAAE,GAAG9D,IAAI,CAACkC,UAAU,IAAIT,GAAG,CAACxC,IAAI;WACvC,CAAC,EACF8E,QAAG,CAACC,cAAc,CAAC9F,IAAI,CAACd,iBAAM,CAACqB,OAAO,CAAEwF,OAAO,IAAI;YACjD,OAAOC,mBAAW,CACfvH,QAAQ,CAAC,kBAAkB,EAAEuC,KAAK,CAAC,CACnChB,IAAI,CAACd,iBAAM,CAAC+G,YAAY,CAAC;cACxBL,MAAM,EAAE,GAAG9D,IAAI,CAACkC,UAAU,IAAIT,GAAG,CAACxC,IAAI,EAAE;cACxCwC,GAAG,EAAE,IAAA2C,aAAM,EAAC3C,GAAG,CAAC;cAChBwC,OAAO,EAAE,IAAAG,aAAM,EAACH,OAAO;cACvB;cACA;cACA;cACA;cACA;cACA;cACA;cACA;aACD,CAAC,CAAC;UACP,CAAC,CAAC,CAAC,CACJ,CAAC,CACL,EACDpE,OAAO,GAAI5B,CAAC,IAAKA,CAAC,GAAGb,iBAAM,CAACiH,cAAc,CAAC,MAAMjH,iBAAM,CAACkH,GAAG,CAAC,uBAAuB,CAAC,CAAC,EACrFlH,iBAAM,CAACmH,QAAQ,CAAC,UAAU,GAAGvE,IAAI,CAACkC,UAAU,GAAG,GAAG,GAAGT,GAAG,CAACxC,IAAI,EAAE;YAC7DuF,iBAAiB,EAAEA,CAAA,KAAMvH,OAAO,CAAC4D;WAClC,CAAC,CACH,EACLb,IAAI,CAACkC,UAAU,CAChB,EAAC;UACF,OAAO9B,GAAG;QACZ,CAAC,EAAE,EAAS,CAKX;QAED,MAAMqE,SAAS,GAAGvH,cAAS,CAAC4E,IAAI,CAAC,GAAGpB,MAAM,CAACgE,MAAM,CAAChC,MAAM,CAAQ,CAG/D;QACD,MAAMiC,OAAO,GAAG7H,SAAS,CAAC2H,SAAS,EAAE;UACnCG,UAAU,EAAE7E,GAAG,CACZC,IAAI,CACJkC,UAAU,GAAG;SACjB,CAAC;QACF,OAAOG,MAAM,CACVwB,GAAG,CACF,GAAG,EACHc,OAAc;QACd;QACA;UAAEE,eAAe,EAAE;QAAI,CAAE,CAC1B;MACL,CAAC,CAAC,CACH;MAED;MACA,MAAMC,MAAM,GAAG3C,KAAK,CAACjE,IAAI,CACvB6G,gBAAK,CAACC,YAAY,CAACrG,CAAC,CAACsG,IAAI,CAAC,EAC1BpD,MAAM,IAAI/C,gBAAK,CAACoG,uBAAuB,CAACrD,MAAM,CAAC,GAAGkD,gBAAK,CAACI,OAAO,CAACtD,MAAa,CAAQ,GAAI5D,CAAC,IAAKA,CAAC;MAChG;MACA2B,UAAU,CAACwF,YAAY,GAAGL,gBAAK,CAACI,OAAO,CAACvF,UAAU,CAACwF,YAAmB,CAAC,GAAInH,CAAC,IAAKA,CAAC,CASnF;MAED;MAEA,OAAO;QACLiE,UAAU,EAAElC,IAAI,CAACkC,UAAU;QAC3BH,MAAM,EAAEpD,CAAC;QACTmG;OACD;IACH,CAAC;IAED,MAAMnC,MAAM,GAmLRf,CAAQ;IAEZ,OAAO;MAAEyD,MAAM,EAAE1C,MAAM;MAAEmC,MAAM,EAAEtE;IAAK,CAAE;EAC1C;EAYA,SAAS8E,QAAQA,CACfC,QAAW,EACXC,YAAkC;IAElC,MAAMC,OAAO,GAAG,IAAAC,oBAAa,EAACH,QAAQ,CAAC;IAEvC,MAAMI,UAAU,GAAG,cAAc3D,gBAAU,CAACC,GAAG,CAAC,YAAY,CAAC,EAI1D,GAAG;IAEN,MAAMtD,CAAC,GAAGgH,UAAU,CACjBvD,GAAG,CAAEC,MAAM,IACVjF,iBAAM,CAACkF,GAAG,CAAC,aAAS;MAClB,KAAK,MAAMsD,KAAK,IAAIH,OAAO,EAAE;QAC3B,OAAOpD,MAAM,CAACwD,KAAK,CAChB,OAAO,GAAGD,KAAK,CAAC1D,UAAU,EAC3B,OAAO0D,KAAK,CACT7D,MAAM,CACNM,MAAM,CACNnE,IAAI,CAACd,iBAAM,CAACkB,GAAG,CAAC0D,gBAAU,CAACI,GAAG,CAAC,IAAA0D,eAAI,EAAC1I,iBAAM,CAAC+H,OAAO,CAACK,YAAY,CAAC,CAAC,CAAC,CAAC,CAAQ,CAC/E;MACH;IACF,CAAC,CAAC,CACH,CACAtH,IAAI,CAAC6G,gBAAK,CAACI,OAAO,CAACM,OAAO,CAACnH,GAAG,CAAEK,CAAC,IAAKA,CAAC,CAACmG,MAAM,CAAC,CAAClG,IAAI,EAA+C,CAAC,CAAC;IAExG,OAAO;MACLuD,KAAK,EAAExD,CAIN;MACDoD,MAAM,EAAE4D;KAMT;EACH;EAEA,OAAO;IAAEL,QAAQ;IAAExF;EAAQ,CAAE;AAC/B,CAAC;AAAAR,OAAA,CAAAK,UAAA,GAAAA,UAAA","ignoreList":[]}