Add to_form and of_form functions to body

CHANGES.md

@@ -14,6 +14,7 @@
 - cohttp: fix transfer-encoding ordering in headers (@mseri #721)
 - Lower-level support for long-running cohttp-async connections (@brendanlong #704)
 - fix deadlock in logging (@dinosaure #722)
+- add of_form and to_form functions to body (@seliopou #440, @mseri #723)
 
 ## v2.5.4 (2020-07-21)
 

cohttp-async/src/body.mli

@@ -16,3 +16,4 @@ val to_pipe : t -> string Pipe.Reader.t
 val of_pipe : string Pipe.Reader.t -> t
 val map : t -> f:(string -> string) -> t
 val as_pipe : t -> f:(string Pipe.Reader.t -> string Pipe.Reader.t) -> t
+val to_form : t -> (string * string list) list Deferred.t

cohttp-async/src/body_raw.ml

@@ -71,6 +71,9 @@ let map t ~f =
 
 let as_pipe t ~f = `Pipe (t |> to_pipe |> f)
 
+let to_form t = to_string t >>| Uri.query_of_encoded
+let of_form ?scheme f = Uri.encoded_of_query ?scheme f |> of_string
+
 let write_body write_body (body : t) writer =
   match body with
   | `Empty -> return ()

cohttp-lwt/src/body.ml

@@ -104,3 +104,6 @@ let map f t =
   match t with
   | #Body.t as t -> (Body.map f t :> t)
   | `Stream s -> `Stream (Lwt_stream.map f s)
+
+  let to_form (body:t) = to_string body >|= Uri.query_of_encoded
+  let of_form ?scheme f = Uri.encoded_of_query ?scheme f |> of_string

cohttp-lwt/src/body.mli

@@ -29,6 +29,8 @@ val to_string_list : t -> string list Lwt.t
 val to_stream : t -> string Lwt_stream.t
 val of_stream : string Lwt_stream.t -> t
 
+val to_form : t -> (string * string list) list Lwt.t
+
 val create_stream : ('a -> Cohttp.Transfer.chunk Lwt.t) -> 'a -> string Lwt_stream.t
 
 val length : t -> (int64 * t) Lwt.t

cohttp/src/body.ml

@@ -64,4 +64,6 @@ let map f = function
   | `String s -> `String (f s)
   | `Strings sl -> `Strings (List.map f sl)
 
+let to_form t = Uri.query_of_encoded (to_string t)
+let of_form ?scheme f = Uri.encoded_of_query ?scheme f |> of_string
 (* TODO: maybe add a functor here that uses IO.S *)

cohttp/src/s.ml

@@ -133,10 +133,12 @@ module type Body = sig
   type t
   val to_string : t -> string
   val to_string_list : t -> string list
+  val to_form : t -> (string * string list) list
   val empty : t
   val is_empty : t -> bool
   val of_string : string -> t
   val of_string_list : string list -> t
+  val of_form : ?scheme:string -> (string * string list) list -> t
   val map : (string -> string) -> t -> t
   val transfer_encoding : t -> Transfer.encoding
 end