♻️ Components refactor: generator for relocate shapes (and tests)

common/test/common_tests/helpers/compositions.cljc

@@ -6,7 +6,8 @@
 
 (ns common-tests.helpers.compositions
   (:require
-   [common-tests.helpers.files :as thf]))
+   [common-tests.helpers.files :as thf]
+   [common-tests.helpers.ids-map :as thi]))
 
 (defn add-rect
   [file rect-label]
@@ -15,10 +16,11 @@
                         :name "Rect1"))
 
 (defn add-frame
-  [file frame-label]
-  (thf/add-sample-shape file frame-label
-                        :type :frame
-                        :name "Frame1"))
+  ([file frame-label & {:keys [parent-label]}]
+   (thf/add-sample-shape file frame-label
+                         :type :frame
+                         :name "Frame1"
+                         :parent-label parent-label)))
 
 (defn add-frame-with-child
   [file frame-label child-label]

common/test/common_tests/helpers/debug.cljc

@@ -0,0 +1,33 @@
+(ns common-tests.helpers.debug
+  (:require
+   [app.common.uuid :as uuid]
+   [common-tests.helpers.ids-map :as thi]))
+
+(defn dump-shape
+  "Dumps a shape, with each attribute in a line"
+  [shape]
+  (println "{")
+  (doseq [[k v] (sort shape)]
+    (when (some? v)
+      (println (str "    " k " : " v))))
+  (println "}"))
+
+(defn- stringify-keys [m keys]
+  (apply str (interpose ", " (map #(str % ": " (get m %)) keys))))
+
+(defn dump-page
+  "Dumps the layer tree of the page. Prints the label of each shape, and the specified keys.
+   Example: (thd/dump-page (thf/current-page file) [:id :touched])"
+  ([page keys]
+   (dump-page page uuid/zero "" keys))
+  ([page id padding keys]
+   (let [objects (vals (:objects page))
+         root-objects (filter #(and
+                                (= (:parent-id %) id)
+                                (not= (:id %) id))
+                              objects)]
+     (doseq [val root-objects]
+       (println padding (thi/label (:id val))
+                (when keys
+                  (str "[" (stringify-keys val keys) "]")))
+       (dump-page page (:id val) (str padding "    ") keys)))))

common/test/common_tests/helpers/files.cljc

@@ -9,12 +9,15 @@
    [app.common.data.macros :as dm]
    [app.common.features :as ffeat]
    [app.common.files.changes :as cfc]
+   [app.common.files.changes-builder :as pcb]
    [app.common.files.helpers :as cfh]
+   [app.common.files.libraries-helpers :as cflh]
    [app.common.files.validate :as cfv]
    [app.common.geom.point :as gpt]
    [app.common.pprint :refer [pprint]]
    [app.common.types.color :as ctc]
    [app.common.types.colors-list :as ctcl]
+   [app.common.types.component :as ctk]
    [app.common.types.components-list :as ctkl]
    [app.common.types.container :as ctn]
    [app.common.types.file :as ctf]
@@ -206,8 +209,16 @@
   [file id]
   (ctkl/get-component (:data file) id))
 
+(defn set-child-label
+  [file shape-label child-idx label]
+  (let [id (-> (get-shape file shape-label)
+               :shapes
+               (nth child-idx))]
+    (when id
+      (thi/set-id! label id))))
+
 (defn instantiate-component
-  [file component-label copy-root-label & {:keys [parent-label library] :as params}]
+  [file component-label copy-root-label & {:keys [parent-label library children-labels] :as params}]
   (let [page      (current-page file)
         library   (or library file)
         component (get-component library component-label)
@@ -236,33 +247,60 @@
                      (assoc :frame-id frame-id)
 
                      (and (some? parent) (ctn/in-any-component? (:objects page) parent))
-                     (dissoc :component-root))]
+                     (dissoc :component-root))
+        file'      (ctf/update-file-data
+                    file
+                    (fn [file-data]
+                      (as-> file-data $
+                        (ctpl/update-page $
+                                          (:id page)
+                                          #(ctst/add-shape (:id copy-root')
+                                                           copy-root'
+                                                           %
+                                                           frame-id
+                                                           parent-id
+                                                           nil
+                                                           true))
+                        (reduce (fn [file-data shape]
+                                  (ctpl/update-page file-data
+                                                    (:id page)
+                                                    #(ctst/add-shape (:id shape)
+                                                                     shape
+                                                                     %
+                                                                     (:parent-id shape)
+                                                                     (:frame-id shape)
+                                                                     nil
+                                                                     true)))
+                                $
+                                (remove #(= (:id %) (:did copy-root')) copy-shapes)))))]
+    (when children-labels
+      (dotimes [idx (count children-labels)]
+        (set-child-label file' copy-root-label idx (nth children-labels idx))))
+    file'))
+
+
+
+(defn component-swap
+  [file shape-label new-component-label new-shape-label & {:keys [library] :as params}]
+  (let [shape            (get-shape file shape-label)
+        library          (or library file)
+        libraries        {(:id library) library}
+        page             (current-page file)
+        objects          (:objects page)
+        id-new-component (-> (get-component library new-component-label)
+                             :id)
+
+        ;; Store the properties that need to be maintained when the component is swapped
+        keep-props-values (select-keys shape ctk/swap-keep-attrs)
+
+
+        [new_shape _ changes]
+        (-> (pcb/empty-changes nil (:id page))
+            (cflh/generate-component-swap objects shape (:data file) page libraries id-new-component 0 nil keep-props-values))]
+
+    (thi/set-id! new-shape-label (:id new_shape))
+    (apply-changes file changes)))
 
-    (ctf/update-file-data
-     file
-     (fn [file-data]
-       (as-> file-data $
-         (ctpl/update-page $
-                           (:id page)
-                           #(ctst/add-shape (:id copy-root')
-                                            copy-root'
-                                            %
-                                            frame-id
-                                            parent-id
-                                            nil
-                                            true))
-         (reduce (fn [file-data shape]
-                   (ctpl/update-page file-data
-                                     (:id page)
-                                     #(ctst/add-shape (:id shape)
-                                                      shape
-                                                      %
-                                                      (:parent-id shape)
-                                                      (:frame-id shape)
-                                                      nil
-                                                      true)))
-                 $
-                 (remove #(= (:id %) (:did copy-root')) copy-shapes)))))))
 
 (defn sample-color
   [label & {:keys [] :as params}]

common/test/common_tests/helpers/ids_map.cljc

@@ -34,3 +34,9 @@
   [f]
   (reset-idmap!)
   (f))
+
+(defn label [id]
+  (->> @idmap
+       (filter #(= id (val %)))
+       (map key)
+       (first)))