@effect-app/infra 1.42.1 → 1.43.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @effect-app/infra
 
+## 1.43.0
+
+### Minor Changes
+
+- b8723a2: improve Raw api
+
 ## 1.42.1
 
 ### Patch Changes

package/_cjs/api/routing3.cjs

@@ -78,26 +78,27 @@ const makeRouter = (middleware, devMode) => {
         };
       }, {
         success: rsc[cur].success,
-        failure: rsc[cur].failure
-      }) // "Raw" variations are for when you don't want to decode just to encode it again on the response
-      ;
-      prev[cur + "Raw"] = 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 = "raw";
-          static handler = () => fnOrEffect;
-        } : class {
-          static stack = stack;
-          static _tag = "raw";
-          static handler = (req, ctx) => fnOrEffect(req, {
-            ...ctx,
-            Response: rsc[cur].success
-          });
-        };
-      }, {
-        success: _effectApp.S.encodedSchema(rsc[cur].success),
-        failure: rsc[cur].failure
+        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;
     }, {});

package/_cjs/api/routing3.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"routing3.cjs","names":["_utils","require","_rpc","_schema","_effectApp","_http","_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","makeRouter","middleware","devMode","rpc","makeRpc","matchFor","rsc","meta","filtered","typedKeysOf","reduce","acc","cur","Predicate","isObject","items","prev","Object","assign","fnOrEffect","stack","Error","split","slice","join","isEffect","success","failure","req","ctx","Response","S","encodedSchema","effect","layers","make","Router","HttpRouter","Tag","moduleName","layer","use","router","gen","controllers","mapped","Serializable","symbol","constructor","symbolResult","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","services","omit","Scope","Tracer","ParentSpan","HttpMiddleware","provide","uninterruptible","routes","Layer","provideMerge","Live","matchAll","handlers","requestLayer","routers","typedValuesOf","rootRouter","route","mount","flow"],"sources":["../../src/api/routing3.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"routing3.cjs","names":["_utils","require","_rpc","_schema","_effectApp","_http","_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","makeRouter","middleware","devMode","rpc","makeRpc","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","effect","layers","make","Router","HttpRouter","Tag","moduleName","layer","use","router","gen","controllers","mapped","Serializable","symbol","constructor","symbolResult","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","services","omit","Scope","Tracer","ParentSpan","HttpMiddleware","provide","uninterruptible","routes","Layer","provideMerge","Live","matchAll","handlers","requestLayer","routers","typedValuesOf","rootRouter","route","mount","flow"],"sources":["../../src/api/routing3.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/api/routing3.d.ts

@@ -86,13 +86,17 @@ export declare const makeRouter: <Context, CTXMap extends Record<string, RPCCont
     }) => <E_1, R_1, THandlers extends { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]>; }, TLayers extends NonEmptyArray<Layer.Layer.Any>>(layers: TLayers, make: (requests: { [Key in keyof Filter<Rsc>]: {
         <A_1 extends S.Schema.Type<GetSuccess<Rsc[Key]>>, R2 = never, E_2 = never>(f: Effect<A_1, E_2, R2>): HandleVoid<S.Schema.Type<GetSuccess<Rsc[Key]>>, A_1, Handler<Rsc[Key], "d", Exclude<R2, GetEffectContext<CTXMap, Rsc[Key]["config"]>>>>;
         <A_1 extends S.Schema.Type<GetSuccess<Rsc[Key]>>, R2_1 = never, E_3 = never>(f: (req: S.Schema.Type<Rsc[Key]>) => Effect<A_1, E_3, R2_1>): HandleVoid<S.Schema.Type<GetSuccess<Rsc[Key]>>, A_1, Handler<Rsc[Key], "d", Exclude<R2_1, GetEffectContext<CTXMap, Rsc[Key]["config"]>>>>;
+    } & {
         success: Rsc[Key]["success"];
+        successRaw: S.SchemaClass<S.Schema.Encoded<Rsc[Key]["success"]>>;
         failure: Rsc[Key]["failure"];
-    }; } & { [Key_1 in keyof Filter<Rsc> as Key_1 extends string ? `${Key_1}Raw` : never]: {
-        <A_1 extends S.Schema.Encoded<GetSuccess<Rsc[Key_1]>>, R2 = never, E_2 = never>(f: Effect<A_1, E_2, R2>): HandleVoid<S.Schema.Encoded<GetSuccess<Rsc[Key_1]>>, A_1, Handler<Rsc[Key_1], "raw", Exclude<R2, GetEffectContext<CTXMap, Rsc[Key_1]["config"]>>>>;
-        <A_1 extends S.Schema.Encoded<GetSuccess<Rsc[Key_1]>>, R2_1 = never, E_3 = never>(f: (req: S.Schema.Type<Rsc[Key_1]>) => Effect<A_1, E_3, R2_1>): HandleVoid<S.Schema.Encoded<GetSuccess<Rsc[Key_1]>>, A_1, Handler<Rsc[Key_1], "raw", Exclude<R2_1, GetEffectContext<CTXMap, Rsc[Key_1]["config"]>>>>;
-        success: S.SchemaClass<S.Schema.Encoded<Rsc[Key_1]["success"]>, S.Schema.Encoded<Rsc[Key_1]["success"]>, never>;
-        failure: Rsc[Key_1]["failure"];
+        /**
+         * Requires the Encoded shape (e.g directly undecoded from DB, so that we don't do multiple Decode/Encode)
+         */
+        raw: {
+            <A_1 extends S.Schema.Encoded<GetSuccess<Rsc[Key]>>, R2 = never, E_2 = never>(f: Effect<A_1, E_2, R2>): HandleVoid<S.Schema.Encoded<GetSuccess<Rsc[Key]>>, A_1, Handler<Rsc[Key], "raw", Exclude<R2, GetEffectContext<CTXMap, Rsc[Key]["config"]>>>>;
+            <A_1 extends S.Schema.Encoded<GetSuccess<Rsc[Key]>>, R2_1 = never, E_3 = never>(f: (req: S.Schema.Type<Rsc[Key]>) => Effect<A_1, E_3, R2_1>): HandleVoid<S.Schema.Encoded<GetSuccess<Rsc[Key]>>, A_1, Handler<Rsc[Key], "raw", Exclude<R2_1, GetEffectContext<CTXMap, Rsc[Key]["config"]>>>>;
+        };
     }; }) => Effect<THandlers, E_1, R_1>) => {
         moduleName: ModuleName;
         Router: HttpRouter.HttpRouter.TagClass<RouterShape<Rsc>, `${ModuleName}Router`, never, Exclude<RPCRouteR<{ [K in keyof Filter<Rsc>]: Rpc.Rpc<Rsc[K], _R<ReturnType<THandlers[K]["handler"]>>>; }[keyof Filter<Rsc>]>, { [k in keyof TLayers]: Layer.Layer.Success<TLayers[k]>; }[number]>>;

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

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

package/dist/api/routing3.js

@@ -71,25 +71,25 @@ export const makeRouter = (middleware, devMode) => {
                     };
             }, {
                 success: rsc[cur].success,
-                failure: rsc[cur].failure
-            }) // "Raw" variations are for when you don't want to decode just to encode it again on the response
-            ;
-            prev[cur + "Raw"] = Object.assign((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 });
-                    };
-            }, {
-                success: S.encodedSchema(rsc[cur].success),
-                failure: rsc[cur].failure
+                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;
         }, {});
@@ -206,4 +206,4 @@ export const makeRouter = (middleware, devMode) => {
     }
     return { matchAll, matchFor };
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing3.js","sourceRoot":"","sources":["../../src/api/routing3.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing3.js","sourceRoot":"","sources":["../../src/api/routing3.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "1.42.1",
+  "version": "1.43.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -22,8 +22,8 @@
     "redlock": "^4.2.0",
     "@effect-app/core": "1.17.0",
     "effect-app": "1.30.0",
-    "@effect-app/schema": "1.19.0",
-    "@effect-app/infra-adapters": "1.20.1"
+    "@effect-app/infra-adapters": "1.20.1",
+    "@effect-app/schema": "1.19.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.25.7",

package/src/api/routing3.ts

@@ -176,10 +176,7 @@ export const makeRouter = <Context, CTXMap extends Record<string, RPCContextMap.
       return acc
     }, {} as Filtered)
 
-    type MatchWithServicesNew2<RT extends "raw" | "d", Key extends keyof Rsc> = {
-      success: RT extends "raw" ? S.SchemaClass<S.Schema.Encoded<Rsc[Key]["success"]>> : Rsc[Key]["success"]
-      failure: Rsc[Key]["failure"]
-
+    type Match<RT extends "raw" | "d", Key extends keyof Rsc> = {
       // TODO: deal with HandleVoid and ability to extends from GetSuccessShape...
       // aka we want to make sure that the return type is void if the success is void,
       // and make sure A is the actual expected type
@@ -227,44 +224,43 @@ export const makeRouter = <Context, CTXMap extends Record<string, RPCContextMap.
             }
         }, {
           success: rsc[cur].success,
-          failure: rsc[cur].failure
-        }) // "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.
-        ;(prev as any)[(cur as any) + "Raw"] = Object.assign((fnOrEffect: any) => {
-          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: any, ctx: any) => fnOrEffect(req, { ...ctx, Response: 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: any) => {
+              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: any, ctx: any) => fnOrEffect(req, { ...ctx, Response: rsc[cur].success })
+                }
             }
-        }, {
-          success: S.encodedSchema(rsc[cur].success),
-          failure: rsc[cur].failure
         })
         return prev
       },
-      {} as
-        & {
-          // use Rsc as Key over using Keys, so that the Go To on X.Action remain in tact in Controllers files
-          /**
-           * Requires the Type shape
-           */
-          [Key in keyof Filtered]: MatchWithServicesNew2<"d", Key>
-        }
-        & {
-          // use Rsc as Key over using Keys, so that the Go To on X.Action remain in tact in Controllers files
+      {} as {
+        // use Rsc as Key over using Keys, so that the Go To on X.Action remain in tact in Controllers files
+        /**
+         * Requires the Type shape
+         */
+        [Key in keyof Filtered]: Match<"d", Key> & {
+          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)
            */
-          [Key in keyof Filtered as Key extends string ? `${Key}Raw` : never]: MatchWithServicesNew2<"raw", Key>
+          raw: Match<"raw", Key>
         }
+      }
     )
 
     type Keys = keyof Filtered

package/_cjs/api/routing2 copy.cjs

@@ -1,256 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.toHttpApp = exports.makeRouter = exports.RouterSymbol = void 0;
-var _utils = require("@effect-app/core/utils");
-var _rpc = require("@effect/rpc");
-var _schema = require("@effect/schema");
-var _effectApp = require("effect-app");
-var _http = require("effect-app/http");
-var _errorReporter = require("../errorReporter.cjs");
-var _logger = require("../logger.cjs");
-var _DynamicMiddleware = require("./routing/DynamicMiddleware.cjs");
-/* 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.
-*/
-
-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 = 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();
-const makeRouter = (middleware, devMode) => {
-  const rpc = (0, _DynamicMiddleware.makeRpc)(middleware);
-  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,
-        failure: rsc[cur].failure
-      }) // "Raw" variations are for when you don't want to decode just to encode it again on the response
-      ;
-      prev[cur + "Raw"] = 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 = "raw";
-          static handler = () => fnOrEffect;
-        } : class {
-          static stack = stack;
-          static _tag = "raw";
-          static handler = (req, ctx) => fnOrEffect(req, {
-            ...ctx,
-            Response: rsc[cur].success
-          });
-        };
-      }, {
-        success: _effectApp.S.encodedSchema(rsc[cur].success),
-        failure: rsc[cur].failure
-      });
-      return prev;
-    }, {});
-    const controllers = (controllers, 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 [_schema.Serializable.symbol]() {
-            return this.constructor;
-          }
-          get [_schema.Serializable.symbolResult]() {
-            return {
-              failure: req.failure,
-              success: _effectApp.S.encodedSchema(req.success)
-            };
-          }
-        } : req, req => _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 : 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 r = class Router extends _http.HttpRouter.Tag(`${meta.moduleName}Router`)() {};
-      const layer = r.use(router => _effectApp.Effect.gen(function* () {
-        const httpApp = toHttpApp(rpcRouter, {
-          spanPrefix: rsc.meta.moduleName + "."
-        });
-        const services = (yield* _effectApp.Effect.context()).pipe(_effectApp.Context.omit(_effectApp.Scope.Scope), _effectApp.Context.omit(_effectApp.Tracer.ParentSpan));
-        yield* router.all("/", httpApp.pipe(_http.HttpMiddleware.make(_effectApp.Effect.provide(services))),
-        // TODO: not queries.
-        {
-          uninterruptible: true
-        });
-      }));
-      const routes = layer.pipe(_effectApp.Layer.provideMerge(r.Live), layers ? _effectApp.Layer.provide(layers) : _ => _);
-      // Effect.Effect<HttpRouter.HttpRouter<unknown, HttpRouter.HttpRouter.DefaultServices>, never, UserRouter>
-      return {
-        moduleName: meta.moduleName,
-        Router: r,
-        routes
-      };
-    };
-    const effect = (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);
-        // 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 [_schema.Serializable.symbol]() {
-              return this.constructor;
-            }
-            get [_schema.Serializable.symbolResult]() {
-              return {
-                failure: req.failure,
-                success: _effectApp.S.encodedSchema(req.success)
-              };
-            }
-          } : req, req => _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 : 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 + "."
-        });
-        const services = (yield* _effectApp.Effect.context()).pipe(_effectApp.Context.omit(_effectApp.Scope.Scope), _effectApp.Context.omit(_effectApp.Tracer.ParentSpan));
-        yield* router.all("/", httpApp.pipe(_http.HttpMiddleware.make(_effectApp.Effect.provide(services))),
-        // 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.Layer.provide(layers) : _ => _);
-      // Effect.Effect<HttpRouter.HttpRouter<unknown, HttpRouter.HttpRouter.DefaultServices>, never, UserRouter>
-      return {
-        moduleName: meta.moduleName,
-        Router: r,
-        routes
-      };
-    };
-    const r = {
-      effect,
-      controllers
-    };
-    return r;
-  }
-  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=routing2 copy.cjs.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"routing2 copy.cjs","names":["_utils","require","_rpc","_schema","_effectApp","_http","_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","makeRouter","middleware","devMode","rpc","makeRpc","matchFor","rsc","meta","filtered","typedKeysOf","reduce","acc","cur","Predicate","isObject","items","prev","Object","assign","fnOrEffect","stack","Error","split","slice","join","isEffect","success","failure","req","ctx","Response","S","encodedSchema","controllers","layers","mapped","effect","Serializable","symbol","constructor","symbolResult","annotateCurrentSpan","entries","key","value","length","substring","undefined","keys","zipRight","tapErrorCause","Cause","isFailure","void","all","action","moduleName","Rpc","currentHeaders","headers","InfraLogger","annotateLogs","pretty","catchAllDefect","die","withSpan","captureStackTrace","rpcRouter","make","values","Router","HttpRouter","Tag","layer","use","router","gen","httpApp","spanPrefix","services","omit","Scope","Tracer","ParentSpan","HttpMiddleware","provide","uninterruptible","routes","Layer","provideMerge","Live","matchAll","handlers","requestLayer","routers","typedValuesOf","rootRouter","route","mount","flow"],"sources":["../../src/api/routing2 copy.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/api/routing2 copy.d.ts

@@ -1,105 +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 GetFailure<T extends {
-    failure?: S.Schema.Any;
-}> = T["failure"] extends never ? typeof S.Never : T["failure"];
-export interface Handler<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>;
-}
-type AHandler<Action extends AnyRequestModule> = Handler<Action, "raw", S.Schema.Encoded<GetSuccess<Action>>, S.Schema.Type<GetFailure<Action>> | S.ParseResult.ParseError, any> | Handler<Action, "d", S.Schema.Type<GetSuccess<Action>>, S.Schema.Type<GetFailure<Action>> | S.ParseResult.ParseError, 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 interface ExtendedMiddleware<Context, CTXMap extends Record<string, RPCContextMap.Any>> extends Middleware<Context, CTXMap> {
-    makeContext: Effect<{
-        [K in keyof CTXMap as CTXMap[K][1] extends never ? never : CTXMap[K][0]]: CTXMap[K][1];
-    }, never, never>;
-}
-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;
-export declare const makeRouter: <Context, CTXMap extends Record<string, RPCContextMap.Any>>(middleware: ExtendedMiddleware<Context, CTXMap>, 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_1 ? T_1 extends Effect.Effect.Success<T[keyof T]["Router"]["router"]> ? T_1 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_2 ? T_2 extends Effect.Effect.Success<T[keyof T]["Router"]["router"]> ? T_2 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;
-        };
-    }) => {
-        effect: <E_1, R_1, THandlers extends { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]>; }, TLayers extends NonEmptyArray<Layer.Layer.Any>>(layers: TLayers, make: (requests: { [Key in keyof Filter<Rsc>]: {
-            <A_1 extends S.Schema.Type<GetSuccess<Rsc[Key]>>, R2 = never, E_2 = never>(f: Effect<A_1, E_2, R2>): HandleVoid<S.Schema.Type<GetSuccess<Rsc[Key]>>, A_1, Handler<Rsc[Key], "d", A_1, E_2, Exclude<R2, GetEffectContext<CTXMap, Rsc[Key]["config"]>>>>;
-            <A_1 extends S.Schema.Type<GetSuccess<Rsc[Key]>>, R2_1 = never, E_3 = never>(f: (req: S.Schema.Type<Rsc[Key]>) => Effect<A_1, E_3, R2_1>): HandleVoid<S.Schema.Type<GetSuccess<Rsc[Key]>>, A_1, Handler<Rsc[Key], "d", A_1, E_3, Exclude<R2_1, GetEffectContext<CTXMap, Rsc[Key]["config"]>>>>;
-            success: Rsc[Key]["success"];
-            failure: Rsc[Key]["failure"];
-        }; } & { [Key_1 in keyof Filter<Rsc> as Key_1 extends string ? `${Key_1}Raw` : never]: {
-            <A_1 extends S.Schema.Encoded<GetSuccess<Rsc[Key_1]>>, R2 = never, E_2 = never>(f: Effect<A_1, E_2, R2>): HandleVoid<S.Schema.Encoded<GetSuccess<Rsc[Key_1]>>, A_1, Handler<Rsc[Key_1], "raw", A_1, E_2, Exclude<R2, GetEffectContext<CTXMap, Rsc[Key_1]["config"]>>>>;
-            <A_1 extends S.Schema.Encoded<GetSuccess<Rsc[Key_1]>>, R2_1 = never, E_3 = never>(f: (req: S.Schema.Type<Rsc[Key_1]>) => Effect<A_1, E_3, R2_1>): HandleVoid<S.Schema.Encoded<GetSuccess<Rsc[Key_1]>>, A_1, Handler<Rsc[Key_1], "raw", A_1, E_3, Exclude<R2_1, GetEffectContext<CTXMap, Rsc[Key_1]["config"]>>>>;
-            success: S.SchemaClass<S.Schema.Encoded<Rsc[Key_1]["success"]>, S.Schema.Encoded<Rsc[Key_1]["success"]>, never>;
-            failure: Rsc[Key_1]["failure"];
-        }; }) => Effect<THandlers, E_1, R_1>) => {
-            moduleName: ModuleName;
-            Router: HttpRouter.HttpRouter.TagClass<RouterShape<Rsc>, `${ModuleName}Router`, never, Exclude<RPCRouteR<{ [K in keyof Filter<Rsc>]: Rpc.Rpc<Rsc[K], _R<ReturnType<THandlers[K]["handler"]>>>; }[keyof Filter<Rsc>]>, { [k in keyof TLayers]: Layer.Layer.Success<TLayers[k]>; }[number]>>;
-            routes: Layer.Layer<RouterShape<Rsc>, E_1 | { [k_1 in keyof TLayers]: Layer.Layer.Error<TLayers[k_1]>; }[number], { [k_2 in keyof TLayers]: Layer.Layer.Context<TLayers[k_2]>; }[number] | Exclude<R_1, { [k_3 in keyof TLayers]: Layer.Layer.Success<TLayers[k_3]>; }[number]>>;
-        };
-        controllers: <THandlers_1 extends { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]>; }, TLayers_1 extends NonEmptyArray<Layer.Layer.Any>>(controllers: THandlers_1, layers?: TLayers_1) => {
-            moduleName: ModuleName;
-            Router: HttpRouter.HttpRouter.TagClass<RouterShape<Rsc>, `${ModuleName}Router`, never, Exclude<RPCRouteR<{ [K in keyof Filter<Rsc>]: Rpc.Rpc<Rsc[K], _R<ReturnType<THandlers_1[K]["handler"]>>>; }[keyof Filter<Rsc>]>, { [k in keyof TLayers_1]: Layer.Layer.Success<TLayers_1[k]>; }[number]>>;
-            routes: Layer.Layer<RouterShape<Rsc>, { [k_1 in keyof TLayers_1]: Layer.Layer.Error<TLayers_1[k_1]>; }[number], { [k_2 in keyof TLayers_1]: Layer.Layer.Context<TLayers_1[k_2]>; }[number]>;
-        };
-    };
-};
-export {};
-//# sourceMappingURL=routing2%20copy.d.ts.map

package/dist/api/routing2 copy.d.ts.map

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

package/dist/api/routing2 copy.js

@@ -1,300 +0,0 @@
-/* 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 { pretty, typedKeysOf, typedValuesOf } from "@effect-app/core/utils";
-import { Rpc, RpcRouter } from "@effect/rpc";
-import { Serializable } from "@effect/schema";
-import { Cause, Chunk, Context, Effect, FiberRef, flow, Layer, Predicate, S, Scope, Stream, Tracer } from "effect-app";
-import { HttpMiddleware, HttpRouter, HttpServerRequest, HttpServerResponse } from "effect-app/http";
-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 const makeRouter = (middleware, devMode) => {
-    const rpc = makeRpc(middleware);
-    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,
-                failure: rsc[cur].failure
-            }) // "Raw" variations are for when you don't want to decode just to encode it again on the response
-            ;
-            prev[cur + "Raw"] = Object.assign((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 });
-                    };
-            }, {
-                success: S.encodedSchema(rsc[cur].success),
-                failure: rsc[cur].failure
-            });
-            return prev;
-        }, {});
-        const controllers = (controllers, 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 [Serializable.symbol]() {
-                            return this.constructor;
-                        }
-                        get [Serializable.symbolResult]() {
-                            return {
-                                failure: req.failure,
-                                success: S.encodedSchema(req.success)
-                            };
-                        }
-                    }
-                    : req, (req) => 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 r = (class Router extends HttpRouter.Tag(`${meta.moduleName}Router`)() {
-            });
-            const layer = r.use((router) => Effect.gen(function* () {
-                const httpApp = toHttpApp(rpcRouter, {
-                    spanPrefix: rsc
-                        .meta
-                        .moduleName + "."
-                });
-                const services = (yield* Effect.context()).pipe(Context.omit(Scope.Scope), Context.omit(Tracer.ParentSpan));
-                yield* router
-                    .all("/", (httpApp
-                    .pipe(HttpMiddleware.make(Effect.provide(services)))), 
-                // TODO: not queries.
-                { uninterruptible: true });
-            }));
-            const routes = layer.pipe(Layer.provideMerge(r.Live), layers ? Layer.provide(layers) : (_) => _);
-            // Effect.Effect<HttpRouter.HttpRouter<unknown, HttpRouter.HttpRouter.DefaultServices>, never, UserRouter>
-            return {
-                moduleName: meta.moduleName,
-                Router: r,
-                routes
-            };
-        };
-        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);
-                // 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 [Serializable.symbol]() {
-                                return this.constructor;
-                            }
-                            get [Serializable.symbolResult]() {
-                                return {
-                                    failure: req.failure,
-                                    success: S.encodedSchema(req.success)
-                                };
-                            }
-                        }
-                        : req, (req) => 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
-                    .all("/", (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) : (_) => _);
-            // Effect.Effect<HttpRouter.HttpRouter<unknown, HttpRouter.HttpRouter.DefaultServices>, never, UserRouter>
-            return {
-                moduleName: meta.moduleName,
-                Router: r,
-                routes
-            };
-        };
-        const r = {
-            effect,
-            controllers
-        };
-        return r;
-    }
-    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":"routing2 copy.js","sourceRoot":"","sources":["../../src/api/routing2 copy.ts"],"names":[],"mappings":"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"}