refactoring support .Inherits() and .Include() to map OpenGenerics

src/Mapster/TypeAdapterConfig.cs

@@ -13,8 +13,6 @@ namespace Mapster
 {
     public class TypeAdapterConfig
     {
-        public Type SourceType { get; protected set; }
-        public Type DestinationType { get; protected set; }
         public static List<TypeAdapterRule> RulesTemplate { get; } = CreateRuleTemplate();
         public static TypeAdapterConfig GlobalSettings { get; } = new TypeAdapterConfig();
 
@@ -150,9 +148,6 @@ public TypeAdapterSetter When(Func<PreCompileArgument, bool> canMap)
 		/// <returns></returns>
 		public TypeAdapterSetter<TSource, TDestination> NewConfig<TSource, TDestination>()
         {
-            this.SourceType = typeof(TSource);
-            this.DestinationType = typeof(TDestination);
-
             Remove(typeof(TSource), typeof(TDestination));
             return ForType<TSource, TDestination>();
         }
@@ -166,9 +161,6 @@ public TypeAdapterSetter<TSource, TDestination> NewConfig<TSource, TDestination>
 		/// <returns></returns>
 		public TypeAdapterSetter NewConfig(Type sourceType, Type destinationType)
         {
-            this.SourceType = sourceType;
-            this.DestinationType = destinationType;
-
             Remove(sourceType, destinationType);
             return ForType(sourceType, destinationType);
         }
@@ -182,9 +174,6 @@ public TypeAdapterSetter NewConfig(Type sourceType, Type destinationType)
 		/// <returns></returns>
 		public TypeAdapterSetter<TSource, TDestination> ForType<TSource, TDestination>()
         {
-            this.SourceType = typeof(TSource);
-            this.DestinationType = typeof(TDestination);
-
             var key = new TypeTuple(typeof(TSource), typeof(TDestination));
             var settings = GetSettings(key);
             return new TypeAdapterSetter<TSource, TDestination>(settings, this);
@@ -199,9 +188,6 @@ public TypeAdapterSetter<TSource, TDestination> ForType<TSource, TDestination>()
 		/// <returns></returns>
 		public TypeAdapterSetter ForType(Type sourceType, Type destinationType)
         {
-            this.SourceType = sourceType;
-            this.DestinationType = destinationType;
-
             var key = new TypeTuple(sourceType, destinationType);
             var settings = GetSettings(key);
             return new TypeAdapterSetter(settings, this);
@@ -215,9 +201,6 @@ public TypeAdapterSetter ForType(Type sourceType, Type destinationType)
 		/// <returns></returns>
 		public TypeAdapterSetter<TDestination> ForDestinationType<TDestination>()
         {
-            this.SourceType = typeof(void);
-            this.DestinationType = typeof(TDestination);
-
             var key = new TypeTuple(typeof(void), typeof(TDestination));
             var settings = GetSettings(key);
             return new TypeAdapterSetter<TDestination>(settings, this);
@@ -231,9 +214,6 @@ public TypeAdapterSetter<TDestination> ForDestinationType<TDestination>()
 		/// <returns></returns>
 		public TypeAdapterSetter ForDestinationType(Type destinationType)
         {
-            this.SourceType = typeof(void);
-            this.DestinationType = destinationType;
-
             var key = new TypeTuple(typeof(void), destinationType);
             var settings = GetSettings(key);
             return new TypeAdapterSetter(settings, this);
@@ -249,6 +229,10 @@ private TypeAdapterSettings GetSettings(TypeTuple key)
                 Rules.LockAdd(r);
                 return r;
             });
+
+            rule.Settings.SourceType = key.Source;
+            rule.Settings.DestinationType = key.Destination;
+
             return rule.Settings;
         }
 

src/Mapster/TypeAdapterSetter.cs

@@ -1,10 +1,10 @@
-using System;
+using Mapster.Adapters;
+using Mapster.Models;
+using Mapster.Utils;
+using System;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
-using Mapster.Adapters;
-using Mapster.Models;
-using Mapster.Utils;
 
 namespace Mapster
 {
@@ -273,8 +273,8 @@ public static TSetter Include<TSetter>(this TSetter setter, Type sourceType, Typ
         {
             setter.CheckCompiled();
 
-            Type baseSourceType = setter.Config.SourceType;
-            Type baseDestinationType = setter.Config.DestinationType;
+            Type baseSourceType = setter.Settings.SourceType ?? typeof(void);
+            Type baseDestinationType = setter.Settings.DestinationType ?? typeof(void);
 
             if (baseSourceType.IsOpenGenericType() && baseDestinationType.IsOpenGenericType())
             {
@@ -291,8 +291,7 @@ public static TSetter Include<TSetter>(this TSetter setter, Type sourceType, Typ
                 if (!baseDestinationType.GetTypeInfo().IsAssignableFrom(destType.GetTypeInfo()))
                     throw new InvalidCastException("In order to use inherits, TDestination must be inherited from TBaseDestination.");
             }
-
-
+
             setter.Config.Rules.LockAdd(new TypeAdapterRule
             {
                 Priority = arg =>
@@ -310,8 +309,8 @@ public static TSetter Inherits<TSetter>(this TSetter setter, Type baseSourceType
         {
             setter.CheckCompiled();
 
-            Type derivedSourceType = setter.Config.SourceType;
-            Type derivedDestinationType = setter.Config.DestinationType;
+            Type derivedSourceType = setter.Settings.SourceType ?? typeof(void);
+            Type derivedDestinationType = setter.Settings.DestinationType ?? typeof(void);
 
             if(baseSourceType.IsOpenGenericType() && baseDestinationType.IsOpenGenericType())
             {

src/Mapster/TypeAdapterSettings.cs

@@ -10,6 +10,16 @@ namespace Mapster
     [AdaptWith(AdaptDirectives.DestinationAsRecord)]
     public class TypeAdapterSettings : SettingStore
     {
+        public Type? SourceType 
+        {
+            get => Get<Type>(nameof(SourceType));
+            set => Set(nameof(SourceType), value);
+        }
+        public Type? DestinationType
+        {
+            get => Get<Type>(nameof(DestinationType));
+            set => Set(nameof(DestinationType), value);
+        }
         public IgnoreDictionary Ignore
         {
             get => Get(nameof(Ignore), () => new IgnoreDictionary());