dsl: update filter(Entity.Type, invert = false)

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## Upcoming Release
 
+### New/Tweaks
+- DSL: `filter(Enitity.Type, invert)` filters entities by type, now has an `invert` parameter. 
 - Faster template processing by lazily parsing method parameters. 
 
 ## sift-0.15.0 2023-08-21

cli/src/main/resources/META-INF/native-image/reflect-config.json

@@ -1,4 +1,7 @@
 [
+{
+  "name":"[B"
+},
 {
   "name":"[C"
 },
@@ -312,6 +315,9 @@
 {
   "name":"kotlin.Boolean"
 },
+{
+  "name":"kotlin.ByteArray"
+},
 {
   "name":"kotlin.Char"
 },
@@ -739,7 +745,11 @@
   "methods":[{"name":"<init>","parameterTypes":["org.objectweb.asm.Type"] }, {"name":"<init>","parameterTypes":["sift.core.dsl.SiftType"] }, {"name":"<init>","parameterTypes":["sift.core.dsl.SiftType","int","kotlin.jvm.internal.DefaultConstructorMarker"] }, {"name":"<init>","parameterTypes":["sift.core.dsl.Type"] }]
 },
 {
-  "name":"sift.core.api.Action$InjectClass"
+  "name":"sift.core.api.Action$InjectClass",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["byte[]"] }, {"name":"<init>","parameterTypes":["byte[]","int","kotlin.jvm.internal.DefaultConstructorMarker"] }]
 },
 {
   "name":"sift.core.api.Action$IntoAnnotations",

core/src/main/kotlin/sift/core/api/Action.kt

@@ -993,10 +993,13 @@ sealed class Action<IN, OUT> {
         }
     }
 
-    internal data class EntityFilter<T : Element>(val entity: Entity.Type) : IsoAction<T>() {
+    internal data class EntityFilter<T : Element>(
+        val entity: Entity.Type,
+        val invert: Boolean
+    ) : IsoAction<T>() {
         override fun id() = "filter-entity($entity)"
         override fun execute(ctx: Context, input: Iter<T>): Iter<T> {
-            return input.filter { it in ctx.entityService }
+            return input.filter { (it in ctx.entityService) xor invert }
         }
     }
 

core/src/main/kotlin/sift/core/dsl/Core.kt

@@ -14,9 +14,12 @@ abstract class Core<ELEMENT : Element>(
     private var stack: MutableList<Action<*, *>> = mutableListOf()
 
     /**
-     * Filters elements that belongs to [entity].
+     * Filters elements owned by [entity].
+     *
+     * @param entity the entity to filter elements by
+     * @param invert if true, returns elements which do not belong to [entity]
      */
-    fun filter(entity: Entity.Type) {
-        action += Action.EntityFilter(entity)
+    fun filter(entity: Entity.Type, invert: Boolean = false) {
+        action += Action.EntityFilter(entity, invert)
     }
 }

core/src/test/kotlin/sift/core/dsl/DslTest.kt

@@ -1401,6 +1401,31 @@ class DslTest {
         )
     }
 
+    @Test
+    fun `filter by entity type`() {
+        val a = Entity.Type("a")
+        val b = Entity.Type("b")
+
+        val cns = listOf(SomeController::class, NotAController::class).map(::classNode)
+
+        template {
+            classes {
+                filter("SomeController")
+                entity(a, label("a: \${name}"), property("name", readName()))
+            }
+
+            classes("match classes except those owned by 'a'") {
+                filter(a, invert = true)
+                entity(b, label("b: \${name}"), property("name", readName()))
+            }
+        }.expecting(cns, listOf(a, b), """
+            ── a + b
+               ├─ a: SomeController
+               └─ b: NotAController
+            """
+        )
+    }
+
     @Test
     fun `read endpoint and construct label`() {
         val endpoint = Entity.Type("endpoint")