Extend output overloads

ArchLeaders · Jul 11, 2023 · 4f768f5 · 4f768f5
1 parent 15ee7c0
commit 4f768f5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/src/ConfigFactory.Core/ConfigModule.cs b/src/ConfigFactory.Core/ConfigModule.cs
@@ -1,4 +1,5 @@
 using CommunityToolkit.Mvvm.ComponentModel;
+using ConfigFactory.Core.Attributes;
 using ConfigFactory.Core.Components;
 using ConfigFactory.Core.Models;
 using System.Linq.Expressions;
@@ -89,10 +90,13 @@ public void Save()
         JsonSerializer.Serialize(fs, (T)this);
     }
 
-    public bool Validate(out string? message)
+    public bool Validate() => Validate(out _, out _);
+    public bool Validate(out string? message) => Validate(out message, out _);
+    public bool Validate(out string? message, out (PropertyInfo? info, ConfigAttribute? attribute) target)
     {
         foreach ((var name, (var validate, var errorMessage)) in Validators) {
-            PropertyInfo propertyInfo = Properties[name].info;
+            target = Properties[name];
+            PropertyInfo propertyInfo = target.info!;
             if (validate(propertyInfo.GetValue(this)) is bool isValid) {
                 ValidationInterface?.SetValidationColor(propertyInfo, isValid ? SuccessColor : FailureColor);
 
@@ -103,6 +107,7 @@ public bool Validate(out string? message)
             }
         }
 
+        target = (null, null);
         message = "Validation Successful";
         return true;
     }

diff --git a/src/ConfigFactory.Core/IConfigModule.cs b/src/ConfigFactory.Core/IConfigModule.cs
@@ -1,5 +1,7 @@
-using ConfigFactory.Core.Components;
+using ConfigFactory.Core.Attributes;
+using ConfigFactory.Core.Components;
 using ConfigFactory.Core.Models;
+using System.Reflection;
 
 namespace ConfigFactory.Core;
 
@@ -37,10 +39,16 @@ public interface IConfigModule
     public void Save();
 
     /// <summary>
-    /// Validates the properties and sends the invalid error message to the output <paramref name="message"/>
+    /// Validates each property registered in the <see cref="Validators"/> collection
     /// </summary>
     /// <returns>
     /// <see langword="true"/> if the validation was successful; <see langword="false"/> if the validation failed
     /// </returns>
-    public bool Validate(out string? message);
+    public virtual bool Validate() => Validate(out _, out _);
+
+    /// <inheritdoc cref="Validate()"/>
+    public virtual bool Validate(out string? message) => Validate(out message, out _);
+
+    /// <inheritdoc cref="Validate()"/>
+    public bool Validate(out string? message, out (PropertyInfo? info, ConfigAttribute? attribute) target);
 }
diff --git a/src/ConfigFactory/ConfigFactory.cs b/src/ConfigFactory/ConfigFactory.cs
@@ -58,7 +58,7 @@ public static ConfigPageModel Append(this ConfigPageModel configPageModel, IConf
         }
 
         module.ValidationInterface = new ValidationInterface(configPageModel);
-        module.Validate(out _);
+        module.Validate();
 
         return configPageModel;
     }