@effect-app/infra 2.73.0 → 2.73.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.
package/CHANGELOG.md
CHANGED
|
@@ -9,17 +9,18 @@ export type MakeRPCHandlerFactory<RequestContextMap extends Record<string, RPCCo
|
|
|
9
9
|
export type RPCHandlerFactory<RequestContextMap extends Record<string, RPCContextMap.Any>, MiddlewareR, ContextProviderA> = <T extends {
|
|
10
10
|
config?: Partial<Record<keyof RequestContextMap, any>>;
|
|
11
11
|
}, Req extends S.TaggedRequest.All, HandlerR>(schema: T & S.Schema<Req, any, never>, handler: (request: Req, headers: any) => Effect.Effect<EffectRequest.Request.Success<Req>, EffectRequest.Request.Error<Req>, HandlerR>, moduleName?: string) => (req: Req, headers: any) => Effect.Effect<Request.Request.Success<Req>, Request.Request.Error<Req> | RequestContextMapErrors<RequestContextMap>, HttpRouter.HttpRouter.Provided | Exclude<MiddlewareR | Exclude<HandlerR, GetEffectContext<RequestContextMap, (T & S.Schema<Req, any, never>)["config"]>>, ContextProviderA>>;
|
|
12
|
-
export type ContextProviderShape<ContextProviderA> = Effect<Context.Context<ContextProviderA>, never,
|
|
12
|
+
export type ContextProviderShape<ContextProviderA, ContextProviderR> = Effect<Context.Context<ContextProviderA>, never, ContextProviderR>;
|
|
13
13
|
export interface MiddlewareMake<MiddlewareR, // what the middlware requires to execute
|
|
14
14
|
RequestContextMap extends Record<string, RPCContextMap.Any>, // what services will the middlware provide dynamically to the handler, or raise errors.
|
|
15
15
|
MakeMiddlewareE, // what the middleware construction can fail with
|
|
16
16
|
MakeMiddlewareR, // what the middlware requires to be constructed
|
|
17
17
|
MiddlewareDependencies extends NonEmptyArray<Layer.Layer.Any>, // layers provided for the middlware to be constructed
|
|
18
18
|
ContextProviderA, // what the context provider provides
|
|
19
|
+
ContextProviderR extends HttpRouter.HttpRouter.Provided, // what the context provider requires
|
|
19
20
|
MakeContextProviderE, // what the context provider construction can fail with
|
|
20
21
|
MakeContextProviderR> {
|
|
21
22
|
dependencies?: MiddlewareDependencies;
|
|
22
|
-
contextProvider: Context.Tag<ContextProviderId, ContextProviderShape<ContextProviderA>> & {
|
|
23
|
+
contextProvider: Context.Tag<ContextProviderId, ContextProviderShape<ContextProviderA, ContextProviderR>> & {
|
|
23
24
|
Default: Layer.Layer<ContextProviderId, MakeContextProviderE, MakeContextProviderR>;
|
|
24
25
|
};
|
|
25
26
|
execute: (maker: (cb: MakeRPCHandlerFactory<RequestContextMap, MiddlewareR>) => MakeRPCHandlerFactory<RequestContextMap, MiddlewareR>) => Effect<MakeRPCHandlerFactory<RequestContextMap, MiddlewareR>, MakeMiddlewareE, MakeMiddlewareR>;
|
|
@@ -44,13 +45,13 @@ export declare const mergeContextProviders: <TDeps extends Array.NonEmptyReadonl
|
|
|
44
45
|
dependencies: { [K in keyof TDeps]: TDeps[K]["Default"]; };
|
|
45
46
|
effect: Effect.Effect<Effect.Effect<Context.Context<GetContext<Effect.Success<InstanceType<TDeps[number]>>>>, Effect.Error<InstanceType<TDeps[number]>>, Effect.Context<InstanceType<TDeps[number]>>>, never, InstanceType<TDeps[number]>>;
|
|
46
47
|
};
|
|
47
|
-
export declare const ContextProvider: <A, E, R,
|
|
48
|
-
effect: Effect<Effect<A,
|
|
48
|
+
export declare const ContextProvider: <A, E, R, ContextE, ContextR, Dependencies extends NonEmptyArray<Layer.Layer.Any>>(input: {
|
|
49
|
+
effect: Effect<Effect<A, ContextE, ContextR>, E, R>;
|
|
49
50
|
dependencies?: Dependencies;
|
|
50
|
-
}) => Context.Tag<ContextProviderId, Effect<A,
|
|
51
|
+
}) => Context.Tag<ContextProviderId, Effect<A, ContextE, ContextR>> & {
|
|
51
52
|
Default: Layer.Layer<ContextProviderId, E | LayersUtils.GetLayersError<Dependencies>, Exclude<R, LayersUtils.GetLayersSuccess<Dependencies>> | LayersUtils.GetLayersContext<Dependencies>>;
|
|
52
53
|
};
|
|
53
|
-
export declare const EmptyContextProvider: Context.Tag<ContextProviderId, Effect<Context.Context<never>, never,
|
|
54
|
+
export declare const EmptyContextProvider: Context.Tag<ContextProviderId, Effect<Context.Context<never>, never, never>> & {
|
|
54
55
|
Default: Layer.Layer<ContextProviderId, never, never>;
|
|
55
56
|
};
|
|
56
57
|
export type Middleware<MiddlewareR, // what the middlware requires to execute
|
|
@@ -69,8 +70,9 @@ export declare const makeMiddleware: <RequestContextMap extends Record<string, R
|
|
|
69
70
|
MakeMiddlewareR, // what the middlware requires to be constructed
|
|
70
71
|
MiddlewareDependencies extends NonEmptyArray<Layer.Layer.Any>, // layers provided for the middlware to be constructed
|
|
71
72
|
ContextProviderA, // what the context provider provides
|
|
73
|
+
ContextProviderR extends HttpRouter.HttpRouter.Provided, // what the context provider requires
|
|
72
74
|
MakeContextProviderE, // what the context provider construction can fail with
|
|
73
|
-
MakeContextProviderR>(make: MiddlewareMake<MiddlewareR, RequestContextMap, MakeMiddlewareE, MakeMiddlewareR, MiddlewareDependencies, ContextProviderA, MakeContextProviderE, MakeContextProviderR>) => Context.Tag<MiddlewareMakerId, {
|
|
75
|
+
MakeContextProviderR>(make: MiddlewareMake<MiddlewareR, RequestContextMap, MakeMiddlewareE, MakeMiddlewareR, MiddlewareDependencies, ContextProviderA, ContextProviderR, MakeContextProviderE, MakeContextProviderR>) => Context.Tag<MiddlewareMakerId, {
|
|
74
76
|
effect: RPCHandlerFactory<RequestContextMap, MiddlewareR, ContextProviderA>;
|
|
75
77
|
_tag: "MiddlewareMaker";
|
|
76
78
|
}> & {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DynamicMiddleware.d.ts","sourceRoot":"","sources":["../../../src/api/routing/DynamicMiddleware.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"DynamicMiddleware.d.ts","sourceRoot":"","sources":["../../../src/api/routing/DynamicMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -67,4 +67,4 @@ export const makeMiddleware =
|
|
|
67
67
|
function makeRpcEffect() {
|
|
68
68
|
return (cb) => cb;
|
|
69
69
|
}
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRHluYW1pY01pZGRsZXdhcmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXBpL3JvdXRpbmcvRHluYW1pY01pZGRsZXdhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsNERBQTREO0FBQzVELHdEQUF3RDtBQUN4RCx1REFBdUQ7QUFDdkQsT0FBTyxFQUFjLE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUE0QyxNQUFNLFlBQVksQ0FBQTtBQTJFekcsU0FBUyxjQUFjO0lBQ3JCLE9BQU8sQ0FBQyxFQUF5RCxFQUFFLEVBQUUsQ0FBQyxFQUFFLENBQUE7QUFDMUUsQ0FBQztBQW1ERCxNQUFNLENBQUMsTUFBTSxxQkFBcUIsR0FBRyxDQWFuQyxHQUFHLElBQVcsRUFXZCxFQUFFLENBQUMsQ0FBQztJQUNKLFlBQVksRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFRO0lBQy9DLE1BQU0sRUFBRSxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQztRQUMxQixNQUFNLFFBQVEsR0FBRyxLQUFLLENBQUMsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFBO1FBQ3hDLDhEQUE4RDtRQUM5RCxPQUFPLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBaUIsQ0FBQyxDQUFDLElBQUksQ0FDdkMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQVEsQ0FBQyxDQUFDLENBQ2pELENBQUE7SUFDSCxDQUFDLENBQVE7Q0FDVixDQUFDLENBQUE7QUFFRixxQkFBcUI7QUFDckIseUNBQXlDO0FBQ3pDLGlFQUFpRTtBQUNqRSw0RUFBNEU7QUFDNUUsK0NBQStDO0FBQy9DLFVBQVU7QUFDVixxRkFBcUY7QUFDckYsdUZBQXVGO0FBQ3ZGLFFBQVE7QUFDUixVQUFV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
|
package/package.json
CHANGED
|
@@ -80,10 +80,10 @@ function makeRpcHandler<RequestContextMap extends Record<string, RPCContextMap.A
|
|
|
80
80
|
return (cb: MakeRPCHandlerFactory<RequestContextMap, MiddlewareR>) => cb
|
|
81
81
|
}
|
|
82
82
|
|
|
83
|
-
export type ContextProviderShape<ContextProviderA> = Effect<
|
|
83
|
+
export type ContextProviderShape<ContextProviderA, ContextProviderR> = Effect<
|
|
84
84
|
Context.Context<ContextProviderA>,
|
|
85
85
|
never,
|
|
86
|
-
|
|
86
|
+
ContextProviderR
|
|
87
87
|
>
|
|
88
88
|
|
|
89
89
|
export interface MiddlewareMake<
|
|
@@ -95,6 +95,7 @@ export interface MiddlewareMake<
|
|
|
95
95
|
//
|
|
96
96
|
// ContextProvider is a service that builds additional context for each request.
|
|
97
97
|
ContextProviderA, // what the context provider provides
|
|
98
|
+
ContextProviderR extends HttpRouter.HttpRouter.Provided, // what the context provider requires
|
|
98
99
|
MakeContextProviderE, // what the context provider construction can fail with
|
|
99
100
|
MakeContextProviderR // what the context provider construction requires
|
|
100
101
|
> {
|
|
@@ -102,7 +103,7 @@ export interface MiddlewareMake<
|
|
|
102
103
|
contextProvider:
|
|
103
104
|
& Context.Tag<
|
|
104
105
|
ContextProviderId,
|
|
105
|
-
ContextProviderShape<ContextProviderA>
|
|
106
|
+
ContextProviderShape<ContextProviderA, ContextProviderR>
|
|
106
107
|
>
|
|
107
108
|
& {
|
|
108
109
|
Default: Layer.Layer<ContextProviderId, MakeContextProviderE, MakeContextProviderR>
|
|
@@ -179,12 +180,12 @@ export const mergeContextProviders = <
|
|
|
179
180
|
// >
|
|
180
181
|
// >(...deps: TDeps) => ContextProvider(mergeContextProviders(...deps))
|
|
181
182
|
|
|
182
|
-
export const ContextProvider = <A, E, R,
|
|
183
|
-
input: { effect: Effect<Effect<A,
|
|
183
|
+
export const ContextProvider = <A, E, R, ContextE, ContextR, Dependencies extends NonEmptyArray<Layer.Layer.Any>>(
|
|
184
|
+
input: { effect: Effect<Effect<A, ContextE, ContextR>, E, R>; dependencies?: Dependencies }
|
|
184
185
|
) => {
|
|
185
186
|
const ctx = Context.GenericTag<
|
|
186
187
|
ContextProviderId,
|
|
187
|
-
Effect<A,
|
|
188
|
+
Effect<A, ContextE, ContextR>
|
|
188
189
|
>(
|
|
189
190
|
"ContextProvider"
|
|
190
191
|
)
|
|
@@ -240,6 +241,7 @@ export const makeMiddleware =
|
|
|
240
241
|
//
|
|
241
242
|
// ContextProvider is a service that builds additional context for each request.
|
|
242
243
|
ContextProviderA, // what the context provider provides
|
|
244
|
+
ContextProviderR extends HttpRouter.HttpRouter.Provided, // what the context provider requires
|
|
243
245
|
MakeContextProviderE, // what the context provider construction can fail with
|
|
244
246
|
MakeContextProviderR // what the context provider construction requires
|
|
245
247
|
>(
|
|
@@ -250,6 +252,7 @@ export const makeMiddleware =
|
|
|
250
252
|
MakeMiddlewareR,
|
|
251
253
|
MiddlewareDependencies,
|
|
252
254
|
ContextProviderA,
|
|
255
|
+
ContextProviderR,
|
|
253
256
|
MakeContextProviderE,
|
|
254
257
|
MakeContextProviderR
|
|
255
258
|
>
|