Add option to automatically format operation files

src/Config/Config.php

@@ -48,6 +48,7 @@ private function __construct(
         public bool $dumpEnumIsMethods = false,
         public ?object $introspectionClient = null,
         public array $inlineProcessingDirectories = [],
+        public bool $formatOperationFiles = false,
     ) {}
 
     public static function create(
@@ -123,6 +124,11 @@ public function enableDumpEnumIsMethods() : self
         return $this->with('dumpEnumIsMethods', true);
     }
 
+    public function enableFormatOperationFiles() : self
+    {
+        return $this->with('formatOperationFiles', true);
+    }
+
     public function withScalar(string $name, Type $type, ?Type $payloadType = null) : self
     {
         $scalars = $this->scalars;

src/Executor/PlanExecutor.php

@@ -4,6 +4,8 @@
 
 namespace Ruudk\GraphQLCodeGenerator\Executor;
 
+use GraphQL\Error\SyntaxError;
+use GraphQL\Language\Parser as GraphQLParser;
 use JsonException;
 use LogicException;
 use PhpParser\NodeTraverser;
@@ -12,6 +14,7 @@
 use PhpParser\Parser;
 use PhpParser\ParserFactory;
 use PhpParser\PrettyPrinter\Standard;
+use RuntimeException;
 use Ruudk\GraphQLCodeGenerator\Config\Config;
 use Ruudk\GraphQLCodeGenerator\Generator\DataClassGenerator;
 use Ruudk\GraphQLCodeGenerator\Generator\EnumTypeGenerator;
@@ -20,6 +23,7 @@
 use Ruudk\GraphQLCodeGenerator\Generator\InputTypeGenerator;
 use Ruudk\GraphQLCodeGenerator\Generator\NodeNotFoundExceptionGenerator;
 use Ruudk\GraphQLCodeGenerator\Generator\OperationClassGenerator;
+use Ruudk\GraphQLCodeGenerator\GraphQL\AST\Printer;
 use Ruudk\GraphQLCodeGenerator\PHP\Visitor\OperationInjector;
 use Ruudk\GraphQLCodeGenerator\PHP\Visitor\UseStatementInserter;
 use Ruudk\GraphQLCodeGenerator\Planner\OperationPlan;
@@ -36,6 +40,7 @@
 use Ruudk\GraphQLCodeGenerator\TypeInitializer\ObjectTypeInitializer;
 use Symfony\Component\Filesystem\Exception\IOException;
 use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\Finder\Finder;
 use Webmozart\Assert\Assert;
 
 final class PlanExecutor
@@ -51,7 +56,7 @@ final class PlanExecutor
     private Filesystem $filesystem;
 
     public function __construct(
-        Config $config,
+        private Config $config,
     ) {
         // Initialize type initializer
         $typeInitializer = new DelegatingTypeInitializer(
@@ -76,9 +81,11 @@ public function __construct(
     }
 
     /**
-     * @throws LogicException
      * @throws JsonException
      * @throws IOException
+     * @throws SyntaxError
+     * @throws RuntimeException
+     * @throws LogicException
      * @return array<string, string>
      */
     public function execute(PlannerResult $plan) : array
@@ -95,6 +102,19 @@ public function execute(PlannerResult $plan) : array
             }
         }
 
+        if ($this->config->formatOperationFiles) {
+            $finder = Finder::create()->files()
+                ->in($this->config->queriesDir)
+                ->name('*.graphql')
+                ->sortByName();
+
+            foreach ($finder as $file) {
+                $document = GraphQLParser::parse($file->getContents());
+
+                $this->filesystem->dumpFile($file->getPathname(), Printer::doPrint($document));
+            }
+        }
+
         $printer = new Standard();
         foreach ($plan->operationsToInject as $path => $operations) {
             $oldStmts = $this->phpParser->parse($this->filesystem->readFile($path));

src/Generator/DataClassGenerator.php

@@ -4,13 +4,13 @@
 
 namespace Ruudk\GraphQLCodeGenerator\Generator;
 
-use GraphQL\Language\Printer;
 use GraphQL\Type\Definition\InterfaceType;
 use GraphQL\Type\Definition\ObjectType;
 use GraphQL\Type\Definition\UnionType;
 use Ruudk\CodeGenerator\CodeGenerator;
 use Ruudk\GraphQLCodeGenerator\Attribute\Generated;
 use Ruudk\GraphQLCodeGenerator\Config\Config;
+use Ruudk\GraphQLCodeGenerator\GraphQL\AST\Printer;
 use Ruudk\GraphQLCodeGenerator\Planner\Plan\DataClassPlan;
 use Ruudk\GraphQLCodeGenerator\Planner\Source\FileSource;
 use Ruudk\GraphQLCodeGenerator\Type\FragmentObjectType;

src/GraphQL/AST/Printer.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ruudk\GraphQLCodeGenerator\GraphQL\AST;
+
+use GraphQL\Language\AST\Node;
+use GraphQL\Language\AST\OperationDefinitionNode;
+use Override;
+
+final class Printer extends \GraphQL\Language\Printer
+{
+    #[Override]
+    protected static function p(?Node $node) : string
+    {
+        if ($node instanceof OperationDefinitionNode) {
+            $value = parent::p($node);
+
+            if (str_starts_with($value, '{')) {
+                return 'query ' . $value;
+            }
+
+            return $value;
+        }
+
+        return parent::p($node);
+    }
+}

src/PHP/Visitor/OperationFinder.php

@@ -4,14 +4,12 @@
 
 namespace Ruudk\GraphQLCodeGenerator\PHP\Visitor;
 
+use InvalidArgumentException;
 use Override;
-use PhpParser\NameContext;
 use PhpParser\Node;
-use PhpParser\Node\Name;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\NodeVisitorAbstract;
 use Ruudk\GraphQLCodeGenerator\Attribute\GeneratedGraphQLClient;
-use Webmozart\Assert\InvalidArgumentException;
 
 final class OperationFinder extends NodeVisitorAbstract
 {
@@ -26,17 +24,16 @@ final class OperationFinder extends NodeVisitorAbstract
      */
     public function __construct(
         private array $constants,
-        private NameContext $context,
     ) {}
 
     /**
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     #[Override]
     public function enterNode(Node $node) : null
     {
         if ($node instanceof Node\Stmt\Class_ && $node->name !== null) {
-            $this->className = Name::concat($this->context->getNamespace(), (string) $node->name)?->toString();
+            $this->className = $node->namespacedName?->toString();
 
             return null;
         }
@@ -56,7 +53,7 @@ public function enterNode(Node $node) : null
 
             foreach ($param->attrGroups as $attrGroup) {
                 foreach ($attrGroup->attrs as $attr) {
-                    if ($this->context->getResolvedClassName($attr->name)->toString() !== GeneratedGraphQLClient::class) {
+                    if ($attr->name->toString() !== GeneratedGraphQLClient::class) {
                         continue;
                     }
 

src/Planner.php

@@ -10,7 +10,6 @@
 use GraphQL\Language\AST\NodeList;
 use GraphQL\Language\AST\OperationDefinitionNode;
 use GraphQL\Language\Parser;
-use GraphQL\Language\Printer;
 use GraphQL\Type\Definition\EnumType;
 use GraphQL\Type\Definition\InputObjectType;
 use GraphQL\Type\Definition\NamedType;
@@ -59,6 +58,7 @@
 use PhpParser\ParserFactory;
 use Ruudk\GraphQLCodeGenerator\Attribute\GeneratedGraphQLClient;
 use Ruudk\GraphQLCodeGenerator\Config\Config;
+use Ruudk\GraphQLCodeGenerator\GraphQL\AST\Printer;
 use Ruudk\GraphQLCodeGenerator\GraphQL\DocumentNodeWithSource;
 use Ruudk\GraphQLCodeGenerator\GraphQL\FragmentDefinitionNodeWithSource;
 use Ruudk\GraphQLCodeGenerator\GraphQL\PossibleTypesFinder;
@@ -264,15 +264,9 @@ public function plan() : PlannerResult
                 Assert::notNull($stmts, 'Failed to parse PHP file');
 
                 $classConstants = new ClassConstantFinder();
-                $nameResolver = new NameResolver(options: [
-                    'replaceNodes' => false,
-                ]);
-                new NodeTraverser($nameResolver, $classConstants)->traverse($stmts);
-
-                $operationFinder = new OperationFinder(
-                    $classConstants->constants,
-                    $nameResolver->getNameContext(),
-                );
+                $stmts = new NodeTraverser(new NameResolver(), $classConstants)->traverse($stmts);
+
+                $operationFinder = new OperationFinder($classConstants->constants);
                 new NodeTraverser($operationFinder)->traverse($stmts);
 
                 foreach ($operationFinder->operations as $className => $methods) {

tests/Simple/Schema.graphql

@@ -1,14 +1,14 @@
 type Query {
-    viewer: Viewer!
+  viewer: Viewer!
 }
 
 type Viewer {
-    login: String!
-    projects: [Project!]!
+  login: String!
+  projects: [Project!]!
 }
 
 type Project {
-    id: ID!
-    name: String!
-    description: String
+  id: ID!
+  name: String!
+  description: String
 }

tests/Simple/SimpleTest.php

@@ -4,11 +4,20 @@
 
 namespace Ruudk\GraphQLCodeGenerator\Simple;
 
+use Override;
+use Ruudk\GraphQLCodeGenerator\Config\Config;
 use Ruudk\GraphQLCodeGenerator\GraphQLTestCase;
 use Ruudk\GraphQLCodeGenerator\Simple\Generated\Query\Test\TestQuery;
 
 final class SimpleTest extends GraphQLTestCase
 {
+    #[Override]
+    public function getConfig() : Config
+    {
+        return parent::getConfig()
+            ->enableFormatOperationFiles();
+    }
+
     public function testGenerate() : void
     {
         $this->assertActualMatchesExpected();

tests/Simple/Test.graphql

@@ -1,9 +1,9 @@
 query Test {
-    viewer {
-        login
-        projects {
-            name
-            description
-        }
+  viewer {
+    login
+    projects {
+      name
+      description
     }
+  }
 }