Merge pull request #999 from metosin/fix-997

fix #997
metosin · Jan 24, 2024 · 686408c · 686408c
2 parents 8919b63 + 3640cd5
commit 686408c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/malli/core.cljc b/src/malli/core.cljc
@@ -2318,7 +2318,7 @@
          maybe-set-ref (fn [s r] (if (and ref-key r) (-update-properties s assoc ref-key r) s))]
      (-> (walk schema (fn [schema _ children _]
                         (cond (= :ref (type schema)) schema
-                              (-ref-schema? schema) (-> children (first) (maybe-set-ref (-ref schema)))
+                              (-ref-schema? schema) (maybe-set-ref (deref (-set-children schema children)) (-ref schema))
                               :else (-set-children schema children)))
                {::walk-schema-refs true})
          (deref-all)))))

diff --git a/test/malli/core_test.cljc b/test/malli/core_test.cljc
@@ -3069,4 +3069,23 @@
             [:address [:map {:id ::address}
                        [:street :string]
                        [:lonlat {:optional true} [:tuple :double :double]]]]]
-           (m/form (m/deref-recursive schema {::m/ref-key :id}))))))
+           (m/form (m/deref-recursive schema {::m/ref-key :id}))))
+    (testing "util schemas"
+      (let [registry (merge (m/default-schemas) (mu/schemas))]
+        (is (= [:map [:x :int] [:y :int]]
+               (m/form (m/deref-recursive
+                        [:merge
+                         [:map [:x :int]]
+                         [:map [:y :int]]]
+                        {:registry registry}))))
+        (is (= [:map {:id ::xymap}
+                [::x [:int {:id ::x}]]
+                [::y [:int {:id ::y}]]]
+               (m/form (m/deref-recursive
+                        [:schema {:registry {::x :int
+                                             ::y :int
+                                             ::xmap [:map ::x]
+                                             ::ymap [:map ::y]
+                                             ::xymap [:merge ::xmap ::ymap]}}
+                         ::xymap]
+                        {:registry registry, ::m/ref-key :id}))))))))