Honor field with property info declared, use field object as type before use drupal to graphql type.

Author: olragon

graphql_api.graphql.inc

@@ -110,7 +110,7 @@ function graphql_api_graphql_api_info() {
             ];
           },
         ]
-      ),
+      )
     ],
   ];
 }

src/Schema.php

@@ -677,9 +677,17 @@ public function getMutation() {
   public function addFieldDefs() {
     $this->collectTimeMetric(__METHOD__);
     foreach (field_info_fields() as $field => $field_info) {
+      $field_properties = [];
       if (!empty($field_info['columns'])) {
+        $field_properties = $field_info['columns'];
+      }
+      if (!empty($field_info['property info'])) {
+        $field_properties = $field_info['property info'];
+      }
+
+      if (!empty($field_properties)) {
         $graphql_fields = [];
-        foreach ($field_info['columns'] as $column => $info) {
+        foreach ($field_properties as $column => $info) {
           $graphql_fields[$column] = [
             'type' => $this->drupalToGqlFieldType($info['type']),
             'description' => ''
@@ -699,6 +707,7 @@ public function addFieldDefs() {
           $this->addObjectType($field_info['type'], $objectDef);
         }
       }
+      
     }
     $this->collectTimeMetric(__METHOD__);
   }
@@ -1472,13 +1481,17 @@ public function getFields($entity_type, $bundle = '') {
             if ($field_info['type'] === 'a_field_relation_reference') {
               continue;
             }
-
-            $fieldType = $this->gqlFieldType($field_info['type'], [
-              'entity_type' => $entity_type,
-              'bundle' => $bundle,
-              'property' => $field,
-              'info' => $field_info
-            ]);
+            
+            if (isset($this->objectTypes[$field])) {
+              $fieldType = $this->objectTypes[$field];
+            } else {
+              $fieldType = $this->gqlFieldType($field_info['type'], [
+                'entity_type' => $entity_type,
+                'bundle' => $bundle,
+                'property' => $field,
+                'info' => $field_info
+              ]);
+            }
 
             if (!$fieldType) {
               $this->addError("Cannot detect field type of {$field}");
@@ -1750,10 +1763,6 @@ public function drupalToGqlFieldType($drupalType, $context = []) {
           // @fixme datetime should have object defs
           $type = Type::string();
           break;
-        case 'struct':
-          // @fixme struct should have object defs
-          $type = Type::string();
-          break;
         case 'array':
           $type = ListOfType::string();
           break;