feat: directly use MemberInfo for naming convention (dahomey-technologies#140)

Odonno · EricSites · commit d4359141223b · 2025-09-12T23:30:30.000-04:00
diff --git a/src/Dahomey.Cbor.Tests/Issues/Issue0021.cs b/src/Dahomey.Cbor.Tests/Issues/Issue0021.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Reflection;
 using Dahomey.Cbor.Serialization;
 using Dahomey.Cbor.Serialization.Conventions;
 using Dahomey.Cbor.Serialization.Converters.Mappings;
@@ -13,9 +14,9 @@ public class Issue0021
     {
         public class LowerCaseNamingConvention : INamingConvention
         {
-            public string GetPropertyName(string name)
+            public string GetPropertyName(MemberInfo memberInfo)
             {
-                return name.ToLowerInvariant();
+                return memberInfo.Name.ToLowerInvariant();
             }
         }
 
diff --git a/src/Dahomey.Cbor.Tests/NamingConventionTests.cs b/src/Dahomey.Cbor.Tests/NamingConventionTests.cs
@@ -1,19 +1,30 @@
-﻿using Dahomey.Cbor.Serialization.Conventions;
+﻿using System.Linq;
+using Dahomey.Cbor.Serialization.Conventions;
 using Xunit;
 
 namespace Dahomey.Cbor.Tests;
 
 public class NamingConventionTests
 {
+    private class TestObject
+    {
+        public string FooBar { get; set; }
+        public string fooBar { get; set; }
+        public string FooBAR { get; set; }
+        public string FooBARFoo { get; set; }
+        public string Foo { get; set; }
+        public string foo { get; set; }
+    }
+    
     [Theory]
     [InlineData("FooBar", "fooBar")]
     [InlineData("fooBar", "fooBar")]
     [InlineData("Foo", "foo")]
     [InlineData("foo", "foo")]
-    [InlineData("", "")]
     public void CamelCase(string srcName, string expectedName)
     {
-        string actualName = new CamelCaseNamingConvention().GetPropertyName(srcName);
+        var memberInfo = typeof(TestObject).GetMember(srcName).Single();
+        string actualName = new CamelCaseNamingConvention().GetPropertyName(memberInfo);
         Assert.Equal(expectedName, actualName);
     }
 
@@ -24,10 +35,10 @@ public void CamelCase(string srcName, string expectedName)
     [InlineData("FooBARFoo", "foo_bar_foo")]
     [InlineData("Foo", "foo")]
     [InlineData("foo", "foo")]
-    [InlineData("", "")]
     public void SnakeCase(string srcName, string expectedName)
     {
-        string actualName = new SnakeCaseNamingConvention().GetPropertyName(srcName);
+        var memberInfo = typeof(TestObject).GetMember(srcName).Single();
+        string actualName = new SnakeCaseNamingConvention().GetPropertyName(memberInfo);
         Assert.Equal(expectedName, actualName);
     }
 
@@ -38,10 +49,10 @@ public void SnakeCase(string srcName, string expectedName)
     [InlineData("FooBARFoo", "FOO_BAR_FOO")]
     [InlineData("Foo", "FOO")]
     [InlineData("foo", "FOO")]
-    [InlineData("", "")]
     public void UpperSnakeCase(string srcName, string expectedName)
     {
-        string actualName = new UpperSnakeCaseNamingConvention().GetPropertyName(srcName);
+        var memberInfo = typeof(TestObject).GetMember(srcName).Single();
+        string actualName = new UpperSnakeCaseNamingConvention().GetPropertyName(memberInfo);
         Assert.Equal(expectedName, actualName);
     }
 
@@ -52,10 +63,10 @@ public void UpperSnakeCase(string srcName, string expectedName)
     [InlineData("FooBARFoo", "foo-bar-foo")]
     [InlineData("Foo", "foo")]
     [InlineData("foo", "foo")]
-    [InlineData("", "")]
     public void KebabCase(string srcName, string expectedName)
     {
-        string actualName = new KebabCaseNamingConvention().GetPropertyName(srcName);
+        var memberInfo = typeof(TestObject).GetMember(srcName).Single();
+        string actualName = new KebabCaseNamingConvention().GetPropertyName(memberInfo);
         Assert.Equal(expectedName, actualName);
     }
 
@@ -66,10 +77,10 @@ public void KebabCase(string srcName, string expectedName)
     [InlineData("FooBARFoo", "FOO-BAR-FOO")]
     [InlineData("Foo", "FOO")]
     [InlineData("foo", "FOO")]
-    [InlineData("", "")]
     public void UpperKebabCase(string srcName, string expectedName)
     {
-        string actualName = new UpperKebabCaseNamingConvention().GetPropertyName(srcName);
+        var memberInfo = typeof(TestObject).GetMember(srcName).Single();
+        string actualName = new UpperKebabCaseNamingConvention().GetPropertyName(memberInfo);
         Assert.Equal(expectedName, actualName);
     }
 
@@ -80,10 +91,10 @@ public void UpperKebabCase(string srcName, string expectedName)
     [InlineData("FooBARFoo", "foobarfoo")]
     [InlineData("Foo", "foo")]
     [InlineData("foo", "foo")]
-    [InlineData("", "")]
     public void LowerCase(string srcName, string expectedName)
     {
-        string actualName = new LowerCaseNamingConvention().GetPropertyName(srcName);
+        var memberInfo = typeof(TestObject).GetMember(srcName).Single();
+        string actualName = new LowerCaseNamingConvention().GetPropertyName(memberInfo);
         Assert.Equal(expectedName, actualName);
     }
 
@@ -94,10 +105,10 @@ public void LowerCase(string srcName, string expectedName)
     [InlineData("FooBARFoo", "FOOBARFOO")]
     [InlineData("Foo", "FOO")]
     [InlineData("foo", "FOO")]
-    [InlineData("", "")]
     public void UpperCase(string srcName, string expectedName)
     {
-        string actualName = new UpperCaseNamingConvention().GetPropertyName(srcName);
+        var memberInfo = typeof(TestObject).GetMember(srcName).Single();
+        string actualName = new UpperCaseNamingConvention().GetPropertyName(memberInfo);
         Assert.Equal(expectedName, actualName);
     }
 }
diff --git a/src/Dahomey.Cbor/Serialization/Conventions/CamelCaseNamingConvention.cs b/src/Dahomey.Cbor/Serialization/Conventions/CamelCaseNamingConvention.cs
@@ -1,12 +1,12 @@
-﻿using System;
-using System.Text;
+﻿using System.Reflection;
 
 namespace Dahomey.Cbor.Serialization.Conventions
 {
     public class CamelCaseNamingConvention : INamingConvention
     {
-        public string GetPropertyName(string reflectionName)
+        public string GetPropertyName(MemberInfo member)
         {
+            string reflectionName = member.Name;
             if (string.IsNullOrEmpty(reflectionName) || char.IsLower(reflectionName[0]))
             {
                 return reflectionName;
diff --git a/src/Dahomey.Cbor/Serialization/Conventions/INamingConvention.cs b/src/Dahomey.Cbor/Serialization/Conventions/INamingConvention.cs
@@ -1,7 +1,9 @@
-﻿namespace Dahomey.Cbor.Serialization.Conventions
+﻿using System.Reflection;
+
+namespace Dahomey.Cbor.Serialization.Conventions
 {
     public interface INamingConvention
     {
-        string GetPropertyName(string name);
+        string GetPropertyName(MemberInfo member);
     }
 }
diff --git a/src/Dahomey.Cbor/Serialization/Conventions/KebabCaseNamingConvention.cs b/src/Dahomey.Cbor/Serialization/Conventions/KebabCaseNamingConvention.cs
@@ -1,9 +1,11 @@
-﻿namespace Dahomey.Cbor.Serialization.Conventions;
+﻿using System.Reflection;
+
+namespace Dahomey.Cbor.Serialization.Conventions;
 
 public class KebabCaseNamingConvention : INamingConvention
 {
-    public string GetPropertyName(string name)
+    public string GetPropertyName(MemberInfo member)
     {
-        return NamingConventionExtensions.GetPropertyName(name, (byte)'-');
+        return NamingConventionExtensions.GetPropertyName(member.Name, (byte)'-');
     }
 }
diff --git a/src/Dahomey.Cbor/Serialization/Conventions/LowerCaseNamingConvention.cs b/src/Dahomey.Cbor/Serialization/Conventions/LowerCaseNamingConvention.cs
@@ -1,4 +1,6 @@
-﻿namespace Dahomey.Cbor.Serialization.Conventions
+﻿using System.Reflection;
+
+namespace Dahomey.Cbor.Serialization.Conventions
 {
     /// <summary>
     /// Convert all names to lower case when serializing
@@ -9,11 +11,11 @@ public sealed class LowerCaseNamingConvention : INamingConvention
         /// <summary>
         /// Get property name according convention
         /// </summary>
-        /// <param name="name"> Property raw-name</param>
+        /// <param name="member">Property member info</param>
         /// <returns>Property name according convention</returns>
-        public string GetPropertyName(string name)
+        public string GetPropertyName(MemberInfo member)
         {
-            return name.ToLower();
+            return member.Name.ToLower();
         }
     }
 }
diff --git a/src/Dahomey.Cbor/Serialization/Conventions/SnakeCaseNamingConvention.cs b/src/Dahomey.Cbor/Serialization/Conventions/SnakeCaseNamingConvention.cs
@@ -1,9 +1,11 @@
-﻿namespace Dahomey.Cbor.Serialization.Conventions;
+﻿using System.Reflection;
+
+namespace Dahomey.Cbor.Serialization.Conventions;
 
 public class SnakeCaseNamingConvention : INamingConvention
 {
-    public string GetPropertyName(string name)
+    public string GetPropertyName(MemberInfo member)
     {
-        return NamingConventionExtensions.GetPropertyName(name, (byte)'_');
+        return NamingConventionExtensions.GetPropertyName(member.Name, (byte)'_');
     }
 }
diff --git a/src/Dahomey.Cbor/Serialization/Conventions/UpperCaseNamingConvention.cs b/src/Dahomey.Cbor/Serialization/Conventions/UpperCaseNamingConvention.cs
@@ -1,4 +1,6 @@
-﻿namespace Dahomey.Cbor.Serialization.Conventions
+﻿using System.Reflection;
+
+namespace Dahomey.Cbor.Serialization.Conventions
 {
     /// <summary>
     /// Convert all names to upper case when serializing
@@ -9,11 +11,11 @@ public sealed class UpperCaseNamingConvention : INamingConvention
         /// <summary>
         /// Get property name according convention
         /// </summary>
-        /// <param name="name"> Property raw-name</param>
+        /// <param name="member">Property member info</param>
         /// <returns>Property name according convention</returns>
-        public string GetPropertyName(string name)
+        public string GetPropertyName(MemberInfo member)
         {
-            return name.ToUpper();
+            return member.Name.ToUpper();
         }
     }
 }
diff --git a/src/Dahomey.Cbor/Serialization/Conventions/UpperKebabCaseNamingConvention.cs b/src/Dahomey.Cbor/Serialization/Conventions/UpperKebabCaseNamingConvention.cs
@@ -1,9 +1,11 @@
-﻿namespace Dahomey.Cbor.Serialization.Conventions;
+﻿using System.Reflection;
+
+namespace Dahomey.Cbor.Serialization.Conventions;
 
 public class UpperKebabCaseNamingConvention : INamingConvention
 {
-    public string GetPropertyName(string name)
+    public string GetPropertyName(MemberInfo member)
     {
-        return NamingConventionExtensions.GetPropertyName(name, (byte)'-', true);
+        return NamingConventionExtensions.GetPropertyName(member.Name, (byte)'-', true);
     }
 }
diff --git a/src/Dahomey.Cbor/Serialization/Conventions/UpperSnakeCaseNamingConvention.cs b/src/Dahomey.Cbor/Serialization/Conventions/UpperSnakeCaseNamingConvention.cs
@@ -1,9 +1,11 @@
-﻿namespace Dahomey.Cbor.Serialization.Conventions;
+﻿using System.Reflection;
+
+namespace Dahomey.Cbor.Serialization.Conventions;
 
 public class UpperSnakeCaseNamingConvention : INamingConvention
 {
-    public string GetPropertyName(string name)
+    public string GetPropertyName(MemberInfo member)
     {
-        return NamingConventionExtensions.GetPropertyName(name, (byte)'_', true);
+        return NamingConventionExtensions.GetPropertyName(member.Name, (byte)'_', true);
     }
 }
diff --git a/src/Dahomey.Cbor/Serialization/Converters/Mappings/MemberMapping.cs b/src/Dahomey.Cbor/Serialization/Converters/Mappings/MemberMapping.cs
@@ -188,7 +188,7 @@ private void InitializeMemberName()
                 }
                 else if (_objectMapping.NamingConvention != null)
                 {
-                    _memberName = _objectMapping.NamingConvention.GetPropertyName(MemberInfo.Name);
+                    _memberName = _objectMapping.NamingConvention.GetPropertyName(MemberInfo);
                 }
                 else
                 {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Reflection;`
`2`	`3`	`using Dahomey.Cbor.Serialization;`
`3`	`4`	`using Dahomey.Cbor.Serialization.Conventions;`
`4`	`5`	`using Dahomey.Cbor.Serialization.Converters.Mappings;`
`@@ -13,9 +14,9 @@ public class Issue0021`
`13`	`14`	`{`
`14`	`15`	`public class LowerCaseNamingConvention : INamingConvention`
`15`	`16`	`{`
`16`		`- public string GetPropertyName(string name)`
	`17`	`+ public string GetPropertyName(MemberInfo memberInfo)`
`17`	`18`	`{`
`18`		`- return name.ToLowerInvariant();`
	`19`	`+ return memberInfo.Name.ToLowerInvariant();`
`19`	`20`	`}`
`20`	`21`	`}`
`21`	`22`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`		`-using System;`
`2`		`-using System.Text;`
	`1`	`+using System.Reflection;`
`3`	`2`
`4`	`3`	`namespace Dahomey.Cbor.Serialization.Conventions`
`5`	`4`	`{`
`6`	`5`	`public class CamelCaseNamingConvention : INamingConvention`
`7`	`6`	`{`
`8`		`- public string GetPropertyName(string reflectionName)`
	`7`	`+ public string GetPropertyName(MemberInfo member)`
`9`	`8`	`{`
	`9`	`+ string reflectionName = member.Name;`
`10`	`10`	`if (string.IsNullOrEmpty(reflectionName) \|\| char.IsLower(reflectionName[0]))`
`11`	`11`	`{`
`12`	`12`	`return reflectionName;`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`		`-namespace Dahomey.Cbor.Serialization.Conventions`
	`1`	`+using System.Reflection;`
	`2`	`+`
	`3`	`+namespace Dahomey.Cbor.Serialization.Conventions`
`2`	`4`	`{`
`3`	`5`	`public interface INamingConvention`
`4`	`6`	`{`
`5`		`- string GetPropertyName(string name);`
	`7`	`+ string GetPropertyName(MemberInfo member);`
`6`	`8`	`}`
`7`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,11 @@`
`1`		`-namespace Dahomey.Cbor.Serialization.Conventions;`
	`1`	`+using System.Reflection;`
	`2`	`+`
	`3`	`+namespace Dahomey.Cbor.Serialization.Conventions;`
`2`	`4`
`3`	`5`	`public class KebabCaseNamingConvention : INamingConvention`
`4`	`6`	`{`
`5`		`- public string GetPropertyName(string name)`
	`7`	`+ public string GetPropertyName(MemberInfo member)`
`6`	`8`	`{`
`7`		`- return NamingConventionExtensions.GetPropertyName(name, (byte)'-');`
	`9`	`+ return NamingConventionExtensions.GetPropertyName(member.Name, (byte)'-');`
`8`	`10`	`}`
`9`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-namespace Dahomey.Cbor.Serialization.Conventions`
	`1`	`+using System.Reflection;`
	`2`	`+`
	`3`	`+namespace Dahomey.Cbor.Serialization.Conventions`
`2`	`4`	`{`
`3`	`5`	`/// <summary>`
`4`	`6`	`/// Convert all names to lower case when serializing`
`@@ -9,11 +11,11 @@ public sealed class LowerCaseNamingConvention : INamingConvention`
`9`	`11`	`/// <summary>`
`10`	`12`	`/// Get property name according convention`
`11`	`13`	`/// </summary>`
`12`		`- /// <param name="name"> Property raw-name</param>`
	`14`	`+ /// <param name="member">Property member info</param>`
`13`	`15`	`/// <returns>Property name according convention</returns>`
`14`		`- public string GetPropertyName(string name)`
	`16`	`+ public string GetPropertyName(MemberInfo member)`
`15`	`17`	`{`
`16`		`- return name.ToLower();`
	`18`	`+ return member.Name.ToLower();`
`17`	`19`	`}`
`18`	`20`	`}`
`19`	`21`	`}`