com.wallstop-studios.unity-helpers 1.0.0-rc8 → 1.0.1-rc01

package/Editor/AnimationEventEditor.cs

@@ -139,11 +139,14 @@
             }
 
             frameRate = _currentClip.frameRate = EditorGUILayout.FloatField("FrameRate", frameRate);
+            DrawGuiLine(height: 5, color: new Color(0f, 0.5f, 1f, 1f));
             _scrollPosition = EditorGUILayout.BeginScrollView(_scrollPosition);
 
             // Need a copy because we might be mutating it
-            foreach (AnimationEventItem item in _state.ToList())
+            List<AnimationEventItem> stateCopy = _state.ToList();
+            for (int i = 0; i < stateCopy.Count; ++i)
             {
+                AnimationEventItem item = stateCopy[i];
                 AnimationEvent animEvent = item.animationEvent;
 
                 int frame = Mathf.RoundToInt(animEvent.time * oldFrameRate);
@@ -152,11 +155,15 @@
                 DrawSpritePreview(item);
 
                 EditorGUI.indentLevel++;
-
                 RenderAnimationEventItem(item, frame, frameRate);
-
+                
+                if (i != stateCopy.Count - 1)
+                {
+                    DrawGuiLine(height: 3, color: new Color(0f, 1f, 0.3f, 1f));
+                    EditorGUILayout.Space();
+                }
+                
                 EditorGUI.indentLevel--;
-                EditorGUILayout.Space();
             }
 
             EditorGUILayout.EndScrollView();
@@ -641,7 +648,7 @@
         private bool TryFindSpriteForEvent(AnimationEventItem item, out Sprite sprite)
         {
             sprite = null;
-            foreach (ObjectReferenceKeyframe keyFrame in _referenceCurve)
+            foreach (ObjectReferenceKeyframe keyFrame in _referenceCurve ?? Enumerable.Empty<ObjectReferenceKeyframe>())
             {
                 if (keyFrame.time <= item.animationEvent.time)
                 {
@@ -739,6 +746,15 @@
                 }
             }
         }
+
+        private void DrawGuiLine(int height = 1, Color? color = null)
+        {
+            Rect rect = EditorGUILayout.GetControlRect(false, height);
+            rect.height = height;
+            int minusWidth = EditorGUI.indentLevel * 16;
+            rect.xMin += minusWidth;
+            EditorGUI.DrawRect(rect, color ?? new Color(0.5f, 0.5f, 0.5f, 1f));
+        }
     }
 #endif
 }

package/Runtime/Core/Attributes/ChildComponentAttribute.cs

@@ -18,18 +18,20 @@
 
     public static class ChildComponentExtensions
     {
-        private static readonly Dictionary<Type, List<FieldInfo>> FieldsByType = new();
+        private static readonly Dictionary<Type, FieldInfo[]> FieldsByType = new();
 
         public static void AssignChildComponents(this Component component)
         {
             Type componentType = component.GetType();
-            List<FieldInfo> fields = FieldsByType.GetOrAdd(componentType, type =>
-            {
-                FieldInfo[] fields = type.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
-                return fields
-                    .Where(prop => Attribute.IsDefined(prop, typeof(ChildComponentAttribute)))
-                    .ToList();
-            });
+            FieldInfo[] fields = FieldsByType.GetOrAdd(
+                componentType, type =>
+                {
+                    FieldInfo[] fields = type.GetFields(
+                        BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+                    return fields
+                        .Where(prop => Attribute.IsDefined(prop, typeof(ChildComponentAttribute)))
+                        .ToArray();
+                });
 
             foreach (FieldInfo field in fields)
             {
@@ -42,7 +44,7 @@
                 {
                     Component[] childComponents = component.GetComponentsInChildren(childComponentType, true);
                     foundChild = 0 < childComponents.Length;
-                    
+
                     Array correctTypedArray = Array.CreateInstance(childComponentType, childComponents.Length);
                     Array.Copy(childComponents, correctTypedArray, childComponents.Length);
                     field.SetValue(component, correctTypedArray);
@@ -51,7 +53,7 @@
                 {
                     childComponentType = fieldType.GenericTypeArguments[0];
                     Type constructedListType = typeof(List<>).MakeGenericType(childComponentType);
-                    IList instance = (IList) Activator.CreateInstance(constructedListType);
+                    IList instance = (IList)Activator.CreateInstance(constructedListType);
 
                     foundChild = false;
                     foreach (Component childComponent in component.GetComponentsInChildren(childComponentType, true))
@@ -74,7 +76,10 @@
 
                 if (!foundChild)
                 {
-                    if (field.GetCustomAttributes(typeof(ChildComponentAttribute), false)[0] is ChildComponentAttribute { optional: false } _)
+                    if (field.GetCustomAttributes(typeof(ChildComponentAttribute), false)[0] is ChildComponentAttribute
+                        {
+                            optional: false
+                        } _)
                     {
                         component.LogError($"Unable to find child component of type {fieldType}");
                     }
@@ -82,4 +87,4 @@
             }
         }
     }
-}
+}

package/Runtime/Core/Attributes/ParentComponent.cs

@@ -18,18 +18,20 @@
 
     public static class ParentComponentExtensions
     {
-        private static readonly Dictionary<Type, List<FieldInfo>> FieldsByType = new();
+        private static readonly Dictionary<Type, FieldInfo[]> FieldsByType = new();
 
         public static void AssignParentComponents(this Component component)
         {
             Type componentType = component.GetType();
-            List<FieldInfo> fields = FieldsByType.GetOrAdd(componentType, type =>
-            {
-                FieldInfo[] fields = type.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
-                return fields
-                    .Where(prop => Attribute.IsDefined(prop, typeof(ParentComponentAttribute)))
-                    .ToList();
-            });
+            FieldInfo[] fields = FieldsByType.GetOrAdd(
+                componentType, type =>
+                {
+                    FieldInfo[] fields = type.GetFields(
+                        BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+                    return fields
+                        .Where(prop => Attribute.IsDefined(prop, typeof(ParentComponentAttribute)))
+                        .ToArray();
+                });
 
             foreach (FieldInfo field in fields)
             {
@@ -42,7 +44,7 @@
                 {
                     Component[] parentComponents = component.GetComponentsInParent(parentComponentType, true);
                     foundParent = 0 < parentComponents.Length;
- 
+
                     Array correctTypedArray = Array.CreateInstance(parentComponentType, parentComponents.Length);
                     Array.Copy(parentComponents, correctTypedArray, parentComponents.Length);
                     field.SetValue(component, correctTypedArray);
@@ -51,7 +53,7 @@
                 {
                     parentComponentType = fieldType.GenericTypeArguments[0];
                     Type constructedListType = typeof(List<>).MakeGenericType(parentComponentType);
-                    IList instance = (IList) Activator.CreateInstance(constructedListType);
+                    IList instance = (IList)Activator.CreateInstance(constructedListType);
 
                     foundParent = false;
                     foreach (Component parentComponent in component.GetComponentsInParent(parentComponentType, true))
@@ -74,7 +76,8 @@
 
                 if (!foundParent)
                 {
-                    if (field.GetCustomAttributes(typeof(ParentComponentAttribute), false)[0] is ParentComponentAttribute { optional: false } _)
+                    if (field.GetCustomAttributes(typeof(ParentComponentAttribute), false)[0] is
+                        ParentComponentAttribute { optional: false } _)
                     {
                         component.LogError($"Unable to find parent component of type {fieldType}");
                     }
@@ -82,4 +85,4 @@
             }
         }
     }
-}
+}

package/Runtime/Core/Attributes/SiblingComponentAttribute.cs

@@ -18,18 +18,20 @@
 
     public static class SiblingComponentExtensions
     {
-        private static readonly Dictionary<Type, List<FieldInfo>> FieldsByType = new();
+        private static readonly Dictionary<Type, FieldInfo[]> FieldsByType = new();
 
         public static void AssignSiblingComponents(this Component component)
         {
             Type componentType = component.GetType();
-            List<FieldInfo> fields = FieldsByType.GetOrAdd(componentType,
+            FieldInfo[] fields = FieldsByType.GetOrAdd(
+                componentType,
                 type =>
                 {
-                    FieldInfo[] fields = type.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+                    FieldInfo[] fields = type.GetFields(
+                        BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
                     return fields
                         .Where(prop => Attribute.IsDefined(prop, typeof(SiblingComponentAttribute)))
-                        .ToList();
+                        .ToArray();
                 });
 
             foreach (FieldInfo field in fields)
@@ -52,7 +54,7 @@
                 {
                     siblingComponentType = fieldType.GenericTypeArguments[0];
                     Type constructedListType = typeof(List<>).MakeGenericType(siblingComponentType);
-                    IList instance = (IList) Activator.CreateInstance(constructedListType);
+                    IList instance = (IList)Activator.CreateInstance(constructedListType);
 
                     foundSibling = false;
                     foreach (Component siblingComponent in component.GetComponents(siblingComponentType))
@@ -78,7 +80,8 @@
 
                 if (!foundSibling)
                 {
-                    if (field.GetCustomAttributes(typeof(SiblingComponentAttribute), false)[0] is SiblingComponentAttribute {optional: false} _)
+                    if (field.GetCustomAttributes(typeof(SiblingComponentAttribute), false)[0] is
+                        SiblingComponentAttribute { optional: false } _)
                     {
                         component.LogError($"Unable to find sibling component of type {fieldType}");
                     }
@@ -86,4 +89,4 @@
             }
         }
     }
-}
+}

package/Runtime/Core/Attributes/ValidateAssignmentAttribute.cs

@@ -12,21 +12,26 @@
 
     [AttributeUsage(AttributeTargets.Field)]
     [MeansImplicitUse]
-    public sealed class ValidateAssignmentAttribute : Attribute
-    {
-    }
+    public sealed class ValidateAssignmentAttribute : Attribute { }
 
     public static class ValidateAssignmentExtensions
     {
-        private static readonly Dictionary<Type, List<FieldInfo>> FieldsByType = new();
+        private static readonly Dictionary<Type, FieldInfo[]> FieldsByType = new();
+
+        private static FieldInfo[] GetOrAdd(Type objectType)
+        {
+            return FieldsByType.GetOrAdd(
+                objectType, type => type
+                    .GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
+                    .Where(prop => Attribute.IsDefined(prop, typeof(ValidateAssignmentAttribute)))
+                    .ToArray());
+        }
 
         public static void ValidateAssignments(this Object o)
         {
 #if UNITY_EDITOR
             Type objectType = o.GetType();
-            List<FieldInfo> fields = FieldsByType.GetOrAdd(objectType, type => type
-                .GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
-                .Where(prop => Attribute.IsDefined(prop, typeof(ValidateAssignmentAttribute))).ToList());
+            FieldInfo[] fields = GetOrAdd(objectType);
 
             foreach (FieldInfo field in fields)
             {
@@ -43,24 +48,48 @@
         public static bool AreAnyAssignmentsInvalid(this Object o)
         {
             Type objectType = o.GetType();
-            List<FieldInfo> fields = FieldsByType.GetOrAdd(objectType, type => type
-                .GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
-                .Where(prop => Attribute.IsDefined(prop, typeof(ValidateAssignmentAttribute))).ToList());
+            FieldInfo[] fields = GetOrAdd(objectType);
 
-            return fields.Any(field => IsFieldInvalid(field, o));
+            foreach (FieldInfo field in fields)
+            {
+                if (IsFieldInvalid(field, o))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private static bool IsInvalid(IEnumerable enumerable)
+        {
+            IEnumerator enumerator = enumerable.GetEnumerator();
+            try
+            {
+                return !enumerator.MoveNext();
+            }
+            finally
+            {
+                if (enumerator is IDisposable disposable)
+                {
+                    disposable.Dispose();
+                }
+            }
         }
 
         private static bool IsFieldInvalid(FieldInfo field, Object o)
         {
             object fieldValue = field.GetValue(o);
+
             return fieldValue switch
             {
-                IList list => list.Count <= 0,
-                ICollection collection => collection.Count <= 0,
                 Object unityObject => !unityObject,
                 string stringValue => string.IsNullOrWhiteSpace(stringValue),
+                IList list => list.Count <= 0,
+                ICollection collection => collection.Count <= 0,
+                IEnumerable enumerable => IsInvalid(enumerable),
                 _ => fieldValue == null
             };
         }
     }
-}
+}

package/Runtime/Core/Extension/StringExtensions.cs

@@ -1,10 +1,14 @@
 namespace UnityHelpers.Core.Extension
 {
+    using System.Collections.Generic;
     using System.Text;
     using Serialization;
 
     public static class StringExtensions
     {
+        private static readonly HashSet<char> PascalCaseSeparators =
+            new() { '_', ' ', '\r', '\n', '\t', '.', '\'', '"' };
+
         public static string Center(this string input, int length)
         {
             if (input == null || length <= input.Length)
@@ -17,12 +21,12 @@
 
         public static byte[] GetBytes(this string input)
         {
-            return System.Text.Encoding.Default.GetBytes(input);
+            return Encoding.Default.GetBytes(input);
         }
 
         public static string GetString(this byte[] bytes)
         {
-            return System.Text.Encoding.Default.GetString(bytes);
+            return Encoding.Default.GetString(bytes);
         }
 
         public static string ToJson<T>(this T value)
@@ -34,29 +38,66 @@
         {
             int startIndex = 0;
             StringBuilder stringBuilder = new();
+            bool appendedAnySeparator = false;
             for (int i = 0; i < value.Length; ++i)
             {
-                if (startIndex < i && char.IsLower(value[i - 1]) && char.IsUpper(value[i]))
+                while (startIndex < value.Length && PascalCaseSeparators.Contains(value[startIndex]))
+                {
+                    ++startIndex;
+                }
+
+                if (startIndex < i && char.IsLower(value[i - 1]) &&
+                    (char.IsUpper(value[i]) || PascalCaseSeparators.Contains(value[i])))
                 {
                     _ = stringBuilder.Append(char.ToUpper(value[startIndex]));
                     if (1 < i - startIndex)
                     {
-                        _ = stringBuilder.Append(value.Substring(startIndex + 1, i - 1 - startIndex).ToLower());
+                        for (int j = startIndex + 1; j < i; ++j)
+                        {
+                            char current = value[j];
+                            if (PascalCaseSeparators.Contains(current))
+                            {
+                                continue;
+                            }
+
+                            _ = stringBuilder.Append(char.ToLower(current));
+                        }
+                    }
+
+                    if (!string.IsNullOrEmpty(separator))
+                    {
+                        appendedAnySeparator = true;
+                        _ = stringBuilder.Append(separator);
                     }
 
-                    _ = stringBuilder.Append(separator);
                     startIndex = i;
                     continue;
                 }
 
-                if (startIndex + 1 < i && char.IsLower(value[i]) && char.IsUpper(value[i - 1]))
+                if (startIndex + 1 < i && char.IsLower(value[i]) &&
+                    (char.IsUpper(value[i - 1]) || PascalCaseSeparators.Contains(value[i - 1])))
                 {
                     _ = stringBuilder.Append(char.ToUpper(value[startIndex]));
                     if (1 < i - 1 - startIndex)
                     {
-                        _ = stringBuilder.Append(value.Substring(startIndex + 1, i - 1 - startIndex).ToLower());
+                        for (int j = startIndex + 1; j < i; ++j)
+                        {
+                            char current = value[j];
+                            if (PascalCaseSeparators.Contains(current))
+                            {
+                                continue;
+                            }
+
+                            _ = stringBuilder.Append(char.ToLower(current));
+                        }
+                    }
+
+                    if (!string.IsNullOrEmpty(separator))
+                    {
+                        appendedAnySeparator = true;
+                        _ = stringBuilder.Append(separator);
                     }
-                    _ = stringBuilder.Append(separator);
+
                     startIndex = i - 1;
                 }
             }
@@ -66,11 +107,25 @@
                 _ = stringBuilder.Append(char.ToUpper(value[startIndex]));
                 if (startIndex + 1 < value.Length)
                 {
-                    _ = stringBuilder.Append(value.Substring(startIndex + 1, value.Length - 1 - startIndex).ToLower());
+                    for (int j = startIndex + 1; j < value.Length; ++j)
+                    {
+                        char current = value[j];
+                        if (PascalCaseSeparators.Contains(current))
+                        {
+                            continue;
+                        }
+
+                        _ = stringBuilder.Append(char.ToLower(current));
+                    }
                 }
             }
+            else if (appendedAnySeparator && !string.IsNullOrEmpty(separator) &&
+                     separator.Length <= stringBuilder.Length)
+            {
+                stringBuilder.Remove(stringBuilder.Length - separator.Length, separator.Length);
+            }
 
             return stringBuilder.ToString();
         }
     }
-}
+}