direct passing of directive arguments & tests

graphpql · Sep 10, 2020 · 8aaabd5 · 8aaabd5
1 parent f3d889e
commit 8aaabd5
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 32 deletions.
diff --git a/src/Directive/Directive.php b/src/Directive/Directive.php
@@ -51,7 +51,7 @@ public function isRepeatable() : bool
 
     public function resolve(\Graphpinator\Resolver\ArgumentValueSet $arguments) : string
     {
-        $result = \call_user_func($this->resolveFn, $arguments);
+        $result = \call_user_func_array($this->resolveFn, $arguments->getRawArguments());
 
         if (\is_string($result) && \array_key_exists($result, DirectiveResult::ENUM)) {
             return $result;

diff --git a/src/Directive/IncludeDirective.php b/src/Directive/IncludeDirective.php
@@ -15,8 +15,8 @@ public function __construct()
             new \Graphpinator\Argument\ArgumentSet([
                 new \Graphpinator\Argument\Argument('if', \Graphpinator\Type\Container\Container::Boolean()->notNull()),
             ]),
-            static function (\Graphpinator\Resolver\ArgumentValueSet $arguments) : string {
-                return $arguments->offsetGet('if')->getRawValue()
+            static function (bool $if) : string {
+                return $if
                     ? DirectiveResult::NONE
                     : DirectiveResult::SKIP;
             },

diff --git a/src/Directive/SkipDirective.php b/src/Directive/SkipDirective.php
@@ -15,8 +15,8 @@ public function __construct()
             new \Graphpinator\Argument\ArgumentSet([
                 new \Graphpinator\Argument\Argument('if', \Graphpinator\Type\Container\Container::Boolean()->notNull()),
             ]),
-            static function (\Graphpinator\Resolver\ArgumentValueSet $arguments) : string {
-                return $arguments->offsetGet('if')->getRawValue()
+            static function (bool $if) : string {
+                return $if
                     ? DirectiveResult::SKIP
                     : DirectiveResult::NONE;
             },

diff --git a/src/Field/ResolvableField.php b/src/Field/ResolvableField.php
@@ -8,25 +8,25 @@
 
 final class ResolvableField extends \Graphpinator\Field\Field
 {
-    private \Closure $resolveFunction;
+    private \Closure $resolveFn;
 
     public function __construct(
         string $name,
         \Graphpinator\Type\Contract\Outputable $type,
-        callable $resolveFunction,
+        callable $resolveFn,
         ?\Graphpinator\Argument\ArgumentSet $arguments = null
     )
     {
         parent::__construct($name, $type, $arguments);
-        $this->resolveFunction = $resolveFunction;
+        $this->resolveFn = $resolveFn;
     }
 
     public function resolve(FieldResult $parentValue, \Graphpinator\Resolver\ArgumentValueSet $arguments) : FieldResult
     {
         $args = $arguments->getRawArguments();
         \array_unshift($args, $parentValue->getResult()->getRawValue());
 
-        $result = \call_user_func_array($this->resolveFunction, $args);
+        $result = \call_user_func_array($this->resolveFn, $args);
 
         if (!$result instanceof FieldResult) {
             return FieldResult::fromRaw($this->type, $result);

diff --git a/src/Type/Introspection/Type.php b/src/Type/Introspection/Type.php
@@ -56,12 +56,12 @@ static function (Definition $definition) : ?string {
             new \Graphpinator\Field\ResolvableField(
                 'fields',
                 $this->container->introspectionField()->notNull()->list(),
-                static function (Definition $definition, \Graphpinator\Resolver\ArgumentValueSet $arguments) : ?\Graphpinator\Field\FieldSet {
+                static function (Definition $definition, bool $includeDeprecated) : ?\Graphpinator\Field\FieldSet {
                     if (!$definition instanceof \Graphpinator\Type\Contract\InterfaceImplementor) {
                         return null;
                     }
 
-                    if ($arguments['includeDeprecated']->getRawValue() === true) {
+                    if ($includeDeprecated === true) {
                         return $definition->getFields();
                     }
 
@@ -78,7 +78,7 @@ static function (Definition $definition, \Graphpinator\Resolver\ArgumentValueSet
                     return new \Graphpinator\Field\FieldSet($filtered);
                 },
                 new \Graphpinator\Argument\ArgumentSet([
-                    new \Graphpinator\Argument\Argument('includeDeprecated', \Graphpinator\Type\Container\Container::Boolean(), false),
+                    new \Graphpinator\Argument\Argument('includeDeprecated', \Graphpinator\Type\Container\Container::Boolean()->notNull(), false),
                 ]),
             ),
             new \Graphpinator\Field\ResolvableField(
@@ -117,12 +117,12 @@ function (Definition $definition) : ?\Graphpinator\Utils\ConcreteSet {
             new \Graphpinator\Field\ResolvableField(
                 'enumValues',
                 $this->container->introspectionEnumValue()->notNull()->list(),
-                static function (Definition $definition, \Graphpinator\Resolver\ArgumentValueSet $arguments) : ?\Graphpinator\Type\Enum\EnumItemSet {
+                static function (Definition $definition, bool $includeDeprecated) : ?\Graphpinator\Type\Enum\EnumItemSet {
                     if (!$definition instanceof \Graphpinator\Type\EnumType) {
                         return null;
                     }
 
-                    if ($arguments['includeDeprecated']->getRawValue() === true) {
+                    if ($includeDeprecated === true) {
                         return $definition->getItems();
                     }
 
@@ -139,7 +139,7 @@ static function (Definition $definition, \Graphpinator\Resolver\ArgumentValueSet
                     return new \Graphpinator\Type\Enum\EnumItemSet($filtered);
                 },
                 new \Graphpinator\Argument\ArgumentSet([
-                    new \Graphpinator\Argument\Argument('includeDeprecated', \Graphpinator\Type\Container\Container::Boolean(), false),
+                    new \Graphpinator\Argument\Argument('includeDeprecated', \Graphpinator\Type\Container\Container::Boolean()->notNull(), false),
                 ]),
             ),
             new \Graphpinator\Field\ResolvableField(

diff --git a/src/Type/Schema.php b/src/Type/Schema.php
@@ -36,8 +36,8 @@ function() : self {
         $this->query->addMetaField(new \Graphpinator\Field\ResolvableField(
             '__type',
             $this->container->introspectionType(),
-            function($parent, \Graphpinator\Resolver\ArgumentValueSet $args) : \Graphpinator\Type\Contract\Definition {
-                return $this->container->getType($args['name']->getRawValue());
+            function($parent, string $name) : \Graphpinator\Type\Contract\Definition {
+                return $this->container->getType($name);
             },
             new \Graphpinator\Argument\ArgumentSet([
                 new \Graphpinator\Argument\Argument('name', \Graphpinator\Type\Container\Container::String()->notNull()),

diff --git a/tests/Spec/PrintSchema.php b/tests/Spec/PrintSchema.php
@@ -100,7 +100,7 @@ protected function getFieldDefinition() : \Graphpinator\Field\ResolvableFieldSet
                     (new \Graphpinator\Field\ResolvableField(
                         'field1',
                         TestSchema::getInterface(),
-                        static function (int $parent, \Graphpinator\Resolver\ArgumentValueSet $args) {
+                        static function (int $parent, ?int $arg1, ?\stdClass $arg2) {
                             return 1;
                         },
                         new \Graphpinator\Argument\ArgumentSet([

diff --git a/tests/Spec/PrintTest.php b/tests/Spec/PrintTest.php
@@ -60,12 +60,12 @@ enum __TypeKind {
                   name: String
                   description: String
                   fields(
-                    includeDeprecated: Boolean = false
+                    includeDeprecated: Boolean! = false
                   ): [__Field!]
                   interfaces: [__Type!]
                   possibleTypes: [__Type!]
                   enumValues(
-                    includeDeprecated: Boolean = false
+                    includeDeprecated: Boolean! = false
                   ): [__EnumValue!]
                   inputFields: [__InputValue!]
                   ofType: __Type

diff --git a/tests/Spec/TestSchema.php b/tests/Spec/TestSchema.php
@@ -95,11 +95,11 @@ protected function getFieldDefinition() : \Graphpinator\Field\ResolvableFieldSet
                     new \Graphpinator\Field\ResolvableField(
                         'field1',
                         TestSchema::getInterface(),
-                        static function (int $parent, \Graphpinator\Resolver\ArgumentValueSet $args) : \Graphpinator\Resolver\FieldResult {
+                        static function (int $parent, ?int $arg1, ?\stdClass $arg2) : \Graphpinator\Resolver\FieldResult {
                             $object = new \stdClass();
 
-                            if ($args['arg2']->getRawValue() === null) {
-                                $object->name = 'Test ' . $args['arg1']->getRawValue();
+                            if ($arg2 === null) {
+                                $object->name = 'Test ' . $arg1;
                             } else {
                                 $concat = static function (\stdClass $objectVal) use (&$concat) : string {
                                     $str = '';
@@ -121,14 +121,14 @@ static function (int $parent, \Graphpinator\Resolver\ArgumentValueSet $args) : \
                                     return $str;
                                 };
 
-                                $object->name = $concat($args['arg2']->getRawValue());
+                                $object->name = $concat($arg2);
                             }
 
                             return \Graphpinator\Resolver\FieldResult::fromRaw(TestSchema::getTypeXyz(), $object);
                         },
                         new \Graphpinator\Argument\ArgumentSet([
-                        new \Graphpinator\Argument\Argument('arg1', \Graphpinator\Type\Container\Container::Int(), 123),
-                        new \Graphpinator\Argument\Argument('arg2', TestSchema::getInput()),
+                            new \Graphpinator\Argument\Argument('arg1', \Graphpinator\Type\Container\Container::Int(), 123),
+                            new \Graphpinator\Argument\Argument('arg2', TestSchema::getInput()),
                         ]),
                     ),
                 ]);

diff --git a/tests/Unit/Type/TypeTest.php b/tests/Unit/Type/TypeTest.php
@@ -108,29 +108,29 @@ protected function getFieldDefinition() : \Graphpinator\Field\ResolvableFieldSet
                     new \Graphpinator\Field\ResolvableField(
                         'field1',
                         \Graphpinator\Type\Container\Container::String(),
-                        static function ($parentValue, \Graphpinator\Resolver\ArgumentValueSet $arguments) {
+                        static function ($parentValue) {
                             TypeTest::assertSame(TypeTest::PARENT_VAL, $parentValue);
-                            TypeTest::assertCount(0, $arguments);
+                            TypeTest::assertCount(1, \func_get_args());
 
                             return 'fieldValue';
                         },
                     ),
                     new \Graphpinator\Field\ResolvableField(
                         'field2',
                         \Graphpinator\Type\Container\Container::Boolean(),
-                        static function ($parentValue, \Graphpinator\Resolver\ArgumentValueSet $arguments) {
+                        static function ($parentValue) {
                             TypeTest::assertSame(TypeTest::PARENT_VAL, $parentValue);
-                            TypeTest::assertCount(0, $arguments);
+                            TypeTest::assertCount(1, \func_get_args());
 
                             return false;
                         },
                     ),
                     new \Graphpinator\Field\ResolvableField(
                         'field3',
                         \Graphpinator\Type\Container\Container::Int(),
-                        static function ($parentValue, \Graphpinator\Resolver\ArgumentValueSet $arguments) {
+                        static function ($parentValue) {
                             TypeTest::assertSame(TypeTest::PARENT_VAL, $parentValue);
-                            TypeTest::assertCount(0, $arguments);
+                            TypeTest::assertCount(1, \func_get_args());
 
                             return null;
                         },