feat: instances component for creating prefab instances in config

chore: Use inner serializer for InheritPrefabs
fix: not resetting delegated status in forEach call, resulting in incorrect entities returned in queries.

addons/geary-prefabs/src/commonMain/kotlin/com/mineinabyss/geary/prefabs/PrefabLoader.kt

@@ -34,7 +34,11 @@ class PrefabLoader {
                     if (logger.config.minSeverity <= Severity.Debug)
                         logger.e("Could not read prefab $path:\n\u001B[37m${it.stackTraceToString()}")
                     else
-                        logger.e("Could not read prefab $path:\n\u001B[37m${it.message}")
+                        logger.e(
+                            "Could not read prefab $path:\n\u001B[37m${
+                                it.stackTraceToString().lines().take(5).joinToString("\n")
+                            }"
+                        )
                 }
             }
         }

addons/geary-prefabs/src/commonMain/kotlin/com/mineinabyss/geary/prefabs/Prefabs.kt

@@ -28,6 +28,7 @@ interface Prefabs {
                 createInheritPrefabsOnLoadListener()
                 createParseChildOnPrefabListener()
                 createParseChildrenOnPrefabListener()
+                createParseInstancesOnPrefabListener()
                 createParseRelationOnPrefabListener()
                 createParseRelationWithDataListener()
                 createTrackPrefabsByKeyListener()

addons/geary-prefabs/src/commonMain/kotlin/com/mineinabyss/geary/prefabs/configuration/components/ChildrenOnPrefab.kt

@@ -5,7 +5,6 @@ import com.mineinabyss.geary.datatypes.Component
 import com.mineinabyss.geary.serialization.serializers.InnerSerializer
 import com.mineinabyss.geary.serialization.serializers.PolymorphicListAsMapSerializer
 import kotlinx.serialization.Polymorphic
-import kotlinx.serialization.PolymorphicSerializer
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.builtins.MapSerializer
 import kotlinx.serialization.builtins.serializer
@@ -23,7 +22,7 @@ class ChildrenOnPrefab(
 ) {
     class Serializer : InnerSerializer<Map<String, List<Component>>, ChildrenOnPrefab>(
         "geary:children",
-        MapSerializer(String.serializer(), PolymorphicListAsMapSerializer.of(PolymorphicSerializer(Component::class))),
+        MapSerializer(String.serializer(), PolymorphicListAsMapSerializer.ofComponents()),
         { ChildrenOnPrefab(it) },
         { it.nameToComponents },
     )

addons/geary-prefabs/src/commonMain/kotlin/com/mineinabyss/geary/prefabs/configuration/components/InheritPrefabs.kt

@@ -1,16 +1,23 @@
 package com.mineinabyss.geary.prefabs.configuration.components
 
 import com.mineinabyss.geary.prefabs.PrefabKey
-import kotlinx.serialization.SerialName
+import com.mineinabyss.geary.serialization.serializers.InnerSerializer
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.SetSerializer
 
 /**
  * > geary:inherit
  *
  * Will make this entity an instance of all entities defined in [from]
  */
-@Serializable
-@SerialName("geary:inherit")
+@Serializable(with = InheritPrefabs.Serializer::class)
 class InheritPrefabs(
     val from: Set<PrefabKey>
-)
+) {
+    class Serializer : InnerSerializer<Set<PrefabKey>, InheritPrefabs>(
+        "geary:inherit",
+        SetSerializer(PrefabKey.serializer()),
+        { InheritPrefabs(it) },
+        { it.from }
+    )
+}

addons/geary-prefabs/src/commonMain/kotlin/com/mineinabyss/geary/prefabs/configuration/components/InstancesOnPrefab.kt

@@ -0,0 +1,29 @@
+package com.mineinabyss.geary.prefabs.configuration.components
+
+import com.mineinabyss.geary.components.EntityName
+import com.mineinabyss.geary.datatypes.Component
+import com.mineinabyss.geary.serialization.serializers.InnerSerializer
+import com.mineinabyss.geary.serialization.serializers.PolymorphicListAsMapSerializer
+import kotlinx.serialization.Polymorphic
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.MapSerializer
+import kotlinx.serialization.builtins.serializer
+
+/**
+ * > geary:children
+ *
+ * A component that will add a list of named children to this entity.
+ *
+ * The keys will be used to set an extra [EntityName] component.
+ */
+@Serializable(with = InstancesOnPrefab.Serializer::class)
+class InstancesOnPrefab(
+    val nameToComponents: Map<String, List<@Polymorphic Component>>
+) {
+    class Serializer : InnerSerializer<Map<String, List<Component>>, InstancesOnPrefab>(
+        "geary:instances",
+        MapSerializer(String.serializer(), PolymorphicListAsMapSerializer.ofComponents()),
+        { InstancesOnPrefab(it) },
+        { it.nameToComponents },
+    )
+}

addons/geary-prefabs/src/commonMain/kotlin/com/mineinabyss/geary/prefabs/configuration/systems/ParseInstancesOnPrefab.kt

@@ -0,0 +1,28 @@
+package com.mineinabyss.geary.prefabs.configuration.systems
+
+import com.mineinabyss.geary.components.relations.NoInherit
+import com.mineinabyss.geary.helpers.entity
+import com.mineinabyss.geary.modules.GearyModule
+import com.mineinabyss.geary.prefabs.PrefabKey
+import com.mineinabyss.geary.prefabs.configuration.components.InstancesOnPrefab
+import com.mineinabyss.geary.prefabs.configuration.components.Prefab
+import com.mineinabyss.geary.systems.builders.listener
+import com.mineinabyss.geary.systems.query.ListenerQuery
+
+fun GearyModule.createParseInstancesOnPrefabListener() = listener(object : ListenerQuery() {
+    val instances by get<InstancesOnPrefab>()
+    val prefabKey by get<PrefabKey>()
+    override fun ensure() = event.anyFirstSet(::instances, ::prefabKey)
+}).exec {
+    entity.addRelation<NoInherit, InstancesOnPrefab>()
+    instances.nameToComponents.forEach { (name, components) ->
+        entity {
+            set(PrefabKey.of(prefabKey.namespace, name))
+            set(Prefab())
+            extend(entity)
+            addRelation<NoInherit, Prefab>()
+            setAll(components)
+        }
+        logger.d("Created instance $name of prefab $prefabKey")
+    }
+}

geary-core/src/commonMain/kotlin/com/mineinabyss/geary/systems/query/CachedQueryRunner.kt

@@ -35,6 +35,7 @@ class CachedQueryRunner<T : Query> internal constructor(val query: T) {
             try {
                 while (row < upTo) {
                     query.originalRow = row
+                    query.delegated = false
                     run(query)
                     row++
                 }
@@ -77,6 +78,7 @@ class CachedQueryRunner<T : Query> internal constructor(val query: T) {
         fun prepareRow(): Boolean {
             if (row >= upTo) return false
             query.originalRow = row
+            query.delegated = false
             return true
         }
 

geary-core/src/jvmTest/kotlin/com/mineinabyss/geary/queries/SimpleQueryTest.kt

@@ -39,6 +39,18 @@ class SimpleQueryTest : GearyTest() {
         nums.sorted() shouldBe (0..9).toList()
     }
 
+    @Test
+    fun `entities should return matched entities correctly`() {
+        val query = geary.queryManager.trackQuery(MyQuery())
+
+        val nums = mutableListOf<Int>()
+        query.entities().forEach {
+            nums.add(it.get<Int>()!!)
+        }
+
+        nums.sorted() shouldBe (0..9).toList()
+    }
+
     @Test
     fun `first should correctly return first matched entity`() {
         val query = geary.queryManager.trackQuery(MyQuery())