Add more tests and fix minor issues (#7814)

ChilliCream · Dec 11, 2024 · 4cbe8b9 · 4cbe8b9
1 parent 45d8625
commit 4cbe8b9
Show file tree

Hide file tree

Showing 95 changed files with 3,936 additions and 897 deletions.
diff --git a/...otChocolate/Fusion-vnext/src/Fusion.Execution/Planning/InlineFragmentOperationRewriter.cs b/...otChocolate/Fusion-vnext/src/Fusion.Execution/Planning/InlineFragmentOperationRewriter.cs
@@ -135,7 +135,7 @@ private void InlineFragmentDefinition(
         {
             var fragmentContext = context.Branch(typeCondition);
 
-            RewriteFields(fragmentDefinition.SelectionSet, context);
+            RewriteFields(fragmentDefinition.SelectionSet, fragmentContext);
 
             var selectionSet = new SelectionSetNode(
                 null,

diff --git a/src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Planning/Nodes/SelectionPlanNode.cs b/src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Planning/Nodes/SelectionPlanNode.cs
@@ -152,7 +152,7 @@ public bool RemoveDirective(CompositeDirective directive)
 
     private void InitializeConditions()
     {
-        if(_isConditional.HasValue)
+        if (_isConditional.HasValue)
         {
             return;
         }
@@ -170,7 +170,7 @@ private void InitializeConditions()
                 continue;
             }
 
-            if (directive.Name.Value.Equals("skip"))
+            if (directive.Name.Value.Equals("include"))
             {
                 _includeVariable = GetVariableName(directive);
             }

diff --git a/src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Planning/OperationPlanner.cs b/src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Planning/OperationPlanner.cs
@@ -31,7 +31,7 @@ public RequestPlanNode CreatePlan(DocumentNode document, string? operationName)
             var context = new PlaningContext(operation, operation, ImmutableStack<SelectionPathSegment>.Empty);
             if (TryPlanSelectionSet(context))
             {
-                PlanConditionNode(operation, operation.Selections);
+                TryMakeOperationConditional(operation, operation.Selections);
                 operationPlan.AddOperation(operation);
             }
         }
@@ -275,7 +275,7 @@ private bool TryHandleUnresolvedSelections(
             }
 
             schemasInContext.Add(schemaName, lookupOperation);
-            PlanConditionNode(lookupOperation, lookupField.Selections);
+            TryMakeOperationConditional(lookupOperation, lookupField.Selections);
 
             // we add the lookup operation to all the schemas that we have requirements with.
             foreach (var requiredSchema in fieldSchemaDependencies.Values.Distinct())
@@ -607,7 +607,7 @@ private static FieldNode CreateFieldNodeFromPath(FieldPath path)
         return current!;
     }
 
-    private void PlanConditionNode(
+    private void TryMakeOperationConditional(
         OperationPlanNode operation,
         IReadOnlyList<SelectionPlanNode> selections)
     {
@@ -655,9 +655,8 @@ private void PlanConditionNode(
         }
     }
 
-    private bool IsSelectionAlwaysSkipped(ISelectionNode selectionNode)
+    private static bool IsSelectionAlwaysSkipped(ISelectionNode selectionNode)
     {
-        var selectionIsSkipped = false;
         foreach (var directive in selectionNode.Directives)
         {
             var isSkipDirective = directive.Name.Value == "skip";
@@ -673,26 +672,19 @@ private bool IsSelectionAlwaysSkipped(ISelectionNode selectionNode)
                     {
                         if (booleanValueNode.Value && isSkipDirective)
                         {
-                            selectionIsSkipped = true;
+                            return true;
                         }
-                        else if (!booleanValueNode.Value && isIncludedDirective)
-                        {
-                            selectionIsSkipped = true;
-                        }
-                        else
+
+                        if (!booleanValueNode.Value && isIncludedDirective)
                         {
-                            selectionIsSkipped = false;
+                            return true;
                         }
                     }
-                    else
-                    {
-                        selectionIsSkipped = false;
-                    }
                 }
             }
         }
 
-        return selectionIsSkipped;
+        return false;
     }
 
     private string GetNextRequirementName()

diff --git a/src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Planning/OperationVariableBinder.cs b/src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Planning/OperationVariableBinder.cs
@@ -9,7 +9,7 @@ public static void BindOperationVariables(
         OperationDefinitionNode operationDefinition,
         RequestPlanNode operationPlan)
     {
-        var operationBacklog = new Stack<OperationPlanNode>(operationPlan.Operations.OfType<OperationPlanNode>());
+        var operationBacklog = new Stack<OperationPlanNode>(operationPlan.Operations);
         var selectionBacklog = new Stack<SelectionPlanNode>();
         var variableDefinitions = operationDefinition.VariableDefinitions.ToDictionary(t => t.Variable.Name.Value);
         var usedVariables = new HashSet<string>();
@@ -18,7 +18,7 @@ public static void BindOperationVariables(
         {
             CollectAndBindUsedVariables(operation, variableDefinitions, usedVariables, selectionBacklog);
 
-            foreach (var child in operation.Dependants.OfType<OperationPlanNode>())
+            foreach (var child in operation.Dependants)
             {
                 operationBacklog.Push(child);
             }

diff --git a/src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Planning/PlanNodeYamlFormatter.cs b/src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Planning/PlanNodeYamlFormatter.cs
@@ -1,4 +1,5 @@
 using System.Buffers;
+using System.Buffers.Text;
 using System.Text;
 using System.Text.Json;
 using HotChocolate.Fusion.Planning.Nodes;
@@ -77,7 +78,7 @@ private static void WriteOperationNode(
 
         if (operation.IncludeVariable is not null)
         {
-            writer.WriteLine("    includeIf: \"{0}\"", operation.SkipVariable);
+            writer.WriteLine("    includeIf: \"{0}\"", operation.IncludeVariable);
         }
 
         if (operation.Requirements.Count > 0)