Merge pull request #216 from kuzn-ilya/fix/issue-215

Add support for IDataLoaderResult<>

Author: tlil

src/GraphQL.Conventions/Attributes/MetaData/NameAttribute.cs

@@ -7,6 +7,7 @@
 using GraphQL.Conventions.Attributes.MetaData.Utilities;
 using GraphQL.Conventions.Types.Descriptors;
 using GraphQL.Conventions.Types.Resolution.Extensions;
+using GraphQL.DataLoader;
 
 // ReSharper disable once CheckNamespace
 namespace GraphQL.Conventions
@@ -62,6 +63,11 @@ public override void MapType(GraphTypeInfo type, TypeInfo typeInfo)
  return;
  }
 
+ while (typeInfo.IsGenericType(typeof(IDataLoaderResult<>)))
+ {
+ typeInfo = typeInfo.TypeParameter();
+ }
+
  if (typeInfo.IsGenericType(typeof(Task<>)))
  {
  typeInfo = typeInfo.TypeParameter();

src/GraphQL.Conventions/Types/Descriptors/GraphTypeInfo.cs

@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using GraphQL.Conventions.Types.Resolution;
 using GraphQL.Conventions.Types.Resolution.Extensions;
+using GraphQL.DataLoader;
 
 namespace GraphQL.Conventions.Types.Descriptors
 {
@@ -108,6 +109,11 @@ private void DeriveMetaData()
  {
  var type = TypeRepresentation;
 
+ while (type.IsGenericType(typeof(IDataLoaderResult<>)))
+ {
+ type = type.TypeParameter();
+ }
+
  if (type.IsGenericType(typeof(Task<>)))
  {
  IsTask = true;

src/GraphQL.Conventions/Types/Resolution/Extensions/ReflectionExtensions.cs

@@ -7,6 +7,7 @@
 using System.Threading.Tasks;
 using GraphQL.Conventions.Extensions;
 using GraphQL.Conventions.Types.Descriptors;
+using GraphQL.DataLoader;
 
 namespace GraphQL.Conventions.Types.Resolution.Extensions
 {
@@ -82,6 +83,11 @@ public static async Task<object> GetTaskResult(this object obj)
 
  public static TypeInfo GetTypeRepresentation(this TypeInfo typeInfo)
  {
+ while (typeInfo.IsGenericType(typeof(IDataLoaderResult<>)))
+ {
+ typeInfo = typeInfo.TypeParameter();
+ }
+
  if (typeInfo.IsGenericType(typeof(Task<>)))
  {
  typeInfo = typeInfo.TypeParameter();

src/GraphQL.Conventions/Types/Resolution/ObjectReflector.cs

@@ -7,6 +7,7 @@
 using GraphQL.Conventions.Handlers;
 using GraphQL.Conventions.Types.Descriptors;
 using GraphQL.Conventions.Types.Resolution.Extensions;
+using GraphQL.DataLoader;
 
 namespace GraphQL.Conventions.Types.Resolution
 {
@@ -80,6 +81,11 @@ public GraphSchemaInfo GetSchema(TypeInfo typeInfo)
 
  public GraphTypeInfo GetType(TypeInfo typeInfo, bool isInjected = false)
  {
+ while (typeInfo.IsGenericType(typeof(IDataLoaderResult<>)))
+ {
+ typeInfo = typeInfo.TypeParameter();
+ }
+
  if (typeInfo.IsGenericType(typeof(Task<>)))
  {
  typeInfo = typeInfo.TypeParameter();

test/GraphQL.Conventions.Tests/Execution/DataLoaderResultUnwrappingTests.cs

@@ -0,0 +1,58 @@
+using System.Threading.Tasks;
+using GraphQL.Conventions;
+using GraphQL.DataLoader;
+using GraphQL.NewtonsoftJson;
+using Tests.Templates;
+
+namespace Tests.Execution
+{
+ public class DataLoaderResultUnwrappingTests : ConstructionTestBase
+ {
+ [Test]
+ public async Task Schema_Will_Execute_With_No_Errors_When_A_Type_Is_In_A_IDataLoaderResult()
+ {
+ const string query = @"{
+ dataLoaderResult
+ nestedDataLoaderResult
+ anEnum
+ nestedEnum
+ namedResult
+ resultProperty
+ }";
+
+ var schema = Schema<BugReproSchemaDataLoaderResult>();
+
+ var result = await schema.ExecuteAsync((e) => e.Query = query);
+ ResultHelpers.AssertNoErrorsInResult(result);
+ }
+
+ private class BugReproSchemaDataLoaderResult
+ {
+ public BugReproQueryDataLoaderResult Query { get; }
+ }
+
+ public enum BugReproQueryDataLoaderResultEnum
+ {
+ Zero,
+ One
+ }
+
+ private class BugReproQueryDataLoaderResult
+ {
+ public IDataLoaderResult<string> DataLoaderResult() => new DataLoaderResult<string>("Test");
+
+ public IDataLoaderResult<IDataLoaderResult<string>> NestedDataLoaderResult() => new DataLoaderResult<IDataLoaderResult<string>>(new DataLoaderResult<string>("Test"));
+
+ public IDataLoaderResult<BugReproQueryDataLoaderResultEnum> AnEnum() => new DataLoaderResult<BugReproQueryDataLoaderResultEnum>(BugReproQueryDataLoaderResultEnum.One);
+
+ public IDataLoaderResult<IDataLoaderResult<BugReproQueryDataLoaderResultEnum>> NestedEnum() => new DataLoaderResult<IDataLoaderResult<BugReproQueryDataLoaderResultEnum>>(new DataLoaderResult<BugReproQueryDataLoaderResultEnum>(BugReproQueryDataLoaderResultEnum.One));
+
+ [Name("namedResult")]
+ public IDataLoaderResult<int> ANamedResult() => new DataLoaderResult<int>(100500);
+
+ public IDataLoaderResult<int> ResultProperty => new DataLoaderResult<int>(100500);
+
+ public IDataLoaderResult<int> ResultField = new DataLoaderResult<int>(100500);
+ }
+ }
+}