http: turn url into a labeled arg

rizo · Apr 2, 2024 · 5907514 · 5907514
1 parent 0a60e2c
commit 5907514
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 19 deletions.
diff --git a/src/helix/Helix.mli b/src/helix/Helix.mli
@@ -164,23 +164,24 @@ module Http : sig
     ?mode:Stdweb.Fetch.mode ->
     encode:'a Encoder.t ->
     decode:'b Decoder.t ->
-    string ->
+    url:string ->
     'a ->
     'b result option Signal.t
 
   val get :
     ?headers:(string * string) list ->
     ?mode:Stdweb.Fetch.mode ->
     decode:'a Decoder.t ->
-    string ->
+    url:string ->
+    unit ->
     'a result option Signal.t
 
   val put :
     ?headers:(string * string) list ->
     ?mode:Stdweb.Fetch.mode ->
     encode:'a Encoder.t ->
     decode:'b Decoder.t ->
-    string ->
+    url:string ->
     'a ->
     'b result option Signal.t
 
@@ -189,15 +190,15 @@ module Http : sig
     ?mode:Stdweb.Fetch.mode ->
     encode:'a Encoder.t ->
     decode:'b Decoder.t ->
-    string ->
+    url:string ->
     'a ->
     'b result option Signal.t
 
   val delete :
     ?headers:(string * string) list ->
     ?mode:Stdweb.Fetch.mode ->
     decode:'b Decoder.t ->
-    string ->
+    url:string ->
     'a ->
     'b result option Signal.t
 
@@ -208,23 +209,24 @@ module Http : sig
       ?mode:Stdweb.Fetch.mode ->
       encode:('a -> Stdweb.Json.t) ->
       decode:(Stdweb.Json.t -> ('b, 'err) Result.t) ->
-      string ->
+      url:string ->
       'a ->
       'b result option Signal.t
 
     val get :
       ?headers:(string * string) list ->
       ?mode:Stdweb.Fetch.mode ->
       decode:(Stdweb.Json.t -> ('a, 'err) Result.t) ->
-      string ->
+      url:string ->
+      unit ->
       'a result option Signal.t
 
     val put :
       ?headers:(string * string) list ->
       ?mode:Stdweb.Fetch.mode ->
       encode:('a -> Stdweb.Json.t) ->
       decode:(Stdweb.Json.t -> ('b, 'err) Result.t) ->
-      string ->
+      url:string ->
       'a ->
       'b result option Signal.t
 
@@ -233,15 +235,15 @@ module Http : sig
       ?mode:Stdweb.Fetch.mode ->
       encode:('a -> Stdweb.Json.t) ->
       decode:(Stdweb.Json.t -> ('b, 'err) Result.t) ->
-      string ->
+      url:string ->
       'a ->
       'b result option Signal.t
 
     val delete :
       ?headers:(string * string) list ->
       ?mode:Stdweb.Fetch.mode ->
       decode:(Stdweb.Json.t -> ('b, 'err) Result.t) ->
-      string ->
+      url:string ->
       'a ->
       'b result option Signal.t
   end

diff --git a/src/helix/Http.ml b/src/helix/Http.ml
@@ -74,7 +74,7 @@ end
 
 (* FIXME: prevent signal handler errors from being caught *)
 let request ?meth ?(headers = []) ?mode ~encode:(content_type, to_body) ~decode
-    url request_value =
+    ~url request_value =
   let headers =
     match content_type with
     | Some content_type -> ("Content-Type", content_type) :: headers
@@ -107,17 +107,17 @@ let request ?meth ?(headers = []) ?mode ~encode:(content_type, to_body) ~decode
   |> Promise.catch (fun err -> Signal.emit (Some (Error (Fetch_error err))) s);
   s
 
-let get ?headers ?mode ~decode url =
-  request ~meth:`Get ?headers ?mode ~encode:Encoder.ignore ~decode url ()
+let get ?headers ?mode ~decode ~url () =
+  request ~meth:`Get ?headers ?mode ~encode:Encoder.ignore ~decode ~url ()
 
-let put ?headers ?mode ~encode ~decode url request_value =
-  request ~meth:`Put ?headers ?mode ~encode ~decode url request_value
+let put ?headers ?mode ~encode ~decode ~url request_value =
+  request ~meth:`Put ?headers ?mode ~encode ~decode ~url request_value
 
-let post ?headers ?mode ~encode ~decode url request_value =
-  request ~meth:`Post ?headers ?mode ~encode ~decode url request_value
+let post ?headers ?mode ~encode ~decode ~url request_value =
+  request ~meth:`Post ?headers ?mode ~encode ~decode ~url request_value
 
-let delete ?headers ?mode ~decode url request_value =
-  request ~meth:`Delete ?headers ?mode ~encode:Encoder.ignore ~decode url
+let delete ?headers ?mode ~decode ~url request_value =
+  request ~meth:`Delete ?headers ?mode ~encode:Encoder.ignore ~decode ~url
     request_value
 
 module Json = struct