Fix handling of NonNull type (#6)

* fix non-null case

* add test

* cleanup

* add type strength

Author: shmax

src/Type/Definition/UserErrorsType.php

@@ -32,11 +32,11 @@ public function __construct(array $config, array $path, bool $isParentList = fal
 
         $this->_addErrorCodes($config, $finalFields, $path);
 
-        $type = $config['type'];
+        $type = $this->_getType($config);
         if ($type instanceof InputObjectType) {
-            $this->_buildInputObjectType($config, $path, $finalFields);
+            $this->_buildInputObjectType($type, $config, $path, $finalFields);
         } elseif ($type instanceof ListOfType) {
-            $this->_buildListOfType($config, $path, $finalFields);
+            $this->_buildListOfType($type, $config, $path, $finalFields);
         }
 
         if ($isParentList) {
@@ -50,8 +50,15 @@ public function __construct(array $config, array $path, bool $isParentList = fal
         ]);
     }
 
-    protected function _buildListOfType($config, $path, &$finalFields) {
+    protected function _getType($config): Type {
         $type = $config['type'];
+        if($type instanceof NonNull) {
+            $type = $type->getWrappedType();
+        }
+        return $type;
+    }
+
+    protected function _buildListOfType(ListOfType $type, $config, $path, &$finalFields) {
         $wrappedType = $type->getWrappedType(true);
         if (isset($config['validateItem'])) {
             $newType = static::create(
@@ -77,9 +84,8 @@ protected function _buildListOfType($config, $path, &$finalFields) {
         }
     }
 
-    protected function _buildInputObjectType($config, $path, &$finalFields) {
+    protected function _buildInputObjectType(InputObjectType $type, $config, $path, &$finalFields) {
         $fields = [];
-        $type = $config['type'];
         foreach ($type->getFields() as $key => $field) {
             $newType = static::create(
                 $field->config + ['typeSetter' => $config['typeSetter'] ?? null],

tests/Type/UserErrorsType/NonNullTest.php

@@ -0,0 +1,109 @@
+<?php
+
+declare(strict_types=1);
+
+namespace GraphQL\Tests\Type\UserErrorsType;
+
+use GraphQL\Tests\Utils;
+use GraphQL\Type\Definition\InputObjectType;
+use GraphQL\Type\Definition\Type;
+use GraphQL\Type\Definition\UserErrorsType;
+use GraphQL\Type\Schema;
+use GraphQL\Utils\SchemaPrinter;
+use PHPUnit\Framework\TestCase;
+
+final class NonNullTest extends TestCase
+{
+    public function testStringWrappedType(): void
+    {
+        $type = new UserErrorsType([
+            'errorCodes' => ['invalidColor'],
+            'validate' => static function ($value) {
+                return $value ? 0 : 1;
+            },
+            'type' => Type::nonNull(Type::string()),
+        ], ['authorId']);
+
+        self::assertEquals(Utils::nowdoc('
+            schema {
+              query: AuthorIdError
+            }
+            
+            """User errors for AuthorId"""
+            type AuthorIdError {
+              """An error code"""
+              code: AuthorIdErrorCode
+            
+              """A natural language description of the issue"""
+              msg: String
+            }
+            
+            """Error code"""
+            enum AuthorIdErrorCode {
+              invalidColor
+            }
+
+        '), SchemaPrinter::doPrint(new Schema(['query' => $type])));
+    }
+
+    public function testInputObjectWrappedType(): void
+    {
+        $type = new UserErrorsType([
+            'errorCodes' => ['invalidColor'],
+            'validate' => static function ($value) {
+                return $value ? 0 : 1;
+            },
+            'type' => Type::nonNull(new InputObjectType([
+                'name' => 'bookInput',
+                'fields' => [
+                    'authorId' => [
+                        'type' => Type::id(),
+                        'description' => 'An author Id',
+                        'validate' => static function($authorId) {
+                            return !empty($authorId);
+                        }
+                    ],
+                ],
+            ])),
+        ], ['author']);
+
+        self::assertEquals(Utils::nowdoc('
+            schema {
+              query: AuthorError
+            }
+            
+            """User errors for Author"""
+            type AuthorError {
+              """An error code"""
+              code: AuthorErrorCode
+            
+              """A natural language description of the issue"""
+              msg: String
+            
+              """Suberrors for Author"""
+              suberrors: Author_Suberrors
+            }
+            
+            """Error code"""
+            enum AuthorErrorCode {
+              invalidColor
+            }
+            
+            """User errors for AuthorId"""
+            type Author_AuthorIdError {
+              """A numeric error code. 0 on success, non-zero on failure."""
+              code: Int
+            
+              """An error message."""
+              msg: String
+            }
+            
+            """User Error"""
+            type Author_Suberrors {
+              """Error for authorId"""
+              authorId: Author_AuthorIdError
+            }
+
+        '), SchemaPrinter::doPrint(new Schema(['query' => $type])));
+    }
+}