effect-app 3.0.2 → 3.0.4

package/dist/rpc/middleware-api.js

@@ -1,88 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { Rpc } from "@effect/rpc";
-import { Tag } from "@effect/rpc/RpcMiddleware";
-import { Context, Layer, S } from "effect-app";
-import { typedValuesOf } from "effect-app/utils";
-import { middlewareMaker } from "./generic-middleware.js";
-/** Adapter used when setting the dynamic prop on a middleware implementation */
-export const contextMap = (rcm, key) => ({
-    key,
-    settings: { service: rcm[key]["service"] }
-});
-const tag = Context.GenericTag("RequestContextConfig");
-/** Retrieves RequestContextConfig out of the RPC annotations */
-export const getConfig = () => (rpc) => {
-    return Context.getOrElse(rpc.annotations, tag, () => ({}));
-};
-const makeMiddlewareBasic = 
-// by setting RequestContextMap beforehand, execute contextual typing does not fuck up itself to anys
-(rcm, ...make) => {
-    // reverse middlewares and wrap one after the other
-    const middleware = middlewareMaker(make);
-    const failures = make.map((_) => _.failure).filter(Boolean);
-    const provides = make.flatMap((_) => !_.provides ? [] : Array.isArray(_.provides) ? _.provides : [_.provides]);
-    const requires = make
-        .flatMap((_) => !_.requires ? [] : Array.isArray(_.requires) ? _.requires : [_.requires])
-        .filter((_) => !provides.includes(_));
-    const MiddlewareMaker = Tag()("MiddlewareMaker", {
-        failure: (failures.length > 0
-            ? S.Union(...failures)
-            : S.Never),
-        requires: (requires.length > 0
-            ? requires
-            : undefined),
-        provides: (provides.length > 0
-            ? provides
-            : undefined),
-        wrap: true
-    });
-    const layer = Layer
-        .scoped(MiddlewareMaker, middleware);
-    // add to the tag a default implementation
-    return Object.assign(MiddlewareMaker, {
-        layer,
-        // tag to be used to retrieve the RequestContextConfig from RPC annotations
-        requestContext: Context.GenericTag("RequestContextConfig"),
-        requestContextMap: rcm
-    });
-};
-export const makeMiddleware = (rcm) => {
-    let allMiddleware = [];
-    const requestContext = Context.GenericTag("RequestContextConfig");
-    const it = {
-        // rpc with config
-        rpc: (tag, options) => {
-            const config = options?.config ?? {};
-            // based on the config, we must enhance (union) or set failures.
-            // TODO: we should only include errors that are relevant based on the middleware config.ks
-            const error = options?.error;
-            const errors = typedValuesOf(rcm).map((_) => _.error).filter((_) => _ && _ !== S.Never); // TODO: only the errors relevant based on config
-            const newError = error ? S.Union(error, ...errors) : S.Union(...errors);
-            const rpc = Rpc.make(tag, { ...options, error: newError });
-            return Object.assign(rpc.annotate(requestContext, config), { config });
-        },
-        middleware: (...middlewares) => {
-            for (const mw of middlewares) {
-                // recall that we run middlewares in reverse order
-                allMiddleware = [mw, ...allMiddleware];
-            }
-            return allMiddleware.filter((m) => !!m.dynamic).length !== Object.keys(rcm).length
-                // for sure, until all the dynamic middlewares are provided it's non sensical to call makeMiddlewareBasic
-                ? it
-                // actually, we don't know yet if MiddlewareR is never, but we can't easily check it at runtime
-                : Object.assign(makeMiddlewareBasic(rcm, ...allMiddleware), it);
-        }
-    };
-    return it;
-};
-// alternatively consider group.serverMiddleware? hmmm
-export const middlewareGroup = (middleware) => (group) => {
-    const middlewaredGroup = group.middleware(middleware);
-    const toLayerOriginal = middlewaredGroup.toLayer.bind(middlewaredGroup);
-    return Object.assign(middlewaredGroup, {
-        toLayerDynamic: (build) => {
-            return toLayerOriginal(build); // ??
-        }
-    });
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZS1hcGkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcnBjL21pZGRsZXdhcmUtYXBpLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHVEQUF1RDtBQUN2RCxPQUFPLEVBQUUsR0FBRyxFQUFxRCxNQUFNLGFBQWEsQ0FBQTtBQUdwRixPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sMkJBQTJCLENBQUE7QUFDL0MsT0FBTyxFQUFFLE9BQU8sRUFBZSxLQUFLLEVBQWtELENBQUMsRUFBd0MsTUFBTSxZQUFZLENBQUE7QUFFakosT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBR2hELE9BQU8sRUFBd0IsZUFBZSxFQUEwQixNQUFNLHlCQUF5QixDQUFBO0FBR3ZHLGdGQUFnRjtBQUNoRixNQUFNLENBQUMsTUFBTSxVQUFVLEdBQUcsQ0FHeEIsR0FBc0IsRUFBRSxHQUFRLEVBQTJDLEVBQUUsQ0FBQyxDQUFDO0lBQy9FLEdBQUc7SUFDSCxRQUFRLEVBQUUsRUFBRSxPQUFPLEVBQUUsR0FBRyxDQUFDLEdBQUcsQ0FBRSxDQUFDLFNBQVMsQ0FBQyxFQUE0QjtDQUN0RSxDQUFDLENBQUE7QUFFRixNQUFNLEdBQUcsR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLHNCQUFzQixDQUFDLENBQUE7QUFDdEQsZ0VBQWdFO0FBQ2hFLE1BQU0sQ0FBQyxNQUFNLFNBQVMsR0FBRyxHQUVyQixFQUFFLENBQ04sQ0FBQyxHQUFpQixFQUF1QyxFQUFFO0lBQ3pELE9BQU8sT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsV0FBVyxFQUFFLEdBQVUsRUFBRSxHQUFHLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7QUFDbkUsQ0FBQyxDQUFBO0FBeUlELE1BQU0sbUJBQW1CO0FBQ3ZCLHFHQUFxRztBQUNyRyxDQUlFLEdBQXNCLEVBQ3RCLEdBQUcsSUFBeUIsRUFDNUIsRUFBRTtJQUNGLG1EQUFt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

package/dist/rpc/middleware-native.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"middleware-native.d.ts","sourceRoot":"","sources":["../../src/rpc/middleware-native.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;;AAGpC,qBAAa,OAAQ,SAAQ,YAAsE;CAAG;;;;;AAEtG,qBAAa,sBAAuB,SAAQ,2BAA2D;CAAG;;;;;AAE1G,qBAAa,mCACX,SAAQ,wCAAqF;CAC7F;;;;;AAEF,qBAAa,gBAAiB,SAAQ,qBAA+C;CAAG;AAExF,eAAO,MAAM,yBAAyB,+GAI5B,CAAA"}

package/dist/rpc/middleware-native.js

@@ -1,17 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { Context } from "effect-app";
-import { Tag } from "./RpcMiddleware.js";
-export class DevMode extends Context.Reference()("DevMode", { defaultValue: () => false }) {
-}
-export class RequestCacheMiddleware extends Tag()("RequestCacheMiddleware", {}) {
-}
-export class ConfigureInterruptibilityMiddleware extends Tag()("ConfigureInterruptibilityMiddleware", {}) {
-}
-export class LoggerMiddleware extends Tag()("LoggerMiddleware", {}) {
-}
-export const DefaultGenericMiddlewares = [
-    RequestCacheMiddleware,
-    ConfigureInterruptibilityMiddleware,
-    LoggerMiddleware
-];
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZS1uYXRpdmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcnBjL21pZGRsZXdhcmUtbmF0aXZlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHVEQUF1RDtBQUN2RCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQ3BDLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUV4QyxNQUFNLE9BQU8sT0FBUSxTQUFRLE9BQU8sQ0FBQyxTQUFTLEVBQVcsQ0FBQyxTQUFTLEVBQUUsRUFBRSxZQUFZLEVBQUUsR0FBRyxFQUFFLENBQUMsS0FBSyxFQUFFLENBQUM7Q0FBRztBQUV0RyxNQUFNLE9BQU8sc0JBQXVCLFNBQVEsR0FBRyxFQUEwQixDQUFDLHdCQUF3QixFQUFFLEVBQUUsQ0FBQztDQUFHO0FBRTFHLE1BQU0sT0FBTyxtQ0FDWCxTQUFRLEdBQUcsRUFBdUMsQ0FBQyxxQ0FBcUMsRUFBRSxFQUFFLENBQUM7Q0FDN0Y7QUFFRixNQUFNLE9BQU8sZ0JBQWlCLFNBQVEsR0FBRyxFQUFvQixDQUFDLGtCQUFrQixFQUFFLEVBQUUsQ0FBQztDQUFHO0FBRXhGLE1BQU0sQ0FBQyxNQUFNLHlCQUF5QixHQUFHO0lBQ3ZDLHNCQUFzQjtJQUN0QixtQ0FBbUM7SUFDbkMsZ0JBQWdCO0NBQ1IsQ0FBQSJ9

package/src/client/req.ts

@@ -1,288 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
-import { type Tag } from "../Context.js"
-import { type Context, type NonEmptyReadonlyArray, S } from "../internal/lib.js"
-import { type Values } from "../utils.js"
-
-/** @deprecated just use Service Identifier Union */
-export type ContextTagArray = NonEmptyReadonlyArray<Context.Tag<any, any>>
-
-/** @deprecated just use Service Identifier Union */
-export namespace ContextTagArray {
-  export type Identifier<A> = A extends ContextTagArray ? Tag.Identifier<A[number]> : never
-  export type Service<A> = A extends ContextTagArray ? Tag.Service<A[number]> : never
-}
-
-/** @deprecated just use Service Identifier Union */
-export type AnyService = Context.Tag<any, any> | ContextTagArray
-/** @deprecated just use Service Identifier Union */
-export namespace AnyService {
-  export type Bla<A> = A extends ContextTagArray ? Context.Context<ContextTagArray.Identifier<A>>
-    : A extends Context.Tag<any, any> ? Tag.Service<A>
-    : never
-  export type Identifier<A> = A extends ContextTagArray ? ContextTagArray.Identifier<A>
-    : A extends Context.Tag<any, any> ? Tag.Identifier<A>
-    : never
-  export type Service<A> = A extends ContextTagArray ? ContextTagArray.Service<A>
-    : A extends Context.Tag<any, any> ? Tag.Service<A>
-    : never
-}
-
-export namespace RPCContextMap {
-  /**
-   * Middleware is inactivate by default, the Key is optional in route context, and the service is optionally provided as Effect Context.
-   * Unless explicitly configured as `true`.
-   */
-  export type RPCContextMap<Service, E> = {
-    service: Service
-    error: E
-    contextActivation: true
-  }
-
-  /**
-   * Middleware is active by default, and provides the Service at Key in route context, and the Service is provided as Effect Context.
-   * Unless explicitly omitted.
-   */
-  export type Inverted<Service extends AnyService, E> = {
-    service: Service
-    error: E
-    contextActivation: false
-  }
-
-  export type Custom<Service extends AnyService, E, C> = {
-    service: Service
-    error: E
-    contextActivation: C
-  }
-
-  export type Any = {
-    service: AnyService
-    error: S.Schema.All
-    contextActivation: any
-  }
-
-  export const make = <Service extends AnyService, E>(
-    service: Service,
-    error: E
-  ): RPCContextMap<Service, E> => ({
-    service,
-    error,
-    contextActivation: true
-  })
-
-  export const makeInverted = <Service extends AnyService, E>(
-    service: Service,
-    error: E
-  ): Inverted<Service, E> => ({
-    service,
-    error,
-    contextActivation: false
-  })
-
-  export const makeCustom = <Service extends AnyService, E, C>(
-    service: Service,
-    error: E,
-    contextActivation: C
-  ): Custom<Service, E, C> => ({
-    service,
-    error,
-    contextActivation
-  })
-}
-
-export type GetContextConfig<RequestContextMap extends Record<string, RPCContextMap.Any>> = {
-  [K in keyof RequestContextMap]?: RequestContextMap[K]["contextActivation"] extends true ? false
-    : RequestContextMap[K]["contextActivation"] extends false ? true
-    : RequestContextMap[K]["contextActivation"]
-}
-
-export type GetEffectContext<RequestContextMap extends Record<string, RPCContextMap.Any>, T> = Values<
-  // inverted: contextActivation is false => remove if explicitly set to true (like allowAnonymous: true disables auth and auth service and related errors)
-  & {
-    [
-      key in keyof RequestContextMap as RequestContextMap[key]["contextActivation"] extends true ? never
-        : key extends keyof T ? T[key] extends true ? never : key
-        : key
-    ]: // TODO: or as an Optional available?
-      AnyService.Identifier<RequestContextMap[key]["service"]>
-  }
-  // normal: contextActivation is true => add if explicitly set to true
-  & {
-    [
-      key in keyof RequestContextMap as RequestContextMap[key]["contextActivation"] extends false ? never
-        : key extends keyof T ? T[key] extends true ? key : never
-        : never
-    ]: // TODO: or as an Optional available?
-      AnyService.Identifier<RequestContextMap[key]["service"]>
-  }
->
-
-export type GetEffectError<RequestContextMap extends Record<string, RPCContextMap.Any>, T> = Values<
-  // inverted: contextActivation is false => remove if explicitly set to true (like allowAnonymous: true disables auth and auth service and related errors)
-  & {
-    [
-      key in keyof RequestContextMap as RequestContextMap[key]["contextActivation"] extends true ? never
-        : key extends keyof T ? T[key] extends true ? never : key
-        : key
-    ]: // TODO: or as an Optional available?
-      RequestContextMap[key]["error"]
-  }
-  // normal: contextActivation is true => add if explicitly set to true
-  & {
-    [
-      key in keyof RequestContextMap as RequestContextMap[key]["contextActivation"] extends false ? never
-        : key extends keyof T ? T[key] extends true ? key : never
-        : never
-    ]: // TODO: or as an Optional available?
-      RequestContextMap[key]["error"]
-  }
->
-
-// TODO: Fix error types... (?)
-type JoinSchema<T> = T extends ReadonlyArray<S.Schema.All> ? S.Union<T> : typeof S.Never
-
-const merge = (a: any, b: Array<any>) =>
-  a !== undefined && b.length ? S.Union(a, ...b) : a !== undefined ? a : b.length ? S.Union(...b) : S.Never
-
-/**
- * Converts struct fields to TypeLiteral schema, or returns existing schema.
- *
- * @example
- * ```typescript
- * type Fields = { name: S.String; age: S.Number }
- * type Schema = SchemaOrFields<Fields>
- * // Result: S.TypeLiteral<Fields, []>
- *
- * type Existing = S.String
- * type Same = SchemaOrFields<Existing>
- * // Result: S.String
- * ```
- */
-type SchemaOrFields<T> = T extends S.Struct.Fields ? S.TypeLiteral<T, []> : T extends S.Schema.Any ? T : never
-
-/**
- * Whatever the input, we will only decode or encode to void
- */
-const ForceVoid: S.Schema<void> = S.transform(S.Any, S.Void, { decode: () => void 0, encode: () => void 0 })
-
-export const makeRpcClient = <
-  RequestConfig extends object,
-  RequestContextMap extends Record<string, RPCContextMap.Any>,
-  GeneralErrors extends S.Schema.All = never
->(
-  errors: { [K in keyof RequestContextMap]: RequestContextMap[K]["error"] },
-  generalErrors?: GeneralErrors
-) => {
-  // Long way around Context/C extends etc to support actual jsdoc from passed in RequestConfig etc... (??)
-  type Context = {
-    success: S.Schema.Any | S.Struct.Fields // SchemaOrFields will make a Schema type out of Struct.Fields
-    failure: S.Schema.Any | S.Struct.Fields // SchemaOrFields will make a Schema type out of Struct.Fields
-  }
-
-  function TaggedRequest<Self>(): {
-    <Tag extends string, Payload extends S.Struct.Fields, C extends Context>(
-      tag: Tag,
-      fields: Payload,
-      config: RequestConfig & C
-    ):
-      & S.TaggedRequestClass<
-        Self,
-        Tag,
-        { readonly _tag: S.tag<Tag> } & Payload,
-        SchemaOrFields<typeof config["success"]>,
-        JoinSchema<
-          [SchemaOrFields<typeof config["failure"]> | GetEffectError<RequestContextMap, C> | GeneralErrors]
-        >
-      >
-      & { config: Omit<C, "success" | "failure"> }
-    <Tag extends string, Payload extends S.Struct.Fields, C extends Pick<Context, "success">>(
-      tag: Tag,
-      fields: Payload,
-      config: RequestConfig & C
-    ):
-      & S.TaggedRequestClass<
-        Self,
-        Tag,
-        { readonly _tag: S.tag<Tag> } & Payload,
-        SchemaOrFields<typeof config["success"]>,
-        JoinSchema<[GetEffectError<RequestContextMap, C> | GeneralErrors]>
-      >
-      & { config: Omit<C, "success" | "failure"> }
-    <Tag extends string, Payload extends S.Struct.Fields, C extends Pick<Context, "failure">>(
-      tag: Tag,
-      fields: Payload,
-      config: RequestConfig & C
-    ):
-      & S.TaggedRequestClass<
-        Self,
-        Tag,
-        { readonly _tag: S.tag<Tag> } & Payload,
-        typeof S.Void,
-        JoinSchema<
-          [SchemaOrFields<typeof config["failure"]> | GetEffectError<RequestContextMap, C> | GeneralErrors]
-        >
-      >
-      & { config: Omit<C, "success" | "failure"> }
-    <Tag extends string, Payload extends S.Struct.Fields, C extends Record<string, any>>(
-      tag: Tag,
-      fields: Payload,
-      config: C & RequestConfig
-    ):
-      & S.TaggedRequestClass<
-        Self,
-        Tag,
-        { readonly _tag: S.tag<Tag> } & Payload,
-        typeof S.Void,
-        JoinSchema<[GetEffectError<RequestContextMap, C> | GeneralErrors]>
-      >
-      & { config: Omit<C, "success" | "failure"> }
-    <Tag extends string, Payload extends S.Struct.Fields>(
-      tag: Tag,
-      fields: Payload
-    ):
-      & S.TaggedRequestClass<
-        Self,
-        Tag,
-        { readonly _tag: S.tag<Tag> } & Payload,
-        typeof S.Void,
-        GeneralErrors extends never ? typeof S.Never : GeneralErrors
-      >
-      // eslint-disable-next-line @typescript-eslint/no-empty-object-type
-      & { config: {} }
-  } {
-    // TODO: filter errors based on config + take care of inversion
-    const errorSchemas = Object.values(errors)
-    return (<Tag extends string, Fields extends S.Struct.Fields, C extends Context>(
-      tag: Tag,
-      fields: Fields,
-      config?: C
-    ) => {
-      // S.TaggedRequest is a factory function that creates a TaggedRequest class
-      const req = S.TaggedRequest<Self>()(tag, {
-        payload: fields,
-        // ensure both failure and success are schemas
-        failure: merge(
-          config?.failure ? S.isSchema(config.failure) ? config.failure : S.Struct(config.failure) : undefined,
-          [...errorSchemas, generalErrors].filter(Boolean)
-        ),
-        success: config?.success
-          ? S.isSchema(config.success)
-            ? S.AST.isVoidKeyword(config.success.ast) ? ForceVoid : config.success
-            : S.Struct(config.success)
-          : ForceVoid
-      })
-      return class extends (Object.assign(req, { config }) as any) {
-        constructor(payload: any, disableValidation: any = true) {
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-          super(payload, disableValidation)
-        }
-      }
-    }) as any
-  }
-
-  return {
-    TaggedRequest
-  }
-}

package/src/rpc/RpcMiddlewareX.ts

@@ -1,65 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { type Effect, Layer, type NonEmptyReadonlyArray, Unify } from "effect-app"
-import { type TagUnify, type TagUnifyIgnore } from "effect/Context"
-import { type Service } from "effect/Effect"
-import { type RpcMiddlewareDynamicWrap, type RpcMiddlewareWrap, type RpcOptionsDynamic, type RpcOptionsOriginal, Tag, type TagClass } from "./RpcMiddleware.js"
-
-/**
- * @deprecated - RPC groups are defined centrally and re-used between server and client,
- * so layer implementation details should not be mixed.
- */
-export const TagService = <
-  Self,
-  Config extends {
-    requires?: any
-    provides?: any
-  } = { requires: never; provides: never }
->() =>
-<
-  const Name extends string,
-  const Options extends RpcOptionsOriginal | RpcOptionsDynamic<any, any>
->(
-  id: Name,
-  options?: Options | undefined
-) =>
-<
-  LayerOpts extends {
-    effect: Effect.Effect<
-      Options extends RpcOptionsDynamic<any, any> ? RpcMiddlewareDynamicWrap<
-          TagClass.FailureService<Options>,
-          "requires" extends keyof Config ? Config["requires"] : never,
-          { [K in Options["dynamic"]["key"]]?: Options["dynamic"]["settings"]["contextActivation"] }
-        >
-        : RpcMiddlewareWrap<
-          "provides" extends keyof Config ? Config["provides"] : never,
-          TagClass.Failure<Options>,
-          "requires" extends keyof Config ? Config["requires"] : never
-        >,
-      any,
-      any
-    >
-    dependencies?: NonEmptyReadonlyArray<Layer.Layer.Any>
-  }
->(opts: LayerOpts): TagClass<Self, Name, Options, Config> & {
-  Default: Layer.Layer<
-    Self,
-    | (LayerOpts extends { effect: Effect<infer _A, infer _E, infer _R> } ? _E
-      : never)
-    | Service.MakeDepsE<LayerOpts>,
-    | Exclude<
-      LayerOpts extends { effect: Effect<infer _A, infer _E, infer _R> } ? _R : never,
-      Service.MakeDepsOut<LayerOpts>
-    >
-    | Service.MakeDepsIn<LayerOpts>
-  >
-} =>
-  class extends Tag<Self>()(id, options as any) {
-    static readonly Default = Layer.scoped(this, opts.effect as any).pipe(
-      Layer.provide([Layer.empty, ...opts.dependencies ?? []])
-    )
-    static override [Unify.typeSymbol]?: unknown
-    static override [Unify.unifySymbol]?: TagUnify<typeof this>
-    static override [Unify.ignoreSymbol]?: TagUnifyIgnore
-  } as any

package/src/rpc/generic-middleware.ts

@@ -1,128 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { type RpcMiddleware } from "@effect/rpc"
-import { Context, Effect, type Layer, type NonEmptyReadonlyArray, type S } from "effect-app"
-import { type GetContextConfig, type RPCContextMap } from "effect-app/client"
-import { type Tag } from "effect/Context"
-import { type Simplify } from "effect/Types"
-import { PreludeLogger } from "../logger.js"
-import { type MakeTags, type MiddlewareMakerId } from "./middleware-api.js"
-import { type RpcMiddlewareWrap, type TagClassAny } from "./RpcMiddleware.js"
-
-// Effect rpc middleware does not support changing payload or headers, but we do..
-
-export interface MiddlewareMaker<
-  RequestContextMap extends Record<string, RPCContextMap.Any>,
-  MiddlewareProviders extends ReadonlyArray<MiddlewareMaker.Any>
-> extends
-  RpcMiddleware.TagClass<
-    MiddlewareMakerId,
-    "MiddlewareMaker",
-    Simplify<
-      & { readonly wrap: true }
-      & (Exclude<
-        MiddlewareMaker.ManyRequired<MiddlewareProviders>,
-        MiddlewareMaker.ManyProvided<MiddlewareProviders>
-      > extends never ? {} : {
-        readonly requires: MakeTags<
-          Exclude<
-            MiddlewareMaker.ManyRequired<MiddlewareProviders>,
-            MiddlewareMaker.ManyProvided<MiddlewareProviders>
-          >
-        >
-      })
-      & (MiddlewareMaker.ManyErrors<MiddlewareProviders> extends never ? {}
-        : {
-          readonly failure: S.Schema<MiddlewareMaker.ManyErrors<MiddlewareProviders>>
-        })
-      & (MiddlewareMaker.ManyProvided<MiddlewareProviders> extends never ? {}
-        : { readonly provides: MakeTags<MiddlewareMaker.ManyProvided<MiddlewareProviders>> })
-    >
-  >
-{
-  readonly layer: Layer.Layer<MiddlewareMakerId, never, Tag.Identifier<MiddlewareProviders[number]>>
-  readonly requestContext: RequestContextTag<RequestContextMap>
-  readonly requestContextMap: RequestContextMap
-}
-
-export interface RequestContextTag<RequestContextMap extends Record<string, RPCContextMap.Any>>
-  extends Context.Tag<"RequestContextConfig", GetContextConfig<RequestContextMap>>
-{}
-
-export namespace MiddlewareMaker {
-  export type Any = TagClassAny
-
-  export type ApplyServices<A extends TagClassAny, R> = Exclude<R, Provided<A>> | Required<A>
-
-  export type ApplyManyServices<A extends NonEmptyReadonlyArray<TagClassAny>, R> =
-    | Exclude<R, { [K in keyof A]: Provided<A[K]> }[number]>
-    | { [K in keyof A]: Required<A[K]> }[number]
-
-  export type ManyProvided<A extends ReadonlyArray<TagClassAny>> = A extends NonEmptyReadonlyArray<TagClassAny>
-    ? { [K in keyof A]: Provided<A[K]> }[number]
-    : Provided<A[number]>
-  export type ManyRequired<A extends ReadonlyArray<TagClassAny>> = A extends NonEmptyReadonlyArray<TagClassAny>
-    ? { [K in keyof A]: Required<A[K]> }[number]
-    : Required<A[number]>
-  export type ManyErrors<A extends ReadonlyArray<TagClassAny>> = A extends NonEmptyReadonlyArray<TagClassAny>
-    ? { [K in keyof A]: Errors<A[K]> }[number]
-    : Errors<A[number]>
-
-  export type Provided<T> = T extends TagClassAny ? T extends { provides: infer _P } ? _P
-    : never
-    : never
-
-  export type Errors<T> = T extends TagClassAny ? T extends { failure: S.Schema.Any } ? S.Schema.Type<T["failure"]>
-    : never
-    : never
-
-  export type Required<T> = T extends TagClassAny ? T extends { requires: infer _R } ? _R
-    : never
-    : never
-}
-
-export const middlewareMaker = <
-  MiddlewareProviders extends ReadonlyArray<MiddlewareMaker.Any>
->(middlewares: MiddlewareProviders): Effect.Effect<
-  RpcMiddlewareWrap<
-    MiddlewareMaker.ManyProvided<MiddlewareProviders>,
-    MiddlewareMaker.ManyErrors<MiddlewareProviders>,
-    Exclude<
-      MiddlewareMaker.ManyRequired<MiddlewareProviders>,
-      MiddlewareMaker.ManyProvided<MiddlewareProviders>
-    > extends never ? never
-      : Exclude<MiddlewareMaker.ManyRequired<MiddlewareProviders>, MiddlewareMaker.ManyProvided<MiddlewareProviders>>
-  >
-> => {
-  // we want to run them in reverse order because latter middlewares will provide context to former ones
-  middlewares = middlewares.toReversed() as any
-
-  return Effect.gen(function*() {
-    const context = yield* Effect.context()
-
-    // returns a Effect/RpcMiddlewareWrap with Scope in requirements
-    return (
-      _options: Parameters<
-        RpcMiddleware.RpcMiddlewareWrap<
-          MiddlewareMaker.ManyProvided<MiddlewareProviders>,
-          never
-        >
-      >[0]
-    ) => {
-      const { next, ...options } = _options
-      // we start with the actual handler
-      let handler = next
-
-      // inspired from Effect/RpcMiddleware
-      for (const tag of middlewares) {
-        // use the tag to get the middleware from context
-        const middleware = Context.unsafeGet(context, tag)
-
-        // wrap the current handler, allowing the middleware to run before and after it
-        handler = PreludeLogger.logDebug("Applying middleware wrap " + tag.key).pipe(
-          Effect.zipRight(middleware(handler, options))
-        ) as any
-      }
-      return handler
-    }
-  }) as any
-}

package/wallaby.cjs

@@ -1 +0,0 @@
-module.exports = require("../../wallaby.base.cjs")