fix(resolver): Rewrite fromPath to use PropertyPath data producer (#1089)

Author: Kingdutch

src/GraphQL/ResolverBuilder.php

@@ -11,7 +11,6 @@
 use Drupal\graphql\GraphQL\Resolver\DefaultValue;
 use Drupal\graphql\GraphQL\Resolver\Map;
 use Drupal\graphql\GraphQL\Resolver\ParentValue;
-use Drupal\graphql\GraphQL\Resolver\Path;
 use Drupal\graphql\GraphQL\Resolver\SourceContext;
 use Drupal\graphql\GraphQL\Resolver\Tap;
 use Drupal\graphql\GraphQL\Resolver\Value;
@@ -94,10 +93,13 @@ public function cond(array $branches) {
    * @param string $path
    * @param \Drupal\graphql\GraphQL\Resolver\ResolverInterface $value
    *
-   * @return \Drupal\graphql\GraphQL\Resolver\Path
+   * @return \Drupal\graphql\Plugin\GraphQL\DataProducer\DataProducerProxy
    */
   public function fromPath($type, $path, ResolverInterface $value = NULL) {
-    return new Path($type, $path, $value);
+    return $this->produce('property_path')
+      ->map('type', $this->fromValue($type))
+      ->map('path', $this->fromValue($path))
+      ->map('value', $value ?: $this->fromParent());
   }
 
   /**

tests/modules/graphql_resolver_builder_test/graphql_resolver_builder_test.info.yml

@@ -0,0 +1,9 @@
+type: module
+name: GraphQL Resolver Builder Test
+description: Tests the graphql resolver builder functionality.
+package: Testing
+core_version_requirement: ^8 || ^9
+hidden: TRUE
+dependencies:
+  - graphql:graphql
+  - drupal:typed_data

tests/modules/graphql_resolver_builder_test/src/Plugin/DataType/Tree.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Drupal\graphql_resolver_builder_test\Plugin\DataType;
+
+use Drupal\Core\TypedData\Plugin\DataType\Map;
+
+/**
+ * A tree data type for testing.
+ *
+ * @DataType(
+ *   id = "tree",
+ *   label = @Translation("Tree"),
+ *   definition_class = "\Drupal\graphql_resolver_builder_test\TypedData\Definition\TreeDefinition"
+ * )
+ */
+class Tree extends Map {}

tests/modules/graphql_resolver_builder_test/src/TypedData/Definition/TreeDefinition.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Drupal\graphql_resolver_builder_test\TypedData\Definition;
+
+use Drupal\Core\TypedData\ComplexDataDefinitionBase;
+use Drupal\Core\TypedData\DataDefinition;
+
+/**
+ * Data definition for the Tree data type.
+ */
+class TreeDefinition extends ComplexDataDefinitionBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getPropertyDefinitions() {
+    if (!isset($this->propertyDefinitions)) {
+      $info = &$this->propertyDefinitions;
+
+      $info['left'] = self::create('tree')
+        ->setLabel('Left branch');
+
+      $info['right'] = self::create('tree')
+        ->setLabel('Right branch');
+
+      $info['value'] = DataDefinition::create('string')
+        ->setLabel('Leaf value');
+    }
+    return $this->propertyDefinitions;
+  }
+
+}

tests/src/Kernel/ResolverBuilderTest.php

@@ -3,9 +3,6 @@
 namespace Drupal\Tests\graphql\Kernel;
 
 use GraphQL\Deferred;
-use Drupal\Core\TypedData\TypedDataManagerInterface;
-use Drupal\Core\TypedData\ComplexDataInterface;
-use Drupal\Core\TypedData\TypedDataInterface;
 use Drupal\graphql\GraphQL\Resolver\ResolverInterface;
 
 /**
@@ -21,6 +18,7 @@ class ResolverBuilderTest extends GraphQLTestBase {
   public static $modules = [
     'graphql',
     'typed_data',
+    'graphql_resolver_builder_test',
   ];
 
   /**
@@ -132,38 +130,20 @@ public function testFromArgument() {
    * @covers ::fromPath
    */
   public function testFromPath() {
-    $manager = $this->createMock(TypedDataManagerInterface::class);
-    $manager->expects($this->any())
-      ->method('getDefinition')
-      ->will($this->returnValueMap([
-        'tree_mock' => ['class' => '\Drupal\Core\TypedData\ComplexDataInterface'],
-      ]));
-
-    $this->container->set('typed_data_manager', $manager);
-
-    $uri = $this->prophesize(TypedDataInterface::class);
-    $uri->getValue()->willReturn('<front>');
-
-    $path = $this->prophesize(ComplexDataInterface::class);
-    $path->get('uri')->willReturn($uri);
-    $path->getValue()->willReturn([]);
-
-    $tree = $this->prophesize(ComplexDataInterface::class);
-    $tree->get('path')->willReturn($path);
-    $tree->getValue()->willReturn([]);
-
-    $manager->expects($this->any())
-      ->method('create')
-      ->willReturn($tree->reveal());
-
-    $this->mockResolver('Query', 'tree', $this->builder->fromValue([
-      'path' => [
-        'uri' => '<front>',
-        'path_name' => 'Front page',
-      ],
-    ]));
+    $manager = $this->container->get('typed_data_manager');
+    $tree_definition = $manager->createDataDefinition('tree');
+    /** @var \Drupal\graphql_resolver_builder_test\Plugin\DataType\Tree $right */
+    $right = $manager->create($tree_definition);
+    $right->set('value', 'Front page');
+    /** @var \Drupal\graphql_resolver_builder_test\Plugin\DataType\Tree $tree */
+    $tree = $manager->create($tree_definition);
+    $tree->set('left', [
+      'value' => '<front>',
+      'right' => $right,
+    ]);
 
-    $this->mockResolver('Tree', 'uri', $this->builder->fromPath('tree', 'path.uri'));
+    $this->mockResolver('Query', 'tree', $this->builder->fromValue($tree));
+    $this->mockResolver('Tree', 'uri', $this->builder->fromPath('tree', 'left.value'));
 
     $query = <<<GQL
       query {