Fixed static type extensions when using generics (#5690)

src/HotChocolate/Core/src/Types/Types/ObjectTypeExtension.cs

@@ -164,19 +164,28 @@ protected override ObjectTypeDefinition CreateDefinition(ITypeDiscoveryContext c
 /// </summary>
 internal sealed class StaticObjectTypeExtension : ObjectTypeExtension
 {
-    private readonly Type _staticRuntimeType;
+    private readonly Type _staticExtType;
 
-    public StaticObjectTypeExtension(Type staticRuntimeType)
-        => _staticRuntimeType = staticRuntimeType;
+    public StaticObjectTypeExtension(Type staticExtType)
+        => _staticExtType = staticExtType;
 
     protected override void Configure(IObjectTypeDescriptor descriptor)
     {
+        var context = descriptor.Extend().Context;
         var definition = descriptor.Extend().Definition;
 
+        // we are using the non-generic type extension class which would set nothing.
+        definition.Name = context.Naming.GetTypeName(_staticExtType, TypeKind.Object);
+        definition.Description = context.Naming.GetTypeDescription(_staticExtType, TypeKind.Object);
+        definition.Fields.BindingBehavior = context.Options.DefaultBindingBehavior;
+        definition.FieldBindingFlags = context.Options.DefaultFieldBindingFlags;
+        definition.FieldBindingType = _staticExtType;
+        definition.IsExtension = true;
+
         // we set the static type as runtime type. Since this is not the actual runtime
         // type and is replaced by the actual runtime type of the GraphQL type
         // we do not run into any conflicts here.
-        definition.RuntimeType = _staticRuntimeType;
+        definition.RuntimeType = _staticExtType;
 
         // next we set the binding flags to only infer static members.
         definition.FieldBindingFlags = FieldBindingFlags.Static;

src/HotChocolate/Core/src/Types/Types/ObjectTypeExtension~1.cs

@@ -7,6 +7,16 @@
 
 namespace HotChocolate.Types;
 
+/// <summary>
+/// <para>
+/// Object type extensions are used to represent a type which has been extended
+/// from some original type.
+/// </para>
+/// <para>
+/// For example, this might be used to represent local data, or by a GraphQL service
+/// which is itself an extension of another GraphQL service.
+/// </para>
+/// </summary>
 public class ObjectTypeExtension<T> : ObjectTypeExtension
 {
     private Action<IObjectTypeDescriptor<T>>? _configure;

src/HotChocolate/Core/test/Types.Tests/Types/ObjectTypeExtensionTests.cs

@@ -728,6 +728,32 @@ public async Task Query_Extension_With_Static_Members_Execute()
         SnapshotExtensions.MatchSnapshot(result);
     }
 
+    [Fact]
+    public async Task Query_Extension_With_Static_Members_And_Generic_Schema()
+    {
+        var schema =
+            await new ServiceCollection()
+                .AddGraphQL()
+                .AddQueryType<FooQuery>()
+                .AddTypeExtension(typeof(StaticFooQueryExtensions))
+                .BuildSchemaAsync();
+
+        SnapshotExtensions.MatchSnapshot(schema);
+    }
+
+    [Fact]
+    public async Task Query_Extension_With_Static_Members_And_Generic()
+    {
+        var result =
+            await new ServiceCollection()
+                .AddGraphQL()
+                .AddQueryType<FooQuery>()
+                .AddTypeExtension(typeof(StaticFooQueryExtensions))
+                .ExecuteRequestAsync("{ hello }");
+
+        SnapshotExtensions.MatchSnapshot(result);
+    }
+
     public class FooType : ObjectType<Foo>
     {
         protected override void Configure(IObjectTypeDescriptor<Foo> descriptor)
@@ -1099,4 +1125,17 @@ public static class StaticExtensions
         public static string Hello()
             => "abc";
     }
+
+    public class FooQuery
+    {
+        public string Abc { get; } = "def";
+    }
+
+    [ExtendObjectType<FooQuery>]
+    public static class StaticFooQueryExtensions
+    {
+        public static string Hello([Parent] FooQuery query)
+            => query.Abc;
+    }
+
 }

src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/ObjectTypeExtensionTests.Query_Extension_With_Static_Members_And_Generic.snap

@@ -0,0 +1,5 @@
+{
+  "data": {
+    "hello": "def"
+  }
+}

src/HotChocolate/Core/test/Types.Tests/Types/__snapshots__/ObjectTypeExtensionTests.Query_Extension_With_Static_Members_And_Generic_Schema.graphql

@@ -0,0 +1,8 @@
+schema {
+  query: FooQuery
+}
+
+type FooQuery {
+  abc: String!
+  hello: String!
+}