Add additional types to schema builder

Author: rasmusjp

src/Our.Umbraco.GraphQL/Builders/ISchemaBuilder.cs

@@ -0,0 +1,11 @@
+using System.Reflection;
+using GraphQL.Types;
+
+namespace Our.Umbraco.GraphQL.Builders
+{
+    public interface ISchemaBuilder
+    {
+        ISchema Build<TSchema>(params TypeInfo[] additionalTypes);
+        ISchema Build(TypeInfo schemaType, params TypeInfo[] additionalTypes);
+    }
+}

src/Our.Umbraco.GraphQL/Builders/SchemaBuilder.cs

@@ -6,7 +6,7 @@
 
 namespace Our.Umbraco.GraphQL.Builders
 {
-    public class SchemaBuilder
+    public class SchemaBuilder : ISchemaBuilder
     {
         private readonly IGraphTypeAdapter _graphTypeAdapter;
         private readonly GraphVisitor _visitor;
@@ -17,9 +17,9 @@ public SchemaBuilder(IGraphTypeAdapter graphTypeAdapter, GraphVisitor visitor)
             _visitor = visitor;
         }
 
-        public ISchema Build<TSchema>() => Build(typeof(TSchema).GetTypeInfo());
+        public ISchema Build<TSchema>(params TypeInfo[] additionalTypes) => Build(typeof(TSchema).GetTypeInfo(), additionalTypes);
 
-        public ISchema Build(TypeInfo schemaType)
+        public ISchema Build(TypeInfo schemaType, params TypeInfo[] additionalTypes)
         {
             if (schemaType == null) throw new ArgumentNullException(nameof(schemaType));
 
@@ -33,6 +33,11 @@ public ISchema Build(TypeInfo schemaType)
                 throw new ArgumentException("'Query' does not have a getter.", nameof(schemaType));
             schema.Query = (IObjectGraphType) _graphTypeAdapter.Adapt(queryPropertyInfo.GetMethod.ReturnType.GetTypeInfo());
 
+            foreach(var type in additionalTypes)
+            {
+                schema.RegisterType(_graphTypeAdapter.Adapt(type));
+            }
+
             _visitor?.Visit(schema);
 
             return schema;

test/Our.Umbraco.GraphQL.Tests/Builders/SchemaBuilderTests.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Net.Configuration;
 using System.Reflection;
 using FluentAssertions;
 using GraphQL.Types;
@@ -79,6 +80,21 @@ public void Build_WithVisitor_CallsVisitWithSchema()
             visitor.Received(1).Visit(Arg.Is(schema));
         }
 
+
+        [Fact]
+        public void Build_WithAdditionalTypes_AddToAdditionalTypes()
+        {
+            var graphTypeAdapter = Substitute.For<IGraphTypeAdapter>();
+            graphTypeAdapter.Adapt(Arg.Is(typeof(Query).GetTypeInfo())).Returns(new ObjectGraphType());
+            graphTypeAdapter.Adapt(Arg.Is(typeof(MyType).GetTypeInfo()))
+                .Returns(new ObjectGraphType {Name = "MyType"});
+            var schemaBuilder = CreateSUT(graphTypeAdapter);
+
+            var schema = schemaBuilder.Build<SchemaWithQuery>(typeof(MyType).GetTypeInfo());
+
+            schema.FindType(nameof(MyType)).Should().NotBeNull();
+        }
+
         private class EmptySchema
         {
         }
@@ -100,5 +116,10 @@ private class SchemaWithQuery
         private class Query
         {
         }
+
+        private class MyType
+        {
+            public string Name { get; set; }
+        }
     }
 }