Fixed Object Composition for Partial Results. (#6339)

Author: michaelstaib

src/HotChocolate/Fusion/src/Core/Execution/ExecutorUtils.cs

@@ -63,13 +63,16 @@ private static void ComposeResult(
 
                 if (!data.HasValue)
                 {
-                    if (!partialResult && !nullable)
+                    if (!partialResult)
                     {
-                        PropagateNonNullError(selectionSetResult);
-                        break;
-                    }
+                        if (!nullable)
+                        {
+                            PropagateNonNullError(selectionSetResult);
+                            break;
+                        }
 
-                    result.Set(responseName, null, nullable);
+                        result.Set(responseName, null, nullable);
+                    }
                 }
                 else if (namedType.IsType(TypeKind.Scalar))
                 {
@@ -108,38 +111,44 @@ private static void ComposeResult(
                 }
                 else if (selectionType.IsCompositeType())
                 {
-                    var value = ComposeObject(
-                        context,
-                        selectionSetResult,
-                        responseIndex,
-                        selection,
-                        data);
-
-                    if (value is null && !nullable)
+                    if (!result.IsInitialized)
                     {
-                        PropagateNonNullError(selectionSetResult);
-                        break;
-                    }
+                        var value = ComposeObject(
+                            context,
+                            selectionSetResult,
+                            responseIndex,
+                            selection,
+                            data);
+
+                        if (value is null && !nullable)
+                        {
+                            PropagateNonNullError(selectionSetResult);
+                            break;
+                        }
 
-                    result.Set(responseName, value, nullable);
+                        result.Set(responseName, value, nullable);
+                    }
                 }
                 else
                 {
-                    var value = ComposeList(
-                        context,
-                        selectionSetResult,
-                        responseIndex,
-                        selection,
-                        data,
-                        selectionType);
-
-                    if (value is null && !nullable)
+                    if (!result.IsInitialized)
                     {
-                        PropagateNonNullError(selectionSetResult);
-                        break;
-                    }
+                        var value = ComposeList(
+                            context,
+                            selectionSetResult,
+                            responseIndex,
+                            selection,
+                            data,
+                            selectionType);
+
+                        if (value is null && !nullable)
+                        {
+                            PropagateNonNullError(selectionSetResult);
+                            break;
+                        }
 
-                    result.Set(responseName, value, nullable);
+                        result.Set(responseName, value, nullable);
+                    }
                 }
             }
             else if ((selection.CustomOptions & _typeNameFlag) == _typeNameFlag)

src/HotChocolate/Fusion/src/Core/Planning/Nodes/Compose.cs

@@ -24,7 +24,7 @@ public Compose(int id, IReadOnlyList<ISelectionSet> selectionSets) : base(id)
             throw new ArgumentNullException(nameof(selectionSets));
         }
 
-        _selectionSets = selectionSets.Distinct().ToArray();
+        _selectionSets = selectionSets.Distinct().OrderBy(t => t.Id).ToArray();
     }
 
     public override QueryPlanNodeKind Kind => QueryPlanNodeKind.Compose;

src/HotChocolate/Fusion/test/Core.Tests/DemoIntegrationTests.cs

@@ -1345,6 +1345,72 @@ query Requires {
 
         Assert.Null(result.ExpectQueryResult().Errors);
     }
+    
+    [Fact]
+    public async Task Require_Data_In_Context_3()
+    {
+        // arrange
+        using var demoProject = await DemoProject.CreateAsync();
+
+        // act
+        var fusionGraph = await new FusionGraphComposer(logFactory: _logFactory).ComposeAsync(
+            new[]
+            {
+                demoProject.Reviews2.ToConfiguration(Reviews2ExtensionSdl),
+                demoProject.Accounts.ToConfiguration(AccountsExtensionSdl),
+                demoProject.Products.ToConfiguration(ProductsExtensionSdl),
+                demoProject.Shipping.ToConfiguration(ShippingExtensionSdl),
+            },
+            FusionFeatureFlags.NodeField);
+
+        var executor = await new ServiceCollection()
+            .AddSingleton(demoProject.HttpClientFactory)
+            .AddSingleton(demoProject.WebSocketConnectionFactory)
+            .AddFusionGatewayServer()
+            .ConfigureFromDocument(SchemaFormatter.FormatAsDocument(fusionGraph))
+            .BuildRequestExecutorAsync();
+
+        var request = Parse(
+            """
+            query Large {
+              users {
+                id
+                name
+                birthdate
+                reviews {
+                  body
+                  author {
+                    name
+                    birthdate
+                  }
+                  product {
+                    id
+                    name
+                    deliveryEstimate(zip: "abc") {
+                      max
+                    }
+                  }
+                }
+              }
+            }
+            """);
+
+        // act
+        var result = await executor.ExecuteAsync(
+            QueryRequestBuilder
+                .New()
+                .SetQuery(request)
+                .SetVariableValue("id", "UHJvZHVjdAppMQ==")
+                .SetVariableValue("first", 1)
+                .Create());
+
+        // assert
+        var snapshot = new Snapshot();
+        CollectSnapshotData(snapshot, request, result, fusionGraph);
+        await snapshot.MatchAsync();
+
+        Assert.Null(result.ExpectQueryResult().Errors);
+    }
 
     public sealed class HotReloadConfiguration : IObservable<GatewayConfiguration>
     {