Skip to content

Commit b4e85db

Browse files
wokalskiadamchol
wokalski
authored and
adamchol
committed
Fix arpaca codegen
1 parent 7b4a655 commit b4e85db

File tree

1 file changed

+40
-39
lines changed

1 file changed

+40
-39
lines changed

‎lib/eio/arpaca/bin/codegen.ml

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ let to_snake_case =
5353
in
5454
fun str -> regex str
5555

56-
let service_name_of_package path = String.concat "." path
56+
let service_name_of_package service_packages service =
57+
String.concat "." (service_packages @ [ service ])
5758

5859
let gen_service_client_struct ~proto_gen_module (service : Ot.service) sc : unit
5960
=
@@ -74,7 +75,7 @@ let gen_service_client_struct ~proto_gen_module (service : Ot.service) sc : unit
7475
connection_error )
7576
Grpc_client_eio.Io.t) request =
7677
let response =
77-
Grpc_client_eio.Client.Unary.call ~sw ~io ~service:"%s.%s"
78+
Grpc_client_eio.Client.Unary.call ~sw ~io ~service:"%s"
7879
~method_name:%S
7980
~headers:(Grpc_client.make_request_headers `Proto)
8081
(%s.%s request)
@@ -89,8 +90,8 @@ let gen_service_client_struct ~proto_gen_module (service : Ot.service) sc : unit
8990
}
9091
| #Grpc_client_eio.Rpc_error.Unary.error' as rest -> Io'.raise_client_error (Unary rest)|}
9192
(Pb_codegen_util.function_name_of_rpc rpc |> to_snake_case)
92-
(service_name_of_package service.service_packages)
93-
service.service_name rpc.rpc_name typ_mod_name
93+
(service_name_of_package service.service_packages service.service_name)
94+
rpc.rpc_name typ_mod_name
9495
(function_name_encode_pb ~service_name ~rpc_name rpc.rpc_req)
9596
typ_mod_name
9697
(function_name_decode_pb ~service_name ~rpc_name rpc.rpc_res)
@@ -99,13 +100,13 @@ let gen_service_client_struct ~proto_gen_module (service : Ot.service) sc : unit
99100
{|let %s (type headers net_response stream_error connection_error) ~sw ~(io :
100101
( headers,
101102
net_response,
102-
Pbrt.Encoder.t -> unit,
103+
Pbrt.Encoder.t ->unit,
103104
Pbrt.Decoder.t Grpc_eio_core.Body_reader.consumer,
104105
stream_error,
105106
connection_error )
106107
Grpc_client_eio.Io.t) request handler =
107108
let stream =
108-
Grpc_client_eio.Client.Server_streaming.call ~sw ~io ~service:"%s.%s"
109+
Grpc_client_eio.Client.Server_streaming.call ~sw ~io ~service:"%s"
109110
~method_name:"%s"
110111
~headers:(Grpc_client.make_request_headers `Proto)
111112
(%s.%s request) (fun net_response ~read ->
@@ -125,8 +126,8 @@ let gen_service_client_struct ~proto_gen_module (service : Ot.service) sc : unit
125126
| #Grpc_client_eio.Rpc_error.Server_streaming.error' as rest -> Io'.raise_client_error (Server_streaming rest)
126127
|}
127128
(Pb_codegen_util.function_name_of_rpc rpc |> to_snake_case)
128-
(service_name_of_package service.service_packages)
129-
service.service_name rpc.rpc_name typ_mod_name
129+
(service_name_of_package service.service_packages service.service_name)
130+
rpc.rpc_name typ_mod_name
130131
(function_name_encode_pb ~service_name ~rpc_name rpc.rpc_req)
131132
typ_mod_name
132133
(function_name_decode_pb ~service_name ~rpc_name rpc.rpc_res)
@@ -141,7 +142,7 @@ let gen_service_client_struct ~proto_gen_module (service : Ot.service) sc : unit
141142
connection_error )
142143
Grpc_client_eio.Io.t) handler =
143144
let response =
144-
Grpc_client_eio.Client.Client_streaming.call ~sw ~io ~service:"%s.%s"
145+
Grpc_client_eio.Client.Client_streaming.call ~sw ~io ~service:"%s"
145146
~method_name:"%s"
146147
~headers:(Grpc_client.make_request_headers `Proto)
147148
(fun net_response ~writer ->
@@ -159,8 +160,8 @@ let gen_service_client_struct ~proto_gen_module (service : Ot.service) sc : unit
159160
}
160161
| #Grpc_client_eio.Rpc_error.Client_streaming.error' as rest -> Io'.raise_client_error (Client_streaming rest)|}
161162
(Pb_codegen_util.function_name_of_rpc rpc |> to_snake_case)
162-
(service_name_of_package service.service_packages)
163-
service.service_name rpc.rpc_name typ_mod_name
163+
(service_name_of_package service.service_packages service.service_name)
164+
rpc.rpc_name typ_mod_name
164165
(function_name_encode_pb ~service_name ~rpc_name rpc.rpc_req)
165166
typ_mod_name
166167
(function_name_decode_pb ~service_name ~rpc_name rpc.rpc_res)
@@ -175,7 +176,7 @@ let gen_service_client_struct ~proto_gen_module (service : Ot.service) sc : unit
175176
connection_error )
176177
Grpc_client_eio.Io.t) handler =
177178
let stream =
178-
Grpc_client_eio.Client.Bidirectional_streaming.call ~sw ~io ~service:"%s.%s"
179+
Grpc_client_eio.Client.Bidirectional_streaming.call ~sw ~io ~service:"%s"
179180
~method_name:"%s"
180181
~headers:(Grpc_client.make_request_headers `Proto)
181182
(fun net_response ~writer ~read ->
@@ -194,8 +195,8 @@ let gen_service_client_struct ~proto_gen_module (service : Ot.service) sc : unit
194195
| `Stream_result_success result -> result
195196
| #Grpc_client_eio.Rpc_error.Bidirectional_streaming.error' as rest -> Io'.raise_client_error (Bidirectional_streaming rest)|}
196197
(Pb_codegen_util.function_name_of_rpc rpc |> to_snake_case)
197-
(service_name_of_package service.service_packages)
198-
service.service_name rpc.rpc_name typ_mod_name
198+
(service_name_of_package service.service_packages service.service_name)
199+
rpc.rpc_name typ_mod_name
199200
(function_name_encode_pb ~service_name ~rpc_name rpc.rpc_req)
200201
typ_mod_name
201202
(function_name_decode_pb ~service_name ~rpc_name rpc.rpc_res)
@@ -208,7 +209,7 @@ let gen_service_client_struct ~proto_gen_module (service : Ot.service) sc : unit
208209
F.linep sc
209210
{|let %s ~sw ~io request =
210211
let response =
211-
Grpc_client_eio.Client.Unary.call ~sw ~io ~service:"%s.%s"
212+
Grpc_client_eio.Client.Unary.call ~sw ~io ~service:"%s"
212213
~method_name:%S
213214
~headers:(Grpc_client.make_request_headers `Proto)
214215
(%s.%s request)
@@ -223,16 +224,16 @@ let gen_service_client_struct ~proto_gen_module (service : Ot.service) sc : unit
223224
}
224225
| #Grpc_client_eio.Rpc_error.Unary.error' as rest -> Error rest|}
225226
(Pb_codegen_util.function_name_of_rpc rpc |> to_snake_case)
226-
(service_name_of_package service.service_packages)
227-
service.service_name rpc.rpc_name typ_mod_name
227+
(service_name_of_package service.service_packages service.service_name)
228+
rpc.rpc_name typ_mod_name
228229
(function_name_encode_pb ~service_name ~rpc_name rpc.rpc_req)
229230
typ_mod_name
230231
(function_name_decode_pb ~service_name ~rpc_name rpc.rpc_res)
231232
| `Server_streaming ->
232233
F.linep sc
233234
{|let %s ~sw ~io request handler =
234235
let stream =
235-
Grpc_client_eio.Client.Server_streaming.call ~sw ~io ~service:"%s.%s"
236+
Grpc_client_eio.Client.Server_streaming.call ~sw ~io ~service:"%s"
236237
~method_name:"%s"
237238
~headers:(Grpc_client.make_request_headers `Proto)
238239
(%s.%s request) (fun net_response ~read ->
@@ -249,16 +250,16 @@ let gen_service_client_struct ~proto_gen_module (service : Ot.service) sc : unit
249250
| `Stream_result_success result -> Ok result
250251
| #Grpc_client_eio.Rpc_error.Server_streaming.error' as rest -> Error rest|}
251252
(Pb_codegen_util.function_name_of_rpc rpc |> to_snake_case)
252-
(service_name_of_package service.service_packages)
253-
service.service_name rpc.rpc_name typ_mod_name
253+
(service_name_of_package service.service_packages service.service_name)
254+
rpc.rpc_name typ_mod_name
254255
(function_name_encode_pb ~service_name ~rpc_name rpc.rpc_req)
255256
typ_mod_name
256257
(function_name_decode_pb ~service_name ~rpc_name rpc.rpc_res)
257258
| `Client_streaming ->
258259
F.linep sc
259260
{|let %s ~sw ~io handler =
260261
let response =
261-
Grpc_client_eio.Client.Client_streaming.call ~sw ~io ~service:"%s.%s"
262+
Grpc_client_eio.Client.Client_streaming.call ~sw ~io ~service:"%s"
262263
~method_name:"%s"
263264
~headers:(Grpc_client.make_request_headers `Proto)
264265
(fun net_response ~writer ->
@@ -276,16 +277,16 @@ let gen_service_client_struct ~proto_gen_module (service : Ot.service) sc : unit
276277
}
277278
| #Grpc_client_eio.Rpc_error.Client_streaming.error' as rest -> Error rest|}
278279
(Pb_codegen_util.function_name_of_rpc rpc |> to_snake_case)
279-
(service_name_of_package service.service_packages)
280-
service.service_name rpc.rpc_name typ_mod_name
280+
(service_name_of_package service.service_packages service.service_name)
281+
rpc.rpc_name typ_mod_name
281282
(function_name_encode_pb ~service_name ~rpc_name rpc.rpc_req)
282283
typ_mod_name
283284
(function_name_decode_pb ~service_name ~rpc_name rpc.rpc_res)
284285
| `Bidirectional_streaming ->
285286
F.linep sc
286287
{|let %s ~sw ~io handler =
287288
let stream =
288-
Grpc_client_eio.Client.Bidirectional_streaming.call ~sw ~io ~service:"%s.%s"
289+
Grpc_client_eio.Client.Bidirectional_streaming.call ~sw ~io ~service:"%s"
289290
~method_name:"%s"
290291
~headers:(Grpc_client.make_request_headers `Proto)
291292
(fun net_response ~writer ~read ->
@@ -303,8 +304,8 @@ let gen_service_client_struct ~proto_gen_module (service : Ot.service) sc : unit
303304
| `Stream_result_success result -> Ok result
304305
| #Grpc_client_eio.Rpc_error.Bidirectional_streaming.error' as rest -> Error rest|}
305306
(Pb_codegen_util.function_name_of_rpc rpc |> to_snake_case)
306-
(service_name_of_package service.service_packages)
307-
service.service_name rpc.rpc_name typ_mod_name
307+
(service_name_of_package service.service_packages service.service_name)
308+
rpc.rpc_name typ_mod_name
308309
(function_name_encode_pb ~service_name ~rpc_name rpc.rpc_req)
309310
typ_mod_name
310311
(function_name_decode_pb ~service_name ~rpc_name rpc.rpc_res)
@@ -333,15 +334,15 @@ let gen_service_client_struct ~proto_gen_module (service : Ot.service) sc : unit
333334
| #Grpc_client_eio.Rpc_error.Unary.error' as rest ->
334335
rest|}
335336
(Pb_codegen_util.function_name_of_rpc rpc |> to_snake_case)
336-
(service_name_of_package service.service_packages)
337+
(service_name_of_package service.service_packages service.service_name)
337338
service.service_name rpc.rpc_name typ_mod_name
338339
(function_name_encode_pb ~service_name ~rpc_name rpc.rpc_req)
339340
typ_mod_name
340341
(function_name_decode_pb ~service_name ~rpc_name rpc.rpc_res)
341342
| `Server_streaming ->
342343
F.linep sc
343344
{|let %s ~sw ~io request handler =
344-
Grpc_client_eio.Client.Server_streaming.call ~sw ~io ~service:"%s.%s"
345+
Grpc_client_eio.Client.Server_streaming.call ~sw ~io ~service:"%s"
345346
~method_name:"%s"
346347
~headers:(Grpc_client.make_request_headers `Proto)
347348
(%s.%s request) (fun net_response ~read ->
@@ -354,16 +355,16 @@ let gen_service_client_struct ~proto_gen_module (service : Ot.service) sc : unit
354355
in
355356
handler net_response responses)|}
356357
(Pb_codegen_util.function_name_of_rpc rpc |> to_snake_case)
357-
(service_name_of_package service.service_packages)
358-
service.service_name rpc.rpc_name typ_mod_name
358+
(service_name_of_package service.service_packages service.service_name)
359+
rpc.rpc_name typ_mod_name
359360
(function_name_encode_pb ~service_name ~rpc_name rpc.rpc_req)
360361
typ_mod_name
361362
(function_name_decode_pb ~service_name ~rpc_name rpc.rpc_res)
362363
| `Client_streaming ->
363364
F.linep sc
364365
{|let %s ~sw ~io handler =
365366
let response =
366-
Grpc_client_eio.Client.Client_streaming.call ~sw ~io ~service:"%s.%s"
367+
Grpc_client_eio.Client.Client_streaming.call ~sw ~io ~service:"%s"
367368
~method_name:"%s"
368369
~headers:(Grpc_client.make_request_headers `Proto)
369370
(fun net_response ~writer ->
@@ -382,15 +383,15 @@ let gen_service_client_struct ~proto_gen_module (service : Ot.service) sc : unit
382383
| #Grpc_client_eio.Rpc_error.Client_streaming.error' as rest ->
383384
rest|}
384385
(Pb_codegen_util.function_name_of_rpc rpc |> to_snake_case)
385-
(service_name_of_package service.service_packages)
386-
service.service_name rpc.rpc_name typ_mod_name
386+
(service_name_of_package service.service_packages service.service_name)
387+
rpc.rpc_name typ_mod_name
387388
(function_name_encode_pb ~service_name ~rpc_name rpc.rpc_req)
388389
typ_mod_name
389390
(function_name_decode_pb ~service_name ~rpc_name rpc.rpc_res)
390391
| `Bidirectional_streaming ->
391392
F.linep sc
392393
{|let %s ~sw ~io handler =
393-
Grpc_client_eio.Client.Bidirectional_streaming.call ~sw ~io ~service:"%s.%s"
394+
Grpc_client_eio.Client.Bidirectional_streaming.call ~sw ~io ~service:"%s"
394395
~method_name:"%s"
395396
~headers:(Grpc_client.make_request_headers `Proto)
396397
(fun net_response ~writer ~read ->
@@ -404,8 +405,8 @@ let gen_service_client_struct ~proto_gen_module (service : Ot.service) sc : unit
404405
in
405406
handler net_response ~writer:writer' ~read:read')|}
406407
(Pb_codegen_util.function_name_of_rpc rpc |> to_snake_case)
407-
(service_name_of_package service.service_packages)
408-
service.service_name rpc.rpc_name typ_mod_name
408+
(service_name_of_package service.service_packages service.service_name)
409+
rpc.rpc_name typ_mod_name
409410
(function_name_encode_pb ~service_name ~rpc_name rpc.rpc_req)
410411
typ_mod_name
411412
(function_name_decode_pb ~service_name ~rpc_name rpc.rpc_res)
@@ -471,9 +472,9 @@ let gen_service_server_struct ~proto_gen_module (service : Ot.service) top_scope
471472
let rpc_name = rpc.rpc_name in
472473
let service_name = service.service_name in
473474

474-
F.linep sc {|| "%s.%s", %S ->|}
475-
(String.concat "." service.service_packages)
476-
service.service_name rpc.rpc_name;
475+
F.linep sc {|| "%s", %S ->|}
476+
(String.concat "." (service.service_packages @ [ service.service_name ]))
477+
rpc.rpc_name;
477478
let impl = Pb_codegen_util.function_name_of_rpc rpc |> to_snake_case in
478479

479480
let decoder_func =

0 commit comments

Comments
 (0)