Completed date formatting through the "formatted" leaf

Example:

  {
    content {
      ... on DateAndTimeFieldValue {
        formatted(format: "d/m/Y")
      }
    }
  }

Author: Bertrand Dunogier

GraphQL/Resolver/ContentResolver.php

@@ -50,6 +50,8 @@ class ContentResolver
         'ezrichtext' => 'RichTextFieldValue',
         'ezstring' => 'TextLineFieldValue',
         'ezobjectrelationlist' => 'RelationListFieldValue',
+        'ezdate' => 'DateFieldValue',
+        'ezdatetime' => 'DateAndTimeFieldValue',
     ];
 
     public function __construct(ContentService $contentService, SearchService $searchService, ContentTypeService $contentTypeService, TypeResolver $typeResolver)

GraphQL/Resolver/DateResolver.php

@@ -6,16 +6,11 @@
 
 class DateResolver
 {
-    public function resolveDateToFormat(DateTime $date, Argument $args)
+    public function resolveDateToFormat(string $format, DateTime $date = null)
     {
-        if (isset($args['constant'])) {
-            $format = $args['constant'];
-        } else if (isset($args['format'])) {
-            $format = $args['format'];
-        } else {
-            $format = DateTime::RFC850;
+        if ($date === null) {
+            return $date;
         }
-
         return $date->format($format);
     }
 }

Resources/config/graphql/Field.types.yml

@@ -159,20 +159,25 @@ DateFieldValue:
     config:
         interfaces: [FieldValue]
         fields:
-            format:
+            text:
                 type: "String"
-                description: "String representation of the value"
-                resolve: "@=value"
+                description: "Unix timestamp"
+                resolve: "@=value.value ? value.value.getTimestamp() : null"
+            formatted:
+                type: "String"
+                description: "Formatted date"
+                # @todo: refactor with a datetime resolver
+                resolve: "@=resolver('DateTimeFormat', [args['format'], value.value])"
+                args:
+                    format:
+                        type: String
+                        description: "A format string compatible with PHP's date() function"
 
 DateAndTimeFieldValue:
     type: object
+    inherits: ["DateFieldValue"]
     config:
         interfaces: [FieldValue]
-        fields:
-            text:
-                type: "String"
-                description: "String representation of the value"
-                resolve: "@=value"
 
 EmailAddressFieldValue:
     type: object