Add support for nullable schema map items (juhaku#1032)

Add support for nullable schemas in maps like `HashMap` and `BTreeMap`. Resolves juhaku#897
jayvdb · Sep 7, 2024 · 5341dd0 · 5341dd0
1 parent ed255a1
commit 5341dd0
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/utoipa/src/lib.rs b/utoipa/src/lib.rs
@@ -654,6 +654,18 @@ impl<'__s, K: PartialSchema, V: ToSchema<'__s>> PartialSchema for Option<BTreeMa
     }
 }
 
+#[cfg(feature = "macros")]
+#[cfg_attr(doc_cfg, doc(cfg(feature = "macros")))]
+impl<'__s, K: PartialSchema, V: ToSchema<'__s>> PartialSchema for BTreeMap<K, Option<V>> {
+    fn schema() -> openapi::RefOr<openapi::schema::Schema> {
+        schema!(
+            #[inline]
+            BTreeMap<K, Option<V>>
+        )
+        .into()
+    }
+}
+
 #[cfg(feature = "macros")]
 #[cfg_attr(doc_cfg, doc(cfg(feature = "macros")))]
 impl<'__s, K: PartialSchema, V: ToSchema<'__s>> PartialSchema for std::collections::HashMap<K, V> {
@@ -680,6 +692,20 @@ impl<'__s, K: PartialSchema, V: ToSchema<'__s>> PartialSchema
     }
 }
 
+#[cfg(feature = "macros")]
+#[cfg_attr(doc_cfg, doc(cfg(feature = "macros")))]
+impl<'__s, K: PartialSchema, V: ToSchema<'__s>> PartialSchema
+    for std::collections::HashMap<K, Option<V>>
+{
+    fn schema() -> openapi::RefOr<openapi::schema::Schema> {
+        schema!(
+            #[inline]
+            std::collections::HashMap<K, Option<V>>
+        )
+        .into()
+    }
+}
+
 /// Trait for implementing OpenAPI PathItem object with path.
 ///
 /// This trait is implemented via [`#[utoipa::path(...)]`][derive] attribute macro and there

diff --git a/utoipa/src/openapi/schema.rs b/utoipa/src/openapi/schema.rs
@@ -1242,6 +1242,12 @@ impl From<Schema> for AdditionalProperties<Schema> {
     }
 }
 
+impl From<AllOfBuilder> for AdditionalProperties<Schema> {
+    fn from(value: AllOfBuilder) -> Self {
+        Self::RefOr(RefOr::T(Schema::AllOf(value.build())))
+    }
+}
+
 builder! {
     RefBuilder;