refactor(describe): remove describe_common lib

Signed-off-by: Ali Caglayan <[email protected]>

Author: Alizter

bin/describe/describe_common.ml

@@ -160,7 +160,7 @@ let to_dyn context_name external_resolved_libs =
 let term =
   let+ common = Common.term
   and+ context_name = Common.context_arg ~doc:"Build context to use."
-  and+ format = Describe_common.Format.arg in
+  and+ format = Describe_format.arg in
   let config = Common.init common in
   Scheduler.go ~common ~config @@ fun () ->
   let open Fiber.O in
@@ -175,7 +175,7 @@ let term =
   in
   external_resolved_libs setup super_context
   >>| to_dyn context_name
-  >>| Describe_common.Format.print_dyn format
+  >>| Describe_format.print_dyn format
 
 let command =
   let doc =

bin/describe/describe_common.mli

@@ -0,0 +1,31 @@
+open Stdune
+open Import
+
+type t =
+  | Sexp
+  | Csexp
+
+let all = [ ("sexp", Sexp); ("csexp", Csexp) ]
+
+let arg =
+  let doc = Printf.sprintf "$(docv) must be %s" (Arg.doc_alts_enum all) in
+  Arg.(value & opt (enum all) Sexp & info [ "format" ] ~docv:"FORMAT" ~doc)
+
+let print_as_sexp dyn =
+  let rec dune_lang_of_sexp : Sexp.t -> Dune_lang.t = function
+    | Atom s -> Dune_lang.atom_or_quoted_string s
+    | List l -> List (List.map l ~f:dune_lang_of_sexp)
+  in
+  let cst =
+    dyn |> Sexp.of_dyn |> dune_lang_of_sexp
+    |> Dune_lang.Ast.add_loc ~loc:Loc.none
+    |> Dune_lang.Cst.concrete
+  in
+  let version = Dune_lang.Syntax.greatest_supported_version Stanza.syntax in
+  Pp.to_fmt Stdlib.Format.std_formatter
+    (Dune_lang.Format.pp_top_sexps ~version [ cst ])
+
+let print_dyn t dyn =
+  match t with
+  | Csexp -> Csexp.to_channel stdout (Sexp.of_dyn dyn)
+  | Sexp -> print_as_sexp dyn

bin/describe/describe_external_lib_deps.ml

@@ -0,0 +1,11 @@
+open Import
+
+(** Formatting utilities for dune describe commands *)
+
+type t =
+  | Sexp
+  | Csexp
+
+val arg : t Term.t
+
+val print_dyn : t -> Dyn.t -> unit

bin/describe/describe_format.ml

@@ -3,7 +3,7 @@ open Stdune
 
 let term =
   let+ common = Common.term
-  and+ format = Describe_common.Format.arg in
+  and+ format = Describe_format.arg in
   let config = Common.init common in
   Scheduler.go ~common ~config @@ fun () ->
   Build_system.run_exn @@ fun () ->
@@ -26,7 +26,7 @@ let term =
     Dyn.Tuple [ String (Path.to_string opam_file); String contents ]
   in
   Dyn.List (List.map packages ~f:opam_file_to_dyn)
-  |> Describe_common.Format.print_dyn format
+  |> Describe_format.print_dyn format
 
 let command =
   let doc =