merge + closed bugfix

exoscale · Jan 6, 2025 · 93fa9a6 · 93fa9a6
1 parent 7e99a50
commit 93fa9a6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/src/exoscale/coax.cljc b/src/exoscale/coax.cljc
@@ -127,20 +127,12 @@
 
 (defn gen-coerce-merge
   [[_ & spec-forms]]
-  (fn [x opts]
+  (fn [x {:as opts :keys [closed]}]
     (if (map? x)
-      (reduce (fn [m spec-form]
-                ;; for every spec-form coerce to new value;
-                ;; we need to compare key by key what changed so that
-                ;; defaults do not overwrite coerced values
-                (into m
-                      (keep (fn [[spec v]]
-                              ;; new-val doesn't match default, keep it
-                              (when-not (= (get x spec) v)
-                                [spec v])))
-                      (coerce spec-form x (assoc opts :closed true))))
-              x
-              spec-forms)
+      (into {}
+            (map (fn [spec-form]
+                   (coerce spec-form x (assoc opts :closed closed))))
+            spec-forms)
       :exoscale.coax/invalid)))
 
 (defn gen-coerce-nilable

diff --git a/test/exoscale/coax_test.cljc b/test/exoscale/coax_test.cljc
@@ -420,6 +420,11 @@
          (sc/coerce ::merge2 {::foo "1" :foo "1" :bar "1" :c {:a 2}}))
       "Leave out ok vals")
 
+  (is (= {::foo 1 :bar "1" :foo 1}
+         (sc/coerce ::merge2 {::foo "1" :foo "1" :bar "1" :c {:a 2}}
+                    {:closed true}))
+      "Remove extras")
+
   (is (= "garbage" (sc/coerce ::merge "garbage"))
       "garbage is passthrough")