feat: add MapProperty override, add tests and fix riok#450

TimothyMakkison · May 21, 2023 · 617fcd0 · 617fcd0
1 parent 612ff4e
commit 617fcd0
Show file tree

Hide file tree

Showing 6 changed files with 126 additions and 3 deletions.
diff --git a/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/BuilderContext/IMembersBuilderContext.cs b/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/BuilderContext/IMembersBuilderContext.cs
@@ -20,6 +20,7 @@ public interface IMembersBuilderContext<out T>
     IReadOnlyCollection<string> IgnoredSourceMemberNames { get; }
 
     Dictionary<string, IMappableMember> TargetMembers { get; }
+    Dictionary<string, IMappableMember> IgnoredTargetMembers { get; }
 
     Dictionary<string, List<MapPropertyAttribute>> MemberConfigsByRootTargetName { get; }
 }
diff --git a/...k.Mapperly/Descriptors/MappingBodyBuilders/BuilderContext/MembersMappingBuilderContext.cs b/...k.Mapperly/Descriptors/MappingBodyBuilders/BuilderContext/MembersMappingBuilderContext.cs
@@ -26,14 +26,14 @@ protected MembersMappingBuilderContext(MappingBuilderContext builderContext, T m
         _unmappedSourceMemberNames = GetSourceMemberNames();
         TargetMembers = GetTargetMembers();
 
-        var ignoredTargetMemberNames = GetIgnoredTargetMembers();
         IgnoredSourceMemberNames = GetIgnoredSourceMembers();
+        var ignoredTargetMemberNames = GetIgnoredTargetMembers();
 
         _ignoredUnmatchedSourceMemberNames = InitIgnoredUnmatchedProperties(IgnoredSourceMemberNames, _unmappedSourceMemberNames);
         _ignoredUnmatchedTargetMemberNames = InitIgnoredUnmatchedProperties(ignoredTargetMemberNames, TargetMembers.Keys);
 
         _unmappedSourceMemberNames.ExceptWith(IgnoredSourceMemberNames);
-        TargetMembers.RemoveRange(ignoredTargetMemberNames);
+        IgnoredTargetMembers = TargetMembers.ExtractRange(ignoredTargetMemberNames);
     }
 
     public MappingBuilderContext BuilderContext { get; }
@@ -44,6 +44,8 @@ protected MembersMappingBuilderContext(MappingBuilderContext builderContext, T m
 
     public Dictionary<string, IMappableMember> TargetMembers { get; }
 
+    public Dictionary<string, IMappableMember> IgnoredTargetMembers { get; }
+
     public Dictionary<string, List<MapPropertyAttribute>> MemberConfigsByRootTargetName { get; }
 
     public void AddDiagnostics()
@@ -84,7 +86,7 @@ private IEnumerable<string> GetIgnoredObsoleteTargetMembers()
 
         if (obsoleteAttribute.IgnoreObsoleteStrategy.HasFlag(IgnoreObsoleteMembersStrategy.Target))
         {
-            return Mapping.SourceType
+            return Mapping.TargetType
                 .GetAccessibleMappableMembers()
                 .Where(x => x.MemberSymbol.HasAttribute(BuilderContext.Types.ObsoleteAttribute))
                 .Select(x => x.Name);

diff --git a/...iok.Mapperly/Descriptors/MappingBodyBuilders/NewInstanceObjectMemberMappingBodyBuilder.cs b/...iok.Mapperly/Descriptors/MappingBodyBuilders/NewInstanceObjectMemberMappingBodyBuilder.cs
@@ -66,6 +66,19 @@ out var sourceMemberPath
 
             BuildInitMemberMapping(ctx, targetMember, sourceMemberPath);
         }
+
+        var initOnlyIgnoredTargetMembers = includeAllMembers
+            ? ctx.IgnoredTargetMembers.Values.ToArray()
+            : ctx.IgnoredTargetMembers.Values.Where(x => x.CanOnlySetViaInitializer()).ToArray();
+        foreach (var targetMember in initOnlyIgnoredTargetMembers)
+        {
+            ctx.IgnoredTargetMembers.Remove(targetMember.Name);
+
+            if (ctx.MemberConfigsByRootTargetName.Remove(targetMember.Name, out var memberConfigs))
+            {
+                BuildInitMemberMapping(ctx, targetMember, memberConfigs);
+            }
+        }
     }
 
     private static void BuildInitMemberMapping(

diff --git a/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/ObjectMemberMappingBodyBuilder.cs b/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/ObjectMemberMappingBodyBuilder.cs
@@ -66,6 +66,20 @@ out var sourceMemberPath
             }
         }
 
+        foreach (var targetMember in ctx.IgnoredTargetMembers.Values)
+        {
+            if (ctx.MemberConfigsByRootTargetName.Remove(targetMember.Name, out var memberConfigs))
+            {
+                // add all configured mappings
+                // order by target path count to map less nested items first (otherwise they would overwrite all others)
+                // eg. target.A = source.B should be mapped before target.A.Id = source.B.Id
+                foreach (var config in memberConfigs.OrderBy(x => x.Target.Count))
+                {
+                    BuildMemberAssignmentMapping(ctx, config);
+                }
+            }
+        }
+
         ctx.AddDiagnostics();
     }
 

diff --git a/src/Riok.Mapperly/Helpers/DictionaryExtensions.cs b/src/Riok.Mapperly/Helpers/DictionaryExtensions.cs
@@ -19,6 +19,21 @@ public static void RemoveRange<TKey, TValue>(this IDictionary<TKey, TValue> dict
         }
     }
 
+    public static Dictionary<TKey, TValue> ExtractRange<TKey, TValue>(this IDictionary<TKey, TValue> dict, IEnumerable<TKey> keys)
+    {
+        var removedItems = new Dictionary<TKey, TValue>();
+        foreach (var key in keys)
+        {
+            if (dict.TryGetValue(key, out var value))
+            {
+                dict.Remove(key);
+                removedItems.Add(key, value);
+            }
+        }
+
+        return removedItems;
+    }
+
     public static TValue? GetValueOrDefault<TKey, TValue>(this IDictionary<TKey, TValue> dict, TKey key)
     {
         dict.TryGetValue(key, out var value);

diff --git a/test/Riok.Mapperly.Tests/Mapping/IgnoreObsoleteTest.cs b/test/Riok.Mapperly.Tests/Mapping/IgnoreObsoleteTest.cs
@@ -225,4 +225,82 @@ public void MethodAttributeOverridesClassAttribute()
                 """
             );
     }
+
+    [Fact]
+    public void MapPropertyOverridesIgnoreObsoleteBoth()
+    {
+        var source = TestSourceBuilder.MapperWithBodyAndTypes(
+            """
+                [MapProperty("Ignored", "Ignored")]
+                [MapperIgnoreObsoleteMembers]
+                partial B Map(A source);
+                """,
+            _classA,
+            _classB
+        );
+
+        TestHelper
+            .GenerateMapper(source, TestHelperOptions.AllowInfoDiagnostics)
+            .Should()
+            .HaveSingleMethodBody(
+                """
+                var target = new global::B();
+                target.Value = source.Value;
+                target.Ignored = source.Ignored;
+                return target;
+                """
+            );
+    }
+
+    [Fact]
+    public void MapPropertyOverridesIgnoreObsoleteSource()
+    {
+        var source = TestSourceBuilder.MapperWithBodyAndTypes(
+            """
+                [MapProperty("Ignored", "Ignored")]
+                [MapperIgnoreObsoleteMembers(IgnoreObsoleteMembersStrategy.Source)]
+                partial B Map(A source);
+                """,
+            _classA,
+            _classB
+        );
+
+        TestHelper
+            .GenerateMapper(source, TestHelperOptions.AllowInfoDiagnostics)
+            .Should()
+            .HaveSingleMethodBody(
+                """
+                var target = new global::B();
+                target.Value = source.Value;
+                target.Ignored = source.Ignored;
+                return target;
+                """
+            );
+    }
+
+    [Fact]
+    public void MapPropertyOverridesIgnoreObsoleteTarget()
+    {
+        var source = TestSourceBuilder.MapperWithBodyAndTypes(
+            """
+                [MapProperty("Ignored", "Ignored")]
+                [MapperIgnoreObsoleteMembers(IgnoreObsoleteMembersStrategy.Target)]
+                partial B Map(A source);
+                """,
+            _classA,
+            _classB
+        );
+
+        TestHelper
+            .GenerateMapper(source, TestHelperOptions.AllowInfoDiagnostics)
+            .Should()
+            .HaveSingleMethodBody(
+                """
+                var target = new global::B();
+                target.Value = source.Value;
+                target.Ignored = source.Ignored;
+                return target;
+                """
+            );
+    }
 }