Merge pull request #94 from dev-five-git/rename-form

Rename form

Author: owjs3901

.changepacks/changepack_log_h04jC8dn9bMOhEM5LmVP4.json

@@ -0,0 +1 @@
+{"changes":{"Cargo.toml":"Patch"},"note":"Implement Multiform","date":"2026-03-06T16:01:53.731789300Z"}

Cargo.lock

@@ -168,13 +168,14 @@ pub struct CreateUserRequest {
 
 #### Typed Multipart (Recommended)
 
-Upload files using `TypedMultipart` from [`axum_typed_multipart`](https://crates.io/crates/axum_typed_multipart):
+Upload files using vespera's built-in `TypedMultipart` extractor:
 
 ```rust
-use axum_typed_multipart::{FieldData, TryFromMultipart, TypedMultipart};
+use vespera::multipart::{FieldData, TypedMultipart};
+use vespera::{Multipart, Schema};
 use tempfile::NamedTempFile;
 
-#[derive(TryFromMultipart, vespera::Schema)]
+#[derive(Multipart, Schema)]
 pub struct CreateUploadRequest {
     pub name: String,
     #[form_data(limit = "10MiB")]
@@ -189,8 +190,6 @@ pub async fn create_upload(
 
 Vespera automatically generates `multipart/form-data` content type in OpenAPI, and maps `FieldData<NamedTempFile>` to `{ "type": "string", "format": "binary" }`.
 
-> **Note:** `axum` must be a direct dependency of your project (not just via vespera) because `TryFromMultipart` internally references `axum::extract::multipart::Multipart`.
-
 #### Raw Multipart (Untyped)
 
 For dynamic multipart handling where the fields aren't known at compile time, use axum's built-in `Multipart` extractor:
@@ -444,23 +443,23 @@ vespera::schema_type!(Schema from Model, name = "MemoSchema");
 
 ### Multipart Mode
 
-Generate `TryFromMultipart` structs from existing types using the `multipart` keyword:
+Generate `Multipart` structs from existing types using the `multipart` keyword:
 
 ```rust
-#[derive(TryFromMultipart, vespera::Schema)]
+#[derive(vespera::Multipart, vespera::Schema)]
 pub struct CreateUploadRequest {
     pub name: String,
     #[form_data(limit = "10MiB")]
     pub file: Option<FieldData<NamedTempFile>>,
     pub description: Option<String>,
 }
 
-// Generates a TryFromMultipart struct (no serde derives), all fields Optional
+// Generates a Multipart struct (no serde derives), all fields Optional
 schema_type!(PatchUploadRequest from CreateUploadRequest, multipart, partial, omit = ["file"]);
 ```
 
 When `multipart` is enabled:
-- Derives `TryFromMultipart` instead of `Serialize`/`Deserialize`
+- Derives `Multipart` instead of `Serialize`/`Deserialize`
 - Suppresses `#[serde(...)]` attributes (multipart parsing is not serde-based)
 - Preserves `#[form_data(...)]` attributes from source struct
 - Skips SeaORM relation fields (nested objects can't be represented in multipart forms)
@@ -479,7 +478,7 @@ When `multipart` is enabled:
 | `name` | Custom OpenAPI schema name: `name = "UserSchema"` |
 | `rename_all` | Serde rename strategy: `rename_all = "camelCase"` |
 | `ignore` | Skip Schema derive (bare keyword, no value) |
-| `multipart` | Derive `TryFromMultipart` instead of serde (bare keyword) |
+| `multipart` | Derive `Multipart` instead of serde (bare keyword) |
 | `omit_default` | Auto-omit fields with DB defaults: `primary_key`, `default_value` (bare keyword) |
 
 ---

README.md

@@ -345,7 +345,7 @@ Json(model.into())  // Easy conversion!
 | `rename` | Rename fields | API naming differs from model |
 | `rename_all` | Serde rename strategy | Different casing needed |
 | `add` | Add new fields | New fields not in model (breaks `From` impl) |
-| `multipart` | Derive `TryFromMultipart` | Multipart form-data endpoints |
+| `multipart` | Derive `Multipart` | Multipart form-data endpoints |
 
 **Avoid (Special Cases Only):**
 
@@ -446,14 +446,15 @@ pub async fn patch_user(
 
 ### Multipart Mode (`multipart`)
 
-Generate `TryFromMultipart` structs from existing multipart request types:
+Generate `Multipart` structs from existing multipart request types:
 
 ```rust
-use axum_typed_multipart::{FieldData, TryFromMultipart, TypedMultipart};
+use vespera::multipart::{FieldData, TypedMultipart};
+use vespera::{Multipart, Schema};
 use tempfile::NamedTempFile;
 
 // Base multipart struct (manually defined)
-#[derive(TryFromMultipart, vespera::Schema)]
+#[derive(Multipart, Schema)]
 pub struct CreateUploadRequest {
     pub name: String,
     #[form_data(limit = "10MiB")]
@@ -464,7 +465,7 @@ pub struct CreateUploadRequest {
 }
 
 // Derive a partial update struct via schema_type!
-// - Derives TryFromMultipart (not serde)
+// - Derives Multipart (not serde)
 // - All fields become Option<T> (partial)
 // - "document" field excluded
 // - #[form_data(limit = "10MiB")] preserved from source
@@ -475,18 +476,17 @@ schema_type!(PatchUploadRequest from CreateUploadRequest, multipart, partial, om
 
 | Aspect | Normal Mode | Multipart Mode |
 |--------|------------|----------------|
-| Derives | `Serialize`, `Deserialize` | `TryFromMultipart` |
+| Derives | `Serialize`, `Deserialize` | `Multipart` |
 | Struct attrs | `#[serde(rename_all=...)]` | None |
 | Field attrs | `#[serde(...)]` preserved | `#[form_data(...)]` preserved |
 | Relation fields | Included (BelongsTo/HasOne) | **Skipped** (can't represent in forms) |
 | `From` impl | Auto-generated | **Not generated** |
 
-**OpenAPI rename alignment:** The schema parser reads `#[form_data(field_name = "...")]` and `#[try_from_multipart(rename_all = "...")]` as fallbacks when serde attrs are absent, ensuring OpenAPI field names match runtime multipart parsing.
+**OpenAPI rename alignment:** The schema parser reads `#[form_data(field_name = "...")]` and `#[serde(rename_all = "...")]` for multipart structs, ensuring OpenAPI field names match runtime multipart parsing.
 
 **Dependencies required in your Cargo.toml:**
 ```toml
-axum = "0.8"                   # Required: TryFromMultipart references axum internals
-axum_typed_multipart = "0.16"  # The multipart crate
+vespera = "0.1"                # Includes multipart support natively
 tempfile = "3"                 # For NamedTempFile file uploads
 ```
 

SKILL.md

@@ -12,10 +12,9 @@ default = ["axum-extra/typed-header", "axum-extra/form", "axum-extra/query", "ax
 [dependencies]
 vespera_core = { workspace = true }
 vespera_macro = { workspace = true }
-axum = "0.8"
+axum = { version = "0.8", features = ["multipart"] }
 axum-extra = { version = "0.12" }
 chrono = { version = "0.4", features = ["serde"] }
-axum_typed_multipart = "0.16"
 tempfile = "3"
 serde_json = "1"
 tower-layer = "0.3"

crates/vespera/Cargo.toml

@@ -20,7 +20,7 @@ pub mod openapi {
 pub use vespera_core::openapi::OpenApi;
 
 // Re-export macros from vespera_macro
-pub use vespera_macro::{Schema, export_app, route, schema, schema_type, vespera};
+pub use vespera_macro::{Multipart, Schema, export_app, route, schema, schema_type, vespera};
 
 // Re-export serde_json for merge feature (runtime spec merging)
 pub use serde_json;
@@ -29,9 +29,8 @@ pub use serde_json;
 // This allows generated types to use chrono::DateTime without users adding chrono dependency
 pub use chrono;
 
-// Re-export axum_typed_multipart for schema_type! multipart mode
-// This allows generated types to use FieldData/TryFromMultipart without users adding the dependency
-pub use axum_typed_multipart;
+// Native multipart form data extraction (replaces axum_typed_multipart)
+pub mod multipart;
 
 // Re-export tempfile for schema_type! multipart mode (NamedTempFile)
 pub use tempfile;