fixes #419

metosin · Apr 24, 2021 · 566470c · 566470c
1 parent ccabd0b
commit 566470c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/malli/core.cljc b/src/malli/core.cljc
@@ -184,6 +184,7 @@
 (defn -parse-entries [children {:keys [naked-keys lazy-refs]} options]
   (let [-parse (fn [e] (let [[[k ?p ?v] f] (cond
                                              (-reference? e) (if naked-keys [[e nil e] e])
+                                             (and (= 1 (count e)) (-reference? (first e))) (if naked-keys [[(first e) nil (first e)] e])
                                              (and (= 2 (count e)) (-reference? (first e)) (map? (last e))) (if naked-keys [(conj e (first e)) e])
                                              :else [e (->> (-update (vec e) (dec (count e)) (-comp -form #(schema % options))) (keep identity) (vec))])
                              [p ?s] (if (or (nil? ?p) (map? ?p)) [?p ?v] [nil ?p])

diff --git a/test/malli/core_test.cljc b/test/malli/core_test.cljc
@@ -1754,16 +1754,18 @@
 
 (deftest custom-registry-qualified-keyword-in-map-test
   (let [schema [:map {:registry {::id int?
+                                 ::location [:tuple :int :int]
                                  ::country string?}}
                 ::id
+                [::location]
                 [:name string?]
                 [::country {:optional true}]]]
 
     (testing "Example with qualified keyword + optional, regular key"
-      (is (m/validate schema {::id 123 ::country "Finland" :name "Malli"})))
+      (is (m/validate schema {::id 123 ::location [1 1] ::country "Finland" :name "Malli"})))
 
     (testing "Optional qualified keyword is optional"
-      (is (m/validate schema {::id 123 :name "Malli"})))))
+      (is (m/validate schema {::id 123 ::location [1 1] :name "Malli"})))))
 
 (deftest simple-schemas
   (testing "simple schemas"