yume/juniper
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor GraphQLTypeAsync to use async-trait

Browse source
This commit is contained in:
nWacky 2019-11-01 19:37:55 +03:00
parent 820f472f2c
commit 52c3e281f3
No known key found for this signature in database
GPG key ID: 22EF2C62F6F79FD0
8 changed files with 96 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
juniper/src/macros/scalar.rs
View file

@ -423,12 +423,16 @@ macro_rules! graphql_scalar {
)
{
fn resolve_async<'a>(
fn resolve_async<'a, 'async_trait>(
&'a self,
info: &'a Self::TypeInfo,
selection_set: Option<&'a [$crate::Selection<$crate::__juniper_insert_generic!($($scalar)+)>]>,
executor: &'a $crate::Executor<Self::Context, $crate::__juniper_insert_generic!($($scalar)+)>,
) -> futures::future::BoxFuture<'a, $crate::Value<$crate::__juniper_insert_generic!($($scalar)+)>> {
selection_set: Option<&'a [$crate::Selection<'a, $crate::__juniper_insert_generic!($($scalar)+)>]>,
executor: &'a $crate::Executor<'a, Self::Context, $crate::__juniper_insert_generic!($($scalar)+)>,
) -> futures::future::BoxFuture<'async_trait, $crate::Value<$crate::__juniper_insert_generic!($($scalar)+)>>
where
'a: 'async_trait,
Self: 'async_trait,
{
use $crate::GraphQLType;
use futures::future;
let v = self.resolve(info, selection_set, executor);

21
juniper/src/schema/schema.rs
View file

@ -77,6 +77,7 @@ where
}
#[cfg(feature = "async")]
#[async_trait::async_trait]
impl<'a, CtxT, S, QueryT, MutationT> crate::GraphQLTypeAsync<S>
for RootNode<'a, QueryT, MutationT, S>
where
@ -85,25 +86,25 @@ where
QueryT::TypeInfo: Send + Sync,
MutationT: crate::GraphQLTypeAsync<S, Context = CtxT>,
MutationT::TypeInfo: Send + Sync,
CtxT: Send + Sync,
for<'b> &'b S: ScalarRefValue<'b>,
CtxT: Send + Sync + 'a,
for<'c> &'c S: ScalarRefValue<'c>,
{
fn resolve_field_async<'b>(
async fn resolve_field_async<'b>(
&'b self,
info: &'b Self::TypeInfo,
info: &'b <Self as crate::GraphQLType<S>>::TypeInfo,
field_name: &'b str,
arguments: &'b Arguments<S>,
executor: &'b Executor<Self::Context, S>,
) -> crate::BoxFuture<'b, ExecutionResult<S>> {
arguments: &'b Arguments<'b, S>,
executor: &'b Executor<'b, <Self as crate::GraphQLType<S>>::Context, S>,
) -> ExecutionResult<S> {
use futures::future::{ready, FutureExt};
match field_name {
"__schema" | "__type" => {
let v = self.resolve_field(info, field_name, arguments, executor);
Box::pin(ready(v))
self.resolve_field(info, field_name, arguments, executor)
}
_ => self
.query_type
.resolve_field_async(info, field_name, arguments, executor),
.resolve_field_async(info, field_name, arguments, executor)
.await,
}
}
}

24
juniper/src/types/async_await.rs
View file

@ -13,8 +13,7 @@ use crate::BoxFuture;
use super::base::{is_excluded, merge_key_into, Arguments, GraphQLType};
// todo: async trait
//#[async_trait]
#[async_trait]
pub trait GraphQLTypeAsync<S>: GraphQLType<S> + Send + Sync
where
Self::Context: Send + Sync,
@ -22,43 +21,38 @@ where
S: ScalarValue + Send + Sync,
for<'b> &'b S: ScalarRefValue<'b>,
{
fn resolve_field_async<'a>(
async fn resolve_field_async<'a>(
&'a self,
info: &'a Self::TypeInfo,
field_name: &'a str,
arguments: &'a Arguments<'a, S>,
executor: &'a Executor<'a, Self::Context, S>,
) -> BoxFuture<'a, ExecutionResult<S>> {
) -> ExecutionResult<S> {
panic!("resolve_field must be implemented by object types");
}
fn resolve_async<'a>(
async fn resolve_async<'a>(
&'a self,
info: &'a Self::TypeInfo,
selection_set: Option<&'a [Selection<'a, S>]>,
executor: &'a Executor<'a, Self::Context, S>,
) -> BoxFuture<'a, Value<S>> {
) -> Value<S> {
if let Some(selection_set) = selection_set {
resolve_selection_set_into_async(self, info, selection_set, executor)
resolve_selection_set_into_async(self, info, selection_set, executor).await
} else {
panic!("resolve() must be implemented by non-object output types");
}
}
fn resolve_into_type_async<'a>(
async fn resolve_into_type_async<'a>(
&'a self,
info: &'a Self::TypeInfo,
type_name: &str,
selection_set: Option<&'a [Selection<'a, S>]>,
executor: &'a Executor<'a, Self::Context, S>,
) -> BoxFuture<'a, ExecutionResult<S>> {
) -> ExecutionResult<S> {
if Self::name(info).unwrap() == type_name {
Box::pin(
async move {
let x = self.resolve_async(info, selection_set, executor).await;
Ok(x)
}
)
Ok(self.resolve_async(info, selection_set, executor).await)
} else {
panic!("resolve_into_type_async must be implemented by unions and interfaces");
}

50
juniper/src/types/containers.rs
View file

@ -257,6 +257,7 @@ where
}
#[cfg(feature = "async")]
#[async_trait::async_trait]
impl<S, T, CtxT> crate::GraphQLTypeAsync<S> for Vec<T>
where
T: crate::GraphQLTypeAsync<S, Context = CtxT>,
@ -265,18 +266,18 @@ where
CtxT: Send + Sync,
for<'b> &'b S: ScalarRefValue<'b>,
{
fn resolve_async<'a>(
async fn resolve_async<'a>(
&'a self,
info: &'a Self::TypeInfo,
selection_set: Option<&'a [Selection<S>]>,
executor: &'a Executor<Self::Context, S>,
) -> crate::BoxFuture<'a, Value<S>> {
let f = resolve_into_list_async(executor, info, self.iter());
Box::pin(f)
info: &'a <Self as crate::GraphQLType<S>>::TypeInfo,
selection_set: Option<&'a [Selection<'a, S>]>,
executor: &'a Executor<'a, <Self as crate::GraphQLType<S>>::Context, S>,
) -> Value<S> {
resolve_into_list_async(executor, info, self.iter()).await
}
}
#[cfg(feature = "async")]
#[async_trait::async_trait]
impl<S, T, CtxT> crate::GraphQLTypeAsync<S> for &[T]
where
T: crate::GraphQLTypeAsync<S, Context = CtxT>,
@ -285,18 +286,18 @@ where
CtxT: Send + Sync,
for<'b> &'b S: ScalarRefValue<'b>,
{
fn resolve_async<'a>(
async fn resolve_async<'a>(
&'a self,
info: &'a Self::TypeInfo,
selection_set: Option<&'a [Selection<S>]>,
executor: &'a Executor<Self::Context, S>,
) -> crate::BoxFuture<'a, Value<S>> {
let f = resolve_into_list_async(executor, info, self.iter());
Box::pin(f)
info: &'a <Self as crate::GraphQLType<S>>::TypeInfo,
selection_set: Option<&'a [Selection<'a, S>]>,
executor: &'a Executor<'a, <Self as crate::GraphQLType<S>>::Context, S>,
) -> Value<S> {
resolve_into_list_async(executor, info, self.iter()).await
}
}
#[cfg(feature = "async")]
#[async_trait::async_trait]
impl<S, T, CtxT> crate::GraphQLTypeAsync<S> for Option<T>
where
T: crate::GraphQLTypeAsync<S, Context = CtxT>,
@ -305,18 +306,15 @@ where
CtxT: Send + Sync,
for<'b> &'b S: ScalarRefValue<'b>,
{
fn resolve_async<'a>(
async fn resolve_async<'a>(
&'a self,
info: &'a Self::TypeInfo,
selection_set: Option<&'a [Selection<S>]>,
executor: &'a Executor<Self::Context, S>,
) -> crate::BoxFuture<'a, Value<S>> {
let f = async move {
match *self {
Some(ref obj) => executor.resolve_into_value_async(info, obj).await,
None => Value::null(),
}
};
Box::pin(f)
info: &'a <Self as crate::GraphQLType<S>>::TypeInfo,
selection_set: Option<&'a [Selection<'a, S>]>,
executor: &'a Executor<'a, <Self as crate::GraphQLType<S>>::Context, S>,
) -> Value<S> {
match *self {
Some(ref obj) => executor.resolve_into_value_async(info, obj).await,
None => Value::null(),
}
}
}

38
juniper/src/types/pointers.rs
View file

@ -137,31 +137,43 @@ where
}
#[cfg(feature = "async")]
#[async_trait::async_trait]
impl<'e, S, T> crate::GraphQLTypeAsync<S> for &'e T
where
S: ScalarValue + Send + Sync,
T: crate::GraphQLTypeAsync<S>,
T::TypeInfo: Send + Sync,
T::Context: Send + Sync,
for<'b> &'b S: ScalarRefValue<'b>,
for<'c> &'c S: ScalarRefValue<'c>,
{
fn resolve_field_async<'b>(
async fn resolve_field_async<'b>(
&'b self,
info: &'b Self::TypeInfo,
info: &'b <Self as crate::GraphQLType<S>>::TypeInfo,
field_name: &'b str,
arguments: &'b Arguments<S>,
executor: &'b Executor<Self::Context, S>,
) -> crate::BoxFuture<'b, ExecutionResult<S>> {
crate::GraphQLTypeAsync::resolve_field_async(&**self, info, field_name, arguments, executor)
arguments: &'b Arguments<'b, S>,
executor: &'b Executor<'b, <Self as crate::GraphQLType<S>>::Context, S>,
) -> ExecutionResult<S> {
crate::GraphQLTypeAsync::resolve_field_async(
&**self,
info,
field_name,
arguments,
executor
).await
}
fn resolve_async<'a>(
async fn resolve_async<'a>(
&'a self,
info: &'a Self::TypeInfo,
selection_set: Option<&'a [Selection<S>]>,
executor: &'a Executor<Self::Context, S>,
) -> crate::BoxFuture<'a, Value<S>> {
crate::GraphQLTypeAsync::resolve_async(&**self, info, selection_set, executor)
info: &'a <Self as crate::GraphQLType<S>>::TypeInfo,
selection_set: Option<&'a [Selection<'a, S>]>,
executor: &'a Executor<'a, <Self as crate::GraphQLType<S>>::Context, S>,
) -> Value<S> {
crate::GraphQLTypeAsync::resolve_async(
&**self,
info,
selection_set,
executor
).await
}
}

14
juniper/src/types/scalars.rs
View file

@ -197,19 +197,19 @@ where
}
#[cfg(feature = "async")]
#[async_trait::async_trait]
impl<'e, S> crate::GraphQLTypeAsync<S> for &'e str
where
S: ScalarValue + Send + Sync,
for<'b> &'b S: ScalarRefValue<'b>,
{
fn resolve_async<'a>(
async fn resolve_async<'a>(
&'a self,
info: &'a Self::TypeInfo,
selection_set: Option<&'a [Selection<S>]>,
executor: &'a Executor<Self::Context, S>,
) -> crate::BoxFuture<'a, crate::Value<S>> {
use futures::future;
future::FutureExt::boxed(future::ready(self.resolve(info, selection_set, executor)))
info: &'a <Self as crate::GraphQLType<S>>::TypeInfo,
selection_set: Option<&'a [Selection<'a, S>]>,
executor: &'a Executor<'a, <Self as crate::GraphQLType<S>>::Context, S>,
) -> crate::Value<S> {
self.resolve(info, selection_set, executor)
}
}

8
juniper_codegen/src/derive_enum.rs
View file

@ -213,12 +213,16 @@ pub fn impl_enum(ast: &syn::DeriveInput, is_internal: bool) -> TokenStream {
__S: #juniper_path::ScalarValue + Send + Sync,
for<'__b> &'__b __S: #juniper_path::ScalarRefValue<'__b>
{
fn resolve_async<'a>(
fn resolve_async<'a, 'async_trait>(
&'a self,
info: &'a Self::TypeInfo,
selection_set: Option<&'a [#juniper_path::Selection<__S>]>,
executor: &'a #juniper_path::Executor<Self::Context, __S>,
) -> futures::future::BoxFuture<'a, #juniper_path::Value<__S>> {
) -> futures::future::BoxFuture<'async_trait, #juniper_path::Value<__S>>
where
'a: 'async_trait,
Self: 'async_trait
{
use #juniper_path::GraphQLType;
use futures::future;
let v = self.resolve(info, selection_set, executor);

9
juniper_codegen/src/util.rs
View file

@ -925,14 +925,17 @@ impl GraphQLTypeDefiniton {
impl#impl_generics #juniper_crate_name::GraphQLTypeAsync<#scalar> for #ty #type_generics_tokens
#where_async
{
fn resolve_field_async<'b>(
fn resolve_field_async<'b, 'async_trait>(
&'b self,
info: &'b Self::TypeInfo,
field: &'b str,
args: &'b #juniper_crate_name::Arguments<#scalar>,
executor: &'b #juniper_crate_name::Executor<Self::Context, #scalar>,
) -> futures::future::BoxFuture<'b, #juniper_crate_name::ExecutionResult<#scalar>>
where #scalar: Send + Sync,
) -> futures::future::BoxFuture<'async_trait, #juniper_crate_name::ExecutionResult<#scalar>>
where
#scalar: Send + Sync,
'b: 'async_trait,
Self: 'async_trait,
{
use futures::future;
use #juniper_crate_name::GraphQLType;