feat: case-insensitive MapProperty configurations matching for constr…

…uctor parameters (#957)
riok · Dec 6, 2023 · b9db799 · b9db799
1 parent cec43ad
commit b9db799
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 9 deletions.
diff --git a/...iok.Mapperly/Descriptors/MappingBodyBuilders/BuilderContext/INewInstanceBuilderContext.cs b/...iok.Mapperly/Descriptors/MappingBodyBuilders/BuilderContext/INewInstanceBuilderContext.cs
@@ -13,4 +13,11 @@ public interface INewInstanceBuilderContext<out T> : IMembersBuilderContext<T>
     void AddConstructorParameterMapping(ConstructorParameterMapping mapping);
 
     void AddInitMemberMapping(MemberAssignmentMapping mapping);
+
+    /// <summary>
+    /// Maps case insensitive target root member names to their real case sensitive names.
+    /// For example id => Id. The real name can then be used as key for <see cref="IMembersBuilderContext{T}.MemberConfigsByRootTargetName"/>.
+    /// This allows resolving case insensitive configuration member names (eg. when mapping to constructor parameters).
+    /// </summary>
+    IReadOnlyDictionary<string, string> RootTargetNameCasingMapping { get; }
 }
diff --git a/...Riok.Mapperly/Descriptors/MappingBodyBuilders/BuilderContext/NewInstanceBuilderContext.cs b/...Riok.Mapperly/Descriptors/MappingBodyBuilders/BuilderContext/NewInstanceBuilderContext.cs
@@ -7,11 +7,17 @@ namespace Riok.Mapperly.Descriptors.MappingBodyBuilders.BuilderContext;
 /// An implementation of <see cref="INewInstanceBuilderContext{T}"/>.
 /// </summary>
 /// <typeparam name="T">The type of the mapping.</typeparam>
-public class NewInstanceBuilderContext<T>(MappingBuilderContext builderContext, T mapping)
-    : MembersMappingBuilderContext<T>(builderContext, mapping),
-        INewInstanceBuilderContext<T>
+public class NewInstanceBuilderContext<T> : MembersMappingBuilderContext<T>, INewInstanceBuilderContext<T>
     where T : INewInstanceObjectMemberMapping
 {
+    public IReadOnlyDictionary<string, string> RootTargetNameCasingMapping { get; }
+
+    public NewInstanceBuilderContext(MappingBuilderContext builderContext, T mapping)
+        : base(builderContext, mapping)
+    {
+        RootTargetNameCasingMapping = MemberConfigsByRootTargetName.ToDictionary(x => x.Key, x => x.Key, StringComparer.OrdinalIgnoreCase);
+    }
+
     public void AddInitMemberMapping(MemberAssignmentMapping mapping)
     {
         SetSourceMemberMapped(mapping.SourcePath);
@@ -20,7 +26,8 @@ public void AddInitMemberMapping(MemberAssignmentMapping mapping)
 
     public void AddConstructorParameterMapping(ConstructorParameterMapping mapping)
     {
-        MemberConfigsByRootTargetName.Remove(mapping.Parameter.Name);
+        var paramName = RootTargetNameCasingMapping.GetValueOrDefault(mapping.Parameter.Name, defaultValue: mapping.Parameter.Name);
+        MemberConfigsByRootTargetName.Remove(paramName);
         SetSourceMemberMapped(mapping.DelegateMapping.SourcePath);
         Mapping.AddConstructorParameterMapping(mapping);
     }

diff --git a/...erly/Descriptors/MappingBodyBuilders/BuilderContext/NewInstanceContainerBuilderContext.cs b/...erly/Descriptors/MappingBodyBuilders/BuilderContext/NewInstanceContainerBuilderContext.cs
@@ -8,11 +8,17 @@ namespace Riok.Mapperly.Descriptors.MappingBodyBuilders.BuilderContext;
 /// which supports containers (<seealso cref="MembersContainerBuilderContext{T}"/>).
 /// </summary>
 /// <typeparam name="T"></typeparam>
-public class NewInstanceContainerBuilderContext<T>(MappingBuilderContext builderContext, T mapping)
-    : MembersContainerBuilderContext<T>(builderContext, mapping),
-        INewInstanceBuilderContext<T>
+public class NewInstanceContainerBuilderContext<T> : MembersContainerBuilderContext<T>, INewInstanceBuilderContext<T>
     where T : INewInstanceObjectMemberMapping, IMemberAssignmentTypeMapping
 {
+    public IReadOnlyDictionary<string, string> RootTargetNameCasingMapping { get; }
+
+    public NewInstanceContainerBuilderContext(MappingBuilderContext builderContext, T mapping)
+        : base(builderContext, mapping)
+    {
+        RootTargetNameCasingMapping = MemberConfigsByRootTargetName.ToDictionary(x => x.Key, x => x.Key, StringComparer.OrdinalIgnoreCase);
+    }
+
     public void AddInitMemberMapping(MemberAssignmentMapping mapping)
     {
         SetSourceMemberMapped(mapping.SourcePath);
@@ -21,7 +27,8 @@ public void AddInitMemberMapping(MemberAssignmentMapping mapping)
 
     public void AddConstructorParameterMapping(ConstructorParameterMapping mapping)
     {
-        MemberConfigsByRootTargetName.Remove(mapping.Parameter.Name);
+        var paramName = RootTargetNameCasingMapping.GetValueOrDefault(mapping.Parameter.Name, defaultValue: mapping.Parameter.Name);
+        MemberConfigsByRootTargetName.Remove(paramName);
         SetSourceMemberMapped(mapping.DelegateMapping.SourcePath);
         Mapping.AddConstructorParameterMapping(mapping);
     }

diff --git a/...iok.Mapperly/Descriptors/MappingBodyBuilders/NewInstanceObjectMemberMappingBodyBuilder.cs b/...iok.Mapperly/Descriptors/MappingBodyBuilders/NewInstanceObjectMemberMappingBodyBuilder.cs
@@ -320,7 +320,10 @@ out PropertyMappingConfiguration? memberConfig
         sourcePath = null;
         memberConfig = null;
 
-        if (!ctx.MemberConfigsByRootTargetName.TryGetValue(parameter.Name, out var memberConfigs))
+        if (
+            !ctx.RootTargetNameCasingMapping.TryGetValue(parameter.Name, out var parameterName)
+            || !ctx.MemberConfigsByRootTargetName.TryGetValue(parameterName, out var memberConfigs)
+        )
         {
             return ctx.BuilderContext
                 .SymbolAccessor

diff --git a/test/Riok.Mapperly.Tests/Mapping/CtorTest.cs b/test/Riok.Mapperly.Tests/Mapping/CtorTest.cs
@@ -79,4 +79,33 @@ public void DeepCloneRecordShouldNotUseCtorMapping()
                 """
             );
     }
+
+    [Fact]
+    public void MapPropertyCtorMapping()
+    {
+        var source = TestSourceBuilder.MapperWithBodyAndTypes(
+            """
+            [MapProperty(nameof(A.BId), nameof(B.Id))]
+            private partial B Map(A source);
+            """,
+            "class A { public long BId { get; } }",
+            """
+            class B
+            {
+                public long Id { get; }
+
+                public B(long id) { Id = id; }
+            }
+            """
+        );
+        TestHelper
+            .GenerateMapper(source)
+            .Should()
+            .HaveSingleMethodBody(
+                """
+                var target = new global::B(source.BId);
+                return target;
+                """
+            );
+    }
 }