MC-36456: union implementation

Author: cpartica

app/code/Magento/GraphQl/etc/schema.graphqls

@@ -30,14 +30,12 @@ directive @resolver(class: String="") on QUERY
     | OBJECT
     | FIELD_DEFINITION
     | ARGUMENT_DEFINITION
-    | INTERFACE
-    | UNION
     | ENUM
     | ENUM_VALUE
     | INPUT_OBJECT
     | INPUT_FIELD_DEFINITION
 
-directive @typeResolver(class: String="") on INTERFACE | OBJECT
+directive @typeResolver(class: String="") on INTERFACE | OBJECT | UNION
 
 directive @cache(cacheIdentity: String="" cacheable: Boolean=true) on QUERY
 

lib/internal/Magento/Framework/GraphQl/Config/Element/UnionFactory.php

@@ -60,7 +60,7 @@ public function create(
             UnionType::class,
             [
                 'name' => $unionData['name'],
-                'resolver' => $unionData['resolver'],
+                'typeResolver' => $unionData['typeResolver'],
                 'types' => $types,
                 'description' => isset($unionData['description']) ? $unionData['description'] : ''
             ]

lib/internal/Magento/Framework/GraphQl/Config/Element/UnionType.php

@@ -25,7 +25,7 @@ class UnionType implements UnionInterface
     /**
      * @var string
      */
-    private $resolver;
+    private $typeResolver;
 
     /**
      * @var string
@@ -34,19 +34,19 @@ class UnionType implements UnionInterface
 
     /**
      * @param string $name
-     * @param string $resolver
+     * @param string $typeResolver
      * @param string[] $types
      * @param string $description
      */
     public function __construct(
         string $name,
-        string $resolver,
+        string $typeResolver,
         array $types,
         string $description
     ) {
         $this->name = $name;
         $this->types = $types;
-        $this->resolver = $resolver;
+        $this->typeResolver = $typeResolver;
         $this->description = $description;
     }
 
@@ -75,9 +75,9 @@ public function getTypes() : array
      *
      * @return string
      */
-    public function getResolver()
+    public function getTypeResolver()
     {
-        return $this->resolver;
+        return $this->typeResolver;
     }
 
     /**

lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/ResolveType.php

@@ -44,7 +44,7 @@ public function format(ConfigElementInterface $configElement, OutputTypeInterfac
                 return $typeResolver->resolveType($value);
             };
         } elseif ($configElement instanceof UnionType) {
-            $typeResolver = $this->objectManager->create($configElement->getResolver());
+            $typeResolver = $this->objectManager->create($configElement->getTypeResolver());
             $config['resolveType'] = function ($value) use ($typeResolver) {
                 return $typeResolver->resolveType($value);
             };

lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php

@@ -331,9 +331,6 @@ private static function getModuleNameForRelevantFile(string $file): string
     private function addModuleNameToTypes(array $source, string $filePath): array
     {
         foreach ($source as $typeName => $type) {
-            if (!isset($type['type'])) {
-                $x=1;
-            }
             if ((!isset($type['module']))
                 && (($type['type'] ?? '' === self::GRAPHQL_INTERFACE && isset($type['typeResolver']))
                     || isset($type['implements'])

lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php

@@ -64,7 +64,7 @@ public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
 
             $unionResolveType = $this->getUnionTypeResolver($typeMeta);
             if (!empty($unionResolveType)) {
-                $result['resolver'] = $unionResolveType;
+                $result['typeResolver'] = $unionResolveType;
             }
 
 
@@ -89,7 +89,7 @@ private function getUnionTypeResolver(\GraphQL\Type\Definition\UnionType $unionT
         /** @var \GraphQL\Language\AST\NodeList $directives */
         $directives = $unionTypeMeta->astNode->directives;
         foreach ($directives as $directive) {
-            if ($directive->name->value == 'resolver') {
+            if ($directive->name->value == 'typeResolver') {
                 foreach ($directive->arguments as $directiveArgument) {
                     if ($directiveArgument->name->value == 'class') {
                         return $directiveArgument->value->value;