Make documentId deterministic SHA-256 string and keep schemaId as in-memory int cache key

.config/dotnet-tools.json

@@ -3,14 +3,14 @@
   "isRoot": true,
   "tools": {
     "fantomas": {
-      "version": "7.0.1",
+      "version": "7.0.5",
       "commands": [
         "fantomas"
       ],
       "rollForward": false
     },
     "fsdocs-tool": {
-      "version": "20.0.1",
+      "version": "22.1.0",
       "commands": [
         "fsdocs"
       ],

.github/workflows/publish-ci.yml

@@ -8,7 +8,7 @@ on:
 env:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
   DOTNET_NOLOGO: true
-  DOTNET_SDK_VERSION: 10.0.202
+  DOTNET_SDK_VERSION: 10.0.302
 
 jobs:
   publish:

.github/workflows/publish-release.yml

@@ -9,7 +9,7 @@ env:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
   DOTNET_NOLOGO: true
   SLEEP_DURATION: 60
-  DOTNET_SDK_VERSION: 10.0.202
+  DOTNET_SDK_VERSION: 10.0.302
 
 jobs:
   publish:

.github/workflows/publish-test-results.yml

@@ -0,0 +1,61 @@
+name: Publish Test Results
+
+on:
+  workflow_run:
+    workflows: ["Build and Test"]
+    types:
+      - completed
+
+permissions: {}
+
+jobs:
+  test-results:
+    if: github.event.workflow_run.conclusion != 'skipped' && github.event.workflow_run.event == 'pull_request'
+    name: Test Results
+    runs-on: ubuntu-latest
+
+    permissions:
+      actions: read
+      checks: write
+      pull-requests: write
+
+    steps:
+    - name: Download event file
+      uses: dawidd6/action-download-artifact@v6
+      with:
+        run_id: ${{ github.event.workflow_run.id }}
+        path: artifacts
+        name: EventFile
+
+    - name: Download test results
+      uses: dawidd6/action-download-artifact@v6
+      with:
+        run_id: ${{ github.event.workflow_run.id }}
+        path: test-results
+        name: ^test-results-.*
+        name_is_regexp: true
+        if_no_artifact_found: warn
+
+    - name: Resolve event file path
+      id: event_file
+      shell: pwsh
+      run: |
+        $eventFilePath =
+          Get-ChildItem -Path artifacts -Filter event.json -Recurse |
+          Select-Object -First 1 -ExpandProperty FullName
+
+        if ($null -eq $eventFilePath) {
+          throw "event.json file was not found in downloaded artifacts"
+        }
+
+        "path=$eventFilePath" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
+
+    - name: Publish test results
+      if: ${{ hashFiles('test-results/**/*.trx') != '' }}
+      uses: EnricoMi/publish-unit-test-result-action@v2
+      with:
+        commit: ${{ github.event.workflow_run.head_sha }}
+        comment_mode: always
+        event_file: ${{ steps.event_file.outputs.path }}
+        event_name: ${{ github.event.workflow_run.event }}
+        files: "test-results/**/*.trx"

.github/workflows/pull-request.yml

@@ -14,14 +14,31 @@ env:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
   DOTNET_NOLOGO: true
 
+permissions: {}
+
 jobs:
+  event_file:
+    if: github.event_name == 'pull_request'
+    name: Publish event file
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+    - name: Upload event file
+      uses: actions/upload-artifact@v4
+      with:
+        name: EventFile
+        path: ${{ github.event_path }}
+
   build:
+    permissions:
+      contents: read
 
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04, windows-latest, macOS-latest]
-        dotnet: [10.0.202]
+        dotnet: [10.0.302]
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -50,3 +67,10 @@ jobs:
 
     - name: Build and run integration tests
       run: dotnet run --project build/Build.fsproj --launch-profile BuildAndTest
+
+    - name: Upload test results
+      if: always()
+      uses: actions/upload-artifact@v4
+      with:
+        name: test-results-${{ matrix.os }}
+        path: test-results

FSharp.Data.GraphQL.Integration.slnx

@@ -4,6 +4,9 @@
     <Platform Name="x64" />
     <Platform Name="x86" />
   </Configurations>
+  <Folder Name="/samples/">
+    <Project Path="samples/star-wars-api/star-wars-api.fsproj" />
+  </Folder>
   <Folder Name="/Solution Items/">
     <File Path="Directory.Build.props" />
     <File Path="Directory.Build.targets" />
@@ -12,7 +15,9 @@
   <Folder Name="/src/">
     <Project Path="src/FSharp.Data.GraphQL.Server.AspNetCore/FSharp.Data.GraphQL.Server.AspNetCore.fsproj" />
     <Project Path="src/FSharp.Data.GraphQL.Server.Giraffe/FSharp.Data.GraphQL.Server.Giraffe.fsproj" />
+    <Project Path="src/FSharp.Data.GraphQL.Server.Middleware/FSharp.Data.GraphQL.Server.Middleware.fsproj" />
     <Project Path="src/FSharp.Data.GraphQL.Server.Oxpecker/FSharp.Data.GraphQL.Server.Oxpecker.fsproj" />
+    <Project Path="src/FSharp.Data.GraphQL.Server.Relay/FSharp.Data.GraphQL.Server.Relay.fsproj" />
     <Project Path="src/FSharp.Data.GraphQL.Server/FSharp.Data.GraphQL.Server.fsproj" />
     <Project Path="src/FSharp.Data.GraphQL.Shared/FSharp.Data.GraphQL.Shared.fsproj" />
   </Folder>

Packages.props

@@ -17,6 +17,7 @@
     </PackageReference>
     <PackageReference Update="FSharp.Control.FusionTasks" Version="2.6.*" />
     <PackageReference Update="FSharp.Control.Reactive" Version="6.*" />
+    <PackageReference Update="FSharp.Data.LiteralProviders" Version="1.0.3" />
     <PackageReference Update="FSharp.SystemTextJson" Version="1.*" />
     <PackageReference Update="FsToolkit.ErrorHandling" Version="$(FsToolkitVersion)" />
     <PackageReference Update="FsToolkit.ErrorHandling.TaskResult" Version="$(FsToolkitVersion)" />
@@ -76,9 +77,11 @@
     <PackageReference Update="GraphQL.Server.Ui.Voyager" Version="8.*"  />
     <PackageReference Update="HotChocolate.AspNetCore" Version="15.*" />
     <PackageReference Update="Iced" Version="1.17.*" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />
     <PackageReference Update="Microsoft.Azure.Cosmos" Version="3.*" />
     <PackageReference Update="Microsoft.CodeCoverage" Version="17.3.*" />
     <PackageReference Update="Microsoft.Data.Sqlite" Version="$(MicrosoftExtensionsVersion)" />
+    <PackageReference Update="SQLitePCLRaw.lib.e_sqlite3" Version="3.53.3" />
     <PackageReference Update="Microsoft.Diagnostics.NETCore.Client" Version="0.2.*" />
     <PackageReference Update="Microsoft.Diagnostics.Runtime" Version="2.2.*" />
     <PackageReference Update="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.*" />

README.md

@@ -230,7 +230,7 @@ printfn "Custom data: %A\n" result.CustomData
 
 // Errors: <null>
 
-// Custom data: map [("documentId", 1221427401)]
+// Custom data: map [("documentId", "<SHA-256 of the executed query document>")]
 ```
 
 For more information about how to use the client provider, see the [examples folder](samples/client-provider).
@@ -361,6 +361,8 @@ query TestQuery {
 }
 ```
 
+For string filters, lowercase suffixes are case-insensitive (`name_starts_with`, `name_sw`, `name_contains`, `name_equals`, `name_eq`), while capitalized suffixes are case-sensitive (`name_Starts_With`, `name_SW`, `name_Contains`, `name_Equals`, `name_EQ`). `contains`/`Contains` do not have shorthand aliases.
+
 Also you can apply `not` operator like this:
 
 ```graphql
@@ -406,12 +408,16 @@ type ObjectListFilter =
     | And of ObjectListFilter * ObjectListFilter
     | Or of ObjectListFilter * ObjectListFilter
     | Not of ObjectListFilter
-    | Equals of FieldFilter<System.IComparable>
+    | Equals of Filter : FieldFilter<System.IComparable> * Comparer : System.Collections.IComparer
     | GreaterThan of FieldFilter<System.IComparable>
+    | GreaterThanOrEqual of FieldFilter<System.IComparable>
     | LessThan of FieldFilter<System.IComparable>
-    | StartsWith of FieldFilter<string>
-    | EndsWith of FieldFilter<string>
-    | Contains of FieldFilter<string>
+    | LessThanOrEqual of FieldFilter<System.IComparable>
+    | In of FieldFilter<obj list>
+    | StartsWith of Filter : FieldFilter<string> * Comparer : System.StringComparer
+    | EndsWith of Filter : FieldFilter<string> * Comparer : System.StringComparer
+    | Contains of Filter : FieldFilter<System.IComparable> * Comparer : System.Collections.IComparer
+    | OfTypes of System.Type list
     | FilterField of FieldFilter<ObjectListFilter>
 ```
 

RELEASE_NOTES.md

@@ -288,4 +288,5 @@
 
 * **Breaking Change** Migrated to .NET 10
 * **Breaking Change** Made Relay `Edge` a read-only struct
+* Added case-insensitive string comparison support to `ObjectListFilter`, including comparer-aware filter cases and GraphQL filter suffix handling
 * Improved Relay XML documentation comments

build/Program.fs

@@ -2,8 +2,6 @@ module Program
 
 open System
 open System.IO
-open System.Net.Http
-open System.Text.Json
 
 open Fake.Core
 open Fake.Core.TargetOperators
@@ -32,7 +30,7 @@ let ctx = Context.forceFakeContext ()
 let embedAll = ctx.Arguments |> List.exists (fun arg -> arg = BuildArguments.EmbedAll)
 
 module DotNetCli =
-    let setVersion (o : DotNet.Options) = { o with Version = Some "10.0.202" }
+    let setVersion (o : DotNet.Options) = { o with Version = Some "10.0.302" }
     let setRestoreOptions (o : DotNet.RestoreOptions) = o.WithCommon setVersion
 
 let configurationString = Environment.environVarOrDefault "CONFIGURATION" "Release"
@@ -100,12 +98,17 @@ let startGraphQLServer (project : string) port (streamRef : DataRef<Stream>) =
 
     System.Threading.Thread.Sleep (2000)
 
-let runTests (project : string) (args : string) =
+let runTests (project : string) =
+    let projectName = Path.GetFileNameWithoutExtension project
+    let resultsFileName = $"{projectName}.trx"
+
     DotNet.test
         (fun options ->
             {
                 options with
                     NoBuild = true
+                    Logger = Some $"trx;LogFileName={resultsFileName}"
+                    ResultsDirectory = Some "test-results"
                     Framework = Some DotNetMoniker
                     Configuration = configuration
                     MSBuildParams = {
@@ -123,26 +126,6 @@ let runTests (project : string) (args : string) =
             |> _.WithCommon(DotNetCli.setVersion))
         project
 
-let starWarsServerStream = StreamRef.Empty
-
-let [<Literal>] StartStarWarsServerTarget = "StartStarWarsServer"
-Target.create StartStarWarsServerTarget <| fun _ ->
-    Target.activateFinal "StopStarWarsServer"
-
-    let project =
-        "samples"
-        </> "star-wars-api"
-        </> "star-wars-api.fsproj"
-
-    startGraphQLServer project 8086 starWarsServerStream
-
-let [<Literal>] StopStarWarsServerTarget = "StopStarWarsServer"
-Target.createFinal StopStarWarsServerTarget <| fun _ ->
-    try
-        starWarsServerStream.Value.Write ([| 0uy |], 0, 1)
-    with e ->
-        printfn "%s" e.Message
-
 let integrationTestServerProjectPath =
     "tests"
     </> "FSharp.Data.GraphQL.IntegrationTests.Server"
@@ -179,57 +162,52 @@ Target.createFinal StopIntegrationServerTarget <| fun _ ->
     with e ->
         printfn "%s" e.Message
 
+let integrationTestsProjectPath =
+    "tests"
+    </> "FSharp.Data.GraphQL.IntegrationTests"
+    </> "FSharp.Data.GraphQL.IntegrationTests.fsproj"
+
 let [<Literal>] UpdateIntrospectionFileTarget = "UpdateIntrospectionFile"
 Target.create UpdateIntrospectionFileTarget <| fun _ ->
-    let client = new HttpClient ()
-    (task {
-        let! result = client.GetAsync ("http://localhost:8086")
-        let! contentStream = result.Content.ReadAsStreamAsync ()
-        let! jsonDocument = JsonDocument.ParseAsync contentStream
-        let file =
-            new FileStream ("tests/FSharp.Data.GraphQL.IntegrationTests/introspection.json", FileMode.Create, FileAccess.Write, FileShare.None)
-        let encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping
-        let jsonWriterOptions = JsonWriterOptions (Indented = true, Encoder = encoder)
-        let writer = new Utf8JsonWriter (file, jsonWriterOptions)
-        jsonDocument.WriteTo writer
-        do! writer.FlushAsync ()
-        do! writer.DisposeAsync ()
-        do! file.DisposeAsync ()
-        result.Dispose ()
-    })
-        .Wait ()
-    client.Dispose ()
+    let projectName = Path.GetFileNameWithoutExtension integrationTestsProjectPath
+    let resultsFileName = $"{projectName}.trx"
+
+    DotNet.test
+        (fun options ->
+            {
+                options with
+                    NoBuild = true
+                    Logger = Some $"trx;LogFileName={resultsFileName}"
+                    ResultsDirectory = Some "test-results"
+                    Framework = Some DotNetMoniker
+                    Configuration = configuration
+                    Common = {
+                        options.Common with
+                            CustomParams = Some "--filter FullyQualifiedName~IntrospectionUpdateTests"
+                    }
+                    MSBuildParams = {
+                        options.MSBuildParams with
+                            DisableInternalBinLog = true
+                            Verbosity = Some Normal
+                            Properties = [
+                                if embedAll then
+                                    ("DebugType", "embedded")
+                                    ("EmbedAllSources", "true")
+                            ]
+                    }
+            }
+            |> _.WithRedirectOutput(true)
+            |> _.WithCommon(DotNetCli.setVersion))
+        integrationTestsProjectPath
 
 let unitTestsProjectPath =
     "tests"
     </> "FSharp.Data.GraphQL.Tests"
     </> "FSharp.Data.GraphQL.Tests.fsproj"
 
-let integrationTestsProjectPath =
-    "tests"
-    </> "FSharp.Data.GraphQL.IntegrationTests"
-    </> "FSharp.Data.GraphQL.IntegrationTests.fsproj"
-
-let [<Literal>] BuildIntegrationTestsTarget = "BuildIntegrationTests"
-Target.create BuildIntegrationTestsTarget <| fun _ ->
-    integrationTestsProjectPath
-    |> DotNet.build (fun options -> {
-        options with
-            Configuration = configuration
-            MSBuildParams = {
-                options.MSBuildParams with
-                    DisableInternalBinLog = true
-            }
-            Common = DotNetCli.setVersion options.Common
-    })
-
 let [<Literal>] RunUnitTestsTarget = "RunUnitTests"
 Target.create RunUnitTestsTarget <| fun _ ->
-    runTests unitTestsProjectPath ""
-
-let [<Literal>] RunIntegrationTestsTarget = "RunIntegrationTests"
-Target.create RunIntegrationTestsTarget <| fun _ ->
-    runTests integrationTestsProjectPath "" //"--filter Execution=Sync"
+    runTests unitTestsProjectPath
 
 let prepareDocGen () =
     Shell.rm "docs/release-notes.md"
@@ -406,12 +384,7 @@ Target.create "PackAndPush" ignore
 ==> RestoreTarget
 ==> BuildTarget
 ==> RunUnitTestsTarget
-==> StartStarWarsServerTarget
-==> BuildIntegrationTestServerTarget
-==> StartIntegrationServerTarget
 ==> UpdateIntrospectionFileTarget
-==> BuildIntegrationTestsTarget
-==> RunIntegrationTestsTarget
 ==> "All"
 =?> (GenerateDocsTarget, Environment.environVar "GITHUB_ACTIONS" = "True")
 |> ignore