Fix issue field file, image alway return NULL

Author: olragon

graphql_api.graphql.inc

@@ -34,14 +34,22 @@ function graphql_api_graphql_api_info() {
         'name' => 'field_item_file',
         'fields' => function () {
           $schema = graphql_api();
-          return $schema->getInterfaceType('file')->getFields() + [
+          $file_type = $schema->getObjectType('file_file');
+          if (module_exists('file_entity')) {
+            $file_type = $schema->getInterfaceType('file');
+          }
+          return [
             'description' => [
               'type' => Type::string(),
               'description' => t('Alt')
             ],
             'display' => [
               'type' => Type::string(),
               'description' => t('Display')
+            ],
+            'file' => [
+              'type' => $file_type,
+              'description' => t('File')
             ]
           ];
         }
@@ -50,7 +58,11 @@ function graphql_api_graphql_api_info() {
         'name' => 'field_item_image',
         'fields' => function () {
           $schema = graphql_api();
-          return $schema->getInterfaceType('file')->getFields() + [
+          $file_type = $schema->getObjectType('file_file');
+          if (module_exists('file_entity')) {
+            $file_type = $schema->getInterfaceType('file');
+          }
+          return [
             'description' => [
               'type' => Type::string(),
               'description' => t('Alt')
@@ -66,6 +78,18 @@ function graphql_api_graphql_api_info() {
             'title' => [
               'type' => Type::string(),
               'description' => t('Title')
+            ],
+            'width' => [
+              'type' => Type::float(),
+              'description' => t('Width')
+            ],
+            'height' => [
+              'type' => Type::float(),
+              'description' => t('Height')
+            ],
+            'file' => [
+              'type' => $file_type,
+              'description' => t('File')
             ]
           ];
         }

src/Schema.php

@@ -614,10 +614,18 @@ public function getFields($entity_type, $bundle = '') {
             $fields[$field] = [
               'type' => $fieldType,
               'description' => isset($field_info['description']) ? $field_info['description'] : '',
-              'resolve' => function ($value, $args, $context, ResolveInfo $info) use ($entity_type, $bundle, $field) {
+              'resolve' => function ($value, $args, $context, ResolveInfo $info) use ($entity_type, $bundle, $field, $fieldType) {
                 $wrap = entity_metadata_wrapper($entity_type, $value);
                 if ($wrap->__isset($field)) {
                   $items = $wrap->{$field}->value();
+                  if (in_array($fieldType->name, ['field_item_image', 'field_item_file']) && !empty($items['fid'])) {
+                    $items['file'] = file_load($items['fid']);
+                  }
+                  if ($fieldType instanceof ListOfType) {
+                    foreach ($items as $index => $item) {
+                      $items[$index]['file'] = file_load($item['fid']);
+                    }
+                  }
                   return $items;
                 }
                 return NULL;