Migrate from duti to clojure+ and clj-reload

Author: tonsky

deps.edn

@@ -28,11 +28,12 @@
   {:extra-paths ["dev" "test"]
    :jvm-opts    ["-ea" "-Ddatascript.debug" "-Dclojure.main.report=stderr"]
    :extra-deps
-   {io.github.tonsky/duti      {:git/sha "e36d65296a4f9758664309ec35b00887e88c405a"}
-    metosin/jsonista           {:mvn/version "0.3.3"}
-    cheshire/cheshire          {:mvn/version "5.10.0"}
-    com.cognitect/transit-clj  {:mvn/version "1.0.324"}
-    com.cognitect/transit-cljs {:mvn/version "0.8.269"}}}
+   {io.github.tonsky/clj-reload   {:mvn/version "0.9.8"}
+    io.github.tonsky/clojure-plus {:mvn/version "1.6.3"}
+    metosin/jsonista              {:mvn/version "0.3.3"}
+    cheshire/cheshire             {:mvn/version "5.10.0"}
+    com.cognitect/transit-clj     {:mvn/version "1.0.324"}
+    com.cognitect/transit-cljs    {:mvn/version "0.8.269"}}}
 
   :bench
   {:extra-paths ["bench"]

dev/user.clj

@@ -1,17 +1,32 @@
 (ns user
   (:require
-   [duti.core :as duti]))
+   [clj-reload.core :as reload]
+   [clojure+.error]
+   [clojure+.hashp]
+   [clojure+.print]
+   [clojure+.test]))
 
-(duti/set-dirs "src" "bench" "test" #_"bench_datomic" #_"test_datomic")
+(clojure+.error/install!
+  {:trace-transform
+   (fn [trace]
+     (take-while #(not (#{"Compiler" "clj-reload" "clojure-sublimed"} (:ns %))) trace))})
 
-(def reload
-  duti/reload)
+(clojure+.hashp/install!)
+(clojure+.print/install!)
+(clojure+.test/install!)
+
+(reload/init
+  {:dirs ["src" "bench" "test"]
+   :no-reload '[user]})
 
-(def -main
-  duti/-main)
+(def reload
+  reload/reload)
 
 (defn test-all []
-  (duti/test #"datascript\.test\.(?!cljs).*"))
+  (reload/reload {:only #"datascript\.test\.(?!cljs).*"})
+  (clojure+.test/run))
 
 (defn -test-main [_]
-  (duti/test-exit #"datascript\.test\.(?!cljs).*"))
+  (reload/reload {:only #"datascript\.test\.(?!cljs).*"})
+  (let [{:keys [fail error]} (clojure+.test/run)]
+    (System/exit (+ fail error))))

script/repl.sh

@@ -2,4 +2,4 @@
 set -o errexit -o nounset -o pipefail
 cd "`dirname $0`/.."
 
-clojure -M:1.12:dev:bench:datomic -m user
+clojure -X:1.12:dev:bench:datomic clojure+.core.server/start-server