fix up interfaces add usings

lukemurray · Nov 14, 2023 · 58c6201 · 58c6201
1 parent c22dc95
commit 58c6201
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 4 deletions.
diff --git a/src/dotnet-gqlgen/.vscode/launch.json b/src/dotnet-gqlgen/.vscode/launch.json
@@ -0,0 +1,22 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch ",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            "program": "${workspaceFolder}/bin/Debug/net6.0/dotnet-gqlgen.dll",
+            "args": [],
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "cwd": "${workspaceFolder}",
+            "console": "internalConsole",
+            "stopAtEntry": false   
+        }
+]
+}
diff --git a/src/dotnet-gqlgen/Program.cs b/src/dotnet-gqlgen/Program.cs
@@ -30,6 +30,8 @@ public class Program
         public string ScalarMapping { get; }
         [Option(LongName = "output", ShortName = "o", Description = "Output directory")]
         public string OutputDir { get; } = "output";
+        [Option(LongName = "usings", ShortName = "u", Description = "Extra using statements to add to generated code.")]
+        public string Usings { get; } = "";
 
         public Dictionary<string, string> dotnetToGqlTypeMappings = new Dictionary<string, string> {
             {"string", "String"},
@@ -113,7 +115,8 @@ private async void OnExecute()
                     Types = allTypes,
                     Enums = typeInfo.Enums,
                     Mutation = typeInfo.Mutation,
-                    CmdArgs = $"-n {Namespace} -c {ClientClassName} -m {ScalarMapping}"
+                    CmdArgs = $"-n {Namespace} -c {ClientClassName} -m {ScalarMapping}",
+                    Usings = Usings
                 });
                 Directory.CreateDirectory(OutputDir);
                 File.WriteAllText($"{OutputDir}/GeneratedResultTypes.cs", resultTypes);
@@ -124,7 +127,8 @@ private async void OnExecute()
                     SchemaFile = Source,
                     Types = allTypes,
                     Mutation = typeInfo.Mutation,
-                    CmdArgs = $"-n {Namespace} -c {ClientClassName} -m {ScalarMapping}"
+                    CmdArgs = $"-n {Namespace} -c {ClientClassName} -m {ScalarMapping}",
+                    Usings = Usings
                 });
                 Directory.CreateDirectory(OutputDir);
                 File.WriteAllText($"{OutputDir}/GeneratedQueryTypes.cs", queryTypes);

diff --git a/src/dotnet-gqlgen/SchemaInfo.cs b/src/dotnet-gqlgen/SchemaInfo.cs
@@ -102,6 +102,7 @@ public TypeInfo(IEnumerable<Field> fields, string name, string description, bool
             Name = name;
             Description = description;
             IsInput = isInput;
+            IsInterface = isInterface;
         }
 
         public List<Field> Fields { get; }
@@ -114,6 +115,7 @@ public string DescriptionForComment(int indent = 8)
         }
 
         public bool IsInput { get; }
+        public bool IsInterface { get; }
     }
 
     public class Field

diff --git a/src/dotnet-gqlgen/SchemaVisitor.cs b/src/dotnet-gqlgen/SchemaVisitor.cs
@@ -139,7 +139,7 @@ public override object VisitInterfaceDef(GraphQLSchemaParser.InterfaceDefContext
                 if (schemaInfo.Types.ContainsKey(context.typeName.GetText()))
                     schemaInfo.Types[context.typeName.GetText()].Fields.AddRange(fields);
                 else
-                    schemaInfo.Types.Add(context.typeName.GetText(), new TypeInfo(fields, context.typeName.GetText(), desc, true));
+                    schemaInfo.Types.Add(context.typeName.GetText(), new TypeInfo(fields, context.typeName.GetText(), desc, false, true));
                 return result;
             }
         }

diff --git a/src/dotnet-gqlgen/queryTypes.cshtml b/src/dotnet-gqlgen/queryTypes.cshtml
@@ -7,6 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using DotNetGqlClient;
+@Model.Usings
 
 /// <summary>
 /// Generated classes used for making GraphQL API calls with a typed interface.
@@ -25,6 +26,7 @@ namespace @Model.Namespace
     @gqlType.DescriptionForComment(4)
     @:/// </summary>
     }
+
     @:public abstract class @gqlType.QueryName : @gqlType.Name
     @:{
 @foreach(var field in gqlType.Fields)

diff --git a/src/dotnet-gqlgen/resultTypes.cshtml b/src/dotnet-gqlgen/resultTypes.cshtml
@@ -5,8 +5,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq.Expressions;
 using DotNetGqlClient;
+@Model.Usings
 
 /// <summary>
 /// Generated classes used for making GraphQL API calls with a typed interface.
@@ -37,6 +37,7 @@ namespace @Model.Namespace
     @gqlType.DescriptionForComment(4)
     @:/// </summary>
     }
+    @* We make interfaces as classes for now *@
     @:public class @gqlType.Name
     @:{
 @foreach(var field in gqlType.Fields)