com.artromskiy.deltaecs.unity 0.0.53 → 0.0.56

package/Editor/SceneEntityInspectorView.cs

@@ -1,11 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+
 using Delta;
 using Delta.ECS;
 using Delta.ECS.Integration;
+
 using UnityEditor;
 using UnityEditor.UIElements;
+
 using UnityEngine;
 using UnityEngine.UIElements;
 
@@ -28,6 +31,8 @@ namespace Delta.ECS.Unity.Editor
         private EntityAuthoring _authoringEntity;
         private ComponentId[] _runtimeComponentBuffer;
         private ComponentId[] _runtimeComponentIds;
+
+        internal int ComponentCount => _componentEntries.Count;
         private SceneAuthoring Authoring => _target.Authoring;
 
         public SceneEntityInspectorView(SelectionProxy proxy)
@@ -94,16 +99,141 @@ namespace Delta.ECS.Unity.Editor
             return _root;
         }
 
+        internal void ScheduleRefreshContent() => _root.schedule.Execute(RefreshContent);
+
+        private static VisualElement BuildViewField(GameObject currentView, Action<GameObject> onChanged)
+        {
+            var row = new VisualElement();
+            row.AddToClassList("ecs-view-binding");
+
+            var field = new ObjectField("Unity View")
+            {
+                objectType = typeof(GameObject),
+                allowSceneObjects = true,
+                value = currentView
+            };
+            AddInspectorFieldClasses(field);
+            row.Add(field);
+
+            var unbind = new Button(() => field.value = null)
+            {
+                text = "Unbind",
+                tooltip = "Remove the GameObject binding from this entity"
+            };
+            unbind.AddToClassList("ecs-action-button");
+            unbind.SetEnabled(currentView != null);
+            field.RegisterValueChangedCallback(evt =>
+            {
+                GameObject nextView = evt.newValue as GameObject;
+                unbind.SetEnabled(nextView != null);
+                onChanged(nextView);
+            });
+            row.Add(unbind);
+            return row;
+        }
+
+        private static void AddEntityInfo(VisualElement card, Entity entity, string stableId)
+        {
+            var idRow = new VisualElement { pickingMode = PickingMode.Ignore };
+            idRow.AddToClassList("ecs-entity-id-row");
+            idRow.Add(CreateEntityMetadata($"EntityId: {entity.Index}"));
+            idRow.Add(CreateEntityMetadata($"Generation: {entity.Generation}"));
+            card.Add(idRow);
+            card.Add(CreateEntityMetadata($"StableId: {(string.IsNullOrEmpty(stableId) ? "—" : stableId)}"));
+        }
+
+        private static Label CreateEntityMetadata(string text)
+        {
+            var label = CreateClassLabel(text, "ecs-entity-metadata");
+            label.pickingMode = PickingMode.Ignore;
+            label.style.minHeight = EditorGUIUtility.singleLineHeight;
+            return label;
+        }
+
+        private static ToolbarMenu CreateComponentMenu()
+        {
+            var menu = new ToolbarMenu { text = "⋮" };
+            menu.AddToClassList("ecs-component-menu");
+            menu.Q<VisualElement>(className: ToolbarMenu.arrowUssClassName)?.AddToClassList("ecs-component-menu-arrow");
+            menu.RegisterCallback<AttachToPanelEvent>(_ =>
+                menu.Q<VisualElement>(className: ToolbarMenu.arrowUssClassName)?.AddToClassList("ecs-component-menu-arrow"));
+            menu.RegisterCallback<PointerDownEvent>(evt => evt.StopPropagation());
+            menu.RegisterCallback<ClickEvent>(evt => evt.StopPropagation());
+            return menu;
+        }
+
+        private static Button CreateRemoveComponentButton(Action removeComponent)
+        {
+            var button = new Button(removeComponent) { text = "×", tooltip = "Remove component" };
+            button.AddToClassList("ecs-component-remove");
+            button.RegisterCallback<PointerDownEvent>(evt => evt.StopPropagation());
+            button.RegisterCallback<ClickEvent>(evt => evt.StopPropagation());
+            return button;
+        }
+
+        private static void AddHeaderAction(Toggle header, VisualElement action)
+        {
+            header.Add(action);
+        }
+
+        private static void AddInspectorFieldClasses(VisualElement field)
+        {
+            field.AddToClassList(BaseField<float>.alignedFieldUssClassName);
+            field.AddToClassList("ecs-value-field");
+        }
+
+        private static Label CreateClassLabel(string text, string className)
+        {
+            var label = new Label(text);
+            label.AddToClassList(className);
+            return label;
+        }
+
+        private static Label CreateEntityIcon() => CreateClassLabel("◆", "ecs-entity-icon");
+
+        private static ComponentDescriptor? TryGetDescriptor(ComponentData data,
+            IReadOnlyDictionary<ulong, ComponentDescriptor> descriptors)
+        {
+            ulong? schema = GetSchemaId(data);
+            return schema.HasValue && descriptors.TryGetValue(schema.Value, out ComponentDescriptor descriptor)
+                ? descriptor
+                : null;
+        }
+
+        private static string GetComponentMenuPath(ComponentDescriptor descriptor)
+        {
+            string namespacePath = descriptor.ValueType.Namespace?.Replace('.', '/') ?? string.Empty;
+            string shortName = GetShortTypeName(descriptor.ValueType);
+            return string.IsNullOrEmpty(namespacePath) ? shortName : $"{namespacePath}/{shortName}";
+        }
+
+        private static string GetShortTypeName(Type type)
+        {
+            string name = type.Name;
+            int genericMarker = name.IndexOf('`');
+            return genericMarker < 0 ? name : name.Substring(0, genericMarker);
+        }
+
+        private static ulong? GetSchemaId(ComponentData data)
+        {
+            return data != null && data.TryGetSchemaId(out SchemaId schema) ? schema.Value : null;
+        }
+
+        private static bool IsComponentExpanded(ulong schema) =>
+            InspectorState.instance.IsComponentExpanded(schema);
+
+        private static void SetComponentExpanded(ulong schema, bool expanded) =>
+            InspectorState.instance.SetComponentExpanded(schema, expanded);
+
+        private static int GetComponentOrder(ulong schema) =>
+            InspectorState.instance.GetComponentOrder(schema);
+
         private void OnEntitySelectionChanged()
         {
             SyncSelection();
             RefreshContent();
         }
 
-        internal int ComponentCount => _componentEntries.Count;
-
-        internal void ScheduleRefreshContent() => _root.schedule.Execute(RefreshContent);
-
         private void OnAuthoringChanged(SceneAuthoring changedAuthoring)
         {
             if (changedAuthoring != Authoring || EditorApplication.isPlayingOrWillChangePlaymode)
@@ -284,55 +414,6 @@ namespace Delta.ECS.Unity.Editor
             });
         }
 
-        private static VisualElement BuildViewField(GameObject currentView, Action<GameObject> onChanged)
-        {
-            var row = new VisualElement();
-            row.AddToClassList("ecs-view-binding");
-
-            var field = new ObjectField("Unity View")
-            {
-                objectType = typeof(GameObject),
-                allowSceneObjects = true,
-                value = currentView
-            };
-            AddInspectorFieldClasses(field);
-            row.Add(field);
-
-            var unbind = new Button(() => field.value = null)
-            {
-                text = "Unbind",
-                tooltip = "Remove the GameObject binding from this entity"
-            };
-            unbind.AddToClassList("ecs-action-button");
-            unbind.SetEnabled(currentView != null);
-            field.RegisterValueChangedCallback(evt =>
-            {
-                GameObject nextView = evt.newValue as GameObject;
-                unbind.SetEnabled(nextView != null);
-                onChanged(nextView);
-            });
-            row.Add(unbind);
-            return row;
-        }
-
-        private static void AddEntityInfo(VisualElement card, Entity entity, string stableId)
-        {
-            var idRow = new VisualElement { pickingMode = PickingMode.Ignore };
-            idRow.AddToClassList("ecs-entity-id-row");
-            idRow.Add(CreateEntityMetadata($"EntityId: {entity.Index}"));
-            idRow.Add(CreateEntityMetadata($"Generation: {entity.Generation}"));
-            card.Add(idRow);
-            card.Add(CreateEntityMetadata($"StableId: {(string.IsNullOrEmpty(stableId) ? "—" : stableId)}"));
-        }
-
-        private static Label CreateEntityMetadata(string text)
-        {
-            var label = CreateClassLabel(text, "ecs-entity-metadata");
-            label.pickingMode = PickingMode.Ignore;
-            label.style.minHeight = EditorGUIUtility.singleLineHeight;
-            return label;
-        }
-
         private VisualElement BuildAuthoringComponentCard(EntityAuthoring authoring, ComponentData data, ComponentDescriptor descriptor)
         {
             return BuildComponentCard(descriptor, body =>
@@ -463,32 +544,6 @@ namespace Delta.ECS.Unity.Editor
             }
         }
 
-        private static ToolbarMenu CreateComponentMenu()
-        {
-            var menu = new ToolbarMenu { text = "⋮" };
-            menu.AddToClassList("ecs-component-menu");
-            menu.Q<VisualElement>(className: ToolbarMenu.arrowUssClassName)?.AddToClassList("ecs-component-menu-arrow");
-            menu.RegisterCallback<AttachToPanelEvent>(_ =>
-                menu.Q<VisualElement>(className: ToolbarMenu.arrowUssClassName)?.AddToClassList("ecs-component-menu-arrow"));
-            menu.RegisterCallback<PointerDownEvent>(evt => evt.StopPropagation());
-            menu.RegisterCallback<ClickEvent>(evt => evt.StopPropagation());
-            return menu;
-        }
-
-        private static Button CreateRemoveComponentButton(Action removeComponent)
-        {
-            var button = new Button(removeComponent) { text = "×", tooltip = "Remove component" };
-            button.AddToClassList("ecs-component-remove");
-            button.RegisterCallback<PointerDownEvent>(evt => evt.StopPropagation());
-            button.RegisterCallback<ClickEvent>(evt => evt.StopPropagation());
-            return button;
-        }
-
-        private static void AddHeaderAction(Toggle header, VisualElement action)
-        {
-            header.Add(action);
-        }
-
         private void DrawEditableValue(VisualElement body, EntityAuthoring authoring, ComponentData data,
             ComponentDescriptor descriptor, object value)
         {
@@ -560,12 +615,6 @@ namespace Delta.ECS.Unity.Editor
             return fieldControl;
         }
 
-        private static void AddInspectorFieldClasses(VisualElement field)
-        {
-            field.AddToClassList(BaseField<float>.alignedFieldUssClassName);
-            field.AddToClassList("ecs-value-field");
-        }
-
         private void BuildRuntimeEntity()
         {
             _runtimeBindings.Clear();
@@ -862,8 +911,7 @@ namespace Delta.ECS.Unity.Editor
                 return;
             }
 
-            if (!world.Integration.TryWrite(entity, descriptor.Id, updated, snapshot.Stamp,
-                    out _, out EcsWriteError writeError))
+            if (!world.Integration.TryWrite(entity, descriptor.Id, updated, out EcsWriteError writeError))
             {
                 Debug.LogWarning($"Could not edit {descriptor.Name}: {writeError.Code}.");
                 RefreshRuntimeView();
@@ -891,15 +939,6 @@ namespace Delta.ECS.Unity.Editor
             return value?.ToString() ?? "None";
         }
 
-        private static Label CreateClassLabel(string text, string className)
-        {
-            var label = new Label(text);
-            label.AddToClassList(className);
-            return label;
-        }
-
-        private static Label CreateEntityIcon() => CreateClassLabel("◆", "ecs-entity-icon");
-
         private void RefreshRuntimeView()
         {
             if (SyncSelection())
@@ -1059,29 +1098,6 @@ namespace Delta.ECS.Unity.Editor
                 .ToArray();
         }
 
-        private static ComponentDescriptor? TryGetDescriptor(ComponentData data,
-            IReadOnlyDictionary<ulong, ComponentDescriptor> descriptors)
-        {
-            ulong? schema = GetSchemaId(data);
-            return schema.HasValue && descriptors.TryGetValue(schema.Value, out ComponentDescriptor descriptor)
-                ? descriptor
-                : null;
-        }
-
-        private static string GetComponentMenuPath(ComponentDescriptor descriptor)
-        {
-            string namespacePath = descriptor.ValueType.Namespace?.Replace('.', '/') ?? string.Empty;
-            string shortName = GetShortTypeName(descriptor.ValueType);
-            return string.IsNullOrEmpty(namespacePath) ? shortName : $"{namespacePath}/{shortName}";
-        }
-
-        private static string GetShortTypeName(Type type)
-        {
-            string name = type.Name;
-            int genericMarker = name.IndexOf('`');
-            return genericMarker < 0 ? name : name.Substring(0, genericMarker);
-        }
-
         private void AddComponent(EntityAuthoring authoring, ComponentDescriptor descriptor)
         {
             Undo.RecordObject(Authoring, $"Add {GetShortTypeName(descriptor.ValueType)}");
@@ -1139,20 +1155,6 @@ namespace Delta.ECS.Unity.Editor
             RefreshContent();
         }
 
-        private static ulong? GetSchemaId(ComponentData data)
-        {
-            return data != null && data.TryGetSchemaId(out SchemaId schema) ? schema.Value : null;
-        }
-
-        private static bool IsComponentExpanded(ulong schema) =>
-            InspectorState.instance.IsComponentExpanded(schema);
-
-        private static void SetComponentExpanded(ulong schema, bool expanded) =>
-            InspectorState.instance.SetComponentExpanded(schema, expanded);
-
-        private static int GetComponentOrder(ulong schema) =>
-            InspectorState.instance.GetComponentOrder(schema);
-
         private void MoveComponent(ulong schema, int direction)
         {
             int index = _componentEntries.FindIndex(entry => entry.Descriptor?.Schema.Value == schema);

package/Editor/SelectionProxyBridge.cs

@@ -1,6 +1,9 @@
 using System.Collections.Generic;
+
 using Unity.Hierarchy;
+
 using UnityEditor;
+
 using UnityEngine;
 
 namespace Delta.ECS.Unity.Editor

package/Editor/SelectionProxyEditor.cs

@@ -1,4 +1,5 @@
 using UnityEditor;
+
 using UnityEngine.UIElements;
 
 namespace Delta.ECS.Unity.Editor
@@ -12,6 +13,8 @@ namespace Delta.ECS.Unity.Editor
 
         public override bool RequiresConstantRepaint() => EditorApplication.isPlaying;
 
+        public override VisualElement CreateInspectorGUI() => _view.CreateGUI();
+
         private void OnEnable()
         {
             _view?.Dispose();
@@ -27,7 +30,5 @@ namespace Delta.ECS.Unity.Editor
             _view?.Dispose();
             _view = null;
         }
-
-        public override VisualElement CreateInspectorGUI() => _view.CreateGUI();
     }
 }

package/README.md

@@ -18,7 +18,7 @@ Add the npm-compatible registry and package to the Unity project's
     }
   ],
   "dependencies": {
-    "com.artromskiy.deltaecs.unity": "0.0.53"
+    "com.artromskiy.deltaecs.unity": "0.0.56"
   }
 }
 ```
@@ -30,12 +30,12 @@ separate NuGet packages and are not included in this UPM package.
 ## Register components
 
 Install `DeltaECS.Generators` in the assembly that declares components, then
-mark component structs with `DeltaEcsComponentAttribute`:
+mark component structs with `ComponentSchemaAttribute`:
 
 ```csharp
 using Delta.ECS;
 
-[DeltaEcsComponent]
+[ComponentSchema]
 public struct Health
 {
     public float Value;
@@ -46,7 +46,7 @@ Generated module initializers expose one registration per marked component.
 Register the full catalog into a layout registry, then create the world:
 
 ```csharp
-var layouts = new ComponentLayoutRegistry();
+var layouts = new ComponentRegistry();
 foreach (IGeneratedComponentRegistration registration in GeneratedComponentCatalog.GetRegistrations())
 {
     layouts.Register(registration);
@@ -58,7 +58,7 @@ using var world = new World(layouts);
 To register only one generated component, pass its registration directly:
 
 ```csharp
-var layouts = new ComponentLayoutRegistry();
+var layouts = new ComponentRegistry();
 layouts.Register(GeneratedComponentCatalog.GetRegistration<Health>());
 ```
 
@@ -67,7 +67,7 @@ The generator reports the stable schema ID for each component. Set
 unchanged after a type rename:
 
 ```csharp
-[DeltaEcsComponent(SchemaId = 0x1234UL)]
+[ComponentSchema(0x1234UL)]
 public struct Position
 {
     public float X;

package/Runtime/ComponentData.cs

@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
+
 using Delta.ECS;
 using Delta.ECS.Integration;
+
 using UnityEngine;
 
 namespace Delta.ECS.Unity
@@ -17,12 +19,26 @@ namespace Delta.ECS.Unity
         public string Json => _json;
         public IReadOnlyList<EntityReference> EntityReferences => _entityReferences ??= new List<EntityReference>();
 
+        private List<EntityReference> EntityReferenceList =>
+            _entityReferences ??= new List<EntityReference>();
+
         public ComponentData(ulong schemaId, string json)
         {
             _schemaId = schemaId.ToString("X16");
             _json = json;
         }
 
+        public static ComponentData CreateDefault(ComponentDescriptor descriptor)
+        {
+            if (descriptor.IsTag)
+            {
+                return new ComponentData(descriptor.Schema.Value, "{}");
+            }
+
+            object value = Activator.CreateInstance(descriptor.ValueType);
+            return new ComponentData(descriptor.Schema.Value, JsonUtility.ToJson(value));
+        }
+
         public bool TryGetSchemaId(out SchemaId schemaId)
         {
             if (ulong.TryParse(_schemaId, System.Globalization.NumberStyles.HexNumber, null, out ulong value))
@@ -93,19 +109,5 @@ namespace Delta.ECS.Unity
 
             return string.Empty;
         }
-
-        private List<EntityReference> EntityReferenceList =>
-            _entityReferences ??= new List<EntityReference>();
-
-        public static ComponentData CreateDefault(ComponentDescriptor descriptor)
-        {
-            if (descriptor.IsTag)
-            {
-                return new ComponentData(descriptor.Schema.Value, "{}");
-            }
-
-            object value = Activator.CreateInstance(descriptor.ValueType);
-            return new ComponentData(descriptor.Schema.Value, JsonUtility.ToJson(value));
-        }
     }
 }

package/Runtime/EntityAuthoring.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+
 using UnityEngine;
 
 namespace Delta.ECS.Unity

package/Runtime/EntityContext.cs

@@ -1,6 +1,7 @@
 #nullable enable
 
 using System;
+
 using Delta.ECS;
 
 namespace Delta.ECS.Unity
@@ -17,15 +18,18 @@ namespace Delta.ECS.Unity
         /// <summary>Gets whether this context refers to a live entity.</summary>
         public bool IsAlive => World != null && World.IsAlive(Entity);
 
+        internal EntityContext(World world, Entity entity)
+        {
+            World = world;
+            Entity = entity;
+        }
+
         /// <summary>Reports whether the entity owns the specified component registration.</summary>
         public bool Has(ComponentId componentId) => World?.Has(Entity, componentId) ?? false;
 
         /// <summary>Reports whether the entity owns the primary registration for <typeparamref name="T"/>.</summary>
         public bool Has<T>() => World?.Has<T>(Entity) ?? false;
 
-        /// <summary>Reports whether the entity owns the specified registration of <typeparamref name="T"/>.</summary>
-        public bool Has<T>(ComponentId componentId) => World?.Has<T>(Entity, componentId) ?? false;
-
         /// <summary>Attempts to read the primary component for <typeparamref name="T"/>.</summary>
         public bool TryGet<T>(out T value)
         {
@@ -70,51 +74,6 @@ namespace Delta.ECS.Unity
         /// <summary>Gets a read-only reference to the specified registration of <typeparamref name="T"/>.</summary>
         public ref readonly T GetReadRef<T>(ComponentId componentId) => ref GetWorld().GetReadRef<T>(Entity, componentId);
 
-        /// <summary>Attempts to read the stamp for the primary component of <typeparamref name="T"/>.</summary>
-        public bool TryGetComponentStamp<T>(out Stamp stamp)
-        {
-            World? world = World;
-            if (world is null)
-            {
-                stamp = default;
-                return false;
-            }
-
-            return world.TryGetComponentStamp<T>(Entity, out stamp);
-        }
-
-        /// <summary>Attempts to read the stamp for the specified component registration.</summary>
-        public bool TryGetComponentStamp(ComponentId componentId, out Stamp stamp)
-        {
-            World? world = World;
-            if (world is null)
-            {
-                stamp = default;
-                return false;
-            }
-
-            return world.TryGetComponentStamp(Entity, componentId, out stamp);
-        }
-
-        /// <summary>Attempts to read the stamp for the specified registration of <typeparamref name="T"/>.</summary>
-        public bool TryGetComponentStamp<T>(ComponentId componentId, out Stamp stamp)
-        {
-            World? world = World;
-            if (world is null)
-            {
-                stamp = default;
-                return false;
-            }
-
-            return world.TryGetComponentStamp<T>(Entity, componentId, out stamp);
-        }
-
-        internal EntityContext(World world, Entity entity)
-        {
-            World = world;
-            Entity = entity;
-        }
-
         private World GetWorld()
             => World ?? UnityThrowHelpers.ThrowMissingEntityContextWorld();
     }

package/Runtime/EntityReference.cs

@@ -1,4 +1,5 @@
 using System;
+
 using UnityEngine;
 
 namespace Delta.ECS.Unity

package/Runtime/PropertyBagValueAccess.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+
 using Delta.ECS;
+
 using Unity.Properties;
 
 namespace Delta.ECS.Unity
@@ -75,11 +77,11 @@ namespace Delta.ECS.Unity
 
         private sealed class ReadPathVisitor : IPropertyBagVisitor
         {
-            private readonly string[] _path;
-            private readonly int _pathIndex;
 
             internal object Value;
             internal bool Found;
+            private readonly string[] _path;
+            private readonly int _pathIndex;
 
             internal ReadPathVisitor(string[] path, int pathIndex)
             {
@@ -121,12 +123,12 @@ namespace Delta.ECS.Unity
 
         private sealed class WritePathVisitor : IPropertyBagVisitor
         {
+
+            internal bool Succeeded;
             private readonly string[] _path;
             private readonly int _pathIndex;
             private readonly object _value;
 
-            internal bool Succeeded;
-
             internal WritePathVisitor(string[] path, int pathIndex, object value)
             {
                 _path = path;