@effect-app/infra 2.87.0 → 2.87.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/dist/api/routing/middleware/middleware-api.d.ts +1 -17
  3. package/dist/api/routing/middleware/middleware-api.d.ts.map +1 -1
  4. package/dist/api/routing/middleware/middleware-api.js +1 -1
  5. package/dist/api/routing.d.ts +28 -22
  6. package/dist/api/routing.d.ts.map +1 -1
  7. package/dist/api/routing.js +1 -1
  8. package/package.json +1 -1
  9. package/src/api/routing/middleware/middleware-api.ts +14 -35
  10. package/src/api/routing.ts +50 -35
  11. package/test/controller.test.ts +1 -14
  12. package/test/dist/controller.test.d.ts.map +1 -1
  13. package/test/dist/fixtures.d.ts +2 -2
  14. package/test/layerUtils.test.ts +3 -0
package/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # @effect-app/infra
2
2
 
3
+ ## 2.87.2
4
+
5
+ ### Patch Changes
6
+
7
+ - 6d43e93: fix Router empty dependencies support
8
+
9
+ ## 2.87.1
10
+
11
+ ### Patch Changes
12
+
13
+ - remove debug
14
+
3
15
  ## 2.87.0
4
16
 
5
17
  ### Minor Changes
package/dist/api/routing/middleware/middleware-api.d.ts CHANGED
@@ -1,6 +1,5 @@
1
1
  import { Context, Layer, type NonEmptyArray, type NonEmptyReadonlyArray } from "effect-app";
2
2
  import { type RPCContextMap } from "effect-app/client";
3
- import { type Simplify } from "effect-app/Types";
4
3
  import { type LayerUtils } from "../../layerUtils.js";
5
4
  import { type GenericMiddlewareMaker } from "./generic-middleware.js";
6
5
  import { type MiddlewareMakerId, type RPCHandlerFactory } from "./RouterMiddleware.js";
@@ -35,22 +34,7 @@ export interface MiddlewareDynamic<RequestContext extends Record<string, RPCCont
35
34
  ...MW
36
35
  ], DynamicMiddlewareProviders, GenericMiddlewareMaker.ApplyManyServices<MW, MiddlewareR>>;
37
36
  }
38
- type DynamicMiddlewareMakerrsss<RequestContext extends Record<string, RPCContextMap.Any>, Provided extends keyof RequestContext = never, Middlewares extends ReadonlyArray<GenericMiddlewareMaker> = [], DynamicMiddlewareProviders = unknown, MiddlewareR = never> = keyof Omit<RequestContext, Provided> extends never ? [MiddlewareR] extends [never] ? {
39
- MiddlewareR: MiddlewareR;
40
- Provided: Provided;
41
- Middlewares: Middlewares;
42
- DynamicMiddlewareProviders: Simplify<DynamicMiddlewareProviders>;
43
- } & ReturnType<typeof makeMiddlewareBasic<RequestContext, Middlewares>> & MiddlewareM<RequestContext, Provided, Middlewares, DynamicMiddlewareProviders, MiddlewareR> : {
44
- MiddlewareR: MiddlewareR;
45
- Provided: Provided;
46
- Middlewares: Middlewares;
47
- DynamicMiddlewareProviders: Simplify<DynamicMiddlewareProviders>;
48
- } & MiddlewareM<RequestContext, Provided, Middlewares, DynamicMiddlewareProviders, MiddlewareR> : {
49
- MiddlewareR: MiddlewareR;
50
- Provided: Provided;
51
- Middlewares: Middlewares;
52
- DynamicMiddlewareProviders: Simplify<DynamicMiddlewareProviders>;
53
- } & MiddlewareDynamic<RequestContext, Provided, Middlewares, DynamicMiddlewareProviders, MiddlewareR>;
37
+ type DynamicMiddlewareMakerrsss<RequestContext extends Record<string, RPCContextMap.Any>, Provided extends keyof RequestContext = never, Middlewares extends ReadonlyArray<GenericMiddlewareMaker> = [], DynamicMiddlewareProviders = unknown, MiddlewareR = never> = keyof Omit<RequestContext, Provided> extends never ? [MiddlewareR] extends [never] ? ReturnType<typeof makeMiddlewareBasic<RequestContext, Middlewares>> & MiddlewareM<RequestContext, Provided, Middlewares, DynamicMiddlewareProviders, MiddlewareR> : MiddlewareM<RequestContext, Provided, Middlewares, DynamicMiddlewareProviders, MiddlewareR> : MiddlewareDynamic<RequestContext, Provided, Middlewares, DynamicMiddlewareProviders, MiddlewareR>;
54
38
  export declare const makeMiddleware: <RequestContextMap extends Record<string, RPCContextMap.Any>>() => DynamicMiddlewareMakerrsss<RequestContextMap>;
55
39
  export declare const makeMiddlewareBasic: <RequestContextMap extends Record<string, RPCContextMap.Any>, GenericMiddlewareProviders extends ReadonlyArray<GenericMiddlewareMaker>>(...make: GenericMiddlewareProviders) => Context.Tag<MiddlewareMakerId, {
56
40
  effect: RPCHandlerFactory<RequestContextMap, GenericMiddlewareMaker.Provided<GenericMiddlewareProviders[number]>>;
package/dist/api/routing/middleware/middleware-api.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"middleware-api.d.ts","sourceRoot":"","sources":["../../../../src/api/routing/middleware/middleware-api.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"middleware-api.d.ts","sourceRoot":"","sources":["../../../../src/api/routing/middleware/middleware-api.ts"],"names":[],"mappings":"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"}
package/dist/api/routing/middleware/middleware-api.js CHANGED
@@ -55,4 +55,4 @@ export const makeMiddlewareBasic =
55
55
  .pipe(Layer.provide(middlewares.dependencies));
56
56
  return Object.assign(MiddlewareMaker, { Default: middlewareLayer });
57
57
  };
58
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZS1hcGkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvYXBpL3JvdXRpbmcvbWlkZGxld2FyZS9taWRkbGV3YXJlLWFwaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sYUFBYSxDQUFBO0FBQ2pDLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBa0QsTUFBTSxZQUFZLENBQUE7QUFJbkcsT0FBTyxFQUErQixzQkFBc0IsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBQzdGLE9BQU8sRUFBRSxhQUFhLEVBQWtELE1BQU0sdUJBQXVCLENBQUE7QUFHckcsa0RBQWtEO0FBQ2xELHlIQUF5SDtBQUN6SCxNQUFNLENBQUMsTUFBTSxVQUFVLEdBQ3JCLEdBQWdFLEVBQUUsQ0FDbEUsQ0FBb0MsQ0FBSSxFQUFFLE9BQXdDLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDdEYsR0FBRyxFQUFFLENBQUM7SUFDTixRQUFRLEVBQUUsRUFBRSxPQUFPLEVBQXdDO0NBQzVELENBQUMsQ0FBQTtBQW9ISixNQUFNLENBQUMsTUFBTSxjQUFjLEdBRTRCLEdBQUcsRUFBRTtJQUMxRCxJQUFJLGFBQWEsR0FBNkIsRUFBRSxDQUFBO0lBQ2hELE1BQU0sRUFBRSxHQUFHO1FBQ1QsVUFBVSxFQUFFLENBQUMsR0FBRyxXQUFrQixFQUFFLEVBQUU7WUFDcEMsS0FBSyxNQUFNLEVBQUUsSUFBSSxXQUFXLEVBQUUsQ0FBQztnQkFDN0IsYUFBYSxHQUFHLENBQUMsRUFBRSxFQUFFLEdBQUcsYUFBYSxDQUFDLENBQUE7WUFDeEMsQ0FBQztZQUNELG1FQUFtRTtZQUNuRSxPQUFPLE1BQU0sQ0FBQyxNQUFNLENBQUMsbUJBQW1CLENBQVcsR0FBRyxhQUFhLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQTtRQUMzRSxDQUFDO0tBQ0YsQ0FBQTtJQUNELE9BQU8sRUFBUyxDQUFBO0FBQ2xCLENBQUMsQ0FBQTtBQUVELE1BQU0sQ0FBQyxNQUFNLG1CQUFtQjtBQUM5QixxR0FBcUc7QUFDckcsQ0FLRSxHQUFHLElBQWdDLEVBQ25DLEVBQUU7SUFDRixNQUFNLGVBQWUsR0FBRyxPQUFPLENBQUMsVUFBVSxDQVV4QyxpQkFBaUIsQ0FDbEIsQ0FBQTtJQUVELE1BQU0sV0FBVyxHQUFHLHNCQUFzQixDQUFDLEdBQUcsSUFBSSxDQUFDLENBQUE7SUFFbkQsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDLE1BQU0sQ0FDcEIsZUFBZSxFQUNmLFdBQVc7U0FDUixNQUFNO1NBQ04sSUFBSSxDQUNILE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDdkIsSUFBSSxFQUFFLGlCQUEwQjtRQUNoQyxNQUFNLEVBQUUsYUFBYSxFQUdsQixDQUNELENBQUMsTUFBTSxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsRUFBRTtZQUMzQixPQUFPLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxFQUFFLENBQzFCLE1BQU07aUJBQ0gsR0FBRyxDQUFDLFFBQVEsQ0FBQztnQkFDWixNQUFNLEtBQUssR0FBRztvQkFDWixNQUFNLEVBQUUsTUFBTSxDQUFDLE1BQU0sSUFBSSxFQUFFO29CQUMzQixPQUFPO29CQUNQLE9BQU87b0JBQ1AsUUFBUSxFQUFFLENBQUMsRUFBRSxrREFBa0Q7b0JBQy9ELEdBQUcsRUFBRTt3QkFDSCxHQUFHLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxNQUFhLENBQUM7d0JBQ3ZDLEdBQUcsRUFBRSxHQUFHLFVBQVUsSUFBSSxPQUFPLENBQUMsSUFBSSxFQUFFO3dCQUNwQyxJQUFJLEVBQUUsR0FBRyxVQUFVLElBQUksT0FBTyxDQUFDLElBQUksRUFBRTtxQkFDdEM7aUJBQ0YsQ0FBQTtnQkFDRCxPQUFPLEtBQUssQ0FBQyxDQUFDLE9BQU8sQ0FBQztvQkFDcEIsR0FBRyxLQUFLO29CQUNSLElBQUksRUFBRSxJQUFJLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBUTtpQkFDcEMsQ0FBQyxDQUFBO1lBQ0osQ0FBQyxDQUFRLENBQUEsQ0FBQyxPQUFPO1FBQ3ZCLENBQUMsQ0FDRjtLQUNGLENBQUMsQ0FBQyxDQUNKLENBQ0osQ0FBQTtJQUVELE1BQU0sZUFBZSxHQUFHLENBQUM7U0FDdEIsSUFBSSxDQUNILEtBQUssQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLFlBQW1CLENBQUMsQ0FLL0MsQ0FBQTtJQUVILE9BQU8sTUFBTSxDQUFDLE1BQU0sQ0FBQyxlQUFlLEVBQUUsRUFBRSxPQUFPLEVBQUUsZUFBZSxFQUFFLENBQUMsQ0FBQTtBQUNyRSxDQUFDLENBQUEifQ==
58
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZS1hcGkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvYXBpL3JvdXRpbmcvbWlkZGxld2FyZS9taWRkbGV3YXJlLWFwaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sYUFBYSxDQUFBO0FBQ2pDLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBa0QsTUFBTSxZQUFZLENBQUE7QUFHbkcsT0FBTyxFQUErQixzQkFBc0IsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBQzdGLE9BQU8sRUFBRSxhQUFhLEVBQWtELE1BQU0sdUJBQXVCLENBQUE7QUFHckcsa0RBQWtEO0FBQ2xELHlIQUF5SDtBQUN6SCxNQUFNLENBQUMsTUFBTSxVQUFVLEdBQ3JCLEdBQWdFLEVBQUUsQ0FDbEUsQ0FBb0MsQ0FBSSxFQUFFLE9BQXdDLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDdEYsR0FBRyxFQUFFLENBQUM7SUFDTixRQUFRLEVBQUUsRUFBRSxPQUFPLEVBQXdDO0NBQzVELENBQUMsQ0FBQTtBQWdHSixNQUFNLENBQUMsTUFBTSxjQUFjLEdBRTRCLEdBQUcsRUFBRTtJQUMxRCxJQUFJLGFBQWEsR0FBNkIsRUFBRSxDQUFBO0lBQ2hELE1BQU0sRUFBRSxHQUFHO1FBQ1QsVUFBVSxFQUFFLENBQUMsR0FBRyxXQUFrQixFQUFFLEVBQUU7WUFDcEMsS0FBSyxNQUFNLEVBQUUsSUFBSSxXQUFXLEVBQUUsQ0FBQztnQkFDN0IsYUFBYSxHQUFHLENBQUMsRUFBRSxFQUFFLEdBQUcsYUFBYSxDQUFDLENBQUE7WUFDeEMsQ0FBQztZQUNELG1FQUFtRTtZQUNuRSxPQUFPLE1BQU0sQ0FBQyxNQUFNLENBQUMsbUJBQW1CLENBQVcsR0FBRyxhQUFhLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQTtRQUMzRSxDQUFDO0tBQ0YsQ0FBQTtJQUNELE9BQU8sRUFBUyxDQUFBO0FBQ2xCLENBQUMsQ0FBQTtBQUVELE1BQU0sQ0FBQyxNQUFNLG1CQUFtQjtBQUM5QixxR0FBcUc7QUFDckcsQ0FLRSxHQUFHLElBQWdDLEVBQ25DLEVBQUU7SUFDRixNQUFNLGVBQWUsR0FBRyxPQUFPLENBQUMsVUFBVSxDQVV4QyxpQkFBaUIsQ0FDbEIsQ0FBQTtJQUVELE1BQU0sV0FBVyxHQUFHLHNCQUFzQixDQUFDLEdBQUcsSUFBSSxDQUFDLENBQUE7SUFFbkQsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDLE1BQU0sQ0FDcEIsZUFBZSxFQUNmLFdBQVc7U0FDUixNQUFNO1NBQ04sSUFBSSxDQUNILE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDdkIsSUFBSSxFQUFFLGlCQUEwQjtRQUNoQyxNQUFNLEVBQUUsYUFBYSxFQUdsQixDQUNELENBQUMsTUFBTSxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsRUFBRTtZQUMzQixPQUFPLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxFQUFFLENBQzFCLE1BQU07aUJBQ0gsR0FBRyxDQUFDLFFBQVEsQ0FBQztnQkFDWixNQUFNLEtBQUssR0FBRztvQkFDWixNQUFNLEVBQUUsTUFBTSxDQUFDLE1BQU0sSUFBSSxFQUFFO29CQUMzQixPQUFPO29CQUNQLE9BQU87b0JBQ1AsUUFBUSxFQUFFLENBQUMsRUFBRSxrREFBa0Q7b0JBQy9ELEdBQUcsRUFBRTt3QkFDSCxHQUFHLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxNQUFhLENBQUM7d0JBQ3ZDLEdBQUcsRUFBRSxHQUFHLFVBQVUsSUFBSSxPQUFPLENBQUMsSUFBSSxFQUFFO3dCQUNwQyxJQUFJLEVBQUUsR0FBRyxVQUFVLElBQUksT0FBTyxDQUFDLElBQUksRUFBRTtxQkFDdEM7aUJBQ0YsQ0FBQTtnQkFDRCxPQUFPLEtBQUssQ0FBQyxDQUFDLE9BQU8sQ0FBQztvQkFDcEIsR0FBRyxLQUFLO29CQUNSLElBQUksRUFBRSxJQUFJLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBUTtpQkFDcEMsQ0FBQyxDQUFBO1lBQ0osQ0FBQyxDQUFRLENBQUEsQ0FBQyxPQUFPO1FBQ3ZCLENBQUMsQ0FDRjtLQUNGLENBQUMsQ0FBQyxDQUNKLENBQ0osQ0FBQTtJQUVELE1BQU0sZUFBZSxHQUFHLENBQUM7U0FDdEIsSUFBSSxDQUNILEtBQUssQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLFlBQW1CLENBQUMsQ0FLL0MsQ0FBQTtJQUVILE9BQU8sTUFBTSxDQUFDLE1BQU0sQ0FBQyxlQUFlLEVBQUUsRUFBRSxPQUFPLEVBQUUsZUFBZSxFQUFFLENBQUMsQ0FBQTtBQUNyRSxDQUFDLENBQUEifQ==
package/dist/api/routing.d.ts CHANGED
@@ -1,9 +1,9 @@
1
1
  import { type Array, Effect, Layer, S, type Scope } from "effect-app";
2
2
  import type { GetEffectContext, RPCContextMap } from "effect-app/client/req";
3
3
  import { type HttpHeaders, HttpRouter } from "effect-app/http";
4
+ import { type Service } from "effect/Effect";
4
5
  import type { Contravariant } from "effect/Types";
5
6
  import { type YieldWrap } from "effect/Utils";
6
- import { type LayerUtils } from "./layerUtils.js";
7
7
  import { type RouterMiddleware } from "./routing/middleware.js";
8
8
  export * from "./routing/middleware.js";
9
9
  export type AnyRequestModule = S.Schema.Any & {
@@ -207,7 +207,7 @@ export declare const makeRouter: <RequestContextMap extends Record<string, RPCCo
207
207
  };
208
208
  }) => {
209
209
  <const Make extends {
210
- dependencies: Array<Layer.Layer.Any>;
210
+ dependencies?: Array<Layer.Layer.Any>;
211
211
  effect: (match: <const Impl extends { [K in keyof FilterRequestModules<Resource_1>]: ({
212
212
  raw: (req: S.Schema.Type<Resource_1[K]>) => Generator<YieldWrap<Effect<any, S.ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, Resource_1[K]["config"]>>>, S.Schema.Encoded<GetSuccess<Resource_1[K]>>, never>;
213
213
  } | {
@@ -218,70 +218,74 @@ export declare const makeRouter: <RequestContextMap extends Record<string, RPCCo
218
218
  raw: any;
219
219
  } ? RequestTypes.TYPE : RequestTypes.DECODED, Exclude<Exclude<Impl[K] extends {
220
220
  raw: any;
221
- } ? Impl[K]["raw"] extends (...args: any[]) => Effect<any, any, infer R> ? R : Impl[K]["raw"] extends Effect<any, any, infer R> ? R : Impl[K]["raw"] extends (...args: any[]) => Generator<YieldWrap<Effect<any, any, infer R>>, any, any> ? R : never : Impl[K] extends (...args: any[]) => Effect<any, any, infer R> ? R : Impl[K] extends Effect<any, any, infer R> ? R : Impl[K] extends (...args: any[]) => Generator<YieldWrap<Effect<any, any, infer R>>, any, any> ? R : never, GetEffectContext<RequestContextMap, Resource_1[K]["config"]> | ContextProviderA>, Scope.Scope>>; }) => Generator<YieldWrap<Effect<any, any, Make["strict"] extends false ? any : LayerUtils.GetLayersSuccess<Make["dependencies"]>>>, { [K in keyof FilterRequestModules<Resource_1>]: AnyHandler<Resource_1[K]>; }, any>;
221
+ } ? Impl[K]["raw"] extends (...args: any[]) => Effect<any, any, infer R> ? R : Impl[K]["raw"] extends Effect<any, any, infer R> ? R : Impl[K]["raw"] extends (...args: any[]) => Generator<YieldWrap<Effect<any, any, infer R>>, any, any> ? R : never : Impl[K] extends (...args: any[]) => Effect<any, any, infer R> ? R : Impl[K] extends Effect<any, any, infer R> ? R : Impl[K] extends (...args: any[]) => Generator<YieldWrap<Effect<any, any, infer R>>, any, any> ? R : never, GetEffectContext<RequestContextMap, Resource_1[K]["config"]> | ContextProviderA>, Scope.Scope>>; }) => Generator<YieldWrap<Effect<any, any, Make["strict"] extends false ? any : Make extends {
222
+ dependencies: Array<Layer.Layer.Any>;
223
+ } ? MakeDepsOut<Make> : any>>, { [K in keyof FilterRequestModules<Resource_1>]: AnyHandler<Resource_1[K]>; }, any>;
222
224
  strict?: boolean;
223
225
  /** @deprecated */
224
226
  readonly ಠ_ಠ: never;
225
227
  }>(make: Make): {
226
228
  moduleName: ModuleName;
227
- routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | LayerUtils.GetLayersError<Make["dependencies"]> | Layer.Error<typeof middleware.Default>, LayerUtils.GetLayersContext<Make["dependencies"]> | Layer.Context<typeof middleware.Default> | Exclude<MakeContext<Make>, LayerUtils.GetLayersSuccess<Make["dependencies"]>>>;
229
+ routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | Service.MakeDepsE<Make> | Layer.Error<typeof middleware.Default>, Service.MakeDepsIn<Make> | Layer.Context<typeof middleware.Default> | Exclude<MakeContext<Make>, MakeDepsOut<Make>>>;
228
230
  make: Make;
229
231
  };
230
232
  <const Make extends {
231
- dependencies: Array<Layer.Layer.Any>;
232
- effect: Effect<{ [K in keyof FilterRequestModules<Resource_1>]: AnyHandler<Resource_1[K]>; }, any, Make["strict"] extends false ? any : LayerUtils.GetLayersSuccess<Make["dependencies"]>>;
233
+ dependencies?: Array<Layer.Layer.Any>;
234
+ effect: Effect<{ [K in keyof FilterRequestModules<Resource_1>]: AnyHandler<Resource_1[K]>; }, any, Make["strict"] extends false ? any : Make extends {
235
+ dependencies: Array<Layer.Layer.Any>;
236
+ } ? MakeDepsOut<Make> : any>;
233
237
  strict?: boolean;
234
238
  /** @deprecated */
235
239
  readonly ಠ_ಠ: never;
236
240
  }>(make: Make): {
237
241
  moduleName: ModuleName;
238
- routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | LayerUtils.GetLayersError<Make["dependencies"]> | Layer.Error<typeof middleware.Default>, LayerUtils.GetLayersContext<Make["dependencies"]> | Layer.Context<typeof middleware.Default> | Exclude<MakeContext<Make>, LayerUtils.GetLayersSuccess<Make["dependencies"]>>>;
242
+ routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | Service.MakeDepsE<Make> | Layer.Error<typeof middleware.Default>, Service.MakeDepsIn<Make> | Layer.Context<typeof middleware.Default> | Exclude<MakeContext<Make>, MakeDepsOut<Make>>>;
239
243
  make: Make;
240
244
  };
241
245
  <const Make extends {
242
- dependencies: Array<Layer.Layer.Any>;
243
- effect: Effect<{ [K in keyof FilterRequestModules<Resource_1>]: AnyHandler<Resource_1[K]>; }, any, Make["strict"] extends false ? any : LayerUtils.GetLayersSuccess<Make["dependencies"]>>;
246
+ dependencies?: Array<Layer.Layer.Any>;
247
+ effect: Effect<{ [K in keyof FilterRequestModules<Resource_1>]: AnyHandler<Resource_1[K]>; }, any, Make["strict"] extends false ? any : MakeDepsOut<Make>>;
244
248
  strict?: boolean;
245
249
  /** @deprecated */
246
250
  readonly ಠ_ಠ: never;
247
251
  }>(make: Make): {
248
252
  moduleName: ModuleName;
249
- routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | LayerUtils.GetLayersError<Make["dependencies"]> | Layer.Error<typeof middleware.Default>, LayerUtils.GetLayersContext<Make["dependencies"]> | Layer.Context<typeof middleware.Default> | Exclude<MakeContext<Make>, LayerUtils.GetLayersSuccess<Make["dependencies"]>>>;
253
+ routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | Service.MakeDepsE<Make> | Layer.Error<typeof middleware.Default>, Service.MakeDepsIn<Make> | Layer.Context<typeof middleware.Default> | Exclude<MakeContext<Make>, MakeDepsOut<Make>>>;
250
254
  make: Make;
251
255
  };
252
256
  <const Make extends {
253
- dependencies: Array<Layer.Layer.Any>;
254
- effect: Effect<{ [K in keyof FilterRequestModules<Resource_1>]: AnyHandler<Resource_1[K]>; }, any, Make["strict"] extends false ? any : LayerUtils.GetLayersSuccess<Make["dependencies"]>>;
257
+ dependencies?: Array<Layer.Layer.Any>;
258
+ effect: Effect<{ [K in keyof FilterRequestModules<Resource_1>]: AnyHandler<Resource_1[K]>; }, any, Make["strict"] extends false ? any : MakeDepsOut<Make>>;
255
259
  strict?: boolean;
256
260
  /** @deprecated */
257
261
  readonly ಠ_ಠ: never;
258
262
  }>(make: Make): {
259
263
  moduleName: ModuleName;
260
- routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | LayerUtils.GetLayersError<Make["dependencies"]> | Layer.Error<typeof middleware.Default>, LayerUtils.GetLayersContext<Make["dependencies"]> | Layer.Context<typeof middleware.Default> | Exclude<MakeContext<Make>, LayerUtils.GetLayersSuccess<Make["dependencies"]>>>;
264
+ routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | Service.MakeDepsE<Make> | Layer.Error<typeof middleware.Default>, Service.MakeDepsIn<Make> | Layer.Context<typeof middleware.Default> | Exclude<MakeContext<Make>, MakeDepsOut<Make>>>;
261
265
  make: Make;
262
266
  };
263
267
  <const Make extends {
264
- dependencies: Array<Layer.Layer.Any>;
265
- effect: Effect<{ [K in keyof FilterRequestModules<Resource_1>]: AnyHandler<Resource_1[K]>; }, any, LayerUtils.GetLayersSuccess<Make["dependencies"]>>;
268
+ dependencies?: Array<Layer.Layer.Any>;
269
+ effect: Effect<{ [K in keyof FilterRequestModules<Resource_1>]: AnyHandler<Resource_1[K]>; }, any, MakeDepsOut<Make>>;
266
270
  strict?: boolean;
267
271
  /** @deprecated */
268
272
  readonly ಠ_ಠ: never;
269
273
  }>(make: Make): {
270
274
  moduleName: ModuleName;
271
- routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | LayerUtils.GetLayersError<Make["dependencies"]> | Layer.Error<typeof middleware.Default>, LayerUtils.GetLayersContext<Make["dependencies"]> | Layer.Context<typeof middleware.Default> | Exclude<MakeContext<Make>, LayerUtils.GetLayersSuccess<Make["dependencies"]>>>;
275
+ routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | Service.MakeDepsE<Make> | Layer.Error<typeof middleware.Default>, Service.MakeDepsIn<Make> | Layer.Context<typeof middleware.Default> | Exclude<MakeContext<Make>, MakeDepsOut<Make>>>;
272
276
  make: Make;
273
277
  };
274
278
  <const Make extends {
275
- dependencies: Array<Layer.Layer.Any>;
276
- effect: Effect<{ [K in keyof FilterRequestModules<Resource_1>]: AnyHandler<Resource_1[K]>; }, any, LayerUtils.GetLayersSuccess<Make["dependencies"]>>;
279
+ dependencies?: Array<Layer.Layer.Any>;
280
+ effect: Effect<{ [K in keyof FilterRequestModules<Resource_1>]: AnyHandler<Resource_1[K]>; }, any, MakeDepsOut<Make>>;
277
281
  strict?: boolean;
278
282
  }>(make: Make): {
279
283
  moduleName: ModuleName;
280
- routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | LayerUtils.GetLayersError<Make["dependencies"]> | Layer.Error<typeof middleware.Default>, LayerUtils.GetLayersContext<Make["dependencies"]> | Layer.Context<typeof middleware.Default> | Exclude<MakeContext<Make>, LayerUtils.GetLayersSuccess<Make["dependencies"]>>>;
284
+ routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | Service.MakeDepsE<Make> | Layer.Error<typeof middleware.Default>, Service.MakeDepsIn<Make> | Layer.Context<typeof middleware.Default> | Exclude<MakeContext<Make>, MakeDepsOut<Make>>>;
281
285
  make: Make;
282
286
  };
283
287
  <const Make extends {
284
- dependencies: Array<Layer.Layer.Any>;
288
+ dependencies?: Array<Layer.Layer.Any>;
285
289
  effect: (match: <const Impl extends { [K in keyof FilterRequestModules<Resource_1>]: ({
286
290
  raw: (req: S.Schema.Type<Resource_1[K]>) => Generator<YieldWrap<Effect<any, S.ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, Resource_1[K]["config"]>>>, S.Schema.Encoded<GetSuccess<Resource_1[K]>>, never>;
287
291
  } | {
@@ -292,11 +296,13 @@ export declare const makeRouter: <RequestContextMap extends Record<string, RPCCo
292
296
  raw: any;
293
297
  } ? RequestTypes.TYPE : RequestTypes.DECODED, Exclude<Exclude<Impl[K] extends {
294
298
  raw: any;
295
- } ? Impl[K]["raw"] extends (...args: any[]) => Effect<any, any, infer R> ? R : Impl[K]["raw"] extends Effect<any, any, infer R> ? R : Impl[K]["raw"] extends (...args: any[]) => Generator<YieldWrap<Effect<any, any, infer R>>, any, any> ? R : never : Impl[K] extends (...args: any[]) => Effect<any, any, infer R> ? R : Impl[K] extends Effect<any, any, infer R> ? R : Impl[K] extends (...args: any[]) => Generator<YieldWrap<Effect<any, any, infer R>>, any, any> ? R : never, GetEffectContext<RequestContextMap, Resource_1[K]["config"]> | ContextProviderA>, Scope.Scope>>; }) => Generator<YieldWrap<Effect<any, any, Make["strict"] extends false ? any : LayerUtils.GetLayersSuccess<Make["dependencies"]>>>, { [K in keyof FilterRequestModules<Resource_1>]: AnyHandler<Resource_1[K]>; }, any>;
299
+ } ? Impl[K]["raw"] extends (...args: any[]) => Effect<any, any, infer R> ? R : Impl[K]["raw"] extends Effect<any, any, infer R> ? R : Impl[K]["raw"] extends (...args: any[]) => Generator<YieldWrap<Effect<any, any, infer R>>, any, any> ? R : never : Impl[K] extends (...args: any[]) => Effect<any, any, infer R> ? R : Impl[K] extends Effect<any, any, infer R> ? R : Impl[K] extends (...args: any[]) => Generator<YieldWrap<Effect<any, any, infer R>>, any, any> ? R : never, GetEffectContext<RequestContextMap, Resource_1[K]["config"]> | ContextProviderA>, Scope.Scope>>; }) => Generator<YieldWrap<Effect<any, any, Make["strict"] extends false ? any : Make extends {
300
+ dependencies: Array<Layer.Layer.Any>;
301
+ } ? MakeDepsOut<Make> : any>>, { [K in keyof FilterRequestModules<Resource_1>]: AnyHandler<Resource_1[K]>; }, any>;
296
302
  strict?: boolean;
297
303
  }>(make: Make): {
298
304
  moduleName: ModuleName;
299
- routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | LayerUtils.GetLayersError<Make["dependencies"]> | Layer.Error<typeof middleware.Default>, LayerUtils.GetLayersContext<Make["dependencies"]> | Layer.Context<typeof middleware.Default> | Exclude<MakeContext<Make>, LayerUtils.GetLayersSuccess<Make["dependencies"]>>>;
305
+ routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | Service.MakeDepsE<Make> | Layer.Error<typeof middleware.Default>, Service.MakeDepsIn<Make> | Layer.Context<typeof middleware.Default> | Exclude<MakeContext<Make>, MakeDepsOut<Make>>>;
300
306
  make: Make;
301
307
  };
302
308
  <const Make extends {
package/dist/api/routing.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/api/routing.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/api/routing.ts"],"names":[],"mappings":"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"}
package/dist/api/routing.js CHANGED
@@ -171,4 +171,4 @@ export const makeRouter = (middleware, devMode) => {
171
171
  Router: matchFor
172
172
  };
173
173
  };
174
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../src/api/routing.ts"],"names":[],"mappings":"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"}
174
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../src/api/routing.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@effect-app/infra",
3
- "version": "2.87.0",
3
+ "version": "2.87.2",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "dependencies": {
package/src/api/routing/middleware/middleware-api.ts CHANGED
@@ -1,7 +1,6 @@
1
1
  import { Rpc } from "@effect/rpc"
2
2
  import { Context, Effect, Layer, type NonEmptyArray, type NonEmptyReadonlyArray } from "effect-app"
3
3
  import { type RPCContextMap } from "effect-app/client"
4
- import { type Simplify } from "effect-app/Types"
5
4
  import { type LayerUtils } from "../../layerUtils.js"
6
5
  import { type GenericMiddlewareMaker, genericMiddlewareMaker } from "./generic-middleware.js"
7
6
  import { makeRpcEffect, type MiddlewareMakerId, type RPCHandlerFactory } from "./RouterMiddleware.js"
@@ -82,12 +81,6 @@ type DynamicMiddlewareMakerrsss<
82
81
  DynamicMiddlewareProviders = unknown,
83
82
  MiddlewareR = never
84
83
  > = keyof Omit<RequestContext, Provided> extends never ? [MiddlewareR] extends [never] ?
85
- & {
86
- MiddlewareR: MiddlewareR
87
- Provided: Provided
88
- Middlewares: Middlewares
89
- DynamicMiddlewareProviders: Simplify<DynamicMiddlewareProviders>
90
- }
91
84
  & ReturnType<
92
85
  typeof makeMiddlewareBasic<
93
86
  RequestContext,
@@ -101,34 +94,20 @@ type DynamicMiddlewareMakerrsss<
101
94
  DynamicMiddlewareProviders,
102
95
  MiddlewareR
103
96
  >
104
- :
105
- & {
106
- MiddlewareR: MiddlewareR
107
- Provided: Provided
108
- Middlewares: Middlewares
109
- DynamicMiddlewareProviders: Simplify<DynamicMiddlewareProviders>
110
- }
111
- & MiddlewareM<
112
- RequestContext,
113
- Provided,
114
- Middlewares,
115
- DynamicMiddlewareProviders,
116
- MiddlewareR
117
- >
118
- :
119
- & {
120
- MiddlewareR: MiddlewareR
121
- Provided: Provided
122
- Middlewares: Middlewares
123
- DynamicMiddlewareProviders: Simplify<DynamicMiddlewareProviders>
124
- }
125
- & MiddlewareDynamic<
126
- RequestContext,
127
- Provided,
128
- Middlewares,
129
- DynamicMiddlewareProviders,
130
- MiddlewareR
131
- >
97
+ : MiddlewareM<
98
+ RequestContext,
99
+ Provided,
100
+ Middlewares,
101
+ DynamicMiddlewareProviders,
102
+ MiddlewareR
103
+ >
104
+ : MiddlewareDynamic<
105
+ RequestContext,
106
+ Provided,
107
+ Middlewares,
108
+ DynamicMiddlewareProviders,
109
+ MiddlewareR
110
+ >
132
111
 
133
112
  export const makeMiddleware: <
134
113
  RequestContextMap extends Record<string, RPCContextMap.Any>
package/src/api/routing.ts CHANGED
@@ -8,6 +8,7 @@ import { type Array, Effect, Layer, type NonEmptyReadonlyArray, Predicate, S, Sc
8
8
  import type { GetEffectContext, GetEffectError, RPCContextMap } from "effect-app/client/req"
9
9
  import { type HttpHeaders, HttpRouter } from "effect-app/http"
10
10
  import { typedKeysOf, typedValuesOf } from "effect-app/utils"
11
+ import { type Service } from "effect/Effect"
11
12
  import type { Contravariant } from "effect/Types"
12
13
  import { type YieldWrap } from "effect/Utils"
13
14
  import { type LayerUtils } from "./layerUtils.js"
@@ -493,10 +494,16 @@ export const makeRouter = <
493
494
  // Multiple times duplicated the "good" overload, so that errors will only mention the last overload when failing
494
495
  <
495
496
  const Make extends {
496
- dependencies: Array<Layer.Layer.Any>
497
+ dependencies?: Array<Layer.Layer.Any>
497
498
  effect: (match: typeof router3) => Generator<
498
499
  YieldWrap<
499
- Effect<any, any, Make["strict"] extends false ? any : LayerUtils.GetLayersSuccess<Make["dependencies"]>>
500
+ Effect<
501
+ any,
502
+ any,
503
+ Make["strict"] extends false ? any
504
+ : Make extends { dependencies: Array<Layer.Layer.Any> } ? MakeDepsOut<Make>
505
+ : any
506
+ >
500
507
  >,
501
508
  { [K in keyof FilterRequestModules<Resource>]: AnyHandler<Resource[K]> },
502
509
  any
@@ -514,13 +521,13 @@ export const makeRouter = <
514
521
  routes: Layer.Layer<
515
522
  RouterShape<Resource>,
516
523
  | MakeErrors<Make>
517
- | LayerUtils.GetLayersError<Make["dependencies"]>
524
+ | Service.MakeDepsE<Make>
518
525
  | Layer.Error<typeof middleware.Default>,
519
- | LayerUtils.GetLayersContext<Make["dependencies"]>
526
+ | Service.MakeDepsIn<Make>
520
527
  | Layer.Context<typeof middleware.Default>
521
528
  | Exclude<
522
529
  MakeContext<Make>,
523
- LayerUtils.GetLayersSuccess<Make["dependencies"]>
530
+ MakeDepsOut<Make>
524
531
  >
525
532
  >
526
533
 
@@ -529,11 +536,13 @@ export const makeRouter = <
529
536
  }
530
537
  <
531
538
  const Make extends {
532
- dependencies: Array<Layer.Layer.Any>
539
+ dependencies?: Array<Layer.Layer.Any>
533
540
  effect: Effect<
534
541
  { [K in keyof FilterRequestModules<Resource>]: AnyHandler<Resource[K]> },
535
542
  any,
536
- Make["strict"] extends false ? any : LayerUtils.GetLayersSuccess<Make["dependencies"]>
543
+ Make["strict"] extends false ? any
544
+ : Make extends { dependencies: Array<Layer.Layer.Any> } ? MakeDepsOut<Make>
545
+ : any
537
546
  >
538
547
  strict?: boolean
539
548
  /** @deprecated */
@@ -547,13 +556,13 @@ export const makeRouter = <
547
556
  routes: Layer.Layer<
548
557
  RouterShape<Resource>,
549
558
  | MakeErrors<Make>
550
- | LayerUtils.GetLayersError<Make["dependencies"]>
559
+ | Service.MakeDepsE<Make>
551
560
  | Layer.Error<typeof middleware.Default>,
552
- | LayerUtils.GetLayersContext<Make["dependencies"]>
561
+ | Service.MakeDepsIn<Make>
553
562
  | Layer.Context<typeof middleware.Default>
554
563
  | Exclude<
555
564
  MakeContext<Make>,
556
- LayerUtils.GetLayersSuccess<Make["dependencies"]>
565
+ MakeDepsOut<Make>
557
566
  >
558
567
  >
559
568
 
@@ -562,11 +571,11 @@ export const makeRouter = <
562
571
  }
563
572
  <
564
573
  const Make extends {
565
- dependencies: Array<Layer.Layer.Any>
574
+ dependencies?: Array<Layer.Layer.Any>
566
575
  effect: Effect<
567
576
  { [K in keyof FilterRequestModules<Resource>]: AnyHandler<Resource[K]> },
568
577
  any,
569
- Make["strict"] extends false ? any : LayerUtils.GetLayersSuccess<Make["dependencies"]>
578
+ Make["strict"] extends false ? any : MakeDepsOut<Make>
570
579
  >
571
580
  strict?: boolean
572
581
  /** @deprecated */
@@ -580,13 +589,13 @@ export const makeRouter = <
580
589
  routes: Layer.Layer<
581
590
  RouterShape<Resource>,
582
591
  | MakeErrors<Make>
583
- | LayerUtils.GetLayersError<Make["dependencies"]>
592
+ | Service.MakeDepsE<Make>
584
593
  | Layer.Error<typeof middleware.Default>,
585
- | LayerUtils.GetLayersContext<Make["dependencies"]>
594
+ | Service.MakeDepsIn<Make>
586
595
  | Layer.Context<typeof middleware.Default>
587
596
  | Exclude<
588
597
  MakeContext<Make>,
589
- LayerUtils.GetLayersSuccess<Make["dependencies"]>
598
+ MakeDepsOut<Make>
590
599
  >
591
600
  >
592
601
 
@@ -595,11 +604,11 @@ export const makeRouter = <
595
604
  }
596
605
  <
597
606
  const Make extends {
598
- dependencies: Array<Layer.Layer.Any>
607
+ dependencies?: Array<Layer.Layer.Any>
599
608
  effect: Effect<
600
609
  { [K in keyof FilterRequestModules<Resource>]: AnyHandler<Resource[K]> },
601
610
  any,
602
- Make["strict"] extends false ? any : LayerUtils.GetLayersSuccess<Make["dependencies"]>
611
+ Make["strict"] extends false ? any : MakeDepsOut<Make>
603
612
  >
604
613
  strict?: boolean
605
614
  /** @deprecated */
@@ -613,13 +622,13 @@ export const makeRouter = <
613
622
  routes: Layer.Layer<
614
623
  RouterShape<Resource>,
615
624
  | MakeErrors<Make>
616
- | LayerUtils.GetLayersError<Make["dependencies"]>
625
+ | Service.MakeDepsE<Make>
617
626
  | Layer.Error<typeof middleware.Default>,
618
- | LayerUtils.GetLayersContext<Make["dependencies"]>
627
+ | Service.MakeDepsIn<Make>
619
628
  | Layer.Context<typeof middleware.Default>
620
629
  | Exclude<
621
630
  MakeContext<Make>,
622
- LayerUtils.GetLayersSuccess<Make["dependencies"]>
631
+ MakeDepsOut<Make>
623
632
  >
624
633
  >
625
634
 
@@ -628,11 +637,11 @@ export const makeRouter = <
628
637
  }
629
638
  <
630
639
  const Make extends {
631
- dependencies: Array<Layer.Layer.Any>
640
+ dependencies?: Array<Layer.Layer.Any>
632
641
  effect: Effect<
633
642
  { [K in keyof FilterRequestModules<Resource>]: AnyHandler<Resource[K]> },
634
643
  any,
635
- LayerUtils.GetLayersSuccess<Make["dependencies"]>
644
+ MakeDepsOut<Make>
636
645
  >
637
646
  strict?: boolean
638
647
  /** @deprecated */
@@ -646,13 +655,13 @@ export const makeRouter = <
646
655
  routes: Layer.Layer<
647
656
  RouterShape<Resource>,
648
657
  | MakeErrors<Make>
649
- | LayerUtils.GetLayersError<Make["dependencies"]>
658
+ | Service.MakeDepsE<Make>
650
659
  | Layer.Error<typeof middleware.Default>,
651
- | LayerUtils.GetLayersContext<Make["dependencies"]>
660
+ | Service.MakeDepsIn<Make>
652
661
  | Layer.Context<typeof middleware.Default>
653
662
  | Exclude<
654
663
  MakeContext<Make>,
655
- LayerUtils.GetLayersSuccess<Make["dependencies"]>
664
+ MakeDepsOut<Make>
656
665
  >
657
666
  >
658
667
 
@@ -661,11 +670,11 @@ export const makeRouter = <
661
670
  }
662
671
  <
663
672
  const Make extends {
664
- dependencies: Array<Layer.Layer.Any>
673
+ dependencies?: Array<Layer.Layer.Any>
665
674
  effect: Effect<
666
675
  { [K in keyof FilterRequestModules<Resource>]: AnyHandler<Resource[K]> },
667
676
  any,
668
- LayerUtils.GetLayersSuccess<Make["dependencies"]>
677
+ MakeDepsOut<Make>
669
678
  >
670
679
  strict?: boolean
671
680
  }
@@ -677,13 +686,13 @@ export const makeRouter = <
677
686
  routes: Layer.Layer<
678
687
  RouterShape<Resource>,
679
688
  | MakeErrors<Make>
680
- | LayerUtils.GetLayersError<Make["dependencies"]>
689
+ | Service.MakeDepsE<Make>
681
690
  | Layer.Error<typeof middleware.Default>,
682
- | LayerUtils.GetLayersContext<Make["dependencies"]>
691
+ | Service.MakeDepsIn<Make>
683
692
  | Layer.Context<typeof middleware.Default>
684
693
  | Exclude<
685
694
  MakeContext<Make>,
686
- LayerUtils.GetLayersSuccess<Make["dependencies"]>
695
+ MakeDepsOut<Make>
687
696
  >
688
697
  >
689
698
 
@@ -692,10 +701,16 @@ export const makeRouter = <
692
701
  }
693
702
  <
694
703
  const Make extends {
695
- dependencies: Array<Layer.Layer.Any>
704
+ dependencies?: Array<Layer.Layer.Any>
696
705
  effect: (match: typeof router3) => Generator<
697
706
  YieldWrap<
698
- Effect<any, any, Make["strict"] extends false ? any : LayerUtils.GetLayersSuccess<Make["dependencies"]>>
707
+ Effect<
708
+ any,
709
+ any,
710
+ Make["strict"] extends false ? any
711
+ : Make extends { dependencies: Array<Layer.Layer.Any> } ? MakeDepsOut<Make>
712
+ : any
713
+ >
699
714
  >,
700
715
  { [K in keyof FilterRequestModules<Resource>]: AnyHandler<Resource[K]> },
701
716
  any
@@ -711,13 +726,13 @@ export const makeRouter = <
711
726
  routes: Layer.Layer<
712
727
  RouterShape<Resource>,
713
728
  | MakeErrors<Make>
714
- | LayerUtils.GetLayersError<Make["dependencies"]>
729
+ | Service.MakeDepsE<Make>
715
730
  | Layer.Error<typeof middleware.Default>,
716
- | LayerUtils.GetLayersContext<Make["dependencies"]>
731
+ | Service.MakeDepsIn<Make>
717
732
  | Layer.Context<typeof middleware.Default>
718
733
  | Exclude<
719
734
  MakeContext<Make>,
720
- LayerUtils.GetLayersSuccess<Make["dependencies"]>
735
+ MakeDepsOut<Make>
721
736
  >
722
737
  >
723
738
 
package/test/controller.test.ts CHANGED
@@ -255,23 +255,12 @@ expectTypeOf({} as makeContext).toEqualTypeOf<
255
255
  >()
256
256
 
257
257
  const router2 = r2.Router(Something)({
258
- dependencies: [
259
- SomethingRepo.Default,
260
- SomethingService.Default,
261
- SomethingService2.Default
262
- ],
263
258
  *effect(match) {
264
- const repo = yield* SomethingRepo
265
- const smth = yield* SomethingService
266
- const smth2 = yield* SomethingService2
267
-
268
259
  // this gets catched in 'routes' type
269
260
  if (Math.random() > 0.5) {
270
261
  return yield* new InvalidStateError("ciao")
271
262
  }
272
263
 
273
- console.log({ repo, smth, smth2 })
274
-
275
264
  return match({
276
265
  Eff: () =>
277
266
  Effect
@@ -322,6 +311,4 @@ expectTypeOf({} as Layer.Context<typeof matched2>).toEqualTypeOf<Some | SomeServ
322
311
 
323
312
  type makeContext2 = MakeContext<typeof router2.make>
324
313
  expectTypeOf({} as MakeErrors<typeof router2.make>).toEqualTypeOf<InvalidStateError>()
325
- expectTypeOf({} as makeContext2).toEqualTypeOf<
326
- SomethingService | SomethingRepo | SomethingService2
327
- >()
314
+ expectTypeOf({} as makeContext2).toEqualTypeOf<never>()
package/test/dist/controller.test.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"controller.test.d.ts","sourceRoot":"","sources":["../controller.test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,UAAU,EAAc,MAAM,+BAA+B,CAAA;AAE7F,OAAO,EAAW,MAAM,EAAE,KAAK,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAElE,OAAO,EAA6C,UAAU,EAAO,MAAM,kCAAkC,CAAA;AAE7G,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,KAAK,iBAAiB,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;;;;;;AAgCrI,cAAM,kBAAmB,SAAQ,uBAU/B;CAAG;;;;;;;AAML,qBAAa,eAAgB,SAAQ,oBAanC;CACD;AAwBD,eAAO,MAAM,WAAW;;;;;;;;;;;;;;YAIM,CAAA;AAE9B,MAAM,MAAM,aAAa,GAAG;IAC1B,yCAAyC;IACzC,cAAc,CAAC,EAAE,IAAI,CAAA;IACrB,iEAAiE;IACjE,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAC/B,CAAA;AACD,eAAO,MAAuB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAI/B,CAAA;;;;;;;;;;AAEF,qBAAa,GAAI,SAAQ,QAA0C;CAAG;;;;;;;;;;AACtE,qBAAa,GAAI,SAAQ,QAA0C;CAAG;;;;;;;;;;;;AAEtE,qBAAa,WAAY,SAAQ,gBAEV;CAAG;;;;;;;;;;;;AAgB1B,qBAAa,YAAa,SAAQ,iBAET;CAAG;;;;;;;;;;;;AAE5B,qBAAa,aAAc,SAAQ,kBAEA;CAAG;;;;;AAItC,qBAAa,gBAAiB,SAAQ,qBAKpC;CAAG;;;;;AASL,qBAAa,aAAc,SAAQ,kBAOjC;CAAG;;;;;AAEL,qBAAa,iBAAkB,SAAQ,sBAKrC;CAAG;AAEL,eAAO,MAAQ,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAAE,QAAQ;;;;;2HAAE,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uCAAiC,CAAA;AAE1E,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAgC,CAAA"}
1
+ {"version":3,"file":"controller.test.d.ts","sourceRoot":"","sources":["../controller.test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,UAAU,EAAc,MAAM,+BAA+B,CAAA;AAE7F,OAAO,EAAW,MAAM,EAAE,KAAK,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAElE,OAAO,EAA6C,UAAU,EAAO,MAAM,kCAAkC,CAAA;AAE7G,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,KAAK,iBAAiB,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;;;;;;AAgCrI,cAAM,kBAAmB,SAAQ,uBAU/B;CAAG;;;;;;;AAML,qBAAa,eAAgB,SAAQ,oBAanC;CACD;AAwBD,eAAO,MAAM,WAAW;;;;;YAIM,CAAA;AAE9B,MAAM,MAAM,aAAa,GAAG;IAC1B,yCAAyC;IACzC,cAAc,CAAC,EAAE,IAAI,CAAA;IACrB,iEAAiE;IACjE,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAC/B,CAAA;AACD,eAAO,MAAuB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAI/B,CAAA;;;;;;;;;;AAEF,qBAAa,GAAI,SAAQ,QAA0C;CAAG;;;;;;;;;;AACtE,qBAAa,GAAI,SAAQ,QAA0C;CAAG;;;;;;;;;;;;AAEtE,qBAAa,WAAY,SAAQ,gBAEV;CAAG;;;;;;;;;;;;AAgB1B,qBAAa,YAAa,SAAQ,iBAET;CAAG;;;;;;;;;;;;AAE5B,qBAAa,aAAc,SAAQ,kBAEA;CAAG;;;;;AAItC,qBAAa,gBAAiB,SAAQ,qBAKpC;CAAG;;;;;AASL,qBAAa,aAAc,SAAQ,kBAOjC;CAAG;;;;;AAEL,qBAAa,iBAAkB,SAAQ,sBAKrC;CAAG;AAEL,eAAO,MAAQ,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAAE,QAAQ;;;;;2HAAE,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uCAAiC,CAAA;AAE1E,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAgC,CAAA"}
package/test/dist/fixtures.d.ts CHANGED
@@ -37,7 +37,7 @@ declare const Some_base: (abstract new (service: {
37
37
  } & {
38
38
  use: <X>(body: (_: {
39
39
  a: number;
40
- }) => X) => X extends Effect.Effect<infer A, infer E_1, infer R_3> ? Effect.Effect<A, E_1, Some | R_3> : Effect.Effect<X, never, Some>;
40
+ }) => X) => X extends Effect.Effect<infer A, infer E_1, infer R_3> ? Effect.Effect<A, E_1, R_3 | Some> : Effect.Effect<X, never, Some>;
41
41
  };
42
42
  export declare class Some extends Some_base {
43
43
  }
@@ -138,7 +138,7 @@ declare const SomeService_base: (abstract new (service: {
138
138
  } & {
139
139
  use: <X>(body: (_: {
140
140
  a: number;
141
- }) => X) => X extends Effect.Effect<infer A, infer E_1, infer R_3> ? Effect.Effect<A, E_1, R_3 | SomeService> : Effect.Effect<X, never, SomeService>;
141
+ }) => X) => X extends Effect.Effect<infer A, infer E_1, infer R_3> ? Effect.Effect<A, E_1, SomeService | R_3> : Effect.Effect<X, never, SomeService>;
142
142
  };
143
143
  export declare class SomeService extends SomeService_base {
144
144
  }
package/test/layerUtils.test.ts CHANGED
@@ -4,12 +4,15 @@ import { expectTypeOf } from "vitest/index.cjs"
4
4
  import { type LayerUtils } from "../src/api/layerUtils.js"
5
5
 
6
6
  it("works", () => {
7
+ // not supported atm, resolves to unknown!
8
+ // type None = LayerUtils.GetLayersContext<any[]>
7
9
  type B = (Layer.Layer<void, "error-a", "a"> | Layer.Layer<void, "error-b", "b">)[]
8
10
  type C = LayerUtils.GetLayersContext<B>
9
11
  type CE = LayerUtils.GetLayersError<B>
10
12
 
11
13
  expectTypeOf({} as C).toEqualTypeOf<"a" | "b">()
12
14
  expectTypeOf({} as CE).toEqualTypeOf<"error-a" | "error-b">()
15
+ // expectTypeOf({} as None).toEqualTypeOf<never>()
13
16
 
14
17
  type B2 = [Layer.Layer<void, "error-a", "a">, Layer.Layer<void, "error-b", "b"> | Layer.Layer<void, "error-c", "c">]
15
18
  type C2 = LayerUtils.GetLayersContext<B2>