fix: required/init properties not using PropertyNameMappingStrategy (#…

…505)
riok · Jul 11, 2023 · de4a900 · de4a900
1 parent f19b833
commit de4a900
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/...iok.Mapperly/Descriptors/MappingBodyBuilders/NewInstanceObjectMemberMappingBodyBuilder.cs b/...iok.Mapperly/Descriptors/MappingBodyBuilders/NewInstanceObjectMemberMappingBodyBuilder.cs
@@ -34,6 +34,11 @@ public static void BuildMappingBody(MappingBuilderContext ctx, NewInstanceObject
 
     private static void BuildInitOnlyMemberMappings(INewInstanceBuilderContext<IMapping> ctx, bool includeAllMembers = false)
     {
+        var memberNameComparer =
+            ctx.BuilderContext.MapperConfiguration.PropertyNameMappingStrategy == PropertyNameMappingStrategy.CaseSensitive
+                ? StringComparer.Ordinal
+                : StringComparer.OrdinalIgnoreCase;
+
         var initOnlyTargetMembers = includeAllMembers
             ? ctx.TargetMembers.Values.ToArray()
             : ctx.TargetMembers.Values.Where(x => x.CanOnlySetViaInitializer()).ToArray();
@@ -52,6 +57,7 @@ private static void BuildInitOnlyMemberMappings(INewInstanceBuilderContext<IMapp
                     ctx.Mapping.SourceType,
                     MemberPathCandidateBuilder.BuildMemberPathCandidates(targetMember.Name),
                     ctx.IgnoredSourceMemberNames,
+                    memberNameComparer,
                     ctx.BuilderContext.SymbolAccessor,
                     out var sourceMemberPath
                 )

diff --git a/src/Riok.Mapperly/Symbols/MemberPath.cs b/src/Riok.Mapperly/Symbols/MemberPath.cs
@@ -176,14 +176,6 @@ public override int GetHashCode()
 
     private bool Equals(MemberPath other) => Path.SequenceEqual(other.Path);
 
-    public static bool TryFind(
-        ITypeSymbol type,
-        IEnumerable<IEnumerable<string>> pathCandidates,
-        IReadOnlyCollection<string> ignoredNames,
-        SymbolAccessor symbolAccessor,
-        [NotNullWhen(true)] out MemberPath? memberPath
-    ) => TryFind(type, pathCandidates, ignoredNames, StringComparer.Ordinal, symbolAccessor, out memberPath);
-
     public static bool TryFind(
         ITypeSymbol type,
         IEnumerable<IEnumerable<string>> pathCandidates,

diff --git a/test/Riok.Mapperly.Tests/Mapping/ObjectPropertyTest.cs b/test/Riok.Mapperly.Tests/Mapping/ObjectPropertyTest.cs
@@ -176,16 +176,19 @@ public void WithPropertyNameMappingStrategyCaseInsensitive()
         var source = TestSourceBuilder.MapperWithBodyAndTypes(
             "partial B Map(A source);",
             new TestSourceBuilderOptions { PropertyNameMappingStrategy = PropertyNameMappingStrategy.CaseInsensitive },
-            "class A { public string StringValue { get; set; } }",
-            "class B { public string stringvalue { get; set; } }"
+            "class A { public string StringValue { get; set; } public int Value { get; set; } }",
+            "class B { public string stringvalue { get; set; } public required int value { get; init; } }"
         );
 
         TestHelper
             .GenerateMapper(source)
             .Should()
             .HaveSingleMethodBody(
                 """
-                var target = new global::B();
+                var target = new global::B()
+                {
+                    value = source.Value
+                };
                 target.stringvalue = source.StringValue;
                 return target;
                 """