Improve OpenAPI 3.2.0 compliance

Author: SamuelMarks

core/Cargo.toml

@@ -21,3 +21,6 @@ serde_yaml = "^0.9"
 
 # OpenAPI definition types
 utoipa = { version = "^5.4", features = ["preserve_order", "indexmap", "uuid"] }
+
+# Strict RFC 3986 URI resolution
+url = "2.5"

core/src/codegen.rs

@@ -8,6 +8,7 @@
 //! into valid, compilable Rust code. It handles:
 //! - Dependency analysis (auto-injecting imports like `Uuid`, `chrono`, `serde`).
 //! - Attribute injection (`derive`, `serde` options, `deprecated`).
+//! - Formats `discriminator` mappings into Serde attributes (`tag`, `rename`, `alias`).
 //! - Formatting and comments preservation including external docs links.
 
 use crate::error::{AppError, AppResult};
@@ -203,6 +204,15 @@ fn generate_enum_body(en: &ParsedEnum) -> String {
         "",
     ));
 
+    if let Some(mapping) = &en.discriminator_mapping {
+        if !mapping.is_empty() {
+            code.push_str("///\n/// **Discriminator Mapping:**\n");
+            for (key, val) in mapping {
+                code.push_str(&format!("/// * `{}` -> `{}`\n", key, val));
+            }
+        }
+    }
+
     if en.is_deprecated {
         code.push_str("#[deprecated]\n");
     }
@@ -293,6 +303,7 @@ fn collect_imports(model: &ParsedModel, imports: &mut BTreeSet<String>) {
 mod tests {
     use super::*;
     use crate::parser::{ParsedExternalDocs, ParsedField, ParsedVariant};
+    use std::collections::BTreeMap;
 
     fn field(name: &str, ty: &str) -> ParsedField {
         ParsedField {
@@ -358,7 +369,7 @@ mod tests {
     }
 
     #[test]
-    fn test_generate_enum_tagged() {
+    fn test_generate_enum_tagged_with_alias() {
         let en = ParsedEnum {
             name: "Pet".into(),
             description: Some("Polymorphic pet".into()),
@@ -367,24 +378,15 @@ mod tests {
             untagged: false,
             is_deprecated: false,
             external_docs: None,
-            variants: vec![
-                ParsedVariant {
-                    name: "Cat".into(),
-                    ty: Some("CatInfo".into()),
-                    description: None,
-                    rename: Some("cat".into()),
-                    aliases: Some(vec!["kitty".into()]),
-                    is_deprecated: false,
-                },
-                ParsedVariant {
-                    name: "Dog".into(),
-                    ty: Some("DogInfo".into()),
-                    description: None,
-                    rename: Some("dog".into()),
-                    aliases: None,
-                    is_deprecated: false,
-                },
-            ],
+            variants: vec![ParsedVariant {
+                name: "Cat".into(),
+                ty: Some("CatInfo".into()),
+                description: None,
+                rename: Some("cat".into()),
+                aliases: Some(vec!["kitty".into()]),
+                is_deprecated: false,
+            }],
+            discriminator_mapping: None,
         };
 
         let code = generate_dtos(&[ParsedModel::Enum(en)]);
@@ -395,6 +397,31 @@ mod tests {
         assert!(code.contains("    Cat(CatInfo),"));
     }
 
+    #[test]
+    fn test_generate_enum_with_mapping_comments() {
+        let mut mapping = BTreeMap::new();
+        mapping.insert(
+            "mapped_val".to_string(),
+            "#/components/schemas/Mapped".to_string(),
+        );
+
+        let en = ParsedEnum {
+            name: "MappedEnum".into(),
+            description: None,
+            rename: None,
+            tag: Some("kind".into()),
+            untagged: false,
+            is_deprecated: false,
+            external_docs: None,
+            variants: vec![],
+            discriminator_mapping: Some(mapping),
+        };
+
+        let code = generate_dtos(&[ParsedModel::Enum(en)]);
+        assert!(code.contains("/// **Discriminator Mapping:**"));
+        assert!(code.contains("/// * `mapped_val` -> `#/components/schemas/Mapped`"));
+    }
+
     #[test]
     fn test_generate_enum_primitive_variants() {
         // Test untagged enum with primitives: [String, i32]
@@ -424,6 +451,7 @@ mod tests {
                     is_deprecated: false,
                 },
             ],
+            discriminator_mapping: None,
         };
 
         let code = generate_dtos(&[ParsedModel::Enum(en)]);

core/src/contract_test_generator.rs

@@ -45,7 +45,15 @@ fn generate_test_fn(
 ) -> String {
     let fn_name = format!("test_{}", route.handler_name);
 
-    let mut uri = route.path.clone();
+    // Prepend base_path if it exists.
+    // This allows tests to hit scopes like `/api/v1/users` even if the route definition is just `/users`.
+    let full_path_template = if let Some(base) = &route.base_path {
+        format!("{}{}", base, route.path)
+    } else {
+        route.path.clone()
+    };
+
+    let mut uri = full_path_template.clone();
 
     for param in &route.params {
         if param.source == ParamSource::Path {
@@ -130,6 +138,7 @@ mod tests {
     fn test_generate_contract_test_structure() {
         let routes = vec![ParsedRoute {
             path: "/users/{id}".into(),
+            base_path: None,
             method: "GET".into(),
             handler_name: "get_user".into(),
             params: vec![crate::oas::RouteParam {
@@ -170,6 +179,7 @@ mod tests {
     fn test_generate_with_query_params() {
         let routes = vec![ParsedRoute {
             path: "/search".into(),
+            base_path: None,
             method: "GET".into(),
             handler_name: "search_items".into(),
             params: vec![
@@ -210,6 +220,7 @@ mod tests {
     fn test_generate_with_body() {
         let routes = vec![ParsedRoute {
             path: "/create".into(),
+            base_path: None,
             method: "POST".into(),
             handler_name: "create_item".into(),
             params: vec![],
@@ -232,4 +243,31 @@ mod tests {
         let code = generate_contract_tests_file(&routes, "doc.yaml", "init", &strategy).unwrap();
         assert!(code.contains(".set_json(serde_json::json!"));
     }
+
+    #[test]
+    fn test_generate_with_base_path() {
+        let routes = vec![ParsedRoute {
+            path: "/ping".into(),
+            base_path: Some("/api/v1".into()),
+            method: "GET".into(),
+            handler_name: "ping".into(),
+            params: vec![],
+            request_body: None,
+            security: vec![],
+            response_type: None,
+            response_headers: vec![],
+            response_links: None,
+            kind: RouteKind::Path,
+            callbacks: vec![],
+            deprecated: false,
+            external_docs: None,
+        }];
+
+        let strategy = ActixStrategy;
+        let code = generate_contract_tests_file(&routes, "doc.yaml", "init", &strategy).unwrap();
+        // Expect URI to include base path
+        assert!(code.contains(".uri(\"/api/v1/ping\")"));
+        // Expect validation logic to use original template
+        assert!(code.contains("validate_response(resp, \"GET\", \"/ping\").await;"));
+    }
 }

core/src/handler_generator/builder.rs

@@ -48,6 +48,7 @@ mod tests {
     fn test_scaffold_new_file() {
         let route = ParsedRoute {
             path: "/users".into(),
+            base_path: None,
             method: "GET".into(),
             handler_name: "get_users".into(),
             params: vec![],
@@ -76,6 +77,7 @@ mod tests {
 
         let route = ParsedRoute {
             path: "/new".into(),
+            base_path: None,
             method: "POST".into(),
             handler_name: "new_func".into(),
             params: vec![],

core/src/handler_generator/extractors.rs

@@ -79,7 +79,8 @@ pub(crate) fn generate_function(
         let extractor = match def.format {
             BodyFormat::Json => strategy.body_extractor(&def.ty),
             BodyFormat::Form => strategy.form_extractor(&def.ty),
-            BodyFormat::Multipart => strategy.multipart_extractor(),
+            // Pass the type to the multipart extractor
+            BodyFormat::Multipart => strategy.multipart_extractor(&def.ty),
         };
         args.push(format!("body: {}", extractor));
     }
@@ -112,6 +113,7 @@ mod tests {
     fn test_single_path_param() {
         let route = ParsedRoute {
             path: "/users/{id}".into(),
+            base_path: None,
             method: "GET".into(),
             handler_name: "get_user".into(),
             params: vec![RouteParam {
@@ -142,6 +144,7 @@ mod tests {
     fn test_query_and_body() {
         let route = ParsedRoute {
             path: "/search".into(),
+            base_path: None,
             method: "POST".into(),
             handler_name: "search".into(),
             params: vec![RouteParam {
@@ -173,10 +176,39 @@ mod tests {
         assert!(code.contains("body: web::Json<SearchFilter>"));
     }
 
+    #[test]
+    fn test_multipart_extractor_generates_typed() {
+        let route = ParsedRoute {
+            path: "/upload".into(),
+            base_path: None,
+            method: "POST".into(),
+            handler_name: "upload_file".into(),
+            params: vec![],
+            request_body: Some(RequestBodyDefinition {
+                ty: "UploadForm".into(),
+                format: BodyFormat::Multipart,
+                encoding: None,
+            }),
+            security: vec![],
+            response_type: None,
+            response_headers: vec![],
+            response_links: None,
+            kind: RouteKind::Path,
+            callbacks: vec![],
+            deprecated: false,
+            external_docs: None,
+        };
+
+        let strategy = ActixStrategy;
+        let code = update_handler_module("", &[route], &strategy).unwrap();
+        assert!(code.contains("body: actix_multipart::form::MultipartForm<UploadForm>"));
+    }
+
     #[test]
     fn test_oas_3_2_querystring_extractor() {
         let route = ParsedRoute {
             path: "/raw".into(),
+            base_path: None,
             method: "GET".into(),
             handler_name: "raw_search".into(),
             params: vec![RouteParam {
@@ -207,13 +239,15 @@ mod tests {
     fn test_security_stub_gen() {
         let route = ParsedRoute {
             path: "/api".into(),
+            base_path: None,
             method: "POST".into(),
             handler_name: "secure_ops".into(),
             params: vec![],
             request_body: None,
             security: vec![SecurityRequirement {
                 scheme_name: "ApiKey".into(),
                 scopes: vec![],
+                scheme: None, // Simplified for this test file context
             }],
             response_type: None,
             response_headers: vec![],
@@ -233,6 +267,7 @@ mod tests {
     fn test_extractor_passes_headers_info() {
         let route = ParsedRoute {
             path: "/headers".into(),
+            base_path: None,
             method: "GET".into(),
             handler_name: "get_headers".into(),
             params: vec![],