Fixed issue with composite type detection on select (#7376)

ChilliCream · Aug 16, 2024 · 7b81b8c · 7b81b8c
1 parent 0f437f5
commit 7b81b8c
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 7 deletions.
diff --git a/src/HotChocolate/Core/src/Execution/Processing/SelectionCollection.cs b/src/HotChocolate/Core/src/Execution/Processing/SelectionCollection.cs
@@ -76,13 +76,13 @@ public bool IsSelected(string fieldName)
 
         while (Unsafe.IsAddressLessThan(ref start, ref end))
         {
-            if (!start.Type.IsCompositeType())
+            var namedType = start.Type.NamedType();
+
+            if (!namedType.IsCompositeType())
             {
                 return false;
             }
 
-            var namedType = start.Type.NamedType();
-
             if (namedType.IsAbstractType())
             {
                 foreach (var possibleType in _schema.GetPossibleTypes(namedType))
@@ -428,13 +428,13 @@ private bool CollectSelections(
 
         while (Unsafe.IsAddressLessThan(ref start, ref end))
         {
-            if (!start.Type.IsCompositeType())
+            var namedType = start.Type.NamedType();
+
+            if (!namedType.IsCompositeType())
             {
                 goto NEXT;
             }
 
-            var namedType = start.Type.NamedType();
-
             if (namedType.IsAbstractType())
             {
                 foreach (var possibleType in _schema.GetPossibleTypes(namedType))

diff --git a/src/HotChocolate/Core/test/Types.Tests/Resolvers/IsSelectedTests.cs b/src/HotChocolate/Core/test/Types.Tests/Resolvers/IsSelectedTests.cs
@@ -719,6 +719,59 @@ public async Task Select_Category_Level_1()
         result.MatchMarkdownSnapshot();
     }
 
+    [Fact]
+    public async Task Traverse_With_Select()
+    {
+        var result =
+            await new ServiceCollection()
+                .AddGraphQL()
+                .AddQueryType(
+                    c =>
+                    {
+                        c.Name("Query");
+                        c.Field("user")
+                            .Resolve(
+                                ctx =>
+                                {
+                                    var isTagsOnContext = ctx.IsSelected("tags");
+                                    var collection = ctx.Select("tags");
+                                    var isAuditOnTagsCollection = collection.IsSelected("audit");
+                                    collection = collection.Select("audit");
+                                    var isEditedByOnAudiCollection = collection.IsSelected("editedBy");
+                                    var operationResult = ((IMiddlewareContext)ctx).OperationResult;
+
+                                    operationResult.SetExtension(
+                                        nameof(isTagsOnContext),
+                                        isTagsOnContext);
+                                    operationResult.SetExtension(
+                                        nameof(isAuditOnTagsCollection),
+                                        isAuditOnTagsCollection);
+                                    operationResult.SetExtension(
+                                        nameof(isEditedByOnAudiCollection),
+                                        isEditedByOnAudiCollection);
+
+                                    return Query.DummyUser;
+                                });
+                    })
+                .ExecuteRequestAsync(
+                    """
+                    query {
+                        user {
+                            name
+                            tags {
+                                value
+                                name
+                                audit {
+                                    editedBy
+                                }
+                            }
+                        }
+                    }
+                    """);
+
+        result.MatchMarkdownSnapshot();
+    }
+
     [Fact]
     public async Task Select_Category_Level_2()
     {
@@ -996,6 +1049,7 @@ public class User
         public string City { get; set; }
 
         public Category Category { get; set; }
+        public List<UserTag> Tags { get; set; }
     }
 
     public class Category
@@ -1004,4 +1058,17 @@ public class Category
 
         public Category Next { get; set; }
     }
+
+    public class UserTag
+    {
+        public string Name { get; set; }
+        public int Value { get; set; }
+        public Audit Audit { get; set; }
+    }
+
+    public class Audit
+    {
+        public string EditedBy { get; set; }
+        public string EditedAt { get; set; }
+    }
 }
diff --git a/...est/Types.Tests/Resolvers/__snapshots__/IsSelectedTests.Traverse_With_Select.md b/...est/Types.Tests/Resolvers/__snapshots__/IsSelectedTests.Traverse_With_Select.md
@@ -0,0 +1,17 @@
+# Traverse_With_Select
+
+```json
+{
+  "data": {
+    "user": {
+      "name": "a",
+      "tags": null
+    }
+  },
+  "extensions": {
+    "isTagsOnContext": true,
+    "isAuditOnTagsCollection": true,
+    "isEditedByOnAudiCollection": true
+  }
+}
+```
diff --git a/...tChocolate/Data/src/Data/Projections/Context/ResolverContextSelectionContextExtensions.cs b/...tChocolate/Data/src/Data/Projections/Context/ResolverContextSelectionContextExtensions.cs
@@ -14,5 +14,5 @@ public static class ResolverContextSelectionExtensions
     /// <param name="context">The resolver context</param>
     /// Returns the <see cref="ISelectedField"/> of the current resolver.
     public static ISelectedField GetSelectedField(this IResolverContext context)
-        => new SelectedField(context, (ISelection)context.Selection);
+        => new SelectedField(context, context.Selection);
 }