Skip to content

Commit 651d52f

Browse files
authored
Merge pull request #123 from cknitt/fix-rescript-11-uncurried
Fix compatibility with ReScript 11 uncurried mode
2 parents fb2e74a + 79e6d20 commit 651d52f

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

lib/js/examples/fetch_examples.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ fetch("/api/hellos/1").then(function (prim) {
1111
return Promise.resolve((console.log(text), undefined));
1212
});
1313

14-
fetch("/api/hello", Webapi__Fetch.RequestInit.make(/* Post */2, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined)(undefined)).then(function (prim) {
14+
fetch("/api/hello", Webapi__Fetch.RequestInit.make(/* Post */2, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined)).then(function (prim) {
1515
return prim.text();
1616
}).then(function (text) {
1717
return Promise.resolve((console.log(text), undefined));
@@ -34,8 +34,8 @@ var payload = {};
3434
payload["hello"] = "world";
3535

3636
fetch("/api/hello", Webapi__Fetch.RequestInit.make(/* Post */2, {
37-
"Content-Type": "application/json"
38-
}, Caml_option.some(JSON.stringify(payload)), undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined)(undefined)).then(function (prim) {
37+
"Content-Type": "application/json"
38+
}, Caml_option.some(JSON.stringify(payload)), undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined)).then(function (prim) {
3939
return prim.json();
4040
});
4141

@@ -48,14 +48,14 @@ formData.append("image0", {
4848
}, undefined);
4949

5050
fetch("/api/upload", Webapi__Fetch.RequestInit.make(/* Post */2, {
51-
Accept: "*"
52-
}, Caml_option.some(formData), undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined)(undefined)).then(function (prim) {
51+
Accept: "*"
52+
}, Caml_option.some(formData), undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined)).then(function (prim) {
5353
return prim.json();
5454
});
5555

5656
var controller = new AbortController();
5757

58-
fetch("/api/fruit", Webapi__Fetch.RequestInit.make(undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, Caml_option.some(controller.signal))(undefined));
58+
fetch("/api/fruit", Webapi__Fetch.RequestInit.make(undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, Caml_option.some(controller.signal), undefined));
5959

6060
controller.abort();
6161

src/Webapi/Webapi__Fetch.res

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ module RequestInit = {
336336
~integrity: string="",
337337
~keepalive: option<bool>=?,
338338
~signal: option<signal>=?,
339+
()
339340
) =>
340341
make(
341342
~_method=?map(encodeRequestMethod, method_),
@@ -350,6 +351,7 @@ module RequestInit = {
350351
~integrity,
351352
~keepalive?,
352353
~signal?,
354+
()
353355
)
354356
}
355357

@@ -401,7 +403,8 @@ module ResponseInit = {
401403
~status: option<int>=?,
402404
~statusText: option<string>=?,
403405
~headers: option<headersInit>=?,
404-
) => make(~status?, ~statusText?, ~headers?)
406+
()
407+
) => make(~status?, ~statusText?, ~headers?, ())
405408
}
406409

407410
module Response = {

src/Webapi/Webapi__Fetch.resi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,14 @@ module Headers: {
103103
@new external make: t = "Headers"
104104
@new external makeWithInit: headersInit => t = "Headers"
105105

106-
@send external append: t => (string, string) => unit = "append"
107-
@send external delete: t => string => unit = "delete"
106+
@send external append: (t, string, string) => unit = "append"
107+
@send external delete: (t, string) => unit = "delete"
108108
/* entries */ /* very experimental */
109109
@send @return(null_to_opt)
110-
external get: t => string => option<string> = "get"
111-
@send external has: t => string => bool = "has"
110+
external get: (t, string) => option<string> = "get"
111+
@send external has: (t, string) => bool = "has"
112112
/* keys */ /* very experimental */
113-
@send external set: t => (string, string) => unit = "set"
113+
@send external set: (t, string, string) => unit = "set"
114114
/* values */
115115
/* very experimental */
116116
}

0 commit comments

Comments
 (0)