refactor

Author: sprocketc

src/electron/file.cljs

@@ -22,7 +22,9 @@
   [file-path data]
   (let [document (pr-str (dissoc data :path :id :title))]
     (.writeFileSync fs file-path document "utf-8")
-    (js/Promise.resolve (serialize-document (select-keys data [:id]) file-path))))
+    (-> (select-keys data [:id])
+        (serialize-document file-path)
+        (js/Promise.resolve))))
 
 (defn- read!
   [file-path]

src/renderer/frame/handlers.cljs

@@ -43,7 +43,8 @@
                    (select-keys [:width :height]))]
     (if-not (-> db :window :focused)
       db
-      (reduce #(pan-by %1 (mat/div [(:width offset) (:height offset)] 2) %2) db (:document-tabs db)))))
+      (-> (:document-tabs db)
+          (reduce #(pan-by %1 (mat/div [(:width offset) (:height offset)] 2) %2) db)))))
 
 (m/=> zoom-in-place [:-> App number? Vec2D App])
 (defn zoom-in-place

src/renderer/history/handlers.cljs

@@ -98,9 +98,9 @@
   ([db]
    (undo db 1))
   ([db n]
-   (if (and (pos? n) (undos? (history db)))
-     (recur (go-to db (previous-position (history db))) (dec n))
-     db)))
+   (if-not (and (pos? n) (undos? (history db)))
+     db
+     (recur (go-to db (previous-position (history db))) (dec n)))))
 
 (m/=> redo [:function
             [:-> App App]
@@ -109,9 +109,9 @@
   ([db]
    (redo db 1))
   ([db n]
-   (if (and (pos? n) (redos? (history db)))
-     (recur (go-to db (next-position (history db))) (dec n))
-     db)))
+   (if-not (and (pos? n) (redos? (history db)))
+     db
+     (recur (go-to db (next-position (history db))) (dec n)))))
 
 (m/=> accumulate [:-> History [:or fn? keyword?] [:vector HistoryState]])
 (defn accumulate
@@ -177,12 +177,12 @@
          db db]
     (let [parent-id (:parent node)
           parent (state (history db) parent-id)]
-      (if parent
+      (if-not parent
+        db
         (let [index (.indexOf (:children parent) (:id node))
               new-index (dec (count (:children parent)))
               children-path (path db :states parent-id :children)]
-          (recur parent (update-in db children-path vec/move index new-index)))
-        db))))
+          (recur parent (update-in db children-path vec/move index new-index)))))))
 
 (def valid-elements? (m/validator [:map-of uuid? Element]))
 

src/renderer/utils/units.cljs

@@ -50,8 +50,7 @@
   (let [s (str/trim (str v))
         n (js/parseFloat s 10)
         unit (match-unit s)]
-    [(if (js/isNaN n) 0 n)
-     unit]))
+    [(if (js/isNaN n) 0 n) unit]))
 
 (m/=> ->px [:-> number? string? number?])
 (defn ->px