Do not set resolvers for input and interface types (#259)

sungam3r · web-flow · commit 482b1d17ce9f · 2023-05-05T12:50:04.000+01:00
diff --git a/samples/DataLoaderWithEFCore/DataLoaderWithEFCore/DataLoaderWithEFCore.csproj b/samples/DataLoaderWithEFCore/DataLoaderWithEFCore/DataLoaderWithEFCore.csproj
@@ -1,10 +1,10 @@
-﻿<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>  
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <LangVersion>9.0</LangVersion>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <Compile Remove="wwwroot\**" />
     <Content Remove="wwwroot\**" />
@@ -15,7 +15,7 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="11.0.1" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
-    <PackageReference Include="GraphQL.DataLoader" Version="7.2.0" />
+    <PackageReference Include="GraphQL.DataLoader" Version="7.4.1" />
     <PackageReference Include="GraphQL.Server.Ui.Playground" Version="7.1.1" />
     <ProjectReference Include="../../../src/GraphQL.Conventions/GraphQL.Conventions.csproj" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.6" />
diff --git a/samples/SimpleWebApp.Tests/SimpleWebApp.Tests.csproj b/samples/SimpleWebApp.Tests/SimpleWebApp.Tests.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -22,6 +22,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Using Include="Xunit"/>
+    <Using Include="Xunit" />
   </ItemGroup>
 </Project>
diff --git a/samples/SubscriptionsGraphQLServer/SubscriptionExample/SubscriptionExample/SubscriptionExample.csproj b/samples/SubscriptionsGraphQLServer/SubscriptionExample/SubscriptionExample/SubscriptionExample.csproj
@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL.SystemTextJson" Version="7.2.0" />
-    <PackageReference Include="GraphQL.MicrosoftDI" Version="7.2.0" />
+    <PackageReference Include="GraphQL.SystemTextJson" Version="7.4.1" />
+    <PackageReference Include="GraphQL.MicrosoftDI" Version="7.4.1" />
     <PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="7.1.1" />
     <PackageReference Include="GraphQL.Server.Ui.Playground" Version="7.1.1" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.16.1" />
diff --git a/src/GraphQL.Conventions/Adapters/GraphTypeAdapter.cs b/src/GraphQL.Conventions/Adapters/GraphTypeAdapter.cs
@@ -86,10 +86,12 @@ private IObjectGraphType DeriveOperationType(GraphTypeInfo typeInfo) =>
 
         private FieldType DeriveField(GraphFieldInfo fieldInfo)
         {
+            bool resolvable = fieldInfo.DeclaringType.IsOutputType && !fieldInfo.DeclaringType.IsInterfaceType;
+
             if (fieldInfo.Type.IsObservable)
             {
-                var resolver = FieldResolverFactory(fieldInfo);
-                var streamResolver = new EventStreamResolver(resolver);
+                var resolver = resolvable ? FieldResolverFactory(fieldInfo) : null;
+                var streamResolver = resolvable ? new EventStreamResolver(resolver) : null;
                 return new FieldType
                 {
                     Name = fieldInfo.Name,
@@ -110,7 +112,7 @@ private FieldType DeriveField(GraphFieldInfo fieldInfo)
                 DefaultValue = fieldInfo.DefaultValue,
                 Type = GetType(fieldInfo.Type),
                 Arguments = new QueryArguments(fieldInfo.Arguments.Where(arg => !arg.IsInjected).Select(DeriveArgument)),
-                Resolver = FieldResolverFactory(fieldInfo),
+                Resolver = resolvable ? FieldResolverFactory(fieldInfo) : null,
             };
         }
 
diff --git a/src/GraphQL.Conventions/GraphQL.Conventions.csproj b/src/GraphQL.Conventions/GraphQL.Conventions.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>GraphQL Conventions for .NET</Description>
-    <VersionPrefix>7.2.0-preview</VersionPrefix>
+    <VersionPrefix>7.2.1-preview</VersionPrefix>
     <Authors>Tommy Lillehagen</Authors>
     <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
     <LangVersion>9.0</LangVersion>
@@ -27,8 +27,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL.DataLoader" Version="7.2.0" />
-    <PackageReference Include="GraphQL.NewtonsoftJson" Version="7.2.0" />
+    <PackageReference Include="GraphQL.DataLoader" Version="7.4.1" />
+    <PackageReference Include="GraphQL.NewtonsoftJson" Version="7.4.1" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/test/GraphQL.Conventions.Tests/GraphQL.Conventions.Tests.csproj b/test/GraphQL.Conventions.Tests/GraphQL.Conventions.Tests.csproj
@@ -12,12 +12,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL.DataLoader" Version="7.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="17.2.0" />
+    <PackageReference Include="GraphQL.DataLoader" Version="7.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="System.Reactive" Version="5.0.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/test/SubscriptionExample.Tests/SubscriptionExample.Tests.csproj b/test/SubscriptionExample.Tests/SubscriptionExample.Tests.csproj
@@ -8,7 +8,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
 		<PackageReference Include="xunit" Version="2.4.2" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Original file line number	Diff line number	Diff line change
`@@ -86,10 +86,12 @@ private IObjectGraphType DeriveOperationType(GraphTypeInfo typeInfo) =>`
`86`	`86`
`87`	`87`	`private FieldType DeriveField(GraphFieldInfo fieldInfo)`
`88`	`88`	`{`
	`89`	`+ bool resolvable = fieldInfo.DeclaringType.IsOutputType && !fieldInfo.DeclaringType.IsInterfaceType;`
	`90`	`+`
`89`	`91`	`if (fieldInfo.Type.IsObservable)`
`90`	`92`	`{`
`91`		`- var resolver = FieldResolverFactory(fieldInfo);`
`92`		`- var streamResolver = new EventStreamResolver(resolver);`
	`93`	`+ var resolver = resolvable ? FieldResolverFactory(fieldInfo) : null;`
	`94`	`+ var streamResolver = resolvable ? new EventStreamResolver(resolver) : null;`
`93`	`95`	`return new FieldType`
`94`	`96`	`{`
`95`	`97`	`Name = fieldInfo.Name,`
`@@ -110,7 +112,7 @@ private FieldType DeriveField(GraphFieldInfo fieldInfo)`
`110`	`112`	`DefaultValue = fieldInfo.DefaultValue,`
`111`	`113`	`Type = GetType(fieldInfo.Type),`
`112`	`114`	`Arguments = new QueryArguments(fieldInfo.Arguments.Where(arg => !arg.IsInjected).Select(DeriveArgument)),`
`113`		`- Resolver = FieldResolverFactory(fieldInfo),`
	`115`	`+ Resolver = resolvable ? FieldResolverFactory(fieldInfo) : null,`
`114`	`116`	`};`
`115`	`117`	`}`
`116`	`118`