fix fn specs and enable boolean operation tests

Author: sprocketc

.clj-kondo/metosin/malli-types-cljs/config.edn

@@ -133,8 +133,8 @@
             (count (children-ids db (first parent-els)))))))
 
 (m/=> siblings [:function
-                [:-> App [:vector uuid?]]
-                [:-> App uuid? [:vector uuid?]]])
+                [:-> App [:maybe [:vector uuid?]]]
+                [:-> App uuid? [:maybe [:vector uuid?]]]])
 (defn siblings
   ([db]
    (:children (parent db)))
@@ -182,8 +182,10 @@
    of nested elements."
   [db id]
   (let [ancestor-els (reverse (ancestor-ids db id))]
-    (conj (mapv #(index db %) ancestor-els)
-          (index db id))))
+    (->> (index db id)
+         (conj (map #(index db %) ancestor-els))
+         (remove nil?)
+         (vec))))
 
 (m/=> descendant-ids [:function
                       [:-> App [:set uuid?]]
@@ -658,12 +660,18 @@
                 :parent (-> selected-elements first :parent)
                 :attrs (merge attrs {:d new-path})})))))
 
+(m/=> paste-in-place [:function
+                      [:-> App App]
+                      [:-> App Element App]])
 (defn paste-in-place
   ([db]
    (reduce paste-in-place (deselect db) (:copied-elements db)))
   ([db el]
    (reduce select (add db el) (selected-ids db))))
 
+(m/=> paste [:function
+             [:-> App App]
+             [:-> App Element Element App]])
 (defn paste
   ([db]
    (let [parent-el (hovered-svg db)]
@@ -705,6 +713,9 @@
                            :attrs attrs
                            :parent id}) (selected-ids db))))
 
+(m/=> paste-styles [:function
+                    [:-> App App]
+                    [:-> App uuid? App]])
 (defn paste-styles
   ([db]
    (reduce paste-styles db (selected-ids db)))
@@ -719,6 +730,7 @@
                    (update-attr id attr #(if % (-> attrs attr) disj))))
                db style-attrs)) db)))
 
+(m/=> inherit-attrs [:-> App Element uuid? App])
 (defn inherit-attrs
   [db source-el id]
   (reduce
@@ -787,6 +799,7 @@
     (-> (add db svg)
         (collapse))))
 
+(m/=> snapping-points [:-> App [:maybe [:sequential Element]] [:vector Vec2D]])
 (defn snapping-points
   [db els]
   (let [options (-> db :snap :options)]

src/renderer/element/handlers.cljs

@@ -27,6 +27,7 @@
                (assoc nneighbor :base-point %)))
        (remove nil?)))
 
+(m/=> update-nearest-neighbors [:-> App App])
 (defn update-nearest-neighbors
   [db]
   (let [zoom (get-in db [:documents (:active-document db) :zoom])

src/renderer/snap/handlers.cljs

@@ -75,6 +75,7 @@
   [db]
   (get-in db [:documents (:active-document db) :temp-element]))
 
+(m/=> create-temp-element [:-> App App])
 (defn create-temp-element
   [db]
   (->> (temp db)

src/renderer/tool/handlers.cljs

@@ -2,6 +2,7 @@
   "Internationalization namespace
    https://github.com/taoensso/tempura"
   (:require
+   [malli.core :as m]
    [re-frame.core :as rf]
    [renderer.app.subs :as-alias app.s]
    [taoensso.tempura :refer [tr] :refer-macros [load-resource-at-compile-time]]))
@@ -12,6 +13,7 @@
   {:en-US (load-resource-at-compile-time "lang/en-US.edn")
    :el-GR (load-resource-at-compile-time "lang/el-GR.edn")})
 
+(m/=> lang? [:-> keyword? boolean?])
 (defn lang?
   [lang]
   (contains? dictionary lang))

src/renderer/utils/i18n.cljs

@@ -9,6 +9,7 @@
 (def PathManipulation
   [:enum :simplify :smooth :flatten :reverse])
 
+(m/=> get-d [:-> any? string?])
 (defn get-d
   [paper-path]
   (-> paper-path

src/renderer/utils/path.cljs

@@ -171,27 +171,27 @@
      (is (= (-> @selected first :attrs :fill) "black"))
      (not (-> @selected first :attrs :stroke)))))
 
-#_(deftest boolean-operation
-    (rf-test/run-test-sync
-     (rf/dispatch [::app.e/initialize-db])
-     (rf/dispatch [::document.e/init])
-     (let [selected (rf/subscribe [::s/selected])]
-       (rf/dispatch [::e/add {:tag :rect
-                              :attrs {:x 100
-                                      :y 100
-                                      :width 100
-                                      :height 100
-                                      :fill "red"
-                                      :stroke "black"}}])
-       (rf/dispatch [::e/add {:tag :rect
-                              :attrs {:x 100
-                                      :y 100
-                                      :width 100
-                                      :height 100}}])
-       (rf/dispatch [::e/select-all])
-       (rf/dispatch [::e/boolean-operation :unite])
-       (is (= (-> @selected first :tag) :path))
-       (is (= (-> @selected first :attrs :fill) "red")))))
+(deftest boolean-operation
+  (rf-test/run-test-sync
+   (rf/dispatch [::app.e/initialize-db])
+   (rf/dispatch [::document.e/init])
+   (let [selected (rf/subscribe [::s/selected])]
+     (rf/dispatch [::e/add {:tag :rect
+                            :attrs {:x 100
+                                    :y 100
+                                    :width 100
+                                    :height 100
+                                    :fill "red"
+                                    :stroke "black"}}])
+     (rf/dispatch [::e/add {:tag :rect
+                            :attrs {:x 100
+                                    :y 100
+                                    :width 100
+                                    :height 100}}])
+     (rf/dispatch [::e/select-all])
+     (rf/dispatch [::e/boolean-operation :unite])
+     (is (= (-> @selected first :tag) :path))
+     (is (= (-> @selected first :attrs :fill) "red")))))
 
 (deftest import-svg
   (rf-test/run-test-sync