fix: to prevent errors occuring when merging non-map value

xcoo · Mar 26, 2024 · bd5bbbd · bd5bbbd
1 parent 25fa1c9
commit bd5bbbd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/cljc/proton/core.cljc b/src/cljc/proton/core.cljc
@@ -198,7 +198,7 @@
   "Recursively merges maps."
   [& maps]
   (letfn [(m [& xs]
-            (if (some #(and (map? %) (not (record? %))) xs)
+            (if (every? #(and (map? %) (not (record? %))) xs)
               (apply merge-with m xs)
               (last xs)))]
     (reduce m maps)))
diff --git a/test/proton/core_test.cljc b/test/proton/core_test.cljc
@@ -161,4 +161,6 @@
   (is (= (core/deep-merge {:foo {:bar 1}} {:foo {:baz 2}})
          {:foo {:bar 1 :baz 2}}))
   (is (= (core/deep-merge {:foo {:bar 1}} {:baz 2})
-         {:foo {:bar 1} :baz 2})))
+         {:foo {:bar 1} :baz 2}))
+  (is (= (core/deep-merge {:foo 1} {:foo {:baz 2}})
+         {:foo {:baz 2}})))