Updated tag name validation to allow hyphens and relax requirements (#8304)

Author: glen-84

src/HotChocolate/Core/src/Types/Properties/TypeResources.Designer.cs

@@ -965,7 +965,7 @@ Type: `{0}`</value>
     <value>The specified type `{0}` is expected to be an output type.</value>
   </data>
   <data name="TagDirective_Name_NotValid" xml:space="preserve">
-    <value>The tag name must follow the GraphQL type name rules.</value>
+    <value>Tag names may only include alphanumeric characters (a-z, A-Z, 0-9), hyphens, and underscores.</value>
   </data>
   <data name="TagDirective_Descriptor_NotSupported" xml:space="preserve">
     <value>Tag is not supported on the specified descriptor.</value>

src/HotChocolate/Core/src/Types/Properties/TypeResources.resx

@@ -1,6 +1,6 @@
 #nullable enable
 
-using System.Runtime.CompilerServices;
+using System.Text.RegularExpressions;
 using HotChocolate.Properties;
 
 namespace HotChocolate.Types;
@@ -47,7 +47,7 @@ interface Book {
       author: String!
     }
     """)]
-public sealed class Tag
+public sealed partial class Tag
 {
     /// <summary>
     /// Creates a new instance of <see cref="Tag"/>.
@@ -60,7 +60,9 @@ public sealed class Tag
     /// </exception>
     public Tag(string name)
     {
-        if (!IsValidTagName(name))
+        ArgumentNullException.ThrowIfNull(name);
+
+        if (!ValidNameRegex().IsMatch(name))
         {
             throw new ArgumentException(
                 TypeResources.TagDirective_Name_NotValid,
@@ -77,68 +79,6 @@ public Tag(string name)
     [GraphQLDescription("The name of the tag.")]
     public string Name { get; }
 
-    private static bool IsValidTagName(string? name)
-    {
-        if (string.IsNullOrEmpty(name))
-        {
-            return false;
-        }
-
-        var span = name.AsSpan();
-
-        if (IsLetterOrUnderscore(span[0]))
-        {
-            if (span.Length > 1)
-            {
-                for (var i = 1; i < span.Length; i++)
-                {
-                    if (!IsLetterOrDigitOrUnderscoreOrHyphen(span[i]))
-                    {
-                        return false;
-                    }
-                }
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private static bool IsLetterOrDigitOrUnderscoreOrHyphen(char c)
-    {
-        if (c is > (char)96 and < (char)123 or > (char)64 and < (char)91)
-        {
-            return true;
-        }
-
-        if (c is > (char)47 and < (char)58)
-        {
-            return true;
-        }
-
-        if (c == '_' || c == '-')
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private static bool IsLetterOrUnderscore(char c)
-    {
-        if (c is > (char)96 and < (char)123 or > (char)64 and < (char)91)
-        {
-            return true;
-        }
-
-        if (c == '_')
-        {
-            return true;
-        }
-
-        return false;
-    }
+    [GeneratedRegex("^[a-zA-Z0-9_-]+$")]
+    private static partial Regex ValidNameRegex();
 }

src/HotChocolate/Core/src/Types/Types/Directives/Tag.cs

@@ -43,6 +43,65 @@ repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION |
         schema.MatchSnapshot();
     }
 
+    [Fact]
+    public async Task ValidNames()
+    {
+        var exception = await Record.ExceptionAsync(
+            async () => await new ServiceCollection()
+                .AddGraphQL()
+                .AddDocumentFromString(
+                    """
+                    type Query {
+                        field: String
+                            @tag(name: "tag")
+                            @tag(name: "TAG")
+                            @tag(name: "TAG_123")
+                            @tag(name: "tag_123")
+                            @tag(name: "tag-123")
+                    }
+
+                    directive @tag("The name of the tag." name: String!)
+                        repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION |
+                            ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE |
+                            INPUT_OBJECT | INPUT_FIELD_DEFINITION
+                    """)
+                .UseField(_ => _ => default)
+                .BuildSchemaAsync());
+
+        Assert.Null(exception);
+    }
+
+    [Theory]
+    [InlineData("tag name")]
+    [InlineData("tag*")]
+    [InlineData("@TAG")]
+    [InlineData("tag=name")]
+    [InlineData("tagK")] // K = Kelvin Sign (U+212A)
+    public async Task InvalidNames(string tagName)
+    {
+        async Task Act() =>
+            await new ServiceCollection()
+                .AddGraphQL()
+                .AddDocumentFromString(
+                    $$"""
+                    type Query {
+                        field: String @tag(name: "{{tagName}}")
+                    }
+
+                    directive @tag("The name of the tag." name: String!)
+                        repeatable on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION |
+                            ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE |
+                            INPUT_OBJECT | INPUT_FIELD_DEFINITION
+                    """)
+                .UseField(_ => _ => default)
+                .BuildSchemaAsync();
+
+        Assert.Equal(
+            "Tag names may only include alphanumeric characters (a-z, A-Z, 0-9), hyphens, and " +
+            "underscores. (Parameter 'name')",
+            (await Assert.ThrowsAsync<ArgumentException>(Act)).Message);
+    }
+
     [Tag("OnObjectType")]
     public class Query
     {