Allow optional arguments. (#674)

Author: fubhy

modules/graphql_core/src/Plugin/Deriver/Fields/EntityRenderedDeriver.php

@@ -49,6 +49,14 @@ public function getDerivativeDefinitions($basePluginDefinition) {
           'entity_type' => $id,
         ] + $basePluginDefinition;
 
+        if (!isset($derivative['arguments']['mode'])) {
+          $derivative['arguments'] = isset($derivative['arguments']) ? $derivative['arguments'] : [];
+          $derivative['arguments']['mode'] = [
+            'type' => StringHelper::camelCase($id, 'display', 'mode', 'id'),
+            'optional' => TRUE,
+          ];
+        }
+
         $this->derivatives["entity:$id"] = $derivative;
       }
     }

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

@@ -23,7 +23,7 @@
  *   deriver = "Drupal\graphql_core\Plugin\Deriver\Fields\EntityRenderedDeriver",
  * )
  */
-class EntityRendered extends FieldPluginBase  implements ContainerFactoryPluginInterface {
+class EntityRendered extends FieldPluginBase implements ContainerFactoryPluginInterface {
   use DependencySerializationTrait;
 
   /**
@@ -79,28 +79,6 @@ public function __construct(
     $this->renderer = $renderer;
   }
 
-  // TODO: Fix this.
-//  /**
-//   * {@inheritdoc}
-//   */
-//  protected function buildArguments(SchemaBuilderInterface $builder) {
-//    $arguments = parent::buildArguments($builder);
-//
-//    if (empty($arguments['mode'])) {
-//      $definition = $this->getPluginDefinition();
-//      $type = StringHelper::camelCase($definition['entity_type'], 'display', 'mode', 'id');
-//
-//      if ($type = $builder->findByName($type, [GRAPHQL_ENUM_PLUGIN])) {
-//        $arguments['mode'] = new InputField([
-//          'name' => 'mode',
-//          'type' => $type->getDefinition($builder),
-//        ]);
-//      }
-//    }
-//
-//    return $arguments;
-//  }
-
   /**
    * {@inheritdoc}
    */

src/Plugin/GraphQL/Schemas/SchemaPluginBase.php

@@ -446,11 +446,24 @@ public function processFields(array $fields) {
    * {@inheritdoc}
    */
   public function processArguments(array $args) {
-    return array_map(function ($arg) {
+    return array_filter(array_map(function ($arg) {
+      try {
+        $type = $this->processType($arg['type']);
+      }
+      catch (\Exception $e) {
+        // Allow optional arguments that are removed if the input type is
+        // not defined.
+        if (empty($arg['optional'])) {
+          throw $e;
+        }
+
+        return NULL;
+      }
+
       return [
-        'type' => $this->processType($arg['type']),
+        'type' => $type,
       ] + $arg;
-    }, $args);
+    }, $args));
   }
 
   /**

src/Plugin/GraphQL/Traits/ArgumentAwarePluginTrait.php

@@ -18,6 +18,7 @@ trait ArgumentAwarePluginTrait {
   protected function buildArguments($definition) {
     return array_map(function ($argument) use ($definition) {
       return [
+        'optional' => !empty($argument['optional']),
         'type' => $this->buildArgumentType($argument, $definition),
         'description' => $this->buildArgumentDescription($argument, $definition),
         'defaultValue' => $this->buildArgumentDefault($argument, $definition),