Merge pull request #69 from dev-five-git/refactor-2

Refactor 2

Author: owjs3901

.changepacks/changepack_log_SlPnaNu320dejvkld6zlv.json

@@ -0,0 +1 @@
+{"changes":{"crates/vespera/Cargo.toml":"Patch","crates/vespera_macro/Cargo.toml":"Patch","crates/vespera_core/Cargo.toml":"Patch"},"note":"Support serde flatten","date":"2026-02-05T04:33:01.526326100Z"}

.changepacks/changepack_log_VL8xtXZ0Ty1P8XW4hfaso.json

@@ -0,0 +1 @@
+{"changes":{"crates/vespera_core/Cargo.toml":"Patch","crates/vespera/Cargo.toml":"Patch","crates/vespera_macro/Cargo.toml":"Patch"},"note":"Support serde flatten, tagged, untagged","date":"2026-02-05T12:30:36.574038700Z"}

.claude/settings.local.json

@@ -3,3 +3,7 @@ lcov.info
 coverage
 build_rs_cov.profraw
 .sisyphus/
+/docs
+.claude
+.DS_Store
+coverage-report

.gitignore

@@ -183,6 +183,10 @@ pub struct Schema {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub not: Option<Box<SchemaRef>>,
 
+    /// Discriminator for polymorphic schemas (used with oneOf/anyOf/allOf)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub discriminator: Option<Discriminator>,
+
     /// Nullable flag
     #[serde(skip_serializing_if = "Option::is_none")]
     pub nullable: Option<bool>,
@@ -246,6 +250,7 @@ impl Schema {
             any_of: None,
             one_of: None,
             not: None,
+            discriminator: None,
             nullable: None,
             read_only: None,
             write_only: None,
@@ -305,6 +310,20 @@ pub struct ExternalDocumentation {
     pub url: String,
 }
 
+/// Discriminator object for polymorphism support (OpenAPI 3.0/3.1)
+///
+/// Used with `oneOf`, `anyOf`, `allOf` to aid in serialization, deserialization,
+/// and validation when request bodies or response payloads may be one of several types.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Discriminator {
+    /// The name of the property in the payload that will hold the discriminator value
+    pub property_name: String,
+    /// An object to hold mappings between payload values and schema names or references
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub mapping: Option<BTreeMap<String, String>>,
+}
+
 /// OpenAPI Components (reusable components)
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]

Cargo.lock

@@ -17,7 +17,6 @@ proc-macro2 = "1"
 vespera_core = { workspace = true }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-anyhow = "1.0"
 
 [dev-dependencies]
 rstest = "0.26"

crates/vespera_core/src/schema.rs

@@ -1,3 +1,5 @@
+use crate::http::is_http_method;
+
 pub struct RouteArgs {
     pub method: Option<syn::Ident>,
     pub path: Option<syn::LitStr>,
@@ -22,33 +24,26 @@ impl syn::parse::Parse for RouteArgs {
                 // Try to parse as method identifier (get, post, etc.)
                 let ident: syn::Ident = input.parse()?;
                 let ident_str = ident.to_string().to_lowercase();
-                match ident_str.as_str() {
-                    "get" | "post" | "put" | "patch" | "delete" | "head" | "options" => {
-                        method = Some(ident);
-                    }
-                    "path" => {
-                        input.parse::<syn::Token![=]>()?;
-                        let lit: syn::LitStr = input.parse()?;
-                        path = Some(lit);
-                    }
-                    "error_status" => {
-                        input.parse::<syn::Token![=]>()?;
-                        let array: syn::ExprArray = input.parse()?;
-                        error_status = Some(array);
-                    }
-                    "tags" => {
-                        input.parse::<syn::Token![=]>()?;
-                        let array: syn::ExprArray = input.parse()?;
-                        tags = Some(array);
-                    }
-                    "description" => {
-                        input.parse::<syn::Token![=]>()?;
-                        let lit: syn::LitStr = input.parse()?;
-                        description = Some(lit);
-                    }
-                    _ => {
-                        return Err(lookahead.error());
-                    }
+                if is_http_method(&ident_str) {
+                    method = Some(ident);
+                } else if ident_str == "path" {
+                    input.parse::<syn::Token![=]>()?;
+                    let lit: syn::LitStr = input.parse()?;
+                    path = Some(lit);
+                } else if ident_str == "error_status" {
+                    input.parse::<syn::Token![=]>()?;
+                    let array: syn::ExprArray = input.parse()?;
+                    error_status = Some(array);
+                } else if ident_str == "tags" {
+                    input.parse::<syn::Token![=]>()?;
+                    let array: syn::ExprArray = input.parse()?;
+                    tags = Some(array);
+                } else if ident_str == "description" {
+                    input.parse::<syn::Token![=]>()?;
+                    let lit: syn::LitStr = input.parse()?;
+                    description = Some(lit);
+                } else {
+                    return Err(lookahead.error());
                 }
 
                 // Check if there's a comma
@@ -74,9 +69,10 @@ impl syn::parse::Parse for RouteArgs {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use rstest::rstest;
 
+    use super::*;
+
     #[rstest]
     // Method only
     #[case("get", true, Some("get"), None, None)]