(WIP) Moved validation from OneOf-specific rule to VariablesInAllowedPositions

glen-84 · glen-84 · commit 4b275092f3bf · 2025-06-10T15:47:50.000+02:00
diff --git a/dictionary.txt b/dictionary.txt
@@ -18,6 +18,7 @@ BCPROCKS
 bfnrt
 blazor
 blazorwasm
+Brontie
 Browsable
 BSON
 buildtransitive
diff --git a/src/HotChocolate/Core/src/Validation/ErrorHelper.cs b/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(
diff --git a/src/HotChocolate/Core/src/Validation/Rules/VariableVisitor.cs b/src/HotChocolate/Core/src/Validation/Rules/VariableVisitor.cs
@@ -284,7 +284,7 @@ private bool IsVariableUsageAllowed(
         IType locationType,
         IValueNode? locationDefault)
     {
-        if (locationType.IsNonNullType()
+        if (IsNonNullPosition(locationType, variableDefinition)
             && !variableDefinition.Type.IsNonNullType())
         {
             if (variableDefinition.DefaultValue.IsNull()
@@ -303,6 +303,20 @@ private bool IsVariableUsageAllowed(
             locationType);
     }
 
+    private static bool IsNonNullPosition(
+        IType locationType,
+        VariableDefinitionNode _)
+    {
+        if (locationType.IsNonNullType())
+        {
+            return true;
+        }
+
+        // FIXME: How to implement this part?
+
+        return false;
+    }
+
     // http://facebook.github.io/graphql/June2018/#AreTypesCompatible()
     private bool AreTypesCompatible(
         ITypeNode variableType,
diff --git a/src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.A_is_null_Error.snap b/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"
       }
     }
diff --git a/src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.A_is_null_and_B_is_null_Error.snap b/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"
       }
     }
diff --git a/src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.A_is_null_and_B_is_set_Error.snap b/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"
       }
     }
diff --git a/src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.A_is_set_and_B_is_null_Error.snap b/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"
       }
     }
diff --git a/src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.A_is_set_and_B_is_set_Error.snap b/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"
       }
     }
diff --git a/src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.A_is_set_and_B_is_set_to_string_Error.snap b/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"
       }
     },
diff --git a/src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.A_is_unset_variable_and_B_is_set_Error.snap b/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"
       }
     }
diff --git a/src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.A_is_variable_and_B_is_set_Error.snap b/src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.A_is_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"
       }
     }
diff --git a/src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.A_is_variable_and_B_is_unset_variable_Error.snap b/src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.A_is_variable_and_B_is_unset_variable_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"
       }
     }
diff --git a/src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.B_is_set_and_C_is_invalid_prop_Error.snap b/src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.B_is_set_and_C_is_invalid_prop_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"
       }
     },
diff --git a/src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.B_is_variable_and_var_is_null_Error.snap b/src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.B_is_variable_and_var_is_null_Error.snap
@@ -13,7 +13,7 @@
       ],
       "extensions": {
         "fieldCoordinate": "ExampleInput.b",
-        "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"
       }
     }
diff --git a/src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.Input_is_empty_object_Error.snap b/src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.Input_is_empty_object_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"
       }
     }
diff --git a/src/HotChocolate/Core/test/Validation.Tests/AllVariableUsagesAreAllowedRuleTests.cs b/src/HotChocolate/Core/test/Validation.Tests/AllVariableUsagesAreAllowedRuleTests.cs
@@ -503,4 +503,60 @@ dog @include(if: $boolVar)
             """
         );
     }
+
+    [Fact]
+    public void VariablesUsedForOneOfInputObjectFieldsMustBeNonNullable1_Valid()
+    {
+        ExpectValid(
+            """
+            mutation addCat($cat: CatInput!) {
+              addPet(pet: { cat: $cat }) {
+                name
+              }
+            }
+            """
+        );
+    }
+
+    [Fact]
+    public void VariablesUsedForOneOfInputObjectFieldsMustBeNonNullable2_Valid()
+    {
+        ExpectValid(
+            """
+            mutation addCatWithDefault($cat: CatInput! = { name: "Brontie" }) {
+              addPet(pet: { cat: $cat }) {
+                name
+              }
+            }
+            """
+        );
+    }
+
+    [Fact(Skip = "Implement VariableVisitor.IsNonNullPosition")]
+    public void VariablesUsedForOneOfInputObjectFieldsMustBeNonNullable1_Error()
+    {
+        ExpectErrors(
+            """
+            mutation addNullableCat($cat: CatInput) {
+              addPet(pet: { cat: $cat }) {
+                name
+              }
+            }
+            """
+        );
+    }
+
+    [Fact(Skip = "Implement VariableVisitor.IsNonNullPosition")]
+    public void VariablesUsedForOneOfInputObjectFieldsMustBeNonNullable2_Error()
+    {
+        ExpectErrors(
+            """
+            mutation addNullableCatWithDefault($cat: CatInput = { name: "Brontie" }) {
+              addPet(pet: { cat: $cat }) {
+                name
+              }
+            }
+            """
+        );
+    }
 }
diff --git a/src/HotChocolate/Core/test/Validation.Tests/OneOfRuleTests.cs b/src/HotChocolate/Core/test/Validation.Tests/OneOfRuleTests.cs
diff --git a/src/HotChocolate/Core/test/Validation.Tests/ValuesOfCorrectTypeRuleTests.cs b/src/HotChocolate/Core/test/Validation.Tests/ValuesOfCorrectTypeRuleTests.cs
diff --git a/src/HotChocolate/Core/test/Validation.Tests/__snapshots__/OneOfRuleTests.IfFieldWithLiteralValueIsPresentThenTheValueMustNotBeNull_Error.snap b/src/HotChocolate/Core/test/Validation.Tests/__snapshots__/OneOfRuleTests.IfFieldWithLiteralValueIsPresentThenTheValueMustNotBeNull_Error.snap
diff --git a/src/HotChocolate/Core/test/Validation.Tests/__snapshots__/OneOfRuleTests.MultipleFieldsAreNotAllowed_1.snap b/src/HotChocolate/Core/test/Validation.Tests/__snapshots__/OneOfRuleTests.MultipleFieldsAreNotAllowed_1.snap
diff --git a/src/HotChocolate/Core/test/Validation.Tests/__snapshots__/OneOfRuleTests.MultipleFieldsAreNotAllowed_3.snap b/src/HotChocolate/Core/test/Validation.Tests/__snapshots__/OneOfRuleTests.MultipleFieldsAreNotAllowed_3.snap
diff --git a/src/HotChocolate/Core/test/Validation.Tests/__snapshots__/OneOfRuleTests.VariablesUsedForOneOfInputObjectFieldsMustBeNonNullable_Error.snap b/src/HotChocolate/Core/test/Validation.Tests/__snapshots__/OneOfRuleTests.VariablesUsedForOneOfInputObjectFieldsMustBeNonNullable_Error.snap
diff --git a/src/HotChocolate/Core/test/Validation.Tests/__snapshots__/ValuesOfCorrectTypeRuleTests.BadOneOfWithNoFields.snap b/src/HotChocolate/Core/test/Validation.Tests/__snapshots__/ValuesOfCorrectTypeRuleTests.BadOneOfWithNoFields.snap
diff --git a/src/HotChocolate/Core/test/Validation.Tests/__snapshots__/ValuesOfCorrectTypeRuleTests.BadOneOfWithTwoFields.snap b/src/HotChocolate/Core/test/Validation.Tests/__snapshots__/ValuesOfCorrectTypeRuleTests.BadOneOfWithTwoFields.snap

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`],`
`14`	`14`	`"extensions": {`
`15`	`15`	`"type": "ExampleInput",`
`16`		`- "specifiedBy": "https://spec.graphql.org/draft/#sec-OneOf-Input-Objects-Have-Exactly-One-Field",`
	`16`	`+ "specifiedBy": "https://spec.graphql.org/draft/#sec-All-Variable-Usages-Are-Allowed",`
`17`	`17`	`"rfc": "https://github.com/graphql/graphql-spec/pull/825"`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{`
	`1`	`+{`
`2`	`2`	`"errors": [`
`3`	`3`	`{`
`4`	`4`	"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 @@`
`13`	`13`	`],`
`14`	`14`	`"extensions": {`
`15`	`15`	`"type": "ExampleInput",`
`16`		`- "specifiedBy": "https://spec.graphql.org/draft/#sec-OneOf-Input-Objects-Have-Exactly-One-Field",`
	`16`	`+ "specifiedBy": "https://spec.graphql.org/draft/#sec-All-Variable-Usages-Are-Allowed",`
`17`	`17`	`"rfc": "https://github.com/graphql/graphql-spec/pull/825"`
`18`	`18`	`}`
`19`	`19`	`}`