Extract getting of required federated directives to the schema builder

Author: a-melnikov

src/FederatedSchema.php

@@ -81,10 +81,9 @@ public static function isReservedRootType(string $name): bool
     public function __construct(array $config)
     {
         $this->entityTypes = $this->extractEntityTypes($config);
-        $this->entityDirectives = Directives::getDirectives();
         $this->schemaExtensionTypes = $this->extractSchemaExtensionTypes($config);
 
-        $config = array_merge($config, $this->getEntityDirectivesConfig($config), $this->getQueryTypeConfig($config));
+        $config = array_merge($config, $this->getQueryTypeConfig($config));
 
         parent::__construct($config);
     }

src/FederatedSchemaTrait.php

@@ -28,11 +28,6 @@ trait FederatedSchemaTrait
      */
     protected array $schemaExtensionTypes = [];
 
-    /**
-     * @var Directive[]
-     */
-    protected array $entityDirectives = [];
-
     /**
      * Returns all the resolved entity types in the schema.
      *
@@ -59,19 +54,6 @@ public function getSchemaExtensionTypes(): array
         return $this->schemaExtensionTypes;
     }
 
-    /**
-     * @param array<string,mixed> $config
-     *
-     * @return array<string,mixed>
-     */
-    protected function getEntityDirectivesConfig(array $config): array
-    {
-        $directives = $config['directives'] ?? [];
-        $config['directives'] = array_merge($directives, $this->entityDirectives);
-
-        return $config;
-    }
-
     /**
      * @param array{ query: ObjectType } $config
      *

src/SchemaBuilder.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Apollo\Federation;
+
+class SchemaBuilder
+{
+    /**
+     * @param array<string,mixed> $schemaConfig
+     * @param array<string,mixed> $builderConfig
+     */
+    public function build(array $schemaConfig, array $builderConfig = []): FederatedSchema
+    {
+        $builderConfig += ['directives' => ['link']];
+        $schemaConfig = array_merge($schemaConfig, $this->getEntityDirectivesConfig($schemaConfig, $builderConfig));
+
+        return new FederatedSchema($schemaConfig);
+    }
+
+    /**
+     * @param array<string,mixed> $schemaConfig
+     * @param array{ directives: array<string> } $builderConfig
+     *
+     * @return array<string,mixed>
+     */
+    protected function getEntityDirectivesConfig(array $schemaConfig, array $builderConfig): array
+    {
+        $directives = array_intersect_key(Directives::getDirectives(), array_flip($builderConfig['directives']));
+        $schemaConfig['directives'] = array_merge($schemaConfig['directives'] ?? [], $directives);
+
+        return $schemaConfig;
+    }
+}

test/StarWarsSchema.php

@@ -4,7 +4,9 @@
 
 namespace Apollo\Federation\Tests;
 
+use Apollo\Federation\Enum\DirectiveEnum;
 use Apollo\Federation\FederatedSchema;
+use Apollo\Federation\SchemaBuilder;
 use Apollo\Federation\Types\EntityObjectType;
 use Apollo\Federation\Types\EntityRefObjectType;
 use GraphQL\Type\Definition\ObjectType;
@@ -18,8 +20,10 @@ class StarWarsSchema
     public static function getEpisodesSchema(): FederatedSchema
     {
         if (!self::$episodesSchema) {
-            self::$episodesSchema = new FederatedSchema([
+            self::$episodesSchema = (new SchemaBuilder())->build([
                 'query' => self::getQueryType(),
+            ], [
+                'directives' => DirectiveEnum::getAll(),
             ]);
         }
 
@@ -29,7 +33,7 @@ public static function getEpisodesSchema(): FederatedSchema
     public static function getEpisodesSchemaCustomResolver(): FederatedSchema
     {
         if (!self::$overriddenEpisodesSchema) {
-            self::$overriddenEpisodesSchema = new FederatedSchema([
+            self::$overriddenEpisodesSchema = (new SchemaBuilder())->build([
                 'query' => self::getQueryType(),
                 'resolve' => function ($root, $args, $context, $info): array {
                     return array_map(static function (array $ref) use ($info) {
@@ -40,6 +44,8 @@ public static function getEpisodesSchemaCustomResolver(): FederatedSchema
                         return $type->resolveReference($ref);
                     }, $args[FederatedSchema::RESERVED_FIELD_REPRESENTATIONS]);
                 },
+            ], [
+                'directives' => DirectiveEnum::getAll(),
             ]);
         }