Skip to content

Fix: Preserve trailing underscores in GraphQL field names #551

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Preserve trailing underscores in GraphQL field names #551

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
2 changes: 1 addition & 1 deletion graphql_client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ categories = ["network-programming", "web-programming", "wasm"]
edition = "2018"
homepage = "https://github.com/graphql-rust/graphql-client"
readme = "../README.md"
rust-version.workspace = true
rust-version = "1.64.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should keep a single version for the workspace. You can change the workspace version if it needs to adjusted.


[package.metadata.docs.rs]
features = ["reqwest"]
Expand Down
14 changes: 13 additions & 1 deletion graphql_client_codegen/src/codegen/inputs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,18 @@ use heck::{ToSnakeCase, ToUpperCamelCase};
use proc_macro2::{Ident, Span, TokenStream};
use quote::{quote, ToTokens};

fn to_snake_case_preserve_trailing_underscores(s: &str) -> String {
let trailing_underscores = s.chars().rev().take_while(|&c| c == '_').count();
if trailing_underscores == 0 {
s.to_snake_case()
} else {
let without_trailing = &s[..s.len() - trailing_underscores];
let suffix = "_".repeat(trailing_underscores);
format!("{}{}", without_trailing.to_snake_case(), suffix)
}
}


pub(super) fn generate_input_object_definitions(
all_used_types: &UsedTypes,
options: &GraphQLClientCodegenOptions,
Expand Down Expand Up @@ -61,7 +73,7 @@ fn generate_struct(
let struct_name = Ident::new(safe_name.as_ref(), Span::call_site());

let fields = input.fields.iter().map(|(field_name, field_type)| {
let safe_field_name = keyword_replace(field_name.to_snake_case());
let safe_field_name = keyword_replace(to_snake_case_preserve_trailing_underscores(field_name));
let annotation = field_rename_annotation(field_name, safe_field_name.as_ref());
let name_ident = Ident::new(safe_field_name.as_ref(), Span::call_site());
let normalized_field_type_name = options
Expand Down
Loading