Feature/0.4.3 1 (#3)

* Fix assets

Author: teoadal

.github/workflows/dotnet.yaml

@@ -25,7 +25,7 @@ jobs:
       - name: Run tests with coverage
         run: |
           cd ./src/Hexecs.Tests/
-          dotnet test -c Release --no-build /p:CollectCoverage=true /p:CoverletOutput=TestResults/ /p:CoverletOutputFormat=opencover
+          dotnet test -c Release --no-build /p:CollectCoverage=true /p:CoverletOutput=TestResults/ /p:CoverletOutputFormat=opencover /p:Exclude="[*Tests*]*|[*Benchmarks*]*|[*Demo*]*"
       - name: Publish coverage report
         if: matrix.os == 'ubuntu-latest' && matrix.dotnet-version == '10.0.x'
         uses: codecov/codecov-action@v3

src/Hexecs.Tests/Assets/AssetFilter1Should.cs

@@ -0,0 +1,83 @@
+using Hexecs.Tests.Mocks;
+
+namespace Hexecs.Tests.Assets;
+
+public sealed class AssetFilter1Should(AssetTestFixture fixture) : IClassFixture<AssetTestFixture>
+{
+    [Fact(DisplayName = "Фильтр ассетов должен содержать все созданные ассеты")]
+    public void ContainsAllAssets()
+    {
+        // arrange 
+        var assetIds = new List<uint>();
+
+        var (context, world) = fixture.CreateAssetContext(loader =>
+        {
+            for (int i = 1; i < 100; i++)
+            {
+                var asset = loader.CreateAsset(new CarAsset(i, i));
+                assetIds.Add(asset.Id);
+            }
+        });
+
+        var expectedAssets = assetIds.Select(id => context.GetAsset(id)).ToArray();
+
+        // act
+
+        var filter = context.Filter<CarAsset>();
+        var actualActors = filter.ToArray();
+
+        // assert
+
+        actualActors
+            .Should()
+            .Contain(expectedAssets);
+
+        world.Dispose();
+    }
+
+    [Fact(DisplayName = "Фильтр ассетов можно перебирать как AssetRef")]
+    public void AssetFilterShouldEnumerable()
+    {
+        // arrange 
+        var expectedIds = new Dictionary<uint, CarAsset>();
+
+        var (context, world) = fixture.CreateAssetContext(loader =>
+        {
+            for (var i = 0; i < 100; i++)
+            {
+                var component = new CarAsset(i, i);
+                var asset = loader.CreateAsset(component);
+
+                expectedIds.Add(asset.Id, component);
+            }
+        });
+
+        // act
+
+        var filter = context.Filter<CarAsset>();
+
+        // assert
+
+        var actualIds = new List<uint>();
+        foreach (var asset in filter)
+        {
+            actualIds.Add(asset.Id);
+            asset
+                .Component1
+                .Should().Be(expectedIds[asset.Id]);
+        }
+
+        filter.Length
+            .Should().Be(expectedIds.Count);
+
+        actualIds
+            .Should()
+            .HaveCount(expectedIds.Count);
+
+        actualIds
+            .Should()
+            .Contain(expectedIds.Keys);
+
+        world.Dispose();
+    }
+}

src/Hexecs.Tests/Hexecs.Tests.csproj

@@ -3,6 +3,9 @@
     <PropertyGroup>
         <IsPackable>false</IsPackable>
         <IsTestProject>true</IsTestProject>
+        <CollectCoverage>true</CollectCoverage>
+        <CoverletOutputFormat>opencover</CoverletOutputFormat>
+        <Exclude>[*Tests*]*,[*Benchmarks*]*,[*Demo*]*</Exclude>
     </PropertyGroup>
 
     <ItemGroup>

src/Hexecs.Tests/Mocks/CarAsset.cs

@@ -0,0 +1,12 @@
+using Hexecs.Assets;
+
+namespace Hexecs.Tests.Mocks;
+
+public readonly struct CarAsset(int price, int speed) : IAssetComponent
+{
+    public const string Alias1 = "Alias1";
+    public const string Alias2 = "Alias2";
+
+    public readonly int Price = price;
+    public readonly int Speed = speed;
+}

src/Hexecs/Actors/ActorContext.cs

@@ -171,7 +171,7 @@ public Actor Clone(uint actorId, bool withParent = true)
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public Actor CreateActor(uint? expectedId = null)
     {
-        if (expectedId == Actor.EmptyId) ActorError.WrongId();
+        if (expectedId == Actor.EmptyId) ActorError.InvalidId();
         var actorId = expectedId ?? GetNextActorId();
 
         AddEntry(actorId);

src/Hexecs/Actors/ActorError.cs

@@ -142,6 +142,12 @@ public static T QueueNotFound<T>()
         throw new Exception($"System {TypeOf<T>.GetTypeName()} isn't found");
     }
 
+    [DoesNotReturn]
+    public static void InvalidId()
+    {
+        throw new Exception("Invalid actor id");
+    }
+    
     /// <summary>
     /// Генерирует исключение, когда актёр с указанным ключом не найден.
     /// </summary>
@@ -255,10 +261,4 @@ public static void ValueNotFound(string name, Type type)
     {
         throw new Exception($"Value '{name}' (type {TypeOf.GetTypeName(type)}) isn't found");
     }
-
-    [DoesNotReturn]
-    public static void WrongId()
-    {
-        throw new Exception("Wrong actor id");
-    }
 }

src/Hexecs/Assets/AssetContext.Dictionary.cs

@@ -12,6 +12,7 @@ public int Length
 
     private ref Entry AddEntry(uint id)
     {
+        if (id == Asset.EmptyId) AssetError.InvalidId();
         ref var entry = ref CollectionsMarshal.GetValueRefOrAddDefault(_entries, id, out var exists);
         if (exists) AssetError.AlreadyExists(id);
         return ref entry;

src/Hexecs/Assets/AssetContext.Entry.cs

@@ -12,7 +12,7 @@ public void Add(ushort componentId)
             ArrayUtils.InsertOrCreate(ref _array, _length, componentId);
             _length++;
         }
-        
+
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public readonly ReadOnlySpan<ushort> AsReadOnlySpan() => _length == 0
             ? ReadOnlySpan<ushort>.Empty

src/Hexecs/Assets/AssetContext.cs

@@ -76,7 +76,14 @@ public Asset<T1> GetAsset<T1>()
         where T1 : struct, IAssetComponent
     {
         var pool = GetComponentPool<T1>();
-        if (pool is { Length: > 0 }) return pool.First();
+        if (pool != null)
+        {
+            var firstId = pool.FirstId();
+            if (firstId != Asset.EmptyId)
+            {
+                return new Asset<T1>(this, firstId);
+            }
+        }
 
         AssetError.NotFound<T1>();
         return Asset<T1>.Empty;
@@ -92,8 +99,6 @@ public Asset<T1> GetAsset<T1>()
     public Asset<T1> GetAsset<T1>(uint assetId)
         where T1 : struct, IAssetComponent
     {
-        Debug.Assert(ExistsAsset(assetId), $"Asset {assetId} isn't found");
-
         var pool = GetComponentPool<T1>();
         if (pool == null || !pool.Has(assetId)) AssetError.ComponentNotFound<T1>(assetId);
 

src/Hexecs/Assets/AssetError.cs

@@ -97,6 +97,12 @@ public static void ConstraintExists<T>()
         throw new Exception($"Constraint for {TypeOf<T>.GetTypeName()} already exists");
     }
 
+    [DoesNotReturn]
+    public static void InvalidId()
+    {
+        throw new Exception("Invalid asset id");
+    }
+    
     /// <summary>
     /// Генерирует исключение при попытке использовать загрузчик ассетов, который уже освобожден.
     /// </summary>