Refactor, vol.2

Author: tyranron

juniper/src/executor/mod.rs

@@ -22,7 +22,11 @@ use crate::{
         },
         model::{RootNode, SchemaType, TypeType},
     },
-    types::{base::{GraphQLType, GraphQLValue}, name::Name, async_await::GraphQLValueAsync},
+    types::{
+        async_await::{GraphQLTypeAsync, GraphQLValueAsync},
+        base::{GraphQLType, GraphQLValue},
+        name::Name,
+    },
     value::{DefaultScalarValue, ParseScalarValue, ScalarValue, Value},
     GraphQLError,
 };
@@ -754,9 +758,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: GraphQLValue<S, Context = CtxT>,
-    MutationT: GraphQLValue<S, Context = CtxT>,
-    SubscriptionT: GraphQLValue<S, Context = CtxT>,
+    QueryT: GraphQLType<S, Context = CtxT>,
+    MutationT: GraphQLType<S, Context = CtxT>,
+    SubscriptionT: GraphQLType<S, Context = CtxT>,
 {
     if operation.item.operation_type == OperationType::Subscription {
         return Err(GraphQLError::IsSubscription);
@@ -848,11 +852,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: GraphQLValueAsync<S, Context = CtxT> + Send + Sync,
+    QueryT: GraphQLTypeAsync<S, Context = CtxT> + Send + Sync,
     QueryT::TypeInfo: Send + Sync,
-    MutationT: GraphQLValueAsync<S, Context = CtxT> + Send + Sync,
+    MutationT: GraphQLTypeAsync<S, Context = CtxT> + Send + Sync,
     MutationT::TypeInfo: Send + Sync,
-    SubscriptionT: GraphQLValue<S, Context = CtxT> + Send + Sync,
+    SubscriptionT: GraphQLType<S, Context = CtxT> + Send + Sync,
     SubscriptionT::TypeInfo: Send + Sync,
     CtxT: Send + Sync,
 {
@@ -995,9 +999,9 @@ where
     'd: 'r,
     'op: 'd,
     S: ScalarValue + Send + Sync,
-    QueryT: GraphQLValueAsync<S, Context = CtxT> + Send + Sync,
+    QueryT: GraphQLTypeAsync<S, Context = CtxT> + Send + Sync,
     QueryT::TypeInfo: Send + Sync,
-    MutationT: GraphQLValueAsync<S, Context = CtxT> + Send + Sync,
+    MutationT: GraphQLTypeAsync<S, Context = CtxT> + Send + Sync,
     MutationT::TypeInfo: Send + Sync,
     SubscriptionT: crate::GraphQLSubscriptionType<S, Context = CtxT> + Send + Sync,
     SubscriptionT::TypeInfo: Send + Sync,

juniper/src/schema/schema.rs

@@ -1,7 +1,10 @@
 use crate::{
     ast::Selection,
     executor::{ExecutionResult, Executor, Registry},
-    types::{base::{Arguments, GraphQLType, GraphQLValue, TypeKind}, async_await::{GraphQLValueAsync, GraphQLTypeAsync}},
+    types::{
+        async_await::{GraphQLTypeAsync, GraphQLValueAsync},
+        base::{Arguments, GraphQLType, GraphQLValue, TypeKind},
+    },
     value::{ScalarValue, Value},
 };
 

juniper/src/schema/translate/graphql_parser.rs

@@ -1,25 +1,27 @@
-use std::boxed::Box;
-use std::collections::BTreeMap;
+use std::{boxed::Box, collections::BTreeMap};
 
-use graphql_parser::query::{
-    Directive as ExternalDirective, Number as ExternalNumber, Type as ExternalType,
+use graphql_parser::{
+    query::{Directive as ExternalDirective, Number as ExternalNumber, Type as ExternalType},
+    schema::{
+        Definition, Document, EnumType as ExternalEnum, EnumValue as ExternalEnumValue,
+        Field as ExternalField, InputObjectType as ExternalInputObjectType,
+        InputValue as ExternalInputValue, InterfaceType as ExternalInterfaceType,
+        ObjectType as ExternalObjectType, ScalarType as ExternalScalarType, SchemaDefinition, Text,
+        TypeDefinition as ExternalTypeDefinition, UnionType as ExternalUnionType,
+        Value as ExternalValue,
+    },
+    Pos,
 };
-use graphql_parser::schema::{Definition, Document, SchemaDefinition, Text};
-use graphql_parser::schema::{
-    EnumType as ExternalEnum, EnumValue as ExternalEnumValue, Field as ExternalField,
-    InputObjectType as ExternalInputObjectType, InputValue as ExternalInputValue,
-    InterfaceType as ExternalInterfaceType, ObjectType as ExternalObjectType,
-    ScalarType as ExternalScalarType, TypeDefinition as ExternalTypeDefinition,
-    UnionType as ExternalUnionType, Value as ExternalValue,
-};
-use graphql_parser::Pos;
 
-use crate::ast::{InputValue, Type};
-use crate::schema::meta::DeprecationStatus;
-use crate::schema::meta::{Argument, EnumValue, Field, MetaType};
-use crate::schema::model::SchemaType;
-use crate::schema::translate::SchemaTranslator;
-use crate::value::ScalarValue;
+use crate::{
+    ast::{InputValue, Type},
+    schema::{
+        meta::{Argument, DeprecationStatus, EnumValue, Field, MetaType},
+        model::SchemaType,
+        translate::SchemaTranslator,
+    },
+    value::ScalarValue,
+};
 
 pub struct GraphQLParserTranslator;
 

juniper/src/types/async_await.rs

@@ -2,7 +2,7 @@ use crate::{
     ast::Selection,
     executor::{ExecutionResult, Executor},
     parser::Spanning,
-    value::{Object, ScalarValue, Value, DefaultScalarValue},
+    value::{DefaultScalarValue, Object, ScalarValue, Value},
 };
 
 use crate::BoxFuture;
@@ -117,9 +117,22 @@ crate::sa::assert_obj_safe!(GraphQLValueAsync<Context = (), TypeInfo = ()>);
 ///
 /// It's automatically implemented for [`GraphQLValueAsync`] and [`GraphQLType`] implementors, so
 /// doesn't require manual or code-generated implementation.
-pub trait GraphQLTypeAsync<S = DefaultScalarValue>: GraphQLValueAsync<S> + GraphQLType<S> {}
+pub trait GraphQLTypeAsync<S = DefaultScalarValue>: GraphQLValueAsync<S> + GraphQLType<S>
+where
+    Self::Context: Send + Sync,
+    Self::TypeInfo: Send + Sync,
+    S: ScalarValue + Send + Sync,
+{
+}
 
-impl<S, T> GraphQLTypeAsync<S> for T where T: GraphQLValueAsync<S> + GraphQLType<S> {}
+impl<S, T> GraphQLTypeAsync<S> for T
+where
+    T: GraphQLValueAsync<S> + GraphQLType<S>,
+    T::Context: Send + Sync,
+    T::TypeInfo: Send + Sync,
+    S: ScalarValue + Send + Sync,
+{
+}
 
 // Wrapper function around resolve_selection_set_into_async_recursive.
 // This wrapper is necessary because async fns can not be recursive.
@@ -175,7 +188,8 @@ where
     let meta_type = executor
         .schema()
         .concrete_type_by_name(
-            instance.type_name(info)
+            instance
+                .type_name(info)
                 .expect("Resolving named type's selection set")
                 .as_ref(),
         )

juniper/src/types/base.rs

@@ -417,7 +417,8 @@ where
     let meta_type = executor
         .schema()
         .concrete_type_by_name(
-            instance.type_name(info)
+            instance
+                .type_name(info)
                 .expect("Resolving named type's selection set")
                 .as_ref(),
         )

juniper/src/types/containers.rs

@@ -2,22 +2,25 @@ use crate::{
     ast::{FromInputValue, InputValue, Selection, ToInputValue},
     executor::{ExecutionResult, Executor, Registry},
     schema::meta::MetaType,
-    types::{async_await::GraphQLValueAsync, base::{GraphQLType, GraphQLValue}},
+    types::{
+        async_await::GraphQLValueAsync,
+        base::{GraphQLType, GraphQLValue},
+    },
     value::{ScalarValue, Value},
 };
 
 impl<S, T, CtxT> GraphQLType<S> for Option<T>
-    where
-        S: ScalarValue,
-        T: GraphQLType<S, Context = CtxT>,
+where
+    S: ScalarValue,
+    T: GraphQLType<S, Context = CtxT>,
 {
     fn name(_: &T::TypeInfo) -> Option<&'static str> {
         None
     }
 
     fn meta<'r>(info: &T::TypeInfo, registry: &mut Registry<'r, S>) -> MetaType<'r, S>
-        where
-            S: 'r,
+    where
+        S: 'r,
     {
         registry.build_nullable_type::<T>(info).into_meta()
     }
@@ -103,7 +106,6 @@ where
     T: GraphQLType<S, Context = CtxT>,
     S: ScalarValue,
 {
-
     fn name(_: &T::TypeInfo) -> Option<&'static str> {
         None
     }

juniper/src/types/pointers.rs

@@ -13,17 +13,17 @@ use crate::{
 };
 
 impl<S, T, CtxT> GraphQLType<S> for Box<T>
-    where
-        S: ScalarValue,
-        T: GraphQLType<S, Context = CtxT> + ?Sized,
+where
+    S: ScalarValue,
+    T: GraphQLType<S, Context = CtxT> + ?Sized,
 {
     fn name(info: &T::TypeInfo) -> Option<&str> {
         T::name(info)
     }
 
     fn meta<'r>(info: &T::TypeInfo, registry: &mut Registry<'r, S>) -> MetaType<'r, S>
-        where
-            S: 'r,
+    where
+        S: 'r,
     {
         T::meta(info, registry)
     }

juniper/src/types/scalars.rs

@@ -1,12 +1,16 @@
+use std::{char, convert::From, marker::PhantomData, ops::Deref, rc::Rc, thread::JoinHandle, u32};
+
 use serde::{Deserialize, Serialize};
-use std::{char, convert::From, marker::PhantomData, ops::Deref, u32};
 
 use crate::{
     ast::{InputValue, Selection, ToInputValue},
     executor::{ExecutionResult, Executor, Registry},
     parser::{LexerError, ParseError, ScalarToken, Token},
     schema::meta::MetaType,
-    types::{base::{GraphQLType, GraphQLValue}, async_await::GraphQLValueAsync},
+    types::{
+        async_await::GraphQLValueAsync,
+        base::{GraphQLType, GraphQLValue},
+    },
     value::{ParseScalarResult, ScalarValue, Value},
 };
 
@@ -215,7 +219,7 @@ where
     type Context = ();
     type TypeInfo = ();
 
-    fn type_name(&self, info: &()) -> Option<&'static str> {
+    fn type_name<'i>(&self, info: &'i Self::TypeInfo) -> Option<&'i str> {
         <Self as GraphQLType<S>>::name(info)
     }
 
@@ -334,7 +338,7 @@ where
 /// If you instantiate `RootNode` with this as the mutation, no mutation will be
 /// generated for the schema.
 #[derive(Debug)]
-pub struct EmptyMutation<T: ?Sized = ()>(PhantomData<std::thread::JoinHandle<T>>);
+pub struct EmptyMutation<T: ?Sized = ()>(PhantomData<JoinHandle<Box<T>>>);
 
 // `EmptyMutation` doesn't use `T`, so should be `Send` and `Sync` even when `T` is not.
 crate::sa::assert_impl_all!(EmptyMutation<Rc<String>>: Send, Sync);
@@ -370,7 +374,7 @@ where
     type Context = T;
     type TypeInfo = ();
 
-    fn type_name(&self, info: &()) -> Option<&'static str> {
+    fn type_name<'i>(&self, info: &'i Self::TypeInfo) -> Option<&'i str> {
         <Self as GraphQLType<S>>::name(info)
     }
 }
@@ -394,7 +398,7 @@ impl<T> Default for EmptyMutation<T> {
 ///
 /// If you instantiate `RootNode` with this as the subscription,
 /// no subscriptions will be generated for the schema.
-pub struct EmptySubscription<T: ?Sized = ()>(PhantomData<std::thread::JoinHandle<T>>);
+pub struct EmptySubscription<T: ?Sized = ()>(PhantomData<JoinHandle<Box<T>>>);
 
 // `EmptySubscription` doesn't use `T`, so should be `Send` and `Sync` even when `T` is not.
 crate::sa::assert_impl_all!(EmptySubscription<Rc<String>>: Send, Sync);
@@ -430,7 +434,7 @@ where
     type Context = T;
     type TypeInfo = ();
 
-    fn type_name(&self, info: &()) -> Option<&'static str> {
+    fn type_name<'i>(&self, info: &'i Self::TypeInfo) -> Option<&'i str> {
         <Self as GraphQLType<S>>::name(info)
     }
 }

juniper/src/types/subscriptions.rs

@@ -2,7 +2,7 @@ use crate::{
     http::{GraphQLRequest, GraphQLResponse},
     parser::Spanning,
     types::base::{is_excluded, merge_key_into},
-    Arguments, BoxFuture, Executor, FieldError, GraphQLValue, Object, ScalarValue, Selection, Value,
+    Arguments, BoxFuture, Executor, FieldError, GraphQLType, Object, ScalarValue, Selection, Value,
     ValuesStream,
 };
 
@@ -68,7 +68,7 @@ pub trait SubscriptionConnection<'a, S>: futures::Stream<Item = GraphQLResponse<
 
  See trait methods for more detailed explanation on how this trait works.
 */
-pub trait GraphQLSubscriptionType<S>: GraphQLValue<S> + Send + Sync
+pub trait GraphQLSubscriptionType<S>: GraphQLType<S> + Send + Sync
 where
     Self::Context: Send + Sync,
     Self::TypeInfo: Send + Sync,
@@ -218,7 +218,8 @@ where
     let meta_type = executor
         .schema()
         .concrete_type_by_name(
-            instance.type_name(info)
+            instance
+                .type_name(info)
                 .expect("Resolving named type's selection set")
                 .as_ref(),
         )

juniper_codegen/src/derive_scalar_value.rs

@@ -125,9 +125,8 @@ fn impl_scalar_struct(
                 selection_set: Option<&'a [#crate_name::Selection<__S>]>,
                 executor: &'a #crate_name::Executor<Self::Context, __S>,
             ) -> #crate_name::BoxFuture<'a, #crate_name::ExecutionResult<__S>> {
-                use #crate_name::GraphQLType;
                 use #crate_name::futures::future;
-                let v = self.resolve(info, selection_set, executor);
+                let v = #crate_name::GraphQLValue::resolve(self, info, selection_set, executor);
                 Box::pin(future::ready(v))
             }
         }
@@ -164,7 +163,7 @@ fn impl_scalar_struct(
             type Context = ();
             type TypeInfo = ();
 
-            fn type_name(&self, info: &Self::TypeInfo) -> Option<&'static str> {
+            fn type_name<'__i>(&self, info: &'__i Self::TypeInfo) -> Option<&'__i str> {
                 <Self as #crate_name::GraphQLType<S>>::name(info)
             }
 
@@ -174,7 +173,7 @@ fn impl_scalar_struct(
                 selection: Option<&[#crate_name::Selection<S>]>,
                 executor: &#crate_name::Executor<Self::Context, S>,
             ) -> #crate_name::ExecutionResult<S> {
-                #crate_name::GraphQLType::resolve(&self.0, info, selection, executor)
+                #crate_name::GraphQLValue::resolve(&self.0, info, selection, executor)
             }
         }
 

juniper_codegen/src/graphql_union/mod.rs

@@ -552,7 +552,7 @@ impl ToTokens for UnionDefinition {
                 type Context = #context;
                 type TypeInfo = ();
 
-                fn type_name(&self, info: &Self::TypeInfo) -> Option<&'static str> {
+                fn type_name<'__i>(&self, info: &'__i Self::TypeInfo) -> Option<&'__i str> {
                     <Self as #crate_path::GraphQLType<#scalar>>::name(info)
                 }
 
@@ -632,7 +632,13 @@ impl ToTokens for UnionDefinition {
             }
         };
 
-        into.append_all(&[union_impl, output_type_impl, type_impl, value_impl, value_async_impl]);
+        into.append_all(&[
+            union_impl,
+            output_type_impl,
+            type_impl,
+            value_impl,
+            value_async_impl,
+        ]);
     }
 }
 

juniper_codegen/src/impl_scalar.rs

@@ -263,9 +263,8 @@ pub fn build_scalar(
                 selection_set: Option<&'a [#crate_name::Selection<#async_generic_type>]>,
                 executor: &'a #crate_name::Executor<Self::Context, #async_generic_type>,
             ) -> #crate_name::BoxFuture<'a, #crate_name::ExecutionResult<#async_generic_type>> {
-                use #crate_name::GraphQLType;
                 use #crate_name::futures::future;
-                let v = self.resolve(info, selection_set, executor);
+                let v = #crate_name::GraphQLValue::resolve(self, info, selection_set, executor);
                 Box::pin(future::ready(v))
             }
         }
@@ -306,7 +305,7 @@ pub fn build_scalar(
             type Context = ();
             type TypeInfo = ();
 
-            fn type_name(&self, info: &Self::TypeInfo) -> Option<&'static str> {
+            fn type_name<'__i>(&self, info: &'__i Self::TypeInfo) -> Option<&'__i str> {
                 <Self as #crate_name::GraphQLType<#generic_type>>::name(info)
             }