Merged
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/WhenMapUsingOverrideTypesSettings.cs
Original file line numberDiff line numberDiff 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 WhenMapUsingOverrideTypesSettings
{
[TestMethod]
public void OverrideDestinationTramsformIsWorked()
{
var config = new TypeAdapterConfig();
config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);

config
.NewConfig<CollectionPocoOverride, CollectionDtoOverride>()
.MapUsing(src => src.Children, dest => dest.Children,
cfg =>
{
cfg.SkipAllSettings(true);
})
.MapUsing(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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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)));
}

}
}
46 changes: 46 additions & 0 deletions src/Mapster/TypeAdapterConfig.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -474,6 +474,26 @@ 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);

if(mapping.OverrideSettings.ConverterFactory == null || mapping.OverrideSettings.ConverterToTargetFactory == null)
{
var defaultfactory = GetOvverideDefaultSettings(tuple, mapType);

if (mapping.OverrideSettings.ConverterFactory == null)
mapping.OverrideSettings.ConverterFactory = defaultfactory.ConverterFactory;
if (mapping.OverrideSettings.ConverterToTargetFactory == null)
mapping.OverrideSettings.ConverterToTargetFactory = defaultfactory.ConverterToTargetFactory;

}


arg.Settings = mapping.OverrideSettings;
}

}

return CreateMapExpression(arg);
Expand DownExpand Up@@ -627,6 +647,32 @@ orderby priority.Value descending
return result;
}

internal TypeAdapterSettings GetOvverideDefaultSettings(TypeTuple tuple, MapType mapType)
{
var arg = new PreCompileArgument
{
SourceType = tuple.Source,
DestinationType = tuple.Destination,
MapType = mapType,
ExplicitMapping = true,
};

var result = new TypeAdapterSettings();

var rules = RulesTemplate.Reverse<TypeAdapterRule>();
var settings = from rule in rules
let priority = rule.Priority(arg)
where priority != null
orderby priority.Value descending
select rule.Settings;
foreach (var setting in settings)
{
result.Apply(setting);
}

return result;
}

private CompileArgument GetCompileArgument(TypeTuple tuple, MapType mapType, CompileContext context)
{
var setting = GetMergedSettings(tuple, mapType);
Expand Down
46 changes: 46 additions & 0 deletions src/Mapster/TypeAdapterSetter.cs
Original file line numberDiff line numberDiff 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 DownExpand Up@@ -628,6 +638,42 @@ public TypeAdapterSetter<TDestination> IgnoredRemove(params Expression<Func<TDes
}

#endregion

public TypeAdapterSetter<TSource, TDestination> MapUsing<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,
Expand Down
41 changes: 41 additions & 0 deletions src/Mapster/TypeAdapterSetters/OverrideTypesSetter.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
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> SkipAllSettings(bool value)
{
_Settings.SkipAllSettings = value;
return this;
}

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

return this;
}

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


}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
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/WhenMapUsingOverrideTypesSettings.cs
Original file line numberDiff line numberDiff 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 WhenMapUsingOverrideTypesSettings
{
[TestMethod]
public void OverrideDestinationTramsformIsWorked()
{
var config = new TypeAdapterConfig();
config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);

config
.NewConfig<CollectionPocoOverride, CollectionDtoOverride>()
.MapUsing(src => src.Children, dest => dest.Children,
cfg =>
{
cfg.SkipAllSettings(true);
})
.MapUsing(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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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)));
}

}
}
46 changes: 46 additions & 0 deletions src/Mapster/TypeAdapterConfig.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -474,6 +474,26 @@ 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);

if(mapping.OverrideSettings.ConverterFactory == null || mapping.OverrideSettings.ConverterToTargetFactory == null)
{
var defaultfactory = GetOvverideDefaultSettings(tuple, mapType);

if (mapping.OverrideSettings.ConverterFactory == null)
mapping.OverrideSettings.ConverterFactory = defaultfactory.ConverterFactory;
if (mapping.OverrideSettings.ConverterToTargetFactory == null)
mapping.OverrideSettings.ConverterToTargetFactory = defaultfactory.ConverterToTargetFactory;

}


arg.Settings = mapping.OverrideSettings;
}

}

return CreateMapExpression(arg);
Expand DownExpand Up@@ -627,6 +647,32 @@ orderby priority.Value descending
return result;
}

internal TypeAdapterSettings GetOvverideDefaultSettings(TypeTuple tuple, MapType mapType)
{
var arg = new PreCompileArgument
{
SourceType = tuple.Source,
DestinationType = tuple.Destination,
MapType = mapType,
ExplicitMapping = true,
};

var result = new TypeAdapterSettings();

var rules = RulesTemplate.Reverse<TypeAdapterRule>();
var settings = from rule in rules
let priority = rule.Priority(arg)
where priority != null
orderby priority.Value descending
select rule.Settings;
foreach (var setting in settings)
{
result.Apply(setting);
}

return result;
}

private CompileArgument GetCompileArgument(TypeTuple tuple, MapType mapType, CompileContext context)
{
var setting = GetMergedSettings(tuple, mapType);
Expand Down
46 changes: 46 additions & 0 deletions src/Mapster/TypeAdapterSetter.cs
Original file line numberDiff line numberDiff 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 DownExpand Up@@ -628,6 +638,42 @@ public TypeAdapterSetter<TDestination> IgnoredRemove(params Expression<Func<TDes
}

#endregion

public TypeAdapterSetter<TSource, TDestination> MapUsing<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,
Expand Down
41 changes: 41 additions & 0 deletions src/Mapster/TypeAdapterSetters/OverrideTypesSetter.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
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> SkipAllSettings(bool value)
{
_Settings.SkipAllSettings = value;
return this;
}

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

return this;
}

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


}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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/WhenMapUsingOverrideTypesSettings.cs
Original file line numberDiff line numberDiff 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 WhenMapUsingOverrideTypesSettings
{
[TestMethod]
public void OverrideDestinationTramsformIsWorked()
{
var config = new TypeAdapterConfig();
config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);

config
.NewConfig<CollectionPocoOverride, CollectionDtoOverride>()
.MapUsing(src => src.Children, dest => dest.Children,
cfg =>
{
cfg.SkipAllSettings(true);
})
.MapUsing(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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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)));
}

}
}
46 changes: 46 additions & 0 deletions src/Mapster/TypeAdapterConfig.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -474,6 +474,26 @@ 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);

if(mapping.OverrideSettings.ConverterFactory == null || mapping.OverrideSettings.ConverterToTargetFactory == null)
{
var defaultfactory = GetOvverideDefaultSettings(tuple, mapType);

if (mapping.OverrideSettings.ConverterFactory == null)
mapping.OverrideSettings.ConverterFactory = defaultfactory.ConverterFactory;
if (mapping.OverrideSettings.ConverterToTargetFactory == null)
mapping.OverrideSettings.ConverterToTargetFactory = defaultfactory.ConverterToTargetFactory;

}


arg.Settings = mapping.OverrideSettings;
}

}

return CreateMapExpression(arg);
Expand DownExpand Up@@ -627,6 +647,32 @@ orderby priority.Value descending
return result;
}

internal TypeAdapterSettings GetOvverideDefaultSettings(TypeTuple tuple, MapType mapType)
{
var arg = new PreCompileArgument
{
SourceType = tuple.Source,
DestinationType = tuple.Destination,
MapType = mapType,
ExplicitMapping = true,
};

var result = new TypeAdapterSettings();

var rules = RulesTemplate.Reverse<TypeAdapterRule>();
var settings = from rule in rules
let priority = rule.Priority(arg)
where priority != null
orderby priority.Value descending
select rule.Settings;
foreach (var setting in settings)
{
result.Apply(setting);
}

return result;
}

private CompileArgument GetCompileArgument(TypeTuple tuple, MapType mapType, CompileContext context)
{
var setting = GetMergedSettings(tuple, mapType);
Expand Down
46 changes: 46 additions & 0 deletions src/Mapster/TypeAdapterSetter.cs
Original file line numberDiff line numberDiff 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 DownExpand Up@@ -628,6 +638,42 @@ public TypeAdapterSetter<TDestination> IgnoredRemove(params Expression<Func<TDes
}

#endregion

public TypeAdapterSetter<TSource, TDestination> MapUsing<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,
Expand Down
41 changes: 41 additions & 0 deletions src/Mapster/TypeAdapterSetters/OverrideTypesSetter.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
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> SkipAllSettings(bool value)
{
_Settings.SkipAllSettings = value;
return this;
}

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

return this;
}

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


}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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/WhenMapUsingOverrideTypesSettings.cs
Original file line numberDiff line numberDiff 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 WhenMapUsingOverrideTypesSettings
{
[TestMethod]
public void OverrideDestinationTramsformIsWorked()
{
var config = new TypeAdapterConfig();
config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);

config
.NewConfig<CollectionPocoOverride, CollectionDtoOverride>()
.MapUsing(src => src.Children, dest => dest.Children,
cfg =>
{
cfg.SkipAllSettings(true);
})
.MapUsing(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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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)));
}

}
}
46 changes: 46 additions & 0 deletions src/Mapster/TypeAdapterConfig.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -474,6 +474,26 @@ 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);

if(mapping.OverrideSettings.ConverterFactory == null || mapping.OverrideSettings.ConverterToTargetFactory == null)
{
var defaultfactory = GetOvverideDefaultSettings(tuple, mapType);

if (mapping.OverrideSettings.ConverterFactory == null)
mapping.OverrideSettings.ConverterFactory = defaultfactory.ConverterFactory;
if (mapping.OverrideSettings.ConverterToTargetFactory == null)
mapping.OverrideSettings.ConverterToTargetFactory = defaultfactory.ConverterToTargetFactory;

}


arg.Settings = mapping.OverrideSettings;
}

}

return CreateMapExpression(arg);
Expand DownExpand Up@@ -627,6 +647,32 @@ orderby priority.Value descending
return result;
}

internal TypeAdapterSettings GetOvverideDefaultSettings(TypeTuple tuple, MapType mapType)
{
var arg = new PreCompileArgument
{
SourceType = tuple.Source,
DestinationType = tuple.Destination,
MapType = mapType,
ExplicitMapping = true,
};

var result = new TypeAdapterSettings();

var rules = RulesTemplate.Reverse<TypeAdapterRule>();
var settings = from rule in rules
let priority = rule.Priority(arg)
where priority != null
orderby priority.Value descending
select rule.Settings;
foreach (var setting in settings)
{
result.Apply(setting);
}

return result;
}

private CompileArgument GetCompileArgument(TypeTuple tuple, MapType mapType, CompileContext context)
{
var setting = GetMergedSettings(tuple, mapType);
Expand Down
46 changes: 46 additions & 0 deletions src/Mapster/TypeAdapterSetter.cs
Original file line numberDiff line numberDiff 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 DownExpand Up@@ -628,6 +638,42 @@ public TypeAdapterSetter<TDestination> IgnoredRemove(params Expression<Func<TDes
}

#endregion

public TypeAdapterSetter<TSource, TDestination> MapUsing<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,
Expand Down
41 changes: 41 additions & 0 deletions src/Mapster/TypeAdapterSetters/OverrideTypesSetter.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
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> SkipAllSettings(bool value)
{
_Settings.SkipAllSettings = value;
return this;
}

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

return this;
}

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


}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
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/WhenMapUsingOverrideTypesSettings.cs
Original file line numberDiff line numberDiff 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 WhenMapUsingOverrideTypesSettings
{
[TestMethod]
public void OverrideDestinationTramsformIsWorked()
{
var config = new TypeAdapterConfig();
config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);

config
.NewConfig<CollectionPocoOverride, CollectionDtoOverride>()
.MapUsing(src => src.Children, dest => dest.Children,
cfg =>
{
cfg.SkipAllSettings(true);
})
.MapUsing(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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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)));
}

}
}
46 changes: 46 additions & 0 deletions src/Mapster/TypeAdapterConfig.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -474,6 +474,26 @@ 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);

if(mapping.OverrideSettings.ConverterFactory == null || mapping.OverrideSettings.ConverterToTargetFactory == null)
{
var defaultfactory = GetOvverideDefaultSettings(tuple, mapType);

if (mapping.OverrideSettings.ConverterFactory == null)
mapping.OverrideSettings.ConverterFactory = defaultfactory.ConverterFactory;
if (mapping.OverrideSettings.ConverterToTargetFactory == null)
mapping.OverrideSettings.ConverterToTargetFactory = defaultfactory.ConverterToTargetFactory;

}


arg.Settings = mapping.OverrideSettings;
}

}

return CreateMapExpression(arg);
Expand DownExpand Up@@ -627,6 +647,32 @@ orderby priority.Value descending
return result;
}

internal TypeAdapterSettings GetOvverideDefaultSettings(TypeTuple tuple, MapType mapType)
{
var arg = new PreCompileArgument
{
SourceType = tuple.Source,
DestinationType = tuple.Destination,
MapType = mapType,
ExplicitMapping = true,
};

var result = new TypeAdapterSettings();

var rules = RulesTemplate.Reverse<TypeAdapterRule>();
var settings = from rule in rules
let priority = rule.Priority(arg)
where priority != null
orderby priority.Value descending
select rule.Settings;
foreach (var setting in settings)
{
result.Apply(setting);
}

return result;
}

private CompileArgument GetCompileArgument(TypeTuple tuple, MapType mapType, CompileContext context)
{
var setting = GetMergedSettings(tuple, mapType);
Expand Down
46 changes: 46 additions & 0 deletions src/Mapster/TypeAdapterSetter.cs
Original file line numberDiff line numberDiff 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 DownExpand Up@@ -628,6 +638,42 @@ public TypeAdapterSetter<TDestination> IgnoredRemove(params Expression<Func<TDes
}

#endregion

public TypeAdapterSetter<TSource, TDestination> MapUsing<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,
Expand Down
41 changes: 41 additions & 0 deletions src/Mapster/TypeAdapterSetters/OverrideTypesSetter.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
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> SkipAllSettings(bool value)
{
_Settings.SkipAllSettings = value;
return this;
}

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

return this;
}

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


}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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/WhenMapUsingOverrideTypesSettings.cs
Original file line numberDiff line numberDiff 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 WhenMapUsingOverrideTypesSettings
{
[TestMethod]
public void OverrideDestinationTramsformIsWorked()
{
var config = new TypeAdapterConfig();
config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);

config
.NewConfig<CollectionPocoOverride, CollectionDtoOverride>()
.MapUsing(src => src.Children, dest => dest.Children,
cfg =>
{
cfg.SkipAllSettings(true);
})
.MapUsing(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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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)));
}

}
}
46 changes: 46 additions & 0 deletions src/Mapster/TypeAdapterConfig.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -474,6 +474,26 @@ 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);

if(mapping.OverrideSettings.ConverterFactory == null || mapping.OverrideSettings.ConverterToTargetFactory == null)
{
var defaultfactory = GetOvverideDefaultSettings(tuple, mapType);

if (mapping.OverrideSettings.ConverterFactory == null)
mapping.OverrideSettings.ConverterFactory = defaultfactory.ConverterFactory;
if (mapping.OverrideSettings.ConverterToTargetFactory == null)
mapping.OverrideSettings.ConverterToTargetFactory = defaultfactory.ConverterToTargetFactory;

}


arg.Settings = mapping.OverrideSettings;
}

}

return CreateMapExpression(arg);
Expand DownExpand Up@@ -627,6 +647,32 @@ orderby priority.Value descending
return result;
}

internal TypeAdapterSettings GetOvverideDefaultSettings(TypeTuple tuple, MapType mapType)
{
var arg = new PreCompileArgument
{
SourceType = tuple.Source,
DestinationType = tuple.Destination,
MapType = mapType,
ExplicitMapping = true,
};

var result = new TypeAdapterSettings();

var rules = RulesTemplate.Reverse<TypeAdapterRule>();
var settings = from rule in rules
let priority = rule.Priority(arg)
where priority != null
orderby priority.Value descending
select rule.Settings;
foreach (var setting in settings)
{
result.Apply(setting);
}

return result;
}

private CompileArgument GetCompileArgument(TypeTuple tuple, MapType mapType, CompileContext context)
{
var setting = GetMergedSettings(tuple, mapType);
Expand Down
46 changes: 46 additions & 0 deletions src/Mapster/TypeAdapterSetter.cs
Original file line numberDiff line numberDiff 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 DownExpand Up@@ -628,6 +638,42 @@ public TypeAdapterSetter<TDestination> IgnoredRemove(params Expression<Func<TDes
}

#endregion

public TypeAdapterSetter<TSource, TDestination> MapUsing<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,
Expand Down
41 changes: 41 additions & 0 deletions src/Mapster/TypeAdapterSetters/OverrideTypesSetter.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
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> SkipAllSettings(bool value)
{
_Settings.SkipAllSettings = value;
return this;
}

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

return this;
}

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


}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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/WhenMapUsingOverrideTypesSettings.cs
Original file line numberDiff line numberDiff 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 WhenMapUsingOverrideTypesSettings
{
[TestMethod]
public void OverrideDestinationTramsformIsWorked()
{
var config = new TypeAdapterConfig();
config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);

config
.NewConfig<CollectionPocoOverride, CollectionDtoOverride>()
.MapUsing(src => src.Children, dest => dest.Children,
cfg =>
{
cfg.SkipAllSettings(true);
})
.MapUsing(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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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)));
}

}
}
46 changes: 46 additions & 0 deletions src/Mapster/TypeAdapterConfig.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -474,6 +474,26 @@ 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);

if(mapping.OverrideSettings.ConverterFactory == null || mapping.OverrideSettings.ConverterToTargetFactory == null)
{
var defaultfactory = GetOvverideDefaultSettings(tuple, mapType);

if (mapping.OverrideSettings.ConverterFactory == null)
mapping.OverrideSettings.ConverterFactory = defaultfactory.ConverterFactory;
if (mapping.OverrideSettings.ConverterToTargetFactory == null)
mapping.OverrideSettings.ConverterToTargetFactory = defaultfactory.ConverterToTargetFactory;

}


arg.Settings = mapping.OverrideSettings;
}

}

return CreateMapExpression(arg);
Expand DownExpand Up@@ -627,6 +647,32 @@ orderby priority.Value descending
return result;
}

internal TypeAdapterSettings GetOvverideDefaultSettings(TypeTuple tuple, MapType mapType)
{
var arg = new PreCompileArgument
{
SourceType = tuple.Source,
DestinationType = tuple.Destination,
MapType = mapType,
ExplicitMapping = true,
};

var result = new TypeAdapterSettings();

var rules = RulesTemplate.Reverse<TypeAdapterRule>();
var settings = from rule in rules
let priority = rule.Priority(arg)
where priority != null
orderby priority.Value descending
select rule.Settings;
foreach (var setting in settings)
{
result.Apply(setting);
}

return result;
}

private CompileArgument GetCompileArgument(TypeTuple tuple, MapType mapType, CompileContext context)
{
var setting = GetMergedSettings(tuple, mapType);
Expand Down
46 changes: 46 additions & 0 deletions src/Mapster/TypeAdapterSetter.cs
Original file line numberDiff line numberDiff 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 DownExpand Up@@ -628,6 +638,42 @@ public TypeAdapterSetter<TDestination> IgnoredRemove(params Expression<Func<TDes
}

#endregion

public TypeAdapterSetter<TSource, TDestination> MapUsing<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,
Expand Down
41 changes: 41 additions & 0 deletions src/Mapster/TypeAdapterSetters/OverrideTypesSetter.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
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> SkipAllSettings(bool value)
{
_Settings.SkipAllSettings = value;
return this;
}

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

return this;
}

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


}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
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/WhenMapUsingOverrideTypesSettings.cs
Original file line numberDiff line numberDiff 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 WhenMapUsingOverrideTypesSettings
{
[TestMethod]
public void OverrideDestinationTramsformIsWorked()
{
var config = new TypeAdapterConfig();
config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);

config
.NewConfig<CollectionPocoOverride, CollectionDtoOverride>()
.MapUsing(src => src.Children, dest => dest.Children,
cfg =>
{
cfg.SkipAllSettings(true);
})
.MapUsing(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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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)));
}

}
}
46 changes: 46 additions & 0 deletions src/Mapster/TypeAdapterConfig.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -474,6 +474,26 @@ 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);

if(mapping.OverrideSettings.ConverterFactory == null || mapping.OverrideSettings.ConverterToTargetFactory == null)
{
var defaultfactory = GetOvverideDefaultSettings(tuple, mapType);

if (mapping.OverrideSettings.ConverterFactory == null)
mapping.OverrideSettings.ConverterFactory = defaultfactory.ConverterFactory;
if (mapping.OverrideSettings.ConverterToTargetFactory == null)
mapping.OverrideSettings.ConverterToTargetFactory = defaultfactory.ConverterToTargetFactory;

}


arg.Settings = mapping.OverrideSettings;
}

}

return CreateMapExpression(arg);
Expand DownExpand Up@@ -627,6 +647,32 @@ orderby priority.Value descending
return result;
}

internal TypeAdapterSettings GetOvverideDefaultSettings(TypeTuple tuple, MapType mapType)
{
var arg = new PreCompileArgument
{
SourceType = tuple.Source,
DestinationType = tuple.Destination,
MapType = mapType,
ExplicitMapping = true,
};

var result = new TypeAdapterSettings();

var rules = RulesTemplate.Reverse<TypeAdapterRule>();
var settings = from rule in rules
let priority = rule.Priority(arg)
where priority != null
orderby priority.Value descending
select rule.Settings;
foreach (var setting in settings)
{
result.Apply(setting);
}

return result;
}

private CompileArgument GetCompileArgument(TypeTuple tuple, MapType mapType, CompileContext context)
{
var setting = GetMergedSettings(tuple, mapType);
Expand Down
46 changes: 46 additions & 0 deletions src/Mapster/TypeAdapterSetter.cs
Original file line numberDiff line numberDiff 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 DownExpand Up@@ -628,6 +638,42 @@ public TypeAdapterSetter<TDestination> IgnoredRemove(params Expression<Func<TDes
}

#endregion

public TypeAdapterSetter<TSource, TDestination> MapUsing<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,
Expand Down
41 changes: 41 additions & 0 deletions src/Mapster/TypeAdapterSetters/OverrideTypesSetter.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
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> SkipAllSettings(bool value)
{
_Settings.SkipAllSettings = value;
return this;
}

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

return this;
}

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


}
Loading
Loading