feat: added providers

meetacy · Dec 22, 2023 · 1919707 · 1919707
1 parent 6f026ff
commit 1919707
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 13 deletions.
diff --git a/core/src/commonMain/kotlin/app/meetacy/di/builder/DIBuilder.kt b/core/src/commonMain/kotlin/app/meetacy/di/builder/DIBuilder.kt
@@ -71,12 +71,8 @@ public class DIBuilder(dependencies: Dependencies) {
         name: String? = null,
         crossinline factory: DI.() -> T
     ) {
-        val key = DependencyKey<T>(
-            type = typeOf<T>(),
-            name = name
-        )
         val provider = DependencyProvider.Singleton { di -> di.factory() }
-        register(key, provider)
+        register<T>(name, provider)
     }
 
     public inline fun <reified T> singleton(
@@ -89,6 +85,24 @@ public class DIBuilder(dependencies: Dependencies) {
         )
     }
 
+    public inline fun <reified T> provider(
+        name: String? = null,
+        crossinline factory: DI.() -> T
+    ) {
+        val provider = DependencyProvider { di -> di.factory() }
+        register<T>(name, provider)
+    }
+
+    public inline fun <reified T> provider(
+        noinline factory: DI.() -> T
+    ): DIBuilderProviderDelegate<T> {
+        return DIBuilderProviderDelegate(
+            di = this,
+            type = typeOf<T>(),
+            factory = factory
+        )
+    }
+
     public fun build(): DI = DI(
         dependencies = Dependencies(dependencies.toList())
     )

diff --git a/core/src/commonMain/kotlin/app/meetacy/di/builder/DIBuilderDelegates.kt b/core/src/commonMain/kotlin/app/meetacy/di/builder/DIBuilderDelegates.kt
@@ -17,10 +17,7 @@ public class DIBuilderConstantDelegate<T>(
         property: KProperty<*>
     ): ReadOnlyProperty<Any?, Unit> {
         di.register(
-            key = DependencyKey(
-                type = type,
-                name = property.name
-            ),
+            key = DependencyKey(type, property.name),
             provider = { value }
         )
         return ReadOnlyProperty { _, _ -> }
@@ -37,12 +34,26 @@ public class DIBuilderSingletonDelegate<T>(
         property: KProperty<*>
     ): ReadOnlyProperty<Any?, Unit> {
         di.register(
-            key = DependencyKey(
-                type = type,
-                name = property.name
-            ),
+            key = DependencyKey(type, property.name),
             provider = DependencyProvider.Singleton { di -> di.factory() }
         )
         return ReadOnlyProperty { _, _ -> }
     }
 }
+
+public class DIBuilderProviderDelegate<T>(
+    private val di: DIBuilder,
+    private val type: KType,
+    private val factory: DI.() -> T
+) {
+    public operator fun provideDelegate(
+        thisRef: Any?,
+        property: KProperty<*>
+    ): ReadOnlyProperty<Any?, Unit> {
+        di.register(
+            key = DependencyKey(type, property.name),
+            provider = { di -> di.factory() }
+        )
+        return ReadOnlyProperty { _, _ -> }
+    }
+}