@effect-app/infra 2.20.1 → 2.21.1

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @effect-app/infra
 
+## 2.21.1
+
+### Patch Changes
+
+- c971d73: update packages
+- f86ebc5: fix E/R
+- Updated dependencies [c971d73]
+  - effect-app@2.11.1
+
+## 2.21.0
+
+### Minor Changes
+
+- 67f43cc: feat: add routing6
+
 ## 2.20.1
 
 ### Patch Changes

package/_cjs/api/routing6.cjs

@@ -0,0 +1,214 @@
+"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 request = rsc[cur];
+          static stack = stack;
+          static _tag = "d";
+          static handler = () => fnOrEffect;
+        } : class {
+          static request = rsc[cur];
+          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 request = rsc[cur];
+            static stack = stack;
+            static _tag = "raw";
+            static handler = () => fnOrEffect;
+          } : class {
+            static request = rsc[cur];
+            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;
+        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 = m => f(m.dependencies, m.effect);
+    const total = Object.keys(filtered).length;
+    // TODO
+    const accum = {};
+    const router2 = (0, _utils.typedKeysOf)(filtered).reduce((prev, cur) => {
+      prev[cur] = Object.assign(it => {
+        accum[cur] = items[cur](it);
+        if (Object.keys(accum).length === total) return accum;
+        return router2;
+      }, {
+        raw: it => {
+          accum[cur] = items[cur](it);
+          if (Object.keys(accum).length === total) return accum;
+          return router2;
+        }
+      });
+      return prev;
+    }, {});
+    return Object.assign(effect, router2);
+  }
+  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=routing6.cjs.map

package/_cjs/api/routing6.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"routing6.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","m","total","accum","router2","it","matchAll","handlers","requestLayer","routers","typedValuesOf","rootRouter","route","mount","flow"],"sources":["../../src/api/routing6.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/Emailer/service.d.ts

@@ -19,7 +19,7 @@ declare const Emailer_base: (abstract new (service: {
 } & {
     use: <X>(body: (_: {
         sendMail: (msg: EmailMsgOptionalFrom) => Effect<void, Error | ResponseError>;
-    }) => X) => X extends Effect.Effect<infer A_1, infer E_1, infer R_3> ? Effect.Effect<A_1, E_1, R_3 | Emailer> : Effect.Effect<X, never, Emailer>;
+    }) => X) => X extends Effect.Effect<infer A_1, infer E_1, infer R_3> ? Effect.Effect<A_1, E_1, Emailer | R_3> : Effect.Effect<X, never, Emailer>;
 };
 /**
  * @tsplus type Emailer

package/dist/MainFiberSet.d.ts

@@ -44,7 +44,7 @@ declare const MainFiberSet_base: (abstract new (service: {
         run: <R_1, XE extends never, XA extends unknown>(effect: Effect.Effect<XA, XE, R_1>) => Effect.Effect<Fiber.RuntimeFiber<XA, XE>, never, R_1>;
         add: (...fibers: Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
         addAll: (fibers: readonly Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
-    }) => X) => X extends Effect.Effect<infer A_1, infer E_2, infer R_4> ? Effect.Effect<A_1, E_2, MainFiberSet | R_4> : Effect.Effect<X, never, MainFiberSet>;
+    }) => X) => X extends Effect.Effect<infer A_1, infer E_2, infer R_4> ? Effect.Effect<A_1, E_2, R_4 | MainFiberSet> : Effect.Effect<X, never, MainFiberSet>;
 };
 /**
  * Whenever you fork long running (e.g worker) fibers via e.g `Effect.forkScoped` or `Effect.forkDaemon`

package/dist/Model/Repository/internal/internal.d.ts

@@ -22,12 +22,12 @@ export declare function makeRepoInternal<Evt = never>(): <ItemType extends strin
         config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
             partitionValue?: (a: Encoded) => string;
         };
-    }) => Effect.Effect<Repository<T, Encoded, Evt, ItemType, IdKey, Exclude<R, RCtx>, RPublish>, E, R | RInitial | StoreMaker>;
+    }) => Effect.Effect<Repository<T, Encoded, Evt, ItemType, IdKey, Exclude<R, RCtx>, RPublish>, E, StoreMaker | R | RInitial>;
     Q: Q.Query<Encoded>;
 };
 export declare function makeStore<Encoded extends FieldValues>(): <ItemType extends string, R, E, T, IdKey extends keyof Encoded>(name: ItemType, schema: S.Schema<T, E, R>, mapTo: (e: E, etag: string | undefined) => Encoded, idKey: IdKey) => <RInitial = never, EInitial = never>(makeInitial?: Effect<readonly T[], EInitial, RInitial>, config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
     partitionValue?: (a: Encoded) => string;
-}) => Effect.Effect<import("../../../Store.js").Store<IdKey, Encoded, PersistenceModelType<Encoded>>, EInitial, R | RInitial | StoreMaker>;
+}) => Effect.Effect<import("../../../Store.js").Store<IdKey, Encoded, PersistenceModelType<Encoded>>, EInitial, StoreMaker | R | RInitial>;
 export interface Repos<T, Encoded extends {
     id: string;
 }, RSchema, Evt, ItemType extends string, IdKey extends keyof T, RPublish> {

package/dist/Operations.d.ts

@@ -56,15 +56,15 @@ declare const Operations_base: (abstract new (service: {
     update: (id: OperationId, progress: OperationProgress) => Effect.Effect<void, never, never>;
 }>) & {
     toLayer: {
-        (): Layer.Layer<Operations, never, OperationsRepo | RequestFiberSet>;
+        (): Layer.Layer<Operations, never, RequestFiberSet | OperationsRepo>;
         <E_1, R_1>(eff: Effect.Effect<Omit<Operations, keyof Context.TagClassShape<any, any>>, E_1, R_1>): Layer.Layer<Operations, E_1, R_1>;
     };
     toLayerScoped: {
-        (): Layer.Layer<Operations, never, OperationsRepo | RequestFiberSet>;
+        (): Layer.Layer<Operations, never, RequestFiberSet | OperationsRepo>;
         <E_1, R_2>(eff: Effect.Effect<Context.TagClassShape<any, any>, E_1, R_2>): Layer.Layer<Operations, E_1, Exclude<R_2, Scope.Scope>>;
     };
     of: (service: Context.TagClassShape<any, any>) => Operations;
-    make: Effect.Effect<Operations, never, OperationsRepo | RequestFiberSet>;
+    make: Effect.Effect<Operations, never, RequestFiberSet | OperationsRepo>;
 } & Context.Tag<Operations, Operations> & {
     cleanup: Effect.Effect<void[], never, Operations>;
     register: (title: S.NonEmptyString2k) => Effect.Effect<S.StringId, never, Scope.Scope | Operations>;

package/dist/QueueMaker/sbqueue.d.ts

@@ -14,9 +14,9 @@ export declare function makeServiceBusQueue<Evt extends {
 }, EvtE, DrainEvtE>(queueName: string, queueDrainName: string, schema: S.Schema<Evt, EvtE>, drainSchema: S.Schema<DrainEvt, DrainEvtE>): Effect.Effect<{
     drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, import("effect/Scope").Scope | Exclude<Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, never>, Tracer.ParentSpan>, ServiceBusReceiverFactory>>;
     publish: (messages_0: Evt, ...messages: Evt[]) => Effect.Effect<void, never, never>;
-}, never, ServiceBusReceiverFactory | import("@azure/service-bus").ServiceBusSender>;
+}, never, import("@azure/service-bus").ServiceBusSender | ServiceBusReceiverFactory>;
 /**
  * @tsplus static QueueMaker.Ops makeServiceBusLayers
  */
-export declare function makeServiceBusLayers(url: string, queueName: string, queueDrainName: string): Layer.Layer<ServiceBusReceiverFactory | import("@azure/service-bus").ServiceBusSender, never, never>;
+export declare function makeServiceBusLayers(url: string, queueName: string, queueDrainName: string): Layer.Layer<import("@azure/service-bus").ServiceBusSender | ServiceBusReceiverFactory, never, never>;
 //# sourceMappingURL=sbqueue.d.ts.map

package/dist/RequestContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RequestContext.d.ts","sourceRoot":"","sources":["../src/RequestContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,YAAY,CAAA;AAIxC,eAAO,MAAM,MAAM,yBAAwB,CAAA;AAC3C,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC,IAAI,CAAA;AAEvC,eAAO,MAAM,SAAS,gCAAoC,CAAA;;;;;;;;;;;;;IAmBxD,kBAAkB;;;;yBAkBH,EAAG,iBAElB;;;yBAe6B,EAAI,iBAAgB;;;;;;;;;;;;;;;;;AApDnD;;;GAGG;AACH,qBAAa,cAAe,SAAQ,mBAelC;IAGA,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc;;;;CAMrD;AAED,eAAO,MAAM,cAAc,QAAS,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,WAAW,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;;;;;;;CAgBxG,CAAA;AAKF,yBAAiB,cAAc,CAAC;IAC9B,UAAiB,OAAQ,SAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;KAAG;CACtF"}
+{"version":3,"file":"RequestContext.d.ts","sourceRoot":"","sources":["../src/RequestContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,YAAY,CAAA;AAIxC,eAAO,MAAM,MAAM,yBAAwB,CAAA;AAC3C,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC,IAAI,CAAA;AAEvC,eAAO,MAAM,SAAS,gCAAoC,CAAA;;;;;;;;;;;;;IAmBxD,kBAAkB;;;;2BAkBA,iBAElB;;;2BAeiC,iBAAgB;;;;;;;;;;;;;;;;;AApDnD;;;GAGG;AACH,qBAAa,cAAe,SAAQ,mBAelC;IAGA,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc;;;;CAMrD;AAED,eAAO,MAAM,cAAc,QAAS,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,WAAW,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;;;;;;;CAgBxG,CAAA;AAKF,yBAAiB,cAAc,CAAC;IAC9B,UAAiB,OAAQ,SAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;KAAG;CACtF"}

package/dist/Store/service.d.ts

@@ -88,7 +88,7 @@ declare const StoreMaker_base: (abstract new (service: {
 } & Context.Tag<StoreMaker, StoreMaker> & {} & {
     use: <X>(body: (_: {
         make: <IdKey extends keyof Encoded, Encoded extends FieldValues, R = never, E = never>(name: string, idKey: IdKey, seed?: Effect<Iterable<Encoded>, E, R>, config?: StoreConfig<Encoded>) => Effect<Store<IdKey, Encoded>, E, R>;
-    }) => X) => X extends Effect.Effect<infer A_1, infer E_1, infer R_3> ? Effect.Effect<A_1, E_1, StoreMaker | R_3> : Effect.Effect<X, never, StoreMaker>;
+    }) => X) => X extends Effect.Effect<infer A_1, infer E_1, infer R_3> ? Effect.Effect<A_1, E_1, R_3 | StoreMaker> : Effect.Effect<X, never, StoreMaker>;
 };
 /**
  * @tsplus type StoreMaker
@@ -127,7 +127,7 @@ declare const ContextMap_base: (abstract new (service: {
     use: <X>(body: (_: {
         get: (id: string) => string | undefined;
         set: (id: string, eTag: string | undefined) => void;
-    }) => X) => X extends Effect.Effect<infer A_1, infer E_2, infer R_4> ? Effect.Effect<A_1, E_2, R_4 | ContextMap> : Effect.Effect<X, never, ContextMap>;
+    }) => X) => X extends Effect.Effect<infer A_1, infer E_2, infer R_4> ? Effect.Effect<A_1, E_2, ContextMap | R_4> : Effect.Effect<X, never, ContextMap>;
 };
 /**
  * @tsplus type ContextMap

package/dist/adapters/ServiceBus.d.ts

@@ -31,7 +31,7 @@ export declare class ServiceBusReceiverFactory extends ServiceBusReceiverFactory
     static readonly Live: (queueName: string) => Layer.Layer<ServiceBusReceiverFactory, never, ServiceBusClient>;
 }
 export declare function sendMessages(messages: ServiceBusMessage | ServiceBusMessage[] | ServiceBusMessageBatch, options?: OperationOptionsBase): Effect.Effect<void, never, ServiceBusSender>;
-export declare function subscribe<RMsg, RErr>(hndlr: MessageHandlers<RMsg, RErr>, sessionId?: string): Effect.Effect<void, never, Scope.Scope | RMsg | RErr | ServiceBusReceiverFactory>;
+export declare function subscribe<RMsg, RErr>(hndlr: MessageHandlers<RMsg, RErr>, sessionId?: string): Effect.Effect<void, never, Scope.Scope | ServiceBusReceiverFactory | RMsg | RErr>;
 export interface MessageHandlers<RMsg, RErr> {
     /**
      * Handler that processes messages from service bus.

package/dist/api/routing6.d.ts

@@ -0,0 +1,216 @@
+import type * as HttpApp from "@effect/platform/HttpApp";
+import { Rpc, RpcRouter } from "@effect/rpc";
+import type { NonEmptyReadonlyArray } from "effect-app";
+import { Array, 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 { Contravariant } from "effect/Types";
+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;
+export type AnyRequestModule = S.Schema.Any & {
+    _tag: string;
+    config?: any;
+    success?: S.Schema.Any;
+    failure?: S.Schema.Any;
+};
+export interface AddAction<Actions extends AnyRequestModule, Accum extends Record<string, any> = {}> {
+    accum: Accum;
+    add<A extends Handler<Actions, any, any>>(a: A): Exclude<Actions, A extends Handler<infer M, any, any> ? M : never> extends never ? Accum & {
+        [K in A extends Handler<infer M, any, any> ? M extends AnyRequestModule ? M["_tag"] : never : never]: A;
+    } : AddAction<Exclude<Actions, A extends Handler<infer M, any, any> ? M : never>, Accum & {
+        [K in A extends Handler<infer M, any, any> ? M extends AnyRequestModule ? M["_tag"] : never : never]: A;
+    }> & Accum & {
+        [K in A extends Handler<infer M, any, any> ? M extends AnyRequestModule ? M["_tag"] : never : never]: A;
+    };
+}
+export interface Method<Rsc extends Record<string, AnyRequestModule>, K extends keyof Rsc, RT extends "d" | "raw", CTXMap extends Record<string, any>, Context, Accum> {
+    <A extends GetSuccessShape<Rsc[K], RT>, R2 = never, E = never>(f: Effect<A, E, R2>): keyof {
+        [k in keyof Rsc as k extends K | keyof Accum ? never : k]: Rsc[k];
+    } extends never ? {
+        [k in K]: HandleVoid<GetSuccessShape<Rsc[K], RT>, A, Handler<Rsc[K], RT, Exclude<Context | Exclude<R2, GetEffectContext<CTXMap, Rsc[K]["config"]>>, HttpRouter.HttpRouter.Provided>>>;
+    } & Accum : RRouter<{
+        [k in keyof Rsc as k extends K | keyof Accum ? never : k]: Rsc[k];
+    }, CTXMap, Context, {
+        [k in K]: HandleVoid<GetSuccessShape<Rsc[K], RT>, A, Handler<Rsc[K], RT, Exclude<Context | Exclude<R2, GetEffectContext<CTXMap, Rsc[K]["config"]>>, HttpRouter.HttpRouter.Provided>>>;
+    } & Accum>;
+    <A extends GetSuccessShape<Rsc[K], RT>, R2 = never, E = never>(f: (req: S.Schema.Type<Rsc[K]>) => Effect<A, E, R2>): keyof {
+        [k in keyof Rsc as k extends K | keyof Accum ? never : k]: Rsc[k];
+    } extends never ? {
+        [k in K]: HandleVoid<GetSuccessShape<Rsc[K], RT>, A, Handler<Rsc[K], RT, Exclude<Context | Exclude<R2, GetEffectContext<CTXMap, Rsc[K]["config"]>>, HttpRouter.HttpRouter.Provided>>>;
+    } & Accum : RRouter<{
+        [k in keyof Rsc as k extends K | keyof Accum ? never : k]: Rsc[k];
+    }, CTXMap, Context, {
+        [k in K]: HandleVoid<GetSuccessShape<Rsc[K], RT>, A, Handler<Rsc[K], RT, Exclude<Context | Exclude<R2, GetEffectContext<CTXMap, Rsc[K]["config"]>>, HttpRouter.HttpRouter.Provided>>>;
+    } & Accum>;
+}
+type RRouter<Rsc extends Record<string, AnyRequestModule>, CTXMap extends Record<string, any>, Context, Accum = {}> = {
+    [K in keyof Rsc]: (Method<Rsc, K, "d", CTXMap, Context, Accum>) & {
+        raw: Method<Rsc, K, "raw", CTXMap, Context, Accum>;
+    };
+};
+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 AnyRequestModule ? 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 NonEmptyReadonlyArray<Layer.Layer.Any> | never[]>(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 NonEmptyReadonlyArray<Layer.Layer.Any> | never[]>(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_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;
+        };
+    }) => {
+        <const Make extends {
+            dependencies: Array<Layer.Layer.Any>;
+            effect: Effect<{ [K in keyof Filter<Rsc>]: AHandler<Rsc[K]>; }, any, Make["strict"] extends false ? any : Make["dependencies"] extends infer T ? T extends Make["dependencies"] ? T extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k in keyof T]: Layer.Layer.Success<T[k]>; }[number] : never : never : never>;
+            strict?: boolean;
+            /** @deprecated */
+            readonly ಠ_ಠ: never;
+        }>(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<MakeHandlers<Make, Filter<Rsc>>[K]["handler"]>>>; }[keyof Filter<Rsc>]>, HttpRouter.HttpRouter.Provided>>;
+            routes: Layer.Layer<RouterShape<Rsc>, MakeErrors<Make> | (Make["dependencies"] extends infer T_1 ? T_1 extends Make["dependencies"] ? T_1 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_1 in keyof T_1]: Layer.Layer.Error<T_1[k_1]>; }[number] : never : never : never), (Make["dependencies"] extends infer T_2 ? T_2 extends Make["dependencies"] ? T_2 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_2 in keyof T_2]: Layer.Layer.Context<T_2[k_2]>; }[number] : never : never : never) | Exclude<MakeContext<Make> | RMW, (Make["dependencies"] extends infer T ? T extends Make["dependencies"] ? T extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k in keyof T]: Layer.Layer.Success<T[k]>; }[number] : never : never : never) | (Layers extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_3 in keyof Layers]: Layer.Layer.Success<Layers[k_3]>; }[number] : never)>>;
+        };
+        <const Make extends {
+            dependencies: Array<Layer.Layer.Any>;
+            effect: Effect<{ [K in keyof Filter<Rsc>]: AHandler<Rsc[K]>; }, any, Make["strict"] extends false ? any : Make["dependencies"] extends infer T ? T extends Make["dependencies"] ? T extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k in keyof T]: Layer.Layer.Success<T[k]>; }[number] : never : never : never>;
+            strict?: boolean;
+            /** @deprecated */
+            readonly ಠ_ಠ: never;
+        }>(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<MakeHandlers<Make, Filter<Rsc>>[K]["handler"]>>>; }[keyof Filter<Rsc>]>, HttpRouter.HttpRouter.Provided>>;
+            routes: Layer.Layer<RouterShape<Rsc>, MakeErrors<Make> | (Make["dependencies"] extends infer T_1 ? T_1 extends Make["dependencies"] ? T_1 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_1 in keyof T_1]: Layer.Layer.Error<T_1[k_1]>; }[number] : never : never : never), (Make["dependencies"] extends infer T_2 ? T_2 extends Make["dependencies"] ? T_2 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_2 in keyof T_2]: Layer.Layer.Context<T_2[k_2]>; }[number] : never : never : never) | Exclude<MakeContext<Make> | RMW, (Make["dependencies"] extends infer T ? T extends Make["dependencies"] ? T extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k in keyof T]: Layer.Layer.Success<T[k]>; }[number] : never : never : never) | (Layers extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_3 in keyof Layers]: Layer.Layer.Success<Layers[k_3]>; }[number] : never)>>;
+        };
+        <const Make extends {
+            dependencies: Array<Layer.Layer.Any>;
+            effect: Effect<{ [K in keyof Filter<Rsc>]: AHandler<Rsc[K]>; }, any, Make["strict"] extends false ? any : Make["dependencies"] extends infer T ? T extends Make["dependencies"] ? T extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k in keyof T]: Layer.Layer.Success<T[k]>; }[number] : never : never : never>;
+            strict?: boolean;
+            /** @deprecated */
+            readonly ಠ_ಠ: never;
+        }>(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<MakeHandlers<Make, Filter<Rsc>>[K]["handler"]>>>; }[keyof Filter<Rsc>]>, HttpRouter.HttpRouter.Provided>>;
+            routes: Layer.Layer<RouterShape<Rsc>, MakeErrors<Make> | (Make["dependencies"] extends infer T_1 ? T_1 extends Make["dependencies"] ? T_1 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_1 in keyof T_1]: Layer.Layer.Error<T_1[k_1]>; }[number] : never : never : never), (Make["dependencies"] extends infer T_2 ? T_2 extends Make["dependencies"] ? T_2 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_2 in keyof T_2]: Layer.Layer.Context<T_2[k_2]>; }[number] : never : never : never) | Exclude<MakeContext<Make> | RMW, (Make["dependencies"] extends infer T ? T extends Make["dependencies"] ? T extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k in keyof T]: Layer.Layer.Success<T[k]>; }[number] : never : never : never) | (Layers extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_3 in keyof Layers]: Layer.Layer.Success<Layers[k_3]>; }[number] : never)>>;
+        };
+        <const Make extends {
+            dependencies: Array<Layer.Layer.Any>;
+            effect: Effect<{ [K in keyof Filter<Rsc>]: AHandler<Rsc[K]>; }, any, Make["dependencies"] extends infer T ? T extends Make["dependencies"] ? T extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k in keyof T]: Layer.Layer.Success<T[k]>; }[number] : never : never : never>;
+            strict?: boolean;
+            /** @deprecated */
+            readonly ಠ_ಠ: never;
+        }>(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<MakeHandlers<Make, Filter<Rsc>>[K]["handler"]>>>; }[keyof Filter<Rsc>]>, HttpRouter.HttpRouter.Provided>>;
+            routes: Layer.Layer<RouterShape<Rsc>, MakeErrors<Make> | (Make["dependencies"] extends infer T_1 ? T_1 extends Make["dependencies"] ? T_1 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_1 in keyof T_1]: Layer.Layer.Error<T_1[k_1]>; }[number] : never : never : never), (Make["dependencies"] extends infer T_2 ? T_2 extends Make["dependencies"] ? T_2 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_2 in keyof T_2]: Layer.Layer.Context<T_2[k_2]>; }[number] : never : never : never) | Exclude<MakeContext<Make> | RMW, (Make["dependencies"] extends infer T ? T extends Make["dependencies"] ? T extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k in keyof T]: Layer.Layer.Success<T[k]>; }[number] : never : never : never) | (Layers extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_3 in keyof Layers]: Layer.Layer.Success<Layers[k_3]>; }[number] : never)>>;
+        };
+        <const Make extends {
+            dependencies: Array<Layer.Layer.Any>;
+            effect: Effect<{ [K in keyof Filter<Rsc>]: AHandler<Rsc[K]>; }, any, Make["dependencies"] extends infer T ? T extends Make["dependencies"] ? T extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k in keyof T]: Layer.Layer.Success<T[k]>; }[number] : never : never : never>;
+            strict?: boolean;
+        }>(make: Make): {
+            moduleName: ModuleName;
+            Router: 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<MakeHandlers<Make, Filter<Rsc>>[K]["handler"]>>>; }[keyof Filter<Rsc>]>, HttpRouter.HttpRouter.Provided>>;
+            routes: Layer.Layer<RouterShape<Rsc>, MakeErrors<Make> | (Make["dependencies"] extends infer T_1 ? T_1 extends Make["dependencies"] ? T_1 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_1 in keyof T_1]: Layer.Layer.Error<T_1[k_1]>; }[number] : never : never : never), (Make["dependencies"] extends infer T_2 ? T_2 extends Make["dependencies"] ? T_2 extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_2 in keyof T_2]: Layer.Layer.Context<T_2[k_2]>; }[number] : never : never : never) | Exclude<MakeContext<Make> | RMW, (Make["dependencies"] extends infer T ? T extends Make["dependencies"] ? T extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k in keyof T]: Layer.Layer.Success<T[k]>; }[number] : never : never : never) | (Layers extends readonly [Layer.Layer.Any, ...Layer.Layer.Any[]] ? { [k_3 in keyof Layers]: Layer.Layer.Success<Layers[k_3]>; }[number] : never)>>;
+        };
+        <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;
+        }>(make: Make): {
+            moduleName: ModuleName;
+            Router: HttpRouter.HttpRouter.TagClass<RouterShape<Rsc>, `${ModuleName}Router`, never, Exclude<Context, HttpRouter.HttpRouter.Provided>>;
+            routes: any;
+        };
+    } & RRouter<Filter<Rsc>, CTXMap, Context, {}>;
+};
+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"]>;
+export {};
+//# sourceMappingURL=routing6.d.ts.map