Skip to content

Commit 60584b6

Browse files
bartelinkbartelink
committed
chore!: Target FsCodec 3.0.0-rc.14
1 parent 551d321 commit 60584b6

File tree

27 files changed

+68
-73
lines changed

27 files changed

+68
-73
lines changed

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<PropertyGroup>
33
<Authors>@jet @moneylion @bartelink @eiriktsarpalis and contributors</Authors>
44
<Company>Jet.com</Company>
5-
<Description>Sleek, composable event sourcing componentry</Description>
5+
<Description>Efficient event sourced decisions and data</Description>
66
<PackageProjectUrl>https://github.com/jet/equinox</PackageProjectUrl>
77
<PackageTags>eventsourcing eventstore fsharp fscodec cosmosdb dynamodb eventstoredb postgres sqlserver</PackageTags>
8-
<PackageLicense>Apache-2.0</PackageLicense>
8+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
99
<Copyright>Copyright © 2016-23</Copyright>
1010

1111
<WarningLevel>5</WarningLevel>

‎azure-pipelines.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,6 @@ jobs:
4848
pool:
4949
vmImage: 'macOS-latest'
5050
steps:
51-
- task: UseDotNet@2
52-
displayName: 'Install .NET Core sdk'
53-
inputs:
54-
packageType: sdk
55-
version: 6.x
5651
- script: dotnet test build.proj -v n
5752
displayName: dotnet test build.proj
5853
env:

‎samples/Store/Domain.Tests/Domain.Tests.fsproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="FsCheck.xUnit" Version="3.0.0-beta2" />
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
20+
<PackageReference Include="FsCheck.xUnit" Version="3.0.0-rc1" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
2222
<PackageReference Include="xunit" Version="2.4.2" />
23-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
23+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
2424
<PrivateAssets>all</PrivateAssets>
2525
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2626
</PackageReference>

‎samples/Store/Domain/Domain.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<ItemGroup>
1818
<PackageReference Include="FSharp.Core" Version="6.0.7" ExcludeAssets="contentfiles" />
1919

20-
<PackageReference Include="FsCodec.NewtonsoftJson" Version="3.0.0-rc.13" />
21-
<PackageReference Include="FsCodec.SystemTextJson" Version="3.0.0-rc.13" />
20+
<PackageReference Include="FsCodec.NewtonsoftJson" Version="3.0.0-rc.14" />
21+
<PackageReference Include="FsCodec.SystemTextJson" Version="3.0.0-rc.14" />
2222

2323
<ProjectReference Include="..\..\..\src\Equinox\Equinox.fsproj" />
2424
</ItemGroup>

‎samples/Store/Integration/CodecIntegration.fs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ type SimpleDu =
2828
interface IUnionContract
2929

3030
let render = function
31-
| EventA { id = id } -> sprintf """{"id":"%O"}""" id
32-
| EventB { age = None } -> sprintf "{\"age\":null}"
33-
| EventB { age = Some age } -> sprintf """{"age":%d}""" age
34-
| EventC { value = I { i = i } } -> sprintf """{"value":{"case":"I","i":%d}}""" i
35-
| EventC { value = S { maybeI = None } } -> sprintf """{"value":{"case":"S","maybeI":null}}"""
36-
| EventC { value = S { maybeI = Some i } } -> sprintf """{"value":{"case":"S","maybeI":%d}}""" i
31+
| EventA { id = id } -> $"""{{"id":"{id}"}}"""
32+
| EventB { age = None } -> "{\"age\":null}"
33+
| EventB { age = Some age } -> $"""{{"age":%d{age}}}"""
34+
| EventC { value = I { i = i } } -> $"""{{"value":{{"case":"I","i":%d{i}}}}}"""
35+
| EventC { value = S { maybeI = None } } -> """{"value":{"case":"S","maybeI":null}}"""
36+
| EventC { value = S { maybeI = Some i } } -> $"""{{"value":{{"case":"S","maybeI":%d{i}}}}}"""
3737
| EventD -> null
3838
//| EventE i -> string i
3939
//| EventF s -> Newtonsoft.Json.JsonConvert.SerializeObject s
@@ -46,5 +46,5 @@ let ``Can roundtrip, rendering correctly`` (x: SimpleDu) =
4646
let d = serialized.Data
4747
render x =! if d.IsEmpty then null else System.Text.Encoding.UTF8.GetString(d.Span)
4848
let adapted = FsCodec.Core.TimelineEvent.Create(-1L, serialized)
49-
let deserialized = codec.TryDecode adapted |> ValueOption.get
49+
let deserialized = codec.Decode adapted |> ValueOption.get
5050
deserialized =! x

‎samples/Store/Integration/Integration.fsproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="FsCheck.xUnit" Version="3.0.0-beta2" />
29-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
28+
<PackageReference Include="FsCheck.xUnit" Version="3.0.0-rc1" />
29+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
3030
<PackageReference Include="Serilog.Sinks.Seq" Version="5.2.0" />
3131
<PackageReference Include="unquote" Version="6.1.0" />
3232
<PackageReference Include="xunit" Version="2.4.2" />
33-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
33+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
3434
<PrivateAssets>all</PrivateAssets>
3535
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3636
</PackageReference>

‎samples/Tutorial/Tutorial.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
<ItemGroup>
3030
<PackageReference Include="MinVer" Version="4.2.0" PrivateAssets="All" />
31-
<PackageReference Include="FsCodec.SystemTextJson" Version="3.0.0-rc.13" />
31+
<PackageReference Include="FsCodec.SystemTextJson" Version="3.0.0-rc.14" />
3232
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
3333
<PackageReference Include="Serilog.Sinks.Seq" Version="5.2.0" />
3434
</ItemGroup>

‎src/Equinox.CosmosStore/CosmosStore.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,13 +1071,13 @@ type internal StoreCategory<'event, 'state, 'req>
10711071
checkUnfolds, compressUnfolds, mapUnfolds: Choice<unit, 'event[] -> 'state -> 'event[], 'event[] -> 'state -> 'event[] * 'event[]>) =
10721072
let fold s xs = (fold : Func<'state, 'event[], 'state>).Invoke(s, xs)
10731073
let reload (log, streamName, (Token.Unpack pos as streamToken), state) preloaded ct: Task<struct (StreamToken * 'state)> = task {
1074-
match! store.Reload(log, (streamName, pos), (codec.TryDecode, isOrigin), ct, ?preview = preloaded) with
1074+
match! store.Reload(log, (streamName, pos), (codec.Decode, isOrigin), ct, ?preview = preloaded) with
10751075
| LoadFromTokenResult.Unchanged -> return struct (streamToken, state)
10761076
| LoadFromTokenResult.Found (token', events) -> return token', fold state events }
10771077
interface ICategory<'event, 'state, 'req> with
10781078
member _.Empty = Token.create Position.fromKnownEmpty, initial
10791079
member _.Load(log, _categoryName, _streamId, stream, _maxAge, _requireLeader, ct): Task<struct (StreamToken * 'state)> = task {
1080-
let! token, events = store.Load(log, (stream, None), (codec.TryDecode, isOrigin), checkUnfolds, ct)
1080+
let! token, events = store.Load(log, (stream, None), (codec.Decode, isOrigin), checkUnfolds, ct)
10811081
return struct (token, fold initial events) }
10821082
member _.Sync(log, _categoryName, _streamId, streamName, req, (Token.Unpack pos as streamToken), state, events, ct) = task {
10831083
let state' = fold state events

‎src/Equinox.DynamoStore/DynamoStore.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,13 +1119,13 @@ type internal StoreCategory<'event, 'state, 'req>
11191119
let fold s xs = (fold : Func<'state, 'event[], 'state>).Invoke(s, xs)
11201120
let fetch state f = task { let! token', events = f in return struct (token', fold state events) }
11211121
let reload (log, streamNam, requireLeader, (Token.Unpack pos as streamToken), state) ct: Task<struct (StreamToken * 'state)> = task {
1122-
match! store.Reload(log, (streamNam, pos), requireLeader, (codec.TryDecode, isOrigin), ct) with
1122+
match! store.Reload(log, (streamNam, pos), requireLeader, (codec.Decode, isOrigin), ct) with
11231123
| LoadFromTokenResult.Unchanged -> return struct (streamToken, state)
11241124
| LoadFromTokenResult.Found (token', events) -> return token', fold state events }
11251125
interface ICategory<'event, 'state, 'req> with
11261126
member _.Empty = Token.empty, initial
11271127
member _.Load(log, _categoryName, _streamId, streamName, _maxAge, requireLeader, ct) =
1128-
fetch initial (store.Load(log, (streamName, None), requireLeader, (codec.TryDecode, isOrigin), checkUnfolds, ct))
1128+
fetch initial (store.Load(log, (streamName, None), requireLeader, (codec.Decode, isOrigin), checkUnfolds, ct))
11291129
member _.Sync(log, _categoryName, _streamId, streamName, req, (Token.Unpack pos as streamToken), state, events, ct) = task {
11301130
let state' = fold state events
11311131
let exp, events, eventsEncoded, unfoldsEncoded =

‎src/Equinox.EventStore/EventStore.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ type private CompactionContext(eventsLen: int, capacityBeforeCompaction: int) =
440440

441441
type private StoreCategory<'event, 'state, 'req>(context: EventStoreContext, codec: FsCodec.IEventCodec<_, _, 'req>, fold, initial, access) =
442442
let fold s xs = (fold : System.Func<'state, 'event[], 'state>).Invoke(s, xs)
443-
let tryDecode (e: ResolvedEvent) = e |> UnionEncoderAdapters.encodedEventOfResolvedEvent |> codec.TryDecode
443+
let tryDecode (e: ResolvedEvent) = e |> UnionEncoderAdapters.encodedEventOfResolvedEvent |> codec.Decode
444444
let isOrigin =
445445
match access with
446446
| AccessStrategy.Unoptimized | AccessStrategy.LatestKnownEvent -> fun _ -> true

0 commit comments

Comments
 (0)