fix(cljstyle): Fix all cljstyle warnings

athensresearch · Mar 9, 2021 · c2f3367 · c2f3367
1 parent 96fc9f2
commit c2f3367
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 69 deletions.
diff --git a/src/cljs/athens/dbrx.cljs b/src/cljs/athens/dbrx.cljs
@@ -1,30 +1,35 @@
 (ns athens.dbrx
   (:require
-   [datascript.core :as d]
-   [reagent.core :as reagent]
-   [reagent.ratom :as ratom]))
+    [datascript.core :as d]
+    [reagent.core :as reagent]
+    [reagent.ratom :as ratom]))
 
 
-(defn create-conn [schema]
+(defn create-conn
+  [schema]
   (reagent/atom
-   (d/empty-db schema)
-   :meta {:listeners (atom {})}))
+    (d/empty-db schema)
+    :meta {:listeners (atom {})}))
 
 
-(defn pull [conn selector eid]
+(defn pull
+  [conn selector eid]
   (ratom/make-reaction
     #(d/pull @conn selector eid)))
 
 
-(defn pull-many [conn selector eids]
+(defn pull-many
+  [conn selector eids]
   (ratom/make-reaction
     #(d/pull-many @conn selector eids)))
 
 
-(defn q [query conn & args]
+(defn q
+  [query conn & args]
   (ratom/make-reaction
     #(apply d/q query @conn args)))
 
 
-(defn transact! [conn tx-data]
+(defn transact!
+  [conn tx-data]
   (d/transact! conn tx-data))
diff --git a/src/cljs/athens/devcards/all_pages.cljs b/src/cljs/athens/devcards/all_pages.cljs
@@ -22,10 +22,10 @@
   [button {:on-click (fn []
                        (let [n (:max-eid @db/dsdb)]
                          (transact! db/dsdb [{:node/title     (str "Test Title " n)
-                                                :block/uid      (str "uid" n)
-                                                :block/children [{:block/string "a block string" :block/uid (str "uid-" n "-" (rand))}]
-                                                :create/time    (.getTime (js/Date.))
-                                                :edit/time      (.getTime (js/Date.))}])))}
+                                              :block/uid      (str "uid" n)
+                                              :block/children [{:block/string "a block string" :block/uid (str "uid-" n "-" (rand))}]
+                                              :create/time    (.getTime (js/Date.))
+                                              :edit/time      (.getTime (js/Date.))}])))}
    "Create Page"])
 
 

diff --git a/src/cljs/athens/devcards/athena.cljs b/src/cljs/athens/devcards/athena.cljs
@@ -15,8 +15,8 @@
                        (let [n       (inc (:max-eid @db/dsdb))
                              n-child (inc n)]
                          (transact! db/dsdb [{:node/title     (str "Test Page " n)
-                                                :block/uid      (str "uid-" n)
-                                                :block/children [{:block/string (str "Test Block" n-child) :block/uid (str "uid-" n-child)}]}])))} "Create Test Pages and Blocks"])
+                                              :block/uid      (str "uid-" n)
+                                              :block/children [{:block/string (str "Test Block" n-child) :block/uid (str "uid-" n-child)}]}])))} "Create Test Pages and Blocks"])
 
 
 (defcard-rg Load-Real-DB

diff --git a/src/cljs/athens/posh.cljs b/src/cljs/athens/posh.cljs
@@ -1,48 +1,54 @@
 (ns athens.posh
   (:require
-   [athens.dbrx :as dbrx]
-   [datascript.core :as d]
-   [posh.reagent :as posh]
-   [taoensso.tufte :as tufte]))
+    [athens.dbrx :as dbrx]
+    [datascript.core :as d]
+    [posh.reagent :as posh]
+    [taoensso.tufte :as tufte]))
 
 
 (def version
   ;; :dbrx or :posh
+  #_:posh
   :dbrx)
 
 
-(defn create-conn [schema]
+(defn create-conn
+  [schema]
   (tufte/p ::create-conn
-     (case version
-       :posh (let [conn (d/create-conn schema)]
-               (posh/posh! conn)
-               conn)
-       :dbrx (dbrx/create-conn schema))))
+           (case version
+             :posh (let [conn (d/create-conn schema)]
+                     (posh/posh! conn)
+                     conn)
+             :dbrx (dbrx/create-conn schema))))
 
 
-(defn pull [conn selector eid]
+(defn pull
+  [conn selector eid]
   (tufte/p ::pull
-     (case version
-       :posh (posh/pull conn selector eid)
-       :dbrx (dbrx/pull conn selector eid))))
+           (case version
+             :posh (posh/pull conn selector eid)
+             :dbrx (dbrx/pull conn selector eid))))
 
 
-(defn pull-many [conn selector eids]
+(defn pull-many
+  [conn selector eids]
   (tufte/p ::pull-many
-     (case version
-       :posh (posh/pull-many conn selector eids)
-       :dbrx (dbrx/pull-many conn selector eids))))
+           (case version
+             :posh (posh/pull-many conn selector eids)
+             :dbrx (dbrx/pull-many conn selector eids))))
 
 
-(defn q [query conn & args]
+(defn q
+  [query conn & args]
   (tufte/p ::q
-     (case version
-       :posh (apply posh/q query conn args)
-       :dbrx (apply dbrx/q query conn args))))
+           (case version
+             :posh (apply posh/q query conn args)
+             :dbrx (apply dbrx/q query conn args))))
 
 
-(defn transact! [conn tx-data]
+(defn transact!
+  [conn tx-data]
   (tufte/p ::transact!
-     (case version
-       :posh (posh/transact! conn tx-data)
-       :dbrx (dbrx/transact! conn tx-data))))
+           (case version
+             :posh (posh/transact! conn tx-data)
+             :dbrx (dbrx/transact! conn tx-data))))
diff --git a/src/cljs/athens/router.cljs b/src/cljs/athens/router.cljs
@@ -38,7 +38,8 @@
      :local-storage/set! ["current-route/uid" (-> route second :id)]}))
 
 
-(defn page-title [nav-match]
+(defn page-title
+  [nav-match]
   (let [prefix #(str % " | Athens")]
     (if-some [block-id (get-in nav-match [:path-params :id])]
       (let [node (pull db/dsdb '[*] [:block/uid block-id])

diff --git a/src/cljs/athens/tracing.cljs b/src/cljs/athens/tracing.cljs
@@ -1,9 +1,9 @@
 (ns athens.tracing
   (:require
-   [reagent.impl.batching :as batching]
-   ;; This exists only in newer versions of re-frame-10x
-   ;; [day8.reagent.impl.batching :as day8.batching]
-   [taoensso.tufte :as tufte]))
+    [reagent.impl.batching :as batching]
+    ;; This exists only in newer versions of re-frame-10x
+    ;; [day8.reagent.impl.batching :as day8.batching]
+    [taoensso.tufte :as tufte]))
 
 
 (defonce reagent-next-tick batching/next-tick)
@@ -20,11 +20,12 @@
   (atom nil))
 
 
-(defn format-stats [stats]
+(defn format-stats
+  [stats]
   (-> stats
       (tufte/format-pstats
-       {:columns [:n-calls :p50 :p95 :p99 :max :clock :total]
-        :format-id-fn str})
+        {:columns [:n-calls :p50 :p95 :p99 :max :clock :total]
+         :format-id-fn str})
       (println)))
 
 
@@ -37,19 +38,19 @@
   (reagent-next-tick
    ;; TODO: ideally, should also be wrapping re-frame-10x:
    ;; reframe10x-next-tick day8.batching/next-tick
-   (fn []
-     (tufte/profile {} (f))
-     (when (false? (.-scheduled? batching/render-queue))
-       (when-some [m (not-empty @stats-accumulator)]
-         (when (some-> m vals first deref :stats)
-           (let [stats (-> m vals first)]
-             (println "Epoch Stats:")
-             (format-stats stats)
-             (if @stats-total
-               (swap! stats-total tufte/merge-pstats stats)
-               (reset! stats-total stats))
-             (println "Total Stats:")
-             (format-stats @stats-total))))))))
+    (fn []
+      (tufte/profile {} (f))
+      (when (false? (.-scheduled? batching/render-queue))
+        (when-some [m (not-empty @stats-accumulator)]
+          (when (some-> m vals first deref :stats)
+            (let [stats (-> m vals first)]
+              (println "Epoch Stats:")
+              (format-stats stats)
+              (if @stats-total
+                (swap! stats-total tufte/merge-pstats stats)
+                (reset! stats-total stats))
+              (println "Total Stats:")
+              (format-stats @stats-total))))))))
 
 
 (defn patch-next-tick

diff --git a/src/cljs/athens/util.cljs b/src/cljs/athens/util.cljs
@@ -29,14 +29,15 @@
     (specter-recursive-path #(contains? % :block/uid))
     (fn [{:block/keys [uid] :as block}]
       (assoc block :block/uid (str uid "-embed-" embed-id)
-                   :block/original-uid uid))
+             :block/original-uid uid))
     block))
 
 
 ;; -- DOM ----------------------------------------------------------------
 
 ;; TODO: move all these DOM utilities to a .cljs file instead of cljc
-(defn scroll-top! [element pos]
+(defn scroll-top!
+  [element pos]
   (when pos
     (set! (.. element -scrollTop) pos)))
 
@@ -85,7 +86,8 @@
       (< (.. el-box -top) (.. cont-box -top)))))
 
 
-(defn scroll-into-view [element container align-top?]
+(defn scroll-into-view
+  [element container align-top?]
   (when (is-beyond-rect? element container)
     (.. element (scrollIntoView align-top? {:behavior "auto"}))))
 
@@ -225,9 +227,9 @@
    satisfies the function"
   [afn]
   (recursive-path [] p
-    (s/cond-path
-      map? (s/multi-path [s/MAP-VALS p] afn)
-      sequential? [s/ALL p])))
+                  (s/cond-path
+                    map? (s/multi-path [s/MAP-VALS p] afn)
+                    sequential? [s/ALL p])))
 
 ;; OS