fix class register can not use validate attribute, #116

Author: neuecc

sandbox/GeneratorSandbox/Program.cs

@@ -1,172 +1,14 @@
-using ConsoleAppFramework;
-using GeneratorSandbox;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using System.ComponentModel.DataAnnotations;
-using System.Numerics;
-using System.Text.Json;
-using System.Threading.Channels;
-using ZLogger;
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+using ConsoleAppFramework;
 
+args = ["show", "--aaa", "a", "--value", "10.2"];
 
-//args = "--first-arg invalid.email --second-arg 10".Split(' ');
+var app = ConsoleApp.Create();
+app.Add<Test>();
+app.Run(args);
 
-//ConsoleApp.Timeout = Timeout.InfiniteTimeSpan;
-
-
-
-
-//ConsoleApp.Run(args, (
-//    [Argument] DateTime dateTime, // Argument
-//    [Argument] Guid guidvalue,    // 
-//    int intVar,                   // required
-//    bool boolFlag,                // flag
-//    MyEnum enumValue,             // enum
-//    int[] array,                  // array
-//    MyClass obj,                  // object
-//    string optional = "abcde",    // optional
-//    double? nullableValue = null, // nullable
-//    params string[] paramsArray   // params
-//    ) => { });
-
-
-args = ["--mc", "{\"MyProperty\":100}"];
-
-ConsoleApp.Run(args, (MyClass mc) =>
-{
-    Console.WriteLine(mc.MyProperty);
-});
-
-public enum MyEnum
-{
-
-}
-
-public class MyClass
-{
-    public int MyProperty { get; set; }
-}
-
-// inject logger
-public class MyCommand(ILogger<MyCommand> logger, IOptions<PositionOptions> options)
-{
-    [Command("")]
-    public void Echo(string msg)
-    {
-        logger.ZLogTrace($"Binded Option: {options.Value.Title} {options.Value.Name}");
-        logger.ZLogInformation($"Message is {msg}");
-    }
-}
-
-
-
-public class PositionOptions
-{
-    public string Title { get; set; } = "";
-    public string Name { get; set; } = "";
-}
-
-
-
-
-
-[AttributeUsage(AttributeTargets.Parameter)]
-public class Vector3ParserAttribute : Attribute, IArgumentParser<Vector3>
-{
-    public static bool TryParse(ReadOnlySpan<char> s, out Vector3 result)
-    {
-        Span<Range> ranges = stackalloc Range[3];
-        var splitCount = s.Split(ranges, ',');
-        if (splitCount != 3)
-        {
-            result = default;
-            return false;
-        }
-
-        float x;
-        float y;
-        float z;
-        if (float.TryParse(s[ranges[0]], out x) && float.TryParse(s[ranges[1]], out y) && float.TryParse(s[ranges[2]], out z))
-        {
-            result = new Vector3(x, y, z);
-            return true;
-        }
-
-        result = default;
-        return false;
-    }
-}
-
-
-internal class DIFilter(string foo, int bar, ConsoleAppFilter next)
-    : ConsoleAppFilter(next)
-{
-    public override Task InvokeAsync(ConsoleAppContext context, CancellationToken cancellationToken)
-    {
-        var newContext = context with { State = 100 };
-
-        Console.Write("invoke:");
-        Console.Write(foo);
-        Console.Write(bar);
-        return Next.InvokeAsync(newContext, cancellationToken);
-    }
-}
-
-public class MiniDI : IServiceProvider
-{
-    System.Collections.Generic.Dictionary<Type, object> dict = new();
-
-    public void Register(Type type, object instance)
-    {
-        dict[type] = instance;
-    }
-
-    public object? GetService(Type serviceType)
-    {
-        return dict.TryGetValue(serviceType, out var instance) ? instance : null;
-    }
-}
-
-namespace ConsoleAppFramework
+public class Test
 {
-    partial class ConsoleApp
-    {
-        static async Task RunWithFilterAsync2(string commandName, string[] args, ConsoleAppFilter invoker)
-        {
-            using var posixSignalHandler = PosixSignalHandler.Register(Timeout);
-            try
-            {
-
-
-                await Task.Run(() => invoker.InvokeAsync(new ConsoleAppContext(commandName, args, null), posixSignalHandler.Token)).WaitAsync(posixSignalHandler.TimeoutToken);
-
-
-                await Task.Factory.StartNew(static state => Task.CompletedTask, 1983, default, TaskCreationOptions.DenyChildAttach, TaskScheduler.Default).Unwrap();
-
-
-
-            }
-            catch (Exception ex)
-            {
-                if (ex is OperationCanceledException)
-                {
-                    Environment.ExitCode = 130;
-                    return;
-                }
-
-                Environment.ExitCode = 1;
-                if (ex is ValidationException)
-                {
-                    LogError(ex.Message);
-                }
-                else
-                {
-                    LogError(ex.ToString());
-                }
-            }
-        }
-    }
+    public void Show(string aaa, [Range(0, 1)] double value) => ConsoleApp.Log($"{value}");
 }

src/ConsoleAppFramework/Emitter.cs

@@ -212,7 +212,14 @@ public void EmitRun(SourceBuilder sb, CommandWithId commandWithId, bool isRunAsy
                 {
                     sb.AppendLine();
                     sb.AppendLine("var validationContext = new System.ComponentModel.DataAnnotations.ValidationContext(\"\", null, null);");
-                    sb.AppendLine("var parameters = command.Method.GetParameters();");
+                    if (command.CommandMethodInfo == null)
+                    {
+                        sb.AppendLine("var parameters = command.Method.GetParameters();");
+                    }
+                    else
+                    {
+                        sb.AppendLine($"var parameters = typeof({command.CommandMethodInfo.TypeFullName}).GetMethod(\"{command.CommandMethodInfo.MethodName}\").GetParameters();");
+                    }
                     sb.AppendLine("System.Text.StringBuilder? errorMessages = null;");
                     for (int i = 0; i < command.Parameters.Length; i++)
                     {

tests/ConsoleAppFramework.GeneratorTests/RunTest.cs

@@ -89,4 +89,27 @@ public class Obj
 }
 """, "--foo 10 --bar aiueo --ft Grape --flag --half 1.3 --itt 99 --obj {\"Foo\":1999}", "10aiueoGrapeTrue1.3991999");
     }
+
+    [Fact]
+    public void ValidateClass()
+    {
+        var expected = """
+The field value must be between 0 and 1.
+
+
+""";
+
+        verifier.Execute("""
+var app = ConsoleApp.Create();
+app.Add<Test>();
+app.Run(args);
+
+public class Test
+{
+    public void Show(string aaa, [Range(0, 1)] double value) => ConsoleApp.Log($"{value}");
+}
+
+""", "show --aaa foo --value 100", expected);
+
+    }
 }