Skip to content

Fix compatibility with ReScript 11 uncurried mode #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 11, 2023
Merged

Fix compatibility with ReScript 11 uncurried mode #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1bcd0f
Fix compatibility with ReScript 11 uncurried mode
cknitt Apr 21, 2023
79e6d20
Run yarn build and add fetch_examples.js changes
cknitt May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions lib/js/examples/fetch_examples.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ fetch("/api/hellos/1").then(function (prim) {
return Promise.resolve((console.log(text), undefined));
});

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

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

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

fetch("/api/upload", Webapi__Fetch.RequestInit.make(/* Post */2, {
Accept: "*"
}, Caml_option.some(formData), undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined)(undefined)).then(function (prim) {
Accept: "*"
}, Caml_option.some(formData), undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined)).then(function (prim) {
return prim.json();
});

var controller = new AbortController();

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

controller.abort();

Expand Down
5 changes: 4 additions & 1 deletion src/Webapi/Webapi__Fetch.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ module RequestInit = {
~integrity: string="",
~keepalive: option<bool>=?,
~signal: option<signal>=?,
()
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pretty sure I left these () out because it was easier to write and wasn't necessary to make the output work, this is fine

) =>
make(
~_method=?map(encodeRequestMethod, method_),
Expand All @@ -350,6 +351,7 @@ module RequestInit = {
~integrity,
~keepalive?,
~signal?,
()
)
}

Expand Down Expand Up @@ -401,7 +403,8 @@ module ResponseInit = {
~status: option<int>=?,
~statusText: option<string>=?,
~headers: option<headersInit>=?,
) => make(~status?, ~statusText?, ~headers?)
()
) => make(~status?, ~statusText?, ~headers?, ())
}

module Response = {
Expand Down
10 changes: 5 additions & 5 deletions src/Webapi/Webapi__Fetch.resi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,14 @@ module Headers: {
@new external make: t = "Headers"
@new external makeWithInit: headersInit => t = "Headers"

@send external append: t => (string, string) => unit = "append"
@send external delete: t => string => unit = "delete"
@send external append: (t, string, string) => unit = "append"
@send external delete: (t, string) => unit = "delete"
/* entries */ /* very experimental */
@send @return(null_to_opt)
external get: t => string => option<string> = "get"
@send external has: t => string => bool = "has"
external get: (t, string) => option<string> = "get"
@send external has: (t, string) => bool = "has"
/* keys */ /* very experimental */
@send external set: t => (string, string) => unit = "set"
@send external set: (t, string, string) => unit = "set"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess I inherited this from the bs-fetch code 🤨 this is totally fine 😂

/* values */
/* very experimental */
}
Expand Down