Revert "Improvements for Mapster Tool "

Author: DocSvartz

src/ExpressionTranslator/ExpressionTranslator.cs

@@ -11,7 +11,6 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Xml.Linq;
 
 namespace ExpressionDebugger
 {
@@ -1269,88 +1268,6 @@ public Expression VisitLambda(LambdaExpression node, LambdaType type, string? me
             }
         }
 
-        public Expression VisitLambdaForGenerateMappers(LambdaExpression node, LambdaType type, Type InterfaceType, string? methodName = null,
-           bool isInternal = false)
-        {
-            VisitLambda(node, type, methodName, isInternal);
-
-            if (!isInternal)
-                isInternal = node.ReturnType.GetTypeInfo().IsNotPublic ||
-                             node.Parameters.Any(it => it.Type.GetTypeInfo().IsNotPublic);
-
-            if(!isInternal)
-                return node; // skip create interface implimentation if public only
-
-            if (type == LambdaType.PrivateLambda || type == LambdaType.PublicLambda)
-            {
-                _inlineCount++;
-                if (type == LambdaType.PublicLambda)
-                {
-                    var name = methodName != null ? $"{InterfaceType.FullName}.{methodName}" : "Main";
-                    WriteLine();
-                    var funcType = MakeDelegateType(node.ReturnType, node.Parameters.Select(it => it.Type).ToArray());
-                    var exprType = typeof(Expression<>).MakeGenericType(funcType);
-                    Write(Translate(exprType), " ", name, " => ");
-                }
-
-                IList<ParameterExpression> args;
-                if (node.Parameters.Count == 1)
-                {
-                    args = new List<ParameterExpression>();
-                    var arg = VisitParameter(node.Parameters[0]);
-                    args.Add((ParameterExpression)arg);
-                }
-                else
-                {
-                    args = VisitArguments("(", node.Parameters.ToList(), p => (ParameterExpression)VisitParameter(p),
-                        ")");
-                }
-
-                Write(" => ");
-                var body = VisitGroup(node.Body, ExpressionType.Quote);
-                if (type == LambdaType.PublicLambda)
-                    Write(";");
-                _inlineCount--;
-                return Expression.Lambda(body, node.Name, node.TailCall, args);
-            }
-            else
-            {
-                var name = methodName != null ? $"{InterfaceType.FullName}.{methodName}" : "Main";
-                if (type == LambdaType.PublicMethod || type == LambdaType.ExtensionMethod)
-                {
-                    if (!isInternal)
-                        isInternal = node.ReturnType.GetTypeInfo().IsNotPublic ||
-                                     node.Parameters.Any(it => it.Type.GetTypeInfo().IsNotPublic);
-                    WriteLine();
-                    Methods[name] = node.Type;
-                }
-                else
-                {
-                    name = GetName(node, name);
-                    WriteModifierNextLine("private");
-                }
-
-                Write(Translate(node.ReturnType), " ", name);
-                var open = "(";
-                if (type == LambdaType.ExtensionMethod)
-                {
-                    if (Definitions?.IsStatic != true)
-                        throw new InvalidOperationException("Extension method requires static class");
-                    if (node.Parameters.Count == 0)
-                        throw new InvalidOperationException("Extension method requires at least 1 parameter");
-                    open = "(this ";
-                }
-
-                var args = VisitArguments(open, node.Parameters, VisitParameterDeclaration, ")");
-                Indent();
-                var body = VisitBody(node.Body, true);
-
-                Outdent();
-
-                return Expression.Lambda(body, name, node.TailCall, args);
-            }
-        }
-
         private HashSet<LambdaExpression>? _visitedLambda;
         private int _writerLevel;
 
@@ -1948,15 +1865,8 @@ public override string ToString()
                             WriteNextLine("using ", ns, ";");
                         }
 
-                    }
-
-                    foreach (var ns in Definitions.GeneratedAttributes.Select(x => x.NameSpace).Distinct())
-                    {
-                        WriteNextLine("using ", ns, ";");
-                    }
-
-                    if(_usings != null || Definitions.GeneratedAttributes.Count != 0)
                         WriteLine();
+                    }
 
                     // NOTE: type alias cannot solve all name conflicted case, user should use PrintFullTypeName
                     // keep logic here for compatibility
@@ -1981,11 +1891,6 @@ public override string ToString()
                         Indent();
                     }
 
-                    foreach (var gAttr in Definitions.GeneratedAttributes)
-                    {
-                        WriteNextLine(gAttr.Implimentation);
-                    }
-
                     var isInternal = Definitions.IsInternal;
                     if (!isInternal)
                         isInternal = Definitions.Implements?.Any(it =>

src/ExpressionTranslator/Helpers/GeneratedAttributes/IGeneratedAttribute.cs

@@ -1,5 +1,4 @@
-using ExpressionDebugger.Helpers.GeneratedAttributes;
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace ExpressionDebugger
@@ -13,7 +12,6 @@ public class TypeDefinitions
         public IEnumerable<Type>? Implements { get; set; }
         public bool PrintFullTypeName { get; set; }
         public bool IsRecordType { get; set; }
-        public HashSet<IGeneratedAttribute> GeneratedAttributes { get; set; } = new HashSet<IGeneratedAttribute>();
 
         /// <summary>
         /// Set to 2 to mark all properties as nullable

src/ExpressionTranslator/Helpers/GeneratedAttributes/MapsterToolGeneratedMapperAttribute.cs

@@ -28,13 +28,6 @@ public class MapperOptions
         [Option('N', "nullableDirective", Required = false, HelpText = "Set true to add \"#nullable enable\" to the top of generated mapper files")]
         public bool GenerateNullableDirective { get; set; }
 
-        [Option('h', "helpersCreate", Required = false, HelpText = "Generate helpers features")]
-        public bool CreateHelpers { get; set; }
-
-        [Option('H', "helpersNamespace", Required = false, HelpText = "Specify additional namespace to generated helpers features")]
-        public string? HelpersNamespace { get; set; }
-               
-
         [Usage(ApplicationAlias = "dotnet mapster mapper")]
         public static IEnumerable<Example> Examples =>
             new List<Example>