Skip to content
Closed
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
298 changes: 298 additions & 0 deletions src/Mapster.Tests/WhenMappingMemberNameContainingPeriod.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,298 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using System.Reflection.Emit;
using System.Runtime.CompilerServices;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Shouldly;

namespace Mapster.Tests;

[TestClass]
public class WhenMappingMemberNameContainingPeriod
{
private const string MemberName = "Some.Property.With.Periods";

[TestMethod]
public void Property_Name_Containing_Periods_Is_Supported()
{
// Create a target type with a property that contains periods
Type targetType = new TestTypeBuilder()
.AddProperty<int>(MemberName)
.CreateType();

// Call the local function defined below, the actual test method
CallStaticLocalTestMethod(
nameof(Test),
new Type[] { targetType });

// The actual test method adapting Source to the target type and back to the source to verify mapping the property with periods
static void Test<TTarget>()
{
// Get expression for mapping the property with periods
Expression<Func<TTarget, int>> getPropertyExpression = BuildGetPropertyExpression<TTarget, int>(MemberName);

// Create the config
TypeAdapterConfig<Source, TTarget>
.NewConfig()
.TwoWays()
.Map(getPropertyExpression, src => src.Value);

// Execute the mapping both ways
Source source = new() { Value = 551 };
TTarget target = source.Adapt<TTarget>();
Source adaptedSource = target.Adapt<Source>();

Assert.AreEqual(source.Value, adaptedSource.Value);
}
}

[TestMethod]
public void Constructor_Parameter_Name_Containing_Periods_Is_Supported()
{
// Create a target type with a property that contains periods
Type targetTypeWithProperty = new TestTypeBuilder()
.AddProperty<int>(MemberName)
.CreateType();

// Create a target type with a constructor parameter that contains periods
Type targetTypeWithConstructor = new TestTypeBuilder()
.AddConstructorWithReadOnlyProperty<int>(MemberName)
.CreateType();

// Call the local function defined below, the actual test method
CallStaticLocalTestMethod(
nameof(Test),
new Type[] { targetTypeWithProperty, targetTypeWithConstructor });

// The actual test method
static void Test<TWithProperty, TWithConstructor>()
where TWithProperty : new()
{
// Create the config
TypeAdapterConfig<TWithProperty, TWithConstructor>
.NewConfig()
.TwoWays()
.MapToConstructor(true);

// Create delegate for setting the property value on TWithProperty
Expression<Action<TWithProperty, int>> setPropertyExpression = BuildSetPropertyExpression<TWithProperty, int>(MemberName);
Action<TWithProperty, int> setProperty = setPropertyExpression.Compile();

// Create the source object
int value = 551;
TWithProperty source = new();
setProperty.Invoke(source, value);

// Map
TWithConstructor target = source.Adapt<TWithConstructor>();
TWithProperty adaptedSource = target.Adapt<TWithProperty>();

// Create delegate for getting the property from TWithProperty
Expression<Func<TWithProperty, int>> getPropertyExpression = BuildGetPropertyExpression<TWithProperty, int>(MemberName);
Func<TWithProperty, int> getProperty = getPropertyExpression.Compile();

// Verify
Assert.AreEqual(value, getProperty.Invoke(adaptedSource));
}
}

[TestMethod]
public void Using_Property_Path_String_Is_Supported()
Comment thread
DocSvartz marked this conversation as resolved.
{
// Create a target type with a property that contains periods
Type targetType = new TestTypeBuilder()
.AddProperty<int>(MemberName)
.CreateType();

// Create the config, both ways
TypeAdapterConfig
.GlobalSettings
.NewConfig(typeof(Source), targetType)
.Map(MemberName, nameof(Source.Value));
TypeAdapterConfig
.GlobalSettings
.NewConfig(targetType, typeof(Source))
.Map(nameof(Source.Value), MemberName);

// Execute the mapping both ways
Source source = new() { Value = 551 };
object target = source.Adapt(typeof(Source), targetType);
Comment thread
DocSvartz marked this conversation as resolved.
Source adaptedSource = target.Adapt<Source>();

Assert.AreEqual(source.Value, adaptedSource.Value);
}

[TestMethod]
public void Object_To_Dictionary_Map()
{
var poco = new SimplePoco
{
Id = Guid.NewGuid(),
Name = "test",
};

var config = new TypeAdapterConfig();
config.NewConfig<SimplePoco, Dictionary<string, object>>()
.Map(MemberName, c => c.Id);
var dict = poco.Adapt<Dictionary<string, object>>(config);

dict.Count.ShouldBe(2);
dict[MemberName].ShouldBe(poco.Id);
dict["Name"].ShouldBe(poco.Name);
}

private static void CallStaticLocalTestMethod(string methodName, Type[] genericArguments, [CallerMemberName] string caller = "Unknown")
{
MethodInfo genericMethodInfo = typeof(WhenMappingMemberNameContainingPeriod)
.GetMethods(BindingFlags.NonPublic | BindingFlags.Static)
.Single(x => x.Name.Contains($"<{caller}>") && x.Name.Contains(methodName));

MethodInfo method = genericMethodInfo.MakeGenericMethod(genericArguments);

method.Invoke(null, null);
}

private static Expression<Func<T, TProperty>> BuildGetPropertyExpression<T, TProperty>(string propertyName)
{
ParameterExpression param = Expression.Parameter(typeof(T), "x");
MemberExpression property = Expression.Property(param, propertyName);
return Expression.Lambda<Func<T, TProperty>>(property, param);
}

private static Expression<Action<T, TProperty>> BuildSetPropertyExpression<T, TProperty>(string propertyName)
{
ParameterExpression param = Expression.Parameter(typeof(T), "x");
ParameterExpression value = Expression.Parameter(typeof(TProperty), "value");
MemberExpression property = Expression.Property(param, propertyName);
BinaryExpression assign = Expression.Assign(property, value);
return Expression.Lambda<Action<T, TProperty>>(assign, param, value);
}

private class Source
{
public int Value { get; set; }
}

private class TestTypeBuilder
{
private readonly TypeBuilder _typeBuilder;

public TestTypeBuilder()
{
AssemblyBuilder assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(
new AssemblyName("Types"),
AssemblyBuilderAccess.Run);
ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule("<Module>");
_typeBuilder = moduleBuilder.DefineType(
"Types.Target",
TypeAttributes.Public |
TypeAttributes.Class |
TypeAttributes.Sealed |
TypeAttributes.AutoClass |
TypeAttributes.AnsiClass |
TypeAttributes.BeforeFieldInit |
TypeAttributes.AutoLayout,
null);
}

public TestTypeBuilder AddConstructorWithReadOnlyProperty<TParameter>(string parameterName)
{
// Add read-only property
FieldBuilder fieldBuilder = AddProperty<TParameter>(parameterName, false);

// Build the constructor with the parameter for the property
ConstructorBuilder constructorBuilder = _typeBuilder.DefineConstructor(
MethodAttributes.Public,
CallingConventions.Standard,
new Type[] { typeof(TParameter) });

// Define the parameter name
constructorBuilder.DefineParameter(1, ParameterAttributes.None, MemberName);

ILGenerator constructorIL = constructorBuilder.GetILGenerator();

// Call the base class constructor
constructorIL.Emit(OpCodes.Ldarg_0);
constructorIL.Emit(OpCodes.Call, typeof(object).GetConstructor(Type.EmptyTypes));

// Set the property value
constructorIL.Emit(OpCodes.Ldarg_0);
constructorIL.Emit(OpCodes.Ldarg_1);
constructorIL.Emit(OpCodes.Stfld, fieldBuilder);

constructorIL.Emit(OpCodes.Ret);

return this;
}

public TestTypeBuilder AddProperty<T>(string propertyName)
{
AddProperty<T>(propertyName, true);
return this;
}

private FieldBuilder AddProperty<T>(string propertyName, bool addSetter)
{
Type propertyType = typeof(T);
FieldBuilder fieldBuilder = _typeBuilder.DefineField($"_{propertyName}", propertyType, FieldAttributes.Private);
PropertyBuilder propertyBuilder = _typeBuilder.DefineProperty(propertyName, PropertyAttributes.None, propertyType, null);

AddGetMethod(_typeBuilder, propertyBuilder, fieldBuilder, propertyName, propertyType);
if (addSetter)
{
AddSetMethod(_typeBuilder, propertyBuilder, fieldBuilder, propertyName, propertyType);
}

return fieldBuilder;
}

public Type CreateType() => _typeBuilder.CreateType();

private static PropertyBuilder AddGetMethod(TypeBuilder typeBuilder, PropertyBuilder propertyBuilder, FieldBuilder fieldBuilder, string propertyName, Type propertyType)
{
MethodBuilder getMethodBuilder = typeBuilder.DefineMethod(
"get_" + propertyName,
MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.HideBySig,
propertyType,
Type.EmptyTypes);
ILGenerator getMethodGenerator = getMethodBuilder.GetILGenerator();

getMethodGenerator.Emit(OpCodes.Ldarg_0);
getMethodGenerator.Emit(OpCodes.Ldfld, fieldBuilder);
getMethodGenerator.Emit(OpCodes.Ret);

propertyBuilder.SetGetMethod(getMethodBuilder);

return propertyBuilder;
}

private static PropertyBuilder AddSetMethod(TypeBuilder typeBuilder, PropertyBuilder propertyBuilder, FieldBuilder fieldBuilder, string propertyName, Type propertyType)
{
MethodBuilder setMethodBuilder = typeBuilder.DefineMethod(
$"set_{propertyName}",
MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.HideBySig,
null,
new Type[] { propertyType });

ILGenerator setMethodGenerator = setMethodBuilder.GetILGenerator();
Label modifyProperty = setMethodGenerator.DefineLabel();
Label exitSet = setMethodGenerator.DefineLabel();

setMethodGenerator.MarkLabel(modifyProperty);
setMethodGenerator.Emit(OpCodes.Ldarg_0);
setMethodGenerator.Emit(OpCodes.Ldarg_1);
setMethodGenerator.Emit(OpCodes.Stfld, fieldBuilder);

setMethodGenerator.Emit(OpCodes.Nop);
setMethodGenerator.MarkLabel(exitSet);
setMethodGenerator.Emit(OpCodes.Ret);

propertyBuilder.SetSetMethod(setMethodBuilder);

return propertyBuilder;
}
}
}
6 changes: 3 additions & 3 deletions src/Mapster.Tool/Program.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ private static void GenerateMappers(MapperOptions opt)
// This way when we compare attribute types (such as MapperAttribute) between our running assembly
// and the scanned assembly the two types with the same FullName can be considered equal because
// they both were resolved from AssemblyLoadContext.Default.

// This isolated Assembly Load Context will be able to resolve the Mapster assembly, but
// the resolved Assembly will be the same one that is in AssemblyLoadContext.Default
// (the runtime assembly load context that our code refers to by default when referencing
Expand DownExpand Up@@ -461,8 +461,8 @@ Dictionary<string, PropertySetting> settings
setter.Settings.Resolvers.Add(
new InvokerModel
{
DestinationMemberName = setting.TargetPropertyName ?? name,
SourceMemberName = name,
DestinationMemberPath = (setting.TargetPropertyName ?? name).Split('.'),
SourceMemberPath = name.Split('.'),
Invoker = setting.MapFunc,
}
);
Expand Down
4 changes: 2 additions & 2 deletions src/Mapster/Adapters/BaseClassAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ protected ClassMapping CreateClassConverter(Expression source, ClassModel classM
arg.Settings.ExtraSources.Select(src =>
src is LambdaExpression lambda
? lambda.Apply(arg.MapType, source)
: ExpressionEx.PropertyOrFieldPath(source, (string)src)));
: ExpressionEx.PropertyOrFieldPath(source, (string[])src)));
foreach (var destinationMember in destinationMembers)
{
if (ProcessIgnores(arg, destinationMember, out var ignore))
Expand DownExpand Up@@ -124,7 +124,7 @@ protected static bool ProcessIgnores(
if (!destinationMember.ShouldMapMember(arg, MemberSide.Destination))
return true;

return arg.Settings.Ignore.TryGetValue(destinationMember.Name, out ignore)
return arg.Settings.Ignore.TryGetValue(new[] { destinationMember.Name }, out ignore)
&& ignore.Condition == null;
}

Expand Down
4 changes: 3 additions & 1 deletion src/Mapster/Adapters/ClassAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,7 +214,9 @@ private static Expression SetValueByReflection(MemberMapping member, MemberExpre
if (member.UseDestinationValue)
return null;

if (!arg.Settings.Resolvers.Any(r => r.DestinationMemberName == member.DestinationMember.Name)
if (!arg.Settings.Resolvers.Any(r
=> r.DestinationMemberPath.Length == 1
&& r.DestinationMemberPath[0] == member.DestinationMember.Name)
&& member.Getter is MemberExpression memberExp && contructorMembers.Contains(memberExp.Member))
continue;

Expand Down
9 changes: 5 additions & 4 deletions src/Mapster/Adapters/DictionaryAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,16 +105,17 @@ protected override Expression CreateBlockExpression(Expression source, Expressio

//ignore mapped
var ignores = arg.Settings.Resolvers
.Select(r => r.SourceMemberName)
.Where(name => name != null)
.Select(r => r.SourceMemberPath)
.Where(path => path != null)
.Select(path => path![0])
.ToHashSet();

//ignore
var ignoreIfs = new Dictionary<string, Expression>();
foreach (var ignore in arg.Settings.Ignore)
{
if (ignore.Value.Condition == null)
ignores.Add(ignore.Key);
ignores.Add(ignore.Key[0]);
else
{
var body = ignore.Value.IsChildPath
Expand All@@ -123,7 +124,7 @@ protected override Expression CreateBlockExpression(Expression source, Expressio
var setWithCondition = Expression.IfThen(
ExpressionEx.Not(body),
set);
ignoreIfs.Add(ignore.Key, setWithCondition);
ignoreIfs.Add(ignore.Key[0], setWithCondition);
}
}

Expand Down
4 changes: 3 additions & 1 deletion src/Mapster/Adapters/RecordTypeAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,9 @@ protected override Expression CreateInlineExpression(Expression source, CompileA
if (member.UseDestinationValue)
return null;

if (!arg.Settings.Resolvers.Any(r => r.DestinationMemberName == member.DestinationMember.Name)
if (!arg.Settings.Resolvers.Any(r
=> r.DestinationMemberPath.Length == 1
&& r.DestinationMemberPath[0] == member.DestinationMember.Name)
&& member.Getter is MemberExpression memberExp && contructorMembers.Contains(memberExp.Member))
continue;

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Feature: Allow for mapping properties containing periods by JMolenkamp · Pull Request #777 · MapsterMapper/Mapster · GitHub
Skip to content
Closed
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
298 changes: 298 additions & 0 deletions src/Mapster.Tests/WhenMappingMemberNameContainingPeriod.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,298 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using System.Reflection.Emit;
using System.Runtime.CompilerServices;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Shouldly;

namespace Mapster.Tests;

[TestClass]
public class WhenMappingMemberNameContainingPeriod
{
private const string MemberName = "Some.Property.With.Periods";

[TestMethod]
public void Property_Name_Containing_Periods_Is_Supported()
{
// Create a target type with a property that contains periods
Type targetType = new TestTypeBuilder()
.AddProperty<int>(MemberName)
.CreateType();

// Call the local function defined below, the actual test method
CallStaticLocalTestMethod(
nameof(Test),
new Type[] { targetType });

// The actual test method adapting Source to the target type and back to the source to verify mapping the property with periods
static void Test<TTarget>()
{
// Get expression for mapping the property with periods
Expression<Func<TTarget, int>> getPropertyExpression = BuildGetPropertyExpression<TTarget, int>(MemberName);

// Create the config
TypeAdapterConfig<Source, TTarget>
.NewConfig()
.TwoWays()
.Map(getPropertyExpression, src => src.Value);

// Execute the mapping both ways
Source source = new() { Value = 551 };
TTarget target = source.Adapt<TTarget>();
Source adaptedSource = target.Adapt<Source>();

Assert.AreEqual(source.Value, adaptedSource.Value);
}
}

[TestMethod]
public void Constructor_Parameter_Name_Containing_Periods_Is_Supported()
{
// Create a target type with a property that contains periods
Type targetTypeWithProperty = new TestTypeBuilder()
.AddProperty<int>(MemberName)
.CreateType();

// Create a target type with a constructor parameter that contains periods
Type targetTypeWithConstructor = new TestTypeBuilder()
.AddConstructorWithReadOnlyProperty<int>(MemberName)
.CreateType();

// Call the local function defined below, the actual test method
CallStaticLocalTestMethod(
nameof(Test),
new Type[] { targetTypeWithProperty, targetTypeWithConstructor });

// The actual test method
static void Test<TWithProperty, TWithConstructor>()
where TWithProperty : new()
{
// Create the config
TypeAdapterConfig<TWithProperty, TWithConstructor>
.NewConfig()
.TwoWays()
.MapToConstructor(true);

// Create delegate for setting the property value on TWithProperty
Expression<Action<TWithProperty, int>> setPropertyExpression = BuildSetPropertyExpression<TWithProperty, int>(MemberName);
Action<TWithProperty, int> setProperty = setPropertyExpression.Compile();

// Create the source object
int value = 551;
TWithProperty source = new();
setProperty.Invoke(source, value);

// Map
TWithConstructor target = source.Adapt<TWithConstructor>();
TWithProperty adaptedSource = target.Adapt<TWithProperty>();

// Create delegate for getting the property from TWithProperty
Expression<Func<TWithProperty, int>> getPropertyExpression = BuildGetPropertyExpression<TWithProperty, int>(MemberName);
Func<TWithProperty, int> getProperty = getPropertyExpression.Compile();

// Verify
Assert.AreEqual(value, getProperty.Invoke(adaptedSource));
}
}

[TestMethod]
public void Using_Property_Path_String_Is_Supported()
Comment thread
DocSvartz marked this conversation as resolved.
{
// Create a target type with a property that contains periods
Type targetType = new TestTypeBuilder()
.AddProperty<int>(MemberName)
.CreateType();

// Create the config, both ways
TypeAdapterConfig
.GlobalSettings
.NewConfig(typeof(Source), targetType)
.Map(MemberName, nameof(Source.Value));
TypeAdapterConfig
.GlobalSettings
.NewConfig(targetType, typeof(Source))
.Map(nameof(Source.Value), MemberName);

// Execute the mapping both ways
Source source = new() { Value = 551 };
object target = source.Adapt(typeof(Source), targetType);
Comment thread
DocSvartz marked this conversation as resolved.
Source adaptedSource = target.Adapt<Source>();

Assert.AreEqual(source.Value, adaptedSource.Value);
}

[TestMethod]
public void Object_To_Dictionary_Map()
{
var poco = new SimplePoco
{
Id = Guid.NewGuid(),
Name = "test",
};

var config = new TypeAdapterConfig();
config.NewConfig<SimplePoco, Dictionary<string, object>>()
.Map(MemberName, c => c.Id);
var dict = poco.Adapt<Dictionary<string, object>>(config);

dict.Count.ShouldBe(2);
dict[MemberName].ShouldBe(poco.Id);
dict["Name"].ShouldBe(poco.Name);
}

private static void CallStaticLocalTestMethod(string methodName, Type[] genericArguments, [CallerMemberName] string caller = "Unknown")
{
MethodInfo genericMethodInfo = typeof(WhenMappingMemberNameContainingPeriod)
.GetMethods(BindingFlags.NonPublic | BindingFlags.Static)
.Single(x => x.Name.Contains($"<{caller}>") && x.Name.Contains(methodName));

MethodInfo method = genericMethodInfo.MakeGenericMethod(genericArguments);

method.Invoke(null, null);
}

private static Expression<Func<T, TProperty>> BuildGetPropertyExpression<T, TProperty>(string propertyName)
{
ParameterExpression param = Expression.Parameter(typeof(T), "x");
MemberExpression property = Expression.Property(param, propertyName);
return Expression.Lambda<Func<T, TProperty>>(property, param);
}

private static Expression<Action<T, TProperty>> BuildSetPropertyExpression<T, TProperty>(string propertyName)
{
ParameterExpression param = Expression.Parameter(typeof(T), "x");
ParameterExpression value = Expression.Parameter(typeof(TProperty), "value");
MemberExpression property = Expression.Property(param, propertyName);
BinaryExpression assign = Expression.Assign(property, value);
return Expression.Lambda<Action<T, TProperty>>(assign, param, value);
}

private class Source
{
public int Value { get; set; }
}

private class TestTypeBuilder
{
private readonly TypeBuilder _typeBuilder;

public TestTypeBuilder()
{
AssemblyBuilder assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(
new AssemblyName("Types"),
AssemblyBuilderAccess.Run);
ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule("<Module>");
_typeBuilder = moduleBuilder.DefineType(
"Types.Target",
TypeAttributes.Public |
TypeAttributes.Class |
TypeAttributes.Sealed |
TypeAttributes.AutoClass |
TypeAttributes.AnsiClass |
TypeAttributes.BeforeFieldInit |
TypeAttributes.AutoLayout,
null);
}

public TestTypeBuilder AddConstructorWithReadOnlyProperty<TParameter>(string parameterName)
{
// Add read-only property
FieldBuilder fieldBuilder = AddProperty<TParameter>(parameterName, false);

// Build the constructor with the parameter for the property
ConstructorBuilder constructorBuilder = _typeBuilder.DefineConstructor(
MethodAttributes.Public,
CallingConventions.Standard,
new Type[] { typeof(TParameter) });

// Define the parameter name
constructorBuilder.DefineParameter(1, ParameterAttributes.None, MemberName);

ILGenerator constructorIL = constructorBuilder.GetILGenerator();

// Call the base class constructor
constructorIL.Emit(OpCodes.Ldarg_0);
constructorIL.Emit(OpCodes.Call, typeof(object).GetConstructor(Type.EmptyTypes));

// Set the property value
constructorIL.Emit(OpCodes.Ldarg_0);
constructorIL.Emit(OpCodes.Ldarg_1);
constructorIL.Emit(OpCodes.Stfld, fieldBuilder);

constructorIL.Emit(OpCodes.Ret);

return this;
}

public TestTypeBuilder AddProperty<T>(string propertyName)
{
AddProperty<T>(propertyName, true);
return this;
}

private FieldBuilder AddProperty<T>(string propertyName, bool addSetter)
{
Type propertyType = typeof(T);
FieldBuilder fieldBuilder = _typeBuilder.DefineField($"_{propertyName}", propertyType, FieldAttributes.Private);
PropertyBuilder propertyBuilder = _typeBuilder.DefineProperty(propertyName, PropertyAttributes.None, propertyType, null);

AddGetMethod(_typeBuilder, propertyBuilder, fieldBuilder, propertyName, propertyType);
if (addSetter)
{
AddSetMethod(_typeBuilder, propertyBuilder, fieldBuilder, propertyName, propertyType);
}

return fieldBuilder;
}

public Type CreateType() => _typeBuilder.CreateType();

private static PropertyBuilder AddGetMethod(TypeBuilder typeBuilder, PropertyBuilder propertyBuilder, FieldBuilder fieldBuilder, string propertyName, Type propertyType)
{
MethodBuilder getMethodBuilder = typeBuilder.DefineMethod(
"get_" + propertyName,
MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.HideBySig,
propertyType,
Type.EmptyTypes);
ILGenerator getMethodGenerator = getMethodBuilder.GetILGenerator();

getMethodGenerator.Emit(OpCodes.Ldarg_0);
getMethodGenerator.Emit(OpCodes.Ldfld, fieldBuilder);
getMethodGenerator.Emit(OpCodes.Ret);

propertyBuilder.SetGetMethod(getMethodBuilder);

return propertyBuilder;
}

private static PropertyBuilder AddSetMethod(TypeBuilder typeBuilder, PropertyBuilder propertyBuilder, FieldBuilder fieldBuilder, string propertyName, Type propertyType)
{
MethodBuilder setMethodBuilder = typeBuilder.DefineMethod(
$"set_{propertyName}",
MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.HideBySig,
null,
new Type[] { propertyType });

ILGenerator setMethodGenerator = setMethodBuilder.GetILGenerator();
Label modifyProperty = setMethodGenerator.DefineLabel();
Label exitSet = setMethodGenerator.DefineLabel();

setMethodGenerator.MarkLabel(modifyProperty);
setMethodGenerator.Emit(OpCodes.Ldarg_0);
setMethodGenerator.Emit(OpCodes.Ldarg_1);
setMethodGenerator.Emit(OpCodes.Stfld, fieldBuilder);

setMethodGenerator.Emit(OpCodes.Nop);
setMethodGenerator.MarkLabel(exitSet);
setMethodGenerator.Emit(OpCodes.Ret);

propertyBuilder.SetSetMethod(setMethodBuilder);

return propertyBuilder;
}
}
}
6 changes: 3 additions & 3 deletions src/Mapster.Tool/Program.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ private static void GenerateMappers(MapperOptions opt)
// This way when we compare attribute types (such as MapperAttribute) between our running assembly
// and the scanned assembly the two types with the same FullName can be considered equal because
// they both were resolved from AssemblyLoadContext.Default.

// This isolated Assembly Load Context will be able to resolve the Mapster assembly, but
// the resolved Assembly will be the same one that is in AssemblyLoadContext.Default
// (the runtime assembly load context that our code refers to by default when referencing
Expand DownExpand Up@@ -461,8 +461,8 @@ Dictionary<string, PropertySetting> settings
setter.Settings.Resolvers.Add(
new InvokerModel
{
DestinationMemberName = setting.TargetPropertyName ?? name,
SourceMemberName = name,
DestinationMemberPath = (setting.TargetPropertyName ?? name).Split('.'),
SourceMemberPath = name.Split('.'),
Invoker = setting.MapFunc,
}
);
Expand Down
4 changes: 2 additions & 2 deletions src/Mapster/Adapters/BaseClassAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ protected ClassMapping CreateClassConverter(Expression source, ClassModel classM
arg.Settings.ExtraSources.Select(src =>
src is LambdaExpression lambda
? lambda.Apply(arg.MapType, source)
: ExpressionEx.PropertyOrFieldPath(source, (string)src)));
: ExpressionEx.PropertyOrFieldPath(source, (string[])src)));
foreach (var destinationMember in destinationMembers)
{
if (ProcessIgnores(arg, destinationMember, out var ignore))
Expand DownExpand Up@@ -124,7 +124,7 @@ protected static bool ProcessIgnores(
if (!destinationMember.ShouldMapMember(arg, MemberSide.Destination))
return true;

return arg.Settings.Ignore.TryGetValue(destinationMember.Name, out ignore)
return arg.Settings.Ignore.TryGetValue(new[] { destinationMember.Name }, out ignore)
&& ignore.Condition == null;
}

Expand Down
4 changes: 3 additions & 1 deletion src/Mapster/Adapters/ClassAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,7 +214,9 @@ private static Expression SetValueByReflection(MemberMapping member, MemberExpre
if (member.UseDestinationValue)
return null;

if (!arg.Settings.Resolvers.Any(r => r.DestinationMemberName == member.DestinationMember.Name)
if (!arg.Settings.Resolvers.Any(r
=> r.DestinationMemberPath.Length == 1
&& r.DestinationMemberPath[0] == member.DestinationMember.Name)
&& member.Getter is MemberExpression memberExp && contructorMembers.Contains(memberExp.Member))
continue;

Expand Down
9 changes: 5 additions & 4 deletions src/Mapster/Adapters/DictionaryAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,16 +105,17 @@ protected override Expression CreateBlockExpression(Expression source, Expressio

//ignore mapped
var ignores = arg.Settings.Resolvers
.Select(r => r.SourceMemberName)
.Where(name => name != null)
.Select(r => r.SourceMemberPath)
.Where(path => path != null)
.Select(path => path![0])
.ToHashSet();

//ignore
var ignoreIfs = new Dictionary<string, Expression>();
foreach (var ignore in arg.Settings.Ignore)
{
if (ignore.Value.Condition == null)
ignores.Add(ignore.Key);
ignores.Add(ignore.Key[0]);
else
{
var body = ignore.Value.IsChildPath
Expand All@@ -123,7 +124,7 @@ protected override Expression CreateBlockExpression(Expression source, Expressio
var setWithCondition = Expression.IfThen(
ExpressionEx.Not(body),
set);
ignoreIfs.Add(ignore.Key, setWithCondition);
ignoreIfs.Add(ignore.Key[0], setWithCondition);
}
}

Expand Down
4 changes: 3 additions & 1 deletion src/Mapster/Adapters/RecordTypeAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,9 @@ protected override Expression CreateInlineExpression(Expression source, CompileA
if (member.UseDestinationValue)
return null;

if (!arg.Settings.Resolvers.Any(r => r.DestinationMemberName == member.DestinationMember.Name)
if (!arg.Settings.Resolvers.Any(r
=> r.DestinationMemberPath.Length == 1
&& r.DestinationMemberPath[0] == member.DestinationMember.Name)
&& member.Getter is MemberExpression memberExp && contructorMembers.Contains(memberExp.Member))
continue;

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Feature: Allow for mapping properties containing periods by JMolenkamp · Pull Request #777 · MapsterMapper/Mapster · GitHub
Skip to content
Closed
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
298 changes: 298 additions & 0 deletions src/Mapster.Tests/WhenMappingMemberNameContainingPeriod.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,298 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using System.Reflection.Emit;
using System.Runtime.CompilerServices;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Shouldly;

namespace Mapster.Tests;

[TestClass]
public class WhenMappingMemberNameContainingPeriod
{
private const string MemberName = "Some.Property.With.Periods";

[TestMethod]
public void Property_Name_Containing_Periods_Is_Supported()
{
// Create a target type with a property that contains periods
Type targetType = new TestTypeBuilder()
.AddProperty<int>(MemberName)
.CreateType();

// Call the local function defined below, the actual test method
CallStaticLocalTestMethod(
nameof(Test),
new Type[] { targetType });

// The actual test method adapting Source to the target type and back to the source to verify mapping the property with periods
static void Test<TTarget>()
{
// Get expression for mapping the property with periods
Expression<Func<TTarget, int>> getPropertyExpression = BuildGetPropertyExpression<TTarget, int>(MemberName);

// Create the config
TypeAdapterConfig<Source, TTarget>
.NewConfig()
.TwoWays()
.Map(getPropertyExpression, src => src.Value);

// Execute the mapping both ways
Source source = new() { Value = 551 };
TTarget target = source.Adapt<TTarget>();
Source adaptedSource = target.Adapt<Source>();

Assert.AreEqual(source.Value, adaptedSource.Value);
}
}

[TestMethod]
public void Constructor_Parameter_Name_Containing_Periods_Is_Supported()
{
// Create a target type with a property that contains periods
Type targetTypeWithProperty = new TestTypeBuilder()
.AddProperty<int>(MemberName)
.CreateType();

// Create a target type with a constructor parameter that contains periods
Type targetTypeWithConstructor = new TestTypeBuilder()
.AddConstructorWithReadOnlyProperty<int>(MemberName)
.CreateType();

// Call the local function defined below, the actual test method
CallStaticLocalTestMethod(
nameof(Test),
new Type[] { targetTypeWithProperty, targetTypeWithConstructor });

// The actual test method
static void Test<TWithProperty, TWithConstructor>()
where TWithProperty : new()
{
// Create the config
TypeAdapterConfig<TWithProperty, TWithConstructor>
.NewConfig()
.TwoWays()
.MapToConstructor(true);

// Create delegate for setting the property value on TWithProperty
Expression<Action<TWithProperty, int>> setPropertyExpression = BuildSetPropertyExpression<TWithProperty, int>(MemberName);
Action<TWithProperty, int> setProperty = setPropertyExpression.Compile();

// Create the source object
int value = 551;
TWithProperty source = new();
setProperty.Invoke(source, value);

// Map
TWithConstructor target = source.Adapt<TWithConstructor>();
TWithProperty adaptedSource = target.Adapt<TWithProperty>();

// Create delegate for getting the property from TWithProperty
Expression<Func<TWithProperty, int>> getPropertyExpression = BuildGetPropertyExpression<TWithProperty, int>(MemberName);
Func<TWithProperty, int> getProperty = getPropertyExpression.Compile();

// Verify
Assert.AreEqual(value, getProperty.Invoke(adaptedSource));
}
}

[TestMethod]
public void Using_Property_Path_String_Is_Supported()
Comment thread
DocSvartz marked this conversation as resolved.
{
// Create a target type with a property that contains periods
Type targetType = new TestTypeBuilder()
.AddProperty<int>(MemberName)
.CreateType();

// Create the config, both ways
TypeAdapterConfig
.GlobalSettings
.NewConfig(typeof(Source), targetType)
.Map(MemberName, nameof(Source.Value));
TypeAdapterConfig
.GlobalSettings
.NewConfig(targetType, typeof(Source))
.Map(nameof(Source.Value), MemberName);

// Execute the mapping both ways
Source source = new() { Value = 551 };
object target = source.Adapt(typeof(Source), targetType);
Comment thread
DocSvartz marked this conversation as resolved.
Source adaptedSource = target.Adapt<Source>();

Assert.AreEqual(source.Value, adaptedSource.Value);
}

[TestMethod]
public void Object_To_Dictionary_Map()
{
var poco = new SimplePoco
{
Id = Guid.NewGuid(),
Name = "test",
};

var config = new TypeAdapterConfig();
config.NewConfig<SimplePoco, Dictionary<string, object>>()
.Map(MemberName, c => c.Id);
var dict = poco.Adapt<Dictionary<string, object>>(config);

dict.Count.ShouldBe(2);
dict[MemberName].ShouldBe(poco.Id);
dict["Name"].ShouldBe(poco.Name);
}

private static void CallStaticLocalTestMethod(string methodName, Type[] genericArguments, [CallerMemberName] string caller = "Unknown")
{
MethodInfo genericMethodInfo = typeof(WhenMappingMemberNameContainingPeriod)
.GetMethods(BindingFlags.NonPublic | BindingFlags.Static)
.Single(x => x.Name.Contains($"<{caller}>") && x.Name.Contains(methodName));

MethodInfo method = genericMethodInfo.MakeGenericMethod(genericArguments);

method.Invoke(null, null);
}

private static Expression<Func<T, TProperty>> BuildGetPropertyExpression<T, TProperty>(string propertyName)
{
ParameterExpression param = Expression.Parameter(typeof(T), "x");
MemberExpression property = Expression.Property(param, propertyName);
return Expression.Lambda<Func<T, TProperty>>(property, param);
}

private static Expression<Action<T, TProperty>> BuildSetPropertyExpression<T, TProperty>(string propertyName)
{
ParameterExpression param = Expression.Parameter(typeof(T), "x");
ParameterExpression value = Expression.Parameter(typeof(TProperty), "value");
MemberExpression property = Expression.Property(param, propertyName);
BinaryExpression assign = Expression.Assign(property, value);
return Expression.Lambda<Action<T, TProperty>>(assign, param, value);
}

private class Source
{
public int Value { get; set; }
}

private class TestTypeBuilder
{
private readonly TypeBuilder _typeBuilder;

public TestTypeBuilder()
{
AssemblyBuilder assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(
new AssemblyName("Types"),
AssemblyBuilderAccess.Run);
ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule("<Module>");
_typeBuilder = moduleBuilder.DefineType(
"Types.Target",
TypeAttributes.Public |
TypeAttributes.Class |
TypeAttributes.Sealed |
TypeAttributes.AutoClass |
TypeAttributes.AnsiClass |
TypeAttributes.BeforeFieldInit |
TypeAttributes.AutoLayout,
null);
}

public TestTypeBuilder AddConstructorWithReadOnlyProperty<TParameter>(string parameterName)
{
// Add read-only property
FieldBuilder fieldBuilder = AddProperty<TParameter>(parameterName, false);

// Build the constructor with the parameter for the property
ConstructorBuilder constructorBuilder = _typeBuilder.DefineConstructor(
MethodAttributes.Public,
CallingConventions.Standard,
new Type[] { typeof(TParameter) });

// Define the parameter name
constructorBuilder.DefineParameter(1, ParameterAttributes.None, MemberName);

ILGenerator constructorIL = constructorBuilder.GetILGenerator();

// Call the base class constructor
constructorIL.Emit(OpCodes.Ldarg_0);
constructorIL.Emit(OpCodes.Call, typeof(object).GetConstructor(Type.EmptyTypes));

// Set the property value
constructorIL.Emit(OpCodes.Ldarg_0);
constructorIL.Emit(OpCodes.Ldarg_1);
constructorIL.Emit(OpCodes.Stfld, fieldBuilder);

constructorIL.Emit(OpCodes.Ret);

return this;
}

public TestTypeBuilder AddProperty<T>(string propertyName)
{
AddProperty<T>(propertyName, true);
return this;
}

private FieldBuilder AddProperty<T>(string propertyName, bool addSetter)
{
Type propertyType = typeof(T);
FieldBuilder fieldBuilder = _typeBuilder.DefineField($"_{propertyName}", propertyType, FieldAttributes.Private);
PropertyBuilder propertyBuilder = _typeBuilder.DefineProperty(propertyName, PropertyAttributes.None, propertyType, null);

AddGetMethod(_typeBuilder, propertyBuilder, fieldBuilder, propertyName, propertyType);
if (addSetter)
{
AddSetMethod(_typeBuilder, propertyBuilder, fieldBuilder, propertyName, propertyType);
}

return fieldBuilder;
}

public Type CreateType() => _typeBuilder.CreateType();

private static PropertyBuilder AddGetMethod(TypeBuilder typeBuilder, PropertyBuilder propertyBuilder, FieldBuilder fieldBuilder, string propertyName, Type propertyType)
{
MethodBuilder getMethodBuilder = typeBuilder.DefineMethod(
"get_" + propertyName,
MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.HideBySig,
propertyType,
Type.EmptyTypes);
ILGenerator getMethodGenerator = getMethodBuilder.GetILGenerator();

getMethodGenerator.Emit(OpCodes.Ldarg_0);
getMethodGenerator.Emit(OpCodes.Ldfld, fieldBuilder);
getMethodGenerator.Emit(OpCodes.Ret);

propertyBuilder.SetGetMethod(getMethodBuilder);

return propertyBuilder;
}

private static PropertyBuilder AddSetMethod(TypeBuilder typeBuilder, PropertyBuilder propertyBuilder, FieldBuilder fieldBuilder, string propertyName, Type propertyType)
{
MethodBuilder setMethodBuilder = typeBuilder.DefineMethod(
$"set_{propertyName}",
MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.HideBySig,
null,
new Type[] { propertyType });

ILGenerator setMethodGenerator = setMethodBuilder.GetILGenerator();
Label modifyProperty = setMethodGenerator.DefineLabel();
Label exitSet = setMethodGenerator.DefineLabel();

setMethodGenerator.MarkLabel(modifyProperty);
setMethodGenerator.Emit(OpCodes.Ldarg_0);
setMethodGenerator.Emit(OpCodes.Ldarg_1);
setMethodGenerator.Emit(OpCodes.Stfld, fieldBuilder);

setMethodGenerator.Emit(OpCodes.Nop);
setMethodGenerator.MarkLabel(exitSet);
setMethodGenerator.Emit(OpCodes.Ret);

propertyBuilder.SetSetMethod(setMethodBuilder);

return propertyBuilder;
}
}
}
6 changes: 3 additions & 3 deletions src/Mapster.Tool/Program.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ private static void GenerateMappers(MapperOptions opt)
// This way when we compare attribute types (such as MapperAttribute) between our running assembly
// and the scanned assembly the two types with the same FullName can be considered equal because
// they both were resolved from AssemblyLoadContext.Default.

// This isolated Assembly Load Context will be able to resolve the Mapster assembly, but
// the resolved Assembly will be the same one that is in AssemblyLoadContext.Default
// (the runtime assembly load context that our code refers to by default when referencing
Expand DownExpand Up@@ -461,8 +461,8 @@ Dictionary<string, PropertySetting> settings
setter.Settings.Resolvers.Add(
new InvokerModel
{
DestinationMemberName = setting.TargetPropertyName ?? name,
SourceMemberName = name,
DestinationMemberPath = (setting.TargetPropertyName ?? name).Split('.'),
SourceMemberPath = name.Split('.'),
Invoker = setting.MapFunc,
}
);
Expand Down
4 changes: 2 additions & 2 deletions src/Mapster/Adapters/BaseClassAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ protected ClassMapping CreateClassConverter(Expression source, ClassModel classM
arg.Settings.ExtraSources.Select(src =>
src is LambdaExpression lambda
? lambda.Apply(arg.MapType, source)
: ExpressionEx.PropertyOrFieldPath(source, (string)src)));
: ExpressionEx.PropertyOrFieldPath(source, (string[])src)));
foreach (var destinationMember in destinationMembers)
{
if (ProcessIgnores(arg, destinationMember, out var ignore))
Expand DownExpand Up@@ -124,7 +124,7 @@ protected static bool ProcessIgnores(
if (!destinationMember.ShouldMapMember(arg, MemberSide.Destination))
return true;

return arg.Settings.Ignore.TryGetValue(destinationMember.Name, out ignore)
return arg.Settings.Ignore.TryGetValue(new[] { destinationMember.Name }, out ignore)
&& ignore.Condition == null;
}

Expand Down
4 changes: 3 additions & 1 deletion src/Mapster/Adapters/ClassAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,7 +214,9 @@ private static Expression SetValueByReflection(MemberMapping member, MemberExpre
if (member.UseDestinationValue)
return null;

if (!arg.Settings.Resolvers.Any(r => r.DestinationMemberName == member.DestinationMember.Name)
if (!arg.Settings.Resolvers.Any(r
=> r.DestinationMemberPath.Length == 1
&& r.DestinationMemberPath[0] == member.DestinationMember.Name)
&& member.Getter is MemberExpression memberExp && contructorMembers.Contains(memberExp.Member))
continue;

Expand Down
9 changes: 5 additions & 4 deletions src/Mapster/Adapters/DictionaryAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,16 +105,17 @@ protected override Expression CreateBlockExpression(Expression source, Expressio

//ignore mapped
var ignores = arg.Settings.Resolvers
.Select(r => r.SourceMemberName)
.Where(name => name != null)
.Select(r => r.SourceMemberPath)
.Where(path => path != null)
.Select(path => path![0])
.ToHashSet();

//ignore
var ignoreIfs = new Dictionary<string, Expression>();
foreach (var ignore in arg.Settings.Ignore)
{
if (ignore.Value.Condition == null)
ignores.Add(ignore.Key);
ignores.Add(ignore.Key[0]);
else
{
var body = ignore.Value.IsChildPath
Expand All@@ -123,7 +124,7 @@ protected override Expression CreateBlockExpression(Expression source, Expressio
var setWithCondition = Expression.IfThen(
ExpressionEx.Not(body),
set);
ignoreIfs.Add(ignore.Key, setWithCondition);
ignoreIfs.Add(ignore.Key[0], setWithCondition);
}
}

Expand Down
4 changes: 3 additions & 1 deletion src/Mapster/Adapters/RecordTypeAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,9 @@ protected override Expression CreateInlineExpression(Expression source, CompileA
if (member.UseDestinationValue)
return null;

if (!arg.Settings.Resolvers.Any(r => r.DestinationMemberName == member.DestinationMember.Name)
if (!arg.Settings.Resolvers.Any(r
=> r.DestinationMemberPath.Length == 1
&& r.DestinationMemberPath[0] == member.DestinationMember.Name)
&& member.Getter is MemberExpression memberExp && contructorMembers.Contains(memberExp.Member))
continue;

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Feature: Allow for mapping properties containing periods by JMolenkamp · Pull Request #777 · MapsterMapper/Mapster · GitHub
Skip to content
Closed
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
298 changes: 298 additions & 0 deletions src/Mapster.Tests/WhenMappingMemberNameContainingPeriod.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,298 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using System.Reflection.Emit;
using System.Runtime.CompilerServices;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Shouldly;

namespace Mapster.Tests;

[TestClass]
public class WhenMappingMemberNameContainingPeriod
{
private const string MemberName = "Some.Property.With.Periods";

[TestMethod]
public void Property_Name_Containing_Periods_Is_Supported()
{
// Create a target type with a property that contains periods
Type targetType = new TestTypeBuilder()
.AddProperty<int>(MemberName)
.CreateType();

// Call the local function defined below, the actual test method
CallStaticLocalTestMethod(
nameof(Test),
new Type[] { targetType });

// The actual test method adapting Source to the target type and back to the source to verify mapping the property with periods
static void Test<TTarget>()
{
// Get expression for mapping the property with periods
Expression<Func<TTarget, int>> getPropertyExpression = BuildGetPropertyExpression<TTarget, int>(MemberName);

// Create the config
TypeAdapterConfig<Source, TTarget>
.NewConfig()
.TwoWays()
.Map(getPropertyExpression, src => src.Value);

// Execute the mapping both ways
Source source = new() { Value = 551 };
TTarget target = source.Adapt<TTarget>();
Source adaptedSource = target.Adapt<Source>();

Assert.AreEqual(source.Value, adaptedSource.Value);
}
}

[TestMethod]
public void Constructor_Parameter_Name_Containing_Periods_Is_Supported()
{
// Create a target type with a property that contains periods
Type targetTypeWithProperty = new TestTypeBuilder()
.AddProperty<int>(MemberName)
.CreateType();

// Create a target type with a constructor parameter that contains periods
Type targetTypeWithConstructor = new TestTypeBuilder()
.AddConstructorWithReadOnlyProperty<int>(MemberName)
.CreateType();

// Call the local function defined below, the actual test method
CallStaticLocalTestMethod(
nameof(Test),
new Type[] { targetTypeWithProperty, targetTypeWithConstructor });

// The actual test method
static void Test<TWithProperty, TWithConstructor>()
where TWithProperty : new()
{
// Create the config
TypeAdapterConfig<TWithProperty, TWithConstructor>
.NewConfig()
.TwoWays()
.MapToConstructor(true);

// Create delegate for setting the property value on TWithProperty
Expression<Action<TWithProperty, int>> setPropertyExpression = BuildSetPropertyExpression<TWithProperty, int>(MemberName);
Action<TWithProperty, int> setProperty = setPropertyExpression.Compile();

// Create the source object
int value = 551;
TWithProperty source = new();
setProperty.Invoke(source, value);

// Map
TWithConstructor target = source.Adapt<TWithConstructor>();
TWithProperty adaptedSource = target.Adapt<TWithProperty>();

// Create delegate for getting the property from TWithProperty
Expression<Func<TWithProperty, int>> getPropertyExpression = BuildGetPropertyExpression<TWithProperty, int>(MemberName);
Func<TWithProperty, int> getProperty = getPropertyExpression.Compile();

// Verify
Assert.AreEqual(value, getProperty.Invoke(adaptedSource));
}
}

[TestMethod]
public void Using_Property_Path_String_Is_Supported()
Comment thread
DocSvartz marked this conversation as resolved.
{
// Create a target type with a property that contains periods
Type targetType = new TestTypeBuilder()
.AddProperty<int>(MemberName)
.CreateType();

// Create the config, both ways
TypeAdapterConfig
.GlobalSettings
.NewConfig(typeof(Source), targetType)
.Map(MemberName, nameof(Source.Value));
TypeAdapterConfig
.GlobalSettings
.NewConfig(targetType, typeof(Source))
.Map(nameof(Source.Value), MemberName);

// Execute the mapping both ways
Source source = new() { Value = 551 };
object target = source.Adapt(typeof(Source), targetType);
Comment thread
DocSvartz marked this conversation as resolved.
Source adaptedSource = target.Adapt<Source>();

Assert.AreEqual(source.Value, adaptedSource.Value);
}

[TestMethod]
public void Object_To_Dictionary_Map()
{
var poco = new SimplePoco
{
Id = Guid.NewGuid(),
Name = "test",
};

var config = new TypeAdapterConfig();
config.NewConfig<SimplePoco, Dictionary<string, object>>()
.Map(MemberName, c => c.Id);
var dict = poco.Adapt<Dictionary<string, object>>(config);

dict.Count.ShouldBe(2);
dict[MemberName].ShouldBe(poco.Id);
dict["Name"].ShouldBe(poco.Name);
}

private static void CallStaticLocalTestMethod(string methodName, Type[] genericArguments, [CallerMemberName] string caller = "Unknown")
{
MethodInfo genericMethodInfo = typeof(WhenMappingMemberNameContainingPeriod)
.GetMethods(BindingFlags.NonPublic | BindingFlags.Static)
.Single(x => x.Name.Contains($"<{caller}>") && x.Name.Contains(methodName));

MethodInfo method = genericMethodInfo.MakeGenericMethod(genericArguments);

method.Invoke(null, null);
}

private static Expression<Func<T, TProperty>> BuildGetPropertyExpression<T, TProperty>(string propertyName)
{
ParameterExpression param = Expression.Parameter(typeof(T), "x");
MemberExpression property = Expression.Property(param, propertyName);
return Expression.Lambda<Func<T, TProperty>>(property, param);
}

private static Expression<Action<T, TProperty>> BuildSetPropertyExpression<T, TProperty>(string propertyName)
{
ParameterExpression param = Expression.Parameter(typeof(T), "x");
ParameterExpression value = Expression.Parameter(typeof(TProperty), "value");
MemberExpression property = Expression.Property(param, propertyName);
BinaryExpression assign = Expression.Assign(property, value);
return Expression.Lambda<Action<T, TProperty>>(assign, param, value);
}

private class Source
{
public int Value { get; set; }
}

private class TestTypeBuilder
{
private readonly TypeBuilder _typeBuilder;

public TestTypeBuilder()
{
AssemblyBuilder assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(
new AssemblyName("Types"),
AssemblyBuilderAccess.Run);
ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule("<Module>");
_typeBuilder = moduleBuilder.DefineType(
"Types.Target",
TypeAttributes.Public |
TypeAttributes.Class |
TypeAttributes.Sealed |
TypeAttributes.AutoClass |
TypeAttributes.AnsiClass |
TypeAttributes.BeforeFieldInit |
TypeAttributes.AutoLayout,
null);
}

public TestTypeBuilder AddConstructorWithReadOnlyProperty<TParameter>(string parameterName)
{
// Add read-only property
FieldBuilder fieldBuilder = AddProperty<TParameter>(parameterName, false);

// Build the constructor with the parameter for the property
ConstructorBuilder constructorBuilder = _typeBuilder.DefineConstructor(
MethodAttributes.Public,
CallingConventions.Standard,
new Type[] { typeof(TParameter) });

// Define the parameter name
constructorBuilder.DefineParameter(1, ParameterAttributes.None, MemberName);

ILGenerator constructorIL = constructorBuilder.GetILGenerator();

// Call the base class constructor
constructorIL.Emit(OpCodes.Ldarg_0);
constructorIL.Emit(OpCodes.Call, typeof(object).GetConstructor(Type.EmptyTypes));

// Set the property value
constructorIL.Emit(OpCodes.Ldarg_0);
constructorIL.Emit(OpCodes.Ldarg_1);
constructorIL.Emit(OpCodes.Stfld, fieldBuilder);

constructorIL.Emit(OpCodes.Ret);

return this;
}

public TestTypeBuilder AddProperty<T>(string propertyName)
{
AddProperty<T>(propertyName, true);
return this;
}

private FieldBuilder AddProperty<T>(string propertyName, bool addSetter)
{
Type propertyType = typeof(T);
FieldBuilder fieldBuilder = _typeBuilder.DefineField($"_{propertyName}", propertyType, FieldAttributes.Private);
PropertyBuilder propertyBuilder = _typeBuilder.DefineProperty(propertyName, PropertyAttributes.None, propertyType, null);

AddGetMethod(_typeBuilder, propertyBuilder, fieldBuilder, propertyName, propertyType);
if (addSetter)
{
AddSetMethod(_typeBuilder, propertyBuilder, fieldBuilder, propertyName, propertyType);
}

return fieldBuilder;
}

public Type CreateType() => _typeBuilder.CreateType();

private static PropertyBuilder AddGetMethod(TypeBuilder typeBuilder, PropertyBuilder propertyBuilder, FieldBuilder fieldBuilder, string propertyName, Type propertyType)
{
MethodBuilder getMethodBuilder = typeBuilder.DefineMethod(
"get_" + propertyName,
MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.HideBySig,
propertyType,
Type.EmptyTypes);
ILGenerator getMethodGenerator = getMethodBuilder.GetILGenerator();

getMethodGenerator.Emit(OpCodes.Ldarg_0);
getMethodGenerator.Emit(OpCodes.Ldfld, fieldBuilder);
getMethodGenerator.Emit(OpCodes.Ret);

propertyBuilder.SetGetMethod(getMethodBuilder);

return propertyBuilder;
}

private static PropertyBuilder AddSetMethod(TypeBuilder typeBuilder, PropertyBuilder propertyBuilder, FieldBuilder fieldBuilder, string propertyName, Type propertyType)
{
MethodBuilder setMethodBuilder = typeBuilder.DefineMethod(
$"set_{propertyName}",
MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.HideBySig,
null,
new Type[] { propertyType });

ILGenerator setMethodGenerator = setMethodBuilder.GetILGenerator();
Label modifyProperty = setMethodGenerator.DefineLabel();
Label exitSet = setMethodGenerator.DefineLabel();

setMethodGenerator.MarkLabel(modifyProperty);
setMethodGenerator.Emit(OpCodes.Ldarg_0);
setMethodGenerator.Emit(OpCodes.Ldarg_1);
setMethodGenerator.Emit(OpCodes.Stfld, fieldBuilder);

setMethodGenerator.Emit(OpCodes.Nop);
setMethodGenerator.MarkLabel(exitSet);
setMethodGenerator.Emit(OpCodes.Ret);

propertyBuilder.SetSetMethod(setMethodBuilder);

return propertyBuilder;
}
}
}
6 changes: 3 additions & 3 deletions src/Mapster.Tool/Program.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ private static void GenerateMappers(MapperOptions opt)
// This way when we compare attribute types (such as MapperAttribute) between our running assembly
// and the scanned assembly the two types with the same FullName can be considered equal because
// they both were resolved from AssemblyLoadContext.Default.

// This isolated Assembly Load Context will be able to resolve the Mapster assembly, but
// the resolved Assembly will be the same one that is in AssemblyLoadContext.Default
// (the runtime assembly load context that our code refers to by default when referencing
Expand DownExpand Up@@ -461,8 +461,8 @@ Dictionary<string, PropertySetting> settings
setter.Settings.Resolvers.Add(
new InvokerModel
{
DestinationMemberName = setting.TargetPropertyName ?? name,
SourceMemberName = name,
DestinationMemberPath = (setting.TargetPropertyName ?? name).Split('.'),
SourceMemberPath = name.Split('.'),
Invoker = setting.MapFunc,
}
);
Expand Down
4 changes: 2 additions & 2 deletions src/Mapster/Adapters/BaseClassAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ protected ClassMapping CreateClassConverter(Expression source, ClassModel classM
arg.Settings.ExtraSources.Select(src =>
src is LambdaExpression lambda
? lambda.Apply(arg.MapType, source)
: ExpressionEx.PropertyOrFieldPath(source, (string)src)));
: ExpressionEx.PropertyOrFieldPath(source, (string[])src)));
foreach (var destinationMember in destinationMembers)
{
if (ProcessIgnores(arg, destinationMember, out var ignore))
Expand DownExpand Up@@ -124,7 +124,7 @@ protected static bool ProcessIgnores(
if (!destinationMember.ShouldMapMember(arg, MemberSide.Destination))
return true;

return arg.Settings.Ignore.TryGetValue(destinationMember.Name, out ignore)
return arg.Settings.Ignore.TryGetValue(new[] { destinationMember.Name }, out ignore)
&& ignore.Condition == null;
}

Expand Down
4 changes: 3 additions & 1 deletion src/Mapster/Adapters/ClassAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,7 +214,9 @@ private static Expression SetValueByReflection(MemberMapping member, MemberExpre
if (member.UseDestinationValue)
return null;

if (!arg.Settings.Resolvers.Any(r => r.DestinationMemberName == member.DestinationMember.Name)
if (!arg.Settings.Resolvers.Any(r
=> r.DestinationMemberPath.Length == 1
&& r.DestinationMemberPath[0] == member.DestinationMember.Name)
&& member.Getter is MemberExpression memberExp && contructorMembers.Contains(memberExp.Member))
continue;

Expand Down
9 changes: 5 additions & 4 deletions src/Mapster/Adapters/DictionaryAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,16 +105,17 @@ protected override Expression CreateBlockExpression(Expression source, Expressio

//ignore mapped
var ignores = arg.Settings.Resolvers
.Select(r => r.SourceMemberName)
.Where(name => name != null)
.Select(r => r.SourceMemberPath)
.Where(path => path != null)
.Select(path => path![0])
.ToHashSet();

//ignore
var ignoreIfs = new Dictionary<string, Expression>();
foreach (var ignore in arg.Settings.Ignore)
{
if (ignore.Value.Condition == null)
ignores.Add(ignore.Key);
ignores.Add(ignore.Key[0]);
else
{
var body = ignore.Value.IsChildPath
Expand All@@ -123,7 +124,7 @@ protected override Expression CreateBlockExpression(Expression source, Expressio
var setWithCondition = Expression.IfThen(
ExpressionEx.Not(body),
set);
ignoreIfs.Add(ignore.Key, setWithCondition);
ignoreIfs.Add(ignore.Key[0], setWithCondition);
}
}

Expand Down
4 changes: 3 additions & 1 deletion src/Mapster/Adapters/RecordTypeAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,9 @@ protected override Expression CreateInlineExpression(Expression source, CompileA
if (member.UseDestinationValue)
return null;

if (!arg.Settings.Resolvers.Any(r => r.DestinationMemberName == member.DestinationMember.Name)
if (!arg.Settings.Resolvers.Any(r
=> r.DestinationMemberPath.Length == 1
&& r.DestinationMemberPath[0] == member.DestinationMember.Name)
&& member.Getter is MemberExpression memberExp && contructorMembers.Contains(memberExp.Member))
continue;

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Feature: Allow for mapping properties containing periods by JMolenkamp · Pull Request #777 · MapsterMapper/Mapster · GitHub
Skip to content
Closed
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
298 changes: 298 additions & 0 deletions src/Mapster.Tests/WhenMappingMemberNameContainingPeriod.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,298 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using System.Reflection.Emit;
using System.Runtime.CompilerServices;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Shouldly;

namespace Mapster.Tests;

[TestClass]
public class WhenMappingMemberNameContainingPeriod
{
private const string MemberName = "Some.Property.With.Periods";

[TestMethod]
public void Property_Name_Containing_Periods_Is_Supported()
{
// Create a target type with a property that contains periods
Type targetType = new TestTypeBuilder()
.AddProperty<int>(MemberName)
.CreateType();

// Call the local function defined below, the actual test method
CallStaticLocalTestMethod(
nameof(Test),
new Type[] { targetType });

// The actual test method adapting Source to the target type and back to the source to verify mapping the property with periods
static void Test<TTarget>()
{
// Get expression for mapping the property with periods
Expression<Func<TTarget, int>> getPropertyExpression = BuildGetPropertyExpression<TTarget, int>(MemberName);

// Create the config
TypeAdapterConfig<Source, TTarget>
.NewConfig()
.TwoWays()
.Map(getPropertyExpression, src => src.Value);

// Execute the mapping both ways
Source source = new() { Value = 551 };
TTarget target = source.Adapt<TTarget>();
Source adaptedSource = target.Adapt<Source>();

Assert.AreEqual(source.Value, adaptedSource.Value);
}
}

[TestMethod]
public void Constructor_Parameter_Name_Containing_Periods_Is_Supported()
{
// Create a target type with a property that contains periods
Type targetTypeWithProperty = new TestTypeBuilder()
.AddProperty<int>(MemberName)
.CreateType();

// Create a target type with a constructor parameter that contains periods
Type targetTypeWithConstructor = new TestTypeBuilder()
.AddConstructorWithReadOnlyProperty<int>(MemberName)
.CreateType();

// Call the local function defined below, the actual test method
CallStaticLocalTestMethod(
nameof(Test),
new Type[] { targetTypeWithProperty, targetTypeWithConstructor });

// The actual test method
static void Test<TWithProperty, TWithConstructor>()
where TWithProperty : new()
{
// Create the config
TypeAdapterConfig<TWithProperty, TWithConstructor>
.NewConfig()
.TwoWays()
.MapToConstructor(true);

// Create delegate for setting the property value on TWithProperty
Expression<Action<TWithProperty, int>> setPropertyExpression = BuildSetPropertyExpression<TWithProperty, int>(MemberName);
Action<TWithProperty, int> setProperty = setPropertyExpression.Compile();

// Create the source object
int value = 551;
TWithProperty source = new();
setProperty.Invoke(source, value);

// Map
TWithConstructor target = source.Adapt<TWithConstructor>();
TWithProperty adaptedSource = target.Adapt<TWithProperty>();

// Create delegate for getting the property from TWithProperty
Expression<Func<TWithProperty, int>> getPropertyExpression = BuildGetPropertyExpression<TWithProperty, int>(MemberName);
Func<TWithProperty, int> getProperty = getPropertyExpression.Compile();

// Verify
Assert.AreEqual(value, getProperty.Invoke(adaptedSource));
}
}

[TestMethod]
public void Using_Property_Path_String_Is_Supported()
Comment thread
DocSvartz marked this conversation as resolved.
{
// Create a target type with a property that contains periods
Type targetType = new TestTypeBuilder()
.AddProperty<int>(MemberName)
.CreateType();

// Create the config, both ways
TypeAdapterConfig
.GlobalSettings
.NewConfig(typeof(Source), targetType)
.Map(MemberName, nameof(Source.Value));
TypeAdapterConfig
.GlobalSettings
.NewConfig(targetType, typeof(Source))
.Map(nameof(Source.Value), MemberName);

// Execute the mapping both ways
Source source = new() { Value = 551 };
object target = source.Adapt(typeof(Source), targetType);
Comment thread
DocSvartz marked this conversation as resolved.
Source adaptedSource = target.Adapt<Source>();

Assert.AreEqual(source.Value, adaptedSource.Value);
}

[TestMethod]
public void Object_To_Dictionary_Map()
{
var poco = new SimplePoco
{
Id = Guid.NewGuid(),
Name = "test",
};

var config = new TypeAdapterConfig();
config.NewConfig<SimplePoco, Dictionary<string, object>>()
.Map(MemberName, c => c.Id);
var dict = poco.Adapt<Dictionary<string, object>>(config);

dict.Count.ShouldBe(2);
dict[MemberName].ShouldBe(poco.Id);
dict["Name"].ShouldBe(poco.Name);
}

private static void CallStaticLocalTestMethod(string methodName, Type[] genericArguments, [CallerMemberName] string caller = "Unknown")
{
MethodInfo genericMethodInfo = typeof(WhenMappingMemberNameContainingPeriod)
.GetMethods(BindingFlags.NonPublic | BindingFlags.Static)
.Single(x => x.Name.Contains($"<{caller}>") && x.Name.Contains(methodName));

MethodInfo method = genericMethodInfo.MakeGenericMethod(genericArguments);

method.Invoke(null, null);
}

private static Expression<Func<T, TProperty>> BuildGetPropertyExpression<T, TProperty>(string propertyName)
{
ParameterExpression param = Expression.Parameter(typeof(T), "x");
MemberExpression property = Expression.Property(param, propertyName);
return Expression.Lambda<Func<T, TProperty>>(property, param);
}

private static Expression<Action<T, TProperty>> BuildSetPropertyExpression<T, TProperty>(string propertyName)
{
ParameterExpression param = Expression.Parameter(typeof(T), "x");
ParameterExpression value = Expression.Parameter(typeof(TProperty), "value");
MemberExpression property = Expression.Property(param, propertyName);
BinaryExpression assign = Expression.Assign(property, value);
return Expression.Lambda<Action<T, TProperty>>(assign, param, value);
}

private class Source
{
public int Value { get; set; }
}

private class TestTypeBuilder
{
private readonly TypeBuilder _typeBuilder;

public TestTypeBuilder()
{
AssemblyBuilder assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(
new AssemblyName("Types"),
AssemblyBuilderAccess.Run);
ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule("<Module>");
_typeBuilder = moduleBuilder.DefineType(
"Types.Target",
TypeAttributes.Public |
TypeAttributes.Class |
TypeAttributes.Sealed |
TypeAttributes.AutoClass |
TypeAttributes.AnsiClass |
TypeAttributes.BeforeFieldInit |
TypeAttributes.AutoLayout,
null);
}

public TestTypeBuilder AddConstructorWithReadOnlyProperty<TParameter>(string parameterName)
{
// Add read-only property
FieldBuilder fieldBuilder = AddProperty<TParameter>(parameterName, false);

// Build the constructor with the parameter for the property
ConstructorBuilder constructorBuilder = _typeBuilder.DefineConstructor(
MethodAttributes.Public,
CallingConventions.Standard,
new Type[] { typeof(TParameter) });

// Define the parameter name
constructorBuilder.DefineParameter(1, ParameterAttributes.None, MemberName);

ILGenerator constructorIL = constructorBuilder.GetILGenerator();

// Call the base class constructor
constructorIL.Emit(OpCodes.Ldarg_0);
constructorIL.Emit(OpCodes.Call, typeof(object).GetConstructor(Type.EmptyTypes));

// Set the property value
constructorIL.Emit(OpCodes.Ldarg_0);
constructorIL.Emit(OpCodes.Ldarg_1);
constructorIL.Emit(OpCodes.Stfld, fieldBuilder);

constructorIL.Emit(OpCodes.Ret);

return this;
}

public TestTypeBuilder AddProperty<T>(string propertyName)
{
AddProperty<T>(propertyName, true);
return this;
}

private FieldBuilder AddProperty<T>(string propertyName, bool addSetter)
{
Type propertyType = typeof(T);
FieldBuilder fieldBuilder = _typeBuilder.DefineField($"_{propertyName}", propertyType, FieldAttributes.Private);
PropertyBuilder propertyBuilder = _typeBuilder.DefineProperty(propertyName, PropertyAttributes.None, propertyType, null);

AddGetMethod(_typeBuilder, propertyBuilder, fieldBuilder, propertyName, propertyType);
if (addSetter)
{
AddSetMethod(_typeBuilder, propertyBuilder, fieldBuilder, propertyName, propertyType);
}

return fieldBuilder;
}

public Type CreateType() => _typeBuilder.CreateType();

private static PropertyBuilder AddGetMethod(TypeBuilder typeBuilder, PropertyBuilder propertyBuilder, FieldBuilder fieldBuilder, string propertyName, Type propertyType)
{
MethodBuilder getMethodBuilder = typeBuilder.DefineMethod(
"get_" + propertyName,
MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.HideBySig,
propertyType,
Type.EmptyTypes);
ILGenerator getMethodGenerator = getMethodBuilder.GetILGenerator();

getMethodGenerator.Emit(OpCodes.Ldarg_0);
getMethodGenerator.Emit(OpCodes.Ldfld, fieldBuilder);
getMethodGenerator.Emit(OpCodes.Ret);

propertyBuilder.SetGetMethod(getMethodBuilder);

return propertyBuilder;
}

private static PropertyBuilder AddSetMethod(TypeBuilder typeBuilder, PropertyBuilder propertyBuilder, FieldBuilder fieldBuilder, string propertyName, Type propertyType)
{
MethodBuilder setMethodBuilder = typeBuilder.DefineMethod(
$"set_{propertyName}",
MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.HideBySig,
null,
new Type[] { propertyType });

ILGenerator setMethodGenerator = setMethodBuilder.GetILGenerator();
Label modifyProperty = setMethodGenerator.DefineLabel();
Label exitSet = setMethodGenerator.DefineLabel();

setMethodGenerator.MarkLabel(modifyProperty);
setMethodGenerator.Emit(OpCodes.Ldarg_0);
setMethodGenerator.Emit(OpCodes.Ldarg_1);
setMethodGenerator.Emit(OpCodes.Stfld, fieldBuilder);

setMethodGenerator.Emit(OpCodes.Nop);
setMethodGenerator.MarkLabel(exitSet);
setMethodGenerator.Emit(OpCodes.Ret);

propertyBuilder.SetSetMethod(setMethodBuilder);

return propertyBuilder;
}
}
}
6 changes: 3 additions & 3 deletions src/Mapster.Tool/Program.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ private static void GenerateMappers(MapperOptions opt)
// This way when we compare attribute types (such as MapperAttribute) between our running assembly
// and the scanned assembly the two types with the same FullName can be considered equal because
// they both were resolved from AssemblyLoadContext.Default.

// This isolated Assembly Load Context will be able to resolve the Mapster assembly, but
// the resolved Assembly will be the same one that is in AssemblyLoadContext.Default
// (the runtime assembly load context that our code refers to by default when referencing
Expand DownExpand Up@@ -461,8 +461,8 @@ Dictionary<string, PropertySetting> settings
setter.Settings.Resolvers.Add(
new InvokerModel
{
DestinationMemberName = setting.TargetPropertyName ?? name,
SourceMemberName = name,
DestinationMemberPath = (setting.TargetPropertyName ?? name).Split('.'),
SourceMemberPath = name.Split('.'),
Invoker = setting.MapFunc,
}
);
Expand Down
4 changes: 2 additions & 2 deletions src/Mapster/Adapters/BaseClassAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ protected ClassMapping CreateClassConverter(Expression source, ClassModel classM
arg.Settings.ExtraSources.Select(src =>
src is LambdaExpression lambda
? lambda.Apply(arg.MapType, source)
: ExpressionEx.PropertyOrFieldPath(source, (string)src)));
: ExpressionEx.PropertyOrFieldPath(source, (string[])src)));
foreach (var destinationMember in destinationMembers)
{
if (ProcessIgnores(arg, destinationMember, out var ignore))
Expand DownExpand Up@@ -124,7 +124,7 @@ protected static bool ProcessIgnores(
if (!destinationMember.ShouldMapMember(arg, MemberSide.Destination))
return true;

return arg.Settings.Ignore.TryGetValue(destinationMember.Name, out ignore)
return arg.Settings.Ignore.TryGetValue(new[] { destinationMember.Name }, out ignore)
&& ignore.Condition == null;
}

Expand Down
4 changes: 3 additions & 1 deletion src/Mapster/Adapters/ClassAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,7 +214,9 @@ private static Expression SetValueByReflection(MemberMapping member, MemberExpre
if (member.UseDestinationValue)
return null;

if (!arg.Settings.Resolvers.Any(r => r.DestinationMemberName == member.DestinationMember.Name)
if (!arg.Settings.Resolvers.Any(r
=> r.DestinationMemberPath.Length == 1
&& r.DestinationMemberPath[0] == member.DestinationMember.Name)
&& member.Getter is MemberExpression memberExp && contructorMembers.Contains(memberExp.Member))
continue;

Expand Down
9 changes: 5 additions & 4 deletions src/Mapster/Adapters/DictionaryAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,16 +105,17 @@ protected override Expression CreateBlockExpression(Expression source, Expressio

//ignore mapped
var ignores = arg.Settings.Resolvers
.Select(r => r.SourceMemberName)
.Where(name => name != null)
.Select(r => r.SourceMemberPath)
.Where(path => path != null)
.Select(path => path![0])
.ToHashSet();

//ignore
var ignoreIfs = new Dictionary<string, Expression>();
foreach (var ignore in arg.Settings.Ignore)
{
if (ignore.Value.Condition == null)
ignores.Add(ignore.Key);
ignores.Add(ignore.Key[0]);
else
{
var body = ignore.Value.IsChildPath
Expand All@@ -123,7 +124,7 @@ protected override Expression CreateBlockExpression(Expression source, Expressio
var setWithCondition = Expression.IfThen(
ExpressionEx.Not(body),
set);
ignoreIfs.Add(ignore.Key, setWithCondition);
ignoreIfs.Add(ignore.Key[0], setWithCondition);
}
}

Expand Down
4 changes: 3 additions & 1 deletion src/Mapster/Adapters/RecordTypeAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,9 @@ protected override Expression CreateInlineExpression(Expression source, CompileA
if (member.UseDestinationValue)
return null;

if (!arg.Settings.Resolvers.Any(r => r.DestinationMemberName == member.DestinationMember.Name)
if (!arg.Settings.Resolvers.Any(r
=> r.DestinationMemberPath.Length == 1
&& r.DestinationMemberPath[0] == member.DestinationMember.Name)
&& member.Getter is MemberExpression memberExp && contructorMembers.Contains(memberExp.Member))
continue;

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Feature: Allow for mapping properties containing periods by JMolenkamp · Pull Request #777 · MapsterMapper/Mapster · GitHub
Skip to content
Closed
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
298 changes: 298 additions & 0 deletions src/Mapster.Tests/WhenMappingMemberNameContainingPeriod.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,298 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using System.Reflection.Emit;
using System.Runtime.CompilerServices;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Shouldly;

namespace Mapster.Tests;

[TestClass]
public class WhenMappingMemberNameContainingPeriod
{
private const string MemberName = "Some.Property.With.Periods";

[TestMethod]
public void Property_Name_Containing_Periods_Is_Supported()
{
// Create a target type with a property that contains periods
Type targetType = new TestTypeBuilder()
.AddProperty<int>(MemberName)
.CreateType();

// Call the local function defined below, the actual test method
CallStaticLocalTestMethod(
nameof(Test),
new Type[] { targetType });

// The actual test method adapting Source to the target type and back to the source to verify mapping the property with periods
static void Test<TTarget>()
{
// Get expression for mapping the property with periods
Expression<Func<TTarget, int>> getPropertyExpression = BuildGetPropertyExpression<TTarget, int>(MemberName);

// Create the config
TypeAdapterConfig<Source, TTarget>
.NewConfig()
.TwoWays()
.Map(getPropertyExpression, src => src.Value);

// Execute the mapping both ways
Source source = new() { Value = 551 };
TTarget target = source.Adapt<TTarget>();
Source adaptedSource = target.Adapt<Source>();

Assert.AreEqual(source.Value, adaptedSource.Value);
}
}

[TestMethod]
public void Constructor_Parameter_Name_Containing_Periods_Is_Supported()
{
// Create a target type with a property that contains periods
Type targetTypeWithProperty = new TestTypeBuilder()
.AddProperty<int>(MemberName)
.CreateType();

// Create a target type with a constructor parameter that contains periods
Type targetTypeWithConstructor = new TestTypeBuilder()
.AddConstructorWithReadOnlyProperty<int>(MemberName)
.CreateType();

// Call the local function defined below, the actual test method
CallStaticLocalTestMethod(
nameof(Test),
new Type[] { targetTypeWithProperty, targetTypeWithConstructor });

// The actual test method
static void Test<TWithProperty, TWithConstructor>()
where TWithProperty : new()
{
// Create the config
TypeAdapterConfig<TWithProperty, TWithConstructor>
.NewConfig()
.TwoWays()
.MapToConstructor(true);

// Create delegate for setting the property value on TWithProperty
Expression<Action<TWithProperty, int>> setPropertyExpression = BuildSetPropertyExpression<TWithProperty, int>(MemberName);
Action<TWithProperty, int> setProperty = setPropertyExpression.Compile();

// Create the source object
int value = 551;
TWithProperty source = new();
setProperty.Invoke(source, value);

// Map
TWithConstructor target = source.Adapt<TWithConstructor>();
TWithProperty adaptedSource = target.Adapt<TWithProperty>();

// Create delegate for getting the property from TWithProperty
Expression<Func<TWithProperty, int>> getPropertyExpression = BuildGetPropertyExpression<TWithProperty, int>(MemberName);
Func<TWithProperty, int> getProperty = getPropertyExpression.Compile();

// Verify
Assert.AreEqual(value, getProperty.Invoke(adaptedSource));
}
}

[TestMethod]
public void Using_Property_Path_String_Is_Supported()
Comment thread
DocSvartz marked this conversation as resolved.
{
// Create a target type with a property that contains periods
Type targetType = new TestTypeBuilder()
.AddProperty<int>(MemberName)
.CreateType();

// Create the config, both ways
TypeAdapterConfig
.GlobalSettings
.NewConfig(typeof(Source), targetType)
.Map(MemberName, nameof(Source.Value));
TypeAdapterConfig
.GlobalSettings
.NewConfig(targetType, typeof(Source))
.Map(nameof(Source.Value), MemberName);

// Execute the mapping both ways
Source source = new() { Value = 551 };
object target = source.Adapt(typeof(Source), targetType);
Comment thread
DocSvartz marked this conversation as resolved.
Source adaptedSource = target.Adapt<Source>();

Assert.AreEqual(source.Value, adaptedSource.Value);
}

[TestMethod]
public void Object_To_Dictionary_Map()
{
var poco = new SimplePoco
{
Id = Guid.NewGuid(),
Name = "test",
};

var config = new TypeAdapterConfig();
config.NewConfig<SimplePoco, Dictionary<string, object>>()
.Map(MemberName, c => c.Id);
var dict = poco.Adapt<Dictionary<string, object>>(config);

dict.Count.ShouldBe(2);
dict[MemberName].ShouldBe(poco.Id);
dict["Name"].ShouldBe(poco.Name);
}

private static void CallStaticLocalTestMethod(string methodName, Type[] genericArguments, [CallerMemberName] string caller = "Unknown")
{
MethodInfo genericMethodInfo = typeof(WhenMappingMemberNameContainingPeriod)
.GetMethods(BindingFlags.NonPublic | BindingFlags.Static)
.Single(x => x.Name.Contains($"<{caller}>") && x.Name.Contains(methodName));

MethodInfo method = genericMethodInfo.MakeGenericMethod(genericArguments);

method.Invoke(null, null);
}

private static Expression<Func<T, TProperty>> BuildGetPropertyExpression<T, TProperty>(string propertyName)
{
ParameterExpression param = Expression.Parameter(typeof(T), "x");
MemberExpression property = Expression.Property(param, propertyName);
return Expression.Lambda<Func<T, TProperty>>(property, param);
}

private static Expression<Action<T, TProperty>> BuildSetPropertyExpression<T, TProperty>(string propertyName)
{
ParameterExpression param = Expression.Parameter(typeof(T), "x");
ParameterExpression value = Expression.Parameter(typeof(TProperty), "value");
MemberExpression property = Expression.Property(param, propertyName);
BinaryExpression assign = Expression.Assign(property, value);
return Expression.Lambda<Action<T, TProperty>>(assign, param, value);
}

private class Source
{
public int Value { get; set; }
}

private class TestTypeBuilder
{
private readonly TypeBuilder _typeBuilder;

public TestTypeBuilder()
{
AssemblyBuilder assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(
new AssemblyName("Types"),
AssemblyBuilderAccess.Run);
ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule("<Module>");
_typeBuilder = moduleBuilder.DefineType(
"Types.Target",
TypeAttributes.Public |
TypeAttributes.Class |
TypeAttributes.Sealed |
TypeAttributes.AutoClass |
TypeAttributes.AnsiClass |
TypeAttributes.BeforeFieldInit |
TypeAttributes.AutoLayout,
null);
}

public TestTypeBuilder AddConstructorWithReadOnlyProperty<TParameter>(string parameterName)
{
// Add read-only property
FieldBuilder fieldBuilder = AddProperty<TParameter>(parameterName, false);

// Build the constructor with the parameter for the property
ConstructorBuilder constructorBuilder = _typeBuilder.DefineConstructor(
MethodAttributes.Public,
CallingConventions.Standard,
new Type[] { typeof(TParameter) });

// Define the parameter name
constructorBuilder.DefineParameter(1, ParameterAttributes.None, MemberName);

ILGenerator constructorIL = constructorBuilder.GetILGenerator();

// Call the base class constructor
constructorIL.Emit(OpCodes.Ldarg_0);
constructorIL.Emit(OpCodes.Call, typeof(object).GetConstructor(Type.EmptyTypes));

// Set the property value
constructorIL.Emit(OpCodes.Ldarg_0);
constructorIL.Emit(OpCodes.Ldarg_1);
constructorIL.Emit(OpCodes.Stfld, fieldBuilder);

constructorIL.Emit(OpCodes.Ret);

return this;
}

public TestTypeBuilder AddProperty<T>(string propertyName)
{
AddProperty<T>(propertyName, true);
return this;
}

private FieldBuilder AddProperty<T>(string propertyName, bool addSetter)
{
Type propertyType = typeof(T);
FieldBuilder fieldBuilder = _typeBuilder.DefineField($"_{propertyName}", propertyType, FieldAttributes.Private);
PropertyBuilder propertyBuilder = _typeBuilder.DefineProperty(propertyName, PropertyAttributes.None, propertyType, null);

AddGetMethod(_typeBuilder, propertyBuilder, fieldBuilder, propertyName, propertyType);
if (addSetter)
{
AddSetMethod(_typeBuilder, propertyBuilder, fieldBuilder, propertyName, propertyType);
}

return fieldBuilder;
}

public Type CreateType() => _typeBuilder.CreateType();

private static PropertyBuilder AddGetMethod(TypeBuilder typeBuilder, PropertyBuilder propertyBuilder, FieldBuilder fieldBuilder, string propertyName, Type propertyType)
{
MethodBuilder getMethodBuilder = typeBuilder.DefineMethod(
"get_" + propertyName,
MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.HideBySig,
propertyType,
Type.EmptyTypes);
ILGenerator getMethodGenerator = getMethodBuilder.GetILGenerator();

getMethodGenerator.Emit(OpCodes.Ldarg_0);
getMethodGenerator.Emit(OpCodes.Ldfld, fieldBuilder);
getMethodGenerator.Emit(OpCodes.Ret);

propertyBuilder.SetGetMethod(getMethodBuilder);

return propertyBuilder;
}

private static PropertyBuilder AddSetMethod(TypeBuilder typeBuilder, PropertyBuilder propertyBuilder, FieldBuilder fieldBuilder, string propertyName, Type propertyType)
{
MethodBuilder setMethodBuilder = typeBuilder.DefineMethod(
$"set_{propertyName}",
MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.HideBySig,
null,
new Type[] { propertyType });

ILGenerator setMethodGenerator = setMethodBuilder.GetILGenerator();
Label modifyProperty = setMethodGenerator.DefineLabel();
Label exitSet = setMethodGenerator.DefineLabel();

setMethodGenerator.MarkLabel(modifyProperty);
setMethodGenerator.Emit(OpCodes.Ldarg_0);
setMethodGenerator.Emit(OpCodes.Ldarg_1);
setMethodGenerator.Emit(OpCodes.Stfld, fieldBuilder);

setMethodGenerator.Emit(OpCodes.Nop);
setMethodGenerator.MarkLabel(exitSet);
setMethodGenerator.Emit(OpCodes.Ret);

propertyBuilder.SetSetMethod(setMethodBuilder);

return propertyBuilder;
}
}
}
6 changes: 3 additions & 3 deletions src/Mapster.Tool/Program.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ private static void GenerateMappers(MapperOptions opt)
// This way when we compare attribute types (such as MapperAttribute) between our running assembly
// and the scanned assembly the two types with the same FullName can be considered equal because
// they both were resolved from AssemblyLoadContext.Default.

// This isolated Assembly Load Context will be able to resolve the Mapster assembly, but
// the resolved Assembly will be the same one that is in AssemblyLoadContext.Default
// (the runtime assembly load context that our code refers to by default when referencing
Expand DownExpand Up@@ -461,8 +461,8 @@ Dictionary<string, PropertySetting> settings
setter.Settings.Resolvers.Add(
new InvokerModel
{
DestinationMemberName = setting.TargetPropertyName ?? name,
SourceMemberName = name,
DestinationMemberPath = (setting.TargetPropertyName ?? name).Split('.'),
SourceMemberPath = name.Split('.'),
Invoker = setting.MapFunc,
}
);
Expand Down
4 changes: 2 additions & 2 deletions src/Mapster/Adapters/BaseClassAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ protected ClassMapping CreateClassConverter(Expression source, ClassModel classM
arg.Settings.ExtraSources.Select(src =>
src is LambdaExpression lambda
? lambda.Apply(arg.MapType, source)
: ExpressionEx.PropertyOrFieldPath(source, (string)src)));
: ExpressionEx.PropertyOrFieldPath(source, (string[])src)));
foreach (var destinationMember in destinationMembers)
{
if (ProcessIgnores(arg, destinationMember, out var ignore))
Expand DownExpand Up@@ -124,7 +124,7 @@ protected static bool ProcessIgnores(
if (!destinationMember.ShouldMapMember(arg, MemberSide.Destination))
return true;

return arg.Settings.Ignore.TryGetValue(destinationMember.Name, out ignore)
return arg.Settings.Ignore.TryGetValue(new[] { destinationMember.Name }, out ignore)
&& ignore.Condition == null;
}

Expand Down
4 changes: 3 additions & 1 deletion src/Mapster/Adapters/ClassAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,7 +214,9 @@ private static Expression SetValueByReflection(MemberMapping member, MemberExpre
if (member.UseDestinationValue)
return null;

if (!arg.Settings.Resolvers.Any(r => r.DestinationMemberName == member.DestinationMember.Name)
if (!arg.Settings.Resolvers.Any(r
=> r.DestinationMemberPath.Length == 1
&& r.DestinationMemberPath[0] == member.DestinationMember.Name)
&& member.Getter is MemberExpression memberExp && contructorMembers.Contains(memberExp.Member))
continue;

Expand Down
9 changes: 5 additions & 4 deletions src/Mapster/Adapters/DictionaryAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,16 +105,17 @@ protected override Expression CreateBlockExpression(Expression source, Expressio

//ignore mapped
var ignores = arg.Settings.Resolvers
.Select(r => r.SourceMemberName)
.Where(name => name != null)
.Select(r => r.SourceMemberPath)
.Where(path => path != null)
.Select(path => path![0])
.ToHashSet();

//ignore
var ignoreIfs = new Dictionary<string, Expression>();
foreach (var ignore in arg.Settings.Ignore)
{
if (ignore.Value.Condition == null)
ignores.Add(ignore.Key);
ignores.Add(ignore.Key[0]);
else
{
var body = ignore.Value.IsChildPath
Expand All@@ -123,7 +124,7 @@ protected override Expression CreateBlockExpression(Expression source, Expressio
var setWithCondition = Expression.IfThen(
ExpressionEx.Not(body),
set);
ignoreIfs.Add(ignore.Key, setWithCondition);
ignoreIfs.Add(ignore.Key[0], setWithCondition);
}
}

Expand Down
4 changes: 3 additions & 1 deletion src/Mapster/Adapters/RecordTypeAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,9 @@ protected override Expression CreateInlineExpression(Expression source, CompileA
if (member.UseDestinationValue)
return null;

if (!arg.Settings.Resolvers.Any(r => r.DestinationMemberName == member.DestinationMember.Name)
if (!arg.Settings.Resolvers.Any(r
=> r.DestinationMemberPath.Length == 1
&& r.DestinationMemberPath[0] == member.DestinationMember.Name)
&& member.Getter is MemberExpression memberExp && contructorMembers.Contains(memberExp.Member))
continue;

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Feature: Allow for mapping properties containing periods by JMolenkamp · Pull Request #777 · MapsterMapper/Mapster · GitHub
Skip to content
Closed
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
298 changes: 298 additions & 0 deletions src/Mapster.Tests/WhenMappingMemberNameContainingPeriod.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,298 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using System.Reflection.Emit;
using System.Runtime.CompilerServices;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Shouldly;

namespace Mapster.Tests;

[TestClass]
public class WhenMappingMemberNameContainingPeriod
{
private const string MemberName = "Some.Property.With.Periods";

[TestMethod]
public void Property_Name_Containing_Periods_Is_Supported()
{
// Create a target type with a property that contains periods
Type targetType = new TestTypeBuilder()
.AddProperty<int>(MemberName)
.CreateType();

// Call the local function defined below, the actual test method
CallStaticLocalTestMethod(
nameof(Test),
new Type[] { targetType });

// The actual test method adapting Source to the target type and back to the source to verify mapping the property with periods
static void Test<TTarget>()
{
// Get expression for mapping the property with periods
Expression<Func<TTarget, int>> getPropertyExpression = BuildGetPropertyExpression<TTarget, int>(MemberName);

// Create the config
TypeAdapterConfig<Source, TTarget>
.NewConfig()
.TwoWays()
.Map(getPropertyExpression, src => src.Value);

// Execute the mapping both ways
Source source = new() { Value = 551 };
TTarget target = source.Adapt<TTarget>();
Source adaptedSource = target.Adapt<Source>();

Assert.AreEqual(source.Value, adaptedSource.Value);
}
}

[TestMethod]
public void Constructor_Parameter_Name_Containing_Periods_Is_Supported()
{
// Create a target type with a property that contains periods
Type targetTypeWithProperty = new TestTypeBuilder()
.AddProperty<int>(MemberName)
.CreateType();

// Create a target type with a constructor parameter that contains periods
Type targetTypeWithConstructor = new TestTypeBuilder()
.AddConstructorWithReadOnlyProperty<int>(MemberName)
.CreateType();

// Call the local function defined below, the actual test method
CallStaticLocalTestMethod(
nameof(Test),
new Type[] { targetTypeWithProperty, targetTypeWithConstructor });

// The actual test method
static void Test<TWithProperty, TWithConstructor>()
where TWithProperty : new()
{
// Create the config
TypeAdapterConfig<TWithProperty, TWithConstructor>
.NewConfig()
.TwoWays()
.MapToConstructor(true);

// Create delegate for setting the property value on TWithProperty
Expression<Action<TWithProperty, int>> setPropertyExpression = BuildSetPropertyExpression<TWithProperty, int>(MemberName);
Action<TWithProperty, int> setProperty = setPropertyExpression.Compile();

// Create the source object
int value = 551;
TWithProperty source = new();
setProperty.Invoke(source, value);

// Map
TWithConstructor target = source.Adapt<TWithConstructor>();
TWithProperty adaptedSource = target.Adapt<TWithProperty>();

// Create delegate for getting the property from TWithProperty
Expression<Func<TWithProperty, int>> getPropertyExpression = BuildGetPropertyExpression<TWithProperty, int>(MemberName);
Func<TWithProperty, int> getProperty = getPropertyExpression.Compile();

// Verify
Assert.AreEqual(value, getProperty.Invoke(adaptedSource));
}
}

[TestMethod]
public void Using_Property_Path_String_Is_Supported()
Comment thread
DocSvartz marked this conversation as resolved.
{
// Create a target type with a property that contains periods
Type targetType = new TestTypeBuilder()
.AddProperty<int>(MemberName)
.CreateType();

// Create the config, both ways
TypeAdapterConfig
.GlobalSettings
.NewConfig(typeof(Source), targetType)
.Map(MemberName, nameof(Source.Value));
TypeAdapterConfig
.GlobalSettings
.NewConfig(targetType, typeof(Source))
.Map(nameof(Source.Value), MemberName);

// Execute the mapping both ways
Source source = new() { Value = 551 };
object target = source.Adapt(typeof(Source), targetType);
Comment thread
DocSvartz marked this conversation as resolved.
Source adaptedSource = target.Adapt<Source>();

Assert.AreEqual(source.Value, adaptedSource.Value);
}

[TestMethod]
public void Object_To_Dictionary_Map()
{
var poco = new SimplePoco
{
Id = Guid.NewGuid(),
Name = "test",
};

var config = new TypeAdapterConfig();
config.NewConfig<SimplePoco, Dictionary<string, object>>()
.Map(MemberName, c => c.Id);
var dict = poco.Adapt<Dictionary<string, object>>(config);

dict.Count.ShouldBe(2);
dict[MemberName].ShouldBe(poco.Id);
dict["Name"].ShouldBe(poco.Name);
}

private static void CallStaticLocalTestMethod(string methodName, Type[] genericArguments, [CallerMemberName] string caller = "Unknown")
{
MethodInfo genericMethodInfo = typeof(WhenMappingMemberNameContainingPeriod)
.GetMethods(BindingFlags.NonPublic | BindingFlags.Static)
.Single(x => x.Name.Contains($"<{caller}>") && x.Name.Contains(methodName));

MethodInfo method = genericMethodInfo.MakeGenericMethod(genericArguments);

method.Invoke(null, null);
}

private static Expression<Func<T, TProperty>> BuildGetPropertyExpression<T, TProperty>(string propertyName)
{
ParameterExpression param = Expression.Parameter(typeof(T), "x");
MemberExpression property = Expression.Property(param, propertyName);
return Expression.Lambda<Func<T, TProperty>>(property, param);
}

private static Expression<Action<T, TProperty>> BuildSetPropertyExpression<T, TProperty>(string propertyName)
{
ParameterExpression param = Expression.Parameter(typeof(T), "x");
ParameterExpression value = Expression.Parameter(typeof(TProperty), "value");
MemberExpression property = Expression.Property(param, propertyName);
BinaryExpression assign = Expression.Assign(property, value);
return Expression.Lambda<Action<T, TProperty>>(assign, param, value);
}

private class Source
{
public int Value { get; set; }
}

private class TestTypeBuilder
{
private readonly TypeBuilder _typeBuilder;

public TestTypeBuilder()
{
AssemblyBuilder assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(
new AssemblyName("Types"),
AssemblyBuilderAccess.Run);
ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule("<Module>");
_typeBuilder = moduleBuilder.DefineType(
"Types.Target",
TypeAttributes.Public |
TypeAttributes.Class |
TypeAttributes.Sealed |
TypeAttributes.AutoClass |
TypeAttributes.AnsiClass |
TypeAttributes.BeforeFieldInit |
TypeAttributes.AutoLayout,
null);
}

public TestTypeBuilder AddConstructorWithReadOnlyProperty<TParameter>(string parameterName)
{
// Add read-only property
FieldBuilder fieldBuilder = AddProperty<TParameter>(parameterName, false);

// Build the constructor with the parameter for the property
ConstructorBuilder constructorBuilder = _typeBuilder.DefineConstructor(
MethodAttributes.Public,
CallingConventions.Standard,
new Type[] { typeof(TParameter) });

// Define the parameter name
constructorBuilder.DefineParameter(1, ParameterAttributes.None, MemberName);

ILGenerator constructorIL = constructorBuilder.GetILGenerator();

// Call the base class constructor
constructorIL.Emit(OpCodes.Ldarg_0);
constructorIL.Emit(OpCodes.Call, typeof(object).GetConstructor(Type.EmptyTypes));

// Set the property value
constructorIL.Emit(OpCodes.Ldarg_0);
constructorIL.Emit(OpCodes.Ldarg_1);
constructorIL.Emit(OpCodes.Stfld, fieldBuilder);

constructorIL.Emit(OpCodes.Ret);

return this;
}

public TestTypeBuilder AddProperty<T>(string propertyName)
{
AddProperty<T>(propertyName, true);
return this;
}

private FieldBuilder AddProperty<T>(string propertyName, bool addSetter)
{
Type propertyType = typeof(T);
FieldBuilder fieldBuilder = _typeBuilder.DefineField($"_{propertyName}", propertyType, FieldAttributes.Private);
PropertyBuilder propertyBuilder = _typeBuilder.DefineProperty(propertyName, PropertyAttributes.None, propertyType, null);

AddGetMethod(_typeBuilder, propertyBuilder, fieldBuilder, propertyName, propertyType);
if (addSetter)
{
AddSetMethod(_typeBuilder, propertyBuilder, fieldBuilder, propertyName, propertyType);
}

return fieldBuilder;
}

public Type CreateType() => _typeBuilder.CreateType();

private static PropertyBuilder AddGetMethod(TypeBuilder typeBuilder, PropertyBuilder propertyBuilder, FieldBuilder fieldBuilder, string propertyName, Type propertyType)
{
MethodBuilder getMethodBuilder = typeBuilder.DefineMethod(
"get_" + propertyName,
MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.HideBySig,
propertyType,
Type.EmptyTypes);
ILGenerator getMethodGenerator = getMethodBuilder.GetILGenerator();

getMethodGenerator.Emit(OpCodes.Ldarg_0);
getMethodGenerator.Emit(OpCodes.Ldfld, fieldBuilder);
getMethodGenerator.Emit(OpCodes.Ret);

propertyBuilder.SetGetMethod(getMethodBuilder);

return propertyBuilder;
}

private static PropertyBuilder AddSetMethod(TypeBuilder typeBuilder, PropertyBuilder propertyBuilder, FieldBuilder fieldBuilder, string propertyName, Type propertyType)
{
MethodBuilder setMethodBuilder = typeBuilder.DefineMethod(
$"set_{propertyName}",
MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.HideBySig,
null,
new Type[] { propertyType });

ILGenerator setMethodGenerator = setMethodBuilder.GetILGenerator();
Label modifyProperty = setMethodGenerator.DefineLabel();
Label exitSet = setMethodGenerator.DefineLabel();

setMethodGenerator.MarkLabel(modifyProperty);
setMethodGenerator.Emit(OpCodes.Ldarg_0);
setMethodGenerator.Emit(OpCodes.Ldarg_1);
setMethodGenerator.Emit(OpCodes.Stfld, fieldBuilder);

setMethodGenerator.Emit(OpCodes.Nop);
setMethodGenerator.MarkLabel(exitSet);
setMethodGenerator.Emit(OpCodes.Ret);

propertyBuilder.SetSetMethod(setMethodBuilder);

return propertyBuilder;
}
}
}
6 changes: 3 additions & 3 deletions src/Mapster.Tool/Program.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ private static void GenerateMappers(MapperOptions opt)
// This way when we compare attribute types (such as MapperAttribute) between our running assembly
// and the scanned assembly the two types with the same FullName can be considered equal because
// they both were resolved from AssemblyLoadContext.Default.

// This isolated Assembly Load Context will be able to resolve the Mapster assembly, but
// the resolved Assembly will be the same one that is in AssemblyLoadContext.Default
// (the runtime assembly load context that our code refers to by default when referencing
Expand DownExpand Up@@ -461,8 +461,8 @@ Dictionary<string, PropertySetting> settings
setter.Settings.Resolvers.Add(
new InvokerModel
{
DestinationMemberName = setting.TargetPropertyName ?? name,
SourceMemberName = name,
DestinationMemberPath = (setting.TargetPropertyName ?? name).Split('.'),
SourceMemberPath = name.Split('.'),
Invoker = setting.MapFunc,
}
);
Expand Down
4 changes: 2 additions & 2 deletions src/Mapster/Adapters/BaseClassAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ protected ClassMapping CreateClassConverter(Expression source, ClassModel classM
arg.Settings.ExtraSources.Select(src =>
src is LambdaExpression lambda
? lambda.Apply(arg.MapType, source)
: ExpressionEx.PropertyOrFieldPath(source, (string)src)));
: ExpressionEx.PropertyOrFieldPath(source, (string[])src)));
foreach (var destinationMember in destinationMembers)
{
if (ProcessIgnores(arg, destinationMember, out var ignore))
Expand DownExpand Up@@ -124,7 +124,7 @@ protected static bool ProcessIgnores(
if (!destinationMember.ShouldMapMember(arg, MemberSide.Destination))
return true;

return arg.Settings.Ignore.TryGetValue(destinationMember.Name, out ignore)
return arg.Settings.Ignore.TryGetValue(new[] { destinationMember.Name }, out ignore)
&& ignore.Condition == null;
}

Expand Down
4 changes: 3 additions & 1 deletion src/Mapster/Adapters/ClassAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,7 +214,9 @@ private static Expression SetValueByReflection(MemberMapping member, MemberExpre
if (member.UseDestinationValue)
return null;

if (!arg.Settings.Resolvers.Any(r => r.DestinationMemberName == member.DestinationMember.Name)
if (!arg.Settings.Resolvers.Any(r
=> r.DestinationMemberPath.Length == 1
&& r.DestinationMemberPath[0] == member.DestinationMember.Name)
&& member.Getter is MemberExpression memberExp && contructorMembers.Contains(memberExp.Member))
continue;

Expand Down
9 changes: 5 additions & 4 deletions src/Mapster/Adapters/DictionaryAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,16 +105,17 @@ protected override Expression CreateBlockExpression(Expression source, Expressio

//ignore mapped
var ignores = arg.Settings.Resolvers
.Select(r => r.SourceMemberName)
.Where(name => name != null)
.Select(r => r.SourceMemberPath)
.Where(path => path != null)
.Select(path => path![0])
.ToHashSet();

//ignore
var ignoreIfs = new Dictionary<string, Expression>();
foreach (var ignore in arg.Settings.Ignore)
{
if (ignore.Value.Condition == null)
ignores.Add(ignore.Key);
ignores.Add(ignore.Key[0]);
else
{
var body = ignore.Value.IsChildPath
Expand All@@ -123,7 +124,7 @@ protected override Expression CreateBlockExpression(Expression source, Expressio
var setWithCondition = Expression.IfThen(
ExpressionEx.Not(body),
set);
ignoreIfs.Add(ignore.Key, setWithCondition);
ignoreIfs.Add(ignore.Key[0], setWithCondition);
}
}

Expand Down
4 changes: 3 additions & 1 deletion src/Mapster/Adapters/RecordTypeAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,9 @@ protected override Expression CreateInlineExpression(Expression source, CompileA
if (member.UseDestinationValue)
return null;

if (!arg.Settings.Resolvers.Any(r => r.DestinationMemberName == member.DestinationMember.Name)
if (!arg.Settings.Resolvers.Any(r
=> r.DestinationMemberPath.Length == 1
&& r.DestinationMemberPath[0] == member.DestinationMember.Name)
&& member.Getter is MemberExpression memberExp && contructorMembers.Contains(memberExp.Member))
continue;

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Feature: Allow for mapping properties containing periods by JMolenkamp · Pull Request #777 · MapsterMapper/Mapster · GitHub
Skip to content
Closed
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
298 changes: 298 additions & 0 deletions src/Mapster.Tests/WhenMappingMemberNameContainingPeriod.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,298 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using System.Reflection.Emit;
using System.Runtime.CompilerServices;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Shouldly;

namespace Mapster.Tests;

[TestClass]
public class WhenMappingMemberNameContainingPeriod
{
private const string MemberName = "Some.Property.With.Periods";

[TestMethod]
public void Property_Name_Containing_Periods_Is_Supported()
{
// Create a target type with a property that contains periods
Type targetType = new TestTypeBuilder()
.AddProperty<int>(MemberName)
.CreateType();

// Call the local function defined below, the actual test method
CallStaticLocalTestMethod(
nameof(Test),
new Type[] { targetType });

// The actual test method adapting Source to the target type and back to the source to verify mapping the property with periods
static void Test<TTarget>()
{
// Get expression for mapping the property with periods
Expression<Func<TTarget, int>> getPropertyExpression = BuildGetPropertyExpression<TTarget, int>(MemberName);

// Create the config
TypeAdapterConfig<Source, TTarget>
.NewConfig()
.TwoWays()
.Map(getPropertyExpression, src => src.Value);

// Execute the mapping both ways
Source source = new() { Value = 551 };
TTarget target = source.Adapt<TTarget>();
Source adaptedSource = target.Adapt<Source>();

Assert.AreEqual(source.Value, adaptedSource.Value);
}
}

[TestMethod]
public void Constructor_Parameter_Name_Containing_Periods_Is_Supported()
{
// Create a target type with a property that contains periods
Type targetTypeWithProperty = new TestTypeBuilder()
.AddProperty<int>(MemberName)
.CreateType();

// Create a target type with a constructor parameter that contains periods
Type targetTypeWithConstructor = new TestTypeBuilder()
.AddConstructorWithReadOnlyProperty<int>(MemberName)
.CreateType();

// Call the local function defined below, the actual test method
CallStaticLocalTestMethod(
nameof(Test),
new Type[] { targetTypeWithProperty, targetTypeWithConstructor });

// The actual test method
static void Test<TWithProperty, TWithConstructor>()
where TWithProperty : new()
{
// Create the config
TypeAdapterConfig<TWithProperty, TWithConstructor>
.NewConfig()
.TwoWays()
.MapToConstructor(true);

// Create delegate for setting the property value on TWithProperty
Expression<Action<TWithProperty, int>> setPropertyExpression = BuildSetPropertyExpression<TWithProperty, int>(MemberName);
Action<TWithProperty, int> setProperty = setPropertyExpression.Compile();

// Create the source object
int value = 551;
TWithProperty source = new();
setProperty.Invoke(source, value);

// Map
TWithConstructor target = source.Adapt<TWithConstructor>();
TWithProperty adaptedSource = target.Adapt<TWithProperty>();

// Create delegate for getting the property from TWithProperty
Expression<Func<TWithProperty, int>> getPropertyExpression = BuildGetPropertyExpression<TWithProperty, int>(MemberName);
Func<TWithProperty, int> getProperty = getPropertyExpression.Compile();

// Verify
Assert.AreEqual(value, getProperty.Invoke(adaptedSource));
}
}

[TestMethod]
public void Using_Property_Path_String_Is_Supported()
Comment thread
DocSvartz marked this conversation as resolved.
{
// Create a target type with a property that contains periods
Type targetType = new TestTypeBuilder()
.AddProperty<int>(MemberName)
.CreateType();

// Create the config, both ways
TypeAdapterConfig
.GlobalSettings
.NewConfig(typeof(Source), targetType)
.Map(MemberName, nameof(Source.Value));
TypeAdapterConfig
.GlobalSettings
.NewConfig(targetType, typeof(Source))
.Map(nameof(Source.Value), MemberName);

// Execute the mapping both ways
Source source = new() { Value = 551 };
object target = source.Adapt(typeof(Source), targetType);
Comment thread
DocSvartz marked this conversation as resolved.
Source adaptedSource = target.Adapt<Source>();

Assert.AreEqual(source.Value, adaptedSource.Value);
}

[TestMethod]
public void Object_To_Dictionary_Map()
{
var poco = new SimplePoco
{
Id = Guid.NewGuid(),
Name = "test",
};

var config = new TypeAdapterConfig();
config.NewConfig<SimplePoco, Dictionary<string, object>>()
.Map(MemberName, c => c.Id);
var dict = poco.Adapt<Dictionary<string, object>>(config);

dict.Count.ShouldBe(2);
dict[MemberName].ShouldBe(poco.Id);
dict["Name"].ShouldBe(poco.Name);
}

private static void CallStaticLocalTestMethod(string methodName, Type[] genericArguments, [CallerMemberName] string caller = "Unknown")
{
MethodInfo genericMethodInfo = typeof(WhenMappingMemberNameContainingPeriod)
.GetMethods(BindingFlags.NonPublic | BindingFlags.Static)
.Single(x => x.Name.Contains($"<{caller}>") && x.Name.Contains(methodName));

MethodInfo method = genericMethodInfo.MakeGenericMethod(genericArguments);

method.Invoke(null, null);
}

private static Expression<Func<T, TProperty>> BuildGetPropertyExpression<T, TProperty>(string propertyName)
{
ParameterExpression param = Expression.Parameter(typeof(T), "x");
MemberExpression property = Expression.Property(param, propertyName);
return Expression.Lambda<Func<T, TProperty>>(property, param);
}

private static Expression<Action<T, TProperty>> BuildSetPropertyExpression<T, TProperty>(string propertyName)
{
ParameterExpression param = Expression.Parameter(typeof(T), "x");
ParameterExpression value = Expression.Parameter(typeof(TProperty), "value");
MemberExpression property = Expression.Property(param, propertyName);
BinaryExpression assign = Expression.Assign(property, value);
return Expression.Lambda<Action<T, TProperty>>(assign, param, value);
}

private class Source
{
public int Value { get; set; }
}

private class TestTypeBuilder
{
private readonly TypeBuilder _typeBuilder;

public TestTypeBuilder()
{
AssemblyBuilder assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(
new AssemblyName("Types"),
AssemblyBuilderAccess.Run);
ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule("<Module>");
_typeBuilder = moduleBuilder.DefineType(
"Types.Target",
TypeAttributes.Public |
TypeAttributes.Class |
TypeAttributes.Sealed |
TypeAttributes.AutoClass |
TypeAttributes.AnsiClass |
TypeAttributes.BeforeFieldInit |
TypeAttributes.AutoLayout,
null);
}

public TestTypeBuilder AddConstructorWithReadOnlyProperty<TParameter>(string parameterName)
{
// Add read-only property
FieldBuilder fieldBuilder = AddProperty<TParameter>(parameterName, false);

// Build the constructor with the parameter for the property
ConstructorBuilder constructorBuilder = _typeBuilder.DefineConstructor(
MethodAttributes.Public,
CallingConventions.Standard,
new Type[] { typeof(TParameter) });

// Define the parameter name
constructorBuilder.DefineParameter(1, ParameterAttributes.None, MemberName);

ILGenerator constructorIL = constructorBuilder.GetILGenerator();

// Call the base class constructor
constructorIL.Emit(OpCodes.Ldarg_0);
constructorIL.Emit(OpCodes.Call, typeof(object).GetConstructor(Type.EmptyTypes));

// Set the property value
constructorIL.Emit(OpCodes.Ldarg_0);
constructorIL.Emit(OpCodes.Ldarg_1);
constructorIL.Emit(OpCodes.Stfld, fieldBuilder);

constructorIL.Emit(OpCodes.Ret);

return this;
}

public TestTypeBuilder AddProperty<T>(string propertyName)
{
AddProperty<T>(propertyName, true);
return this;
}

private FieldBuilder AddProperty<T>(string propertyName, bool addSetter)
{
Type propertyType = typeof(T);
FieldBuilder fieldBuilder = _typeBuilder.DefineField($"_{propertyName}", propertyType, FieldAttributes.Private);
PropertyBuilder propertyBuilder = _typeBuilder.DefineProperty(propertyName, PropertyAttributes.None, propertyType, null);

AddGetMethod(_typeBuilder, propertyBuilder, fieldBuilder, propertyName, propertyType);
if (addSetter)
{
AddSetMethod(_typeBuilder, propertyBuilder, fieldBuilder, propertyName, propertyType);
}

return fieldBuilder;
}

public Type CreateType() => _typeBuilder.CreateType();

private static PropertyBuilder AddGetMethod(TypeBuilder typeBuilder, PropertyBuilder propertyBuilder, FieldBuilder fieldBuilder, string propertyName, Type propertyType)
{
MethodBuilder getMethodBuilder = typeBuilder.DefineMethod(
"get_" + propertyName,
MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.HideBySig,
propertyType,
Type.EmptyTypes);
ILGenerator getMethodGenerator = getMethodBuilder.GetILGenerator();

getMethodGenerator.Emit(OpCodes.Ldarg_0);
getMethodGenerator.Emit(OpCodes.Ldfld, fieldBuilder);
getMethodGenerator.Emit(OpCodes.Ret);

propertyBuilder.SetGetMethod(getMethodBuilder);

return propertyBuilder;
}

private static PropertyBuilder AddSetMethod(TypeBuilder typeBuilder, PropertyBuilder propertyBuilder, FieldBuilder fieldBuilder, string propertyName, Type propertyType)
{
MethodBuilder setMethodBuilder = typeBuilder.DefineMethod(
$"set_{propertyName}",
MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.HideBySig,
null,
new Type[] { propertyType });

ILGenerator setMethodGenerator = setMethodBuilder.GetILGenerator();
Label modifyProperty = setMethodGenerator.DefineLabel();
Label exitSet = setMethodGenerator.DefineLabel();

setMethodGenerator.MarkLabel(modifyProperty);
setMethodGenerator.Emit(OpCodes.Ldarg_0);
setMethodGenerator.Emit(OpCodes.Ldarg_1);
setMethodGenerator.Emit(OpCodes.Stfld, fieldBuilder);

setMethodGenerator.Emit(OpCodes.Nop);
setMethodGenerator.MarkLabel(exitSet);
setMethodGenerator.Emit(OpCodes.Ret);

propertyBuilder.SetSetMethod(setMethodBuilder);

return propertyBuilder;
}
}
}
6 changes: 3 additions & 3 deletions src/Mapster.Tool/Program.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,7 @@ private static void GenerateMappers(MapperOptions opt)
// This way when we compare attribute types (such as MapperAttribute) between our running assembly
// and the scanned assembly the two types with the same FullName can be considered equal because
// they both were resolved from AssemblyLoadContext.Default.

// This isolated Assembly Load Context will be able to resolve the Mapster assembly, but
// the resolved Assembly will be the same one that is in AssemblyLoadContext.Default
// (the runtime assembly load context that our code refers to by default when referencing
Expand DownExpand Up@@ -461,8 +461,8 @@ Dictionary<string, PropertySetting> settings
setter.Settings.Resolvers.Add(
new InvokerModel
{
DestinationMemberName = setting.TargetPropertyName ?? name,
SourceMemberName = name,
DestinationMemberPath = (setting.TargetPropertyName ?? name).Split('.'),
SourceMemberPath = name.Split('.'),
Invoker = setting.MapFunc,
}
);
Expand Down
4 changes: 2 additions & 2 deletions src/Mapster/Adapters/BaseClassAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ protected ClassMapping CreateClassConverter(Expression source, ClassModel classM
arg.Settings.ExtraSources.Select(src =>
src is LambdaExpression lambda
? lambda.Apply(arg.MapType, source)
: ExpressionEx.PropertyOrFieldPath(source, (string)src)));
: ExpressionEx.PropertyOrFieldPath(source, (string[])src)));
foreach (var destinationMember in destinationMembers)
{
if (ProcessIgnores(arg, destinationMember, out var ignore))
Expand DownExpand Up@@ -124,7 +124,7 @@ protected static bool ProcessIgnores(
if (!destinationMember.ShouldMapMember(arg, MemberSide.Destination))
return true;

return arg.Settings.Ignore.TryGetValue(destinationMember.Name, out ignore)
return arg.Settings.Ignore.TryGetValue(new[] { destinationMember.Name }, out ignore)
&& ignore.Condition == null;
}

Expand Down
4 changes: 3 additions & 1 deletion src/Mapster/Adapters/ClassAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,7 +214,9 @@ private static Expression SetValueByReflection(MemberMapping member, MemberExpre
if (member.UseDestinationValue)
return null;

if (!arg.Settings.Resolvers.Any(r => r.DestinationMemberName == member.DestinationMember.Name)
if (!arg.Settings.Resolvers.Any(r
=> r.DestinationMemberPath.Length == 1
&& r.DestinationMemberPath[0] == member.DestinationMember.Name)
&& member.Getter is MemberExpression memberExp && contructorMembers.Contains(memberExp.Member))
continue;

Expand Down
9 changes: 5 additions & 4 deletions src/Mapster/Adapters/DictionaryAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,16 +105,17 @@ protected override Expression CreateBlockExpression(Expression source, Expressio

//ignore mapped
var ignores = arg.Settings.Resolvers
.Select(r => r.SourceMemberName)
.Where(name => name != null)
.Select(r => r.SourceMemberPath)
.Where(path => path != null)
.Select(path => path![0])
.ToHashSet();

//ignore
var ignoreIfs = new Dictionary<string, Expression>();
foreach (var ignore in arg.Settings.Ignore)
{
if (ignore.Value.Condition == null)
ignores.Add(ignore.Key);
ignores.Add(ignore.Key[0]);
else
{
var body = ignore.Value.IsChildPath
Expand All@@ -123,7 +124,7 @@ protected override Expression CreateBlockExpression(Expression source, Expressio
var setWithCondition = Expression.IfThen(
ExpressionEx.Not(body),
set);
ignoreIfs.Add(ignore.Key, setWithCondition);
ignoreIfs.Add(ignore.Key[0], setWithCondition);
}
}

Expand Down
4 changes: 3 additions & 1 deletion src/Mapster/Adapters/RecordTypeAdapter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,9 @@ protected override Expression CreateInlineExpression(Expression source, CompileA
if (member.UseDestinationValue)
return null;

if (!arg.Settings.Resolvers.Any(r => r.DestinationMemberName == member.DestinationMember.Name)
if (!arg.Settings.Resolvers.Any(r
=> r.DestinationMemberPath.Length == 1
&& r.DestinationMemberPath[0] == member.DestinationMember.Name)
&& member.Getter is MemberExpression memberExp && contructorMembers.Contains(memberExp.Member))
continue;

Expand Down
Loading