Handle nullable values in JSON parsed dicts

ConsumePlugin/GeneratedJson.fs

@@ -7,6 +7,7 @@
 
 namespace ConsumePlugin
 
+open System.Collections.Generic
 open System.Text.Json.Serialization
 
 /// Module containing JSON serializing methods for the InternalTypeNotExtensionSerial type
@@ -36,6 +37,7 @@ module internal InternalTypeNotExtensionSerial =
         node :> _
 namespace ConsumePlugin
 
+open System.Collections.Generic
 open System.Text.Json.Serialization
 
 /// Module containing JSON serializing extension members for the InternalTypeExtension type
@@ -94,6 +96,27 @@ namespace ConsumePlugin
 module JsonRecordType =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : JsonRecordType =
+        let arg_6 =
+            match node.["g"] |> Option.ofObj with
+            | None ->
+                raise (
+                    System.Collections.Generic.KeyNotFoundException (
+                        sprintf "Required key '%s' not found on JSON object" ("g")
+                    )
+                )
+            | Some node ->
+                node.AsObject ()
+                |> Seq.map (fun kvp ->
+                    let key = (kvp.Key)
+                    let value = kvp.Value |> Option.ofObj
+
+                    key,
+                    match value with
+                    | None -> System.Nullable ()
+                    | Some v -> v.AsValue().GetValue<System.Int32> () |> System.Nullable
+                )
+                |> dict
+
         let arg_5 =
             match node.["f"] |> Option.ofObj with
             | None ->
@@ -194,6 +217,7 @@ module JsonRecordType =
             D = arg_3
             E = arg_4
             F = arg_5
+            G = arg_6
         }
 namespace ConsumePlugin
 

ConsumePlugin/JsonRecord.fs

@@ -1,5 +1,6 @@
 namespace ConsumePlugin
 
+open System.Collections.Generic
 open System.Text.Json.Serialization
 
 module Literals =
@@ -27,6 +28,7 @@ type JsonRecordType =
         D : InnerType
         E : string array
         F : int[]
+        G : IDictionary<string, System.Nullable<int>>
     }
 
 [<WoofWare.Myriad.Plugins.JsonParse>]

WoofWare.Myriad.Plugins.Test/TestJsonParse/TestJsonParse.fs

@@ -1,5 +1,7 @@
 namespace WoofWare.Myriad.Plugins.Test
 
+open System
+open System.Collections.Generic
 open System.Text.Json.Nodes
 open ConsumePlugin
 open NUnit.Framework
@@ -14,7 +16,7 @@ module TestJsonParse =
         let s =
             """
 {
-    "a": 3, "another-thing": "hello", "hi": [6, 1], "d": {"something": "oh hi"},
+    "a": 3, "another-thing": "hello", "hi": [6, 1], "d": {"something": "oh hi"}, "g": {},
     "e": ["something", "else"], "f": []
 }
 """
@@ -30,6 +32,61 @@ module TestJsonParse =
                     }
                 E = [| "something" ; "else" |]
                 F = [||]
+                G = dict []
+            }
+
+        let actual = s |> JsonNode.Parse |> JsonRecordType.jsonParse
+        actual |> shouldEqual expected
+
+    [<Test>]
+    let ``Single example with explicit null`` () =
+        let s =
+            """
+{
+    "a": 3, "another-thing": "hello", "hi": [6, 1], "d": {"something": "oh hi"}, "g": {"hi": null},
+    "e": ["something", "else"], "f": []
+}
+"""
+
+        let expected =
+            {
+                A = 3
+                B = "hello"
+                C = [ 6 ; 1 ]
+                D =
+                    {
+                        Thing = "oh hi"
+                    }
+                E = [| "something" ; "else" |]
+                F = [||]
+                G = dict [ "hi", Nullable () ]
+            }
+
+        let actual = s |> JsonNode.Parse |> JsonRecordType.jsonParse
+        actual |> shouldEqual expected
+
+    [<Test>]
+    let ``Single example, nullable provided`` () =
+        let s =
+            """
+{
+    "a": 3, "another-thing": "hello", "hi": [6, 1], "d": {"something": "oh hi"}, "g": {"hi": 3},
+    "e": ["something", "else"], "f": []
+}
+"""
+
+        let expected =
+            {
+                A = 3
+                B = "hello"
+                C = [ 6 ; 1 ]
+                D =
+                    {
+                        Thing = "oh hi"
+                    }
+                E = [| "something" ; "else" |]
+                F = [||]
+                G = dict [ "hi", Nullable 3 ]
             }
 
         let actual = s |> JsonNode.Parse |> JsonRecordType.jsonParse

WoofWare.Myriad.Plugins/JsonParseGenerator.fs

@@ -125,7 +125,14 @@ module internal JsonParseGenerator =
         =
         let keyArg = SynExpr.createLongIdent [ "kvp" ; "Key" ] |> SynExpr.paren
 
-        let valueArg = SynExpr.createLongIdent [ "kvp" ; "Value" ]
+        let valueArg =
+            let value = SynExpr.createLongIdent [ "kvp" ; "Value" ]
+
+            if valueTypeIsNullable then
+                value
+                |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "Option" ; "ofObj" ])
+            else
+                value
 
         let value =
             if valueTypeIsNullable then