StringyEnum now works with all datatypes lower or equal then uint

Author: TwentyFourMinutes

src/StringyEnums/StringyEnums.Shared/Models/TestByteEnum.cs

@@ -0,0 +1,17 @@
+using System;
+
+namespace StringyEnums.Shared.Models
+{
+	[Flags]
+	public enum TestByteEnum : byte
+	{
+		[StringRepresentation("Enum 1")]
+		EnumOne = 1,
+		[StringRepresentation("Enum 2")]
+		EnumTwo = 2,
+		[StringRepresentation("Enum 3")]
+		EnumThree = 4,
+		[StringRepresentation("Enum 4")]
+		EnumFour = 8
+	}
+}

src/StringyEnums/StringyEnums.Shared/Models/TestUShortEnum.cs

@@ -0,0 +1,17 @@
+using System;
+
+namespace StringyEnums.Shared.Models
+{
+	[Flags]
+	public enum TestUShortEnum : ushort
+	{
+		[StringRepresentation("Enum 1")]
+		EnumOne = 1,
+		[StringRepresentation("Enum 2")]
+		EnumTwo = 2,
+		[StringRepresentation("Enum 3")]
+		EnumThree = 4,
+		[StringRepresentation("Enum 4")]
+		EnumFour = 8
+	}
+}

src/StringyEnums/StringyEnums.Test/EnumExtensionTests.cs

@@ -8,7 +8,12 @@ public class EnumExtensionTests
 	{
 		public EnumExtensionTests()
 		{
-			EnumCore.Init(init => init.InitWith<TestEnum>());
+			EnumCore.Init(init =>
+			{
+				init.InitWith<TestEnum>();
+				init.InitWith<TestByteEnum>();
+				init.InitWith<TestUShortEnum>();
+			});
 		}
 
 		[Theory]
@@ -26,5 +31,15 @@ public void IsFlagRepresenationEqual(TestEnum enumVal, params string[] represent
 		[InlineData(TestEnum.EnumOne, "Enum 1")]
 		public void IsParseRepresenationEqual(TestEnum enumVal, string representation)
 			=> Assert.Equal(representation.GetEnumFromRepresentation<TestEnum>(), enumVal);
+
+		[Theory]
+		[InlineData(TestByteEnum.EnumOne, "Enum 1")]
+		public void IsByteParseRepresenationEqual(TestByteEnum enumVal, string representation)
+			=> Assert.Equal(representation.GetEnumFromRepresentation<TestByteEnum>(), enumVal);
+
+		[Theory]
+		[InlineData(TestUShortEnum.EnumOne, "Enum 1")]
+		public void IsUShortParseRepresenationEqual(TestUShortEnum enumVal, string representation)
+			=> Assert.Equal(representation.GetEnumFromRepresentation<TestUShortEnum>(), enumVal);
 	}
 }

src/StringyEnums/StringyEnums/CacheInitializer.cs

@@ -12,11 +12,11 @@ namespace StringyEnums
 	/// </summary>
 	public class CacheInitializer
 	{
-		private readonly Dictionary<Type, IReadOnlyBiDictionary<int, string>> _tempCache;
+		private readonly Dictionary<Type, IReadOnlyBiDictionary<uint, string>> _tempCache;
 
 		internal CacheInitializer()
 		{
-			_tempCache = new Dictionary<Type, IReadOnlyBiDictionary<int, string>>();
+			_tempCache = new Dictionary<Type, IReadOnlyBiDictionary<uint, string>>();
 		}
 
 		/// <summary>
@@ -70,15 +70,15 @@ private void InitWith(Type enumType)
 
 			var fields = enumType.GetFields();
 
-			var temptDict = new BiDictionary<int, string>();
+			var temptDict = new BiDictionary<uint, string>();
 
 			foreach (var field in fields.Where(x => x.IsStatic))
 			{
 				var attr = field.GetCustomAttribute<StringRepresentationAttribute>();
 
 				if (attr is { })
 				{
-					temptDict.TryAdd((int)field.GetValue(enumType)!, attr.StringRepresentation);
+					temptDict.TryAdd(Convert.ToUInt32(field.GetValue(enumType))!, attr.StringRepresentation);
 				}
 			}
 
@@ -88,7 +88,7 @@ private void InitWith(Type enumType)
 			}
 		}
 
-		internal IReadOnlyDictionary<Type, IReadOnlyBiDictionary<int, string>> CustructCache()
-			=> new ReadOnlyDictionary<Type, IReadOnlyBiDictionary<int, string>>(_tempCache.ToDictionary(k => k.Key, v => (IReadOnlyBiDictionary<int, string>)new ReadOnlyBiDictionary<int, string>(v.Value)));
+		internal IReadOnlyDictionary<Type, IReadOnlyBiDictionary<uint, string>> CustructCache()
+			=> new ReadOnlyDictionary<Type, IReadOnlyBiDictionary<uint, string>>(_tempCache.ToDictionary(k => k.Key, v => (IReadOnlyBiDictionary<uint, string>)new ReadOnlyBiDictionary<uint, string>(v.Value)));
 	}
 }

src/StringyEnums/StringyEnums/EnumCore.cs

@@ -10,9 +10,9 @@ namespace StringyEnums
 	/// </summary>
 	public static class EnumCore
 	{
-		private static IReadOnlyDictionary<Type, IReadOnlyBiDictionary<int, string>>? _representationCache;
+		private static IReadOnlyDictionary<Type, IReadOnlyBiDictionary<uint, string>>? _representationCache;
 
-		internal static IReadOnlyDictionary<Type, IReadOnlyBiDictionary<int, string>> RepresentationCache
+		internal static IReadOnlyDictionary<Type, IReadOnlyBiDictionary<uint, string>> RepresentationCache
 		{
 			get => _representationCache ?? throw new NotInitializedException("Please call the EnumCore.Initialize method at application startup.");
 			private set => _representationCache = value;

src/StringyEnums/StringyEnums/EnumExtensions.cs

@@ -16,7 +16,7 @@ public static class EnumExtensions
 		/// <returns>The string representation of the given <paramref name="enumValue"/>.</returns>
 		/// <exception cref="KeyNotFoundException">Is thrown when the given <paramref name="enumValue"/> doesn't contain any string representation or the <typeparamref name="TEnum"/> isn't cached.</exception>
 		public static string GetRepresentation<TEnum>(this TEnum enumValue) where TEnum : struct, Enum
-			=> EnumCore.RepresentationCache[typeof(TEnum)][(int)(dynamic)enumValue];
+			=> EnumCore.RepresentationCache[typeof(TEnum)][(uint)(dynamic)enumValue];
 
 		/// <summary>
 		/// Tries to get the string representation from the <see cref="StringRepresentationAttribute"/> on the given <typeparamref name="TEnum"/>.
@@ -29,7 +29,7 @@ public static bool TryGetRepresentation<TEnum>(this TEnum enumValue, out string?
 		{
 			if (EnumCore.RepresentationCache.TryGetValue(typeof(TEnum), out var dict))
 			{
-				return dict.TryGet((int)(dynamic)enumValue, out representation);
+				return dict.TryGet((uint)(dynamic)enumValue, out representation);
 			}
 
 			representation = default;
@@ -47,13 +47,13 @@ public static string[] GetFlagRepresentation<TEnum>(this TEnum enumValue) where
 		{
 			var dict = EnumCore.RepresentationCache[typeof(TEnum)];
 
-			var flags = (int)(dynamic)enumValue;
+			var flags = (uint)(dynamic)enumValue;
 
 			var tempArr = new string[GetHammingWeight(flags)];
 
 			int lastIndex = 0;
 
-			for (int i = 1; i <= flags; i *= 2)
+			for (uint i = 1; i <= flags; i *= 2)
 			{
 				if ((flags & i) != 0)
 				{
@@ -75,13 +75,13 @@ public static bool TryGetFlagRepresentation<TEnum>(this TEnum enumValue, out str
 		{
 			if (EnumCore.RepresentationCache.TryGetValue(typeof(TEnum), out var dict))
 			{
-				var flags = (int)(dynamic)enumValue;
+				var flags = (uint)(dynamic)enumValue;
 
 				representations = new string[GetHammingWeight(flags)];
 
 				int lastIndex = 0;
 
-				for (int i = 1; i <= flags; i *= 2)
+				for (uint i = 1; i <= flags; i *= 2)
 				{
 					if ((flags & i) != 0)
 					{
@@ -137,7 +137,7 @@ public static bool TryGetEnumFromRepresentation<TEnum>(this string value, out TE
 			return false;
 		}
 
-		private static int GetHammingWeight(int value)
+		private static uint GetHammingWeight(uint value)
 		{
 			value -= ((value >> 1) & 0x55555555);
 			value = (value & 0x33333333) + ((value >> 2) & 0x33333333);

src/StringyEnums/StringyEnums/StringyEnums.csproj

@@ -5,7 +5,7 @@
     <LangVersion>8</LangVersion>
     <Nullable>enable</Nullable>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.0.0.1</Version>
+    <Version>1.0.0.2</Version>
     <Authors>Twenty</Authors>
     <Company>Twenty</Company>
     <Product>StringyEnums</Product>