@orpc/experimental-effect 2.0.0-beta.4 → 2.0.0-beta.6
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/README.md +1 -1
- package/dist/extensions/effect.d.mts +7 -8
- package/dist/extensions/effect.d.ts +7 -8
- package/dist/extensions/effect.mjs +1 -1
- package/dist/extensions/input-output.d.mts +18 -18
- package/dist/extensions/input-output.d.ts +18 -18
- package/dist/extensions/input-output.mjs +8 -5
- package/dist/index.d.mts +6 -12
- package/dist/index.d.ts +6 -12
- package/dist/index.mjs +7 -13
- package/dist/shared/experimental-effect.C9oJcd5q.mjs +34 -0
- package/dist/shared/{experimental-effect.CuTs7Ks0.d.mts → experimental-effect.Cw48Xdc-.d.mts} +8 -9
- package/dist/shared/{experimental-effect.CuTs7Ks0.d.ts → experimental-effect.Cw48Xdc-.d.ts} +8 -9
- package/dist/shared/{experimental-effect.B68ZlIzV.mjs → experimental-effect.YQKompVf.mjs} +1 -1
- package/package.json +7 -7
- package/dist/shared/experimental-effect.dulfW-wX.mjs +0 -40
package/README.md
CHANGED
|
@@ -134,7 +134,6 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
|
|
|
134
134
|
</tr>
|
|
135
135
|
<tr>
|
|
136
136
|
<td align="center"><a href="https://github.com/piscis?ref=orpc" target="_blank" rel="noopener" title="Alex"><img src="https://avatars.githubusercontent.com/u/326163?u=b245f368bd940cf51d08c0b6bf55f8257f359437&v=4" width="119" alt="Alex"/><br />Alex</a></td>
|
|
137
|
-
<td align="center"><a href="https://github.com/nattstack?ref=orpc" target="_blank" rel="noopener" title="nattstack"><img src="https://avatars.githubusercontent.com/u/31426677?u=fa9dbb8b3e66eb0ea3c88db5dc07f31c8c5418fe&v=4" width="119" alt="nattstack"/><br />nattstack</a></td>
|
|
138
137
|
<td align="center"><a href="https://github.com/finom?ref=orpc" target="_blank" rel="noopener" title="Andrey Gubanov"><img src="https://avatars.githubusercontent.com/u/1082083?u=29e91400dbd4a9c217048a8f59562c4f740498e6&v=4" width="119" alt="Andrey Gubanov"/><br />Andrey Gubanov</a></td>
|
|
139
138
|
</tr>
|
|
140
139
|
</table>
|
|
@@ -173,6 +172,7 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
|
|
|
173
172
|
<a href="https://github.com/illarionvk?ref=orpc" target="_blank" rel="noopener" title="Illarion Koperski"><img src="https://avatars.githubusercontent.com/u/5012724?u=7cfa13652f7ac5fb3c56d880e3eb3fbe40c3ea34&v=4" width="32" height="32" alt="Illarion Koperski" /></a>
|
|
174
173
|
<a href="https://github.com/steelbrain?ref=orpc" target="_blank" rel="noopener" title="Anees Iqbal"><img src="https://avatars.githubusercontent.com/u/4278113?u=22b80b5399eed68ac76cd58b02961b0481f1db11&v=4" width="32" height="32" alt="Anees Iqbal" /></a>
|
|
175
174
|
<a href="https://github.com/Scrumplex?ref=orpc" target="_blank" rel="noopener" title="Sefa Eyeoglu"><img src="https://avatars.githubusercontent.com/u/11587657?u=ab503582165c0bbff0cca47ce31c9450bb1553c9&v=4" width="32" height="32" alt="Sefa Eyeoglu" /></a>
|
|
175
|
+
<a href="https://github.com/nattstack?ref=orpc" target="_blank" rel="noopener" title="nattstack"><img src="https://avatars.githubusercontent.com/u/31426677?u=fa9dbb8b3e66eb0ea3c88db5dc07f31c8c5418fe&v=4" width="32" height="32" alt="nattstack" /></a>
|
|
176
176
|
<a href="https://github.com/ChromeGG?ref=orpc" target="_blank" rel="noopener" title="Adam Tkaczyk"><img src="https://avatars.githubusercontent.com/u/39050595?u=a58ca6042a6950e94e6e92442db76ef584279bc0&v=4" width="32" height="32" alt="Adam Tkaczyk" /></a>
|
|
177
177
|
<a href="https://github.com/plancraft?ref=orpc" target="_blank" rel="noopener" title="plancraft"><img src="https://avatars.githubusercontent.com/u/46482287?v=4" width="32" height="32" alt="plancraft" /></a>
|
|
178
178
|
</p>
|
|
@@ -1,26 +1,25 @@
|
|
|
1
1
|
import { ErrorMap, InferSchemaOutput, InitialInputSchema, Schema, AnySchema, InferSchemaInput } from '@orpc/contract';
|
|
2
2
|
import { Context, ORPCErrorConstructorMap, DecoratedProcedure, AnyORPCError, MergedContext, ImplementedProcedure } from '@orpc/server';
|
|
3
3
|
import { Effect } from 'effect';
|
|
4
|
-
import {
|
|
5
|
-
import { W as WithEffectContext, H as HandlerGen, I as InferYieldError } from '../shared/experimental-effect.CuTs7Ks0.mjs';
|
|
4
|
+
import { W as WithEffectContext, H as HandlerGen, I as InferYieldError } from '../shared/experimental-effect.Cw48Xdc-.mjs';
|
|
6
5
|
|
|
7
6
|
declare module '@orpc/server' {
|
|
8
7
|
interface Builder<TInitialContext extends Context, TErrorMap extends ErrorMap> {
|
|
9
|
-
effect<TYield extends
|
|
8
|
+
effect<TYield extends Effect.Effect<any, any, TInitialContext extends WithEffectContext<infer S> ? S : never>, TReturn>(handler: HandlerGen<TInitialContext, InferSchemaOutput<InitialInputSchema>, TYield, TReturn, ORPCErrorConstructorMap<TErrorMap>>): DecoratedProcedure<TInitialContext, object, InitialInputSchema, Schema<Exclude<TReturn, AnyORPCError>>, TErrorMap, Extract<TReturn | InferYieldError<TYield>, AnyORPCError>>;
|
|
10
9
|
}
|
|
11
10
|
interface BuilderWithMiddlewares<TInitialContext extends Context, TInjectedContext extends Context, TErrorMap extends ErrorMap> {
|
|
12
|
-
effect<TYield extends
|
|
11
|
+
effect<TYield extends Effect.Effect<any, any, MergedContext<TInitialContext, TInjectedContext> extends WithEffectContext<infer S> ? S : never>, TReturn>(handler: HandlerGen<MergedContext<TInitialContext, TInjectedContext>, InferSchemaOutput<InitialInputSchema>, TYield, TReturn, ORPCErrorConstructorMap<TErrorMap>>): DecoratedProcedure<TInitialContext, TInjectedContext, InitialInputSchema, Schema<Exclude<TReturn, AnyORPCError>>, TErrorMap, Extract<TReturn | InferYieldError<TYield>, AnyORPCError>>;
|
|
13
12
|
}
|
|
14
13
|
interface BuilderWithInput<TInitialContext extends Context, TInjectedContext extends Context, TInputSchema extends AnySchema, TErrorMap extends ErrorMap> {
|
|
15
|
-
effect<TYield extends
|
|
14
|
+
effect<TYield extends Effect.Effect<any, any, MergedContext<TInitialContext, TInjectedContext> extends WithEffectContext<infer S> ? S : never>, TReturn>(handler: HandlerGen<MergedContext<TInitialContext, TInjectedContext>, InferSchemaOutput<TInputSchema>, TYield, TReturn, ORPCErrorConstructorMap<TErrorMap>>): DecoratedProcedure<TInitialContext, TInjectedContext, TInputSchema, Schema<Exclude<TReturn, AnyORPCError>>, TErrorMap, Extract<TReturn | InferYieldError<TYield>, AnyORPCError>>;
|
|
16
15
|
}
|
|
17
16
|
interface BuilderWithOutput<TInitialContext extends Context, TInjectedContext extends Context, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> {
|
|
18
|
-
effect<TYield extends
|
|
17
|
+
effect<TYield extends Effect.Effect<any, any, MergedContext<TInitialContext, TInjectedContext> extends WithEffectContext<infer S> ? S : never>, TReturn extends InferSchemaInput<TOutputSchema> | AnyORPCError>(handler: HandlerGen<MergedContext<TInitialContext, TInjectedContext>, InferSchemaOutput<InitialInputSchema>, TYield, TReturn, ORPCErrorConstructorMap<TErrorMap>>): DecoratedProcedure<TInitialContext, TInjectedContext, InitialInputSchema, TOutputSchema, TErrorMap, Extract<TReturn | InferYieldError<TYield>, AnyORPCError>>;
|
|
19
18
|
}
|
|
20
19
|
interface BuilderWithInputOutput<TInitialContext extends Context, TInjectedContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> {
|
|
21
|
-
effect<TYield extends
|
|
20
|
+
effect<TYield extends Effect.Effect<any, any, MergedContext<TInitialContext, TInjectedContext> extends WithEffectContext<infer S> ? S : never>, TReturn extends InferSchemaInput<TOutputSchema> | AnyORPCError>(handler: HandlerGen<MergedContext<TInitialContext, TInjectedContext>, InferSchemaOutput<TInputSchema>, TYield, TReturn, ORPCErrorConstructorMap<TErrorMap>>): DecoratedProcedure<TInitialContext, TInjectedContext, TInputSchema, TOutputSchema, TErrorMap, Extract<TReturn | InferYieldError<TYield>, AnyORPCError>>;
|
|
22
21
|
}
|
|
23
22
|
interface ProcedureImplementer<TInitialContext extends Context, TInjectedContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> {
|
|
24
|
-
effect(handler: HandlerGen<MergedContext<TInitialContext, TInjectedContext>, InferSchemaOutput<TInputSchema>,
|
|
23
|
+
effect(handler: HandlerGen<MergedContext<TInitialContext, TInjectedContext>, InferSchemaOutput<TInputSchema>, Effect.Effect<any, any, MergedContext<TInitialContext, TInjectedContext> extends WithEffectContext<infer S> ? S : never>, AnyORPCError | InferSchemaInput<TOutputSchema>, ORPCErrorConstructorMap<TErrorMap>>): ImplementedProcedure<TInitialContext, TInjectedContext, TInputSchema, TOutputSchema, TErrorMap>;
|
|
25
24
|
}
|
|
26
25
|
}
|
|
@@ -1,26 +1,25 @@
|
|
|
1
1
|
import { ErrorMap, InferSchemaOutput, InitialInputSchema, Schema, AnySchema, InferSchemaInput } from '@orpc/contract';
|
|
2
2
|
import { Context, ORPCErrorConstructorMap, DecoratedProcedure, AnyORPCError, MergedContext, ImplementedProcedure } from '@orpc/server';
|
|
3
3
|
import { Effect } from 'effect';
|
|
4
|
-
import {
|
|
5
|
-
import { W as WithEffectContext, H as HandlerGen, I as InferYieldError } from '../shared/experimental-effect.CuTs7Ks0.js';
|
|
4
|
+
import { W as WithEffectContext, H as HandlerGen, I as InferYieldError } from '../shared/experimental-effect.Cw48Xdc-.js';
|
|
6
5
|
|
|
7
6
|
declare module '@orpc/server' {
|
|
8
7
|
interface Builder<TInitialContext extends Context, TErrorMap extends ErrorMap> {
|
|
9
|
-
effect<TYield extends
|
|
8
|
+
effect<TYield extends Effect.Effect<any, any, TInitialContext extends WithEffectContext<infer S> ? S : never>, TReturn>(handler: HandlerGen<TInitialContext, InferSchemaOutput<InitialInputSchema>, TYield, TReturn, ORPCErrorConstructorMap<TErrorMap>>): DecoratedProcedure<TInitialContext, object, InitialInputSchema, Schema<Exclude<TReturn, AnyORPCError>>, TErrorMap, Extract<TReturn | InferYieldError<TYield>, AnyORPCError>>;
|
|
10
9
|
}
|
|
11
10
|
interface BuilderWithMiddlewares<TInitialContext extends Context, TInjectedContext extends Context, TErrorMap extends ErrorMap> {
|
|
12
|
-
effect<TYield extends
|
|
11
|
+
effect<TYield extends Effect.Effect<any, any, MergedContext<TInitialContext, TInjectedContext> extends WithEffectContext<infer S> ? S : never>, TReturn>(handler: HandlerGen<MergedContext<TInitialContext, TInjectedContext>, InferSchemaOutput<InitialInputSchema>, TYield, TReturn, ORPCErrorConstructorMap<TErrorMap>>): DecoratedProcedure<TInitialContext, TInjectedContext, InitialInputSchema, Schema<Exclude<TReturn, AnyORPCError>>, TErrorMap, Extract<TReturn | InferYieldError<TYield>, AnyORPCError>>;
|
|
13
12
|
}
|
|
14
13
|
interface BuilderWithInput<TInitialContext extends Context, TInjectedContext extends Context, TInputSchema extends AnySchema, TErrorMap extends ErrorMap> {
|
|
15
|
-
effect<TYield extends
|
|
14
|
+
effect<TYield extends Effect.Effect<any, any, MergedContext<TInitialContext, TInjectedContext> extends WithEffectContext<infer S> ? S : never>, TReturn>(handler: HandlerGen<MergedContext<TInitialContext, TInjectedContext>, InferSchemaOutput<TInputSchema>, TYield, TReturn, ORPCErrorConstructorMap<TErrorMap>>): DecoratedProcedure<TInitialContext, TInjectedContext, TInputSchema, Schema<Exclude<TReturn, AnyORPCError>>, TErrorMap, Extract<TReturn | InferYieldError<TYield>, AnyORPCError>>;
|
|
16
15
|
}
|
|
17
16
|
interface BuilderWithOutput<TInitialContext extends Context, TInjectedContext extends Context, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> {
|
|
18
|
-
effect<TYield extends
|
|
17
|
+
effect<TYield extends Effect.Effect<any, any, MergedContext<TInitialContext, TInjectedContext> extends WithEffectContext<infer S> ? S : never>, TReturn extends InferSchemaInput<TOutputSchema> | AnyORPCError>(handler: HandlerGen<MergedContext<TInitialContext, TInjectedContext>, InferSchemaOutput<InitialInputSchema>, TYield, TReturn, ORPCErrorConstructorMap<TErrorMap>>): DecoratedProcedure<TInitialContext, TInjectedContext, InitialInputSchema, TOutputSchema, TErrorMap, Extract<TReturn | InferYieldError<TYield>, AnyORPCError>>;
|
|
19
18
|
}
|
|
20
19
|
interface BuilderWithInputOutput<TInitialContext extends Context, TInjectedContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> {
|
|
21
|
-
effect<TYield extends
|
|
20
|
+
effect<TYield extends Effect.Effect<any, any, MergedContext<TInitialContext, TInjectedContext> extends WithEffectContext<infer S> ? S : never>, TReturn extends InferSchemaInput<TOutputSchema> | AnyORPCError>(handler: HandlerGen<MergedContext<TInitialContext, TInjectedContext>, InferSchemaOutput<TInputSchema>, TYield, TReturn, ORPCErrorConstructorMap<TErrorMap>>): DecoratedProcedure<TInitialContext, TInjectedContext, TInputSchema, TOutputSchema, TErrorMap, Extract<TReturn | InferYieldError<TYield>, AnyORPCError>>;
|
|
22
21
|
}
|
|
23
22
|
interface ProcedureImplementer<TInitialContext extends Context, TInjectedContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> {
|
|
24
|
-
effect(handler: HandlerGen<MergedContext<TInitialContext, TInjectedContext>, InferSchemaOutput<TInputSchema>,
|
|
23
|
+
effect(handler: HandlerGen<MergedContext<TInitialContext, TInjectedContext>, InferSchemaOutput<TInputSchema>, Effect.Effect<any, any, MergedContext<TInitialContext, TInjectedContext> extends WithEffectContext<infer S> ? S : never>, AnyORPCError | InferSchemaInput<TOutputSchema>, ORPCErrorConstructorMap<TErrorMap>>): ImplementedProcedure<TInitialContext, TInjectedContext, TInputSchema, TOutputSchema, TErrorMap>;
|
|
25
24
|
}
|
|
26
25
|
}
|
|
@@ -4,41 +4,41 @@ import { Schema } from 'effect';
|
|
|
4
4
|
|
|
5
5
|
declare module '@orpc/contract' {
|
|
6
6
|
interface ContractBuilder<TErrorMap extends ErrorMap> {
|
|
7
|
-
input<
|
|
8
|
-
output<
|
|
7
|
+
input<S extends Schema.ConstraintDecoder<any>>(schema: S): ProcedureContractBuilderWithInput<Schema$1<S['Encoded'], S['Type']>, TErrorMap>;
|
|
8
|
+
output<S extends Schema.ConstraintDecoder<any>>(schema: S): ProcedureContractBuilderWithOutput<Schema$1<S['Encoded'], S['Type']>, TErrorMap>;
|
|
9
9
|
}
|
|
10
10
|
interface ProcedureContractBuilderWithInput<TInputSchema extends AnySchema, TErrorMap extends ErrorMap> {
|
|
11
|
-
input<
|
|
12
|
-
output<
|
|
11
|
+
input<S extends Schema.ConstraintDecoder<any>>(schema: S): ProcedureContractBuilderWithInput<MergedSchema<Schema$1<S['Encoded'], S['Type']>, TInputSchema>, TErrorMap>;
|
|
12
|
+
output<S extends Schema.ConstraintDecoder<any>>(schema: S): ProcedureContractBuilderWithInputOutput<TInputSchema, Schema$1<S['Encoded'], S['Type']>, TErrorMap>;
|
|
13
13
|
}
|
|
14
14
|
interface ProcedureContractBuilderWithOutput<TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> {
|
|
15
|
-
input<
|
|
16
|
-
output<
|
|
15
|
+
input<S extends Schema.ConstraintDecoder<any>>(schema: S): ProcedureContractBuilderWithInputOutput<Schema$1<S['Encoded'], S['Type']>, TOutputSchema, TErrorMap>;
|
|
16
|
+
output<S extends Schema.ConstraintDecoder<any>>(schema: S): ProcedureContractBuilderWithOutput<MergedSchema<Schema$1<S['Encoded'], S['Type']>, TOutputSchema>, TErrorMap>;
|
|
17
17
|
}
|
|
18
18
|
interface ProcedureContractBuilderWithInputOutput<TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> {
|
|
19
|
-
input<
|
|
20
|
-
output<
|
|
19
|
+
input<S extends Schema.ConstraintDecoder<any>>(schema: S): ProcedureContractBuilderWithInputOutput<MergedSchema<Schema$1<S['Encoded'], S['Type']>, TInputSchema>, TOutputSchema, TErrorMap>;
|
|
20
|
+
output<S extends Schema.ConstraintDecoder<any>>(schema: S): ProcedureContractBuilderWithInputOutput<TInputSchema, MergedSchema<Schema$1<S['Encoded'], S['Type']>, TOutputSchema>, TErrorMap>;
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
declare module '@orpc/server' {
|
|
24
24
|
interface Builder<TInitialContext extends Context, TErrorMap extends ErrorMap> {
|
|
25
|
-
input<
|
|
26
|
-
output<
|
|
25
|
+
input<S extends Schema.ConstraintDecoder<any>>(schema: S): BuilderWithInput<TInitialContext, object, Schema$1<S['Encoded'], S['Type']>, TErrorMap>;
|
|
26
|
+
output<S extends Schema.ConstraintDecoder<any>>(schema: S): BuilderWithOutput<TInitialContext, object, Schema$1<S['Encoded'], S['Type']>, TErrorMap>;
|
|
27
27
|
}
|
|
28
28
|
interface BuilderWithMiddlewares<TInitialContext extends Context, TInjectedContext extends Context, TErrorMap extends ErrorMap> {
|
|
29
|
-
input<
|
|
30
|
-
output<
|
|
29
|
+
input<S extends Schema.ConstraintDecoder<any>>(schema: S): BuilderWithInput<TInitialContext, TInjectedContext, Schema$1<S['Encoded'], S['Type']>, TErrorMap>;
|
|
30
|
+
output<S extends Schema.ConstraintDecoder<any>>(schema: S): BuilderWithOutput<TInitialContext, TInjectedContext, Schema$1<S['Encoded'], S['Type']>, TErrorMap>;
|
|
31
31
|
}
|
|
32
32
|
interface BuilderWithInput<TInitialContext extends Context, TInjectedContext extends Context, TInputSchema extends AnySchema, TErrorMap extends ErrorMap> {
|
|
33
|
-
input<
|
|
34
|
-
output<
|
|
33
|
+
input<S extends Schema.ConstraintDecoder<any>>(schema: S): BuilderWithInput<TInitialContext, TInjectedContext, MergedSchema<Schema$1<S['Encoded'], S['Type']>, TInputSchema>, TErrorMap>;
|
|
34
|
+
output<S extends Schema.ConstraintDecoder<any>>(schema: S): BuilderWithInputOutput<TInitialContext, TInjectedContext, TInputSchema, Schema$1<S['Encoded'], S['Type']>, TErrorMap>;
|
|
35
35
|
}
|
|
36
36
|
interface BuilderWithOutput<TInitialContext extends Context, TInjectedContext extends Context, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> {
|
|
37
|
-
input<
|
|
38
|
-
output<
|
|
37
|
+
input<S extends Schema.ConstraintDecoder<any>>(schema: S): BuilderWithInputOutput<TInitialContext, TInjectedContext, Schema$1<S['Encoded'], S['Type']>, TOutputSchema, TErrorMap>;
|
|
38
|
+
output<S extends Schema.ConstraintDecoder<any>>(schema: S): BuilderWithOutput<TInitialContext, TInjectedContext, MergedSchema<Schema$1<S['Encoded'], S['Type']>, TOutputSchema>, TErrorMap>;
|
|
39
39
|
}
|
|
40
40
|
interface BuilderWithInputOutput<TInitialContext extends Context, TInjectedContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> {
|
|
41
|
-
input<
|
|
42
|
-
output<
|
|
41
|
+
input<S extends Schema.ConstraintDecoder<any>>(schema: S): BuilderWithInputOutput<TInitialContext, TInjectedContext, MergedSchema<Schema$1<S['Encoded'], S['Type']>, TInputSchema>, TOutputSchema, TErrorMap>;
|
|
42
|
+
output<S extends Schema.ConstraintDecoder<any>>(schema: S): BuilderWithInputOutput<TInitialContext, TInjectedContext, TInputSchema, MergedSchema<Schema$1<S['Encoded'], S['Type']>, TOutputSchema>, TErrorMap>;
|
|
43
43
|
}
|
|
44
44
|
}
|
|
@@ -4,41 +4,41 @@ import { Schema } from 'effect';
|
|
|
4
4
|
|
|
5
5
|
declare module '@orpc/contract' {
|
|
6
6
|
interface ContractBuilder<TErrorMap extends ErrorMap> {
|
|
7
|
-
input<
|
|
8
|
-
output<
|
|
7
|
+
input<S extends Schema.ConstraintDecoder<any>>(schema: S): ProcedureContractBuilderWithInput<Schema$1<S['Encoded'], S['Type']>, TErrorMap>;
|
|
8
|
+
output<S extends Schema.ConstraintDecoder<any>>(schema: S): ProcedureContractBuilderWithOutput<Schema$1<S['Encoded'], S['Type']>, TErrorMap>;
|
|
9
9
|
}
|
|
10
10
|
interface ProcedureContractBuilderWithInput<TInputSchema extends AnySchema, TErrorMap extends ErrorMap> {
|
|
11
|
-
input<
|
|
12
|
-
output<
|
|
11
|
+
input<S extends Schema.ConstraintDecoder<any>>(schema: S): ProcedureContractBuilderWithInput<MergedSchema<Schema$1<S['Encoded'], S['Type']>, TInputSchema>, TErrorMap>;
|
|
12
|
+
output<S extends Schema.ConstraintDecoder<any>>(schema: S): ProcedureContractBuilderWithInputOutput<TInputSchema, Schema$1<S['Encoded'], S['Type']>, TErrorMap>;
|
|
13
13
|
}
|
|
14
14
|
interface ProcedureContractBuilderWithOutput<TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> {
|
|
15
|
-
input<
|
|
16
|
-
output<
|
|
15
|
+
input<S extends Schema.ConstraintDecoder<any>>(schema: S): ProcedureContractBuilderWithInputOutput<Schema$1<S['Encoded'], S['Type']>, TOutputSchema, TErrorMap>;
|
|
16
|
+
output<S extends Schema.ConstraintDecoder<any>>(schema: S): ProcedureContractBuilderWithOutput<MergedSchema<Schema$1<S['Encoded'], S['Type']>, TOutputSchema>, TErrorMap>;
|
|
17
17
|
}
|
|
18
18
|
interface ProcedureContractBuilderWithInputOutput<TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> {
|
|
19
|
-
input<
|
|
20
|
-
output<
|
|
19
|
+
input<S extends Schema.ConstraintDecoder<any>>(schema: S): ProcedureContractBuilderWithInputOutput<MergedSchema<Schema$1<S['Encoded'], S['Type']>, TInputSchema>, TOutputSchema, TErrorMap>;
|
|
20
|
+
output<S extends Schema.ConstraintDecoder<any>>(schema: S): ProcedureContractBuilderWithInputOutput<TInputSchema, MergedSchema<Schema$1<S['Encoded'], S['Type']>, TOutputSchema>, TErrorMap>;
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
declare module '@orpc/server' {
|
|
24
24
|
interface Builder<TInitialContext extends Context, TErrorMap extends ErrorMap> {
|
|
25
|
-
input<
|
|
26
|
-
output<
|
|
25
|
+
input<S extends Schema.ConstraintDecoder<any>>(schema: S): BuilderWithInput<TInitialContext, object, Schema$1<S['Encoded'], S['Type']>, TErrorMap>;
|
|
26
|
+
output<S extends Schema.ConstraintDecoder<any>>(schema: S): BuilderWithOutput<TInitialContext, object, Schema$1<S['Encoded'], S['Type']>, TErrorMap>;
|
|
27
27
|
}
|
|
28
28
|
interface BuilderWithMiddlewares<TInitialContext extends Context, TInjectedContext extends Context, TErrorMap extends ErrorMap> {
|
|
29
|
-
input<
|
|
30
|
-
output<
|
|
29
|
+
input<S extends Schema.ConstraintDecoder<any>>(schema: S): BuilderWithInput<TInitialContext, TInjectedContext, Schema$1<S['Encoded'], S['Type']>, TErrorMap>;
|
|
30
|
+
output<S extends Schema.ConstraintDecoder<any>>(schema: S): BuilderWithOutput<TInitialContext, TInjectedContext, Schema$1<S['Encoded'], S['Type']>, TErrorMap>;
|
|
31
31
|
}
|
|
32
32
|
interface BuilderWithInput<TInitialContext extends Context, TInjectedContext extends Context, TInputSchema extends AnySchema, TErrorMap extends ErrorMap> {
|
|
33
|
-
input<
|
|
34
|
-
output<
|
|
33
|
+
input<S extends Schema.ConstraintDecoder<any>>(schema: S): BuilderWithInput<TInitialContext, TInjectedContext, MergedSchema<Schema$1<S['Encoded'], S['Type']>, TInputSchema>, TErrorMap>;
|
|
34
|
+
output<S extends Schema.ConstraintDecoder<any>>(schema: S): BuilderWithInputOutput<TInitialContext, TInjectedContext, TInputSchema, Schema$1<S['Encoded'], S['Type']>, TErrorMap>;
|
|
35
35
|
}
|
|
36
36
|
interface BuilderWithOutput<TInitialContext extends Context, TInjectedContext extends Context, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> {
|
|
37
|
-
input<
|
|
38
|
-
output<
|
|
37
|
+
input<S extends Schema.ConstraintDecoder<any>>(schema: S): BuilderWithInputOutput<TInitialContext, TInjectedContext, Schema$1<S['Encoded'], S['Type']>, TOutputSchema, TErrorMap>;
|
|
38
|
+
output<S extends Schema.ConstraintDecoder<any>>(schema: S): BuilderWithOutput<TInitialContext, TInjectedContext, MergedSchema<Schema$1<S['Encoded'], S['Type']>, TOutputSchema>, TErrorMap>;
|
|
39
39
|
}
|
|
40
40
|
interface BuilderWithInputOutput<TInitialContext extends Context, TInjectedContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> {
|
|
41
|
-
input<
|
|
42
|
-
output<
|
|
41
|
+
input<S extends Schema.ConstraintDecoder<any>>(schema: S): BuilderWithInputOutput<TInitialContext, TInjectedContext, MergedSchema<Schema$1<S['Encoded'], S['Type']>, TInputSchema>, TOutputSchema, TErrorMap>;
|
|
42
|
+
output<S extends Schema.ConstraintDecoder<any>>(schema: S): BuilderWithInputOutput<TInitialContext, TInjectedContext, TInputSchema, MergedSchema<Schema$1<S['Encoded'], S['Type']>, TOutputSchema>, TErrorMap>;
|
|
43
43
|
}
|
|
44
44
|
}
|
|
@@ -1,21 +1,24 @@
|
|
|
1
1
|
import { ContractBuilder } from '@orpc/contract';
|
|
2
2
|
import { Builder } from '@orpc/server';
|
|
3
3
|
import { Schema } from 'effect';
|
|
4
|
-
import { t as toStandardSchema } from '../shared/experimental-effect.
|
|
4
|
+
import { t as toStandardSchema } from '../shared/experimental-effect.YQKompVf.mjs';
|
|
5
5
|
|
|
6
|
+
function isEffectConstraintDecoder(schema) {
|
|
7
|
+
return Schema.isSchema(schema);
|
|
8
|
+
}
|
|
6
9
|
const OriginalContractBuilderInput = ContractBuilder.prototype.input;
|
|
7
10
|
ContractBuilder.prototype.input = function input(schema) {
|
|
8
|
-
return OriginalContractBuilderInput.bind(this)(
|
|
11
|
+
return OriginalContractBuilderInput.bind(this)(isEffectConstraintDecoder(schema) ? toStandardSchema(schema) : schema);
|
|
9
12
|
};
|
|
10
13
|
const OriginalContractBuilderOutput = ContractBuilder.prototype.output;
|
|
11
14
|
ContractBuilder.prototype.output = function output(schema) {
|
|
12
|
-
return OriginalContractBuilderOutput.bind(this)(
|
|
15
|
+
return OriginalContractBuilderOutput.bind(this)(isEffectConstraintDecoder(schema) ? toStandardSchema(schema) : schema);
|
|
13
16
|
};
|
|
14
17
|
const OriginalBuilderInput = Builder.prototype.input;
|
|
15
18
|
Builder.prototype.input = function input2(schema) {
|
|
16
|
-
return OriginalBuilderInput.bind(this)(
|
|
19
|
+
return OriginalBuilderInput.bind(this)(isEffectConstraintDecoder(schema) ? toStandardSchema(schema) : schema);
|
|
17
20
|
};
|
|
18
21
|
const OriginalBuilderOutput = Builder.prototype.output;
|
|
19
22
|
Builder.prototype.output = function output2(schema) {
|
|
20
|
-
return OriginalBuilderOutput.bind(this)(
|
|
23
|
+
return OriginalBuilderOutput.bind(this)(isEffectConstraintDecoder(schema) ? toStandardSchema(schema) : schema);
|
|
21
24
|
};
|
package/dist/index.d.mts
CHANGED
|
@@ -1,30 +1,24 @@
|
|
|
1
|
-
export { H as HandlerGen, I as InferYieldError, W as WithEffectContext, h as handlerGen } from './shared/experimental-effect.
|
|
1
|
+
export { H as HandlerGen, I as InferYieldError, W as WithEffectContext, h as handlerGen } from './shared/experimental-effect.Cw48Xdc-.mjs';
|
|
2
2
|
import { AnySchema, Schema as Schema$1 } from '@orpc/contract';
|
|
3
3
|
import { JsonSchemaConverter, JsonSchemaConverterDirection, JsonSchema } from '@orpc/json-schema';
|
|
4
|
-
import {
|
|
4
|
+
import { Effect, Schema } from 'effect';
|
|
5
5
|
import '@orpc/server';
|
|
6
|
-
import 'effect/Utils';
|
|
7
6
|
|
|
8
7
|
declare class EffectSchemaToJsonSchemaConverter implements JsonSchemaConverter {
|
|
8
|
+
private readonly converter;
|
|
9
9
|
condition(schema: AnySchema | undefined, _direction: JsonSchemaConverterDirection): boolean;
|
|
10
10
|
convert(schema: AnySchema | undefined, direction: JsonSchemaConverterDirection): [jsonSchema: JsonSchema, optional: boolean];
|
|
11
11
|
}
|
|
12
12
|
|
|
13
|
-
/**
|
|
14
|
-
* Extracts the most meaningful original error from an Effect Cause,
|
|
15
|
-
* preserving the original error instance wherever possible.
|
|
16
|
-
*/
|
|
17
|
-
declare function extractErrorFromCause(cause: Cause.Cause<unknown>): unknown;
|
|
18
13
|
interface RunPromiseOptions {
|
|
19
14
|
signal?: undefined | AbortSignal;
|
|
20
15
|
}
|
|
21
16
|
/**
|
|
22
|
-
* Runs an Effect as a Promise
|
|
23
|
-
* bypassing Effect.runPromise's FiberFailure wrapper.
|
|
17
|
+
* Runs an Effect as a Promise and throws the most meaningful errors.
|
|
24
18
|
*/
|
|
25
19
|
declare function runPromise<T>(effect: Effect.Effect<T, unknown>, options?: RunPromiseOptions): Promise<T>;
|
|
26
20
|
|
|
27
|
-
declare function toStandardSchema<
|
|
21
|
+
declare function toStandardSchema<S extends Schema.ConstraintDecoder<any>>(schema: S): Schema$1<S['Encoded'], S['Type']> & S;
|
|
28
22
|
|
|
29
|
-
export { EffectSchemaToJsonSchemaConverter,
|
|
23
|
+
export { EffectSchemaToJsonSchemaConverter, runPromise, toStandardSchema };
|
|
30
24
|
export type { RunPromiseOptions };
|
package/dist/index.d.ts
CHANGED
|
@@ -1,30 +1,24 @@
|
|
|
1
|
-
export { H as HandlerGen, I as InferYieldError, W as WithEffectContext, h as handlerGen } from './shared/experimental-effect.
|
|
1
|
+
export { H as HandlerGen, I as InferYieldError, W as WithEffectContext, h as handlerGen } from './shared/experimental-effect.Cw48Xdc-.js';
|
|
2
2
|
import { AnySchema, Schema as Schema$1 } from '@orpc/contract';
|
|
3
3
|
import { JsonSchemaConverter, JsonSchemaConverterDirection, JsonSchema } from '@orpc/json-schema';
|
|
4
|
-
import {
|
|
4
|
+
import { Effect, Schema } from 'effect';
|
|
5
5
|
import '@orpc/server';
|
|
6
|
-
import 'effect/Utils';
|
|
7
6
|
|
|
8
7
|
declare class EffectSchemaToJsonSchemaConverter implements JsonSchemaConverter {
|
|
8
|
+
private readonly converter;
|
|
9
9
|
condition(schema: AnySchema | undefined, _direction: JsonSchemaConverterDirection): boolean;
|
|
10
10
|
convert(schema: AnySchema | undefined, direction: JsonSchemaConverterDirection): [jsonSchema: JsonSchema, optional: boolean];
|
|
11
11
|
}
|
|
12
12
|
|
|
13
|
-
/**
|
|
14
|
-
* Extracts the most meaningful original error from an Effect Cause,
|
|
15
|
-
* preserving the original error instance wherever possible.
|
|
16
|
-
*/
|
|
17
|
-
declare function extractErrorFromCause(cause: Cause.Cause<unknown>): unknown;
|
|
18
13
|
interface RunPromiseOptions {
|
|
19
14
|
signal?: undefined | AbortSignal;
|
|
20
15
|
}
|
|
21
16
|
/**
|
|
22
|
-
* Runs an Effect as a Promise
|
|
23
|
-
* bypassing Effect.runPromise's FiberFailure wrapper.
|
|
17
|
+
* Runs an Effect as a Promise and throws the most meaningful errors.
|
|
24
18
|
*/
|
|
25
19
|
declare function runPromise<T>(effect: Effect.Effect<T, unknown>, options?: RunPromiseOptions): Promise<T>;
|
|
26
20
|
|
|
27
|
-
declare function toStandardSchema<
|
|
21
|
+
declare function toStandardSchema<S extends Schema.ConstraintDecoder<any>>(schema: S): Schema$1<S['Encoded'], S['Type']> & S;
|
|
28
22
|
|
|
29
|
-
export { EffectSchemaToJsonSchemaConverter,
|
|
23
|
+
export { EffectSchemaToJsonSchemaConverter, runPromise, toStandardSchema };
|
|
30
24
|
export type { RunPromiseOptions };
|
package/dist/index.mjs
CHANGED
|
@@ -1,26 +1,20 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
export {
|
|
1
|
+
import { StandardJsonSchemaConverter } from '@orpc/json-schema';
|
|
2
|
+
import { Schema } from 'effect';
|
|
3
|
+
export { h as handlerGen, r as runPromise } from './shared/experimental-effect.C9oJcd5q.mjs';
|
|
4
|
+
export { t as toStandardSchema } from './shared/experimental-effect.YQKompVf.mjs';
|
|
4
5
|
import '@orpc/server';
|
|
5
6
|
import '@orpc/shared';
|
|
6
7
|
import '@orpc/contract';
|
|
7
8
|
|
|
8
9
|
class EffectSchemaToJsonSchemaConverter {
|
|
10
|
+
converter = new StandardJsonSchemaConverter();
|
|
9
11
|
condition(schema, _direction) {
|
|
10
12
|
return schema?.["~standard"].vendor === "effect";
|
|
11
13
|
}
|
|
12
14
|
convert(schema, direction) {
|
|
13
15
|
const effectSchema = schema;
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
try {
|
|
17
|
-
const result = effectSchema["~standard"].validate(void 0);
|
|
18
|
-
if (!(result instanceof Promise) && !result.issues) {
|
|
19
|
-
optional = direction === "input" ? true : result.value === void 0;
|
|
20
|
-
}
|
|
21
|
-
} catch {
|
|
22
|
-
}
|
|
23
|
-
return [jsonSchema, optional];
|
|
16
|
+
const standardJsonSchema = Schema.toStandardJSONSchemaV1(effectSchema);
|
|
17
|
+
return this.converter.convert(standardJsonSchema, direction);
|
|
24
18
|
}
|
|
25
19
|
}
|
|
26
20
|
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { ORPCError } from '@orpc/server';
|
|
2
|
+
import { Effect, Exit, Cause, Context } from 'effect';
|
|
3
|
+
import { AbortError } from '@orpc/shared';
|
|
4
|
+
|
|
5
|
+
async function runPromise(effect, options = {}) {
|
|
6
|
+
const exit = await Effect.runPromiseExit(effect, options);
|
|
7
|
+
if (Exit.isSuccess(exit)) {
|
|
8
|
+
return exit.value;
|
|
9
|
+
}
|
|
10
|
+
if (Cause.hasInterruptsOnly(exit.cause)) {
|
|
11
|
+
if (options.signal?.aborted) {
|
|
12
|
+
throw options.signal.reason;
|
|
13
|
+
}
|
|
14
|
+
throw new AbortError("All fibers interrupted without error");
|
|
15
|
+
}
|
|
16
|
+
throw Cause.squash(exit.cause);
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
const succeedOnORPCError = Effect.catch((error) => error instanceof ORPCError ? Effect.succeed(error) : Effect.fail(error));
|
|
20
|
+
function handlerGen(handler) {
|
|
21
|
+
return (opts, input) => {
|
|
22
|
+
let ef = Effect.gen(() => handler(opts, input)).pipe(succeedOnORPCError);
|
|
23
|
+
if (Context.isContext(opts.context["effect/context"])) {
|
|
24
|
+
ef = ef.pipe(Effect.provide(opts.context["effect/context"]));
|
|
25
|
+
}
|
|
26
|
+
if (typeof opts.context["effect/wrap"] === "function") {
|
|
27
|
+
const intercept = opts.context["effect/wrap"];
|
|
28
|
+
ef = intercept(ef, opts);
|
|
29
|
+
}
|
|
30
|
+
return runPromise(ef, { signal: opts.signal });
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
export { handlerGen as h, runPromise as r };
|
package/dist/shared/{experimental-effect.CuTs7Ks0.d.mts → experimental-effect.Cw48Xdc-.d.mts}
RENAMED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { AnyProcedure, Context as Context$1, ORPCErrorConstructorMap, ProcedureHandlerOptions, ProcedureHandler, AnyORPCError } from '@orpc/server';
|
|
2
|
-
import { YieldWrap } from 'effect/Utils';
|
|
3
2
|
import { Context, Effect } from 'effect';
|
|
4
3
|
|
|
5
4
|
interface WithEffectContext<Services> {
|
|
@@ -14,13 +13,13 @@ interface WithEffectContext<Services> {
|
|
|
14
13
|
* interface ServerContext extends WithEffectContext<Random | Logger> {}
|
|
15
14
|
*
|
|
16
15
|
* const context: ServerContext = {
|
|
17
|
-
* '
|
|
16
|
+
* 'effect/context': Context.empty().pipe(
|
|
18
17
|
* Context.add(Random, { next: Effect.sync(() => Math.random()) }),
|
|
19
18
|
* ),
|
|
20
19
|
* }
|
|
21
20
|
* ```
|
|
22
21
|
*/
|
|
23
|
-
['
|
|
22
|
+
['effect/context']: Context.Context<Services>;
|
|
24
23
|
/**
|
|
25
24
|
* An optional hook to wrap any effect before it is executed within this oRPC context.
|
|
26
25
|
* Useful for adding observability, tracing, or error handling.
|
|
@@ -37,23 +36,23 @@ interface WithEffectContext<Services> {
|
|
|
37
36
|
* )
|
|
38
37
|
*
|
|
39
38
|
* const context: ServerContext = {
|
|
40
|
-
* '
|
|
41
|
-
* '
|
|
39
|
+
* 'effect/context': Context.empty(),
|
|
40
|
+
* 'effect/wrap': (effect) => effect.pipe(Effect.provide(TracingLive)),
|
|
42
41
|
* }
|
|
43
42
|
* ```
|
|
44
43
|
*/
|
|
45
|
-
['
|
|
44
|
+
['effect/wrap']?: <A, E>(effect: Effect.Effect<A, E>, opts: {
|
|
46
45
|
path: string[];
|
|
47
46
|
procedure: AnyProcedure;
|
|
48
47
|
signal?: undefined | AbortSignal;
|
|
49
48
|
}) => Effect.Effect<A, E>;
|
|
50
49
|
}
|
|
51
50
|
|
|
52
|
-
type InferYieldError<Eff> = [Eff] extends [never] ? never : [Eff] extends [
|
|
53
|
-
interface HandlerGen<TCurrentContext extends Context$1, TInput, TYield extends
|
|
51
|
+
type InferYieldError<Eff> = [Eff] extends [never] ? never : [Eff] extends [Effect.Effect<infer _A, infer E, infer _R>] ? E : never;
|
|
52
|
+
interface HandlerGen<TCurrentContext extends Context$1, TInput, TYield extends Effect.Effect<any, any, TCurrentContext extends WithEffectContext<infer S> ? S : never>, TReturn, TErrorConstructorMap extends ORPCErrorConstructorMap<any>> {
|
|
54
53
|
(opts: ProcedureHandlerOptions<TCurrentContext, TInput, TErrorConstructorMap>, input: TInput): Generator<TYield, TReturn, never>;
|
|
55
54
|
}
|
|
56
|
-
declare function handlerGen<TCurrentContext extends Context$1, TInput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>, TYield extends
|
|
55
|
+
declare function handlerGen<TCurrentContext extends Context$1, TInput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>, TYield extends Effect.Effect<any, any, TCurrentContext extends WithEffectContext<infer S> ? S : never>, TReturn>(handler: HandlerGen<TCurrentContext, TInput, TYield, TReturn, TErrorConstructorMap>): ProcedureHandler<TCurrentContext, TInput, TReturn | Extract<InferYieldError<TYield>, AnyORPCError>, TErrorConstructorMap>;
|
|
57
56
|
|
|
58
57
|
export { handlerGen as h };
|
|
59
58
|
export type { HandlerGen as H, InferYieldError as I, WithEffectContext as W };
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { AnyProcedure, Context as Context$1, ORPCErrorConstructorMap, ProcedureHandlerOptions, ProcedureHandler, AnyORPCError } from '@orpc/server';
|
|
2
|
-
import { YieldWrap } from 'effect/Utils';
|
|
3
2
|
import { Context, Effect } from 'effect';
|
|
4
3
|
|
|
5
4
|
interface WithEffectContext<Services> {
|
|
@@ -14,13 +13,13 @@ interface WithEffectContext<Services> {
|
|
|
14
13
|
* interface ServerContext extends WithEffectContext<Random | Logger> {}
|
|
15
14
|
*
|
|
16
15
|
* const context: ServerContext = {
|
|
17
|
-
* '
|
|
16
|
+
* 'effect/context': Context.empty().pipe(
|
|
18
17
|
* Context.add(Random, { next: Effect.sync(() => Math.random()) }),
|
|
19
18
|
* ),
|
|
20
19
|
* }
|
|
21
20
|
* ```
|
|
22
21
|
*/
|
|
23
|
-
['
|
|
22
|
+
['effect/context']: Context.Context<Services>;
|
|
24
23
|
/**
|
|
25
24
|
* An optional hook to wrap any effect before it is executed within this oRPC context.
|
|
26
25
|
* Useful for adding observability, tracing, or error handling.
|
|
@@ -37,23 +36,23 @@ interface WithEffectContext<Services> {
|
|
|
37
36
|
* )
|
|
38
37
|
*
|
|
39
38
|
* const context: ServerContext = {
|
|
40
|
-
* '
|
|
41
|
-
* '
|
|
39
|
+
* 'effect/context': Context.empty(),
|
|
40
|
+
* 'effect/wrap': (effect) => effect.pipe(Effect.provide(TracingLive)),
|
|
42
41
|
* }
|
|
43
42
|
* ```
|
|
44
43
|
*/
|
|
45
|
-
['
|
|
44
|
+
['effect/wrap']?: <A, E>(effect: Effect.Effect<A, E>, opts: {
|
|
46
45
|
path: string[];
|
|
47
46
|
procedure: AnyProcedure;
|
|
48
47
|
signal?: undefined | AbortSignal;
|
|
49
48
|
}) => Effect.Effect<A, E>;
|
|
50
49
|
}
|
|
51
50
|
|
|
52
|
-
type InferYieldError<Eff> = [Eff] extends [never] ? never : [Eff] extends [
|
|
53
|
-
interface HandlerGen<TCurrentContext extends Context$1, TInput, TYield extends
|
|
51
|
+
type InferYieldError<Eff> = [Eff] extends [never] ? never : [Eff] extends [Effect.Effect<infer _A, infer E, infer _R>] ? E : never;
|
|
52
|
+
interface HandlerGen<TCurrentContext extends Context$1, TInput, TYield extends Effect.Effect<any, any, TCurrentContext extends WithEffectContext<infer S> ? S : never>, TReturn, TErrorConstructorMap extends ORPCErrorConstructorMap<any>> {
|
|
54
53
|
(opts: ProcedureHandlerOptions<TCurrentContext, TInput, TErrorConstructorMap>, input: TInput): Generator<TYield, TReturn, never>;
|
|
55
54
|
}
|
|
56
|
-
declare function handlerGen<TCurrentContext extends Context$1, TInput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>, TYield extends
|
|
55
|
+
declare function handlerGen<TCurrentContext extends Context$1, TInput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>, TYield extends Effect.Effect<any, any, TCurrentContext extends WithEffectContext<infer S> ? S : never>, TReturn>(handler: HandlerGen<TCurrentContext, TInput, TYield, TReturn, TErrorConstructorMap>): ProcedureHandler<TCurrentContext, TInput, TReturn | Extract<InferYieldError<TYield>, AnyORPCError>, TErrorConstructorMap>;
|
|
57
56
|
|
|
58
57
|
export { handlerGen as h };
|
|
59
58
|
export type { HandlerGen as H, InferYieldError as I, WithEffectContext as W };
|
|
@@ -2,7 +2,7 @@ import { getHiddenMetaPlugins, setHiddenMetaPlugins } from '@orpc/contract';
|
|
|
2
2
|
import { Schema } from 'effect';
|
|
3
3
|
|
|
4
4
|
function toStandardSchema(schema) {
|
|
5
|
-
const converted = Schema.
|
|
5
|
+
const converted = Schema.toStandardSchemaV1(schema);
|
|
6
6
|
const metaPlugins = getHiddenMetaPlugins(schema);
|
|
7
7
|
if (metaPlugins) {
|
|
8
8
|
setHiddenMetaPlugins(converted, metaPlugins);
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@orpc/experimental-effect",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "2.0.0-beta.
|
|
4
|
+
"version": "2.0.0-beta.6",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"homepage": "https://orpc.dev",
|
|
7
7
|
"repository": {
|
|
@@ -39,16 +39,16 @@
|
|
|
39
39
|
"dist"
|
|
40
40
|
],
|
|
41
41
|
"peerDependencies": {
|
|
42
|
-
"effect": ">=
|
|
42
|
+
"effect": ">=4.0.0-beta.90"
|
|
43
43
|
},
|
|
44
44
|
"dependencies": {
|
|
45
|
-
"@orpc/contract": "2.0.0-beta.
|
|
46
|
-
"@orpc/json-schema": "2.0.0-beta.
|
|
47
|
-
"@orpc/server": "2.0.0-beta.
|
|
48
|
-
"@orpc/shared": "2.0.0-beta.
|
|
45
|
+
"@orpc/contract": "2.0.0-beta.6",
|
|
46
|
+
"@orpc/json-schema": "2.0.0-beta.6",
|
|
47
|
+
"@orpc/server": "2.0.0-beta.6",
|
|
48
|
+
"@orpc/shared": "2.0.0-beta.6"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
|
-
"effect": "
|
|
51
|
+
"effect": "4.0.0-beta.90"
|
|
52
52
|
},
|
|
53
53
|
"scripts": {
|
|
54
54
|
"build": "unbuild",
|
|
@@ -1,40 +0,0 @@
|
|
|
1
|
-
import { ORPCError } from '@orpc/server';
|
|
2
|
-
import { Effect, Exit, Cause, FiberId, Context } from 'effect';
|
|
3
|
-
import { AbortError } from '@orpc/shared';
|
|
4
|
-
|
|
5
|
-
function extractErrorFromCause(cause) {
|
|
6
|
-
return Cause.match(cause, {
|
|
7
|
-
onFail: (error) => error,
|
|
8
|
-
onDie: (defect) => defect,
|
|
9
|
-
onInterrupt: (fiberId) => new AbortError(`Fiber interrupted: ${FiberId.threadName(fiberId)}`),
|
|
10
|
-
onEmpty: new Error("Effect failed with no error information"),
|
|
11
|
-
// Mirrors native try/finally: if the finalizer (right) also throws,
|
|
12
|
-
// it overwrites the original (left) — same behaviour as JS would produce
|
|
13
|
-
onSequential: (_left, right) => right,
|
|
14
|
-
onParallel: (left, _right) => left
|
|
15
|
-
});
|
|
16
|
-
}
|
|
17
|
-
async function runPromise(effect, options = {}) {
|
|
18
|
-
const exit = await Effect.runPromiseExit(effect, options);
|
|
19
|
-
if (Exit.isSuccess(exit)) {
|
|
20
|
-
return exit.value;
|
|
21
|
-
}
|
|
22
|
-
throw extractErrorFromCause(exit.cause);
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
const succeedOnORPCError = Effect.catchAll((error) => error instanceof ORPCError ? Effect.succeed(error) : Effect.fail(error));
|
|
26
|
-
function handlerGen(handler) {
|
|
27
|
-
return (opts, input) => {
|
|
28
|
-
let ef = Effect.gen(() => handler(opts, input)).pipe(succeedOnORPCError);
|
|
29
|
-
if (Context.isContext(opts.context["~effect/context"])) {
|
|
30
|
-
ef = ef.pipe(Effect.provide(opts.context["~effect/context"]));
|
|
31
|
-
}
|
|
32
|
-
if (typeof opts.context["~effect/wrap"] === "function") {
|
|
33
|
-
const intercept = opts.context["~effect/wrap"];
|
|
34
|
-
ef = intercept(ef, opts);
|
|
35
|
-
}
|
|
36
|
-
return runPromise(ef, { signal: opts.signal });
|
|
37
|
-
};
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
export { extractErrorFromCause as e, handlerGen as h, runPromise as r };
|