@effect-app/infra 3.0.1 → 3.0.3
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 +14 -0
- package/dist/api/routing/middleware/middleware.d.ts.map +1 -1
- package/dist/api/routing/middleware/middleware.js +10 -9
- package/dist/api/routing/tsort.d.ts +2 -2
- package/dist/api/routing/tsort.d.ts.map +1 -1
- package/dist/api/routing/tsort.js +1 -1
- package/dist/api/routing.d.ts +4 -11
- package/dist/api/routing.d.ts.map +1 -1
- package/dist/api/routing.js +5 -7
- package/package.json +2 -2
- package/src/api/routing/middleware/middleware.ts +9 -8
- package/src/api/routing/tsort.ts +2 -2
- package/src/api/routing.ts +19 -28
- package/test/controller.test.ts +18 -20
- package/test/dist/controller.test.d.ts.map +1 -1
- package/test/dist/fixtures.d.ts +12 -15
- package/test/dist/fixtures.d.ts.map +1 -1
- package/test/dist/fixtures.js +17 -37
- package/test/dist/requires.test.d.ts.map +1 -1
- package/test/dist/rpc-multi-middleware.test.d.ts.map +1 -1
- package/test/fixtures.ts +23 -49
- package/test/requires.test.ts +11 -13
- package/test/rpc-multi-middleware.test.ts +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
# @effect-app/infra
|
|
2
2
|
|
|
3
|
+
## 3.0.3
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 88bb989: align dynamic/global middleware with V4
|
|
8
|
+
- Updated dependencies [88bb989]
|
|
9
|
+
- effect-app@3.0.2
|
|
10
|
+
|
|
11
|
+
## 3.0.2
|
|
12
|
+
|
|
13
|
+
### Patch Changes
|
|
14
|
+
|
|
15
|
+
- 64745d0: just layers
|
|
16
|
+
|
|
3
17
|
## 3.0.1
|
|
4
18
|
|
|
5
19
|
### Patch Changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../../src/api/routing/middleware/middleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../../src/api/routing/middleware/middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,KAAK,EAA+C,MAAM,QAAQ,CAAA;AACpG,OAAO,KAAK,gBAAgB,MAAM,kCAAkC,CAAA;AASpE,eAAO,MAAM,kBAAkB,kCAM9B,CAAA;AAED,eAAO,MAAM,0BAA0B,oEAGtC,CAAA;AAOD,eAAO,MAAM,uCAAuC,iFAqBnD,CAAA;AAED,eAAO,MAAM,oBAAoB,8DA2DhC,CAAA;AAED,eAAO,MAAM,6BAA6B,+JAIzC,CAAA"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
1
2
|
import { Cause, Duration, Effect, Layer, ParseResult, Request, Schedule } from "effect";
|
|
2
3
|
import * as MiddlewareNative from "effect-app/rpc/middleware-native";
|
|
3
4
|
import { pretty } from "effect-app/utils";
|
|
@@ -7,7 +8,7 @@ import { determineMethod, isCommand } from "../utils.js";
|
|
|
7
8
|
const logRequestError = logError("Request");
|
|
8
9
|
const reportRequestError = reportError("Request");
|
|
9
10
|
export const RequestCacheLayers = Layer.mergeAll(Layer.setRequestCache(Request.makeCache({ capacity: 500, timeToLive: Duration.hours(8) })), Layer.setRequestCaching(true), Layer.setRequestBatching(true));
|
|
10
|
-
export const RequestCacheMiddlewareLive = Layer.succeed(MiddlewareNative.RequestCacheMiddleware, (
|
|
11
|
+
export const RequestCacheMiddlewareLive = Layer.succeed(MiddlewareNative.RequestCacheMiddleware, (effect) => effect.pipe(Effect.provide(RequestCacheLayers)));
|
|
11
12
|
// retry just once on optimistic concurrency exceptions
|
|
12
13
|
const optimisticConcurrencySchedule = Schedule.once.pipe(Schedule.intersect(Schedule.recurWhile((a) => a?._tag === "OptimisticConcurrencyException")));
|
|
13
14
|
export const ConfigureInterruptibilityMiddlewareLive = Layer.effect(MiddlewareNative.ConfigureInterruptibilityMiddleware, Effect.gen(function* () {
|
|
@@ -20,17 +21,17 @@ export const ConfigureInterruptibilityMiddlewareLive = Layer.effect(MiddlewareNa
|
|
|
20
21
|
cache.set(key, n);
|
|
21
22
|
return n;
|
|
22
23
|
};
|
|
23
|
-
return ({
|
|
24
|
+
return (effect, { rpc }) => {
|
|
24
25
|
const method = getCached(rpc._tag, rpc.payloadSchema);
|
|
25
|
-
|
|
26
|
-
? Effect.retry(Effect.uninterruptible(
|
|
27
|
-
: Effect.interruptible(
|
|
28
|
-
return
|
|
26
|
+
effect = isCommand(method)
|
|
27
|
+
? Effect.retry(Effect.uninterruptible(effect), optimisticConcurrencySchedule)
|
|
28
|
+
: Effect.interruptible(effect);
|
|
29
|
+
return effect;
|
|
29
30
|
};
|
|
30
31
|
}));
|
|
31
32
|
export const LoggerMiddlewareLive = Layer.effect(MiddlewareNative.LoggerMiddleware, Effect.gen(function* () {
|
|
32
33
|
const devMode = yield* MiddlewareNative.DevMode;
|
|
33
|
-
return ({ headers,
|
|
34
|
+
return (effect, { headers, payload, rpc }) => Effect
|
|
34
35
|
.annotateCurrentSpan({
|
|
35
36
|
"request.name": rpc._tag,
|
|
36
37
|
"requestInput": typeof payload === "object" && payload !== null
|
|
@@ -54,7 +55,7 @@ export const LoggerMiddlewareLive = Layer.effect(MiddlewareNative.LoggerMiddlewa
|
|
|
54
55
|
})
|
|
55
56
|
.pipe(
|
|
56
57
|
// can't use andThen due to some being a function and effect
|
|
57
|
-
Effect.zipRight(
|
|
58
|
+
Effect.zipRight(effect),
|
|
58
59
|
// TODO: support ParseResult if the error channel of the request allows it.. but who would want that?
|
|
59
60
|
Effect.catchAll((_) => ParseResult.isParseError(_) ? Effect.die(_) : Effect.fail(_)), Effect.tapErrorCause((cause) => Cause.isFailure(cause) ? logRequestError(cause) : Effect.void), Effect.tapDefect((cause) => Effect
|
|
60
61
|
.all([
|
|
@@ -79,4 +80,4 @@ export const LoggerMiddlewareLive = Layer.effect(MiddlewareNative.LoggerMiddlewa
|
|
|
79
80
|
])), devMode ? (_) => _ : Effect.catchAllDefect(() => Effect.die("Internal Server Error")));
|
|
80
81
|
}));
|
|
81
82
|
export const DefaultGenericMiddlewaresLive = Layer.mergeAll(RequestCacheMiddlewareLive, ConfigureInterruptibilityMiddlewareLive, LoggerMiddlewareLive);
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
83
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9hcGkvcm91dGluZy9taWRkbGV3YXJlL21pZGRsZXdhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsdURBQXVEO0FBQ3ZELE9BQU8sRUFBRSxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsV0FBVyxFQUFFLE9BQU8sRUFBRSxRQUFRLEVBQWUsTUFBTSxRQUFRLENBQUE7QUFDcEcsT0FBTyxLQUFLLGdCQUFnQixNQUFNLGtDQUFrQyxDQUFBO0FBQ3BFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUN6QyxPQUFPLEVBQUUsUUFBUSxFQUFFLFdBQVcsRUFBRSxNQUFNLDJCQUEyQixDQUFBO0FBQ2pFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUNoRCxPQUFPLEVBQUUsZUFBZSxFQUFFLFNBQVMsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUV4RCxNQUFNLGVBQWUsR0FBRyxRQUFRLENBQUMsU0FBUyxDQUFDLENBQUE7QUFDM0MsTUFBTSxrQkFBa0IsR0FBRyxXQUFXLENBQUMsU0FBUyxDQUFDLENBQUE7QUFFakQsTUFBTSxDQUFDLE1BQU0sa0JBQWtCLEdBQUcsS0FBSyxDQUFDLFFBQVEsQ0FDOUMsS0FBSyxDQUFDLGVBQWUsQ0FDbkIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLFFBQVEsRUFBRSxHQUFHLEVBQUUsVUFBVSxFQUFFLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUNwRSxFQUNELEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsRUFDN0IsS0FBSyxDQUFDLGtCQUFrQixDQUFDLElBQUksQ0FBQyxDQUMvQixDQUFBO0FBRUQsTUFBTSxDQUFDLE1BQU0sMEJBQTBCLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FDckQsZ0JBQWdC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
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
export declare function tsort(edges: any): any[];
|
|
2
2
|
export declare const createEdges: <T extends {
|
|
3
|
-
dependsOn?: readonly any[];
|
|
3
|
+
dependsOn?: readonly any[] | undefined;
|
|
4
4
|
}>(dep: readonly T[]) => any[];
|
|
5
5
|
export declare const sort: <T>(dep: readonly (T & {
|
|
6
|
-
dependsOn?: readonly any[];
|
|
6
|
+
dependsOn?: readonly any[] | undefined;
|
|
7
7
|
})[]) => readonly T[];
|
|
8
8
|
//# sourceMappingURL=tsort.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsort.d.ts","sourceRoot":"","sources":["../../../src/api/routing/tsort.ts"],"names":[],"mappings":"AAEA,wBAAgB,KAAK,CAAC,KAAK,KAAA,SAqC1B;AAED,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS;IAAE,SAAS,CAAC,EAAE,SAAS,GAAG,EAAE,CAAA;CAAE,EAAE,KAAK,SAAS,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"tsort.d.ts","sourceRoot":"","sources":["../../../src/api/routing/tsort.ts"],"names":[],"mappings":"AAEA,wBAAgB,KAAK,CAAC,KAAK,KAAA,SAqC1B;AAED,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS;IAAE,SAAS,CAAC,EAAE,SAAS,GAAG,EAAE,GAAG,SAAS,CAAA;CAAE,EAAE,KAAK,SAAS,CAAC,EAAE,UAQlG,CAAA;AAED,eAAO,MAAM,IAAI,GAAI,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC,GAAG;IAAE,SAAS,CAAC,EAAE,SAAS,GAAG,EAAE,GAAG,SAAS,CAAA;CAAE,CAAC,EAAE,KAAG,SAAS,CAAC,EAIpG,CAAA"}
|
|
@@ -48,4 +48,4 @@ export const sort = (dep) => {
|
|
|
48
48
|
const result = tsort(edges);
|
|
49
49
|
return result.concat(dep.filter((v) => !result.includes(v)));
|
|
50
50
|
};
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHNvcnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXBpL3JvdXRpbmcvdHNvcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsNkRBQTZEO0FBQzdELGNBQWM7QUFDZCxNQUFNLFVBQVUsS0FBSyxDQUFDLEtBQUs7SUFDekIsTUFBTSxLQUFLLEdBQUcsSUFBSSxHQUFHLEVBQUUsRUFBRSxNQUFNLEdBQUcsRUFBRSxFQUFFLE9BQU8sR0FBRyxJQUFJLEdBQUcsRUFBRSxDQUFBO0lBRXpELE1BQU0sSUFBSSxHQUFHLFVBQVMsRUFBRTtRQUN0QixJQUFJLENBQUMsRUFBRSxHQUFHLEVBQUUsQ0FBQTtRQUNaLElBQUksQ0FBQyxNQUFNLEdBQUcsRUFBRSxDQUFBO0lBQ2xCLENBQUMsQ0FBQTtJQUVELEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtRQUNsQixNQUFNLElBQUksR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUM1QixJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUM7WUFBRSxLQUFLLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFBO1FBQ3JELElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQztZQUFFLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRSxFQUFFLElBQUksSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDL0MsS0FBSyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFBO0lBQ2pDLENBQUMsQ0FBQyxDQUNEO0lBQUEsQ0FBQyxHQUFHLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxTQUFTLEtBQUssQ0FBQyxLQUFLLEVBQUUsU0FBUztRQUN4RCxNQUFNLElBQUksR0FBRyxLQUFLLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxFQUFFLEVBQUUsR0FBRyxJQUFJLENBQUMsRUFBRSxDQUFBO1FBRTNDLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUM7WUFBRSxPQUFNO1FBQzlCLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQztZQUFFLFNBQVMsR0FBRyxFQUFFLENBQUE7UUFFN0MsU0FBUyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQTtRQUNsQixPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsQ0FBQTtRQUN4QixJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxVQUFTLE9BQU87WUFDbEMsSUFBSSxTQUFTLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO2dCQUNwQyxNQUFNLElBQUksS0FBSyxDQUFDLGlCQUFpQixHQUFHLE9BQU8sR0FBRyxTQUFTLEdBQUcsRUFBRSxDQUFDLENBQUE7WUFDL0QsQ0FBQztZQUNELEtBQUssQ0FDSCxPQUFPLEVBQ1AsU0FBUyxDQUFDLEdBQUcsQ0FBQyxVQUFTLENBQUM7Z0JBQ3RCLE9BQU8sQ0FBQyxDQUFBO1lBQ1YsQ0FBQyxDQUFDLENBQ0gsQ0FBQTtRQUNILENBQUMsQ0FBQyxDQUFBO1FBQ0YsTUFBTSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FBQTtJQUNwQixDQUFDLENBQUMsQ0FBQTtJQUVGLE9BQU8sTUFBTSxDQUFBO0FBQ2YsQ0FBQztBQUVELE1BQU0sQ0FBQyxNQUFNLFdBQVcsR0FBRyxDQUF1RCxHQUFpQixFQUFFLEVBQUU7SUFDckcsTUFBTSxNQUFNLEdBQUcsRUFBRSxDQUFBO0lBQ2pCLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtRQUNsQixHQUFHLENBQUMsU0FBUyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFO1lBQzNCLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsR0FBRyxDQUFDLENBQUMsQ0FBQTtRQUN2QixDQUFDLENBQUMsQ0FBQTtJQUNKLENBQUMsQ0FBQyxDQUFBO0lBQ0YsT0FBTyxNQUFNLENBQUE7QUFDZixDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxJQUFJLEdBQUcsQ0FBSSxHQUFnRSxFQUFnQixFQUFFO0lBQ3hHLE1BQU0sS0FBSyxHQUFHLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUM5QixNQUFNLE1BQU0sR0FBRyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDM0IsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFDOUQsQ0FBQyxDQUFBIn0=
|
package/dist/api/routing.d.ts
CHANGED
|
@@ -72,11 +72,8 @@ export type RouteMatcher<RequestContextMap extends Record<string, any>, Resource
|
|
|
72
72
|
};
|
|
73
73
|
export declare const makeRouter: <RequestContextMap extends Record<string, RPCContextMap.Any>, MakeMiddlewareE, MakeMiddlewareR, ContextProviderA, ContextProviderE, ContextProviderR>(middleware: RouterMiddleware<RequestContextMap, MakeMiddlewareE, MakeMiddlewareR, ContextProviderA, ContextProviderE, ContextProviderR>, devMode: boolean) => {
|
|
74
74
|
matchAll: <T extends {
|
|
75
|
-
[key: string]:
|
|
76
|
-
|
|
77
|
-
moduleName: string;
|
|
78
|
-
};
|
|
79
|
-
}>(handlers: T) => Layer.Layer<never, Layer.Layer.Error<(typeof handlers)[keyof typeof handlers]["routes"]>, Layer.Layer.Context<(typeof handlers)[keyof typeof handlers]["routes"]>>;
|
|
75
|
+
[key: string]: Layer.Layer<never, any, any>;
|
|
76
|
+
}>(handlers: T) => Layer.Layer<never, Layer.Layer.Error<(typeof handlers)[keyof typeof handlers]>, Layer.Layer.Context<(typeof handlers)[keyof typeof handlers]>>;
|
|
80
77
|
Router: <const ModuleName extends string, const Resource extends Record<string, any>>(rsc: Resource & {
|
|
81
78
|
meta: {
|
|
82
79
|
moduleName: ModuleName;
|
|
@@ -97,9 +94,7 @@ export declare const makeRouter: <RequestContextMap extends Record<string, RPCCo
|
|
|
97
94
|
} ? 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[K]["config"]> | ContextProviderA>, Scope.Scope>>; }) => Generator<YieldWrap<Effect<any, any, any>>, { [K in keyof FilterRequestModules<Resource>]: AnyHandler<Resource[K]>; }, any>;
|
|
98
95
|
/** @deprecated */
|
|
99
96
|
readonly ಠ_ಠ: never;
|
|
100
|
-
}>(make: Make): {
|
|
101
|
-
moduleName: ModuleName;
|
|
102
|
-
routes: Layer.Layer<never, MakeErrors<Make> | Service.MakeDepsE<Make> | Layer.Error<typeof middleware.Default>, Service.MakeDepsIn<Make> | Layer.Context<typeof middleware.Default> | Exclude<MakeContext<Make>, MakeDepsOut<Make>> | RpcSerialization.RpcSerialization>;
|
|
97
|
+
}>(make: Make): Layer.Layer<never, MakeErrors<Make> | Service.MakeDepsE<Make> | Layer.Error<typeof middleware.Default>, Service.MakeDepsIn<Make> | Layer.Context<typeof middleware.Default> | Exclude<MakeContext<Make>, MakeDepsOut<Make>> | RpcSerialization.RpcSerialization> & {
|
|
103
98
|
[TypeTestId]: Make;
|
|
104
99
|
};
|
|
105
100
|
<const Make extends {
|
|
@@ -115,9 +110,7 @@ export declare const makeRouter: <RequestContextMap extends Record<string, RPCCo
|
|
|
115
110
|
} ? RequestTypes.RAW : RequestTypes.DECODED, Exclude<Exclude<Impl[K] extends {
|
|
116
111
|
raw: any;
|
|
117
112
|
} ? 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[K]["config"]> | ContextProviderA>, Scope.Scope>>; }) => Generator<YieldWrap<Effect<any, any, any>>, { [K in keyof FilterRequestModules<Resource>]: AnyHandler<Resource[K]>; }, any>;
|
|
118
|
-
}>(make: Make): {
|
|
119
|
-
moduleName: ModuleName;
|
|
120
|
-
routes: Layer.Layer<never, MakeErrors<Make> | Service.MakeDepsE<Make> | Layer.Error<typeof middleware.Default>, Service.MakeDepsIn<Make> | Layer.Context<typeof middleware.Default> | Exclude<MakeContext<Make>, MakeDepsOut<Make>> | RpcSerialization.RpcSerialization>;
|
|
113
|
+
}>(make: Make): Layer.Layer<never, MakeErrors<Make> | Service.MakeDepsE<Make> | Layer.Error<typeof middleware.Default>, Service.MakeDepsIn<Make> | Layer.Context<typeof middleware.Default> | Exclude<MakeContext<Make>, MakeDepsOut<Make>> | RpcSerialization.RpcSerialization> & {
|
|
121
114
|
readonly [TypeTestId]: Make;
|
|
122
115
|
};
|
|
123
116
|
};
|
|
@@ -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
|
@@ -77,7 +77,8 @@ export const makeRouter = (middleware, devMode) => {
|
|
|
77
77
|
return acc;
|
|
78
78
|
}, {});
|
|
79
79
|
const makeRoutes = (dependencies, make) => {
|
|
80
|
-
|
|
80
|
+
console.log({ dependencies, make });
|
|
81
|
+
const dependenciesL = (dependencies ? Layer.mergeAll(...dependencies) : Layer.empty);
|
|
81
82
|
const layer = Effect
|
|
82
83
|
.gen(function* () {
|
|
83
84
|
const finalMake = (make[Symbol.toStringTag] === "GeneratorFunction"
|
|
@@ -138,21 +139,18 @@ export const makeRouter = (middleware, devMode) => {
|
|
|
138
139
|
dependenciesL,
|
|
139
140
|
middleware.Default
|
|
140
141
|
]), Layer.provide(Layer.succeed(DevMode, devMode)));
|
|
141
|
-
return
|
|
142
|
-
moduleName: meta.moduleName,
|
|
143
|
-
routes
|
|
144
|
-
};
|
|
142
|
+
return routes;
|
|
145
143
|
};
|
|
146
144
|
const effect = ((make) => Object.assign(makeRoutes(make.dependencies, make.effect), { make }));
|
|
147
145
|
return effect;
|
|
148
146
|
}
|
|
149
147
|
function matchAll(handlers) {
|
|
150
148
|
const routers = typedValuesOf(handlers);
|
|
151
|
-
return Layer.mergeAll(...routers
|
|
149
|
+
return Layer.mergeAll(...routers);
|
|
152
150
|
}
|
|
153
151
|
return {
|
|
154
152
|
matchAll,
|
|
155
153
|
Router: matchFor
|
|
156
154
|
};
|
|
157
155
|
};
|
|
158
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
156
|
+
//# 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": "3.0.
|
|
3
|
+
"version": "3.0.3",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"proper-lockfile": "^4.1.2",
|
|
14
14
|
"pure-rand": "7.0.1",
|
|
15
15
|
"query-string": "^9.2.2",
|
|
16
|
-
"effect-app": "3.0.
|
|
16
|
+
"effect-app": "3.0.2"
|
|
17
17
|
},
|
|
18
18
|
"devDependencies": {
|
|
19
19
|
"@azure/cosmos": "^4.5.0",
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
1
2
|
import { Cause, Duration, Effect, Layer, ParseResult, Request, Schedule, type Schema } from "effect"
|
|
2
3
|
import * as MiddlewareNative from "effect-app/rpc/middleware-native"
|
|
3
4
|
import { pretty } from "effect-app/utils"
|
|
@@ -18,7 +19,7 @@ export const RequestCacheLayers = Layer.mergeAll(
|
|
|
18
19
|
|
|
19
20
|
export const RequestCacheMiddlewareLive = Layer.succeed(
|
|
20
21
|
MiddlewareNative.RequestCacheMiddleware,
|
|
21
|
-
(
|
|
22
|
+
(effect) => effect.pipe(Effect.provide(RequestCacheLayers))
|
|
22
23
|
)
|
|
23
24
|
|
|
24
25
|
// retry just once on optimistic concurrency exceptions
|
|
@@ -37,14 +38,14 @@ export const ConfigureInterruptibilityMiddlewareLive = Layer.effect(
|
|
|
37
38
|
cache.set(key, n)
|
|
38
39
|
return n
|
|
39
40
|
}
|
|
40
|
-
return ({
|
|
41
|
+
return (effect, { rpc }) => {
|
|
41
42
|
const method = getCached(rpc._tag, rpc.payloadSchema)
|
|
42
43
|
|
|
43
|
-
|
|
44
|
-
? Effect.retry(Effect.uninterruptible(
|
|
45
|
-
: Effect.interruptible(
|
|
44
|
+
effect = isCommand(method)
|
|
45
|
+
? Effect.retry(Effect.uninterruptible(effect), optimisticConcurrencySchedule)
|
|
46
|
+
: Effect.interruptible(effect)
|
|
46
47
|
|
|
47
|
-
return
|
|
48
|
+
return effect
|
|
48
49
|
}
|
|
49
50
|
})
|
|
50
51
|
)
|
|
@@ -53,7 +54,7 @@ export const LoggerMiddlewareLive = Layer.effect(
|
|
|
53
54
|
MiddlewareNative.LoggerMiddleware,
|
|
54
55
|
Effect.gen(function*() {
|
|
55
56
|
const devMode = yield* MiddlewareNative.DevMode
|
|
56
|
-
return ({ headers,
|
|
57
|
+
return (effect, { headers, payload, rpc }) =>
|
|
57
58
|
Effect
|
|
58
59
|
.annotateCurrentSpan({
|
|
59
60
|
"request.name": rpc._tag,
|
|
@@ -78,7 +79,7 @@ export const LoggerMiddlewareLive = Layer.effect(
|
|
|
78
79
|
})
|
|
79
80
|
.pipe(
|
|
80
81
|
// can't use andThen due to some being a function and effect
|
|
81
|
-
Effect.zipRight(
|
|
82
|
+
Effect.zipRight(effect),
|
|
82
83
|
// TODO: support ParseResult if the error channel of the request allows it.. but who would want that?
|
|
83
84
|
Effect.catchAll((_) => ParseResult.isParseError(_) ? Effect.die(_) : Effect.fail(_)),
|
|
84
85
|
Effect.tapErrorCause((cause) => Cause.isFailure(cause) ? logRequestError(cause) : Effect.void),
|
package/src/api/routing/tsort.ts
CHANGED
|
@@ -39,7 +39,7 @@ export function tsort(edges) {
|
|
|
39
39
|
return sorted
|
|
40
40
|
}
|
|
41
41
|
|
|
42
|
-
export const createEdges = <T extends { dependsOn?: readonly any[] }>(dep: readonly T[]) => {
|
|
42
|
+
export const createEdges = <T extends { dependsOn?: readonly any[] | undefined }>(dep: readonly T[]) => {
|
|
43
43
|
const result = []
|
|
44
44
|
dep.forEach((key) => {
|
|
45
45
|
key.dependsOn?.forEach((n) => {
|
|
@@ -49,7 +49,7 @@ export const createEdges = <T extends { dependsOn?: readonly any[] }>(dep: reado
|
|
|
49
49
|
return result
|
|
50
50
|
}
|
|
51
51
|
|
|
52
|
-
export const sort = <T>(dep: readonly (T & { dependsOn?: readonly any[] })[]): readonly T[] => {
|
|
52
|
+
export const sort = <T>(dep: readonly (T & { dependsOn?: readonly any[] | undefined })[]): readonly T[] => {
|
|
53
53
|
const edges = createEdges(dep)
|
|
54
54
|
const result = tsort(edges)
|
|
55
55
|
return result.concat(dep.filter((v) => !result.includes(v)))
|
package/src/api/routing.ts
CHANGED
|
@@ -347,7 +347,8 @@ export const makeRouter = <
|
|
|
347
347
|
match: any
|
|
348
348
|
) => Effect<THandlers, MakeE, MakeR> | Generator<YieldWrap<Effect<any, MakeE, MakeR>>, THandlers, any>
|
|
349
349
|
) => {
|
|
350
|
-
|
|
350
|
+
console.log({ dependencies, make })
|
|
351
|
+
const dependenciesL = (dependencies ? Layer.mergeAll(...dependencies as any) : Layer.empty) as Layer.Layer<
|
|
351
352
|
LayerUtils.GetLayersSuccess<MakeDependencies>,
|
|
352
353
|
LayerUtils.GetLayersError<MakeDependencies>,
|
|
353
354
|
LayerUtils.GetLayersContext<MakeDependencies>
|
|
@@ -449,10 +450,7 @@ export const makeRouter = <
|
|
|
449
450
|
Layer.provide(Layer.succeed(DevMode, devMode))
|
|
450
451
|
)
|
|
451
452
|
|
|
452
|
-
return
|
|
453
|
-
moduleName: meta.moduleName,
|
|
454
|
-
routes
|
|
455
|
-
}
|
|
453
|
+
return routes
|
|
456
454
|
}
|
|
457
455
|
|
|
458
456
|
const effect: {
|
|
@@ -476,10 +474,8 @@ export const makeRouter = <
|
|
|
476
474
|
}
|
|
477
475
|
>(
|
|
478
476
|
make: Make
|
|
479
|
-
):
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
routes: Layer.Layer<
|
|
477
|
+
):
|
|
478
|
+
& Layer.Layer<
|
|
483
479
|
never,
|
|
484
480
|
| MakeErrors<Make>
|
|
485
481
|
| Service.MakeDepsE<Make>
|
|
@@ -492,10 +488,10 @@ export const makeRouter = <
|
|
|
492
488
|
>
|
|
493
489
|
| RpcSerialization.RpcSerialization
|
|
494
490
|
>
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
491
|
+
& {
|
|
492
|
+
// just for type testing purposes
|
|
493
|
+
[TypeTestId]: Make
|
|
494
|
+
}
|
|
499
495
|
<
|
|
500
496
|
const Make extends {
|
|
501
497
|
dependencies?: Array<Layer.Layer.Any>
|
|
@@ -513,10 +509,8 @@ export const makeRouter = <
|
|
|
513
509
|
}
|
|
514
510
|
>(
|
|
515
511
|
make: Make
|
|
516
|
-
):
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
routes: Layer.Layer<
|
|
512
|
+
):
|
|
513
|
+
& Layer.Layer<
|
|
520
514
|
never,
|
|
521
515
|
| MakeErrors<Make>
|
|
522
516
|
| Service.MakeDepsE<Make>
|
|
@@ -529,10 +523,10 @@ export const makeRouter = <
|
|
|
529
523
|
>
|
|
530
524
|
| RpcSerialization.RpcSerialization
|
|
531
525
|
>
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
|
|
526
|
+
& {
|
|
527
|
+
// just for type testing purposes
|
|
528
|
+
readonly [TypeTestId]: Make
|
|
529
|
+
}
|
|
536
530
|
} =
|
|
537
531
|
((make: { dependencies: any; effect: any }) =>
|
|
538
532
|
Object.assign(makeRoutes(make.dependencies, make.effect), { make })) as any
|
|
@@ -542,20 +536,17 @@ export const makeRouter = <
|
|
|
542
536
|
|
|
543
537
|
function matchAll<
|
|
544
538
|
T extends {
|
|
545
|
-
[key: string]:
|
|
546
|
-
routes: Layer.Layer<never, any, any>
|
|
547
|
-
moduleName: string
|
|
548
|
-
}
|
|
539
|
+
[key: string]: Layer.Layer<never, any, any>
|
|
549
540
|
}
|
|
550
541
|
>(
|
|
551
542
|
handlers: T
|
|
552
543
|
) {
|
|
553
544
|
const routers = typedValuesOf(handlers)
|
|
554
545
|
|
|
555
|
-
return Layer.mergeAll(...routers
|
|
546
|
+
return Layer.mergeAll(...routers as [any]) as unknown as Layer.Layer<
|
|
556
547
|
never,
|
|
557
|
-
Layer.Layer.Error<typeof handlers[keyof typeof handlers]
|
|
558
|
-
Layer.Layer.Context<typeof handlers[keyof typeof handlers]
|
|
548
|
+
Layer.Layer.Error<typeof handlers[keyof typeof handlers]>,
|
|
549
|
+
Layer.Layer.Context<typeof handlers[keyof typeof handlers]>
|
|
559
550
|
>
|
|
560
551
|
}
|
|
561
552
|
|
package/test/controller.test.ts
CHANGED
|
@@ -12,15 +12,15 @@ import { sort } from "../src/api/routing/tsort.js"
|
|
|
12
12
|
import { AllowAnonymous, AllowAnonymousLive, CustomError1, RequestContextMap, RequireRoles, RequireRolesLive, Some, SomeElse, SomeService, Test, TestLive } from "./fixtures.js"
|
|
13
13
|
|
|
14
14
|
// @effect-diagnostics-next-line missingEffectServiceDependency:off
|
|
15
|
-
class MyContextProvider extends TagService<MyContextProvider
|
|
16
|
-
provides:
|
|
17
|
-
requires:
|
|
18
|
-
})({
|
|
15
|
+
class MyContextProvider extends TagService<MyContextProvider, {
|
|
16
|
+
provides: Some
|
|
17
|
+
requires: SomeElse
|
|
18
|
+
}>()("MyContextProvider", {})({
|
|
19
19
|
effect: Effect.gen(function*() {
|
|
20
20
|
yield* SomeService
|
|
21
21
|
if (Math.random() > 0.5) return yield* new CustomError1()
|
|
22
22
|
|
|
23
|
-
return Effect.fnUntraced(function*() {
|
|
23
|
+
return Effect.fnUntraced(function*(effect) {
|
|
24
24
|
yield* SomeElse
|
|
25
25
|
// the only requirements you can have are the one provided by HttpLayerRouter.Provided
|
|
26
26
|
yield* Scope.Scope
|
|
@@ -35,22 +35,22 @@ class MyContextProvider extends TagService<MyContextProvider>()("MyContextProvid
|
|
|
35
35
|
// this is allowed here but mergeContextProviders/MergedContextProvider will trigger an error
|
|
36
36
|
// if (Math.random() > 0.5) return yield* new CustomError2()
|
|
37
37
|
|
|
38
|
-
return
|
|
38
|
+
return yield* Effect.provideService(effect, Some, new Some({ a: 1 }))
|
|
39
39
|
})
|
|
40
40
|
})
|
|
41
41
|
}) {}
|
|
42
42
|
|
|
43
43
|
// @effect-diagnostics-next-line missingEffectServiceDependency:off
|
|
44
|
-
class MyContextProvider3 extends TagService<MyContextProvider3
|
|
45
|
-
provides:
|
|
46
|
-
requires:
|
|
47
|
-
})({
|
|
44
|
+
class MyContextProvider3 extends TagService<MyContextProvider3, {
|
|
45
|
+
provides: Some
|
|
46
|
+
requires: SomeElse
|
|
47
|
+
}>()("MyContextProvider3", {})({
|
|
48
48
|
dependencies: [Layer.effect(SomeService, SomeService.make)],
|
|
49
49
|
effect: Effect.gen(function*() {
|
|
50
50
|
yield* SomeService
|
|
51
51
|
if (Math.random() > 0.5) return yield* new CustomError1()
|
|
52
52
|
|
|
53
|
-
return Effect.fnUntraced(function*() {
|
|
53
|
+
return Effect.fnUntraced(function*(effect) {
|
|
54
54
|
yield* SomeElse
|
|
55
55
|
// the only requirements you can have are the one provided by HttpLayerRouter.Provided
|
|
56
56
|
yield* Scope.Scope
|
|
@@ -65,7 +65,7 @@ class MyContextProvider3 extends TagService<MyContextProvider3>()("MyContextProv
|
|
|
65
65
|
// this is allowed here but mergeContextProviders/MergedContextProvider will trigger an error
|
|
66
66
|
// if (Math.random() > 0.5) return yield* new CustomError2()
|
|
67
67
|
|
|
68
|
-
return
|
|
68
|
+
return yield* Effect.provideService(effect, Some, new Some({ a: 1 }))
|
|
69
69
|
})
|
|
70
70
|
})
|
|
71
71
|
}) {}
|
|
@@ -73,14 +73,14 @@ class MyContextProvider3 extends TagService<MyContextProvider3>()("MyContextProv
|
|
|
73
73
|
expectTypeOf(MyContextProvider3.Default).toEqualTypeOf<Layer.Layer<MyContextProvider3, CustomError1, never>>()
|
|
74
74
|
|
|
75
75
|
// @effect-diagnostics-next-line missingEffectServiceDependency:off
|
|
76
|
-
class MyContextProvider2 extends TagService<MyContextProvider2>()("MyContextProvider2", {
|
|
76
|
+
class MyContextProvider2 extends TagService<MyContextProvider2, { provides: SomeElse }>()("MyContextProvider2", {})({
|
|
77
77
|
effect: Effect.gen(function*() {
|
|
78
78
|
if (Math.random() > 0.5) return yield* new CustomError1()
|
|
79
79
|
|
|
80
|
-
return Effect.fnUntraced(function*() {
|
|
80
|
+
return Effect.fnUntraced(function*(effect) {
|
|
81
81
|
// we test without dependencies, so that we end up with an R of never.
|
|
82
82
|
|
|
83
|
-
return new SomeElse({ b: 2 })
|
|
83
|
+
return yield* Effect.provideService(effect, SomeElse, new SomeElse({ b: 2 }))
|
|
84
84
|
})
|
|
85
85
|
})
|
|
86
86
|
}) {}
|
|
@@ -89,16 +89,14 @@ class MyContextProvider2 extends TagService<MyContextProvider2>()("MyContextProv
|
|
|
89
89
|
|
|
90
90
|
const Str = Context.GenericTag<"str", "str">("str")
|
|
91
91
|
|
|
92
|
-
export class BogusMiddleware extends TagService<BogusMiddleware>()("BogusMiddleware", {
|
|
93
|
-
wrap: true
|
|
94
|
-
})({
|
|
92
|
+
export class BogusMiddleware extends TagService<BogusMiddleware>()("BogusMiddleware", {})({
|
|
95
93
|
effect: Effect.gen(function*() {
|
|
96
94
|
yield* Str
|
|
97
95
|
// yield* Effect.context<"test-dep">()
|
|
98
|
-
return (
|
|
96
|
+
return (effect) =>
|
|
99
97
|
Effect.gen(function*() {
|
|
100
98
|
// yield* Effect.context<"test-dep2">()
|
|
101
|
-
return yield*
|
|
99
|
+
return yield* effect
|
|
102
100
|
})
|
|
103
101
|
})
|
|
104
102
|
}) {
|
|
@@ -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;AAC7F,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAEnD,OAAO,EAAW,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAM7D,OAAO,EAAE,cAAc,EAAsB,YAAY,EAAE,iBAAiB,EAAE,YAAY,EAAoB,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAY,MAAM,eAAe,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;AAC7F,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAEnD,OAAO,EAAW,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAM7D,OAAO,EAAE,cAAc,EAAsB,YAAY,EAAE,iBAAiB,EAAE,YAAY,EAAoB,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAY,MAAM,eAAe,CAAA;;cAgEpG,QAAQ;;;;AAApF,cAAM,kBAAmB,SAAQ,uBAU/B;CAAG;;;;;;;AAML,qBAAa,eAAgB,SAAQ,oBAUnC;CACD;AAgED,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;AAUL,eAAO,MAAQ,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAAE,QAAQ;;qGAK9B,CAAA;AAED,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAGd,CAAA"}
|
package/test/dist/fixtures.d.ts
CHANGED
|
@@ -92,22 +92,14 @@ declare const SomeService_base: (abstract new (service: {
|
|
|
92
92
|
};
|
|
93
93
|
export declare class SomeService extends SomeService_base {
|
|
94
94
|
}
|
|
95
|
-
declare const SomeMiddleware_base: import("effect-app/rpc").TagClass<SomeMiddleware, "SomeMiddleware", {
|
|
96
|
-
|
|
95
|
+
declare const SomeMiddleware_base: import("effect-app/rpc").TagClass<SomeMiddleware, "SomeMiddleware", {}, {
|
|
96
|
+
provides: Some;
|
|
97
97
|
}>;
|
|
98
98
|
export declare class SomeMiddleware extends SomeMiddleware_base {
|
|
99
99
|
}
|
|
100
100
|
export declare const SomeMiddlewareLive: Layer.Layer<SomeMiddleware, never, never>;
|
|
101
|
-
declare const
|
|
102
|
-
|
|
103
|
-
readonly wrap: true;
|
|
104
|
-
}>;
|
|
105
|
-
export declare class SomeMiddlewareWrap extends SomeMiddlewareWrap_base {
|
|
106
|
-
}
|
|
107
|
-
export declare const SomeMiddlewareWrapLive: Layer.Layer<SomeMiddlewareWrap, never, never>;
|
|
108
|
-
declare const SomeElseMiddleware_base: import("effect-app/rpc").TagClass<SomeElseMiddleware, "SomeElseMiddleware", {
|
|
109
|
-
readonly provides: typeof SomeElse;
|
|
110
|
-
readonly wrap: true;
|
|
101
|
+
declare const SomeElseMiddleware_base: import("effect-app/rpc").TagClass<SomeElseMiddleware, "SomeElseMiddleware", {}, {
|
|
102
|
+
provides: SomeElse;
|
|
111
103
|
}>;
|
|
112
104
|
export declare class SomeElseMiddleware extends SomeElseMiddleware_base {
|
|
113
105
|
}
|
|
@@ -122,22 +114,27 @@ export interface RequestContextMap extends _RequestContextMap {
|
|
|
122
114
|
}
|
|
123
115
|
declare const AllowAnonymous_base: import("effect-app/rpc").TagClass<AllowAnonymous, "AllowAnonymous", {
|
|
124
116
|
readonly dynamic: import("effect-app/rpc").RpcDynamic<"allowAnonymous", RPCContextMap.Inverted<[typeof UserProfile], typeof NotLoggedInError>>;
|
|
125
|
-
|
|
117
|
+
}, {
|
|
118
|
+
requires: SomeElse;
|
|
126
119
|
}>;
|
|
127
120
|
export declare class AllowAnonymous extends AllowAnonymous_base {
|
|
128
121
|
}
|
|
129
122
|
export declare const AllowAnonymousLive: Layer.Layer<AllowAnonymous, never, never>;
|
|
130
123
|
declare const RequireRoles_base: import("effect-app/rpc").TagClass<RequireRoles, "RequireRoles", {
|
|
131
124
|
readonly dynamic: import("effect-app/rpc").RpcDynamic<"requireRoles", RPCContextMap.Custom<never, typeof UnauthorizedError, string[]>>;
|
|
132
|
-
readonly wrap: true;
|
|
133
125
|
readonly dependsOn: readonly [typeof AllowAnonymous];
|
|
126
|
+
}, {
|
|
127
|
+
requires: never;
|
|
128
|
+
provides: never;
|
|
134
129
|
}>;
|
|
135
130
|
export declare class RequireRoles extends RequireRoles_base {
|
|
136
131
|
}
|
|
137
132
|
export declare const RequireRolesLive: Layer.Layer<RequireRoles, never, SomeService>;
|
|
138
133
|
declare const Test_base: import("effect-app/rpc").TagClass<Test, "Test", {
|
|
139
|
-
readonly wrap: true;
|
|
140
134
|
readonly dynamic: import("effect-app/rpc").RpcDynamic<"test", RPCContextMap.RPCContextMap<never, typeof S.Never>>;
|
|
135
|
+
}, {
|
|
136
|
+
requires: never;
|
|
137
|
+
provides: never;
|
|
141
138
|
}>;
|
|
142
139
|
export declare class Test extends Test_base {
|
|
143
140
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAC7D,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;;;;;;;;;;;;;AAItF,qBAAa,WAAY,SAAQ,gBAKhC;CACA;;;;;;;;;;;;;;;;;;;;;;;;;AAED,qBAAa,IAAK,SAAQ,SAA2D;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;AACxF,qBAAa,QAAS,SAAQ,aAAmE;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;AAEpG,qBAAa,WAAY,SAAQ,gBAAgE;CAAG;;cAGhC,IAAI;;AAAxE,qBAAa,cAAe,SAAQ,mBAA+D;CAClG;AAED,eAAO,MAAM,kBAAkB,2CAM9B,CAAA;;cAE2E,QAAQ;;AAApF,qBAAa,kBAAmB,SAAQ,uBAA2E;CAAG;AAEtH,eAAO,MAAM,sBAAsB,+CAUlC,CAAA;AASD,eAAO,MAAM,iBAAiB;;;;CAIpB,CAAA;AAEV,KAAK,kBAAkB,GAAG,OAAO,iBAAiB,CAAA;AAClD,MAAM,WAAW,iBAAkB,SAAQ,kBAAkB;CAAG;;;;cAEI,QAAQ;;AAA5E,qBAAa,cAAe,SAAQ,mBAElC;CAAG;AAEL,eAAO,MAAM,kBAAkB,2CAyB9B,CAAA;;;;;;;;AAID,qBAAa,YAAa,SAAQ,iBAKhC;CAAG;AAEL,eAAO,MAAM,gBAAgB,+CAuB5B,CAAA;;;;;;;AAGD,qBAAa,IAAK,SAAQ,SAExB;CAAG;AAEL,eAAO,MAAM,QAAQ,iCAOpB,CAAA;;;;AAED,qBAAa,YAAa,SAAQ,iBAAmD;CAAG;;;;AACxF,qBAAa,YAAa,SAAQ,iBAAmD;CAAG"}
|
package/test/dist/fixtures.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Context, Effect, Layer,
|
|
1
|
+
import { Context, Effect, Layer, S, Scope } from "effect-app";
|
|
2
2
|
import { NotLoggedInError, RPCContextMap, UnauthorizedError } from "effect-app/client";
|
|
3
3
|
import { contextMap, getConfig, Tag } from "effect-app/rpc";
|
|
4
4
|
import { TaggedError } from "effect-app/Schema";
|
|
@@ -14,36 +14,20 @@ export class SomeElse extends Context.TagMakeId("SomeElse", Effect.succeed({ b:
|
|
|
14
14
|
const MakeSomeService = Effect.succeed({ a: 1 });
|
|
15
15
|
export class SomeService extends Context.TagMakeId("SomeService", MakeSomeService)() {
|
|
16
16
|
}
|
|
17
|
-
export class SomeMiddleware extends Tag()("SomeMiddleware", {
|
|
18
|
-
provides: Some
|
|
19
|
-
}) {
|
|
20
|
-
}
|
|
21
|
-
export const SomeMiddlewareLive = Layer.effect(SomeMiddleware, Effect.gen(function* () {
|
|
22
|
-
// yield* Effect.context<"test-dep">()
|
|
23
|
-
return () => Effect.gen(function* () {
|
|
24
|
-
return new Some({ a: 1 });
|
|
25
|
-
});
|
|
26
|
-
}));
|
|
27
17
|
// functionally equivalent to the one above
|
|
28
|
-
export class
|
|
29
|
-
provides: Some,
|
|
30
|
-
wrap: true
|
|
31
|
-
}) {
|
|
18
|
+
export class SomeMiddleware extends Tag()("SomeMiddleware", {}) {
|
|
32
19
|
}
|
|
33
|
-
export const
|
|
20
|
+
export const SomeMiddlewareLive = Layer.effect(SomeMiddleware, Effect.gen(function* () {
|
|
34
21
|
// yield* Effect.context<"test-dep">()
|
|
35
|
-
return (
|
|
22
|
+
return (effect) => effect.pipe(Effect.provideService(Some, new Some({ a: 1 })));
|
|
36
23
|
}));
|
|
37
|
-
export class SomeElseMiddleware extends Tag()("SomeElseMiddleware", {
|
|
38
|
-
provides: SomeElse,
|
|
39
|
-
wrap: true
|
|
40
|
-
}) {
|
|
24
|
+
export class SomeElseMiddleware extends Tag()("SomeElseMiddleware", {}) {
|
|
41
25
|
}
|
|
42
26
|
export const SomeElseMiddlewareLive = Layer.effect(SomeElseMiddleware, Effect.gen(function* () {
|
|
43
27
|
// yield* Effect.context<"test-dep">()
|
|
44
|
-
return (
|
|
28
|
+
return (effect) => Effect.gen(function* () {
|
|
45
29
|
// yield* Effect.context<"test-dep2">()
|
|
46
|
-
return yield*
|
|
30
|
+
return yield* effect.pipe(Effect.provideService(SomeElse, new SomeElse({ b: 2 })));
|
|
47
31
|
});
|
|
48
32
|
}));
|
|
49
33
|
const requestConfig = getConfig();
|
|
@@ -58,12 +42,11 @@ export const RequestContextMap = {
|
|
|
58
42
|
test: RPCContextMap.make(null, S.Never)
|
|
59
43
|
};
|
|
60
44
|
export class AllowAnonymous extends Tag()("AllowAnonymous", {
|
|
61
|
-
dynamic: contextMap(RequestContextMap, "allowAnonymous")
|
|
62
|
-
requires: SomeElse
|
|
45
|
+
dynamic: contextMap(RequestContextMap, "allowAnonymous")
|
|
63
46
|
}) {
|
|
64
47
|
}
|
|
65
48
|
export const AllowAnonymousLive = Layer.effect(AllowAnonymous, Effect.gen(function* () {
|
|
66
|
-
return Effect.fnUntraced(function* ({ headers, rpc }) {
|
|
49
|
+
return Effect.fnUntraced(function* (effect, { headers, rpc }) {
|
|
67
50
|
yield* SomeElse;
|
|
68
51
|
yield* Scope.Scope; // provided by HttpLayerRouter.Provided
|
|
69
52
|
const isLoggedIn = !!headers["x-user"];
|
|
@@ -71,20 +54,18 @@ export const AllowAnonymousLive = Layer.effect(AllowAnonymous, Effect.gen(functi
|
|
|
71
54
|
if (!requestConfig(rpc).allowAnonymous) {
|
|
72
55
|
return yield* new NotLoggedInError({ message: "Not logged in" });
|
|
73
56
|
}
|
|
74
|
-
return
|
|
57
|
+
return yield* effect;
|
|
75
58
|
}
|
|
76
|
-
return
|
|
59
|
+
return yield* Effect.provideService(effect, UserProfile, new UserProfile({
|
|
77
60
|
id: "whatever",
|
|
78
61
|
roles: ["user", ...headers["x-is-manager"] === "true" ? ["manager"] : []]
|
|
79
|
-
}))
|
|
62
|
+
}));
|
|
80
63
|
});
|
|
81
64
|
}));
|
|
82
65
|
// TODO: don't expect service when it's wrap
|
|
83
66
|
// @effect-diagnostics-next-line missingEffectServiceDependency:off
|
|
84
67
|
export class RequireRoles extends Tag()("RequireRoles", {
|
|
85
68
|
dynamic: contextMap(RequestContextMap, "requireRoles"),
|
|
86
|
-
wrap: true,
|
|
87
|
-
// wrap: true,
|
|
88
69
|
// had to move this in here, because once you put it manually as a readonly static property on the class,
|
|
89
70
|
// there's a weird issue where the fluent api stops behaving properly after adding this middleware via `addDynamicMiddleware`
|
|
90
71
|
dependsOn: [AllowAnonymous]
|
|
@@ -92,7 +73,7 @@ export class RequireRoles extends Tag()("RequireRoles", {
|
|
|
92
73
|
}
|
|
93
74
|
export const RequireRolesLive = Layer.effect(RequireRoles, Effect.gen(function* () {
|
|
94
75
|
yield* SomeService;
|
|
95
|
-
return Effect.fnUntraced(function* ({
|
|
76
|
+
return Effect.fnUntraced(function* (effect, { rpc }) {
|
|
96
77
|
// we don't know if the service will be provided or not, so we use option..
|
|
97
78
|
const userProfile = yield* Effect.serviceOption(UserProfile);
|
|
98
79
|
const { requireRoles } = requestConfig(rpc);
|
|
@@ -103,22 +84,21 @@ export const RequireRolesLive = Layer.effect(RequireRoles, Effect.gen(function*
|
|
|
103
84
|
if (requireRoles && !userProfile.value?.roles?.some((role) => requireRoles.includes(role))) {
|
|
104
85
|
return yield* new UnauthorizedError({ message: "don't have the right roles" });
|
|
105
86
|
}
|
|
106
|
-
return yield*
|
|
87
|
+
return yield* effect;
|
|
107
88
|
});
|
|
108
89
|
}));
|
|
109
90
|
// TODO: don't expect service when it's wrap
|
|
110
91
|
export class Test extends Tag()("Test", {
|
|
111
|
-
wrap: true,
|
|
112
92
|
dynamic: contextMap(RequestContextMap, "test")
|
|
113
93
|
}) {
|
|
114
94
|
}
|
|
115
95
|
export const TestLive = Layer.effect(Test, Effect.gen(function* () {
|
|
116
|
-
return Effect.fn(function* (
|
|
117
|
-
return yield*
|
|
96
|
+
return Effect.fn(function* (effect) {
|
|
97
|
+
return yield* effect;
|
|
118
98
|
});
|
|
119
99
|
}));
|
|
120
100
|
export class CustomError1 extends TaggedError()("CustomError1", {}) {
|
|
121
101
|
}
|
|
122
102
|
export class CustomError2 extends TaggedError()("CustomError1", {}) {
|
|
123
103
|
}
|
|
124
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
104
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZml4dHVyZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9maXh0dXJlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsQ0FBQyxFQUFFLEtBQUssRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUM3RCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsYUFBYSxFQUFFLGlCQUFpQixFQUFFLE1BQU0sbUJBQW1CLENBQUE7QUFDdEYsT0FBTyxFQUFFLFVBQVUsRUFBRSxTQUFTLEVBQUUsR0FBRyxFQUFFLE1BQU0sZ0JBQWdCLENBQUE7QUFDM0QsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBRS9DLE1BQU0sT0FBTyxXQUFZLFNBQVEsT0FBTyxDQUFDLFNBQVMsQ0FBMkIsYUFBYSxDQUFDLENBQ3pGLENBQUMsQ0FBQyxLQUFLLENBQWMsYUFBYSxDQUFDLENBQUM7SUFDbEMsRUFBRSxFQUFFLENBQUMsQ0FBQyxNQUFNO0lBQ1osS0FBSyxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQztDQUN6QixDQUFDLENBQ0g7Q0FDQTtBQUVELE1BQU0sT0FBTyxJQUFLLFNBQVEsT0FBTyxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQVE7Q0FBRztBQUN4RixNQUFNLE9BQU8sUUFBUyxTQUFRLE9BQU8sQ0FBQyxTQUFTLENBQUMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFZO0NBQUc7QUFDcEcsTUFBTSxlQUFlLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFBO0FBQ2hELE1BQU0sT0FBTyxXQUFZLFNB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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requires.test.d.ts","sourceRoot":"","sources":["../requires.test.ts"],"names":[],"mappings":"AAGA,OAAO,EAA2B,KAAK,EAAE,CAAC,EAAE,MAAM,YAAY,CAAA;AAC9D,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAGvE,OAAO,EAAE,cAAc,EAAyC,YAAY,EAAoB,IAAI,EAAE,kBAAkB,
|
|
1
|
+
{"version":3,"file":"requires.test.d.ts","sourceRoot":"","sources":["../requires.test.ts"],"names":[],"mappings":"AAGA,OAAO,EAA2B,KAAK,EAAE,CAAC,EAAE,MAAM,YAAY,CAAA;AAC9D,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAGvE,OAAO,EAAE,cAAc,EAAyC,YAAY,EAAoB,IAAI,EAAE,kBAAkB,EAA0B,cAAc,EAAmC,IAAI,EAAY,MAAM,eAAe,CAAA;;cAG/K,IAAI;;;;AAD7D,qBAAa,sBACX,SAAQ,2BASN;CAEH;AAkBD,eAAO,MAAM,eAAe;;;;;;;;;;SAKK,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-multi-middleware.test.d.ts","sourceRoot":"","sources":["../rpc-multi-middleware.test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAkD,MAAM,aAAa,CAAA;AAEvF,OAAO,EAA2B,KAAK,EAAE,MAAM,QAAQ,CAAA;AAOvD,OAAO,
|
|
1
|
+
{"version":3,"file":"rpc-multi-middleware.test.d.ts","sourceRoot":"","sources":["../rpc-multi-middleware.test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAkD,MAAM,aAAa,CAAA;AAEvF,OAAO,EAA2B,KAAK,EAAE,MAAM,QAAQ,CAAA;AAOvD,OAAO,EAA4M,WAAW,EAAE,MAAM,eAAe,CAAA;AA8CrP,eAAO,MAAM,OAAO,uFAWO,CAAA;AAiB3B,eAAO,MAAM,YAAY,yKAItB,CAAA;AAEH,eAAO,MAAM,YAAY,+FAgByB,CAAA"}
|
package/test/fixtures.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Context, Effect, Layer,
|
|
1
|
+
import { Context, Effect, Layer, S, Scope } from "effect-app"
|
|
2
2
|
import { NotLoggedInError, RPCContextMap, UnauthorizedError } from "effect-app/client"
|
|
3
3
|
import { contextMap, getConfig, Tag } from "effect-app/rpc"
|
|
4
4
|
import { TaggedError } from "effect-app/Schema"
|
|
@@ -16,49 +16,28 @@ export class SomeElse extends Context.TagMakeId("SomeElse", Effect.succeed({ b:
|
|
|
16
16
|
const MakeSomeService = Effect.succeed({ a: 1 })
|
|
17
17
|
export class SomeService extends Context.TagMakeId("SomeService", MakeSomeService)<SomeService>() {}
|
|
18
18
|
|
|
19
|
-
export class SomeMiddleware extends Tag<SomeMiddleware>()("SomeMiddleware", {
|
|
20
|
-
provides: Some
|
|
21
|
-
}) {}
|
|
22
|
-
|
|
23
|
-
export const SomeMiddlewareLive = Layer.effect(
|
|
24
|
-
SomeMiddleware,
|
|
25
|
-
Effect.gen(function*() {
|
|
26
|
-
// yield* Effect.context<"test-dep">()
|
|
27
|
-
return () =>
|
|
28
|
-
Effect.gen(function*() {
|
|
29
|
-
return new Some({ a: 1 })
|
|
30
|
-
})
|
|
31
|
-
})
|
|
32
|
-
)
|
|
33
|
-
|
|
34
19
|
// functionally equivalent to the one above
|
|
35
|
-
export class
|
|
36
|
-
provides: Some,
|
|
37
|
-
wrap: true
|
|
38
|
-
}) {
|
|
20
|
+
export class SomeMiddleware extends Tag<SomeMiddleware, { provides: Some }>()("SomeMiddleware", {}) {
|
|
39
21
|
}
|
|
40
22
|
|
|
41
|
-
export const
|
|
42
|
-
|
|
23
|
+
export const SomeMiddlewareLive = Layer.effect(
|
|
24
|
+
SomeMiddleware,
|
|
43
25
|
Effect.gen(function*() {
|
|
44
26
|
// yield* Effect.context<"test-dep">()
|
|
45
|
-
return (
|
|
27
|
+
return (effect) => effect.pipe(Effect.provideService(Some, new Some({ a: 1 })))
|
|
46
28
|
})
|
|
47
29
|
)
|
|
48
30
|
|
|
49
|
-
export class SomeElseMiddleware extends Tag<SomeElseMiddleware>()("SomeElseMiddleware", {
|
|
50
|
-
provides: SomeElse,
|
|
51
|
-
wrap: true
|
|
52
|
-
}) {}
|
|
31
|
+
export class SomeElseMiddleware extends Tag<SomeElseMiddleware, { provides: SomeElse }>()("SomeElseMiddleware", {}) {}
|
|
53
32
|
|
|
54
33
|
export const SomeElseMiddlewareLive = Layer.effect(
|
|
55
34
|
SomeElseMiddleware,
|
|
56
35
|
Effect.gen(function*() {
|
|
57
36
|
// yield* Effect.context<"test-dep">()
|
|
58
|
-
return (
|
|
37
|
+
return (effect) =>
|
|
59
38
|
Effect.gen(function*() {
|
|
60
39
|
// yield* Effect.context<"test-dep2">()
|
|
61
|
-
return yield*
|
|
40
|
+
return yield* effect.pipe(Effect.provideService(SomeElse, new SomeElse({ b: 2 })))
|
|
62
41
|
})
|
|
63
42
|
})
|
|
64
43
|
)
|
|
@@ -79,16 +58,15 @@ export const RequestContextMap = {
|
|
|
79
58
|
type _RequestContextMap = typeof RequestContextMap
|
|
80
59
|
export interface RequestContextMap extends _RequestContextMap {}
|
|
81
60
|
|
|
82
|
-
export class AllowAnonymous extends Tag<AllowAnonymous>()("AllowAnonymous", {
|
|
83
|
-
dynamic: contextMap(RequestContextMap, "allowAnonymous")
|
|
84
|
-
requires: SomeElse
|
|
61
|
+
export class AllowAnonymous extends Tag<AllowAnonymous, { requires: SomeElse }>()("AllowAnonymous", {
|
|
62
|
+
dynamic: contextMap(RequestContextMap, "allowAnonymous")
|
|
85
63
|
}) {}
|
|
86
64
|
|
|
87
65
|
export const AllowAnonymousLive = Layer.effect(
|
|
88
66
|
AllowAnonymous,
|
|
89
67
|
Effect.gen(function*() {
|
|
90
68
|
return Effect.fnUntraced(
|
|
91
|
-
function*({ headers, rpc }) {
|
|
69
|
+
function*(effect, { headers, rpc }) {
|
|
92
70
|
yield* SomeElse
|
|
93
71
|
yield* Scope.Scope // provided by HttpLayerRouter.Provided
|
|
94
72
|
const isLoggedIn = !!headers["x-user"]
|
|
@@ -96,16 +74,15 @@ export const AllowAnonymousLive = Layer.effect(
|
|
|
96
74
|
if (!requestConfig(rpc).allowAnonymous) {
|
|
97
75
|
return yield* new NotLoggedInError({ message: "Not logged in" })
|
|
98
76
|
}
|
|
99
|
-
return
|
|
77
|
+
return yield* effect
|
|
100
78
|
}
|
|
101
|
-
return
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
)
|
|
79
|
+
return yield* Effect.provideService(
|
|
80
|
+
effect,
|
|
81
|
+
UserProfile,
|
|
82
|
+
new UserProfile({
|
|
83
|
+
id: "whatever",
|
|
84
|
+
roles: ["user", ...headers["x-is-manager"] === "true" ? ["manager"] : []]
|
|
85
|
+
})
|
|
109
86
|
)
|
|
110
87
|
}
|
|
111
88
|
)
|
|
@@ -116,8 +93,6 @@ export const AllowAnonymousLive = Layer.effect(
|
|
|
116
93
|
// @effect-diagnostics-next-line missingEffectServiceDependency:off
|
|
117
94
|
export class RequireRoles extends Tag<RequireRoles>()("RequireRoles", {
|
|
118
95
|
dynamic: contextMap(RequestContextMap, "requireRoles"),
|
|
119
|
-
wrap: true,
|
|
120
|
-
// wrap: true,
|
|
121
96
|
// had to move this in here, because once you put it manually as a readonly static property on the class,
|
|
122
97
|
// there's a weird issue where the fluent api stops behaving properly after adding this middleware via `addDynamicMiddleware`
|
|
123
98
|
dependsOn: [AllowAnonymous]
|
|
@@ -128,7 +103,7 @@ export const RequireRolesLive = Layer.effect(
|
|
|
128
103
|
Effect.gen(function*() {
|
|
129
104
|
yield* SomeService
|
|
130
105
|
return Effect.fnUntraced(
|
|
131
|
-
function*({
|
|
106
|
+
function*(effect, { rpc }) {
|
|
132
107
|
// we don't know if the service will be provided or not, so we use option..
|
|
133
108
|
const userProfile = yield* Effect.serviceOption(UserProfile)
|
|
134
109
|
const { requireRoles } = requestConfig(rpc)
|
|
@@ -142,7 +117,7 @@ export const RequireRolesLive = Layer.effect(
|
|
|
142
117
|
if (requireRoles && !userProfile.value?.roles?.some((role) => requireRoles.includes(role))) {
|
|
143
118
|
return yield* new UnauthorizedError({ message: "don't have the right roles" })
|
|
144
119
|
}
|
|
145
|
-
return yield*
|
|
120
|
+
return yield* effect
|
|
146
121
|
}
|
|
147
122
|
)
|
|
148
123
|
})
|
|
@@ -150,15 +125,14 @@ export const RequireRolesLive = Layer.effect(
|
|
|
150
125
|
|
|
151
126
|
// TODO: don't expect service when it's wrap
|
|
152
127
|
export class Test extends Tag<Test>()("Test", {
|
|
153
|
-
wrap: true,
|
|
154
128
|
dynamic: contextMap(RequestContextMap, "test")
|
|
155
129
|
}) {}
|
|
156
130
|
|
|
157
131
|
export const TestLive = Layer.effect(
|
|
158
132
|
Test,
|
|
159
133
|
Effect.gen(function*() {
|
|
160
|
-
return Effect.fn(function*(
|
|
161
|
-
return yield*
|
|
134
|
+
return Effect.fn(function*(effect) {
|
|
135
|
+
return yield* effect
|
|
162
136
|
})
|
|
163
137
|
})
|
|
164
138
|
)
|
package/test/requires.test.ts
CHANGED
|
@@ -5,22 +5,20 @@ import { Context, Effect, Either, Layer, S } from "effect-app"
|
|
|
5
5
|
import { NotLoggedInError, UnauthorizedError } from "effect-app/client"
|
|
6
6
|
import { HttpHeaders } from "effect-app/http"
|
|
7
7
|
import { makeMiddleware, TagService } from "effect-app/rpc"
|
|
8
|
-
import { AllowAnonymous, AllowAnonymousLive, RequestContextMap, RequireRoles, RequireRolesLive, Some, SomeElseMiddleware, SomeElseMiddlewareLive, SomeMiddleware, SomeMiddlewareLive,
|
|
8
|
+
import { AllowAnonymous, AllowAnonymousLive, RequestContextMap, RequireRoles, RequireRolesLive, Some, SomeElseMiddleware, SomeElseMiddlewareLive, SomeMiddleware, SomeMiddlewareLive, SomeService, Test, TestLive } from "./fixtures.js"
|
|
9
9
|
|
|
10
|
-
export class RequiresSomeMiddleware
|
|
11
|
-
requires:
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
// yield* Effect.context<"test-dep">()
|
|
16
|
-
return ({ next }) =>
|
|
17
|
-
Effect.gen(function*() {
|
|
10
|
+
export class RequiresSomeMiddleware
|
|
11
|
+
extends TagService<RequiresSomeMiddleware, { requires: Some }>()("RequiresSomeMiddleware", {})({
|
|
12
|
+
effect: Effect.gen(function*() {
|
|
13
|
+
// yield* Effect.context<"test-dep">()
|
|
14
|
+
return Effect.fnUntraced(function*(effect) {
|
|
18
15
|
yield* Some
|
|
19
16
|
// yield* Effect.context<"test-dep2">()
|
|
20
|
-
return yield*
|
|
17
|
+
return yield* effect
|
|
21
18
|
})
|
|
19
|
+
})
|
|
22
20
|
})
|
|
23
|
-
|
|
21
|
+
{
|
|
24
22
|
}
|
|
25
23
|
|
|
26
24
|
const middleware3 = makeMiddleware(RequestContextMap)
|
|
@@ -41,14 +39,14 @@ const _middlewareSidewaysFully = makeMiddleware(RequestContextMap)
|
|
|
41
39
|
|
|
42
40
|
export const _middleware3Bis = makeMiddleware(RequestContextMap)
|
|
43
41
|
.middleware(RequiresSomeMiddleware)
|
|
44
|
-
.middleware(
|
|
42
|
+
.middleware(SomeMiddleware)
|
|
45
43
|
.middleware(RequireRoles)
|
|
46
44
|
.middleware(AllowAnonymous, Test)
|
|
47
45
|
.middleware(SomeElseMiddleware)
|
|
48
46
|
|
|
49
47
|
expectTypeOf(_middlewareSideways).toEqualTypeOf<typeof middleware3>()
|
|
50
48
|
expectTypeOf(_middlewareSidewaysFully).toEqualTypeOf<typeof _middlewareSideways>()
|
|
51
|
-
expectTypeOf(_middleware3Bis).
|
|
49
|
+
expectTypeOf(_middleware3Bis).toEqualTypeOf<typeof middleware3>()
|
|
52
50
|
|
|
53
51
|
class TestRequest extends S.TaggedRequest<Test>("Test")("Test", {
|
|
54
52
|
payload: {},
|
|
@@ -9,12 +9,12 @@ import { HttpLayerRouter } from "effect-app/http"
|
|
|
9
9
|
import { DefaultGenericMiddlewares, makeMiddleware, middlewareGroup } from "effect-app/rpc"
|
|
10
10
|
import { createServer } from "http"
|
|
11
11
|
import { DefaultGenericMiddlewaresLive } from "../src/api/routing.js"
|
|
12
|
-
import { AllowAnonymous, AllowAnonymousLive, RequestContextMap, RequireRoles, RequireRolesLive, Some, SomeElseMiddleware, SomeElseMiddlewareLive,
|
|
12
|
+
import { AllowAnonymous, AllowAnonymousLive, RequestContextMap, RequireRoles, RequireRolesLive, Some, SomeElseMiddleware, SomeElseMiddlewareLive, SomeMiddleware, SomeMiddlewareLive, SomeService, Test, TestLive, UserProfile } from "./fixtures.js"
|
|
13
13
|
|
|
14
14
|
const middleware = makeMiddleware(RequestContextMap)
|
|
15
15
|
.middleware(RequireRoles)
|
|
16
16
|
.middleware(AllowAnonymous, Test)
|
|
17
|
-
.middleware(SomeElseMiddleware,
|
|
17
|
+
.middleware(SomeElseMiddleware, SomeMiddleware)
|
|
18
18
|
.middleware(...DefaultGenericMiddlewares)
|
|
19
19
|
|
|
20
20
|
const UserRpcs = middlewareGroup(middleware)(RpcGroup
|
|
@@ -76,7 +76,7 @@ const middlwareLayer = middleware
|
|
|
76
76
|
Layer.provide([
|
|
77
77
|
DefaultGenericMiddlewaresLive,
|
|
78
78
|
SomeElseMiddlewareLive,
|
|
79
|
-
|
|
79
|
+
SomeMiddlewareLive,
|
|
80
80
|
TestLive,
|
|
81
81
|
RequireRolesLive.pipe(Layer.provide(SomeService.toLayer())),
|
|
82
82
|
AllowAnonymousLive
|