fix((#504): bring back scope on SetBinder and ArgSetBinder (#505)

Author: romainbsl

kodein-di/src/commonMain/kotlin/org/kodein/di/DI.kt

@@ -304,8 +304,7 @@ public interface DI : DIAware {
         /**
          * Manage multiple bindings in a [Set]
          */
-        @DIDsl
-        public interface SetBinder<T : Any> : BindBuilder.WithScope<Any> {
+        public interface SetBinder<T : Any> {
 
             /**
              * Add a binding in the [Set] of type [T]
@@ -379,8 +378,7 @@ public interface DI : DIAware {
         /**
          * Manage multiple bindings, with type argument, in a [Set]
          */
-        @DIDsl
-        public interface ArgSetBinder<A : Any, T : Any> : BindBuilder.WithScope<Any> {
+        public interface ArgSetBinder<A : Any, T : Any> {
 
             /**
              * Add a binding in the [Set] of type [T]

kodein-di/src/commonMain/kotlin/org/kodein/di/internal/DIBuilderImpl.kt

@@ -87,9 +87,9 @@ internal open class DIBuilderImpl internal constructor(
         addSetBindingToContainer: Boolean = true,
     ) : DI.Builder.SetBinder<T> {
 
-        override val contextType: TypeToken<Any> get() = this@DIBuilderImpl.contextType
-        override val scope: Scope<Any?> get() = this@DIBuilderImpl.scope
-        override val explicitContext: Boolean get() = this@DIBuilderImpl.explicitContext
+        val contextType: TypeToken<Any> get() = this@DIBuilderImpl.contextType
+        val scope: Scope<Any?> get() = this@DIBuilderImpl.scope
+        val explicitContext: Boolean get() = this@DIBuilderImpl.explicitContext
 
         private val setBinding: BaseMultiBinding<*, *, T> by lazy {
             val setType = erasedComp(Set::class, setBindingType) as TypeToken<Set<T>>
@@ -161,9 +161,9 @@ internal open class DIBuilderImpl internal constructor(
         addSetBindingToContainer: Boolean = true,
     ) : DI.Builder.ArgSetBinder<A, T> {
 
-        override val contextType: TypeToken<Any> get() = this@DIBuilderImpl.contextType
-        override val scope: Scope<Any?> get() = this@DIBuilderImpl.scope
-        override val explicitContext: Boolean get() = this@DIBuilderImpl.explicitContext
+        val contextType: TypeToken<Any> get() = this@DIBuilderImpl.contextType
+        val scope: Scope<Any?> get() = this@DIBuilderImpl.scope
+        val explicitContext: Boolean get() = this@DIBuilderImpl.explicitContext
 
         private val setBinding: BaseMultiBinding<*, in A, out T> by lazy {
             val setType = erasedComp(Set::class, setBindingType) as TypeToken<Set<T>>

kodein-di/src/commonTest/kotlin/org/kodein/di/Tests_13_Scope.kt

@@ -440,4 +440,70 @@ class Tests_13_Scope {
         assertTrue(c.closed)
     }
 
+    @Test
+    fun test_18_ScopedSetBindingSingleton() {
+        val registries = mapOf("a" to SingleItemScopeRegistry(), "b" to SingleItemScopeRegistry())
+        val myScope = object : Scope<String> {
+            override fun getRegistry(context: String) = registries[context]!!
+        }
+
+        val di = DI {
+            bindSet<IPerson> {
+                add { scoped(myScope).singleton { Person("Salomon") } }
+                add { scoped(myScope).singleton { Person("Laila") } }
+            }
+        }
+
+        val personsA: Set<IPerson> by di.on(context = "a").instance()
+        val personsB: Set<IPerson> by di.on(context = "b").instance()
+
+        assertEquals(2, personsA.size)
+        assertEquals(2, personsB.size)
+
+        val personsA2: Set<IPerson> by di.on(context = "a").instance()
+        assertEquals(personsA, personsA2)
+
+        registries["a"]!!.clear()
+        val personsA3: Set<IPerson> by di.on(context = "a").instance()
+        assertTrue(personsA.none { a -> personsA3.any { b -> a === b } })
+    }
+
+    @Test
+    fun test_19_NonScopedSetBindingConvenienceMethods() {
+        val di = DI {
+            bindSet<IPerson> {
+                addSingleton { Person("Salomon") }
+                addProvider { Person("Laila") }
+                addInstance(Person("Mary"))
+            }
+        }
+
+        val persons: Set<IPerson> by di.instance()
+        assertEquals(3, persons.size)
+        assertTrue(Person("Salomon") in persons)
+        assertTrue(Person("Laila") in persons)
+        assertTrue(Person("Mary") in persons)
+    }
+
+    @Test
+    fun test_20_ScopedArgSetBindingMultiton() {
+        val registries = mapOf("a" to SingleItemScopeRegistry(), "b" to SingleItemScopeRegistry())
+        val myScope = object : Scope<String> {
+            override fun getRegistry(context: String) = registries[context]!!
+        }
+
+        val di = DI {
+            bindArgSet<String, IPerson> {
+                add { scoped(myScope).multiton { name: String -> Person(name) } }
+            }
+        }
+
+        val personsA: Set<IPerson> by di.on(context = "a").instance(arg = "Salomon")
+        assertEquals(1, personsA.size)
+        assertTrue(Person("Salomon") in personsA)
+
+        val personsA2: Set<IPerson> by di.on(context = "a").instance(arg = "Salomon")
+        assertEquals(personsA, personsA2)
+    }
+
 }