[Fusion] Refactored SchemaComposer

Author: glen-84

src/HotChocolate/Fusion-vnext/src/Fusion.Composition/CompositionContext.cs

@@ -5,13 +5,13 @@
 namespace HotChocolate.Fusion;
 
 internal sealed class CompositionContext(
-    ImmutableArray<SchemaDefinition> schemaDefinitions,
+    ImmutableSortedSet<SchemaDefinition> schemaDefinitions,
     ICompositionLog compositionLog)
 {
     /// <summary>
     /// Gets the schema definitions.
     /// </summary>
-    public ImmutableArray<SchemaDefinition> SchemaDefinitions { get; } = schemaDefinitions;
+    public ImmutableSortedSet<SchemaDefinition> SchemaDefinitions { get; } = schemaDefinitions;
 
     /// <summary>
     /// Gets the composition log.

src/HotChocolate/Fusion-vnext/src/Fusion.Composition/Errors/ErrorHelper.cs

@@ -4,6 +4,9 @@ namespace HotChocolate.Fusion.Errors;
 
 internal static class ErrorHelper
 {
+    public static CompositionError SourceSchemaParsingFailed()
+        => new(ErrorHelper_SourceSchemaParsingFailed);
+
     public static CompositionError SourceSchemaValidationFailed()
         => new(ErrorHelper_SourceSchemaValidationFailed);
 

src/HotChocolate/Fusion-vnext/src/Fusion.Composition/Logging/LogEntryCodes.cs

@@ -12,6 +12,7 @@ public static class LogEntryCodes
     public const string InputFieldDefaultMismatch = "INPUT_FIELD_DEFAULT_MISMATCH";
     public const string InputFieldTypesNotMergeable = "INPUT_FIELD_TYPES_NOT_MERGEABLE";
     public const string InputWithMissingRequiredFields = "INPUT_WITH_MISSING_REQUIRED_FIELDS";
+    public const string InvalidGraphQL = "INVALID_GRAPHQL";
     public const string KeyDirectiveInFieldsArg = "KEY_DIRECTIVE_IN_FIELDS_ARG";
     public const string KeyFieldsHasArgs = "KEY_FIELDS_HAS_ARGS";
     public const string KeyFieldsSelectInvalidType = "KEY_FIELDS_SELECT_INVALID_TYPE";

src/HotChocolate/Fusion-vnext/src/Fusion.Composition/Logging/LogEntryHelper.cs

@@ -266,6 +266,14 @@ public static LogEntry InputWithMissingRequiredFields(
             schema);
     }
 
+    public static LogEntry InvalidGraphQL(string exceptionMessage)
+    {
+        return new LogEntry(
+            string.Format(LogEntryHelper_InvalidGraphQL, exceptionMessage),
+            LogEntryCodes.InvalidGraphQL,
+            severity: LogSeverity.Error);
+    }
+
     public static LogEntry KeyDirectiveInFieldsArgument(
         string entityTypeName,
         Directive keyDirective,

src/HotChocolate/Fusion-vnext/src/Fusion.Composition/PostMergeValidator.cs

@@ -4,11 +4,13 @@
 
 namespace HotChocolate.Fusion;
 
-internal sealed class PostMergeValidator(IEnumerable<object> rules)
+#pragma warning disable CS9113 // Parameter is unread.
+internal sealed class PostMergeValidator(
+    SchemaDefinition mergedSchema,
+    ImmutableArray<object> rules)
+#pragma warning restore CS9113 // Parameter is unread.
 {
-    private readonly ImmutableArray<object> _rules = [.. rules];
-
-    public CompositionResult Validate(SchemaDefinition _)
+    public CompositionResult Validate()
     {
         // FIXME: Implement.
         return CompositionResult.Success();

src/HotChocolate/Fusion-vnext/src/Fusion.Composition/PreMergeValidator.cs

@@ -3,27 +3,30 @@
 using HotChocolate.Fusion.Errors;
 using HotChocolate.Fusion.Events;
 using HotChocolate.Fusion.Info;
+using HotChocolate.Fusion.Logging.Contracts;
 using HotChocolate.Fusion.PreMergeValidation;
 using HotChocolate.Fusion.Results;
 using HotChocolate.Skimmed;
 
 namespace HotChocolate.Fusion;
 
-internal sealed class PreMergeValidator(IEnumerable<object> rules)
+internal sealed class PreMergeValidator(
+    ImmutableSortedSet<SchemaDefinition> schemas,
+    ImmutableArray<object> rules,
+    ICompositionLog log)
 {
-    private readonly ImmutableArray<object> _rules = [.. rules];
-
-    public CompositionResult Validate(CompositionContext context)
+    public CompositionResult Validate()
     {
-        PublishEvents(context);
+        PublishEvents();
 
-        return context.Log.HasErrors
+        return log.HasErrors
             ? ErrorHelper.PreMergeValidationFailed()
             : CompositionResult.Success();
     }
 
-    private void PublishEvents(CompositionContext context)
+    private void PublishEvents()
     {
+        var context = new CompositionContext(schemas, log);
         MultiValueDictionary<string, TypeInfo> typeGroupByName = [];
 
         foreach (var schema in context.SchemaDefinitions)
@@ -127,7 +130,7 @@ private void PublishEvents(CompositionContext context)
     private void PublishEvent<TEvent>(TEvent @event, CompositionContext context)
         where TEvent : IEvent
     {
-        foreach (var rule in _rules)
+        foreach (var rule in rules)
         {
             if (rule is IEventHandler<TEvent> handler)
             {

src/HotChocolate/Fusion-vnext/src/Fusion.Composition/Properties/CompositionResources.Designer.cs

@@ -21,6 +21,9 @@
   <data name="ErrorHelper_PreMergeValidationFailed" xml:space="preserve">
     <value>Pre-merge validation failed. View the composition log for details.</value>
   </data>
+  <data name="ErrorHelper_SourceSchemaParsingFailed" xml:space="preserve">
+    <value>Source schema parsing failed. View the composition log for details.</value>
+  </data>
   <data name="ErrorHelper_SourceSchemaValidationFailed" xml:space="preserve">
     <value>Source schema validation failed. View the composition log for details.</value>
   </data>
@@ -66,6 +69,9 @@
   <data name="LogEntryHelper_InputWithMissingRequiredFields" xml:space="preserve">
     <value>The input type '{0}' in schema '{1}' must define the required field '{2}'.</value>
   </data>
+  <data name="LogEntryHelper_InvalidGraphQL" xml:space="preserve">
+    <value>Invalid GraphQL in source schema. Exception message: {0}.</value>
+  </data>
   <data name="LogEntryHelper_KeyDirectiveInFieldsArgument" xml:space="preserve">
     <value>A @key directive on type '{0}' in schema '{1}' references field '{2}', which must not include directive applications.</value>
   </data>

src/HotChocolate/Fusion-vnext/src/Fusion.Composition/Properties/CompositionResources.resx

@@ -76,4 +76,16 @@ public static implicit operator CompositionResult<TValue>(CompositionResult resu
     {
         return new CompositionResult<TValue>(result.Errors);
     }
+
+    public void Deconstruct(
+        out bool isSuccess,
+        out bool isFailure,
+        out TValue value,
+        out ImmutableArray<CompositionError> errors)
+    {
+        isSuccess = IsSuccess;
+        isFailure = IsFailure;
+        value = Value;
+        errors = Errors;
+    }
 }

src/HotChocolate/Fusion-vnext/src/Fusion.Composition/Results/CompositionResult~1.cs

@@ -3,9 +3,11 @@
 
 namespace HotChocolate.Fusion;
 
-internal sealed class SatisfiabilityValidator
+#pragma warning disable CS9113 // Parameter is unread.
+internal sealed class SatisfiabilityValidator(SchemaDefinition mergedSchema)
+#pragma warning restore CS9113 // Parameter is unread.
 {
-    public CompositionResult Validate(SchemaDefinition _)
+    public CompositionResult Validate()
     {
         // FIXME: Implement.
         return CompositionResult.Success();