Applied suggestions of @xperiandrii

fsprojects · Dec 3, 2024 · b20fa5f · b20fa5f
1 parent 3ae142c
commit b20fa5f
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 12 deletions.
diff --git a/src/FSharp.Data.GraphQL.Server.AspNetCore/GraphQLSubscriptionsManagement.fs b/src/FSharp.Data.GraphQL.Server.AspNetCore/GraphQLSubscriptionsManagement.fs
@@ -1,6 +1,6 @@
 module internal FSharp.Data.GraphQL.Server.AspNetCore.GraphQLSubscriptionsManagement
 
-open FSharp.Data.GraphQL.Shared.Websockets
+open FSharp.Data.GraphQL.Shared.WebSockets
 
 let addSubscription
     (id : SubscriptionId, unsubscriber : SubscriptionUnsubscriber, onUnsubscribe : OnUnsubscribeAction)

diff --git a/src/FSharp.Data.GraphQL.Server.AspNetCore/GraphQLWebsocketMiddleware.fs b/src/FSharp.Data.GraphQL.Server.AspNetCore/GraphQLWebsocketMiddleware.fs
@@ -20,7 +20,7 @@ open FsToolkit.ErrorHandling
 
 open FSharp.Data.GraphQL
 open FSharp.Data.GraphQL.Execution
-open FSharp.Data.GraphQL.Shared.Websockets
+open FSharp.Data.GraphQL.Shared.WebSockets
 
 type GraphQLWebSocketMiddleware<'Root>
     (

diff --git a/src/FSharp.Data.GraphQL.Shared/FSharp.Data.GraphQL.Shared.fsproj b/src/FSharp.Data.GraphQL.Shared/FSharp.Data.GraphQL.Shared.fsproj
@@ -48,7 +48,6 @@
     <Compile Include="Helpers\MemoryCache.fs" />
     <Compile Include="Errors.fs" />
     <Compile Include="Exception.fs" />
-    <Compile Include="Websockets/Exceptions.fs" />
     <Compile Include="ValidationTypes.fs" />
     <Compile Include="AsyncVal.fs" />
     <Compile Include="Ast.fs" />
@@ -62,7 +61,7 @@
     <Compile Include="ValidationResultCache.fs" />
     <Compile Include="Parser.fs" />
     <Compile Include="GQLRequest.fs" />
-    <Compile Include="Websockets/Messages.fs" />
+    <Compile Include="WebSockets.fs" />
     <Compile Include="Serialization/JsonConverters.fs" />
     <Compile Include="Serialization/JSON.fs" />
   </ItemGroup>

diff --git a/src/FSharp.Data.GraphQL.Shared/Serialization/JsonConverters.fs b/src/FSharp.Data.GraphQL.Shared/Serialization/JsonConverters.fs
@@ -6,7 +6,7 @@ open System.Text.Json.Serialization
 
 open FSharp.Data.GraphQL
 open FSharp.Data.GraphQL.Shared
-open FSharp.Data.GraphQL.Shared.Websockets
+open FSharp.Data.GraphQL.Shared.WebSockets
 
 [<Sealed>]
 type ClientMessageConverter () =

diff --git a/...ata.GraphQL.Shared/Websockets/Messages.fs → src/FSharp.Data.GraphQL.Shared/WebSockets.fs b/...ata.GraphQL.Shared/Websockets/Messages.fs → src/FSharp.Data.GraphQL.Shared/WebSockets.fs
@@ -1,10 +1,13 @@
-namespace FSharp.Data.GraphQL.Shared.Websockets
+namespace FSharp.Data.GraphQL.Shared.WebSockets
 
 open System
 open System.Collections.Generic
 open System.Text.Json
 open FSharp.Data.GraphQL.Shared
 
+type InvalidWebsocketMessageException (explanation : string) =
+    inherit System.Exception (explanation)
+
 type SubscriptionId = string
 type SubscriptionUnsubscriber = IDisposable
 type OnUnsubscribeAction = SubscriptionId -> unit

diff --git a/src/FSharp.Data.GraphQL.Shared/Websockets/Exceptions.fs b/src/FSharp.Data.GraphQL.Shared/Websockets/Exceptions.fs
diff --git a/tests/FSharp.Data.GraphQL.Tests/AspNetCore/InvalidMessageTests.fs b/tests/FSharp.Data.GraphQL.Tests/AspNetCore/InvalidMessageTests.fs
@@ -2,7 +2,7 @@ module FSharp.Data.GraphQL.Tests.AspNetCore.InvalidMessageTests
 
 open System.Text.Json
 open Xunit
-open FSharp.Data.GraphQL.Shared.Websockets
+open FSharp.Data.GraphQL.Shared.WebSockets
 
 let toClientMessage (theInput : string) =
     JsonSerializer.Deserialize<ClientMessage> (theInput, serializerOptions)

diff --git a/tests/FSharp.Data.GraphQL.Tests/AspNetCore/SerializationTests.fs b/tests/FSharp.Data.GraphQL.Tests/AspNetCore/SerializationTests.fs
@@ -4,7 +4,7 @@ open Xunit
 open System.Text.Json
 open FSharp.Data.GraphQL.Ast
 open FSharp.Data.GraphQL.Shared
-open FSharp.Data.GraphQL.Shared.Websockets
+open FSharp.Data.GraphQL.Shared.WebSockets
 open System.Text.Json.Serialization
 
 [<Fact>]