Use single source for all consumers of "GQL services" expression part

Author: a-melnikov

src/ExpressionLanguage/ExpressionFunction.php

@@ -10,10 +10,7 @@
 
 class ExpressionFunction extends BaseExpressionFunction
 {
-    /**
-     * TODO: use single source for all usages (create a provider).
-     */
-    protected string $gqlServices = '$'.TypeGenerator::GRAPHQL_SERVICES;
+    protected string $gqlServices = TypeGenerator::GRAPHQL_SERVICES_EXPR;
 
     public function __construct(string $name, callable $compiler, ?callable $evaluator = null)
     {

src/Generator/ConfigBuilder/FieldsBuilder.php

@@ -33,11 +33,6 @@ class FieldsBuilder implements ConfigBuilderInterface
     protected ResolveInstructionBuilder $resolveInstructionBuilder;
     protected ValidationRulesBuilder $validationRulesBuilder;
 
-    /**
-     * TODO: use single source for all usages (create a provider).
-     */
-    protected string $gqlServices = '$' . TypeGenerator::GRAPHQL_SERVICES;
-
     public function __construct(
         ExpressionConverter $expressionConverter,
         ResolveInstructionBuilder $resolveInstructionBuilder,
@@ -241,11 +236,13 @@ protected function buildComplexity($complexity): GeneratorInterface
             $expression = $this->expressionConverter->convert($complexity);
 
             if (EL::expressionContainsVar('args', $complexity)) {
+                $gqlServices = TypeGenerator::GRAPHQL_SERVICES_EXPR;
+
                 return Closure::new()
                     ->addArgument('childrenComplexity')
                     ->addArgument('arguments', '', [])
                     ->bindVar(TypeGenerator::GRAPHQL_SERVICES)
-                    ->append('$args = ', "$this->gqlServices->get('argumentFactory')->create(\$arguments)")
+                    ->append('$args = ', "{$gqlServices}->get('argumentFactory')->create(\$arguments)")
                     ->append('return ', $expression);
             }
 
@@ -351,7 +348,8 @@ protected function wrapTypeRecursive($typeNode, bool &$isReference, PhpFile $php
                     $phpFile->addUse(Type::class);
                 } else {
                     $name = $typeNode->name->value;
-                    $type = "$this->gqlServices->getType('$name')";
+                    $gqlServices = TypeGenerator::GRAPHQL_SERVICES_EXPR;
+                    $type = "{$gqlServices}->getType('$name')";
                     $isReference = true;
                 }
                 break;

src/Generator/ConfigBuilder/InterfacesBuilder.php

@@ -12,15 +12,11 @@
 
 class InterfacesBuilder implements ConfigBuilderInterface
 {
-    /**
-     * TODO: use single source for all usages (create a provider).
-     */
-    protected string $gqlServices = '$' . TypeGenerator::GRAPHQL_SERVICES;
-
     public function build(TypeConfig $typeConfig, Collection $builder, PhpFile $phpFile): void
     {
         if (isset($typeConfig->interfaces) && !empty($typeConfig->interfaces)) {
-            $items = array_map(fn ($type) => "$this->gqlServices->getType('$type')", $typeConfig->interfaces);
+            $gqlServices = TypeGenerator::GRAPHQL_SERVICES_EXPR;
+            $items = array_map(static fn ($type) => "{$gqlServices}->getType('$type')", $typeConfig->interfaces);
             $builder->addItem('interfaces', ArrowFunction::new(Collection::numeric($items, true)));
         }
     }

src/Generator/ConfigBuilder/TypesBuilder.php

@@ -12,15 +12,11 @@
 
 class TypesBuilder implements ConfigBuilderInterface
 {
-    /**
-     * TODO: use single source for all usages (create a provider).
-     */
-    protected string $gqlServices = '$' . TypeGenerator::GRAPHQL_SERVICES;
-
     public function build(TypeConfig $typeConfig, Collection $builder, PhpFile $phpFile): void
     {
         if (isset($typeConfig->types) && !empty($typeConfig->types)) {
-            $items = array_map(fn ($type) => "$this->gqlServices->getType('$type')", $typeConfig->types);
+            $gqlServices = TypeGenerator::GRAPHQL_SERVICES_EXPR;
+            $items = array_map(static fn ($type) => "{$gqlServices}->getType('$type')", $typeConfig->types);
             $builder->addItem('types', ArrowFunction::new(Collection::numeric($items, true)));
         }
     }

src/Generator/ResolveInstructionBuilder.php

@@ -18,11 +18,6 @@ class ResolveInstructionBuilder
 {
     protected ExpressionConverter $expressionConverter;
 
-    /**
-     * TODO: use single source for all usages (create a provider).
-     */
-    protected string $gqlServices = '$' . TypeGenerator::GRAPHQL_SERVICES;
-
     public function __construct(ExpressionConverter $expressionConverter)
     {
         $this->expressionConverter = $expressionConverter;
@@ -90,7 +85,8 @@ public function build(TypeConfig $typeConfig, $resolve, ?string $currentField =
                     $closure->append('$errors = ', Instance::new(ResolveErrors::class));
                 }
 
-                $closure->append('$validator = ', "$this->gqlServices->createInputValidator(...func_get_args())");
+                $gqlServices = TypeGenerator::GRAPHQL_SERVICES_EXPR;
+                $closure->append('$validator = ', "{$gqlServices}->createInputValidator(...func_get_args())");
 
                 // If auto-validation on or errors are injected
                 if (!$injectValidator || $injectErrors) {

src/Generator/TypeGenerator.php

@@ -25,6 +25,7 @@ class TypeGenerator
     public const MODE_WRITE = 4;
     public const MODE_OVERRIDE = 8;
     public const GRAPHQL_SERVICES = 'services';
+    public const GRAPHQL_SERVICES_EXPR = '$' . self::GRAPHQL_SERVICES;
 
     private static bool $classMapLoaded = false;
     private array $typeConfigs;