feat: Expose EventRunner.removeObserver (closes #114)

Author: 0ffz

geary-core/src/com/mineinabyss/geary/observers/ArchetypeEventRunner.kt

@@ -18,10 +18,15 @@ class ArchetypeEventRunner(
     val observerComponent: ComponentId = compProvider.id<Observer>()
 
     private val eventToObserversMap = EventToObserversMap(records)
+
     override fun addObserver(observer: Observer) {
         eventToObserversMap.addObserver(observer)
     }
 
+    override fun removeObserver(observer: Observer) {
+        eventToObserversMap.removeObserver(observer)
+    }
+
     private inline fun matchObservers(
         eventType: ComponentId,
         involvedComponent: ComponentId,

geary-core/src/com/mineinabyss/geary/observers/EventRunner.kt

@@ -1,12 +1,13 @@
 package com.mineinabyss.geary.observers
 
 import com.mineinabyss.geary.datatypes.ComponentId
-import com.mineinabyss.geary.datatypes.Entity
 import com.mineinabyss.geary.datatypes.EntityId
 
 interface EventRunner {
     fun addObserver(observer: Observer)
 
+    fun removeObserver(observer: Observer)
+
     fun callEvent(
         eventType: ComponentId,
         eventData: Any?,

geary-core/test@jvm/com/mineinabyss/geary/components/ComponentAsEntityProviderTest.kt

@@ -5,11 +5,63 @@ import com.mineinabyss.geary.helpers.entity
 import com.mineinabyss.geary.test.GearyTest
 import io.kotest.matchers.shouldBe
 import org.junit.jupiter.api.Test
+import org.koin.core.scope.Scope
+import org.koin.core.scope.ScopeCallback
+import org.koin.dsl.koinApplication
+import org.koin.dsl.module
+import kotlin.random.Random
 
-class ComponentAsEntityProviderTest: GearyTest() {
+class ComponentAsEntityProviderTest : GearyTest() {
     @Test
     fun `should correctly register reserved components`() {
         entity()
         componentId<Any>() shouldBe ReservedComponents.ANY
     }
 }
+
+class Something {
+
+    class A(val test: String) {
+    }
+
+    class B(val test: String)
+
+    @Test
+    fun main() {
+        val app = koinApplication() {
+            modules(module {
+                single { "default" }
+                scope<A> {
+                    scoped {
+                        registerCallback(object : ScopeCallback {
+                            override fun onScopeClose(scope: Scope) {
+                                println("Closed")
+                            }
+                        })
+                        Random.nextInt()
+                    }
+                    scoped {
+                        get<Double>().toString()
+                    }
+                }
+                scope<B> {
+                    scoped { get<Int>().toString() }
+                    scoped<Double> { 0.1 }
+//                    scoped<String> { "B" + Random.nextInt(100) }
+                }
+            })
+        }
+        app.koin.createScope<A>("A").apply {
+            get<Int>()
+        }.close()
+        val scopeB = app.koin.createScope<A>("A").get<Int>().let { println(it) }
+//        val scopeB = app.koin.createScope<B>().apply {
+//            linkTo(app.koin.getScope("A"))
+//        }
+
+//        scopeA.linkTo(scopeB)
+//        scopeA.get<Int>().let { println(it) }
+//        scopeB.get<String>().let { println(it) }
+//        scopeA.close()
+    }
+}

geary-core/test@jvm/com/mineinabyss/geary/observers/RemoveObserverTest.kt

@@ -0,0 +1,30 @@
+package com.mineinabyss.geary.observers
+
+import com.mineinabyss.geary.helpers.entity
+import com.mineinabyss.geary.modules.observe
+import com.mineinabyss.geary.observers.events.OnSet
+import com.mineinabyss.geary.systems.query.query
+import com.mineinabyss.geary.test.GearyTest
+import io.kotest.matchers.shouldBe
+import kotlin.test.Test
+
+class RemoveObserverTest : GearyTest() {
+    @Test
+    fun `should stop observing events after removed`() {
+        val called = mutableListOf<Int>()
+        val observer = observe<OnSet>().exec(query<Int>()) { (data) ->
+            called += data
+        }
+
+        val entity = entity {
+            set(1)
+            set(2)
+        }
+
+        eventRunner.removeObserver(observer)
+
+        entity.set(3)
+
+        called shouldBe listOf(1, 2)
+    }
+}