Fixed code generation

Author: michaelstaib

src/HotChocolate/Core/src/Types.Analyzers/Helpers/SymbolExtensions.cs

@@ -492,6 +492,26 @@ private static bool IsPostProcessorAttribute(INamedTypeSymbol? attributeClass)
         return false;
     }
 
+    public static bool IsOrInheritsFrom(this ITypeSymbol? attributeClass, params string[] fullTypeName)
+    {
+        var current = attributeClass;
+
+        while (current != null)
+        {
+            foreach(var typeName in fullTypeName)
+            {
+                if (current.ToDisplayString() == typeName)
+                {
+                    return true;
+                }
+            }
+
+            current = current.BaseType;
+        }
+
+        return false;
+    }
+
     public static bool IsOrInheritsFrom(this ITypeSymbol? attributeClass, string fullTypeName)
     {
         var current = attributeClass;

src/HotChocolate/Core/src/Types.Analyzers/Inspectors/ObjectTypeExtensionInfoInspector.cs

@@ -302,32 +302,34 @@ private static Resolver CreateNodeResolver(
 file static class Extensions
 {
     public static bool IsNodeResolver(this IMethodSymbol methodSymbol)
-        => methodSymbol
-            .GetAttributes()
-            .Any(t => t.AttributeClass?.ToDisplayString().Equals(NodeResolverAttribute, Ordinal) ?? false);
-
-    public static bool Skip(this IMethodSymbol methodSymbol)
-        => methodSymbol
-            .GetAttributes()
-            .Any(t =>
+    {
+        foreach (var attribute in methodSymbol.GetAttributes())
+        {
+            if (attribute.AttributeClass.IsOrInheritsFrom(NodeResolverAttribute))
             {
-                var name = t.AttributeClass?.ToDisplayString();
+                return true;
+            }
+        }
 
-                if (name is null)
-                {
-                    return false;
-                }
+        return false;
+    }
 
-                if (name.Equals(DataLoaderAttribute, Ordinal) ||
-                    name.Equals(QueryAttribute, Ordinal) ||
-                    name.Equals(MutationAttribute, Ordinal) ||
-                    name.Equals(SubscriptionAttribute, Ordinal))
-                {
-                    return true;
-                }
+    public static bool Skip(this IMethodSymbol methodSymbol)
+    {
+        foreach (var attribute in methodSymbol.GetAttributes())
+        {
+            if (attribute.AttributeClass.IsOrInheritsFrom(
+                DataLoaderAttribute,
+                QueryAttribute,
+                MutationAttribute,
+                SubscriptionAttribute))
+            {
+                return true;
+            }
+        }
 
-                return false;
-            });
+        return false;
+    }
 
     public static ImmutableArray<MemberBinding> GetMemberBindings(this ISymbol member)
     {

src/HotChocolate/Core/src/Types/Types/Descriptors/TypeConfiguration.cs

@@ -80,9 +80,9 @@ internal void Apply<TDescriptor>(
             {
                 foreach (var item in list)
                 {
-                    if (item is Func<Action<TDescriptor>> factory)
+                    if (item is Action<TDescriptor> configure)
                     {
-                        factory()(descriptor);
+                        configure(descriptor);
                     }
                 }
             }
@@ -100,9 +100,9 @@ internal void Apply<TDescriptor>(
             {
                 foreach (var item in list)
                 {
-                    if (item is Func<Action<TDescriptor>> factory)
+                    if (item is Action<TDescriptor> configure)
                     {
-                        factory()(descriptor);
+                        configure(descriptor);
                     }
                 }
             }

src/HotChocolate/Core/test/Types.Analyzers.Tests/ResolverTests.cs

@@ -169,4 +169,76 @@ internal class Test;
             internal class Entity;
             """).MatchMarkdownAsync();
     }
+
+    [Fact]
+    public async Task Ensure_Entity_Becomes_Node()
+    {
+        await TestHelper.GetGeneratedSourceSnapshot(
+            """
+            using HotChocolate;
+            using HotChocolate.Types;
+            using HotChocolate.Types.Relay;
+            using System.Threading.Tasks;
+
+            namespace TestNamespace;
+
+            [QueryType]
+            internal static partial class Query
+            {
+                public static Task<Test?> GetTestById([ID<Test>] int id)
+                    => Task.FromResult<Test?>(null);
+            }
+
+            [ObjectType<Test>]
+            internal static partial class TestType
+            {
+                [NodeResolver]
+                public static Task<Test?> GetTest(int id)
+                    => Task.FromResult<Test?>(null);
+            }
+
+            internal class Test
+            {
+                public int Id { get; set; }
+
+                public string Name { get; set; }
+            }
+            """).MatchMarkdownAsync();
+    }
+
+    [Fact]
+    public async Task Ensure_Entity_Becomes_Node_With_Query_Node_Resolver()
+    {
+        await TestHelper.GetGeneratedSourceSnapshot(
+            """
+            using HotChocolate;
+            using HotChocolate.Types;
+            using HotChocolate.Types.Relay;
+            using System.Threading.Tasks;
+
+            namespace TestNamespace;
+
+            [QueryType]
+            internal static partial class Query
+            {
+                [NodeResolver]
+                public static Task<Test?> GetTestById(int id)
+                    => Task.FromResult<Test?>(null);
+            }
+
+            [ObjectType<Test>]
+            internal static partial class TestType
+            {
+                public static Task<Test?> GetTest(int id)
+                    => Task.FromResult<Test?>(null);
+            }
+
+            internal class Test
+            {
+                public int Id { get; set; }
+
+                public string Name { get; set; }
+            }
+            """).MatchMarkdownAsync();
+    }
 }