From 08069b87934779b8872b5deaa470c04a0b862fac Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Sun, 15 Nov 2026 13:38:15 +0100 Subject: [PATCH] :paperclip: Keep a moved shape's authored geometry where it shows The model kept the geometry a shape authored relative to the parent it authored it in. A move keeps where and how the shape shows, so moved into a turned board it was expected turned with it, where production keeps its turn on the page. The model records the authored geometry again in the shape's new parent after a move. Harness only; the benchmark is not run. Also in this commit: - Draw fewer random programs in JS and check coverage on the JVM. The random composition properties drew 50 programs in JS as on the JVM, which made the JS run of the common tests take about two and a half hours. JS runs the same model and production code, so it now draws 15 programs per property as a parity check, and the coverage shares, which need the JVM's 50 programs to tell, are asserted on the JVM only. AI-assisted-by: claude-opus-5-5 --- .../common/test_helpers/composable/gen.cljc | 14 +++-- .../logic/composable_gen_test.cljc | 63 ++++++++++++------- 2 files changed, 49 insertions(+), 28 deletions(-) diff --git a/common/src/app/common/test_helpers/composable/gen.cljc b/common/src/app/common/test_helpers/composable/gen.cljc index 8da997bd8d..8e07ebc58b 100644 --- a/common/src/app/common/test_helpers/composable/gen.cljc +++ b/common/src/app/common/test_helpers/composable/gen.cljc @@ -1139,10 +1139,16 @@ :update-main (shadow/update-main model objects (all-objects after) id) :detach (shadow/detach model objects (all-objects after) id) ;; a move resets the shape's constraints to its new parent's defaults, - ;; which an override of them now holds - :move (cond-> model - (get-in model [id :constraints-group]) - (assoc-in [id :constraints-group] (shadow/values (get (all-objects after) id) :constraints-group))) + ;; which an override of them now holds; a move keeps where the shape + ;; shows, so the geometry it authored is now that, in its new parent + :move (let [moved (get (all-objects after) id)] + (cond-> model + (get-in model [id :constraints-group]) + (assoc-in [id :constraints-group] (shadow/values moved :constraints-group)) + + (get-in model [id :geometry-group]) + (assoc-in [id :geometry-group] + (shadow/author-geometry moved (get (all-objects after) (:frame-id moved)))))) :nest (let [parent (get objects (tm/target-shape-id before (:into op)))] (if (:blocked parent) (shadow/edit model shape :blocked true) diff --git a/common/test/common_tests/logic/composable_gen_test.cljc b/common/test/common_tests/logic/composable_gen_test.cljc index 57d5d1460a..7174bf2a27 100644 --- a/common/test/common_tests/logic/composable_gen_test.cljc +++ b/common/test/common_tests/logic/composable_gen_test.cljc @@ -1595,8 +1595,16 @@ (t/is (thrown? #?(:clj Exception :cljs js/Error) (cg/run {:world [2 0] :ops [[:restore 0]]})))) -;; programs each random composition test draws, enough for every kind to reach its coverage share -(def ^:private coverage-programs 50) +;; programs each random composition test draws: on the JVM enough for every +;; kind to reach its coverage share; in JS a parity check of the same code +(def ^:private coverage-programs #?(:clj 50 :cljs 15)) + +(defn- coverage-errors + "The coverage errors of `cg/coverage-errors` on the JVM, whose programs + are enough to tell them; none in JS, whose fewer programs are not." + [& args] + #?(:clj (apply cg/coverage-errors args) + :cljs (do args []))) (t/deftest random-compositions (let [coverage (atom {}) @@ -1607,8 +1615,8 @@ :max-size 30 :default-num coverage-programs) (println "Component operation coverage:" (pr-str @coverage)) - (t/is (empty? (cg/coverage-errors @coverage [:edit :reset :update-main :detach :sync :undo :redo])) - (pr-str (cg/coverage-errors @coverage [:edit :reset :update-main :detach :sync :undo :redo]))))) + (t/is (empty? (coverage-errors @coverage [:edit :reset :update-main :detach :sync :undo :redo])) + (pr-str (coverage-errors @coverage [:edit :reset :update-main :detach :sync :undo :redo]))))) (t/deftest random-structure-compositions (let [coverage (atom {}) @@ -1619,8 +1627,8 @@ :max-size 30 :default-num coverage-programs) (println "Structure operation coverage:" (pr-str @coverage)) - (t/is (empty? (cg/coverage-errors @coverage cg/structure-kinds)) - (pr-str (cg/coverage-errors @coverage cg/structure-kinds))))) + (t/is (empty? (coverage-errors @coverage cg/structure-kinds)) + (pr-str (coverage-errors @coverage cg/structure-kinds))))) (t/deftest partial-sync-keeps-independent-components-pending (let [situation (cg/world [3 0]) @@ -1669,8 +1677,8 @@ :max-size 30 :default-num coverage-programs) (println "Swap operation coverage:" (pr-str @coverage)) - (t/is (empty? (cg/coverage-errors @coverage cg/swap-kinds)) - (pr-str (cg/coverage-errors @coverage cg/swap-kinds))))) + (t/is (empty? (coverage-errors @coverage cg/swap-kinds)) + (pr-str (coverage-errors @coverage cg/swap-kinds))))) (t/deftest generated-variant-set-edits-cover-every-edit (let [spec [2 2 {:variants true :rich-variants true}] @@ -2350,8 +2358,8 @@ :max-size 30 :default-num coverage-programs) (println "Variant operation coverage:" (pr-str @coverage)) - (t/is (empty? (cg/coverage-errors @coverage cg/variant-coverage-kinds)) - (pr-str (cg/coverage-errors @coverage cg/variant-coverage-kinds))))) + (t/is (empty? (coverage-errors @coverage cg/variant-coverage-kinds)) + (pr-str (coverage-errors @coverage cg/variant-coverage-kinds))))) (t/deftest centring-a-nested-copy-after-its-copy-resized-keeps-its-children-in-place (t/is (map? (cg/run {:world [1 0 {:variants true :text-styles false :library-variants false :stale-libraries false @@ -2678,8 +2686,8 @@ :max-size 30 :default-num coverage-programs) (println "Shape structure operation coverage:" (pr-str @coverage)) - (t/is (empty? (cg/coverage-errors @coverage cg/shape-structure-coverage-kinds)) - (pr-str (cg/coverage-errors @coverage cg/shape-structure-coverage-kinds))))) + (t/is (empty? (coverage-errors @coverage cg/shape-structure-coverage-kinds)) + (pr-str (coverage-errors @coverage cg/shape-structure-coverage-kinds))))) (t/deftest random-grid-compositions (let [coverage (atom {}) @@ -2690,8 +2698,8 @@ :max-size 30 :default-num coverage-programs) (println "Grid operation coverage:" (pr-str @coverage)) - (t/is (empty? (cg/coverage-errors @coverage cg/grid-coverage-kinds)) - (pr-str (cg/coverage-errors @coverage cg/grid-coverage-kinds))))) + (t/is (empty? (coverage-errors @coverage cg/grid-coverage-kinds)) + (pr-str (coverage-errors @coverage cg/grid-coverage-kinds))))) (t/deftest random-token-compositions (let [coverage (atom {}) @@ -2702,8 +2710,8 @@ :max-size 30 :default-num coverage-programs) (println "Token operation coverage:" (pr-str @coverage)) - (t/is (empty? (cg/coverage-errors @coverage cg/token-coverage-kinds)) - (pr-str (cg/coverage-errors @coverage cg/token-coverage-kinds))))) + (t/is (empty? (coverage-errors @coverage cg/token-coverage-kinds)) + (pr-str (coverage-errors @coverage cg/token-coverage-kinds))))) (t/deftest random-scale-compositions ;; scale programs run several times longer than the others; the gates draw more @@ -2715,8 +2723,8 @@ :max-size 30 :default-num 12) (println "Scale operation coverage:" (pr-str @coverage)) - (t/is (empty? (cg/coverage-errors @coverage cg/scale-coverage-kinds)) - (pr-str (cg/coverage-errors @coverage cg/scale-coverage-kinds))))) + (t/is (empty? (coverage-errors @coverage cg/scale-coverage-kinds)) + (pr-str (coverage-errors @coverage cg/scale-coverage-kinds))))) (t/deftest random-renames-leave-variant-management-to-its-own-operations (let [situation (cg/world [2 2 {:variants true}]) @@ -2777,8 +2785,8 @@ :max-size 30 :default-num coverage-programs) (println "Library operation coverage:" (pr-str @coverage)) - (t/is (empty? (cg/coverage-errors @coverage cg/library-kinds)) - (pr-str (cg/coverage-errors @coverage cg/library-kinds))))) + (t/is (empty? (coverage-errors @coverage cg/library-kinds)) + (pr-str (coverage-errors @coverage cg/library-kinds))))) (t/deftest random-stale-library-compositions (let [coverage (atom {}) @@ -2789,8 +2797,8 @@ :max-size 30 :default-num coverage-programs) (println "Stale library operation coverage:" (pr-str @coverage)) - (t/is (empty? (cg/coverage-errors @coverage cg/stale-library-coverage-kinds #{:sync})) - (pr-str (cg/coverage-errors @coverage cg/stale-library-coverage-kinds #{:sync}))))) + (t/is (empty? (coverage-errors @coverage cg/stale-library-coverage-kinds #{:sync})) + (pr-str (coverage-errors @coverage cg/stale-library-coverage-kinds #{:sync}))))) (t/deftest random-library-dependency-compositions (let [coverage (atom {}) @@ -2801,8 +2809,8 @@ :max-size 30 :default-num coverage-programs) (println "Library dependency operation coverage:" (pr-str @coverage)) - (t/is (empty? (cg/coverage-errors @coverage cg/dependency-kinds #{:sync})) - (pr-str (cg/coverage-errors @coverage cg/dependency-kinds #{:sync}))))) + (t/is (empty? (coverage-errors @coverage cg/dependency-kinds #{:sync})) + (pr-str (coverage-errors @coverage cg/dependency-kinds #{:sync}))))) (t/deftest update-main-moves-an-authored-swap-to-the-replaced-main-shape (let [result (cg/run {:world [2 1 {:library true :variants true}] @@ -4308,6 +4316,13 @@ :grid-empty false :layout-copies false :text true}] :ops [[:switch 11] [:switch 5] [:nest 17] [:add-child 15] [:rotate 15] [:style 12 9 1] [:paste 12]]})))) +(t/deftest generated-a-moved-board-keeps-the-geometry-it-shows-in-a-turned-parent + ;; a board that authored its geometry, moved into a turned main board, + ;; keeps where and how it shows; the main's copies show it alike + (t/is (map? (cg/run {:world [2 1 {:text true}] + :ops [[:move 0 0 0 0] [:resize 8 0 0 0] [:rotate 0 0 0 0] [:remove-child 0 0 0 0] + [:update-main 0] [:move 1 0 0 0]]})))) + (t/deftest generated-an-update-main-of-a-pasted-swap-authors-no-empty-fills ;; a pasted copy holds empty fill and stroke lists where its main holds ;; none; pushing it to the main overrides nothing the two show alike