Trim Picker logic

jet · Jan 27, 2024 · 097c9ec · 097c9ec
1 parent 790f8fb
commit 097c9ec
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 43 deletions.
diff --git a/src/FsCodec.NewtonsoftJson/Pickler.fs b/src/FsCodec.NewtonsoftJson/Pickler.fs
@@ -1,34 +1,15 @@
 namespace FsCodec.NewtonsoftJson
 
 open Newtonsoft.Json
-open System
-
-[<AutoOpen>]
-module private Prelude =
-    let memoize (f: 'T -> 'S): 'T -> 'S =
-        let cache = new System.Collections.Concurrent.ConcurrentDictionary<'T, 'S>()
-        fun t -> cache.GetOrAdd(t, f)
 
 [<AbstractClass>]
 type JsonPickler<'T>() =
     inherit JsonConverter()
 
-    static let isMatchingType =
-        let rec isMatching = function
-            | [] -> false
-            | t :: _ when t = typeof<'T> -> true
-            | t :: tl ->
-                let tail =
-                    [ match t.BaseType with null -> () | bt -> yield bt
-                      yield! t.GetInterfaces()
-                      yield! tl ]
-                isMatching tail
-        memoize (fun t -> isMatching [t])
-
     abstract Write: writer: JsonWriter * serializer: JsonSerializer * source: 'T  -> unit
     abstract Read: reader: JsonReader * serializer: JsonSerializer -> 'T
 
-    override _.CanConvert t = isMatchingType t
+    override _.CanConvert t = t = typeof<'T>
     override _.CanRead = true
     override _.CanWrite = true
 

diff --git a/src/FsCodec.NewtonsoftJson/UnionConverter.fs b/src/FsCodec.NewtonsoftJson/UnionConverter.fs
@@ -15,8 +15,10 @@ module private UnionInfo =
         || t.IsArray
         || (t.IsGenericType && let g = t.GetGenericTypeDefinition() in typedefof<Option<_>> = g || g.IsValueType) // Nullable<T>
 
-    let typeHasConverterAttribute = memoize (fun (t: Type) -> t.IsDefined(typeof<JsonConverterAttribute>))
-    let typeIsUnionWithConverterAttribute = memoize (fun (t: Type) -> FsCodec.Union.isUnion t && typeHasConverterAttribute t)
+    let hasConverterCache = System.Collections.Concurrent.ConcurrentDictionary<Type, bool>()
+    let typeHasConverterAttribute (t: Type) = hasConverterCache.GetOrAdd(t, fun t -> t.IsDefined(typeof<JsonConverterAttribute>, ``inherit`` = false))
+    let isUnionCache = System.Collections.Concurrent.ConcurrentDictionary<Type, bool>()
+    let typeIsUnionWithConverterAttribute t = isUnionCache.GetOrAdd(t, fun t -> FsCodec.Union.isUnion t && typeHasConverterAttribute t)
 
     let propTypeRequiresConstruction (propertyType: Type) =
         not (isInlinedIntoUnionItem propertyType)

diff --git a/src/FsCodec.SystemTextJson/Pickler.fs b/src/FsCodec.SystemTextJson/Pickler.fs
@@ -2,32 +2,12 @@
 
 open System.Text.Json
 
-[<AutoOpen>]
-module private Prelude =
-    let memoize (f: 'T -> 'S): 'T -> 'S =
-        let cache = new System.Collections.Concurrent.ConcurrentDictionary<'T, 'S>()
-        fun t -> cache.GetOrAdd(t, f)
-
 [<AbstractClass>]
 type JsonPickler<'T>() =
     inherit Serialization.JsonConverter<'T>()
 
-    static let isMatchingType =
-        let rec isMatching = function
-            | [] -> false
-            | t :: _ when t = typeof<'T> -> true
-            | t :: tl ->
-                let tail =
-                    [ match t.BaseType with null -> () | bt -> yield bt
-                      yield! t.GetInterfaces()
-                      yield! tl ]
-                isMatching tail
-        memoize (fun t -> isMatching [t])
-
     abstract Read: reader: byref<Utf8JsonReader> * options: JsonSerializerOptions -> 'T
 
-    override _.CanConvert t = isMatchingType t
-
     override x.Read(reader, _typeToConvert, options) =
         x.Read(&reader, options)
 

diff --git a/src/FsCodec.SystemTextJson/UnionOrTypeSafeEnumConverterFactory.fs b/src/FsCodec.SystemTextJson/UnionOrTypeSafeEnumConverterFactory.fs
@@ -5,7 +5,8 @@ open System.Text.Json.Serialization
 type UnionOrTypeSafeEnumConverterFactory(typeSafeEnum, union) =
     inherit JsonConverterFactory()
 
-    static let hasConverterAttribute: System.Type -> bool = memoize _.IsDefined(typeof<JsonConverterAttribute>, true)
+    static let cache = System.Collections.Concurrent.ConcurrentDictionary<System.Type, bool>()
+    static let hasConverterAttribute t: bool = cache.GetOrAdd(t, fun (t: System.Type) -> t.IsDefined(typeof<JsonConverterAttribute>, ``inherit`` = false))
 
     override _.CanConvert t =
         not (t.IsGenericType && let g = t.GetGenericTypeDefinition() in g = typedefof<option<_>> || g = typedefof<list<_>>)