Fixed the encoding of default values when performing introspection.

Includes an update of introspection tests

(cherry picked from commit d7c61ed)

Author: njlr

src/FSharp.Data.GraphQL.Server/Schema.fs

@@ -12,6 +12,7 @@ open FSharp.Control.Reactive
 open System.Collections.Generic
 open System.Reactive.Linq
 open System.Reactive.Subjects
+open System.Text.Json
 
 type private Channel = ISubject<obj>
 
@@ -62,6 +63,8 @@ type SchemaConfig =
       SubscriptionProvider : ISubscriptionProvider
       /// Provider for the back-end of the live query subscription system.
       LiveFieldSubscriptionProvider : ILiveFieldSubscriptionProvider
+      /// JSON serialization options
+      JsonOptions : JsonSerializerOptions
     }
     /// Returns the default Subscription Provider, backed by Observable streams.
     static member DefaultSubscriptionProvider() =
@@ -131,7 +134,8 @@ type SchemaConfig =
                 | :? GraphQLException as ex -> [ex]
                 | ex -> [{ new IGQLError with member _.Message = ex.Message }]
           SubscriptionProvider = SchemaConfig.DefaultSubscriptionProvider()
-          LiveFieldSubscriptionProvider = SchemaConfig.DefaultLiveFieldSubscriptionProvider() }
+          LiveFieldSubscriptionProvider = SchemaConfig.DefaultLiveFieldSubscriptionProvider()
+          JsonOptions = JsonSerializerOptions.Default }
     /// <summary>
     /// Default SchemaConfig with buffered stream support.
     /// This config modifies the stream directive to have two optional arguments: 'interval' and 'preferredBatchSize'.
@@ -223,14 +227,17 @@ type Schema<'Root> (query: ObjectDef<'Root>, ?mutation: ObjectDef<'Root>, ?subsc
 
     let introspectInput (namedTypes: Map<string, IntrospectionTypeRef>) (inputDef: InputFieldDef) : IntrospectionInputVal =
         // We need this so a default value that is an option is not printed as "Some"
-        let stringify =
+        let unwrap =
             function
-            | ObjectOption x -> string x
-            | x -> string x
+            | ObjectOption x -> x
+            | x -> x
+        let defaultValue =
+            inputDef.DefaultValue
+            |> Option.map (fun value -> JsonSerializer.Serialize(unwrap value, schemaConfig.JsonOptions))
         { Name = inputDef.Name
           Description = inputDef.Description
           Type = introspectTypeRef (Option.isSome inputDef.DefaultValue) namedTypes inputDef.TypeDef
-          DefaultValue = inputDef.DefaultValue |> Option.map stringify }
+          DefaultValue = defaultValue }
 
     let introspectField (namedTypes: Map<string, IntrospectionTypeRef>) (fdef: FieldDef) =
         { Name = fdef.Name

src/FSharp.Data.GraphQL.Shared/Helpers/Reflection.fs

@@ -11,7 +11,7 @@ open System.Collections.Immutable
 /// General helper functions and types.
 module Helpers =
 
-    /// Casts a System.Object to an option to a System.Object option.
+    /// Casts a System.Object to a System.Object option.
     let optionCast (value: obj) =
         if isNull value then None
         else

tests/FSharp.Data.GraphQL.Tests/IntrospectionTests.fs

@@ -45,7 +45,8 @@ let inputFieldQuery = """{
 let ``Input field must be marked as nullable when defaultValue is provided`` () =
     let root = Define.Object("Query", [
         Define.Field("onlyField", StringType, "The only field", [
-            Define.Input("in", StringType, defaultValue = "1")
+            Define.Input("inInt", IntType, defaultValue = 1)
+            Define.Input("inString", StringType, defaultValue = "this is a default value")
         ], fun _ _ -> "Only value")
     ])
     let schema = Schema(root)
@@ -57,23 +58,29 @@ let ``Input field must be marked as nullable when defaultValue is provided`` ()
                     "name", upcast "onlyField"
                     "args", upcast [
                         NameValueLookup.ofList [
-                            "name", upcast "in"
+                            "name", upcast "inInt"
                             "type", upcast NameValueLookup.ofList [
                                 "kind", upcast "SCALAR"
-                                "name", upcast "String"
+                                "name", upcast "Int"
                             ]
                             "defaultValue", upcast "1"
                         ]
+                        NameValueLookup.ofList [
+                            "name", upcast "inString"
+                            "type", upcast NameValueLookup.ofList [
+                                "kind", upcast "SCALAR"
+                                "name", upcast "String"
+                            ]
+                            "defaultValue", upcast "\"this is a default value\""
+                        ]
                     ]
                 ]
             ]
         ]
     ]
-    match result with
-    | Direct(data, errors) ->
-      empty errors
-      data |> equals (upcast expected)
-    | response -> fail $"Expected a Direct GQLResponse but got {Environment.NewLine}{response}"
+    ensureDirect result <| fun data errors ->
+        empty errors
+        data |> equals (upcast expected)
 
 [<Fact>]
 let ``Input field must be marked as non-nullable when defaultValue is not provided`` () =
@@ -103,11 +110,9 @@ let ``Input field must be marked as non-nullable when defaultValue is not provid
             ]
         ]
     ]
-    match result with
-    | Direct(data, errors) ->
-      empty errors
-      data |> equals (upcast expected)
-    | response -> fail $"Expected a Direct GQLResponse but got {Environment.NewLine}{response}"
+    ensureDirect result <| fun data errors ->
+        empty errors
+        data |> equals (upcast expected)
 
 [<Fact>]
 let ``Input field must be marked as nullable when its type is nullable`` () =
@@ -137,11 +142,9 @@ let ``Input field must be marked as nullable when its type is nullable`` () =
             ]
         ]
     ]
-    match result with
-    | Direct(data, errors) ->
-      empty errors
-      data |> equals (upcast expected)
-    | response -> fail $"Expected a Direct GQLResponse but got {Environment.NewLine}{response}"
+    ensureDirect result <| fun data errors ->
+        empty errors
+        data |> equals (upcast expected)
 
 [<Fact>]
 let ``Input field must be marked as nullable when its type is nullable and have default value provided`` () =
@@ -164,18 +167,16 @@ let ``Input field must be marked as nullable when its type is nullable and have
                                 "kind", upcast "SCALAR"
                                 "name", upcast "String"
                             ]
-                            "defaultValue", upcast "1"
+                            "defaultValue", upcast "\"1\""
                         ]
                     ]
                 ]
             ]
         ]
     ]
-    match result with
-    | Direct(data, errors) ->
-      empty errors
-      data |> equals (upcast expected)
-    | response -> fail $"Expected a Direct GQLResponse but got {Environment.NewLine}{response}"
+    ensureDirect result <| fun data errors ->
+        empty errors
+        data |> equals (upcast expected)
 
 [<Fact>]
 let ``Introspection schema must be serializable back and forth using json`` () =
@@ -282,8 +283,7 @@ let ``Introspection schema must be serializable back and forth using json`` () =
       }
     }"""
     let result = Executor(schema).AsyncExecute(query) |> sync
-    match result with
-    | Direct (data, errors) ->
+    ensureDirect result <| fun data errors ->
         empty errors
         let additionalConverters = Seq.empty //seq { NameValueLookupConverter() :> JsonConverter }
         let json = JsonSerializer.Serialize(data, Json.getSerializerOptions additionalConverters)
@@ -296,7 +296,6 @@ let ``Introspection schema must be serializable back and forth using json`` () =
         let deserialized = JsonSerializer.Deserialize<IntrospectionResult>(json, skippableOptions)
         let expected = (schema :> ISchema).Introspected
         deserialized.__schema |> equals expected
-    | response -> fail $"Expected a Direct GQLResponse but got {Environment.NewLine}{response}"
 
 [<Fact>]
 let ``Core type definitions are considered nullable`` () =
@@ -325,11 +324,9 @@ let ``Core type definitions are considered nullable`` () =
             "kind", upcast "SCALAR"
             "name", upcast "String"
             "ofType", null]]
-    match result with
-    | Direct(data, errors) ->
-      empty errors
-      data |> equals (upcast expected)
-    | response -> fail $"Expected a Direct GQLResponse but got {Environment.NewLine}{response}"
+    ensureDirect result <| fun data errors ->
+        empty errors
+        data |> equals (upcast expected)
 
 type User = { FirstName: string; LastName: string }
 type UserInput = { Name: string }
@@ -391,11 +388,9 @@ let ``Default field type definitions are considered non-null`` () =
                             "kind", upcast "SCALAR"
                             "name", upcast "String"
                             "ofType", null]]]]]]
-    match result with
-    | Direct(data, errors) ->
-      empty errors
-      data |> equals (upcast expected)
-    | response -> fail $"Expected a Direct GQLResponse but got {Environment.NewLine}{response}"
+    ensureDirect result <| fun data errors ->
+        empty errors
+        data |> equals (upcast expected)
 
 [<Fact>]
 let ``Nullabe field type definitions are considered nullable`` () =
@@ -433,11 +428,9 @@ let ``Nullabe field type definitions are considered nullable`` () =
                         "kind", upcast "SCALAR"
                         "name", upcast "String"
                         "ofType", null]]]]]
-    match result with
-    | Direct(data, errors) ->
-      empty errors
-      data |> equals (upcast expected)
-    | response -> fail $"Expected a Direct GQLResponse but got {Environment.NewLine}{response}"
+    ensureDirect result <| fun data errors ->
+        empty errors
+        data |> equals (upcast expected)
 
 [<Fact>]
 let ``Default field args type definitions are considered non-null`` () =
@@ -482,11 +475,9 @@ let ``Default field args type definitions are considered non-null`` () =
                                     "kind", upcast "SCALAR"
                                     "name", upcast "Int"
                                     "ofType", null]]]]]]]]
-    match result with
-    | Direct(data, errors) ->
-      empty errors
-      data |> equals (upcast expected)
-    | response -> fail $"Expected a Direct GQLResponse but got {Environment.NewLine}{response}"
+    ensureDirect result <| fun data errors ->
+        empty errors
+        data |> equals (upcast expected)
 
 [<Fact>]
 let ``Nullable field args type definitions are considered nullable`` () =
@@ -528,11 +519,9 @@ let ``Nullable field args type definitions are considered nullable`` () =
                                 "kind", upcast "SCALAR"
                                 "name", upcast "Int"
                                 "ofType", null ]]]]]]]
-    match result with
-    | Direct(data, errors) ->
-      empty errors
-      data |> equals (upcast expected)
-    | response -> fail $"Expected a Direct GQLResponse but got {Environment.NewLine}{response}"
+    ensureDirect result <| fun data errors ->
+        empty errors
+        data |> equals (upcast expected)
 
 [<Fact>]
 let ``Introspection executes an introspection query`` () =
@@ -910,7 +899,7 @@ let ``Introspection executes an introspection query`` () =
                                                      "kind", upcast "SCALAR"
                                                      "name", upcast "Boolean"
                                                      "ofType", null]
-                                                   "defaultValue", upcast "False"];]
+                                                   "defaultValue", upcast "false"];]
                                       "type", upcast NameValueLookup.ofList [
                                               "kind", upcast "LIST"
                                               "name", null
@@ -934,7 +923,7 @@ let ``Introspection executes an introspection query`` () =
                                                      "kind", upcast "SCALAR"
                                                      "name", upcast "Boolean"
                                                      "ofType", null]
-                                                   "defaultValue", upcast "False"];]
+                                                   "defaultValue", upcast "false"];]
                                       "type", upcast NameValueLookup.ofList [
                                               "kind", upcast "LIST"
                                               "name", null
@@ -1410,8 +1399,6 @@ let ``Introspection executes an introspection query`` () =
                             upcast "FRAGMENT_SPREAD";
                             upcast "INLINE_FRAGMENT";]
                         "args", upcast []]]]]
-    match result with
-    | Direct(data, errors) ->
-      empty errors
-      data |> equals (upcast expected)
-    | response -> fail $"Expected a Direct GQLResponse but got {Environment.NewLine}{response}"
+    ensureDirect result <| fun data errors ->
+        empty errors
+        data |> equals (upcast expected)