Extract child definition when necessary

metosin · Sep 20, 2023 · 98ffa58 · 98ffa58
1 parent 65e8235
commit 98ffa58
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/src/spec_tools/swagger/core.cljc b/src/spec_tools/swagger/core.cljc
@@ -31,18 +31,22 @@
 
 (defn- accept-merge [children]
   ;; Use x-anyOf and x-allOf instead of normal versions
-  {:type "object"
-   :properties (->> (concat children
-                            (mapcat :x-anyOf children)
-                            (mapcat :x-allOf children))
-                    (map :properties)
-                    (reduce merge {}))
-   ;; Don't include top schema from s/or.
-   :required (->> (concat (remove :x-anyOf children)
-                          (mapcat :x-allOf children))
-                  (map :required)
-                  (reduce into (sorted-set))
-                  (into []))})
+  (let [children' (map #(if (contains? % :$ref)
+                          (first (vals (::definitions %)))
+                          %)
+                       children)]
+    {:type "object"
+     :properties (->> (concat children'
+                              (mapcat :x-anyOf children')
+                              (mapcat :x-allOf children'))
+                      (map :properties)
+                      (reduce merge {}))
+     ;; Don't include top schema from s/or.
+     :required (->> (concat (remove :x-anyOf children')
+                            (mapcat :x-allOf children'))
+                    (map :required)
+                    (reduce into (sorted-set))
+                    (into []))}))
 
 (defmethod accept-spec 'clojure.spec.alpha/merge [_ _ children _]
   (accept-merge children))