Merge pull request #1428 from vstepanyuk/extension-extended-context

Feature extend ResolveInfo with field attribute
async-graphql · Jan 6, 2024 · d7bb65d · d7bb65d
2 parents 44ae983 + d2c869c
commit d7bb65d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 2 deletions.
diff --git a/derive/src/subscription.rs b/derive/src/subscription.rs
@@ -330,6 +330,7 @@ pub fn generate(
                                     name: field.node.name.node.as_str(),
                                     alias: field.node.alias.as_ref().map(|alias| alias.node.as_str()),
                                     is_for_introspection: false,
+                                    field: &field.node,
                                 };
                                 let resolve_fut = async {
                                     #crate_name::OutputType::resolve(&msg, &ctx_selection_set, &*field)

diff --git a/src/dynamic/resolve.rs b/src/dynamic/resolve.rs
@@ -254,6 +254,7 @@ fn collect_field<'a>(
                 name: &field.node.name.node,
                 alias: field.node.alias.as_ref().map(|alias| &*alias.node),
                 is_for_introspection: ctx_field.is_for_introspection,
+                field: &field.node,
             };
 
             let resolve_fut = async {
@@ -472,6 +473,7 @@ async fn resolve_list<'a>(
                     .as_ref()
                     .map(|alias| alias.node.as_str()),
                 is_for_introspection: ctx_item.is_for_introspection,
+                field: &ctx_item.item.node,
             };
 
             let resolve_fut = async { resolve(schema, &ctx_item, type_ref, Some(value)).await };

diff --git a/src/dynamic/subscription.rs b/src/dynamic/subscription.rs
@@ -244,6 +244,7 @@ impl Subscription {
                                         name: field.node.name.node.as_str(),
                                         alias: field.node.alias.as_ref().map(|alias| alias.node.as_str()),
                                         is_for_introspection: false,
+                                        field: &field.node,
                                     };
                                     let resolve_fut = resolve(&schema, &ctx_field, &field_type, Some(&value));
                                     futures_util::pin_mut!(resolve_fut);

diff --git a/src/extensions/mod.rs b/src/extensions/mod.rs
@@ -30,8 +30,9 @@ pub use self::opentelemetry::OpenTelemetry;
 #[cfg(feature = "tracing")]
 pub use self::tracing::Tracing;
 use crate::{
-    parser::types::ExecutableDocument, Data, DataContext, Error, QueryPathNode, Request, Response,
-    Result, SchemaEnv, ServerError, ServerResult, ValidationResult, Value, Variables,
+    parser::types::{ExecutableDocument, Field},
+    Data, DataContext, Error, QueryPathNode, Request, Response, Result, SchemaEnv, ServerError,
+    ServerResult, ValidationResult, Value, Variables,
 };
 
 /// Context for extension
@@ -128,6 +129,9 @@ pub struct ResolveInfo<'a> {
 
     /// If `true` means the current field is for introspection.
     pub is_for_introspection: bool,
+
+    /// Current field
+    pub field: &'a Field,
 }
 
 type RequestFut<'a> = &'a mut (dyn Future<Output = Response> + Send + Unpin);

diff --git a/src/resolver_utils/container.rs b/src/resolver_utils/container.rs
@@ -244,6 +244,7 @@ impl<'a> Fields<'a> {
                                         .as_ref()
                                         .map(|alias| alias.node.as_str()),
                                     is_for_introspection: ctx_field.is_for_introspection,
+                                    field: &field.node,
                                 };
 
                                 let resolve_fut = root.resolve_field(&ctx_field);

diff --git a/src/resolver_utils/list.rs b/src/resolver_utils/list.rs
@@ -27,6 +27,7 @@ pub async fn resolve_list<'a, T: OutputType + 'a>(
                         name: field.node.name.node.as_str(),
                         alias: field.node.alias.as_ref().map(|alias| alias.node.as_str()),
                         is_for_introspection: ctx_idx.is_for_introspection,
+                        field: &field.node,
                     };
                     let resolve_fut = async {
                         OutputType::resolve(&item, &ctx_idx, field)