Merge pull request #5 from mbarbin/err

Refactor err & err-cli
mbarbin · Sep 3, 2024 · 4b2744b · 4b2744b
2 parents 2ebf451 + fa51ffd
commit 4b2744b
Show file tree

Hide file tree

Showing 52 changed files with 1,566 additions and 1,459 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
 #           janestreet-bleeding-external: https://github.com/janestreet/opam-repository.git#external-packages
 
       - name: Install dependencies
-        run: opam install . --deps-only --with-doc --with-test
+        run: opam install . --deps-only --with-doc --with-test --with-dev-setup
 
       - name: Build
         run: opam exec -- dune build @all @lint

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,14 @@
+## 0.0.3 (2024-09-03)
+
+### Changed
+
+- Refactor `Err` - undocumented changes while we're stabilizing.
+- Refactor the separation between `Err` and `Err_handler`. Keep only the cli part separate and rename it `err-cli`.
+
+### Fixed
+
+- Fix some unintended behavior related to raising and catching errors with `err0` and `erro-handler`. Added tests to cover and characterize different use cases.
+
 ## 0.0.2 (2024-08-23)
 
 ### Changed

diff --git a/Makefile b/Makefile
@@ -20,7 +20,7 @@ lint:
 
 .PHONY: deps
 deps:
-	opam install . --deps-only --with-doc --with-test
+	opam install . --deps-only --with-doc --with-test --with-dev-setup
 
 .PHONY: doc
 doc:

diff --git a/commandlang-tests.opam b/commandlang-tests.opam
@@ -10,8 +10,9 @@ bug-reports: "https://github.com/mbarbin/commandlang/issues"
 depends: [
   "dune" {>= "3.16"}
   "ocaml" {>= "5.2"}
+  "ocamlformat" {with-dev-setup & = "0.26.2"}
   "base" {>= "v0.17" & < "v0.18"}
-  "bisect_ppx" {dev & >= "2.8.3"}
+  "bisect_ppx" {with-dev-setup & >= "2.8.3"}
   "climate" {= "0.0.1~preview-0.1"}
   "cmdliner" {= "1.3.0"}
   "commandlang" {= version}
@@ -20,24 +21,24 @@ depends: [
   "commandlang-to-cmdliner" {= version}
   "core" {>= "v0.17" & < "v0.18"}
   "core_unix" {>= "v0.17" & < "v0.18"}
-  "err0" {= version}
-  "err0-handler" {= version}
+  "err" {= version}
+  "err-cli" {= version}
   "expect_test_helpers_core" {>= "v0.17" & < "v0.18"}
-  "loc0" {>= "0.1.0"}
+  "loc" {>= "0.2.0"}
   "mdx" {>= "2.4"}
   "ppx_compare" {>= "v0.17" & < "v0.18"}
   "ppx_enumerate" {>= "v0.17" & < "v0.18"}
   "ppx_expect" {>= "v0.17" & < "v0.18"}
   "ppx_hash" {>= "v0.17" & < "v0.18"}
   "ppx_here" {>= "v0.17" & < "v0.18"}
-  "ppx_js_style" {dev & >= "v0.17" & < "v0.18"}
+  "ppx_js_style" {with-dev-setup & >= "v0.17" & < "v0.18"}
   "ppx_let" {>= "v0.17" & < "v0.18"}
   "ppx_sexp_conv" {>= "v0.17" & < "v0.18"}
   "ppx_sexp_value" {>= "v0.17" & < "v0.18"}
   "ppxlib" {>= "0.33"}
-  "sherlodoc" {with-doc & >= "0.2"}
   "stdio" {>= "v0.17" & < "v0.18"}
   "stdune" {>= "3.16"}
+  "sherlodoc" {with-doc & >= "0.2"}
   "odoc" {with-doc}
 ]
 build: [

diff --git a/commandlang-to-base.opam b/commandlang-to-base.opam
@@ -10,18 +10,18 @@ bug-reports: "https://github.com/mbarbin/commandlang/issues"
 depends: [
   "dune" {>= "3.16"}
   "ocaml" {>= "5.2"}
+  "ocamlformat" {with-dev-setup & = "0.26.2"}
   "base" {>= "v0.17" & < "v0.18"}
-  "bisect_ppx" {dev & >= "2.8.3"}
+  "bisect_ppx" {with-dev-setup & >= "2.8.3"}
   "commandlang" {= version}
   "core" {>= "v0.17" & < "v0.18"}
-  "err0" {= version}
-  "err0-handler" {= version}
+  "err" {= version}
   "ppx_compare" {>= "v0.17" & < "v0.18"}
   "ppx_enumerate" {>= "v0.17" & < "v0.18"}
   "ppx_expect" {>= "v0.17" & < "v0.18"}
   "ppx_hash" {>= "v0.17" & < "v0.18"}
   "ppx_here" {>= "v0.17" & < "v0.18"}
-  "ppx_js_style" {dev & >= "v0.17" & < "v0.18"}
+  "ppx_js_style" {with-dev-setup & >= "v0.17" & < "v0.18"}
   "ppx_let" {>= "v0.17" & < "v0.18"}
   "ppx_sexp_conv" {>= "v0.17" & < "v0.18"}
   "ppx_sexp_value" {>= "v0.17" & < "v0.18"}

diff --git a/commandlang-to-climate.opam b/commandlang-to-climate.opam
@@ -10,12 +10,12 @@ bug-reports: "https://github.com/mbarbin/commandlang/issues"
 depends: [
   "dune" {>= "3.16"}
   "ocaml" {>= "5.2"}
-  "bisect_ppx" {dev & >= "2.8.3"}
+  "ocamlformat" {with-dev-setup & = "0.26.2"}
+  "bisect_ppx" {with-dev-setup & >= "2.8.3"}
   "climate" {= "0.0.1~preview-0.1"}
   "commandlang" {= version}
-  "err0" {= version}
-  "err0-handler" {= version}
-  "ppx_js_style" {dev & >= "v0.17" & < "v0.18"}
+  "err" {= version}
+  "ppx_js_style" {with-dev-setup & >= "v0.17" & < "v0.18"}
   "odoc" {with-doc}
 ]
 build: [

diff --git a/commandlang-to-cmdliner.opam b/commandlang-to-cmdliner.opam
@@ -10,12 +10,12 @@ bug-reports: "https://github.com/mbarbin/commandlang/issues"
 depends: [
   "dune" {>= "3.16"}
   "ocaml" {>= "5.2"}
-  "bisect_ppx" {dev & >= "2.8.3"}
+  "ocamlformat" {with-dev-setup & = "0.26.2"}
+  "bisect_ppx" {with-dev-setup & >= "2.8.3"}
   "cmdliner" {= "1.3.0"}
   "commandlang" {= version}
-  "err0" {= version}
-  "err0-handler" {= version}
-  "ppx_js_style" {dev & >= "v0.17" & < "v0.18"}
+  "err" {= version}
+  "ppx_js_style" {with-dev-setup & >= "v0.17" & < "v0.18"}
   "odoc" {with-doc}
 ]
 build: [

diff --git a/commandlang.opam b/commandlang.opam
@@ -10,8 +10,9 @@ bug-reports: "https://github.com/mbarbin/commandlang/issues"
 depends: [
   "dune" {>= "3.16"}
   "ocaml" {>= "5.2"}
-  "bisect_ppx" {dev & >= "2.8.3"}
-  "ppx_js_style" {dev & >= "v0.17" & < "v0.18"}
+  "ocamlformat" {with-dev-setup & = "0.26.2"}
+  "bisect_ppx" {with-dev-setup & >= "2.8.3"}
+  "ppx_js_style" {with-dev-setup & >= "v0.17" & < "v0.18"}
   "odoc" {with-doc}
 ]
 build: [

diff --git a/doc/docs/reference/dune b/doc/docs/reference/dune
@@ -1,4 +1,5 @@
 (mdx
+ (package commandlang-tests)
  (deps
   (package commandlang)
   (glob_files *.txt))

diff --git a/doc/docs/tutorials/getting-started/dune b/doc/docs/tutorials/getting-started/dune
@@ -1,4 +1,5 @@
 (mdx
+ (package commandlang-tests)
  (deps
   (package commandlang)
   my-calculator