com.artromskiy.deltaecs.unity 0.0.62 → 0.0.64

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.0.64
+
+- Published with the matching DeltaECS NuGet packages.
+
+## 0.0.63
+
+- Published with the matching DeltaECS NuGet packages.
+
 ## 0.0.62
 
 - Published with the matching DeltaECS NuGet packages.

package/Editor/ComponentDropdown.cs

@@ -3,8 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 
-using Delta.ECS.Integration;
-
 using UnityEditor.IMGUI.Controls;
 
 using UnityEngine;
@@ -13,13 +11,13 @@ namespace Delta.ECS.Unity.Editor
 {
     internal sealed class ComponentDropdown : AdvancedDropdown
     {
-        private readonly ComponentDescriptor[] _components;
-        private readonly Func<ComponentDescriptor, string> _getMenuPath;
-        private readonly Action<ComponentDescriptor> _add;
-        private readonly Dictionary<int, ComponentDescriptor> _items = new();
+        private readonly ComponentId[] _components;
+        private readonly Func<ComponentId, string> _getMenuPath;
+        private readonly Action<ComponentId> _add;
+        private readonly Dictionary<int, ComponentId> _items = new();
 
-        public ComponentDropdown(ComponentDescriptor[] components,
-            Func<ComponentDescriptor, string> getMenuPath, Action<ComponentDescriptor> add)
+        public ComponentDropdown(ComponentId[] components,
+            Func<ComponentId, string> getMenuPath, Action<ComponentId> add)
             : base(new AdvancedDropdownState())
         {
             _components = components;
@@ -67,9 +65,9 @@ namespace Delta.ECS.Unity.Editor
 
         protected override void ItemSelected(AdvancedDropdownItem item)
         {
-            if (_items.TryGetValue(item.id, out ComponentDescriptor descriptor))
+            if (_items.TryGetValue(item.id, out ComponentId componentId))
             {
-                _add(descriptor);
+                _add(componentId);
             }
         }
     }

package/Editor/ComponentPropertyBagFields.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 
 using Delta;
 using Delta.ECS;
-using Delta.ECS.Integration;
 using Delta.ECS.Unity;
 
 using Unity.Properties;
@@ -19,7 +18,7 @@ namespace Delta.ECS.Unity.Editor
 
     internal static class ComponentPropertyBagFields
     {
-        internal static ComponentPropertyBinding[] Build(VisualElement parent, ComponentDescriptor descriptor,
+        internal static ComponentPropertyBinding[] Build(VisualElement parent, Type componentType,
             object value, bool canWrite, Action<string[], object> onChanged,
             Func<string, Entity, Action<object>, VisualElement> createEntityField)
         {
@@ -28,7 +27,7 @@ namespace Delta.ECS.Unity.Editor
                 return Array.Empty<ComponentPropertyBinding>();
             }
 
-            IPropertyBag propertyBag = PropertyBag.GetPropertyBag(descriptor.ValueType);
+            IPropertyBag propertyBag = PropertyBag.GetPropertyBag(componentType);
             if (propertyBag == null)
             {
                 return Array.Empty<ComponentPropertyBinding>();

package/Editor/SceneEntityInspectorView.cs

@@ -4,7 +4,6 @@ using System.Linq;
 
 using Delta;
 using Delta.ECS;
-using Delta.ECS.Integration;
 
 using UnityEditor;
 using UnityEditor.UIElements;
@@ -35,6 +34,8 @@ namespace Delta.ECS.Unity.Editor
         internal int ComponentCount => _componentEntries.Count;
         private SceneAuthoring Authoring => _target.Authoring;
 
+        private ComponentRegistry Components => (_target.IsRuntime ? _target.RuntimeWorld : _previewWorld).World.Components;
+
         public SceneEntityInspectorView(SelectionProxy proxy)
             : this(() => proxy != null ? proxy.Target : default)
         {
@@ -191,22 +192,6 @@ namespace Delta.ECS.Unity.Editor
 
         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;
@@ -228,6 +213,16 @@ namespace Delta.ECS.Unity.Editor
         private static int GetComponentOrder(ulong schema) =>
             InspectorState.instance.GetComponentOrder(schema);
 
+        private ComponentId? TryGetComponentId(ComponentData data)
+            => _previewWorld.TryGetComponentId(data, out ComponentId componentId) ? componentId : null;
+
+        private string GetComponentMenuPath(ComponentId componentId)
+        {
+            string namespacePath = Components.GetComponentType(componentId).Namespace?.Replace('.', '/') ?? string.Empty;
+            string shortName = GetShortTypeName(Components.GetComponentType(componentId));
+            return string.IsNullOrEmpty(namespacePath) ? shortName : $"{namespacePath}/{shortName}";
+        }
+
         private void OnEntitySelectionChanged()
         {
             SyncSelection();
@@ -414,26 +409,26 @@ namespace Delta.ECS.Unity.Editor
             });
         }
 
-        private VisualElement BuildAuthoringComponentCard(EntityAuthoring authoring, ComponentData data, ComponentDescriptor descriptor)
+        private VisualElement BuildAuthoringComponentCard(EntityAuthoring authoring, ComponentData data, ComponentId componentId)
         {
-            return BuildComponentCard(descriptor, body =>
+            return BuildComponentCard(componentId, body =>
             {
-                if (descriptor.IsTag)
+                if (Components.IsTag(componentId))
                 {
                     body.Add(CreateClassLabel("Tag · membership only", "ecs-empty-component"));
                     return;
                 }
 
-                if (!_previewWorld.TryRead(authoring, descriptor, out ComponentSnapshot snapshot, out EcsReadError readError))
+                if (!_previewWorld.TryRead(authoring, componentId, out object value))
                 {
-                    body.Add(new HelpBox($"Could not read component: {readError.Code}.", HelpBoxMessageType.Error));
+                    body.Add(new HelpBox("Could not read component.", HelpBoxMessageType.Error));
                     return;
                 }
 
-                DrawEditableValue(body, authoring, data, descriptor, snapshot.Value);
+                DrawEditableValue(body, authoring, data, componentId, value);
             },
-            descriptor.IsTag ? null : () => ResetComponent(authoring, data, descriptor),
-            () => RemoveComponent(authoring, data, descriptor));
+            Components.IsTag(componentId) ? null : () => ResetComponent(authoring, data, componentId),
+            () => RemoveComponent(authoring, data, componentId));
         }
 
         private VisualElement BuildUnknownComponentCard(EntityAuthoring authoring, ComponentData data)
@@ -462,23 +457,22 @@ namespace Delta.ECS.Unity.Editor
                 .Where(schema => schema.HasValue)
                 .Select(schema => schema.Value)
                 .ToHashSet();
-            ComponentDescriptor[] available = Array.FindAll(
-                _previewWorld.Integration.Catalog.Components.ToArray(),
-                descriptor => (descriptor.Capabilities & ComponentCapabilities.Write) != 0
-                    && !existingSchemas.Contains(descriptor.Schema.Value));
+            ComponentId[] available = Array.FindAll(
+                _previewWorld.World.Components.GetComponentIds().ToArray(),
+                componentId => !existingSchemas.Contains(Components.GetSchemaId(componentId).Value));
             button.SetEnabled(available.Length != 0);
             button.clicked += () => new ComponentDropdown(available, GetComponentMenuPath,
-                    descriptor => AddComponent(authoring, descriptor))
+                    componentId => AddComponent(authoring, componentId))
                 .Show(button.worldBound);
             return button;
         }
 
-        private VisualElement BuildComponentCard(ComponentDescriptor descriptor, Action<VisualElement> buildBody,
+        private VisualElement BuildComponentCard(ComponentId componentId, Action<VisualElement> buildBody,
             Action resetComponent = null, Action removeComponent = null)
         {
-            bool expanded = IsComponentExpanded(descriptor.Schema.Value);
-            return BuildComponentFoldout(GetShortTypeName(descriptor.ValueType), descriptor.Schema.Value, expanded, buildBody,
-                header => AddComponentActions(header, descriptor, resetComponent, removeComponent));
+            bool expanded = IsComponentExpanded(Components.GetSchemaId(componentId).Value);
+            return BuildComponentFoldout(GetShortTypeName(Components.GetComponentType(componentId)), Components.GetSchemaId(componentId).Value, expanded, buildBody,
+                header => AddComponentActions(header, componentId, resetComponent, removeComponent));
         }
 
         private Foldout BuildComponentFoldout(string title, ulong? schema, bool expanded,
@@ -517,19 +511,19 @@ namespace Delta.ECS.Unity.Editor
                     body.Clear();
                     if (schema.HasValue)
                     {
-                        _runtimeBindings.RemoveAll(binding => binding.Descriptor.Schema.Value == schema.Value);
+                        _runtimeBindings.RemoveAll(binding => Components.GetSchemaId(binding.Component).Value == schema.Value);
                     }
                 }
             });
             return foldout;
         }
 
-        private void AddComponentActions(Toggle header, ComponentDescriptor descriptor,
+        private void AddComponentActions(Toggle header, ComponentId componentId,
             Action resetComponent, Action removeComponent)
         {
             var actions = CreateComponentMenu();
-            actions.menu.AppendAction("Move Up", _ => MoveComponent(descriptor.Schema.Value, -1));
-            actions.menu.AppendAction("Move Down", _ => MoveComponent(descriptor.Schema.Value, 1));
+            actions.menu.AppendAction("Move Up", _ => MoveComponent(Components.GetSchemaId(componentId).Value, -1));
+            actions.menu.AppendAction("Move Down", _ => MoveComponent(Components.GetSchemaId(componentId).Value, 1));
             if (resetComponent != null || removeComponent != null)
             {
                 actions.menu.AppendSeparator();
@@ -545,33 +539,31 @@ namespace Delta.ECS.Unity.Editor
         }
 
         private void DrawEditableValue(VisualElement body, EntityAuthoring authoring, ComponentData data,
-            ComponentDescriptor descriptor, object value)
+            ComponentId componentId, object value)
         {
-            bool canWrite = (descriptor.Capabilities & ComponentCapabilities.Write) != 0
-                && descriptor.ValueType.IsValueType;
             int previousChildCount = body.childCount;
-            ComponentPropertyBinding[] bindings = ComponentPropertyBagFields.Build(body, descriptor, value,
-                canWrite,
+            ComponentPropertyBinding[] bindings = ComponentPropertyBagFields.Build(body, Components.GetComponentType(componentId), value,
+                true,
                 (path, next) =>
                 {
                     object updated = value;
-                    if (!PropertyBagValueAccess.TrySetValue(ref updated, descriptor.ValueType, path, next))
+                    if (!PropertyBagValueAccess.TrySetValue(ref updated, Components.GetComponentType(componentId), path, next))
                     {
-                        Debug.LogWarning($"Could not edit a property on {descriptor.Name}: the property path is unavailable.", Authoring);
+                        Debug.LogWarning($"Could not edit a property on {Components.GetComponentType(componentId).FullName ?? Components.GetComponentType(componentId).Name}: the property path is unavailable.", Authoring);
                         RefreshContent();
                         return;
                     }
 
                     if (Equals(updated, value)) return;
-                    Undo.RecordObject(Authoring, $"Edit {descriptor.Name}");
-                    if (_previewWorld.TryWrite(authoring, data, descriptor, updated, out EcsWriteError writeError))
+                    Undo.RecordObject(Authoring, $"Edit {Components.GetComponentType(componentId).FullName ?? Components.GetComponentType(componentId).Name}");
+                    if (_previewWorld.TryWrite(authoring, data, componentId, updated))
                     {
                         value = updated;
                         MarkSceneDirty();
                     }
                     else
                     {
-                        Debug.LogError($"Could not write {descriptor.Name}: {writeError.Code}.", Authoring);
+                        Debug.LogError($"Could not write {Components.GetComponentType(componentId).FullName ?? Components.GetComponentType(componentId).Name}.", Authoring);
                         RefreshContent();
                     }
                 },
@@ -618,47 +610,54 @@ namespace Delta.ECS.Unity.Editor
         private void BuildRuntimeEntity()
         {
             _runtimeBindings.Clear();
-            SceneWorld world = _target.RuntimeWorld;
+            SceneWorld sceneWorld = _target.RuntimeWorld;
             Entity entity = _target.RuntimeEntity;
-            if (world == null || !world.IsBound || !world.Integration.IsAlive(entity))
+            if (sceneWorld == null || !sceneWorld.IsBound)
             {
                 _header.Add(new HelpBox("The selected runtime entity is no longer alive.", HelpBoxMessageType.Warning));
                 return;
             }
 
-            _header.Add(BuildRuntimeHeader(world, entity));
-            ComponentDescriptor[] components = ProjectRuntimeComponents(world, entity);
+            World world = sceneWorld.World;
+            if (!world.IsAlive(entity))
+            {
+                _header.Add(new HelpBox("The selected runtime entity is no longer alive.", HelpBoxMessageType.Warning));
+                return;
+            }
+
+            _header.Add(BuildRuntimeHeader(sceneWorld, entity));
+            ComponentId[] components = ProjectRuntimeComponents(sceneWorld, entity);
             if (components == null)
             {
                 _header.Add(new HelpBox("Could not read the selected entity's components.", HelpBoxMessageType.Error));
                 return;
             }
 
-            foreach (ComponentDescriptor descriptor in components)
+            foreach (ComponentId componentId in components)
             {
-                _componentEntries.Add(new ComponentEntry(null, descriptor));
+                _componentEntries.Add(new ComponentEntry(null, componentId));
             }
 
             RenderComponentRows();
         }
 
-        private VisualElement BuildRuntimeComponentCard(SceneWorld world, Entity entity, ComponentDescriptor descriptor)
+        private VisualElement BuildRuntimeComponentCard(SceneWorld world, Entity entity, ComponentId componentId)
         {
-            return BuildComponentCard(descriptor, body =>
+            return BuildComponentCard(componentId, body =>
             {
-                if (descriptor.IsTag)
+                if (Components.IsTag(componentId))
                 {
                     body.Add(CreateClassLabel("Tag · membership only", "ecs-empty-component"));
                     return;
                 }
 
-                if (!world.TryRead(entity, descriptor, out ComponentSnapshot snapshot, out EcsReadError error))
+                if (!world.TryRead(entity, componentId, out object value))
                 {
-                    body.Add(new HelpBox($"Could not read component: {error.Code}.", HelpBoxMessageType.Error));
+                    body.Add(new HelpBox("Could not read component.", HelpBoxMessageType.Error));
                     return;
                 }
 
-                DrawRuntimeValue(body, world, entity, descriptor, snapshot);
+                DrawRuntimeValue(body, world, entity, componentId, value);
             });
         }
 
@@ -679,9 +678,9 @@ namespace Delta.ECS.Unity.Editor
             row.EnableInClassList("ecs-component-row", true);
             row.userData = entry;
             row.Add(_target.IsRuntime
-                ? BuildRuntimeComponentCard(_target.RuntimeWorld, _target.RuntimeEntity, entry.Descriptor.Value)
-                : entry.Descriptor.HasValue
-                    ? BuildAuthoringComponentCard(_authoringEntity, entry.Data, entry.Descriptor.Value)
+                ? BuildRuntimeComponentCard(_target.RuntimeWorld, _target.RuntimeEntity, entry.Component.Value)
+                : entry.Component.HasValue
+                    ? BuildAuthoringComponentCard(_authoringEntity, entry.Data, entry.Component.Value)
                     : BuildUnknownComponentCard(_authoringEntity, entry.Data));
         }
 
@@ -701,8 +700,8 @@ namespace Delta.ECS.Unity.Editor
 
         private void UnbindComponentItem(VisualElement row, int index)
         {
-            if (row.userData is ComponentEntry entry && entry.Descriptor.HasValue)
-                _runtimeBindings.RemoveAll(binding => binding.Descriptor.Schema == entry.Descriptor.Value.Schema);
+            if (row.userData is ComponentEntry entry && entry.Component.HasValue)
+                _runtimeBindings.RemoveAll(binding => Components.GetSchemaId(binding.Component) == Components.GetSchemaId(entry.Component.Value));
             row.userData = null;
             row.Clear();
         }
@@ -721,8 +720,8 @@ namespace Delta.ECS.Unity.Editor
             List<ulong> componentOrder = state.GetComponentOrderSnapshot();
 
             ulong[] visibleOrder = _componentEntries
-                .Select(entry => entry.Descriptor.HasValue
-                    ? (ulong?)entry.Descriptor.Value.Schema.Value
+                .Select(entry => entry.Component.HasValue
+                    ? (ulong?)Components.GetSchemaId(entry.Component.Value).Value
                     : GetSchemaId(entry.Data))
                 .Where(schema => schema.HasValue)
                 .Select(schema => schema.Value)
@@ -730,17 +729,17 @@ namespace Delta.ECS.Unity.Editor
                 .ToArray();
             HashSet<ulong> visibleSchemas = visibleOrder.ToHashSet();
 
-            IEnumerable<ComponentDescriptor> catalog = _previewWorld != null
-                ? _previewWorld.Integration.Catalog.Components.ToArray()
+            IEnumerable<ComponentId> catalog = _previewWorld != null
+                ? _previewWorld.World.Components.GetComponentIds().ToArray()
                 : _target.RuntimeWorld != null && _target.RuntimeWorld.IsBound
-                    ? _target.RuntimeWorld.Integration.Catalog.Components.ToArray()
-                    : Array.Empty<ComponentDescriptor>();
-            foreach (ComponentDescriptor descriptor in catalog
-                .OrderBy(descriptor => GetShortTypeName(descriptor.ValueType), StringComparer.Ordinal))
+                    ? _target.RuntimeWorld.World.Components.GetComponentIds().ToArray()
+                    : Array.Empty<ComponentId>();
+            foreach (ComponentId componentId in catalog
+                .OrderBy(componentId => GetShortTypeName(Components.GetComponentType(componentId)), StringComparer.Ordinal))
             {
-                if (!componentOrder.Contains(descriptor.Schema.Value))
+                if (!componentOrder.Contains(Components.GetSchemaId(componentId).Value))
                 {
-                    componentOrder.Add(descriptor.Schema.Value);
+                    componentOrder.Add(Components.GetSchemaId(componentId).Value);
                 }
             }
 
@@ -764,9 +763,9 @@ namespace Delta.ECS.Unity.Editor
             state.SetComponentOrder(componentOrder);
         }
 
-        private ComponentDescriptor[] ProjectRuntimeComponents(SceneWorld world, Entity entity)
+        private ComponentId[] ProjectRuntimeComponents(SceneWorld world, Entity entity)
         {
-            ReadOnlyMemory<ComponentDescriptor> catalog = world.Integration.Catalog.Components;
+            ReadOnlySpan<ComponentId> catalog = world.World.Components.GetComponentIds();
             _runtimeComponentBuffer = new ComponentId[catalog.Length];
             if (!world.TryGetComponents(entity, _runtimeComponentBuffer, out int count))
             {
@@ -776,19 +775,14 @@ namespace Delta.ECS.Unity.Editor
 
             _runtimeComponentIds = new ComponentId[count];
             Array.Copy(_runtimeComponentBuffer, _runtimeComponentIds, count);
-            Dictionary<ComponentId, ComponentDescriptor> descriptorsById = catalog.ToArray()
-                .ToDictionary(descriptor => descriptor.Id);
-
-            return OrderComponentDescriptors(_runtimeComponentIds
-                .Where(descriptorsById.ContainsKey)
-                .Select(id => descriptorsById[id]));
+            return OrderComponents(_runtimeComponentIds);
         }
 
-        private ComponentDescriptor[] OrderComponentDescriptors(IEnumerable<ComponentDescriptor> descriptors)
+        private ComponentId[] OrderComponents(IEnumerable<ComponentId> componentIds)
         {
-            return descriptors
-                .OrderBy(descriptor => GetComponentOrder(descriptor.Schema.Value))
-                .ThenBy(descriptor => GetShortTypeName(descriptor.ValueType), StringComparer.Ordinal)
+            return componentIds
+                .OrderBy(componentId => GetComponentOrder(Components.GetSchemaId(componentId).Value))
+                .ThenBy(componentId => GetShortTypeName(Components.GetComponentType(componentId)), StringComparer.Ordinal)
                 .ToArray();
         }
 
@@ -811,19 +805,17 @@ namespace Delta.ECS.Unity.Editor
         }
 
         private void DrawRuntimeValue(VisualElement body, SceneWorld world, Entity entity,
-            ComponentDescriptor descriptor, ComponentSnapshot snapshot)
+            ComponentId componentId, object value)
         {
-            bool canWrite = (descriptor.Capabilities & ComponentCapabilities.Write) != 0
-                && descriptor.ValueType.IsValueType;
             int previousChildCount = body.childCount;
-            ComponentPropertyBinding[] properties = ComponentPropertyBagFields.Build(body, descriptor,
-                snapshot.Value, canWrite,
-                (path, next) => WriteRuntimeField(world, entity, descriptor, path, next),
+            ComponentPropertyBinding[] properties = ComponentPropertyBagFields.Build(body, Components.GetComponentType(componentId),
+                value, true,
+                (path, next) => WriteRuntimeField(world, entity, componentId, path, next),
                 (label, current, onChanged) => CreateRuntimeEntityReferenceField(world, label, current, onChanged));
 
             if (properties.Length > 0)
             {
-                _runtimeBindings.Add(new RuntimeValueBinding(descriptor, properties));
+                _runtimeBindings.Add(new RuntimeValueBinding(componentId, properties));
             }
             else if (body.childCount == previousChildCount)
             {
@@ -831,18 +823,19 @@ namespace Delta.ECS.Unity.Editor
             }
         }
 
-        private VisualElement CreateRuntimeEntityReferenceField(SceneWorld world, string label, Entity current,
+        private VisualElement CreateRuntimeEntityReferenceField(SceneWorld sceneWorld, string label, Entity current,
             Action<object> onChanged)
         {
-            Entity[] authored = world.AuthoredEntities;
+            World world = sceneWorld.World;
+            Entity[] authored = sceneWorld.AuthoredEntities;
             var values = new List<Entity>(authored.Length + 2) { default };
             var options = new List<string>(authored.Length + 2) { "None" };
             var names = new List<string>(authored.Length);
             for (int i = 0; i < authored.Length; i++)
             {
                 Entity candidate = authored[i];
-                if (!world.Integration.IsAlive(candidate)) continue;
-                names.Add(GetRuntimeEntityName(world, candidate));
+                if (!world.IsAlive(candidate)) continue;
+                names.Add(GetRuntimeEntityName(sceneWorld, candidate));
             }
 
             HashSet<string> duplicateNames = names
@@ -856,9 +849,9 @@ namespace Delta.ECS.Unity.Editor
             for (int i = 0; i < authored.Length; i++)
             {
                 Entity candidate = authored[i];
-                if (!world.Integration.IsAlive(candidate)) continue;
+                if (!world.IsAlive(candidate)) continue;
                 string name = names[nameIndex++];
-                string stableId = world.TryGetStableId(candidate, out string id) ? id : string.Empty;
+                string stableId = sceneWorld.TryGetStableId(candidate, out string id) ? id : string.Empty;
                 values.Add(candidate);
                 options.Add(duplicateNames.Contains(name) && !string.IsNullOrEmpty(stableId)
                     ? $"{name} ({stableId.Substring(0, Math.Min(8, stableId.Length))})"
@@ -869,7 +862,7 @@ namespace Delta.ECS.Unity.Editor
             if (current.IsValid && currentIndex < 0)
             {
                 values.Add(current);
-                options.Add($"Current ({FormatValue(typeof(Entity), current, world)})");
+                options.Add($"Current ({FormatValue(typeof(Entity), current, sceneWorld)})");
                 currentIndex = values.Count - 1;
             }
 
@@ -893,27 +886,27 @@ namespace Delta.ECS.Unity.Editor
                     : entity.ToString();
         }
 
-        private void WriteRuntimeField(SceneWorld world, Entity entity, ComponentDescriptor descriptor,
+        private void WriteRuntimeField(SceneWorld world, Entity entity, ComponentId componentId,
             string[] path, object next)
         {
-            if (!world.Integration.TryRead(entity, descriptor.Id, out ComponentSnapshot snapshot, out EcsReadError readError))
+            if (!world.TryRead(entity, componentId, out object value))
             {
-                Debug.LogWarning($"Could not read {descriptor.Name} before editing: {readError.Code}.");
+                Debug.LogWarning($"Could not read {Components.GetComponentType(componentId).FullName ?? Components.GetComponentType(componentId).Name} before editing.");
                 RefreshRuntimeView();
                 return;
             }
 
-            object updated = snapshot.Value;
-            if (!PropertyBagValueAccess.TrySetValue(ref updated, descriptor.ValueType, path, next))
+            object updated = value;
+            if (!PropertyBagValueAccess.TrySetValue(ref updated, Components.GetComponentType(componentId), path, next))
             {
-                Debug.LogWarning($"Could not edit {descriptor.Name}: the property path is unavailable.");
+                Debug.LogWarning($"Could not edit {Components.GetComponentType(componentId).FullName ?? Components.GetComponentType(componentId).Name}: the property path is unavailable.");
                 RefreshRuntimeView();
                 return;
             }
 
-            if (!world.Integration.TryWrite(entity, descriptor.Id, updated, out EcsWriteError writeError))
+            if (!world.TryWrite(entity, componentId, updated))
             {
-                Debug.LogWarning($"Could not edit {descriptor.Name}: {writeError.Code}.");
+                Debug.LogWarning($"Could not edit {Components.GetComponentType(componentId).FullName ?? Components.GetComponentType(componentId).Name}.");
                 RefreshRuntimeView();
             }
         }
@@ -951,9 +944,23 @@ namespace Delta.ECS.Unity.Editor
                 return;
             }
 
-            SceneWorld world = _target.RuntimeWorld;
+            SceneWorld sceneWorld = _target.RuntimeWorld;
             Entity entity = _target.RuntimeEntity;
-            if (world == null || !world.IsBound || !world.Integration.IsAlive(entity))
+            if (sceneWorld == null || !sceneWorld.IsBound)
+            {
+                if (_runtimeComponentIds != null)
+                {
+                    _runtimeComponentIds = null;
+                    _runtimeComponentBuffer = null;
+                    _runtimeBindings.Clear();
+                    RefreshContent();
+                }
+
+                return;
+            }
+
+            World world = sceneWorld.World;
+            if (!world.IsAlive(entity))
             {
                 if (_runtimeComponentIds != null)
                 {
@@ -972,7 +979,7 @@ namespace Delta.ECS.Unity.Editor
                 return;
             }
 
-            if (!world.TryGetComponents(entity, _runtimeComponentBuffer, out int count)
+            if (!sceneWorld.TryGetComponents(entity, _runtimeComponentBuffer, out int count)
                 || count != _runtimeComponentIds.Length)
             {
                 RefreshContent();
@@ -991,7 +998,7 @@ namespace Delta.ECS.Unity.Editor
             for (int i = 0; i < _runtimeBindings.Count; i++)
             {
                 RuntimeValueBinding binding = _runtimeBindings[i];
-                if (!world.Integration.TryRead(entity, binding.Descriptor.Id, out ComponentSnapshot snapshot, out _))
+                if (!sceneWorld.TryRead(entity, binding.Component, out object componentValue))
                 {
                     continue;
                 }
@@ -1006,10 +1013,10 @@ namespace Delta.ECS.Unity.Editor
                         continue;
                     }
 
-                    if (PropertyBagValueAccess.TryGetValue(snapshot.Value, binding.Descriptor.ValueType,
-                            property.Path, out object value))
+                    if (PropertyBagValueAccess.TryGetValue(componentValue, Components.GetComponentType(binding.Component),
+                            property.Path, out object fieldValue))
                     {
-                        SetRuntimeFieldValue(control, property.ValueType, value, world);
+                        SetRuntimeFieldValue(control, property.ValueType, fieldValue, sceneWorld);
                     }
                 }
             }
@@ -1085,26 +1092,22 @@ namespace Delta.ECS.Unity.Editor
 
         private ComponentEntry[] ProjectAuthoringComponents(EntityAuthoring authoring)
         {
-            Dictionary<ulong, ComponentDescriptor> descriptors = _previewWorld.Integration.Catalog.Components
-                .ToArray()
-                .ToDictionary(descriptor => descriptor.Schema.Value);
-
             return authoring.Components
-                .Select(data => new ComponentEntry(data, TryGetDescriptor(data, descriptors)))
-                .OrderBy(entry => entry.Descriptor.HasValue ? GetComponentOrder(entry.Descriptor.Value.Schema.Value) : int.MaxValue)
-                .ThenBy(entry => entry.Descriptor.HasValue
-                    ? GetShortTypeName(entry.Descriptor.Value.ValueType)
+                .Select(data => new ComponentEntry(data, TryGetComponentId(data)))
+                .OrderBy(entry => entry.Component.HasValue ? GetComponentOrder(Components.GetSchemaId(entry.Component.Value).Value) : int.MaxValue)
+                .ThenBy(entry => entry.Component.HasValue
+                    ? GetShortTypeName(Components.GetComponentType(entry.Component.Value))
                     : entry.Data?.SchemaIdText ?? string.Empty, StringComparer.Ordinal)
                 .ToArray();
         }
 
-        private void AddComponent(EntityAuthoring authoring, ComponentDescriptor descriptor)
+        private void AddComponent(EntityAuthoring authoring, ComponentId componentId)
         {
-            Undo.RecordObject(Authoring, $"Add {GetShortTypeName(descriptor.ValueType)}");
-            ComponentData data = ComponentData.CreateDefault(descriptor);
-            if (!_previewWorld.AddComponent(authoring, descriptor, data, out EcsWriteError error, out string failureReason))
+            Undo.RecordObject(Authoring, $"Add {GetShortTypeName(Components.GetComponentType(componentId))}");
+            ComponentData data = ComponentData.CreateDefault(Components, componentId);
+            if (!_previewWorld.AddComponent(authoring, componentId, data, out string failureReason))
             {
-                Debug.LogError($"Could not add {GetShortTypeName(descriptor.ValueType)}: {failureReason ?? error.Code.ToString()}.", Authoring);
+                Debug.LogError($"Could not add {GetShortTypeName(Components.GetComponentType(componentId))}: {failureReason}.", Authoring);
                 RebuildPreviewAndView();
                 return;
             }
@@ -1115,16 +1118,16 @@ namespace Delta.ECS.Unity.Editor
         }
 
         private void RemoveComponent(EntityAuthoring authoring, ComponentData data,
-            ComponentDescriptor? descriptor = null)
+            ComponentId? componentId = null)
         {
             int index = authoring.Components.IndexOf(data);
             if (index < 0 || index >= authoring.Components.Count) return;
-            if (!descriptor.HasValue && _previewWorld.TryGetDescriptor(data, out ComponentDescriptor resolved))
+            if (!componentId.HasValue && _previewWorld.TryGetComponentId(data, out ComponentId resolved))
             {
-                descriptor = resolved;
+                componentId = resolved;
             }
 
-            if (!descriptor.HasValue)
+            if (!componentId.HasValue)
             {
                 Undo.RecordObject(Authoring, "Remove Unregistered Delta ECS Component");
                 authoring.Components.RemoveAt(index);
@@ -1133,11 +1136,11 @@ namespace Delta.ECS.Unity.Editor
                 return;
             }
 
-            ComponentDescriptor component = descriptor.Value;
-            Undo.RecordObject(Authoring, $"Remove {GetShortTypeName(component.ValueType)}");
-            if (!_previewWorld.RemoveComponent(authoring, component, out EcsWriteError error))
+            ComponentId component = componentId.Value;
+            Undo.RecordObject(Authoring, $"Remove {GetShortTypeName(Components.GetComponentType(component))}");
+            if (!_previewWorld.RemoveComponent(authoring, component))
             {
-                Debug.LogError($"Could not remove {GetShortTypeName(component.ValueType)}: {error.Code}.", Authoring);
+                Debug.LogError($"Could not remove {GetShortTypeName(Components.GetComponentType(component))}.", Authoring);
                 return;
             }
 
@@ -1146,18 +1149,18 @@ namespace Delta.ECS.Unity.Editor
             RebuildPreviewAndView();
         }
 
-        private void ResetComponent(EntityAuthoring authoring, ComponentData data, ComponentDescriptor descriptor)
+        private void ResetComponent(EntityAuthoring authoring, ComponentData data, ComponentId componentId)
         {
-            Undo.RecordObject(Authoring, $"Reset {GetShortTypeName(descriptor.ValueType)}");
-            object value = Activator.CreateInstance(descriptor.ValueType);
-            if (_previewWorld.TryWrite(authoring, data, descriptor, value, out EcsWriteError error)) MarkSceneDirty();
-            else Debug.LogError($"Could not reset {GetShortTypeName(descriptor.ValueType)}: {error.Code}.", Authoring);
+            Undo.RecordObject(Authoring, $"Reset {GetShortTypeName(Components.GetComponentType(componentId))}");
+            object value = Activator.CreateInstance(Components.GetComponentType(componentId));
+            if (_previewWorld.TryWrite(authoring, data, componentId, value)) MarkSceneDirty();
+            else Debug.LogError($"Could not reset {GetShortTypeName(Components.GetComponentType(componentId))}.", Authoring);
             RefreshContent();
         }
 
         private void MoveComponent(ulong schema, int direction)
         {
-            int index = _componentEntries.FindIndex(entry => entry.Descriptor?.Schema.Value == schema);
+            int index = _componentEntries.FindIndex(entry => entry.Component.HasValue && Components.GetSchemaId(entry.Component.Value).Value == schema);
             int next = index + direction;
             if (index < 0 || next < 0 || next >= _componentEntries.Count) return;
             _componentList.viewController.Move(index, next);
@@ -1201,22 +1204,22 @@ namespace Delta.ECS.Unity.Editor
         private readonly struct ComponentEntry
         {
             public readonly ComponentData Data;
-            public readonly ComponentDescriptor? Descriptor;
-            public ComponentEntry(ComponentData data, ComponentDescriptor? descriptor)
+            public readonly ComponentId? Component;
+            public ComponentEntry(ComponentData data, ComponentId? componentId)
             {
                 Data = data;
-                Descriptor = descriptor;
+                Component = componentId;
             }
         }
 
         private readonly struct RuntimeValueBinding
         {
-            public readonly ComponentDescriptor Descriptor;
+            public readonly ComponentId Component;
             public readonly ComponentPropertyBinding[] Properties;
 
-            public RuntimeValueBinding(ComponentDescriptor descriptor, ComponentPropertyBinding[] properties)
+            public RuntimeValueBinding(ComponentId componentId, ComponentPropertyBinding[] properties)
             {
-                Descriptor = descriptor;
+                Component = componentId;
                 Properties = properties;
             }
         }

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.62"
+    "com.artromskiy.deltaecs.unity": "0.0.64"
   }
 }
 ```

package/Runtime/ComponentData.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 
 using Delta.ECS;
-using Delta.ECS.Integration;
 
 using UnityEngine;
 
@@ -28,15 +27,15 @@ namespace Delta.ECS.Unity
             _json = json;
         }
 
-        public static ComponentData CreateDefault(ComponentDescriptor descriptor)
+        public static ComponentData CreateDefault(ComponentRegistry components, ComponentId componentId)
         {
-            if (descriptor.IsTag)
+            if (components.IsTag(componentId))
             {
-                return new ComponentData(descriptor.Schema.Value, "{}");
+                return new ComponentData(components.GetSchemaId(componentId).Value, "{}");
             }
 
-            object value = Activator.CreateInstance(descriptor.ValueType);
-            return new ComponentData(descriptor.Schema.Value, JsonUtility.ToJson(value));
+            object value = Activator.CreateInstance(components.GetComponentType(componentId));
+            return new ComponentData(components.GetSchemaId(componentId).Value, JsonUtility.ToJson(value));
         }
 
         public bool TryGetSchemaId(out SchemaId schemaId)

package/Runtime/SceneWorld.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 
 using Delta.ECS;
-using Delta.ECS.Integration;
 
 using UnityEngine;
 using UnityEngine.SceneManagement;
@@ -25,7 +24,6 @@ namespace Delta.ECS.Unity
         private readonly Dictionary<Entity, GameObject> _viewsByEntity = new();
         private readonly Dictionary<UnityEngine.EntityId, Entity> _entitiesByView = new();
         private readonly World _world;
-        private readonly IEcsWorld _integration;
         private readonly SceneData _sceneData;
         private readonly SceneAuthoring _authoring;
         private readonly bool _ownsWorld;
@@ -33,7 +31,6 @@ namespace Delta.ECS.Unity
         private bool _disposed;
 
         public World World => _world;
-        internal ComponentId HiddenEntityHierarchyComponentId => _hiddenEntityHierarchyComponentId;
 
         public Entity[] AuthoredEntities
         {
@@ -44,28 +41,21 @@ namespace Delta.ECS.Unity
                 return entities;
             }
         }
-        internal IEcsWorld Integration => _integration;
+        internal ComponentId HiddenEntityHierarchyComponentId => _hiddenEntityHierarchyComponentId;
         internal SceneData SceneData => _sceneData;
         internal Scene UnityScene => _authoring != null ? _authoring.gameObject.scene : default;
         internal bool IsBound => !_disposed;
 
-        internal SceneWorld(World world, SceneData sceneData)
-            : this(world, sceneData, null, ownsWorld: false, registerLiveWorld: true)
-        {
-        }
-
-        private SceneWorld(World world, SceneData sceneData,
-            SceneAuthoring authoring, bool ownsWorld, bool registerLiveWorld)
+        private SceneWorld(World world,
+            SceneData sceneData, SceneAuthoring authoring, bool ownsWorld, bool registerLiveWorld)
         {
             _world = world ?? UnityThrowHelpers.ThrowArgumentNull<World>(nameof(world));
             _sceneData = sceneData ?? UnityThrowHelpers.ThrowArgumentNull<SceneData>(nameof(sceneData));
             _authoring = authoring;
-            _integration = world;
             _ownsWorld = ownsWorld;
             _hiddenEntityHierarchyComponentId = world.Components.GetPrimary<HideFromEntityHierarchy>();
 
             _sceneData.EnsureStableIds();
-            _integration.Initialize();
             RebuildAuthoringEntities();
             if (registerLiveWorld)
             {
@@ -73,7 +63,7 @@ namespace Delta.ECS.Unity
             }
         }
 
-        /// <summary>Returns the integration-owned runtime context for a loaded Unity scene.</summary>
+        /// <summary>Returns the runtime context for a loaded Unity scene.</summary>
         public static SceneWorld GetForScene(Scene scene) => SceneWorldRuntime.GetForScene(scene);
 
         /// <summary>Resolves the live ECS world and entity currently associated with a Unity view.</summary>
@@ -93,7 +83,7 @@ namespace Delta.ECS.Unity
         /// <summary>Registers a transient runtime association; it is not written into scene data.</summary>
         public bool BindView(Entity entity, GameObject view)
         {
-            if (view == null || !_integration.IsAlive(entity))
+            if (view == null || !_world.IsAlive(entity))
             {
                 return false;
             }
@@ -128,7 +118,7 @@ namespace Delta.ECS.Unity
             {
                 foreach (Entity candidate in _entitiesByStableId.Values)
                 {
-                    if (_integration.IsAlive(candidate) && _world.Has(candidate, componentId))
+                    if (_world.IsAlive(candidate) && _world.Has(candidate, componentId))
                     {
                         entity = candidate;
                         return true;
@@ -159,7 +149,6 @@ namespace Delta.ECS.Unity
             _stableIdsByEntity.Clear();
             _viewsByEntity.Clear();
             _entitiesByView.Clear();
-            _integration.Shutdown();
 
             if (_ownsWorld)
             {
@@ -220,7 +209,7 @@ namespace Delta.ECS.Unity
 
         internal static SceneWorld CreatePreview(SceneData sceneData)
         {
-            var world = CreateWorld(DefaultEntityCapacity);
+            World world = CreateWorld(DefaultEntityCapacity);
             try
             {
                 return new SceneWorld(world, sceneData, null,
@@ -240,7 +229,7 @@ namespace Delta.ECS.Unity
                 UnityThrowHelpers.ThrowArgumentNull(nameof(authoring));
             }
 
-            var world = CreateWorld(DefaultEntityCapacity);
+            World world = CreateWorld(DefaultEntityCapacity);
             try
             {
                 return new SceneWorld(world, authoring.SceneData, authoring,
@@ -260,7 +249,7 @@ namespace Delta.ECS.Unity
                 UnityThrowHelpers.ThrowArgumentNull(nameof(authoring));
             }
 
-            var world = CreateWorld(RuntimeEntityCapacity);
+            World world = CreateWorld(RuntimeEntityCapacity);
             try
             {
                 return new SceneWorld(world, authoring.SceneData, authoring,
@@ -295,10 +284,10 @@ namespace Delta.ECS.Unity
                 for (int componentIndex = 0; componentIndex < authoring.Components.Count; componentIndex++)
                 {
                     ComponentData data = authoring.Components[componentIndex];
-                    if (TryGetDescriptor(data, out ComponentDescriptor descriptor)
-                        && seenSchemas.Add(descriptor.Schema.Value))
+                    if (TryGetComponentId(data, out ComponentId componentId)
+                        && seenSchemas.Add(_world.Components.GetSchemaId(componentId).Value))
                     {
-                        componentIds.Add(descriptor.Id);
+                        componentIds.Add(componentId);
                     }
                     else
                     {
@@ -306,7 +295,7 @@ namespace Delta.ECS.Unity
                     }
                 }
 
-                Entity entity = _integration.Create(componentIds.ToArray());
+                Entity entity = _world.Create(componentIds.ToArray());
                 _entitiesByStableId.Add(authoring.StableId, entity);
                 _stableIdsByEntity.Add(entity, authoring.StableId);
             }
@@ -323,21 +312,21 @@ namespace Delta.ECS.Unity
                 for (int componentIndex = 0; componentIndex < authoring.Components.Count; componentIndex++)
                 {
                     ComponentData data = authoring.Components[componentIndex];
-                    if (!TryGetDescriptor(data, out ComponentDescriptor descriptor))
+                    if (!TryGetComponentId(data, out ComponentId componentId))
                     {
                         continue;
                     }
 
-                    if (descriptor.IsTag)
+                    if (_world.Components.IsTag(componentId))
                     {
                         continue;
                     }
 
-                    object value = data.CreateValue(descriptor.ValueType, ResolveEntity);
-                    if (_integration.TryRead(entity, descriptor.Id, out _, out _)
-                        && !_integration.TryWrite(entity, descriptor.Id, value, out EcsWriteError error))
+                    object value = data.CreateValue(_world.Components.GetComponentType(componentId), ResolveEntity);
+                    if (TryRead(entity, componentId, out _)
+                        && !_world.TryWrite(entity, componentId, value))
                     {
-                        Debug.LogError($"Failed to load {descriptor.Name} on '{authoring.Name}': {error.Code}.");
+                        Debug.LogError($"Failed to load {_world.Components.GetComponentType(componentId).FullName ?? _world.Components.GetComponentType(componentId).Name} on '{authoring.Name}'.");
                     }
                 }
             }
@@ -369,7 +358,7 @@ namespace Delta.ECS.Unity
         internal bool TryGetEntity(GameObject view, out Entity entity)
         {
             if (view != null && _entitiesByView.TryGetValue(view.GetEntityId(), out entity)
-                && _integration.IsAlive(entity))
+                && _world.IsAlive(entity))
             {
                 return true;
             }
@@ -377,7 +366,7 @@ namespace Delta.ECS.Unity
             if (view != null && _authoring != null
                 && _authoring.TryGetStableId(view, out string stableId)
                 && _entitiesByStableId.TryGetValue(stableId, out entity)
-                && _integration.IsAlive(entity))
+                && _world.IsAlive(entity))
             {
                 return true;
             }
@@ -386,56 +375,42 @@ namespace Delta.ECS.Unity
             return false;
         }
 
-        internal bool TryGetDescriptor(ComponentData data, out ComponentDescriptor descriptor)
+        internal bool TryGetComponentId(ComponentData data, out ComponentId componentId)
         {
-            descriptor = default;
-            if (data == null || !data.TryGetSchemaId(out SchemaId schema))
-            {
-                return false;
-            }
-
-            ReadOnlyMemory<ComponentDescriptor> catalog = _integration.Catalog.Components;
-            for (int i = 0; i < catalog.Length; i++)
-            {
-                if (catalog.Span[i].Schema == schema)
-                {
-                    descriptor = catalog.Span[i];
-                    return true;
-                }
-            }
-
-            return false;
+            componentId = ComponentId.Invalid;
+            return data != null && data.TryGetSchemaId(out SchemaId schema)
+                && _world.Components.TryGetComponentId(schema, out componentId);
         }
 
-        internal bool TryRead(EntityAuthoring authoring, ComponentDescriptor descriptor,
-            out ComponentSnapshot snapshot, out EcsReadError error)
+        internal bool TryRead(EntityAuthoring authoring, ComponentId componentId, out object? value)
         {
             if (TryGetEntity(authoring, out Entity entity))
             {
-                return TryRead(entity, descriptor, out snapshot, out error);
+                return TryRead(entity, componentId, out value);
             }
 
-            snapshot = default;
-            error = default;
+            value = null;
             return false;
         }
 
-        internal bool TryRead(Entity entity, ComponentDescriptor descriptor,
-            out ComponentSnapshot snapshot, out EcsReadError error)
-            => _integration.TryRead(entity, descriptor.Id, out snapshot, out error);
+        internal bool TryRead(Entity entity, ComponentId componentId, out object? value)
+            => _world.TryRead(entity, componentId, out value);
+
+        internal bool TryWrite(Entity entity, ComponentId componentId, object value)
+            => _world.TryWrite(entity, componentId, value);
 
         internal bool TryGetComponents(Entity entity, Span<ComponentId> destination, out int totalCount)
         {
             totalCount = 0;
-            if (!_integration.IsAlive(entity))
+            if (!_world.IsAlive(entity))
             {
                 return false;
             }
 
-            ReadOnlyMemory<ComponentDescriptor> components = _integration.Catalog.Components;
+            ReadOnlySpan<ComponentId> components = _world.Components.GetComponentIds();
             for (int index = 0; index < components.Length; index++)
             {
-                ComponentId component = components.Span[index].Id;
+                ComponentId component = components[index];
                 if (!_world.Has(entity, component))
                 {
                     continue;
@@ -453,26 +428,14 @@ namespace Delta.ECS.Unity
         }
 
         internal bool TryWrite(EntityAuthoring authoring, ComponentData data,
-            ComponentDescriptor descriptor, object value, out EcsWriteError error)
+            ComponentId componentId, object value)
         {
-            if (!TryGetEntity(authoring, out Entity entity) || !_integration.IsAlive(entity))
-            {
-                error = new EcsWriteError(EcsWriteErrorCode.EntityNotAlive);
-                return false;
-            }
-
-            if (!_integration.TryRead(entity, descriptor.Id, out ComponentSnapshot snapshot, out _))
-            {
-                error = new EcsWriteError(EcsWriteErrorCode.ComponentMissing);
-                return false;
-            }
-
-            if (!_integration.TryWrite(entity, descriptor.Id, value, out error))
+            if (!TryGetEntity(authoring, out Entity entity) || !_world.TryWrite(entity, componentId, value))
             {
                 return false;
             }
 
-            if (descriptor.IsTag)
+            if (_world.Components.IsTag(componentId))
             {
                 data.StoreDefaultTag();
             }
@@ -484,60 +447,41 @@ namespace Delta.ECS.Unity
             return true;
         }
 
-        internal bool AddComponent(EntityAuthoring authoring, ComponentDescriptor descriptor,
-            ComponentData data, out EcsWriteError error, out string failureReason)
+        internal bool AddComponent(EntityAuthoring authoring, ComponentId componentId,
+            ComponentData data, out string failureReason)
         {
             failureReason = null;
             if (!TryGetEntity(authoring, out Entity entity))
             {
-                error = new EcsWriteError(EcsWriteErrorCode.EntityNotAlive);
                 failureReason = "The authored entity is not bound to the preview world. Rebuild the preview and try again.";
                 return false;
             }
 
-            if (!_integration.IsAlive(entity))
+            if (!_world.IsAlive(entity))
             {
-                error = new EcsWriteError(EcsWriteErrorCode.EntityNotAlive);
                 failureReason = "The entity is no longer alive in the preview world.";
                 return false;
             }
 
-            if (!_integration.Add(entity, new[] { descriptor.Id }))
+            if (!_world.Add(entity, componentId))
             {
-                error = default;
-                failureReason = _world.Has(entity, descriptor.Id)
+                failureReason = _world.Has(entity, componentId)
                     ? "The component is already present in the preview world."
                     : "DeltaECS rejected the structural add without reporting a write error.";
                 return false;
             }
 
-            if (descriptor.IsTag)
+            if (_world.Components.IsTag(componentId))
             {
                 data.StoreDefaultTag();
-                error = default;
                 return true;
             }
 
-            object value = data.CreateValue(descriptor.ValueType, ResolveEntity);
-            if (!_integration.TryRead(entity, descriptor.Id, out ComponentSnapshot snapshot, out EcsReadError readError))
-            {
-                _integration.Remove(entity, new[] { descriptor.Id });
-                error = new EcsWriteError(readError.Code switch
-                {
-                    EcsReadErrorCode.EntityNotAlive => EcsWriteErrorCode.EntityNotAlive,
-                    EcsReadErrorCode.ComponentUnknown => EcsWriteErrorCode.ComponentUnknown,
-                    EcsReadErrorCode.ComponentMissing => EcsWriteErrorCode.ComponentMissing,
-                    EcsReadErrorCode.Unsupported => EcsWriteErrorCode.Unsupported,
-                    _ => EcsWriteErrorCode.None
-                });
-                failureReason = $"The new component could not be read from the preview world ({readError.Code}).";
-                return false;
-            }
-
-            if (!_integration.TryWrite(entity, descriptor.Id, value, out error))
+            object value = data.CreateValue(_world.Components.GetComponentType(componentId), ResolveEntity);
+            if (!_world.TryWrite(entity, componentId, value))
             {
-                _integration.Remove(entity, new[] { descriptor.Id });
-                failureReason = $"The default component value could not be written ({error.Code}).";
+                _world.Remove(entity, componentId);
+                failureReason = "The default component value could not be written.";
                 return false;
             }
 
@@ -545,13 +489,8 @@ namespace Delta.ECS.Unity
             return true;
         }
 
-        internal bool RemoveComponent(EntityAuthoring authoring, ComponentDescriptor descriptor,
-            out EcsWriteError error)
-        {
-            error = default;
-            return TryGetEntity(authoring, out Entity entity)
-                && _integration.Remove(entity, new[] { descriptor.Id });
-        }
+        internal bool RemoveComponent(EntityAuthoring authoring, ComponentId componentId)
+            => TryGetEntity(authoring, out Entity entity) && _world.Remove(entity, componentId);
 
         internal bool TryGetAuthoring(string stableId, out EntityAuthoring authoring)
         {
@@ -586,9 +525,9 @@ namespace Delta.ECS.Unity
         {
             foreach (Entity entity in _entitiesByStableId.Values)
             {
-                if (_integration.IsAlive(entity))
+                if (_world.IsAlive(entity))
                 {
-                    _integration.Destroy(entity);
+                    _world.Destroy(entity);
                 }
             }
         }

package/Runtime/ViewComponents.cs

@@ -2,12 +2,6 @@ using Delta.ECS;
 
 namespace Delta.ECS.Unity
 {
-    internal static class ViewComponentSchemaIds
-    {
-        internal const ulong ViewToken = 0x405B11F5A17E14A1UL;
-        internal const ulong ViewBound = 0xB31CB42A81D3B164UL;
-        internal const ulong HideFromEntityHierarchy = 0x8C13A2E9764DB501UL;
-    }
 
     /// <summary>Receives the entity context after a Unity view is bound to an entity.</summary>
     public interface IEntityView
@@ -39,4 +33,10 @@ namespace Delta.ECS.Unity
     public readonly struct HideFromEntityHierarchy
     {
     }
+    internal static class ViewComponentSchemaIds
+    {
+        internal const ulong ViewToken = 0x405B11F5A17E14A1UL;
+        internal const ulong ViewBound = 0xB31CB42A81D3B164UL;
+        internal const ulong HideFromEntityHierarchy = 0x8C13A2E9764DB501UL;
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.artromskiy.deltaecs.unity",
-  "version": "0.0.62",
+  "version": "0.0.64",
   "displayName": "DeltaECS Unity",
   "description": "Unity scene authoring and editor integration for DeltaECS.",
   "unity": "6000.7",