Add enum conversion support for f.e. IPAddress and StringGUID #2658 (#…

…2682)
ChilliCream · Nov 26, 2020 · 21ea620 · 21ea620
1 parent 1b9a1c9
commit 21ea620
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/HotChocolate/Core/src/Types/Types/Descriptors/Conventions/DefaultNamingConventions.cs b/src/HotChocolate/Core/src/Types/Types/Descriptors/Conventions/DefaultNamingConventions.cs
@@ -199,12 +199,15 @@ public virtual unsafe NameString GetEnumValueName(object value)
             }
 
             bool allUpper = true;
+            int lengthMinusOne = name.Length - 1;
 
             for (var i = 0; i < name.Length; i++)
             {
                 var c = name[i];
 
-                if (i > 0 && char.IsUpper(c))
+                if (i > 0 && char.IsUpper(c) && 
+                    (!char.IsUpper(name[i - 1]) || 
+                        (i < lengthMinusOne && char.IsLower(name[i + 1]))))
                 {
                     underscores++;
                 }
@@ -241,7 +244,9 @@ public virtual unsafe NameString GetEnumValueName(object value)
 
                 for (var i = 1; i < name.Length; i++)
                 {
-                    if (char.IsUpper(name[i]))
+                    if (char.IsUpper(name[i]) && 
+                        (!char.IsUpper(name[i - 1]) || 
+                            (i < lengthMinusOne && char.IsLower(name[i + 1]))))
                     {
                         buffer[p++] = '_';
                     }

diff --git a/...late/Core/test/Types.Tests/Types/Descriptors/Conventions/DefaultNamingConventionsTypes.cs b/...late/Core/test/Types.Tests/Types/Descriptors/Conventions/DefaultNamingConventionsTypes.cs
@@ -8,6 +8,8 @@ public class DefaultNamingConventionsTests
         [InlineData("Foo", "FOO")]
         [InlineData("FooBar", "FOO_BAR")]
         [InlineData("FooBarBaz", "FOO_BAR_BAZ")]
+        [InlineData("StringGUID", "STRING_GUID")]
+        [InlineData("IPAddress", "IP_ADDRESS")]
         [InlineData("FOO_BAR_BAZ", "FOO_BAR_BAZ")]
         [InlineData("FOOBAR", "FOOBAR")]
         [InlineData("F", "F")]