Merge branch 'master' of github.com:dadish/ProcessGraphQL

Author: dadish

src/Type/Fieldtype/FieldtypeOptions.php

@@ -5,6 +5,8 @@
 use GraphQL\Type\Definition\ObjectType;
 use ProcessWire\GraphQL\Cache;
 use ProcessWire\InputfieldSelectMultiple;
+use ProcessWire\Field;
+use ProcessWire\GraphQL\Utils;
 use ProcessWire\GraphQL\Type\Fieldtype\Traits\SetValueTrait;
 use ProcessWire\GraphQL\Type\Fieldtype\Traits\FieldTrait;
 
@@ -21,8 +23,8 @@ class FieldtypeOptions
 
   public static function type($field)
   {
-    return Cache::type(self::$name, function () use ($field) {
-      $type = new ObjectType([
+    $type = Cache::type(self::$name, function () use ($field) {
+      return new ObjectType([
         'name' => self::$name,
         'description' => self::$description,
         'fields' => [
@@ -52,18 +54,18 @@ public static function type($field)
           ]
         ],
       ]);
+    });
 
-      if (self::isMultiple($field)) {
-        return Type::listOf($type);
-      }
+    if (self::isMultiple($field)) {
+      return Type::listOf($type);
+    }
 
-      return $type;
-    });
+    return $type;
   }
 
   public static function inputType($field)
   {
-    return Cache::type(self::$inputName, function () use ($field) {
+    return Cache::type(self::getName($field), function () use ($field) {
       $options = [];
       foreach ($field->type->getOptions($field) as $option) {
         $options[$option->title ? $option->title : $option->value] = [
@@ -73,7 +75,7 @@ public static function inputType($field)
       }
 
       $type = new EnumType([
-        'name' => self::$inputName,
+        'name' => self::getName($field),
         'description' => "Possible values for the ". self::$name .".",
         'values' => $options,
       ]);
@@ -110,4 +112,13 @@ public static function inputField($field)
       ];
     });
   }
+
+  public static function getName(Field $field = null)
+  {
+    if ($field instanceof Field) {
+      return Utils::normalizeTypeName("{$field->name}".self::$inputName);
+    }
+
+    return self::$inputName;
+  }
 }