From c3dc2bb089a438e1c3a2dbcce53f7271772874d3 Mon Sep 17 00:00:00 2001
From: Laszlo Paillat <laszlo.paillat@gmail.com>
Date: Sat, 16 Oct 2021 20:05:32 +0200
Subject: [PATCH] renamed EntityMap.ContainsEntity method to Contains renamed
 EntityMultiMap.ContainsEntity method to Contains added IEntityContainer type
 as common base interface for all entity container (EntitySet,
 EntitySortedSet, EntityMap, EntityMultiMap)

---
 documentation/NEXT_RELEASENOTES.txt           |  3 +
 source/DefaultEcs.Test/EntityMapTest.cs       | 12 +--
 source/DefaultEcs.Test/EntityMultiMapTest.cs  | 12 +--
 .../System/AEntitySortedSetSystemTest.cs      |  2 -
 source/DefaultEcs/EntityMap.cs                | 68 ++++++----------
 source/DefaultEcs/EntityMultiMap.cs           | 78 +++++++------------
 source/DefaultEcs/EntitySet.cs                | 64 ++++++---------
 source/DefaultEcs/EntitySortedSet.cs          | 64 ++++++---------
 source/DefaultEcs/IEntityContainer.cs         | 36 +++++++++
 .../Internal/EntityContainerWatcher.cs        |  4 +-
 .../DefaultEcs/Internal/IEntityContainer.cs   |  2 -
 11 files changed, 154 insertions(+), 191 deletions(-)
 create mode 100644 source/DefaultEcs/IEntityContainer.cs

diff --git a/documentation/NEXT_RELEASENOTES.txt b/documentation/NEXT_RELEASENOTES.txt
index ef32cde7..7b6d6cde 100644
--- a/documentation/NEXT_RELEASENOTES.txt
+++ b/documentation/NEXT_RELEASENOTES.txt
@@ -1,8 +1,11 @@
 breaking changes:
 remove EntityCommandRecorder.CreateEntity method, see new WorldRecord type
+renamed EntityMap.ContainsEntity method to Contains
+renamed EntityMultiMap.ContainsEntity method to Contains
 
 ---
 
+added IEntityContainer type as common base interface for all entity container (EntitySet, EntitySortedSet, EntityMap, EntityMultiMap)
 added EntityCommandRecorder.Record(World) method
 added WorldRecord type to record action on World
 added EntitySet.EntityAdded event
diff --git a/source/DefaultEcs.Test/EntityMapTest.cs b/source/DefaultEcs.Test/EntityMapTest.cs
index c3782e7d..a04735ba 100644
--- a/source/DefaultEcs.Test/EntityMapTest.cs
+++ b/source/DefaultEcs.Test/EntityMapTest.cs
@@ -21,7 +21,7 @@ public void World_Should_return_world()
         }
 
         [Fact]
-        public void ContainsEntity_Should_return_weither_an_entity_is_in_or_not()
+        public void Contains_Should_return_weither_an_entity_is_in_or_not()
         {
             using World world = new();
 
@@ -29,23 +29,23 @@ public void ContainsEntity_Should_return_weither_an_entity_is_in_or_not()
 
             using EntityMap<int> map = world.GetEntities().AsMap<int>();
 
-            Check.That(map.ContainsEntity(entity)).IsFalse();
+            Check.That(map.Contains(entity)).IsFalse();
 
             entity.Set(42);
 
-            Check.That(map.ContainsEntity(entity)).IsTrue();
+            Check.That(map.Contains(entity)).IsTrue();
 
             entity.Disable<int>();
 
-            Check.That(map.ContainsEntity(entity)).IsFalse();
+            Check.That(map.Contains(entity)).IsFalse();
 
             entity.Enable<int>();
 
-            Check.That(map.ContainsEntity(entity)).IsTrue();
+            Check.That(map.Contains(entity)).IsTrue();
 
             entity.Remove<int>();
 
-            Check.That(map.ContainsEntity(entity)).IsFalse();
+            Check.That(map.Contains(entity)).IsFalse();
         }
 
         [Fact]
diff --git a/source/DefaultEcs.Test/EntityMultiMapTest.cs b/source/DefaultEcs.Test/EntityMultiMapTest.cs
index 0b917313..e9753a8e 100644
--- a/source/DefaultEcs.Test/EntityMultiMapTest.cs
+++ b/source/DefaultEcs.Test/EntityMultiMapTest.cs
@@ -20,7 +20,7 @@ public void World_Should_return_world()
         }
 
         [Fact]
-        public void ContainsEntity_Should_return_weither_an_entity_is_in_or_not()
+        public void Contains_Should_return_weither_an_entity_is_in_or_not()
         {
             using World world = new();
 
@@ -28,24 +28,24 @@ public void ContainsEntity_Should_return_weither_an_entity_is_in_or_not()
 
             using EntityMultiMap<int> map = world.GetEntities().AsMultiMap<int>();
 
-            Check.That(map.ContainsEntity(entity)).IsFalse();
+            Check.That(map.Contains(entity)).IsFalse();
 
             entity.Set(42);
             world.CreateEntity().Set(42);
 
-            Check.That(map.ContainsEntity(entity)).IsTrue();
+            Check.That(map.Contains(entity)).IsTrue();
 
             entity.Disable<int>();
 
-            Check.That(map.ContainsEntity(entity)).IsFalse();
+            Check.That(map.Contains(entity)).IsFalse();
 
             entity.Enable<int>();
 
-            Check.That(map.ContainsEntity(entity)).IsTrue();
+            Check.That(map.Contains(entity)).IsTrue();
 
             entity.Remove<int>();
 
-            Check.That(map.ContainsEntity(entity)).IsFalse();
+            Check.That(map.Contains(entity)).IsFalse();
         }
 
         [Fact]
diff --git a/source/DefaultEcs.Test/System/AEntitySortedSetSystemTest.cs b/source/DefaultEcs.Test/System/AEntitySortedSetSystemTest.cs
index be71bccf..c3dad9e8 100644
--- a/source/DefaultEcs.Test/System/AEntitySortedSetSystemTest.cs
+++ b/source/DefaultEcs.Test/System/AEntitySortedSetSystemTest.cs
@@ -1,8 +1,6 @@
 using System;
 using DefaultEcs.System;
-using DefaultEcs.Threading;
 using NFluent;
-using NSubstitute;
 using Xunit;
 
 namespace DefaultEcs.Test.System
diff --git a/source/DefaultEcs/EntityMap.cs b/source/DefaultEcs/EntityMap.cs
index 24a102a6..12579a5e 100644
--- a/source/DefaultEcs/EntityMap.cs
+++ b/source/DefaultEcs/EntityMap.cs
@@ -16,7 +16,7 @@ namespace DefaultEcs
     /// <typeparam name="TKey">The type of the component used as key.</typeparam>
     [DebuggerTypeProxy(typeof(EntityMapDebugView<>))]
     [DebuggerDisplay("EntityMap[{_entities.Count}]")]
-    public sealed class EntityMap<TKey> : IEntityContainer, IDisposable
+    public sealed class EntityMap<TKey> : IEntityContainer
     {
         #region Types
 
@@ -133,20 +133,6 @@ internal KeyEnumerator(EntityMap<TKey> map)
 
         #endregion
 
-        #region Events
-
-        /// <summary>
-        /// Occurs when an <see cref="Entity"/> is added in the current <see cref="EntityMap{TKey}"/>.
-        /// </summary>
-        public event EntityAddedHandler EntityAdded;
-
-        /// <summary>
-        /// Occurs when an <see cref="Entity"/> is removed from the current <see cref="EntityMap{TKey}"/>.
-        /// </summary>
-        public event EntityRemovedHandler EntityRemoved;
-
-        #endregion
-
         #region Initialisation
 
         internal EntityMap(
@@ -201,13 +187,6 @@ private void On(in ComponentChangedMessage<TKey> message)
 
         #region Methods
 
-        /// <summary>
-        /// Determines whether the <see cref="EntityMap{TKey}"/> contains a specific <see cref="Entity"/>.
-        /// </summary>
-        /// <param name="entity">The <see cref="Entity"/> to locate in the <see cref="EntityMap{TKey}"/>.</param>
-        /// <returns>true if the <see cref="EntityMap{TKey}"/> contains the specified <see cref="Entity"/>; otherwise, false.</returns>
-        public bool ContainsEntity(Entity entity) => entity.EntityId < _entityIds.Length && _entityIds[entity.EntityId];
-
         /// <summary>
         /// Determines whether the <see cref="EntityMap{TKey}"/> contains the specified key.
         /// </summary>
@@ -223,11 +202,20 @@ private void On(in ComponentChangedMessage<TKey> message)
         /// <returns>true if the <see cref="EntityMap{TKey}"/> contains an <see cref="Entity"/> with the specified key; otherwise, false.</returns>
         public bool TryGetEntity(TKey key, out Entity entity) => _entities.TryGetValue(key, out entity);
 
-        /// <summary>
-        /// Clears current instance of its entities if it was created with some reactive filter (<see cref="EntityQueryBuilder.WhenAdded{T}"/>, <see cref="EntityQueryBuilder.WhenChanged{T}"/> or <see cref="EntityQueryBuilder.WhenRemoved{T}"/>).
-        /// Does nothing if it was created from a static filter.
-        /// This method need to be called after current instance content has been processed in a update cycle.
-        /// </summary>
+        #endregion
+
+        #region IEntityContainer
+
+        /// <inheritdoc/>
+        public event EntityAddedHandler EntityAdded;
+
+        /// <inheritdoc/>
+        public event EntityRemovedHandler EntityRemoved;
+
+        /// <inheritdoc/>
+        public bool Contains(in Entity entity) => entity.EntityId < _entityIds.Length && _entityIds[entity.EntityId];
+
+        /// <inheritdoc/>
         public void Complete()
         {
             if (_needClearing)
@@ -237,11 +225,17 @@ public void Complete()
             }
         }
 
-        #endregion
+        /// <inheritdoc/>
+        public void TrimExcess()
+        {
+            ArrayExtension.Trim(ref _entityIds, Array.FindLastIndex(_entityIds, i => i) + 1);
 
-        #region IEntityContainer
+#if NETSTANDARD2_1
+            _entities.TrimExcess();
+#endif
+        }
 
-        void IEntityContainer.Add(int entityId)
+        void Internal.IEntityContainer.Add(int entityId)
         {
             ArrayExtension.EnsureLength(ref _entityIds, entityId, _worldMaxCapacity);
 
@@ -255,7 +249,7 @@ void IEntityContainer.Add(int entityId)
             }
         }
 
-        void IEntityContainer.Remove(int entityId)
+        void Internal.IEntityContainer.Remove(int entityId)
         {
             if (entityId < _entityIds.Length && _entityIds[entityId])
             {
@@ -266,18 +260,6 @@ void IEntityContainer.Remove(int entityId)
             }
         }
 
-        /// <summary>
-        /// Resizes inner storage to exactly the number of <see cref="Entity"/> this <see cref="EntityMap{TKey}"/> contains.
-        /// </summary>
-        public void TrimExcess()
-        {
-            ArrayExtension.Trim(ref _entityIds, Array.FindLastIndex(_entityIds, i => i) + 1);
-
-#if NETSTANDARD2_1
-            _entities.TrimExcess();
-#endif
-        }
-
         #endregion
 
         #region IDisposable
diff --git a/source/DefaultEcs/EntityMultiMap.cs b/source/DefaultEcs/EntityMultiMap.cs
index 8580e41d..4aff4730 100644
--- a/source/DefaultEcs/EntityMultiMap.cs
+++ b/source/DefaultEcs/EntityMultiMap.cs
@@ -18,7 +18,7 @@ namespace DefaultEcs
     /// <typeparam name="TKey">The type of the component used as key.</typeparam>
     [DebuggerTypeProxy(typeof(EntityMultiMapDebugView<>))]
     [DebuggerDisplay("EntityMultiMap[{_entities.Count}]")]
-    public sealed class EntityMultiMap<TKey> : IEntityContainer, ISortable, IDisposable
+    public sealed class EntityMultiMap<TKey> : IEntityContainer, ISortable
     {
         #region Types
 
@@ -241,20 +241,6 @@ public bool MoveNext()
 
         #endregion
 
-        #region Events
-
-        /// <summary>
-        /// Occurs when an <see cref="Entity"/> is added in the current <see cref="EntityMap{TKey}"/>.
-        /// </summary>
-        public event EntityAddedHandler EntityAdded;
-
-        /// <summary>
-        /// Occurs when an <see cref="Entity"/> is removed from the current <see cref="EntityMap{TKey}"/>.
-        /// </summary>
-        public event EntityRemovedHandler EntityRemoved;
-
-        #endregion
-
         #region Initialisation
 
         internal EntityMultiMap(
@@ -341,13 +327,6 @@ private void On(in ComponentChangedMessage<TKey> message)
         /// <returns>The number of <see cref="Entity"/> in the current <see cref="EntityMultiMap{TKey}"/> for the given <typeparamref name="TKey"/>.</returns>
         public int Count(TKey key) => _entities.TryGetValue(key, out Entities entities) ? entities.Count : 0;
 
-        /// <summary>
-        /// Determines whether the <see cref="EntityMultiMap{TKey}"/> contains a specific <see cref="Entity"/>.
-        /// </summary>
-        /// <param name="entity">The <see cref="Entity"/> to locate in the <see cref="EntityMultiMap{TKey}"/>.</param>
-        /// <returns>true if the <see cref="EntityMultiMap{TKey}"/> contains the specified <see cref="Entity"/>; otherwise, false.</returns>
-        public bool ContainsEntity(Entity entity) => entity.EntityId < _mapping.Length && _mapping[entity.EntityId].Entities != null;
-
         /// <summary>
         /// Determines whether the <see cref="EntityMultiMap{TKey}"/> contains the specified key.
         /// </summary>
@@ -367,11 +346,20 @@ public bool TryGetEntities(TKey key, out ReadOnlySpan<Entity> entities)
             return entities.Length > 0;
         }
 
-        /// <summary>
-        /// Clears current instance of its entities if it was created with some reactive filter (<see cref="EntityQueryBuilder.WhenAdded{T}"/>, <see cref="EntityQueryBuilder.WhenChanged{T}"/> or <see cref="EntityQueryBuilder.WhenRemoved{T}"/>).
-        /// Does nothing if it was created from a static filter.
-        /// This method need to be called after current instance content has been processed in a update cycle.
-        /// </summary>
+        #endregion
+
+        #region IEntityContainer
+
+        /// <inheritdoc/>
+        public event EntityAddedHandler EntityAdded;
+
+        /// <inheritdoc/>
+        public event EntityRemovedHandler EntityRemoved;
+
+        /// <inheritdoc/>
+        public bool Contains(in Entity entity) => entity.EntityId < _mapping.Length && _mapping[entity.EntityId].Entities != null;
+
+        /// <inheritdoc/>
         public void Complete()
         {
             if (_needClearing)
@@ -384,11 +372,22 @@ public void Complete()
             }
         }
 
-        #endregion
+        /// <inheritdoc/>
+        public void TrimExcess()
+        {
+#if NETSTANDARD2_1
+            _entities.TrimExcess();
+#endif
 
-        #region IEntityContainer
+            ArrayExtension.Trim(ref _mapping, Array.FindLastIndex(_mapping, i => i.Entities != null) + 1);
+
+            foreach (Entities entities in _entities.Values)
+            {
+                entities.TrimExcess();
+            }
+        }
 
-        void IEntityContainer.Add(int entityId)
+        void Internal.IEntityContainer.Add(int entityId)
         {
             ArrayExtension.EnsureLength(ref _mapping, entityId, _worldMaxCapacity);
 
@@ -409,7 +408,7 @@ void IEntityContainer.Add(int entityId)
             }
         }
 
-        void IEntityContainer.Remove(int entityId)
+        void Internal.IEntityContainer.Remove(int entityId)
         {
             if (entityId < _mapping.Length)
             {
@@ -428,23 +427,6 @@ void IEntityContainer.Remove(int entityId)
             }
         }
 
-        /// <summary>
-        /// Resizes inner storage to exactly the number of <see cref="Entity"/> this <see cref="EntityMultiMap{TKey}"/> contains.
-        /// </summary>
-        public void TrimExcess()
-        {
-#if NETSTANDARD2_1
-            _entities.TrimExcess();
-#endif
-
-            ArrayExtension.Trim(ref _mapping, Array.FindLastIndex(_mapping, i => i.Entities != null) + 1);
-
-            foreach (Entities entities in _entities.Values)
-            {
-                entities.TrimExcess();
-            }
-        }
-
         #endregion
 
         #region ISortable
diff --git a/source/DefaultEcs/EntitySet.cs b/source/DefaultEcs/EntitySet.cs
index 229eda11..2e1abe30 100644
--- a/source/DefaultEcs/EntitySet.cs
+++ b/source/DefaultEcs/EntitySet.cs
@@ -15,7 +15,7 @@ namespace DefaultEcs
     /// </summary>
     [DebuggerTypeProxy(typeof(EntitySetDebugView))]
     [DebuggerDisplay("EntitySet[{Count}]")]
-    public sealed class EntitySet : IEntityContainer, ISortable, IDisposable
+    public sealed class EntitySet : IEntityContainer, ISortable
     {
         #region Fields
 
@@ -49,20 +49,6 @@ public int Count
 
         #endregion
 
-        #region Events
-
-        /// <summary>
-        /// Occurs when an <see cref="Entity"/> is added in the current <see cref="EntitySet"/>.
-        /// </summary>
-        public event EntityAddedHandler EntityAdded;
-
-        /// <summary>
-        /// Occurs when an <see cref="Entity"/> is removed from the current <see cref="EntitySet"/>.
-        /// </summary>
-        public event EntityRemovedHandler EntityRemoved;
-
-        #endregion
-
         #region Initialisation
 
         internal EntitySet(
@@ -114,11 +100,20 @@ internal EntitySet(
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public ReadOnlySpan<Entity> GetEntities() => GetEntities(0, Count);
 
-        /// <summary>
-        /// Clears current instance of its entities if it was created with some reactive filter (<see cref="EntityQueryBuilder.WhenAdded{T}"/>, <see cref="EntityQueryBuilder.WhenChanged{T}"/> or <see cref="EntityQueryBuilder.WhenRemoved{T}"/>).
-        /// Does nothing if it was created from a static filter.
-        /// This method need to be called after current instance content has been processed in a update cycle.
-        /// </summary>
+        #endregion
+
+        #region IEntityContainer
+
+        /// <inheritdoc/>
+        public event EntityAddedHandler EntityAdded;
+
+        /// <inheritdoc/>
+        public event EntityRemovedHandler EntityRemoved;
+
+        /// <inheritdoc/>
+        public bool Contains(in Entity entity) => entity.WorldId == _worldId && entity.EntityId < _mapping.Length && _mapping[entity.EntityId] != -1;
+
+        /// <inheritdoc/>
         public void Complete()
         {
             if (_needClearing && Count > 0)
@@ -129,18 +124,14 @@ public void Complete()
             }
         }
 
-        /// <summary>
-        /// Determines whether an <see cref="Entity"/> is in the <see cref="EntitySet"/>.
-        /// </summary>
-        /// <param name="entity">The <see cref="Entity"/> to locate in the <see cref="EntitySet"/>.</param>
-        /// <returns>true if <paramref name="entity" /> is found in the <see cref="EntitySet" />; otherwise, false.</returns>
-        public bool Contains(in Entity entity) => entity.WorldId == _worldId && entity.EntityId < _mapping.Length && _mapping[entity.EntityId] != -1;
-
-        #endregion
-
-        #region IEntityContainer
+        /// <inheritdoc/>
+        public void TrimExcess()
+        {
+            ArrayExtension.Trim(ref _entities, Count);
+            ArrayExtension.Trim(ref _mapping, Array.FindLastIndex(_mapping, i => i != -1) + 1);
+        }
 
-        void IEntityContainer.Add(int entityId)
+        void Internal.IEntityContainer.Add(int entityId)
         {
             ArrayExtension.EnsureLength(ref _mapping, entityId, _worldMaxCapacity, -1);
 
@@ -162,7 +153,7 @@ void IEntityContainer.Add(int entityId)
             }
         }
 
-        void IEntityContainer.Remove(int entityId)
+        void Internal.IEntityContainer.Remove(int entityId)
         {
             if (entityId < _mapping.Length)
             {
@@ -186,15 +177,6 @@ void IEntityContainer.Remove(int entityId)
             }
         }
 
-        /// <summary>
-        /// Resizes inner storage to exactly the number of <see cref="Entity"/> this <see cref="EntitySet"/> contains.
-        /// </summary>
-        public void TrimExcess()
-        {
-            ArrayExtension.Trim(ref _entities, Count);
-            ArrayExtension.Trim(ref _mapping, Array.FindLastIndex(_mapping, i => i != -1) + 1);
-        }
-
         #endregion
 
         #region ISortable
diff --git a/source/DefaultEcs/EntitySortedSet.cs b/source/DefaultEcs/EntitySortedSet.cs
index 92e91ed7..487298b7 100644
--- a/source/DefaultEcs/EntitySortedSet.cs
+++ b/source/DefaultEcs/EntitySortedSet.cs
@@ -16,7 +16,7 @@ namespace DefaultEcs
     /// <typeparam name="TComponent">The type of the component to sort <see cref="Entity"/> by.</typeparam>
     [DebuggerTypeProxy(typeof(EntitySortedSetDebugView<>))]
     [DebuggerDisplay("EntitySortedSet[{Count}]")]
-    public sealed class EntitySortedSet<TComponent> : IEntityContainer, IDisposable
+    public sealed class EntitySortedSet<TComponent> : IEntityContainer
     {
         #region Fields
 
@@ -50,20 +50,6 @@ public int Count
 
         #endregion
 
-        #region Events
-
-        /// <summary>
-        /// Occurs when an <see cref="Entity"/> is added in the current <see cref="EntitySortedSet{TComponent}"/>.
-        /// </summary>
-        public event EntityAddedHandler EntityAdded;
-
-        /// <summary>
-        /// Occurs when an <see cref="Entity"/> is removed from the current <see cref="EntitySortedSet{TComponent}"/>.
-        /// </summary>
-        public event EntityRemovedHandler EntityRemoved;
-
-        #endregion
-
         #region Initialisation
 
         internal EntitySortedSet(
@@ -130,11 +116,20 @@ private void On(in ComponentChangedMessage<TComponent> message)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public ReadOnlySpan<Entity> GetEntities() => new(_entities, 0, Count);
 
-        /// <summary>
-        /// Clears current instance of its entities if it was created with some reactive filter (<see cref="EntityQueryBuilder.WhenAdded{T}"/>, <see cref="EntityQueryBuilder.WhenChanged{T}"/> or <see cref="EntityQueryBuilder.WhenRemoved{T}"/>).
-        /// Does nothing if it was created from a static filter.
-        /// This method need to be called after current instance content has been processed in a update cycle.
-        /// </summary>
+        #endregion
+
+        #region IEntityContainer
+
+        /// <inheritdoc/>
+        public event EntityAddedHandler EntityAdded;
+
+        /// <inheritdoc/>
+        public event EntityRemovedHandler EntityRemoved;
+
+        /// <inheritdoc/>
+        public bool Contains(in Entity entity) => entity.WorldId == _worldId && entity.EntityId < _mapping.Length && _mapping[entity.EntityId] != -1;
+
+        /// <inheritdoc/>
         public void Complete()
         {
             if (_needClearing && Count > 0)
@@ -144,18 +139,14 @@ public void Complete()
             }
         }
 
-        /// <summary>
-        /// Determines whether an <see cref="Entity"/> is in the <see cref="EntitySortedSet{T}"/>.
-        /// </summary>
-        /// <param name="entity">The <see cref="Entity"/> to locate in the <see cref="EntitySortedSet{T}"/>.</param>
-        /// <returns>true if <paramref name="entity" /> is found in the <see cref="EntitySortedSet{T}" />; otherwise, false.</returns>
-        public bool Contains(in Entity entity) => entity.WorldId == _worldId && entity.EntityId < _mapping.Length && _mapping[entity.EntityId] != -1;
-
-        #endregion
-
-        #region IEntityContainer
+        /// <inheritdoc/>
+        public void TrimExcess()
+        {
+            ArrayExtension.Trim(ref _entities, Count);
+            ArrayExtension.Trim(ref _mapping, Array.FindLastIndex(_mapping, i => i != -1) + 1);
+        }
 
-        void IEntityContainer.Add(int entityId)
+        void Internal.IEntityContainer.Add(int entityId)
         {
             ArrayExtension.EnsureLength(ref _mapping, entityId, _worldMaxCapacity, -1);
 
@@ -180,7 +171,7 @@ void IEntityContainer.Add(int entityId)
             }
         }
 
-        void IEntityContainer.Remove(int entityId)
+        void Internal.IEntityContainer.Remove(int entityId)
         {
             if (entityId < _mapping.Length)
             {
@@ -206,15 +197,6 @@ void IEntityContainer.Remove(int entityId)
             }
         }
 
-        /// <summary>
-        /// Resizes inner storage to exactly the number of <see cref="Entity"/> this <see cref="EntitySortedSet{T}"/> contains.
-        /// </summary>
-        public void TrimExcess()
-        {
-            ArrayExtension.Trim(ref _entities, Count);
-            ArrayExtension.Trim(ref _mapping, Array.FindLastIndex(_mapping, i => i != -1) + 1);
-        }
-
         #endregion
 
         #region IDisposable
diff --git a/source/DefaultEcs/IEntityContainer.cs b/source/DefaultEcs/IEntityContainer.cs
new file mode 100644
index 00000000..0946f940
--- /dev/null
+++ b/source/DefaultEcs/IEntityContainer.cs
@@ -0,0 +1,36 @@
+using System;
+
+namespace DefaultEcs
+{
+    internal interface IEntityContainer : Internal.IEntityContainer, IDisposable
+    {
+        /// <summary>
+        /// Occurs when an <see cref="Entity"/> is added in the current <see cref="IEntityContainer"/>.
+        /// </summary>
+        event EntityAddedHandler EntityAdded;
+
+        /// <summary>
+        /// Occurs when an <see cref="Entity"/> is removed from the current <see cref="IEntityContainer"/>.
+        /// </summary>
+        event EntityRemovedHandler EntityRemoved;
+
+        /// <summary>
+        /// Determines whether the <see cref="IEntityContainer"/> contains a specific <see cref="Entity"/>.
+        /// </summary>
+        /// <param name="entity">The <see cref="Entity"/> to locate in the <see cref="IEntityContainer"/>.</param>
+        /// <returns>true if the <see cref="IEntityContainer"/> contains the specified <see cref="Entity"/>; otherwise, false.</returns>
+        bool Contains(in Entity entity);
+
+        /// <summary>
+        /// Clears current instance of its entities if it was created with some reactive filter (<see cref="EntityQueryBuilder.WhenAdded{T}"/>, <see cref="EntityQueryBuilder.WhenChanged{T}"/> or <see cref="EntityQueryBuilder.WhenRemoved{T}"/>).
+        /// Does nothing if it was created from a static filter.
+        /// This method need to be called after current instance content has been processed in a update cycle.
+        /// </summary>
+        void Complete();
+
+        /// <summary>
+        /// Resizes inner storage to exactly the number of <see cref="Entity"/> this <see cref="IEntityContainer"/> contains.
+        /// </summary>
+        void TrimExcess();
+    }
+}
diff --git a/source/DefaultEcs/Internal/EntityContainerWatcher.cs b/source/DefaultEcs/Internal/EntityContainerWatcher.cs
index 99280b4a..1b5d2ce2 100644
--- a/source/DefaultEcs/Internal/EntityContainerWatcher.cs
+++ b/source/DefaultEcs/Internal/EntityContainerWatcher.cs
@@ -7,7 +7,7 @@ internal sealed class EntityContainerWatcher
     {
         #region Fields
 
-        private readonly IEntityContainer _container;
+        private readonly DefaultEcs.IEntityContainer _container;
         private readonly Predicate<ComponentEnum> _filter;
         private readonly Predicate<int> _predicate;
 
@@ -15,7 +15,7 @@ internal sealed class EntityContainerWatcher
 
         #region Initialisation
 
-        public EntityContainerWatcher(IEntityContainer container, Predicate<ComponentEnum> filter, Predicate<int> predicate)
+        public EntityContainerWatcher(DefaultEcs.IEntityContainer container, Predicate<ComponentEnum> filter, Predicate<int> predicate)
         {
             _container = container;
             _filter = filter;
diff --git a/source/DefaultEcs/Internal/IEntityContainer.cs b/source/DefaultEcs/Internal/IEntityContainer.cs
index 04b7f8cb..945c9e8d 100644
--- a/source/DefaultEcs/Internal/IEntityContainer.cs
+++ b/source/DefaultEcs/Internal/IEntityContainer.cs
@@ -5,7 +5,5 @@ internal interface IEntityContainer
         void Add(int entityId);
 
         void Remove(int entityId);
-
-        void TrimExcess();
     }
 }