@effect-app/infra 2.35.4 → 2.36.0

package/test/controller.test.ts

@@ -201,7 +201,7 @@ it("router", () => {
   console.log({ routes })
 })
 
-export default Router(Something)({
+Router(Something)({
   dependencies: [
     SomethingRepo.Default,
     SomethingService.Default,
@@ -216,13 +216,55 @@ export default Router(Something)({
 
     return matchFor(Something)({
       GetSomething: Effect.succeed("12"),
-      DoSomething: Effect.void, // Effect.succeed(2) should fail
+      DoSomething: Effect.void,
       GetSomething2: Effect.succeed(12)
     })
   })
 })
 
-export const RawTest = Router(Something)({
+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.succeed(2),
+      GetSomething2: Effect.succeed(12)
+    })
+  })
+})
+
+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 },
+      GetSomething2: { raw: SomethingService2.use(() => Effect.succeed("12")) }
+    })
+  })
+})
+
+Router(Something)({
   dependencies: [
     SomethingRepo.Default,
     SomethingService.Default,
@@ -237,7 +279,9 @@ export const RawTest = Router(Something)({
 
     return matchFor(Something)({
       GetSomething: SomethingService2.use(() => Effect.succeed("12")),
-      DoSomething: { raw: Effect.void }, // Effect.succeed(2) should fail
+      DoSomething: {
+        raw: Effect.succeed(2)
+      },
       GetSomething2: { raw: SomethingService2.use(() => Effect.succeed("12")) }
     })
   })

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

@@ -1 +1 @@
-{"version":3,"file":"controller.test.d.ts","sourceRoot":"","sources":["../controller.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"controller.test.d.ts","sourceRoot":"","sources":["../controller.test.ts"],"names":[],"mappings":"AAGA,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,EAAE,KAAK,gBAAgB,EAAiB,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,MAAM;;;;;;iDAmJjB,MAAE,KAAK,CAAC,GAAG;;;;;;;;;;iDAmB+yC,MAAM,KAAK,CAAC,GAAG;;;;;;;;;;iDAA0zD,MAAM,KAAK,CAAC,GAAG;;;;;;;;;;iDAA0zD,MAAM,KAAK,CAAC,GAAG;;;;;;;;;;iDAAqxD,MAAM,KAAK,CAAC,GAAG;;;;;;;;;;;;;;;;;;;;;qBA7O3sN,EAuC9C,MAtCJ,CAsCI,GAtCA;;;;qBAD8C,EAuC9C,MAtCJ,CAsCI,GAtCA;;;iBAD8C,EAuC9C,MAtCJ,CAsCI,GAtCA;;iBAD8C,EAuC9C,MAtCJ,CAsCI,GAtCA;;;;;;GAsEa,QAAQ;;;;;gBAKF,MAAM,KAAK;;;;;;GALP,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAvEe,EAuC9C,MAtCJ,CAsCI,GAtCA;;;;;;;;;;;;;;;;;;;;iBAD8C,EAuC9C,MAtCJ,CAsCI,GAtCA;;;;;;;;;;;;;;;;;;;;;;;aAD8C,EAuC9C,MAtCJ,CAsCI,GAtCA;;;;;;;;;;;;;;;;;;aAD8C,EAuC9C,MAtCJ,CAsCI,GAtCA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qFAsEgE,CAAA;AAE1E,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;yCAxCvB,EAAA,MAjCA,CAAC,MAAM;iBACa,EAAG,MAAM,CAAC,GAAG,GAAE,EAAG,MAAM,CAAC,MAAM;iBAC9C,EA+BL,MA9BH,CA8BG,GA9BC,GAAE,EA8BH,MA5BJ,CA4BI,MA5BG;;;;;;2CA4BH,EAnBG,MACT,CAkBM,MAlBC;iBAAoC,EAAG,MAAM,CAAC,GAAG,GAAE,EAAG,MAAM,CAAE,MAAK;;;;;;2CAkBpE,EAAA,MATG,CASH,MATU;iBAEH,EAAA,MAAK,CAAC,GAAG,GAAE,EAAG,MAC9B,CAMS,MANF;;;;;;2CAWI,EACF,MAAJ,CAAI,MAAG;;;;;2CAQG,EAAA,MAAF,CAAE,MAAK;;;;;CA6BnB,CAAA;;;;;;;;;;AAEF,qBAAa,WAAY,SAAQ,gBAEV;CAAG;;;;;;;;;;AAE1B,qBAAa,YAAa,SAAQ,iBAET;CAAG;;;;;;;;;;AAE5B,qBAAa,aAAc,SAAQ,kBAEA;CAAG;;;;;AAItC,qBAAa,gBAAiB,SAAQ,qBAKpC;CAAG;;;;;AASL,qBAAa,aAAc,SAAQ,kBAOjC;CAAG;;;;;AAEL,qBAAa,iBAAkB,SAAQ,sBAKrC;CAAG"}

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

@@ -1,104 +0,0 @@
-import type * as HttpApp from "@effect/platform/HttpApp";
-import { Rpc, RpcRouter } from "@effect/rpc";
-import type { NonEmptyArray } from "effect-app";
-import { Effect, Layer, S } from "effect-app";
-import type { GetEffectContext, RPCContextMap } from "effect-app/client/req";
-import type { HttpServerError } from "effect-app/http";
-import { HttpRouter } from "effect-app/http";
-import type { Middleware } from "./routing/DynamicMiddleware.js";
-export type _R<T extends Effect<any, any, any>> = [T] extends [
-    Effect<any, any, infer R>
-] ? R : never;
-export type _E<T extends Effect<any, any, any>> = [T] extends [
-    Effect<any, infer E, any>
-] ? E : never;
-export type EffectDeps<A> = {
-    [K in keyof A as A[K] extends Effect<any, any, any> ? K : never]: A[K] extends Effect<any, any, any> ? A[K] : never;
-};
-/**
- *   Plain jane JSON version
- * @deprecated use HttpRpcRouterNoStream.toHttpApp once support options
- */
-export declare const toHttpApp: <R extends RpcRouter.RpcRouter<any, any>>(self: R, options?: {
-    readonly spanPrefix?: string;
-}) => HttpApp.Default<HttpServerError.RequestError, RpcRouter.RpcRouter.Context<R>>;
-export interface Hint<Err extends string> {
-    Err: Err;
-}
-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 & {
-    success?: S.Schema.Any;
-    failure?: S.Schema.Any;
-};
-type GetSuccess<T> = T extends {
-    success: S.Schema.Any;
-} ? T["success"] : typeof S.Void;
-type GetSuccessShape<Action extends {
-    success?: S.Schema.Any;
-}, RT extends "d" | "raw"> = RT extends "raw" ? S.Schema.Encoded<GetSuccess<Action>> : S.Schema.Type<GetSuccess<Action>>;
-type GetFailure<T extends {
-    failure?: S.Schema.Any;
-}> = T["failure"] extends never ? typeof S.Never : T["failure"];
-type HandlerFull<Action extends AnyRequestModule, RT extends "raw" | "d", A, E, R> = {
-    new (): {};
-    _tag: RT;
-    stack: string;
-    handler: (req: S.Schema.Type<Action>) => Effect<A, E, R>;
-};
-export interface Handler<Action extends AnyRequestModule, RT extends "raw" | "d", R> extends HandlerFull<Action, RT, GetSuccessShape<Action, RT>, S.Schema.Type<GetFailure<Action>> | S.ParseResult.ParseError, R> {
-}
-type AHandler<Action extends AnyRequestModule> = Handler<Action, any, any>;
-type Filter<T> = {
-    [K in keyof T as T[K] extends S.Schema.All & {
-        success: S.Schema.Any;
-        failure: S.Schema.Any;
-    } ? K : never]: T[K];
-};
-export declare const RouterSymbol: unique symbol;
-export interface RouterShape<Rsc> {
-    [RouterSymbol]: Rsc;
-}
-type RPCRouteR<T extends Rpc.Rpc<any, any>> = [T] extends [
-    Rpc.Rpc<any, infer R>
-] ? R : never;
-type Match<Rsc extends Record<string, any>, CTXMap extends Record<string, any>, RT extends "raw" | "d", Key extends keyof Rsc, Context> = {
-    <A extends GetSuccessShape<Rsc[Key], RT>, R2 = never, E = never>(f: Effect<A, E, R2>): HandleVoid<GetSuccessShape<Rsc[Key], RT>, A, Handler<Rsc[Key], RT, Exclude<Context | Exclude<R2, GetEffectContext<CTXMap, Rsc[Key]["config"]>>, HttpRouter.HttpRouter.Provided>>>;
-    <A extends GetSuccessShape<Rsc[Key], RT>, R2 = never, E = never>(f: (req: S.Schema.Type<Rsc[Key]>) => Effect<A, E, R2>): HandleVoid<GetSuccessShape<Rsc[Key], RT>, A, Handler<Rsc[Key], RT, Exclude<Context | Exclude<R2, GetEffectContext<CTXMap, Rsc[Key]["config"]>>, HttpRouter.HttpRouter.Provided>>>;
-};
-export type RouteMatcher<CTXMap extends Record<string, any>, Rsc extends Record<string, any>, Context> = {
-    [Key in keyof Filter<Rsc>]: Match<Rsc, CTXMap, "d", Key, Context> & {
-        success: Rsc[Key]["success"];
-        successRaw: S.SchemaClass<S.Schema.Encoded<Rsc[Key]["success"]>>;
-        failure: Rsc[Key]["failure"];
-        /**
-         * Requires the Encoded shape (e.g directly undecoded from DB, so that we don't do multiple Decode/Encode)
-         */
-        raw: Match<Rsc, CTXMap, "raw", Key, Context>;
-    };
-};
-export declare const makeMiddleware: <Context, CTXMap extends Record<string, RPCContextMap.Any>, RMW, Layers extends Array<Layer.Layer.Any>>(content: Middleware<Context, CTXMap, RMW, Layers>) => Middleware<Context, CTXMap, RMW, Layers>;
-export declare const makeRouter: <Context, CTXMap extends Record<string, RPCContextMap.Any>, RMW, Layers extends Array<Layer.Layer.Any>>(middleware: Middleware<Context, CTXMap, RMW, Layers>, devMode: boolean) => {
-    matchAll: <T extends {
-        [key: string]: {
-            Router: {
-                router: Effect<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<(typeof handlers)[keyof typeof handlers]["routes"]>, Layer.Layer.Context<(typeof handlers)[keyof typeof handlers]["routes"]>>;
-        Router: HttpRouter.HttpRouter.TagClass<"RootRouter", "RootRouter", Effect.Effect.Success<T[keyof T]["Router"]["router"]> extends infer T_3 ? T_3 extends Effect.Effect.Success<T[keyof T]["Router"]["router"]> ? T_3 extends HttpRouter.HttpRouter<infer E_1, any> ? E_1 : never : never : never, R | Exclude<Effect.Effect.Success<T[keyof T]["Router"]["router"]> extends infer T_4 ? T_4 extends Effect.Effect.Success<T[keyof T]["Router"]["router"]> ? T_4 extends 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;
-        };
-    }) => <E_1, R_1, THandlers extends { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]>; }, TLayers extends NonEmptyArray<Layer.Layer.Any>>(layers: TLayers, make: (requests: RouteMatcher<CTXMap, Rsc, Context>) => Effect<THandlers, E_1, R_1>) => {
-        moduleName: ModuleName;
-        Router: HttpRouter.HttpRouter.TagClass<RouterShape<Rsc>, `${ModuleName}Router`, never, Exclude<Context, HttpRouter.HttpRouter.Provided | ({ [k in keyof Layers]: Layer.Layer.Success<Layers[k]>; }[number] | { [k_1 in keyof TLayers]: Layer.Layer.Success<TLayers[k_1]>; }[number])> | Exclude<RPCRouteR<{ [K in keyof Filter<Rsc>]: Rpc.Rpc<Rsc[K], _R<ReturnType<THandlers[K]["handler"]>>>; }[keyof Filter<Rsc>]>, HttpRouter.HttpRouter.Provided | ({ [k in keyof Layers]: Layer.Layer.Success<Layers[k]>; }[number] | { [k_1 in keyof TLayers]: Layer.Layer.Success<TLayers[k_1]>; }[number])>>;
-        routes: Layer.Layer<RouterShape<Rsc>, E_1 | { [k_2 in keyof TLayers]: Layer.Layer.Error<TLayers[k_2]>; }[number], { [k_3 in keyof TLayers]: Layer.Layer.Context<TLayers[k_3]>; }[number] | Exclude<RMW, { [k in keyof Layers]: Layer.Layer.Success<Layers[k]>; }[number] | { [k_1 in keyof TLayers]: Layer.Layer.Success<TLayers[k_1]>; }[number]> | Exclude<R_1, { [k in keyof Layers]: Layer.Layer.Success<Layers[k]>; }[number] | { [k_1 in keyof TLayers]: Layer.Layer.Success<TLayers[k_1]>; }[number]>>;
-    };
-};
-export {};
-//# sourceMappingURL=routing.legacy.d.ts.map

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

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

package/dist/api/routing.legacy.js

@@ -1,209 +0,0 @@
-import { Rpc, RpcRouter } from "@effect/rpc";
-import { Cause, Chunk, Context, Effect, FiberRef, flow, Layer, Predicate, S, Schema, Scope, Stream, Tracer } from "effect-app";
-import { HttpMiddleware, HttpRouter, HttpServerRequest, HttpServerResponse } from "effect-app/http";
-import { pretty, typedKeysOf, typedValuesOf } from "effect-app/utils";
-import { logError, reportError } from "../errorReporter.js";
-import { InfraLogger } from "../logger.js";
-import { makeRpc } from "./routing/DynamicMiddleware.js";
-const logRequestError = logError("Request");
-const reportRequestError = reportError("Request");
-/**
- *   Plain jane JSON version
- * @deprecated use HttpRpcRouterNoStream.toHttpApp once support options
- */
-export const toHttpApp = (self, options) => {
-    const handler = RpcRouter.toHandler(self, options);
-    return Effect.withFiberRuntime((fiber) => {
-        const context = fiber.getFiberRef(FiberRef.currentContext);
-        const request = Context.unsafeGet(context, HttpServerRequest.HttpServerRequest);
-        return Effect.flatMap(request.json, (_) => handler(_).pipe(Stream.provideContext(context), Stream.runCollect, Effect.map((_) => Chunk.toReadonlyArray(_)), Effect.andThen((_) => {
-            let status = 200;
-            for (const r of _.flat()) {
-                if (typeof r === "number")
-                    continue;
-                const results = 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 HttpServerResponse.json(_, { status });
-        }), Effect.orDie, Effect.tapDefect(reportError("RPCHttpApp"))));
-    });
-};
-export const RouterSymbol = Symbol();
-// export interface RouteMatcher<
-//   Filtered extends Record<string, any>,
-//   CTXMap extends Record<string, any>,
-//   Rsc extends Filtered
-// > extends RouteMatcherInt<Filtered, CTXMap, Rsc> {}
-export const makeMiddleware = (content) => content;
-export const makeRouter = (middleware, devMode) => {
-    function matchFor(rsc) {
-        const meta = rsc.meta;
-        const filtered = typedKeysOf(rsc).reduce((acc, cur) => {
-            if (Predicate.isObject(rsc[cur]) && rsc[cur]["success"]) {
-                acc[cur] = rsc[cur];
-            }
-            return acc;
-        }, {});
-        const items = typedKeysOf(filtered).reduce((prev, cur) => {
-            ;
-            prev[cur] = Object.assign((fnOrEffect) => {
-                const stack = new Error().stack?.split("\n").slice(2).join("\n");
-                return 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: 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 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 effect = (layers, make) => {
-            const r = (class Router extends HttpRouter.Tag(`${meta.moduleName}Router`)() {
-            });
-            const layer = r.use((router) => Effect.gen(function* () {
-                const controllers = yield* make(items);
-                const rpc = yield* makeRpc(middleware);
-                // return make.pipe(Effect.map((c) => controllers(c, layers)))
-                const mapped = 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 = S.encodedSchema(req.success);
-                            get [Schema.symbolSerializable]() {
-                                return this.constructor;
-                            }
-                            get [Schema.symbolWithResult]() {
-                                return {
-                                    failure: req.failure,
-                                    success: S.encodedSchema(req.success)
-                                };
-                            }
-                        }
-                        : req, (req) => 
-                    // TODO: render more data... similar to console?
-                    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
-                                : 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
-                    Effect.zipRight(handler.handler(req)), Effect.tapErrorCause((cause) => Cause.isFailure(cause) ? logRequestError(cause) : Effect.void), Effect.tapDefect((cause) => Effect
-                        .all([
-                        reportRequestError(cause, {
-                            action: `${meta.moduleName}.${req._tag}`
-                        }),
-                        Rpc.currentHeaders.pipe(Effect.andThen((headers) => {
-                            return InfraLogger
-                                .logError("Finished request", cause)
-                                .pipe(Effect.annotateLogs({
-                                action: `${meta.moduleName}.${req._tag}`,
-                                req: pretty(req),
-                                headers: 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 ? (_) => _ : Effect.catchAllDefect(() => Effect.die("Internal Server Error")), Effect.withSpan("Request." + meta.moduleName + "." + req._tag, {
-                        captureStackTrace: () => handler.stack
-                    })), meta.moduleName); // TODO
-                    return acc;
-                }, {});
-                const rpcRouter = RpcRouter.make(...Object.values(mapped));
-                const httpApp = toHttpApp(rpcRouter, {
-                    spanPrefix: rsc
-                        .meta
-                        .moduleName + "."
-                });
-                const services = (yield* Effect.context()).pipe(Context.omit(Scope.Scope), Context.omit(Tracer.ParentSpan));
-                yield* router
-                    .post("/", (httpApp
-                    .pipe(HttpMiddleware.make(Effect.provide(services)))), 
-                // TODO: not queries.
-                { uninterruptible: true });
-            }));
-            // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-            const routes = layer.pipe(Layer.provideMerge(r.Live), layers ? Layer.provide(layers) : (_) => _, middleware.dependencies ? Layer.provide(middleware.dependencies) : (_) => _);
-            // Effect.Effect<HttpRouter.HttpRouter<unknown, HttpRouter.HttpRouter.DefaultServices>, never, UserRouter>
-            return {
-                moduleName: meta.moduleName,
-                Router: r,
-                routes
-            };
-        };
-        return effect;
-    }
-    function matchAll(handlers, requestLayer) {
-        const routers = typedValuesOf(handlers);
-        const rootRouter = class extends HttpRouter.Tag("RootRouter")() {
-        };
-        const r = rootRouter
-            .use((router) => Effect.gen(function* () {
-            for (const route of routers) {
-                yield* router.mount(("/rpc/" + route.moduleName), yield* route
-                    .Router
-                    .router
-                    .pipe(Effect.map(HttpRouter.use(flow(Effect.provide(requestLayer))))));
-            }
-        }))
-            .pipe(Layer.provide(routers.map((r) => r.routes).flat()));
-        return {
-            layer: r,
-            Router: rootRouter
-        };
-    }
-    return { matchAll, matchFor };
-};
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.legacy.js","sourceRoot":"","sources":["../../src/api/routing.legacy.ts"],"names":[],"mappings":"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"}