refactoring

Author: DocSvartz

src/Mapster.Core/Utils/ProjectToTypeVisitors.cs

@@ -0,0 +1,49 @@
+using System.Collections.Generic;
+using System.Linq.Expressions;
+
+namespace Mapster.Utils
+{
+    public sealed class TopLevelMemberNameVisitor : ExpressionVisitor
+    {
+        public string? MemeberName { get; private set; }
+
+        public override Expression Visit(Expression node)
+        {
+            if (node == null)
+                return null;
+            switch (node.NodeType)
+            {
+                case ExpressionType.MemberAccess:
+                    {
+                        if (string.IsNullOrEmpty(MemeberName))
+                            MemeberName = ((MemberExpression)node).Member.Name;
+
+                        return base.Visit(node);
+                    }
+            }
+
+            return base.Visit(node);
+        }
+    }
+
+    public sealed class QuoteVisiter : ExpressionVisitor
+    {
+        public List<UnaryExpression> Quotes { get; private set; } = new();
+
+        public override Expression Visit(Expression node)
+        {
+            if (node == null)
+                return null;
+            switch (node.NodeType)
+            {
+                case ExpressionType.Quote:
+                    {
+                        Quotes.Add((UnaryExpression)node);
+                        return base.Visit(node);
+                    }
+            }
+
+            return base.Visit(node);
+        }
+    }
+}

src/Mapster.Core/Utils/TopLevelMemeberNameVisiter.cs

@@ -1,10 +1,10 @@
 using Mapster.Enums;
 using Mapster.Models;
+using Mapster.Utils;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Linq.Expressions;
-using Mapster;
 
 namespace Mapster.EFCore
 {
@@ -13,9 +13,7 @@ public static class EFCoreExtensions
         public static IQueryable<TDestination> EFCoreProjectToType<TDestination>(this IQueryable source, 
             TypeAdapterConfig? config = null, ProjectToTypeAutoMapping autoMapConfig = ProjectToTypeAutoMapping.WithoutCollections)
         {
-
-            var allInclude = new IncludeVisiter();
-
+            var allInclude = new IncludeVisitor();
             allInclude.Visit(source.Expression);
 
             if (config == null)
@@ -27,13 +25,9 @@ public static IQueryable<TDestination> EFCoreProjectToType<TDestination>(this IQ
 
                 var mapTuple = new TypeTuple(source.ElementType, typeof(TDestination));
 
-              
                 TypeAdapterRule rule;
-
                 config.RuleMap.TryGetValue(mapTuple, out rule);
 
-
-
                 if(rule != null)
                 {
                     rule.Settings.ProjectToTypeMapConfig = autoMapConfig;
@@ -48,113 +42,55 @@ public static IQueryable<TDestination> EFCoreProjectToType<TDestination>(this IQ
                         }
                         else
                             rule.Settings.ProjectToTypeResolvers.TryAdd(item.Key, item.Value);
-
-
                     }
-
                 }
-
-
             }
             else
             {
                 config = config.Clone()
                     .ForType(source.ElementType, typeof(TDestination))
                     .Config;
             }
-                
-
+            
             return source.ProjectToType<TDestination>(config);
-
         }
-
     }
 
-    internal class IncludeVisiter : ExpressionVisitor
+
+    internal class IncludeVisitor : ExpressionVisitor
     {
+        public Dictionary<string, UnaryExpression> IncludeExpression { get; protected set; } = new();
+        private bool IsInclude(Expression node) => node.Type.Name.StartsWith("IIncludableQueryable");
+
         [return: NotNullIfNotNull("node")]
         public override Expression Visit(Expression node)
         {
             if (node == null)
                 return null;
+
             switch (node.NodeType)
             {
                 case ExpressionType.Call:
                     {
-                        if(IsInclude(node))
+                        if (IsInclude(node))
                         {
                             var QuoteVisiter = new QuoteVisiter();
                             QuoteVisiter.Visit(node);
 
                             foreach (var item in QuoteVisiter.Quotes)
                             {
-                                var memberv = new TopLevelMemeberNameVisiter();
+                                var memberv = new TopLevelMemberNameVisitor();
                                 memberv.Visit(item);
 
-                                IncludeExpression.TryAdd(memberv.Key, item);
-
+                                IncludeExpression.TryAdd(memberv.MemeberName, item);
                             }
-
-                            
                         }
                         return base.Visit(node);
                     }
             }
 
             return base.Visit(node);
         }
-
-        public Dictionary<string,UnaryExpression> IncludeExpression { get; protected set; } = new();
-        private bool IsInclude (Expression node) => node.Type.Name.StartsWith("IIncludableQueryable");
-
     }
 
-    internal class QuoteVisiter: ExpressionVisitor
-    {
-        public List<UnaryExpression> Quotes { get; private set; } = new();
-
-        public override Expression Visit(Expression node)
-        {
-            if (node == null)
-                return null;
-            switch (node.NodeType)
-            {
-                case ExpressionType.Quote:
-                    {
-                        Quotes.Add((UnaryExpression)node);
-                        return base.Visit(node);
-                    }
-            }
-
-            return base.Visit(node);
-
-        }
-    }
-
-    internal class TopLevelMemeberNameVisiter: ExpressionVisitor
-    {
-        public string? Key { get; private set; }
-
-        public override Expression Visit(Expression node)
-        {
-            
-
-            if (node == null)
-                return null;
-            switch (node.NodeType)
-            {
-                case ExpressionType.MemberAccess:
-                    {
-                        if (string.IsNullOrEmpty(Key))
-                            Key = ((MemberExpression)node).Member.Name;
-
-                        return base.Visit(node);
-                    }
-            }
-
-            return base.Visit(node);
-
-             
-        }
-    }
 }

src/Mapster.EFCore/EFCoreExtensions.cs

@@ -47,7 +47,7 @@ select fn(src, destinationMember, arg))
 
                     s.Visit(getter);
 
-                    var match = arg.Settings.ProjectToTypeResolvers.GetValueOrDefault(s.Key);
+                    var match = arg.Settings.ProjectToTypeResolvers.GetValueOrDefault(s.MemeberName);
 
                     if (match != null)
                     {

src/Mapster/Adapters/BaseClassAdapter.cs

@@ -86,9 +86,9 @@ protected override Expression CreateBlockExpression(Expression source, Expressio
             var kvpType = source.Type.ExtractCollectionType();
             var kvp = Expression.Variable(kvpType, "kvp");
             var key = Expression.Variable(keyType, "key");
-            var keyAssign = Expression.Assign(key, Expression.Property(kvp, "Key"));
+            var keyAssign = Expression.Assign(key, Expression.Property(kvp, "MemeberName"));
 
-            //dest[kvp.Key] = convert(kvp.Value);
+            //dest[kvp.MemeberName] = convert(kvp.Value);
             var set = CreateSetFromKvp(kvp, key, dict, arg);
             if (arg.Settings.NameMatchingStrategy.SourceMemberNameConverter != MapsterHelper.Identity)
             {
@@ -140,7 +140,7 @@ protected override Expression CreateBlockExpression(Expression source, Expressio
             }
 
             //if (kvp.Value != null)
-            //  dest[kvp.Key] = convert(kvp.Value);
+            //  dest[kvp.MemeberName] = convert(kvp.Value);
             var kvpValueType = kvpType.GetGenericArguments()[1];
             if (arg.Settings.IgnoreNullValues == true && kvpValueType.CanBeNull())
             {
@@ -152,7 +152,7 @@ protected override Expression CreateBlockExpression(Expression source, Expressio
             }
 
             //foreach (var kvp in source) {
-            //  dest[kvp.Key] = convert(kvp.Value);
+            //  dest[kvp.MemeberName] = convert(kvp.Value);
             //}
             set = Expression.Block(new[] { key }, keyAssign, set);
             var loop = ExpressionEx.ForEach(source, kvp, set);