Merge pull request #123

byme8 · web-flow · commit 178f997158c1 · 2025-03-08T08:25:46.000+02:00
Add support for predefined enum.
diff --git a/src/TestApp/TestStandardLibrary/Generated/GraphQL.g.cs b/src/TestApp/TestStandardLibrary/Generated/GraphQL.g.cs
@@ -1,4 +1,4 @@
-// c849b892619845face64d0012af70905
+// 6ed7879f132707962e54dd34977ad956
 // <auto-generated>
 // This file generated for ZeroQL 1.0.0.0.
 //
@@ -15,6 +15,7 @@ namespace GraphQL.TestServer
     using System.Text.Json;
     using ZeroQL;
     using ZeroQL.Json;
+    using ZeroQL.Internal;
 
     public class TestServerClient : global::ZeroQL.GraphQLClient<Query, Mutation>
     {
@@ -1140,6 +1141,10 @@ public class User
         [JsonPropertyName("userKind")]
         public UserKind UserKind { get; set; }
 
+        [ZeroQL.GraphQLName("kind")]
+        [JsonPropertyName("kind")]
+        public __TypeKind Kind { get; set; }
+
         [JsonPropertyName("role")]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
         [global::System.ObsoleteAttribute("This property is for internal use only. Do not use it directly. It maybe be removed in the future releases.")]
diff --git a/src/TestApp/ZeroQL.TestApp/Generated/GraphQL.g.cs b/src/TestApp/ZeroQL.TestApp/Generated/GraphQL.g.cs
@@ -1,4 +1,4 @@
-// 2529ecfad66562aa7d1aa2a47edf3d08
+// eba44a7905e80c72dd75a1a8467f4216
 // <auto-generated>
 // This file generated for ZeroQL 1.0.0.0.
 //
@@ -15,6 +15,7 @@ namespace GraphQL.TestServer
     using System.Text.Json;
     using ZeroQL;
     using ZeroQL.Json;
+    using ZeroQL.Internal;
 
     public class TestServerClient : global::ZeroQL.GraphQLClient<Query, Mutation>
     {
@@ -1140,6 +1141,10 @@ public class User
         [JsonPropertyName("userKind")]
         public UserKind UserKind { get; set; }
 
+        [ZeroQL.GraphQLName("kind")]
+        [JsonPropertyName("kind")]
+        public __TypeKind Kind { get; set; }
+
         [JsonPropertyName("role")]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
         [global::System.ObsoleteAttribute("This property is for internal use only. Do not use it directly. It maybe be removed in the future releases.")]
diff --git a/src/TestApp/ZeroQL.TestApp/schema.graphql b/src/TestApp/ZeroQL.TestApp/schema.graphql
@@ -210,6 +210,7 @@ type User {
   firstName: String!
   lastName: String!
   userKind: UserKind!
+  kind: __TypeKind!
   role: Role
   loginAttempts: [UserLoginAttempt!]!
 }
diff --git a/src/ZeroQL.Runtime/GraphQL/GraphQL.cs b/src/ZeroQL.Runtime/GraphQL/GraphQL.cs
@@ -2,6 +2,7 @@
 
 using System;
 
+// ReSharper disable once CheckNamespace
 namespace ZeroQL;
 
 [Obsolete("Request syntax is deprecated because it is not compatible with AOT runtimes. It will be removed in the future releases.")]
diff --git a/src/ZeroQL.Runtime/Internal/__TypeKind.cs b/src/ZeroQL.Runtime/Internal/__TypeKind.cs
@@ -0,0 +1,18 @@
+// ReSharper disable InconsistentNaming
+// ReSharper disable once CheckNamespace
+
+namespace ZeroQL.Internal;
+
+// ReSharper disable once UnusedMember.Global
+public enum __TypeKind
+{
+    Interface = 0,
+    Object = 1,
+    Union = 2,
+    InputObject = 4,
+    Enum = 8,
+    Scalar = 16, // 0x00000010
+    List = 32, // 0x00000020
+    NonNull = 64, // 0x00000040
+    Directive = 128, // 0x00000080
+}
diff --git a/src/ZeroQL.TestServer/Program.cs b/src/ZeroQL.TestServer/Program.cs
@@ -14,21 +14,23 @@ public class Program
 
     public static async Task Main(string[] args)
     {
-        await StartServer(new ServerContext
+        var (_, task) = await StartServer(new ServerContext
         {
             Arguments = args,
             Port = 10_000,
         });
+
+        await task;
     }
 
-    public static async Task<WebApplication> StartServer(ServerContext context)
+    public static async Task<(WebApplication App, Task Running)> StartServer(ServerContext context)
     {
         var builder = WebApplication.CreateBuilder(context.Arguments);
         var app = CreateApp(context, builder);
 
-        _ = app.RunAsync(context.CancellationTokenSource.Token);
+        var runningTask = app.RunAsync(context.CancellationTokenSource.Token);
 
-        return app;
+        return (app, runningTask);
     }
 
     public static WebApplication CreateApp(ServerContext context, WebApplicationBuilder builder)
diff --git a/src/ZeroQL.TestServer/Query/Models/Limit.cs b/src/ZeroQL.TestServer/Query/Models/Limit.cs
@@ -1,4 +1,5 @@
-﻿namespace ZeroQL.TestServer.Query.Models;
+﻿// ReSharper disable InconsistentNaming
+namespace ZeroQL.TestServer.Query.Models;
 
 [GraphQLName("Limit")]
 public class Limit_1
diff --git a/src/ZeroQL.TestServer/Query/Models/User.cs b/src/ZeroQL.TestServer/Query/Models/User.cs
@@ -10,6 +10,8 @@ public class User
     public string LastName { get; set; }
 
     public UserKind UserKind { get; set; }
+    
+    public TypeKind Kind { get; set; } = TypeKind.Object;
 
     public static User Create() => new User()
     {
diff --git a/src/ZeroQL.Tests/Bootstrap/CustomSchemaParseTests.ClassNameIdenticalToPropertyName.verified.txt b/src/ZeroQL.Tests/Bootstrap/CustomSchemaParseTests.ClassNameIdenticalToPropertyName.verified.txt
@@ -15,6 +15,7 @@ namespace TestApp
     using System.Text.Json;
     using ZeroQL;
     using ZeroQL.Json;
+    using ZeroQL.Internal;
 
     public class GraphQLClient : global::ZeroQL.GraphQLClient<Query, ZeroQL.Unit>
     {
diff --git a/src/ZeroQL.Tests/Bootstrap/ParseSchemaTests.InternalClient.verified.txt b/src/ZeroQL.Tests/Bootstrap/ParseSchemaTests.InternalClient.verified.txt
@@ -15,6 +15,7 @@ namespace GraphQLClient
     using System.Text.Json;
     using ZeroQL;
     using ZeroQL.Json;
+    using ZeroQL.Internal;
 
     internal class TestApp : global::ZeroQL.GraphQLClient<Query, Mutation>
     {
@@ -1140,6 +1141,10 @@ namespace GraphQLClient
         [JsonPropertyName("userKind")]
         public UserKind UserKind { get; set; }
 
+        [ZeroQL.GraphQLName("kind")]
+        [JsonPropertyName("kind")]
+        public __TypeKind Kind { get; set; }
+
         [JsonPropertyName("role")]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
         [global::System.ObsoleteAttribute("This property is for internal use only. Do not use it directly. It maybe be removed in the future releases.")]
diff --git a/src/ZeroQL.Tests/Bootstrap/ParseSchemaTests.PublicClient.verified.txt b/src/ZeroQL.Tests/Bootstrap/ParseSchemaTests.PublicClient.verified.txt
@@ -15,6 +15,7 @@ namespace GraphQLClient
     using System.Text.Json;
     using ZeroQL;
     using ZeroQL.Json;
+    using ZeroQL.Internal;
 
     public class TestApp : global::ZeroQL.GraphQLClient<Query, Mutation>
     {
@@ -1140,6 +1141,10 @@ namespace GraphQLClient
         [JsonPropertyName("userKind")]
         public UserKind UserKind { get; set; }
 
+        [ZeroQL.GraphQLName("kind")]
+        [JsonPropertyName("kind")]
+        public __TypeKind Kind { get; set; }
+
         [JsonPropertyName("role")]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
         [global::System.ObsoleteAttribute("This property is for internal use only. Do not use it directly. It maybe be removed in the future releases.")]
diff --git a/src/ZeroQL.Tests/Bootstrap/ParseSchemaTests.cs b/src/ZeroQL.Tests/Bootstrap/ParseSchemaTests.cs
@@ -210,7 +210,7 @@ public void InputsDetected()
     [Fact]
     public void UserDetected()
     {
-        var propertiesNames = new[] { "Id", "FirstName", "LastName", "UserKind" };
+        var propertiesNames = new[] { "Id", "FirstName", "LastName", "UserKind", "Kind" };
 
         var query = SyntaxTree.GetClass("User")!;
 
@@ -219,7 +219,7 @@ public void UserDetected()
             .OfType<PropertyDeclarationSyntax>()
             .Where(o => !o.Identifier.ValueText.StartsWith("__"))
             .Select(o => o.Identifier.ValueText).Should()
-            .Contain(propertiesNames).And.HaveCount(4);
+            .Contain(propertiesNames).And.HaveCount(5);
     }
 
     [Fact]
diff --git a/src/ZeroQL.Tests/CLI/CliTests.CanPullSchemaFromRemoteServer.verified.txt b/src/ZeroQL.Tests/CLI/CliTests.CanPullSchemaFromRemoteServer.verified.txt
@@ -106,6 +106,7 @@ type User {
   firstName: String!
   lastName: String!
   userKind: UserKind!
+  kind: __TypeKind!
   role: Role
   loginAttempts: [UserLoginAttempt!]!
 }
diff --git a/src/ZeroQL.Tests/SourceGeneration/PersistentQueryTest.cs b/src/ZeroQL.Tests/SourceGeneration/PersistentQueryTest.cs
@@ -94,7 +94,7 @@ public async Task CanSendPersistedQueryWhenServerHasIt()
             throw new InvalidOperationException("Server is running");
         }
 
-        var app = await Program.StartServer(context);
+        var (app, _) = await Program.StartServer(context);
         context.CancellationTokenSource.Token.Register(async () =>
         {
             await app.DisposeAsync();
diff --git a/src/ZeroQL.Tests/SourceGeneration/UserScalarTests.JsonDocumentTypeWorks.verified.txt b/src/ZeroQL.Tests/SourceGeneration/UserScalarTests.JsonDocumentTypeWorks.verified.txt
@@ -1 +1 @@
-﻿[{"Id":1,"FirstName":"Jon","LastName":"Smith","UserKind":0},{"Id":2,"FirstName":"Ben","LastName":"Smith","UserKind":2}]
+﻿[{"Id":1,"FirstName":"Jon","LastName":"Smith","UserKind":0,"Kind":1},{"Id":2,"FirstName":"Ben","LastName":"Smith","UserKind":2,"Kind":1}]
diff --git a/src/ZeroQL.Tests/SourceGeneration/UserScalarTests.JsonElementTypeWorks.verified.txt b/src/ZeroQL.Tests/SourceGeneration/UserScalarTests.JsonElementTypeWorks.verified.txt
@@ -1 +1 @@
-﻿[{"Id":1,"FirstName":"Jon","LastName":"Smith","UserKind":0},{"Id":2,"FirstName":"Ben","LastName":"Smith","UserKind":2}]
+﻿[{"Id":1,"FirstName":"Jon","LastName":"Smith","UserKind":0,"Kind":1},{"Id":2,"FirstName":"Ben","LastName":"Smith","UserKind":2,"Kind":1}]
diff --git a/src/ZeroQL.Tools/Bootstrap/GraphQLGenerator.cs b/src/ZeroQL.Tools/Bootstrap/GraphQLGenerator.cs
@@ -111,6 +111,7 @@ public static string ToCSharp(string graphql, GraphQlGeneratorOptions options)
             "System.Text.Json",
             "ZeroQL",
             "ZeroQL.Json",
+            "ZeroQL.Internal"
         };
         var checksum = ChecksumHelper.GenerateChecksumFromInlineSchema(graphql, options);
 
diff --git a/src/ZeroQL.Tools/Internal/TypeContext.cs b/src/ZeroQL.Tools/Internal/TypeContext.cs
@@ -8,6 +8,11 @@ namespace ZeroQL.Internal;
 
 public class TypeContext
 {
+    public HashSet<string> PredefinedEnums =
+    [
+        "__TypeKind"
+    ];
+    
     public Dictionary<string, string> GraphQLToCsharpScalarTypes = new()
     {
         { "String", "string" },
@@ -92,6 +97,11 @@ public TypeDefinition GetTypeDefinition(GraphQLType type)
     
     private TypeDefinition GetTypeDefinition(GraphQLNamedType namedType)
     {
+        if (PredefinedEnums.Contains(namedType.Name.StringValue))
+        {
+            return new EnumTypeDefinition(namedType.Name.StringValue);
+        }
+        
         if (Enums.Contains(namedType.Name.StringValue))
         {
             return new EnumTypeDefinition(namedType.Name.StringValue);

Original file line number	Diff line number	Diff line change
`@@ -210,6 +210,7 @@ type User {`
`210`	`210`	`firstName: String!`
`211`	`211`	`lastName: String!`
`212`	`212`	`userKind: UserKind!`
	`213`	`+ kind: __TypeKind!`
`213`	`214`	`role: Role`
`214`	`215`	`loginAttempts: [UserLoginAttempt!]!`
`215`	`216`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,21 +14,23 @@ public class Program`
`14`	`14`
`15`	`15`	`public static async Task Main(string[] args)`
`16`	`16`	`{`
`17`		`- await StartServer(new ServerContext`
	`17`	`+ var (_, task) = await StartServer(new ServerContext`
`18`	`18`	`{`
`19`	`19`	`Arguments = args,`
`20`	`20`	`Port = 10_000,`
`21`	`21`	`});`
	`22`	`+`
	`23`	`+ await task;`
`22`	`24`	`}`
`23`	`25`
`24`		`- public static async Task<WebApplication> StartServer(ServerContext context)`
	`26`	`+ public static async Task<(WebApplication App, Task Running)> StartServer(ServerContext context)`
`25`	`27`	`{`
`26`	`28`	`var builder = WebApplication.CreateBuilder(context.Arguments);`
`27`	`29`	`var app = CreateApp(context, builder);`
`28`	`30`
`29`		`- _ = app.RunAsync(context.CancellationTokenSource.Token);`
	`31`	`+ var runningTask = app.RunAsync(context.CancellationTokenSource.Token);`
`30`	`32`
`31`		`- return app;`
	`33`	`+ return (app, runningTask);`
`32`	`34`	`}`
`33`	`35`
`34`	`36`	`public static WebApplication CreateApp(ServerContext context, WebApplicationBuilder builder)`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ public class User`
`10`	`10`	`public string LastName { get; set; }`
`11`	`11`
`12`	`12`	`public UserKind UserKind { get; set; }`
	`13`	`+`
	`14`	`+ public TypeKind Kind { get; set; } = TypeKind.Object;`
`13`	`15`
`14`	`16`	`public static User Create() => new User()`
`15`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ namespace TestApp`
`15`	`15`	`using System.Text.Json;`
`16`	`16`	`using ZeroQL;`
`17`	`17`	`using ZeroQL.Json;`
	`18`	`+ using ZeroQL.Internal;`
`18`	`19`
`19`	`20`	`public class GraphQLClient : global::ZeroQL.GraphQLClient<Query, ZeroQL.Unit>`
`20`	`21`	`{`