update GraphQL 4.6.0 (#743)

Author: SimonCropp

docs/configuration.md

@@ -333,7 +333,7 @@ A user context that exposes both types.
 <!-- snippet: MultiUserContext -->
 <a id='snippet-multiusercontext'></a>
 ```cs
-public class UserContext: Dictionary<string, object>
+public class UserContext: Dictionary<string, object?>
 {
     public UserContext(DbContext1 context1, DbContext2 context2)
     {
@@ -824,7 +824,7 @@ public class DerivedGraph :
     {
         AddNavigationConnectionField(
             name: "childrenFromInterface",
-            e => e.Source.ChildrenFromBase);
+            e => e.Source!.ChildrenFromBase);
         AutoMap();
         Interface<InterfaceGraph>();
         IsTypeOf = obj => obj is DerivedEntity;

docs/defining-graphs.md

@@ -95,10 +95,10 @@ public class CompanyGraph :
     {
         AddNavigationListField(
             name: "employees",
-            resolve: context => context.Source.Employees);
+            resolve: context => context.Source!.Employees);
         AddNavigationConnectionField(
             name: "employeesConnection",
-            resolve: context => context.Source.Employees,
+            resolve: context => context.Source!.Employees,
             includeNames: new[] {"Employees"});
         AutoMap();
     }
@@ -224,7 +224,7 @@ public class CompanyGraph :
     {
         AddNavigationConnectionField(
             name: "employees",
-            resolve: context => context.Source.Employees);
+            resolve: context => context.Source!.Employees);
     }
 }
 ```
@@ -327,7 +327,7 @@ Field<ListGraphType<EmployeeSummaryGraph>>(
 
         if (context.HasArgument("where"))
         {
-            var wheres = context.GetArgument<List<WhereExpression>>("where");
+            var wheres = context.GetArgument<List<WhereExpression>>("where")!;
 
             var predicate = ExpressionBuilder<Employee>.BuildPredicate(wheres);
             query = query.Where(predicate);

src/Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;NU5104;CS1573</NoWarn>
-    <Version>15.0.4</Version>
+    <Version>15.0.5</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PackageTags>EntityFrameworkCore, EntityFramework, GraphQL</PackageTags>
     <SignAssembly>false</SignAssembly>

src/GraphQL.EntityFramework/ComplexGraphResolver.cs

@@ -37,12 +37,12 @@ public static bool TryGetEntityTypeForField(this FieldType fieldType, [NotNullWh
     static Resolved GetOrAdd(FieldType fieldType)
     {
         return cache.GetOrAdd(
-            fieldType.ResolvedType,
+            fieldType.ResolvedType!,
             graphType =>
             {
                 if (graphType is ListGraphType listGraphType)
                 {
-                    graphType = listGraphType.ResolvedType;
+                    graphType = listGraphType.ResolvedType!;
                 }
 
                 if (graphType is UnionGraphType unionGraphType)
@@ -52,13 +52,13 @@ static Resolved GetOrAdd(FieldType fieldType)
 
                 if (graphType is NonNullGraphType nonNullGraphType)
                 {
-                    graphType = nonNullGraphType.ResolvedType;
+                    graphType = nonNullGraphType.ResolvedType!;
                     if (graphType is ListGraphType innerListGraphType)
                     {
-                        graphType = innerListGraphType.ResolvedType;
+                        graphType = innerListGraphType.ResolvedType!;
                         if (graphType is NonNullGraphType innerNonNullGraphType)
                         {
-                            graphType = innerNonNullGraphType.ResolvedType;
+                            graphType = innerNonNullGraphType.ResolvedType!;
                         }
 
                         if (graphType is UnionGraphType innerUnionGraphType)

src/GraphQL.EntityFramework/GraphApi/EfGraphQLService_NavigationList.cs

@@ -40,7 +40,7 @@ public FieldType AddNavigationListField<TSource, TReturn>(
                         var fieldContext = BuildContext(context);
                         var result = resolve(fieldContext);
                         result = result.ApplyGraphQlArguments(hasId, context);
-                        return fieldContext.Filters.ApplyFilter(result, context.UserContext);
+                        return fieldContext.Filters.ApplyFilter(result, context.UserContext)!;
                     });
             }
 

src/GraphQL.EntityFramework/GraphApi/EfGraphQLService_QueryableConnection.cs

@@ -80,9 +80,9 @@ void AddQueryableConnection<TSource, TGraph, TReturn>(
                         return query
                             .ApplyConnectionContext(
                                 context.First,
-                                context.After,
+                                context.After!,
                                 context.Last,
-                                context.Before,
+                                context.Before!,
                                 context,
                                 context.CancellationToken,
                                 efFieldContext.Filters);

src/GraphQL.EntityFramework/GraphQL.EntityFramework.csproj

@@ -7,7 +7,7 @@
     <PackageReference Include="ConfigureAwait.Fody" Version="3.3.1" PrivateAssets="All" />
     <PackageReference Include="Fody" Version="6.5.2" PrivateAssets="all" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
-    <PackageReference Include="GraphQL" Version="4.5.0" />
+    <PackageReference Include="GraphQL" Version="4.6.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.9" />
     <PackageReference Include="NullabilityInfo" Version="0.1.15" PrivateAssets="All" />

src/GraphQL.EntityFramework/IncludeAppender.cs

@@ -50,7 +50,7 @@ List<string> GetPaths(IResolveFieldContext context, IReadOnlyList<Navigation> na
     {
         List<string> list = new();
 
-        AddField(list, context.FieldAst, context.FieldAst.SelectionSet, null, context.FieldDefinition, navigationProperty, context);
+        AddField(list, context.FieldAst, context.FieldAst.SelectionSet!, null, context.FieldDefinition, navigationProperty, context);
 
         return list;
     }
@@ -66,7 +66,7 @@ void AddField(List<string> list, Field field, SelectionSet selectionSet, string?
 
         foreach (var inlineFragment in selectionSet.Selections.OfType<InlineFragment>())
         {
-            if (inlineFragment.Type.GraphTypeFromType(context.Schema) is IComplexGraphType graphFragment)
+            if (inlineFragment.Type!.GraphTypeFromType(context.Schema) is IComplexGraphType graphFragment)
             {
                 AddField(list, field, inlineFragment.SelectionSet, parentPath, fieldType, parentNavigationProperties, context, graphFragment);
             }
@@ -130,7 +130,7 @@ void ProcessSubFields(List<string> list, string? parentPath, ICollection<Field>
             var single = graph.Fields.SingleOrDefault(x => x.Name == subField.Name);
             if (single is not null)
             {
-                AddField(list, subField, subField.SelectionSet, parentPath, single, navigationProperties, context);
+                AddField(list, subField, subField.SelectionSet!, parentPath, single, navigationProperties, context);
             }
         }
     }
@@ -146,7 +146,7 @@ public static void SetIncludeMetadata(FieldType fieldType, string fieldName, IEn
         SetIncludeMetadata(fieldName, includeNames, fieldType.Metadata);
     }
 
-    static void SetIncludeMetadata(string fieldName, IEnumerable<string>? includeNames, IDictionary<string, object> metadata)
+    static void SetIncludeMetadata(string fieldName, IEnumerable<string>? includeNames, IDictionary<string, object?> metadata)
     {
         if (includeNames is null)
         {
@@ -167,7 +167,7 @@ static bool TryGetIncludeMetadata(FieldType fieldType, [NotNullWhen(true)] out s
     {
         if (fieldType.Metadata.TryGetValue("_EF_IncludeName", out var fieldNameObject))
         {
-            value = (string[])fieldNameObject;
+            value = (string[])fieldNameObject!;
             return true;
         }
 

src/GraphQL.EntityFramework/Mapping/SimpleFieldResolver.cs

@@ -14,6 +14,6 @@ public SimpleFieldResolver(Func<TSource, object> func)
 
     public object Resolve(IResolveFieldContext context)
     {
-        return func((TSource) context.Source);
+        return func((TSource) context.Source!);
     }
 }

src/GraphQL.EntityFramework/Where/ArgumentsAppender.cs

@@ -54,7 +54,7 @@ static QueryArgument<IntGraphType> takeArgument()
 
     public static void AddWhereArgument(this FieldType field, bool hasId, IEnumerable<QueryArgument>? extra)
     {
-        var arguments = field.Arguments;
+        var arguments = field.Arguments!;
         arguments.Add(whereArgument());
         arguments.Add(orderByArgument());
         if (hasId)