10.1.0 Fix and Improvements

src/Mapster.Core/Enums/MapType.cs

@@ -9,5 +9,6 @@ public enum MapType
  MapToTarget = 2,
  Projection = 4,
  ApplyNullPropagation = 8,
+ CtorParam = 16,
  }
 }

src/Mapster.EF6/TypeAdapterBuilderExtensions.cs

@@ -60,10 +60,10 @@ public static ITypeAdapterBuilder<TSource> EntityFromContext<TSource>(this IType
  var getters = keys.Select(key => arg.DestinationType.GetProperty(key))
  .Select(prop => new PropertyModel(prop))
  .Select(model => arg.Settings.ValueAccessingStrategies
- .Select(s => s(src, model, arg))
+ .Select(s => s((ResolverSourceInput)src, model, arg))
  .FirstOrDefault(exp => exp != null))
  .Where(exp => exp != null)
- .Select(exp => Expression.Convert(exp, typeof(object)))
+ .Select(exp => Expression.Convert(exp.Exp, typeof(object)))
  .ToArray();
  if (getters.Length != keys.Length)
  throw new InvalidOperationException($"Cannot get key for sourceType={arg.SourceType.Name}, destinationType={arg.DestinationType.Name}");

src/Mapster.EFCore/TypeAdapterBuilderExtensions.cs

@@ -66,10 +66,10 @@ public static ITypeAdapterBuilder<TSource> EntityFromContext<TSource>(this IType
  var getters = keys.Select(key => arg.DestinationType.GetProperty(key))
  .Select(prop => new PropertyModel(prop!))
  .Select(model => arg.Settings.ValueAccessingStrategies
- .Select(s => s(src, model, arg))
+ .Select(s => s((ResolverSourceInput)src, model, arg))
  .FirstOrDefault(exp => exp != null))
  .Where(exp => exp != null)
- .Select(exp => Expression.Convert(exp, typeof(object)))
+ .Select(exp => Expression.Convert(exp.Exp, typeof(object)))
  .ToArray();
  if (getters.Length != keys.Length)
  throw new InvalidOperationException($"Cannot get key for sourceType={arg.SourceType.Name}, destinationType={arg.DestinationType.Name}");

src/Mapster.Tests/WhenMapUsingOverrideTypesSettings.cs

@@ -2,6 +2,7 @@
 using Shouldly;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Mapster.Tests
 {
@@ -82,8 +83,203 @@ public void UsingDefaultValueIsWorked()
  resultCDInsaiderReconfig.Data.ShouldBe(35);
  }
 
+ [TestMethod]
+ public void CustomDefaultValueIsWorkedWhenUsingAsCtorParam()
+ {
+ var config = new TypeAdapterConfig();
+
+ config.ForDestinationType<int?>()
+ .DefaultValue(x => 42);
+
+ config.
+ NewConfig<NullableIntInsaider, NullableIntCtorParam>()
+ .MapUsing(dest => dest.Data, src => src.Data, cfg =>
+ {
+ cfg.ReConfigurate()
+ .DefaultValue(x => 35);
+ });
+
+ var src = new NullableIntInsaider() { Data = null };
+
+ var result = src.Adapt<NullableIntCtorParam>(config);
+
+ result.Data.ShouldBe(35);
+ }
+
+ [TestMethod]
+ public void ExtraSourceUsingCustomConfig()
+ {
+ var config = new TypeAdapterConfig();
+ config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);
+ config.NewConfig<SourceFlattentInsaider, DestinationFlattentData>()
+ .MapUsing(dest=> dest, src => src.SrcData, cfg =>
+ {
+ cfg.SkipDestinationTransforms()
+ .ReConfigurate()
+ .Map(dest=>dest.Data, src => 42)
+ .MapUsing(dest => dest.Collection, src => src.Collection, cfg =>
+ {
+ cfg
+ .SkipDestinationTransforms();
+ })
+ ;
+ });
+
+ var src = new SourceFlattentInsaider() { SrcData = new() { Value = "Hello" } };
+
+ var result = src.Adapt<DestinationFlattentData>(config);
+
+ result.Collection.ShouldBeNull();
+ result.Data.ShouldBe(42);
+ }
+
+
+ [TestMethod]
+ public void ReMapSettersIsWorked()
+ {
+ var config = new TypeAdapterConfig();
+ config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);
+ config.ForDestinationType<DestinationFlattentData>()
+ .Ignore(x => x.Value)
+ .Ignore(x => x.Data);
+ config.NewConfig<SourceFlattentInsaider, DestinationFlattentData>()
+ .ReMap(dest => dest, src => src.SrcData, true);
+ config.NewConfig<RemapMemberMappings, DestinationFlattentData>()
+ .ReMap(dest => dest.Data, src => src.Data);
+
+ var src = new SourceFlattentInsaider() { SrcData = new() { Value = "Hello", Data = 42 } };
+ var reMapSrc = new RemapMemberMappings { Data = 21, Value = "World" };
+
+
+
+ var result = src.Adapt<DestinationFlattentData>(config);
+
+ result.Collection.ShouldBeNull();
+ result.Value.ShouldBe("Hello");
+ result.Data.ShouldBe(42);
+
+ var reMapResut = reMapSrc.Adapt<DestinationFlattentData>(config);
+
+ reMapResut.Data.ShouldBe(21);
+ reMapResut.Value.ShouldBe(default);
+ }
+
+ [TestMethod]
+ public void ApplyPropagantionUsingDeepSrcAnalize()
+ {
+ var config = new TypeAdapterConfig();
+
+ config.NewConfig<Source1004, Destination1004>()
+ .Map(dest => dest.ProductNames, src => src.Products.Select(x => x.Name).ToArray());
+
+ config.NewConfig<Source1004, DestinationCtor1004>()
+ .Map(dest => dest.ProductNames, src => src.Products.Select(x => x.Name).ToArray());
+
+ config.NewConfig<NullableStrings, NullableStringsDest>()
+ .Map(dest => dest.Result, src => $"{src.Value1.ToString()}");
+
+ config.NewConfig<NullableStrings, NullableStringsDestCtor>()
+ .Map(dest => dest.Result, src => $"{src.Value1.ToString()}");
+
+ var src = new Source1004();
+ var srcStrings = new NullableStrings();
+
+ //var str = src.BuildAdapter(config).CreateMapExpression<DestinationCtor1004>();
+ //var str2 = src.BuildAdapter(config).CreateMapExpression<NullableStringsDestCtor>();
+
+ Should.NotThrow(() =>
+ {
+ src.Adapt<Destination1004>(config);
+ src.Adapt<DestinationCtor1004>(config);
+
+ srcStrings.Adapt<NullableStringsDest>(config);
+ srcStrings.Adapt<NullableStringsDestCtor>(config);
+ });
+ }
+
  #region TestClasses
 
+ class Source1004
+ {
+ public Product1004[]? Products { get; set; }
+ }
+
+ class Product1004
+ {
+ public required string Name { get; set; }
+ }
+
+ class Destination1004
+ {
+ public string[]? ProductNames { get; set; }
+ }
+
+ class DestinationCtor1004
+ {
+ public DestinationCtor1004(string[]? productNames)
+ {
+ ProductNames = productNames;
+ }
+
+ public string[]? ProductNames { get; }
+ }
+
+ public class NullableStrings
+ {
+ public string Value1 { get; set; }
+
+ public string Value2 { get; set; }
+ }
+
+ public class NullableStringsDest
+ {
+ public string Result { get; set; }
+ }
+ public class NullableStringsDestCtor
+ {
+ public NullableStringsDestCtor(string result)
+ {
+ Result = result;
+ }
+
+ public string Result { get;}
+ }
+
+ public class RemapMemberMappings
+ {
+ public int Data { get; set; }
+ public string Value { get; set; }
+ }
+
+ public class DestinationFlattentData
+ {
+ public int Data { get; set; }
+ public string Value { get; set; }
+ public List<string> Collection { get; set; }
+ }
+
+ public class SourceFlattentData
+ {
+ public int Data { get; set; }
+ public string Value { get; set; }
+ public List<string> Collection { get; set; }
+ }
+
+ public class SourceFlattentInsaider
+ {
+ public SourceFlattentData SrcData { get; set; }
+ }
+
+ public class NullableIntCtorParam
+ {
+ public NullableIntCtorParam(int? data)
+ {
+ Data = data;
+ }
+ public int? Data { get; }
+ }
+
+
  public class NullableIntInsaider
  {
  public int? Data { get; set; }

src/Mapster/Adapters/BaseAdapter.cs

@@ -208,7 +208,7 @@ protected Expression CreateBlockExpressionBody(Expression source, Expression? de
  /// Not create destination is abstract type if source is null
  if (arg.DestinationType.IsAbstract)
  blocks.Add(Expression.IfThen(Expression.Equal(source, Expression.Constant(null, arg.SourceType)), 
- Expression.Return(label, Expression.Default(arg.DestinationType))));
+ Expression.Return(label, arg.DestinationType.CreateDefault(arg))));
 
  //new TDest();
  Expression transformedSource = source;
@@ -388,6 +388,9 @@ private static Expression InvokeMapping(
  if (exp == null)
  return null;
 
+ if(arg.MapType == MapType.CtorParam)
+ return exp;
+
  //projection null is handled by EF
  if (arg.MapType != MapType.Projection)
  exp = source.NotNullReturn(exp,arg);
@@ -448,9 +451,10 @@ protected virtual Expression CreateInstantiationExpression(Expression source, Ex
  }
  }
 
- internal static Expression CreateAdaptExpressionCore(Expression source, Type destinationType, CompileArgument arg, MemberMapping? mapping = null, Expression? destination = null)
+ internal static Expression CreateAdaptExpressionCore(Expression source, Type destinationType, CompileArgument arg, MemberMapping? mapping = null, Expression? destination = null, MapType? mapTypeCtor = null)
  {
- var mapType = arg.MapType == MapType.MapToTarget && destination == null ? MapType.Map :
+ var mapType = mapTypeCtor != null ? mapTypeCtor.Value:
+ arg.MapType == MapType.MapToTarget && destination == null ? MapType.Map :
  mapping?.UseDestinationValue == true ? MapType.MapToTarget :
  arg.MapType;
  var extraParams = new HashSet<ParameterExpression>();

src/Mapster.Core/Enums/MapType.cs

@@ -9,5 +9,6 @@ public enum MapType
  MapToTarget = 2,
  Projection = 4,
  ApplyNullPropagation = 8,
+ CtorParam = 16,
  }
 }

src/Mapster.EF6/TypeAdapterBuilderExtensions.cs

@@ -60,10 +60,10 @@ public static ITypeAdapterBuilder<TSource> EntityFromContext<TSource>(this IType
  var getters = keys.Select(key => arg.DestinationType.GetProperty(key))
  .Select(prop => new PropertyModel(prop))
  .Select(model => arg.Settings.ValueAccessingStrategies
- .Select(s => s(src, model, arg))
+ .Select(s => s((ResolverSourceInput)src, model, arg))
  .FirstOrDefault(exp => exp != null))
  .Where(exp => exp != null)
- .Select(exp => Expression.Convert(exp, typeof(object)))
+ .Select(exp => Expression.Convert(exp.Exp, typeof(object)))
  .ToArray();
  if (getters.Length != keys.Length)
  throw new InvalidOperationException($"Cannot get key for sourceType={arg.SourceType.Name}, destinationType={arg.DestinationType.Name}");

src/Mapster.EFCore/TypeAdapterBuilderExtensions.cs

@@ -66,10 +66,10 @@ public static ITypeAdapterBuilder<TSource> EntityFromContext<TSource>(this IType
  var getters = keys.Select(key => arg.DestinationType.GetProperty(key))
  .Select(prop => new PropertyModel(prop!))
  .Select(model => arg.Settings.ValueAccessingStrategies
- .Select(s => s(src, model, arg))
+ .Select(s => s((ResolverSourceInput)src, model, arg))
  .FirstOrDefault(exp => exp != null))
  .Where(exp => exp != null)
- .Select(exp => Expression.Convert(exp, typeof(object)))
+ .Select(exp => Expression.Convert(exp.Exp, typeof(object)))
  .ToArray();
  if (getters.Length != keys.Length)
  throw new InvalidOperationException($"Cannot get key for sourceType={arg.SourceType.Name}, destinationType={arg.DestinationType.Name}");

src/Mapster.Tests/WhenMapUsingOverrideTypesSettings.cs

@@ -2,6 +2,7 @@
 using Shouldly;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Mapster.Tests
 {
@@ -82,8 +83,203 @@ public void UsingDefaultValueIsWorked()
  resultCDInsaiderReconfig.Data.ShouldBe(35);
  }
 
+ [TestMethod]
+ public void CustomDefaultValueIsWorkedWhenUsingAsCtorParam()
+ {
+ var config = new TypeAdapterConfig();
+
+ config.ForDestinationType<int?>()
+ .DefaultValue(x => 42);
+
+ config.
+ NewConfig<NullableIntInsaider, NullableIntCtorParam>()
+ .MapUsing(dest => dest.Data, src => src.Data, cfg =>
+ {
+ cfg.ReConfigurate()
+ .DefaultValue(x => 35);
+ });
+
+ var src = new NullableIntInsaider() { Data = null };
+
+ var result = src.Adapt<NullableIntCtorParam>(config);
+
+ result.Data.ShouldBe(35);
+ }
+
+ [TestMethod]
+ public void ExtraSourceUsingCustomConfig()
+ {
+ var config = new TypeAdapterConfig();
+ config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);
+ config.NewConfig<SourceFlattentInsaider, DestinationFlattentData>()
+ .MapUsing(dest=> dest, src => src.SrcData, cfg =>
+ {
+ cfg.SkipDestinationTransforms()
+ .ReConfigurate()
+ .Map(dest=>dest.Data, src => 42)
+ .MapUsing(dest => dest.Collection, src => src.Collection, cfg =>
+ {
+ cfg
+ .SkipDestinationTransforms();
+ })
+ ;
+ });
+
+ var src = new SourceFlattentInsaider() { SrcData = new() { Value = "Hello" } };
+
+ var result = src.Adapt<DestinationFlattentData>(config);
+
+ result.Collection.ShouldBeNull();
+ result.Data.ShouldBe(42);
+ }
+
+
+ [TestMethod]
+ public void ReMapSettersIsWorked()
+ {
+ var config = new TypeAdapterConfig();
+ config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);
+ config.ForDestinationType<DestinationFlattentData>()
+ .Ignore(x => x.Value)
+ .Ignore(x => x.Data);
+ config.NewConfig<SourceFlattentInsaider, DestinationFlattentData>()
+ .ReMap(dest => dest, src => src.SrcData, true);
+ config.NewConfig<RemapMemberMappings, DestinationFlattentData>()
+ .ReMap(dest => dest.Data, src => src.Data);
+
+ var src = new SourceFlattentInsaider() { SrcData = new() { Value = "Hello", Data = 42 } };
+ var reMapSrc = new RemapMemberMappings { Data = 21, Value = "World" };
+
+
+
+ var result = src.Adapt<DestinationFlattentData>(config);
+
+ result.Collection.ShouldBeNull();
+ result.Value.ShouldBe("Hello");
+ result.Data.ShouldBe(42);
+
+ var reMapResut = reMapSrc.Adapt<DestinationFlattentData>(config);
+
+ reMapResut.Data.ShouldBe(21);
+ reMapResut.Value.ShouldBe(default);
+ }
+
+ [TestMethod]
+ public void ApplyPropagantionUsingDeepSrcAnalize()
+ {
+ var config = new TypeAdapterConfig();
+
+ config.NewConfig<Source1004, Destination1004>()
+ .Map(dest => dest.ProductNames, src => src.Products.Select(x => x.Name).ToArray());
+
+ config.NewConfig<Source1004, DestinationCtor1004>()
+ .Map(dest => dest.ProductNames, src => src.Products.Select(x => x.Name).ToArray());
+
+ config.NewConfig<NullableStrings, NullableStringsDest>()
+ .Map(dest => dest.Result, src => $"{src.Value1.ToString()}");
+
+ config.NewConfig<NullableStrings, NullableStringsDestCtor>()
+ .Map(dest => dest.Result, src => $"{src.Value1.ToString()}");
+
+ var src = new Source1004();
+ var srcStrings = new NullableStrings();
+
+ //var str = src.BuildAdapter(config).CreateMapExpression<DestinationCtor1004>();
+ //var str2 = src.BuildAdapter(config).CreateMapExpression<NullableStringsDestCtor>();
+
+ Should.NotThrow(() =>
+ {
+ src.Adapt<Destination1004>(config);
+ src.Adapt<DestinationCtor1004>(config);
+
+ srcStrings.Adapt<NullableStringsDest>(config);
+ srcStrings.Adapt<NullableStringsDestCtor>(config);
+ });
+ }
+
  #region TestClasses
 
+ class Source1004
+ {
+ public Product1004[]? Products { get; set; }
+ }
+
+ class Product1004
+ {
+ public required string Name { get; set; }
+ }
+
+ class Destination1004
+ {
+ public string[]? ProductNames { get; set; }
+ }
+
+ class DestinationCtor1004
+ {
+ public DestinationCtor1004(string[]? productNames)
+ {
+ ProductNames = productNames;
+ }
+
+ public string[]? ProductNames { get; }
+ }
+
+ public class NullableStrings
+ {
+ public string Value1 { get; set; }
+
+ public string Value2 { get; set; }
+ }
+
+ public class NullableStringsDest
+ {
+ public string Result { get; set; }
+ }
+ public class NullableStringsDestCtor
+ {
+ public NullableStringsDestCtor(string result)
+ {
+ Result = result;
+ }
+
+ public string Result { get;}
+ }
+
+ public class RemapMemberMappings
+ {
+ public int Data { get; set; }
+ public string Value { get; set; }
+ }
+
+ public class DestinationFlattentData
+ {
+ public int Data { get; set; }
+ public string Value { get; set; }
+ public List<string> Collection { get; set; }
+ }
+
+ public class SourceFlattentData
+ {
+ public int Data { get; set; }
+ public string Value { get; set; }
+ public List<string> Collection { get; set; }
+ }
+
+ public class SourceFlattentInsaider
+ {
+ public SourceFlattentData SrcData { get; set; }
+ }
+
+ public class NullableIntCtorParam
+ {
+ public NullableIntCtorParam(int? data)
+ {
+ Data = data;
+ }
+ public int? Data { get; }
+ }
+
+
  public class NullableIntInsaider
  {
  public int? Data { get; set; }

src/Mapster/Adapters/BaseAdapter.cs

@@ -208,7 +208,7 @@ protected Expression CreateBlockExpressionBody(Expression source, Expression? de
  /// Not create destination is abstract type if source is null
  if (arg.DestinationType.IsAbstract)
  blocks.Add(Expression.IfThen(Expression.Equal(source, Expression.Constant(null, arg.SourceType)), 
- Expression.Return(label, Expression.Default(arg.DestinationType))));
+ Expression.Return(label, arg.DestinationType.CreateDefault(arg))));
 
  //new TDest();
  Expression transformedSource = source;
@@ -388,6 +388,9 @@ private static Expression InvokeMapping(
  if (exp == null)
  return null;
 
+ if(arg.MapType == MapType.CtorParam)
+ return exp;
+
  //projection null is handled by EF
  if (arg.MapType != MapType.Projection)
  exp = source.NotNullReturn(exp,arg);
@@ -448,9 +451,10 @@ protected virtual Expression CreateInstantiationExpression(Expression source, Ex
  }
  }
 
- internal static Expression CreateAdaptExpressionCore(Expression source, Type destinationType, CompileArgument arg, MemberMapping? mapping = null, Expression? destination = null)
+ internal static Expression CreateAdaptExpressionCore(Expression source, Type destinationType, CompileArgument arg, MemberMapping? mapping = null, Expression? destination = null, MapType? mapTypeCtor = null)
  {
- var mapType = arg.MapType == MapType.MapToTarget && destination == null ? MapType.Map :
+ var mapType = mapTypeCtor != null ? mapTypeCtor.Value:
+ arg.MapType == MapType.MapToTarget && destination == null ? MapType.Map :
  mapping?.UseDestinationValue == true ? MapType.MapToTarget :
  arg.MapType;
  var extraParams = new HashSet<ParameterExpression>();

src/Mapster.Core/Enums/MapType.cs

@@ -9,5 +9,6 @@ public enum MapType
  MapToTarget = 2,
  Projection = 4,
  ApplyNullPropagation = 8,
+ CtorParam = 16,
  }
 }

src/Mapster.EF6/TypeAdapterBuilderExtensions.cs

@@ -60,10 +60,10 @@ public static ITypeAdapterBuilder<TSource> EntityFromContext<TSource>(this IType
  var getters = keys.Select(key => arg.DestinationType.GetProperty(key))
  .Select(prop => new PropertyModel(prop))
  .Select(model => arg.Settings.ValueAccessingStrategies
- .Select(s => s(src, model, arg))
+ .Select(s => s((ResolverSourceInput)src, model, arg))
  .FirstOrDefault(exp => exp != null))
  .Where(exp => exp != null)
- .Select(exp => Expression.Convert(exp, typeof(object)))
+ .Select(exp => Expression.Convert(exp.Exp, typeof(object)))
  .ToArray();
  if (getters.Length != keys.Length)
  throw new InvalidOperationException($"Cannot get key for sourceType={arg.SourceType.Name}, destinationType={arg.DestinationType.Name}");

src/Mapster.EFCore/TypeAdapterBuilderExtensions.cs

@@ -66,10 +66,10 @@ public static ITypeAdapterBuilder<TSource> EntityFromContext<TSource>(this IType
  var getters = keys.Select(key => arg.DestinationType.GetProperty(key))
  .Select(prop => new PropertyModel(prop!))
  .Select(model => arg.Settings.ValueAccessingStrategies
- .Select(s => s(src, model, arg))
+ .Select(s => s((ResolverSourceInput)src, model, arg))
  .FirstOrDefault(exp => exp != null))
  .Where(exp => exp != null)
- .Select(exp => Expression.Convert(exp, typeof(object)))
+ .Select(exp => Expression.Convert(exp.Exp, typeof(object)))
  .ToArray();
  if (getters.Length != keys.Length)
  throw new InvalidOperationException($"Cannot get key for sourceType={arg.SourceType.Name}, destinationType={arg.DestinationType.Name}");

src/Mapster.Tests/WhenMapUsingOverrideTypesSettings.cs

@@ -2,6 +2,7 @@
 using Shouldly;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Mapster.Tests
 {
@@ -82,8 +83,203 @@ public void UsingDefaultValueIsWorked()
  resultCDInsaiderReconfig.Data.ShouldBe(35);
  }
 
+ [TestMethod]
+ public void CustomDefaultValueIsWorkedWhenUsingAsCtorParam()
+ {
+ var config = new TypeAdapterConfig();
+
+ config.ForDestinationType<int?>()
+ .DefaultValue(x => 42);
+
+ config.
+ NewConfig<NullableIntInsaider, NullableIntCtorParam>()
+ .MapUsing(dest => dest.Data, src => src.Data, cfg =>
+ {
+ cfg.ReConfigurate()
+ .DefaultValue(x => 35);
+ });
+
+ var src = new NullableIntInsaider() { Data = null };
+
+ var result = src.Adapt<NullableIntCtorParam>(config);
+
+ result.Data.ShouldBe(35);
+ }
+
+ [TestMethod]
+ public void ExtraSourceUsingCustomConfig()
+ {
+ var config = new TypeAdapterConfig();
+ config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);
+ config.NewConfig<SourceFlattentInsaider, DestinationFlattentData>()
+ .MapUsing(dest=> dest, src => src.SrcData, cfg =>
+ {
+ cfg.SkipDestinationTransforms()
+ .ReConfigurate()
+ .Map(dest=>dest.Data, src => 42)
+ .MapUsing(dest => dest.Collection, src => src.Collection, cfg =>
+ {
+ cfg
+ .SkipDestinationTransforms();
+ })
+ ;
+ });
+
+ var src = new SourceFlattentInsaider() { SrcData = new() { Value = "Hello" } };
+
+ var result = src.Adapt<DestinationFlattentData>(config);
+
+ result.Collection.ShouldBeNull();
+ result.Data.ShouldBe(42);
+ }
+
+
+ [TestMethod]
+ public void ReMapSettersIsWorked()
+ {
+ var config = new TypeAdapterConfig();
+ config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);
+ config.ForDestinationType<DestinationFlattentData>()
+ .Ignore(x => x.Value)
+ .Ignore(x => x.Data);
+ config.NewConfig<SourceFlattentInsaider, DestinationFlattentData>()
+ .ReMap(dest => dest, src => src.SrcData, true);
+ config.NewConfig<RemapMemberMappings, DestinationFlattentData>()
+ .ReMap(dest => dest.Data, src => src.Data);
+
+ var src = new SourceFlattentInsaider() { SrcData = new() { Value = "Hello", Data = 42 } };
+ var reMapSrc = new RemapMemberMappings { Data = 21, Value = "World" };
+
+
+
+ var result = src.Adapt<DestinationFlattentData>(config);
+
+ result.Collection.ShouldBeNull();
+ result.Value.ShouldBe("Hello");
+ result.Data.ShouldBe(42);
+
+ var reMapResut = reMapSrc.Adapt<DestinationFlattentData>(config);
+
+ reMapResut.Data.ShouldBe(21);
+ reMapResut.Value.ShouldBe(default);
+ }
+
+ [TestMethod]
+ public void ApplyPropagantionUsingDeepSrcAnalize()
+ {
+ var config = new TypeAdapterConfig();
+
+ config.NewConfig<Source1004, Destination1004>()
+ .Map(dest => dest.ProductNames, src => src.Products.Select(x => x.Name).ToArray());
+
+ config.NewConfig<Source1004, DestinationCtor1004>()
+ .Map(dest => dest.ProductNames, src => src.Products.Select(x => x.Name).ToArray());
+
+ config.NewConfig<NullableStrings, NullableStringsDest>()
+ .Map(dest => dest.Result, src => $"{src.Value1.ToString()}");
+
+ config.NewConfig<NullableStrings, NullableStringsDestCtor>()
+ .Map(dest => dest.Result, src => $"{src.Value1.ToString()}");
+
+ var src = new Source1004();
+ var srcStrings = new NullableStrings();
+
+ //var str = src.BuildAdapter(config).CreateMapExpression<DestinationCtor1004>();
+ //var str2 = src.BuildAdapter(config).CreateMapExpression<NullableStringsDestCtor>();
+
+ Should.NotThrow(() =>
+ {
+ src.Adapt<Destination1004>(config);
+ src.Adapt<DestinationCtor1004>(config);
+
+ srcStrings.Adapt<NullableStringsDest>(config);
+ srcStrings.Adapt<NullableStringsDestCtor>(config);
+ });
+ }
+
  #region TestClasses
 
+ class Source1004
+ {
+ public Product1004[]? Products { get; set; }
+ }
+
+ class Product1004
+ {
+ public required string Name { get; set; }
+ }
+
+ class Destination1004
+ {
+ public string[]? ProductNames { get; set; }
+ }
+
+ class DestinationCtor1004
+ {
+ public DestinationCtor1004(string[]? productNames)
+ {
+ ProductNames = productNames;
+ }
+
+ public string[]? ProductNames { get; }
+ }
+
+ public class NullableStrings
+ {
+ public string Value1 { get; set; }
+
+ public string Value2 { get; set; }
+ }
+
+ public class NullableStringsDest
+ {
+ public string Result { get; set; }
+ }
+ public class NullableStringsDestCtor
+ {
+ public NullableStringsDestCtor(string result)
+ {
+ Result = result;
+ }
+
+ public string Result { get;}
+ }
+
+ public class RemapMemberMappings
+ {
+ public int Data { get; set; }
+ public string Value { get; set; }
+ }
+
+ public class DestinationFlattentData
+ {
+ public int Data { get; set; }
+ public string Value { get; set; }
+ public List<string> Collection { get; set; }
+ }
+
+ public class SourceFlattentData
+ {
+ public int Data { get; set; }
+ public string Value { get; set; }
+ public List<string> Collection { get; set; }
+ }
+
+ public class SourceFlattentInsaider
+ {
+ public SourceFlattentData SrcData { get; set; }
+ }
+
+ public class NullableIntCtorParam
+ {
+ public NullableIntCtorParam(int? data)
+ {
+ Data = data;
+ }
+ public int? Data { get; }
+ }
+
+
  public class NullableIntInsaider
  {
  public int? Data { get; set; }

src/Mapster/Adapters/BaseAdapter.cs

@@ -208,7 +208,7 @@ protected Expression CreateBlockExpressionBody(Expression source, Expression? de
  /// Not create destination is abstract type if source is null
  if (arg.DestinationType.IsAbstract)
  blocks.Add(Expression.IfThen(Expression.Equal(source, Expression.Constant(null, arg.SourceType)), 
- Expression.Return(label, Expression.Default(arg.DestinationType))));
+ Expression.Return(label, arg.DestinationType.CreateDefault(arg))));
 
  //new TDest();
  Expression transformedSource = source;
@@ -388,6 +388,9 @@ private static Expression InvokeMapping(
  if (exp == null)
  return null;
 
+ if(arg.MapType == MapType.CtorParam)
+ return exp;
+
  //projection null is handled by EF
  if (arg.MapType != MapType.Projection)
  exp = source.NotNullReturn(exp,arg);
@@ -448,9 +451,10 @@ protected virtual Expression CreateInstantiationExpression(Expression source, Ex
  }
  }
 
- internal static Expression CreateAdaptExpressionCore(Expression source, Type destinationType, CompileArgument arg, MemberMapping? mapping = null, Expression? destination = null)
+ internal static Expression CreateAdaptExpressionCore(Expression source, Type destinationType, CompileArgument arg, MemberMapping? mapping = null, Expression? destination = null, MapType? mapTypeCtor = null)
  {
- var mapType = arg.MapType == MapType.MapToTarget && destination == null ? MapType.Map :
+ var mapType = mapTypeCtor != null ? mapTypeCtor.Value:
+ arg.MapType == MapType.MapToTarget && destination == null ? MapType.Map :
  mapping?.UseDestinationValue == true ? MapType.MapToTarget :
  arg.MapType;
  var extraParams = new HashSet<ParameterExpression>();

src/Mapster.Core/Enums/MapType.cs

@@ -9,5 +9,6 @@ public enum MapType
  MapToTarget = 2,
  Projection = 4,
  ApplyNullPropagation = 8,
+ CtorParam = 16,
  }
 }

src/Mapster.EF6/TypeAdapterBuilderExtensions.cs

@@ -60,10 +60,10 @@ public static ITypeAdapterBuilder<TSource> EntityFromContext<TSource>(this IType
  var getters = keys.Select(key => arg.DestinationType.GetProperty(key))
  .Select(prop => new PropertyModel(prop))
  .Select(model => arg.Settings.ValueAccessingStrategies
- .Select(s => s(src, model, arg))
+ .Select(s => s((ResolverSourceInput)src, model, arg))
  .FirstOrDefault(exp => exp != null))
  .Where(exp => exp != null)
- .Select(exp => Expression.Convert(exp, typeof(object)))
+ .Select(exp => Expression.Convert(exp.Exp, typeof(object)))
  .ToArray();
  if (getters.Length != keys.Length)
  throw new InvalidOperationException($"Cannot get key for sourceType={arg.SourceType.Name}, destinationType={arg.DestinationType.Name}");

src/Mapster.EFCore/TypeAdapterBuilderExtensions.cs

@@ -66,10 +66,10 @@ public static ITypeAdapterBuilder<TSource> EntityFromContext<TSource>(this IType
  var getters = keys.Select(key => arg.DestinationType.GetProperty(key))
  .Select(prop => new PropertyModel(prop!))
  .Select(model => arg.Settings.ValueAccessingStrategies
- .Select(s => s(src, model, arg))
+ .Select(s => s((ResolverSourceInput)src, model, arg))
  .FirstOrDefault(exp => exp != null))
  .Where(exp => exp != null)
- .Select(exp => Expression.Convert(exp, typeof(object)))
+ .Select(exp => Expression.Convert(exp.Exp, typeof(object)))
  .ToArray();
  if (getters.Length != keys.Length)
  throw new InvalidOperationException($"Cannot get key for sourceType={arg.SourceType.Name}, destinationType={arg.DestinationType.Name}");

src/Mapster.Tests/WhenMapUsingOverrideTypesSettings.cs

@@ -2,6 +2,7 @@
 using Shouldly;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Mapster.Tests
 {
@@ -82,8 +83,203 @@ public void UsingDefaultValueIsWorked()
  resultCDInsaiderReconfig.Data.ShouldBe(35);
  }
 
+ [TestMethod]
+ public void CustomDefaultValueIsWorkedWhenUsingAsCtorParam()
+ {
+ var config = new TypeAdapterConfig();
+
+ config.ForDestinationType<int?>()
+ .DefaultValue(x => 42);
+
+ config.
+ NewConfig<NullableIntInsaider, NullableIntCtorParam>()
+ .MapUsing(dest => dest.Data, src => src.Data, cfg =>
+ {
+ cfg.ReConfigurate()
+ .DefaultValue(x => 35);
+ });
+
+ var src = new NullableIntInsaider() { Data = null };
+
+ var result = src.Adapt<NullableIntCtorParam>(config);
+
+ result.Data.ShouldBe(35);
+ }
+
+ [TestMethod]
+ public void ExtraSourceUsingCustomConfig()
+ {
+ var config = new TypeAdapterConfig();
+ config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);
+ config.NewConfig<SourceFlattentInsaider, DestinationFlattentData>()
+ .MapUsing(dest=> dest, src => src.SrcData, cfg =>
+ {
+ cfg.SkipDestinationTransforms()
+ .ReConfigurate()
+ .Map(dest=>dest.Data, src => 42)
+ .MapUsing(dest => dest.Collection, src => src.Collection, cfg =>
+ {
+ cfg
+ .SkipDestinationTransforms();
+ })
+ ;
+ });
+
+ var src = new SourceFlattentInsaider() { SrcData = new() { Value = "Hello" } };
+
+ var result = src.Adapt<DestinationFlattentData>(config);
+
+ result.Collection.ShouldBeNull();
+ result.Data.ShouldBe(42);
+ }
+
+
+ [TestMethod]
+ public void ReMapSettersIsWorked()
+ {
+ var config = new TypeAdapterConfig();
+ config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);
+ config.ForDestinationType<DestinationFlattentData>()
+ .Ignore(x => x.Value)
+ .Ignore(x => x.Data);
+ config.NewConfig<SourceFlattentInsaider, DestinationFlattentData>()
+ .ReMap(dest => dest, src => src.SrcData, true);
+ config.NewConfig<RemapMemberMappings, DestinationFlattentData>()
+ .ReMap(dest => dest.Data, src => src.Data);
+
+ var src = new SourceFlattentInsaider() { SrcData = new() { Value = "Hello", Data = 42 } };
+ var reMapSrc = new RemapMemberMappings { Data = 21, Value = "World" };
+
+
+
+ var result = src.Adapt<DestinationFlattentData>(config);
+
+ result.Collection.ShouldBeNull();
+ result.Value.ShouldBe("Hello");
+ result.Data.ShouldBe(42);
+
+ var reMapResut = reMapSrc.Adapt<DestinationFlattentData>(config);
+
+ reMapResut.Data.ShouldBe(21);
+ reMapResut.Value.ShouldBe(default);
+ }
+
+ [TestMethod]
+ public void ApplyPropagantionUsingDeepSrcAnalize()
+ {
+ var config = new TypeAdapterConfig();
+
+ config.NewConfig<Source1004, Destination1004>()
+ .Map(dest => dest.ProductNames, src => src.Products.Select(x => x.Name).ToArray());
+
+ config.NewConfig<Source1004, DestinationCtor1004>()
+ .Map(dest => dest.ProductNames, src => src.Products.Select(x => x.Name).ToArray());
+
+ config.NewConfig<NullableStrings, NullableStringsDest>()
+ .Map(dest => dest.Result, src => $"{src.Value1.ToString()}");
+
+ config.NewConfig<NullableStrings, NullableStringsDestCtor>()
+ .Map(dest => dest.Result, src => $"{src.Value1.ToString()}");
+
+ var src = new Source1004();
+ var srcStrings = new NullableStrings();
+
+ //var str = src.BuildAdapter(config).CreateMapExpression<DestinationCtor1004>();
+ //var str2 = src.BuildAdapter(config).CreateMapExpression<NullableStringsDestCtor>();
+
+ Should.NotThrow(() =>
+ {
+ src.Adapt<Destination1004>(config);
+ src.Adapt<DestinationCtor1004>(config);
+
+ srcStrings.Adapt<NullableStringsDest>(config);
+ srcStrings.Adapt<NullableStringsDestCtor>(config);
+ });
+ }
+
  #region TestClasses
 
+ class Source1004
+ {
+ public Product1004[]? Products { get; set; }
+ }
+
+ class Product1004
+ {
+ public required string Name { get; set; }
+ }
+
+ class Destination1004
+ {
+ public string[]? ProductNames { get; set; }
+ }
+
+ class DestinationCtor1004
+ {
+ public DestinationCtor1004(string[]? productNames)
+ {
+ ProductNames = productNames;
+ }
+
+ public string[]? ProductNames { get; }
+ }
+
+ public class NullableStrings
+ {
+ public string Value1 { get; set; }
+
+ public string Value2 { get; set; }
+ }
+
+ public class NullableStringsDest
+ {
+ public string Result { get; set; }
+ }
+ public class NullableStringsDestCtor
+ {
+ public NullableStringsDestCtor(string result)
+ {
+ Result = result;
+ }
+
+ public string Result { get;}
+ }
+
+ public class RemapMemberMappings
+ {
+ public int Data { get; set; }
+ public string Value { get; set; }
+ }
+
+ public class DestinationFlattentData
+ {
+ public int Data { get; set; }
+ public string Value { get; set; }
+ public List<string> Collection { get; set; }
+ }
+
+ public class SourceFlattentData
+ {
+ public int Data { get; set; }
+ public string Value { get; set; }
+ public List<string> Collection { get; set; }
+ }
+
+ public class SourceFlattentInsaider
+ {
+ public SourceFlattentData SrcData { get; set; }
+ }
+
+ public class NullableIntCtorParam
+ {
+ public NullableIntCtorParam(int? data)
+ {
+ Data = data;
+ }
+ public int? Data { get; }
+ }
+
+
  public class NullableIntInsaider
  {
  public int? Data { get; set; }

src/Mapster/Adapters/BaseAdapter.cs

@@ -208,7 +208,7 @@ protected Expression CreateBlockExpressionBody(Expression source, Expression? de
  /// Not create destination is abstract type if source is null
  if (arg.DestinationType.IsAbstract)
  blocks.Add(Expression.IfThen(Expression.Equal(source, Expression.Constant(null, arg.SourceType)), 
- Expression.Return(label, Expression.Default(arg.DestinationType))));
+ Expression.Return(label, arg.DestinationType.CreateDefault(arg))));
 
  //new TDest();
  Expression transformedSource = source;
@@ -388,6 +388,9 @@ private static Expression InvokeMapping(
  if (exp == null)
  return null;
 
+ if(arg.MapType == MapType.CtorParam)
+ return exp;
+
  //projection null is handled by EF
  if (arg.MapType != MapType.Projection)
  exp = source.NotNullReturn(exp,arg);
@@ -448,9 +451,10 @@ protected virtual Expression CreateInstantiationExpression(Expression source, Ex
  }
  }
 
- internal static Expression CreateAdaptExpressionCore(Expression source, Type destinationType, CompileArgument arg, MemberMapping? mapping = null, Expression? destination = null)
+ internal static Expression CreateAdaptExpressionCore(Expression source, Type destinationType, CompileArgument arg, MemberMapping? mapping = null, Expression? destination = null, MapType? mapTypeCtor = null)
  {
- var mapType = arg.MapType == MapType.MapToTarget && destination == null ? MapType.Map :
+ var mapType = mapTypeCtor != null ? mapTypeCtor.Value:
+ arg.MapType == MapType.MapToTarget && destination == null ? MapType.Map :
  mapping?.UseDestinationValue == true ? MapType.MapToTarget :
  arg.MapType;
  var extraParams = new HashSet<ParameterExpression>();

src/Mapster.Core/Enums/MapType.cs

@@ -9,5 +9,6 @@ public enum MapType
  MapToTarget = 2,
  Projection = 4,
  ApplyNullPropagation = 8,
+ CtorParam = 16,
  }
 }

src/Mapster.EF6/TypeAdapterBuilderExtensions.cs

@@ -60,10 +60,10 @@ public static ITypeAdapterBuilder<TSource> EntityFromContext<TSource>(this IType
  var getters = keys.Select(key => arg.DestinationType.GetProperty(key))
  .Select(prop => new PropertyModel(prop))
  .Select(model => arg.Settings.ValueAccessingStrategies
- .Select(s => s(src, model, arg))
+ .Select(s => s((ResolverSourceInput)src, model, arg))
  .FirstOrDefault(exp => exp != null))
  .Where(exp => exp != null)
- .Select(exp => Expression.Convert(exp, typeof(object)))
+ .Select(exp => Expression.Convert(exp.Exp, typeof(object)))
  .ToArray();
  if (getters.Length != keys.Length)
  throw new InvalidOperationException($"Cannot get key for sourceType={arg.SourceType.Name}, destinationType={arg.DestinationType.Name}");

src/Mapster.EFCore/TypeAdapterBuilderExtensions.cs

@@ -66,10 +66,10 @@ public static ITypeAdapterBuilder<TSource> EntityFromContext<TSource>(this IType
  var getters = keys.Select(key => arg.DestinationType.GetProperty(key))
  .Select(prop => new PropertyModel(prop!))
  .Select(model => arg.Settings.ValueAccessingStrategies
- .Select(s => s(src, model, arg))
+ .Select(s => s((ResolverSourceInput)src, model, arg))
  .FirstOrDefault(exp => exp != null))
  .Where(exp => exp != null)
- .Select(exp => Expression.Convert(exp, typeof(object)))
+ .Select(exp => Expression.Convert(exp.Exp, typeof(object)))
  .ToArray();
  if (getters.Length != keys.Length)
  throw new InvalidOperationException($"Cannot get key for sourceType={arg.SourceType.Name}, destinationType={arg.DestinationType.Name}");

src/Mapster.Tests/WhenMapUsingOverrideTypesSettings.cs

@@ -2,6 +2,7 @@
 using Shouldly;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Mapster.Tests
 {
@@ -82,8 +83,203 @@ public void UsingDefaultValueIsWorked()
  resultCDInsaiderReconfig.Data.ShouldBe(35);
  }
 
+ [TestMethod]
+ public void CustomDefaultValueIsWorkedWhenUsingAsCtorParam()
+ {
+ var config = new TypeAdapterConfig();
+
+ config.ForDestinationType<int?>()
+ .DefaultValue(x => 42);
+
+ config.
+ NewConfig<NullableIntInsaider, NullableIntCtorParam>()
+ .MapUsing(dest => dest.Data, src => src.Data, cfg =>
+ {
+ cfg.ReConfigurate()
+ .DefaultValue(x => 35);
+ });
+
+ var src = new NullableIntInsaider() { Data = null };
+
+ var result = src.Adapt<NullableIntCtorParam>(config);
+
+ result.Data.ShouldBe(35);
+ }
+
+ [TestMethod]
+ public void ExtraSourceUsingCustomConfig()
+ {
+ var config = new TypeAdapterConfig();
+ config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);
+ config.NewConfig<SourceFlattentInsaider, DestinationFlattentData>()
+ .MapUsing(dest=> dest, src => src.SrcData, cfg =>
+ {
+ cfg.SkipDestinationTransforms()
+ .ReConfigurate()
+ .Map(dest=>dest.Data, src => 42)
+ .MapUsing(dest => dest.Collection, src => src.Collection, cfg =>
+ {
+ cfg
+ .SkipDestinationTransforms();
+ })
+ ;
+ });
+
+ var src = new SourceFlattentInsaider() { SrcData = new() { Value = "Hello" } };
+
+ var result = src.Adapt<DestinationFlattentData>(config);
+
+ result.Collection.ShouldBeNull();
+ result.Data.ShouldBe(42);
+ }
+
+
+ [TestMethod]
+ public void ReMapSettersIsWorked()
+ {
+ var config = new TypeAdapterConfig();
+ config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);
+ config.ForDestinationType<DestinationFlattentData>()
+ .Ignore(x => x.Value)
+ .Ignore(x => x.Data);
+ config.NewConfig<SourceFlattentInsaider, DestinationFlattentData>()
+ .ReMap(dest => dest, src => src.SrcData, true);
+ config.NewConfig<RemapMemberMappings, DestinationFlattentData>()
+ .ReMap(dest => dest.Data, src => src.Data);
+
+ var src = new SourceFlattentInsaider() { SrcData = new() { Value = "Hello", Data = 42 } };
+ var reMapSrc = new RemapMemberMappings { Data = 21, Value = "World" };
+
+
+
+ var result = src.Adapt<DestinationFlattentData>(config);
+
+ result.Collection.ShouldBeNull();
+ result.Value.ShouldBe("Hello");
+ result.Data.ShouldBe(42);
+
+ var reMapResut = reMapSrc.Adapt<DestinationFlattentData>(config);
+
+ reMapResut.Data.ShouldBe(21);
+ reMapResut.Value.ShouldBe(default);
+ }
+
+ [TestMethod]
+ public void ApplyPropagantionUsingDeepSrcAnalize()
+ {
+ var config = new TypeAdapterConfig();
+
+ config.NewConfig<Source1004, Destination1004>()
+ .Map(dest => dest.ProductNames, src => src.Products.Select(x => x.Name).ToArray());
+
+ config.NewConfig<Source1004, DestinationCtor1004>()
+ .Map(dest => dest.ProductNames, src => src.Products.Select(x => x.Name).ToArray());
+
+ config.NewConfig<NullableStrings, NullableStringsDest>()
+ .Map(dest => dest.Result, src => $"{src.Value1.ToString()}");
+
+ config.NewConfig<NullableStrings, NullableStringsDestCtor>()
+ .Map(dest => dest.Result, src => $"{src.Value1.ToString()}");
+
+ var src = new Source1004();
+ var srcStrings = new NullableStrings();
+
+ //var str = src.BuildAdapter(config).CreateMapExpression<DestinationCtor1004>();
+ //var str2 = src.BuildAdapter(config).CreateMapExpression<NullableStringsDestCtor>();
+
+ Should.NotThrow(() =>
+ {
+ src.Adapt<Destination1004>(config);
+ src.Adapt<DestinationCtor1004>(config);
+
+ srcStrings.Adapt<NullableStringsDest>(config);
+ srcStrings.Adapt<NullableStringsDestCtor>(config);
+ });
+ }
+
  #region TestClasses
 
+ class Source1004
+ {
+ public Product1004[]? Products { get; set; }
+ }
+
+ class Product1004
+ {
+ public required string Name { get; set; }
+ }
+
+ class Destination1004
+ {
+ public string[]? ProductNames { get; set; }
+ }
+
+ class DestinationCtor1004
+ {
+ public DestinationCtor1004(string[]? productNames)
+ {
+ ProductNames = productNames;
+ }
+
+ public string[]? ProductNames { get; }
+ }
+
+ public class NullableStrings
+ {
+ public string Value1 { get; set; }
+
+ public string Value2 { get; set; }
+ }
+
+ public class NullableStringsDest
+ {
+ public string Result { get; set; }
+ }
+ public class NullableStringsDestCtor
+ {
+ public NullableStringsDestCtor(string result)
+ {
+ Result = result;
+ }
+
+ public string Result { get;}
+ }
+
+ public class RemapMemberMappings
+ {
+ public int Data { get; set; }
+ public string Value { get; set; }
+ }
+
+ public class DestinationFlattentData
+ {
+ public int Data { get; set; }
+ public string Value { get; set; }
+ public List<string> Collection { get; set; }
+ }
+
+ public class SourceFlattentData
+ {
+ public int Data { get; set; }
+ public string Value { get; set; }
+ public List<string> Collection { get; set; }
+ }
+
+ public class SourceFlattentInsaider
+ {
+ public SourceFlattentData SrcData { get; set; }
+ }
+
+ public class NullableIntCtorParam
+ {
+ public NullableIntCtorParam(int? data)
+ {
+ Data = data;
+ }
+ public int? Data { get; }
+ }
+
+
  public class NullableIntInsaider
  {
  public int? Data { get; set; }

src/Mapster/Adapters/BaseAdapter.cs

@@ -208,7 +208,7 @@ protected Expression CreateBlockExpressionBody(Expression source, Expression? de
  /// Not create destination is abstract type if source is null
  if (arg.DestinationType.IsAbstract)
  blocks.Add(Expression.IfThen(Expression.Equal(source, Expression.Constant(null, arg.SourceType)), 
- Expression.Return(label, Expression.Default(arg.DestinationType))));
+ Expression.Return(label, arg.DestinationType.CreateDefault(arg))));
 
  //new TDest();
  Expression transformedSource = source;
@@ -388,6 +388,9 @@ private static Expression InvokeMapping(
  if (exp == null)
  return null;
 
+ if(arg.MapType == MapType.CtorParam)
+ return exp;
+
  //projection null is handled by EF
  if (arg.MapType != MapType.Projection)
  exp = source.NotNullReturn(exp,arg);
@@ -448,9 +451,10 @@ protected virtual Expression CreateInstantiationExpression(Expression source, Ex
  }
  }
 
- internal static Expression CreateAdaptExpressionCore(Expression source, Type destinationType, CompileArgument arg, MemberMapping? mapping = null, Expression? destination = null)
+ internal static Expression CreateAdaptExpressionCore(Expression source, Type destinationType, CompileArgument arg, MemberMapping? mapping = null, Expression? destination = null, MapType? mapTypeCtor = null)
  {
- var mapType = arg.MapType == MapType.MapToTarget && destination == null ? MapType.Map :
+ var mapType = mapTypeCtor != null ? mapTypeCtor.Value:
+ arg.MapType == MapType.MapToTarget && destination == null ? MapType.Map :
  mapping?.UseDestinationValue == true ? MapType.MapToTarget :
  arg.MapType;
  var extraParams = new HashSet<ParameterExpression>();

src/Mapster.Core/Enums/MapType.cs

@@ -9,5 +9,6 @@ public enum MapType
  MapToTarget = 2,
  Projection = 4,
  ApplyNullPropagation = 8,
+ CtorParam = 16,
  }
 }

src/Mapster.EF6/TypeAdapterBuilderExtensions.cs

@@ -60,10 +60,10 @@ public static ITypeAdapterBuilder<TSource> EntityFromContext<TSource>(this IType
  var getters = keys.Select(key => arg.DestinationType.GetProperty(key))
  .Select(prop => new PropertyModel(prop))
  .Select(model => arg.Settings.ValueAccessingStrategies
- .Select(s => s(src, model, arg))
+ .Select(s => s((ResolverSourceInput)src, model, arg))
  .FirstOrDefault(exp => exp != null))
  .Where(exp => exp != null)
- .Select(exp => Expression.Convert(exp, typeof(object)))
+ .Select(exp => Expression.Convert(exp.Exp, typeof(object)))
  .ToArray();
  if (getters.Length != keys.Length)
  throw new InvalidOperationException($"Cannot get key for sourceType={arg.SourceType.Name}, destinationType={arg.DestinationType.Name}");

src/Mapster.EFCore/TypeAdapterBuilderExtensions.cs

@@ -66,10 +66,10 @@ public static ITypeAdapterBuilder<TSource> EntityFromContext<TSource>(this IType
  var getters = keys.Select(key => arg.DestinationType.GetProperty(key))
  .Select(prop => new PropertyModel(prop!))
  .Select(model => arg.Settings.ValueAccessingStrategies
- .Select(s => s(src, model, arg))
+ .Select(s => s((ResolverSourceInput)src, model, arg))
  .FirstOrDefault(exp => exp != null))
  .Where(exp => exp != null)
- .Select(exp => Expression.Convert(exp, typeof(object)))
+ .Select(exp => Expression.Convert(exp.Exp, typeof(object)))
  .ToArray();
  if (getters.Length != keys.Length)
  throw new InvalidOperationException($"Cannot get key for sourceType={arg.SourceType.Name}, destinationType={arg.DestinationType.Name}");

src/Mapster.Tests/WhenMapUsingOverrideTypesSettings.cs

@@ -2,6 +2,7 @@
 using Shouldly;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Mapster.Tests
 {
@@ -82,8 +83,203 @@ public void UsingDefaultValueIsWorked()
  resultCDInsaiderReconfig.Data.ShouldBe(35);
  }
 
+ [TestMethod]
+ public void CustomDefaultValueIsWorkedWhenUsingAsCtorParam()
+ {
+ var config = new TypeAdapterConfig();
+
+ config.ForDestinationType<int?>()
+ .DefaultValue(x => 42);
+
+ config.
+ NewConfig<NullableIntInsaider, NullableIntCtorParam>()
+ .MapUsing(dest => dest.Data, src => src.Data, cfg =>
+ {
+ cfg.ReConfigurate()
+ .DefaultValue(x => 35);
+ });
+
+ var src = new NullableIntInsaider() { Data = null };
+
+ var result = src.Adapt<NullableIntCtorParam>(config);
+
+ result.Data.ShouldBe(35);
+ }
+
+ [TestMethod]
+ public void ExtraSourceUsingCustomConfig()
+ {
+ var config = new TypeAdapterConfig();
+ config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);
+ config.NewConfig<SourceFlattentInsaider, DestinationFlattentData>()
+ .MapUsing(dest=> dest, src => src.SrcData, cfg =>
+ {
+ cfg.SkipDestinationTransforms()
+ .ReConfigurate()
+ .Map(dest=>dest.Data, src => 42)
+ .MapUsing(dest => dest.Collection, src => src.Collection, cfg =>
+ {
+ cfg
+ .SkipDestinationTransforms();
+ })
+ ;
+ });
+
+ var src = new SourceFlattentInsaider() { SrcData = new() { Value = "Hello" } };
+
+ var result = src.Adapt<DestinationFlattentData>(config);
+
+ result.Collection.ShouldBeNull();
+ result.Data.ShouldBe(42);
+ }
+
+
+ [TestMethod]
+ public void ReMapSettersIsWorked()
+ {
+ var config = new TypeAdapterConfig();
+ config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);
+ config.ForDestinationType<DestinationFlattentData>()
+ .Ignore(x => x.Value)
+ .Ignore(x => x.Data);
+ config.NewConfig<SourceFlattentInsaider, DestinationFlattentData>()
+ .ReMap(dest => dest, src => src.SrcData, true);
+ config.NewConfig<RemapMemberMappings, DestinationFlattentData>()
+ .ReMap(dest => dest.Data, src => src.Data);
+
+ var src = new SourceFlattentInsaider() { SrcData = new() { Value = "Hello", Data = 42 } };
+ var reMapSrc = new RemapMemberMappings { Data = 21, Value = "World" };
+
+
+
+ var result = src.Adapt<DestinationFlattentData>(config);
+
+ result.Collection.ShouldBeNull();
+ result.Value.ShouldBe("Hello");
+ result.Data.ShouldBe(42);
+
+ var reMapResut = reMapSrc.Adapt<DestinationFlattentData>(config);
+
+ reMapResut.Data.ShouldBe(21);
+ reMapResut.Value.ShouldBe(default);
+ }
+
+ [TestMethod]
+ public void ApplyPropagantionUsingDeepSrcAnalize()
+ {
+ var config = new TypeAdapterConfig();
+
+ config.NewConfig<Source1004, Destination1004>()
+ .Map(dest => dest.ProductNames, src => src.Products.Select(x => x.Name).ToArray());
+
+ config.NewConfig<Source1004, DestinationCtor1004>()
+ .Map(dest => dest.ProductNames, src => src.Products.Select(x => x.Name).ToArray());
+
+ config.NewConfig<NullableStrings, NullableStringsDest>()
+ .Map(dest => dest.Result, src => $"{src.Value1.ToString()}");
+
+ config.NewConfig<NullableStrings, NullableStringsDestCtor>()
+ .Map(dest => dest.Result, src => $"{src.Value1.ToString()}");
+
+ var src = new Source1004();
+ var srcStrings = new NullableStrings();
+
+ //var str = src.BuildAdapter(config).CreateMapExpression<DestinationCtor1004>();
+ //var str2 = src.BuildAdapter(config).CreateMapExpression<NullableStringsDestCtor>();
+
+ Should.NotThrow(() =>
+ {
+ src.Adapt<Destination1004>(config);
+ src.Adapt<DestinationCtor1004>(config);
+
+ srcStrings.Adapt<NullableStringsDest>(config);
+ srcStrings.Adapt<NullableStringsDestCtor>(config);
+ });
+ }
+
  #region TestClasses
 
+ class Source1004
+ {
+ public Product1004[]? Products { get; set; }
+ }
+
+ class Product1004
+ {
+ public required string Name { get; set; }
+ }
+
+ class Destination1004
+ {
+ public string[]? ProductNames { get; set; }
+ }
+
+ class DestinationCtor1004
+ {
+ public DestinationCtor1004(string[]? productNames)
+ {
+ ProductNames = productNames;
+ }
+
+ public string[]? ProductNames { get; }
+ }
+
+ public class NullableStrings
+ {
+ public string Value1 { get; set; }
+
+ public string Value2 { get; set; }
+ }
+
+ public class NullableStringsDest
+ {
+ public string Result { get; set; }
+ }
+ public class NullableStringsDestCtor
+ {
+ public NullableStringsDestCtor(string result)
+ {
+ Result = result;
+ }
+
+ public string Result { get;}
+ }
+
+ public class RemapMemberMappings
+ {
+ public int Data { get; set; }
+ public string Value { get; set; }
+ }
+
+ public class DestinationFlattentData
+ {
+ public int Data { get; set; }
+ public string Value { get; set; }
+ public List<string> Collection { get; set; }
+ }
+
+ public class SourceFlattentData
+ {
+ public int Data { get; set; }
+ public string Value { get; set; }
+ public List<string> Collection { get; set; }
+ }
+
+ public class SourceFlattentInsaider
+ {
+ public SourceFlattentData SrcData { get; set; }
+ }
+
+ public class NullableIntCtorParam
+ {
+ public NullableIntCtorParam(int? data)
+ {
+ Data = data;
+ }
+ public int? Data { get; }
+ }
+
+
  public class NullableIntInsaider
  {
  public int? Data { get; set; }

src/Mapster/Adapters/BaseAdapter.cs

@@ -208,7 +208,7 @@ protected Expression CreateBlockExpressionBody(Expression source, Expression? de
  /// Not create destination is abstract type if source is null
  if (arg.DestinationType.IsAbstract)
  blocks.Add(Expression.IfThen(Expression.Equal(source, Expression.Constant(null, arg.SourceType)), 
- Expression.Return(label, Expression.Default(arg.DestinationType))));
+ Expression.Return(label, arg.DestinationType.CreateDefault(arg))));
 
  //new TDest();
  Expression transformedSource = source;
@@ -388,6 +388,9 @@ private static Expression InvokeMapping(
  if (exp == null)
  return null;
 
+ if(arg.MapType == MapType.CtorParam)
+ return exp;
+
  //projection null is handled by EF
  if (arg.MapType != MapType.Projection)
  exp = source.NotNullReturn(exp,arg);
@@ -448,9 +451,10 @@ protected virtual Expression CreateInstantiationExpression(Expression source, Ex
  }
  }
 
- internal static Expression CreateAdaptExpressionCore(Expression source, Type destinationType, CompileArgument arg, MemberMapping? mapping = null, Expression? destination = null)
+ internal static Expression CreateAdaptExpressionCore(Expression source, Type destinationType, CompileArgument arg, MemberMapping? mapping = null, Expression? destination = null, MapType? mapTypeCtor = null)
  {
- var mapType = arg.MapType == MapType.MapToTarget && destination == null ? MapType.Map :
+ var mapType = mapTypeCtor != null ? mapTypeCtor.Value:
+ arg.MapType == MapType.MapToTarget && destination == null ? MapType.Map :
  mapping?.UseDestinationValue == true ? MapType.MapToTarget :
  arg.MapType;
  var extraParams = new HashSet<ParameterExpression>();

src/Mapster.Core/Enums/MapType.cs

@@ -9,5 +9,6 @@ public enum MapType
  MapToTarget = 2,
  Projection = 4,
  ApplyNullPropagation = 8,
+ CtorParam = 16,
  }
 }

src/Mapster.EF6/TypeAdapterBuilderExtensions.cs

@@ -60,10 +60,10 @@ public static ITypeAdapterBuilder<TSource> EntityFromContext<TSource>(this IType
  var getters = keys.Select(key => arg.DestinationType.GetProperty(key))
  .Select(prop => new PropertyModel(prop))
  .Select(model => arg.Settings.ValueAccessingStrategies
- .Select(s => s(src, model, arg))
+ .Select(s => s((ResolverSourceInput)src, model, arg))
  .FirstOrDefault(exp => exp != null))
  .Where(exp => exp != null)
- .Select(exp => Expression.Convert(exp, typeof(object)))
+ .Select(exp => Expression.Convert(exp.Exp, typeof(object)))
  .ToArray();
  if (getters.Length != keys.Length)
  throw new InvalidOperationException($"Cannot get key for sourceType={arg.SourceType.Name}, destinationType={arg.DestinationType.Name}");

src/Mapster.EFCore/TypeAdapterBuilderExtensions.cs

@@ -66,10 +66,10 @@ public static ITypeAdapterBuilder<TSource> EntityFromContext<TSource>(this IType
  var getters = keys.Select(key => arg.DestinationType.GetProperty(key))
  .Select(prop => new PropertyModel(prop!))
  .Select(model => arg.Settings.ValueAccessingStrategies
- .Select(s => s(src, model, arg))
+ .Select(s => s((ResolverSourceInput)src, model, arg))
  .FirstOrDefault(exp => exp != null))
  .Where(exp => exp != null)
- .Select(exp => Expression.Convert(exp, typeof(object)))
+ .Select(exp => Expression.Convert(exp.Exp, typeof(object)))
  .ToArray();
  if (getters.Length != keys.Length)
  throw new InvalidOperationException($"Cannot get key for sourceType={arg.SourceType.Name}, destinationType={arg.DestinationType.Name}");

src/Mapster.Tests/WhenMapUsingOverrideTypesSettings.cs

@@ -2,6 +2,7 @@
 using Shouldly;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Mapster.Tests
 {
@@ -82,8 +83,203 @@ public void UsingDefaultValueIsWorked()
  resultCDInsaiderReconfig.Data.ShouldBe(35);
  }
 
+ [TestMethod]
+ public void CustomDefaultValueIsWorkedWhenUsingAsCtorParam()
+ {
+ var config = new TypeAdapterConfig();
+
+ config.ForDestinationType<int?>()
+ .DefaultValue(x => 42);
+
+ config.
+ NewConfig<NullableIntInsaider, NullableIntCtorParam>()
+ .MapUsing(dest => dest.Data, src => src.Data, cfg =>
+ {
+ cfg.ReConfigurate()
+ .DefaultValue(x => 35);
+ });
+
+ var src = new NullableIntInsaider() { Data = null };
+
+ var result = src.Adapt<NullableIntCtorParam>(config);
+
+ result.Data.ShouldBe(35);
+ }
+
+ [TestMethod]
+ public void ExtraSourceUsingCustomConfig()
+ {
+ var config = new TypeAdapterConfig();
+ config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);
+ config.NewConfig<SourceFlattentInsaider, DestinationFlattentData>()
+ .MapUsing(dest=> dest, src => src.SrcData, cfg =>
+ {
+ cfg.SkipDestinationTransforms()
+ .ReConfigurate()
+ .Map(dest=>dest.Data, src => 42)
+ .MapUsing(dest => dest.Collection, src => src.Collection, cfg =>
+ {
+ cfg
+ .SkipDestinationTransforms();
+ })
+ ;
+ });
+
+ var src = new SourceFlattentInsaider() { SrcData = new() { Value = "Hello" } };
+
+ var result = src.Adapt<DestinationFlattentData>(config);
+
+ result.Collection.ShouldBeNull();
+ result.Data.ShouldBe(42);
+ }
+
+
+ [TestMethod]
+ public void ReMapSettersIsWorked()
+ {
+ var config = new TypeAdapterConfig();
+ config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);
+ config.ForDestinationType<DestinationFlattentData>()
+ .Ignore(x => x.Value)
+ .Ignore(x => x.Data);
+ config.NewConfig<SourceFlattentInsaider, DestinationFlattentData>()
+ .ReMap(dest => dest, src => src.SrcData, true);
+ config.NewConfig<RemapMemberMappings, DestinationFlattentData>()
+ .ReMap(dest => dest.Data, src => src.Data);
+
+ var src = new SourceFlattentInsaider() { SrcData = new() { Value = "Hello", Data = 42 } };
+ var reMapSrc = new RemapMemberMappings { Data = 21, Value = "World" };
+
+
+
+ var result = src.Adapt<DestinationFlattentData>(config);
+
+ result.Collection.ShouldBeNull();
+ result.Value.ShouldBe("Hello");
+ result.Data.ShouldBe(42);
+
+ var reMapResut = reMapSrc.Adapt<DestinationFlattentData>(config);
+
+ reMapResut.Data.ShouldBe(21);
+ reMapResut.Value.ShouldBe(default);
+ }
+
+ [TestMethod]
+ public void ApplyPropagantionUsingDeepSrcAnalize()
+ {
+ var config = new TypeAdapterConfig();
+
+ config.NewConfig<Source1004, Destination1004>()
+ .Map(dest => dest.ProductNames, src => src.Products.Select(x => x.Name).ToArray());
+
+ config.NewConfig<Source1004, DestinationCtor1004>()
+ .Map(dest => dest.ProductNames, src => src.Products.Select(x => x.Name).ToArray());
+
+ config.NewConfig<NullableStrings, NullableStringsDest>()
+ .Map(dest => dest.Result, src => $"{src.Value1.ToString()}");
+
+ config.NewConfig<NullableStrings, NullableStringsDestCtor>()
+ .Map(dest => dest.Result, src => $"{src.Value1.ToString()}");
+
+ var src = new Source1004();
+ var srcStrings = new NullableStrings();
+
+ //var str = src.BuildAdapter(config).CreateMapExpression<DestinationCtor1004>();
+ //var str2 = src.BuildAdapter(config).CreateMapExpression<NullableStringsDestCtor>();
+
+ Should.NotThrow(() =>
+ {
+ src.Adapt<Destination1004>(config);
+ src.Adapt<DestinationCtor1004>(config);
+
+ srcStrings.Adapt<NullableStringsDest>(config);
+ srcStrings.Adapt<NullableStringsDestCtor>(config);
+ });
+ }
+
  #region TestClasses
 
+ class Source1004
+ {
+ public Product1004[]? Products { get; set; }
+ }
+
+ class Product1004
+ {
+ public required string Name { get; set; }
+ }
+
+ class Destination1004
+ {
+ public string[]? ProductNames { get; set; }
+ }
+
+ class DestinationCtor1004
+ {
+ public DestinationCtor1004(string[]? productNames)
+ {
+ ProductNames = productNames;
+ }
+
+ public string[]? ProductNames { get; }
+ }
+
+ public class NullableStrings
+ {
+ public string Value1 { get; set; }
+
+ public string Value2 { get; set; }
+ }
+
+ public class NullableStringsDest
+ {
+ public string Result { get; set; }
+ }
+ public class NullableStringsDestCtor
+ {
+ public NullableStringsDestCtor(string result)
+ {
+ Result = result;
+ }
+
+ public string Result { get;}
+ }
+
+ public class RemapMemberMappings
+ {
+ public int Data { get; set; }
+ public string Value { get; set; }
+ }
+
+ public class DestinationFlattentData
+ {
+ public int Data { get; set; }
+ public string Value { get; set; }
+ public List<string> Collection { get; set; }
+ }
+
+ public class SourceFlattentData
+ {
+ public int Data { get; set; }
+ public string Value { get; set; }
+ public List<string> Collection { get; set; }
+ }
+
+ public class SourceFlattentInsaider
+ {
+ public SourceFlattentData SrcData { get; set; }
+ }
+
+ public class NullableIntCtorParam
+ {
+ public NullableIntCtorParam(int? data)
+ {
+ Data = data;
+ }
+ public int? Data { get; }
+ }
+
+
  public class NullableIntInsaider
  {
  public int? Data { get; set; }

src/Mapster/Adapters/BaseAdapter.cs

@@ -208,7 +208,7 @@ protected Expression CreateBlockExpressionBody(Expression source, Expression? de
  /// Not create destination is abstract type if source is null
  if (arg.DestinationType.IsAbstract)
  blocks.Add(Expression.IfThen(Expression.Equal(source, Expression.Constant(null, arg.SourceType)), 
- Expression.Return(label, Expression.Default(arg.DestinationType))));
+ Expression.Return(label, arg.DestinationType.CreateDefault(arg))));
 
  //new TDest();
  Expression transformedSource = source;
@@ -388,6 +388,9 @@ private static Expression InvokeMapping(
  if (exp == null)
  return null;
 
+ if(arg.MapType == MapType.CtorParam)
+ return exp;
+
  //projection null is handled by EF
  if (arg.MapType != MapType.Projection)
  exp = source.NotNullReturn(exp,arg);
@@ -448,9 +451,10 @@ protected virtual Expression CreateInstantiationExpression(Expression source, Ex
  }
  }
 
- internal static Expression CreateAdaptExpressionCore(Expression source, Type destinationType, CompileArgument arg, MemberMapping? mapping = null, Expression? destination = null)
+ internal static Expression CreateAdaptExpressionCore(Expression source, Type destinationType, CompileArgument arg, MemberMapping? mapping = null, Expression? destination = null, MapType? mapTypeCtor = null)
  {
- var mapType = arg.MapType == MapType.MapToTarget && destination == null ? MapType.Map :
+ var mapType = mapTypeCtor != null ? mapTypeCtor.Value:
+ arg.MapType == MapType.MapToTarget && destination == null ? MapType.Map :
  mapping?.UseDestinationValue == true ? MapType.MapToTarget :
  arg.MapType;
  var extraParams = new HashSet<ParameterExpression>();

src/Mapster.Core/Enums/MapType.cs

@@ -9,5 +9,6 @@ public enum MapType
  MapToTarget = 2,
  Projection = 4,
  ApplyNullPropagation = 8,
+ CtorParam = 16,
  }
 }

src/Mapster.EF6/TypeAdapterBuilderExtensions.cs

@@ -60,10 +60,10 @@ public static ITypeAdapterBuilder<TSource> EntityFromContext<TSource>(this IType
  var getters = keys.Select(key => arg.DestinationType.GetProperty(key))
  .Select(prop => new PropertyModel(prop))
  .Select(model => arg.Settings.ValueAccessingStrategies
- .Select(s => s(src, model, arg))
+ .Select(s => s((ResolverSourceInput)src, model, arg))
  .FirstOrDefault(exp => exp != null))
  .Where(exp => exp != null)
- .Select(exp => Expression.Convert(exp, typeof(object)))
+ .Select(exp => Expression.Convert(exp.Exp, typeof(object)))
  .ToArray();
  if (getters.Length != keys.Length)
  throw new InvalidOperationException($"Cannot get key for sourceType={arg.SourceType.Name}, destinationType={arg.DestinationType.Name}");

src/Mapster.EFCore/TypeAdapterBuilderExtensions.cs

@@ -66,10 +66,10 @@ public static ITypeAdapterBuilder<TSource> EntityFromContext<TSource>(this IType
  var getters = keys.Select(key => arg.DestinationType.GetProperty(key))
  .Select(prop => new PropertyModel(prop!))
  .Select(model => arg.Settings.ValueAccessingStrategies
- .Select(s => s(src, model, arg))
+ .Select(s => s((ResolverSourceInput)src, model, arg))
  .FirstOrDefault(exp => exp != null))
  .Where(exp => exp != null)
- .Select(exp => Expression.Convert(exp, typeof(object)))
+ .Select(exp => Expression.Convert(exp.Exp, typeof(object)))
  .ToArray();
  if (getters.Length != keys.Length)
  throw new InvalidOperationException($"Cannot get key for sourceType={arg.SourceType.Name}, destinationType={arg.DestinationType.Name}");

src/Mapster.Tests/WhenMapUsingOverrideTypesSettings.cs

@@ -2,6 +2,7 @@
 using Shouldly;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Mapster.Tests
 {
@@ -82,8 +83,203 @@ public void UsingDefaultValueIsWorked()
  resultCDInsaiderReconfig.Data.ShouldBe(35);
  }
 
+ [TestMethod]
+ public void CustomDefaultValueIsWorkedWhenUsingAsCtorParam()
+ {
+ var config = new TypeAdapterConfig();
+
+ config.ForDestinationType<int?>()
+ .DefaultValue(x => 42);
+
+ config.
+ NewConfig<NullableIntInsaider, NullableIntCtorParam>()
+ .MapUsing(dest => dest.Data, src => src.Data, cfg =>
+ {
+ cfg.ReConfigurate()
+ .DefaultValue(x => 35);
+ });
+
+ var src = new NullableIntInsaider() { Data = null };
+
+ var result = src.Adapt<NullableIntCtorParam>(config);
+
+ result.Data.ShouldBe(35);
+ }
+
+ [TestMethod]
+ public void ExtraSourceUsingCustomConfig()
+ {
+ var config = new TypeAdapterConfig();
+ config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);
+ config.NewConfig<SourceFlattentInsaider, DestinationFlattentData>()
+ .MapUsing(dest=> dest, src => src.SrcData, cfg =>
+ {
+ cfg.SkipDestinationTransforms()
+ .ReConfigurate()
+ .Map(dest=>dest.Data, src => 42)
+ .MapUsing(dest => dest.Collection, src => src.Collection, cfg =>
+ {
+ cfg
+ .SkipDestinationTransforms();
+ })
+ ;
+ });
+
+ var src = new SourceFlattentInsaider() { SrcData = new() { Value = "Hello" } };
+
+ var result = src.Adapt<DestinationFlattentData>(config);
+
+ result.Collection.ShouldBeNull();
+ result.Data.ShouldBe(42);
+ }
+
+
+ [TestMethod]
+ public void ReMapSettersIsWorked()
+ {
+ var config = new TypeAdapterConfig();
+ config.Default.AddDestinationTransform(DestinationTransform.EmptyCollectionIfNull);
+ config.ForDestinationType<DestinationFlattentData>()
+ .Ignore(x => x.Value)
+ .Ignore(x => x.Data);
+ config.NewConfig<SourceFlattentInsaider, DestinationFlattentData>()
+ .ReMap(dest => dest, src => src.SrcData, true);
+ config.NewConfig<RemapMemberMappings, DestinationFlattentData>()
+ .ReMap(dest => dest.Data, src => src.Data);
+
+ var src = new SourceFlattentInsaider() { SrcData = new() { Value = "Hello", Data = 42 } };
+ var reMapSrc = new RemapMemberMappings { Data = 21, Value = "World" };
+
+
+
+ var result = src.Adapt<DestinationFlattentData>(config);
+
+ result.Collection.ShouldBeNull();
+ result.Value.ShouldBe("Hello");
+ result.Data.ShouldBe(42);
+
+ var reMapResut = reMapSrc.Adapt<DestinationFlattentData>(config);
+
+ reMapResut.Data.ShouldBe(21);
+ reMapResut.Value.ShouldBe(default);
+ }
+
+ [TestMethod]
+ public void ApplyPropagantionUsingDeepSrcAnalize()
+ {
+ var config = new TypeAdapterConfig();
+
+ config.NewConfig<Source1004, Destination1004>()
+ .Map(dest => dest.ProductNames, src => src.Products.Select(x => x.Name).ToArray());
+
+ config.NewConfig<Source1004, DestinationCtor1004>()
+ .Map(dest => dest.ProductNames, src => src.Products.Select(x => x.Name).ToArray());
+
+ config.NewConfig<NullableStrings, NullableStringsDest>()
+ .Map(dest => dest.Result, src => $"{src.Value1.ToString()}");
+
+ config.NewConfig<NullableStrings, NullableStringsDestCtor>()
+ .Map(dest => dest.Result, src => $"{src.Value1.ToString()}");
+
+ var src = new Source1004();
+ var srcStrings = new NullableStrings();
+
+ //var str = src.BuildAdapter(config).CreateMapExpression<DestinationCtor1004>();
+ //var str2 = src.BuildAdapter(config).CreateMapExpression<NullableStringsDestCtor>();
+
+ Should.NotThrow(() =>
+ {
+ src.Adapt<Destination1004>(config);
+ src.Adapt<DestinationCtor1004>(config);
+
+ srcStrings.Adapt<NullableStringsDest>(config);
+ srcStrings.Adapt<NullableStringsDestCtor>(config);
+ });
+ }
+
  #region TestClasses
 
+ class Source1004
+ {
+ public Product1004[]? Products { get; set; }
+ }
+
+ class Product1004
+ {
+ public required string Name { get; set; }
+ }
+
+ class Destination1004
+ {
+ public string[]? ProductNames { get; set; }
+ }
+
+ class DestinationCtor1004
+ {
+ public DestinationCtor1004(string[]? productNames)
+ {
+ ProductNames = productNames;
+ }
+
+ public string[]? ProductNames { get; }
+ }
+
+ public class NullableStrings
+ {
+ public string Value1 { get; set; }
+
+ public string Value2 { get; set; }
+ }
+
+ public class NullableStringsDest
+ {
+ public string Result { get; set; }
+ }
+ public class NullableStringsDestCtor
+ {
+ public NullableStringsDestCtor(string result)
+ {
+ Result = result;
+ }
+
+ public string Result { get;}
+ }
+
+ public class RemapMemberMappings
+ {
+ public int Data { get; set; }
+ public string Value { get; set; }
+ }
+
+ public class DestinationFlattentData
+ {
+ public int Data { get; set; }
+ public string Value { get; set; }
+ public List<string> Collection { get; set; }
+ }
+
+ public class SourceFlattentData
+ {
+ public int Data { get; set; }
+ public string Value { get; set; }
+ public List<string> Collection { get; set; }
+ }
+
+ public class SourceFlattentInsaider
+ {
+ public SourceFlattentData SrcData { get; set; }
+ }
+
+ public class NullableIntCtorParam
+ {
+ public NullableIntCtorParam(int? data)
+ {
+ Data = data;
+ }
+ public int? Data { get; }
+ }
+
+
  public class NullableIntInsaider
  {
  public int? Data { get; set; }

src/Mapster/Adapters/BaseAdapter.cs

@@ -208,7 +208,7 @@ protected Expression CreateBlockExpressionBody(Expression source, Expression? de
  /// Not create destination is abstract type if source is null
  if (arg.DestinationType.IsAbstract)
  blocks.Add(Expression.IfThen(Expression.Equal(source, Expression.Constant(null, arg.SourceType)), 
- Expression.Return(label, Expression.Default(arg.DestinationType))));
+ Expression.Return(label, arg.DestinationType.CreateDefault(arg))));
 
  //new TDest();
  Expression transformedSource = source;
@@ -388,6 +388,9 @@ private static Expression InvokeMapping(
  if (exp == null)
  return null;
 
+ if(arg.MapType == MapType.CtorParam)
+ return exp;
+
  //projection null is handled by EF
  if (arg.MapType != MapType.Projection)
  exp = source.NotNullReturn(exp,arg);
@@ -448,9 +451,10 @@ protected virtual Expression CreateInstantiationExpression(Expression source, Ex
  }
  }
 
- internal static Expression CreateAdaptExpressionCore(Expression source, Type destinationType, CompileArgument arg, MemberMapping? mapping = null, Expression? destination = null)
+ internal static Expression CreateAdaptExpressionCore(Expression source, Type destinationType, CompileArgument arg, MemberMapping? mapping = null, Expression? destination = null, MapType? mapTypeCtor = null)
  {
- var mapType = arg.MapType == MapType.MapToTarget && destination == null ? MapType.Map :
+ var mapType = mapTypeCtor != null ? mapTypeCtor.Value:
+ arg.MapType == MapType.MapToTarget && destination == null ? MapType.Map :
  mapping?.UseDestinationValue == true ? MapType.MapToTarget :
  arg.MapType;
  var extraParams = new HashSet<ParameterExpression>();