Do not inline non-primitive type parameters by default

juhaku · Nov 4, 2024 · 872f17c · 872f17c
1 parent a792520
commit 872f17c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/utoipa-gen/src/component.rs b/utoipa-gen/src/component.rs
@@ -1255,8 +1255,17 @@ impl ComponentSchema {
 
                         schema.to_tokens(tokens);
                     } else {
-                        let index = container.generics.get_generic_type_param_index(type_tree);
-                        // only set schema references tokens for concrete non generic types
+                        let schema_type = SchemaType {
+                            path: Cow::Borrowed(&rewritten_path),
+                            nullable,
+                        };
+                        let index = if schema_type.is_primitive() {
+                            container.generics.get_generic_type_param_index(type_tree)
+                        } else {
+                            None
+                        };
+
+                        // forcibly inline primitive type parameters, otherwise use references
                         if index.is_none() {
                             let reference_tokens = if let Some(children) = &type_tree.children {
                                 let composed_generics = Self::compose_generics(

diff --git a/utoipa-gen/tests/openapi_derive.rs b/utoipa-gen/tests/openapi_derive.rs
@@ -4,7 +4,7 @@ use assert_json_diff::{assert_json_eq, assert_json_include};
 use serde::Serialize;
 use serde_json::{json, Value};
 use utoipa::{
-    openapi::{RefOr, Response, ResponseBuilder},
+    openapi::{schema, RefOr, Response, ResponseBuilder},
     OpenApi, ToResponse,
 };
 use utoipa_gen::ToSchema;
@@ -560,8 +560,8 @@ fn openapi_schemas_resolve_schema_references() {
 
     #[derive(ToSchema)]
     enum Element<T> {
-        One(T),
-        Many(Vec<T>),
+        One(#[schema(inline)] T),
+        Many(#[schema(inline)] Vec<T>),
     }
 
     #[derive(ToSchema)]