MapsterMapper#524 Object To TDestination fixed

DocSvartz · Oct 18, 2023 · 6ef1fe0 · 6ef1fe0
1 parent f678d12
commit 6ef1fe0
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 23 deletions.
diff --git a/src/Mapster.Tests/WhenMappingRecordRegression.cs b/src/Mapster.Tests/WhenMappingRecordRegression.cs
@@ -248,6 +248,26 @@ public void DetectFakeRecord()
             object.ReferenceEquals(_destination, _result).ShouldBeTrue();
         }
 
+        /// <summary>
+        /// https://github.com/MapsterMapper/Mapster/issues/524 
+        /// </summary>
+        [TestMethod]
+        public void TSousreIsObjectUpdate()
+        {
+            var source = new TestClassPublicCtr { X = 123 };
+            var _result = Somemap(source);
+
+            _result.X.ShouldBe(123);
+        }
+
+        TestClassPublicCtr Somemap(object source)
+        {
+            var dest = new TestClassPublicCtr { X = 321 };
+            var dest1 = source.Adapt(dest); 
+
+            return dest;
+        }
+
         #region NowNotWorking
 
         /// <summary>
@@ -268,29 +288,6 @@ public void CollectionUpdate()
             destination.Count.ShouldBe(_result.Count);
         }
 
-        /// <summary>
-        /// https://github.com/MapsterMapper/Mapster/issues/524 
-        /// Not work. Already has a special overload:  
-        /// .Adapt(this object source, object destination, Type sourceType, Type destinationType)
-        /// </summary>
-        [Ignore]
-        [TestMethod]
-        public void TSousreIsObjectUpdate()
-        {
-            var source = new TestClassPublicCtr { X = 123 };
-            var _result = Somemap(source);
-
-            _result.X.ShouldBe(123);
-        }
-
-        TestClassPublicCtr Somemap(object source)
-        {
-            var dest = new TestClassPublicCtr { X = 321 };
-            var dest1 = source.Adapt(dest); // typeof(TSource) always return Type as Object. Need use dynamic or Cast to Runtime Type before Adapt
-
-            return dest;
-        }
-
         #endregion NowNotWorking
 
     }

diff --git a/src/Mapster/Adapters/ObjectAdapter.cs b/src/Mapster/Adapters/ObjectAdapter.cs
@@ -31,5 +31,18 @@ protected override Expression CreateInlineExpression(Expression source, CompileA
         {
             return CreateInstantiationExpression(source, arg);
         }
+
+        protected override Expression CreateExpressionBody(Expression source, Expression? destination, CompileArgument arg)
+        {
+
+            if(destination == null || arg.DestinationType == typeof(object))
+                return base.CreateExpressionBody(source, destination, arg);
+            else
+            {
+                var convert = arg.Context.Config.CreateDynamicMapInvokeExpressionBody(arg.DestinationType, source);
+                return arg.Context.Config.CreateMapToTargetInvokeExpressionBody(convert.Type, destination.Type, convert, destination);
+            }
+
+        }
     }
 }