Renamed __Type.oneOf to __Type.isOneOf

glen-84 · glen-84 · commit 0886871f7087 · 2025-06-10T11:01:21.000+02:00
diff --git a/src/HotChocolate/Core/src/Types/Types/Introspection/__Type.cs b/src/HotChocolate/Core/src/Types/Types/Introspection/__Type.cs
@@ -85,9 +85,9 @@ protected override ObjectTypeConfiguration CreateConfiguration(ITypeDiscoveryCon
 
         if (context.DescriptorContext.Options.EnableOneOf)
         {
-            def.Fields.Add(new(Names.OneOf,
+            def.Fields.Add(new(Names.IsOneOf,
                 type: booleanType,
-                pureResolver: Resolvers.OneOf));
+                pureResolver: Resolvers.IsOneOf));
         }
 
         if (context.DescriptorContext.Options.EnableDirectiveIntrospection)
@@ -160,7 +160,7 @@ public static object Kind(IResolverContext context)
                 _ => null
             };
 
-        public static object? OneOf(IResolverContext context)
+        public static object? IsOneOf(IResolverContext context)
             => context.Parent<IType>() is IInputObjectTypeDefinition iot
                 ? iot.Directives.ContainsName(DirectiveNames.OneOf.Name)
                 : null;
@@ -191,7 +191,7 @@ public static class Names
         public const string EnumValues = "enumValues";
         public const string InputFields = "inputFields";
         public const string OfType = "ofType";
-        public const string OneOf = "oneOf";
+        public const string IsOneOf = "isOneOf";
         public const string SpecifiedByUrl = "specifiedByURL";
         public const string IncludeDeprecated = "includeDeprecated";
         public const string AppliedDirectives = "appliedDirectives";
diff --git a/src/HotChocolate/Core/test/Execution.Tests/Integration/StarWarsCodeFirst/__snapshots__/StarWarsCodeFirstTests.Ensure_Benchmark_Query_LargeQuery.snap b/src/HotChocolate/Core/test/Execution.Tests/Integration/StarWarsCodeFirst/__snapshots__/StarWarsCodeFirstTests.Ensure_Benchmark_Query_LargeQuery.snap
@@ -5818,7 +5818,7 @@
               "deprecationReason": null
             },
             {
-              "name": "oneOf",
+              "name": "isOneOf",
               "description": null,
               "args": [],
               "type": {
diff --git a/src/HotChocolate/Core/test/Execution.Tests/__snapshots__/IntrospectionTests.DefaultValueIsInputObject.snap b/src/HotChocolate/Core/test/Execution.Tests/__snapshots__/IntrospectionTests.DefaultValueIsInputObject.snap
@@ -913,7 +913,7 @@
               "deprecationReason": null
             },
             {
-              "name": "oneOf",
+              "name": "isOneOf",
               "description": null,
               "args": [],
               "type": {
diff --git a/src/HotChocolate/Core/test/Execution.Tests/__snapshots__/IntrospectionTests.ExecuteGraphiQLIntrospectionQuery.snap b/src/HotChocolate/Core/test/Execution.Tests/__snapshots__/IntrospectionTests.ExecuteGraphiQLIntrospectionQuery.snap
@@ -913,7 +913,7 @@
               "deprecationReason": null
             },
             {
-              "name": "oneOf",
+              "name": "isOneOf",
               "description": null,
               "args": [],
               "type": {
diff --git a/src/HotChocolate/Core/test/Execution.Tests/__snapshots__/IntrospectionTests.ExecuteGraphiQLIntrospectionQuery_ToJson.snap b/src/HotChocolate/Core/test/Execution.Tests/__snapshots__/IntrospectionTests.ExecuteGraphiQLIntrospectionQuery_ToJson.snap
@@ -913,7 +913,7 @@
               "deprecationReason": null
             },
             {
-              "name": "oneOf",
+              "name": "isOneOf",
               "description": null,
               "args": [],
               "type": {
diff --git a/src/HotChocolate/Core/test/Types.Tests/Types/OneOfIntegrationTests.cs b/src/HotChocolate/Core/test/Types.Tests/Types/OneOfIntegrationTests.cs
@@ -318,17 +318,17 @@ public async Task OneOf_introspection()
                 @"{
                     oneOf_input: __type(name: ""ExampleInput"") {
                         # should be true
-                        oneOf
+                        isOneOf
                     }
 
                     input: __type(name: ""StandardInput"") {
                         # should be false
-                        oneOf
+                        isOneOf
                     }
 
                     object: __type(name: ""Query"") {
                         # should be null
-                        oneOf
+                        isOneOf
                     }
                 }")
             .MatchSnapshotAsync();
diff --git a/src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.OneOf_introspection.snap b/src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/OneOfIntegrationTests.OneOf_introspection.snap
@@ -1,13 +1,13 @@
-﻿{
+{
   "data": {
     "oneOf_input": {
-      "oneOf": true
+      "isOneOf": true
     },
     "input": {
-      "oneOf": false
+      "isOneOf": false
     },
     "object": {
-      "oneOf": null
+      "isOneOf": null
     }
   }
 }
diff --git a/src/HotChocolate/Core/test/Types.Tests/__snapshots__/SchemaFirstTests.DescriptionsAreCorrectlyRead.snap b/src/HotChocolate/Core/test/Types.Tests/__snapshots__/SchemaFirstTests.DescriptionsAreCorrectlyRead.snap
@@ -840,6 +840,18 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "isOneOf",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "kind",
               "description": null,
@@ -880,18 +892,6 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
-            {
-              "name": "oneOf",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "Boolean",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "possibleTypes",
               "description": null,
diff --git a/src/HotChocolate/Core/test/Types.Tests/__snapshots__/SchemaFirstTests.Interfaces_Impl_Interfaces_Are_Correctly_Exposed_Through_Introspection.snap b/src/HotChocolate/Core/test/Types.Tests/__snapshots__/SchemaFirstTests.Interfaces_Impl_Interfaces_Are_Correctly_Exposed_Through_Introspection.snap
@@ -913,7 +913,7 @@
               "deprecationReason": null
             },
             {
-              "name": "oneOf",
+              "name": "isOneOf",
               "description": null,
               "args": [],
               "type": {
diff --git a/src/StrawberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/Integration/__snapshots__/StarWarsIntrospectionTest.Execute_StarWarsIntrospection_Test.snap b/src/StrawberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/Integration/__snapshots__/StarWarsIntrospectionTest.Execute_StarWarsIntrospection_Test.snap
@@ -907,7 +907,7 @@
               "DeprecationReason": null
             },
             {
-              "Name": "oneOf",
+              "Name": "isOneOf",
               "Description": null,
               "Args": [],
               "Type": {
@@ -4193,7 +4193,7 @@
             },
             {
               "__typename": "__Field",
-              "Name": "oneOf",
+              "Name": "isOneOf",
               "Description": null,
               "Args": [],
               "Type": {

Original file line number	Diff line number	Diff line change
`@@ -5818,7 +5818,7 @@`
`5818`	`5818`	`"deprecationReason": null`
`5819`	`5819`	`},`
`5820`	`5820`	`{`
`5821`		`- "name": "oneOf",`
	`5821`	`+ "name": "isOneOf",`
`5822`	`5822`	`"description": null,`
`5823`	`5823`	`"args": [],`
`5824`	`5824`	`"type": {`
Original file line number	Diff line number	Diff line change
`@@ -913,7 +913,7 @@`
`913`	`913`	`"deprecationReason": null`
`914`	`914`	`},`
`915`	`915`	`{`
`916`		`- "name": "oneOf",`
	`916`	`+ "name": "isOneOf",`
`917`	`917`	`"description": null,`
`918`	`918`	`"args": [],`
`919`	`919`	`"type": {`
Original file line number	Diff line number	Diff line change
`@@ -318,17 +318,17 @@ public async Task OneOf_introspection()`
`318`	`318`	`@"{`
`319`	`319`	`oneOf_input: __type(name: ""ExampleInput"") {`
`320`	`320`	`# should be true`
`321`		`- oneOf`
	`321`	`+ isOneOf`
`322`	`322`	`}`
`323`	`323`
`324`	`324`	`input: __type(name: ""StandardInput"") {`
`325`	`325`	`# should be false`
`326`		`- oneOf`
	`326`	`+ isOneOf`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`object: __type(name: ""Query"") {`
`330`	`330`	`# should be null`
`331`		`- oneOf`
	`331`	`+ isOneOf`
`332`	`332`	`}`
`333`	`333`	`}")`
`334`	`334`	`.MatchSnapshotAsync();`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`		`-{`
	`1`	`+{`
`2`	`2`	`"data": {`
`3`	`3`	`"oneOf_input": {`
`4`		`- "oneOf": true`
	`4`	`+ "isOneOf": true`
`5`	`5`	`},`
`6`	`6`	`"input": {`
`7`		`- "oneOf": false`
	`7`	`+ "isOneOf": false`
`8`	`8`	`},`
`9`	`9`	`"object": {`
`10`		`- "oneOf": null`
	`10`	`+ "isOneOf": null`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`	`}`