feat: update System.Text.Json 8.0.5 and use JsonTypeInfo for lists

Author: Tarmil

paket.dependencies

@@ -5,7 +5,7 @@ source https://api.nuget.org/v3/index.json
 nuget FSharp.Core >= 6.0 lowest_matching:true
 nuget Microsoft.SourceLink.GitHub prerelease copy_local:true
 nuget Nerdbank.GitVersioning copy_local:true
-nuget System.Text.Json >= 6.0.10 lowest_matching: true
+nuget System.Text.Json >= 8.0.5 lowest_matching: true
 
 group test
 framework net9.0
@@ -15,7 +15,7 @@ source https://api.nuget.org/v3/index.json
 nuget FSharp.Core >= 6.0
 nuget FsCheck.XUnit
 nuget Microsoft.NET.Test.Sdk
-nuget System.Text.Json >= 8.0.5 prerelease
+nuget System.Text.Json >= 8.0.5
 nuget xunit
 nuget xunit.runner.visualstudio
 nuget BenchmarkDotNet

paket.lock

@@ -22,13 +22,12 @@ NUGET
       System.Buffers (>= 4.5.1)
       System.Memory (>= 4.5.5)
       System.Runtime.CompilerServices.Unsafe (>= 6.0)
-    System.Text.Json (6.0.10)
-      Microsoft.Bcl.AsyncInterfaces (>= 6.0)
+    System.Text.Json (8.0.5)
+      Microsoft.Bcl.AsyncInterfaces (>= 8.0)
       System.Buffers (>= 4.5.1)
-      System.Memory (>= 4.5.4)
-      System.Numerics.Vectors (>= 4.5)
+      System.Memory (>= 4.5.5)
       System.Runtime.CompilerServices.Unsafe (>= 6.0)
-      System.Text.Encodings.Web (>= 6.0)
+      System.Text.Encodings.Web (>= 8.0)
       System.Threading.Tasks.Extensions (>= 4.5.4)
     System.Threading.Tasks.Extensions (4.6.3)
       System.Runtime.CompilerServices.Unsafe (>= 6.1.2)
@@ -242,18 +241,14 @@ NUGET
     Perfolizer (0.5.2)
     System.CodeDom (9.0.5)
     System.Collections.Immutable (9.0.5)
-    System.IO.Pipelines (10.0.0-preview.5.25277.114)
     System.Management (9.0.5)
       System.CodeDom (>= 9.0.5)
     System.Reflection.Metadata (9.0.5)
     System.Reflection.TypeExtensions (4.7)
     System.Runtime.CompilerServices.Unsafe (6.1.2)
     System.Security.AccessControl (6.0.1)
     System.Security.Principal.Windows (5.0)
-    System.Text.Encodings.Web (10.0.0-preview.5.25277.114)
-    System.Text.Json (10.0.0-preview.5.25277.114)
-      System.IO.Pipelines (>= 10.0.0-preview.5.25277.114)
-      System.Text.Encodings.Web (>= 10.0.0-preview.5.25277.114)
+    System.Text.Json (9.0.5)
     xunit (2.9.3)
       xunit.analyzers (>= 1.18)
       xunit.assert (>= 2.9.3)

src/FSharp.SystemTextJson/All.fs

@@ -41,7 +41,7 @@ type JsonFSharpConverter(fsOptions: JsonFSharpOptions, [<Optional>] overrides: I
 
     static member internal CreateConverter(typeToConvert, options, fsOptions) =
         match TypeCache.getKind typeToConvert with
-        | TypeCache.TypeKind.List -> JsonListConverter.CreateConverter(typeToConvert, fsOptions)
+        | TypeCache.TypeKind.List -> JsonListConverter.CreateConverter(typeToConvert, options, fsOptions)
         | TypeCache.TypeKind.Set -> JsonSetConverter.CreateConverter(typeToConvert, fsOptions)
         | TypeCache.TypeKind.Map -> JsonMapConverter.CreateConverter(typeToConvert, options, fsOptions)
         | TypeCache.TypeKind.Tuple -> JsonTupleConverter.CreateConverter(typeToConvert, fsOptions)

src/FSharp.SystemTextJson/Collection.fs

@@ -3,21 +3,22 @@ namespace System.Text.Json.Serialization
 open System
 open System.Text.Json
 open System.Text.Json.Serialization.Helpers
+open System.Text.Json.Serialization.Metadata
 open Microsoft.FSharp.Core.CompilerServices
 
-type JsonListConverter<'T> internal (fsOptions) =
+type JsonListConverter<'T> internal (options, fsOptions) =
     inherit JsonConverter<list<'T>>()
     let tType = typeof<'T>
     let tIsNullable = isNullableFieldType fsOptions tType
     let needsNullChecking = not tIsNullable && not tType.IsValueType
+    let typeInfo = JsonTypeInfo.CreateJsonTypeInfo<'T>(options)
 
-    override _.Read(reader, typeToConvert, options) =
+    override _.Read(reader, typeToConvert, _options) =
         expectAlreadyRead JsonTokenType.StartArray "JSON array" &reader typeToConvert
 
         let mutable l = ListCollector<'T>()
         while reader.Read() && reader.TokenType <> JsonTokenType.EndArray do
-            let value = JsonSerializer.Deserialize(&reader, typeof<'T>, options)
-            l.Add(value :?> 'T)
+            l.Add(JsonSerializer.Deserialize<'T>(&reader, typeInfo))
         let list = l.Close()
 
         if needsNullChecking then
@@ -32,26 +33,26 @@ type JsonListConverter<'T> internal (fsOptions) =
 
     override _.HandleNull = true
 
-    new(fsOptions: JsonFSharpOptions) = JsonListConverter<'T>(fsOptions.Record)
+    new(options, fsOptions: JsonFSharpOptions) = JsonListConverter<'T>(options, fsOptions.Record)
 
 type JsonListConverter(fsOptions) =
     inherit JsonConverterFactory()
 
     static member internal CanConvert(typeToConvert: Type) =
         TypeCache.isList typeToConvert
 
-    static member internal CreateConverter(typeToConvert: Type, fsOptions: JsonFSharpOptions) =
+    static member internal CreateConverter(typeToConvert: Type, options: JsonSerializerOptions, fsOptions: JsonFSharpOptions) =
         typedefof<JsonListConverter<_>>
             .MakeGenericType([| typeToConvert.GetGenericArguments().[0] |])
-            .GetConstructor([| typeof<JsonFSharpOptions> |])
-            .Invoke([| fsOptions |])
+            .GetConstructor([| typeof<JsonSerializerOptions>; typeof<JsonFSharpOptions> |])
+            .Invoke([| options; fsOptions |])
         :?> JsonConverter
 
     override _.CanConvert(typeToConvert) =
         JsonListConverter.CanConvert(typeToConvert)
 
-    override _.CreateConverter(typeToConvert, _options) =
-        JsonListConverter.CreateConverter(typeToConvert, fsOptions)
+    override _.CreateConverter(typeToConvert, options) =
+        JsonListConverter.CreateConverter(typeToConvert, options, fsOptions)
 
 type JsonSetConverter<'T when 'T: comparison> internal (fsOptions) =
     inherit JsonConverter<Set<'T>>()