Merge pull request #511 from crissi/fix_non_null_list_of_non_null_input_object_rules

fix non null list of non null of input object

Author: mfn

CHANGELOG.md

@@ -3,6 +3,8 @@ CHANGELOG
 
 [Next release](https://github.com/rebing/graphql-laravel/compare/3.1.0...master)
 --------------
+### Fixed
+- Fix validation rules for non-null list of non-null objects [\#511 / crissi](https://github.com/rebing/graphql-laravel/pull/511/files)
 
 2019-10-23, 3.1.0
 -----------------

src/Support/Field.php

@@ -5,16 +5,16 @@
 namespace Rebing\GraphQL\Support;
 
 use Closure;
-use Validator;
-use Illuminate\Support\Arr;
-use GraphQL\Type\Definition\NonNull;
+use GraphQL\Type\Definition\InputObjectType;
 use GraphQL\Type\Definition\ListOfType;
+use GraphQL\Type\Definition\NonNull;
 use GraphQL\Type\Definition\ResolveInfo;
+use GraphQL\Type\Definition\Type as GraphqlType;
 use GraphQL\Type\Definition\WrappingType;
-use Rebing\GraphQL\Error\ValidationError;
-use GraphQL\Type\Definition\InputObjectType;
+use Illuminate\Support\Arr;
 use Rebing\GraphQL\Error\AuthorizationError;
-use GraphQL\Type\Definition\Type as GraphqlType;
+use Rebing\GraphQL\Error\ValidationError;
+use Validator;
 
 abstract class Field
 {
@@ -118,7 +118,7 @@ public function inferRulesFromType(GraphqlType $type, string $prefix, array $res
 
         // make sure we are dealing with the actual type
         if ($type instanceof WrappingType) {
-            $type = $type->getWrappedType();
+            $type = $type->getWrappedType(true);
         }
 
         // if it is an input object type - the only type we care about here...
@@ -144,12 +144,17 @@ public function getInputTypeRules(InputObjectType $input, string $prefix, array
                 $rules[$key] = $this->resolveRules($field->rules, $resolutionArguments);
             }
 
+            $type = $field->type;
+            if ($field->type instanceof WrappingType) {
+                $type = $field->type->getWrappedType(true);
+            }
+
             // then recursively call the parent method to see if this is an
             // input object, passing in the new prefix
-            if ($field->type instanceof InputObjectType) {
+            if ($type instanceof InputObjectType) {
                 // in case the field is a self reference we must not do
                 // a recursive call as it will never stop
-                if ($field->type->toString() == $input->toString()) {
+                if ($type->toString() == $input->toString()) {
                     continue;
                 }
             }

tests/Support/Objects/UpdateExampleMutationWithInputType.php

@@ -5,8 +5,8 @@
 namespace Rebing\GraphQL\Tests\Support\Objects;
 
 use GraphQL\Type\Definition\Type;
-use Rebing\GraphQL\Support\Mutation;
 use Rebing\GraphQL\Support\Facades\GraphQL;
+use Rebing\GraphQL\Support\Mutation;
 
 class UpdateExampleMutationWithInputType extends Mutation
 {
@@ -59,6 +59,12 @@ public function args(): array
                 'type'  => Type::nonNull(GraphQL::type('ExampleValidationInputObject')),
                 'rules' => ['required'],
             ],
+
+            'test_with_rules_non_nullable_list_of_non_nullable_input_object' => [
+                'name'  => 'test',
+                'type'  => Type::nonNull(Type::listOf(Type::nonNull(GraphQL::type('ExampleValidationInputObject')))),
+            ],
+
         ];
     }
 

tests/Unit/MutationTest.php

@@ -7,9 +7,9 @@
 use Illuminate\Support\Arr;
 use Illuminate\Validation\Validator;
 use Rebing\GraphQL\Error\ValidationError;
+use Rebing\GraphQL\Tests\Support\Objects\ExampleNestedValidationInputObject;
 use Rebing\GraphQL\Tests\Support\Objects\ExampleType;
 use Rebing\GraphQL\Tests\Support\Objects\ExampleValidationInputObject;
-use Rebing\GraphQL\Tests\Support\Objects\ExampleNestedValidationInputObject;
 use Rebing\GraphQL\Tests\Support\Objects\UpdateExampleMutationWithInputType;
 
 class MutationTest extends FieldTest
@@ -58,6 +58,11 @@ public function testGetRules(): void
         $this->assertEquals(Arr::get($rules, 'test_with_rules_non_nullable_input_object.nest.email'), ['email']);
         $this->assertEquals(Arr::get($rules, 'test_with_rules_non_nullable_input_object.list'), ['required']);
         $this->assertEquals(Arr::get($rules, 'test_with_rules_non_nullable_input_object.list.*.email'), ['email']);
+        $this->assertEquals(Arr::get($rules, 'test_with_rules_non_nullable_list_of_non_nullable_input_object.*.val'), ['required']);
+        $this->assertEquals(Arr::get($rules, 'test_with_rules_non_nullable_list_of_non_nullable_input_object.*.nest'), ['required']);
+        $this->assertEquals(Arr::get($rules, 'test_with_rules_non_nullable_list_of_non_nullable_input_object.*.nest.email'), ['email']);
+        $this->assertEquals(Arr::get($rules, 'test_with_rules_non_nullable_list_of_non_nullable_input_object.*.list'), ['required']);
+        $this->assertEquals(Arr::get($rules, 'test_with_rules_non_nullable_list_of_non_nullable_input_object.*.list.*.email'), ['email']);
     }
 
     /**