Interim

src/ExpressionLanguage/ExpressionFunction/GraphQL/Mutation.php

@@ -12,9 +12,9 @@ public function __construct($name = 'mutation')
     {
         parent::__construct(
             $name,
-            function ($alias, ...$args) {
-                $args = (count($args) > 0) ? (', ' . join(', ', $args)) : '';
-                return "$this->gqlServices->mutation($alias$args)";
+            function (string $alias, ...$args) {
+                $args = count($args) > 0 ? ', ' . join(', ', $args) : '';
+                return "$this->gqlServices->mutation({$alias}{$args})";
             }
         );
     }

src/ExpressionLanguage/ExpressionFunction/GraphQL/Query.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\GraphQL;
+
+use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
+
+final class Query extends ExpressionFunction
+{
+    public const NAME = 'query';
+
+    public function __construct($name = self::NAME)
+    {
+        parent::__construct(
+            $name,
+            function (string $alias, ...$args) {
+                $args = (count($args) > 0) ? (', ' . join(', ', $args)) : '';
+                return "$this->gqlServices->query({$alias}{$args})";
+            }
+        );
+    }
+}

src/Relay/Mutation/MutationFieldDefinition.php

@@ -6,6 +6,7 @@
 
 use InvalidArgumentException;
 use Overblog\GraphQLBundle\Definition\Builder\MappingInterface;
+use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\GraphQL\Query;
 use function is_array;
 use function is_string;
 use function json_encode;
@@ -20,13 +21,14 @@ final class MutationFieldDefinition implements MappingInterface
     public function toMappingDefinition(array $config): array
     {
         $mutateAndGetPayload = $this->cleanMutateAndGetPayload($config);
+        $expFuncName = Query::NAME;
 
         return [
             'type' => $this->extractPayloadType($config),
             'args' => [
                 'input' => ['type' => $this->extractInputType($config)],
             ],
-            'resolve' => "@=resolver('relay_mutation_field', [args, context, info, mutateAndGetPayloadCallback($mutateAndGetPayload)])",
+            'resolve' => "@=$expFuncName('relay_mutation_field', args, context, info, mutateAndGetPayloadCallback($mutateAndGetPayload))",
         ];
     }
 

src/Resolver/AbstractProxyResolver.php

@@ -32,7 +32,7 @@ public function resolve($input)
         $options = $this->getSolutionOptions($alias);
         $func = [$solution, $options['method']];
 
-        return call_user_func_array($func, $funcArgs);
+        return $func(...$funcArgs);
     }
 
     abstract protected function unresolvableMessage(string $alias): string;

src/Resources/config/expression_language_functions.yaml

@@ -24,6 +24,6 @@ services:
         class: Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\GraphQL\Mutation
         arguments: { $name : 'mut' }
 
-    expression_function.resolver_alias:
-        class: Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\GraphQL\Resolver
-        arguments: { $name : 'res' }
+    expression_function.query_alias:
+        class: Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\GraphQL\Query
+        arguments: { $name : 'q' }

tests/Config/Parser/AnnotationParserTest.php

@@ -79,10 +79,10 @@ public function testTypes(): void
         // Test an interface
         $this->expect('Character', 'interface', [
             'description' => 'The character interface',
-            'resolveType' => "@=resolver('character_type', [value])",
+            'resolveType' => "@=query('character_type', value)",
             'fields' => [
                 'name' => ['type' => 'String!', 'description' => 'The name of the character'],
-                'friends' => ['type' => '[Character]', 'description' => 'The friends of the character', 'resolve' => "@=resolver('App\\\\MyResolver::getFriends')"],
+                'friends' => ['type' => '[Character]', 'description' => 'The friends of the character', 'resolve' => "@=query('App\\\\MyResolver::getFriends')"],
             ],
         ]);
 
@@ -92,7 +92,7 @@ public function testTypes(): void
             'interfaces' => ['Character'],
             'fields' => [
                 'name' => ['type' => 'String!', 'description' => 'The name of the character'],
-                'friends' => ['type' => '[Character]', 'description' => 'The friends of the character', 'resolve' => "@=resolver('App\\\\MyResolver::getFriends')"],
+                'friends' => ['type' => '[Character]', 'description' => 'The friends of the character', 'resolve' => "@=query('App\\\\MyResolver::getFriends')"],
                 'race' => ['type' => 'Race'],
             ],
         ]);
@@ -103,7 +103,7 @@ public function testTypes(): void
             'isTypeOf' => "@=isTypeOf('App\Entity\Droid')",
             'fields' => [
                 'name' => ['type' => 'String!', 'description' => 'The name of the character'],
-                'friends' => ['type' => '[Character]', 'description' => 'The friends of the character', 'resolve' => "@=resolver('App\\\\MyResolver::getFriends')"],
+                'friends' => ['type' => '[Character]', 'description' => 'The friends of the character', 'resolve' => "@=query('App\\\\MyResolver::getFriends')"],
                 'memory' => ['type' => 'Int!'],
                 'planet_allowedPlanets' => [
                     'type' => '[Planet]',
@@ -129,7 +129,7 @@ public function testTypes(): void
             'fieldsDefaultAccess' => '@=isAuthenticated()',
             'fields' => [
                 'name' => ['type' => 'String!', 'description' => 'The name of the character'],
-                'friends' => ['type' => '[Character]', 'description' => 'The friends of the character', 'resolve' => "@=resolver('App\\\\MyResolver::getFriends')"],
+                'friends' => ['type' => '[Character]', 'description' => 'The friends of the character', 'resolve' => "@=query('App\\\\MyResolver::getFriends')"],
                 'realName' => ['type' => 'String!', 'access' => "@=hasRole('SITH_LORD')"],
                 'location' => ['type' => 'String!', 'public' => "@=hasRole('SITH_LORD')"],
                 'currentMaster' => ['type' => 'Sith', 'resolve' => "@=service('master_resolver').getMaster(value)"],
@@ -158,7 +158,7 @@ public function testTypes(): void
                         'builder' => 'PlanetFilterArgBuilder',
                         'config' => ['option2' => 'value2'],
                     ],
-                    'resolve' => "@=resolver('closest_planet', [args['filter']])",
+                    'resolve' => "@=query('closest_planet', args['filter'])",
                 ],
             ],
         ]);
@@ -237,7 +237,7 @@ public function testInterfaceAutoguessed(): void
             'interfaces' => ['Armored', 'Character'],
             'fields' => [
                 'name' => ['type' => 'String!', 'description' => 'The name of the character'],
-                'friends' => ['type' => '[Character]', 'description' => 'The friends of the character', 'resolve' => "@=resolver('App\\\\MyResolver::getFriends')"],
+                'friends' => ['type' => '[Character]', 'description' => 'The friends of the character', 'resolve' => "@=query('App\\\\MyResolver::getFriends')"],
                 'planet_armorResistance' => [
                     'type' => 'Int!',
                     'resolve' => '@=call(service(\'Overblog\\\\GraphQLBundle\\\\Tests\\\\Config\\\\Parser\\\\fixtures\\\\annotations\\\\Repository\\\\PlanetRepository\').getArmorResistance, arguments({}, args))',

tests/Config/Parser/fixtures/annotations/Type/Armored.php

@@ -7,7 +7,7 @@
 use Overblog\GraphQLBundle\Annotation as GQL;
 
 /**
- * @GQL\TypeInterface(resolveType="@=resolver('character_type', [value])")
+ * @GQL\TypeInterface(resolveType="@=query('character_type', value)")
  * @GQL\Description("The armored interface")
  */
 interface Armored

tests/Config/Parser/fixtures/annotations/Type/Character.php

@@ -7,7 +7,7 @@
 use Overblog\GraphQLBundle\Annotation as GQL;
 
 /**
- * @GQL\TypeInterface(resolveType="@=resolver('character_type', [value])")
+ * @GQL\TypeInterface(resolveType="@=query('character_type', value)")
  * @GQL\Description("The character interface")
  */
 abstract class Character
@@ -19,7 +19,7 @@ abstract class Character
     protected string $name;
 
     /**
-     * @GQL\Field(type="[Character]", resolve="@=resolver('App\\MyResolver::getFriends')")
+     * @GQL\Field(type="[Character]", resolve="@=query('App\\MyResolver::getFriends')")
      * @GQL\Description("The friends of the character")
      */
     protected array $friends;

tests/Config/Parser/fixtures/annotations/Type/Planet.php

@@ -37,7 +37,7 @@ class Planet
      * @GQL\Field(
      *   type="Planet",
      *   argsBuilder={"PlanetFilterArgBuilder", {"option2": "value2"}},
-     *   resolve="@=resolver('closest_planet', [args['filter']])"
+     *   resolve="@=query('closest_planet', args.filter)"
      * )
      */
     public Planet $closestPlanet;

tests/DependencyInjection/Builder/MutationField.php

@@ -32,7 +32,7 @@ public function toMappingDefinition(array $config): array
 
         $field = [
             'type' => $payloadTypeName.'!',
-            'resolve' => sprintf('@=mutation("%s", [args["input"]])', $resolver),
+            'resolve' => sprintf('@=mutation("%s", args.input)', $resolver),
             'args' => [
                 'input' => $inputTypeName.'!',
             ],
@@ -50,7 +50,7 @@ public function toMappingDefinition(array $config): array
                 'config' => [
                     'types' => [$payloadSuccessTypeName, $payloadFailureTypeName],
                     'resolveType' => sprintf(
-                        '@=resolver("PayloadTypeResolver", [value, "%s", "%s"])',
+                        '@=query("PayloadTypeResolver", value, "%s", "%s")',
                         $payloadSuccessTypeName,
                         $payloadFailureTypeName
                     ),

tests/DependencyInjection/Compiler/ConfigParserPassTest.php

@@ -392,7 +392,7 @@ public function testCustomBuilders(): void
                     'decorator' => false,
                     'config' => [
                         'types' => ['FooSuccessPayload', 'FooFailurePayload'],
-                        'resolveType' => '@=resolver("PayloadTypeResolver", [value, "FooSuccessPayload", "FooFailurePayload"])',
+                        'resolveType' => '@=query("PayloadTypeResolver", value, "FooSuccessPayload", "FooFailurePayload")',
                         'name' => 'FooPayload',
                     ],
                 ],

tests/ExpressionLanguage/ExpressionFunction/GraphQL/ResolverTest.php → tests/ExpressionLanguage/ExpressionFunction/GraphQL/QueryTest.php

@@ -5,25 +5,25 @@
 namespace Overblog\GraphQLBundle\Tests\ExpressionLanguage\ExpressionFunction\GraphQL;
 
 use Overblog\GraphQLBundle\ExpressionLanguage\Exception\EvaluatorIsNotAllowedException;
-use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\GraphQL\Resolver;
+use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\GraphQL\Query;
 use Overblog\GraphQLBundle\Tests\ExpressionLanguage\TestCase;
 
-class ResolverTest extends TestCase
+class QueryTest extends TestCase
 {
     protected function getFunctions()
     {
-        return [new Resolver(), new Resolver('res')];
+        return [new Query(), new Query('q')];
     }
 
     public function testEvaluatorThrowsException(): void
     {
         $this->expectException(EvaluatorIsNotAllowedException::class);
-        $this->expressionLanguage->evaluate('resolver()');
+        $this->expressionLanguage->evaluate('query()');
     }
 
     public function testEvaluatorThrowsExceptionByAlias(): void
     {
         $this->expectException(EvaluatorIsNotAllowedException::class);
-        $this->expressionLanguage->evaluate('res()');
+        $this->expressionLanguage->evaluate('q()');
     }
 }

tests/Functional/App/Resolver/NodeResolver.php

@@ -5,7 +5,6 @@
 namespace Overblog\GraphQLBundle\Tests\Functional\App\Resolver;
 
 use GraphQL\Type\Definition\ResolveInfo;
-use Overblog\GraphQLBundle\Resolver\TypeResolver;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 

tests/Functional/App/config/access/mapping/access.types.yml

@@ -5,7 +5,7 @@ RootQuery:
         fields:
             user:
                 type: User
-                resolve: '@=resolver("query")'
+                resolve: '@=query("query")'
             youShallNotSeeThisUnauthenticated:
                 type: SecureField
                 access: '@=isFullyAuthenticated()'
@@ -18,7 +18,7 @@ Mutation:
             user:
                 access: '@=private_service.hasAccess()'
                 type: Human
-                resolve: '@=resolver("query")'
+                resolve: '@=query("query")'
 
 Human:
     type: interface
@@ -38,7 +38,7 @@ User:
                 resolve: ['ROLE_USER']
             isEnabled:
                 # access as a promise
-                access: "@=resolver('promise', [args.hasAccess])"
+                access: "@=query('promise', args.hasAccess)"
                 args:
                     hasAccess: {type: Boolean!}
                 type: Boolean
@@ -48,7 +48,7 @@ User:
                 access: "@=object == 1"
                 type: friendConnection
                 argsBuilder: "Relay::Connection"
-                resolve: '@=resolver("friends", [value, args])'
+                resolve: '@=query("friends", value, args)'
             friendsAsArray:
                 # TODO(mcg-web): replace by strict equality after fix compilation expression language bug in sf 4.0
                 access: "@=object != 2"
@@ -75,15 +75,15 @@ friendConnection:
     type: relay-connection
     config:
         nodeType: User
-        resolveNode: '@=resolver("node", [value])'
+        resolveNode: '@=query("node", value)'
         edgeFields:
             friendshipTime:
                 type: String
                 resolve: "Yesterday"
         connectionFields:
             totalCount:
                 type: Int
-                resolve: '@=resolver("connection")'
+                resolve: '@=query("connection")'
 
 #Mutation
 RootMutation:
@@ -96,7 +96,7 @@ RootMutation:
                 builderConfig:
                     inputType: simpleMutationWithThunkFieldsInput
                     payloadType: simpleMutationWithThunkFieldsPayload
-                    mutateAndGetPayload: "@=mutation('simple_mutation_with_thunk_fields', [value])"
+                    mutateAndGetPayload: "@=mutation('simple_mutation_with_thunk_fields', value)"
 
 simpleMutationWithThunkFieldsInput:
     type: relay-mutation-input

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

@@ -4,7 +4,7 @@ Query:
         fields:
             user:
                 type: User
-                resolve: '@=resolver("query")'
+                resolve: '@=query("query")'
 
 User:
     type: object
@@ -16,32 +16,32 @@ User:
             friends:
                 type: friendConnection
                 argsBuilder: "Relay::Connection"
-                resolve: '@=resolver("friends", [value, args])'
+                resolve: '@=query("friends", value, args)'
             friendsForward:
                 type: userConnection
                 argsBuilder: "Relay::ForwardConnection"
-                resolve: '@=resolver("friends", [value, args])'
+                resolve: '@=query("friends", value, args)'
             friendsBackward:
                 type: userConnection
                 argsBuilder: "Relay::BackwardConnection"
-                resolve: '@=resolver("friends", [value, args])'
+                resolve: '@=query("friends", value, args)'
 
 friendConnection:
     type: relay-connection
     config:
         nodeType: User
-        resolveNode: '@=resolver("node", [value])'
+        resolveNode: '@=query("node", value)'
         edgeFields:
             friendshipTime:
                 type: String
                 resolve: "Yesterday"
         connectionFields:
             totalCount:
                 type: Int
-                resolve: '@=resolver("connection")'
+                resolve: '@=query("connection")'
 
 userConnection:
     type: relay-connection
     config:
         nodeType: User
-        resolveNode: '@=resolver("node", [value])'
+        resolveNode: '@=query("node", value)'

tests/Functional/App/config/exception/mapping/exception.types.yml

@@ -4,5 +4,5 @@ Query:
       fields:
         test:
           type: "Boolean"
-          resolve: "@=resolver('example_exception')"
+          resolve: "@=query('example_exception')"
 

tests/Functional/App/config/multipleQueries/mapping/RootQuery.types.yml

@@ -4,10 +4,10 @@ RootQuery:
         fields:
             failRequire:
                 type: String!
-                resolve: '@=resolver("example_exception")'
+                resolve: '@=query("example_exception")'
             failOptional:
                 type: String
-                resolve: '@=resolver("example_exception")'
+                resolve: '@=query("example_exception")'
             success:
                 type: String
                 resolve: 'foo'

tests/Functional/App/config/node/mapping/node_type.yml

@@ -1,4 +1,4 @@
 Node:
     type: relay-node
     config:
-        resolveType: '@=typeResolver.resolve(resolver("node_resolver::typeResolver", [value]))'
+        resolveType: '@=typeResolver.resolve(query("node_resolver::typeResolver", value))'