refactor(graphql)!: WithBuilderInfo::getBuilderInfo() will accept a…

…ny `Node`.
LastDragon-ru · Aug 15, 2023 · a4dcdbe · a4dcdbe
1 parent aacd7b1
commit a4dcdbe
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/packages/graphql/src/Builder/Traits/WithBuilderInfo.php b/packages/graphql/src/Builder/Traits/WithBuilderInfo.php
@@ -5,6 +5,7 @@
 use GraphQL\Language\AST\FieldDefinitionNode;
 use GraphQL\Language\AST\InputValueDefinitionNode;
 use GraphQL\Language\AST\InterfaceTypeDefinitionNode;
+use GraphQL\Language\AST\Node;
 use GraphQL\Language\AST\ObjectTypeDefinitionNode;
 use Illuminate\Container\Container;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
@@ -58,10 +59,10 @@ protected function getFieldArgumentBuilderInfo(
         return $builder;
     }
 
-    protected function getBuilderInfo(FieldDefinitionNode $field): ?BuilderInfo {
+    protected function getBuilderInfo(Node $node): ?BuilderInfo {
         // Provider?
         $directives = Container::getInstance()->make(DirectiveLocator::class);
-        $provider   = $directives->associated($field)->first(static function (Directive $directive): bool {
+        $provider   = $directives->associated($node)->first(static function (Directive $directive): bool {
             return $directive instanceof BuilderInfoProvider;
         });
 
@@ -72,10 +73,12 @@ protected function getBuilderInfo(FieldDefinitionNode $field): ?BuilderInfo {
         // Scout?
         $scout = false;
 
-        foreach ($field->arguments as $argument) {
-            if ($directives->associatedOfType($argument, SearchDirective::class)->isNotEmpty()) {
-                $scout = true;
-                break;
+        if ($node instanceof FieldDefinitionNode) {
+            foreach ($node->arguments as $argument) {
+                if ($directives->associatedOfType($argument, SearchDirective::class)->isNotEmpty()) {
+                    $scout = true;
+                    break;
+                }
             }
         }
 
@@ -84,7 +87,7 @@ protected function getBuilderInfo(FieldDefinitionNode $field): ?BuilderInfo {
         }
 
         // Builder?
-        $directive = $directives->associated($field)->first(static function (Directive $directive): bool {
+        $directive = $directives->associated($node)->first(static function (Directive $directive): bool {
             return $directive instanceof AllDirective
                 || $directive instanceof PaginateDirective
                 || $directive instanceof BuilderDirective

diff --git a/packages/graphql/src/Builder/Traits/WithBuilderInfoTest.php b/packages/graphql/src/Builder/Traits/WithBuilderInfoTest.php
@@ -5,6 +5,7 @@
 use Closure;
 use Exception;
 use GraphQL\Language\AST\FieldDefinitionNode;
+use GraphQL\Language\AST\Node;
 use GraphQL\Language\Parser;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Query\Builder as QueryBuilder;
@@ -37,14 +38,14 @@ class WithBuilderInfoTest extends TestCase {
     // <editor-fold desc="Tests">
     // =========================================================================
     /**
-     * @dataProvider dataProviderGetBuilderInfo
+     * @dataProvider dataProviderGetNodeBuilderInfo
      *
-     * @param array{name: string, builder: string}           $expected
-     * @param Closure(DirectiveLocator): FieldDefinitionNode $fieldFactory
+     * @param array{name: string, builder: string} $expected
+     * @param Closure(DirectiveLocator): Node      $nodeFactory
      */
-    public function testGetBuilderInfo(array $expected, Closure $fieldFactory): void {
+    public function testGetNodeBuilderInfo(array $expected, Closure $nodeFactory): void {
         $directives = $this->app->make(DirectiveLocator::class);
-        $field      = $fieldFactory($directives);
+        $node       = $nodeFactory($directives);
         $directive  = new class() extends BaseDirective {
             use WithBuilderInfo {
                 getBuilderInfo as public;
@@ -55,7 +56,7 @@ public static function definition(): string {
             }
         };
 
-        $actual = $directive->getBuilderInfo($field);
+        $actual = $directive->getBuilderInfo($node);
 
         self::assertEquals(
             $expected,
@@ -75,7 +76,7 @@ public static function definition(): string {
      *     Closure(DirectiveLocator): FieldDefinitionNode,
      *     }>
      */
-    public static function dataProviderGetBuilderInfo(): array {
+    public static function dataProviderGetNodeBuilderInfo(): array {
         return [
             'unknown'                                    => [
                 [