Fiex include top node

Author: joadan

src/Linq2GraphQL.Client/GraphBase.cs

@@ -17,6 +17,17 @@ public GraphBase(GraphClient client, string name, OperationType operationType, L
 
         public QueryNode QueryNode { get; }
 
+      
+        /// <summary>
+        /// Include top node
+        /// </summary>
+        /// <returns></returns>
+        public TGraph Include()
+        {
+            QueryNode.IncludePrimitive = true;
+            return (TGraph)(object)this;
+        }
+
         public TGraph Include<TProperty>(Expression<Func<T, TProperty>> path)
         {
             Utilities.ParseExpression(path, QueryNode);

src/Linq2GraphQL.Client/Utilities.cs

@@ -26,8 +26,7 @@ public static void ParseExpression(Expression body, QueryNode parent)
     {
         var parameterVisitor = new ParameterVisitor(new MemberNode(null, null));
         var topNode = parameterVisitor.ParseExpression(body);
-        var tree = topNode.PrintMemberTree();
-
+      
         topNode.PopulateChildQueryNodes(parent);
 
     }

src/Linq2GraphQL.Client/Visitors/MemberNode.cs

@@ -5,9 +5,8 @@
 
 namespace Linq2GraphQL.Client.Visitors
 {
-    public class MemberNode(MemberInfo memberInfo, List<ArgumentValue> arguments = null, ParameterExpression parameterExpression = null)
+    internal class MemberNode(MemberInfo memberInfo, List<ArgumentValue> arguments = null, ParameterExpression parameterExpression = null)
     {
-
         public string ParameterName => parameterExpression?.Name;
 
         public MemberInfo MemberInfo => memberInfo;
@@ -67,15 +66,14 @@ private static List<MemberInfo> GetMembers(Expression expression)
                 members.Add(memberExpression.Member);
                 members.AddRange(GetMembers(memberExpression.Expression));
             }
-
+          
             return members;
         }
 
         public void PopulateChildQueryNodes(QueryNode queryNode)
         {
             foreach (var child in Children)
             {
-
                 var childNode = new QueryNode(child.MemberInfo, null, child.Arguments);
                 childNode.IncludePrimitive = child.Children.Count == 0;
                 var addedNode = queryNode.AddChildNode(childNode);

src/Linq2GraphQL.Client/Visitors/ParameterVisitor.cs

@@ -7,7 +7,7 @@
 
 namespace Linq2GraphQL.Client.Visitors
 {
-    public class ParameterVisitor(MemberNode memberNode) : ExpressionVisitor
+    internal class ParameterVisitor(MemberNode memberNode) : ExpressionVisitor
     {
 
         public MemberNode ParseExpression(Expression expression)
@@ -52,9 +52,7 @@ protected override Expression VisitMethodCall(MethodCallExpression expression)
                     {
                         var arg = expression.Arguments[i];
                         var v = GetArgumentValue(arg);
-
                         argumentValues.Add(new ArgumentValue(graphQLArgumentAttribute.GraphQLName, graphQLArgumentAttribute.GraphQLType, GetArgumentValue(arg)));
-
                     }
                     i++;
                 }
@@ -74,11 +72,9 @@ protected override Expression VisitMethodCall(MethodCallExpression expression)
                 if (attr != null)
                 {
                     var parameter = GetParameterExpression(expression.Arguments[1]);
-
                     var child = memberNode.AddMembers(memberExp);
                     child.SetParameterExpression(parameter);
 
-
                     var visitor = new ParameterVisitor(child);
                     visitor.ParseExpression(expression.Arguments[1]);
                     return expression;
@@ -88,6 +84,29 @@ protected override Expression VisitMethodCall(MethodCallExpression expression)
             return base.VisitMethodCall(expression);
         }
 
+
+
+        protected override Expression VisitLambda<T>(Expression<T> node)
+        {
+            var newExp = node.Body as NewExpression;
+            return base.VisitLambda(node);
+        }
+
+        //protected override Expression VisitNew(NewExpression node)
+        //{
+
+        //    if (memberNode.ParameterName != null && node.Arguments.Any(e=> e.NodeType == ExpressionType.Parameter))
+        //    {
+
+
+
+        //    }
+
+
+        //    return base.VisitNew(node);
+        //}
+
+
         private static object GetArgumentValue(Expression element)
         {
             if (element is ConstantExpression)

test/Linq2GraphQL.Tests/QueryProjectionTests.cs

@@ -67,23 +67,21 @@ public async Task Project_SelectMany()
 
         }
 
-
+      
         [Fact]
-        public async Task Project_Complex()
+        public async Task Project_TopLevelAllPrimitive()
         {
-           
 
             var query = sampleClient
                 .Query
                 .Customers()
-                .Select(e => new {  Customers = e, Orders = e.SelectMany(e=> e.Orders)  });
+                .Include()
+                .Select(e => new { Customers = e, Orders = e.SelectMany(f => f.Orders) });
 
             var request = await query.GetRequestAsync();
-
             var result = await query.ExecuteAsync();
-
             var t = result.Customers.All(e => e.CustomerId != default);
-        
+
             Assert.True(result.Customers.All(e => e.CustomerId != default));
 
         }