Clean up dev and user namespaces

Author: NoahTheDuke

dev/src/clj/user.clj

@@ -0,0 +1,24 @@
+(ns user
+  (:require
+   [kaocha.repl]
+   [potemkin :refer [import-vars]]
+   [web.dev]))
+
+(defn clear-current-ns
+  "Removes all refers, all defined vars, and all imports from the current namespace.
+  Useful in development when unsure of the state of the current namespace.
+  Can be called from anywhere with `(user/clear-current-ns)`."
+  []
+  (map #(ns-unmap *ns* %) (keys (ns-imports *ns*))))
+
+(import-vars
+  [web.dev
+   fetch-cards
+   go
+   halt
+   reset
+   restart])
+
+(import-vars
+  [kaocha.repl
+   run])

dev/src/clj/web/dev.clj

@@ -0,0 +1,22 @@
+(ns web.dev
+  (:require
+   [integrant.repl :as ig-repl]
+   [potemkin :refer [import-vars]]
+   [web.core]
+   [web.system :as system]
+   [tasks.nrdb :as nrdb]))
+
+(ig-repl/set-prep! (fn [] (system/server-config)))
+
+(import-vars
+  [integrant.repl
+   go
+   halt
+   reset])
+
+(defn restart [] (halt) (go))
+
+(defn fetch-cards []
+  (nrdb/fetch-data {:db true})
+  (system/stop :jinteki/cards)
+  (system/start :jinteki/cards))

src/cljs/dev/nr.cljs renamed to dev/src/cljs/nr/dev.cljs

@@ -1,4 +1,4 @@
-(ns dev.nr
+(ns nr.dev
   (:require
     [nr.main :as main]
     [devtools.core :as devtools]))

project.clj

@@ -17,8 +17,8 @@
   :main web.core
 
   :repl-options {:timeout 180000
-                 :init-ns dev.user
-                 :init (do (use 'web.core) (go))}
+                 :init-ns web.dev
+                 :init (go)}
 
   :dependencies [[org.clojure/clojure "1.10.3"]
                  [org.clojure/clojurescript "1.10.891"
@@ -68,8 +68,7 @@
                  [integrant "0.8.0"]
                  [cljc.java-time "0.1.18"]
                  [time-literals "0.1.5"]
-                 [metosin/reitit "0.5.15"]
-                 [metosin/malli "0.7.0"]]
+                 [metosin/reitit "0.5.18"]]
 
   :profiles {:dev {:dependencies [[binaryage/devtools "1.0.4"]
                                   [cider/piggieback "0.5.3"]
@@ -80,7 +79,9 @@
                                   [lambdaisland/kaocha "1.68.1059"]
                                   [thheller/shadow-cljs "2.16.8"]]
                    :plugins [[cider/cider-nrepl "0.27.3"]]
-                   :source-paths ["src/clj" "src/cljs" "src/cljc" "test/clj" "src/css"]
+                   :source-paths ["src/clj" "src/cljs" "src/cljc" "src/css"
+                                  "dev/src/clj" "dev/src/cljs"
+                                  "test/clj"]
                    :resource-paths ["target"]
                    :clean-targets ^{:protect false} ["target"]
                    :jvm-opts ["-Djdk.attach.allowAttachSelf"

shadow-cljs.edn

@@ -3,6 +3,6 @@
  {:app {:target :browser
         :output-dir "resources/public/js"
         :devtools {:watch-dir "resources/public/css"
-                   :repl-init-ns dev.nr}
-        :dev {:modules {:main {:entries [dev.nr]}}}
-        :release {:modules {:main {:entries [prod.nr]}}}}}}
+                   :repl-init-ns nr.dev}
+        :dev {:modules {:main {:entries [nr.dev]}}}
+        :release {:modules {:main {:entries [nr.prod]}}}}}}

src/clj/dev/user.clj

@@ -21,7 +21,9 @@
 (defn download-edn-data
   [localpath]
   (if localpath
-    ((comp edn/read-string slurp) (str localpath "/edn/raw_data.edn"))
+    (-> (str localpath "/edn/raw_data.edn")
+        (slurp)
+        (edn/read-string))
     (let [{:keys [status body error]} @(http/get edn-base-url)]
       (cond
         error (throw (Exception. (str "Failed to download file " error)))

src/clj/tasks/nrdb.clj

@@ -1,7 +1,7 @@
 (ns web.core
   (:require
-    [web.system :refer [start stop]]
-    [monger.collection :as mc])
+   [monger.collection :as mc]
+   [web.system :refer [start stop]])
   (:gen-class :main true))
 
 (defn -main [& _args]