effect-app 1.21.1 → 1.22.1
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 +12 -0
- package/_cjs/client/clientFor.cjs +4 -52
- package/_cjs/client/clientFor.cjs.map +1 -1
- package/dist/client/clientFor.d.ts +4 -10
- package/dist/client/clientFor.d.ts.map +1 -1
- package/dist/client/clientFor.js +8 -16
- package/package.json +1 -1
- package/src/client/clientFor.ts +7 -22
package/CHANGELOG.md
CHANGED
|
@@ -82,13 +82,7 @@ function clientFor_(models, layers = _core.Layer.empty) {
|
|
|
82
82
|
const path = new _pathParser.Path(p); // TODO
|
|
83
83
|
// @ts-expect-error doc
|
|
84
84
|
prev[cur] = requestMeta.method === "GET" ? Object.keys(fields).length === 0 ? {
|
|
85
|
-
handler: client.pipe(_core.Effect.andThen(cl => cl(new Request())), _core.Effect.
|
|
86
|
-
body: _,
|
|
87
|
-
status: 200,
|
|
88
|
-
headers: {}
|
|
89
|
-
})),
|
|
90
|
-
// TODO
|
|
91
|
-
_core.Effect.withSpan("client.request " + requestName, {
|
|
85
|
+
handler: client.pipe(_core.Effect.andThen(cl => cl(new Request())), _core.Effect.withSpan("client.request " + requestName, {
|
|
92
86
|
captureStackTrace: false,
|
|
93
87
|
attributes: {
|
|
94
88
|
"request.name": requestName
|
|
@@ -96,13 +90,7 @@ function clientFor_(models, layers = _core.Layer.empty) {
|
|
|
96
90
|
}), _core.Effect.provide(layers)),
|
|
97
91
|
...requestMeta
|
|
98
92
|
} : {
|
|
99
|
-
handler: req => client.pipe(_core.Effect.andThen(cl => cl(new Request(req))), _core.Effect.
|
|
100
|
-
body: _,
|
|
101
|
-
status: 200,
|
|
102
|
-
headers: {}
|
|
103
|
-
})),
|
|
104
|
-
// TODO
|
|
105
|
-
_core.Effect.withSpan("client.request " + requestName, {
|
|
93
|
+
handler: req => client.pipe(_core.Effect.andThen(cl => cl(new Request(req))), _core.Effect.withSpan("client.request " + requestName, {
|
|
106
94
|
captureStackTrace: false,
|
|
107
95
|
attributes: {
|
|
108
96
|
"request.name": requestName
|
|
@@ -111,13 +99,7 @@ function clientFor_(models, layers = _core.Layer.empty) {
|
|
|
111
99
|
...requestMeta,
|
|
112
100
|
mapPath: req => req ? makePathWithQuery(path, encodeRequest(req)) : p
|
|
113
101
|
} : Object.keys(fields).length === 0 ? {
|
|
114
|
-
handler: client.pipe(_core.Effect.andThen(cl => cl(new Request())), _core.Effect.
|
|
115
|
-
body: _,
|
|
116
|
-
status: 200,
|
|
117
|
-
headers: {}
|
|
118
|
-
})),
|
|
119
|
-
// TODO
|
|
120
|
-
_core.Effect.withSpan("client.request " + requestName, {
|
|
102
|
+
handler: client.pipe(_core.Effect.andThen(cl => cl(new Request())), _core.Effect.withSpan("client.request " + requestName, {
|
|
121
103
|
captureStackTrace: false,
|
|
122
104
|
attributes: {
|
|
123
105
|
"request.name": requestName
|
|
@@ -125,13 +107,7 @@ function clientFor_(models, layers = _core.Layer.empty) {
|
|
|
125
107
|
}), _core.Effect.provide(layers)),
|
|
126
108
|
...requestMeta
|
|
127
109
|
} : {
|
|
128
|
-
handler: req => client.pipe(_core.Effect.andThen(cl => cl(new Request(req))), _core.Effect.
|
|
129
|
-
body: _,
|
|
130
|
-
status: 200,
|
|
131
|
-
headers: {}
|
|
132
|
-
})),
|
|
133
|
-
// TODO
|
|
134
|
-
_core.Effect.withSpan("client.request " + requestName, {
|
|
110
|
+
handler: req => client.pipe(_core.Effect.andThen(cl => cl(new Request(req))), _core.Effect.withSpan("client.request " + requestName, {
|
|
135
111
|
captureStackTrace: false,
|
|
136
112
|
attributes: {
|
|
137
113
|
"request.name": requestName
|
|
@@ -144,12 +120,6 @@ function clientFor_(models, layers = _core.Layer.empty) {
|
|
|
144
120
|
// @ts-expect-error doc
|
|
145
121
|
prev[`${cur}E`] = requestMeta.method === "GET" ? Object.keys(fields).length === 0 ? {
|
|
146
122
|
handler: client.pipe(_core.Effect.andThen(cl => cl(new Request())), _core.Effect.flatMap(res => _effectApp.S.encode(Response)(res)),
|
|
147
|
-
// TODO
|
|
148
|
-
_core.Effect.map(_ => ({
|
|
149
|
-
body: _,
|
|
150
|
-
status: 200,
|
|
151
|
-
headers: {}
|
|
152
|
-
})),
|
|
153
123
|
// TODO,
|
|
154
124
|
_core.Effect.withSpan("client.request " + requestName, {
|
|
155
125
|
captureStackTrace: false,
|
|
@@ -161,12 +131,6 @@ function clientFor_(models, layers = _core.Layer.empty) {
|
|
|
161
131
|
} : {
|
|
162
132
|
handler: req => client.pipe(_core.Effect.andThen(cl => cl(new Request(req))), _core.Effect.flatMap(res => _effectApp.S.encode(Response)(res)),
|
|
163
133
|
// TODO
|
|
164
|
-
_core.Effect.map(_ => ({
|
|
165
|
-
body: _,
|
|
166
|
-
status: 200,
|
|
167
|
-
headers: {}
|
|
168
|
-
})),
|
|
169
|
-
// TODO,
|
|
170
134
|
_core.Effect.withSpan("client.request " + requestName, {
|
|
171
135
|
captureStackTrace: false,
|
|
172
136
|
attributes: {
|
|
@@ -177,12 +141,6 @@ function clientFor_(models, layers = _core.Layer.empty) {
|
|
|
177
141
|
mapPath: req => req ? makePathWithQuery(path, encodeRequest(req)) : p
|
|
178
142
|
} : Object.keys(fields).length === 0 ? {
|
|
179
143
|
handler: client.pipe(_core.Effect.andThen(cl => cl(new Request())), _core.Effect.flatMap(res => _effectApp.S.encode(Response)(res)),
|
|
180
|
-
// TODO
|
|
181
|
-
_core.Effect.map(_ => ({
|
|
182
|
-
body: _,
|
|
183
|
-
status: 200,
|
|
184
|
-
headers: {}
|
|
185
|
-
})),
|
|
186
144
|
// TODO,
|
|
187
145
|
_core.Effect.withSpan("client.request " + requestName, {
|
|
188
146
|
captureStackTrace: false,
|
|
@@ -193,12 +151,6 @@ function clientFor_(models, layers = _core.Layer.empty) {
|
|
|
193
151
|
...requestMeta
|
|
194
152
|
} : {
|
|
195
153
|
handler: req => client.pipe(_core.Effect.andThen(cl => cl(new Request(req))), _core.Effect.flatMap(res => _effectApp.S.encode(Response)(res)),
|
|
196
|
-
// TODO
|
|
197
|
-
_core.Effect.map(_ => ({
|
|
198
|
-
body: _,
|
|
199
|
-
status: 200,
|
|
200
|
-
headers: {}
|
|
201
|
-
})),
|
|
202
154
|
// TODO,
|
|
203
155
|
_core.Effect.withSpan("client.request " + requestName, {
|
|
204
156
|
captureStackTrace: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientFor.cjs","names":["_core","require","_rpc","_rpcHttp","_effect","_effectApp","_client","_http","_utils","_pathParser","_queryString","_interopRequireDefault","e","__esModule","default","makePathWithQuery","path","pars","forQs","Record","filter","_","k","params","includes","q","build","ignoreSearch","ignoreConstraints","Object","keys","length","qs","stringify","makePathWithBody","apiClient","Effect","gen","client","HttpClient","config","ApiConfig","Tag","pipe","mapRequest","HttpClientRequest","prependUrl","apiUrl","setHeaders","headers","Option","getOrElse","HashMap","empty","makeClientFor","layers","cache","Map","models","found","get","m","clientFor_","set","Layer","filtered","typedKeysOf","reduce","acc","cur","Predicate","isObject","success","meta","Error","resolver","flow","HttpRpcResolver","make","RpcResolver","toClient","baseClient","andThen","appendUrl","moduleName","prev","h","Request","Response","encodeRequest","S","encodeSync","requestName","replaceAll","requestMeta","method","mapPath","name","appendUrlParam","fields","Struct","omit","p","Path","handler","cl","
|
|
1
|
+
{"version":3,"file":"clientFor.cjs","names":["_core","require","_rpc","_rpcHttp","_effect","_effectApp","_client","_http","_utils","_pathParser","_queryString","_interopRequireDefault","e","__esModule","default","makePathWithQuery","path","pars","forQs","Record","filter","_","k","params","includes","q","build","ignoreSearch","ignoreConstraints","Object","keys","length","qs","stringify","makePathWithBody","apiClient","Effect","gen","client","HttpClient","config","ApiConfig","Tag","pipe","mapRequest","HttpClientRequest","prependUrl","apiUrl","setHeaders","headers","Option","getOrElse","HashMap","empty","makeClientFor","layers","cache","Map","models","found","get","m","clientFor_","set","Layer","filtered","typedKeysOf","reduce","acc","cur","Predicate","isObject","success","meta","Error","resolver","flow","HttpRpcResolver","make","RpcResolver","toClient","baseClient","andThen","appendUrl","moduleName","prev","h","Request","Response","encodeRequest","S","encodeSync","requestName","replaceAll","requestMeta","method","mapPath","name","appendUrlParam","fields","Struct","omit","p","Path","handler","cl","withSpan","captureStackTrace","attributes","provide","req","flatMap","res","encode"],"sources":["../../src/client/clientFor.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -8,12 +8,6 @@ import type * as Request from "effect/Request";
|
|
|
8
8
|
import { Path } from "path-parser";
|
|
9
9
|
export declare function makePathWithQuery(path: Path, pars: Record<string, string | number | boolean | readonly string[] | readonly number[] | readonly boolean[] | null>): string;
|
|
10
10
|
export declare function makePathWithBody(path: Path, pars: Record<string, string | number | boolean | readonly string[] | readonly number[] | readonly boolean[] | null>): string;
|
|
11
|
-
/** @deprecated will be removed in favour of directly using A/E */
|
|
12
|
-
export interface FetchResponse<T> {
|
|
13
|
-
body: T;
|
|
14
|
-
headers: Record<string, string>;
|
|
15
|
-
status: number;
|
|
16
|
-
}
|
|
17
11
|
type Requests = Record<string, any>;
|
|
18
12
|
export type Client<M extends Requests> = RequestHandlers<ApiConfig | HttpClient.HttpClient.Service, never, // SupportedErrors | FetchError | ResError,
|
|
19
13
|
M> & RequestHandlersE<ApiConfig | HttpClient.HttpClient.Service, never, // SupportedErrors | FetchError | ResError,
|
|
@@ -25,13 +19,13 @@ type IsEmpty<T> = keyof T extends never ? true : false;
|
|
|
25
19
|
type Cruft = "_tag" | Request.RequestTypeId | typeof Serializable.symbol | typeof Serializable.symbolResult;
|
|
26
20
|
type RequestHandlers<R, E, M extends Requests> = {
|
|
27
21
|
[K in keyof M]: IsEmpty<Omit<S.Schema.Type<M[K]>, Cruft>> extends true ? {
|
|
28
|
-
handler: Effect<
|
|
22
|
+
handler: Effect<Schema.Type<M[K]["success"]>, Schema.Type<M[K]["failure"]> | E, R>;
|
|
29
23
|
Request: M[K];
|
|
30
24
|
Reponse: Schema.Type<M[K]["success"]>;
|
|
31
25
|
mapPath: string;
|
|
32
26
|
name: string;
|
|
33
27
|
} : {
|
|
34
|
-
handler: (req: Omit<S.Schema.Type<M[K]>, Cruft>) => Effect<
|
|
28
|
+
handler: (req: Omit<S.Schema.Type<M[K]>, Cruft>) => Effect<Schema.Type<M[K]["success"]>, Schema.Type<M[K]["failure"]> | E, R>;
|
|
35
29
|
Request: M[K];
|
|
36
30
|
Reponse: Schema.Type<M[K]["success"]>;
|
|
37
31
|
mapPath: (req: Omit<S.Schema.Type<M[K]>, Cruft>) => string;
|
|
@@ -40,13 +34,13 @@ type RequestHandlers<R, E, M extends Requests> = {
|
|
|
40
34
|
};
|
|
41
35
|
type RequestHandlersE<R, E, M extends Requests> = {
|
|
42
36
|
[K in keyof M & string as `${K}E`]: IsEmpty<Omit<S.Schema.Type<M[K]>, Cruft>> extends true ? {
|
|
43
|
-
handler: Effect<
|
|
37
|
+
handler: Effect<Schema.Encoded<M[K]["success"]>, Schema.Type<M[K]["failure"]> | E, R>;
|
|
44
38
|
Request: M[K];
|
|
45
39
|
Reponse: Schema.Type<M[K]["success"]>;
|
|
46
40
|
mapPath: string;
|
|
47
41
|
name: string;
|
|
48
42
|
} : {
|
|
49
|
-
handler: (req: Omit<S.Schema.Type<M[K]>, Cruft>) => Effect<
|
|
43
|
+
handler: (req: Omit<S.Schema.Type<M[K]>, Cruft>) => Effect<Schema.Encoded<M[K]["success"]>, Schema.Type<M[K]["failure"]> | E, R>;
|
|
50
44
|
Request: M[K];
|
|
51
45
|
Reponse: Schema.Type<M[K]["success"]>;
|
|
52
46
|
mapPath: (req: Omit<S.Schema.Type<M[K]>, Cruft>) => string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientFor.d.ts","sourceRoot":"","sources":["../../src/client/clientFor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAiB,KAAK,EAA6B,MAAM,kBAAkB,CAAA;AAI1F,OAAO,KAAK,KAAK,YAAY,MAAM,6BAA6B,CAAA;AAEhE,OAAO,EAAE,CAAC,EAAE,MAAM,YAAY,CAAA;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAqB,MAAM,iBAAiB,CAAA;AAC/D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE/C,OAAO,KAAK,KAAK,OAAO,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAGlC,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,CACV,MAAM,EACJ,MAAM,GACN,MAAM,GACN,OAAO,GACP,SAAS,MAAM,EAAE,GACjB,SAAS,MAAM,EAAE,GACjB,SAAS,OAAO,EAAE,GAClB,IAAI,CACP,UAUF;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,CACV,MAAM,EACJ,MAAM,GACN,MAAM,GACN,OAAO,GACP,SAAS,MAAM,EAAE,GACjB,SAAS,MAAM,EAAE,GACjB,SAAS,OAAO,EAAE,GAClB,IAAI,CACP,UAGF;AAED,
|
|
1
|
+
{"version":3,"file":"clientFor.d.ts","sourceRoot":"","sources":["../../src/client/clientFor.ts"],"names":[],"mappings":"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"}
|
package/dist/client/clientFor.js
CHANGED
|
@@ -75,8 +75,7 @@ function clientFor_(models, layers = Layer.empty) {
|
|
|
75
75
|
? Object.keys(fields).length === 0
|
|
76
76
|
? {
|
|
77
77
|
handler: client
|
|
78
|
-
.pipe(Effect.andThen((cl) => cl(new Request())), Effect
|
|
79
|
-
Effect
|
|
78
|
+
.pipe(Effect.andThen((cl) => cl(new Request())), Effect
|
|
80
79
|
.withSpan("client.request " + requestName, {
|
|
81
80
|
captureStackTrace: false,
|
|
82
81
|
attributes: { "request.name": requestName }
|
|
@@ -85,8 +84,7 @@ function clientFor_(models, layers = Layer.empty) {
|
|
|
85
84
|
}
|
|
86
85
|
: {
|
|
87
86
|
handler: (req) => client
|
|
88
|
-
.pipe(Effect.andThen((cl) => cl(new Request(req))), Effect
|
|
89
|
-
Effect
|
|
87
|
+
.pipe(Effect.andThen((cl) => cl(new Request(req))), Effect
|
|
90
88
|
.withSpan("client.request " + requestName, {
|
|
91
89
|
captureStackTrace: false,
|
|
92
90
|
attributes: { "request.name": requestName }
|
|
@@ -97,8 +95,7 @@ function clientFor_(models, layers = Layer.empty) {
|
|
|
97
95
|
: Object.keys(fields).length === 0
|
|
98
96
|
? {
|
|
99
97
|
handler: client
|
|
100
|
-
.pipe(Effect.andThen((cl) => cl(new Request())), Effect.
|
|
101
|
-
Effect.withSpan("client.request " + requestName, {
|
|
98
|
+
.pipe(Effect.andThen((cl) => cl(new Request())), Effect.withSpan("client.request " + requestName, {
|
|
102
99
|
captureStackTrace: false,
|
|
103
100
|
attributes: { "request.name": requestName }
|
|
104
101
|
}), Effect.provide(layers)),
|
|
@@ -106,8 +103,7 @@ function clientFor_(models, layers = Layer.empty) {
|
|
|
106
103
|
}
|
|
107
104
|
: {
|
|
108
105
|
handler: (req) => client
|
|
109
|
-
.pipe(Effect.andThen((cl) => cl(new Request(req))), Effect.
|
|
110
|
-
Effect.withSpan("client.request " + requestName, {
|
|
106
|
+
.pipe(Effect.andThen((cl) => cl(new Request(req))), Effect.withSpan("client.request " + requestName, {
|
|
111
107
|
captureStackTrace: false,
|
|
112
108
|
attributes: { "request.name": requestName }
|
|
113
109
|
}), Effect.provide(layers)),
|
|
@@ -124,8 +120,7 @@ function clientFor_(models, layers = Layer.empty) {
|
|
|
124
120
|
? Object.keys(fields).length === 0
|
|
125
121
|
? {
|
|
126
122
|
handler: client
|
|
127
|
-
.pipe(Effect.andThen((cl) => cl(new Request())), Effect.flatMap((res) => S.encode(Response)(res)), // TODO
|
|
128
|
-
Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO,
|
|
123
|
+
.pipe(Effect.andThen((cl) => cl(new Request())), Effect.flatMap((res) => S.encode(Response)(res)), // TODO,
|
|
129
124
|
Effect
|
|
130
125
|
.withSpan("client.request " + requestName, {
|
|
131
126
|
captureStackTrace: false,
|
|
@@ -136,7 +131,6 @@ function clientFor_(models, layers = Layer.empty) {
|
|
|
136
131
|
: {
|
|
137
132
|
handler: (req) => client
|
|
138
133
|
.pipe(Effect.andThen((cl) => cl(new Request(req))), Effect.flatMap((res) => S.encode(Response)(res)), // TODO
|
|
139
|
-
Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO,
|
|
140
134
|
Effect
|
|
141
135
|
.withSpan("client.request " + requestName, {
|
|
142
136
|
captureStackTrace: false,
|
|
@@ -148,8 +142,7 @@ function clientFor_(models, layers = Layer.empty) {
|
|
|
148
142
|
: Object.keys(fields).length === 0
|
|
149
143
|
? {
|
|
150
144
|
handler: client
|
|
151
|
-
.pipe(Effect.andThen((cl) => cl(new Request())), Effect.flatMap((res) => S.encode(Response)(res)), // TODO
|
|
152
|
-
Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO,
|
|
145
|
+
.pipe(Effect.andThen((cl) => cl(new Request())), Effect.flatMap((res) => S.encode(Response)(res)), // TODO,
|
|
153
146
|
Effect.withSpan("client.request " + requestName, {
|
|
154
147
|
captureStackTrace: false,
|
|
155
148
|
attributes: { "request.name": requestName }
|
|
@@ -158,8 +151,7 @@ function clientFor_(models, layers = Layer.empty) {
|
|
|
158
151
|
}
|
|
159
152
|
: {
|
|
160
153
|
handler: (req) => client
|
|
161
|
-
.pipe(Effect.andThen((cl) => cl(new Request(req))), Effect.flatMap((res) => S.encode(Response)(res)), // TODO
|
|
162
|
-
Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO,
|
|
154
|
+
.pipe(Effect.andThen((cl) => cl(new Request(req))), Effect.flatMap((res) => S.encode(Response)(res)), // TODO,
|
|
163
155
|
Effect.withSpan("client.request " + requestName, {
|
|
164
156
|
captureStackTrace: false,
|
|
165
157
|
attributes: { "request.name": requestName }
|
|
@@ -175,4 +167,4 @@ function clientFor_(models, layers = Layer.empty) {
|
|
|
175
167
|
return prev;
|
|
176
168
|
}, {}));
|
|
177
169
|
}
|
|
178
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"clientFor.js","sourceRoot":"","sources":["../../src/client/clientFor.ts"],"names":[],"mappings":"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"}
|
|
170
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"clientFor.js","sourceRoot":"","sources":["../../src/client/clientFor.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/client/clientFor.ts
CHANGED
|
@@ -55,13 +55,6 @@ export function makePathWithBody(
|
|
|
55
55
|
return path.build(pars, { ignoreSearch: true, ignoreConstraints: true })
|
|
56
56
|
}
|
|
57
57
|
|
|
58
|
-
/** @deprecated will be removed in favour of directly using A/E */
|
|
59
|
-
export interface FetchResponse<T> {
|
|
60
|
-
body: T
|
|
61
|
-
headers: Record<string, string>
|
|
62
|
-
status: number
|
|
63
|
-
}
|
|
64
|
-
|
|
65
58
|
type Requests = Record<string, any>
|
|
66
59
|
|
|
67
60
|
const apiClient = Effect.gen(function*() {
|
|
@@ -175,7 +168,6 @@ function clientFor_<M extends Requests>(models: M, layers = Layer.empty) {
|
|
|
175
168
|
handler: client
|
|
176
169
|
.pipe(
|
|
177
170
|
Effect.andThen((cl) => cl(new Request())),
|
|
178
|
-
Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO
|
|
179
171
|
Effect
|
|
180
172
|
.withSpan("client.request " + requestName, {
|
|
181
173
|
captureStackTrace: false,
|
|
@@ -190,7 +182,6 @@ function clientFor_<M extends Requests>(models: M, layers = Layer.empty) {
|
|
|
190
182
|
client
|
|
191
183
|
.pipe(
|
|
192
184
|
Effect.andThen((cl) => cl(new Request(req))),
|
|
193
|
-
Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO
|
|
194
185
|
Effect
|
|
195
186
|
.withSpan("client.request " + requestName, {
|
|
196
187
|
captureStackTrace: false,
|
|
@@ -206,7 +197,6 @@ function clientFor_<M extends Requests>(models: M, layers = Layer.empty) {
|
|
|
206
197
|
handler: client
|
|
207
198
|
.pipe(
|
|
208
199
|
Effect.andThen((cl) => cl(new Request())),
|
|
209
|
-
Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO
|
|
210
200
|
Effect.withSpan("client.request " + requestName, {
|
|
211
201
|
captureStackTrace: false,
|
|
212
202
|
attributes: { "request.name": requestName }
|
|
@@ -220,7 +210,6 @@ function clientFor_<M extends Requests>(models: M, layers = Layer.empty) {
|
|
|
220
210
|
client
|
|
221
211
|
.pipe(
|
|
222
212
|
Effect.andThen((cl) => cl(new Request(req))),
|
|
223
|
-
Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO
|
|
224
213
|
Effect.withSpan("client.request " + requestName, {
|
|
225
214
|
captureStackTrace: false,
|
|
226
215
|
attributes: { "request.name": requestName }
|
|
@@ -246,8 +235,7 @@ function clientFor_<M extends Requests>(models: M, layers = Layer.empty) {
|
|
|
246
235
|
handler: client
|
|
247
236
|
.pipe(
|
|
248
237
|
Effect.andThen((cl) => cl(new Request())),
|
|
249
|
-
Effect.flatMap((res) => S.encode(Response)(res)), // TODO
|
|
250
|
-
Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO,
|
|
238
|
+
Effect.flatMap((res) => S.encode(Response)(res)), // TODO,
|
|
251
239
|
Effect
|
|
252
240
|
.withSpan("client.request " + requestName, {
|
|
253
241
|
captureStackTrace: false,
|
|
@@ -263,7 +251,6 @@ function clientFor_<M extends Requests>(models: M, layers = Layer.empty) {
|
|
|
263
251
|
.pipe(
|
|
264
252
|
Effect.andThen((cl) => cl(new Request(req))),
|
|
265
253
|
Effect.flatMap((res) => S.encode(Response)(res)), // TODO
|
|
266
|
-
Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO,
|
|
267
254
|
Effect
|
|
268
255
|
.withSpan("client.request " + requestName, {
|
|
269
256
|
captureStackTrace: false,
|
|
@@ -280,8 +267,7 @@ function clientFor_<M extends Requests>(models: M, layers = Layer.empty) {
|
|
|
280
267
|
handler: client
|
|
281
268
|
.pipe(
|
|
282
269
|
Effect.andThen((cl) => cl(new Request())),
|
|
283
|
-
Effect.flatMap((res) => S.encode(Response)(res)), // TODO
|
|
284
|
-
Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO,
|
|
270
|
+
Effect.flatMap((res) => S.encode(Response)(res)), // TODO,
|
|
285
271
|
Effect.withSpan("client.request " + requestName, {
|
|
286
272
|
captureStackTrace: false,
|
|
287
273
|
attributes: { "request.name": requestName }
|
|
@@ -295,8 +281,7 @@ function clientFor_<M extends Requests>(models: M, layers = Layer.empty) {
|
|
|
295
281
|
client
|
|
296
282
|
.pipe(
|
|
297
283
|
Effect.andThen((cl) => cl(new Request(req))),
|
|
298
|
-
Effect.flatMap((res) => S.encode(Response)(res)), // TODO
|
|
299
|
-
Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO,
|
|
284
|
+
Effect.flatMap((res) => S.encode(Response)(res)), // TODO,
|
|
300
285
|
Effect.withSpan("client.request " + requestName, {
|
|
301
286
|
captureStackTrace: false,
|
|
302
287
|
attributes: { "request.name": requestName }
|
|
@@ -334,7 +319,7 @@ type Cruft = "_tag" | Request.RequestTypeId | typeof Serializable.symbol | typeo
|
|
|
334
319
|
// TODO: refactor to new Request pattern, then filter out non-requests similar to the runtime changes in clientFor, and matchFor (boilerplate)
|
|
335
320
|
type RequestHandlers<R, E, M extends Requests> = {
|
|
336
321
|
[K in keyof M]: IsEmpty<Omit<S.Schema.Type<M[K]>, Cruft>> extends true ? {
|
|
337
|
-
handler: Effect<
|
|
322
|
+
handler: Effect<Schema.Type<M[K]["success"]>, Schema.Type<M[K]["failure"]> | E, R>
|
|
338
323
|
Request: M[K]
|
|
339
324
|
Reponse: Schema.Type<M[K]["success"]>
|
|
340
325
|
mapPath: string
|
|
@@ -344,7 +329,7 @@ type RequestHandlers<R, E, M extends Requests> = {
|
|
|
344
329
|
handler: (
|
|
345
330
|
req: Omit<S.Schema.Type<M[K]>, Cruft>
|
|
346
331
|
) => Effect<
|
|
347
|
-
|
|
332
|
+
Schema.Type<M[K]["success"]>,
|
|
348
333
|
Schema.Type<M[K]["failure"]> | E,
|
|
349
334
|
R
|
|
350
335
|
>
|
|
@@ -358,7 +343,7 @@ type RequestHandlers<R, E, M extends Requests> = {
|
|
|
358
343
|
type RequestHandlersE<R, E, M extends Requests> = {
|
|
359
344
|
[K in keyof M & string as `${K}E`]: IsEmpty<Omit<S.Schema.Type<M[K]>, Cruft>> extends true ? {
|
|
360
345
|
handler: Effect<
|
|
361
|
-
|
|
346
|
+
Schema.Encoded<M[K]["success"]>,
|
|
362
347
|
Schema.Type<M[K]["failure"]> | E,
|
|
363
348
|
R
|
|
364
349
|
>
|
|
@@ -374,7 +359,7 @@ type RequestHandlersE<R, E, M extends Requests> = {
|
|
|
374
359
|
Cruft
|
|
375
360
|
>
|
|
376
361
|
) => Effect<
|
|
377
|
-
|
|
362
|
+
Schema.Encoded<M[K]["success"]>,
|
|
378
363
|
Schema.Type<M[K]["failure"]> | E,
|
|
379
364
|
R
|
|
380
365
|
>
|