Refactors

src/SqlStreamStore.FSharp.Postgres/Create.fs

@@ -1,6 +1,6 @@
 namespace SqlStreamStore.FSharp.Postgres
 
-open Prelude.ErrorHandling
+open Prelude
 open SqlStreamStore
 
 type PostgresConfig =
@@ -25,9 +25,6 @@ type PostgresConfig =
 
 module Create =
 
-    /// Represents an in-memory implementation of a stream store. Use for testing or high/speed + volatile scenarios.
-    let inMemoryStore : unit -> InMemoryStreamStore = fun _ -> new InMemoryStreamStore()
-
     let postgresStore (config: PostgresConfig) (schema: string option) : PostgresStreamStore =
 
         let storeSettings =

src/SqlStreamStore.FSharp.Postgres/SqlStreamStore.FSharp.Postgres.fsproj

@@ -12,17 +12,16 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <Compile Include="Create.fs"/>
+        <Compile Include="Create.fs" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Update="FSharp.Core" Version="6.0.*"/>
-        <PackageReference Include="FSharp.Core" Version="6.0.*"/>
-        <PackageReference Include="SqlStreamStore.Postgres" Version="1.2.0-beta.8"/>
+        <PackageReference Include="FSharp.Prelude" Version="6.0.0-beta-3" />
+        <PackageReference Include="SqlStreamStore.Postgres" Version="1.2.0-beta.8" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\SqlStreamStore.FSharp\SqlStreamStore.FSharp.fsproj"/>
+        <ProjectReference Include="..\SqlStreamStore.FSharp\SqlStreamStore.FSharp.fsproj" />
     </ItemGroup>
 
 </Project>

src/SqlStreamStore.FSharp/Append.fs

@@ -1,6 +1,6 @@
 namespace SqlStreamStore.FSharp
 
-open Prelude.ErrorHandling
+open Prelude
 open System.Threading
 open SqlStreamStore
 
@@ -13,7 +13,7 @@ module Append =
     let streamMessages'
         (messages: NewStreamMessage list)
         (appendOptions: AppendOption list)
-        (Stream stream: Stream)
+        (stream: Stream)
         : AsyncResult<Streams.AppendResult, exn> =
 
         let mutable expectedVersion = Streams.ExpectedVersion.Any

src/SqlStreamStore.FSharp/Connect.fs

@@ -2,14 +2,12 @@ namespace SqlStreamStore.FSharp
 
 open SqlStreamStore
 
-type private StreamInternal =
-    {
-        store: IStreamStore
-        streamId: string
-    }
-
-type Stream = private Stream of StreamInternal
+type Stream =
+    private
+        {
+            store: IStreamStore
+            streamId: string
+        }
 
 module Connect =
-    let toStream streamId store =
-        Stream { streamId = streamId; store = store }
+    let toStream streamId store = { streamId = streamId; store = store }

src/SqlStreamStore.FSharp/Extensions.fs

@@ -1,10 +1,9 @@
 namespace SqlStreamStore.FSharp
 
 open System.Threading
-open Prelude.ErrorHandling
+open Prelude
 open SqlStreamStore
 open SqlStreamStore.Streams
-open System
 
 [<AutoOpen>]
 module SqlStreamExtensions =
@@ -172,13 +171,13 @@ module SqlStreamExtensions =
 
             let maxAge' =
                 match maxAge with
-                | None -> Nullable()
-                | Some age -> Nullable age
+                | None -> System.Nullable()
+                | Some age -> System.Nullable age
 
             let maxCount' =
                 match maxCount with
-                | None -> Nullable()
-                | Some count -> Nullable count
+                | None -> System.Nullable()
+                | Some count -> System.Nullable count
 
             let metadataJson' = defaultArg metadataJson null
 

src/SqlStreamStore.FSharp/Get.fs

@@ -1,72 +1,67 @@
 namespace SqlStreamStore.FSharp
 
-open Prelude.ErrorHandling
+open Prelude
 open SqlStreamStore.Streams
 
 module Get =
 
-    // A function to help wit type inference in this module
-    let private curriedMap: (ReadStreamPage -> 'a) -> AsyncResult<ReadStreamPage, exn> -> AsyncResult<'a, exn> =
-        AsyncResult.map
+    let messages: AsyncResult<ReadStreamPage, exn> -> AsyncResult<StreamMessage list, exn> =
+        AsyncResult.map (fun page -> page.Messages |> Array.toList)
 
-    let messages =
-        curriedMap (fun page -> page.Messages |> Array.toList)
-
-    let messagesData =
+    let messagesData: AsyncResult<ReadStreamPage, exn> -> AsyncResult<string list, exn> =
         messages
-        >> AsyncResult.bind (AsyncResult.mapM (fun msg -> msg.GetJsonData()))
+        >> AsyncResult.bind (AsyncResult.traverse (fun msg -> msg.GetJsonData()))
 
-    let messagesDataAs<'data> =
+    let messagesDataAs<'data> : AsyncResult<ReadStreamPage, exn> -> AsyncResult<'data list, exn> =
         messages
-        >> AsyncResult.bind (AsyncResult.mapM (fun msg -> msg.GetJsonDataAs<'data>()))
+        >> AsyncResult.bind (AsyncResult.traverse (fun msg -> msg.GetJsonDataAs<'data>()))
 
-    let status = curriedMap (fun page -> page.Status)
+    let status: AsyncResult<ReadStreamPage, exn> -> AsyncResult<PageReadStatus, exn> =
+        AsyncResult.map (fun page -> page.Status)
 
-    let isEnd = curriedMap (fun page -> page.IsEnd)
+    let isEnd: AsyncResult<ReadStreamPage, exn> -> AsyncResult<bool, exn> = AsyncResult.map (fun page -> page.IsEnd)
 
-    let readDirection =
-        curriedMap (fun page -> page.ReadDirection)
+    let readDirection: AsyncResult<ReadStreamPage, exn> -> AsyncResult<ReadDirection, exn> =
+        AsyncResult.map (fun page -> page.ReadDirection)
 
-    let streamId = curriedMap (fun page -> page.StreamId)
+    let streamId: AsyncResult<ReadStreamPage, exn> -> AsyncResult<string, exn> =
+        AsyncResult.map (fun page -> page.StreamId)
 
-    let fromStreamVersion =
-        curriedMap (fun page -> page.FromStreamVersion)
+    let fromStreamVersion: AsyncResult<ReadStreamPage, exn> -> AsyncResult<int, exn> =
+        AsyncResult.map (fun page -> page.FromStreamVersion)
 
-    let lastStreamPosition =
-        curriedMap (fun page -> page.LastStreamPosition)
+    let lastStreamPosition: AsyncResult<ReadStreamPage, exn> -> AsyncResult<int64, exn> =
+        AsyncResult.map (fun page -> page.LastStreamPosition)
 
-    let nextStreamVersion =
-        curriedMap (fun page -> page.NextStreamVersion)
+    let nextStreamVersion: AsyncResult<ReadStreamPage, exn> -> AsyncResult<int, exn> =
+        AsyncResult.map (fun page -> page.NextStreamVersion)
 
-    let nextStreamPage =
+    let nextStreamPage: AsyncResult<ReadStreamPage, exn> -> AsyncResult<ReadStreamPage, exn> =
         AsyncResult.bind (fun (page: ReadStreamPage) -> page.ReadNext |> AsyncResult.ofTask)
 
 module GetAll =
 
-    // A function to help wit type inference in this module
-    let private curriedMap: (ReadAllPage -> 'a) -> AsyncResult<ReadAllPage, exn> -> AsyncResult<'a, exn> =
-        AsyncResult.map
-
-    let messages =
-        curriedMap (fun page -> page.Messages |> Array.toList)
+    let messages: AsyncResult<ReadAllPage, exn> -> AsyncResult<StreamMessage list, exn> =
+        AsyncResult.map (fun page -> page.Messages |> Array.toList)
 
-    let messagesData =
+    let messagesData: AsyncResult<ReadAllPage, exn> -> AsyncResult<string list, exn> =
         messages
-        >> AsyncResult.bind (AsyncResult.mapM (fun msg -> msg.GetJsonData()))
+        >> AsyncResult.bind (AsyncResult.traverse (fun msg -> msg.GetJsonData()))
 
-    let messagesDataAs<'data> =
+    let messagesDataAs<'data> : AsyncResult<ReadAllPage, exn> -> AsyncResult<'data list, exn> =
         messages
-        >> AsyncResult.bind (AsyncResult.mapM (fun msg -> msg.GetJsonDataAs<'data>()))
+        >> AsyncResult.bind (AsyncResult.traverse (fun msg -> msg.GetJsonDataAs<'data>()))
 
-    let direction = curriedMap (fun page -> page.Direction)
+    let direction: AsyncResult<ReadAllPage, exn> -> AsyncResult<ReadDirection, exn> =
+        AsyncResult.map (fun page -> page.Direction)
 
-    let fromPosition =
-        curriedMap (fun page -> page.FromPosition)
+    let fromPosition: AsyncResult<ReadAllPage, exn> -> AsyncResult<int64, exn> =
+        AsyncResult.map (fun page -> page.FromPosition)
 
-    let isEnd = curriedMap (fun page -> page.IsEnd)
+    let isEnd: AsyncResult<ReadAllPage, exn> -> AsyncResult<bool, exn> = AsyncResult.map (fun page -> page.IsEnd)
 
-    let nextPosition =
-        curriedMap (fun page -> page.NextPosition)
+    let nextPosition: AsyncResult<ReadAllPage, exn> -> AsyncResult<int64, exn> =
+        AsyncResult.map (fun page -> page.NextPosition)
 
-    let nextAllStreamPage =
+    let nextAllStreamPage: AsyncResult<ReadAllPage, exn> -> AsyncResult<ReadAllPage, exn> =
         AsyncResult.bind (fun (page: ReadAllPage) -> page.ReadNext |> AsyncResult.ofTask)

src/SqlStreamStore.FSharp/Read.fs

@@ -1,6 +1,6 @@
 namespace SqlStreamStore.FSharp
 
-open Prelude.ErrorHandling
+open Prelude
 open System.Threading
 open SqlStreamStore
 open SqlStreamStore.Streams
@@ -33,7 +33,7 @@ type ReadAllOption =
 
 module Read =
 
-    let partial' (readOptions: ReadPartialOption list) (Stream stream: Stream) : AsyncResult<ReadStreamPage, exn> =
+    let partial' (readOptions: ReadPartialOption list) (stream: Stream) : AsyncResult<ReadStreamPage, exn> =
 
         let mutable cancellationToken = Unchecked.defaultof<CancellationToken>
         let mutable fromVersionInclusive: int option = None

src/SqlStreamStore.FSharp/SqlStreamStore.FSharp.fsproj

@@ -14,22 +14,20 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <Compile Include="Extensions.fs"/>
-        <Compile Include="NewStreamMessage.fs"/>
-        <Compile Include="Connect.fs"/>
-        <Compile Include="Read.fs"/>
-        <Compile Include="Get.fs"/>
-        <Compile Include="Subscribe.fs"/>
-        <Compile Include="Append.fs"/>
-        <Compile Include="Create.fs"/>
+        <Compile Include="Extensions.fs" />
+        <Compile Include="NewStreamMessage.fs" />
+        <Compile Include="Connect.fs" />
+        <Compile Include="Read.fs" />
+        <Compile Include="Get.fs" />
+        <Compile Include="Subscribe.fs" />
+        <Compile Include="Append.fs" />
+        <Compile Include="Create.fs" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Update="FSharp.Core" Version="6.0.*"/>
-        <PackageReference Include="FSharp.Core" Version="6.0.*"/>
-        <PackageReference Include="FSharp.Prelude" Version="5.0.*"/>
-        <PackageReference Include="Npgsql" Version="5.0.*"/>
-        <PackageReference Include="SqlStreamStore" Version="1.2.0-beta.8"/>
+        <PackageReference Include="FSharp.Prelude" Version="6.0.0-beta-3" />
+        <PackageReference Include="Npgsql" Version="5.0.*" />
+        <PackageReference Include="SqlStreamStore" Version="1.2.0-beta.8" />
     </ItemGroup>
 
 </Project>

src/SqlStreamStore.FSharp/Subscribe.fs

@@ -1,6 +1,6 @@
 namespace SqlStreamStore.FSharp
 
-open Prelude.ErrorHandling
+open Prelude
 open SqlStreamStore
 open SqlStreamStore.Streams
 open SqlStreamStore.Subscriptions
@@ -27,7 +27,7 @@ module Subscribe =
         (continueAfterVersion: int)
         (streamMessageReceived: IStreamSubscription -> StreamMessage -> CancellationToken -> AsyncResult<_, _>)
         (streamSubOptions: StreamSubOption list)
-        (Stream stream: Stream)
+        (stream: Stream)
         : IStreamSubscription =
 
         let mutable hasCaughtUp = null