Use generated serializers for QueryVal serialization

fauna · Jul 23, 2024 · 9402d4e · 9402d4e
1 parent fa81032
commit 9402d4e
Show file tree

Hide file tree

Showing 15 changed files with 196 additions and 53 deletions.
diff --git a/Fauna.Test/Serialization/RoundTrip.Tests.cs b/Fauna.Test/Serialization/RoundTrip.Tests.cs
@@ -31,7 +31,11 @@ public static string Serialize(object? obj)
     {
         using var stream = new MemoryStream();
         using var writer = new Utf8FaunaWriter(stream);
-        DynamicSerializer.Singleton.Serialize(ctx, writer, obj);
+
+        ISerializer ser = DynamicSerializer.Singleton;
+        if (obj is not null) ser = Serializer.Generate(ctx, obj.GetType());
+        ser.Serialize(ctx, writer, obj);
+
         writer.Flush();
         return Encoding.UTF8.GetString(stream.ToArray());
     }

diff --git a/Fauna/Query/QueryVal.cs b/Fauna/Query/QueryVal.cs
@@ -19,6 +19,7 @@ public sealed class QueryVal : Query, IQueryFragment
     /// <param name="v">The value of the specified type to be represented in the query.</param>
     public QueryVal(object? v)
     {
+
         Unwrap = v;
     }
 
@@ -31,7 +32,8 @@ public override void Serialize(MappingContext ctx, Utf8FaunaWriter writer)
     {
         writer.WriteStartObject();
         writer.WriteFieldName("value");
-        DynamicSerializer.Singleton.Serialize(ctx, writer, Unwrap);
+        var ser = Unwrap is not null ? Serializer.Generate(ctx, Unwrap.GetType()) : DynamicSerializer.Singleton;
+        ser.Serialize(ctx, writer, Unwrap);
         writer.WriteEndObject();
     }
 

diff --git a/Fauna/Serialization/ISerializer.cs b/Fauna/Serialization/ISerializer.cs
@@ -15,6 +15,10 @@ public interface ISerializer
 
 public abstract class BaseSerializer<T> : ISerializer<T>
 {
+    protected string UnexpectedTokenExceptionMessage(TokenType token) => $"Unexpected token `{token}` deserializing with `{GetType()}`";
+
+    protected string UnsupportedSerializationTypeMessage(Type type) => $"Cannot serialize `{type}` with `{GetType()}`";
+
     object? ISerializer.Deserialize(MappingContext context, ref Utf8FaunaReader reader) =>
         Deserialize(context, ref reader);
 

diff --git a/Fauna/Serialization/Serializer.cs b/Fauna/Serialization/Serializer.cs
@@ -4,12 +4,12 @@
 namespace Fauna.Serialization;
 
 /// <summary>
-/// Represents methods for deserializing objects to and from Fauna's value format.
+/// Represents methods for serializing objects to and from Fauna's value format.
 /// </summary>
 public static class Serializer
 {
     /// <summary>
-    /// The dynamic data deserializer.
+    /// The dynamic data serializer.
     /// </summary>
     public static ISerializer<object?> Dynamic => DynamicSerializer.Singleton;
 
@@ -39,20 +39,20 @@ public static class Serializer
     private static readonly DocumentSerializer<NamedRef> _namedDocRef = new();
 
     /// <summary>
-    /// Generates a deserializer for the specified non-nullable .NET type.
+    /// Generates a serializer for the specified non-nullable .NET type.
     /// </summary>
     /// <typeparam name="T">The type of the object to serialize.</typeparam>
     /// <param name="context">The serialization context.</param>
     /// <returns>An <see cref="ISerializer{T}"/>.</returns>
     public static ISerializer<T> Generate<T>(MappingContext context) where T : notnull
     {
         var targetType = typeof(T);
-        var deser = (ISerializer<T>)Generate(context, targetType);
-        return deser;
+        var ser = (ISerializer<T>)Generate(context, targetType);
+        return ser;
     }
 
     /// <summary>
-    /// Generates a deserializer for the specified non-nullable .NET type.
+    /// Generates a serializer for the specified non-nullable .NET type.
     /// </summary>
     /// <param name="context">The serialization context.</param>
     /// <param name="targetType">The type of the object to serialize.</typeparam>
@@ -94,7 +94,10 @@ public static ISerializer Generate(MappingContext context, Type targetType)
             throw new ArgumentException($"Unsupported nullable type. Generic arguments > 1: {args}");
         }
 
-        if (targetType.IsGenericType && targetType.GetGenericTypeDefinition() == typeof(NullableDocument<>))
+        if (targetType.IsGenericType && (
+                targetType.GetGenericTypeDefinition() == typeof(NullableDocument<>) ||
+                targetType.GetGenericTypeDefinition() == typeof(NonNullDocument<>) ||
+                targetType.GetGenericTypeDefinition() == typeof(NullDocument<>)))
         {
             var argTypes = targetType.GetGenericArguments();
             var valueType = argTypes[0];
@@ -113,32 +116,32 @@ public static ISerializer Generate(MappingContext context, Type targetType)
                 throw new ArgumentException(
                     $"Unsupported Dictionary key type. Key must be of type string, but was a {keyType}");
 
-            var valueDeserializer = Generate(context, valueType);
+            var valueSerializer = Generate(context, valueType);
 
             var serType = typeof(DictionarySerializer<>).MakeGenericType(new[] { valueType });
-            var ser = Activator.CreateInstance(serType, new[] { valueDeserializer });
+            var ser = Activator.CreateInstance(serType, new[] { valueSerializer });
 
             return (ISerializer)ser!;
         }
 
         if (targetType.IsGenericType && targetType.GetGenericTypeDefinition() == typeof(List<>))
         {
             var elemType = targetType.GetGenericArguments()[0];
-            var elemDeserializer = Generate(context, elemType);
+            var elemSerializer = Generate(context, elemType);
 
             var serType = typeof(ListSerializer<>).MakeGenericType(new[] { elemType });
-            var ser = Activator.CreateInstance(serType, new[] { elemDeserializer });
+            var ser = Activator.CreateInstance(serType, new[] { elemSerializer });
 
             return (ISerializer)ser!;
         }
 
         if (targetType.IsGenericType && targetType.GetGenericTypeDefinition() == typeof(Page<>))
         {
             var elemType = targetType.GetGenericArguments()[0];
-            var elemDeserializer = Generate(context, elemType);
+            var elemSerializer = Generate(context, elemType);
 
             var serType = typeof(PageSerializer<>).MakeGenericType(new[] { elemType });
-            var ser = Activator.CreateInstance(serType, new[] { elemDeserializer });
+            var ser = Activator.CreateInstance(serType, new[] { elemSerializer });
 
             return (ISerializer)ser!;
         }
@@ -153,7 +156,7 @@ public static ISerializer Generate(MappingContext context, Type targetType)
     }
 
     /// <summary>
-    /// Generates a deserializer which returns values of the specified .NET type, or the default if the underlying query value is null.
+    /// Generates a serializer which returns values of the specified .NET type, or the default if the underlying query value is null.
     /// </summary>
     /// <typeparam name="T">The type of the object to serialize.</typeparam>
     /// <param name="context">The serialization context.</param>
@@ -166,7 +169,7 @@ public static ISerializer Generate(MappingContext context, Type targetType)
     }
 
     /// <summary>
-    /// Generates a deserializer which returns values of the specified .NET type, or the default if the underlying query value is null.
+    /// Generates a serializer which returns values of the specified .NET type, or the default if the underlying query value is null.
     /// </summary>
     /// <param name="context">The serialization context.</param>
     /// <param name="targetType">The type of the object to serialize.</typeparam>

diff --git a/Fauna/Serialization/Serializers/CheckedSerializer.cs b/Fauna/Serialization/Serializers/CheckedSerializer.cs
@@ -16,6 +16,6 @@ public override T Deserialize(MappingContext context, ref Utf8FaunaReader reader
 
     public override void Serialize(MappingContext context, Utf8FaunaWriter writer, object? o)
     {
-        throw new NotImplementedException();
+        DynamicSerializer.Singleton.Serialize(context, writer, o);
     }
 }
diff --git a/Fauna/Serialization/Serializers/ClassSerializer.cs b/Fauna/Serialization/Serializers/ClassSerializer.cs
@@ -93,7 +93,7 @@ public override T Deserialize(MappingContext context, ref Utf8FaunaReader reader
 
     public override void Serialize(MappingContext context, Utf8FaunaWriter writer, object? o)
     {
-        throw new NotImplementedException();
+        DynamicSerializer.Singleton.Serialize(context, writer, o);
     }
 
     private object CreateInstance() => Activator.CreateInstance(_info.Type)!;

diff --git a/Fauna/Serialization/Serializers/DictionarySerializer.cs b/Fauna/Serialization/Serializers/DictionarySerializer.cs
@@ -35,6 +35,6 @@ public override Dictionary<string, T> Deserialize(MappingContext context, ref Ut
 
     public override void Serialize(MappingContext context, Utf8FaunaWriter writer, object? o)
     {
-        throw new NotImplementedException();
+        DynamicSerializer.Singleton.Serialize(context, writer, o);
     }
 }
diff --git a/Fauna/Serialization/Serializers/DocumentSerializer.cs b/Fauna/Serialization/Serializers/DocumentSerializer.cs
@@ -20,7 +20,7 @@ public override T Deserialize(MappingContext context, ref Utf8FaunaReader reader
 
     public override void Serialize(MappingContext context, Utf8FaunaWriter writer, object? o)
     {
-        throw new NotImplementedException();
+        DynamicSerializer.Singleton.Serialize(context, writer, o);
     }
 
     private T DeserializeDocument(MappingContext context, ref Utf8FaunaReader reader)

diff --git a/Fauna/Serialization/Serializers/ListSerializer.cs b/Fauna/Serialization/Serializers/ListSerializer.cs
@@ -38,6 +38,6 @@ public override List<T> Deserialize(MappingContext context, ref Utf8FaunaReader
 
     public override void Serialize(MappingContext context, Utf8FaunaWriter writer, object? o)
     {
-        throw new NotImplementedException();
+        DynamicSerializer.Singleton.Serialize(context, writer, o);
     }
 }
diff --git a/Fauna/Serialization/Serializers/ModuleSerializer.cs b/Fauna/Serialization/Serializers/ModuleSerializer.cs
@@ -15,6 +15,6 @@ public override Module Deserialize(MappingContext context, ref Utf8FaunaReader r
 
     public override void Serialize(MappingContext context, Utf8FaunaWriter writer, object? o)
     {
-        throw new NotImplementedException();
+        DynamicSerializer.Singleton.Serialize(context, writer, o);
     }
 }
diff --git a/Fauna/Serialization/Serializers/NullableDocumentSerializer.cs b/Fauna/Serialization/Serializers/NullableDocumentSerializer.cs
@@ -40,6 +40,6 @@ public override NullableDocument<T> Deserialize(MappingContext context, ref Utf8
 
     public override void Serialize(MappingContext context, Utf8FaunaWriter writer, object? o)
     {
-        throw new NotImplementedException();
+        DynamicSerializer.Singleton.Serialize(context, writer, o);
     }
 }
diff --git a/Fauna/Serialization/Serializers/NullableSerializer.cs b/Fauna/Serialization/Serializers/NullableSerializer.cs
@@ -23,6 +23,6 @@ public NullableSerializer(ISerializer<T> inner)
 
     public override void Serialize(MappingContext context, Utf8FaunaWriter writer, object? o)
     {
-        throw new NotImplementedException();
+        DynamicSerializer.Singleton.Serialize(context, writer, o);
     }
 }
diff --git a/Fauna/Serialization/Serializers/NullableStructSerializer.cs b/Fauna/Serialization/Serializers/NullableStructSerializer.cs
@@ -23,6 +23,6 @@ public NullableStructSerializer(ISerializer<T> inner)
 
     public override void Serialize(MappingContext context, Utf8FaunaWriter writer, object? o)
     {
-        throw new NotImplementedException();
+        DynamicSerializer.Singleton.Serialize(context, writer, o);
     }
 }
diff --git a/Fauna/Serialization/Serializers/PageSerializer.cs b/Fauna/Serialization/Serializers/PageSerializer.cs
@@ -63,6 +63,6 @@ public override Page<T> Deserialize(MappingContext context, ref Utf8FaunaReader
 
     public override void Serialize(MappingContext context, Utf8FaunaWriter writer, object? o)
     {
-        throw new NotImplementedException();
+        DynamicSerializer.Singleton.Serialize(context, writer, o);
     }
 }