Skip to content

Update FetchAPI constructors #103

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.

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 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 14 additions & 2 deletions src/FetchAPI/Headers.res
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,25 @@ open Prelude
[Read more on MDN](https://developer.mozilla.org/docs/Web/API/Headers)
*/
@new
external make: (~init: array<array<string>>=?) => headers = "Headers"
external make: unit => headers = "Headers"

/**
[Read more on MDN](https://developer.mozilla.org/docs/Web/API/Headers)
*/
@new
external make2: (~init: any=?) => headers = "Headers"
external fromDict: dict<string> => headers = "Headers"

/**
[Read more on MDN](https://developer.mozilla.org/docs/Web/API/Headers)
*/
@new
external fromHeaders: headers => headers = "Headers"

/**
[Read more on MDN](https://developer.mozilla.org/docs/Web/API/Headers)
*/
@new
external fromKeyValueArray: array<(string, string)> => headers = "Headers"

/**
[Read more on MDN](https://developer.mozilla.org/docs/Web/API/Headers/append)
Expand Down
5 changes: 5 additions & 0 deletions src/FetchAPI/HeadersInit.res
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,8 @@ external fromDict: dict<string> => headersInit = "%identity"
[Read more on MDN](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch#setting_headers)
*/
external fromHeaders: headers => headersInit = "%identity"

/**
[Read more on MDN](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch#setting_headers)
*/
external fromKeyValueArray: array<(string, string)> => headersInit = "%identity"
4 changes: 2 additions & 2 deletions src/FetchAPI/Request.res
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ open FileAPI
[Read more on MDN](https://developer.mozilla.org/docs/Web/API/Request)
*/
@new
external make: (~input: request, ~init: requestInit=?) => request = "Request"
external fromURL: (string, ~init: requestInit=?) => request = "Request"

/**
[Read more on MDN](https://developer.mozilla.org/docs/Web/API/Request)
*/
@new
external make2: (~input: string, ~init: requestInit=?) => request = "Request"
external fromRequest: (request, ~init: requestInit=?) => request = "Request"

/**
[Read more on MDN](https://developer.mozilla.org/docs/Web/API/Request/arrayBuffer)
Expand Down
32 changes: 25 additions & 7 deletions src/FetchAPI/Response.res
Original file line number Diff line number Diff line change
Expand Up @@ -5,43 +5,61 @@ open FileAPI
[Read more on MDN](https://developer.mozilla.org/docs/Web/API/Response)
*/
@new
external make: (~body: readableStream<unit>=?, ~init: responseInit=?) => response = "Response"
external fromNull: (@as(json`null`) _, ~init: responseInit=?) => response = "Response"

/**
[Read more on MDN](https://developer.mozilla.org/docs/Web/API/Response)
*/
@new
external make2: (~body: blob=?, ~init: responseInit=?) => response = "Response"
external fromString: (string, ~init: responseInit=?) => response = "Response"

/**
[Read more on MDN](https://developer.mozilla.org/docs/Web/API/Response)
*/
@new
external make3: (~body: DataView.t=?, ~init: responseInit=?) => response = "Response"
external fromArrayBuffer: (ArrayBuffer.t, ~init: responseInit=?) => response = "Response"

/**
[Read more on MDN](https://developer.mozilla.org/docs/Web/API/Response)
*/
@new
external make4: (~body: ArrayBuffer.t=?, ~init: responseInit=?) => response = "Response"
external fromTypedArray: (TypedArray.t<'t>, ~init: responseInit=?) => response = "Response"

/**
[Read more on MDN](https://developer.mozilla.org/docs/Web/API/Response)
*/
@new
external make5: (~body: formData=?, ~init: responseInit=?) => response = "Response"
external fromDataView: (DataView.t, ~init: responseInit=?) => response = "Response"

/**
[Read more on MDN](https://developer.mozilla.org/docs/Web/API/Response)
*/
@new
external make6: (~body: urlSearchParams=?, ~init: responseInit=?) => response = "Response"
external fromBlob: (blob, ~init: responseInit=?) => response = "Response"

/**
[Read more on MDN](https://developer.mozilla.org/docs/Web/API/Response)
*/
@new
external make7: (~body: string=?, ~init: responseInit=?) => response = "Response"
external fromFile: (file, ~init: responseInit=?) => response = "Response"

/**
[Read more on MDN](https://developer.mozilla.org/docs/Web/API/Response)
*/
@new
external fromURLSearchParams: (urlSearchParams, ~init: responseInit=?) => response = "Response"

/**
[Read more on MDN](https://developer.mozilla.org/docs/Web/API/Response)
*/
@new
external fromFormData: (formData, ~init: responseInit=?) => response = "Response"

/**
[Read more on MDN](https://developer.mozilla.org/docs/Web/API/Response)
*/
@new
external fromReadableStream: (readableStream<'t>, ~init: responseInit=?) => response = "Response"

/**
[Read more on MDN](https://developer.mozilla.org/docs/Web/API/Request/arrayBuffer)
Expand Down
12 changes: 9 additions & 3 deletions src/FetchAPI/URLSearchParams.res
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,25 @@ open Prelude
[Read more on MDN](https://developer.mozilla.org/docs/Web/API/URLSearchParams)
*/
@new
external make: (~init: array<array<string>>=?) => urlSearchParams = "URLSearchParams"
external make: unit => urlSearchParams = "URLSearchParams"

/**
[Read more on MDN](https://developer.mozilla.org/docs/Web/API/URLSearchParams)
*/
@new
external make2: (~init: any=?) => urlSearchParams = "URLSearchParams"
external fromKeyValueArray: array<(string, string)> => urlSearchParams = "URLSearchParams"

/**
[Read more on MDN](https://developer.mozilla.org/docs/Web/API/URLSearchParams)
*/
@new
external make3: (~init: string=?) => urlSearchParams = "URLSearchParams"
external fromDict: dict<string> => urlSearchParams = "URLSearchParams"

/**
[Read more on MDN](https://developer.mozilla.org/docs/Web/API/URLSearchParams)
*/
@new
external fromString: string => urlSearchParams = "URLSearchParams"

/**
Appends a specified key/value pair as a new search parameter.
Expand Down
30 changes: 30 additions & 0 deletions tests/FetchAPI/Headers__test.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions tests/FetchAPI/Headers__test.res
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
let h = Headers.make()

h->Headers.set(~name="X-Test", ~value="1")

let h2 = Headers.fromDict(dict{"X-Vegetable": "Carrot"})

let h3 = Headers.fromKeyValueArray([("X-Fruit", "Apple"), ("X-Vegetable", "Carrot")])

Console.log(h3->Headers.get("X-Fruit"))
20 changes: 20 additions & 0 deletions tests/FetchAPI/Request__test.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions tests/FetchAPI/Request__test.res
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
let req = Request.fromURL("https://example.com")

let req1 = Request.fromURL(
"https://example.com/api",
~init={method: "POST", body: BodyInit.fromString("hello")},
)

let req2 = Request.fromRequest(req1)

Console.log(await req2->Request.text)
19 changes: 19 additions & 0 deletions tests/FetchAPI/Response__test.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions tests/FetchAPI/Response__test.res
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
let response = Response.fromNull(~init={status: 204})

let response1 = Response.fromString(
"pong",
~init={status: 200, headers: HeadersInit.fromDict(dict{"X-Fruit": "Peach"})},
)
16 changes: 14 additions & 2 deletions tests/FetchAPI/URLSearchParams__test.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions tests/FetchAPI/URLSearchParams__test.res
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
let params1 = URLSearchParams.make3(~init="foo=1&bar=2")
let params1 = URLSearchParams.fromString("foo=1&bar=2")
params1->URLSearchParams.keys->Iterator.toArray->Array.forEach(Console.log)

let params2 = URLSearchParams.make3(~init="?foo=1&bar=b")
let params2 = URLSearchParams.fromKeyValueArray([("foo", "1"), ("bar", "b")])
params2->URLSearchParams.values->Iterator.toArray->Array.forEach(Console.log)

let params3 = URLSearchParams.make3(~init="?foo=1&bar=b")
let params3 = URLSearchParams.fromDict(dict{"foo": "1", "bar": "b"})
params3
->URLSearchParams.entries
->Iterator.toArray
Expand Down
2 changes: 1 addition & 1 deletion tests/Global__test.res
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ let response2 = await fetch(
)

let response3 = await fetch_withRequest(
Request.make2(~input="https://rescript-lang.org/"),
Request.fromURL("https://rescript-lang.org/"),
~init={
method: "POST",
headers: HeadersInit.fromDict(
Expand Down
Loading