Fixed bug with NewExpression

Author: magahl-swegon

src/Linq2GraphQL.Client/QueryNode.cs

@@ -24,7 +24,6 @@ public QueryNode(MemberInfo member, string name = null, List<ArgumentValue> argu
         if (!topLevel) {
             SetArgumentHashCodeId();
         }
-       
     }
 
     public bool InterfaceProperty { get; internal set; }

src/Linq2GraphQL.Client/Utilities.cs

@@ -6,7 +6,6 @@ namespace Linq2GraphQL.Client;
 
 public static class Utilities
 {
-
     public static string GetArgumentsId(IEnumerable<object> objects)
     {
         if (objects == null) return null;
@@ -15,23 +14,26 @@ public static string GetArgumentsId(IEnumerable<object> objects)
 
         unchecked
         {
-            int hash = 19;
+            var hash = 19;
             foreach (var obj in objs)
             {
                 hash = hash * 31 + obj.GetHashCode();
             }
-            var hashString = hash.ToString().Replace("-", "_");
 
-            return hashString;
+            return hash.ToString().Replace("-", "_");
         }
     }
 
-    public static bool IsSelectOrSelectMany(this MethodCallExpression methodCallExpression)
+    private static bool IsSelectOrSelectMany(this MethodCallExpression methodCallExpression)
     {
-        if (methodCallExpression.Arguments.Count != 2) { return false; };
+        if (methodCallExpression.Arguments.Count != 2)
+        {
+            return false;
+        }
+
+        ;
         var methodName = methodCallExpression.Method.Name;
         return (methodName == "Select" || methodName == "SelectMany");
-
     }
 
     public static void ParseExpression(Expression body, QueryNode parent)
@@ -44,20 +46,18 @@ public static void ParseExpression(Expression body, QueryNode parent)
         {
             parent.AddChildNode(childNode);
         }
-
     }
 
     private static void ParseExpressionInternal(Expression body, QueryNode parent)
     {
         if (body.NodeType == ExpressionType.MemberInit)
         {
             var exp = (MemberInitExpression)body;
-
-            foreach (MemberAssignment bining in exp.Bindings.Where(e => e.BindingType == MemberBindingType.Assignment).Cast<MemberAssignment>())
+            foreach (var binding in exp.Bindings.Where(e => e.BindingType == MemberBindingType.Assignment)
+                         .Cast<MemberAssignment>())
             {
-                ParseExpressionInternal(bining.Expression, parent);
+                ParseExpressionInternal(binding.Expression, parent);
             }
-
         }
 
         switch (body)
@@ -72,36 +72,29 @@ private static void ParseExpressionInternal(Expression body, QueryNode parent)
                 break;
 
             case MethodCallExpression methodCallExp:
-
                 ParseMethodCallExpression(parent, methodCallExp);
-
                 break;
-            case NewExpression newExpression:
-
-                var t = newExpression;
 
+            case NewExpression newExpression:
                 foreach (var argument in newExpression.Arguments)
                 {
-                    ParseExpressionInternal(argument, parent);
+                    ParseExpression(argument, parent);
                 }
-                break;
-
-
 
+                break;
         }
     }
 
     private static void ParseMethodCallExpression(QueryNode parent, MethodCallExpression methodCallExp)
     {
-        var grapInterfaceAttribute = methodCallExp.Method.GetCustomAttribute<GraphInterfaceAttribute>();
-        if (grapInterfaceAttribute != null)
+        var graphInterfaceAttribute = methodCallExp.Method.GetCustomAttribute<GraphInterfaceAttribute>();
+        if (graphInterfaceAttribute != null)
         {
             var queryNode = new QueryNode(methodCallExp.Method, methodCallExp.Method.Name, null, true);
             parent.AddChildNode(queryNode);
             return;
         }
 
-
         var graphMethodAttribute = methodCallExp.Method.GetCustomAttribute<GraphMethodAttribute>();
         if (graphMethodAttribute != null)
         {
@@ -110,8 +103,8 @@ private static void ParseMethodCallExpression(QueryNode parent, MethodCallExpres
             var i = 0;
             foreach (var parameter in methodCallExp.Method.GetParameters())
             {
-                var graphAtttribute = parameter.GetCustomAttribute<GraphArgumentAttribute>();
-                if (graphAtttribute != null)
+                var graphAttribute = parameter.GetCustomAttribute<GraphArgumentAttribute>();
+                if (graphAttribute != null)
                 {
                     var arg = methodCallExp.Arguments[i];
                     ConstantExpression argConstant;
@@ -125,7 +118,7 @@ private static void ParseMethodCallExpression(QueryNode parent, MethodCallExpres
                         argConstant = (ConstantExpression)arg;
                     }
 
-                    arguments.Add(new ArgumentValue(parameter.Name, graphAtttribute.GraphType,
+                    arguments.Add(new ArgumentValue(parameter.Name, graphAttribute.GraphType,
                         argConstant.Value));
                 }
 
@@ -134,7 +127,6 @@ private static void ParseMethodCallExpression(QueryNode parent, MethodCallExpres
 
             var queryNode = new QueryNode(methodCallExp.Method, graphMethodAttribute.GraphName, arguments);
             parent.AddChildNode(queryNode);
-
         }
         else if (methodCallExp.IsSelectOrSelectMany())
         {
@@ -151,7 +143,7 @@ private static void ParseMethodCallExpression(QueryNode parent, MethodCallExpres
         }
     }
 
-    public static (QueryNode ParentNode, QueryNode LastNode) GetMemberQueryNode(Expression expression)
+    private static (QueryNode ParentNode, QueryNode LastNode) GetMemberQueryNode(Expression expression)
     {
         var members = GetMembers(expression);
         if (members == null) return (null, null);
@@ -164,7 +156,6 @@ public static (QueryNode ParentNode, QueryNode LastNode) GetMemberQueryNode(Expr
         foreach (var member in members)
         {
             var newNode = new QueryNode(member);
-
             if (parentNode == null)
             {
                 parentNode = newNode;
@@ -181,7 +172,7 @@ public static (QueryNode ParentNode, QueryNode LastNode) GetMemberQueryNode(Expr
     }
 
 
-    public static List<MemberInfo> GetMembers(Expression expression)
+    private static List<MemberInfo> GetMembers(Expression expression)
     {
         var members = new List<MemberInfo>();
         if (expression.NodeType == ExpressionType.MemberAccess)

test/Linq2GraphQL.TestServer.Shared/Models/Customer.cs

@@ -6,7 +6,7 @@ public class Customer
     public string CustomerName { get; set; } = "";
     public CustomerStatus Status { get; set; }
     public List<Order> Orders { get; set; } = new();
-    public Address Address { get; set; }
+    public Address? Address { get; set; }
 
 }
 

test/Linq2GraphQL.Tests/MutationTests.cs

@@ -36,7 +36,7 @@ public async Task Mutation_Multiple()
                 CustomerId = id,
                 CustomerName = "New Customer",
                 Orders = new List<OrderInput>(),
-                Status = CustomerStatus.Active
+                Status = CustomerStatus.Active,
             })
             .Select(e=> e.CustomerId)
             .ExecuteAsync();