Skip to content

refactor: migrate generator emitters to sigil_quote #124

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 2 commits into from
Jun 17, 2026
Merged

refactor: migrate generator emitters to sigil_quote #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f20ec73
refactor: quote OkHttp request body emitters
adamcavendish Jun 16, 2026
e52fb44
refactor: migrate generator emitters to sigil_quote
adamcavendish Jun 17, 2026
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
622 changes: 425 additions & 197 deletions src/generators/go/http/sigil_emit_api.rs
View file
Open in desktop

Large diffs are not rendered by default.

330 changes: 190 additions & 140 deletions src/generators/java/okhttp/sigil_emit_api.rs
View file
Open in desktop

Large diffs are not rendered by default.

362 changes: 202 additions & 160 deletions src/generators/kotlin/okhttp/sigil_emit_api.rs
View file
Open in desktop

Large diffs are not rendered by default.

62 changes: 31 additions & 31 deletions src/generators/python/httpx/emit_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,37 +391,37 @@ fn emit_required_multipart_part(
access: &str,
ir: &IrSpec,
) {
if part.is_binary {
cb.add_statement(
&format!(
"files[\"{}\"] = ({}.filename_or_default(\"{}\"), {}.data, \"{}\")",
part.wire_name, access, part.wire_name, access, part.content_type
),
(),
);
} else if part.value_encoding == MultipartValueEncoding::Json {
let json_value = render_multipart_json_value(access, &part.type_expr, ir);
cb.add_statement(
&format!(
"files[\"{}\"] = (None, json.dumps({json_value}), \"{}\")",
part.wire_name, part.content_type
),
(),
);
} else if part.value_encoding == MultipartValueEncoding::Unsupported {
cb.add_statement(
"raise ValueError(\"unsupported multipart part content type\")",
(),
);
} else {
cb.add_statement(
&format!(
"files[\"{}\"] = (None, str({access}), \"{}\")",
part.wire_name, part.content_type
),
(),
);
}
cb.add_code(multipart_part_assignment(part, access, ir));
}

fn multipart_part_assignment(part: &MultipartPart, access: &str, ir: &IrSpec) -> CodeBlock {
let binary_stmt = format!(
"files[\"{}\"] = ({}.filename_or_default(\"{}\"), {}.data, \"{}\")",
part.wire_name, access, part.wire_name, access, part.content_type
);
let json_value = render_multipart_json_value(access, &part.type_expr, ir);
let json_stmt = format!(
"files[\"{}\"] = (None, json.dumps({json_value}), \"{}\")",
part.wire_name, part.content_type
);
let unsupported_stmt = "raise ValueError(\"unsupported multipart part content type\")";
let scalar_stmt = format!(
"files[\"{}\"] = (None, str({access}), \"{}\")",
part.wire_name, part.content_type
);

sigil_quote!(Python {
$if(part.is_binary) {
$L(binary_stmt.as_str())
} $else_if(part.value_encoding == MultipartValueEncoding::Json) {
$L(json_stmt.as_str())
} $else_if(part.value_encoding == MultipartValueEncoding::Unsupported) {
$L(unsupported_stmt)
} $else {
$L(scalar_stmt.as_str())
}
})
.expect("multipart part assignment builds")
}

fn render_multipart_json_value(access: &str, expr: &IrTypeExpr, ir: &IrSpec) -> String {
Expand Down
62 changes: 31 additions & 31 deletions src/generators/python/requests/emit_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,37 +390,37 @@ fn emit_required_multipart_part(
access: &str,
ir: &IrSpec,
) {
if part.is_binary {
cb.add_statement(
&format!(
"files[\"{}\"] = ({}.filename_or_default(\"{}\"), {}.data, \"{}\")",
part.wire_name, access, part.wire_name, access, part.content_type
),
(),
);
} else if part.value_encoding == MultipartValueEncoding::Json {
let json_value = render_multipart_json_value(access, &part.type_expr, ir);
cb.add_statement(
&format!(
"files[\"{}\"] = (None, json.dumps({json_value}), \"{}\")",
part.wire_name, part.content_type
),
(),
);
} else if part.value_encoding == MultipartValueEncoding::Unsupported {
cb.add_statement(
"raise ValueError(\"unsupported multipart part content type\")",
(),
);
} else {
cb.add_statement(
&format!(
"files[\"{}\"] = (None, str({access}), \"{}\")",
part.wire_name, part.content_type
),
(),
);
}
cb.add_code(multipart_part_assignment(part, access, ir));
}

fn multipart_part_assignment(part: &MultipartPart, access: &str, ir: &IrSpec) -> CodeBlock {
let binary_stmt = format!(
"files[\"{}\"] = ({}.filename_or_default(\"{}\"), {}.data, \"{}\")",
part.wire_name, access, part.wire_name, access, part.content_type
);
let json_value = render_multipart_json_value(access, &part.type_expr, ir);
let json_stmt = format!(
"files[\"{}\"] = (None, json.dumps({json_value}), \"{}\")",
part.wire_name, part.content_type
);
let unsupported_stmt = "raise ValueError(\"unsupported multipart part content type\")";
let scalar_stmt = format!(
"files[\"{}\"] = (None, str({access}), \"{}\")",
part.wire_name, part.content_type
);

sigil_quote!(Python {
$if(part.is_binary) {
$L(binary_stmt.as_str())
} $else_if(part.value_encoding == MultipartValueEncoding::Json) {
$L(json_stmt.as_str())
} $else_if(part.value_encoding == MultipartValueEncoding::Unsupported) {
$L(unsupported_stmt)
} $else {
$L(scalar_stmt.as_str())
}
})
.expect("multipart part assignment builds")
}

fn render_multipart_json_value(access: &str, expr: &IrTypeExpr, ir: &IrSpec) -> String {
Expand Down
Loading
Loading