Merge pull request #223 from wandersoncferreira/fix/missing-titles

fixing missing titles with s/cat and s/merge
metosin · Mar 28, 2020 · 6d1ffd4 · 6d1ffd4
2 parents 5c95e58 + 800e354
commit 6d1ffd4
Showing 1 changed file with 29 additions and 23 deletions.
diff --git a/src/spec_tools/json_schema.cljc b/src/spec_tools/json_schema.cljc
@@ -206,24 +206,26 @@
 (defmethod accept-spec 'clojure.spec.alpha/and [_ _ children _]
   (simplify-all-of {:allOf children}))
 
-(defn- accept-merge [children]
-  {:type "object"
-   :properties (->> (concat children
-                            (mapcat :anyOf children)
-                            (mapcat :allOf children))
-                    (map :properties)
-                    (reduce merge {}))
-   :required (->> (concat children
-                          (mapcat :allOf children))
-                  (map :required)
-                  (reduce into (sorted-set))
-                  (into []))})
-
-(defmethod accept-spec 'clojure.spec.alpha/merge [_ _ children _]
-  (accept-merge children))
-
-(defmethod accept-spec 'spec-tools.core/merge [_ _ children _]
-  (accept-merge children))
+(defn- accept-merge [children spec options]
+  (maybe-with-title
+   {:type "object"
+    :properties (->> (concat children
+                             (mapcat :anyOf children)
+                             (mapcat :allOf children))
+                     (map :properties)
+                     (reduce merge {}))
+    :required (->> (concat children
+                           (mapcat :allOf children))
+                   (map :required)
+                   (reduce into (sorted-set))
+                   (into []))}
+   spec))
+
+(defmethod accept-spec 'clojure.spec.alpha/merge [_ spec children options]
+  (accept-merge children spec options))
+
+(defmethod accept-spec 'spec-tools.core/merge [_ spec children options]
+  (accept-merge children spec options))
 
 (defmethod accept-spec 'clojure.spec.alpha/every [_ spec children options]
   (let [form (impl/extract-form spec)
@@ -254,12 +256,16 @@
 (defmethod accept-spec 'clojure.spec.alpha/? [_ _ children _]
   {:type "array" :items (impl/unwrap children) :minItems 0})
 
-(defmethod accept-spec 'clojure.spec.alpha/alt [_ _ children _]
-  {:anyOf children})
+(defmethod accept-spec 'clojure.spec.alpha/alt [_ spec children options]
+  (maybe-with-title
+   {:anyOf children}
+   spec))
 
-(defmethod accept-spec 'clojure.spec.alpha/cat [_ _ children _]
-  {:type "array"
-   :items {:anyOf children}})
+(defmethod accept-spec 'clojure.spec.alpha/cat [_ spec children options]
+  (maybe-with-title
+   {:type "array"
+    :items {:anyOf children}}
+   spec))
 
 ; &