FaCodec a15 Equinox a20

Author: bartelink

src/Propulsion.CosmosStore/CosmosStoreSink.fs

@@ -32,7 +32,7 @@ module private Impl =
 #else
     module StreamSpan =
 
-        let toNativeEventBody (x: EventBody): Equinox.CosmosStore.Core.EncodedBody = FsCodec.SystemTextJson.Encoding.OfEncodedUtf8 x
+        let toNativeEventBody (x: EventBody): Equinox.CosmosStore.Core.EncodedBody = FsCodec.SystemTextJson.Encoding.OfUtf8Encoded x
 #endif
 
 module Internal =

src/Propulsion.CosmosStore/Propulsion.CosmosStore.fsproj

@@ -21,8 +21,8 @@
   <ItemGroup>
     <PackageReference Include="MinVer" Version="5.0.0" PrivateAssets="All" />
 
-    <PackageReference Include="Equinox.CosmosStore" Version="4.1.0-alpha.19" />
-    <PackageReference Include="FsCodec.SystemTextJson" Version="3.0.4-alpha.0.14" />
+    <PackageReference Include="Equinox.CosmosStore" Version="4.1.0-alpha.20" />
+    <PackageReference Include="FsCodec.SystemTextJson" Version="3.0.4-alpha.0.15" />
   </ItemGroup>
 
   <ItemGroup>

src/Propulsion.CosmosStore3/Propulsion.CosmosStore3.fsproj

@@ -39,7 +39,7 @@
     <PackageReference Include="MinVer" Version="5.0.0" PrivateAssets="All" />
 
     <PackageReference Include="Equinox.CosmosStore" Version="[3.0.7, 3.99.0]" />
-    <PackageReference Include="FsCodec" Version="3.0.4-alpha.0.14" />
+    <PackageReference Include="FsCodec" Version="3.0.4-alpha.0.15" />
     <PackageReference Include="FSharp.Control.TaskSeq" Version="0.4.0" />
     <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.27.0" ExcludeAssets="contentfiles" />
   </ItemGroup>

src/Propulsion.DynamoStore/Propulsion.DynamoStore.fsproj

@@ -27,7 +27,7 @@
       <PackageReference Include="MinVer" Version="5.0.0" PrivateAssets="All" />
 
       <PackageReference Include="Equinox.DynamoStore" Version="4.0.0" />
-      <PackageReference Include="FsCodec.SystemTextJson" Version="3.0.4-alpha.0.14" />
+      <PackageReference Include="FsCodec.SystemTextJson" Version="3.0.4-alpha.0.15" />
     </ItemGroup>
 
     <ItemGroup>

src/Propulsion.MemoryStore/MemoryStoreSource.fs

@@ -125,7 +125,7 @@ and MemoryStoreMonitor internal (log: Serilog.ILogger, positions: TranchePositio
 
 /// Coordinates forwarding of a VolatileStore's Committed events to a supplied Sink
 /// Supports awaiting the (asynchronous) handling by the Sink of all Committed events from a given point in time
-type MemoryStoreSource(log, store: Equinox.MemoryStore.VolatileStore<FsCodec.EncodedBody>, categoryFilter, sink) =
-    inherit MemoryStoreSource<FsCodec.EncodedBody>(log, store, categoryFilter, id, sink)
+type MemoryStoreSource(log, store: Equinox.MemoryStore.VolatileStore<FsCodec.Encoded>, categoryFilter, sink) =
+    inherit MemoryStoreSource<FsCodec.Encoded>(log, store, categoryFilter, id, sink)
     new(log, store, categories, sink) =
         MemoryStoreSource(log, store, (fun x -> Array.contains x categories), sink)

src/Propulsion.SqlStreamStore/SqlStreamStoreSource.fs

@@ -1,14 +1,12 @@
 namespace Propulsion.SqlStreamStore
 
-module EncodedBody = let bytes ((_t, d): FsCodec.EncodedBody) = d.Length
-
 module private Impl =
 
     let private toStreamEvent (dataJson: string) struct (sn, msg: SqlStreamStore.Streams.StreamMessage): Propulsion.Sinks.StreamEvent =
         let c = msg.Type
         let d = dataJson |> NotNull.map System.Text.Encoding.UTF8.GetBytes |> FsCodec.Encoding.OfBlob
         let m = msg.JsonMetadata |> NotNull.map System.Text.Encoding.UTF8.GetBytes |> FsCodec.Encoding.OfBlob
-        let sz = c.Length + EncodedBody.bytes d + EncodedBody.bytes m
+        let sz = c.Length + FsCodec.Encoding.ByteCount d + FsCodec.Encoding.ByteCount m
         sn, FsCodec.Core.TimelineEvent.Create(msg.StreamVersion, c, d, m, msg.MessageId, timestamp = System.DateTimeOffset(msg.CreatedUtc), size = sz)
     let private readWithDataAsStreamEvent (struct (_sn, msg: SqlStreamStore.Streams.StreamMessage) as m) ct = task {
         let! json = msg.GetJsonData(ct)

src/Propulsion/Propulsion.fsproj

@@ -32,7 +32,7 @@
   <ItemGroup>
     <PackageReference Include="MinVer" Version="5.0.0" PrivateAssets="All" />
 
-    <PackageReference Include="FsCodec" Version="3.0.4-alpha.0.14" />
+    <PackageReference Include="FsCodec" Version="3.0.4-alpha.0.15" />
     <!-- NOTE this transitively implies a min FSharp.Core 6.0.1 dependency (was 6.0.0 before) -->
     <PackageReference Include="FSharp.Control.TaskSeq" Version="0.4.0" />
     <PackageReference Include="MathNet.Numerics" Version="4.15.0" />

src/Propulsion/Sinks.fs

@@ -5,7 +5,7 @@ open Propulsion.Internal
 open System
 
 /// Canonical Data/Meta type supplied by the majority of Sources
-type EventBody = FsCodec.EncodedBody
+type EventBody = FsCodec.Encoded
 
 /// Timeline Event with Data/Meta in the default format
 type Event = FsCodec.ITimelineEvent<EventBody>

tests/Propulsion.MessageDb.Integration/Propulsion.MessageDb.Integration.fsproj

@@ -9,7 +9,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="FsCodec.SystemTextJson" Version="3.0.4-alpha.0.14" />
+        <PackageReference Include="FsCodec.SystemTextJson" Version="3.0.4-alpha.0.15" />
         <PackageReference Include="TypeShape" Version="10.0.0" />
     </ItemGroup>
     <ItemGroup>