Release v4

src/GraphQL.Client.LocalExecution/GraphQL.Client.LocalExecution.csproj

@@ -8,9 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL" Version="2.4.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="System.Reactive.Compatibility" Version="4.3.2" />
+    <PackageReference Include="GraphQL" Version="4.6.0" />
+    <PackageReference Include="GraphQL.NewtonsoftJson" Version="4.6.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
   <ItemGroup>

src/GraphQL.Client.LocalExecution/GraphQLLocalExecutionClient.cs

@@ -9,6 +9,7 @@
 using System.Threading.Tasks;
 using GraphQL.Client.Abstractions;
 using GraphQL.Client.Serializer.Newtonsoft;
+using GraphQL.NewtonsoftJson;
 using GraphQL.Subscription;
 using GraphQL.Types;
 using Newtonsoft.Json;
@@ -41,6 +42,7 @@ public class GraphQLLocalExecutionClient<TSchema> : IGraphQLClient where TSchema
         public IGraphQLJsonSerializer Serializer { get; }
 
         private readonly DocumentExecuter _documentExecuter;
+        private readonly DocumentWriter _documentWriter;
 
         public GraphQLLocalExecutionClient(TSchema schema, IGraphQLJsonSerializer serializer)
         {
@@ -50,6 +52,7 @@ public GraphQLLocalExecutionClient(TSchema schema, IGraphQLJsonSerializer serial
             if (!Schema.Initialized)
                 Schema.Initialize();
             _documentExecuter = new DocumentExecuter();
+            _documentWriter = new DocumentWriter();
         }
 
         public void Dispose() { }
@@ -109,12 +112,13 @@ private async Task<ExecutionResult> ExecuteAsync(GraphQLRequest request, Cancell
             return result;
         }
 
-        private Task<GraphQLResponse<TResponse>> ExecutionResultToGraphQLResponse<TResponse>(ExecutionResult executionResult, CancellationToken cancellationToken = default)
+        private async Task<GraphQLResponse<TResponse>> ExecutionResultToGraphQLResponse<TResponse>(ExecutionResult executionResult, CancellationToken cancellationToken = default)
         {
+            string json = await _documentWriter.WriteToStringAsync(executionResult);
             // serialize result into utf8 byte stream
-            var resultStream = new MemoryStream(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(executionResult, _variablesSerializerSettings)));
+            var resultStream = new MemoryStream(Encoding.UTF8.GetBytes(json));
             // deserialize using the provided serializer
-            return Serializer.DeserializeFromUtf8StreamAsync<TResponse>(resultStream, cancellationToken);
+            return await Serializer.DeserializeFromUtf8StreamAsync<TResponse>(resultStream, cancellationToken);
         }
 
         #endregion

tests/GraphQL.Client.Serializer.Tests/BaseSerializerTest.cs

@@ -16,6 +16,7 @@
 using GraphQL.Client.Tests.Common.Chat.Schema;
 using GraphQL.Client.Tests.Common.Helpers;
 using GraphQL.Client.Tests.Common.StarWars;
+using GraphQL.Client.Tests.Common.StarWars.TestData;
 using Xunit;
 
 namespace GraphQL.Client.Serializer.Tests

tests/GraphQL.Client.Tests.Common/Chat/AddMessageVariables.cs

@@ -12,7 +12,7 @@ public class AddMessageInput
 
             public string Content { get; set; }
 
-            public DateTime SentAt { get; set; }
+            public string SentAt { get; set; }
         }
     }
 }

tests/GraphQL.Client.Tests.Common/Chat/GraphQLClientChatExtensions.cs

@@ -10,7 +10,7 @@ public static class GraphQLClientChatExtensions
 @"mutation($input: MessageInputType){
   addMessage(message: $input){
     content
-  }  
+  }
 }";
 
         public static Task<GraphQLResponse<AddMessageMutationResult>> AddMessageAsync(this IGraphQLClient client, string message)
@@ -21,7 +21,7 @@ public static Task<GraphQLResponse<AddMessageMutationResult>> AddMessageAsync(th
                 {
                     FromId = "2",
                     Content = message,
-                    SentAt = DateTime.Now
+                    SentAt = DateTime.Now.ToString("s")
                 }
             };
 

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

@@ -36,7 +36,7 @@ public MessageInputType()
         {
             Field<StringGraphType>("fromId");
             Field<StringGraphType>("content");
-            Field<DateGraphType>("sentAt");
+            Field<DateTimeGraphType>("sentAt");
         }
     }
 }

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

@@ -1,13 +1,16 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+
 namespace GraphQL.Client.Tests.Common.Chat.Schema
 {
     public class ChatSchema : Types.Schema
     {
-        public ChatSchema(IDependencyResolver resolver)
-            : base(resolver)
+        public ChatSchema(IServiceProvider services)
+            : base(services)
         {
-            Query = resolver.Resolve<ChatQuery>();
-            Mutation = resolver.Resolve<ChatMutation>();
-            Subscription = resolver.Resolve<ChatSubscriptions>();
+            Query = services.GetRequiredService<ChatQuery>();
+            Mutation = services.GetRequiredService<ChatMutation>();
+            Subscription = services.GetRequiredService<ChatSubscriptions>();
         }
     }
 }

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

@@ -61,9 +61,9 @@ public ChatSubscriptions(IChat chat)
             });
         }
 
-        private IObservable<Message> SubscribeById(ResolveEventStreamContext context)
+        private IObservable<Message> SubscribeById(IResolveEventStreamContext context)
         {
-            var messageContext = context.UserContext.As<MessageHandlingContext>();
+            var messageContext = (MessageHandlingContext) context.UserContext;
             var user = messageContext.Get<ClaimsPrincipal>("user");
 
             var sub = "Anonymous";
@@ -76,16 +76,16 @@ private IObservable<Message> SubscribeById(ResolveEventStreamContext context)
             return messages.Where(message => message.From.Id == id);
         }
 
-        private Message ResolveMessage(ResolveFieldContext context)
+        private Message ResolveMessage(IResolveFieldContext context)
         {
             var message = context.Source as Message;
 
             return message;
         }
 
-        private IObservable<Message> Subscribe(ResolveEventStreamContext context)
+        private IObservable<Message> Subscribe(IResolveEventStreamContext context)
         {
-            var messageContext = context.UserContext.As<MessageHandlingContext>();
+            var messageContext = (MessageHandlingContext) context.UserContext;
             var user = messageContext.Get<ClaimsPrincipal>("user");
 
             var sub = "Anonymous";

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

@@ -12,7 +12,7 @@ public MessageType()
             Field(o => o.From, false, typeof(MessageFromType)).Resolve(ResolveFrom);
         }
 
-        private MessageFrom ResolveFrom(ResolveFieldContext<Message> context)
+        private MessageFrom ResolveFrom(IResolveFieldContext<Message> context)
         {
             var message = context.Source;
             return message.From;

tests/GraphQL.Client.Tests.Common/Common.cs

@@ -1,6 +1,6 @@
 using GraphQL.Client.Tests.Common.Chat.Schema;
-using GraphQL.StarWars;
-using GraphQL.StarWars.Types;
+using GraphQL.Client.Tests.Common.StarWars;
+using GraphQL.Client.Tests.Common.StarWars.Types;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace GraphQL.Client.Tests.Common
@@ -13,15 +13,13 @@ public static class Common
         public static StarWarsSchema GetStarWarsSchema()
         {
             var services = new ServiceCollection();
-            services.AddTransient<IDependencyResolver>(provider => new FuncDependencyResolver(provider.GetService));
             services.AddStarWarsSchema();
             return services.BuildServiceProvider().GetRequiredService<StarWarsSchema>();
         }
 
         public static ChatSchema GetChatSchema()
         {
             var services = new ServiceCollection();
-            services.AddTransient<IDependencyResolver>(provider => new FuncDependencyResolver(provider.GetService));
             services.AddChatSchema();
             return services.BuildServiceProvider().GetRequiredService<ChatSchema>();
         }

tests/GraphQL.Client.Tests.Common/GraphQL.Client.Tests.Common.csproj

@@ -7,13 +7,10 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="GraphQL" Version="2.4.0" />
-    <PackageReference Include="GraphQL.Server.Transports.Subscriptions.Abstractions" Version="3.4.0" />
-    <PackageReference Include="GraphQL.StarWars" Version="1.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Reactive.Testing" Version="4.3.2" />
-    <PackageReference Include="System.Reactive" Version="4.3.2" />
-    <PackageReference Include="System.Reactive.Compatibility" Version="4.3.2" />
+    <PackageReference Include="GraphQL" Version="4.6.0" />
+    <PackageReference Include="GraphQL.Server.Transports.Subscriptions.Abstractions" Version="5.0.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
+    <PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>

tests/GraphQL.Client.Tests.Common/StarWars/Extensions/ResolveFieldContextExtensions.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using GraphQL.Builders;
+using GraphQL.Client.Tests.Common.StarWars.Types;
+using GraphQL.Types.Relay.DataObjects;
+
+namespace GraphQL.Client.Tests.Common.StarWars.Extensions
+{
+    public static class ResolveFieldContextExtensions
+    {
+        public static Connection<U> GetPagedResults<T, U>(this IResolveConnectionContext<T> context, StarWarsData data, List<string> ids) where U : StarWarsCharacter
+        {
+            List<string> idList;
+            List<U> list;
+            string cursor;
+            string endCursor;
+            var pageSize = context.PageSize ?? 20;
+
+            if (context.IsUnidirectional || context.After != null || context.Before == null)
+            {
+                if (context.After != null)
+                {
+                    idList = ids
+                        .SkipWhile(x => !Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(x)).Equals(context.After))
+                        .Take(context.First ?? pageSize).ToList();
+                }
+                else
+                {
+                    idList = ids
+                        .Take(context.First ?? pageSize).ToList();
+                }
+            }
+            else
+            {
+                if (context.Before != null)
+                {
+                    idList = ids.Reverse<string>()
+                        .SkipWhile(x => !Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(x)).Equals(context.Before))
+                        .Take(context.Last ?? pageSize).ToList();
+                }
+                else
+                {
+                    idList = ids.Reverse<string>()
+                        .Take(context.Last ?? pageSize).ToList();
+                }
+            }
+
+            list = data.GetCharactersAsync(idList).Result as List<U> ?? throw new InvalidOperationException($"GetCharactersAsync method should return list of '{typeof(U).Name}' items.");
+            cursor = list.Count > 0 ? list.Last().Cursor : null;
+            endCursor = ids.Count > 0 ? Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(ids.Last())) : null;
+
+            return new Connection<U>
+            {
+                Edges = list.Select(x => new Edge<U> { Cursor = x.Cursor, Node = x }).ToList(),
+                TotalCount = list.Count,
+                PageInfo = new PageInfo
+                {
+                    EndCursor = endCursor,
+                    HasNextPage = endCursor == null ? false : cursor != endCursor,
+                }
+            };
+        }
+    }
+}

tests/GraphQL.Client.Tests.Common/StarWars/StarWarsData.cs

@@ -0,0 +1,90 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using GraphQL.Client.Tests.Common.StarWars.Types;
+
+namespace GraphQL.Client.Tests.Common.StarWars
+{
+    public class StarWarsData
+    {
+        private readonly List<StarWarsCharacter> _characters = new List<StarWarsCharacter>();
+
+        public StarWarsData()
+        {
+            _characters.Add(new Human
+            {
+                Id = "1",
+                Name = "Luke",
+                Friends = new List<string> { "3", "4" },
+                AppearsIn = new[] { 4, 5, 6 },
+                HomePlanet = "Tatooine",
+                Cursor = "MQ=="
+            });
+            _characters.Add(new Human
+            {
+                Id = "2",
+                Name = "Vader",
+                AppearsIn = new[] { 4, 5, 6 },
+                HomePlanet = "Tatooine",
+                Cursor = "Mg=="
+            });
+
+            _characters.Add(new Droid
+            {
+                Id = "3",
+                Name = "R2-D2",
+                Friends = new List<string> { "1", "4" },
+                AppearsIn = new[] { 4, 5, 6 },
+                PrimaryFunction = "Astromech",
+                Cursor = "Mw=="
+            });
+            _characters.Add(new Droid
+            {
+                Id = "4",
+                Name = "C-3PO",
+                AppearsIn = new[] { 4, 5, 6 },
+                PrimaryFunction = "Protocol",
+                Cursor = "NA=="
+            });
+        }
+
+        public IEnumerable<StarWarsCharacter> GetFriends(StarWarsCharacter character)
+        {
+            if (character == null)
+            {
+                return null;
+            }
+
+            var friends = new List<StarWarsCharacter>();
+            var lookup = character.Friends;
+            if (lookup != null)
+            {
+                foreach (var c in _characters.Where(h => lookup.Contains(h.Id)))
+                    friends.Add(c);
+            }
+            return friends;
+        }
+
+        public StarWarsCharacter AddCharacter(StarWarsCharacter character)
+        {
+            character.Id = _characters.Count.ToString();
+            _characters.Add(character);
+            return character;
+        }
+
+        public Task<Human> GetHumanByIdAsync(string id)
+        {
+            return Task.FromResult(_characters.FirstOrDefault(h => h.Id == id && h is Human) as Human);
+        }
+
+        public Task<Droid> GetDroidByIdAsync(string id)
+        {
+            return Task.FromResult(_characters.FirstOrDefault(h => h.Id == id && h is Droid) as Droid);
+        }
+
+        public Task<List<StarWarsCharacter>> GetCharactersAsync(List<string> guids)
+        {
+            return Task.FromResult(_characters.Where(c => guids.Contains(c.Id)).ToList());
+        }
+    }
+}

tests/GraphQL.Client.Tests.Common/StarWars/StarWarsMutation.cs

@@ -0,0 +1,35 @@
+using GraphQL.Client.Tests.Common.StarWars.Types;
+using GraphQL.Types;
+
+namespace GraphQL.Client.Tests.Common.StarWars
+{
+    /// <example>
+    /// This is an example JSON request for a mutation
+    /// {
+    ///   "query": "mutation ($human:HumanInput!){ createHuman(human: $human) { id name } }",
+    ///   "variables": {
+    ///     "human": {
+    ///       "name": "Boba Fett"
+    ///     }
+    ///   }
+    /// }
+    /// </example>
+    public class StarWarsMutation : ObjectGraphType<object>
+    {
+        public StarWarsMutation(StarWarsData data)
+        {
+            Name = "Mutation";
+
+            Field<HumanType>(
+                "createHuman",
+                arguments: new QueryArguments(
+                    new QueryArgument<NonNullGraphType<HumanInputType>> { Name = "human" }
+                ),
+                resolve: context =>
+                {
+                    var human = context.GetArgument<Human>("human");
+                    return data.AddCharacter(human);
+                });
+        }
+    }
+}