+ OfJson / ToJson for JsonObject / JsonValue (#71)

Author: mt-caret

src/Fleece/Fleece.fs

@@ -423,6 +423,8 @@ module SystemTextJson =
                 | JObject x -> Success (dictAsJsonObject x)
                 | a -> Decode.Fail.objExpected a
 
+            static member jsonOfJsonObject o = JObject o
+
         #endif
 
         #if NEWTONSOFT
@@ -442,8 +444,9 @@ module SystemTextJson =
                     match o.Type with
                     | JTokenType.Object -> Success (o :?> JObject)
                     | _ -> Decode.Fail.objExpected o
- 
 
+            static member jsonOfJsonObject o = o :> JToken
+ 
         #endif
 
         #if SYSTEMJSON
@@ -463,6 +466,8 @@ module SystemTextJson =
                     | :? JsonObject as x -> Success x
                     | _ -> Decode.Fail.objExpected o
 
+            static member jsonOfJsonObject (o: JsonObject) = o :> JsonValue
+
         #endif
 
         #if SYSTEMTEXTJSON
@@ -496,6 +501,8 @@ module SystemTextJson =
                 | JObject x -> Success (dictAsJsonObject x)
                 | a -> Decode.Fail.objExpected a
 
+            static member jsonOfJsonObject (o: JsonObject) = JObject o
+
         #endif
 
     open Helpers
@@ -905,6 +912,7 @@ module SystemTextJson =
         static member inline OfJson (_: 'R, _: Default2) = fun js -> (^R : (static member OfJson: JsonValue -> ^R ParseResult) js) : ^R ParseResult
 
         static member OfJson (_: JsonObject, _: Default1) = JsonHelpers.jsonObjectOfJson
+        static member OfJson (_: JsonValue, _: Default1) = Success
 
 
     /// Maps Json to a type
@@ -1043,6 +1051,9 @@ module SystemTextJson =
         static member inline ToJson (t: 'T, _: Default3) = (^T : (static member ToJSON : ^T -> JsonValue) t)
         static member inline ToJson (t: 'T, _: Default2) = (^T : (static member ToJson : ^T -> JsonValue) t)
 
+        static member ToJson (t: JsonObject, _: Default1) = JsonHelpers.jsonOfJsonObject t
+        static member ToJson (t: JsonValue , _: Default1) = t
+
     /// Maps a value to Json
     let inline toJson (x: 't) : JsonValue = ToJson.Invoke x
 

test/Tests/Tests.fs

@@ -444,6 +444,15 @@ let tests = [
 
             }
 
+            test "Map roundtrips as JsonValue and JsonObject" {
+                let p = Map.ofList [ ("1", "one"); ("2", "two")]
+                let x = p |> toJson |> toJson |> ofJson<Map<string,string>>
+                let (Ok o)  = p |> toJson |> ofJson<JsonObject>
+                let y = o |> toJson |> toJson |> ofJson<Map<string,string>>
+                Assert.Equal("roundtrip through JsonValue", Option.ofResult x, Some p)
+                Assert.Equal("roundtrip through JsonObject", Option.ofResult y, Some p)
+            }
+
             test "Map with null key" {
                 let p: Map<string, _> = Map.ofList [null, "a"]
                 Assert.JSON("{}", p)