fix nested EnableNonPublicMember, fix TwoWays IncludeMember

src/Mapster/Adapters/BaseClassAdapter.cs

@@ -175,7 +175,7 @@ protected virtual ClassModel GetSetterModel(CompileArgument arg)
  {
  return new ClassModel
  {
- Members = arg.DestinationType.GetFieldsAndProperties(false, accessorFlags: BindingFlags.NonPublic | BindingFlags.Public)
+ Members = arg.DestinationType.GetFieldsAndProperties(true)
  };
  }
 

src/Mapster/Adapters/DictionaryAdapter.cs

@@ -209,7 +209,7 @@ protected override ClassModel GetSetterModel(CompileArgument arg)
  if (arg.SourceType.GetDictionaryType() == null)
  {
  var srcNames = arg.GetSourceNames();
- var propNames = arg.SourceType.GetFieldsAndProperties(accessorFlags: BindingFlags.NonPublic | BindingFlags.Public)
+ var propNames = arg.SourceType.GetFieldsAndProperties(true)
  .Where(model => model.ShouldMapMember(arg, MemberSide.Source))
  .Select(model => model.Name)
  .Where(name => !srcNames.Contains(name))

src/Mapster/Enums/AccessModifier.cs

@@ -10,6 +10,7 @@ public enum AccessModifier
  Protected = 2,
  Internal = 4,
  ProtectedInternal = 6,
+ NonPublic = 7,
  Public = 8,
  }
 }

src/Mapster/Settings/ShouldMapMember.cs

@@ -5,7 +5,7 @@ namespace Mapster
 {
  public static class ShouldMapMember
  {
- public static readonly Func<IMemberModel, MemberSide, bool?> AllowNonPublic = (model, _) => model.AccessModifier != AccessModifier.None;
+ public static readonly Func<IMemberModel, MemberSide, bool?> AllowNonPublic = (model, _) => (model.AccessModifier & AccessModifier.NonPublic) != 0 ? (bool?)true : null;
  public static readonly Func<IMemberModel, MemberSide, bool?> AllowPublic = (model, _) => model.AccessModifier == AccessModifier.Public ? (bool?)true : null;
  public static readonly Func<IMemberModel, MemberSide, bool?> IgnoreAdaptIgnore = (model, side) =>
  {

src/Mapster/Settings/ValueAccessingStrategy.cs

@@ -69,7 +69,7 @@ public static class ValueAccessingStrategy
 
  private static Expression? PropertyOrFieldFn(Expression source, IMemberModel destinationMember, CompileArgument arg)
  {
- var members = source.Type.GetFieldsAndProperties(accessorFlags: BindingFlags.NonPublic | BindingFlags.Public);
+ var members = source.Type.GetFieldsAndProperties(true);
  var strategy = arg.Settings.NameMatchingStrategy;
  var destinationMemberName = destinationMember.GetMemberName(arg.Settings.GetMemberNames, strategy.DestinationMemberNameConverter);
  return members
@@ -104,7 +104,7 @@ public static class ValueAccessingStrategy
  private static Expression? GetDeepFlattening(Expression source, string propertyName, CompileArgument arg)
  {
  var strategy = arg.Settings.NameMatchingStrategy;
- var members = source.Type.GetFieldsAndProperties(accessorFlags: BindingFlags.NonPublic | BindingFlags.Public);
+ var members = source.Type.GetFieldsAndProperties(true);
  foreach (var member in members)
  {
  if (!member.ShouldMapMember(arg, MemberSide.Source))
@@ -131,7 +131,7 @@ internal static IEnumerable<InvokerModel> FindUnflatteningPairs(Expression sourc
  {
  var strategy = arg.Settings.NameMatchingStrategy;
  var destinationMemberName = destinationMember.GetMemberName(arg.Settings.GetMemberNames, strategy.DestinationMemberNameConverter);
- var members = source.Type.GetFieldsAndProperties(accessorFlags: BindingFlags.NonPublic | BindingFlags.Public);
+ var members = source.Type.GetFieldsAndProperties(true);
 
  foreach (var member in members)
  {
@@ -154,7 +154,7 @@ internal static IEnumerable<InvokerModel> FindUnflatteningPairs(Expression sourc
  private static IEnumerable<string> GetDeepUnflattening(IMemberModel destinationMember, string propertyName, CompileArgument arg)
  {
  var strategy = arg.Settings.NameMatchingStrategy;
- var members = destinationMember.Type.GetFieldsAndProperties(accessorFlags: BindingFlags.NonPublic | BindingFlags.Public);
+ var members = destinationMember.Type.GetFieldsAndProperties(true);
  foreach (var member in members)
  {
  if (!member.ShouldMapMember(arg, MemberSide.Destination))

src/Mapster/TypeAdapterSetter.cs

@@ -175,17 +175,7 @@ public static class TypeAdapterSetterExtensions
  {
  setter.CheckCompiled();
 
- if (value)
- {
- setter.Settings.ShouldMapMember.Remove(ShouldMapMember.AllowPublic);
- setter.Settings.ShouldMapMember.Add(ShouldMapMember.AllowNonPublic);
- }
- else
- {
- setter.Settings.ShouldMapMember.Remove(ShouldMapMember.AllowNonPublic);
- setter.Settings.ShouldMapMember.Add(ShouldMapMember.AllowPublic);
- }
-
+ setter.Settings.EnableNonPublicMembers = value;
  return setter;
  }
 
@@ -690,7 +680,7 @@ public TwoWaysTypeAdapterSetter(TypeAdapterConfig config)
  public TwoWaysTypeAdapterSetter<TSource, TDestination> IncludeMember(Func<IMemberModel, MemberSide, bool> predicate)
  {
  SourceToDestinationSetter.IncludeMember(predicate);
- DestinationToSourceSetter.IgnoreMember((model, side) => predicate(model, side == MemberSide.Source ? MemberSide.Destination : MemberSide.Source));
+ DestinationToSourceSetter.IncludeMember((model, side) => predicate(model, side == MemberSide.Source ? MemberSide.Destination : MemberSide.Source));
  return this;
  }
 

src/Mapster/TypeAdapterSettings.cs

@@ -66,6 +66,11 @@ public NameMatchingStrategy NameMatchingStrategy
  get => Get("SkipDestinationMemberCheck");
  set => Set("SkipDestinationMemberCheck", value);
  }
+ public bool? EnableNonPublicMembers
+ {
+ get => Get("EnableNonPublicMembers");
+ set => Set("EnableNonPublicMembers", value);
+ }
 
  public List<Func<IMemberModel, MemberSide, bool?>> ShouldMapMember
  {

src/Mapster/Utils/ReflectionUtils.cs

@@ -77,35 +77,29 @@ public static bool IsPoco(this Type type)
  if (type.IsConvertible())
  return false;
 
- return type.GetFieldsAndProperties(requireSetter: true).Any();
+ return type.GetFieldsAndProperties().Any(it => (it.SetterModifier & (AccessModifier.Public | AccessModifier.NonPublic)) != 0);
  }
 
- public static IEnumerable<IMemberModelEx> GetFieldsAndProperties(this Type type,
- bool requireSetter = false,
- BindingFlags accessorFlags = BindingFlags.Public)
+ public static IEnumerable<IMemberModelEx> GetFieldsAndProperties(this Type type, bool includeNonPublic = false)
  {
- var bindingFlags = BindingFlags.Instance | accessorFlags;
+ var bindingFlags = BindingFlags.Instance | BindingFlags.Public;
+ if (includeNonPublic)
+ bindingFlags |= BindingFlags.NonPublic;
+
+ if (type.GetTypeInfo().IsInterface)
+ {
+ var allInterfaces = GetAllInterfaces(type);
+ return allInterfaces.SelectMany(GetPropertiesFunc);
+ }
 
- IEnumerable<IMemberModelEx> getPropertiesFunc(Type t) => t.GetProperties(bindingFlags)
+ return GetPropertiesFunc(type).Concat(GetFieldsFunc(type));
+
+ IEnumerable<IMemberModelEx> GetPropertiesFunc(Type t) => t.GetProperties(bindingFlags)
  .Where(x => x.GetIndexParameters().Length == 0)
- .Where(x => !requireSetter || x.CanWrite)
  .Select(CreateModel);
 
- IEnumerable<IMemberModelEx> getFieldsFunc(Type t) => t.GetFields(bindingFlags)
- .Where(x => !requireSetter || !x.IsInitOnly)
+ IEnumerable<IMemberModelEx> GetFieldsFunc(Type t) => t.GetFields(bindingFlags)
  .Select(CreateModel);
-
- if (type.GetTypeInfo().IsInterface)
- {
- var allInterfaces = GetAllInterfaces(type);
- return allInterfaces.SelectMany(getPropertiesFunc);
- }
- else
- {
- var properties = getPropertiesFunc(type);
- var fields = getFieldsFunc(type);
- return properties.Concat(fields);
- }
  }
 
  // GetProperties(), GetFields(), GetMethods() do not return properties/methods from parent interfaces,
@@ -311,6 +305,12 @@ public static bool ShouldMapMember(this IMemberModel member, CompileArgument arg
  .FirstOrDefault(it => it != null);
  if (result != null)
  return result == true;
+ if (arg.Settings.EnableNonPublicMembers == true)
+ {
+ result = Mapster.ShouldMapMember.AllowNonPublic(member, side);
+ if (result != null)
+ return result == true;
+ }
  var names = side == MemberSide.Destination ? arg.GetDestinationNames() : arg.GetSourceNames();
  return names.Contains(member.Name);
  }