Merge branch 'main' into gai/provides-invalid-syntax-rule

ChilliCream · Jan 7, 2025 · 80b5b0b · 80b5b0b
2 parents ede54aa + c6fe32c
commit 80b5b0b
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/src/HotChocolate/Fusion-vnext/src/Fusion.Composition/Logging/LogEntryCodes.cs b/src/HotChocolate/Fusion-vnext/src/Fusion.Composition/Logging/LogEntryCodes.cs
@@ -3,7 +3,7 @@ namespace HotChocolate.Fusion.Logging;
 public static class LogEntryCodes
 {
     public const string DisallowedInaccessible = "DISALLOWED_INACCESSIBLE";
-    public const string EnumTypesInconsistent = "ENUM_TYPES_INCONSISTENT";
+    public const string EnumValuesMismatch = "ENUM_VALUES_MISMATCH";
     public const string ExternalArgumentDefaultMismatch = "EXTERNAL_ARGUMENT_DEFAULT_MISMATCH";
     public const string ExternalMissingOnBase = "EXTERNAL_MISSING_ON_BASE";
     public const string ExternalOnInterface = "EXTERNAL_ON_INTERFACE";

diff --git a/src/HotChocolate/Fusion-vnext/src/Fusion.Composition/Logging/LogEntryHelper.cs b/src/HotChocolate/Fusion-vnext/src/Fusion.Composition/Logging/LogEntryHelper.cs
@@ -100,18 +100,18 @@ public static LogEntry DisallowedInaccessibleDirectiveArgument(
             schema);
     }
 
-    public static LogEntry EnumTypesInconsistent(
+    public static LogEntry EnumValuesMismatch(
         EnumTypeDefinition enumType,
         string enumValue,
         SchemaDefinition schema)
     {
         return new LogEntry(
             string.Format(
-                LogEntryHelper_EnumTypesInconsistent,
+                LogEntryHelper_EnumValuesMismatch,
                 enumType.Name,
                 schema.Name,
                 enumValue),
-            LogEntryCodes.EnumTypesInconsistent,
+            LogEntryCodes.EnumValuesMismatch,
             LogSeverity.Error,
             new SchemaCoordinate(enumType.Name),
             enumType,

diff --git a/...dation/Rules/EnumTypesInconsistentRule.cs → ...alidation/Rules/EnumValuesMismatchRule.cs b/...dation/Rules/EnumTypesInconsistentRule.cs → ...alidation/Rules/EnumValuesMismatchRule.cs
@@ -18,10 +18,10 @@ namespace HotChocolate.Fusion.PreMergeValidation.Rules;
 /// exact match in their values.
 /// </para>
 /// </summary>
-/// <seealso href="https://graphql.github.io/composite-schemas-spec/draft/#sec-Enum-Types-Inconsistent">
+/// <seealso href="https://graphql.github.io/composite-schemas-spec/draft/#sec-Enum-Values-Mismatch">
 /// Specification
 /// </seealso>
-internal sealed class EnumTypesInconsistentRule : IEventHandler<EnumTypeGroupEvent>
+internal sealed class EnumValuesMismatchRule : IEventHandler<EnumTypeGroupEvent>
 {
     public void Handle(EnumTypeGroupEvent @event, CompositionContext context)
     {
@@ -44,8 +44,7 @@ public void Handle(EnumTypeGroupEvent @event, CompositionContext context)
             {
                 if (!enumType.Values.ContainsName(enumValue))
                 {
-                    context.Log.Write(
-                        EnumTypesInconsistent(enumType, enumValue, schema));
+                    context.Log.Write(EnumValuesMismatch(enumType, enumValue, schema));
                 }
             }
         }

diff --git a/...Chocolate/Fusion-vnext/src/Fusion.Composition/Properties/CompositionResources.Designer.cs b/...Chocolate/Fusion-vnext/src/Fusion.Composition/Properties/CompositionResources.Designer.cs
diff --git a/src/HotChocolate/Fusion-vnext/src/Fusion.Composition/Properties/CompositionResources.resx b/src/HotChocolate/Fusion-vnext/src/Fusion.Composition/Properties/CompositionResources.resx
@@ -36,7 +36,7 @@
   <data name="LogEntryHelper_DisallowedInaccessibleDirectiveArgument" xml:space="preserve">
     <value>The built-in directive argument '{0}' in schema '{1}' is not accessible.</value>
   </data>
-  <data name="LogEntryHelper_EnumTypesInconsistent" xml:space="preserve">
+  <data name="LogEntryHelper_EnumValuesMismatch" xml:space="preserve">
     <value>The enum type '{0}' in schema '{1}' must define the value '{2}'.</value>
   </data>
   <data name="LogEntryHelper_ExternalArgumentDefaultMismatch" xml:space="preserve">

diff --git a/src/HotChocolate/Fusion-vnext/src/Fusion.Composition/SourceSchemaMerger.cs b/src/HotChocolate/Fusion-vnext/src/Fusion.Composition/SourceSchemaMerger.cs
@@ -47,7 +47,7 @@ private CompositionResult<SchemaDefinition> MergeSchemaDefinitions(CompositionCo
     private static readonly List<object> _preMergeValidationRules =
     [
         new DisallowedInaccessibleElementsRule(),
-        new EnumTypesInconsistentRule(),
+        new EnumValuesMismatchRule(),
         new ExternalArgumentDefaultMismatchRule(),
         new ExternalMissingOnBaseRule(),
         new ExternalOnInterfaceRule(),

diff --git a/...n/Rules/EnumTypesInconsistentRuleTests.cs → ...tion/Rules/EnumValuesMismatchRuleTests.cs b/...n/Rules/EnumTypesInconsistentRuleTests.cs → ...tion/Rules/EnumValuesMismatchRuleTests.cs
@@ -4,9 +4,9 @@
 
 namespace HotChocolate.Composition.PreMergeValidation.Rules;
 
-public sealed class EnumTypesInconsistentRuleTests : CompositionTestBase
+public sealed class EnumValuesMismatchRuleTests : CompositionTestBase
 {
-    private readonly PreMergeValidator _preMergeValidator = new([new EnumTypesInconsistentRule()]);
+    private readonly PreMergeValidator _preMergeValidator = new([new EnumValuesMismatchRule()]);
 
     [Theory]
     [MemberData(nameof(ValidExamplesData))]
@@ -36,7 +36,7 @@ public void Examples_Invalid(string[] sdl, string[] errorMessages)
         // assert
         Assert.True(result.IsFailure);
         Assert.Equal(errorMessages, context.Log.Select(e => e.Message).ToArray());
-        Assert.True(context.Log.All(e => e.Code == "ENUM_TYPES_INCONSISTENT"));
+        Assert.True(context.Log.All(e => e.Code == "ENUM_VALUES_MISMATCH"));
         Assert.True(context.Log.All(e => e.Severity == LogSeverity.Error));
     }