Adopt Serde preview7 (#6)

agocke · web-flow · commit 2841ca4eb3fb · 2025-04-24T15:36:49.000-07:00
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,15 @@
+<Project>
+  <PropertyGroup>
+    <!-- Enable central package management, https://learn.microsoft.com/en-us/nuget/consume-packages/Central-Package-Management -->
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="Serde" Version="[0.8.0-preview7]" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.2" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageVersion Include="xunit" Version="2.9.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
+    <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
+    <PackageVersion Include="MessagePack" Version="3.1.0" />
+  </ItemGroup>
+</Project>
diff --git a/bench/bench.csproj b/bench/bench.csproj
@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
-    <PackageReference Include="MessagePack" Version="3.1.0" />
+    <PackageReference Include="BenchmarkDotNet" />
+    <PackageReference Include="MessagePack" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Serde.MsgPack.csproj b/src/Serde.MsgPack.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serde" Version="[0.8.0-preview5]" />
+    <PackageReference Include="Serde" />
   </ItemGroup>
 
 </Project>
diff --git a/src/reader/ArrayBufReader.cs b/src/reader/ArrayBufReader.cs
@@ -15,6 +15,6 @@ public void Advance(int count)
 
     public bool FillBuffer(int fillCount)
     {
-        return false;
+        return _offset + fillCount <= _buffer.Length;
     }
 }
diff --git a/src/reader/MsgPackReader.Collections.cs b/src/reader/MsgPackReader.Collections.cs
@@ -1,12 +1,15 @@
 
+using System.Buffers;
+
 namespace Serde.MsgPack;
 
 partial class MsgPackReader<TReader>
 {
     private struct DeserializeCollection(MsgPackReader<TReader> deserializer, bool isDict, int length) : ITypeDeserializer
     {
         private int _index;
-        int? ITypeDeserializer.SizeOpt => isDict switch {
+        int? ITypeDeserializer.SizeOpt => isDict switch
+        {
             true => length / 2,
             false => length,
         };
@@ -130,5 +133,18 @@ void ITypeDeserializer.SkipValue(ISerdeInfo info, int index)
         {
             throw new NotImplementedException();
         }
+
+        DateTimeOffset ITypeDeserializer.ReadDateTimeOffset(ISerdeInfo info, int index)
+        {
+            var next = deserializer.ReadDateTimeOffset();
+            _index++;
+            return next;
+        }
+
+        void ITypeDeserializer.ReadBytes(ISerdeInfo info, int index, IBufferWriter<byte> writer)
+        {
+            deserializer.ReadBytes(writer);
+            _index++;
+        }
     }
 }
diff --git a/src/reader/MsgPackReader.ITypeDeserializer.cs b/src/reader/MsgPackReader.ITypeDeserializer.cs
@@ -1,4 +1,6 @@
 
+using System.Buffers;
+
 namespace Serde.MsgPack;
 
 partial class MsgPackReader<TReader>
@@ -71,5 +73,13 @@ int ITypeDeserializer.TryReadIndex(ISerdeInfo map, out string? errorName)
                 return ITypeDeserializer.IndexNotFound;
             }
         }
+
+        DateTimeOffset ITypeDeserializer.ReadDateTimeOffset(ISerdeInfo info, int index)
+            => deserializer.ReadDateTimeOffset();
+
+        void ITypeDeserializer.ReadBytes(ISerdeInfo info, int index, IBufferWriter<byte> writer)
+        {
+            deserializer.ReadBytes(writer);
+        }
     }
 }
diff --git a/src/reader/MsgPackReader.cs b/src/reader/MsgPackReader.cs
@@ -1,8 +1,10 @@
 
 
+using System.Buffers;
 using System.Buffers.Binary;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using System.Runtime.CompilerServices;
 using System.Text;
 using Serde.IO;
@@ -349,6 +351,32 @@ private string ReadString()
         return str;
     }
 
+    public DateTimeOffset ReadDateTimeOffset()
+    {
+        return DateTime.Parse(ReadString(), styles: DateTimeStyles.RoundtripKind);
+    }
+
+    public void ReadBytes(IBufferWriter<byte> writer)
+    {
+        var b = EatByteOrThrow();
+        int length = b switch
+        {
+            0xc4 => EatByteOrThrow(),
+            0xc5 => ReadBigEndianU16(), // 16-bit length
+            0xc6 => checked((int)ReadBigEndianU32()), // 32-bit length
+            _ => throw new DeserializeException($"Expected bytes, got 0x{b:x}"),
+        };
+        if (!_reader.FillBuffer(length))
+        {
+            ThrowEof();
+        }
+        var inputSpan = _reader.Span[..length];
+        var outSpan = writer.GetSpan(length);
+        inputSpan.CopyTo(outSpan);
+        _reader.Advance(length);
+        writer.Advance(length);
+    }
+
     private ReadOnlySpan<byte> ReadUtf8Span()
     {
         var b = EatByteOrThrow();
diff --git a/src/writer/MsgPackWriter.EnumSerializer.cs b/src/writer/MsgPackWriter.EnumSerializer.cs
@@ -35,5 +35,9 @@ public void WriteValue<T>(ISerdeInfo typeInfo, int index, T value, ISerialize<T>
         public void WriteU16(ISerdeInfo typeInfo, int index, ushort u16) => writer.WriteU16(u16);
         public void WriteU32(ISerdeInfo typeInfo, int index, uint u32) => writer.WriteU32(u32);
         public void WriteU64(ISerdeInfo typeInfo, int index, ulong u64) => writer.WriteU64(u64);
+        public void WriteDateTimeOffset(ISerdeInfo typeInfo, int index, DateTimeOffset dateTimeOffset)
+            => writer.WriteDateTimeOffset(dateTimeOffset);
+        public void WriteBytes(ISerdeInfo typeInfo, int index, ReadOnlyMemory<byte> bytes)
+            => writer.WriteBytes(bytes);
     }
 }
diff --git a/src/writer/MsgPackWriter.ISerializeCollection.cs b/src/writer/MsgPackWriter.ISerializeCollection.cs
@@ -58,5 +58,11 @@ public void WriteU8(ISerdeInfo typeInfo, int index, byte b)
         public void WriteValue<T>(ISerdeInfo typeInfo, int index, T value, ISerialize<T> serialize)
             where T : class?
             => serialize.Serialize(value, writer);
+
+        public void WriteDateTimeOffset(ISerdeInfo typeInfo, int index, DateTimeOffset dateTimeOffset)
+            => writer.WriteDateTimeOffset(dateTimeOffset);
+
+        public void WriteBytes(ISerdeInfo typeInfo, int index, ReadOnlyMemory<byte> bytes)
+            => writer.WriteBytes(bytes);
     }
 }
diff --git a/src/writer/MsgPackWriter.ISerializeType.cs b/src/writer/MsgPackWriter.ISerializeType.cs
@@ -111,4 +111,16 @@ void ITypeSerializer.WriteNull(ISerdeInfo typeInfo, int index)
         WritePropertyName(typeInfo, index);
         WriteNull();
     }
+
+    void ITypeSerializer.WriteDateTimeOffset(ISerdeInfo typeInfo, int index, DateTimeOffset dt)
+    {
+        WritePropertyName(typeInfo, index);
+        WriteDateTimeOffset(dt);
+    }
+
+    void ITypeSerializer.WriteBytes(ISerdeInfo typeInfo, int index, ReadOnlyMemory<byte> bytes)
+    {
+        WritePropertyName(typeInfo, index);
+        WriteBytes(bytes);
+    }
 }
diff --git a/src/writer/MsgPackWriter.cs b/src/writer/MsgPackWriter.cs
@@ -137,6 +137,43 @@ public void WriteNull()
         _out.Add(0xc0);
     }
 
+    public void WriteDateTimeOffset(DateTimeOffset dt)
+    {
+        WriteString(dt.ToString("O"));
+    }
+
+    public void WriteBytes(ReadOnlyMemory<byte> bytes)
+    {
+        byte code = bytes.Length switch
+        {
+            <= 0xff => 0xc4,
+            <= 0xffff => 0xc5,
+            _ => 0xc6
+        };
+        var prefixLen = code switch
+        {
+            0xc4 => 2,
+            0xc5 => 3,
+            _ => 5
+        };
+        var span = _out.GetAppendSpan(prefixLen + bytes.Length);
+        _out.Count += prefixLen + bytes.Length;
+        span[0] = code;
+        switch (prefixLen)
+        {
+            case 2:
+                span[1] = (byte)bytes.Length;
+                break;
+            case 3:
+                WriteBigEndian((ushort)bytes.Length);
+                break;
+            case 5:
+                WriteBigEndian((uint)bytes.Length);
+                break;
+        }
+        bytes.Span.CopyTo(span[prefixLen..]);
+    }
+
     public void WriteI8(sbyte b) => WriteI64(b);
 
     private static readonly Encoding _utf8 = new UTF8Encoding(encoderShouldEmitUTF8Identifier: false, throwOnInvalidBytes: true);
diff --git a/tests/RoundTripTests.cs b/tests/RoundTripTests.cs
@@ -181,6 +181,13 @@ public void TestFloat()
         AssertRoundTrip(float.PositiveInfinity, F32Proxy.Instance);
     }
 
+    [Fact]
+    public void TestBytes()
+    {
+        var bytes = new byte[] { 1, 2, 3, 4, 5 };
+        AssertRoundTrip(bytes, ByteArrayProxy.Instance);
+    }
+
     private static void AssertRoundTrip<T>(T expected)
         where T : ISerializeProvider<T>, IDeserializeProvider<T>, IEquatable<T>
     {
diff --git a/tests/Serde.MsgPack.Tests.csproj b/tests/Serde.MsgPack.Tests.csproj
@@ -8,12 +8,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.2" />
-    <PackageReference Include="MessagePack" Version="2.5.192" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="Serde" Version="[0.8.0-preview5]" />
-    <PackageReference Include="xunit" Version="2.9.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="MessagePack" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Serde" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@ public void Advance(int count)`
`15`	`15`
`16`	`16`	`public bool FillBuffer(int fillCount)`
`17`	`17`	`{`
`18`		`- return false;`
	`18`	`+ return _offset + fillCount <= _buffer.Length;`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,15 @@`
`1`	`1`
	`2`	`+using System.Buffers;`
	`3`	`+`
`2`	`4`	`namespace Serde.MsgPack;`
`3`	`5`
`4`	`6`	`partial class MsgPackReader<TReader>`
`5`	`7`	`{`
`6`	`8`	`private struct DeserializeCollection(MsgPackReader<TReader> deserializer, bool isDict, int length) : ITypeDeserializer`
`7`	`9`	`{`
`8`	`10`	`private int _index;`
`9`		`- int? ITypeDeserializer.SizeOpt => isDict switch {`
	`11`	`+ int? ITypeDeserializer.SizeOpt => isDict switch`
	`12`	`+ {`
`10`	`13`	`true => length / 2,`
`11`	`14`	`false => length,`
`12`	`15`	`};`
`@@ -130,5 +133,18 @@ void ITypeDeserializer.SkipValue(ISerdeInfo info, int index)`
`130`	`133`	`{`
`131`	`134`	`throw new NotImplementedException();`
`132`	`135`	`}`
	`136`	`+`
	`137`	`+ DateTimeOffset ITypeDeserializer.ReadDateTimeOffset(ISerdeInfo info, int index)`
	`138`	`+ {`
	`139`	`+ var next = deserializer.ReadDateTimeOffset();`
	`140`	`+ _index++;`
	`141`	`+ return next;`
	`142`	`+ }`
	`143`	`+`
	`144`	`+ void ITypeDeserializer.ReadBytes(ISerdeInfo info, int index, IBufferWriter<byte> writer)`
	`145`	`+ {`
	`146`	`+ deserializer.ReadBytes(writer);`
	`147`	`+ _index++;`
	`148`	`+ }`
`133`	`149`	`}`
`134`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`
	`2`	`+using System.Buffers;`
	`3`	`+`
`2`	`4`	`namespace Serde.MsgPack;`
`3`	`5`
`4`	`6`	`partial class MsgPackReader<TReader>`
`@@ -71,5 +73,13 @@ int ITypeDeserializer.TryReadIndex(ISerdeInfo map, out string? errorName)`
`71`	`73`	`return ITypeDeserializer.IndexNotFound;`
`72`	`74`	`}`
`73`	`75`	`}`
	`76`	`+`
	`77`	`+ DateTimeOffset ITypeDeserializer.ReadDateTimeOffset(ISerdeInfo info, int index)`
	`78`	`+ => deserializer.ReadDateTimeOffset();`
	`79`	`+`
	`80`	`+ void ITypeDeserializer.ReadBytes(ISerdeInfo info, int index, IBufferWriter<byte> writer)`
	`81`	`+ {`
	`82`	`+ deserializer.ReadBytes(writer);`
	`83`	`+ }`
`74`	`84`	`}`
`75`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,5 +35,9 @@ public void WriteValue<T>(ISerdeInfo typeInfo, int index, T value, ISerialize<T>`
`35`	`35`	`public void WriteU16(ISerdeInfo typeInfo, int index, ushort u16) => writer.WriteU16(u16);`
`36`	`36`	`public void WriteU32(ISerdeInfo typeInfo, int index, uint u32) => writer.WriteU32(u32);`
`37`	`37`	`public void WriteU64(ISerdeInfo typeInfo, int index, ulong u64) => writer.WriteU64(u64);`
	`38`	`+ public void WriteDateTimeOffset(ISerdeInfo typeInfo, int index, DateTimeOffset dateTimeOffset)`
	`39`	`+ => writer.WriteDateTimeOffset(dateTimeOffset);`
	`40`	`+ public void WriteBytes(ISerdeInfo typeInfo, int index, ReadOnlyMemory<byte> bytes)`
	`41`	`+ => writer.WriteBytes(bytes);`
`38`	`42`	`}`
`39`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,5 +58,11 @@ public void WriteU8(ISerdeInfo typeInfo, int index, byte b)`
`58`	`58`	`public void WriteValue<T>(ISerdeInfo typeInfo, int index, T value, ISerialize<T> serialize)`
`59`	`59`	`where T : class?`
`60`	`60`	`=> serialize.Serialize(value, writer);`
	`61`	`+`
	`62`	`+ public void WriteDateTimeOffset(ISerdeInfo typeInfo, int index, DateTimeOffset dateTimeOffset)`
	`63`	`+ => writer.WriteDateTimeOffset(dateTimeOffset);`
	`64`	`+`
	`65`	`+ public void WriteBytes(ISerdeInfo typeInfo, int index, ReadOnlyMemory<byte> bytes)`
	`66`	`+ => writer.WriteBytes(bytes);`
`61`	`67`	`}`
`62`	`68`	`}`