Merge pull request #1151 from dekelpilli/tuple-json-schema

Update json-schema for :tuple for 2020-12 draft

Author: ikitommi

src/malli/json_schema.cljc

@@ -150,7 +150,7 @@
 
 (defmethod accept :enum [_ _ children options] (merge (some-> (m/-infer children) (-transform options)) {:enum children}))
 (defmethod accept :maybe [_ _ children _] {:oneOf (conj children {:type "null"})})
-(defmethod accept :tuple [_ _ children _] {:type "array", :items children, :additionalItems false})
+(defmethod accept :tuple [_ _ children _] {:type "array", :prefixItems children, :items false})
 (defmethod accept :re [_ schema _ options] {:type "string", :pattern (first (m/children schema options))})
 (defmethod accept :fn [_ _ _ _] {})
 

test/malli/json_schema_test.cljc

@@ -91,8 +91,8 @@
    [[:enum 'kikka 'kukka] {:type "string" :enum ['kikka 'kukka]}]
    [[:maybe string?] {:oneOf [{:type "string"} {:type "null"}]}]
    [[:tuple string? string?] {:type "array"
-                              :items [{:type "string"} {:type "string"}]
-                              :additionalItems false}]
+                              :prefixItems [{:type "string"} {:type "string"}]
+                              :items false}]
    [[:re "^[a-z]+\\.[a-z]+$"] {:type "string", :pattern "^[a-z]+\\.[a-z]+$"}]
    [[:fn {:gen/elements [1]} int?] {}]
    [:any {}]
@@ -355,8 +355,8 @@
           :required [:id :malli.json-schema-test/location `description],
           :definitions {"malli.json-schema-test/UserId" {:type "string"},
                         "malli.json-schema-test/location" {:type "array",
-                                                           :items [{:type "number"} {:type "number"}],
-                                                           :additionalItems false},
+                                                           :prefixItems [{:type "number"} {:type "number"}],
+                                                           :items false},
                         "malli.json-schema-test/description" {:type "string"},
                         "malli.json-schema-test/User" {:type "object",
                                                        :properties {:id {:$ref "#/definitions/malli.json-schema-test~1UserId"},