Move fetch to webapi top level, and better integrate it as an internal component

Author: TheSpyder

examples/reason_examples.res examples/fetch_examples.resexamples/reason_examples.res renamed to examples/fetch_examples.res

@@ -1,3 +1,4 @@
+open Webapi;
 let _ = {
   open Js.Promise
   Fetch.fetch("/api/hellos/1")
@@ -41,8 +42,8 @@ let _ = {
 }
 
 let _ = {
-  let formData = Fetch.FormData.make()
-  Fetch.FormData.appendObject(
+  let formData = Webapi.FormData.make()
+  Webapi.FormData.appendObject(
     formData,
     "image0",
     {"type": "image/jpg", "uri": "path/to/it", "name": "image0.jpg"},

examples/ocaml_examples.res

@@ -1,17 +1,17 @@
 'use strict';
 
-var Fetch = require("../src/Webapi/Fetch/Fetch.js");
 var Js_json = require("rescript/lib/js/js_json.js");
 var Belt_Option = require("rescript/lib/js/belt_Option.js");
 var Caml_option = require("rescript/lib/js/caml_option.js");
+var Webapi__Fetch = require("../src/Webapi/Webapi__Fetch.js");
 
 fetch("/api/hellos/1").then(function (prim) {
         return prim.text();
       }).then(function (text) {
       return Promise.resolve((console.log(text), undefined));
     });
 
-fetch("/api/hello", 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));
@@ -33,7 +33,7 @@ var payload = {};
 
 payload["hello"] = "world";
 
-fetch("/api/hello", Fetch.RequestInit.make(/* Post */2, {
+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) {
       return prim.json();
@@ -47,7 +47,7 @@ formData.append("image0", {
       name: "image0.jpg"
     }, undefined);
 
-fetch("/api/upload", Fetch.RequestInit.make(/* Post */2, {
+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) {
       return prim.json();

lib/js/examples/reason_examples.js lib/js/examples/fetch_examples.jslib/js/examples/reason_examples.js renamed to lib/js/examples/fetch_examples.js

@@ -1,25 +1,12 @@
 module Base64 = Webapi__Base64
-
-/** @since 0.18.0 */
 module Blob = Webapi__Blob
 module Canvas = Webapi__Canvas
 module Dom = Webapi__Dom
 module File = Webapi__File
+module Fetch = Webapi__Fetch
+module FormData = Webapi__FormData
 
-/** Re-export from [bs-fetch] for convenience. To use, you will also
-    need to add the [bs-fetch] package as a dependency.
-
-    To get the [FormData] of an HTML form, use
-    [Webapi.Dom.HtmlFormElement.data].
-
-    @since 0.18.0 */
-module FormData = Fetch.FormData
-
-/** Re-export from [bs-fetch] for convenience. See also
-    {!module:FormData}.
-
-    @since 0.18.0 */
-module Iterator = FormData.Iterator
+module Iterator = Webapi__Iterator
 
 module Performance = Webapi__Performance
 

lib/js/examples/ocaml_examples.js

@@ -36,7 +36,7 @@ module Impl = (
   @send external checkValidity: t_htmlFormElement => bool = ""
   @send external reportValidity: t_htmlFormElement => bool = ""
 
-  /** @since 0.18.0 */ @new external data: T.t => Fetch.FormData.t = "FormData"
+  /** @since 0.18.0 */ @new external data: T.t => Webapi__FormData.t = "FormData"
 }
 
 type t = Dom.htmlFormElement

src/Webapi.res

@@ -11,7 +11,7 @@ type signal
 /* external */
 type arrayBuffer /* TypedArray */
 type bufferSource /* Web IDL, either an arrayBuffer or arrayBufferView */
-type formData /* XMLHttpRequest */
+type formData = Webapi__FormData.t/* XMLHttpRequest */
 type readableStream = Webapi__ReadableStream.t /* Streams */
 type urlSearchParams /* URL */
 
@@ -437,45 +437,8 @@ module Response = {
   @send external clone: t => t = "clone"
 }
 
-module FormData = {
-  module EntryValue = {
-    type t
-
-    let classify: t => [> #String(string) | #File(file)] = t =>
-      if Js.typeof(t) == "string" {
-        #String(Obj.magic(t))
-      } else {
-        #File(Obj.magic(t))
-      }
-  }
-
-  module Iterator = Fetch__Iterator
-  type t = formData
-
-  @new external make: unit => t = "FormData"
-  @send external append: (t, string, string) => unit = "append"
-  @send external delete: (t, string) => unit = "delete"
-  @send external get: (t, string) => option<EntryValue.t> = "get"
-  @send external getAll: (t, string) => array<EntryValue.t> = "getAll"
-  @send external set: (t, string, string) => unit = "set"
-  @send external has: (t, string) => bool = "has"
-  @send external keys: t => Iterator.t<string> = "keys"
-  @send external values: t => Iterator.t<EntryValue.t> = "values"
-
-  @send external appendObject: (t, string, {..}, ~filename: string=?, unit) => unit = "append"
-
-  @send external appendBlob: (t, string, blob, ~filename: string=?, unit) => unit = "append"
-
-  @send external appendFile: (t, string, file, ~filename: string=?, unit) => unit = "append"
-
-  @send external setObject: (t, string, {..}, ~filename: string=?, unit) => unit = "set"
-
-  @send external setBlob: (t, string, blob, ~filename: string=?, unit) => unit = "set"
-
-  @send external setFile: (t, string, file, ~filename: string=?, unit) => unit = "set"
-
-  @send external entries: t => Iterator.t<(string, EntryValue.t)> = "entries"
-}
+/** Alias for anyone upgrading */
+module FormData = Webapi__FormData
 
 @val external fetch: string => Js.Promise.t<response> = "fetch"
 @val external fetchWithInit: (string, requestInit) => Js.Promise.t<response> = "fetch"

src/Webapi/Dom/Webapi__Dom__HtmlFormElement.res

@@ -9,7 +9,7 @@ type requestInit
 /* external */
 type arrayBuffer /* TypedArray */
 type bufferSource /* Web IDL, either an arrayBuffer or arrayBufferView */
-type formData /* XMLHttpRequest */
+type formData = Webapi__FormData.t /* XMLHttpRequest */
 type readableStream /* Streams */
 type urlSearchParams /* URL */
 type abortController
@@ -236,46 +236,8 @@ module Response: {
   @send external text: t => Js.Promise.t<string> = "text"
 }
 
-module FormData: {
-  module EntryValue: {
-    @ocaml.doc(" This represents a
-        {{: https://developer.mozilla.org/en-US/docs/Web/API/FormDataEntryValue} FormDataEntryValue}. ")
-    type t
-
-    @ocaml.doc(" [classify entryValue] safely casts the [entryValue] to its
-        correct runtime type. ")
-    let classify: t => [> #String(string) | #File(file)]
-  }
-
-  module Iterator = Fetch__Iterator
-  type t = formData
-
-  @new external make: unit => t = "FormData"
-  @send external append: t => (string, string) => unit = "append"
-  @send external delete: t => string => unit = "delete"
-  @send external get: t => string => option<EntryValue.t> = "get"
-  @send external getAll: t => string => array<EntryValue.t> = "getAll"
-  @send external set: t => (string, string) => unit = "set"
-  @send external has: t => string => bool = "has"
-  @send external keys: t => Iterator.t<string> = "keys"
-  @send external values: t => Iterator.t<EntryValue.t> = "values"
-
-  @send @ocaml.doc(" This is for React Native compatibility purposes ")
-  external appendObject: t => (string, {..}, ~filename: string=?, unit) => unit = "append"
-
-  @send external appendBlob: t => (string, blob, ~filename: string=?, unit) => unit = "append"
-
-  @send external appendFile: t => (string, file, ~filename: string=?, unit) => unit = "append"
-
-  @send @ocaml.doc(" This is for React Native compatibility purposes ")
-  external setObject: t => (string, {..}, ~filename: string=?, unit) => unit = "set"
-
-  @send external setBlob: t => (string, blob, ~filename: string=?, unit) => unit = "set"
-
-  @send external setFile: t => (string, file, ~filename: string=?, unit) => unit = "set"
-
-  @send external entries: t => Iterator.t<(string, EntryValue.t)> = "entries"
-}
+/** Alias for anyone upgrading */
+module FormData = Webapi__FormData
 
 @val external fetch: string => Js.Promise.t<response> = "fetch"
 @val external fetchWithInit: (string, requestInit) => Js.Promise.t<response> = "fetch"