Moved validation from OneOf-specific rule to VariablesInAllowedPositions

Author: glen-84

dictionary.txt

@@ -18,6 +18,7 @@ BCPROCKS
 bfnrt
 blazor
 blazorwasm
+Brontie
 Browsable
 BSON
 buildtransitive

src/HotChocolate/Core/src/Validation/ErrorHelper.cs

@@ -649,7 +649,7 @@ public static IError OneOfMustHaveExactlyOneField(
             .AddLocation(node)
             .SetPath(context.CreateErrorPath())
             .SetExtension(nameof(type), type.Name)
-            .SpecifiedBy("sec-OneOf-Input-Objects-Have-Exactly-One-Field", rfc: 825)
+            .SpecifiedBy("sec-All-Variable-Usages-Are-Allowed", rfc: 825)
             .Build();
 
     public static IError OneOfVariablesMustBeNonNull(
@@ -666,7 +666,7 @@ public static IError OneOfVariablesMustBeNonNull(
             .AddLocation(node)
             .SetPath(context.CreateErrorPath())
             .SetFieldCoordinate(fieldCoordinate)
-            .SpecifiedBy("sec-OneOf–Input-Objects-Have-Exactly-One-Field", rfc: 825)
+            .SpecifiedBy("sec-All-Variable-Usages-Are-Allowed", rfc: 825)
             .Build();
 
     public static IError SkipAndIncludeNotAllowedOnSubscriptionRootField(

src/HotChocolate/Core/src/Validation/Rules/VariableVisitor.cs

@@ -250,7 +250,7 @@ protected override ISyntaxVisitorAction Enter(
         if (context.Variables.TryGetValue(
                 node.Name.Value,
                 out var variableDefinition)
-            && !IsVariableUsageAllowed(variableDefinition, context.Types.Peek(), defaultValue))
+            && !IsVariableUsageAllowed(variableDefinition, context, defaultValue))
         {
             context.ReportError(context.VariableIsNotCompatible(node, variableDefinition));
         }
@@ -281,10 +281,12 @@ protected override ISyntaxVisitorAction Leave(
     // http://facebook.github.io/graphql/June2018/#IsVariableUsageAllowed()
     private bool IsVariableUsageAllowed(
         VariableDefinitionNode variableDefinition,
-        IType locationType,
+        DocumentValidatorContext context,
         IValueNode? locationDefault)
     {
-        if (locationType.IsNonNullType()
+        var locationType = context.Types.Peek();
+
+        if (IsNonNullPosition(locationType, context)
             && !variableDefinition.Type.IsNonNullType())
         {
             if (variableDefinition.DefaultValue.IsNull()
@@ -303,6 +305,23 @@ private bool IsVariableUsageAllowed(
             locationType);
     }
 
+    private static bool IsNonNullPosition(IType locationType, DocumentValidatorContext context)
+    {
+        if (locationType.IsNonNullType())
+        {
+            return true;
+        }
+
+        if (context.Path.Peek() is ObjectFieldNode
+            && context.Types[^2].NullableType() is IInputObjectTypeDefinition inputObjectType
+            && inputObjectType.Directives.ContainsName(DirectiveNames.OneOf.Name))
+        {
+            return true;
+        }
+
+        return false;
+    }
+
     // http://facebook.github.io/graphql/June2018/#AreTypesCompatible()
     private bool AreTypesCompatible(
         ITypeNode variableType,

src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.A_is_null_Error.snap

@@ -13,7 +13,7 @@
       ],
       "extensions": {
         "type": "ExampleInput",
-        "specifiedBy": "https://spec.graphql.org/draft/#sec-OneOf-Input-Objects-Have-Exactly-One-Field",
+        "specifiedBy": "https://spec.graphql.org/draft/#sec-All-Variable-Usages-Are-Allowed",
         "rfc": "https://github.com/graphql/graphql-spec/pull/825"
       }
     }

src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.A_is_null_and_B_is_null_Error.snap

@@ -13,7 +13,7 @@
       ],
       "extensions": {
         "type": "ExampleInput",
-        "specifiedBy": "https://spec.graphql.org/draft/#sec-OneOf-Input-Objects-Have-Exactly-One-Field",
+        "specifiedBy": "https://spec.graphql.org/draft/#sec-All-Variable-Usages-Are-Allowed",
         "rfc": "https://github.com/graphql/graphql-spec/pull/825"
       }
     }

src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.A_is_null_and_B_is_set_Error.snap

@@ -1,4 +1,4 @@
-{
+{
   "errors": [
     {
       "message": "The OneOf Input Object `ExampleInput` requires that exactly one field must be supplied and that field must not be `null`.",
@@ -13,7 +13,7 @@
       ],
       "extensions": {
         "type": "ExampleInput",
-        "specifiedBy": "https://spec.graphql.org/draft/#sec-OneOf-Input-Objects-Have-Exactly-One-Field",
+        "specifiedBy": "https://spec.graphql.org/draft/#sec-All-Variable-Usages-Are-Allowed",
         "rfc": "https://github.com/graphql/graphql-spec/pull/825"
       }
     }

src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.A_is_set_and_B_is_null_Error.snap

@@ -1,4 +1,4 @@
-{
+{
   "errors": [
     {
       "message": "The OneOf Input Object `ExampleInput` requires that exactly one field must be supplied and that field must not be `null`.",
@@ -13,7 +13,7 @@
       ],
       "extensions": {
         "type": "ExampleInput",
-        "specifiedBy": "https://spec.graphql.org/draft/#sec-OneOf-Input-Objects-Have-Exactly-One-Field",
+        "specifiedBy": "https://spec.graphql.org/draft/#sec-All-Variable-Usages-Are-Allowed",
         "rfc": "https://github.com/graphql/graphql-spec/pull/825"
       }
     }

src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.A_is_set_and_B_is_set_Error.snap

@@ -1,4 +1,4 @@
-{
+{
   "errors": [
     {
       "message": "The OneOf Input Object `ExampleInput` requires that exactly one field must be supplied and that field must not be `null`.",
@@ -13,7 +13,7 @@
       ],
       "extensions": {
         "type": "ExampleInput",
-        "specifiedBy": "https://spec.graphql.org/draft/#sec-OneOf-Input-Objects-Have-Exactly-One-Field",
+        "specifiedBy": "https://spec.graphql.org/draft/#sec-All-Variable-Usages-Are-Allowed",
         "rfc": "https://github.com/graphql/graphql-spec/pull/825"
       }
     }

src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.A_is_set_and_B_is_set_to_string_Error.snap

@@ -1,4 +1,4 @@
-{
+{
   "errors": [
     {
       "message": "The OneOf Input Object `ExampleInput` requires that exactly one field must be supplied and that field must not be `null`.",
@@ -13,7 +13,7 @@
       ],
       "extensions": {
         "type": "ExampleInput",
-        "specifiedBy": "https://spec.graphql.org/draft/#sec-OneOf-Input-Objects-Have-Exactly-One-Field",
+        "specifiedBy": "https://spec.graphql.org/draft/#sec-All-Variable-Usages-Are-Allowed",
         "rfc": "https://github.com/graphql/graphql-spec/pull/825"
       }
     },

src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.A_is_unset_variable_and_B_is_set_Error.snap

@@ -13,7 +13,7 @@
       ],
       "extensions": {
         "type": "ExampleInput",
-        "specifiedBy": "https://spec.graphql.org/draft/#sec-OneOf-Input-Objects-Have-Exactly-One-Field",
+        "specifiedBy": "https://spec.graphql.org/draft/#sec-All-Variable-Usages-Are-Allowed",
         "rfc": "https://github.com/graphql/graphql-spec/pull/825"
       }
     }