fix: Allow multiple MapEnumValueAttribute (#672)

riok · Aug 23, 2023 · 71cbfdd · 71cbfdd
1 parent a5f6aef
commit 71cbfdd
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 2 deletions.
diff --git a/src/Riok.Mapperly.Abstractions/MapEnumValueAttribute.cs b/src/Riok.Mapperly.Abstractions/MapEnumValueAttribute.cs
@@ -3,7 +3,7 @@ namespace Riok.Mapperly.Abstractions;
 /// <summary>
 /// Customizes how enum values are mapped
 /// </summary>
-[AttributeUsage(AttributeTargets.Method)]
+[AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
 public sealed class MapEnumValueAttribute : Attribute
 {
     /// <summary>

diff --git a/test/Riok.Mapperly.IntegrationTests/Dto/TestEnumDtoAdditionalValue.cs b/test/Riok.Mapperly.IntegrationTests/Dto/TestEnumDtoAdditionalValue.cs
@@ -6,5 +6,6 @@ public enum TestEnumDtoAdditionalValue
         Value20 = 20,
         Value30 = 30,
         Value40 = 40,
+        Value50 = 50,
     }
 }
diff --git a/test/Riok.Mapperly.IntegrationTests/Mapper/StaticTestMapper.cs b/test/Riok.Mapperly.IntegrationTests/Mapper/StaticTestMapper.cs
@@ -95,10 +95,12 @@ public static void MapExistingList(List<string> src, List<int> dst)
 
         [MapEnum(EnumMappingStrategy.ByName)]
         [MapEnumValue(TestEnumDtoAdditionalValue.Value40, TestEnum.Value30)]
+        [MapEnumValue(TestEnumDtoAdditionalValue.Value50, TestEnum.Value30)]
         public static partial TestEnum MapToEnumByNameWithExplicit(TestEnumDtoAdditionalValue v);
 
         [MapEnum(EnumMappingStrategy.ByValue)]
         [MapEnumValue(TestEnumDtoAdditionalValue.Value40, TestEnum.Value30)]
+        [MapEnumValue(TestEnumDtoAdditionalValue.Value50, TestEnum.Value30)]
         public static partial TestEnum MapToEnumByValueWithExplicit(TestEnumDtoAdditionalValue v);
 
         [MapEnum(EnumMappingStrategy.ByName)]

diff --git a/...y.IntegrationTests/_snapshots/NET_48/StaticMapperTest.SnapshotGeneratedSource.verified.cs b/...y.IntegrationTests/_snapshots/NET_48/StaticMapperTest.SnapshotGeneratedSource.verified.cs
@@ -527,6 +527,7 @@ public static partial class StaticTestMapper
                 global::Riok.Mapperly.IntegrationTests.Dto.TestEnumDtoAdditionalValue.Value20 => global::Riok.Mapperly.IntegrationTests.Models.TestEnum.Value20,
                 global::Riok.Mapperly.IntegrationTests.Dto.TestEnumDtoAdditionalValue.Value30 => global::Riok.Mapperly.IntegrationTests.Models.TestEnum.Value30,
                 global::Riok.Mapperly.IntegrationTests.Dto.TestEnumDtoAdditionalValue.Value40 => global::Riok.Mapperly.IntegrationTests.Models.TestEnum.Value30,
+                global::Riok.Mapperly.IntegrationTests.Dto.TestEnumDtoAdditionalValue.Value50 => global::Riok.Mapperly.IntegrationTests.Models.TestEnum.Value30,
                 _ => throw new System.ArgumentOutOfRangeException(nameof(v), v, "The value of enum TestEnumDtoAdditionalValue is not supported"),
             };
         }
@@ -536,6 +537,7 @@ public static partial class StaticTestMapper
             return v switch
             {
                 global::Riok.Mapperly.IntegrationTests.Dto.TestEnumDtoAdditionalValue.Value40 => global::Riok.Mapperly.IntegrationTests.Models.TestEnum.Value30,
+                global::Riok.Mapperly.IntegrationTests.Dto.TestEnumDtoAdditionalValue.Value50 => global::Riok.Mapperly.IntegrationTests.Models.TestEnum.Value30,
                 _ => (global::Riok.Mapperly.IntegrationTests.Models.TestEnum)v,
             };
         }

diff --git a/...Tests/_snapshots/Roslyn_4_4_OR_LOWER/StaticMapperTest.SnapshotGeneratedSource.verified.cs b/...Tests/_snapshots/Roslyn_4_4_OR_LOWER/StaticMapperTest.SnapshotGeneratedSource.verified.cs
@@ -527,6 +527,7 @@ public static partial class StaticTestMapper
                 global::Riok.Mapperly.IntegrationTests.Dto.TestEnumDtoAdditionalValue.Value20 => global::Riok.Mapperly.IntegrationTests.Models.TestEnum.Value20,
                 global::Riok.Mapperly.IntegrationTests.Dto.TestEnumDtoAdditionalValue.Value30 => global::Riok.Mapperly.IntegrationTests.Models.TestEnum.Value30,
                 global::Riok.Mapperly.IntegrationTests.Dto.TestEnumDtoAdditionalValue.Value40 => global::Riok.Mapperly.IntegrationTests.Models.TestEnum.Value30,
+                global::Riok.Mapperly.IntegrationTests.Dto.TestEnumDtoAdditionalValue.Value50 => global::Riok.Mapperly.IntegrationTests.Models.TestEnum.Value30,
                 _ => throw new System.ArgumentOutOfRangeException(nameof(v), v, "The value of enum TestEnumDtoAdditionalValue is not supported"),
             };
         }
@@ -536,6 +537,7 @@ public static partial class StaticTestMapper
             return v switch
             {
                 global::Riok.Mapperly.IntegrationTests.Dto.TestEnumDtoAdditionalValue.Value40 => global::Riok.Mapperly.IntegrationTests.Models.TestEnum.Value30,
+                global::Riok.Mapperly.IntegrationTests.Dto.TestEnumDtoAdditionalValue.Value50 => global::Riok.Mapperly.IntegrationTests.Models.TestEnum.Value30,
                 _ => (global::Riok.Mapperly.IntegrationTests.Models.TestEnum)v,
             };
         }

diff --git a/...tegrationTests/_snapshots/Roslyn_4_5/StaticMapperTest.SnapshotGeneratedSource.verified.cs b/...tegrationTests/_snapshots/Roslyn_4_5/StaticMapperTest.SnapshotGeneratedSource.verified.cs
@@ -536,6 +536,7 @@ public static partial class StaticTestMapper
                 global::Riok.Mapperly.IntegrationTests.Dto.TestEnumDtoAdditionalValue.Value20 => global::Riok.Mapperly.IntegrationTests.Models.TestEnum.Value20,
                 global::Riok.Mapperly.IntegrationTests.Dto.TestEnumDtoAdditionalValue.Value30 => global::Riok.Mapperly.IntegrationTests.Models.TestEnum.Value30,
                 global::Riok.Mapperly.IntegrationTests.Dto.TestEnumDtoAdditionalValue.Value40 => global::Riok.Mapperly.IntegrationTests.Models.TestEnum.Value30,
+                global::Riok.Mapperly.IntegrationTests.Dto.TestEnumDtoAdditionalValue.Value50 => global::Riok.Mapperly.IntegrationTests.Models.TestEnum.Value30,
                 _ => throw new System.ArgumentOutOfRangeException(nameof(v), v, "The value of enum TestEnumDtoAdditionalValue is not supported"),
             };
         }
@@ -545,6 +546,7 @@ public static partial class StaticTestMapper
             return v switch
             {
                 global::Riok.Mapperly.IntegrationTests.Dto.TestEnumDtoAdditionalValue.Value40 => global::Riok.Mapperly.IntegrationTests.Models.TestEnum.Value30,
+                global::Riok.Mapperly.IntegrationTests.Dto.TestEnumDtoAdditionalValue.Value50 => global::Riok.Mapperly.IntegrationTests.Models.TestEnum.Value30,
                 _ => (global::Riok.Mapperly.IntegrationTests.Models.TestEnum)v,
             };
         }
@@ -728,4 +730,4 @@ private static string MapToString1(global::Riok.Mapperly.IntegrationTests.Dto.Te
             return target;
         }
     }
-}
+}