Merge branch 'development' into fix-interfaces-map-regression

Author: DocSvartz

src/Mapster.Tests/WhenMappingInitProperty.cs

@@ -0,0 +1,63 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Shouldly;
+
+namespace Mapster.Tests;
+
+[TestClass]
+public class WhenMappingInitProperty
+{
+
+    #region Tests
+    /// <summary>
+    /// From Issue #672 
+    /// https://github.com/MapsterMapper/Mapster/issues/672
+    /// </summary>
+    [TestMethod]
+    public void WhenMappingToHiddenandNewInitFieldDestination()
+    {
+        var source = new Source672() { Id = 156};
+        var c =  source.Adapt<BDestination>(); 
+        var s = source.Adapt(new BDestination());
+
+        ((ADestination)c).Id.ShouldBe(156);
+        s.Id.ShouldBe(156);
+    }
+
+    [TestMethod]
+    public void WhenMappingToHiddenandNewInitFieldWithConstructUsing()
+    {
+        TypeAdapterConfig<Source672, BDestination>.NewConfig().ConstructUsing(_ => new BDestination());
+
+
+        var source = new Source672() { Id = 256 };
+        var c = source.Adapt<BDestination>();
+        var s = source.Adapt(new BDestination());
+
+        ((ADestination)c).Id.ShouldBe(256);
+        s.Id.ShouldBe(256);
+    }
+
+
+    #endregion Tests
+
+
+    #region TestClasses
+
+    class Source672
+    {
+        public long Id { get; init; }
+    }
+
+    class ADestination
+    {
+        public int Id { get; init; }
+    }
+
+    class BDestination : ADestination
+    {
+        public new long Id { get; init; }
+    }
+
+
+    #endregion TestClasses
+}

src/Mapster.Tests/WhenMappingToInterface.cs

@@ -3,6 +3,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json.Serialization;
+using Newtonsoft.Json;
 
 namespace Mapster.Tests
 {
@@ -266,6 +268,27 @@ public void MappingToInteraceWithReadonlyProps_AllPropsInitialized()
             );
         }
 
+        [TestMethod]
+        public void MappingToInterface_VerifyReadonlyPropsInterfaceRule()
+        {
+            SampleInterfaceCls source = new SampleInterfaceCls
+            {
+                ActivityData = new SampleActivityData
+                {
+                    Data = new SampleActivityParsedData
+                    {
+                        Steps = new List<string> { "A", "B", "C" }
+                    }
+                }
+            };
+
+            SampleInterfaceCls target = source.Adapt<SampleInterfaceCls>();
+            target.ShouldNotBeNull();
+            target.ShouldSatisfyAllConditions(
+                () => target.ActivityData.ShouldBe(source.ActivityData)
+            );
+        }
+
         public interface IInheritedDtoWithoutProperties : IInheritedDto
         {
         }
@@ -374,6 +397,42 @@ public class PropertyInitializationTestSource
             public int Property1 { get; set; }
             public int Property2 { get; set; }
         }
+        
+        public interface IActivityData
+        {
+    
+        }
+
+        public class SampleInterfaceCls
+        {
+            [Newtonsoft.Json.JsonIgnore]
+            public IActivityData? ActivityData { get; set; }
+
+            public SampleInterfaceCls()
+            {
+        
+            }
+
+            public SampleInterfaceCls(IActivityData data)
+            {
+                SetActivityData(data);
+            }
+    
+            public void SetActivityData(IActivityData data)
+            {
+                ActivityData = data;
+            }
+        }
+        
+        public class SampleActivityData : IActivityData
+        {
+            public SampleActivityParsedData Data { get; set; }
+        }
+        
+        public class SampleActivityParsedData
+        {
+            public List<string> Steps { get; set; } = new List<string>();
+        }
 
     }
 }

src/Mapster/Adapters/ClassAdapter.cs

@@ -183,7 +183,7 @@ private static Expression SetValueByReflection(MemberMapping member, MemberExpre
             var typeofExpression = Expression.Constant(member.Destination!.Type);
             var getPropertyMethod = typeof(Type).GetMethod("GetProperty", new[] { typeof(string) })!;
             var getPropertyExpression = Expression.Call(typeofExpression, getPropertyMethod,
-                Expression.Constant(member.DestinationMember.Name));
+                Expression.Constant(member.DestinationMember.Name, member.DestinationMember.Type));
             var setValueMethod =
                 typeof(PropertyInfo).GetMethod("SetValue", new[] { typeof(object), typeof(object) })!;
             var memberAsObject = adapt.To(typeof(object));

src/Mapster/Adapters/ReadOnlyInterfaceAdapter.cs

@@ -11,7 +11,6 @@ internal class ReadOnlyInterfaceAdapter : ClassAdapter
         protected override bool CanMap(PreCompileArgument arg)
         {
             return arg.DestinationType.IsInterface;
-
         }
 
         protected override bool CanInline(Expression source, Expression? destination, CompileArgument arg)

src/Mapster/TypeAdapter.cs

@@ -96,8 +96,8 @@ public static TDestination Adapt<TSource, TDestination>(this TSource source, TDe
         /// <returns>Adapted destination type.</returns>
         public static TDestination Adapt<TSource, TDestination>(this TSource source, TDestination destination, TypeAdapterConfig config)
         {
-            var sourceType = source.GetType();
-            var destinationType = destination.GetType();
+            var sourceType = source?.GetType();
+            var destinationType = destination?.GetType();
 
             if (sourceType == typeof(object)) // Infinity loop in ObjectAdapter if Runtime Type of source is Object 
                 return destination;