[Fusion] Added built-in types and directives to source schemas (#8456)

Co-authored-by: Michael Staib <[email protected]>

Author: glen-84

src/HotChocolate/Fusion-vnext/src/Fusion.Composition/Extensions/MutableSchemaDefinitionExtensions.cs

@@ -5,6 +5,22 @@ namespace HotChocolate.Fusion.Extensions;
 
 internal static class MutableSchemaDefinitionExtensions
 {
+    public static void AddBuiltInFusionTypes(this MutableSchemaDefinition schema)
+    {
+        foreach (var builtInScalar in FusionBuiltIns.SourceSchemaScalars)
+        {
+            schema.Types.Add(builtInScalar);
+        }
+    }
+
+    public static void AddBuiltInFusionDirectives(this MutableSchemaDefinition schema)
+    {
+        foreach (var builtInDirective in FusionBuiltIns.SourceSchemaDirectives)
+        {
+            schema.DirectiveDefinitions.Add(builtInDirective);
+        }
+    }
+
     public static bool IsRootOperationType(
         this MutableSchemaDefinition schema,
         MutableObjectTypeDefinition type)

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

@@ -1,9 +1,40 @@
+using System.Collections.Frozen;
+using HotChocolate.Fusion.Definitions;
+using HotChocolate.Types.Mutable;
 using static HotChocolate.Fusion.WellKnownTypeNames;
 
 namespace HotChocolate.Fusion;
 
 internal static class FusionBuiltIns
 {
+    private static readonly MutableScalarTypeDefinition s_fieldSelectionMapType =
+        MutableScalarTypeDefinition.Create(FieldSelectionMap);
+
+    private static readonly MutableScalarTypeDefinition s_fieldSelectionSetType =
+        MutableScalarTypeDefinition.Create(FieldSelectionSet);
+
+    private static readonly MutableScalarTypeDefinition s_stringType = BuiltIns.String.Create();
+
+    public static FrozenSet<MutableDirectiveDefinition> SourceSchemaDirectives { get; } =
+        new HashSet<MutableDirectiveDefinition>(
+        [
+            new ExternalMutableDirectiveDefinition(),
+            new InaccessibleMutableDirectiveDefinition(),
+            new InternalMutableDirectiveDefinition(),
+            new IsMutableDirectiveDefinition(s_fieldSelectionMapType),
+            new KeyMutableDirectiveDefinition(s_fieldSelectionSetType),
+            new LookupMutableDirectiveDefinition(),
+            new OverrideMutableDirectiveDefinition(s_stringType),
+            new ProvidesMutableDirectiveDefinition(s_fieldSelectionSetType),
+            new RequireMutableDirectiveDefinition(s_fieldSelectionMapType),
+            new SchemaNameMutableDirectiveDefinition(s_stringType),
+            new ShareableMutableDirectiveDefinition()
+        ]).ToFrozenSet();
+
+    public static FrozenSet<MutableScalarTypeDefinition> SourceSchemaScalars { get; } =
+        new HashSet<MutableScalarTypeDefinition>([s_fieldSelectionMapType, s_fieldSelectionSetType])
+            .ToFrozenSet();
+
     public static bool IsBuiltInSourceSchemaScalar(string typeName)
     {
         return typeName switch

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

@@ -1,6 +1,7 @@
 using System.Collections.Immutable;
 using HotChocolate.Fusion.Comparers;
 using HotChocolate.Fusion.Errors;
+using HotChocolate.Fusion.Extensions;
 using HotChocolate.Fusion.Logging;
 using HotChocolate.Fusion.Logging.Contracts;
 using HotChocolate.Fusion.Results;
@@ -23,7 +24,17 @@ public CompositionResult<ImmutableSortedSet<MutableSchemaDefinition>> Parse()
         {
             try
             {
-                var schema = SchemaParser.Parse(sourceSchema);
+                var schema = new MutableSchemaDefinition();
+                schema.AddBuiltInFusionTypes();
+                schema.AddBuiltInFusionDirectives();
+                SchemaParser.Parse(
+                    schema,
+                    sourceSchema,
+                    new SchemaParserOptions
+                    {
+                        IgnoreExistingTypes = true,
+                        IgnoreExistingDirectives = true
+                    });
                 var schemaNameDirective = schema.Directives.FirstOrDefault(SchemaName);
 
                 if (schema.Name == "default"

src/HotChocolate/Fusion-vnext/src/Fusion.Composition/SourceSchemaValidationRules/TypeDefinitionInvalidRule.cs

@@ -1,12 +1,8 @@
-using System.Collections.Frozen;
-using HotChocolate.Fusion.Definitions;
 using HotChocolate.Fusion.Events;
 using HotChocolate.Fusion.Events.Contracts;
 using HotChocolate.Types;
-using HotChocolate.Types.Mutable;
 using static HotChocolate.Fusion.Logging.LogEntryHelper;
 using static HotChocolate.Fusion.Properties.CompositionResources;
-using static HotChocolate.Fusion.WellKnownTypeNames;
 
 namespace HotChocolate.Fusion.SourceSchemaValidationRules;
 
@@ -26,28 +22,28 @@ public void Handle(SchemaEvent @event, CompositionContext context)
     {
         var schema = @event.Schema;
 
-        // Types.
-        if (schema.Types.TryGetType(FieldSelectionMap, out var fieldSelectionMapType)
-            && fieldSelectionMapType.Kind != TypeKind.Scalar)
+        // Scalars.
+        foreach (var builtInScalar in FusionBuiltIns.SourceSchemaScalars)
         {
-            context.Log.Write(TypeDefinitionInvalid(fieldSelectionMapType, schema));
-        }
-
-        if (schema.Types.TryGetType(FieldSelectionSet, out var fieldSelectionSetType)
-            && fieldSelectionSetType.Kind != TypeKind.Scalar)
-        {
-            context.Log.Write(TypeDefinitionInvalid(fieldSelectionSetType, schema));
+            if (schema.Types.TryGetType(builtInScalar.Name, out var type)
+                && type.Kind != TypeKind.Scalar)
+            {
+                context.Log.Write(TypeDefinitionInvalid(type, schema));
+            }
         }
 
         // Directives.
-        foreach (var (name, definition) in _builtInDirectives)
+        foreach (var builtInDirective in FusionBuiltIns.SourceSchemaDirectives)
         {
-            if (!schema.DirectiveDefinitions.TryGetDirective(name, out var directive))
+            if (
+                !schema.DirectiveDefinitions.TryGetDirective(
+                    builtInDirective.Name,
+                    out var directive))
             {
                 continue;
             }
 
-            foreach (var expectedArgument in definition.Arguments)
+            foreach (var expectedArgument in builtInDirective.Arguments)
             {
                 var argumentName = expectedArgument.Name;
 
@@ -79,30 +75,4 @@ public void Handle(SchemaEvent @event, CompositionContext context)
             }
         }
     }
-
-    private readonly FrozenDictionary<string, MutableDirectiveDefinition> _builtInDirectives =
-        CreateBuiltInDirectiveDefinitions();
-
-    private static FrozenDictionary<string, MutableDirectiveDefinition>
-        CreateBuiltInDirectiveDefinitions()
-    {
-        var fieldSelectionMapType = MutableScalarTypeDefinition.Create(FieldSelectionMap);
-        var fieldSelectionSetType = MutableScalarTypeDefinition.Create(FieldSelectionSet);
-        var stringType = BuiltIns.String.Create();
-
-        return new Dictionary<string, MutableDirectiveDefinition>()
-        {
-            { "external", new ExternalMutableDirectiveDefinition() },
-            { "inaccessible", new InaccessibleMutableDirectiveDefinition() },
-            { "internal", new InternalMutableDirectiveDefinition() },
-            { "is", new IsMutableDirectiveDefinition(fieldSelectionMapType) },
-            { "key", new KeyMutableDirectiveDefinition(fieldSelectionSetType) },
-            { "lookup", new LookupMutableDirectiveDefinition() },
-            { "override", new OverrideMutableDirectiveDefinition(stringType) },
-            { "provides", new ProvidesMutableDirectiveDefinition(fieldSelectionSetType) },
-            { "require", new RequireMutableDirectiveDefinition(fieldSelectionMapType) },
-            { "schemaName", new SchemaNameMutableDirectiveDefinition(stringType) },
-            { "shareable", new ShareableMutableDirectiveDefinition() }
-        }.ToFrozenDictionary();
-    }
 }

src/HotChocolate/Fusion-vnext/test/Fusion.CommandLine.Tests/__resources__/invalid-example-1/source-schema-1.graphqls

@@ -9,6 +9,3 @@ type Query {
 type User {
   id: ID!
 }
-
-directive @schemaName(value: String!) on SCHEMA
-directive @lookup on FIELD_DEFINITION

src/HotChocolate/Fusion-vnext/test/Fusion.CommandLine.Tests/__resources__/invalid-example-1/source-schema-2.graphqls

@@ -10,6 +10,3 @@ type User {
   id: ID!
   username: String!
 }
-
-directive @schemaName(value: String!) on SCHEMA
-directive @lookup on FIELD_DEFINITION

src/HotChocolate/Fusion-vnext/test/Fusion.CommandLine.Tests/__resources__/invalid-example-2/source-schema-1.graphqls

@@ -9,7 +9,3 @@ type Query @inaccessible {         # Error:   QUERY_ROOT_TYPE_INACCESSIBLE
 type User {
   id: ID!
 }
-
-directive @schemaName(value: String!) on SCHEMA
-directive @inaccessible on OBJECT # | etc.
-directive @lookup on FIELD_DEFINITION

src/HotChocolate/Fusion-vnext/test/Fusion.CommandLine.Tests/__resources__/invalid-example-2/source-schema-2.graphqls

@@ -9,6 +9,3 @@ type Query @inaccessible {                         # Error:   QUERY_ROOT_TYPE_IN
 type User {
   username: String!
 }
-
-directive @schemaName(value: String!) on SCHEMA
-directive @lookup on FIELD_DEFINITION

src/HotChocolate/Fusion-vnext/test/Fusion.CommandLine.Tests/__resources__/valid-example-1/source-schema-1.graphqls

@@ -5,5 +5,3 @@ schema @schemaName(value: "Schema1") {
 type Query {
   schema1Field: Int!
 }
-
-directive @schemaName(value: String!) on SCHEMA

src/HotChocolate/Fusion-vnext/test/Fusion.CommandLine.Tests/__resources__/valid-example-1/source-schema-2.graphqls

@@ -5,5 +5,3 @@ schema @schemaName(value: "Schema2") {
 type Query {
   schema2Field: Int!
 }
-
-directive @schemaName(value: String!) on SCHEMA