Add support for named transformations with :schema & ::m/schema

metosin · Jul 13, 2020 · 4cf197b · 4cf197b
1 parent 9f105a5
commit 4cf197b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/malli/core.cljc b/src/malli/core.cljc
@@ -832,7 +832,17 @@
             (-type [_] type)
             (-validator [_] (-validator child))
             (-explainer [_ path] (-explainer child path))
-            (-transformer [_ transformer method options] (-transformer child transformer method options))
+            (-transformer [this transformer method options]
+              (let [this-transformer (-value-transformer transformer this method options)
+                    child-transformer (-transformer child transformer method options)
+                    build (fn [phase]
+                            (let [->this (phase this-transformer)
+                                  ->child (phase child-transformer)]
+                              (if (and ->this ->child)
+                                (comp ->child ->this)
+                                (or ->this ->child))))]
+                {:enter (build :enter)
+                 :leave (build :leave)}))
             (-walk [this walker in options]
               (if (-accept walker this in options)
                 (if id

diff --git a/test/malli/core_test.cljc b/test/malli/core_test.cljc
@@ -390,7 +390,12 @@
     (is (= [:schema {:registry {::cons [:maybe [:tuple 'int? [:ref ::cons]]]}}
             ::cons]
            (m/form [:schema {:registry {::cons [:maybe [:tuple int? [:ref ::cons]]]}}
-                    [::m/schema ::cons]]))))
+                    [::m/schema ::cons]])))
+
+    (is (= "$kikka"
+           (m/decode
+             [:schema {:decode/custom (partial str "$")} string?] "kikka"
+             (mt/transformer {:name :custom})))))
 
   (testing "schema schemas"
     (let [schema [:and
@@ -414,6 +419,11 @@
       (is (= 1 (m/decode schema "1" mt/string-transformer)))
       (is (= "1" (m/decode schema "1" mt/json-transformer)))
 
+      (is (= "$kikka"
+             (m/decode
+               [:schema {:decode/custom (partial str "$")} string?] "kikka"
+               (mt/transformer {:name :custom}))))
+
       (testing "deref"
         (is (mu/equals (m/schema int?) (m/-deref (m/schema [:schema int?])))))