Skip to content
Draft
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
89 changes: 89 additions & 0 deletions src/Mapster.Tests/WhenUsingMapWithOverrideTypesSettings.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Shouldly;
using System;
using System.Collections.Generic;

namespace Mapster.Tests
{
[TestClass]
public class WhenUsingMapWithOverrideTypesSettings
{
[TestMethod]
public void OverrideDestinationTramsformIsWorked()
{
var config = new TypeAdapterConfig();
config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);

config
.NewConfig<CollectionPocoOverride, CollectionDtoOverride>()
.MapWithTypeSettingsOverride(src => src.Children, dest => dest.Children,
cfg =>
{
cfg.SkipSettings(x => x.DestinationTransforms);
})
.MapWithTypeSettingsOverride(src => src.Array, dest => dest.Array,
cfg =>
{
cfg
.ReConfigurate()
.MapWith(x => x ?? new[] { 42 });
});


var source = new CollectionPocoOverride();
var destination = source.Adapt<CollectionDtoOverride>(config);

destination.MultiDimentionalArray.Length.ShouldBe(0);
destination.ChildDict.Count.ShouldBe(0);
destination.Set.Count.ShouldBe(0);


destination.Children.ShouldBeNull(); // Destination Transforms from global context settings is skipped for this property
destination.Array[0].ShouldBe(42); // Custom converter for types is worked, Destination Transforms is not achievable because the custom converter never returns null


var destWithNotTypesSettingOverride = new CollectionPocoOverride().Adapt<CollectionDtoWithArray>(config);

// Destination Transforms correct work from other mapping types
destWithNotTypesSettingOverride.Array.Length.ShouldBe(0);
}


#region TestClasses

class CollectionPocoWithArray
{
public int[] Array { get; set; }
}

class CollectionDtoWithArray
{
public int[] Array { get; set; }
}

class CollectionPocoOverride
{
public Guid Id { get; set; }
public string Name { get; set; }

public List<ChildPoco> Children { get; set; }
public int[] Array { get; set; }
public double[,] MultiDimentionalArray { get; set; }
public Dictionary<string, ChildPoco> ChildDict { get; set; }
public HashSet<string> Set { get; set; }
}

class CollectionDtoOverride
{
public Guid Id { get; set; }
public string Name { get; set; }

public IReadOnlyList<ChildDto> Children { get; internal set; }
public int[] Array { get; set; }
public double[,] MultiDimentionalArray { get; set; }
public IReadOnlyDictionary<string, ChildDto> ChildDict { get; set; }
public ISet<string> Set { get; set; }
}
#endregion TestClasses
}
}
4 changes: 3 additions & 1 deletion src/Mapster/Adapters/BaseAdapter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,9 @@ internal Expression CreateAdaptExpression(Expression source, Type destinationTyp
//transform(adapt(_source));
if (notUsingDestinationValue)
{
var transform = arg.Settings.DestinationTransforms.Find(it => it.Condition(exp.Type));
var settings = mapping?.OverrideSettings ?? arg.Settings;

var transform = settings.DestinationTransforms.Find(it => it.Condition(exp.Type));
if (transform != null)
exp = transform.TransformFunc(exp.Type).Apply(arg.MapType, exp);
}
Expand Down
13 changes: 13 additions & 0 deletions src/Mapster/Adapters/BaseClassAdapter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#region Build the Adapter Model

protected ClassMapping CreateClassConverter(Expression source, ClassModel classModel, CompileArgument arg, Expression? destination = null, bool ctorMapping = false, ClassModel recordRestorMemberModel = null)

Check warning on line 18 in src/Mapster/Adapters/BaseClassAdapter.cs

View workflow job for this annotation

GitHub Actions / build

Cannot convert null literal to non-nullable reference type.
{
var destinationMembers = classModel.Members;
var unmappedDestinationMembers = new List<string>();
Expand Down Expand Up @@ -43,6 +43,12 @@
from src in sources
select fn(src, destinationMember, arg))
.FirstOrDefault(result => result != null);
if(getter is MemberExpression mem && mem?.Expression?.Type == source.Type)
{
getter = Expression.PropertyOrField(source, mem.Member.Name);
}

var test = resolvers.Where(ValueAccessingStrategy.CustomResolvers.Contains);

if (arg.MapType == MapType.Projection && getter != null)
{
Expand Down Expand Up @@ -103,6 +109,10 @@
var nextResolvers = arg.Settings.Resolvers.Next(arg.Settings.Ignore, (ParameterExpression)source, destinationMember.Name)
.ToList();

var overideSettings = arg.Settings.Resolvers
.Where(x => x.DestinationMemberName == destinationMember.Name && x.OvverideSettings != null)
.Select(x=>x.OvverideSettings).FirstOrDefault();

var propertyModel = new MemberMapping
{
DestinationMember = destinationMember,
Expand All @@ -112,6 +122,7 @@
Source = (ParameterExpression)source,
Destination = (ParameterExpression?)destination,
UseDestinationValue = IsCanUsingDestinationValue(arg, destinationMember),
OverrideSettings = overideSettings
};
if(arg.MapType == MapType.ApplyNullPropagation &&
getter == null && !arg.DestinationType.IsRecordType()
Expand Down Expand Up @@ -213,7 +224,7 @@
&& ignore.Condition == null;
}

protected Expression CreateInstantiationExpression(Expression source, ClassMapping classConverter, CompileArgument arg, Expression? destination, ClassModel recordRestorParamModel = null)

Check warning on line 227 in src/Mapster/Adapters/BaseClassAdapter.cs

View workflow job for this annotation

GitHub Actions / build

Cannot convert null literal to non-nullable reference type.
{
var members = classConverter.Members;

Expand Down Expand Up @@ -264,6 +275,7 @@
else
getter = member.Getter
.ApplyNullPropagationFromCtor(CreateAdaptExpressionCore(member.Getter, member.DestinationMember.Type, arg, member), arg);



if (member.Ignore.Condition != null)
Expand All @@ -282,6 +294,7 @@
if (arg.MapType == MapType.MapToTarget && arg.DestinationType.IsRecordType())
getter = TryRestoreRecordMember(member.DestinationMember, recordRestorParamModel, destination) ?? getter;
}

}
arguments.Add(getter);
}
Expand Down
1 change: 1 addition & 0 deletions src/Mapster/Models/InvokerModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public class InvokerModel
public LambdaExpression? Invoker { get; set; }
public string? SourceMemberName { get; set; }
public LambdaExpression? Condition { get; set; }
public TypeAdapterSettings? OvverideSettings { get; set; }
public bool IsChildPath { get; set; }

public InvokerModel? Next(ParameterExpression source, string destMemberName)
Expand Down
1 change: 1 addition & 0 deletions src/Mapster/Models/MemberMapping.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ internal class MemberMapping
public ParameterExpression Source;
public ParameterExpression? Destination;
public bool UseDestinationValue;
public TypeAdapterSettings? OverrideSettings;

public bool HasSettings()
{
Expand Down
38 changes: 30 additions & 8 deletions src/Mapster/Settings/SettingStore.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
using System;
using System.Collections;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;

namespace Mapster
{
Expand Down Expand Up @@ -46,19 +48,18 @@ public T Get<T>(string key, Func<T> initializer) where T : class
return (T)_objectStore.GetOrAdd(key, _ => initializer());
}

public virtual void Apply(object other)
{
if (other is SettingStore settingStore)
Apply(settingStore);
}
public void Apply(SettingStore other)

private void ApplyBoolSettings (IEnumerable<KeyValuePair<string, bool?>> otherBoolStore)
{
foreach (var kvp in other._booleanStore)
foreach (var kvp in otherBoolStore)
{
_booleanStore.TryAdd(kvp.Key, kvp.Value);
}
}

foreach (var kvp in other._objectStore)
private void ApplyObjectSettings(IEnumerable<KeyValuePair<string, object?>> otherBoolStore)
{
foreach (var kvp in otherBoolStore)
{
var self = _objectStore.GetOrAdd(kvp.Key, key =>
{
Expand All @@ -80,5 +81,26 @@ public void Apply(SettingStore other)
}
}
}


public virtual void Apply(object other)
{
if (other is SettingStore settingStore)
Apply(settingStore);
}


public virtual void Apply(SettingStore other)
{
ApplyBoolSettings(other._booleanStore);
ApplyObjectSettings(other._objectStore);
}

public virtual void ApplyWithSkipSettings(SettingStore other, List<String> skipSettingNames)
{
ApplyBoolSettings(other._booleanStore.Where(x => !skipSettingNames.Contains(x.Key)));
ApplyObjectSettings(other._objectStore.Where(x => !skipSettingNames.Contains(x.Key)));
}

}
}
7 changes: 7 additions & 0 deletions src/Mapster/TypeAdapterConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,13 @@ internal LambdaExpression CreateInlineMapExpression(Type sourceType, Type destin
arg.Settings.Resolvers.AddRange(mapping.NextResolvers);
arg.Settings.Ignore.Apply(mapping.NextIgnore);
arg.UseDestinationValue = mapping.UseDestinationValue;

if (mapping.OverrideSettings != null)
{
mapping.OverrideSettings.Apply(arg.Settings);
arg.Settings = mapping.OverrideSettings;
}

}

return CreateMapExpression(arg);
Expand Down
46 changes: 46 additions & 0 deletions src/Mapster/TypeAdapterSetter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ public TypeAdapterSetter(TypeAdapterSettings settings, TypeAdapterConfig config)
Settings = settings;
Config = config;
}

internal static TypeAdapterSetter CreateMapTypeOverride()
{
return new TypeAdapterSetter(new TypeAdapterSettings(), null);
}

internal static TypeAdapterSetter<TSource, TDestination> CreateMapTypeOverride<TSource, TDestination>()
{
return new TypeAdapterSetter<TSource, TDestination>(new TypeAdapterSettings(), null);
}
}
public static class TypeAdapterSetterExtensions
{
Expand Down Expand Up @@ -629,6 +639,42 @@ public TypeAdapterSetter<TDestination> IgnoredRemove(params Expression<Func<TDes

#endregion

public TypeAdapterSetter<TSource, TDestination> MapWithTypeSettingsOverride<TDestinationMember, TSourceMember>(
Expression<Func<TDestination, TDestinationMember>> member,
Expression<Func<TSource, TSourceMember>> source,
Action<OverrideTypesSetter<TSourceMember, TDestinationMember>>? configAction = null)
{
this.CheckCompiled();

var invoker = Expression.Lambda(source.Body, Expression.Parameter(typeof(object)));
if (member.IsIdentity())
{
Settings.ExtraSources.Add(invoker);
return this;
}

TypeAdapterSettings? overrideSettings = null;

if (configAction != null)
{
var Tempsetter = new OverrideTypesSetter<TSourceMember, TDestinationMember>();
configAction(Tempsetter);

overrideSettings = Tempsetter.Settings;
}

Settings.Resolvers.Add(new InvokerModel
{
DestinationMemberName = member.GetMemberPath()!,
Invoker = invoker,
Condition = null,
OvverideSettings = overrideSettings
});
return this;
}



public TypeAdapterSetter<TSource, TDestination> IgnoreIf(
Expression<Func<TSource, TDestination, bool>> condition,
params Expression<Func<TDestination, object>>[] members)
Expand Down
35 changes: 35 additions & 0 deletions src/Mapster/TypeAdapterSetters/OverrideTypesSetter.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
using Mapster.Utils;
using System;
using System.Linq.Expressions;

namespace Mapster
{
[AdaptWith(AdaptDirectives.DestinationAsRecord)]
public class OverrideTypesSetter : TypeAdapterSetter
{
protected OverrideTypesSettings _Settings { get => (OverrideTypesSettings)Settings; }

public OverrideTypesSetter() : this (new OverrideTypesSettings (), null) { }
public OverrideTypesSetter(TypeAdapterSettings settings, TypeAdapterConfig config) : base(settings, config) { }
}

public class OverrideTypesSetter<TSource, TDestination> : OverrideTypesSetter
{
public OverrideTypesSetter<TSource, TDestination> SkipSettings(params Expression<Func<TypeAdapterSettings, object>>[] settings)
{
foreach (var member in settings)
{
_Settings.DropSettings.Add(member.GetMemberPath()!);
}

return this;
}

public TypeAdapterSetter<TSource, TDestination> ReConfigurate()
{
return new TypeAdapterSetter<TSource, TDestination>(this.Settings,this.Config);
}
}


}
24 changes: 24 additions & 0 deletions src/Mapster/TypeAdapterSettings/OverrideTypesSettings.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
using System.Collections.Generic;

namespace Mapster
{
[AdaptWith(AdaptDirectives.DestinationAsRecord)]
public class OverrideTypesSettings : TypeAdapterSettings
{
public List<string> DropSettings
{
get => Get(nameof(DropSettings), () => new List<string>());
}

public override void Apply(object other)
{
if (other is SettingStore settingStore)
Apply(settingStore);
}

public override void Apply(SettingStore other)
{
base.ApplyWithSkipSettings(other, DropSettings);
}
}
}
2 changes: 1 addition & 1 deletion src/Mapster/Utils/ExpressionEx.cs
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public static Expression Not(Expression exp)
public static Expression Apply(this LambdaExpression lambda, MapType mapType, params Expression[] exps)
{
return lambda.Apply(mapType != MapType.Projection, exps);
}
}

public static Expression Apply(this LambdaExpression lambda, ParameterExpression p1, ParameterExpression? p2 = null)
{
Expand Down
Loading