Merge branch 'develop' into patch-1

ChilliCream · Oct 16, 2020 · c508b34 · c508b34
2 parents 02d6789 + 911db2a
commit c508b34
Show file tree

Hide file tree

Showing 26 changed files with 367 additions and 21 deletions.
diff --git a/src/HotChocolate/Core/src/Types/Types/Relay/Extensions/NodeObjectTypeExtensions.cs b/src/HotChocolate/Core/src/Types/Types/Relay/Extensions/NodeObjectTypeExtensions.cs
@@ -27,12 +27,12 @@ public static class NodeObjectTypeExtensions
             return new NodeDescriptor<T>(descriptor);
         }
 
-        [Obsolete("Use ImplementNode.")]
+        [Obsolete("Use ImplementsNode.")]
         public static INodeDescriptor AsNode(
             this IObjectTypeDescriptor descriptor) =>
             ImplementsNode(descriptor);
 
-        [Obsolete("Use ImplementNode.")]
+        [Obsolete("Use ImplementsNode.")]
         public static INodeDescriptor<T> AsNode<T>(
             this IObjectTypeDescriptor<T> descriptor) =>
             ImplementsNode<T>(descriptor);

diff --git a/src/HotChocolate/Data/src/Data/Sorting/Expressions/QueryableSortProvider.cs b/src/HotChocolate/Data/src/Data/Sorting/Expressions/QueryableSortProvider.cs
@@ -56,7 +56,9 @@ public override FieldMiddleware CreateExecutor<TEntityType>(NameString argumentN
                     source = e.AsQueryable();
                 }
 
-                if (source != null && argument.Type is ISortInputType sortInput)
+                if (source != null &&
+                    argument.Type is ListType lt &&
+                    lt.ElementType is ISortInputType sortInput)
                 {
                     var visitorContext = new QueryableSortContext(
                         sortInput,

diff --git a/src/HotChocolate/Data/src/Data/Sorting/Extensions/SortObjectFieldDescriptorExtensions.cs b/src/HotChocolate/Data/src/Data/Sorting/Extensions/SortObjectFieldDescriptorExtensions.cs
@@ -167,6 +167,8 @@ public static class SortObjectFieldDescriptorExtensions
                         throw SortObjectFieldDescriptorExtensions_CannotInfer();
                     }
 
+                    argumentType = typeof(ListType<>).MakeGenericType(argumentType);
+
                     var argumentDefinition = new ArgumentDefinition
                     {
                         Name = argumentPlaceholder,

diff --git a/src/HotChocolate/Data/src/Data/Sorting/Visitor/SortVisitorBase`2.cs b/src/HotChocolate/Data/src/Data/Sorting/Visitor/SortVisitorBase`2.cs
@@ -87,7 +87,7 @@ protected override ISyntaxVisitorAction Enter(IValueNode node, TContext context)
             }
             else
             {
-                throw new InvalidOperationException();
+                return Continue;
             }
 
             return Break;
@@ -104,7 +104,7 @@ protected override ISyntaxVisitorAction Enter(IValueNode node, TContext context)
             }
             else
             {
-                throw new InvalidOperationException();
+                return Continue;
             }
 
             return Break;

diff --git a/src/HotChocolate/Data/test/Data.Sorting.InMemory.Tests/QueryableSortVisitorBooleanTests.cs b/src/HotChocolate/Data/test/Data.Sorting.InMemory.Tests/QueryableSortVisitorBooleanTests.cs
@@ -51,6 +51,28 @@ public async Task Create_Boolean_OrderBy()
             res2.MatchSnapshot("DESC");
         }
 
+        [Fact]
+        public async Task Create_Boolean_OrderBy_List()
+        {
+            // arrange
+            IRequestExecutor tester = _cache.CreateSchema<Foo, FooSortType>(_fooEntities);
+
+            // act
+            IExecutionResult res1 = await tester.ExecuteAsync(
+                QueryRequestBuilder.New()
+                    .SetQuery("{ root(order: [{ bar: ASC}]){ bar}}")
+                    .Create());
+
+            IExecutionResult res2 = await tester.ExecuteAsync(
+                QueryRequestBuilder.New()
+                    .SetQuery("{ root(order: [{ bar: DESC}]){ bar}}")
+                    .Create());
+
+            // assert
+            res1.MatchSnapshot("ASC");
+            res2.MatchSnapshot("DESC");
+        }
+
         [Fact]
         public async Task Create_Boolean_OrderBy_Nullable()
         {

diff --git a/src/HotChocolate/Data/test/Data.Sorting.InMemory.Tests/QueryableSortVisitorObjectTests.cs b/src/HotChocolate/Data/test/Data.Sorting.InMemory.Tests/QueryableSortVisitorObjectTests.cs
@@ -273,6 +273,7 @@ public async Task Create_ObjectNullableEnum_OrderBy()
 
             res2.MatchSnapshot("13");
         }
+
         [Fact]
         public async Task Create_ObjectString_OrderBy()
         {
@@ -327,6 +328,7 @@ public async Task Create_ObjectNullableString_OrderBy()
 
             res2.MatchSnapshot("13");
         }
+
         [Fact]
         public async Task Create_ObjectBool_OrderBy()
         {
@@ -382,6 +384,71 @@ public async Task Create_ObjectNullableBool_OrderBy()
             res2.MatchSnapshot("13");
         }
 
+        [Fact]
+        public async Task Create_ObjectString_OrderBy_TwoProperties()
+        {
+            // arrange
+            IRequestExecutor tester = _cache.CreateSchema<Bar, BarSortType>(_barEntities);
+
+            // act
+            // assert
+            IExecutionResult res1 = await tester.ExecuteAsync(
+                QueryRequestBuilder.New()
+                    .SetQuery(
+                        "{ root(order: { foo: { barBool: ASC, barShort: ASC }}) " +
+                        "{ foo{ barBool barShort}}}")
+                    .Create());
+
+            res1.MatchSnapshot("ASC");
+
+            IExecutionResult res2 = await tester.ExecuteAsync(
+                QueryRequestBuilder.New()
+                    .SetQuery(
+                        @"
+                        {
+                            root(order: [
+                                { foo: { barBool: ASC } },
+                                { foo: { barShort: ASC } }]) {
+                                foo {
+                                    barBool
+                                    barShort
+                                }
+                            }
+                        }
+                        ")
+                    .Create());
+
+            res2.MatchSnapshot("ASC");
+
+            IExecutionResult res3 = await tester.ExecuteAsync(
+                QueryRequestBuilder.New()
+                    .SetQuery(
+                        "{ root(order: { foo: { barBool: DESC, barShort: DESC}}) " +
+                        "{ foo{ barBool barShort}}}")
+                    .Create());
+
+            res3.MatchSnapshot("DESC");
+
+            IExecutionResult res4 = await tester.ExecuteAsync(
+                QueryRequestBuilder.New()
+                    .SetQuery(
+                        @"
+                        {
+                            root(order: [
+                                { foo: { barBool: DESC } },
+                                { foo: { barShort: DESC } }]) {
+                                foo {
+                                    barBool
+                                    barShort
+                                }
+                            }
+                        }
+                        ")
+                    .Create());
+
+            res4.MatchSnapshot("DESC");
+        }
+
         public class Foo
         {
             public int Id { get; set; }

diff --git a/...Tests/__snapshots__/QueryableSortVisitorBooleanTests.Create_Boolean_OrderBy_List_ASC.snap b/...Tests/__snapshots__/QueryableSortVisitorBooleanTests.Create_Boolean_OrderBy_List_ASC.snap
@@ -0,0 +1,12 @@
+{
+  "data": {
+    "root": [
+      {
+        "bar": false
+      },
+      {
+        "bar": true
+      }
+    ]
+  }
+}
diff --git a/...ests/__snapshots__/QueryableSortVisitorBooleanTests.Create_Boolean_OrderBy_List_DESC.snap b/...ests/__snapshots__/QueryableSortVisitorBooleanTests.Create_Boolean_OrderBy_List_DESC.snap
@@ -0,0 +1,12 @@
+{
+  "data": {
+    "root": [
+      {
+        "bar": true
+      },
+      {
+        "bar": false
+      }
+    ]
+  }
+}
diff --git a/...hots__/QueryableSortVisitorObjectTests.Create_ObjectString_OrderBy_TwoProperties_ASC.snap b/...hots__/QueryableSortVisitorObjectTests.Create_ObjectString_OrderBy_TwoProperties_ASC.snap
@@ -0,0 +1,24 @@
+{
+  "data": {
+    "root": [
+      {
+        "foo": {
+          "barBool": false,
+          "barShort": 13
+        }
+      },
+      {
+        "foo": {
+          "barBool": true,
+          "barShort": 12
+        }
+      },
+      {
+        "foo": {
+          "barBool": true,
+          "barShort": 14
+        }
+      }
+    ]
+  }
+}
diff --git a/...ots__/QueryableSortVisitorObjectTests.Create_ObjectString_OrderBy_TwoProperties_DESC.snap b/...ots__/QueryableSortVisitorObjectTests.Create_ObjectString_OrderBy_TwoProperties_DESC.snap
@@ -0,0 +1,24 @@
+{
+  "data": {
+    "root": [
+      {
+        "foo": {
+          "barBool": true,
+          "barShort": 14
+        }
+      },
+      {
+        "foo": {
+          "barBool": true,
+          "barShort": 12
+        }
+      },
+      {
+        "foo": {
+          "barBool": false,
+          "barShort": 13
+        }
+      }
+    ]
+  }
+}
diff --git a/src/HotChocolate/Data/test/Data.Sorting.SqlLite.Tests/QueryableSortVisitorBooleanTests.cs b/src/HotChocolate/Data/test/Data.Sorting.SqlLite.Tests/QueryableSortVisitorBooleanTests.cs
@@ -5,14 +5,12 @@
 
 namespace HotChocolate.Data.Sorting
 {
-
     public class QueryableSortVisitorBooleanTests
         : IClassFixture<SchemaCache>
     {
         private static readonly Foo[] _fooEntities =
         {
-            new Foo { Bar = true },
-            new Foo { Bar = false }
+            new Foo { Bar = true }, new Foo { Bar = false }
         };
 
         private static readonly FooNullable[] _fooNullableEntities =
@@ -52,6 +50,28 @@ public async Task Create_Boolean_OrderBy()
             res2.MatchSqlSnapshot("DESC");
         }
 
+        [Fact]
+        public async Task Create_Boolean_OrderBy_List()
+        {
+            // arrange
+            IRequestExecutor tester = _cache.CreateSchema<Foo, FooSortType>(_fooEntities);
+
+            // act
+            IExecutionResult res1 = await tester.ExecuteAsync(
+                QueryRequestBuilder.New()
+                    .SetQuery("{ root(order: [{ bar: ASC}]){ bar}}")
+                    .Create());
+
+            IExecutionResult res2 = await tester.ExecuteAsync(
+                QueryRequestBuilder.New()
+                    .SetQuery("{ root(order: [{ bar: DESC}]){ bar}}")
+                    .Create());
+
+            // assert
+            res1.MatchSnapshot("ASC");
+            res2.MatchSnapshot("DESC");
+        }
+
         [Fact]
         public async Task Create_Boolean_OrderBy_Nullable()
         {

diff --git a/src/HotChocolate/Data/test/Data.Sorting.SqlLite.Tests/QueryableSortVisitorObjectTests.cs b/src/HotChocolate/Data/test/Data.Sorting.SqlLite.Tests/QueryableSortVisitorObjectTests.cs
@@ -358,7 +358,7 @@ public async Task Create_ObjectNullableBool_OrderBy()
                     .SetQuery(
                         "{ root(order: { foo: { barBool: ASC}}) " +
                         "{ foo{ barBool}}}")
-                    .Create());            
+                    .Create());
 
             IExecutionResult res2 = await tester.ExecuteAsync(
                 QueryRequestBuilder.New()
@@ -372,6 +372,71 @@ public async Task Create_ObjectNullableBool_OrderBy()
             res2.MatchSqlSnapshot("13");
         }
 
+        [Fact]
+        public async Task Create_ObjectString_OrderBy_TwoProperties()
+        {
+            // arrange
+            IRequestExecutor tester = _cache.CreateSchema<Bar, BarSortType>(_barEntities);
+
+            // act
+            // assert
+            IExecutionResult res1 = await tester.ExecuteAsync(
+                QueryRequestBuilder.New()
+                    .SetQuery(
+                        "{ root(order: { foo: { barBool: ASC, barShort: ASC }}) " +
+                        "{ foo{ barBool barShort}}}")
+                    .Create());
+
+            res1.MatchSnapshot("ASC");
+
+            IExecutionResult res2 = await tester.ExecuteAsync(
+                QueryRequestBuilder.New()
+                    .SetQuery(
+                        @"
+                        {
+                            root(order: [
+                                { foo: { barBool: ASC } },
+                                { foo: { barShort: ASC } }]) {
+                                foo {
+                                    barBool
+                                    barShort
+                                }
+                            }
+                        }
+                        ")
+                    .Create());
+
+            res2.MatchSnapshot("ASC");
+
+            IExecutionResult res3 = await tester.ExecuteAsync(
+                QueryRequestBuilder.New()
+                    .SetQuery(
+                        "{ root(order: { foo: { barBool: DESC, barShort: DESC}}) " +
+                        "{ foo{ barBool barShort}}}")
+                    .Create());
+
+            res3.MatchSnapshot("DESC");
+
+            IExecutionResult res4 = await tester.ExecuteAsync(
+                QueryRequestBuilder.New()
+                    .SetQuery(
+                        @"
+                        {
+                            root(order: [
+                                { foo: { barBool: DESC } },
+                                { foo: { barShort: DESC } }]) {
+                                foo {
+                                    barBool
+                                    barShort
+                                }
+                            }
+                        }
+                        ")
+                    .Create());
+
+            res4.MatchSnapshot("DESC");
+        }
+
         public class Foo
         {
             public int Id { get; set; }

diff --git a/...Tests/__snapshots__/QueryableSortVisitorBooleanTests.Create_Boolean_OrderBy_List_ASC.snap b/...Tests/__snapshots__/QueryableSortVisitorBooleanTests.Create_Boolean_OrderBy_List_ASC.snap
@@ -0,0 +1,12 @@
+{
+  "data": {
+    "root": [
+      {
+        "bar": false
+      },
+      {
+        "bar": true
+      }
+    ]
+  }
+}
diff --git a/...ests/__snapshots__/QueryableSortVisitorBooleanTests.Create_Boolean_OrderBy_List_DESC.snap b/...ests/__snapshots__/QueryableSortVisitorBooleanTests.Create_Boolean_OrderBy_List_DESC.snap
@@ -0,0 +1,12 @@
+{
+  "data": {
+    "root": [
+      {
+        "bar": true
+      },
+      {
+        "bar": false
+      }
+    ]
+  }
+}