Change query functions to use t-first style

aantron · Feb 11, 2022 · 9bec26f · 9bec26f
1 parent 940b07a
commit 9bec26f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/example/w-query/README.md b/example/w-query/README.md
@@ -8,7 +8,7 @@ This very simple example accesses a value in the query string with
 ```ocaml
 let () =
   Dream.run (fun request ->
-    match Dream.query "echo" request with
+    match Dream.query request "echo" with
     | None ->
       Dream.html "Use ?echo=foo to give a message to echo!"
     | Some message ->

diff --git a/example/w-query/query.ml b/example/w-query/query.ml
@@ -1,6 +1,6 @@
 let () =
   Dream.run (fun request ->
-    match Dream.query "echo" request with
+    match Dream.query request "echo" with
     | None ->
       Dream.html "Use ?echo=foo to give a message to echo!"
     | Some message ->

diff --git a/src/dream.mli b/src/dream.mli
@@ -432,16 +432,14 @@ https://github.com/aantron/dream/issues
 (** Replaces the version. See {!Dream.version}. *)
 (**/**)
 
-(* TODO Convert query string functions to the new t-first style. *)
-
-val query : string -> request -> string option
+val query : request -> string -> string option
 (** First query parameter with the given name. See
     {{:https://tools.ietf.org/html/rfc3986#section-3.4} RFC 3986 §3.4} and
     example
     {{:https://github.com/aantron/dream/tree/master/example/w-query#files}
     [w-query]}. *)
 
-val queries : string -> request -> string list
+val queries : request -> string -> string list
 (** All query parameters with the given name. *)
 
 val all_queries : request -> (string * string) list

diff --git a/src/server/query.ml b/src/server/query.ml
@@ -28,10 +28,10 @@ let all_queries request =
   |> snd
   |> Formats.from_form_urlencoded
 
-let query name request =
+let query request name =
   List.assoc_opt name (all_queries request)
 
-let queries name request =
+let queries request name =
   all_queries request
   |> List.fold_left (fun accumulator (name', value) ->
     if name' = name then

diff --git a/test/expect/pure/formats/query/query.ml b/test/expect/pure/formats/query/query.ml
@@ -6,8 +6,7 @@
 
 
 let query name string =
-  Dream.request ~target:("/?" ^ string) ""
-  |> Dream.query name
+  Dream.query (Dream.request ~target:("/?" ^ string) "") name
   |> function
     | Some value -> Printf.printf "%S\n" value
     | None -> print_endline "None"
@@ -36,8 +35,7 @@ let%expect_test _ =
 
 
 let queries name string =
-  Dream.request ~target:("/?" ^ string) ""
-  |> Dream.queries name
+  Dream.queries (Dream.request ~target:("/?" ^ string) "") name
   |> List.map (Printf.sprintf "%S")
   |> String.concat " "
   |> Printf.printf "[%s]\n"