fixup! merge + closed bugfix

Author: mpenet

src/exoscale/coax.cljc

@@ -129,10 +129,21 @@
   [[_ & spec-forms]]
   (fn [x {:as opts :keys [closed]}]
     (if (map? x)
-      (into (cond-> x closed empty)
-            (map (fn [spec-form]
-                   (coerce spec-form x (assoc opts :closed true))))
-            spec-forms)
+      (if closed
+        (into {}
+              (map (fn [spec-form]
+                     (coerce spec-form x (assoc opts :closed true))))
+              spec-forms)
+        ;; not closed, we also have to ensure we don't overwrite values with
+        ;; more loose specs towards the end of the args (ex `any?`
+        (reduce (fn [m spec-form]
+                  (into m
+                        (remove (fn [[k v]]
+                                  (= (get x k) v)))
+                        (coerce spec-form x (assoc opts :closed true))))
+                x
+                spec-forms))
+
       :exoscale.coax/invalid)))
 
 (defn gen-coerce-nilable

test/exoscale/coax_test.cljc

@@ -373,6 +373,9 @@
 
 (deftest test-or-conditions-in-unqualified-keys
   (is (= (sc/coerce ::unqualified {:foo "1" :bar "hi"})
+         {:foo 1 :bar "hi"}))
+
+  (is (= (sc/coerce ::unqualified {:foo "1" :bar "hi"} {:closed true})
          {:foo 1 :bar "hi"})))
 
 (deftest test-closed-keys
@@ -402,15 +405,15 @@
                           any?))
   (is (= {:foo 1 :bar "1" :c {:a 2}}
          (sc/coerce ::merge {:foo "1" :bar 1 :c {:a 2}}))
-      "Coerce new vals appropriately")
+      "Coerce new vals appropriately 1")
 
   (is (= {:foo 1 :bar "1" :c {:a 2}}
          (sc/coerce ::merge {:foo 1 :bar "1" :c {:a 2}}))
       "Leave out ok vals")
 
   (is (= {:foo 1 :bar "1" :c {:a 2}}
          (sc/coerce ::merge {:foo "1" :bar 1 :c {:a 2}}))
-      "Coerce new vals appropriately")
+      "Coerce new vals appropriately 2")
 
   (s/def ::merge2 (s/merge (s/keys :req [::foo])
                            ::unqualified))