Skip to content

fix: optional request bodies across generated clients #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamcavendish merged 1 commit into from
Jun 15, 2026
Merged

fix: optional request bodies across generated clients #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 46 additions & 21 deletions src/generators/rust/aioduct/sigil_emit_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,13 @@ pub fn emit_method_body(plan: &OpPlan<'_>) -> CodeBlock {
&& matches!(&body.encoding, BodyEncoding::Multipart)
&& !body.multipart_supported
{
if body.required {
b.add_code(unsupported_multipart_body(&body.var_name));
return b.build().unwrap();
}
b.begin_control_flow(&format!("if {}.is_some()", body.var_name), ());
b.add_code(unsupported_multipart_body(&body.var_name));
return b.build().unwrap();
b.end_control_flow();
}

// Build path
Expand Down Expand Up @@ -130,27 +135,18 @@ pub fn emit_method_body(plan: &OpPlan<'_>) -> CodeBlock {

// Body
if let Some(body) = body {
match &body.encoding {
BodyEncoding::Json => {
b.add_code(json_body(&body.var_name));
}
BodyEncoding::FormUrlEncoded => {
b.add_code(form_body(&body.var_name));
}
BodyEncoding::Xml => {
b.add_code(xml_body(&body.var_name, &body.media_type));
}
BodyEncoding::TextPlain => {
b.add_code(text_body(&body.var_name, &body.media_type));
}
BodyEncoding::OctetStream => {
b.add_code(octet_stream_body(&body.var_name, &body.media_type));
}
BodyEncoding::Multipart => {
emit_multipart_body(&mut b, &body.var_name, &body.multipart_parts);
let can_emit_body =
!matches!(&body.encoding, BodyEncoding::Multipart) || body.multipart_supported;
if can_emit_body {
if !body.required {
b.begin_control_flow(
&format!("if let Some({}) = {}", body.var_name, body.var_name),
(),
);
}
BodyEncoding::Other(media_type) => {
b.add_code(unsupported_media_type_body(media_type));
emit_body(&mut b, body);
if !body.required {
b.end_control_flow();
}
}
}
Expand All @@ -174,6 +170,35 @@ pub fn emit_method_body(plan: &OpPlan<'_>) -> CodeBlock {
b.build().unwrap()
}

fn emit_body(
b: &mut sigil_stitch::code_block::CodeBlockBuilder,
body: &crate::generators::rust::common::emit_api::BodyBinding,
) {
match &body.encoding {
BodyEncoding::Json => {
b.add_code(json_body(&body.var_name));
}
BodyEncoding::FormUrlEncoded => {
b.add_code(form_body(&body.var_name));
}
BodyEncoding::Xml => {
b.add_code(xml_body(&body.var_name, &body.media_type));
}
BodyEncoding::TextPlain => {
b.add_code(text_body(&body.var_name, &body.media_type));
}
BodyEncoding::OctetStream => {
b.add_code(octet_stream_body(&body.var_name, &body.media_type));
}
BodyEncoding::Multipart => {
emit_multipart_body(b, &body.var_name, &body.multipart_parts);
}
BodyEncoding::Other(media_type) => {
b.add_code(unsupported_media_type_body(media_type));
}
}
}

fn unsupported_multipart_body(body_var: &str) -> CodeBlock {
sigil_quote!(RustLang {
let _ = self.client;
Expand Down
9 changes: 8 additions & 1 deletion src/generators/rust/common/emit_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ pub struct BodyBinding {
pub var_name: String,
pub rust_type: String,
pub media_type: String,
pub required: bool,
pub encoding: BodyEncoding,
pub multipart_supported: bool,
pub multipart_parts: Vec<MultipartPart>,
Expand Down Expand Up @@ -331,6 +332,7 @@ pub fn plan_body(
var_name,
rust_type,
media_type,
required: b.required,
encoding,
multipart_supported,
multipart_parts,
Expand Down Expand Up @@ -447,7 +449,12 @@ fn emit_operation(
params.push(format!("{}: {ty}", p.var_name));
}
if let Some(body) = &plan.body {
params.push(format!("{}: &{}", body.var_name, body.rust_type));
let ty = if body.required {
format!("&{}", body.rust_type)
} else {
format!("Option<&{}>", body.rust_type)
};
params.push(format!("{}: {ty}", body.var_name));
}

let async_kw = if config.is_async { "async " } else { "" };
Expand Down
67 changes: 46 additions & 21 deletions src/generators/rust/reqwest/sigil_emit_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,13 @@ pub fn emit_method_body(plan: &OpPlan<'_>) -> CodeBlock {
&& matches!(&body.encoding, BodyEncoding::Multipart)
&& !body.multipart_supported
{
if body.required {
b.add_code(unsupported_multipart_body(&body.var_name));
return b.build().unwrap();
}
b.begin_control_flow(&format!("if {}.is_some()", body.var_name), ());
b.add_code(unsupported_multipart_body(&body.var_name));
return b.build().unwrap();
b.end_control_flow();
}

// Build path
Expand Down Expand Up @@ -127,27 +132,18 @@ pub fn emit_method_body(plan: &OpPlan<'_>) -> CodeBlock {

// Body
if let Some(body) = body {
match &body.encoding {
BodyEncoding::Json => {
b.add_code(json_body(&body.var_name));
}
BodyEncoding::FormUrlEncoded => {
b.add_code(form_body(&body.var_name));
}
BodyEncoding::Xml => {
b.add_code(xml_body(&body.var_name, &body.media_type));
}
BodyEncoding::TextPlain => {
b.add_code(text_body(&body.var_name, &body.media_type));
}
BodyEncoding::OctetStream => {
b.add_code(octet_stream_body(&body.var_name, &body.media_type));
}
BodyEncoding::Multipart => {
emit_multipart_body(&mut b, &body.var_name, &body.multipart_parts);
let can_emit_body =
!matches!(&body.encoding, BodyEncoding::Multipart) || body.multipart_supported;
if can_emit_body {
if !body.required {
b.begin_control_flow(
&format!("if let Some({}) = {}", body.var_name, body.var_name),
(),
);
}
BodyEncoding::Other(media_type) => {
b.add_code(unsupported_media_type_body(media_type));
emit_body(&mut b, body);
if !body.required {
b.end_control_flow();
}
}
}
Expand All @@ -174,6 +170,35 @@ pub fn emit_method_body(plan: &OpPlan<'_>) -> CodeBlock {
b.build().unwrap()
}

fn emit_body(
b: &mut sigil_stitch::code_block::CodeBlockBuilder,
body: &crate::generators::rust::common::emit_api::BodyBinding,
) {
match &body.encoding {
BodyEncoding::Json => {
b.add_code(json_body(&body.var_name));
}
BodyEncoding::FormUrlEncoded => {
b.add_code(form_body(&body.var_name));
}
BodyEncoding::Xml => {
b.add_code(xml_body(&body.var_name, &body.media_type));
}
BodyEncoding::TextPlain => {
b.add_code(text_body(&body.var_name, &body.media_type));
}
BodyEncoding::OctetStream => {
b.add_code(octet_stream_body(&body.var_name, &body.media_type));
}
BodyEncoding::Multipart => {
emit_multipart_body(b, &body.var_name, &body.multipart_parts);
}
BodyEncoding::Other(media_type) => {
b.add_code(unsupported_media_type_body(media_type));
}
}
}

fn unsupported_multipart_body(body_var: &str) -> CodeBlock {
sigil_quote!(RustLang {
let _ = self.client;
Expand Down
108 changes: 72 additions & 36 deletions src/generators/rust/ureq/sigil_emit_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,13 @@ pub fn emit_method_body(plan: &OpPlan<'_>) -> CodeBlock {
&& matches!(&body.encoding, BodyEncoding::Multipart)
&& !body.multipart_supported
{
if body.required {
b.add_code(unsupported_multipart_body(&body.var_name));
return b.build().unwrap();
}
b.begin_control_flow(&format!("if {}.is_some()", body.var_name), ());
b.add_code(unsupported_multipart_body(&body.var_name));
return b.build().unwrap();
b.end_control_flow();
}

// Build path
Expand Down Expand Up @@ -143,30 +148,25 @@ pub fn emit_method_body(plan: &OpPlan<'_>) -> CodeBlock {
// Send
if is_body_method {
if let Some(body) = body {
match &body.encoding {
BodyEncoding::Json => {
b.add_code(json_send(&body.var_name));
}
BodyEncoding::FormUrlEncoded => {
emit_form_body(&mut b, &body.var_name);
b.add_code(form_send());
}
BodyEncoding::Xml => {
b.add_code(xml_send(&body.var_name, &body.media_type));
}
BodyEncoding::TextPlain => {
b.add_code(text_send(&body.var_name, &body.media_type));
}
BodyEncoding::OctetStream => {
b.add_code(octet_stream_send(&body.var_name, &body.media_type));
}
BodyEncoding::Multipart => {
emit_multipart_body(&mut b, &body.var_name, &body.multipart_parts);
b.add_code(multipart_send());
}
BodyEncoding::Other(media_type) => {
b.add_code(unsupported_media_type_body(media_type));
let can_emit_body =
!matches!(&body.encoding, BodyEncoding::Multipart) || body.multipart_supported;
if can_emit_body {
if body.required {
emit_body_send(&mut b, body, "let resp =");
} else {
b.add("let resp;\n", ());
b.begin_control_flow(
&format!("if let Some({}) = {}", body.var_name, body.var_name),
(),
);
emit_body_send(&mut b, body, "resp =");
b.end_control_flow();
b.begin_control_flow("else", ());
b.add("resp = req.send_empty()?;\n", ());
b.end_control_flow();
}
} else {
b.add("let resp = req.send_empty()?;\n", ());
}
} else {
b.add("let resp = req.send_empty()?;\n", ());
Expand All @@ -191,6 +191,42 @@ pub fn emit_method_body(plan: &OpPlan<'_>) -> CodeBlock {
b.build().unwrap()
}

fn emit_body_send(
b: &mut sigil_stitch::code_block::CodeBlockBuilder,
body: &crate::generators::rust::common::emit_api::BodyBinding,
resp_prefix: &str,
) {
match &body.encoding {
BodyEncoding::Json => {
b.add_code(json_send(&body.var_name, resp_prefix));
}
BodyEncoding::FormUrlEncoded => {
emit_form_body(b, &body.var_name);
b.add_code(form_send(resp_prefix));
}
BodyEncoding::Xml => {
b.add_code(xml_send(&body.var_name, &body.media_type, resp_prefix));
}
BodyEncoding::TextPlain => {
b.add_code(text_send(&body.var_name, &body.media_type, resp_prefix));
}
BodyEncoding::OctetStream => {
b.add_code(octet_stream_send(
&body.var_name,
&body.media_type,
resp_prefix,
));
}
BodyEncoding::Multipart => {
emit_multipart_body(b, &body.var_name, &body.multipart_parts);
b.add_code(multipart_send(resp_prefix));
}
BodyEncoding::Other(media_type) => {
b.add_code(unsupported_media_type_body(media_type));
}
}
}

fn unsupported_multipart_body(body_var: &str) -> CodeBlock {
sigil_quote!(RustLang {
let _ = self.client;
Expand All @@ -208,49 +244,49 @@ fn unsupported_media_type_body(media_type: &str) -> CodeBlock {
.expect("unsupported media type body builds")
}

fn json_send(body_var: &str) -> CodeBlock {
fn json_send(body_var: &str, resp_prefix: &str) -> CodeBlock {
sigil_quote!(RustLang {
let resp = req.send_json(&$L(body_var))?;
$L(resp_prefix) req.send_json(&$L(body_var))?;
})
.expect("json send builds")
}

fn form_send() -> CodeBlock {
fn form_send(resp_prefix: &str) -> CodeBlock {
let pairs_iter = "form_pairs.iter().map(|(key, value)| (key.as_str(), value.as_str()))";
sigil_quote!(RustLang {
let resp = req.send_form($L(pairs_iter))?;
$L(resp_prefix) req.send_form($L(pairs_iter))?;
})
.expect("form send builds")
}

fn xml_send(body_var: &str, media_type: &str) -> CodeBlock {
fn xml_send(body_var: &str, media_type: &str, resp_prefix: &str) -> CodeBlock {
sigil_quote!(RustLang {
let body_xml = serde_xml_rs::to_string($L(body_var))?;
req = req.header("Content-Type", $L(rust_string_literal(media_type)));
let resp = req.send(body_xml)?;
$L(resp_prefix) req.send(body_xml)?;
})
.expect("xml send builds")
}

fn text_send(body_var: &str, media_type: &str) -> CodeBlock {
fn text_send(body_var: &str, media_type: &str, resp_prefix: &str) -> CodeBlock {
sigil_quote!(RustLang {
req = req.header("Content-Type", $L(rust_string_literal(media_type)));
let resp = req.send($L(body_var).as_str())?;
$L(resp_prefix) req.send($L(body_var).as_str())?;
})
.expect("text send builds")
}

fn octet_stream_send(body_var: &str, media_type: &str) -> CodeBlock {
fn octet_stream_send(body_var: &str, media_type: &str, resp_prefix: &str) -> CodeBlock {
sigil_quote!(RustLang {
req = req.header("Content-Type", $L(rust_string_literal(media_type)));
let resp = req.send($L(body_var).clone())?;
$L(resp_prefix) req.send($L(body_var).clone())?;
})
.expect("octet-stream send builds")
}

fn multipart_send() -> CodeBlock {
fn multipart_send(resp_prefix: &str) -> CodeBlock {
sigil_quote!(RustLang {
let resp = req.send(multipart_body)?;
$L(resp_prefix) req.send(multipart_body)?;
})
.expect("multipart send builds")
}
Expand Down
Loading
Loading