look up to one registry level for IntoSchema

metosin · Jul 17, 2024 · 8eadc26 · 8eadc26
1 parent 11b6e22
commit 8eadc26
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/src/malli/core.cljc b/src/malli/core.cljc
@@ -275,12 +275,11 @@
         (-fail! ::invalid-schema {:schema ?schema, :form ?form}))))
 
 (defn- -lookup-into-schema [?schema options]
-  (let [registry (-registry options)]
-    (loop [?schema ?schema]
-      (if (into-schema? ?schema)
-        ?schema
-        (some-> (mr/-schema registry ?schema)
-                recur)))))
+  (if (into-schema? ?schema)
+    ?schema
+    (let [?schema (mr/-schema (-registry options) ?schema)]
+      (when (into-schema? ?schema)
+        ?schema))))
 
 (defn -properties-and-options [properties options f]
   (if-let [r (:registry properties)]
@@ -1693,7 +1692,7 @@
         (let [children (-vmap #(schema % options) children)
               child (nth children 0)
               form (delay (let [no-props? (empty? properties)]
-                            (or (if id
+                            (or (when id
                                   (if no-props?
                                     id
                                     [id properties]))

diff --git a/test/malli/core_test.cljc b/test/malli/core_test.cljc
@@ -3379,9 +3379,20 @@
     (is (m/schema ::string options))
     (is (m/schema [::string] options))
     (is (m/schema [::string {:foo :bar}] options))
+    (is (m/schema [::string {:foo :bar}] options))
     (is (validate ::string "a"))
     (is (not (validate ::string 1)))
+    (is (validate [:schema {:registry {::string :int}} ::string] 1))
+    (is (= [:schema {:registry {::string :int}} ::string]
+           (-> [:schema {:registry {::string :int}} ::string]
+               (m/form options))))
     (is (validate [:schema {:registry {::string :int}} [::string {:foo :bar}]] 1))
+    (is (= [:schema {:registry {::string :int}} [::string {:foo :bar}]]
+           (-> [:schema {:registry {::string :int}} [::string {:foo :bar}]]
+               (m/form options))))
+    (is (= [:schema {:registry {::string [:tuple :int]}} [::string {:foo :bar}]]
+           (-> [:schema {:registry {::string [:tuple :int]}} [::string {:foo :bar}]]
+               (m/form options))))
     (is (not (validate [:schema {:registry {::string :int}} [::string]] "a")))
     (is (not (validate [:schema {:registry {::string :int}} [::string {:foo :bar}]] "a")))))