Fixed non-null int issue (#362)

ChilliCream · Nov 25, 2018 · a084c6e · a084c6e
1 parent 7fd1925
commit a084c6e
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 5 deletions.
diff --git a/src/Types.Tests/Types/ObjectTypeTests.cs b/src/Types.Tests/Types/ObjectTypeTests.cs
@@ -31,6 +31,35 @@ public void IntializeExplicitFieldWithImplicitResolver()
             Assert.NotNull(fooType.Fields.First().Resolver);
         }
 
+        [Fact]
+        public void IntArgumentIsInferedAsNonNullType()
+        {
+            // arrange
+            var errors = new List<SchemaError>();
+            var schemaContext = new SchemaContext();
+            var intType = new IntType();
+            schemaContext.Types.RegisterType(intType);
+
+            // act
+            var fooType = new ObjectType<QueryWithIntArg>();
+
+            // assert
+            var initializationContext = new TypeInitializationContext(
+                schemaContext, a => errors.Add(a), fooType, false);
+            ((INeedsInitialization)fooType)
+                .RegisterDependencies(initializationContext);
+            schemaContext.CompleteTypes();
+
+            Assert.Empty(errors);
+
+            IType argumentType = fooType.Fields["bar"]
+                .Arguments.First().Type;
+
+            Assert.NotNull(argumentType);
+            Assert.True(argumentType.IsNonNullType());
+            Assert.Equal(intType, argumentType.NamedType());
+        }
+
         [Fact]
         public void IntializeImpicitFieldWithImplicitResolver()
         {
@@ -478,6 +507,11 @@ public class FooResolver
             public string GetBar(string foo) => "hello foo";
         }
 
+        public class QueryWithIntArg
+        {
+            public string GetBar(int foo) => "hello foo";
+        }
+
         public class Bar
         {
             [GraphQLNonNullType]

diff --git a/src/Types/Configuration/TypeRegistry.GetType.cs b/src/Types/Configuration/TypeRegistry.GetType.cs
@@ -179,11 +179,12 @@ private bool TryGetTypeFromClrType<T>(
             TypeContext context,
             out T type)
         {
-            if (TryGetTypeFromClrType(
-                DotNetTypeInfoFactory.Unwrap(clrType),
-                context,
-                t => t,
-                out type))
+            Type unwrappedClrType = DotNetTypeInfoFactory.Unwrap(clrType);
+
+            if (!unwrappedClrType.IsValueType
+                && TryGetTypeFromClrType(
+                    unwrappedClrType, context,
+                    t => t, out type))
             {
                 return true;
             }