Simplify namespace interdependencies

Author: alexander-yakushev

Makefile

@@ -2,11 +2,8 @@
 
 GIT_SHA := $(shell git rev-parse HEAD)
 
-docker-image:
-	DOCKER_BUILDKIT=1 docker build -f deploy/Dockerfile -t flamebin:latest .
-
 remote-pull:
-	(cd /flamebin/qa/flamebin.dev && git fetch && git reset --hard origin/develop && cd /flamebin/prod/flamebin.dev && git fetch && git reset --hard origin/prod)
+	git fetch && git reset --hard origin/develop
 
 compose:
 	GIT_SHA=$(GIT_SHA) docker-compose -f deploy/compose.yml up --build -d; \

src/flamebin/config.clj

@@ -1,10 +1,6 @@
 (ns flamebin.config
   (:require [clojure.java.io :as io]
             [clojure.string :as str]
-            flamebin.util
-            malli.core
-            malli.experimental.time
-            malli.registry
             [mount.lite :as mount]
             [omniconf.core :as cfg]
             [taoensso.timbre :as log]
@@ -94,10 +90,4 @@
 
 ;;;; Misc initialization
 
-(malli.registry/set-default-registry!
- (malli.registry/composite-registry
-  (malli.core/default-schemas)
-  (malli.experimental.time/schemas)
-  flamebin.util/nano-id-registry))
-
 (taoensso.timbre.tools.logging/use-timbre)

src/flamebin/dto.clj

@@ -1,31 +1,12 @@
 (ns flamebin.dto
   (:require [clojure.test.check.generators :as gen]
-            [flamebin.config :refer [config]]
-            [malli.core :as m]
+            [flamebin.util.malli :as fmalli]
             [malli.experimental.lite :as mlite]
-            [malli.experimental.time.transform]
-            [malli.transform :as mt]
             [malli.util :as mu])
-  (:import java.time.Instant))
+  (:import (java.time Instant)))
 
-config ;; Don't remove.
-
-(def ^:private int-to-boolean
-  {:decoders
-   {:boolean #(cond (= % 1) true
-                    (= % 0) false
-                    :else %)}})
-
-(def global-transformer
-  (mt/transformer
-   mt/string-transformer
-   (mt/key-transformer {:decode keyword})
-   int-to-boolean
-   malli.experimental.time.transform/time-transformer
-   mt/default-value-transformer))
-
-(defn coerce [value schema]
-  (m/coerce schema value global-transformer))
+(def coerce fmalli/coerce)
+(reset-meta! #'coerce (meta #'fmalli/coerce))
 
 (defmacro ^:private defschema-and-constructor [schema-name schema-val]
   (assert (= (first schema-val) '->))

src/flamebin/util.clj

@@ -31,17 +31,6 @@
 
 #_(every? valid-id? (repeatedly 10000 new-id))
 
-(defn- gen-invoke
-  "Given a 0-arg function `f`, return a generator that invokes it whenever a value
-  needs to be generated."
-  [f]
-  (#'gen/make-gen (fn [& _] (rose/pure (f)))))
-
-(def nano-id-registry
-  {:nano-id [:and {:gen/gen (gen-invoke new-id)}
-             :string
-             [:fn {:error/message "Not valid ID"} valid-id?]]})
-
 (let [generator (encore/rand-id-fn {:chars :alphanumeric, :len secret-token-bytes})]
   (defn secret-token [] (generator)))
 

src/flamebin/util/malli.clj

@@ -0,0 +1,43 @@
+(ns flamebin.util.malli
+  (:require [clojure.test.check.generators :as gen]
+            [clojure.test.check.rose-tree :as rose]
+            [flamebin.util :as util]
+            [malli.core :as m]
+            [malli.experimental.time]
+            [malli.experimental.time.transform]
+            [malli.registry]
+            [malli.transform :as mt]))
+
+(defn- gen-invoke
+  "Given a 0-arg function `f`, return a generator that invokes it whenever a value
+  needs to be generated."
+  [f]
+  (#'gen/make-gen (fn [& _] (rose/pure (f)))))
+
+(def nano-id-registry
+  {:nano-id [:and {:gen/gen (gen-invoke util/new-id)}
+             :string
+             [:fn {:error/message "Not valid ID"} util/valid-id?]]})
+
+(def ^:private int-to-boolean
+  {:decoders
+   {:boolean #(cond (= % 1) true
+                    (= % 0) false
+                    :else %)}})
+
+(def global-transformer
+  (mt/transformer
+   mt/string-transformer
+   (mt/key-transformer {:decode keyword})
+   int-to-boolean
+   malli.experimental.time.transform/time-transformer
+   mt/default-value-transformer))
+
+(defn coerce [value schema]
+  (m/coerce schema value global-transformer))
+
+(malli.registry/set-default-registry!
+ (malli.registry/composite-registry
+  (malli.core/default-schemas)
+  (malli.experimental.time/schemas)
+  nano-id-registry))

src/flamebin/web.clj

@@ -5,12 +5,9 @@
             [flamebin.infra.metrics :as ms]
             [flamebin.rate-limiter :as rl]
             [flamebin.util :refer [raise valid-id?]]
-            [flamebin.util.streams :as streams]
+            [flamebin.web.middleware :refer :all]
             [flamebin.web.pages :as pages]
-            [malli.core :as m]
-            malli.error
             [mount.lite :as mount]
-            [muuntaja.core :as content]
             [muuntaja.middleware :as content.mw]
             [org.httpkit.server :as server]
             [reitit.coercion.malli]
@@ -20,9 +17,7 @@
             [reitit.ring.middleware.parameters :refer [parameters-middleware]]
             [ring.middleware.head]
             [ring.middleware.resource]
-            [taoensso.timbre :as log]
-            [flamebin.web.middleware :refer :all])
-  (:import clojure.lang.ExceptionInfo))
+            [taoensso.timbre :as log]))
 
 ;; Endpoints: API
 

src/flamebin/web/middleware.clj

@@ -1,14 +1,14 @@
 (ns flamebin.web.middleware
   (:require [flamebin.infra.metrics :as ms]
             [flamebin.util :refer [raise]]
+            [flamebin.util.malli :refer [coerce]]
             [flamebin.util.streams :as streams]
             [malli.core :as m]
-            [malli.experimental.lite]
             [malli.error]
+            [malli.experimental.lite]
             [muuntaja.core :as content]
             [reitit.ring :as ring]
-            [taoensso.timbre :as log]
-            [flamebin.dto :as dto])
+            [taoensso.timbre :as log])
   (:import (clojure.lang ExceptionInfo)))
 
 (defn resp
@@ -100,6 +100,6 @@
         (let [schema (if (satisfies? m/Schema schema-data)
                        schema-data
                        (malli.experimental.lite/schema schema-data))
-              coerced (dto/coerce query-params schema)]
+              coerced (coerce query-params schema)]
           (handler (assoc request :query-params coerced)))
         (handler request)))))