Shortened field name, merge entity type & bundle if duplicate, add screenshot.

Author: olragon

README.md

@@ -3,6 +3,8 @@ GraphQL API for Drupal 7
 
 [![Build Status](https://travis-ci.org/olragon/graphql_api.svg?branch=master)](https://travis-ci.org/olragon/graphql_api)
 
+![GraphQL API with GraphiQL](/screenshot.png?raw=true "GraphQL API with GraphiQL")
+
 The problems
 ------------
 
@@ -41,8 +43,17 @@ The plans
         - Field API: entityreference -> Interface/Object target entity
         - Field API: relation -> Interface/Object target entity
 3. Create GraphQL endpoint `/graphql`
-    - receive POST content with GrapQL query and variables
-    - execute query and return result
+    - receive POST content with GraphQL query and variables
+    - query using Drupal's `EntityFieldQuery`
+    - check entity access using `entity_access`
+    - resolve property using `entity_metadata_wrapper`
+    - return result
 
   [GraphQL]: https://www.drupal.org/project/graphql "GraphQL module"
   [https://chrome.google.com/webstore/detail/graphiql-feen/mcbfdonlkfpbfdpi…]: https://chrome.google.com/webstore/detail/graphiql-feen/mcbfdonlkfpbfdpimkjilhdneikhfklp
+
+Notes
+-----
+
+1. Field will be shortened `field_tags` -> `tags`
+2. If entity type have single bundle, we skip GraphQL interface and just use GraphQL object. Eg: user, file, ...

screenshot.png

@@ -8,7 +8,6 @@
 use GraphQL\Type\Definition\IDType;
 use GraphQL\Schema as GraphQLSchema;
 use GraphQL\Type\Definition\ResolveInfo;
-use GraphQL\Type\Definition\UnionType;
 
 class Schema {
 
@@ -170,44 +169,55 @@ public function entityToGqlQueryArg($entity_type, $bundle = NULL) {
   public function addEntityGqlDefinition($entity_type) {
     $self = $this;
     $entity_type_info = $this->getEntityInfo($entity_type);
+    $isSingleBundle = FALSE;
     $defs = [
       'interface' => NULL,
       'objects' => []
     ];
 
-    if (!isset($this->interfaceTypes[$entity_type])) {
-      $defs['interface'] = $this->addInterfaceType($entity_type, [
-        'name' => $entity_type,
-        'description' => isset($entity_type_info['description']) ? $entity_type_info['description'] : '',
-        'fields' => $this->getFields($entity_type),
-        'resolveType' => function ($obj) use($entity_type, &$self) {
-          list($id, $rid, $bundle) = entity_extract_ids($entity_type, $obj);
-          $objectType = $self->objectTypes[str_replace('-', '_', $entity_type .'__'. $bundle)];
-          return $objectType;
-        },
-        '__entity_bundle' => null,
-        '__entity_type' => $entity_type
-      ]);
-    } else {
-      $defs['interface'] = $this->interfaceTypes[$entity_type];
+    if (count($entity_type_info['bundles']) === 1 && key($entity_type_info['bundles']) === $entity_type) {
+      $isSingleBundle = TRUE;
+    }
+
+    if (!$isSingleBundle) {
+      if (!isset($this->interfaceTypes[$entity_type])) {
+        $defs['interface'] = $this->addInterfaceType($entity_type, [
+          'name' => $entity_type,
+          'description' => isset($entity_type_info['description']) ? $entity_type_info['description'] : '',
+          'fields' => $this->getFields($entity_type),
+          'resolveType' => function ($obj) use($entity_type, &$self) {
+            list($id, $rid, $bundle) = entity_extract_ids($entity_type, $obj);
+            $objectType = $self->objectTypes[$bundle];
+            return $objectType;
+          },
+          '__entity_bundle' => null,
+          '__entity_type' => $entity_type
+        ]);
+      } else {
+        $defs['interface'] = $this->interfaceTypes[$entity_type];
+      }
     }
 
+    // entity have single bundle: user, taxonomy_vocabulary, file
     foreach ($entity_type_info['bundles'] as $bundle => $bundle_info) {
-      $machine_name = str_replace('-', '_', "{$entity_type}__{$bundle}");
-      if (!isset($this->objectTypes[$machine_name])) {
-        $defs['objects'][$machine_name] = $this->addObjectType($machine_name, [
-          'name' => $machine_name,
+      if (!isset($this->objectTypes[$bundle])) {
+        $defs['objects'][$bundle] = $this->addObjectType($bundle, [
+          'name' => $bundle,
           'description' => '',
           'fields' => $this->getFields($entity_type, $bundle),
-          'interfaces' => [$this->interfaceTypes[$entity_type]],
+          'interfaces' => $isSingleBundle ? [] : [$this->interfaceTypes[$entity_type]],
           '__entity_bundle' => $bundle,
           '__entity_type' => $entity_type
         ]);
       } else {
-        $defs['objects'][$machine_name] = $this->objectTypes[$machine_name];
+        $defs['objects'][$bundle] = $this->objectTypes[$bundle];
       }
     }
 
+    if ($isSingleBundle) {
+      $defs['interface'] = reset($defs['objects']);
+    }
+
     return $defs;
   }
 
@@ -270,8 +280,15 @@ public function getFields($entity_type, $bundle = '') {
     if ($bundle && !empty($properties_info['bundles'][$bundle])) {
       foreach ($properties_info['bundles'][$bundle]['properties'] as $field => $field_info) {
         $fieldType = $this->gqlFieldType($field_info['type'], ['entity_type' => $entity_type, 'bundle' => $bundle, 'property' => $field, 'info' => $field_info]);
-        if (!$fieldType) continue;
-        $fields[$field] = [
+        if (!$fieldType) {
+          throw new Error("Cannot detect field type of {$field}");
+        }
+        $short_field = preg_replace('/^field_/', '', $field);
+        if (isset($fields[$short_field])) {
+          $short_field = $field;
+        }
+
+        $fields[$short_field] = [
           'type' => $fieldType,
           'description' => $field_info['description'],
           'resolve' => function ($value, $args, $context, ResolveInfo $info) use ($entity_type, $bundle, $field) {

src/Schema.php

@@ -1,8 +1,8 @@
 query nodeWithTags($nid: Int) {
-    node__article (nid: $nid) {
+    article (nid: $nid) {
         nid,
         title,
-        field_tags {
+        tags {
             name
         }
     }

tests/fixtures/queryNodeWithTags.graphql

@@ -66,8 +66,8 @@ class Graphql_API_Test extends DrupalWebTestCase {
     ]);
     $this->assertEqual(curl_getinfo($this->curlHandle, CURLINFO_CONTENT_TYPE), 'application/json', 'HTTP content type is correct.');
     $result = drupal_json_decode($response);
-    $this->assertEqual($result['data']['node__article'][0]['title'], $this->nodeWithTags->title, 'Node title is valid.');
-    $this->assertEqual($result['data']['node__article'][0]['field_tags'][0]['name'], $this->tag->name, 'Tag is valid.');
+    $this->assertEqual($result['data']['article'][0]['title'], $this->nodeWithTags->title, 'Node title is valid.');
+    $this->assertEqual($result['data']['article'][0]['tags'][0]['name'], $this->tag->name, 'Tag is valid.');
   }
 
   /**