effect-app 2.47.2 → 2.48.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.
- package/CHANGELOG.md +6 -0
- package/dist/client/apiClientFactory.d.ts +1 -1
- package/dist/client/req.d.ts +11 -11
- package/dist/client/req.d.ts.map +1 -1
- package/dist/client/req.js +1 -1
- package/package.json +1 -1
- package/src/client/req.ts +22 -22
package/CHANGELOG.md
CHANGED
|
@@ -44,7 +44,7 @@ declare const ApiClientFactory_base: (abstract new (service: (requestLevelLayers
|
|
|
44
44
|
raw: import("./clientFor.js").RequestHandler<S.Schema.Type<Omit<M, "meta">[K]["success"]>, S.Schema.Type<Omit<M, "meta">[K]["failure"]>, never, Omit<M, "meta">[K]>;
|
|
45
45
|
} : import("./clientFor.js").RequestHandlerWithInput<Omit<S.Schema.Type<Omit<M, "meta">[K]>, typeof S.symbolSerializable | typeof S.symbolWithResult | "_tag" | typeof import("effect/Request").RequestTypeId>, S.Schema.Type<Omit<M, "meta">[K]["success"]>, S.Schema.Type<Omit<M, "meta">[K]["failure"]>, never, Omit<M, "meta">[K]> & {
|
|
46
46
|
raw: import("./clientFor.js").RequestHandlerWithInput<Omit<S.Schema.Type<Omit<M, "meta">[K]>, typeof S.symbolSerializable | typeof S.symbolWithResult | "_tag" | typeof import("effect/Request").RequestTypeId>, S.Schema.Encoded<Omit<M, "meta">[K]["success"]>, S.Schema.Type<Omit<M, "meta">[K]["failure"]>, never, Omit<M, "meta">[K]>;
|
|
47
|
-
}; } : never>) => X) => X extends Effect.Effect<infer A, infer E, infer R> ? Effect.Effect<A, E,
|
|
47
|
+
}; } : never>) => X) => X extends Effect.Effect<infer A, infer E, infer R> ? Effect.Effect<A, E, R | ApiClientFactory> : Effect.Effect<X, never, ApiClientFactory>;
|
|
48
48
|
};
|
|
49
49
|
/**
|
|
50
50
|
* Used to create clients for resource modules.
|
package/dist/client/req.d.ts
CHANGED
|
@@ -34,15 +34,15 @@ export declare namespace RPCContextMap {
|
|
|
34
34
|
contextActivation: any;
|
|
35
35
|
};
|
|
36
36
|
}
|
|
37
|
-
export type GetEffectContext<
|
|
38
|
-
[key in keyof
|
|
37
|
+
export type GetEffectContext<RequestContextMap extends Record<string, RPCContextMap.Any>, T> = Values<{
|
|
38
|
+
[key in keyof RequestContextMap as RequestContextMap[key]["contextActivation"] extends true ? never : key extends keyof T ? T[key] extends true ? never : RequestContextMap[key]["key"] : RequestContextMap[key]["key"]]: RequestContextMap[key]["service"];
|
|
39
39
|
} & {
|
|
40
|
-
[key in keyof
|
|
40
|
+
[key in keyof RequestContextMap as RequestContextMap[key]["contextActivation"] extends false ? never : key extends keyof T ? T[key] extends true ? RequestContextMap[key]["key"] : never : never]: RequestContextMap[key]["service"];
|
|
41
41
|
}>;
|
|
42
|
-
export type GetEffectError<
|
|
43
|
-
[key in keyof
|
|
42
|
+
export type GetEffectError<RequestContextMap extends Record<string, RPCContextMap.Any>, T> = Values<{
|
|
43
|
+
[key in keyof RequestContextMap as RequestContextMap[key]["contextActivation"] extends true ? never : key extends keyof T ? T[key] extends true ? never : RequestContextMap[key]["key"] : RequestContextMap[key]["key"]]: RequestContextMap[key]["error"];
|
|
44
44
|
} & {
|
|
45
|
-
[key in keyof
|
|
45
|
+
[key in keyof RequestContextMap as RequestContextMap[key]["contextActivation"] extends false ? never : key extends keyof T ? T[key] extends true ? RequestContextMap[key]["key"] : never : never]: RequestContextMap[key]["error"];
|
|
46
46
|
}>;
|
|
47
47
|
type JoinSchema<T> = T extends ReadonlyArray<S.Schema.All> ? S.Union<T> : typeof S.Never;
|
|
48
48
|
/**
|
|
@@ -60,14 +60,14 @@ type JoinSchema<T> = T extends ReadonlyArray<S.Schema.All> ? S.Union<T> : typeof
|
|
|
60
60
|
* ```
|
|
61
61
|
*/
|
|
62
62
|
type SchemaOrFields<T> = T extends S.Struct.Fields ? S.TypeLiteral<T, []> : T extends S.Schema.Any ? T : never;
|
|
63
|
-
export declare const makeRpcClient: <RequestConfig extends object,
|
|
63
|
+
export declare const makeRpcClient: <RequestConfig extends object, RequestContextMap extends Record<string, RPCContextMap.Any>, GeneralErrors extends S.Schema.All = never>(errors: { [K in keyof RequestContextMap]: RequestContextMap[K]["error"]; }, generalErrors?: GeneralErrors) => {
|
|
64
64
|
TaggedRequest: <Self>() => {
|
|
65
65
|
<Tag extends string, Payload extends S.Struct.Fields, C extends {
|
|
66
66
|
success: S.Schema.Any | S.Struct.Fields;
|
|
67
67
|
failure: S.Schema.Any | S.Struct.Fields;
|
|
68
68
|
}>(tag: Tag, fields: Payload, config: RequestConfig & C): S.TaggedRequestClass<Self, Tag, {
|
|
69
69
|
readonly _tag: S.tag<Tag>;
|
|
70
|
-
} & Payload, SchemaOrFields<(typeof config)["success"]>, JoinSchema<[SchemaOrFields<(typeof config)["failure"]> | GetEffectError<
|
|
70
|
+
} & Payload, SchemaOrFields<(typeof config)["success"]>, JoinSchema<[SchemaOrFields<(typeof config)["failure"]> | GetEffectError<RequestContextMap, C> | GeneralErrors]>> & {
|
|
71
71
|
config: Omit<C, "success" | "failure">;
|
|
72
72
|
};
|
|
73
73
|
<Tag extends string, Payload_1 extends S.Struct.Fields, C_1 extends Pick<{
|
|
@@ -75,7 +75,7 @@ export declare const makeRpcClient: <RequestConfig extends object, CTXMap extend
|
|
|
75
75
|
failure: S.Schema.Any | S.Struct.Fields;
|
|
76
76
|
}, "success">>(tag: Tag, fields: Payload_1, config: RequestConfig & C_1): S.TaggedRequestClass<Self, Tag, {
|
|
77
77
|
readonly _tag: S.tag<Tag>;
|
|
78
|
-
} & Payload_1, SchemaOrFields<(typeof config)["success"]>, JoinSchema<[GetEffectError<
|
|
78
|
+
} & Payload_1, SchemaOrFields<(typeof config)["success"]>, JoinSchema<[GetEffectError<RequestContextMap, C_1> | GeneralErrors]>> & {
|
|
79
79
|
config: Omit<C_1, "success" | "failure">;
|
|
80
80
|
};
|
|
81
81
|
<Tag extends string, Payload_2 extends S.Struct.Fields, C_2 extends Pick<{
|
|
@@ -83,12 +83,12 @@ export declare const makeRpcClient: <RequestConfig extends object, CTXMap extend
|
|
|
83
83
|
failure: S.Schema.Any | S.Struct.Fields;
|
|
84
84
|
}, "failure">>(tag: Tag, fields: Payload_2, config: RequestConfig & C_2): S.TaggedRequestClass<Self, Tag, {
|
|
85
85
|
readonly _tag: S.tag<Tag>;
|
|
86
|
-
} & Payload_2, typeof S.Void, JoinSchema<[SchemaOrFields<(typeof config)["failure"]> | GetEffectError<
|
|
86
|
+
} & Payload_2, typeof S.Void, JoinSchema<[SchemaOrFields<(typeof config)["failure"]> | GetEffectError<RequestContextMap, C_2> | GeneralErrors]>> & {
|
|
87
87
|
config: Omit<C_2, "success" | "failure">;
|
|
88
88
|
};
|
|
89
89
|
<Tag extends string, Payload_3 extends S.Struct.Fields, C_3 extends Record<string, any>>(tag: Tag, fields: Payload_3, config: C_3 & RequestConfig): S.TaggedRequestClass<Self, Tag, {
|
|
90
90
|
readonly _tag: S.tag<Tag>;
|
|
91
|
-
} & Payload_3, typeof S.Void, JoinSchema<[GetEffectError<
|
|
91
|
+
} & Payload_3, typeof S.Void, JoinSchema<[GetEffectError<RequestContextMap, C_3> | GeneralErrors]>> & {
|
|
92
92
|
config: Omit<C_3, "success" | "failure">;
|
|
93
93
|
};
|
|
94
94
|
<Tag extends string, Payload_4 extends S.Struct.Fields>(tag: Tag, fields: Payload_4): S.TaggedRequestClass<Self, Tag, {
|
package/dist/client/req.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"req.d.ts","sourceRoot":"","sources":["../../src/client/req.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,oBAAoB,CAAA;AACtC,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC;;;GAGG;AACH,MAAM,MAAM,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC,IAAI;IAC3C,GAAG,EAAE,GAAG,CAAA;IACR,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,CAAC,CAAA;IACR,iBAAiB,EAAE,IAAI,CAAA;CACxB,CAAA;AAED,MAAM,CAAC,OAAO,WAAW,aAAa,CAAC;IACrC,KAAY,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,IAAI;QAC5C,GAAG,EAAE,GAAG,CAAA;QACR,OAAO,EAAE,OAAO,CAAA;QAChB,KAAK,EAAE,CAAC,CAAA;QACR,iBAAiB,EAAE,MAAM,CAAA;KAC1B,CAAA;IAED;;;OAGG;IACH,KAAY,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC,IAAI;QACtC,GAAG,EAAE,GAAG,CAAA;QACR,OAAO,EAAE,OAAO,CAAA;QAChB,KAAK,EAAE,CAAC,CAAA;QACR,iBAAiB,EAAE,KAAK,CAAA;KACzB,CAAA;IAED,KAAY,GAAG,GAAG;QAChB,GAAG,EAAE,MAAM,CAAA;QACX,OAAO,EAAE,GAAG,CAAA;QACZ,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAA;QACnB,iBAAiB,EAAE,GAAG,CAAA;KACvB,CAAA;CACF;AAED,MAAM,MAAM,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"req.d.ts","sourceRoot":"","sources":["../../src/client/req.ts"],"names":[],"mappings":"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"}
|
package/dist/client/req.js
CHANGED
|
@@ -35,4 +35,4 @@ export const makeRpcClient = (errors, generalErrors) => {
|
|
|
35
35
|
TaggedRequest
|
|
36
36
|
};
|
|
37
37
|
};
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVxLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaWVudC9yZXEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsNERBQTREO0FBQzVELHdEQUF3RDtBQUN4RCx1REFBdUQ7QUFFdkQsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBc0Z0QyxNQUFNLEtBQUssR0FBRyxDQUFDLENBQU0sRUFBRSxDQUFhLEVBQUUsRUFBRSxDQUN0QyxDQUFDLEtBQUssU0FBUyxJQUFJLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFBO0FBa0IzRzs7R0FFRztBQUNILE1BQU0sU0FBUyxHQUFtQixDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsQ0FBQyxLQUFLLENBQUMsRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxDQUFBO0FBRTVHLE1BQU0sQ0FBQyxNQUFNLGFBQWEsR0FBRyxDQUszQixNQUF5RSxFQUN6RSxhQUE2QixFQUM3QixFQUFFO0lBT0YsU0FBUyxhQUFhO1FBdUVwQiwrREFBK0Q7UUFDL0QsTUFBTSxZQUFZLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQUMxQyxPQUFPLENBQUMsQ0FDTixHQUFRLEVBQ1IsTUFBYyxFQUNkLE1BQVUsRUFDVixFQUFFO1lBQ0YsMkVBQTJFO1lBQzNFLE1BQU0sR0FBRyxHQUFHLENBQUMsQ0FBQyxhQUFhLEVBQVEsQ0FBQyxHQUFHLEVBQUU7Z0JBQ3ZDLE9BQU8sRUFBRSxNQUFNO2dCQUNmLDhDQUE4QztnQkFDOUMsT0FBTyxFQUFFLEtBQUssQ0FDWixNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsRUFDcEcsQ0FBQyxHQUFHLFlBQVksRUFBRSxhQUFhLENBQUMsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQ2pEO2dCQUNELE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTztvQkFDdEIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQzt3QkFDMUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLE9BQU87d0JBQ3RFLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUM7b0JBQzVCLENBQUMsQ0FBQyxTQUFTO2FBQ2QsQ0FBQyxDQUFBO1lBQ0YsT0FBTyxLQUFNLFNBQVMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsRUFBRSxNQUFNLEVBQUUsQ0FBUztnQkFDMUQsWUFBWSxPQUFZLEVBQUUsb0JBQXlCLElBQUk7b0JBQ3JELDZEQUE2RDtvQkFDN0QsS0FBSyxDQUFDLE9BQU8sRUFBRSxpQkFBaUIsQ0FBQyxDQUFBO2dCQUNuQyxDQUFDO2FBQ0YsQ0FBQTtRQUNILENBQUMsQ0FBUSxDQUFBO0lBQ1gsQ0FBQztJQUVELE9BQU87UUFDTCxhQUFhO0tBQ2QsQ0FBQTtBQUNILENBQUMsQ0FBQSJ9
|
package/package.json
CHANGED
package/src/client/req.ts
CHANGED
|
@@ -43,45 +43,45 @@ export declare namespace RPCContextMap {
|
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
|
|
46
|
-
export type GetEffectContext<
|
|
46
|
+
export type GetEffectContext<RequestContextMap extends Record<string, RPCContextMap.Any>, T> = Values<
|
|
47
47
|
// inverted: contextActivation is false => remove if explicitly set to true (like allowAnonymous: true disables auth and auth service and related errors)
|
|
48
48
|
& {
|
|
49
49
|
[
|
|
50
|
-
key in keyof
|
|
51
|
-
: key extends keyof T ? T[key] extends true ? never :
|
|
52
|
-
:
|
|
50
|
+
key in keyof RequestContextMap as RequestContextMap[key]["contextActivation"] extends true ? never
|
|
51
|
+
: key extends keyof T ? T[key] extends true ? never : RequestContextMap[key]["key"]
|
|
52
|
+
: RequestContextMap[key]["key"]
|
|
53
53
|
]: // TODO: or as an Optional available?
|
|
54
|
-
|
|
54
|
+
RequestContextMap[key]["service"]
|
|
55
55
|
}
|
|
56
56
|
// normal: contextActivation is true => add if explicitly set to true
|
|
57
57
|
& {
|
|
58
58
|
[
|
|
59
|
-
key in keyof
|
|
60
|
-
: key extends keyof T ? T[key] extends true ?
|
|
59
|
+
key in keyof RequestContextMap as RequestContextMap[key]["contextActivation"] extends false ? never
|
|
60
|
+
: key extends keyof T ? T[key] extends true ? RequestContextMap[key]["key"] : never
|
|
61
61
|
: never
|
|
62
62
|
]: // TODO: or as an Optional available?
|
|
63
|
-
|
|
63
|
+
RequestContextMap[key]["service"]
|
|
64
64
|
}
|
|
65
65
|
>
|
|
66
66
|
|
|
67
|
-
export type GetEffectError<
|
|
67
|
+
export type GetEffectError<RequestContextMap extends Record<string, RPCContextMap.Any>, T> = Values<
|
|
68
68
|
// inverted: contextActivation is false => remove if explicitly set to true (like allowAnonymous: true disables auth and auth service and related errors)
|
|
69
69
|
& {
|
|
70
70
|
[
|
|
71
|
-
key in keyof
|
|
72
|
-
: key extends keyof T ? T[key] extends true ? never :
|
|
73
|
-
:
|
|
71
|
+
key in keyof RequestContextMap as RequestContextMap[key]["contextActivation"] extends true ? never
|
|
72
|
+
: key extends keyof T ? T[key] extends true ? never : RequestContextMap[key]["key"]
|
|
73
|
+
: RequestContextMap[key]["key"]
|
|
74
74
|
]: // TODO: or as an Optional available?
|
|
75
|
-
|
|
75
|
+
RequestContextMap[key]["error"]
|
|
76
76
|
}
|
|
77
77
|
// normal: contextActivation is true => add if explicitly set to true
|
|
78
78
|
& {
|
|
79
79
|
[
|
|
80
|
-
key in keyof
|
|
81
|
-
: key extends keyof T ? T[key] extends true ?
|
|
80
|
+
key in keyof RequestContextMap as RequestContextMap[key]["contextActivation"] extends false ? never
|
|
81
|
+
: key extends keyof T ? T[key] extends true ? RequestContextMap[key]["key"] : never
|
|
82
82
|
: never
|
|
83
83
|
]: // TODO: or as an Optional available?
|
|
84
|
-
|
|
84
|
+
RequestContextMap[key]["error"]
|
|
85
85
|
}
|
|
86
86
|
>
|
|
87
87
|
|
|
@@ -114,10 +114,10 @@ const ForceVoid: S.Schema<void> = S.transform(S.Any, S.Void, { decode: () => voi
|
|
|
114
114
|
|
|
115
115
|
export const makeRpcClient = <
|
|
116
116
|
RequestConfig extends object,
|
|
117
|
-
|
|
117
|
+
RequestContextMap extends Record<string, RPCContextMap.Any>,
|
|
118
118
|
GeneralErrors extends S.Schema.All = never
|
|
119
119
|
>(
|
|
120
|
-
errors: { [K in keyof
|
|
120
|
+
errors: { [K in keyof RequestContextMap]: RequestContextMap[K]["error"] },
|
|
121
121
|
generalErrors?: GeneralErrors
|
|
122
122
|
) => {
|
|
123
123
|
// Long way around Context/C extends etc to support actual jsdoc from passed in RequestConfig etc... (??)
|
|
@@ -138,7 +138,7 @@ export const makeRpcClient = <
|
|
|
138
138
|
{ readonly _tag: S.tag<Tag> } & Payload,
|
|
139
139
|
SchemaOrFields<typeof config["success"]>,
|
|
140
140
|
JoinSchema<
|
|
141
|
-
[SchemaOrFields<typeof config["failure"]> | GetEffectError<
|
|
141
|
+
[SchemaOrFields<typeof config["failure"]> | GetEffectError<RequestContextMap, C> | GeneralErrors]
|
|
142
142
|
>
|
|
143
143
|
>
|
|
144
144
|
& { config: Omit<C, "success" | "failure"> }
|
|
@@ -152,7 +152,7 @@ export const makeRpcClient = <
|
|
|
152
152
|
Tag,
|
|
153
153
|
{ readonly _tag: S.tag<Tag> } & Payload,
|
|
154
154
|
SchemaOrFields<typeof config["success"]>,
|
|
155
|
-
JoinSchema<[GetEffectError<
|
|
155
|
+
JoinSchema<[GetEffectError<RequestContextMap, C> | GeneralErrors]>
|
|
156
156
|
>
|
|
157
157
|
& { config: Omit<C, "success" | "failure"> }
|
|
158
158
|
<Tag extends string, Payload extends S.Struct.Fields, C extends Pick<Context, "failure">>(
|
|
@@ -166,7 +166,7 @@ export const makeRpcClient = <
|
|
|
166
166
|
{ readonly _tag: S.tag<Tag> } & Payload,
|
|
167
167
|
typeof S.Void,
|
|
168
168
|
JoinSchema<
|
|
169
|
-
[SchemaOrFields<typeof config["failure"]> | GetEffectError<
|
|
169
|
+
[SchemaOrFields<typeof config["failure"]> | GetEffectError<RequestContextMap, C> | GeneralErrors]
|
|
170
170
|
>
|
|
171
171
|
>
|
|
172
172
|
& { config: Omit<C, "success" | "failure"> }
|
|
@@ -180,7 +180,7 @@ export const makeRpcClient = <
|
|
|
180
180
|
Tag,
|
|
181
181
|
{ readonly _tag: S.tag<Tag> } & Payload,
|
|
182
182
|
typeof S.Void,
|
|
183
|
-
JoinSchema<[GetEffectError<
|
|
183
|
+
JoinSchema<[GetEffectError<RequestContextMap, C> | GeneralErrors]>
|
|
184
184
|
>
|
|
185
185
|
& { config: Omit<C, "success" | "failure"> }
|
|
186
186
|
<Tag extends string, Payload extends S.Struct.Fields>(
|