Fixed DescriptorAttributes for Scalars (#7161)

Author: michaelstaib

src/HotChocolate/Core/src/Types/Types/Descriptors/Definitions/TypeDefinitionBase~1.cs

@@ -27,7 +27,7 @@ protected TypeDefinitionBase(Type runtimeType)
     public bool NeedsNameCompletion { get; set; }
 
     /// <summary>
-    /// Gets or sets the .net type representation of this type.
+    /// Gets or sets the .NET type representation of this type.
     /// </summary>
     public virtual Type RuntimeType
     {

src/HotChocolate/Core/src/Types/Types/Descriptors/DescriptorBase~1.cs

@@ -6,19 +6,15 @@
 
 namespace HotChocolate.Types.Descriptors;
 
-public abstract class DescriptorBase<T>
+public abstract class DescriptorBase<T>(IDescriptorContext context)
     : IDescriptor<T>
     , IDescriptorExtension<T>
     , IDescriptorExtension
     , IDefinitionFactory<T>
     where T : DefinitionBase
 {
-    protected DescriptorBase(IDescriptorContext context)
-    {
-        Context = context ?? throw new ArgumentNullException(nameof(context));
-    }
-
-    protected internal IDescriptorContext Context { get; }
+    protected internal IDescriptorContext Context { get; } =
+        context ?? throw new ArgumentNullException(nameof(context));
 
     IDescriptorContext IHasDescriptorContext.Context => Context;
 

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

@@ -63,7 +63,7 @@ protected internal InputFieldDescriptor(
     protected override void OnCreateDefinition(InputFieldDefinition definition)
     {
         Context.Descriptors.Push(this);
-        
+
         if (Definition is { AttributesAreApplied: false, Property: not null, })
         {
             Context.TypeInspector.ApplyAttributes(
@@ -77,7 +77,7 @@ protected override void OnCreateDefinition(InputFieldDefinition definition)
 
         Context.Descriptors.Pop();
     }
-    
+
     /// <inheritdoc />
     public IInputFieldDescriptor Name(string value)
     {

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

@@ -1,3 +1,4 @@
+using System;
 using HotChocolate.Language;
 using HotChocolate.Types.Descriptors.Definitions;
 using HotChocolate.Types.Helpers;
@@ -17,6 +18,25 @@ protected ScalarTypeDescriptor(IDescriptorContext context)
 
     protected internal override ScalarTypeDefinition Definition { get; protected set; } = new();
 
+    protected override void OnCreateDefinition(ScalarTypeDefinition definition)
+    {
+        Context.Descriptors.Push(this);
+
+        if (!Definition.AttributesAreApplied &&
+            Definition.RuntimeType != typeof(object))
+        {
+            Context.TypeInspector.ApplyAttributes(
+                Context,
+                this,
+                Definition.RuntimeType);
+            Definition.AttributesAreApplied = true;
+        }
+
+        base.OnCreateDefinition(definition);
+
+        Context.Descriptors.Pop();
+    }
+
     public IScalarTypeDescriptor Directive<T>(T directiveInstance)
         where T : class
     {
@@ -40,6 +60,7 @@ public IScalarTypeDescriptor Directive(string name, params ArgumentNode[] argume
     public static ScalarTypeDescriptor New(
         IDescriptorContext context,
         string name,
-        string? description)
-        => new(context) { Definition = { Name = name, Description = description } };
+        string? description,
+        Type scalarType)
+        => new(context) { Definition = { Name = name, Description = description, RuntimeType = scalarType } };
 }

src/HotChocolate/Core/src/Types/Types/Scalars/ScalarType.Initialization.cs

@@ -37,7 +37,7 @@ protected ScalarType(string name, BindingBehavior bind = BindingBehavior.Explici
 
     protected override ScalarTypeDefinition CreateDefinition(ITypeDiscoveryContext context)
     {
-        var descriptor = ScalarTypeDescriptor.New(context.DescriptorContext, Name, Description);
+        var descriptor = ScalarTypeDescriptor.New(context.DescriptorContext, Name, Description, GetType());
         Configure(descriptor);
         return descriptor.CreateDefinition();
     }

src/HotChocolate/Core/src/Types/Types/Scalars/ScalarType.cs

@@ -92,6 +92,7 @@ public virtual bool IsInstanceOfType(object? runtimeValue)
         {
             return true;
         }
+
         return RuntimeType.IsInstanceOfType(runtimeValue);
     }
 

src/HotChocolate/Core/test/Types.Tests/Types/Scalars/CustomScalarTests.cs

@@ -30,7 +30,7 @@ public async Task CustomDirective_With_Directives_Annotation()
         var schema = await new ServiceCollection()
             .AddGraphQL()
             .AddQueryType<Query>()
-            .AddType<FluentCustomScalarType>()
+            .AddType<AnnotationCustomScalarType>()
             .BuildSchemaAsync();
 
         // assert
@@ -92,11 +92,6 @@ public AnnotationCustomScalarType()
             : base("Custom")
         {
         }
-
-        protected override void Configure(IScalarTypeDescriptor descriptor)
-        {
-            descriptor.Directive<CustomDirective>();
-        }
     }
 
     [DirectiveType(DirectiveLocation.Scalar)]