fix ReadToken in GraphQLExtensionsConverter for Newtonsoft

Author: rose-a

src/GraphQL.Client.Serializer.Newtonsoft/GraphQLExtensionsConverter.cs

@@ -24,26 +24,17 @@ public override GraphQLExtensionsType ReadJson(JsonReader reader, Type objectTyp
         }
 
         private object ReadToken(JToken? token) =>
-            token.Type switch
+            token switch
             {
-                JTokenType.Undefined => null,
-                JTokenType.None => null,
-                JTokenType.Null => null,
-                JTokenType.Object => ReadDictionary<Dictionary<string, object>>(token),
-                JTokenType.Array => ReadArray(token),
-                JTokenType.Integer => token.Value<int>(),
-                JTokenType.Float => token.Value<double>(),
-                JTokenType.Raw => token.Value<string>(),
-                JTokenType.String => token.Value<string>(),
-                JTokenType.Uri => token.Value<string>(),
-                JTokenType.Boolean => token.Value<bool>(),
-                JTokenType.Date => token.Value<DateTime>(),
-                JTokenType.Bytes => token.Value<byte[]>(),
-                JTokenType.Guid => token.Value<Guid>(),
-                JTokenType.TimeSpan => token.Value<TimeSpan>(),
-                JTokenType.Constructor => throw new ArgumentOutOfRangeException(nameof(token.Type), "cannot deserialize a JSON constructor"),
-                JTokenType.Property => throw new ArgumentOutOfRangeException(nameof(token.Type), "cannot deserialize a JSON property"),
-                JTokenType.Comment => throw new ArgumentOutOfRangeException(nameof(token.Type), "cannot deserialize a JSON comment"),
+                JObject jObject => ReadDictionary<Dictionary<string, object>>(jObject),
+                JArray jArray => ReadArray(jArray),
+                JValue jValue => jValue.Value,
+                JConstructor _ => throw new ArgumentOutOfRangeException(nameof(token.Type),
+                    "cannot deserialize a JSON constructor"),
+                JProperty _ => throw new ArgumentOutOfRangeException(nameof(token.Type),
+                    "cannot deserialize a JSON property"),
+                JContainer _ => throw new ArgumentOutOfRangeException(nameof(token.Type),
+                    "cannot deserialize a JSON comment"),
                 _ => throw new ArgumentOutOfRangeException(nameof(token.Type))
             };
 
@@ -69,6 +60,8 @@ private IEnumerable<object> ReadArray(JToken element)
             }
         }
 
+        private object ReadNumber(JToken token) => ((JValue) token).Value;
+
         private bool IsUnsupportedJTokenType(JTokenType type) => type == JTokenType.Constructor || type == JTokenType.Property || type == JTokenType.Comment;
     }
 }

tests/GraphQL.Client.Tests.Common/Chat/Schema/ChatQuery.cs

@@ -10,7 +10,8 @@ public class ChatQuery : ObjectGraphType
 
         public static readonly Dictionary<string, object> TestExtensions = new Dictionary<string, object> {
             {"extension1", "hello world"},
-            {"another extension", 4711}
+            {"another extension", 4711},
+            {"long", 19942590700}
         };
 
         // properties for unit testing