feat: parse schema with lifetimes

ProbablyClem · Sep 9, 2024 · 66167eb · 66167eb
1 parent eb04cba
commit 66167eb
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 2 deletions.
diff --git a/utoipauto-core/src/discover.rs b/utoipauto-core/src/discover.rs
@@ -86,7 +86,12 @@ fn parse_module_items(
                 .map(|item| DiscoverType::Fn(build_path(module_path, &item)))
                 .collect(),
             syn::Item::Struct(s) => {
-                let is_generic = !s.generics.params.is_empty();
+                let is_generic = !s
+                    .generics
+                    .params
+                    .iter()
+                    .all(|p| matches!(p, syn::GenericParam::Lifetime(_)));
+
                 parse_from_attr(
                     &s.attrs,
                     &build_path(module_path, &s.ident.to_string()),
@@ -96,7 +101,12 @@ fn parse_module_items(
                 )
             }
             syn::Item::Enum(e) => {
-                let is_generic = !e.generics.params.is_empty();
+                let is_generic = !e
+                    .generics
+                    .params
+                    .iter()
+                    .all(|p| matches!(p, syn::GenericParam::Lifetime(_)));
+
                 parse_from_attr(
                     &e.attrs,
                     &build_path(module_path, &e.ident.to_string()),

diff --git a/utoipauto/tests/default_features/lifetimes.rs b/utoipauto/tests/default_features/lifetimes.rs
@@ -0,0 +1,11 @@
+use utoipa::ToSchema;
+
+#[derive(ToSchema)]
+pub struct LifetimeStructSchema<'a> {
+    foo: &'a str,
+}
+
+#[derive(ToSchema)]
+pub enum LifetimeEnumSchema<'a> {
+    Foo(&'a str),
+}
diff --git a/utoipauto/tests/default_features/mod.rs b/utoipauto/tests/default_features/mod.rs
@@ -1,4 +1,5 @@
 pub mod controllers;
 pub mod generics;
+pub mod lifetimes;
 pub mod models;
 pub mod test;
diff --git a/utoipauto/tests/default_features/test.rs b/utoipauto/tests/default_features/test.rs
@@ -131,3 +131,21 @@ pub struct CustomHandlerApiDocs {}
 fn test_custom_handler() {
     assert_eq!(CustomHandlerApiDocs::openapi().paths.paths.len(), 1)
 }
+
+/// Discover schema with lifetimes
+#[utoipauto(paths = "./utoipauto/tests/default_features/lifetimes.rs")]
+#[derive(OpenApi)]
+#[openapi(info(title = "Lifetimes API", version = "1.0.0"))]
+pub struct LifetimesApiDocs {}
+
+#[test]
+fn test_lifetimes() {
+    assert_eq!(
+        LifetimesApiDocs::openapi()
+            .components
+            .expect("no components")
+            .schemas
+            .len(),
+        2
+    )
+}