fix: allow query to be passed as instance

src/GraphQL.php

@@ -256,7 +256,7 @@
         $type = $this->getType($name, $fresh);
 
         foreach ($modifiers as $modifier) {
             $type = Type::$modifier($type);
         }
 
         return $type;
@@ -352,7 +352,7 @@
     }
 
     /**
-     * @param array<int|string,class-string|array<string,mixed>> $fields
+     * @param array<int|string,class-string|array<string,mixed>|Field> $fields
      * @param array<string,string> $opts
      */
     protected function buildObjectTypeFromFields(array $fields, array $opts = []): ObjectType
@@ -364,6 +364,8 @@
                 $field = $this->app->make($field);
                 /** @var Field $field */
                 $field = $field->toArray();
+            } elseif ($field instanceof Field) {
+                $field = $field->toArray();
             }
             $name = is_numeric($name) ? $field['name'] : $name;
             $field['name'] = $name;

tests/Support/Objects/ExampleProseInstanceQuery.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types = 1);
+namespace Rebing\GraphQL\Tests\Support\Objects;
+
+use GraphQL\Type\Definition\Type;
+use Rebing\GraphQL\Support\Query;
+
+class ExampleProseInstanceQuery extends Query
+{
+    public function __construct(public string $prose)
+    {
+    }
+
+    protected $attributes = [
+        'name' => 'exampleProse',
+    ];
+
+    public function type(): Type
+    {
+        return Type::string();
+    }
+
+    public function args(): array
+    {
+        return [];
+    }
+
+    /**
+     * @param mixed $root
+     * @param array<string,mixed> $args
+     */
+    public function resolve($root, $args): string
+    {
+        return $this->prose;
+    }
+}

tests/Support/Objects/queries.php

@@ -19,6 +19,18 @@
         }
     ',
 
+    'exampleProse' => '
+        query QueryExamplesProse {
+            exampleProse
+        }
+    ',
+
+    'exampleProseRenamed' => '
+        query QueryExamplesProseRenamed {
+            loremIpsum
+        }
+    ',
+
     'examplesWithConfigAlias' => '
         query examplesConfigAlias($index: Int) {
             examplesConfigAlias(index: $index) {

tests/Unit/GraphQLQueryTest.php

@@ -5,6 +5,7 @@
 
 use GraphQL\Utils\SchemaPrinter;
 use Rebing\GraphQL\Support\Facades\GraphQL;
+use Rebing\GraphQL\Tests\Support\Objects\ExampleProseInstanceQuery;
 use Rebing\GraphQL\Tests\Support\Objects\ExamplesQuery;
 use Rebing\GraphQL\Tests\TestCase;
 
@@ -229,4 +230,25 @@ public function testPrintSchema(): void
 
         self::assertStringContainsString($queryFragment, $gql);
     }
+
+    public function testQueryCanBeSetAsInstance(): void
+    {
+        $schema = GraphQL::buildSchemaFromConfig([
+            'query' => [
+                new ExampleProseInstanceQuery('A simple prose'),
+                'loremIpsum' => new ExampleProseInstanceQuery('Lorem ipsum dolor sit amet'),
+            ],
+        ]);
+        GraphQL::addSchema('default', $schema);
+
+        $result = GraphQL::queryAndReturnResult($this->queries['exampleProse']);
+        $expectedDataResult = ['exampleProse' => 'A simple prose'];
+        self::assertSame($expectedDataResult, $result->data);
+        self::assertCount(0, $result->errors);
+
+        $result = GraphQL::queryAndReturnResult($this->queries['exampleProseRenamed']);
+        $expectedDataResult = ['loremIpsum' => 'Lorem ipsum dolor sit amet'];
+        self::assertSame($expectedDataResult, $result->data);
+        self::assertCount(0, $result->errors);
+    }
 }