Handle additionalProperties properly

metosin · Apr 13, 2023 · 8ac2798 · 8ac2798
1 parent 85df820
commit 8ac2798
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/src/spec_tools/swagger/core.cljc b/src/spec_tools/swagger/core.cljc
@@ -90,6 +90,11 @@
 (defmethod accept-spec ::default [dispatch spec children options]
   (json-schema/accept-spec dispatch spec children options))
 
+(defn- update-if [m k f & args]
+  (if (contains? m k)
+    (apply update m k f args)
+    m))
+
 (defmulti create-or-raise-refs (fn [{:keys [type]} _] type))
 
 (defmethod create-or-raise-refs "object" [swagger options]
@@ -100,11 +105,14 @@
           swagger' (create-or-raise-refs (dissoc swagger :title) options)]
       {:$ref         (str "#/definitions/" title)
        ::definitions (merge {title (dissoc swagger' ::definitions)} (::definitions swagger'))})
-    (let [definitions (apply merge (map ::definitions (vals (:properties swagger))))]
+    (let [definitions (apply merge
+                             (::definitions (:additionalProperties swagger))
+                             (map ::definitions (vals (:properties swagger))))]
       (if definitions
         (-> swagger
             (assoc ::definitions definitions)
-            (update :properties update-vals #(dissoc % ::definitions)))
+            (update-if :properties update-vals #(dissoc % ::definitions))
+            (update-if :additionalProperties dissoc ::definitions))
         swagger))))
 
 (defmethod create-or-raise-refs "array" [swagger _]
@@ -181,10 +189,6 @@
 ;; expand the spec
 ;;
 
-(defn- update-if [m k f & args]
-  (if (contains? m k)
-    (apply update m k f args)
-    m))
 (defmulti expand (fn [k _ _ _] k))
 
 (defmethod expand ::responses [_ v acc options]

diff --git a/test/cljc/spec_tools/swagger/core_test.cljc b/test/cljc/spec_tools/swagger/core_test.cljc
@@ -473,6 +473,23 @@
             {::swagger/responses {200 {:schema (st/create-spec
                                                  {:spec ::user
                                                   :swagger/title "User"})}}}
+            {:refs? true}))))
+
+  (testing "::responses with refs in additionalProperties"
+    (is (=
+          {:responses {200 {:schema {:$ref "#/definitions/Every Test"}, :description ""}},
+           :definitions {"Every Test" {:type "object",
+                                       :additionalProperties {:$ref "#/definitions/spec-tools.swagger.core-test.address"}},
+                         "spec-tools.swagger.core-test.address" {:type "object",
+                                                                 :properties {"street" {:type "string"},
+                                                                              "city" {:enum [:tre :hki],
+                                                                                      :type "string",
+                                                                                      :x-nullable true}},
+                                                                 :required ["street" "city"]}}}
+          (swagger/swagger-spec
+            {::swagger/responses {200 {:schema (st/create-spec
+                                                 {:spec (s/every-kv ::id ::address)
+                                                  :swagger/title "Every Test"})}}}
             {:refs? true})))))
 
 #?(:clj