Muatation namespace

src/AnnotationReader.php

@@ -22,6 +22,7 @@
 use TheCodingMachine\GraphQLite\Annotations\Input;
 use TheCodingMachine\GraphQLite\Annotations\MiddlewareAnnotationInterface;
 use TheCodingMachine\GraphQLite\Annotations\MiddlewareAnnotations;
+use TheCodingMachine\GraphQLite\Annotations\MuatationNamespace;
 use TheCodingMachine\GraphQLite\Annotations\ParameterAnnotationInterface;
 use TheCodingMachine\GraphQLite\Annotations\ParameterAnnotations;
 use TheCodingMachine\GraphQLite\Annotations\SourceFieldInterface;
@@ -279,6 +280,16 @@ public function getTypeAnnotation(ReflectionClass $refClass): ?TypeInterface
         return $type;
     }
 
+    /**
+     * @param ReflectionClass<T> $refClass
+     *
+     * @template T of object
+     */
+    public function getNamespaceAnnotation(ReflectionClass $refClass): ?MuatationNamespace
+    {
+        return $this->getClassAnnotation($refClass, MuatationNamespace::class);
+    }
+
     /**
      * @param ReflectionClass<T> $refClass
      *

src/Annotations/MuatationNamespace.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TheCodingMachine\GraphQLite\Annotations;
+
+use Attribute;
+
+/**
+ * @Annotation
+ * @Target({"CLASS"})
+ * @Attributes({
+ *   @Attribute("name", type = "string"),
+ * })
+ */
+#[Attribute(Attribute::TARGET_CLASS)]
+class MuatationNamespace
+{
+
+    /** @var string|null */
+    private $name;
+
+    /**
+     * @param mixed[] $attributes
+     */
+    public function __construct(array $attributes = [], ?string $name = null)
+    {
+        $this->name = $name ?? $attributes['name'] ?? null;
+    }
+
+    /**
+     * Returns the GraphQL name for this type.
+     */
+    public function getName(): ?string
+    {
+        return $this->name;
+    }
+}

src/FieldsBuilder.php

@@ -121,7 +121,27 @@ public function getQueries(object $controller): array
      */
     public function getMutations(object $controller): array
     {
-        return $this->getFieldsByAnnotations($controller, Mutation::class, false);
+        $refClass = new ReflectionClass($controller);
+        $namespaceAnnotation = $this->annotationReader->getNamespaceAnnotation($refClass);
+        if(!$namespaceAnnotation){
+            return $this->getFieldsByAnnotations($controller, Mutation::class, false);
+        }
+
+        $namespaceFieldName = str_replace("Controller", "", $refClass->getShortName());
+        $namespaceName = $namespaceAnnotation->getName() ?? $namespaceFieldName."Mutations";
+
+        $namespaceType = new MutableObjectType([
+            'name' => $namespaceName,
+            'fields' => function () use ($controller) {
+                return $this->getFieldsByAnnotations($controller, Mutation::class, false);
+            }
+        ]);
+        $namespaceType->freeze();
+        $namespaceField = FieldDefinition::create([
+            'name' => strtolower($namespaceFieldName),
+            'type' => $namespaceType
+        ]);
+        return [$namespaceFieldName => $namespaceField];
     }
 
     /**
@@ -362,7 +382,7 @@ private function getFieldsByMethodAnnotations($controller, ReflectionClass $refC
             $name       = $queryAnnotation->getName() ?: $this->namingStrategy->getFieldNameFromMethodName($methodName);
 
             if (! $description) {
-                $description = $docBlockObj->getSummary() . "\n" . $docBlockObj->getDescription()->render();
+                $description = rtrim($docBlockObj->getSummary() . "\n" . $docBlockObj->getDescription()->render());
             }
 
             $fieldDescriptor->setName($name);

tests/Fixtures/MutationNamespaces/Controllers/RenameController.php

@@ -0,0 +1,49 @@
+<?php
+
+
+namespace TheCodingMachine\GraphQLite\Fixtures\MutationNamespaces\Controllers;
+
+
+use TheCodingMachine\GraphQLite\Annotations\MuatationNamespace;
+use TheCodingMachine\GraphQLite\Annotations\Mutation;
+use TheCodingMachine\GraphQLite\Annotations\Query;
+use TheCodingMachine\GraphQLite\Types\ID;
+
+
+/**
+ * @MuatationNamespace(name="CustomNS")
+ */
+class RenameController
+{
+    /**
+     * @Query()
+     */
+    public function custom(ID $id): ID
+    {
+        return new ID("myID");
+    }
+
+    /**
+     * @Mutation()
+     */
+    public function create(ID $id): ID
+    {
+        return new ID("myID");
+    }
+
+    /**
+     * @Mutation()
+     */
+    public function update(ID $id): ID
+    {
+        return new ID("myID");
+    }
+
+    /**
+     * @Mutation()
+     */
+    public function delete(ID $id): ID
+    {
+        return new ID("myID");
+    }
+}

tests/Fixtures/MutationNamespaces/Controllers/UserController.php

@@ -0,0 +1,49 @@
+<?php
+
+
+namespace TheCodingMachine\GraphQLite\Fixtures\MutationNamespaces\Controllers;
+
+
+use TheCodingMachine\GraphQLite\Annotations\MuatationNamespace;
+use TheCodingMachine\GraphQLite\Annotations\Mutation;
+use TheCodingMachine\GraphQLite\Annotations\Query;
+use TheCodingMachine\GraphQLite\Types\ID;
+
+
+/**
+ * @MuatationNamespace()
+ */
+class UserController
+{
+    /**
+     * @Query()
+     */
+    public function user(ID $id): ID
+    {
+        return new ID("myID");
+    }
+
+    /**
+     * @Mutation()
+     */
+    public function create(ID $id): ID
+    {
+        return new ID("myID");
+    }
+
+    /**
+     * @Mutation()
+     */
+    public function update(ID $id): ID
+    {
+        return new ID("myID");
+    }
+
+    /**
+     * @Mutation()
+     */
+    public function delete(ID $id): ID
+    {
+        return new ID("myID");
+    }
+}

tests/Integration/EndToEndTest.php

@@ -6,6 +6,7 @@
 use GraphQL\Error\DebugFlag;
 use GraphQL\Executor\ExecutionResult;
 use GraphQL\GraphQL;
+use GraphQL\Utils\SchemaPrinter;
 use Mouf\Picotainer\Picotainer;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
@@ -2045,4 +2046,22 @@ public function testEndToEndInputTypeValidation(): void
         $result = GraphQL::executeQuery($schema, $queryString);
         $result->toArray(DebugFlag::RETHROW_INTERNAL_EXCEPTIONS);
     }
+
+    public function testMuatationNamespaces(): void
+    {
+        $arrayAdapter = new ArrayAdapter();
+        $arrayAdapter->setLogger(new ExceptionLogger());
+        $schemaFactory = new SchemaFactory(new Psr16Cache($arrayAdapter), new BasicAutoWiringContainer(new EmptyContainer()));
+        $schemaFactory->addControllerNamespace('TheCodingMachine\\GraphQLite\\Fixtures\\MutationNamespaces\\Controllers');
+        $schemaFactory->addTypeNamespace('TheCodingMachine\\GraphQLite\\Fixtures\\Integration\\Types');
+
+        $schema = $schemaFactory->createSchema();
+//        $schemaExport = SchemaPrinter::doPrint($schema);
+        $errors = $schema->validate();
+        $this->assertSame([], $errors);
+        $this->assertSame("UserMutations",$schema->getMutationType()->getField("user")->getType()->name);
+        $this->assertCount(3, $schema->getMutationType()->getField("user")->getType()->config["fields"]());
+        $this->assertSame("CustomNS",$schema->getMutationType()->getField("rename")->getType()->name);
+        $this->assertCount(3, $schema->getMutationType()->getField("rename")->getType()->config["fields"]());
+    }
 }