Skip to content

Commit 482b1d1

Browse files
sungam3rsungam3r
authored
Do not set resolvers for input and interface types (#259)
1 parent 0f9b620 commit 482b1d1

File tree

7 files changed

+22
-21
lines changed

7 files changed

+22
-21
lines changed

‎samples/DataLoaderWithEFCore/DataLoaderWithEFCore/DataLoaderWithEFCore.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0</TargetFrameworks>
55
<LangVersion>9.0</LangVersion>
66
</PropertyGroup>
7-
7+
88
<ItemGroup>
99
<Compile Remove="wwwroot\**" />
1010
<Content Remove="wwwroot\**" />
@@ -15,7 +15,7 @@
1515
<ItemGroup>
1616
<PackageReference Include="AutoMapper" Version="11.0.1" />
1717
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
18-
<PackageReference Include="GraphQL.DataLoader" Version="7.2.0" />
18+
<PackageReference Include="GraphQL.DataLoader" Version="7.4.1" />
1919
<PackageReference Include="GraphQL.Server.Ui.Playground" Version="7.1.1" />
2020
<ProjectReference Include="../../../src/GraphQL.Conventions/GraphQL.Conventions.csproj" />
2121
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.6" />

‎samples/SimpleWebApp.Tests/SimpleWebApp.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net7.0</TargetFramework>
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
1212
<PackageReference Include="xunit" Version="2.4.2" />
1313
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -22,6 +22,6 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<Using Include="Xunit"/>
25+
<Using Include="Xunit" />
2626
</ItemGroup>
2727
</Project>

‎samples/SubscriptionsGraphQLServer/SubscriptionExample/SubscriptionExample/SubscriptionExample.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="GraphQL.SystemTextJson" Version="7.2.0" />
13-
<PackageReference Include="GraphQL.MicrosoftDI" Version="7.2.0" />
12+
<PackageReference Include="GraphQL.SystemTextJson" Version="7.4.1" />
13+
<PackageReference Include="GraphQL.MicrosoftDI" Version="7.4.1" />
1414
<PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="7.1.1" />
1515
<PackageReference Include="GraphQL.Server.Ui.Playground" Version="7.1.1" />
1616
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.16.1" />

‎src/GraphQL.Conventions/Adapters/GraphTypeAdapter.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,12 @@ private IObjectGraphType DeriveOperationType(GraphTypeInfo typeInfo) =>
8686

8787
private FieldType DeriveField(GraphFieldInfo fieldInfo)
8888
{
89+
bool resolvable = fieldInfo.DeclaringType.IsOutputType && !fieldInfo.DeclaringType.IsInterfaceType;
90+
8991
if (fieldInfo.Type.IsObservable)
9092
{
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;
9395
return new FieldType
9496
{
9597
Name = fieldInfo.Name,
@@ -110,7 +112,7 @@ private FieldType DeriveField(GraphFieldInfo fieldInfo)
110112
DefaultValue = fieldInfo.DefaultValue,
111113
Type = GetType(fieldInfo.Type),
112114
Arguments = new QueryArguments(fieldInfo.Arguments.Where(arg => !arg.IsInjected).Select(DeriveArgument)),
113-
Resolver = FieldResolverFactory(fieldInfo),
115+
Resolver = resolvable ? FieldResolverFactory(fieldInfo) : null,
114116
};
115117
}
116118

‎src/GraphQL.Conventions/GraphQL.Conventions.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>GraphQL Conventions for .NET</Description>
5-
<VersionPrefix>7.2.0-preview</VersionPrefix>
5+
<VersionPrefix>7.2.1-preview</VersionPrefix>
66
<Authors>Tommy Lillehagen</Authors>
77
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
88
<LangVersion>9.0</LangVersion>
@@ -27,8 +27,8 @@
2727
</PropertyGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="GraphQL.DataLoader" Version="7.2.0" />
31-
<PackageReference Include="GraphQL.NewtonsoftJson" Version="7.2.0" />
30+
<PackageReference Include="GraphQL.DataLoader" Version="7.4.1" />
31+
<PackageReference Include="GraphQL.NewtonsoftJson" Version="7.4.1" />
3232
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
3333
</ItemGroup>
3434

‎test/GraphQL.Conventions.Tests/GraphQL.Conventions.Tests.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="GraphQL.DataLoader" Version="7.2.0" />
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
17-
<PackageReference Include="Microsoft.TestPlatform.TestHost" Version="17.2.0" />
15+
<PackageReference Include="GraphQL.DataLoader" Version="7.4.1" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
1817
<PackageReference Include="System.Reactive" Version="5.0.0" />
19-
<PackageReference Include="xunit" Version="2.4.1" />
20-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
18+
<PackageReference Include="xunit" Version="2.4.2" />
19+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
2120
<PrivateAssets>all</PrivateAssets>
2221
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2322
</PackageReference>

‎test/SubscriptionExample.Tests/SubscriptionExample.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
1212
<PackageReference Include="xunit" Version="2.4.2" />
1313
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

0 commit comments

Comments
 (0)