impl "multipart/form-data" support

README.md

@@ -36,7 +36,7 @@ You'll need to add the following to `Cargo.toml`:
 [dependencies]
 +futures = "0.3"
 +progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
-+reqwest = { version = "0.11", features = ["json", "stream"] }
++reqwest = { version = "0.11", features = ["json", "stream", "multipart"] }
 +serde = { version = "1.0", features = ["derive"] }
 ```
 
@@ -123,7 +123,7 @@ You'll need to add the following to `Cargo.toml`:
 [dependencies]
 +futures = "0.3"
 +progenitor-client = { git = "https://github.com/oxidecomputer/progenitor" }
-+reqwest = { version = "0.11", features = ["json", "stream"] }
++reqwest = { version = "0.11", features = ["json", "stream", "multipart"] }
 +serde = { version = "1.0", features = ["derive"] }
 
 [build-dependencies]
@@ -180,7 +180,7 @@ bytes = "1.3.0"
 chrono = { version = "0.4.23", default-features=false, features = ["serde"] }
 futures-core = "0.3.25"
 percent-encoding = "2.2.0"
-reqwest = { version = "0.11.13", default-features=false, features = ["json", "stream"] }
+reqwest = { version = "0.11.13", default-features=false, features = ["json", "stream", "multipart"] }
 serde = { version = "1.0.152", features = ["derive"] }
 serde_urlencoded = "0.7.1"
 

example-build/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 [dependencies]
 chrono = { version = "0.4", features = ["serde"] }
 progenitor-client = { path = "../progenitor-client" }
-reqwest = { version = "0.11.16", features = ["json", "stream"] }
+reqwest = { version = "0.11.16", features = ["json", "stream", "multipart"] }
 base64 = "0.21"
 rand = "0.8"
 serde = { version = "1.0", features = ["derive"] }

example-macro/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 [dependencies]
 chrono = { version = "0.4", features = ["serde"] }
 progenitor = { path = "../progenitor" }
-reqwest = { version = "0.11.16", features = ["json", "stream"] }
+reqwest = { version = "0.11.16", features = ["json", "stream", "multipart"] }
 schemars = { version = "0.8.12", features = ["uuid1"] }
 serde = { version = "1.0", features = ["derive"] }
 uuid = { version = "1.3", features = ["serde", "v4"] }

progenitor-client/Cargo.toml

@@ -10,7 +10,7 @@ description = "An OpenAPI client generator - client support"
 bytes = "1.4.0"
 futures-core = "0.3.27"
 percent-encoding = "2.2"
-reqwest = { version = "0.11.16", default-features = false, features = ["json", "stream"] }
+reqwest = { version = "0.11.16", default-features = false, features = ["json", "stream", "multipart"] }
 serde = "1.0"
 serde_json = "1.0"
 serde_urlencoded = "0.7.1"

progenitor-client/src/progenitor_client.rs

@@ -386,11 +386,23 @@ pub fn encode_path(pc: &str) -> String {
 }
 
 #[doc(hidden)]
-pub trait RequestBuilderExt<E> {
+pub trait RequestBuilderExt<E>
+where
+    Self: Sized,
+{
     fn form_urlencoded<T: Serialize + ?Sized>(
         self,
         body: &T,
     ) -> Result<RequestBuilder, Error<E>>;
+
+    fn form_from_raw<
+        S: AsRef<str>,
+        T: AsRef<[u8]>,
+        I: Sized + IntoIterator<Item = (S, T)>,
+    >(
+        self,
+        iter: I,
+    ) -> Result<Self, Error<E>>;
 }
 
 impl<E> RequestBuilderExt<E> for RequestBuilder {
@@ -405,8 +417,37 @@ impl<E> RequestBuilderExt<E> for RequestBuilder {
                     "application/x-www-form-urlencoded",
                 ),
             )
-            .body(serde_urlencoded::to_string(body).map_err(|_| {
-                Error::InvalidRequest("failed to serialize body".to_string())
+            .body(serde_urlencoded::to_string(body).map_err(|e| {
+                Error::InvalidRequest(format!(
+                    "failed to serialize body: {e:?}"
+                ))
             })?))
     }
+
+    fn form_from_raw<
+        S: AsRef<str>,
+        T: AsRef<[u8]>,
+        I: Sized + IntoIterator<Item = (S, T)>,
+    >(
+        self,
+        mut iter: I,
+    ) -> Result<Self, Error<E>> {
+        use reqwest::multipart::{Form, Part};
+
+        let mut form = Form::new();
+        for (name, value) in iter {
+            form = form.part(
+                name.as_ref().to_owned(),
+                Part::stream(Vec::from(value.as_ref())),
+            );
+        }
+        Ok(self
+            .header(
+                reqwest::header::CONTENT_TYPE,
+                reqwest::header::HeaderValue::from_static(
+                    "multipart/form-data",
+                ),
+            )
+            .multipart(form))
+    }
 }

progenitor-impl/Cargo.toml

@@ -11,6 +11,7 @@ readme = "../README.md"
 heck = "0.4.1"
 getopts = "0.2"
 indexmap = "1.9"
+itertools = "0.10"
 openapiv3 = "1.0.0"
 proc-macro2 = "1.0"
 quote = "1.0"

progenitor-impl/src/lib.rs

@@ -7,6 +7,7 @@ use proc_macro2::TokenStream;
 use quote::quote;
 use serde::Deserialize;
 use thiserror::Error;
+use typify::{TypeDetails, TypeId};
 use typify::{TypeSpace, TypeSpaceSettings};
 
 use crate::to_schema::ToSchema;
@@ -40,6 +41,7 @@ pub type Result<T> = std::result::Result<T, Error>;
 
 pub struct Generator {
     type_space: TypeSpace,
+    forms: HashSet<TypeId>,
     settings: GenerationSettings,
     uses_futures: bool,
     uses_websockets: bool,
@@ -163,6 +165,7 @@ impl Default for Generator {
             type_space: TypeSpace::new(
                 TypeSpaceSettings::default().with_type_mod("types"),
             ),
+            forms: Default::default(),
             settings: Default::default(),
             uses_futures: Default::default(),
             uses_websockets: Default::default(),
@@ -204,6 +207,7 @@ impl Generator {
         Self {
             type_space: TypeSpace::new(&type_settings),
             settings: settings.clone(),
+            forms: Default::default(),
             uses_futures: false,
             uses_websockets: false,
         }
@@ -262,6 +266,43 @@ impl Generator {
 
         let types = self.type_space.to_stream();
 
+        let extra_impl = TokenStream::from_iter(
+            self.forms
+                .iter()
+                .map(|type_id| {
+                    let typ = self.get_type_space().get_type(type_id).unwrap();
+                    let form_name = typ.name();
+                    let td = typ.details();
+                    let TypeDetails::Struct(tstru) = td else { unreachable!() };
+                    let properties = indexmap::IndexMap::<&'_ str, _>::from_iter(
+                        tstru
+                            .properties()
+                            .filter_map(|(prop_name, prop_id)| {
+                                self.get_type_space()
+                                    .get_type(&prop_id).ok()
+                                    .map(|prop_typ| (prop_name, prop_typ))
+                            })
+                        );
+                    let properties = syn::punctuated::Punctuated::<_, syn::Token![,]>::from_iter(
+                        properties
+                            .into_iter()
+                            .map(|(prop_name, prop_ty)| {
+                                let ident = quote::format_ident!("{}", prop_name);
+                                quote!{ (#prop_name, &self. #ident) }
+                            }));
+
+                    let form_name = quote::format_ident!("{}",typ.name());
+
+                    quote! {
+                        impl #form_name {
+                            pub fn as_form<'f>(&'f self) -> impl std::iter::Iterator<Item=(&'static str, &'f [u8])> {
+                                [#properties]
+                                    .into_iter()
+                                    .filter_map(|(name, val)| val.as_ref().map(|val| (name, val.as_slice())))
+                            }
+                        }
+                    }
+                }));
         // Generate an implementation of a `Self::as_inner` method, if an inner
         // type is defined.
         let maybe_inner = self.settings.inner_type.as_ref().map(|inner| {
@@ -290,20 +331,20 @@ impl Generator {
         });
 
         let client_docstring = {
-            let mut s = format!("Client for {}", spec.info.title);
+            let mut doc = format!("Client for {}", spec.info.title);
 
-            if let Some(ss) = &spec.info.description {
-                s.push_str("\n\n");
-                s.push_str(ss);
+            if let Some(desc) = &spec.info.description {
+                doc.push_str("\n\n");
+                doc.push_str(desc);
             }
-            if let Some(ss) = &spec.info.terms_of_service {
-                s.push_str("\n\n");
-                s.push_str(ss);
+            if let Some(tos) = &spec.info.terms_of_service {
+                doc.push_str("\n\n");
+                doc.push_str(tos);
             }
 
-            s.push_str(&format!("\n\nVersion: {}", &spec.info.version));
+            doc.push_str(&format!("\n\nVersion: {}", &spec.info.version));
 
-            s
+            doc
         };
 
         let version_str = &spec.info.version;
@@ -325,6 +366,8 @@ impl Generator {
                 use std::convert::TryFrom;
 
                 #types
+
+                #extra_impl
             }
 
             #[derive(Clone, Debug)]