support declare a component definition with primary type (#773)

* support declare a component definition with primary type * use inline reified to support declare a component definition with primary type Co-authored-by: shen.xudong <shen.xudong@immomo.com>
InsertKoinIO · May 29, 2020 · 51f9cd8 · 51f9cd8
1 parent da6c19e
commit 51f9cd8
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/koin-projects/koin-core/src/main/kotlin/org/koin/core/definition/Definitions.kt b/koin-projects/koin-core/src/main/kotlin/org/koin/core/definition/Definitions.kt
@@ -35,7 +35,7 @@ object Definitions {
         )
     }
 
-    internal fun createSingle(
+    fun createSingle(
         clazz: KClass<*>,
         qualifier: Qualifier? = null,
         definition: Definition<*>,

diff --git a/koin-projects/koin-core/src/main/kotlin/org/koin/core/scope/Scope.kt b/koin-projects/koin-core/src/main/kotlin/org/koin/core/scope/Scope.kt
@@ -263,7 +263,7 @@ data class Scope(
      * @param secondaryTypes List of secondary bound types
      * @param override Allows to override a previous declaration of the same type (default to false).
      */
-    fun <T : Any> declare(
+    inline fun <reified T : Any> declare(
         instance: T,
         qualifier: Qualifier? = null,
         secondaryTypes: List<KClass<*>>? = null,

diff --git a/koin-projects/koin-core/src/main/kotlin/org/koin/core/scope/ScopeDefinition.kt b/koin-projects/koin-core/src/main/kotlin/org/koin/core/scope/ScopeDefinition.kt
@@ -34,13 +34,13 @@ class ScopeDefinition(val qualifier: Qualifier, val isRoot: Boolean = false, pri
 
     internal fun size() = definitions.size
 
-    fun <T : Any> saveNewDefinition(
+    inline fun <reified T : Any> saveNewDefinition(
             instance: T,
             qualifier: Qualifier? = null,
             secondaryTypes: List<KClass<*>>? = null,
             override: Boolean = false
     ): BeanDefinition<out Any?> {
-        val clazz = instance::class
+        val clazz = T::class
         val found: BeanDefinition<*>? =
                 definitions.firstOrNull { def -> def.`is`(clazz, qualifier, this) }
         if (found != null) {

diff --git a/koin-projects/koin-core/src/test/java/org/koin/core/DeclareInstanceTest.kt b/koin-projects/koin-core/src/test/java/org/koin/core/DeclareInstanceTest.kt
@@ -193,6 +193,25 @@ class DeclareInstanceTest {
         assertEquals(a, session1.get<Simple.ComponentB>().a)
     }
 
+    @Test
+    fun `can declare a scoped on the fly with primary type`() {
+
+        val koin = koinApplication {
+            printLogger()
+            modules(module {
+                scope(named("Session")) {
+                }
+            })
+        }.koin
+
+        val a = Simple.Component2()
+
+        val session1 = koin.createScope("session1", named("Session"))
+
+        session1.declare<Simple.ComponentInterface1>(a, named("another_a"))
+        assertEquals(a, session1.get<Simple.ComponentInterface1>(named("another_a")))
+    }
+
     @Test
     fun `can't declare a scoped-single on the fly`() {