Merge pull request #74 from BlaiseD/master

Improvement to map a constructor with no parameters in a selector.
AutoMapper · May 21, 2020 · df59fba · df59fba
2 parents 4a69e14 + f52417d
commit df59fba
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 3 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Authors>Jimmy Bogard</Authors>
     <LangVersion>latest</LangVersion>
-    <VersionPrefix>3.1.0</VersionPrefix>
+    <VersionPrefix>3.1.1-preview01</VersionPrefix>
     <WarningsAsErrors>true</WarningsAsErrors>
     <NoWarn>$(NoWarn);1701;1702;1591</NoWarn>
   </PropertyGroup>

diff --git a/src/AutoMapper.Extensions.ExpressionMapping/Extensions/VisitorExtensions.cs b/src/AutoMapper.Extensions.ExpressionMapping/Extensions/VisitorExtensions.cs
@@ -111,9 +111,9 @@ public static ParameterExpression GetParameterExpression(this Expression express
                 case ExpressionType.Parameter:
                     return (ParameterExpression)expression;
                 case ExpressionType.Quote:
-                    return GetParameterExpression(GetMemberExpression((LambdaExpression)((UnaryExpression)expression).Operand));
+                    return GetParameterExpression(((UnaryExpression)expression).Operand);
                 case ExpressionType.Lambda:
-                    return GetParameterExpression(GetMemberExpression((LambdaExpression)expression));
+                    return GetParameterExpression(((LambdaExpression)expression).Body);
                 case ExpressionType.ConvertChecked:
                 case ExpressionType.Convert:
                     var ue = expression as UnaryExpression;

diff --git a/src/AutoMapper.Extensions.ExpressionMapping/XpressionMapperVisitor.cs b/src/AutoMapper.Extensions.ExpressionMapping/XpressionMapperVisitor.cs
@@ -129,6 +129,14 @@ protected override Expression VisitLambda<T>(Expression<T> node)
             return mapped;
         }
 
+        protected override Expression VisitNew(NewExpression node)
+        {
+            if (this.TypeMappings.TryGetValue(node.Type, out Type newType))
+                return Expression.New(newType);
+
+            return base.VisitNew(node);
+        }
+
         protected override Expression VisitMemberInit(MemberInitExpression node)
         {
             if (this.TypeMappings.TryGetValue(node.Type, out Type newType))

diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/XpressionMapperTests.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/XpressionMapperTests.cs
@@ -429,6 +429,32 @@ public void Map__select_method_projecting_to_model_type()
             Assert.True(things.Count == 2);
         }
 
+        [Fact]
+        public void Map_MemberInit()
+        {
+            //Arrange
+            Expression<Func<ThingModel, ThingModel>> selection = s => new ThingModel { Car = s.Car };
+
+            //Act
+            Expression<Func<Thing, Thing>> selectionMapped = mapper.MapExpression<Expression<Func<Thing, Thing>>>(selection);
+
+            //Assert
+            Assert.NotNull(selectionMapped);
+        }
+
+        [Fact]
+        public void Map_Constructor_NoParams()
+        {
+            //Arrange
+            Expression<Func<ThingModel, ThingModel>> selection = s => new ThingModel();
+
+            //Act
+            Expression<Func<Thing, Thing>> selectionMapped = mapper.MapExpression<Expression<Func<Thing, Thing>>>(selection);
+
+            //Assert
+            Assert.NotNull(selectionMapped);
+        }
+
         [Fact]
         public void Map__select_method_where_parent_type_is_grandchild_type()
         {