Removing run-time dependency on schema manager and adding ability to … (#401)

* Removing run-time dependency on schema manager and adding ability to have multiple instances of the schema manager.

* Fixing docblocks.

* Fixing test schema.

* Fixing tests.

* Triggering tests.

Author: fubhy

graphql.services.yml

@@ -78,6 +78,7 @@ services:
       - '@graphql.schema_loader'
       - '@current_user'
       - '%graphql.config%'
+
   graphql.schema_loader:
     class: Drupal\graphql\GraphQL\Schema\SchemaLoader
     arguments:
@@ -182,12 +183,6 @@ services:
   graphql.batched_resolver:
     class: Drupal\graphql\GraphQL\Batching\BatchedFieldResolver
 
-  # Plugin system based schema manager.
-  graphql.pluggable_schema_manager:
-    class: Drupal\graphql\Plugin\GraphQL\PluggableSchemaManager
-    tags:
-      - { name: service_collector, tag: graphql_plugin_manager, call: addPluginManager }
-
   # Plugin manager for schemas
   plugin.manager.graphql.schema:
     class: Drupal\graphql\Plugin\GraphQL\SchemaPluginManager
@@ -199,13 +194,17 @@ services:
       - '\Drupal\graphql\Annotation\GraphQLSchema'
       - 'graphql_schemas'
 
+  # Schema builder service. Collects all registered type system plugin managers.
+  graphql.schema_builder_factory:
+    class: Drupal\graphql\Plugin\GraphQL\SchemaBuilderFactory
+    tags:
+      - { name: service_collector, tag: graphql_plugin_manager, call: addPluginManager }
+
   # Plugin manager implementations for schema types.
   plugin.manager.graphql.union_type:
     class: Drupal\graphql\Plugin\GraphQL\TypeSystemPluginManager
     tags:
       - { name: graphql_plugin_manager }
-    calls:
-      - [setSchemaManager, ['@graphql.pluggable_schema_manager']]
     arguments:
       - 'Plugin/GraphQL/UnionTypes'
       - '@container.namespaces'
@@ -218,8 +217,6 @@ services:
     class: Drupal\graphql\Plugin\GraphQL\TypeSystemPluginManager
     tags:
       - { name: graphql_plugin_manager }
-    calls:
-      - [setSchemaManager, ['@graphql.pluggable_schema_manager']]
     arguments:
       - 'Plugin/GraphQL/Interfaces'
       - '@container.namespaces'
@@ -232,8 +229,6 @@ services:
     class: Drupal\graphql\Plugin\GraphQL\TypeSystemPluginManager
     tags:
       - { name: graphql_plugin_manager }
-    calls:
-      - [setSchemaManager, ['@graphql.pluggable_schema_manager']]
     arguments:
       - 'Plugin/GraphQL/Types'
       - '@container.namespaces'
@@ -246,8 +241,6 @@ services:
     class: Drupal\graphql\Plugin\GraphQL\TypeSystemPluginManager
     tags:
       - { name: graphql_plugin_manager }
-    calls:
-      - [setSchemaManager, ['@graphql.pluggable_schema_manager']]
     arguments:
       - 'Plugin/GraphQL/InputTypes'
       - '@container.namespaces'
@@ -260,8 +253,6 @@ services:
     class: Drupal\graphql\Plugin\GraphQL\TypeSystemPluginManager
     tags:
       - { name: graphql_plugin_manager }
-    calls:
-      - [setSchemaManager, ['@graphql.pluggable_schema_manager']]
     arguments:
       - 'Plugin/GraphQL/Fields'
       - '@container.namespaces'
@@ -274,8 +265,6 @@ services:
     class: Drupal\graphql\Plugin\GraphQL\TypeSystemPluginManager
     tags:
       - { name: graphql_plugin_manager }
-    calls:
-      - [setSchemaManager, ['@graphql.pluggable_schema_manager']]
     arguments:
       - 'Plugin/GraphQL/Mutations'
       - '@container.namespaces'
@@ -288,8 +277,6 @@ services:
     class: Drupal\graphql\Plugin\GraphQL\TypeSystemPluginManager
     tags:
       - { name: graphql_plugin_manager }
-    calls:
-      - [setSchemaManager, ['@graphql.pluggable_schema_manager']]
     arguments:
       - 'Plugin/GraphQL/Scalars'
       - '@container.namespaces'
@@ -302,8 +289,6 @@ services:
     class: Drupal\graphql\Plugin\GraphQL\TypeSystemPluginManager
     tags:
       - { name: graphql_plugin_manager }
-    calls:
-      - [setSchemaManager, ['@graphql.pluggable_schema_manager']]
     arguments:
       - 'Plugin/GraphQL/Enums'
       - '@container.namespaces'

modules/graphql_core/src/Plugin/GraphQL/Enums/Images/ImageStyleId.php

@@ -3,18 +3,19 @@
 namespace Drupal\graphql_core\Plugin\GraphQL\Enums\Images;
 
 use Drupal\graphql\Plugin\GraphQL\Enums\EnumPluginBase;
-use Drupal\graphql\Plugin\GraphQL\PluggableSchemaManagerInterface;
+use Drupal\graphql\Plugin\GraphQL\SchemaBuilder;
 use Drupal\image\Entity\ImageStyle as ImageStyleConfig;
 
 /**
  * @GraphQLEnum(
  *   id = "image_style_id",
- *   name = "ImageStyleId"
+ *   name = "ImageStyleId",
+ *   provider = "image"
  * )
  */
 class ImageStyleId extends EnumPluginBase {
 
-  public function buildValues(PluggableSchemaManagerInterface $schemaManager) {
+  public function buildValues(SchemaBuilder $schemaManager) {
     $items = [];
     foreach (ImageStyleConfig::loadMultiple() as $imageStyle) {
       $items[$imageStyle->id()] = [

modules/graphql_core/src/Plugin/GraphQL/Enums/Languages/AvailableLanguages.php

@@ -5,7 +5,7 @@
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\graphql\Plugin\GraphQL\Enums\EnumPluginBase;
-use Drupal\graphql\Plugin\GraphQL\PluggableSchemaManagerInterface;
+use Drupal\graphql\Plugin\GraphQL\SchemaBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -49,7 +49,7 @@ public static function create(ContainerInterface $container, array $configuratio
   /**
    * {@inheritdoc}
    */
-  public function buildValues(PluggableSchemaManagerInterface $schemaManager) {
+  public function buildValues(SchemaBuilder $schemaManager) {
     $values = [];
 
     foreach ($this->languageManager->getLanguages() as $language) {

modules/graphql_core/src/Plugin/GraphQL/Fields/Context/Context.php

@@ -6,7 +6,7 @@
 use Drupal\Core\Plugin\Context\ContextRepositoryInterface;
 use Drupal\graphql\GraphQL\Batching\BatchedFieldResolver;
 use Drupal\graphql\Plugin\GraphQL\Fields\SubrequestFieldBase;
-use Drupal\graphql\Plugin\GraphQL\PluggableSchemaManagerInterface;
+use Drupal\graphql\Plugin\GraphQL\SchemaBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -68,7 +68,7 @@ public function __construct(
   /**
    * {@inheritdoc}
    */
-  protected function buildType(PluggableSchemaManagerInterface $schemaManager) {
+  protected function buildType(SchemaBuilder $schemaManager) {
     if ($this instanceof PluginInspectionInterface) {
       $definition = $this->getPluginDefinition();
       if (array_key_exists('data_type', $definition) && $definition['data_type']) {

modules/graphql_core/src/Plugin/GraphQL/Fields/Entity/EntityOwner.php

@@ -3,7 +3,7 @@
 namespace Drupal\graphql_core\Plugin\GraphQL\Fields\Entity;
 
 use Drupal\graphql\Plugin\GraphQL\Fields\FieldPluginBase;
-use Drupal\graphql\Plugin\GraphQL\PluggableSchemaManagerInterface;
+use Drupal\graphql\Plugin\GraphQL\SchemaBuilder;
 use Drupal\user\EntityOwnerInterface;
 use Youshido\GraphQL\Execution\ResolveInfo;
 
@@ -22,7 +22,7 @@ class EntityOwner extends FieldPluginBase {
   /**
    * {@inheritdoc}
    */
-  protected function buildType(PluggableSchemaManagerInterface $schemaManager) {
+  protected function buildType(SchemaBuilder $schemaManager) {
     try {
       return $schemaManager->findByName('User', [GRAPHQL_INTERFACE_PLUGIN]);
     }

modules/graphql_core/src/Plugin/GraphQL/Fields/Images/ImageDerivative.php

@@ -26,6 +26,7 @@
  *   field_types = {
  *     "image"
  *   },
+ *   provider = "image",
  *   deriver = "Drupal\graphql_core\Plugin\Deriver\Fields\EntityFieldPropertyDeriver"
  * )
  */

modules/graphql_core/src/Plugin/GraphQL/Fields/Images/ImageResourceHeight.php

@@ -15,6 +15,7 @@
  *   name = "height",
  *   type = "Int",
  *   nullable = true,
+ *   provider = "image",
  *   parents = {"ImageResource"},
  *   field_types = {"image"},
  *   deriver = "Drupal\graphql_core\Plugin\Deriver\Fields\EntityFieldPropertyDeriver"

modules/graphql_core/src/Plugin/GraphQL/Fields/Images/ImageResourceUrl.php

@@ -17,6 +17,7 @@
  *   nullable = true,
  *   parents = {"ImageResource"},
  *   field_types = {"image"},
+ *   provider = "image",
  *   deriver = "Drupal\graphql_core\Plugin\Deriver\Fields\EntityFieldPropertyDeriver"
  * )
  */

modules/graphql_core/src/Plugin/GraphQL/Fields/Images/ImageResourceWidth.php

@@ -15,6 +15,7 @@
  *   name = "width",
  *   type = "Int",
  *   nullable = true,
+ *   provider = "image",
  *   parents = {"ImageResource"},
  *   field_types = {"image"},
  *   deriver = "Drupal\graphql_core\Plugin\Deriver\Fields\EntityFieldPropertyDeriver"

modules/graphql_core/src/Plugin/GraphQL/Schemas/DefaultSchema.php

@@ -3,7 +3,6 @@
 namespace Drupal\graphql_core\Plugin\GraphQL\Schemas;
 
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\graphql\Plugin\GraphQL\SchemaPluginInterface;
 use Drupal\graphql\Plugin\GraphQL\Schemas\SchemaPluginBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Youshido\GraphQL\Config\Schema\SchemaConfig;
@@ -19,40 +18,48 @@
  *   path = "/graphql"
  * )
  */
-class DefaultSchema extends SchemaPluginBase implements SchemaPluginInterface, ContainerFactoryPluginInterface {
-
-  /**
-   * The pluggable schema manager service.
-   *
-   * @var \Drupal\graphql\Plugin\GraphQL\PluggableSchemaManagerInterface
-   */
-  protected $schemaManager;
+class DefaultSchema extends SchemaPluginBase implements ContainerFactoryPluginInterface {
 
   /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    /** @var \Drupal\graphql\Plugin\GraphQL\PluggableSchemaManagerInterface $schemaManager */
-    $schemaManager = $container->get('graphql.pluggable_schema_manager');
-
-    $query = new InternalSchemaQueryObject(['name' => 'RootQuery']);
-    $query->addFields($schemaManager->getRootFields());
+    /** @var \Drupal\graphql\Plugin\GraphQL\SchemaBuilderFactory $schemaBuilderFactory */
+    $schemaBuilderFactory = $container->get('graphql.schema_builder_factory');
+    // TODO: Inject schema reducer configuration into the schema builder.
+    $schemaBuilder = $schemaBuilderFactory->getSchemaBuilder();
 
     $mutation = new InternalSchemaMutationObject(['name' => 'RootMutation']);
-    $mutation->addFields($schemaManager->getMutations());
+    $mutation->addFields($schemaBuilder->getMutations());
+
+    $query = new InternalSchemaQueryObject(['name' => 'RootQuery']);
+    $query->addFields($schemaBuilder->getRootFields());
 
-    $types = $schemaManager->find(function() {
+    $types = $schemaBuilder->find(function() {
       return TRUE;
     }, [
       GRAPHQL_UNION_TYPE_PLUGIN,
       GRAPHQL_TYPE_PLUGIN,
       GRAPHQL_INPUT_TYPE_PLUGIN,
     ]);
 
-    return new static($configuration + ['schema' => [
+    $schema = [
       'query' => $query,
       'mutation' => $mutation,
       'types' => $types,
-    ]], $plugin_id, $plugin_definition);
+    ];
+
+    return new static(
+      $configuration + ['schema' => $schema],
+      $plugin_id,
+      $plugin_definition
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function constructSchema($configuration, $pluginId, $pluginDefinition) {
+    $this->config = new SchemaConfig($configuration['schema']);
   }
 }