Detect Pure Resolver Properly with new Resolver Compiler (#7181)

ChilliCream · Jun 20, 2024 · 7b5dd10 · 7b5dd10
1 parent a4fc933
commit 7b5dd10
Show file tree

Hide file tree

Showing 35 changed files with 817 additions and 504 deletions.
diff --git a/src/HotChocolate/Core/src/Abstractions/ErrorBuilder.cs b/src/HotChocolate/Core/src/Abstractions/ErrorBuilder.cs
@@ -53,6 +53,7 @@ public IErrorBuilder SetMessage(string message)
                 AbstractionResources.Error_Message_Must_Not_Be_Null,
                 nameof(message));
         }
+
         _message = message;
         return this;
     }
@@ -110,7 +111,17 @@ public IErrorBuilder AddLocation(Location location)
     public IErrorBuilder AddLocation(int line, int column) =>
         AddLocation(new Location(line, column));
 
-    public IErrorBuilder AddLocation<T>(IReadOnlyList<T>? syntaxNodes) where T : ISyntaxNode
+    public IErrorBuilder AddLocation(ISyntaxNode syntaxNode)
+    {
+        if (syntaxNode.Location is { } location)
+        {
+            AddLocation(location.Line, location.Column);
+        }
+
+        return this;
+    }
+
+    public IErrorBuilder SetLocations<T>(IReadOnlyList<T>? syntaxNodes) where T : ISyntaxNode
     {
         if (syntaxNodes is null)
         {

diff --git a/src/HotChocolate/Core/src/Abstractions/IErrorBuilder.cs b/src/HotChocolate/Core/src/Abstractions/IErrorBuilder.cs
@@ -22,7 +22,9 @@ public interface IErrorBuilder
 
     IErrorBuilder AddLocation(int line, int column);
 
-    IErrorBuilder AddLocation<T>(IReadOnlyList<T>? syntaxNodes) where T : ISyntaxNode;
+    IErrorBuilder AddLocation(ISyntaxNode syntaxNode);
+
+    IErrorBuilder SetLocations<T>(IReadOnlyList<T>? syntaxNodes) where T : ISyntaxNode;
 
     IErrorBuilder ClearLocations();
 

diff --git a/src/HotChocolate/Core/src/Authorization/AuthorizeMiddleware.cs b/src/HotChocolate/Core/src/Authorization/AuthorizeMiddleware.cs
@@ -81,7 +81,7 @@ private void SetError(
                     .SetMessage(AuthorizeMiddleware_NoDefaultPolicy)
                     .SetCode(ErrorCodes.Authentication.NoDefaultPolicy)
                     .SetPath(context.Path)
-                    .AddLocation([context.Selection.SyntaxNode])
+                    .SetLocations([context.Selection.SyntaxNode])
                     .Build(),
             AuthorizeResult.PolicyNotFound
                 => ErrorBuilder.New()
@@ -90,7 +90,7 @@ private void SetError(
                         _directive.Policy!)
                     .SetCode(ErrorCodes.Authentication.PolicyNotFound)
                     .SetPath(context.Path)
-                    .AddLocation([context.Selection.SyntaxNode])
+                    .SetLocations([context.Selection.SyntaxNode])
                     .Build(),
             _
                 => ErrorBuilder.New()
@@ -100,7 +100,7 @@ private void SetError(
                             ? ErrorCodes.Authentication.NotAuthorized
                             : ErrorCodes.Authentication.NotAuthenticated)
                     .SetPath(context.Path)
-                    .AddLocation([context.Selection.SyntaxNode])
+                    .SetLocations([context.Selection.SyntaxNode])
                     .Build(),
         };
 }
diff --git a/src/HotChocolate/Core/src/Execution/ErrorHelper.cs b/src/HotChocolate/Core/src/Execution/ErrorHelper.cs
@@ -18,7 +18,7 @@ public static IError ArgumentNonNullError(
             .SetMessage(
                 ErrorHelper_ArgumentNonNullError_Message,
                 argument.Name.Value)
-            .AddLocation([argument])
+            .SetLocations([argument])
             .SetExtension("responseName", responseName)
             .SetExtension("errorPath", validationResult.Path)
             .Build();
@@ -30,7 +30,7 @@ public static IError ArgumentValueIsInvalid(
         GraphQLException exception)
     {
         return ErrorBuilder.FromError(exception.Errors[0])
-            .AddLocation([argument])
+            .SetLocations([argument])
             .SetExtension("responseName", responseName)
             .Build();
     }
@@ -50,7 +50,7 @@ public static IError InvalidLeafValue(
         Path path)
     {
         return ErrorBuilder.FromError(exception.Errors[0])
-            .AddLocation([field])
+            .SetLocations([field])
             .SetPath(path)
             .SetCode(ErrorCodes.Execution.CannotSerializeLeafValue)
             .Build();
@@ -64,7 +64,7 @@ public static IError UnexpectedLeafValueSerializationError(
     {
         return errorHandler
             .CreateUnexpectedError(exception)
-            .AddLocation([field])
+            .SetLocations([field])
             .SetPath(path)
             .SetCode(ErrorCodes.Execution.CannotSerializeLeafValue)
             .Build();
@@ -77,7 +77,7 @@ public static IError UnableToResolveTheAbstractType(
     {
         return ErrorBuilder.New()
             .SetMessage(ErrorHelper_UnableToResolveTheAbstractType_Message, typeName)
-            .AddLocation([field])
+            .SetLocations([field])
             .SetPath(path)
             .SetCode(ErrorCodes.Execution.CannotResolveAbstractType)
             .Build();
@@ -91,7 +91,7 @@ public static IError UnexpectedErrorWhileResolvingAbstractType(
     {
         return ErrorBuilder.New()
             .SetMessage(ErrorHelper_UnableToResolveTheAbstractType_Message, typeName)
-            .AddLocation([field])
+            .SetLocations([field])
             .SetPath(path)
             .SetCode(ErrorCodes.Execution.CannotResolveAbstractType)
             .SetException(exception)
@@ -105,7 +105,7 @@ public static IError ListValueIsNotSupported(
     {
         return ErrorBuilder.New()
             .SetMessage(ErrorHelper_ListValueIsNotSupported_Message, listType.FullName!)
-            .AddLocation([field])
+            .SetLocations([field])
             .SetPath(path)
             .SetCode(ErrorCodes.Execution.ListTypeNotSupported)
             .Build();
@@ -117,7 +117,7 @@ public static IError UnexpectedValueCompletionError(
     {
         return ErrorBuilder.New()
             .SetMessage(ErrorHelper_UnexpectedValueCompletionError_Message)
-            .AddLocation([field])
+            .SetLocations([field])
             .SetPath(path)
             .SetCode(ErrorCodes.Execution.ListTypeNotSupported)
             .Build();
@@ -161,7 +161,7 @@ public static IError ValueCompletion_CouldNotResolveAbstractType(
                 result.GetType().FullName ?? result.GetType().Name,
                 field.Name)
             .SetPath(path)
-            .AddLocation([field])
+            .SetLocations([field])
             .Build();
 
     public static IOperationResult StateInvalidForDocumentValidation() =>
@@ -237,7 +237,7 @@ public static IError NonNullOutputFieldViolation(Path? path, FieldNode selection
             .SetMessage("Cannot return null for non-nullable field.")
             .SetCode(ErrorCodes.Execution.NonNullViolation)
             .SetPath(path)
-            .AddLocation([selection])
+            .SetLocations([selection])
             .Build();
 
     public static IError PersistedQueryNotFound(OperationDocumentId requestedKey)
@@ -264,7 +264,7 @@ public static IError NoNullBubbling_ArgumentValue_NotAllowed(
         ArgumentNode argument)
     {
         var errorBuilder = ErrorBuilder.New();
-        errorBuilder.AddLocation([argument.Value]);
+        errorBuilder.SetLocations([argument.Value]);
         errorBuilder.SetMessage(ErrorHelper_NoNullBubbling_ArgumentValue_NotAllowed);
 
         return errorBuilder.Build();

diff --git a/src/HotChocolate/Core/src/Execution/Extensions/OperationContextExtensions.cs b/src/HotChocolate/Core/src/Execution/Extensions/OperationContextExtensions.cs
@@ -34,7 +34,7 @@ public static OperationContext ReportError(
             var error = operationContext.ErrorHandler
                 .CreateUnexpectedError(exception)
                 .SetPath(path)
-                .AddLocation([selection.SyntaxNode])
+                .SetLocations([selection.SyntaxNode])
                 .Build();
 
             ReportError(operationContext, error, resolverContext, selection);

diff --git a/src/HotChocolate/Core/src/Execution/Processing/MiddlewareContext.Global.cs b/src/HotChocolate/Core/src/Execution/Processing/MiddlewareContext.Global.cs
@@ -59,7 +59,7 @@ public void ReportError(string errorMessage)
             ErrorBuilder.New()
                 .SetMessage(errorMessage)
                 .SetPath(Path)
-                .AddLocation([_selection.SyntaxNode])
+                .SetLocations([_selection.SyntaxNode])
                 .Build());
     }
 
@@ -89,7 +89,7 @@ public void ReportError(Exception exception, Action<IErrorBuilder>? configure =
             var errorBuilder = _operationContext.ErrorHandler
                 .CreateUnexpectedError(exception)
                 .SetPath(Path)
-                .AddLocation([_selection.SyntaxNode]);
+                .SetLocations([_selection.SyntaxNode]);
 
             configure?.Invoke(errorBuilder);
 

diff --git a/src/HotChocolate/Core/src/Execution/ThrowHelper.cs b/src/HotChocolate/Core/src/Execution/ThrowHelper.cs
@@ -19,7 +19,7 @@ public static GraphQLException VariableIsNotAnInputType(
                 .SetCode(ErrorCodes.Execution.MustBeInputType)
                 .SetExtension("variable", variableDefinition.Variable.Name.Value)
                 .SetExtension("type", variableDefinition.Type.ToString())
-                .AddLocation([variableDefinition])
+                .SetLocations([variableDefinition])
                 .Build());
     }
 
@@ -33,7 +33,7 @@ public static GraphQLException NonNullVariableIsNull(
                     variableDefinition.Variable.Name.Value)
                 .SetCode(ErrorCodes.Execution.NonNullViolation)
                 .SetExtension("variable", variableDefinition.Variable.Name.Value)
-                .AddLocation([variableDefinition])
+                .SetLocations([variableDefinition])
                 .Build());
     }
 
@@ -51,7 +51,7 @@ public static GraphQLException VariableValueInvalidType(
                 variableDefinition.Variable.Name.Value)
             .SetCode(ErrorCodes.Execution.InvalidType)
             .SetExtension("variable", variableDefinition.Variable.Name.Value)
-            .AddLocation([variableDefinition]);
+            .SetLocations([variableDefinition]);
 
         if (exception is not null)
         {
@@ -75,7 +75,7 @@ public static GraphQLException FieldDoesNotExistOnType(
                     ThrowHelper_FieldDoesNotExistOnType,
                     selection.Name.Value,
                     typeName)
-                .AddLocation([selection])
+                .SetLocations([selection])
                 .Build());
     }
 
@@ -126,7 +126,7 @@ public static GraphQLException ResolverContext_LiteralsNotSupported(
         new(ErrorBuilder.New()
             .SetMessage(ThrowHelper_ResolverContext_LiteralsNotSupported_Message)
             .SetPath(path)
-            .AddLocation([field])
+            .SetLocations([field])
             .SetExtension("fieldName", field.Name)
             .SetExtension("argumentName", argumentName)
             .SetExtension("requestedType", requestedType.FullName)
@@ -140,7 +140,7 @@ public static GraphQLException ResolverContext_CannotConvertArgument(
                 argumentName,
                 requestedType.FullName ?? requestedType.Name)
             .SetPath(path)
-            .AddLocation([field])
+            .SetLocations([field])
             .SetExtension("fieldName", field.Name)
             .SetExtension("argumentName", argumentName)
             .SetExtension("requestedType", requestedType.FullName)
@@ -155,7 +155,7 @@ public static GraphQLException ResolverContext_LiteralNotCompatible(
                 actualType.FullName ?? actualType.Name,
                 requestedType.FullName ?? actualType.Name)
             .SetPath(path)
-            .AddLocation([field])
+            .SetLocations([field])
             .SetExtension("fieldName", field.Name)
             .SetExtension("argumentName", argumentName)
             .SetExtension("requestedType", requestedType.FullName)
@@ -170,7 +170,7 @@ public static GraphQLException ResolverContext_ArgumentDoesNotExist(
                 argumentName,
                 field.Name.Value)
             .SetPath(path)
-            .AddLocation([field])
+            .SetLocations([field])
             .SetExtension("fieldName", field.Name)
             .SetExtension("argumentName", argumentName)
             .Build());
@@ -183,15 +183,15 @@ public static GraphQLException OperationResolverHelper_NoOperationFound(
         DocumentNode documentNode) =>
         new(ErrorBuilder.New()
             .SetMessage(ThrowHelper_OperationResolverHelper_NoOperationFound_Message)
-            .AddLocation([documentNode])
+            .SetLocations([documentNode])
             .Build());
 
     public static GraphQLException OperationResolverHelper_MultipleOperation(
         OperationDefinitionNode firstOperation,
         OperationDefinitionNode secondOperation) =>
         new(ErrorBuilder.New()
             .SetMessage(ThrowHelper_OperationResolverHelper_MultipleOperation_Message)
-            .AddLocation([firstOperation, secondOperation])
+            .SetLocations([firstOperation, secondOperation])
             .Build());
 
     public static GraphQLException OperationResolverHelper_InvalidOperationName(
@@ -200,7 +200,7 @@ public static GraphQLException OperationResolverHelper_InvalidOperationName(
             .SetMessage(
                 ThrowHelper_OperationResolverHelper_InvalidOperationName_Message,
                 operationName)
-            .AddLocation([documentNode])
+            .SetLocations([documentNode])
             .SetExtension("operationName", operationName)
             .Build());
 
@@ -220,20 +220,20 @@ public static GraphQLException CollectVariablesVisitor_NoCompatibleType(
             .SetMessage(ThrowHelper_CollectVariablesVisitor_NoCompatibleType_Message)
             .SetCode(ErrorCodes.Execution.AutoMapVarError)
             .SetPath(path)
-            .AddLocation([node])
+            .SetLocations([node])
             .Build());
 
     public static GraphQLException FieldVisibility_ValueNotSupported(IValueNode value) =>
         new(ErrorBuilder.New()
             .SetMessage(ThrowHelper_FieldVisibility_ValueNotSupported_Message)
-            .AddLocation([value])
+            .SetLocations([value])
             .Build());
 
     public static GraphQLException QueryCompiler_CompositeTypeSelectionSet(
         FieldNode selection) =>
         new(ErrorBuilder.New()
             .SetMessage(ThrowHelper_QueryCompiler_CompositeTypeSelectionSet_Message)
-            .AddLocation([selection])
+            .SetLocations([selection])
             .Build());
 
     public static GraphQLException OperationExecutionMiddleware_NoBatchDispatcher() =>

diff --git a/src/HotChocolate/Core/src/Types.Analyzers/FileBuilders/ObjectTypeExtensionFileBuilder.cs b/src/HotChocolate/Core/src/Types.Analyzers/FileBuilders/ObjectTypeExtensionFileBuilder.cs
@@ -1,7 +1,6 @@
 using System.Text;
 using HotChocolate.Types.Analyzers.Helpers;
 using HotChocolate.Types.Analyzers.Models;
-using Microsoft.CodeAnalysis;
 
 namespace HotChocolate.Types.Analyzers.FileBuilders;
 
@@ -53,7 +52,7 @@ public void WriteInitializeMethod(ObjectTypeExtensionInfo objectTypeExtension)
 
         using (_writer.IncreaseIndent())
         {
-            if (objectTypeExtension.Members.Length > 0)
+            if (objectTypeExtension.Resolvers.Length > 0)
             {
                 _writer.WriteIndentedLine("const global::{0} bindingFlags =", WellKnownTypes.BindingFlags);
                 using (_writer.IncreaseIndent())
@@ -85,9 +84,9 @@ public void WriteInitializeMethod(ObjectTypeExtensionInfo objectTypeExtension)
                 }
             }
 
-            if (objectTypeExtension.Members.Length > 0)
+            if (objectTypeExtension.Resolvers.Length > 0)
             {
-                foreach (var member in objectTypeExtension.Members)
+                foreach (var resolver in objectTypeExtension.Resolvers)
                 {
                     _writer.WriteLine();
                     _writer.WriteIndentedLine("descriptor");
@@ -96,24 +95,23 @@ public void WriteInitializeMethod(ObjectTypeExtensionInfo objectTypeExtension)
                     {
                         _writer.WriteIndentedLine(
                             ".Field(thisType.GetMember(\"{0}\", bindingFlags)[0])",
-                            member.Name);
+                            resolver.Member.Name);
 
-                        if (member is IMethodSymbol method &&
-                            method.GetResultKind() is not ResolverResultKind.Pure)
+                        if (resolver.IsPure)
                         {
                             _writer.WriteIndentedLine(
-                                ".Extend().Definition.Resolver = {0}Resolvers.{1}_{2};",
+                                ".Extend().Definition.PureResolver = {0}Resolvers.{1}_{2};",
                                 objectTypeExtension.Type.ToDisplayString(),
                                 objectTypeExtension.Type.Name,
-                                member.Name);
+                                resolver.Member.Name);
                         }
                         else
                         {
                             _writer.WriteIndentedLine(
-                                ".Extend().Definition.PureResolver = {0}Resolvers.{1}_{2};",
+                                ".Extend().Definition.Resolver = {0}Resolvers.{1}_{2};",
                                 objectTypeExtension.Type.ToDisplayString(),
                                 objectTypeExtension.Type.Name,
-                                member.Name);
+                                resolver.Member.Name);
                         }
                     }
                 }
@@ -122,7 +120,7 @@ public void WriteInitializeMethod(ObjectTypeExtensionInfo objectTypeExtension)
             _writer.WriteLine();
             _writer.WriteIndentedLine("Configure(descriptor);");
 
-            if (objectTypeExtension.Members.Length > 0)
+            if (objectTypeExtension.Resolvers.Length > 0)
             {
                 _writer.WriteLine();
                 _writer.WriteIndentedLine("descriptor.Extend().Context.OnSchemaCreated(");