allow nil as valid fallback value

metosin · Sep 5, 2023 · 0ab9170 · 0ab9170
1 parent 85de30f
commit 0ab9170
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/malli/core.cljc b/src/malli/core.cljc
@@ -560,8 +560,8 @@
                               (let [x* (transformer x)]
                                 (if ((nth validators i) x*)
                                   (reduced x*)
-                                  (or acc x*))))
-                            nil transformers))
+                                  (if (-equals acc ::nil) x* acc))))
+                            ::nil transformers))
                          (fn [x]
                            (reduce-kv
                             (fn [x i validator] (if (validator x) (reduced ((nth transformers i) x)) x))

diff --git a/test/malli/core_test.cljc b/test/malli/core_test.cljc
@@ -319,7 +319,15 @@
                             :string] 1 math)
                  (m/decode [:orn
                             ["kw-math" math-kw-string]
-                            ["string" :string]] 1 math)))))
+                            ["string" :string]] 1 math))))
+
+        (testing "first branch nil can be selected as a fallback"
+          (is (= nil (m/decode
+                      [:or
+                       [:keyword {:decode/math (constantly nil)}]
+                       :keyword]
+                      "kikka"
+                      (mt/transformer {:name :math}))))))
 
       (testing "top-level transformations are retained"
         (doseq [schema [[:or {:decode/string {:enter (fn [m] (update m :enter #(or % true)))