Resolved #1079

ChilliCream · Sep 17, 2019 · b486249 · b486249
1 parent 79dbb2e
commit b486249
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 3 deletions.
diff --git a/src/Core/Types/Types/Descriptors/ArgumentDescriptor.cs b/src/Core/Types/Types/Descriptors/ArgumentDescriptor.cs
@@ -83,6 +83,13 @@ public new IArgumentDescriptor Type<TInputType>()
             return this;
         }
 
+        public new IArgumentDescriptor Type(
+            Type type)
+        {
+            base.Type(type);
+            return this;
+        }
+
         public new IArgumentDescriptor DefaultValue(IValueNode value)
         {
             base.DefaultValue(value);

diff --git a/src/Core/Types/Types/Descriptors/ArgumentDescriptorBase~1.cs b/src/Core/Types/Types/Descriptors/ArgumentDescriptorBase~1.cs
@@ -45,6 +45,20 @@ public void Type<TInputType>()
                 TypeContext.Input);
         }
 
+        public void Type(Type type)
+        {
+            if (Context.Inspector.IsSchemaType(type)
+                && !typeof(IInputType).IsAssignableFrom(type))
+            {
+                throw new ArgumentException(
+                    TypeResources.ArgumentDescriptor_InputTypeViolation);
+            }
+
+            Definition.SetMoreSpecificType(
+                type,
+                TypeContext.Input);
+        }
+
         public void Type<TInputType>(TInputType inputType)
             where TInputType : class, IInputType
         {

diff --git a/src/Core/Types/Types/Descriptors/DirectiveArgumentDescriptor.cs b/src/Core/Types/Types/Descriptors/DirectiveArgumentDescriptor.cs
@@ -1,4 +1,5 @@
-using System.Reflection;
+using System;
+using System.Reflection;
 using HotChocolate.Language;
 using HotChocolate.Types.Descriptors.Definitions;
 
@@ -71,6 +72,13 @@ public new IDirectiveArgumentDescriptor Type<TInputType>()
             return this;
         }
 
+        public new IDirectiveArgumentDescriptor Type(
+          Type type)
+        {
+            base.Type(type);
+            return this;
+        }
+
         public new IDirectiveArgumentDescriptor DefaultValue(
             IValueNode value)
         {

diff --git a/src/Core/Types/Types/Descriptors/InputFieldDescriptor.cs b/src/Core/Types/Types/Descriptors/InputFieldDescriptor.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Reflection;
 using HotChocolate.Language;
 using HotChocolate.Types.Descriptors.Definitions;
@@ -71,6 +71,12 @@ public new IInputFieldDescriptor Type(ITypeNode typeNode)
             return this;
         }
 
+        public new IInputFieldDescriptor Type(Type type)
+        {
+            base.Type(type);
+            return this;
+        }
+
         public IInputFieldDescriptor Ignore()
         {
             Definition.Ignore = true;

diff --git a/src/Core/Types/Types/Descriptors/InterfaceFieldDescriptor.cs b/src/Core/Types/Types/Descriptors/InterfaceFieldDescriptor.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Reflection;
 using HotChocolate.Language;
@@ -125,6 +125,12 @@ public new IInterfaceFieldDescriptor Type(ITypeNode type)
             return this;
         }
 
+        public new IInterfaceFieldDescriptor Type(Type type)
+        {
+            base.Type(type);
+            return this;
+        }
+
         public new IInterfaceFieldDescriptor Argument(
             NameString name,
             Action<IArgumentDescriptor> argument)

diff --git a/src/Core/Types/Types/Descriptors/ObjectFieldDescriptor.cs b/src/Core/Types/Types/Descriptors/ObjectFieldDescriptor.cs
@@ -141,6 +141,12 @@ public new IObjectFieldDescriptor Type(ITypeNode typeNode)
             return this;
         }
 
+        public new IObjectFieldDescriptor Type(Type type)
+        {
+            base.Type(type);
+            return this;
+        }
+
         public new IObjectFieldDescriptor Argument(
             NameString argumentName,
             Action<IArgumentDescriptor> argumentDescriptor)

diff --git a/src/Core/Types/Types/Descriptors/OutputFieldDescriptorBase.cs b/src/Core/Types/Types/Descriptors/OutputFieldDescriptorBase.cs
@@ -55,6 +55,20 @@ protected void Type<TOutputType>()
                 TypeContext.Output);
         }
 
+        protected void Type(Type type)
+        {
+            if (Context.Inspector.IsSchemaType(type)
+                && !typeof(IOutputType).IsAssignableFrom(type))
+            {
+                throw new ArgumentException(
+                    TypeResources.ObjectFieldDescriptorBase_FieldType);
+            }
+
+            Definition.SetMoreSpecificType(
+                type,
+                TypeContext.Output);
+        }
+
         protected void Type<TOutputType>(TOutputType outputType)
             where TOutputType : class, IOutputType
         {