unify packages

bin/dune

···
 (executable
  (name jmap)
  (public_name jmap)
- (package jmap-eio)
+ (package jmap)
+ (optional)
  (modules jmap)
- (libraries jmap-eio eio_main))
+ (libraries jmap.eio eio_main))
 
 (executable
  (name jmapq)
  (public_name jmapq)
- (package jmap-eio)
+ (package jmap)
+ (optional)
  (modules jmapq)
- (libraries jmap-eio eio_main re jsont.bytesrw))
+ (libraries jmap.eio eio_main re jsont.bytesrw))

dune-project

···
  (name jmap)
  (synopsis "JMAP protocol implementation for OCaml")
  (description
-  "A complete implementation of the JSON Meta Application Protocol (JMAP) as specified in RFC 8620 (core) and RFC 8621 (mail).")
+  "A complete implementation of the JSON Meta Application Protocol (JMAP) as specified in RFC 8620 (core) and RFC 8621 (mail). Includes subpackages for Eio (jmap.eio) and browser (jmap.brr) clients.")
  (depends
   (ocaml (>= 5.4.0))
   (jsont (>= 0.2.0))
   json-pointer
-  (ptime (>= 1.0.0))))
-
-(package
- (name jmap-eio)
- (synopsis "JMAP client for Eio")
- (description "High-level JMAP client using Eio for async I/O and the Requests HTTP library.")
- (depends
-  (ocaml (>= 5.4.0))
-  (jmap (= :version))
-  (jsont (>= 0.2.0))
-  eio
-  requests))
-
-(package
- (name jmap-brr)
- (synopsis "JMAP client for browsers")
- (description "JMAP client using Brr for browser-based email clients with js_of_ocaml.")
- (depends
-  (ocaml (>= 5.4.0))
-  (jmap (= :version))
-  (jsont (>= 0.2.0))
-  (brr (>= 0.0.6))))
+  (ptime (>= 1.0.0))
+  (eio :with-test)
+  (requests :with-test)
+  (brr :with-test))
+ (depopts eio requests brr))

eio/dune

···
 (library
  (name jmap_eio)
- (public_name jmap-eio)
+ (public_name jmap.eio)
+ (optional)
  (libraries jmap jsont jsont.bytesrw eio requests uri str cmdliner fmt.tty)
  (modules jmap_eio codec client cli))

jmap-brr.opam

···
-# This file is generated by dune, edit dune-project instead
-opam-version: "2.0"
-synopsis: "JMAP client for browsers"
-description:
-  "JMAP client using Brr for browser-based email clients with js_of_ocaml."
-maintainer: ["Anil Madhavapeddy <[e-mail]>"]
-authors: ["Anil Madhavapeddy <[e-mail]>"]
-license: "ISC"
-homepage: "https://tangled.org/@anil.recoil.org/ocaml-jmap"
-bug-reports: "https://tangled.org/@anil.recoil.org/ocaml-jmap/issues"
-depends: [
-  "dune" {>= "3.20"}
-  "ocaml" {>= "5.4.0"}
-  "jmap" {= version}
-  "jsont" {>= "0.2.0"}
-  "brr" {>= "0.0.6"}
-  "odoc" {with-doc}
-]
-build: [
-  ["dune" "subst"] {dev}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
-]
-x-maintenance-intent: ["(latest)"]

jmap-eio.opam

···
-# This file is generated by dune, edit dune-project instead
-opam-version: "2.0"
-synopsis: "JMAP client for Eio"
-description:
-  "High-level JMAP client using Eio for async I/O and the Requests HTTP library."
-maintainer: ["Anil Madhavapeddy <[e-mail]>"]
-authors: ["Anil Madhavapeddy <[e-mail]>"]
-license: "ISC"
-homepage: "https://tangled.org/@anil.recoil.org/ocaml-jmap"
-bug-reports: "https://tangled.org/@anil.recoil.org/ocaml-jmap/issues"
-depends: [
-  "dune" {>= "3.20"}
-  "ocaml" {>= "5.4.0"}
-  "jmap" {= version}
-  "jsont" {>= "0.2.0"}
-  "eio"
-  "requests"
-  "odoc" {with-doc}
-]
-build: [
-  ["dune" "subst"] {dev}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
-]
-x-maintenance-intent: ["(latest)"]

jmap.opam

···
 opam-version: "2.0"
 synopsis: "JMAP protocol implementation for OCaml"
 description:
-  "A complete implementation of the JSON Meta Application Protocol (JMAP) as specified in RFC 8620 (core) and RFC 8621 (mail)."
+  "A complete implementation of the JSON Meta Application Protocol (JMAP) as specified in RFC 8620 (core) and RFC 8621 (mail). Includes subpackages for Eio (jmap.eio) and browser (jmap.brr) clients."
 maintainer: ["Anil Madhavapeddy <[e-mail]>"]
 authors: ["Anil Madhavapeddy <[e-mail]>"]
 license: "ISC"
···
   "jsont" {>= "0.2.0"}
   "json-pointer"
   "ptime" {>= "1.0.0"}
+  "eio" {with-test}
+  "requests" {with-test}
+  "brr" {with-test}
   "odoc" {with-doc}
 ]
+depopts: ["eio" "requests" "brr"]
 build: [
   ["dune" "subst"] {dev}
   [

lib/js/dune

···
 
 (library
  (name jmap_brr)
- (public_name jmap-brr)
+ (public_name jmap.brr)
+ (optional)
  (libraries jmap brr jsont.brr)
  (modes byte))