Add errors for leaf fields

Author: tobias-tengler

src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Execution/Clients/ErrorTrie.cs

@@ -0,0 +1,59 @@
+using System.Text.Json;
+
+namespace HotChocolate.Fusion.Execution.Clients;
+
+// TODO: Add docs
+public sealed class ErrorTrie : Dictionary<object, ErrorTrie>
+{
+    public JsonElement Error { get; private set; }
+
+    public static ErrorTrie? From(JsonElement json)
+    {
+        if (json.ValueKind != JsonValueKind.Array)
+        {
+            return null;
+        }
+
+        var root = new ErrorTrie();
+
+        foreach (var error in json.EnumerateArray())
+        {
+            var currentTrie = root;
+
+            if (!error.TryGetProperty("path", out var path) || path.ValueKind != JsonValueKind.Array)
+            {
+                continue;
+            }
+
+            foreach (var pathSegment in path.EnumerateArray())
+            {
+                object? pathSegmentValue = pathSegment.ValueKind switch
+                {
+                    JsonValueKind.String => pathSegment.GetString(),
+                    JsonValueKind.Number => pathSegment.GetInt32(),
+                    _ => null
+                };
+
+                if (pathSegmentValue is null)
+                {
+                    break;
+                }
+
+                if (currentTrie.TryGetValue(pathSegmentValue, out var trieAtPath))
+                {
+                    currentTrie = trieAtPath;
+                }
+                else
+                {
+                    var newTrie = new ErrorTrie();
+                    currentTrie[pathSegmentValue] = newTrie;
+                    currentTrie = newTrie;
+                }
+            }
+
+            currentTrie.Error = error;
+        }
+
+        return root;
+    }
+}

src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Execution/Clients/SourceSchemaResult.cs

@@ -6,38 +6,6 @@ public sealed class SourceSchemaResult : IDisposable
 {
     private readonly IDisposable? _resource;
 
-    public SourceSchemaResult(Path path, JsonDocument document, FinalMessage final = FinalMessage.Undefined)
-    {
-        ArgumentNullException.ThrowIfNull(path);
-        ArgumentNullException.ThrowIfNull(document);
-
-        _resource = document;
-        Path = path;
-
-        var root = document.RootElement;
-        if (root.ValueKind != JsonValueKind.Object)
-        {
-            return;
-        }
-
-        if (root.TryGetProperty("data", out var data))
-        {
-            Data = data;
-        }
-
-        if (root.TryGetProperty("errors", out var errors))
-        {
-            Errors = errors;
-        }
-
-        if (root.TryGetProperty("extensions", out var extensions))
-        {
-            Extensions = extensions;
-        }
-
-        Final = final;
-    }
-
     public SourceSchemaResult(
         Path path,
         IDisposable resource,
@@ -52,7 +20,7 @@ public SourceSchemaResult(
         _resource = resource;
         Path = path;
         Data = data;
-        Errors = errors;
+        Errors = ErrorTrie.From(errors);
         Extensions = extensions;
         Final = final;
     }
@@ -61,7 +29,7 @@ public SourceSchemaResult(
 
     public JsonElement Data { get; }
 
-    public JsonElement Errors { get; }
+    public ErrorTrie? Errors { get; }
 
     public JsonElement Extensions { get; }
 

src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Execution/Nodes/OperationExecutionNode.cs

@@ -139,15 +139,33 @@ private async Task<ExecutionNodeResult> ExecuteInternalAsync(
         };
 
         var client = context.GetClient(SchemaName, Operation.Operation);
-        var response = await client.ExecuteAsync(context, request, cancellationToken);
+        SourceSchemaClientResponse response;
 
-        if (!response.IsSuccessful)
+        try
+        {
+            response = await client.ExecuteAsync(context, request, cancellationToken);
+
+            if (!response.IsSuccessful)
+            {
+                context.AddException();
+
+                return new ExecutionNodeResult(
+                    Id,
+                    Activity.Current,
+                    ExecutionStatus.Failed,
+                    Stopwatch.GetElapsedTime(start));
+            }
+        }
+        catch (Exception exception)
         {
+            context.AddException(exception);
+
             return new ExecutionNodeResult(
                 Id,
                 Activity.Current,
                 ExecutionStatus.Failed,
-                Stopwatch.GetElapsedTime(start));
+                Stopwatch.GetElapsedTime(start),
+                exception);
         }
 
         var index = 0;
@@ -163,7 +181,7 @@ private async Task<ExecutionNodeResult> ExecuteInternalAsync(
 
             context.AddPartialResults(Source, buffer.AsSpan(0, index));
         }
-        catch
+        catch (Exception exception)
         {
             // if there is an error, we need to make sure that the pooled buffers for the JsonDocuments
             // are returned to the pool.
@@ -173,7 +191,14 @@ private async Task<ExecutionNodeResult> ExecuteInternalAsync(
                 result?.Dispose();
             }
 
-            throw;
+            context.AddException(exception);
+
+            return new ExecutionNodeResult(
+                Id,
+                Activity.Current,
+                ExecutionStatus.Failed,
+                Stopwatch.GetElapsedTime(start),
+                exception);
         }
         finally
         {

src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Execution/Nodes/Selection.cs

@@ -100,6 +100,11 @@ public bool IsIncluded(ulong includeFlags)
         return false;
     }
 
+    public override string ToString()
+    {
+        return Field.Name;
+    }
+
     internal void Seal(SelectionSet selectionSet)
     {
         if ((_flags & Flags.Sealed) == Flags.Sealed)

src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Execution/OperationPlanContext.cs

@@ -105,6 +105,11 @@ internal void AddPartialResults(SelectionPath sourcePath, ReadOnlySpan<SourceSch
     internal void AddPartialResults(ObjectResult result, ReadOnlySpan<Selection> selections)
         => _resultStore.AddPartialResults(result, selections);
 
+    internal void AddException(Exception? exception = null)
+    {
+        // TODO: Implement and change name
+    }
+
     internal PooledArrayWriter CreateRentedBuffer()
         => _resultStore.CreateRentedBuffer();
 

src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Execution/Pipeline/OperationPlanMiddleware.cs

@@ -1,7 +1,6 @@
 using HotChocolate.Execution;
 using HotChocolate.Fusion.Planning;
 using HotChocolate.Fusion.Rewriters;
-using HotChocolate.Language;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace HotChocolate.Fusion.Execution.Pipeline;
@@ -39,26 +38,11 @@ public ValueTask InvokeAsync(RequestContext context, RequestDelegate next)
         var operationHash = context.OperationDocumentInfo.Hash.Value;
         var operationShortHash = operationHash[..8];
         var rewritten = _rewriter.RewriteDocument(operationDocumentInfo.Document, context.Request.OperationName);
-        var operation = GetOperation(rewritten);
+        var operation = rewritten.GetOperation(context.Request.OperationName);
         var executionPlan = _planner.CreatePlan(operationId, operationHash, operationShortHash, operation);
         context.SetOperationPlan(executionPlan);
 
         return next(context);
-
-        // TODO: this algorithm is wrong and will fail with multiple operations.
-        static OperationDefinitionNode GetOperation(DocumentNode document)
-        {
-            for (var i = 0; i < document.Definitions.Count; i++)
-            {
-                if (document.Definitions[i] is OperationDefinitionNode operation)
-                {
-                    return operation;
-                }
-            }
-
-            throw new InvalidOperationException(
-                "The operation document does not contain an operation definition.");
-        }
     }
 
     public static RequestMiddleware Create()