refactor: remove [Dune_rules.Package] (#10818)

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>

bin/arg.ml

@@ -11,7 +11,7 @@ include struct
   module Dep_conf = Dep_conf
 end
 
-module Package = Dune_rules.Package
+module Package = Dune_lang.Package
 module Context_name = Dune_engine.Context_name
 
 let package_name = conv Package.Name.conv

bin/arg.mli

@@ -33,7 +33,7 @@ val dep : Dep.t conv
 val graph_format : Dune_graph.Graph.File_format.t conv
 val path : Path.t conv
 val external_path : Path.External.t conv
-val package_name : Dune_rules.Package.Name.t conv
+val package_name : Dune_lang.Package.Name.t conv
 val profile : Dune_lang.Profile.t conv
 val lib_name : Dune_lang.Lib_name.t conv
 val version : Dune_lang.Syntax.Version.t conv

bin/common.ml

@@ -14,7 +14,6 @@ end
 
 open struct
   open Dune_rules
-  module Package = Package
   module Colors = Colors
   module Only_packages = Only_packages
 end
@@ -26,6 +25,8 @@ open struct
   module Manpage = Manpage
 end
 
+module Package = Dune_lang.Package
+
 module Let_syntax = struct
   let ( let+ ) t f = Term.(const f $ t)
   let ( and+ ) a b = Term.(const (fun x y -> x, y) $ a $ b)

bin/import.ml

@@ -28,7 +28,6 @@ include struct
   module Super_context = Super_context
   module Context = Context
   module Workspace = Workspace
-  module Package = Package
   module Dune_project = Dune_project
   module Dune_package = Dune_package
   module Resolve = Resolve
@@ -67,6 +66,7 @@ include struct
   module Profile = Profile
   module Lib_name = Lib_name
   module Package_name = Package_name
+  module Package = Package
   module Package_version = Package_version
   module Source_kind = Source_kind
   module Package_info = Package_info

src/dune_pkg/opam_file.ml

@@ -200,3 +200,87 @@ module Create = struct
     { file_contents; file_name }
   ;;
 end
+
+let load_opam_file_with_contents ~contents:opam_file_string file name =
+  let loc = Loc.in_file (Path.source file) in
+  let opam =
+    let opam =
+      let lexbuf =
+        Lexbuf.from_string opam_file_string ~fname:(Path.Source.to_string file)
+      in
+      try Ok (parse lexbuf) with
+      | User_error.E _ as exn -> Error exn
+    in
+    match opam with
+    | Ok s -> Some s
+    | Error exn ->
+      (* CR-rgrinberg: make it possible to disable this warning *)
+      User_warning.emit
+        ~loc
+        [ Pp.text
+            "Unable to read opam file. Some information about this package such as its \
+             version will be ignored."
+        ; Pp.textf "Reason: %s" (Printexc.to_string exn)
+        ];
+      None
+  in
+  let open Option.O in
+  let get_one name =
+    let* value =
+      let* opam = opam in
+      get_field opam name
+    in
+    match value.pelem with
+    | String s -> Some s
+    | _ -> None
+  in
+  let get_many name =
+    let* value =
+      let* opam = opam in
+      get_field opam name
+    in
+    match value.pelem with
+    | String s -> Some [ s ]
+    | List l ->
+      List.fold_left
+        l.pelem
+        ~init:(Some [])
+        ~f:(fun acc (v : OpamParserTypes.FullPos.value) ->
+          let* acc = acc in
+          match v.pelem with
+          | String s -> Some (s :: acc)
+          | _ -> None)
+      >>| List.rev
+    | _ -> None
+  in
+  let dir = Path.Source.parent_exn file in
+  let info =
+    Dune_lang.Package_info.create
+      ~maintainers:(get_many "maintainer")
+      ~authors:(get_many "authors")
+      ~homepage:(get_one "homepage")
+      ~bug_reports:(get_one "bug-reports")
+      ~documentation:(get_one "doc")
+      ~license:(get_many "license")
+      ~source:
+        (let+ url = get_one "dev-repo" in
+         Dune_lang.Source_kind.Url url)
+  in
+  Dune_lang.Package.create
+    ~name
+    ~dir
+    ~loc
+    ~version:(get_one "version" |> Option.map ~f:Package_version.of_string)
+    ~conflicts:[]
+    ~depends:[]
+    ~depopts:[]
+    ~info
+    ~synopsis:(get_one "synopsis")
+    ~description:(get_one "description")
+    ~has_opam_file:(Exists true)
+    ~tags:(Option.value (get_many "tags") ~default:[])
+    ~deprecated_package_names:Package_name.Map.empty
+    ~sites:Dune_lang.Site.Map.empty
+    ~allow_empty:true
+    ~original_opam_file:(Some { file; contents = opam_file_string })
+;;

src/dune_pkg/opam_file.mli

@@ -31,3 +31,10 @@ module Create : sig
   val normalise_field_order : (string * value) list -> (string * value) list
   val of_bindings : (string * value) list -> file:Path.t -> t
 end
+
+(** Construct a package description from an opam file and its contents *)
+val load_opam_file_with_contents
+  :  contents:string
+  -> Path.Source.t
+  -> Package_name.t
+  -> Dune_lang.Package.t

src/dune_rules/dune_project.ml

@@ -933,7 +933,7 @@ let gen_load ~read ~dir ~files ~infer_from_opam_files : t option Memo.t =
         let loc = Loc.in_file (Path.source opam_file) in
         let pkg =
           let+ contents = read opam_file in
-          Package.load_opam_file_with_contents ~contents opam_file name
+          Dune_pkg.Opam_file.load_opam_file_with_contents ~contents opam_file name
         in
         (name, (loc, pkg)) :: acc)
     |> Package.Name.Map.of_list_exn

src/dune_rules/dune_rules.ml

@@ -61,7 +61,6 @@ module Dune_project = Dune_project
 module Source_tree = Source_tree
 module Source_dir_status = Source_dir_status
 module Dune_file0 = Dune_file0
-module Package = Package
 module Dialect = Dialect
 module Private_context = Private_context
 module Odoc = Odoc

src/dune_rules/import.ml

@@ -100,6 +100,7 @@ include struct
   module Package_dependency = Package_dependency
   module Package_constraint = Package_constraint
   module Dune_project_name = Dune_project_name
+  module Package = Package
 end
 
 include Dune_engine.No_io

src/dune_rules/install_rules.ml

@@ -499,6 +499,8 @@ end = struct
       Some (name, entries)
   ;;
 
+  module Package_map_traversals = Memo.Make_parallel_map (Package.Name.Map)
+
   let stanzas_to_entries sctx =
     let ctx = Context.build_context (Super_context.context sctx) in
     let* stanzas = Dune_load.dune_files ctx.name in

src/dune_rules/only_packages.mli

@@ -1,3 +1,5 @@
+open Import
+
 (** Restrict the set of visible packages *)
 
 module Clflags : sig

test/expect-tests/findlib_tests.ml

@@ -2,7 +2,13 @@ open Stdune
 module Lib_name = Dune_lang.Lib_name
 module Meta = Dune_findlib.Findlib.Meta
 module Findlib_config = Dune_findlib.Findlib.Config
-module Lib_dep = Dune_lang.Lib_dep
+
+include struct
+  open Dune_lang
+  module Lib_dep = Lib_dep
+  module Package = Package
+end
+
 open Dune_rules
 open Dune_rules.For_tests
 open Dune_tests_common