handle defaults from entries

metosin · Jul 16, 2020 · c98e0e1 · c98e0e1
1 parent b74e01b
commit c98e0e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/malli/transform.cljc b/src/malli/transform.cljc
@@ -322,8 +322,8 @@
         add-defaults {:compile (fn [schema _]
                                  (let [entries (m/map-entries schema)
                                        defaults (->> entries
-                                                     (keep (fn [[k _ v]]
-                                                             (if-some [default (get-default v)]
+                                                     (keep (fn [[k {:keys [default]} v]]
+                                                             (if-some [default (if (some? default) default (get-default v))]
                                                                [k default])))
                                                      (into {}))]
                                    (if (seq defaults)

diff --git a/test/malli/transform_test.cljc b/test/malli/transform_test.cljc
@@ -542,7 +542,7 @@
 
   (testing "nested"
     (let [schema [:map {:default {}}
-                  [:a [int? {:default 1}]]
+                  [:a {:default 1} int?]
                   [:b [:vector {:default [1 2 3]} int?]]
                   [:c [:map {:default {}}
                        [:x [int? {:default 42}]]
@@ -572,4 +572,5 @@
 
   (testing "default false"
     (is (= {:user/verified false} (m/decode [:map [:user/verified [:and {:default false} boolean?]]] {} mt/default-value-transformer)))
+    (is (= {:user/verified false} (m/decode [:map [:user/verified {:default false} boolean?]] {} mt/default-value-transformer)))
     (is (= false (m/decode [:and {:default false} boolean?] nil mt/default-value-transformer)))))