Stream.Filtered now uses Archetype.MatchSignature instead of Archetype.Signature. Fixes #37

Author: thygrrr

fennecs.tests/Query/QueryFilterTests.cs

@@ -59,6 +59,64 @@ public void Exclude_ShouldNarrowDownResults()
         //Ensure count is reduced
         Assert.Single(results);
     }
+    
+    [Fact]
+    public void Exclude_ShouldNarrowDownResults_EntityAny()
+    {
+        using var world = new World();
+        
+        // Arrange
+        var target = world.Spawn();
+        var entity1 = world.Spawn().Add(new ComponentA());
+        var entity2 = world.Spawn().Add(new ComponentA()).Add(new ComponentB(), target);
+
+        var stream = world.Query<ComponentA>().Stream();
+
+        // Act
+        var filtered = stream with
+        {
+            Exclude = [Comp<ComponentB>.Matching(Match.Entity)]
+        };
+
+        var results = new List<Entity>();
+        filtered.For((in Entity entity, ref ComponentA _) => results.Add(entity));
+        
+        // Assert
+        Assert.Contains(entity1, results);
+        Assert.DoesNotContain(entity2, results);
+        
+        //Ensure count is reduced
+        Assert.Single(results);
+    }
+
+    [Fact]
+    public void Exclude_ShouldNarrowDownResults_MatchAny()
+    {
+        using var world = new World();
+        
+        // Arrange
+        var target = world.Spawn();
+        var entity1 = world.Spawn().Add(new ComponentA());
+        var entity2 = world.Spawn().Add(new ComponentA()).Add(new ComponentB(), target);
+
+        var stream = world.Query<ComponentA>().Stream();
+
+        // Act
+        var filtered = stream with
+        {
+            Exclude = [Comp<ComponentB>.Matching(Match.Any)]
+        };
+
+        var results = new List<Entity>();
+        filtered.For((in Entity entity, ref ComponentA _) => results.Add(entity));
+        
+        // Assert
+        Assert.Contains(entity1, results);
+        Assert.DoesNotContain(entity2, results);
+        
+        //Ensure count is reduced
+        Assert.Single(results);
+    }    
 }
 
 

fennecs/Stream.1.cs

@@ -22,7 +22,7 @@ public record Stream<C0>(Query Query, Match Match0) : IEnumerable<(Entity, C0)>,
     /// </summary>
     protected SortedSet<Archetype> Filtered => Subset.IsEmpty && Exclude.IsEmpty 
         ? Archetypes 
-        : new(Archetypes.Where(a => (Subset.IsEmpty || a.Signature.Matches(Subset)) && !a.Signature.Matches(Exclude)));
+        : new(Archetypes.Where(a => (Subset.IsEmpty || a.MatchSignature.Matches(Subset)) && !a.MatchSignature.Matches(Exclude)));
 
     /// <summary>
     /// Creates a builder for a Batch Operation on the Stream's underyling Query.

fennecs/expressions/Component.cs

@@ -174,7 +174,7 @@ public readonly record struct Comp<T>(Match match = default)
     internal int SIMDsize => Expression.SIMDsize;
 
     /// <summary>
-    /// Component Expression for a blittable type with a specific relation target (match expression).
+    /// Component Expression for a type with a specific relation target (match expression).
     /// </summary>
     public static Comp<T> Matching(Match target) => new(target);
 

fennecs/expressions/Signature.cs

@@ -22,7 +22,7 @@ namespace fennecs;
 
     public bool Matches(IReadOnlySet<TypeExpression> types) => Overlaps(types);
 
-    internal bool Matches(IReadOnlySet<Comp> subset) => Overlaps(subset.Select(component => component.Expression).ToImmutableSortedSet());
+    internal bool Matches(IReadOnlySet<Comp> subset) => Overlaps(subset.Select(component => component.Expression));
 
     /// <summary>
     /// Creates a new <see cref="Signature"/> from the given values.

fennecs/fennecs.csproj

@@ -5,7 +5,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <PackageId>fennecs</PackageId>
-        <Version>0.5.15-beta</Version>
+        <Version>0.5.16-beta</Version>
         <Title>fennecs</Title>
         <Product>fennecs Entity-Component System</Product>
         <Authors>Moritz Voss, Aaron Winter</Authors>