Merge pull request #715 from ingesolvoll/master

:maybe map schema can use :nilable prop in clj-kondo :op spec
metosin · Jun 26, 2022 · b745b73 · b745b73
2 parents 657d570 + 41568f0
commit b745b73
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/malli/clj_kondo.cljc b/src/malli/clj_kondo.cljc
@@ -95,7 +95,11 @@
           (symbol? child) :symbol
           :else :any)))))
 
-(defmethod accept :maybe [_ _ [child] _] (if (keyword? child) (keyword "nilable" (name child)) child))
+(defmethod accept :maybe [_ _ [child] _]
+  (cond
+    (= :keys (:op child)) (assoc child :nilable true)
+    (keyword? child) (keyword "nilable" (name child))
+    :else child))
 (defmethod accept :tuple [_ _ children _] children)
 (defmethod accept :multi [_ _ _ _] :any) ;;??
 (defmethod accept :re [_ _ _ _] :string)

diff --git a/test/malli/clj_kondo_test.cljc b/test/malli/clj_kondo_test.cljc
@@ -44,7 +44,7 @@
           :req {::id :string,
                 :name :string,
                 :description :nilable/string,
-                :select-keys {:op :keys, :req {:x :int}},
+                :select-keys {:op :keys, :req {:x :int} :nilable true},
                 :nested {:op :keys, :req {:id :string, :price :double}},
                 :string-type-enum :nilable/string
                 :keyword-type-enum :keyword