Skip to content

FIx Issue #537 - Step 4 - Fix MapToTarget behavior From RecordType #766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
DocSvartz wants to merge 2 commits into from
Closed

FIx Issue #537 - Step 4 - Fix MapToTarget behavior From RecordType #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f2302a
fix maToTarget behavior From RecordType
DocSvartz Jan 23, 2025
f8469e9
add To RecordTypeAdapter
DocSvartz Jan 23, 2025
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
9 changes: 9 additions & 0 deletions src/Mapster/Adapters/BaseClassAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,15 @@ select fn(src, destinationMember, arg))
Destination = (ParameterExpression?)destination,
UseDestinationValue = arg.MapType != MapType.Projection && destinationMember.UseDestinationValue(arg),
};
if (arg.MapType == MapType.MapToTarget && getter == null && arg.DestinationType.IsRecordType())
{
var find = arg.DestinationType.GetFieldsAndProperties(arg.Settings.EnableNonPublicMembers.GetValueOrDefault()).ToArray()
.Where(x => x.Name == destinationMember.Name).FirstOrDefault();

if (find != null)
getter = Expression.MakeMemberAccess(destination, (MemberInfo)find.Info);

}
if (getter != null)
{
propertyModel.Getter = arg.MapType == MapType.Projection
Expand Down
6 changes: 3 additions & 3 deletions src/Mapster/Adapters/RecordTypeAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ protected override Expression CreateInstantiationExpression(Expression source, E
var classModel = GetConstructorModel(ctor, false);
var classConverter = CreateClassConverter(source, classModel, arg);
var installExpr = CreateInstantiationExpression(source, classConverter, arg);
return RecordInlineExpression(source, arg, installExpr); // Activator field when not include in public ctor
return RecordInlineExpression(source, destination, arg, installExpr); // Activator field when not include in public ctor
}

protected override Expression CreateBlockExpression(Expression source, Expression destination, CompileArgument arg)
Expand All @@ -46,7 +46,7 @@ protected override Expression CreateInlineExpression(Expression source, CompileA
return base.CreateInstantiationExpression(source, arg);
}

private Expression? RecordInlineExpression(Expression source, CompileArgument arg, Expression installExpr)
private Expression? RecordInlineExpression(Expression source, Expression? destination, CompileArgument arg, Expression installExpr)
{
//new TDestination {
// Prop1 = convert(src.Prop1),
Expand All @@ -58,7 +58,7 @@ protected override Expression CreateInlineExpression(Expression source, CompileA
var newInstance = memberInit?.NewExpression ?? (NewExpression)exp;
var contructorMembers = newInstance.Arguments.OfType<MemberExpression>().Select(me => me.Member).ToArray();
var classModel = GetSetterModel(arg);
var classConverter = CreateClassConverter(source, classModel, arg);
var classConverter = CreateClassConverter(source, classModel, arg, destination:destination);
var members = classConverter.Members;

var lines = new List<MemberBinding>();
Expand Down
Loading