Merge pull request #95 from AutoMapper/402Preview03

Do not convert body to destination type when mapping include expressions.

Author: BlaiseD

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
 
     - name: Set Variables
       run: |
-        echo '::set-env name=VERSION_NUMBER::4.0.2-preview-2'
+        echo '::set-env name=VERSION_NUMBER::4.0.2-preview-3'
         echo '::set-env name=DEPLOY_PACKAGE_URL::https://www.myget.org/F/automapperdev/api/v3/index.json'
         echo '::set-env name=DEPLOY_PACKAGE_API_KEY::${{ secrets.MYGET_CI_API_KEY }}'
         echo '::set-env name=REPO::${{ github.repository }}'

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
 
     - name: Set Variables
       run: |
-        echo '::set-env name=VERSION_NUMBER::4.0.2-preview-2'
+        echo '::set-env name=VERSION_NUMBER::4.0.2-preview-3'
         echo '::set-env name=DEPLOY_PACKAGE_URL::https://api.nuget.org/v3/index.json'
         echo '::set-env name=DEPLOY_PACKAGE_API_KEY::${{ secrets.NUGET_API_KEY }}'
         echo '::set-env name=REPO::${{ github.repository }}'

Directory.Build.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Authors>Jimmy Bogard</Authors>
     <LangVersion>latest</LangVersion>
-    <VersionPrefix>4.0.2-preview-2</VersionPrefix>
+    <VersionPrefix>4.0.2-preview-3</VersionPrefix>
     <WarningsAsErrors>true</WarningsAsErrors>
     <NoWarn>$(NoWarn);1701;1702;1591</NoWarn>
   </PropertyGroup>

src/AutoMapper.Extensions.ExpressionMapping/MapperExtensions.cs

@@ -67,11 +67,15 @@ public static TDestDelegate MapExpression<TDestDelegate>(this IMapper mapper, La
             return mapper.MapExpression<TDestDelegate>
             (
                 expression, 
-                (config, mappings) => new XpressionMapperVisitor(mapper, config, mappings)
+                (config, mappings) => new XpressionMapperVisitor(mapper, config, mappings),
+                (desType) => IsFuncType(desType)
             );
         }
 
-        private static TDestDelegate MapExpression<TDestDelegate>(this IMapper mapper, LambdaExpression expression, Func<IConfigurationProvider, Dictionary<Type, Type>, XpressionMapperVisitor> getVisitor)
+        private static TDestDelegate MapExpression<TDestDelegate>(this IMapper mapper, 
+            LambdaExpression expression, 
+            Func<IConfigurationProvider, Dictionary<Type, Type>, XpressionMapperVisitor> getVisitor, 
+            Func<Type, bool> shouldConvertMappedBodyToDestType)
             where TDestDelegate : LambdaExpression
         {
             return MapExpression<TDestDelegate>
@@ -80,15 +84,17 @@ private static TDestDelegate MapExpression<TDestDelegate>(this IMapper mapper, L
                 expression,
                 expression.GetType().GetGenericArguments()[0],
                 typeof(TDestDelegate).GetGenericArguments()[0],
-                getVisitor
+                getVisitor,
+                shouldConvertMappedBodyToDestType
             );
         }
 
         private static TDestDelegate MapExpression<TDestDelegate>(IConfigurationProvider configurationProvider,
             LambdaExpression expression,
             Type typeSourceFunc,
             Type typeDestFunc,
-            Func<IConfigurationProvider, Dictionary<Type, Type>, XpressionMapperVisitor> getVisitor)
+            Func<IConfigurationProvider, Dictionary<Type, Type>, XpressionMapperVisitor> getVisitor,
+            Func<Type, bool> shouldConvertMappedBodyToDestType)
             where TDestDelegate : LambdaExpression
         {
             return CreateVisitor(new Dictionary<Type, Type>().AddTypeMappingsFromDelegates(configurationProvider, typeSourceFunc, typeDestFunc));
@@ -99,15 +105,15 @@ TDestDelegate CreateVisitor(Dictionary<Type, Type> typeMappings)
             TDestDelegate MapBody(Dictionary<Type, Type> typeMappings, XpressionMapperVisitor visitor)
                 => GetLambda(typeMappings, visitor, visitor.Visit(expression.Body));
 
-            TDestDelegate GetLambda(Dictionary<Type, Type> typeMappings, XpressionMapperVisitor visitor, Expression remappedBody)
+            TDestDelegate GetLambda(Dictionary<Type, Type> typeMappings, XpressionMapperVisitor visitor, Expression mappedBody)
             {
-                if (remappedBody == null)
+                if (mappedBody == null)
                     throw new InvalidOperationException(Resource.cantRemapExpression);
 
                 return (TDestDelegate)Lambda
                 (
                     typeDestFunc,
-                    typeDestFunc.IsFuncType() ? ExpressionFactory.ToType(remappedBody, typeDestFunc.GetGenericArguments().Last()) : remappedBody,
+                    shouldConvertMappedBodyToDestType(typeDestFunc) ? ExpressionFactory.ToType(mappedBody, typeDestFunc.GetGenericArguments().Last()) : mappedBody,
                     expression.GetDestinationParameterExpressions(visitor.InfoDictionary, typeMappings)
                 );
             }
@@ -145,7 +151,8 @@ public static TDestDelegate MapExpressionAsInclude<TDestDelegate>(this IMapper m
             return mapper.MapExpression<TDestDelegate>
             (
                 expression,
-                (config, mappings) => new MapIncludesVisitor(mapper, config, mappings)
+                (config, mappings) => new MapIncludesVisitor(mapper, config, mappings),
+                desType => false
             );
         }
 

tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/XpressionMapperTests.cs

@@ -91,6 +91,34 @@ public void Map_collection_includes_with_flattened_string()
             Assert.True(listOfCarLists.Count == 2);
         }
 
+        [Fact]
+        public void Map_collection_includes_with_flattened_collection()
+        {
+            //Arrange
+            Expression<Func<UserModel, object>> selection = s => s.AccountModel.ThingModels;
+
+            //Act
+            Expression<Func<User, object>> selectionMapped = mapper.MapExpressionAsInclude<Expression<Func<User, object>>>(selection);
+            List<object> listOfCarLists = Users.Select(selectionMapped).ToList();
+
+            //Assert
+            Assert.True(listOfCarLists.Count == 2);
+        }
+
+        [Fact]
+        public void Map_collection_includes_with_flattened_collection_return_type_not_converted()
+        {
+            //Arrange
+            Expression<Func<UserModel, object>> selection = s => s.AccountModel.ThingModels;
+
+            //Act
+            Expression<Func<User, object>> selectionMapped = mapper.MapExpressionAsInclude<Expression<Func<User, object>>>(selection);
+            List<object> listOfCarLists = Users.Select(selectionMapped).ToList();
+
+            //Assert
+            Assert.True(selectionMapped.ToString() == "s => s.Account.Things");
+        }
+
         [Fact]
         public void Map_includes_trim_string_nested_in_select_using_object()
         {