wip

Author: Jeremiah VALERIE

src/DependencyInjection/Compiler/GraphQLServicesPass.php

@@ -4,10 +4,11 @@
 
 namespace Overblog\GraphQLBundle\DependencyInjection\Compiler;
 
-use InvalidArgumentException;
 use Overblog\GraphQLBundle\Definition\GraphQLServices;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\DependencyInjection\Reference;
 use function is_string;
 use function sprintf;
@@ -19,6 +20,8 @@ final class GraphQLServicesPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container): void
     {
+        $this->tagAllNotTaggedGraphQLServices($container);
+
         $taggedServices = $container->findTaggedServiceIds('overblog_graphql.service', true);
 
         // TODO: remove following if-block in 1.0
@@ -61,6 +64,84 @@ public function process(ContainerBuilder $container): void
             ['container', 'service_container']
         );
 
-        $container->findDefinition(GraphQLServices::class)->addArgument($locateableServices);
+        $container->findDefinition(GraphQLServices::class)->addArgument(array_unique($locateableServices));
+    }
+
+    private function tagAllNotTaggedGraphQLServices(ContainerBuilder $container): void
+    {
+        if (!$container->hasParameter('overblog_graphql_types.config')) {
+            return;
+        }
+        /** @var array $configs */
+        $configs = $container->getParameter('overblog_graphql_types.config');
+        foreach ($configs as &$typeConfig) {
+            switch ($typeConfig['type']) {
+                case 'object':
+                    if (isset($typeConfig['config']['fieldResolver'])) {
+                        $this->resolveServiceIdAndMethod($container, $typeConfig['config']['fieldResolver']);
+                    }
+
+                    foreach ($typeConfig['config']['fields'] as &$field) {
+                        if (isset($field['resolver'])) {
+                            $this->resolveServiceIdAndMethod($container, $field['resolver']);
+                        }
+                    }
+                    break;
+
+                case 'interface':
+                case 'union':
+                    if (isset($typeConfig['config']['typeResolver'])) {
+                        $this->resolveServiceIdAndMethod($container, $typeConfig['config']['typeResolver']);
+                    }
+                break;
+            }
+        }
+        $container->setParameter('overblog_graphql_types.config', $configs);
+    }
+
+    private function resolveServiceIdAndMethod(ContainerBuilder $container, ?array &$resolver): void
+    {
+        if (!isset($resolver['id']) && !isset($resolver['method'])) {
+            return;
+        }
+        $originalId = $resolver['id'] ?? null;
+        $originalMethod = $resolver['method'] ?? null;
+
+        if (null === $originalId) {
+            [$id, $method] = explode('::', $originalMethod, 2) + [null, null];
+            $throw = false;
+        } else {
+            $id = $originalId;
+            $method = $originalMethod;
+            $throw = true;
+        }
+
+        try {
+            $definition = $container->getDefinition($id);
+        } catch (ServiceNotFoundException $e) {
+            // get Alias real service ID
+            try {
+                $alias = $container->getAlias($id);
+                $id = (string) $alias;
+                $definition = $container->getDefinition($id);
+            } catch (ServiceNotFoundException | InvalidArgumentException $e) {
+                if ($throw) {
+                    throw $e;
+                }
+                $resolver['id'] = null;
+                $resolver['method'] = $originalMethod;
+
+                return;
+            }
+        }
+        if (
+            !$definition->hasTag('overblog_graphql.service')
+            && !$definition->hasTag('overblog_graphql.global_variable')
+        ) {
+            $definition->addTag('overblog_graphql.service');
+        }
+
+        $resolver['id'] = $id;
+        $resolver['method'] = $method;
     }
 }

src/Generator/TypeBuilder.php

@@ -883,7 +883,7 @@ protected function buildCallback(Callback $callback, array $argNames, ?callable
                 return $expressionBuilder($callback->expression);
             }
         } elseif (null !== $callback->id) {
-            $fn = "$this->gqlServices->get('callbacks')->get('$callback->id')";
+            $fn = "$this->gqlServices->get('$callback->id')";
             if ($callback->method) {
                 return Collection::numeric([$fn, $callback->method]);
             } else {

tests/Functional/App/config/connection/mapping/connection.types.yaml

@@ -4,7 +4,7 @@ Query:
         fields:
             user:
                 type: User
-                resolve: '@=query("query")'
+                resolver: 'Overblog\GraphQLBundle\Tests\Functional\App\Resolver\ConnectionResolver::resolveQuery'
 
 User:
     type: object
@@ -16,15 +16,15 @@ User:
             friends:
                 type: friendConnection
                 argsBuilder: "Relay::Connection"
-                resolve: '@=query("friends", value, args)'
+                resolver: 'overblog_graphql.test.resolver.node::friendsResolver'
             friendsForward:
                 type: userConnection
                 argsBuilder: "Relay::ForwardConnection"
-                resolve: '@=resolver("friends", [value, args])'
+                resolver: 'overblog_graphql.test.resolver.node::friendsResolver'
             friendsBackward:
                 type: userConnection
                 argsBuilder: "Relay::BackwardConnection"
-                resolve: '@=resolver("friends", [value, args])'
+                resolver: 'overblog_graphql.test.resolver.node::friendsResolver'
 
 friendConnection:
     type: relay-connection

tests/Functional/App/config/connection/services.yml

@@ -1,6 +1,5 @@
 services:
-    overblog_graphql.test.resolver.node:
-        class: Overblog\GraphQLBundle\Tests\Functional\App\Resolver\ConnectionResolver
+    Overblog\GraphQLBundle\Tests\Functional\App\Resolver\ConnectionResolver:
         arguments:
             - "@overblog_graphql.promise_adapter"
         tags:
@@ -9,3 +8,5 @@ services:
             - { name: "overblog_graphql.query", alias: "query", method: "resolveQuery" }
             - { name: "overblog_graphql.query", alias: "connection", method: "resolveConnection" }
             - { name: "overblog_graphql.query", alias: "promise", method: "resolvePromiseFullFilled" }
+
+    overblog_graphql.test.resolver.node: '@Overblog\GraphQLBundle\Tests\Functional\App\Resolver\ConnectionResolver'