Refactoring schema builder logic. (#404)

Author: fubhy

graphql.services.yml

@@ -193,10 +193,11 @@ services:
       - '\Drupal\graphql\Plugin\GraphQL\Schemas\SchemaPluginBase'
       - '\Drupal\graphql\Annotation\GraphQLSchema'
       - 'graphql_schemas'
+      - '@service_container'
 
   # Schema builder service. Collects all registered type system plugin managers.
-  graphql.schema_builder_factory:
-    class: Drupal\graphql\Plugin\GraphQL\SchemaBuilderFactory
+  graphql.plugin_manager_aggregator:
+    class: Drupal\graphql\Plugin\GraphQL\TypeSystemPluginManagerAggregator
     tags:
       - { name: service_collector, tag: graphql_plugin_manager, call: addPluginManager }
 

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

@@ -3,7 +3,7 @@
 namespace Drupal\graphql_core\Plugin\GraphQL\Enums\Images;
 
 use Drupal\graphql\Plugin\GraphQL\Enums\EnumPluginBase;
-use Drupal\graphql\Plugin\GraphQL\SchemaBuilder;
+use Drupal\graphql\Plugin\GraphQL\SchemaBuilderInterface;
 use Drupal\image\Entity\ImageStyle as ImageStyleConfig;
 
 /**
@@ -15,7 +15,7 @@
  */
 class ImageStyleId extends EnumPluginBase {
 
-  public function buildValues(SchemaBuilder $schemaManager) {
+  public function buildValues(SchemaBuilderInterface $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\SchemaBuilder;
+use Drupal\graphql\Plugin\GraphQL\SchemaBuilderInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -49,7 +49,7 @@ public static function create(ContainerInterface $container, array $configuratio
   /**
    * {@inheritdoc}
    */
-  public function buildValues(SchemaBuilder $schemaManager) {
+  public function buildValues(SchemaBuilderInterface $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\SchemaBuilder;
+use Drupal\graphql\Plugin\GraphQL\SchemaBuilderInterface;
 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(SchemaBuilder $schemaManager) {
+  protected function buildType(SchemaBuilderInterface $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\SchemaBuilder;
+use Drupal\graphql\Plugin\GraphQL\SchemaBuilderInterface;
 use Drupal\user\EntityOwnerInterface;
 use Youshido\GraphQL\Execution\ResolveInfo;
 
@@ -22,7 +22,7 @@ class EntityOwner extends FieldPluginBase {
   /**
    * {@inheritdoc}
    */
-  protected function buildType(SchemaBuilder $schemaManager) {
+  protected function buildType(SchemaBuilderInterface $schemaManager) {
     try {
       return $schemaManager->findByName('User', [GRAPHQL_INTERFACE_PLUGIN]);
     }

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

@@ -2,63 +2,18 @@
 
 namespace Drupal\graphql_core\Plugin\GraphQL\Schemas;
 
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\graphql\Plugin\GraphQL\Schemas\SchemaPluginBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Youshido\GraphQL\Config\Schema\SchemaConfig;
-use Youshido\GraphQL\Schema\InternalSchemaMutationObject;
-use Youshido\GraphQL\Schema\InternalSchemaQueryObject;
 
 /**
  * Default generated schema.
  *
  * @GraphQLSchema(
  *   id = "default",
  *   name = "Default",
- *   path = "/graphql"
+ *   path = "/graphql",
+ *   builder = "\Drupal\graphql\Plugin\GraphQL\PluggableSchemaBuilder"
  * )
  */
-class DefaultSchema extends SchemaPluginBase implements ContainerFactoryPluginInterface {
+class DefaultSchema extends SchemaPluginBase {
 
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    /** @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']);
-
-    $query = new InternalSchemaQueryObject(['name' => 'RootQuery']);
-    $query->addFields($schemaBuilder->getRootFields());
-
-    $types = $schemaBuilder->find(function() {
-      return TRUE;
-    }, [
-      GRAPHQL_UNION_TYPE_PLUGIN,
-      GRAPHQL_TYPE_PLUGIN,
-      GRAPHQL_INPUT_TYPE_PLUGIN,
-    ]);
-
-    $schema = [
-      'query' => $query,
-      'mutation' => $mutation,
-      'types' => $types,
-    ];
-
-    return new static(
-      $configuration + ['schema' => $schema],
-      $plugin_id,
-      $plugin_definition
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function constructSchema($configuration, $pluginId, $pluginDefinition) {
-    $this->config = new SchemaConfig($configuration['schema']);
-  }
 }

modules/graphql_legacy/graphql_image/src/Plugin/GraphQL/Enums/ImageStyleId.php

@@ -3,7 +3,7 @@
 namespace Drupal\graphql_image\Plugin\GraphQL\Enums;
 
 use Drupal\graphql\Plugin\GraphQL\Enums\EnumPluginBase;
-use Drupal\graphql\Plugin\GraphQL\SchemaBuilder;
+use Drupal\graphql\Plugin\GraphQL\SchemaBuilderInterface;
 use Drupal\image\Entity\ImageStyle as ImageStyleConfig;
 use Youshido\GraphQL\Type\Enum\AbstractEnumType;
 
@@ -15,7 +15,7 @@
  */
 class ImageStyleId extends EnumPluginBase {
 
-  public function buildValues(SchemaBuilder $schemaManager) {
+  public function buildValues(SchemaBuilderInterface $schemaManager) {
     $items = [];
     foreach (ImageStyleConfig::loadMultiple() as $imageStyle) {
       $items[$imageStyle->id()] = [

modules/graphql_legacy/graphql_image/src/Plugin/GraphQL/Enums/ResponsiveImageStyleId.php

@@ -3,7 +3,7 @@
 namespace Drupal\graphql_image\Plugin\GraphQL\Enums;
 
 use Drupal\graphql\Plugin\GraphQL\Enums\EnumPluginBase;
-use Drupal\graphql\Plugin\GraphQL\SchemaBuilder;
+use Drupal\graphql\Plugin\GraphQL\SchemaBuilderInterface;
 use Drupal\responsive_image\Entity\ResponsiveImageStyle;
 
 /**
@@ -14,7 +14,7 @@
  */
 class ResponsiveImageStyleId extends EnumPluginBase {
 
-  public function buildValues(SchemaBuilder $schemaManager) {
+  public function buildValues(SchemaBuilderInterface $schemaManager) {
     $items = [];
     foreach (ResponsiveImageStyle::loadMultiple() as $responsiveImageStyle) {
       $items[$responsiveImageStyle->id()] = [

src/Annotation/GraphQLSchema.php

@@ -42,6 +42,13 @@ public function __construct($values) {
    */
   public $path;
 
+  /**
+   * Whether the schema uses the type plugin system.
+   *
+   * @var string
+   */
+  public $builder = '\Drupal\graphql\Plugin\GraphQL\PluggableSchemaBuilder';
+
   /**
    * Weight for precedence calculations.
    *

src/Plugin/GraphQL/Enums/EnumPluginBase.php

@@ -2,8 +2,7 @@
 
 namespace Drupal\graphql\Plugin\GraphQL\Enums;
 
-use Drupal\Core\Cache\CacheableDependencyInterface;
-use Drupal\graphql\Plugin\GraphQL\SchemaBuilder;
+use Drupal\graphql\Plugin\GraphQL\SchemaBuilderInterface;
 use Drupal\graphql\Plugin\GraphQL\Traits\CacheablePluginTrait;
 use Drupal\graphql\Plugin\GraphQL\Traits\NamedPluginTrait;
 use Drupal\graphql\Plugin\GraphQL\Traits\PluginTrait;
@@ -29,7 +28,7 @@ public function __construct(array $configuration, $pluginId, $pluginDefinition)
   /**
    * {@inheritdoc}
    */
-  abstract public function buildValues(SchemaBuilder $schemaManager);
+  abstract public function buildValues(SchemaBuilderInterface $schemaManager);
 
   /**
    * {@inheritdoc}
@@ -41,7 +40,7 @@ public function getValues() {
   /**
    * {@inheritdoc}
    */
-  public function buildConfig(SchemaBuilder $schemaManager) {
+  public function buildConfig(SchemaBuilderInterface $schemaManager) {
     $this->config = new EnumTypeConfig([
       'name' => $this->buildName(),
       'description' => $this->buildDescription(),