@effect-app/infra 2.85.0 → 2.87.0

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 (66) hide show
  1. package/CHANGELOG.md +17 -0
  2. package/dist/api/layerUtils.d.ts +4 -8
  3. package/dist/api/layerUtils.d.ts.map +1 -1
  4. package/dist/api/layerUtils.js +3 -11
  5. package/dist/api/routing/middleware/ContextProvider.d.ts +2 -2
  6. package/dist/api/routing/middleware/ContextProvider.d.ts.map +1 -1
  7. package/dist/api/routing/middleware/RouterMiddleware.d.ts +33 -0
  8. package/dist/api/routing/middleware/RouterMiddleware.d.ts.map +1 -0
  9. package/dist/api/routing/middleware/RouterMiddleware.js +5 -0
  10. package/dist/api/routing/middleware/RpcMiddleware.d.ts +199 -0
  11. package/dist/api/routing/middleware/RpcMiddleware.d.ts.map +1 -0
  12. package/dist/api/routing/middleware/RpcMiddleware.js +14 -0
  13. package/dist/api/routing/middleware/dynamic-middleware.d.ts +3 -13
  14. package/dist/api/routing/middleware/dynamic-middleware.d.ts.map +1 -1
  15. package/dist/api/routing/middleware/dynamic-middleware.js +2 -18
  16. package/dist/api/routing/middleware/generic-middleware.d.ts +15 -22
  17. package/dist/api/routing/middleware/generic-middleware.d.ts.map +1 -1
  18. package/dist/api/routing/middleware/generic-middleware.js +13 -9
  19. package/dist/api/routing/middleware/middleware-api.d.ts +55 -8
  20. package/dist/api/routing/middleware/middleware-api.d.ts.map +1 -1
  21. package/dist/api/routing/middleware/middleware-api.js +50 -14
  22. package/dist/api/routing/middleware/middleware.d.ts +8 -7
  23. package/dist/api/routing/middleware/middleware.d.ts.map +1 -1
  24. package/dist/api/routing/middleware/middleware.js +6 -5
  25. package/dist/api/routing/middleware.d.ts +2 -1
  26. package/dist/api/routing/middleware.d.ts.map +1 -1
  27. package/dist/api/routing/middleware.js +3 -2
  28. package/dist/api/routing/tsort.d.ts +2 -2
  29. package/dist/api/routing/tsort.d.ts.map +1 -1
  30. package/dist/api/routing/tsort.js +1 -1
  31. package/dist/api/routing.d.ts +0 -1
  32. package/dist/api/routing.d.ts.map +1 -1
  33. package/dist/api/routing.js +2 -3
  34. package/package.json +9 -5
  35. package/src/api/layerUtils.ts +7 -21
  36. package/src/api/routing/middleware/ContextProvider.ts +5 -5
  37. package/src/api/routing/middleware/RouterMiddleware.ts +149 -0
  38. package/src/api/routing/middleware/RpcMiddleware.ts +287 -0
  39. package/src/api/routing/middleware/dynamic-middleware.ts +9 -54
  40. package/src/api/routing/middleware/generic-middleware.ts +33 -33
  41. package/src/api/routing/middleware/middleware-api.ts +202 -32
  42. package/src/api/routing/middleware/middleware.ts +13 -5
  43. package/src/api/routing/middleware.ts +2 -1
  44. package/src/api/routing/tsort.ts +2 -2
  45. package/src/api/routing.ts +1 -9
  46. package/test/contextProvider.test.ts +1 -2
  47. package/test/controller.test.ts +35 -155
  48. package/test/dist/contextProvider.test.d.ts.map +1 -1
  49. package/test/dist/controller.test.d.ts.map +1 -1
  50. package/test/dist/fixtures.d.ts +146 -0
  51. package/test/dist/fixtures.d.ts.map +1 -0
  52. package/test/dist/fixtures.js +82 -0
  53. package/test/dist/layerUtils.test.d.ts.map +1 -0
  54. package/test/dist/query.test.d.ts.map +1 -1
  55. package/test/dist/requires.d.ts +21 -0
  56. package/test/dist/requires.d.ts.map +1 -0
  57. package/test/dist/requires.js +27 -0
  58. package/test/dist/requires.test.d.ts.map +1 -0
  59. package/test/fixtures.ts +102 -0
  60. package/test/layerUtils.test.ts +19 -0
  61. package/test/query.test.ts +2 -4
  62. package/test/requires.test.ts +156 -0
  63. package/dist/api/routing/middleware/DynamicMiddleware.d.ts +0 -215
  64. package/dist/api/routing/middleware/DynamicMiddleware.d.ts.map +0 -1
  65. package/dist/api/routing/middleware/DynamicMiddleware.js +0 -168
  66. package/src/api/routing/middleware/DynamicMiddleware.ts +0 -693
@@ -1,168 +0,0 @@
1
- /* eslint-disable @typescript-eslint/no-unsafe-assignment */
2
- /* eslint-disable @typescript-eslint/no-unsafe-return */
3
- /* eslint-disable @typescript-eslint/no-explicit-any */
4
- import { Rpc, RpcMiddleware } from "@effect/rpc";
5
- import { Context, Effect, Layer, Unify } from "effect-app";
6
- import { implementMiddleware } from "./dynamic-middleware.js";
7
- import { genericMiddlewareMaker } from "./generic-middleware.js";
8
- /*:
9
- & Context.Tag<MiddlewareMakerId, {
10
- effect: RPCHandlerFactory<RequestContextMap, GenericMiddlewareMaker.Provided<GenericMiddlewareProviders[number]>>
11
- _tag: "MiddlewareMaker"
12
- }>
13
- & { Default: "abc" } */
14
- // factory for middlewares
15
- export const makeMiddleware =
16
- // by setting RequestContextMap beforehand, execute contextual typing does not fuck up itself to anys
17
- () => (make) => {
18
- const MiddlewareMaker = Context.GenericTag("MiddlewareMaker");
19
- const dynamicMiddlewares = implementMiddleware()(make.dynamicMiddlewares);
20
- const middlewares = genericMiddlewareMaker(...make.genericMiddlewares);
21
- const l = Layer.scoped(MiddlewareMaker, Effect
22
- .all({
23
- dynamicMiddlewares: dynamicMiddlewares.effect,
24
- generic: middlewares.effect,
25
- middleware: make.execute
26
- ? make.execute((cb) => cb)
27
- : Effect.succeed((_schema, next) => (payload, headers) => next(payload, headers))
28
- })
29
- .pipe(Effect.map(({ dynamicMiddlewares, generic, middleware }) => ({
30
- _tag: "MiddlewareMaker",
31
- effect: makeRpcEffect()((schema, next, moduleName) => {
32
- const h = middleware(schema, next, moduleName);
33
- return (payload, headers) => {
34
- const basic = {
35
- config: schema.config ?? {},
36
- payload,
37
- headers,
38
- clientId: 0, // TODO: get the clientId from the request context
39
- rpc: {
40
- ...Rpc.fromTaggedRequest(schema),
41
- // middlewares ? // todo: get from actual middleware flow?
42
- annotations: Context.empty(), // TODO //Annotations(schema as any),
43
- // successSchema: schema.success ?? Schema.Void,
44
- // errorSchema: schema.failure ?? Schema.Never,
45
- payloadSchema: schema,
46
- _tag: `${moduleName}.${payload._tag}`,
47
- key: `${moduleName}.${payload._tag}` /* ? */
48
- // clientId: 0 as number /* ? */
49
- }
50
- };
51
- return Effect
52
- .gen(function* () {
53
- const gen = generic({
54
- ...basic,
55
- next:
56
- // the contextProvider is an Effect that builds the context for the request
57
- // the dynamicMiddlewares is an Effect that builds the dynamiuc context for the request
58
- dynamicMiddlewares(basic).pipe(Effect.flatMap((dynamicContext) => h(payload, headers).pipe(Effect.provide(dynamicContext))))
59
- });
60
- return yield* gen;
61
- }); // why?
62
- };
63
- })
64
- }))));
65
- const dependencies = [
66
- ...(make.dependencies ? make.dependencies : []),
67
- ...dynamicMiddlewares.dependencies,
68
- ...middlewares.dependencies
69
- ];
70
- const middlewareLayer = l
71
- .pipe(Layer.provide(dependencies));
72
- return Object.assign(MiddlewareMaker, { Default: middlewareLayer });
73
- };
74
- export const makeMiddlewareBasic =
75
- // by setting RequestContextMap beforehand, execute contextual typing does not fuck up itself to anys
76
- (make) => {
77
- const MiddlewareMaker = Context.GenericTag("MiddlewareMaker");
78
- const dynamicMiddlewares = implementMiddleware()(make.dynamicMiddlewares);
79
- const middlewares = genericMiddlewareMaker(...make.genericMiddlewares);
80
- const l = Layer.scoped(MiddlewareMaker, Effect
81
- .all({
82
- dynamicMiddlewares: dynamicMiddlewares.effect,
83
- generic: middlewares.effect,
84
- middleware: make.execute
85
- ? make.execute((cb) => cb)
86
- : Effect.succeed((_schema, next) => (payload, headers) => next(payload, headers))
87
- })
88
- .pipe(Effect.map(({ dynamicMiddlewares, generic, middleware }) => ({
89
- _tag: "MiddlewareMaker",
90
- effect: makeRpcEffect()((schema, next, moduleName) => {
91
- const h = middleware(schema, next, moduleName);
92
- return (payload, headers) => Effect
93
- .gen(function* () {
94
- const basic = {
95
- config: schema.config ?? {},
96
- payload,
97
- headers,
98
- clientId: 0, // TODO: get the clientId from the request context
99
- rpc: {
100
- ...Rpc.fromTaggedRequest(schema),
101
- // middlewares ? // todo: get from actual middleware flow?
102
- annotations: Context.empty(), // TODO //Annotations(schema as any),
103
- // successSchema: schema.success ?? Schema.Void,
104
- // errorSchema: schema.failure ?? Schema.Never,
105
- payloadSchema: schema,
106
- _tag: `${moduleName}.${payload._tag}`,
107
- key: `${moduleName}.${payload._tag}` /* ? */
108
- // clientId: 0 as number /* ? */
109
- }
110
- };
111
- return yield* generic({
112
- ...basic,
113
- next:
114
- // the contextProvider is an Effect that builds the context for the request
115
- // the dynamicMiddlewares is an Effect that builds the dynamiuc context for the request
116
- dynamicMiddlewares(basic).pipe(Effect.flatMap((dynamicContext) => h(payload, headers).pipe(Effect.provide(dynamicContext))))
117
- });
118
- }); // why?
119
- })
120
- }))));
121
- const dependencies = [
122
- ...(make.dependencies ? make.dependencies : []),
123
- ...(dynamicMiddlewares.dependencies),
124
- ...middlewares.dependencies
125
- ];
126
- const middlewareLayer = l
127
- .pipe(Layer.provide(dependencies));
128
- return Object.assign(MiddlewareMaker, { Default: middlewareLayer });
129
- };
130
- // it just provides the right types without cluttering the implementation with them
131
- function makeRpcEffect() {
132
- return (cb) => cb;
133
- }
134
- export const Tag = () => (id, options) => (opts) => class extends RpcMiddleware.Tag()(id, options) {
135
- // TODO: move to TagClass.
136
- static dynamic = options && "dynamic" in options ? options.dynamic : undefined;
137
- static dependsOn = options && "dependsOn" in options ? options.dependsOn : undefined;
138
- static Default = Layer.scoped(this, opts.effect).pipe(Layer.provide([Layer.empty, ...opts.dependencies ?? []]));
139
- static [Unify.typeSymbol];
140
- static [Unify.unifySymbol];
141
- static [Unify.ignoreSymbol];
142
- };
143
- // export const Tag = <Self>() =>
144
- // <
145
- // const Name extends string,
146
- // const Options extends Omit<RpcOptionsOriginal, "wrap">
147
- // >(
148
- // id: Name,
149
- // options?: Options | undefined
150
- // ) =>
151
- // OurTag<Self>()(id, { ...options, wrap: true } as Options & { wrap: true }) as <
152
- // E,
153
- // R,
154
- // L extends NonEmptyReadonlyArray<Layer.Layer.Any>
155
- // >(opts: {
156
- // effect: Effect.Effect<
157
- // RpcMiddlewareWrap<
158
- // RpcMiddleware.TagClass.Provides<Options>,
159
- // RpcMiddleware.TagClass.Failure<Options>
160
- // >,
161
- // E,
162
- // R
163
- // >
164
- // dependencies?: L
165
- // }) => RpcMiddleware.TagClass<Self, Name, Options> & {
166
- // Default: Layer.Layer<Self, E | LayerUtils.GetLayersError<L>, Exclude<R, LayerUtils.GetLayersSuccess<L>>>
167
- // }
168
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRHluYW1pY01pZGRsZXdhcmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvYXBpL3JvdXRpbmcvbWlkZGxld2FyZS9EeW5hbWljTWlkZGxld2FyZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSw0REFBNEQ7QUFDNUQsd0RBQXdEO0FBQ3hELHVEQUF1RDtBQUN2RCxPQUFPLEVBQUUsR0FBRyxFQUFFLGFBQWEsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUVoRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQTBGLEtBQUssRUFBRSxNQUFNLFlBQVksQ0FBQTtBQU1sSixPQUFPLEVBQXlCLG1CQUFtQixFQUFFLE1BQU0seUJBQXlCLENBQUE7QUFDcEYsT0FBTyxFQUFpRCxzQkFBc0IsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBaUovRzs7Ozs7MkJBSzJCO0FBRTNCLDBCQUEwQjtBQUMxQixNQUFNLENBQUMsTUFBTSxjQUFjO0FBQ3pCLHFHQUFxRztBQUNyRyxHQUVJLEVBQUUsQ0FDTixDQU9FLElBT0MsRUFDRCxFQUFFO0lBQ0YsTUFBTSxlQUFlLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FVeEMsaUJBQWlCLENBQ2xCLENBQUE7SUFFRCxNQUFNLGtCQUFrQixHQUFHLG1CQUFtQixFQUFxQixDQUFDLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxDQUFBO0lBQzVGLE1BQU0sV0FBVyxHQUFHLHNCQUFzQixDQUFDLEdBQUcsSUFBSSxDQUFDLGtCQUFrQixDQUFDLENBQUE7SUFFdEUsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDLE1BQU0sQ0FDcEIsZUFBZSxFQUNmLE1BQU07U0FDSCxHQUFHLENBQUM7UUFDSCxrQkFBa0IsRUFBRSxrQkFBa0IsQ0FBQyxNQUFNO1FBQzdDLE9BQU8sRUFBRSxXQUFXLENBQUMsTUFBTTtRQUMzQixVQUFVLEVBQUUsSUFBSSxDQUFDLE9BQU87WUFDdEIsQ0FBQyxDQUFDLElBQUks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