Merge remote-tracking branch 'origin/main' into feature/refactoring

# Conflicts: # Assets/BetterValidation/Editor/EditorAddons/Handlers/ClampWrapper.cs # Assets/BetterValidation/Editor/EditorAddons/Handlers/ClampWrapper.cs.meta # Assets/BetterValidation/Editor/EditorAddons/Handlers/MaxWrapper.cs # Assets/BetterValidation/Editor/EditorAddons/Handlers/MaxWrapper.cs.meta # Assets/BetterValidation/Editor/EditorAddons/Utility/ValidationAttributeBinder.cs
techno-dwarf-works · Aug 3, 2024 · d37f79c · d37f79c
2 parents 6d3d801 + 400f7c1
commit d37f79c
Show file tree

Hide file tree

Showing 22 changed files with 193 additions and 29 deletions.
diff --git a/Assets/BetterValidation/Editor/EditorAddons/Extensions.meta b/Assets/BetterValidation/Editor/EditorAddons/Extensions.meta
diff --git a/...s/Handlers/ValidationWrapperExtensions.cs → ...Extensions/ValidationWrapperExtensions.cs b/...s/Handlers/ValidationWrapperExtensions.cs → ...Extensions/ValidationWrapperExtensions.cs
@@ -1,6 +1,7 @@
 using System;
+using Better.Validation.EditorAddons.Handlers;
 
-namespace Better.Validation.EditorAddons.Handlers
+namespace Better.Validation.EditorAddons.Extensions
 {
     public static class ValidationWrapperExtensions
     {

diff --git a/...dlers/ValidationWrapperExtensions.cs.meta → ...sions/ValidationWrapperExtensions.cs.meta b/...dlers/ValidationWrapperExtensions.cs.meta → ...sions/ValidationWrapperExtensions.cs.meta
diff --git a/Assets/BetterValidation/Editor/EditorAddons/Handlers/ClampWrapper.cs b/Assets/BetterValidation/Editor/EditorAddons/Handlers/ClampWrapper.cs
@@ -0,0 +1,55 @@
+using System;
+using Better.Commons.EditorAddons.Extensions;
+using Better.Validation.Runtime.Attributes;
+using UnityEditor;
+using UnityEngine;
+
+namespace Better.Validation.EditorAddons.Handlers
+{
+    public class ClampWrapper : PropertyValidationHandler
+    {
+        public override bool IsSupported()
+        {
+            return Property.propertyType is SerializedPropertyType.Integer or SerializedPropertyType.Float;
+        }
+
+        public override ValidationValue<string> Validate()
+        {
+            var clampAttribute = (ClampAttribute)Attribute;
+            var minValue = clampAttribute.Min;
+            var maxValue = clampAttribute.Max;
+            float value;
+            switch (Property.propertyType)
+            {
+                case SerializedPropertyType.Float:
+                    value = Property.floatValue;
+                    break;
+                case SerializedPropertyType.Integer:
+                    value = Property.intValue;
+                    break;
+                default:
+                    return GetNotValidValue($"Property: {Property.displayName} has invalid type: {Property.propertyType}");
+            }
+
+            if (value >= minValue && value <= maxValue)
+            {
+                return GetClearValue();
+            }
+
+            value = Mathf.Clamp(value, minValue, maxValue);
+            switch (Property.propertyType)
+            {
+                case SerializedPropertyType.Float:
+                    Property.SetValue(value);
+                    break;
+                case SerializedPropertyType.Integer:
+                    Property.SetValue((int)value);
+                    break;
+            }
+
+            EditorUtility.SetDirty(Property.serializedObject.targetObject);
+            Property.serializedObject.ApplyModifiedProperties();
+            return GetClearValue();
+        }
+    }
+}
diff --git a/Assets/BetterValidation/Editor/EditorAddons/Handlers/ClampWrapper.cs.meta b/Assets/BetterValidation/Editor/EditorAddons/Handlers/ClampWrapper.cs.meta
diff --git a/Assets/BetterValidation/Editor/EditorAddons/Handlers/DataValidationHandler.cs b/Assets/BetterValidation/Editor/EditorAddons/Handlers/DataValidationHandler.cs
@@ -32,21 +32,21 @@ public override ValidationValue<string> Validate()
             var methodName = $"\"{att.MethodName.FormatBoldItalic()}\"";
             if (method == null)
             {
-                return GetNotValidCache($"Method with name {methodName} not found");
+                return GetNotValidValue($"Method with name {methodName} not found");
             }
 
             var parameters = method.GetParameters();
             if (parameters.Length > 1)
             {
-                return GetNotValidCache($"Method with name {methodName} has {parameters.Length}. It's not supported");
+                return GetNotValidValue($"Method with name {methodName} has {parameters.Length}. It's not supported");
             }
 
             var parameterInfo = parameters[0];
             var parameterType = parameterInfo.ParameterType;
             var fieldCacheType = fieldCache.Type;
             if (parameterType != fieldCacheType)
             {
-                return GetNotValidCache(
+                return GetNotValidValue(
                     $"Method with name {methodName} has parameter of type \"{parameterType.Name.FormatBoldItalic()}\". But used on field of type \"{fieldCacheType.Name.FormatBoldItalic()}\"");
             }
 
@@ -73,7 +73,7 @@ private ValidationValue<string> InvokeMethod(MethodInfo method, CachedFieldInfo
                 {
                     var fieldInfo = fieldCache.FieldInfo;
                     var name = fieldInfo.FieldType.IsArrayOrList() ? Property.GetArrayPath() : propertyContainer.GetType().Name;
-                    return GetNotValidCache(
+                    return GetNotValidValue(
                         $"Validation failed of \"{fieldInfo.Name.FormatBoldItalic()}\" in \"{name.FormatBoldItalic()}\"");
                 }
             }
@@ -82,11 +82,11 @@ private ValidationValue<string> InvokeMethod(MethodInfo method, CachedFieldInfo
                 var result = (string)method.Invoke(propertyContainer, parameters);
                 if (!string.IsNullOrEmpty(result))
                 {
-                    return GetNotValidCache(result);
+                    return GetNotValidValue(result);
                 }
             }
 
-            return GetClearCache();
+            return GetClearValue();
         }
 
         public override bool IsSupported()

diff --git a/Assets/BetterValidation/Editor/EditorAddons/Handlers/FindComponentHandler.cs b/Assets/BetterValidation/Editor/EditorAddons/Handlers/FindComponentHandler.cs
@@ -22,7 +22,7 @@ public override ValidationValue<string> Validate()
             {
                 if (obj)
                 {
-                    return GetClearCache();
+                    return GetClearValue();
                 }
             }
 
@@ -50,13 +50,13 @@ public override ValidationValue<string> Validate()
 
             if (!obj)
             {
-                return GetNotValidCache($"Reference of \"{requiredType.Name.FormatBoldItalic()}\" not found");
+                return GetNotValidValue($"Reference of \"{requiredType.Name.FormatBoldItalic()}\" not found");
             }
 
             EditorUtility.SetDirty(targetObject);
             Property.objectReferenceValue = obj;
             propertySerializedObject.ApplyModifiedProperties();
-            return GetClearCache();
+            return GetClearValue();
         }
 
         protected Type GetFieldOrElementType()

diff --git a/Assets/BetterValidation/Editor/EditorAddons/Handlers/MaxWrapper.cs b/Assets/BetterValidation/Editor/EditorAddons/Handlers/MaxWrapper.cs
@@ -0,0 +1,52 @@
+using System;
+using Better.Commons.EditorAddons.Extensions;
+using Better.Validation.Runtime.Attributes;
+using UnityEditor;
+
+namespace Better.Validation.EditorAddons.Handlers
+{
+    public class MaxWrapper : PropertyValidationHandler
+    {
+        public override bool IsSupported()
+        {
+            return Property.propertyType is SerializedPropertyType.Integer or SerializedPropertyType.Float;
+        }
+
+        public override ValidationValue<string> Validate()
+        {
+            var maxAttribute = (MaxAttribute)Attribute;
+            var maxValue = maxAttribute.Max;
+            bool isValid;
+            switch (Property.propertyType)
+            {
+                case SerializedPropertyType.Float:
+                    isValid = Property.floatValue <= maxValue;
+                    break;
+                case SerializedPropertyType.Integer:
+                    isValid = Property.intValue <= maxValue;
+                    break;
+                default:
+                    return GetNotValidValue($"Property: {Property.displayName} has invalid type: {Property.propertyType}");
+            }
+
+            if (isValid)
+            {
+                return GetClearValue();
+            }
+
+            switch (Property.propertyType)
+            {
+                case SerializedPropertyType.Float:
+                    Property.SetValue(maxValue);
+                    break;
+                case SerializedPropertyType.Integer:
+                    Property.SetValue((int)maxValue);
+                    break;
+            }
+
+            EditorUtility.SetDirty(Property.serializedObject.targetObject);
+            Property.serializedObject.ApplyModifiedProperties();
+            return GetClearValue();
+        }
+    }
+}
diff --git a/Assets/BetterValidation/Editor/EditorAddons/Handlers/MaxWrapper.cs.meta b/Assets/BetterValidation/Editor/EditorAddons/Handlers/MaxWrapper.cs.meta
diff --git a/Assets/BetterValidation/Editor/EditorAddons/Handlers/MissingComponentHandler.cs b/Assets/BetterValidation/Editor/EditorAddons/Handlers/MissingComponentHandler.cs
@@ -16,18 +16,18 @@ public MissingComponentHandler(Object target)
 
         public override ValidationValue<string> Validate()
         {
-            if (!_target) return GetClearCache();
+            if (!_target) return GetClearValue();
             if (_target is GameObject gameObject)
             {
                 var components = gameObject.GetComponents<Component>();
                 for (var index = components.Length - 1; index >= 0; index--)
                 {
                     var obj = components[index];
-                    if (!obj) return GetNotValidCache($"Missing Component on GameObject: {_target.name}");
+                    if (!obj) return GetNotValidValue($"Missing Component on GameObject: {_target.name}");
                 }
             }
 
-            return GetClearCache();
+            return GetClearValue();
         }
 
         public override bool IsSupported()

diff --git a/Assets/BetterValidation/Editor/EditorAddons/Handlers/MissingReferenceHandler.cs b/Assets/BetterValidation/Editor/EditorAddons/Handlers/MissingReferenceHandler.cs
@@ -12,11 +12,11 @@ public override ValidationValue<string> Validate()
                 var fieldName = $"\"{Property.displayName.FormatBoldItalic()}\"";
                 if (Property.objectReferenceInstanceIDValue != 0)
                 {
-                    return GetNotValidCache($"Object in {fieldName} field is missing reference");
+                    return GetNotValidValue($"Object in {fieldName} field is missing reference");
                 }
             }
 
-            return GetClearCache();
+            return GetClearValue();
         }
 
         public override bool IsSupported()

diff --git a/Assets/BetterValidation/Editor/EditorAddons/Handlers/NotNullHandler.cs b/Assets/BetterValidation/Editor/EditorAddons/Handlers/NotNullHandler.cs
@@ -12,13 +12,13 @@ public override ValidationValue<string> Validate()
                 var fieldName = $"\"{Property.displayName.FormatBoldItalic()}\"";
                 if (Property.objectReferenceInstanceIDValue != 0)
                 {
-                    return GetNotValidCache($"Object in {fieldName} field is missing reference");
+                    return GetNotValidValue($"Object in {fieldName} field is missing reference");
                 }
 
-                return GetNotValidCache($"Object in {fieldName} field is null");
+                return GetNotValidValue($"Object in {fieldName} field is null");
             }
 
-            return GetClearCache();
+            return GetClearValue();
         }
 
         public override bool IsSupported()

diff --git a/Assets/BetterValidation/Editor/EditorAddons/Handlers/PrefabHandler.cs b/Assets/BetterValidation/Editor/EditorAddons/Handlers/PrefabHandler.cs
@@ -19,13 +19,13 @@ public override ValidationValue<string> Validate()
                 var str = $"\"{Property.displayName.FormatBoldItalic()}\"";
                 if (!PrefabUtility.IsPartOfNonAssetPrefabInstance(obj))
                 {
-                    return GetNotValidCache($"Object in {str} field is not prefab");
+                    return GetNotValidValue($"Object in {str} field is not prefab");
                 }
 
-                return GetNotValidCache($"Object in {str} field is prefab instance in scene");
+                return GetNotValidValue($"Object in {str} field is prefab instance in scene");
             }
 
-            return GetClearCache();
+            return GetClearValue();
         }
     }
 }
diff --git a/Assets/BetterValidation/Editor/EditorAddons/Handlers/SceneReferenceHandler.cs b/Assets/BetterValidation/Editor/EditorAddons/Handlers/SceneReferenceHandler.cs
@@ -29,15 +29,15 @@ private ValidationValue<string> ValidateNotPrefabContext(Object obj, Object targ
             if (isTargetInScene && !isObjectInScene)
             {
                 var str = $"\"{Property.displayName.FormatBoldItalic()}\"";;
-                return GetNotValidCache($"Object in {str} field is not scene object");
+                return GetNotValidValue($"Object in {str} field is not scene object");
             }
 
             if (!isTargetInScene)
             {
                 return ValueTuple(obj, target);
             }
 
-            return GetClearCache();
+            return GetClearValue();
         }
 
         private bool IsObjectInScene(Object obj)
@@ -62,11 +62,11 @@ private ValidationValue<string> ValueTuple(Object obj, Object target)
             var equals = objRoot == targetRoot;
             if (!equals)
             {
-                return GetNotValidCache(
+                return GetNotValidValue(
                     $"Object in \"{Property.displayName.FormatBoldItalic()}\" field is not part of \"{target.name.FormatBoldItalic()}\" prefab");
             }
 
-            return GetClearCache();
+            return GetClearValue();
         }
 
         private static Object GetOutermostPrefabInstanceRoot(Object obj)

diff --git a/Assets/BetterValidation/Editor/EditorAddons/Handlers/ValidationHandler.cs b/Assets/BetterValidation/Editor/EditorAddons/Handlers/ValidationHandler.cs
@@ -13,13 +13,13 @@ public abstract class ValidationHandler : SerializedPropertyHandler
 
         public abstract bool IsSupported();
 
-        public static ValidationValue<string> GetNotValidCache(string value)
+        public static ValidationValue<string> GetNotValidValue(string value)
         {
             ValidationValue.Set(false, value);
             return ValidationValue;
         }
 
-        public static ValidationValue<string> GetClearCache()
+        public static ValidationValue<string> GetClearValue()
         {
             ValidationValue.Set(true, string.Empty);
             return ValidationValue;

diff --git a/Assets/BetterValidation/Editor/EditorAddons/Iteration/IteratorFilter.cs b/Assets/BetterValidation/Editor/EditorAddons/Iteration/IteratorFilter.cs
@@ -5,6 +5,7 @@
 using Better.Commons.EditorAddons.Drawers.Handlers;
 using Better.Commons.EditorAddons.Extensions;
 using Better.Commons.Runtime.Extensions;
+using Better.Validation.EditorAddons.Extensions;
 using Better.Validation.EditorAddons.Handlers;
 using Better.Validation.Runtime.Attributes;
 
@@ -37,7 +38,7 @@ public static IEnumerable<ValidationCommandData> PropertyIterationWithAttributes
 
                 propertyHandler.Setup(data.Property, fieldInfo.FieldInfo, validationAttribute);
 
-                var result = handler.IsSupported() ? handler.Validate() : ValidationHandler.GetClearCache();
+                var result = handler.IsSupported() ? handler.Validate() : ValidationHandler.GetClearValue();
 
                 if (result.State) continue;
 

diff --git a/Assets/BetterValidation/Editor/EditorAddons/Utility/ValidationAttributeBinder.cs b/Assets/BetterValidation/Editor/EditorAddons/Utility/ValidationAttributeBinder.cs
@@ -20,6 +20,8 @@ protected override BaseHandlersTypeCollection GenerateCollection()
                 { typeof(SceneReferenceAttribute), typeof(SceneReferenceHandler) },
                 { typeof(FindAttribute), typeof(FindComponentHandler) },
                 { typeof(DataValidationAttribute), typeof(DataValidationHandler) },
+                { typeof(MaxAttribute), typeof(MaxWrapper) },
+                { typeof(ClampAttribute), typeof(ClampWrapper) },
             };
         }
 

diff --git a/Assets/BetterValidation/Runtime/Attributes/ClampAttribute.cs b/Assets/BetterValidation/Runtime/Attributes/ClampAttribute.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Diagnostics;
+using Better.Internal.Core.Runtime;
+
+namespace Better.Validation.Runtime.Attributes
+{
+    [Conditional(Defines.Editor)]
+    [AttributeUsage(AttributeTargets.Field)]
+    public class ClampAttribute : ValidationAttribute
+    {
+        public float Min { get; }
+        public float Max { get; }
+
+        public ClampAttribute(float min, float max)
+        {
+            Min = min;
+            Max = max;
+        }
+    }
+}
diff --git a/Assets/BetterValidation/Runtime/Attributes/ClampAttribute.cs.meta b/Assets/BetterValidation/Runtime/Attributes/ClampAttribute.cs.meta
diff --git a/Assets/BetterValidation/Runtime/Attributes/MaxAttribute.cs b/Assets/BetterValidation/Runtime/Attributes/MaxAttribute.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Diagnostics;
+using Better.Internal.Core.Runtime;
+
+namespace Better.Validation.Runtime.Attributes
+{
+    [Conditional(Defines.Editor)]
+    [AttributeUsage(AttributeTargets.Field)]
+    public class MaxAttribute : ValidationAttribute
+    {
+        public float Max { get; }
+
+        public MaxAttribute(float max)
+        {
+            Max = max;
+        }
+    }
+}