c#, improvement: datetime serialization (#4106)

generators/csharp/codegen/src/AsIs.ts

@@ -1,6 +1,9 @@
 export const STRING_ENUM_SERIALIZER_CLASS_NAME = "StringEnumSerializer";
 export const ONE_OF_SERIALIZER_CLASS_NAME = "OneOfSerializer";
 export const COLLECTION_ITEM_SERIALIZER_CLASS_NAME = "CollectionItemSerializer";
+export const DATETIME_SERIALIZER_CLASS_NAME = "DateTimeSerializer";
+export const CONSTANTS_CLASS_NAME = "Constants";
+export const JSON_UTILS_CLASS_NAME = "JsonUtils";
 
 export enum AsIsFiles {
     EnumConverter = "EnumConverter.Template.cs",
@@ -14,5 +17,8 @@ export enum AsIsFiles {
     StringEnumSerializer = "StringEnumSerializer.cs",
     OneOfSerializer = "OneOfSerializer.cs",
     CollectionItemSerializer = "CollectionItemSerializer.cs",
-    HttpMethodExtensions = "HttpMethodExtensions.cs"
+    HttpMethodExtensions = "HttpMethodExtensions.cs",
+    Constants = "Constants.cs",
+    DateTimeSerializer = "DateTimeSerializer.cs",
+    JsonConfiguration = "JsonConfiguration.cs"
 }

generators/csharp/codegen/src/asIs/Constants.cs

@@ -0,0 +1,6 @@
+namespace <%= namespace%>;
+
+public static class Constants
+{
+    public const string DateTimeFormat = "yyyy'-'MM'-'dd'T'HH':'mm':'ssK";
+}

generators/csharp/codegen/src/asIs/DateTimeSerializer.cs

@@ -0,0 +1,21 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace <%= namespace%>;
+
+public class DateTimeSerializer : JsonConverter<DateTime>
+{
+    public override DateTime Read(
+        ref Utf8JsonReader reader,
+        System.Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return DateTime.ParseExact(reader.GetString()!, Constants.DateTimeFormat, null);
+    }
+
+    public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
+    {
+        writer.WriteStringValue(value.ToString(Constants.DateTimeFormat));
+    }
+}

generators/csharp/codegen/src/asIs/JsonConfiguration.cs

@@ -0,0 +1,30 @@
+using System.Text.Json;
+
+namespace <%= namespace%>;
+
+public static class JsonOptions
+{
+    public static readonly JsonSerializerOptions JsonSerializerOptions;
+
+    static JsonOptions()
+    {
+        JsonSerializerOptions = new JsonSerializerOptions
+        {
+            Converters = { new DateTimeSerializer() },
+            WriteIndented = true
+        };
+    }
+}
+
+public static class JsonUtils
+{
+    public static string Serialize<T>(T obj)
+    {
+        return JsonSerializer.Serialize(obj, JsonOptions.JsonSerializerOptions);
+    }
+
+    public static T Deserialize<T>(string json)
+    {
+        return JsonSerializer.Deserialize<T>(json, JsonOptions.JsonSerializerOptions)!;
+    }
+}

generators/csharp/codegen/src/asIs/RawClient.Template.cs

@@ -1,5 +1,4 @@
 using System.Text;
-using System.Text.Json;
 using System.Net.Http;
 
 namespace <%= namespace%>;
@@ -44,9 +43,8 @@ public async Task<ApiResponse> MakeRequestAsync(BaseApiRequest request)
         {
             if (jsonRequest.Body != null)
             {
-                var serializerOptions = new JsonSerializerOptions { WriteIndented = true, };
                 httpRequest.Content = new StringContent(
-                    JsonSerializer.Serialize(jsonRequest.Body, serializerOptions),
+                    JsonUtils.Serialize(jsonRequest.Body),
                     Encoding.UTF8,
                     "application/json"
                 );

generators/csharp/codegen/src/context/AbstractCsharpGeneratorContext.ts

@@ -17,6 +17,9 @@ import { camelCase, upperFirst } from "lodash-es";
 import { csharp } from "..";
 import {
     COLLECTION_ITEM_SERIALIZER_CLASS_NAME,
+    CONSTANTS_CLASS_NAME,
+    DATETIME_SERIALIZER_CLASS_NAME,
+    JSON_UTILS_CLASS_NAME,
     ONE_OF_SERIALIZER_CLASS_NAME,
     STRING_ENUM_SERIALIZER_CLASS_NAME
 } from "../AsIs";
@@ -73,13 +76,34 @@ export abstract class AbstractCsharpGeneratorContext<
         return `${this.namespace}.Test`;
     }
 
+    public getConstantsClassReference(): csharp.ClassReference {
+        return csharp.classReference({
+            namespace: this.getCoreNamespace(),
+            name: CONSTANTS_CLASS_NAME
+        });
+    }
+
     public getStringEnumSerializerClassReference(): csharp.ClassReference {
         return csharp.classReference({
             namespace: this.getCoreNamespace(),
             name: STRING_ENUM_SERIALIZER_CLASS_NAME
         });
     }
 
+    public getDateTimeSerializerClassReference(): csharp.ClassReference {
+        return csharp.classReference({
+            namespace: this.getCoreNamespace(),
+            name: DATETIME_SERIALIZER_CLASS_NAME
+        });
+    }
+
+    public getJsonUtilsClassReference(): csharp.ClassReference {
+        return csharp.classReference({
+            namespace: this.getCoreNamespace(),
+            name: JSON_UTILS_CLASS_NAME
+        });
+    }
+
     public getCollectionItemSerializerReference(
         itemType: csharp.ClassReference,
         serializer: csharp.ClassReference

generators/csharp/sdk/CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.1.4 - 2024-07-23]
+
+- Improvement: More improvements to datetime serialization.
+
 ## [0.1.3 - 2024-07-22]
 
 - Fix: Fixed a bug with serializing datetimes.

generators/csharp/sdk/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

generators/csharp/sdk/src/SdkGeneratorContext.ts

@@ -68,7 +68,10 @@ export class SdkGeneratorContext extends AbstractCsharpGeneratorContext<SdkCusto
             AsIsFiles.StringEnumSerializer,
             AsIsFiles.OneOfSerializer,
             AsIsFiles.CollectionItemSerializer,
-            AsIsFiles.HttpMethodExtensions
+            AsIsFiles.HttpMethodExtensions,
+            AsIsFiles.Constants,
+            AsIsFiles.DateTimeSerializer,
+            AsIsFiles.JsonConfiguration
         ];
     }
 

generators/csharp/sdk/src/endpoint/EndpointGenerator.ts

@@ -172,12 +172,7 @@ export class EndpointGenerator {
 
                     // Deserialize the response as json
                     writer.write("return ");
-                    writer.writeNode(
-                        csharp.classReference({
-                            name: "JsonSerializer",
-                            namespace: "System.Text.Json"
-                        })
-                    );
+                    writer.writeNode(this.context.getJsonUtilsClassReference());
                     writer.write(".Deserialize<");
                     writer.writeNode(astType);
                     // todo: Maybe remove ! below and handle potential null. Requires introspecting type to know if its

generators/csharp/sdk/src/endpoint/request/WrappedEndpointRequest.ts

@@ -148,9 +148,17 @@ export class WrappedEndpointRequest extends EndpointRequest {
         if (this.isString(reference)) {
             return csharp.codeblock(`${this.getParameterName()}.${name.pascalCase.safeName}`);
         } else if (this.isDatetime({ typeReference: reference, allowOptionals: false })) {
-            return csharp.codeblock(`${this.getParameterName()}.${name.pascalCase.safeName}.ToString("o")`);
+            return csharp.codeblock((writer) => {
+                writer.write(`${this.getParameterName()}.${name.pascalCase.safeName}.ToString(`);
+                writer.writeNode(this.context.getConstantsClassReference());
+                writer.write(".DateTimeFormat)");
+            });
         } else if (this.isDatetime({ typeReference: reference, allowOptionals: true })) {
-            return csharp.codeblock(`${this.getParameterName()}.${name.pascalCase.safeName}.Value.ToString("o")`);
+            return csharp.codeblock((writer) => {
+                writer.write(`${this.getParameterName()}.${name.pascalCase.safeName}.Value.ToString(`);
+                writer.writeNode(this.context.getConstantsClassReference());
+                writer.write(".DateTimeFormat)");
+            });
         } else if (this.isEnum({ typeReference: reference, allowOptionals: false })) {
             return csharp.codeblock((writer) => {
                 writer.writeNode(