[wip] enable spec validation

Author: sprocketc

src/renderer/db.cljs

@@ -1,5 +1,6 @@
 (ns renderer.db
   (:require
+   [renderer.dialog.db]
    [renderer.document.db]
    [renderer.snap.db]
    [renderer.theme.db]
@@ -16,12 +17,19 @@
    [:rulers-visible? boolean?]
    [:snap renderer.snap.db/snap]
    [:rulers-locked? boolean?]
-   [:documents [:map-of :uuid renderer.document.db/document]]
-   [:document-tabs [:vector uuid?]]
+   [:dialogs [:vector renderer.dialog.db/dialog]]
+   [:documents [:map-of keyword? map?]]
+   [:document-tabs [:vector keyword?]]
+   [:recent [:vector string?]]
    [:system-fonts vector?]
+   [:notifications vector?]
    [:debug-info? boolean?]
    [:pen-mode? boolean?]
-   [:panel [:map-of :key [:map [:visible? boolean?]]]]
+   [:backdrop? boolean?]
+   [:lang keyword?]
+   [:repl-mode keyword?]
+   [:worker [:map [:tasks set?]]]
+   [:panel [:map-of keyword? [:map [:visible? boolean?]]]]
    [:window renderer.window.db/window]
    [:theme renderer.theme.db/theme]
    [:timeline renderer.timeline.db/timeline]])
@@ -39,6 +47,7 @@
    :notifications []
    :debug-info? false
    :pen-mode? false
+   :backdrop? false
    :rulers-locked? false
    :grid-visible? false
    :rulers-visible? true
@@ -48,8 +57,7 @@
    :lang :en-US
    :repl-mode :cljs
    :theme {:mode :dark}
-   :worker {:tasks {}}
-   :cmdk {:visible? false}
+   :worker {:tasks #{}}
    :panel {:tree {:visible? true}
            :properties {:visible? true}
            :timeline {:visible? false}

src/renderer/dialog/db.cljs

@@ -0,0 +1,7 @@
+(ns renderer.dialog.db)
+
+(def dialog
+  [:map
+   [:title {:optional true} string?]
+   [:content {:optional true} vector?]
+   [:attrs {:optional true} map?]])

src/renderer/document/db.cljs

@@ -1,19 +1,21 @@
 (ns renderer.document.db
   (:require
-   [renderer.element.db :as element.db]))
+   [renderer.element.db]))
 
 (def document
   [:map
-   [:hovered-keys [:set uuid?]]
-   [:collapsed-keys [:set uuid?]]
-   [:ignored-keys [:set uuid?]]
+   [:key keyword?]
+   [:title string?]
+   [:hovered-keys [:set keyword?]]
+   [:collapsed-keys [:set keyword?]]
+   [:ignored-keys [:set keyword?]]
    [:fill string?]
    [:stroke string?]
    [:zoom double?]
    [:rotate double?]
-   [:filter keyword?]
+   [:history map?]
    [:pan [:tuple double? double?]]
-   [:elements [:map-of :uuid element.db/element]]])
+   [:elements [:map-of keyword? renderer.element.db/element]]])
 
 (def default-document
   {:hovered-keys #{}

src/renderer/document/handlers.cljs

@@ -30,7 +30,7 @@
   [db file-path]
   (cond-> db
     file-path
-    (update :recent #(-> % (conj file-path) distinct))))
+    (update :recent #(-> % (conj file-path) distinct vec))))
 
 (defn set-active
   [db k]

src/renderer/element/db.cljs

@@ -6,8 +6,9 @@
   [:multi {:dispatch :tag}
    [::ma/default
     [:map
-     [:key uuid?]
+     [:key keyword?]
      [:type [:enum :element :handle]]
      [:visible? boolean?]
      [:selected? boolean?]
-     [:attrs [:map-of :uuid string?]]]]])
+     [:content string?]
+     [:attrs [:map-of keyword? string?]]]]])

src/renderer/events.cljs

@@ -6,21 +6,24 @@
    [renderer.effects]
    [renderer.handlers :as h]
    [renderer.frame.handlers :as frame-h]
+   [renderer.notification.events :as-alias notification.e]
    [renderer.tool.base :as tool]
    [renderer.utils.local-storage :as local-storage]
    [renderer.utils.pointer :as pointer]))
 
-(defn check-and-throw
+(defn check-schema
   "Throws an exception if `db` doesn't match the Spec"
   [spec db]
   (when-not (ma/validate spec db)
-    (js/console.log (ex-info (str "spec check failed: " (ma/explain spec db)) {}))
+    (rf/dispatch [::notification.e/add [:div
+                                        [:h2.mb-4.font-bold "Spec check failed"]
+                                        [:p.text-error #_(str (ma/explain spec db))]]])
     db))
 
 #_:clj-kondo/ignore
-(def schema-valdator (rf/after (partial check-and-throw db/app)))
+(def schema-valdator (rf/after (partial check-schema db/app)))
 
-#_(rf/reg-global-interceptor schema-valdator)
+(rf/reg-global-interceptor schema-valdator)
 
 (rf/reg-event-db
  :initialize-db

src/renderer/history/db.cljs

@@ -0,0 +1,19 @@
+(ns renderer.history.db
+  (:require
+   [renderer.element.db]))
+
+(def state
+  [:map
+   [:explenation string?]
+   [:timestamp double?]
+   [:index integer?]
+   [:id keyword?]
+   [:elements [:map-of keyword? renderer.element.db/element]]
+   [:parent keyword?]
+   [:children [:vector keyword?]]])
+
+(def history
+  [:map
+   [:zoom double?]
+   [:position keyword?]
+   [:states [:map-of keyword? state]]])

src/renderer/menubar/views.cljs

@@ -598,5 +598,5 @@
          {:class "menubar-root"
           :on-key-down #(when-not (= (.-key %) "Escape")
                           (.stopPropagation %)) ; FIXME: Esc global action also triggered.
-          :onValueChange #(rf/dispatch [:set-backdrop (seq %)])}]
+          :onValueChange #(rf/dispatch [:set-backdrop (boolean (seq %))])}]
         (map menu-item (root-menu))))

src/renderer/snap/db.cljs

@@ -7,4 +7,4 @@
   [:map
    [:enabled? boolean?]
    [:threshold double?]
-   [:options options]])
+   [:options [:set options]]])

src/renderer/theme/db.cljs

@@ -1,5 +1,6 @@
 (ns renderer.theme.db)
 
 (def theme
-  [:mode [:enum :dark :light :system]
-   :native [:enum :dark :light]])
+  [:map
+   [:mode [:enum :dark :light :system]]
+   [:native [:enum :dark :light]]])