Refactor, vol.1

Author: tyranron

juniper/src/executor/mod.rs

@@ -22,7 +22,7 @@ use crate::{
         },
         model::{RootNode, SchemaType, TypeType},
     },
-    types::{base::GraphQLType, name::Name},
+    types::{base::{GraphQLType, GraphQLValue}, name::Name, async_await::GraphQLValueAsync},
     value::{DefaultScalarValue, ParseScalarValue, ScalarValue, Value},
     GraphQLError,
 };
@@ -244,7 +244,7 @@ impl<S> IntoFieldError<S> for FieldError<S> {
 #[doc(hidden)]
 pub trait IntoResolvable<'a, S, T, C>
 where
-    T: GraphQLType<S>,
+    T: GraphQLValue<S>,
     S: ScalarValue,
 {
     #[doc(hidden)]
@@ -253,7 +253,7 @@ where
 
 impl<'a, S, T, C> IntoResolvable<'a, S, T, C> for T
 where
-    T: GraphQLType<S>,
+    T: GraphQLValue<S>,
     S: ScalarValue,
     T::Context: FromContext<C>,
 {
@@ -265,7 +265,7 @@ where
 impl<'a, S, T, C, E: IntoFieldError<S>> IntoResolvable<'a, S, T, C> for Result<T, E>
 where
     S: ScalarValue,
-    T: GraphQLType<S>,
+    T: GraphQLValue<S>,
     T::Context: FromContext<C>,
 {
     fn into(self, ctx: &'a C) -> FieldResult<Option<(&'a T::Context, T)>, S> {
@@ -277,7 +277,7 @@ where
 impl<'a, S, T, C> IntoResolvable<'a, S, T, C> for (&'a T::Context, T)
 where
     S: ScalarValue,
-    T: GraphQLType<S>,
+    T: GraphQLValue<S>,
 {
     fn into(self, _: &'a C) -> FieldResult<Option<(&'a T::Context, T)>, S> {
         Ok(Some(self))
@@ -287,7 +287,7 @@ where
 impl<'a, S, T, C> IntoResolvable<'a, S, Option<T>, C> for Option<(&'a T::Context, T)>
 where
     S: ScalarValue,
-    T: GraphQLType<S>,
+    T: GraphQLValue<S>,
 {
     fn into(self, _: &'a C) -> FieldResult<Option<(&'a T::Context, Option<T>)>, S> {
         Ok(self.map(|(ctx, v)| (ctx, Some(v))))
@@ -297,7 +297,7 @@ where
 impl<'a, S, T, C> IntoResolvable<'a, S, T, C> for FieldResult<(&'a T::Context, T), S>
 where
     S: ScalarValue,
-    T: GraphQLType<S>,
+    T: GraphQLValue<S>,
 {
     fn into(self, _: &'a C) -> FieldResult<Option<(&'a T::Context, T)>, S> {
         self.map(Some)
@@ -308,7 +308,7 @@ impl<'a, S, T, C> IntoResolvable<'a, S, Option<T>, C>
     for FieldResult<Option<(&'a T::Context, T)>, S>
 where
     S: ScalarValue,
-    T: GraphQLType<S>,
+    T: GraphQLValue<S>,
 {
     fn into(self, _: &'a C) -> FieldResult<Option<(&'a T::Context, Option<T>)>, S> {
         self.map(|o| o.map(|(ctx, v)| (ctx, Some(v))))
@@ -405,7 +405,7 @@ where
     pub fn resolve_with_ctx<NewCtxT, T>(&self, info: &T::TypeInfo, value: &T) -> ExecutionResult<S>
     where
         NewCtxT: FromContext<CtxT>,
-        T: GraphQLType<S, Context = NewCtxT> + ?Sized,
+        T: GraphQLValue<S, Context = NewCtxT> + ?Sized,
     {
         self.replaced_context(<NewCtxT as FromContext<CtxT>>::from(self.context))
             .resolve(info, value)
@@ -414,15 +414,15 @@ where
     /// Resolve a single arbitrary value into an `ExecutionResult`
     pub fn resolve<T>(&self, info: &T::TypeInfo, value: &T) -> ExecutionResult<S>
     where
-        T: GraphQLType<S, Context = CtxT> + ?Sized,
+        T: GraphQLValue<S, Context = CtxT> + ?Sized,
     {
         value.resolve(info, self.current_selection_set, self)
     }
 
     /// Resolve a single arbitrary value into an `ExecutionResult`
     pub async fn resolve_async<T>(&self, info: &T::TypeInfo, value: &T) -> ExecutionResult<S>
     where
-        T: crate::GraphQLTypeAsync<S, Context = CtxT> + Send + Sync + ?Sized,
+        T: GraphQLValueAsync<S, Context = CtxT> + Send + Sync + ?Sized,
         T::TypeInfo: Send + Sync,
         CtxT: Send + Sync,
         S: Send + Sync,
@@ -439,7 +439,7 @@ where
         value: &T,
     ) -> ExecutionResult<S>
     where
-        T: crate::GraphQLTypeAsync<S, Context = NewCtxT> + Send + Sync,
+        T: GraphQLValueAsync<S, Context = NewCtxT> + Send + Sync,
         T::TypeInfo: Send + Sync,
         S: Send + Sync,
         NewCtxT: FromContext<CtxT> + Send + Sync,
@@ -453,23 +453,20 @@ where
     /// If the field fails to resolve, `null` will be returned.
     pub fn resolve_into_value<T>(&self, info: &T::TypeInfo, value: &T) -> Value<S>
     where
-        T: GraphQLType<S, Context = CtxT>,
+        T: GraphQLValue<S, Context = CtxT>,
     {
-        match self.resolve(info, value) {
-            Ok(v) => v,
-            Err(e) => {
-                self.push_error(e);
-                Value::null()
-            }
-        }
+        self.resolve(info, value).unwrap_or_else(|e| {
+            self.push_error(e);
+            Value::null()
+        })
     }
 
     /// Resolve a single arbitrary value into a return value
     ///
     /// If the field fails to resolve, `null` will be returned.
     pub async fn resolve_into_value_async<T>(&self, info: &T::TypeInfo, value: &T) -> Value<S>
     where
-        T: crate::GraphQLTypeAsync<S, Context = CtxT> + Send + Sync + ?Sized,
+        T: GraphQLValueAsync<S, Context = CtxT> + Send + Sync + ?Sized,
         T::TypeInfo: Send + Sync,
         CtxT: Send + Sync,
         S: Send + Sync,
@@ -757,9 +754,9 @@ pub fn execute_validated_query<'a, 'b, QueryT, MutationT, SubscriptionT, CtxT, S
 ) -> Result<(Value<S>, Vec<ExecutionError<S>>), GraphQLError<'a>>
 where
     S: ScalarValue,
-    QueryT: GraphQLType<S, Context = CtxT>,
-    MutationT: GraphQLType<S, Context = CtxT>,
-    SubscriptionT: GraphQLType<S, Context = CtxT>,
+    QueryT: GraphQLValue<S, Context = CtxT>,
+    MutationT: GraphQLValue<S, Context = CtxT>,
+    SubscriptionT: GraphQLValue<S, Context = CtxT>,
 {
     if operation.item.operation_type == OperationType::Subscription {
         return Err(GraphQLError::IsSubscription);
@@ -851,11 +848,11 @@ pub async fn execute_validated_query_async<'a, 'b, QueryT, MutationT, Subscripti
 ) -> Result<(Value<S>, Vec<ExecutionError<S>>), GraphQLError<'a>>
 where
     S: ScalarValue + Send + Sync,
-    QueryT: crate::GraphQLTypeAsync<S, Context = CtxT> + Send + Sync,
+    QueryT: GraphQLValueAsync<S, Context = CtxT> + Send + Sync,
     QueryT::TypeInfo: Send + Sync,
-    MutationT: crate::GraphQLTypeAsync<S, Context = CtxT> + Send + Sync,
+    MutationT: GraphQLValueAsync<S, Context = CtxT> + Send + Sync,
     MutationT::TypeInfo: Send + Sync,
-    SubscriptionT: GraphQLType<S, Context = CtxT> + Send + Sync,
+    SubscriptionT: GraphQLValue<S, Context = CtxT> + Send + Sync,
     SubscriptionT::TypeInfo: Send + Sync,
     CtxT: Send + Sync,
 {
@@ -998,9 +995,9 @@ where
     'd: 'r,
     'op: 'd,
     S: ScalarValue + Send + Sync,
-    QueryT: crate::GraphQLTypeAsync<S, Context = CtxT> + Send + Sync,
+    QueryT: GraphQLValueAsync<S, Context = CtxT> + Send + Sync,
     QueryT::TypeInfo: Send + Sync,
-    MutationT: crate::GraphQLTypeAsync<S, Context = CtxT> + Send + Sync,
+    MutationT: GraphQLValueAsync<S, Context = CtxT> + Send + Sync,
     MutationT::TypeInfo: Send + Sync,
     SubscriptionT: crate::GraphQLSubscriptionType<S, Context = CtxT> + Send + Sync,
     SubscriptionT::TypeInfo: Send + Sync,

juniper/src/lib.rs

@@ -185,8 +185,8 @@ pub use crate::{
         model::{RootNode, SchemaType},
     },
     types::{
-        async_await::GraphQLTypeAsync,
-        base::{Arguments, GraphQLType, TypeKind},
+        async_await::{GraphQLTypeAsync, GraphQLValueAsync},
+        base::{Arguments, GraphQLType, GraphQLValue, TypeKind},
         marker::{self, GraphQLUnion},
         scalars::{EmptyMutation, EmptySubscription, ID},
         subscriptions::{GraphQLSubscriptionType, SubscriptionConnection, SubscriptionCoordinator},

juniper/src/macros/interface.rs

@@ -134,10 +134,7 @@ macro_rules! graphql_interface {
     ) => {
         $crate::__juniper_impl_trait!(
             impl<$($scalar)* $(, $lifetimes)* > GraphQLType for $name {
-                type Context = $ctx;
-                type TypeInfo = ();
-
-                fn name(_ : &Self::TypeInfo) -> Option<&str> {
+                fn name(_ : &Self::TypeInfo) -> Option<&'static str> {
                     Some($($outname)*)
                 }
 
@@ -178,7 +175,17 @@ macro_rules! graphql_interface {
                         $(.description($desciption))*
                         .into_meta()
                 }
+            }
+        );
 
+        $crate::__juniper_impl_trait!(
+            impl<$($scalar)* $(, $lifetimes)* > GraphQLValue for $name {
+                type Context = $ctx;
+                type TypeInfo = ();
+
+                fn type_name(&self, _ : &Self::TypeInfo) -> Option<&'static str> {
+                    Some($($outname)*)
+                }
 
                 #[allow(unused_variables)]
                 fn resolve_field(

juniper/src/schema/schema.rs

@@ -1,7 +1,7 @@
 use crate::{
     ast::Selection,
     executor::{ExecutionResult, Executor, Registry},
-    types::base::{Arguments, GraphQLType, TypeKind},
+    types::{base::{Arguments, GraphQLType, GraphQLValue, TypeKind}, async_await::{GraphQLValueAsync, GraphQLTypeAsync}},
     value::{ScalarValue, Value},
 };
 
@@ -21,9 +21,6 @@ where
     MutationT: GraphQLType<S, Context = CtxT>,
     SubscriptionT: GraphQLType<S, Context = CtxT>,
 {
-    type Context = CtxT;
-    type TypeInfo = QueryT::TypeInfo;
-
     fn name(info: &QueryT::TypeInfo) -> Option<&str> {
         QueryT::name(info)
     }
@@ -34,6 +31,22 @@ where
     {
         QueryT::meta(info, registry)
     }
+}
+
+impl<'a, CtxT, S, QueryT, MutationT, SubscriptionT> GraphQLValue<S>
+    for RootNode<'a, QueryT, MutationT, SubscriptionT, S>
+where
+    S: ScalarValue,
+    QueryT: GraphQLType<S, Context = CtxT>,
+    MutationT: GraphQLType<S, Context = CtxT>,
+    SubscriptionT: GraphQLType<S, Context = CtxT>,
+{
+    type Context = CtxT;
+    type TypeInfo = QueryT::TypeInfo;
+
+    fn type_name<'i>(&self, info: &'i QueryT::TypeInfo) -> Option<&'i str> {
+        QueryT::name(info)
+    }
 
     fn resolve_field(
         &self,
@@ -77,13 +90,13 @@ where
     }
 }
 
-impl<'a, CtxT, S, QueryT, MutationT, SubscriptionT> crate::GraphQLTypeAsync<S>
+impl<'a, CtxT, S, QueryT, MutationT, SubscriptionT> GraphQLValueAsync<S>
     for RootNode<'a, QueryT, MutationT, SubscriptionT, S>
 where
     S: ScalarValue + Send + Sync,
-    QueryT: crate::GraphQLTypeAsync<S, Context = CtxT>,
+    QueryT: GraphQLTypeAsync<S, Context = CtxT>,
     QueryT::TypeInfo: Send + Sync,
-    MutationT: crate::GraphQLTypeAsync<S, Context = CtxT>,
+    MutationT: GraphQLTypeAsync<S, Context = CtxT>,
     MutationT::TypeInfo: Send + Sync,
     SubscriptionT: GraphQLType<S, Context = CtxT> + Send + Sync,
     SubscriptionT::TypeInfo: Send + Sync,