added CoreType

Author: joadan

src/Linq2GraphQL.Generator/GraphQLSchema/RootSchema.cs

@@ -62,7 +62,7 @@ public string GetInterfacesString(string baseClass = null)
             interfaces += "Linq2GraphQL.Client.Common.ICursorPaging";
         }
 
-       
+
 
         if (!string.IsNullOrWhiteSpace(interfaces))
         {
@@ -145,6 +145,18 @@ public TypeInfo FieldInfo
         }
     }
 
+    private CoreType coreType;
+    public CoreType CoreType
+    {
+        get
+        {
+            coreType ??= Type.GetCoreType();
+            return coreType;
+        }
+    }
+
+
+
     private TypeInfo GetFieldTypeInfo()
     {
 
@@ -168,25 +180,29 @@ private TypeInfo GetFieldTypeInfo()
         }
 
 
+        var coreType = Type.GetCoreType();
+
         var isList = allTypes.Any(e => e.Kind == TypeKind.List);
         var isNoneNull = allTypes.Any(e => e.Kind == TypeKind.NonNull);
-      
+
         var graphTypeDefinition = isNoneNull ? baseFieldType.Name + "!" : baseFieldType.Name;
         if (isList)
         {
             graphTypeDefinition = $"[{graphTypeDefinition}]";
+            var gr = coreType.GetGraphQLTypeDefinition();
+            var cs = coreType.GetCSharpTypeDefinition();
         }
 
         return new TypeInfo
         {
-            
+
             Kind = baseFieldType.Kind,
             IsList = isList,
             IsNoneNull = isNoneNull,
             CSharpType = csharpType,
             CSharpTypeName = csharpTypeName,
             GraphTypeDefinition = graphTypeDefinition,
-            IsEnum = baseFieldType.Kind == TypeKind.Enum          
+            IsEnum = baseFieldType.Kind == TypeKind.Enum
         };
     }
 
@@ -347,4 +363,105 @@ public BaseType GetBaseBaseType()
         return OfType.GetBaseBaseType();
     }
 
+
+    public CoreType GetCoreType()
+    {  
+        var result = new CoreType();
+           
+
+        bool currentNoneNull = false;
+
+        foreach (var type in GetAllTypes())
+        {
+
+            switch (type.Kind)
+            {
+                case TypeKind.NonNull:
+                    currentNoneNull = true;
+                    break;
+                case TypeKind.List:
+                    result.Lists.Add(new CoreTypeList { NoneNull = currentNoneNull });
+                    currentNoneNull = false;
+                    break;
+                default:
+
+                    result.NoneNull = currentNoneNull;
+                    result.BaseType = type;
+                    currentNoneNull = false;
+                    break;
+
+            }
+        }
+
+        result.Lists.Reverse();
+
+         if (Helpers.TypeMapping.TryGetValue(result.BaseType.Name, out var typeMapping))
+        {
+            result.CSharpTypeName = typeMapping.Name;
+            result.CSharpType = typeMapping.type;
+        }
+        else
+        {
+            result.CSharpTypeName = result.BaseType.Name.ToPascalCase(); 
+        }
+
+        result.OuterNoneNull = result.Lists.FirstOrDefault()?.NoneNull ?? result.NoneNull;
+
+        return result;
+
+    }
+
+
+}
+
+
+public class CoreTypeList
+{
+    public bool NoneNull { get; set; }
+}
+
+public class CoreType
+{
+    public BaseType BaseType { get; set; }
+    public bool NoneNull { get; set; }
+    public bool OuterNoneNull { get; set; }
+    public string CSharpTypeName { get; set; }
+    public Type CSharpType { get; set; }
+    public List<CoreTypeList> Lists { get; set; } = [];
+
+
+   
+
+    public string GetGraphQLTypeDefinition()
+    {
+        var result = BaseType.Name;
+
+        if (NoneNull) { result += "!"; }
+
+        foreach (var list in Lists)
+        {
+            result = $"[{result}]";
+            if (list.NoneNull) { result += "!"; }
+        }
+
+        return result;
+
+    }
+
+    public string GetCSharpTypeDefinition()
+    {
+        var result = CSharpTypeName;
+
+        if (!NoneNull) { result += "?"; }
+
+        foreach (var list in Lists)
+        {
+            result = $"List<{result}>";
+            if (!list.NoneNull) { result += "?"; }
+        }
+
+        return result;
+
+    }
+
 }

src/Linq2GraphQL.Generator/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "Linq2GraphQL.Generator": {
       "commandName": "Project",
-      "commandLineArgs": "https://localhost:7184/graphql/ -c=\"SampleClient\" -n=\"Linq2GraphQL.TestClient\" -o=\"C:\\Code\\Github\\Linq2GraphQL.Client\\test\\Linq2GraphQL.TestClient\\Generated\" -s=true"
+      "commandLineArgs": "https://localhost:50741/graphql/ -c=\"SampleNullableClient\" -n=\"Linq2GraphQL.TestClientNullable\" -o=\"C:\\Code\\Github\\Linq2GraphQL.Client\\test\\Linq2GraphQL.TestClientNullable\\Generated\" -s=true -nu=true"
     }
   }
 }

test/Linq2GraphQL.TestClientNullable/Generated/Client/QueryMethods.cs

@@ -49,4 +49,13 @@ public GraphQuery<List<Customer>> CustomerListNullable()
         return new GraphQuery<List<Customer>>(client,  "customerListNullable", OperationType.Query, arguments); 
     }
 
+    public GraphQuery<List<Customer>> CustomerListInList()
+    {
+	    var arguments = new List<ArgumentValue>
+        {
+        };
+
+        return new GraphQuery<List<Customer>>(client,  "customerListInList", OperationType.Query, arguments); 
+    }
+
     }

test/Linq2GraphQL.TestServerNullable/Query.cs

@@ -26,5 +26,11 @@ public List<Customer> GetCustomerList()
         {
             return null;
         }
+
+        public List<List<Customer>> GetCustomerListInList()
+        {
+            return [SampleData.GetCustomers()];
+        }
+
     }
 }