member side

MapsterMapper · May 25, 2017 · c436564 · c436564
1 parent 3c02ccd
commit c436564
Show file tree

Hide file tree

Showing 19 changed files with 124 additions and 50 deletions.
diff --git a/src/Mapster.Tests/WhenMappingWithImplicitInheritance.cs b/src/Mapster.Tests/WhenMappingWithImplicitInheritance.cs
@@ -1,6 +1,7 @@
 using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Shouldly;
+using Mapster.Models;
 
 namespace Mapster.Tests
 {
@@ -178,7 +179,8 @@ public void Derived_Config_Shares_Base_Config_Properties()
                 //.MaxDepth(5)
                 .Compile();
 
-            var derivedConfig = TypeAdapterConfig.GlobalSettings.GetMergedSettings(typeof(DerivedPoco), typeof(SimpleDto), MapType.Map);
+            var tuple = new TypeTuple(typeof(DerivedPoco), typeof(SimpleDto));
+            var derivedConfig = TypeAdapterConfig.GlobalSettings.GetMergedSettings(tuple, MapType.Map);
 
             derivedConfig.IgnoreNullValues.ShouldBe(true);
             derivedConfig.ShallowCopyForSameType.ShouldBe(true);
@@ -195,7 +197,8 @@ public void Derived_Config_Shares_Base_Dest_Config_Properties()
                 //.MaxDepth(5)
                 .Compile();
 
-            var derivedConfig = TypeAdapterConfig.GlobalSettings.GetMergedSettings(typeof(DerivedPoco), typeof(DerivedDto), MapType.Map);
+            var tuple = new TypeTuple(typeof(DerivedPoco), typeof(DerivedDto));
+            var derivedConfig = TypeAdapterConfig.GlobalSettings.GetMergedSettings(tuple, MapType.Map);
 
             derivedConfig.IgnoreNullValues.ShouldBe(true);
             derivedConfig.ShallowCopyForSameType.ShouldBe(true);
@@ -212,7 +215,8 @@ public void Derived_Config_Doesnt_Share_Base_Dest_Config_Properties_If_Disabled(
                 //.MaxDepth(5)
                 .Compile();
 
-            var derivedConfig = TypeAdapterConfig.GlobalSettings.GetMergedSettings(typeof(DerivedPoco), typeof(DerivedDto), MapType.Map);
+            var tuple = new TypeTuple(typeof(DerivedPoco), typeof(DerivedDto));
+            var derivedConfig = TypeAdapterConfig.GlobalSettings.GetMergedSettings(tuple, MapType.Map);
 
             derivedConfig.IgnoreNullValues.ShouldBeNull();
             derivedConfig.ShallowCopyForSameType.ShouldBeNull();

diff --git a/src/Mapster/Adapters/BaseClassAdapter.cs b/src/Mapster/Adapters/BaseClassAdapter.cs
@@ -78,7 +78,7 @@ protected static bool ProcessIgnores(
             out LambdaExpression condition)
         {
             condition = null;
-            if (!destinationMember.ShouldMapMember(config.ShouldMapMember))
+            if (!destinationMember.ShouldMapMember(config.ShouldMapMember, MemberSide.Destination))
                 return true;
 
             return config.IgnoreIfs.TryGetValue(destinationMember.Name, out condition)

diff --git a/src/Mapster/Adapters/DictionaryAdapter.cs b/src/Mapster/Adapters/DictionaryAdapter.cs
@@ -174,7 +174,7 @@ protected override ClassModel GetClassModel(Type destinationType, CompileArgumen
                     .Where(name => name != null)
                     .ToHashSet();
                 var propNames = arg.SourceType.GetFieldsAndProperties(accessorFlags: BindingFlags.NonPublic | BindingFlags.Public)
-                    .Where(model => model.ShouldMapMember(arg.Settings.ShouldMapMember))
+                    .Where(model => model.ShouldMapMember(arg.Settings.ShouldMapMember, MemberSide.Source))
                     .Select(model => model.Name)
                     .Where(name => !srcNames.Contains(name))
                     .Select(name => arg.Settings.NameMatchingStrategy.SourceMemberNameConverter(name));

diff --git a/src/Mapster/Enums/MemberSide.cs b/src/Mapster/Enums/MemberSide.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mapster
+{
+    public enum MemberSide
+    {
+        Source,
+        Destination,
+    }
+}
diff --git a/src/Mapster/Mapster.csproj b/src/Mapster/Mapster.csproj
@@ -69,11 +69,13 @@
     <Compile Include="Compile\CompileContext.cs" />
     <Compile Include="Compile\CompileException.cs" />
     <Compile Include="Enums\EnumMappingStrategy.cs" />
+    <Compile Include="Enums\MemberSide.cs" />
     <Compile Include="Interfaces\IApplyable.cs" />
     <Compile Include="Interfaces\IRegister.cs" />
     <Compile Include="MapContext\MapContext.cs" />
     <Compile Include="MapContext\MapContextScope.cs" />
     <Compile Include="Enums\MapType.cs" />
+    <Compile Include="Models\IMemberModelEx.cs" />
     <Compile Include="Models\KeyValuePairModel.cs" />
     <Compile Include="Settings\GetMemberName.cs" />
     <Compile Include="Settings\NameMatchingStrategy.cs" />

diff --git a/src/Mapster/Models/ClassModel.cs b/src/Mapster/Models/ClassModel.cs
@@ -6,6 +6,6 @@ namespace Mapster.Models
     internal class ClassModel
     {
         public ConstructorInfo ConstructorInfo { get; set; }
-        public IEnumerable<IMemberModel> Members { get; set; } 
+        public IEnumerable<IMemberModelEx> Members { get; set; } 
     }
 }
diff --git a/src/Mapster/Models/FieldModel.cs b/src/Mapster/Models/FieldModel.cs
@@ -5,7 +5,7 @@
 
 namespace Mapster.Models
 {
-    public class FieldModel : IMemberModel
+    public class FieldModel : IMemberModelEx
     {
         private readonly FieldInfo _fieldInfo;
         public FieldModel(FieldInfo fieldInfo)

diff --git a/src/Mapster/Models/IMemberModel.cs b/src/Mapster/Models/IMemberModel.cs
@@ -12,8 +12,6 @@ public interface IMemberModel
         AccessModifier SetterModifier { get; }
         AccessModifier AccessModifier { get; }
 
-        Expression GetExpression(Expression source);
-        Expression SetExpression(Expression source, Expression value);
         IEnumerable<object> GetCustomAttributes(bool inherit);
     }
 }
diff --git a/src/Mapster/Models/IMemberModelEx.cs b/src/Mapster/Models/IMemberModelEx.cs
@@ -0,0 +1,10 @@
+using System.Linq.Expressions;
+
+namespace Mapster.Models
+{
+    internal interface IMemberModelEx: IMemberModel
+    {
+        Expression GetExpression(Expression source);
+        Expression SetExpression(Expression source, Expression value);
+    }
+}
diff --git a/src/Mapster/Models/KeyValuePairModel.cs b/src/Mapster/Models/KeyValuePairModel.cs
@@ -7,11 +7,11 @@
 
 namespace Mapster.Models
 {
-    public class KeyValuePairModel : IMemberModel
+    public class KeyValuePairModel : IMemberModelEx
     {
         readonly Func<Expression, Expression, Expression> _getFn;
         readonly Func<Expression, Expression, Expression, Expression> _setFn;
-        public KeyValuePairModel(string name, Type type, 
+        public KeyValuePairModel(string name, Type type,
             Func<Expression, Expression, Expression> getFn, 
             Func<Expression, Expression, Expression, Expression> setFn)
         {

diff --git a/src/Mapster/Models/MemberMapping.cs b/src/Mapster/Models/MemberMapping.cs
@@ -5,7 +5,7 @@ namespace Mapster.Models
     internal class MemberMapping
     {
         public Expression Getter;
-        public IMemberModel DestinationMember;
+        public IMemberModelEx DestinationMember;
         public LambdaExpression SetterCondition;
     }
 }
diff --git a/src/Mapster/Models/ParameterModel.cs b/src/Mapster/Models/ParameterModel.cs
@@ -6,7 +6,7 @@
 
 namespace Mapster.Models
 {
-    public class ParameterModel : IMemberModel
+    public class ParameterModel : IMemberModelEx
     {
         private readonly ParameterInfo _parameterInfo;
         public ParameterModel(ParameterInfo parameterInfo)

diff --git a/src/Mapster/Models/PropertyModel.cs b/src/Mapster/Models/PropertyModel.cs
@@ -5,7 +5,7 @@
 
 namespace Mapster.Models
 {
-    public class PropertyModel : IMemberModel
+    public class PropertyModel : IMemberModelEx
     {
         protected readonly PropertyInfo _propertyInfo;
         public PropertyModel(PropertyInfo propertyInfo)

diff --git a/src/Mapster/Settings/ShouldMapMember.cs b/src/Mapster/Settings/ShouldMapMember.cs
@@ -5,9 +5,9 @@ namespace Mapster
 {
     public static class ShouldMapMember
     {
-        public static Func<IMemberModel, bool?> AllowNonPublic = model => model.AccessModifier != AccessModifier.None;
-        public static Func<IMemberModel, bool?> AllowPublic = model => model.AccessModifier == AccessModifier.Public ? (bool?)true : null;
-        public static Func<IMemberModel, bool?> IgnoreAdaptIgnore = model => model.HasCustomAttribute(typeof(AdaptIgnoreAttribute)) ? (bool?)false : null;
-        public static Func<IMemberModel, bool?> AllowAdaptMember = model => model.HasCustomAttribute(typeof(AdaptMemberAttribute)) ? (bool?)true : null;
+        public static Func<IMemberModel, MemberSide, bool?> AllowNonPublic = (model, _) => model.AccessModifier != AccessModifier.None;
+        public static Func<IMemberModel, MemberSide, bool?> AllowPublic = (model, _) => model.AccessModifier == AccessModifier.Public ? (bool?)true : null;
+        public static Func<IMemberModel, MemberSide, bool?> IgnoreAdaptIgnore = (model, _) => model.HasCustomAttribute(typeof(AdaptIgnoreAttribute)) ? (bool?)false : null;
+        public static Func<IMemberModel, MemberSide, bool?> AllowAdaptMember = (model, _) => model.HasCustomAttribute(typeof(AdaptMemberAttribute)) ? (bool?)true : null;
     }
 }
diff --git a/src/Mapster/Settings/ValueAccessingStrategy.cs b/src/Mapster/Settings/ValueAccessingStrategy.cs
@@ -59,7 +59,7 @@ private static Expression PropertyOrFieldFn(Expression source, IMemberModel dest
             var strategy = arg.Settings.NameMatchingStrategy;
             var destinationMemberName = destinationMember.GetMemberName(arg.Settings.GetMemberNames, strategy.DestinationMemberNameConverter);
             return members
-                .Where(member => member.ShouldMapMember(arg.Settings.ShouldMapMember))
+                .Where(member => member.ShouldMapMember(arg.Settings.ShouldMapMember, MemberSide.Source))
                 .Where(member => member.GetMemberName(arg.Settings.GetMemberNames, strategy.SourceMemberNameConverter) == destinationMemberName)
                 .Select(member => member.GetExpression(source))
                 .FirstOrDefault();

diff --git a/src/Mapster/TypeAdapterConfig.cs b/src/Mapster/TypeAdapterConfig.cs
@@ -297,7 +297,7 @@ internal LambdaExpression CreateMapExpression(TypeTuple tuple, MapType mapType)
             context.Running.Add(tuple);
             try
             {
-                var arg = GetCompileArgument(tuple.Source, tuple.Destination, mapType, context);
+                var arg = GetCompileArgument(tuple, mapType, context);
                 return CreateMapExpression(arg);
             }
             finally
@@ -365,7 +365,7 @@ internal LambdaExpression CreateInlineMapExpression(Type sourceType, Type destin
             context.Running.Add(tuple);
             try
             {
-                var arg = GetCompileArgument(tuple.Source, tuple.Destination, parentMapType == MapType.Projection ? MapType.Projection : MapType.InlineMap, context);
+                var arg = GetCompileArgument(tuple, parentMapType == MapType.Projection ? MapType.Projection : MapType.InlineMap, context);
                 var exp = CreateMapExpression(arg);
                 if (exp != null)
                 {
@@ -419,10 +419,10 @@ private LambdaExpression CreateMapToTargetInvokeExpression(Type sourceType, Type
             return Expression.Lambda(invoke, p1, p2);
         }
 
-        internal TypeAdapterSettings GetMergedSettings(Type sourceType, Type destinationType, MapType mapType)
+        internal TypeAdapterSettings GetMergedSettings(TypeTuple tuple, MapType mapType)
         {
             var settings = (from rule in this.Rules.Reverse<TypeAdapterRule>()
-                            let priority = rule.Priority(sourceType, destinationType, mapType)
+                            let priority = rule.Priority(tuple.Source, tuple.Destination, mapType)
                             where priority != null
                             orderby priority.Value descending
                             select rule.Settings).ToList();
@@ -434,19 +434,19 @@ orderby priority.Value descending
 
             //remove recursive include types
             if (mapType == MapType.MapToTarget)
-                result.Includes.Remove(new TypeTuple(sourceType, destinationType));
+                result.Includes.Remove(tuple);
             else
-                result.Includes.RemoveAll(tuple => tuple.Source == sourceType);
+                result.Includes.RemoveAll(t => t.Source == tuple.Source);
             return result;
         }
 
-        CompileArgument GetCompileArgument(Type sourceType, Type destinationType, MapType mapType, CompileContext context)
+        CompileArgument GetCompileArgument(TypeTuple tuple, MapType mapType, CompileContext context)
         {
-            var setting = GetMergedSettings(sourceType, destinationType, mapType);
+            var setting = GetMergedSettings(tuple, mapType);
             var arg = new CompileArgument
             {
-                SourceType = sourceType,
-                DestinationType = destinationType,
+                SourceType = tuple.Source,
+                DestinationType = tuple.Destination,
                 MapType = mapType,
                 Context = context,
                 Settings = setting,

diff --git a/src/Mapster/TypeAdapterSetter.cs b/src/Mapster/TypeAdapterSetter.cs
@@ -50,16 +50,35 @@ public static TSetter IgnoreAttribute<TSetter>(this TSetter setter, params Type[
 
             foreach (var type in types)
             {
-                setter.Settings.ShouldMapMember.Add(member => member.HasCustomAttribute(type) ? (bool?)false : null);
+                setter.Settings.ShouldMapMember.Add((member, _) => member.HasCustomAttribute(type) ? (bool?)false : null);
             }
             return setter;
         }
 
-        public static TSetter ShouldMapMember<TSetter>(this TSetter setter, Func<IMemberModel, bool> predicate, bool value) where TSetter : TypeAdapterSetter
+        public static TSetter IncludeAttribute<TSetter>(this TSetter setter, params Type[] types) where TSetter : TypeAdapterSetter
         {
             setter.CheckCompiled();
 
-            setter.Settings.ShouldMapMember.Add(member => predicate(member) ? (bool?)value : null);
+            foreach (var type in types)
+            {
+                setter.Settings.ShouldMapMember.Add((member, _) => member.HasCustomAttribute(type) ? (bool?)true : null);
+            }
+            return setter;
+        }
+
+        public static TSetter IgnoreMember<TSetter>(this TSetter setter, Func<IMemberModel, MemberSide, bool> predicate) where TSetter : TypeAdapterSetter
+        {
+            setter.CheckCompiled();
+
+            setter.Settings.ShouldMapMember.Add((member, side) => predicate(member, side) ? (bool?)false : null);
+            return setter;
+        }
+
+        public static TSetter IncludeMember<TSetter>(this TSetter setter, Func<IMemberModel, MemberSide, bool> predicate) where TSetter : TypeAdapterSetter
+        {
+            setter.CheckCompiled();
+
+            setter.Settings.ShouldMapMember.Add((member, side) => predicate(member, side) ? (bool?)true : null);
             return setter;
         }
 
@@ -116,7 +135,10 @@ public static TSetter Map<TSetter, TSourceMember>(
                 Invoker = invoker,
                 Condition = null
             });
-            setter.Settings.ShouldMapMember.Add(member => member.Name == memberName ? (bool?)true : null);
+            setter.Settings.ShouldMapMember.Add((member, side) => 
+                (member.Name == memberName && side == MemberSide.Destination)
+                ? (bool?)true 
+                : null);
 
             return setter;
         }
@@ -134,7 +156,10 @@ public static TSetter Map<TSetter, TSource, TSourceMember>(
                 SourceMemberName = ReflectionUtils.GetMemberInfo(source, true)?.Member.Name,
                 Condition = null
             });
-            setter.Settings.ShouldMapMember.Add(member => member.Name == memberName ? (bool?)true : null);
+            setter.Settings.ShouldMapMember.Add((member, side) =>
+                (member.Name == memberName && side == MemberSide.Destination)
+                ? (bool?)true
+                : null);
 
             return setter;
         }
@@ -150,9 +175,24 @@ public static TSetter Map<TSetter>(
                 SourceMemberName = sourceMemberName,
                 Condition = null
             });
-            setter.Settings.ShouldMapMember.Add(member => member.Name == destinationMemberName ? (bool?)true : null);
             if (sourceMemberName != destinationMemberName)
-                setter.Settings.ShouldMapMember.Add(member => member.Name == sourceMemberName ? (bool?)true : null);
+            {
+                setter.Settings.ShouldMapMember.Add((member, side) =>
+                    (member.Name == destinationMemberName && side == MemberSide.Destination)
+                    ? (bool?)true
+                    : null);
+                setter.Settings.ShouldMapMember.Add((member, side) =>
+                   (member.Name == sourceMemberName && side == MemberSide.Source)
+                   ? (bool?)true
+                   : null);
+            }
+            else
+            {
+                setter.Settings.ShouldMapMember.Add((member, _) =>
+                    member.Name == destinationMemberName
+                    ? (bool?)true
+                    : null);
+            }
 
             return setter;
         }
@@ -163,13 +203,13 @@ public static TSetter EnableNonPublicMembers<TSetter>(this TSetter setter, bool
 
             if (value)
             {
-                setter.Settings.ShouldMapMember.Remove(Mapster.ShouldMapMember.AllowPublic);
-                setter.Settings.ShouldMapMember.Add(Mapster.ShouldMapMember.AllowNonPublic);
+                setter.Settings.ShouldMapMember.Remove(ShouldMapMember.AllowPublic);
+                setter.Settings.ShouldMapMember.Add(ShouldMapMember.AllowNonPublic);
             }
             else
             {
-                setter.Settings.ShouldMapMember.Remove(Mapster.ShouldMapMember.AllowNonPublic);
-                setter.Settings.ShouldMapMember.Add(Mapster.ShouldMapMember.AllowPublic);
+                setter.Settings.ShouldMapMember.Remove(ShouldMapMember.AllowNonPublic);
+                setter.Settings.ShouldMapMember.Add(ShouldMapMember.AllowPublic);
             }
 
             return setter;
@@ -247,7 +287,10 @@ public TypeAdapterSetter<TDestination> Map<TDestinationMember>(
                 SourceMemberName = sourceMemberName,
                 Condition = null
             });
-            Settings.ShouldMapMember.Add(member => member.Name == sourceMemberName ? (bool?)true : null);
+            Settings.ShouldMapMember.Add((member, side) =>
+                (member.Name == sourceMemberName && side == MemberSide.Source)
+                ? (bool?)true
+                : null);
 
             return this;
         }
@@ -375,7 +418,10 @@ public TypeAdapterSetter<TSource, TDestination> Map<TSourceMember>(
                 SourceMemberName = ReflectionUtils.GetMemberInfo(source, true)?.Member.Name,
                 Condition = shouldMap
             });
-            Settings.ShouldMapMember.Add(member => member.Name == memberName ? (bool?)true : null);
+            Settings.ShouldMapMember.Add((member, side) =>
+                (member.Name == memberName && side == MemberSide.Destination)
+                ? (bool?)true
+                : null);
 
             return this;
         }

diff --git a/src/Mapster/TypeAdapterSettings.cs b/src/Mapster/TypeAdapterSettings.cs
@@ -52,9 +52,9 @@ public bool? AvoidInlineMapping
             set => Set("AvoidInlineMapping", value);
         }
 
-        public List<Func<IMemberModel, bool?>> ShouldMapMember
+        public List<Func<IMemberModel, MemberSide, bool?>> ShouldMapMember
         {
-            get => Get("ShouldMapMember", () => new List<Func<IMemberModel, bool?>>());
+            get => Get("ShouldMapMember", () => new List<Func<IMemberModel, MemberSide, bool?>>());
         }
         public List<Func<Expression, IMemberModel, CompileArgument, Expression>> ValueAccessingStrategies
         {