Cleanup

Author: tobias-tengler

Diff for: src/HotChocolate/Core/src/Types/SemanticNonNullTypeInterceptor.cs

@@ -2,15 +2,14 @@
 
 using System.Collections;
 using HotChocolate.Configuration;
-using HotChocolate.Execution.Processing;
 using HotChocolate.Language;
 using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using HotChocolate.Types.Descriptors;
 using HotChocolate.Types.Descriptors.Definitions;
 using HotChocolate.Types.Helpers;
-using HotChocolate.Types.Pagination;
 using HotChocolate.Types.Relay;
+using HotChocolate.Utilities;
 
 namespace HotChocolate;
 
@@ -347,7 +346,7 @@ private static void CheckResultForSemanticNonNullViolations(object? result, IRes
     {
         if (result is null && levels.Contains(currentLevel))
         {
-            context.ReportError(CreateSemanticNonNullViolationError(path, context.Selection));
+            context.ReportError(ErrorHelper.CreateSemanticNonNullViolationError(path, context.Selection));
             return;
         }
 
@@ -368,13 +367,4 @@ private static void CheckResultForSemanticNonNullViolations(object? result, IRes
             }
         }
     }
-
-    // TODO: Move
-    public static IError CreateSemanticNonNullViolationError(Path path, ISelection selection)
-        => ErrorBuilder.New()
-            .SetMessage("Cannot return null for semantic non-null field.")
-            .SetCode(ErrorCodes.Execution.SemanticNonNullViolation)
-            .AddLocation(selection.SyntaxNode)
-            .SetPath(path)
-            .Build();
 }

Diff for: src/HotChocolate/Core/src/Types/Utilities/ErrorHelper.cs

@@ -1,4 +1,5 @@
 using System.Globalization;
+using HotChocolate.Execution.Processing;
 using HotChocolate.Language;
 using HotChocolate.Properties;
 using HotChocolate.Types;
@@ -538,4 +539,12 @@ public static ISchemaError DuplicateFieldName(
             .SetTypeSystemObject(type)
             .Build();
     }
+
+    public static IError CreateSemanticNonNullViolationError(Path path, ISelection selection)
+        => ErrorBuilder.New()
+            .SetMessage("Cannot return null for semantic non-null field.")
+            .SetCode(ErrorCodes.Execution.SemanticNonNullViolation)
+            .AddLocation(selection.SyntaxNode)
+            .SetPath(path)
+            .Build();
 }

Diff for: src/HotChocolate/Fusion/src/Core/Execution/ExecutionUtils.cs

@@ -4,6 +4,7 @@
 using System.Text.Json;
 using HotChocolate.Execution.Processing;
 using HotChocolate.Fusion.Execution.Nodes;
+using HotChocolate.Fusion.Execution.Pipeline;
 using HotChocolate.Fusion.Metadata;
 using HotChocolate.Fusion.Planning;
 using HotChocolate.Fusion.Utilities;
@@ -12,6 +13,7 @@
 using HotChocolate.Types;
 using HotChocolate.Utilities;
 using static HotChocolate.Execution.Processing.Selection;
+using ErrorHelper = HotChocolate.Utilities.ErrorHelper;
 using IType = HotChocolate.Types.IType;
 using ObjectType = HotChocolate.Types.ObjectType;
 
@@ -774,7 +776,7 @@ private static void AddSemanticNonNullViolation(
         int responseIndex)
     {
         var path = PathHelper.CreatePathFromContext(selection, selectionSetResult, responseIndex);
-        var error = SemanticNonNullTypeInterceptor.CreateSemanticNonNullViolationError(path, selection);
+        var error = ErrorHelper.CreateSemanticNonNullViolationError(path, selection);
         resultBuilder.AddError(error);
     }
 
@@ -789,9 +791,6 @@ private static void PropagateNullValues(
         ValueCompletion.PropagateNullValues(selectionSetResult);
     }
 
-    // TODO: Pull out
-    private const int MaxLevels = 3;
-
     private static readonly CustomOptionsFlags[] _levelOptions =
     [
         CustomOptionsFlags.Option5,
@@ -801,7 +800,7 @@ private static void PropagateNullValues(
 
     private static bool IsSemanticNonNull(Selection selection, int level)
     {
-        if (level >= MaxLevels)
+        if (level >= SemanticNonNullOptimizer.MaxLevels)
         {
             return true;
         }

Diff for: src/HotChocolate/Fusion/src/Core/Execution/Pipeline/SemanticNonNullOptimizer.cs

@@ -4,8 +4,10 @@ namespace HotChocolate.Fusion.Execution.Pipeline;
 
 internal sealed class SemanticNonNullOptimizer : ISelectionSetOptimizer
 {
-    // TODO: Pull this out to somewhere
-    private const int MaxLevels = 3;
+    // This is an arbitrary limit to only use the last three options,
+    // so there's still room for other features requiring options.
+    // This is not ideal, but acceptable as this is just a prototype.
+    public const int MaxLevels = 3;
 
     private static readonly Selection.CustomOptionsFlags[] _levelOptions =
     [

Diff for: src/HotChocolate/Fusion/test/Core.Tests/SemanticNonNullTests.cs

@@ -5,8 +5,6 @@
 
 namespace HotChocolate.Fusion;
 
-// TODO: Test with list with more than 3 levels
-// TODO: What is supposed to happen with a non-null that bubbles up to a semantic non-null field?
 public class SemanticNonNullTests(ITestOutputHelper output)
 {
     # region Scalar