remove unused aliases and refactor

Author: sprocketc

.clj-kondo/config.edn

@@ -4,6 +4,7 @@
            :docstring-leading-trailing-whitespace {:level :warning}
            :used-underscored-binding {:level :warning}
            :unused-value {:level :warning}
+           :unused-alias {:level :warning}
            :redundant-call {:level :warning}
            :redundant-str-call {:level :warning}
            :clojure-lsp/unused-public-var {:exclude-regex #{"components.*"

src/renderer/app/db.cljs

@@ -85,7 +85,7 @@
 (def explain (m/explainer App))
 
 (def default
-  (m/decode App {:version config/version} malli.transform/default-value-transformer))
+  (m/decode App {:version config/version} m.transform/default-value-transformer))
 
 (def persisted-keys
   "Top level keys that should be persisted to local storage."

src/renderer/app/events.cljs

@@ -1,6 +1,5 @@
 (ns renderer.app.events
   (:require
-   [config :as config]
    [malli.error :as malli.error]
    [re-frame.core :as rf]
    [renderer.app.db :as app.db]
@@ -34,11 +33,9 @@
      (if (app.db/valid? app-db)
        {:db app-db}
        {::app.effects/local-storage-clear nil
-        :db (cond-> db
-              config/debug?
-              (notification.handlers/add (notification.views/spec-failed
-                                          "Invalid local configuration"
-                                          (-> app-db app.db/explain malli.error/humanize str))))}))))
+        :db (notification.handlers/add db (notification.views/spec-failed
+                                           "Invalid local configuration"
+                                           (-> app-db app.db/explain malli.error/humanize str)))}))))
 
 (rf/reg-event-db
  ::set-system-fonts

src/renderer/app/views.cljs

@@ -176,7 +176,7 @@
         [timeline.views/root]])
      [repl.views/root]]))
 
-(def paper-size
+(defonce paper-size
   {0 [2384 3370]
    1 [1684 2384]
    2 [1191 1684]

src/renderer/attribute/impl/href.cljs

@@ -9,7 +9,6 @@
    [renderer.attribute.views :as attribute.views]
    [renderer.element.events :as-alias element.events]
    [renderer.notification.events :as-alias notification.events]
-   [renderer.tool.events :as-alias tool.events]
    [renderer.tool.handlers :as tool.handlers]
    [renderer.tool.subs :as-alias tool.subs]
    [renderer.ui :as ui]))

src/renderer/attribute/impl/transform.cljs

@@ -1,8 +1,7 @@
 (ns renderer.attribute.impl.transform
   "https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/transform"
   (:require
-   [renderer.attribute.hierarchy :as attribute.hierarchy]
-   [renderer.element.events :as-alias element.events]))
+   [renderer.attribute.hierarchy :as attribute.hierarchy]))
 
 (defmethod attribute.hierarchy/description [:default :transform]
   []

src/renderer/core.cljs

@@ -31,7 +31,7 @@
    [renderer.ruler.subs]
    [renderer.snap.events]
    [renderer.snap.subs]
-   [renderer.theme.db :as db]
+   [renderer.theme.db :as theme.db]
    [renderer.theme.effects :as theme.fx]
    [renderer.theme.events :as theme.events]
    [renderer.theme.subs]
@@ -86,7 +86,7 @@
   (print "Type (help) to see a list of commands."))
 
 (defn ^:export init! []
-  (js/console.log (str "%c" easter-egg) (str "color: " renderer.theme.db/accent))
+  (js/console.log (str "%c" easter-egg) (str "color: " theme.db/accent))
 
   ;; https://code.thheller.com/blog/shadow-cljs/2017/10/14/bootstrap-support.html
   (bootstrap/init replumb.repl/st {:path "js/bootstrap" :load-on-init '[user]} bootstrap-cb!)

src/renderer/dialog/views.cljs

@@ -5,11 +5,9 @@
    [clojure.string :as string]
    [config :as config]
    [re-frame.core :as rf]
-   [renderer.app.subs :as-alias app.subs]
    [renderer.dialog.events :as-alias dialog.events]
    [renderer.dialog.subs :as-alias dialog.subs]
    [renderer.document.events :as-alias document.events]
-   [renderer.document.subs :as-alias document.subs]
    [renderer.menubar.views :as menubar.views]
    [renderer.ui :as ui]
    [renderer.utils.i18n :refer [t]]

src/renderer/document/db.cljs

@@ -41,4 +41,4 @@
 
 (def explain (m/explainer Document))
 
-(def default (m/decode Document {} malli.transform/default-value-transformer))
+(def default (m/decode Document {} m.transform/default-value-transformer))

src/renderer/document/events.cljs

@@ -7,7 +7,6 @@
    [renderer.app.db :refer [App]]
    [renderer.app.effects :as-alias app.effects]
    [renderer.app.events :refer [persist]]
-   [renderer.dialog.events :as-alias dialog.events]
    [renderer.dialog.handlers :as dialog.handlers]
    [renderer.dialog.views :as dialog.views]
    [renderer.document.db :as document.db]
@@ -82,7 +81,8 @@
  ::close
  [persist]
  (fn [db [_ id confirm?]]
-   (if (or (document.handlers/saved? db id) (not confirm?))
+   (if (or (document.handlers/saved? db id)
+           (not confirm?))
      (document.handlers/close db id)
      (-> db
          (document.handlers/set-active id)

src/renderer/document/handlers.cljs

@@ -37,7 +37,7 @@
    (let [document (-> (get-in db [:documents id])
                       (assoc :version (:version db)))]
      (reduce #(update-in %1 [:elements %2] dissoc :selected)
-             (m/decode PersistedDocument document malli.transform/strip-extra-keys-transformer)
+             (m/decode PersistedDocument document m.transform/strip-extra-keys-transformer)
              (keys (:elements document))))))
 
 (m/=> save-format [:-> PersistedDocument string?])

src/renderer/element/db.cljs

@@ -43,4 +43,4 @@
 
 (def default (m/decode Element {:type :element
                                 :visible true
-                                :children []} malli.transform/default-value-transformer))
+                                :children []} m.transform/default-value-transformer))

src/renderer/element/handlers.cljs

@@ -19,7 +19,7 @@
    [renderer.utils.extra :refer [partial-right]]
    [renderer.utils.hiccup :as utils.hiccup]
    [renderer.utils.map :as utils.map]
-   [renderer.utils.math :as utils.math :refer [Vec2]]
+   [renderer.utils.math :refer [Vec2]]
    [renderer.utils.path :as utils.path :refer [PathManipulation PathBooleanOperation]]
    [renderer.utils.vec :as utils.vec]))
 

src/renderer/element/impl/shape/image.cljs

@@ -2,7 +2,6 @@
   "https://www.w3.org/TR/SVG/embedded.html#ImageElement
    https://developer.mozilla.org/en-US/docs/Web/SVG/Reference/Element/image"
   (:require
-   [renderer.app.events :as-alias app.events]
    [renderer.element.hierarchy :as element.hierarchy]))
 
 (derive :image ::element.hierarchy/graphics)

src/renderer/element/impl/text.cljs

@@ -6,7 +6,6 @@
    [clojure.string :as string]
    [re-frame.core :as rf]
    [renderer.app.effects :as-alias app.effects]
-   [renderer.app.events :as-alias app.events]
    [renderer.attribute.hierarchy :as attr.hierarchy]
    [renderer.element.events :as-alias element.events]
    [renderer.element.handlers :as element.handlers]

src/renderer/frame/events.cljs

@@ -3,7 +3,6 @@
    [clojure.core.matrix :as matrix]
    [re-frame.core :as rf]
    [renderer.app.events :refer [persist]]
-   [renderer.document.events :as-alias document.events]
    [renderer.element.handlers :as element.handlers]
    [renderer.frame.handlers :as frame.handlers]
    [renderer.snap.handlers :as snap.handlers]))

src/renderer/frame/views.cljs

@@ -7,7 +7,6 @@
    [reagent.core :as reagent]
    [reagent.dom.server :as server]
    [renderer.app.subs :as-alias app.subs]
-   [renderer.document.subs :as-alias document.subs]
    [renderer.element.hierarchy :as element.hierarchy]
    [renderer.element.subs :as-alias element.subs]
    [renderer.element.views :as element.views]
@@ -17,38 +16,36 @@
    [renderer.utils.pointer :as utils.pointer]
    [renderer.utils.wheel :as utils.wheel]))
 
+(defn wheel-handler!
+  [^js/WheelEvent e]
+  (.stopPropagation e)
+  (when (.-ctrlKey e) (.preventDefault e)) ; Disable wheel zoom on canvas.
+  (rf/dispatch-sync [::tool.events/wheel-event (utils.wheel/event-formatter e)]))
+
 (defn inner-component
   "We need access to the iframe's window to add the pointer move listener.
    This is required in order to track pointer movement outside of our canvas.
    https://github.com/ryanseddon/react-frame-component#accessing-the-iframes-window-and-document
    https://github.com/reagent-project/reagent/blob/master/doc/ReactFeatures.md#function-components"
   []
-  (let [frame-window (.-window (useFrame))
-        wheel-handler (fn [e]
-                        (.stopPropagation e)
-                        ;; Disable wheel zoom on canvas.
-                        (when (.-ctrlKey e) (.preventDefault e))
-                        (rf/dispatch-sync [::tool.events/wheel-event (utils.wheel/event-formatter e)]))]
+  (let [frame-window (.-window (useFrame))]
     (reagent/create-class
      {:component-did-mount
       (fn []
-        (doseq
-         [event ["pointermove" "pointerup"]]
+        (doseq [event ["pointermove" "pointerup"]]
           (.addEventListener frame-window event utils.pointer/event-handler!))
-        (.addEventListener frame-window "wheel" wheel-handler #js {:passive false}))
+        (.addEventListener frame-window "wheel" wheel-handler! #js {:passive false}))
 
       :component-will-unmount
       (fn []
-        (doseq
-         [event ["pointermove" "pointerup"]]
+        (doseq [event ["pointermove" "pointerup"]]
           (.removeEventListener frame-window event utils.pointer/event-handler!))
-        (.removeEventListener frame-window "wheel" wheel-handler))
+        (.removeEventListener frame-window "wheel" wheel-handler!))
 
       :reagent-render #()})))
 
-(defn markup
-  "https://github.com/ryanseddon/react-frame-component#initialcontent"
-  []
+(defonce initial-markup
+  ;; https://github.com/ryanseddon/react-frame-component#initialcontent
   [:html
    [:head]
    [:body {:style {:width "100%"
@@ -94,7 +91,7 @@
                                                   (js/KeyboardEvent. (.-type e)
                                                                      e)))]
           [:> Frame
-           {:initial-content (server/render-to-static-markup [markup])
+           {:initial-content (server/render-to-static-markup initial-markup)
             :mount-target "body"
             :class "overflow-hidden flex-1 border-0"
             :on-key-down on-keyboard-event

src/renderer/history/events.cljs

@@ -2,7 +2,6 @@
   (:require
    [re-frame.core :as rf]
    [renderer.app.effects :as app.effects]
-   [renderer.element.events :as-alias element.events]
    [renderer.history.handlers :as history.handlers]))
 
 (rf/reg-event-db

src/renderer/history/handlers.cljs

@@ -3,8 +3,6 @@
    [malli.core :as m]
    [malli.error :as m.error]
    [renderer.app.db :refer [App]]
-   [renderer.app.effects :as-alias app.effects]
-   [renderer.app.events :as-alias app.events]
    [renderer.document.handlers :as document.handlers]
    [renderer.element.db :refer [Element]]
    [renderer.element.handlers :as element.handlers]

src/renderer/reepl/replumb.cljs

@@ -1,7 +1,7 @@
 (ns renderer.reepl.replumb
   (:require
    #_[shadow.cljs.bootstrap.browser :as bootstrap]
-   [cljs.js :as jsc]
+   [cljs.js]
    [cljs.tagged-literals :as tags]
    [cljs.tools.reader]
    [cljs.tools.reader.reader-types :refer [string-push-back-reader]]
@@ -64,19 +64,19 @@ cljs.js/*load-fn*
          ")"))))
 
 #_(defn jsc-run [source cb]
-    (jsc/eval-str repl/st
-                  source
-                  'stuff
-                  {:eval jsc/js-eval
-                   :ns (repl/current-ns)
-                   :load (partial bootstrap/load repl/st)
-                   :context :statement
-                   :def-emits-var true}
-                  (fn [result]
-                    (swap! repl/app-env assoc :current-ns (:ns result))
-                    (if (contains? result :error)
-                      (cb false (:error result))
-                      (cb true (aget js/window "last_repl_value"))))))
+    (cljs.js/eval-str repl/st
+                      source
+                      'stuff
+                      {:eval cljs.js/js-eval
+                       :ns (repl/current-ns)
+                       :load (partial bootstrap/load repl/st)
+                       :context :statement
+                       :def-emits-var true}
+                      (fn [result]
+                        (swap! repl/app-env assoc :current-ns (:ns result))
+                        (if (contains? result :error)
+                          (cb false (:error result))
+                          (cb true (aget js/window "last_repl_value"))))))
 
 (defn get-first-form
   [text]

src/renderer/ruler/subs.cljs

@@ -1,7 +1,6 @@
 (ns renderer.ruler.subs
   (:require
    [re-frame.core :as rf]
-   [renderer.app.subs :as-alias app.subs]
    [renderer.document.subs :as-alias document.subs]
    [renderer.element.subs :as-alias element.subs]
    [renderer.frame.subs :as-alias frame.subs]

src/renderer/snap/handlers.cljs

@@ -8,7 +8,6 @@
    [renderer.frame.handlers :as frame.handlers]
    [renderer.ruler.handlers :as ruler.handlers]
    [renderer.snap.db :refer [SnapOption NearestNeighbor]]
-   [renderer.snap.subs :as-alias snap.subs]
    [renderer.tool.hierarchy :as tool.hierarchy]
    [renderer.utils.math :refer [Vec2]]))
 

src/renderer/snap/subs.cljs

@@ -1,8 +1,6 @@
 (ns renderer.snap.subs
   (:require
-   [re-frame.core :as rf]
-   [renderer.element.subs :as-alias element.subs]
-   [renderer.frame.subs :as-alias frame.subs]))
+   [re-frame.core :as rf]))
 
 (rf/reg-sub
  ::snap

src/renderer/tool/handlers.cljs

@@ -15,8 +15,8 @@
    [renderer.tool.hierarchy :as tool.hierarchy]
    [renderer.utils.element :as utils.element]
    [renderer.utils.keyboard :refer [KeyboardEvent]]
-   [renderer.utils.math :as utils.math :refer [Vec2]]
-   [renderer.utils.pointer :as pointer :refer [PointerEvent]]
+   [renderer.utils.math :refer [Vec2]]
+   [renderer.utils.pointer :refer [PointerEvent]]
    [renderer.utils.wheel :refer [WheelEvent]]))
 
 (m/=> add-fx [:-> App vector? App])
@@ -82,8 +82,8 @@
        (element.handlers/add db)
        (dissoc-temp)))
 
-(m/=> axis-offset [:-> number? number? number? number?])
-(defn axis-offset
+(m/=> axis-pan-offset [:-> number? number? number? number?])
+(defn axis-pan-offset
   [position offset size]
   (let [threshold 50
         step 15]
@@ -103,8 +103,8 @@
   [db dom-rect pointer-pos pointer-offset]
   (let [[x y] pointer-pos
         [offset-x offset-y] pointer-offset
-        pan [(axis-offset x offset-x (:width dom-rect))
-             (axis-offset y offset-y (:height dom-rect))]]
+        pan [(axis-pan-offset x offset-x (:width dom-rect))
+             (axis-pan-offset y offset-y (:height dom-rect))]]
     (cond-> db
       (not-every? zero? pan)
       (-> (frame.handlers/pan-by pan)

src/renderer/tool/impl/base/edit.cljs

@@ -2,7 +2,6 @@
   (:require
    [clojure.core.matrix :as matrix]
    [re-frame.core :as rf]
-   [renderer.app.effects :as-alias app.effects]
    [renderer.element.handlers :as element.handlers]
    [renderer.element.hierarchy :as element.hierarchy]
    [renderer.element.subs :as-alias element.subs]

src/renderer/tool/impl/base/transform.cljs

@@ -4,7 +4,6 @@
    [malli.core :as m]
    [re-frame.core :as rf]
    [renderer.app.db :refer [App]]
-   [renderer.app.effects :as-alias app.effects]
    [renderer.document.subs :as-alias document.subs]
    [renderer.element.db :refer [Element]]
    [renderer.element.handlers :as element.handlers]

src/renderer/tool/impl/draw/brush.cljs

@@ -2,7 +2,6 @@
   "https://github.com/steveruizok/perfect-freehand"
   (:require
    [clojure.string :as string]
-   [renderer.app.effects :as-alias app.effects]
    [renderer.document.handlers :as document.handlers]
    [renderer.history.handlers :as history.handlers]
    [renderer.tool.handlers :as tool.handlers]

src/renderer/tool/impl/draw/pen.cljs

@@ -1,7 +1,6 @@
 (ns renderer.tool.impl.draw.pen
   (:require
    [clojure.string :as string]
-   [renderer.app.effects :as-alias app.effects]
    [renderer.document.handlers :as document.handlers]
    [renderer.history.handlers :as history.handlers]
    [renderer.tool.handlers :as tool.handlers]

src/renderer/tool/impl/element/core.cljs

@@ -1,6 +1,5 @@
 (ns renderer.tool.impl.element.core
   (:require
-   [renderer.app.effects :as-alias app.effects]
    [renderer.element.handlers :as element.handlers]
    [renderer.history.handlers :as history.handlers]
    [renderer.tool.handlers :as tool.handlers]