Pending changes and refactoring to get the project to build. Runtime errors are now WIP...

Author: Brandon Bernard

.github/copilot-instructions.md

@@ -0,0 +1,4 @@
+# Copilot Instructions
+
+## Project Guidelines
+- For this workspace/task, minimize code churn and keep the scope of changes narrow when modifying code.

GraphQL.RepoDb.SqlServer/GraphQLMiddleware/GraphQLRepoDbMappingMiddleware.cs

@@ -7,6 +7,7 @@
 using HotChocolate.Data.Projections.Context;
 using HotChocolate.ResolverProcessingExtensions;
 using RepoDb.SqlServer.PagingOperations.Reflection;
+using GraphQL.ResolverProcessingExtensions.Selections;
 
 namespace HotChocolate.RepoDb
 {
@@ -31,7 +32,7 @@ public async Task InvokeAsync(IMiddlewareContext context)
         {
             var field = context.GetSelectedField();
 
-            if (field.Field.ResolverMember is MethodInfo resolverMethod 
+            if (field.GetResolverMethodInfo() is MethodInfo resolverMethod 
                 && GetRepoDbMapperFactoryForResolver(resolverMethod) is { } repoDbMapperFactoryDelegate)
             {
                 //ONLY initialize/retrieve the  Params Context if the Resolver is requesting (via DI) the GraphQLRepoDbMapper0...

GraphQL.ResolverProcessingExtensions.Tests/GraphQL.ResolverProcessingExtensions.Tests.csproj

@@ -12,7 +12,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="10.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

GraphQL.ResolverProcessingExtensions.Tests/TestServers/GraphQLHelloWorldTestServer.cs

@@ -1,15 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using HotChocolate;
-using HotChocolate.AspNetCore.Extensions;
-using HotChocolate.AspNetCore.Serialization;
-using HotChocolate.Execution.Configuration;
-using HotChocolate.ResolverProcessingExtensions;
 using HotChocolate.ResolverProcessingExtensions.Tests.GraphQL;
-using HotChocolate.Resolvers;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace HotChocolate.ResolverProcessingExtensions.Tests

GraphQL.ResolverProcessingExtensions.Tests/TestServers/GraphQLStarWarsTestServer.cs

@@ -25,11 +25,11 @@ public GraphQLStarWarsTestServer(GraphQLTestServerFactory serverFactory)
                         .AddType<StarWarsDroid>()
                         .AddTypeExtension<HumanFieldResolvers>()
                         .AddSorting()
-                        .SetPagingOptions(new PagingOptions()
+                        .ModifyPagingOptions(options =>
                         {
-                            DefaultPageSize = 5,
-                            IncludeTotalCount = true,
-                            MaxPageSize = 10
+                            options.DefaultPageSize = 5;
+                            options.IncludeTotalCount = true;
+                            options.MaxPageSize = 10;
                         })
                         .AddResolverProcessingExtensions();
 

GraphQL.ResolverProcessingExtensions.Tests/UnitTests/GraphQLTestBase.cs

@@ -1,12 +1,4 @@
 using System;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.TestHost;
-using Microsoft.Extensions.DependencyInjection;
-using HotChocolate.ResolverProcessingExtensions.Tests.GraphQL;
-using HotChocolate.AspNetCore.Extensions;
-using HotChocolate.AspNetCore.Serialization;
-using HotChocolate.Execution.Configuration;
-using HotChocolate.Resolvers;
 
 namespace HotChocolate.ResolverProcessingExtensions.Tests
 {

…eProcessedResultsMiddlewareExtensions.cs …rProcessedResultsMiddlewareExtensions.csGraphQL.ResolverProcessingExtensions/GraphQLMiddleware/PreProcessedResultsMiddlewareExtensions.cs renamed to GraphQL.ResolverProcessingExtensions/GraphQLMiddleware/ResolverProcessedResultsMiddlewareExtensions.cs GraphQL.ResolverProcessingExtensions/GraphQLMiddleware/PreProcessedResultsMiddlewareExtensions.cs renamed to GraphQL.ResolverProcessingExtensions/GraphQLMiddleware/ResolverProcessedResultsMiddlewareExtensions.cs

@@ -5,6 +5,7 @@
 using System.Reflection;
 using System.Threading.Tasks;
 using HotChocolate.Data.Projections.Context;
+using GraphQL.ResolverProcessingExtensions.Selections;
 
 namespace HotChocolate.ResolverProcessingExtensions
 {
@@ -24,7 +25,7 @@ public async Task InvokeAsync(IMiddlewareContext context)
             IParamsContext paramsContextFacade = null;
 
             var field = context.GetSelectedField();
-            if (field.Field.ResolverMember is MethodInfo resolverMethod 
+            if (field.GetResolverMethodInfo() is MethodInfo resolverMethod 
                 && DoesResolverNeedGraphQLParamsContext(resolverMethod))
             {
                 paramsContextFacade = context.InitializeGraphQLParamsContextSafely();

…leware/PreProcessingResultsMiddleware.cs …e/ResolverProcessingResultsMiddleware.csGraphQL.ResolverProcessingExtensions/GraphQLMiddleware/PreProcessingResultsMiddleware.cs renamed to GraphQL.ResolverProcessingExtensions/GraphQLMiddleware/ResolverProcessingResultsMiddleware.cs GraphQL.ResolverProcessingExtensions/GraphQLMiddleware/PreProcessingResultsMiddleware.cs renamed to GraphQL.ResolverProcessingExtensions/GraphQLMiddleware/ResolverProcessingResultsMiddleware.cs

@@ -157,16 +157,14 @@ protected virtual IReadOnlyList<ResolverProcessingDependencyLink> GatherDependen
             var results = new List<ResolverProcessingDependencyLink>();
             foreach (var selectionField in AllSelectionFields)
             {
-                var contextData = selectionField?.graphqlFieldSelection?.Field?.ContextData;
-                if (contextData?.ContainsKey(ResolverProcessingParentDependencies.ContextDataKey) == true
-                    && contextData[ResolverProcessingParentDependencies.ContextDataKey] is IEnumerable<ResolverProcessingDependencyLink> dependencyLinks)
+                var dependenciesFeature = selectionField?.GraphQLSelectedField?.Field?.Features.Get<ResolverProcessingParentDependenciesFeature>();
+                if (dependenciesFeature?.Dependencies is IEnumerable<ResolverProcessingDependencyLink> dependencyLinks)
                 {
                     results.AddRange(dependencyLinks);
                 }
             }
 
             return results;
         }
-
     }
 }