Fixed issues with IsSelected and composite lists. (#7941)

ChilliCream · Jan 22, 2025 · 40af4af · 40af4af
1 parent 2d9d70e
commit 40af4af
Show file tree

Hide file tree

Showing 4 changed files with 112 additions and 12 deletions.
diff --git a/src/HotChocolate/Core/src/Types/Extensions/ResolverContextExtensions.cs b/src/HotChocolate/Core/src/Types/Extensions/ResolverContextExtensions.cs
@@ -662,13 +662,13 @@ public static bool IsSelected(this IResolverContext context, string fieldName)
                 nameof(fieldName));
         }
 
-        if (!context.Selection.Type.IsCompositeType())
+        var namedType = context.Selection.Type.NamedType();
+
+        if (!namedType.IsCompositeType())
         {
             return false;
         }
 
-        var namedType = context.Selection.Type.NamedType();
-
         if (namedType.IsAbstractType())
         {
             foreach (var possibleType in context.Schema.GetPossibleTypes(namedType))
@@ -741,13 +741,13 @@ public static bool IsSelected(this IResolverContext context, string fieldName1,
                 nameof(fieldName2));
         }
 
-        if (!context.Selection.Type.IsCompositeType())
+        var namedType = context.Selection.Type.NamedType();
+
+        if (!namedType.IsCompositeType())
         {
             return false;
         }
 
-        var namedType = context.Selection.Type.NamedType();
-
         if (namedType.IsAbstractType())
         {
             foreach (var possibleType in context.Schema.GetPossibleTypes(namedType))
@@ -839,13 +839,13 @@ public static bool IsSelected(
                 nameof(fieldName3));
         }
 
-        if (!context.Selection.Type.IsCompositeType())
+        var namedType = context.Selection.Type.NamedType();
+
+        if (!namedType.IsCompositeType())
         {
             return false;
         }
 
-        var namedType = context.Selection.Type.NamedType();
-
         if (namedType.IsAbstractType())
         {
             foreach (var possibleType in context.Schema.GetPossibleTypes(namedType))
@@ -913,13 +913,13 @@ public static bool IsSelected(
             throw new ArgumentNullException(nameof(fieldNames));
         }
 
-        if (!context.Selection.Type.IsCompositeType())
+        var namedType = context.Selection.Type.NamedType();
+
+        if (!namedType.IsCompositeType())
         {
             return false;
         }
 
-        var namedType = context.Selection.Type.NamedType();
-
         if (namedType.IsAbstractType())
         {
             foreach (var possibleType in context.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
@@ -811,6 +811,49 @@ public async Task Select_Category_Level_2()
         result.MatchMarkdownSnapshot();
     }
 
+    [Fact]
+    public async Task IsSelected_Pattern_Lists()
+    {
+        var result =
+            await new ServiceCollection()
+                .AddGraphQL()
+                .AddQueryType<Query>()
+                .ExecuteRequestAsync(
+                    """
+                    query {
+                        user_Attribute_List {
+                            email
+                            tags {
+                                name
+                            }
+                        }
+                    }
+                    """);
+
+
+        result.MatchMarkdownSnapshot();
+    }
+
+    [Fact]
+    public async Task IsSelected_Pattern_Root_Lists()
+    {
+        var result =
+            await new ServiceCollection()
+                .AddGraphQL()
+                .AddQueryType<Query>()
+                .ExecuteRequestAsync(
+                    """
+                    query {
+                        books {
+                            author { name }
+                        }
+                    }
+                    """);
+
+
+        result.MatchMarkdownSnapshot();
+    }
+
     public class Query
     {
         public static User DummyUser { get; } =
@@ -984,6 +1027,32 @@ public User GetUser_Context_4(IResolverContext context)
                 City = "f",
             };
         }
+
+        public User GetUser_Attribute_List(
+            [IsSelected("tags { name }")]
+            bool isSelected,
+            IResolverContext context)
+        {
+            ((IMiddlewareContext)context).OperationResult.SetExtension("isSelected", isSelected);
+            return new User
+            {
+                Name = "a",
+                Email = "b",
+                Password = "c",
+                PhoneNumber = "d",
+                Address = "e",
+                City = "f",
+            };
+        }
+
+        public List<Book> GetBooks(
+            [IsSelected("author")]
+            bool isSelected,
+            IResolverContext context)
+        {
+            ((IMiddlewareContext)context).OperationResult.SetExtension("isSelected", isSelected);
+            return new List<Book>();
+        }
     }
 
     public class BrokenQuery
@@ -1071,4 +1140,8 @@ public class Audit
         public string EditedBy { get; set; }
         public string EditedAt { get; set; }
     }
+
+    public record Book(string Title, Author Author);
+
+    public record Author(string Name);
 }
diff --git a/...Types.Tests/Resolvers/__snapshots__/IsSelectedTests.IsSelected_Pattern_Lists.md b/...Types.Tests/Resolvers/__snapshots__/IsSelectedTests.IsSelected_Pattern_Lists.md
@@ -0,0 +1,15 @@
+# IsSelected_Pattern_Lists
+
+```json
+{
+  "data": {
+    "user_Attribute_List": {
+      "email": "b",
+      "tags": null
+    }
+  },
+  "extensions": {
+    "isSelected": true
+  }
+}
+```
diff --git a/....Tests/Resolvers/__snapshots__/IsSelectedTests.IsSelected_Pattern_Root_Lists.md b/....Tests/Resolvers/__snapshots__/IsSelectedTests.IsSelected_Pattern_Root_Lists.md
@@ -0,0 +1,12 @@
+# IsSelected_Pattern_Root_Lists
+
+```json
+{
+  "data": {
+    "books": []
+  },
+  "extensions": {
+    "isSelected": true
+  }
+}
+```