Skip to content

fix: allow None, object, and array types in graphql #393

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
lgalabru merged 2 commits into from
Oct 29, 2025
Merged

fix: allow None, object, and array types in graphql #393

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
6df2fc8
fix: allow None, object, and array types in graphql
MicaiahReid Oct 28, 2025
41763e8
fms
MicaiahReid Oct 29, 2025
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
26 changes: 13 additions & 13 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,9 @@ surfpool-studio-ui = { path = "crates/studio", default-features = false }
surfpool-subgraph = { path = "crates/subgraph", default-features = false }
surfpool-types = { path = "crates/types", default-features = false }

txtx-addon-kit = "0.4.10"
txtx-addon-network-svm = { version = "0.3.14" }
txtx-addon-network-svm-types = { version = "0.3.13" }
txtx-addon-kit = "0.4.11"
txtx-addon-network-svm = { version = "0.3.15" }
txtx-addon-network-svm-types = { version = "0.3.14" }
txtx-cloud = { version = "0.1.13", features = [
"clap",
"toml",
Expand Down
201 changes: 149 additions & 52 deletions crates/gql/src/types/collections.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,58 +78,13 @@ impl GraphQLType<DefaultScalarValue> for CollectionMetadata {
for field in metadata.fields.iter() {
let registration = {
let description = field.data.description.as_deref().unwrap_or("");
match &field.data.expected_type {
Type::String => registry
.field::<&String>(&field.data.display_name, &())
.description(description),
Type::Integer => registry
.field::<&BigInt>(&field.data.display_name, &())
.description(description),
Type::Bool => registry
.field::<&String>(&field.data.display_name, &())
.description(description),
Type::Float => registry
.field::<&String>(&field.data.display_name, &())
.description(description),
Type::Null => registry
.field::<&String>(&field.data.display_name, &())
.description(description),
Type::Array(_array) => registry
.field::<&String>(&field.data.display_name, &())
.description(description),
Type::Buffer => registry
.field::<&String>(&field.data.display_name, &())
.description(description),
Type::Addon(addon_id) => match addon_id.as_str() {
SVM_PUBKEY => registry
.field::<&PublicKey>(&field.data.display_name, &())
.description(description),
SVM_SIGNATURE => registry
.field::<&Signature>(&field.data.display_name, &())
.description(description),
SVM_U8 | SVM_U16 | SVM_I8 | SVM_I16 | SVM_I32 => registry
.field::<&i32>(&field.data.display_name, &())
.description(description),
SVM_U32 | SVM_U64 | SVM_I64 | SVM_I128 => registry
.field::<&BigInt>(&field.data.display_name, &())
.description(description),
SVM_U128 | SVM_U256 | SVM_I256 => registry
.field::<&String>(&field.data.display_name, &())
.description(description),
SVM_F32 | SVM_F64 => registry
.field::<&f64>(&field.data.display_name, &())
.description(description),
_ => registry
.field::<&String>(&field.data.display_name, &())
.description(description),
},
Type::Object(_object) => registry
.field::<&String>(&field.data.display_name, &())
.description(description),
Type::Map(_map) => registry
.field::<&String>(&field.data.display_name, &())
.description(description),
}
register_txtx_type(
&field.data.expected_type,
&field.data.display_name,
description,
registry,
false,
)
};
fields.push(registration);
}
Expand All @@ -142,6 +97,148 @@ impl GraphQLType<DefaultScalarValue> for CollectionMetadata {
}
}

fn register_txtx_type<'r>(
txtx_type: &Type,
display_name: &str,
description: &str,
registry: &mut Registry<'r, DefaultScalarValue>,
is_opt: bool,
) -> Field<'r, DefaultScalarValue> {
match &txtx_type {
Type::String => match is_opt {
true => registry
.field::<&Option<String>>(display_name, &())
.description(description),
false => registry
.field::<&String>(display_name, &())
.description(description),
},
Type::Integer => match is_opt {
true => registry
.field::<&Option<BigInt>>(display_name, &())
.description(description),
false => registry
.field::<&BigInt>(display_name, &())
.description(description),
},
Type::Bool => match is_opt {
true => registry
.field::<&Option<bool>>(display_name, &())
.description(description),
false => registry
.field::<&bool>(display_name, &())
.description(description),
},
Type::Float => match is_opt {
true => registry
.field::<&Option<f64>>(display_name, &())
.description(description),
false => registry
.field::<&f64>(display_name, &())
.description(description),
},
Type::Null(inner) => {
if let Some(inner) = inner {
register_txtx_type(inner, display_name, description, registry, true)
} else {
registry
.field::<&Option<String>>(display_name, &())
.description(description)
}
}
Type::Array(_array) => match is_opt {
true => registry
.field::<&Option<String>>(display_name, &())
.description(description),
false => registry
.field::<&String>(display_name, &())
.description(description),
},
Type::Buffer => match is_opt {
true => registry
.field::<&Option<String>>(display_name, &())
.description(description),
false => registry
.field::<&String>(display_name, &())
.description(description),
},
Type::Addon(addon_id) => match addon_id.as_str() {
SVM_PUBKEY => match is_opt {
true => registry
.field::<&Option<PublicKey>>(display_name, &())
.description(description),
false => registry
.field::<&PublicKey>(display_name, &())
.description(description),
},
SVM_SIGNATURE => match is_opt {
true => registry
.field::<&Option<Signature>>(display_name, &())
.description(description),
false => registry
.field::<&Signature>(display_name, &())
.description(description),
},
SVM_U8 | SVM_U16 | SVM_I8 | SVM_I16 | SVM_I32 => match is_opt {
true => registry
.field::<&Option<i32>>(display_name, &())
.description(description),
false => registry
.field::<&i32>(display_name, &())
.description(description),
},
SVM_U32 | SVM_U64 | SVM_I64 | SVM_I128 => match is_opt {
true => registry
.field::<&Option<BigInt>>(display_name, &())
.description(description),
false => registry
.field::<&BigInt>(display_name, &())
.description(description),
},
SVM_U128 | SVM_U256 | SVM_I256 => match is_opt {
true => registry
.field::<&Option<String>>(display_name, &())
.description(description),
false => registry
.field::<&String>(display_name, &())
.description(description),
},
SVM_F32 | SVM_F64 => match is_opt {
true => registry
.field::<&Option<f64>>(display_name, &())
.description(description),
false => registry
.field::<&f64>(display_name, &())
.description(description),
},
_ => match is_opt {
true => registry
.field::<&Option<String>>(display_name, &())
.description(description),
false => registry
.field::<&String>(display_name, &())
.description(description),
},
},
Type::Object(_object) => match is_opt {
true => registry
.field::<&Option<String>>(display_name, &())
.description(description),
false => registry
.field::<&String>(display_name, &())
.description(description),
},
Type::Map(_map) => match is_opt {
true => registry
.field::<&Option<String>>(display_name, &())
.description(description),
false => registry
.field::<&String>(display_name, &())
.description(description),
},
}
}

impl GraphQLValue<DefaultScalarValue> for CollectionMetadata {
type Context = DataloaderContext;
type TypeInfo = CollectionMetadata;
Expand Down
Loading