com.wallstop-studios.unity-helpers 2.0.0-rc77 → 2.0.0-rc77.2

package/Editor/AssetProcessors/SpriteLabelProcessor.cs

@@ -2,12 +2,11 @@
 {
 #if UNITY_EDITOR
     using System;
-    using System.Collections.Generic;
+    using System.Collections.Immutable;
     using System.Linq;
     using Core.Extension;
     using Core.Helper;
     using UnityEditor;
-    using UnityEngine;
     using Object = UnityEngine.Object;
 
     public sealed class SpriteLabelProcessor : AssetPostprocessor
@@ -19,7 +18,7 @@
             string[] movedFromAssetPaths
         )
         {
-            bool anyChanged = !Helpers.CachedLabels.Any();
+            bool anyChanged = Helpers.CachedLabels.Count == 0;
             InitializeCacheIfNeeded();
 
             foreach (string path in importedAssets)
@@ -46,19 +45,29 @@
                 }
 
                 string[] newLabels = AssetDatabase.GetLabels(mainObj);
-                if (
-                    !Helpers.CachedLabels.TryGetValue(path, out string[] oldLabels)
-                    || !AreEqual(oldLabels, newLabels)
-                )
+                if (newLabels.Length != 0)
                 {
-                    Debug.Log(
-                        $"[SpriteLabelProcessor] Labels changed on '{path}': {FormatLabels(oldLabels)} → {FormatLabels(newLabels)}"
-                    );
+                    if (
+                        !Helpers.CachedLabels.TryGetValue(path, out string[] oldLabels)
+                        || !AreEqual(oldLabels, newLabels)
+                    )
+                    {
+                        anyChanged = true;
+                        if (newLabels.Length == 0)
+                        {
+                            Helpers.CachedLabels.Remove(path);
+                            continue;
+                        }
 
-                    string[] updated = new string[newLabels.Length];
-                    Array.Copy(newLabels, updated, newLabels.Length);
+                        string[] updated = new string[newLabels.Length];
+                        Array.Copy(newLabels, updated, newLabels.Length);
+                        Helpers.CachedLabels[path] = updated;
+                    }
+                }
+                else if (Helpers.CachedLabels.ContainsKey(path))
+                {
                     anyChanged = true;
-                    Helpers.CachedLabels[path] = updated;
+                    Helpers.CachedLabels.Remove(path);
                 }
             }
 
@@ -94,19 +103,7 @@
                 return false;
             }
 
-            HashSet<string> setA = new(a, StringComparer.OrdinalIgnoreCase);
-            HashSet<string> setB = new(b, StringComparer.OrdinalIgnoreCase);
-            return setA.SetEquals(setB);
-        }
-
-        private static string FormatLabels(string[] arr)
-        {
-            if (arr == null || arr.Length == 0)
-            {
-                return "(none)";
-            }
-
-            return string.Join(", ", arr);
+            return a.ToImmutableHashSet(StringComparer.Ordinal).SetEquals(b);
         }
     }
 #endif

package/Editor/Sprites/ScriptableSpriteAtlasEditor.cs

@@ -564,8 +564,11 @@
 
                     if (allMatch)
                     {
-                        Object[] assets = AssetDatabase.LoadAllAssetsAtPath(assetPath);
-                        foreach (Object asset in assets)
+                        foreach (
+                            Object asset in AssetDatabase
+                                .LoadAllAssetsAtPath(assetPath)
+                                .Concat(AssetDatabase.LoadAllAssetRepresentationsAtPath(assetPath))
+                        )
                         {
                             if (asset is Sprite spriteAsset && spriteAsset != null)
                             {

package/Runtime/Core/Helper/Helpers.cs

@@ -38,7 +38,7 @@
                 return AllSpriteLabels;
             }
 
-            SortedSet<string> allLabels = new(StringComparer.Ordinal);
+            HashSet<string> allLabels = new(StringComparer.Ordinal);
             string[] guids = AssetDatabase.FindAssets("t:Sprite");
             foreach (string guid in guids)
             {
@@ -50,11 +50,15 @@
                 }
 
                 string[] labels = AssetDatabase.GetLabels(asset);
-                CachedLabels[path] = labels;
-                allLabels.UnionWith(labels);
+                if (labels.Length != 0)
+                {
+                    CachedLabels[path] = labels;
+                    allLabels.UnionWith(labels);
+                }
             }
 
             AllSpriteLabels = allLabels.ToArray();
+            Array.Sort(AllSpriteLabels);
             return AllSpriteLabels;
 #else
             return Array.Empty<string>();

package/Runtime/Utils/UnityObjectNameComparer.cs

@@ -58,42 +58,32 @@
 
         private static int CompareNatural(string nameA, string nameB)
         {
-            Match mA = TrailingNumberRegex.Match(nameA);
-            Match mB = TrailingNumberRegex.Match(nameB);
-
-            bool hasNumberA = mA.Success;
-            bool hasNumberB = mB.Success;
+            Match matchA = TrailingNumberRegex.Match(nameA);
+            Match matchB = TrailingNumberRegex.Match(nameB);
 
             // If both have trailing numbers, compare prefix then numeric
-            if (hasNumberA && hasNumberB)
+            if (matchA.Success && matchB.Success)
             {
-                string prefixA = mA.Groups[1].Value;
-                string prefixB = mB.Groups[1].Value;
+                string prefixA = matchA.Groups[1].Value;
+                string prefixB = matchB.Groups[1].Value;
 
-                int prefixCompare = StringComparer.OrdinalIgnoreCase.Compare(prefixA, prefixB);
+                int prefixCompare = string.Compare(
+                    prefixA,
+                    prefixB,
+                    StringComparison.OrdinalIgnoreCase
+                );
                 if (prefixCompare != 0)
                 {
                     return prefixCompare;
                 }
 
                 // same prefix → compare parsed integers
-                int numA = int.Parse(mA.Groups[2].Value);
-                int numB = int.Parse(mB.Groups[2].Value);
+                int numA = int.Parse(matchA.Groups[2].Value);
+                int numB = int.Parse(matchB.Groups[2].Value);
                 return numA.CompareTo(numB);
             }
-            // If only one has a trailing number, treat the one without number as coming first
-
-            if (hasNumberA)
-            {
-                return 1; // B (no number) comes before A
-            }
 
-            if (hasNumberB)
-            {
-                return -1; // A (no number) comes before B
-            }
-            // Neither has a trailing number → pure string compare
-            return StringComparer.OrdinalIgnoreCase.Compare(nameA, nameB);
+            return string.Compare(nameA, nameB, StringComparison.OrdinalIgnoreCase);
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.wallstop-studios.unity-helpers",
-  "version": "2.0.0-rc77",
+  "version": "2.0.0-rc77.2",
   "displayName": "Unity Helpers",
   "description": "Various Unity Helper Library",
   "dependencies": {},
@@ -83,6 +83,8 @@
 
 
 
+
+