Skip to content
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

Jump to bottom

Fixed issues with async node resolvers. #2493

Merged
merged 1 commit into from
Oct 27, 2020
Merged

Fixed issues with async node resolvers. #2493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/INodeDescriptor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public interface INodeDescriptor : IDescriptor
NodeResolverDelegate<object, TId> fieldResolver);

IObjectFieldDescriptor ResolveNodeWith<TResolver>(
Expression<Func<TResolver, object>> method);
Expression<Func<TResolver, object?>> method);

IObjectFieldDescriptor ResolveNodeWith<TResolver>();

Expand Down
2 changes: 1 addition & 1 deletion src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/INodeDescriptor~1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public interface INodeDescriptor<TNode> : IDescriptor
NodeResolverDelegate<object, TId> fieldResolver);

IObjectFieldDescriptor ResolveNodeWith<TResolver>(
Expression<Func<TResolver, TNode>> method);
Expression<Func<TResolver, object?>> method);

IObjectFieldDescriptor ResolveNodeWith<TResolver>();

Expand Down
2 changes: 1 addition & 1 deletion src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/INodeDescriptor~2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public interface INodeDescriptor<TNode, out TId> : IDescriptor
NodeResolverDelegate<TNode, TId> fieldResolver);

IObjectFieldDescriptor ResolveNodeWith<TResolver>(
Expression<Func<TResolver, TNode>> method);
Expression<Func<TResolver, object?>> method);

IObjectFieldDescriptor ResolveNodeWith<TResolver>();

Expand Down
4 changes: 2 additions & 2 deletions src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/NodeDescriptor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ public INodeDescriptor IdField(MemberInfo propertyOrMethod)
public IObjectFieldDescriptor ResolveNodeWith<TResolver>() =>
ResolveNodeWith(Context.TypeInspector.GetNodeResolverMethod(
Definition.NodeType ?? typeof(TResolver),
typeof(TResolver)));
typeof(TResolver))!);

public IObjectFieldDescriptor ResolveNodeWith(Type type) =>
ResolveNodeWith(Context.TypeInspector.GetNodeResolverMethod(
Definition.NodeType ?? type,
type));
type)!);
}
}
2 changes: 1 addition & 1 deletion src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/NodeDescriptorBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ protected NodeDescriptorBase(IDescriptorContext context)
}

public IObjectFieldDescriptor ResolveNodeWith<TResolver>(
Expression<Func<TResolver, object>> method)
Expression<Func<TResolver, object?>> method)
{
if (method is null)
{
Expand Down
28 changes: 2 additions & 26 deletions src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/NodeDescriptor~1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,38 +108,14 @@ public INodeDescriptor<TNode> IdField(MemberInfo propertyOrMethod)
ResolveNode<TId>(
async (ctx, id) => (await nodeResolver(ctx, id).ConfigureAwait(false))!);

public IObjectFieldDescriptor ResolveNodeWith<TResolver>(
Expression<Func<TResolver, TNode>> method)
{
if (method is null)
{
throw new ArgumentNullException(nameof(method));
}

MemberInfo member = method.TryExtractMember();

if (member is MethodInfo m)
{
FieldResolver resolver =
ResolverCompiler.Resolve.Compile(
new ResolverDescriptor(
typeof(TResolver),
typeof(object),
new FieldMember("_", "_", m)));
return ResolveNode(resolver.Resolver);
}

throw new ArgumentException(NodeDescriptor_MustBeMethod, nameof(member));
}

public IObjectFieldDescriptor ResolveNodeWith<TResolver>() =>
ResolveNodeWith(Context.TypeInspector.GetNodeResolverMethod(
typeof(TNode),
typeof(TResolver)));
typeof(TResolver))!);

public IObjectFieldDescriptor ResolveNodeWith(Type type) =>
ResolveNodeWith(Context.TypeInspector.GetNodeResolverMethod(
typeof(TNode),
type));
type)!);
}
}
6 changes: 3 additions & 3 deletions src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/NodeDescriptor~2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public class NodeDescriptor<TNode, TId> : INodeDescriptor<TNode, TId>
});

public IObjectFieldDescriptor ResolveNodeWith<TResolver>(
Expression<Func<TResolver, TNode>> method)
Expression<Func<TResolver, object?>> method)
{
if (method is null)
{
Expand Down Expand Up @@ -102,11 +102,11 @@ public class NodeDescriptor<TNode, TId> : INodeDescriptor<TNode, TId>
public IObjectFieldDescriptor ResolveNodeWith<TResolver>() =>
ResolveNodeWith(Context.TypeInspector.GetNodeResolverMethod(
typeof(TNode),
typeof(TResolver)));
typeof(TResolver))!);

public IObjectFieldDescriptor ResolveNodeWith(Type type) =>
ResolveNodeWith(Context.TypeInspector.GetNodeResolverMethod(
typeof(TNode),
type));
type)!);
}
}