Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions src/Mapster.Tests/WhenPerformingDestinationTransforms.cs
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,32 @@ public void Adapter_Destination_Transform_CreateNewIfNull()
destination.Set.Count.ShouldBe(0);
}

[TestMethod]
public void Explicit_Null_Mapping_Is_Not_Overridden_By_EmptyCollectionIfNull()
{
var config = new TypeAdapterConfig();
config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);
config.NewConfig<ExplicitNullSource, ExplicitNullDestination>()
.Map(d => d.Strings, _ => (string[]?)null);

var destination = new ExplicitNullSource([]).Adapt<ExplicitNullDestination>(config);

destination.Strings.ShouldBeNull();
}

[TestMethod]
public void Explicit_Null_Record_Ctor_Mapping_Is_Not_Overridden_By_EmptyCollectionIfNull()
{
var config = new TypeAdapterConfig();
config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);
config.NewConfig<ExplicitNullSource, ExplicitNullRecordDestination>()
.Map(d => d.Strings, _ => (string[]?)null);

var destination = new ExplicitNullSource([]).Adapt<ExplicitNullRecordDestination>(config);

destination.Strings.ShouldBeNull();
}

#region TestClasses

public class SimplePoco
Expand Down Expand Up @@ -145,6 +171,15 @@ public class CollectionDto
public ISet<string> Set { get; set; }
}

public record ExplicitNullSource(string?[] Strings);

public class ExplicitNullDestination
{
public string[]? Strings { get; set; }
}

public record ExplicitNullRecordDestination(string[]? Strings);

#endregion

}
Expand Down
13 changes: 12 additions & 1 deletion src/Mapster/Adapters/BaseAdapter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ internal Expression CreateAdaptExpression(Expression source, Type destinationTyp
exp = CreateAdaptExpressionCore(_source, destinationType, arg, mapping, destination);

//transform(adapt(_source));
if (notUsingDestinationValue)
if (notUsingDestinationValue && !HasExplicitMemberMap(mapping, arg))
{
var transform = arg.Settings.DestinationTransforms.Find(it => it.Condition(exp.Type));
if (transform != null)
Expand All @@ -545,5 +545,16 @@ internal Expression CreateAdaptExpression(Expression source, Type destinationTyp

return exp.To(destinationType);
}

static bool HasExplicitMemberMap(MemberMapping? mapping, CompileArgument arg)
{
if (mapping?.DestinationMember == null)
return false;

var memberName = mapping.DestinationMember.Name;
return arg.Settings.Resolvers.Any(resolver =>
!resolver.IsChildPath &&
resolver.DestinationMemberName.Equals(memberName, StringComparison.InvariantCultureIgnoreCase));
}
}
}
4 changes: 2 additions & 2 deletions src/Mapster/Adapters/BaseClassAdapter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ protected Expression CreateInstantiationExpression(Expression source, ClassMappi
}
else
getter = member.Getter
.ApplyNullPropagationFromCtor(CreateAdaptExpressionCore(member.Getter, member.DestinationMember.Type, arg, member), arg);
.ApplyNullPropagationFromCtor(CreateAdaptExpressionCore(member.Getter, member.DestinationMember.Type, arg, member), arg, member);


if (member.Ignore.Condition != null)
Expand All @@ -283,7 +283,7 @@ protected Expression CreateInstantiationExpression(Expression source, ClassMappi
getter = TryRestoreRecordMember(member.DestinationMember, recordRestorParamModel, destination) ?? getter;
}
}
arguments.Add(getter);
arguments.Add(ExpressionEx.ApplyDestinationTransform(getter, arg, member));
}

return Expression.New(classConverter.ConstructorInfo!, arguments);
Expand Down
30 changes: 28 additions & 2 deletions src/Mapster/Utils/ExpressionEx.cs
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ public static Expression ApplyPropertyNullPropagation(this Expression getter)
return getter;
}

public static Expression ApplyNullPropagationFromCtor(this Expression getter, Expression adapt, CompileArgument arg)
public static Expression ApplyNullPropagationFromCtor(this Expression getter, Expression adapt, CompileArgument arg, MemberMapping? member = null)
{
if (getter == null)
return adapt;
Expand Down Expand Up @@ -481,16 +481,42 @@ public static Expression ApplyNullPropagationFromCtor(this Expression getter, Ex
}

if (condition == null)
return adapt;
return ApplyDestinationTransform(adapt, arg, member);

// add supporting DestinationTransforms
if (HasExplicitMemberMap(member, arg))
return Expression.Condition(condition, adapt, Expression.Default(adapt.Type));

var transform = arg.Settings.DestinationTransforms.Find(it => it.Condition(adapt.Type));
if (transform != null)
return transform.TransformFunc(adapt.Type).Apply(arg.MapType, Expression.Condition(condition, adapt, Expression.Default(adapt.Type)));

return Expression.Condition(condition, adapt, Expression.Default(adapt.Type));
}

public static Expression ApplyDestinationTransform(Expression exp, CompileArgument arg, MemberMapping? mapping = null)
{
if (HasExplicitMemberMap(mapping, arg))
return exp;

var transform = arg.Settings.DestinationTransforms.Find(it => it.Condition(exp.Type));
if (transform == null)
return exp;

return transform.TransformFunc(exp.Type).Apply(arg.MapType, exp);
}

static bool HasExplicitMemberMap(MemberMapping? mapping, CompileArgument arg)
{
if (mapping?.DestinationMember == null)
return false;

var memberName = mapping.DestinationMember.Name;
return arg.Settings.Resolvers.Any(resolver =>
!resolver.IsChildPath &&
resolver.DestinationMemberName.Equals(memberName, StringComparison.InvariantCultureIgnoreCase));
}

public static string? GetMemberPath(this LambdaExpression lambda, bool firstLevelOnly = false, bool noError = false)
{
var props = new List<string>();
Expand Down