com.wallstop-studios.unity-helpers 2.0.0-rc77.1 → 2.0.0-rc77.3

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,27 @@
                 }
 
                 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);
+                        Helpers.CachedLabels[path] = newLabels;
+                    }
+                }
+                else if (Helpers.CachedLabels.ContainsKey(path))
+                {
                     anyChanged = true;
-                    Helpers.CachedLabels[path] = updated;
+                    Helpers.CachedLabels.Remove(path);
                 }
             }
 
@@ -94,19 +101,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/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/package.json

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