add multiple types of parameter resolution

CHANGELOG.md

@@ -8,6 +8,7 @@ CHANGELOG
 
 ### Fixed
 - Support adding Schema objects directly [\#449 / mfn](https://github.com/rebing/graphql-laravel/pull/449)
+- Input arguments are properly parsed when objects or lists are passed [\#419 / sowork](https://github.com/rebing/graphql-laravel/pull/419)
 
 2019-08-05, 2.0.0
 -----------------

phpstan.neon.dist

@@ -41,8 +41,6 @@ parameters:
         - '/Cannot call method set\(\) on Illuminate\\Config\\Repository\|null/'
         - '/Parameter #4 \$currentPage of class Illuminate\\Pagination\\LengthAwarePaginator constructor expects int\|null, float\|int given/'
         - '/Parameter #1 \$offset of method Illuminate\\Support\\Collection::slice\(\) expects int, float\|int given/'
-        # \Rebing\GraphQL\Support\ResolveInfoFieldsAndArguments::getValue
-        - '/Access to an undefined property GraphQL\\Language\\AST\\ValueNode::\$value/'
         # tests/Unit/GraphQLTest.php
         - '/Call to an undefined method GraphQL\\Type\\Definition\\Type::getFields\(\)/'
         - '/Call to an undefined method Mockery\\/'

src/Support/ResolveInfoFieldsAndArguments.php

@@ -4,10 +4,20 @@
 
 namespace Rebing\GraphQL\Support;
 
+use RuntimeException;
 use GraphQL\Language\AST\FieldNode;
-use GraphQL\Language\AST\ArgumentNode;
+use GraphQL\Language\AST\ValueNode;
+use GraphQL\Language\AST\IntValueNode;
 use GraphQL\Language\AST\VariableNode;
+use GraphQL\Language\AST\EnumValueNode;
+use GraphQL\Language\AST\ListValueNode;
+use GraphQL\Language\AST\NullValueNode;
+use GraphQL\Language\AST\FloatValueNode;
 use GraphQL\Type\Definition\ResolveInfo;
+use GraphQL\Language\AST\ObjectFieldNode;
+use GraphQL\Language\AST\ObjectValueNode;
+use GraphQL\Language\AST\StringValueNode;
+use GraphQL\Language\AST\BooleanValueNode;
 use GraphQL\Language\AST\SelectionSetNode;
 use GraphQL\Language\AST\FragmentSpreadNode;
 use GraphQL\Language\AST\InlineFragmentNode;
@@ -114,7 +124,7 @@ private function foldSelectionSet(SelectionSetNode $selectionSet, int $descend):
                 ];
 
                 foreach ($selectionNode->arguments ?? [] as $argumentNode) {
-                    $fields[$name]['args'][$argumentNode->name->value] = $this->getValue($argumentNode);
+                    $fields[$name]['args'][$argumentNode->name->value] = $this->getValue($argumentNode->value);
                 }
             } elseif ($selectionNode instanceof FragmentSpreadNode) {
                 $spreadName = $selectionNode->name->value;
@@ -132,15 +142,68 @@ private function foldSelectionSet(SelectionSetNode $selectionSet, int $descend):
         return $fields;
     }
 
-    private function getValue(ArgumentNode $argumentNode)
+    private function getValue(ValueNode $value)
     {
-        $value = $argumentNode->value;
         if ($value instanceof VariableNode) {
             $variableName = $value->name->value;
 
             return $this->info->variableValues[$variableName] ?? null;
         }
 
-        return $argumentNode->value->value;
+        if ($value instanceof IntValueNode) {
+            return (int) $value->value;
+        }
+
+        if ($value instanceof FloatValueNode) {
+            return (float) $value->value;
+        }
+
+        if ($value instanceof StringValueNode) {
+            return (string) $value->value;
+        }
+
+        if ($value instanceof BooleanValueNode) {
+            return (bool) $value->value;
+        }
+
+        if ($value instanceof EnumValueNode) {
+            return (string) $value->value;
+        }
+
+        if ($value instanceof NullValueNode) {
+            return;
+        }
+
+        if ($value instanceof ObjectValueNode) {
+            return $this->getInputObjectValue($value);
+        }
+
+        if ($value instanceof ListValueNode) {
+            return $this->getInputListObjectValue($value);
+        }
+
+        throw new RuntimeException('Failed to resolve unknown ValueNode type');
+    }
+
+    private function getInputObjectValue(ObjectValueNode $objectValueNode): array
+    {
+        $value = [];
+        foreach ($objectValueNode->fields->getIterator() as $item) {
+            if ($item instanceof ObjectFieldNode) {
+                $value[$item->name->value] = $this->getValue($item->value);
+            }
+        }
+
+        return $value;
+    }
+
+    private function getInputListObjectValue(ListValueNode $listValueNode): array
+    {
+        $value = [];
+        foreach ($listValueNode->values as $valueNode) {
+            $value[] = $this->getValue($valueNode);
+        }
+
+        return $value;
     }
 }

tests/Database/SelectFields/ValidateDiffNodeTests/EpisodeEnum.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rebing\GraphQL\Tests\Database\SelectFields\ValidateDiffNodeTests;
+
+use Rebing\GraphQL\Support\EnumType;
+
+class EpisodeEnum extends EnumType
+{
+    protected $attributes = [
+        'name' => 'Episode',
+        'description' => 'The types of demographic elements',
+        'values' => [
+            'NEWHOPE' => 'NEWHOPE',
+            'EMPIRE' => 'EMPIRE',
+            'JEDI' => 'JEDI',
+        ],
+    ];
+}

tests/Database/SelectFields/ValidateDiffNodeTests/FilterInput.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rebing\GraphQL\Tests\Database\SelectFields\ValidateDiffNodeTests;
+
+use GraphQL\Type\Definition\Type;
+use Rebing\GraphQL\Support\InputType;
+
+class FilterInput extends InputType
+{
+    protected $attributes = [
+        'name' => 'Filter',
+        'description' => 'filter object',
+    ];
+
+    public function fields(): array
+    {
+        return [
+            'body' => [
+                'type' => Type::string(),
+            ],
+            'id' => [
+                'type' => Type::int(),
+            ],
+            'title' => [
+                'type' => Type::string(),
+            ],
+        ];
+    }
+}

tests/Database/SelectFields/ValidateDiffNodeTests/PostType.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rebing\GraphQL\Tests\Database\SelectFields\ValidateDiffNodeTests;
+
+use GraphQL\Type\Definition\Type;
+use Rebing\GraphQL\Tests\Support\Models\Post;
+use Rebing\GraphQL\Support\Type as GraphQLType;
+
+class PostType extends GraphQLType
+{
+    protected $attributes = [
+        'name' => 'Post',
+        'model' => Post::class,
+    ];
+
+    public function fields(): array
+    {
+        return [
+            'body' => [
+                'type' => Type::string(),
+            ],
+            'id' => [
+                'type' => Type::ID(),
+            ],
+        ];
+    }
+}

tests/Database/SelectFields/ValidateDiffNodeTests/UserType.php

@@ -0,0 +1,86 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rebing\GraphQL\Tests\Database\SelectFields\ValidateDiffNodeTests;
+
+use PHPUnit\Framework\Assert;
+use GraphQL\Type\Definition\Type;
+use Rebing\GraphQL\Support\Facades\GraphQL;
+use Rebing\GraphQL\Tests\Support\Models\User;
+use Rebing\GraphQL\Support\Type as GraphQLType;
+
+class UserType extends GraphQLType
+{
+    protected $attributes = [
+        'name' => 'User',
+        'model' => User::class,
+    ];
+
+    public function fields(): array
+    {
+        return [
+            'id' => [
+                'type' => Type::int(),
+            ],
+            'name' => [
+                'type' => Type::string(),
+            ],
+            'posts' => [
+                'type' => Type::listOf(Type::nonNull(GraphQL::type('Post'))),
+                'args' => [
+                    'id' => [
+                        'type' => Type::int(),
+                    ],
+                    'name' => [
+                        'type' => Type::string(),
+                    ],
+                    'price' => [
+                        'type' => Type::float(),
+                    ],
+                    'status' => [
+                        'type' => Type::boolean(),
+                    ],
+                    'flag' => [
+                        'type' => Type::string(),
+                    ],
+                    'author' => [
+                        'type' => GraphQL::type('Episode'),
+                    ],
+                    'post' => [
+                        'type' => GraphQL::type('Filter'),
+                    ],
+                    'keywords' => [
+                        'type' => Type::listOf(Type::string()),
+                    ],
+                    'customType' => [
+                        'type' => GraphQL::type('MyCustomScalarString'),
+                    ],
+                ],
+                'query' => function (array $args, $query) {
+                    $expectedQueryArgs = [
+                        'id' => 2,
+                        'name' => 'tom',
+                        'price' => 1.3,
+                        'status' => false,
+                        'flag' => null,
+                        'author' => 'EMPIRE',
+                        'post' => [
+                            'id' => 2,
+                            'body' => 'body2',
+                        ],
+                        'keywords' => [
+                            'key4',
+                            'key5',
+                            'key6',
+                        ],
+                        'customType' => 'custom string',
+                    ];
+                    Assert::assertSame($expectedQueryArgs, $args);
+
+                    return $query;
+                },
+            ],
+        ];
+    }
+}

tests/Database/SelectFields/ValidateDiffNodeTests/UsersQuery.php

@@ -0,0 +1,87 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rebing\GraphQL\Tests\Database\SelectFields\ValidateDiffNodeTests;
+
+use PHPUnit\Framework\Assert;
+use GraphQL\Type\Definition\Type;
+use Rebing\GraphQL\Support\Query;
+use GraphQL\Type\Definition\ResolveInfo;
+use Rebing\GraphQL\Support\SelectFields;
+use Rebing\GraphQL\Support\Facades\GraphQL;
+use Rebing\GraphQL\Tests\Support\Models\User;
+
+class UsersQuery extends Query
+{
+    protected $attributes = [
+        'name' => 'users',
+    ];
+
+    public function args(): array
+    {
+        return [
+            'id' => [
+                'type' => Type::int(),
+            ],
+            'name' => [
+                'type' => Type::string(),
+            ],
+            'price' => [
+                'type' => Type::float(),
+            ],
+            'status' => [
+                'type' => Type::boolean(),
+            ],
+            'flag' => [
+                'type' => Type::string(),
+            ],
+            'author' => [
+                'type' => GraphQL::type('Episode'),
+            ],
+            'post' => [
+                'type' => GraphQL::type('Filter'),
+            ],
+            'keywords' => [
+                'type' => Type::listOf(Type::string()),
+            ],
+            'customType' => [
+                'type' => GraphQL::type('MyCustomScalarString'),
+            ],
+        ];
+    }
+
+    public function type(): Type
+    {
+        return Type::nonNull(Type::listOf(Type::nonNull(GraphQL::type('User'))));
+    }
+
+    public function resolve($root, $args, $context, ResolveInfo $resolveInfo, \Closure $getSelectFields)
+    {
+        /** @var SelectFields $fields */
+        $fields = $getSelectFields();
+        $expectedQueryArgs = [
+            'id' => 1,
+            'name' => 'john',
+            'price' => 1.2,
+            'status' => true,
+            'flag' => null,
+            'author' => 'NEWHOPE',
+            'post' => [
+                'body' => 'body',
+                'id' => 1,
+            ],
+            'keywords' => [
+                'key1',
+                'key2',
+                'key3',
+            ],
+            'customType' => 'hello world',
+        ];
+        Assert::assertSame($expectedQueryArgs, $args);
+
+        return User::select($fields->getSelect())
+            ->with($fields->getRelations())
+            ->get();
+    }
+}