✨ Improve the page data procesing module.

common/uxbox/common/data.cljc

@@ -0,0 +1,50 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) 2016-2019 Andrey Antukh <niwi@niwi.nz>
+
+(ns uxbox.common.data
+  "Data manipulation and query helper functions."
+  (:refer-clojure :exclude [concat])
+  (:require [clojure.set :as set]))
+
+(defn concat
+  [& colls]
+  (loop [result (first colls)
+         colls (rest colls)]
+    (if (seq colls)
+      (recur (reduce conj result (first colls))
+             (rest colls))
+      result)))
+
+(defn seek
+  ([pred coll]
+   (seek pred coll nil))
+  ([pred coll not-found]
+   (reduce (fn [_ x]
+             (if (pred x)
+               (reduced x)
+               not-found))
+           not-found coll)))
+
+(defn diff-maps
+  [ma mb]
+  (let [ma-keys (set (keys ma))
+        mb-keys (set (keys mb))
+        added (set/difference mb-keys ma-keys)
+        removed (set/difference ma-keys mb-keys)
+        both (set/intersection ma-keys mb-keys)]
+    (concat
+     (mapv #(vector :add % (get mb %)) added)
+     (mapv #(vector :del % nil) removed)
+     (loop [k (first both)
+            r (rest both)
+            rs []]
+       (if k
+         (let [vma (get ma k)
+               vmb (get mb k)]
+           (if (= vma vmb)
+             (recur (first r) (rest r) rs)
+             (recur (first r) (rest r) (conj rs [:mod k vmb]))))
+         rs)))))

common/uxbox/common/pages.cljc

@@ -5,32 +5,32 @@
 
 ;; --- Specs
 
-(s/def ::id ::cs/uuid)
+(s/def ::id uuid?)
 (s/def ::name string?)
 (s/def ::type keyword?)
 
 ;; Metadata related
-(s/def ::grid-x-axis ::cs/number)
+(s/def ::grid-x-axis number?)
-(s/def ::grid-y-axis ::cs/number)
+(s/def ::grid-y-axis number?)
 (s/def ::grid-color string?)
 (s/def ::background string?)
-(s/def ::background-opacity ::cs/number)
+(s/def ::background-opacity number?)
 
 ;; Page related
-(s/def ::file-id ::cs/uuid)
+(s/def ::file-id uuid?)
-(s/def ::user ::cs/uuid)
+(s/def ::user uuid?)
-(s/def ::created-at ::cs/inst)
+(s/def ::created-at inst?)
-(s/def ::modified-at ::cs/inst)
+(s/def ::modified-at inst?)
-(s/def ::version ::cs/number)
+(s/def ::version number?)
-(s/def ::ordering ::cs/number)
+(s/def ::ordering number?)
 
 ;; Page Data related
 (s/def ::shape
   (s/keys :req-un [::type ::name]
           :opt-un [::id]))
 
-(s/def ::shapes (s/coll-of ::cs/uuid :kind vector?))
+(s/def ::shapes (s/coll-of uuid? :kind vector?))
-(s/def ::canvas (s/coll-of ::cs/uuid :kind vector?))
+(s/def ::canvas (s/coll-of uuid? :kind vector?))
 
 (s/def ::shapes-by-id
   (s/map-of uuid? ::shape))
@@ -48,11 +48,13 @@
                    ::background
                    ::background-opacity]))
 
+(s/def ::shape-change
+  (s/tuple #{:add :mod :del} keyword? any?))
+
 (s/def ::operation
   (s/or :mod-shape (s/cat :name #(= % :mod-shape)
                           :id uuid?
-                          :attr keyword?
+                          :changes (s/* ::shape-change))
-                          :value any?)
         :add-shape (s/cat :name #(= % :add-shape)
                           :id uuid?
                           :data any?)
@@ -67,7 +69,6 @@
 (s/def ::operations
   (s/coll-of ::operation :kind vector?))
 
-
 ;; --- Operations Processing Impl
 
 (declare process-operation)
@@ -79,42 +80,55 @@
 
 (defn process-ops
   [data operations]
-  (->> (cs/conform ::operations operations)
+  (->> (s/assert ::operations operations)
        (reduce process-operation data)))
 
 (defn- process-operation
-  [data operation]
+  [data [op & rest]]
-  (case (first operation)
+  (case op
-    :mod-shape (process-mod-shape data operation)
+    :mod-shape (process-mod-shape data rest)
-    :add-shape (process-add-shape data operation)
+    :add-shape (process-add-shape data rest)
-    :del-shape (process-del-shape data operation)
+    :del-shape (process-del-shape data rest)
-    :add-canvas (process-add-canvas data operation)
+    :add-canvas (process-add-canvas data rest)
-    :del-canvas (process-del-canvas data operation)))
+    :del-canvas (process-del-canvas data rest)))
 
 (defn- process-mod-shape
-  [data {:keys [id attr value]}]
+  [data [id & changes]]
-  (update-in data [:shapes-by-id id] assoc attr value))
+  (if (get-in data [:shapes-by-id id])
+    (update-in data [:shapes-by-id id]
+               #(reduce (fn [shape [op att val]]
+                          (if (= op :del)
+                            (dissoc shape att)
+                            (assoc shape att val)))
+                        % changes))
+    data))
 
 (defn- process-add-shape
-  [data {:keys [id data]}]
+  [data [id sdata]]
   (-> data
-      (update :shapes conj id)
+      (update :shapes (fn [shapes]
-      (update :shapes-by-id assoc id data)))
+                        (if (some #{id} shapes)
+                          shapes
+                          (conj shapes id))))
+      (update :shapes-by-id assoc id sdata)))
 
 (defn- process-del-shape
-  [data {:keys [id attr value]}]
+  [data [id]]
   (-> data
       (update :shapes (fn [s] (filterv #(not= % id) s)))
       (update :shapes-by-id dissoc id)))
 
 (defn- process-add-canvas
-  [data {:keys [id data]}]
+  [data [id sdata]]
   (-> data
-      (update :canvas conj id)
+      (update :canvas (fn [shapes]
-      (update :shapes-by-id assoc id data)))
+                        (if (some #{id} shapes)
+                          shapes
+                          (conj shapes id))))
+      (update :shapes-by-id assoc id sdata)))
 
 (defn- process-del-canvas
-  [data {:keys [id attr value]}]
+  [data [id]]
   (-> data
       (update :canvas (fn [s] (filterv #(not= % id) s)))
       (update :shapes-by-id dissoc id)))