Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Constructor DSL up to 22 parameters #1359

Merged
merged 8 commits into from Dec 13, 2022
Merged

Add Constructor DSL up to 22 parameters #1359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
12f89fc
Add `new` methods to support 11 to 22 parameters
marcellogalhardo Jun 6, 2022
4ec7e41
Make `withOptions` inline
marcellogalhardo Jun 6, 2022
87a4364
Add `singleOf` methods to support 11 to 22 parameters
marcellogalhardo Jun 6, 2022
0b9640f
Add `factoryOf` methods to support 11 to 22 parameters
marcellogalhardo Jun 6, 2022
16083ba
Add `scopedOf` methods to support 11 to 22 parameters
marcellogalhardo Jun 6, 2022
3f74a08
Add `viewModelOf` methods to support 11 to 22 parameters
marcellogalhardo Jun 6, 2022
808a08b
Add `workerOf` methods to support 11 to 22 parameters
marcellogalhardo Jun 6, 2022
9c0b605
Add `fragmentOf` methods to support 11 to 22 parameters
marcellogalhardo Jun 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
173 changes: 98 additions & 75 deletions android/koin-android/src/main/java/org/koin/androidx/fragment/dsl/FragmentOf.kt
View file
Open in desktop

Large diffs are not rendered by default.

171 changes: 96 additions & 75 deletions android/koin-android/src/main/java/org/koin/androidx/viewmodel/dsl/ViewModelOf.kt
View file
Open in desktop

Large diffs are not rendered by default.

203 changes: 113 additions & 90 deletions ...oid/koin-androidx-workmanager/src/main/java/org/koin/androidx/workmanager/dsl/WorkerOf.kt
View file
Open in desktop

Large diffs are not rendered by default.

174 changes: 95 additions & 79 deletions core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/FactoryOf.kt
View file
Open in desktop

Large diffs are not rendered by default.

84 changes: 84 additions & 0 deletions core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/New.kt
View file
Open in desktop
Expand Up @@ -103,3 +103,87 @@ inline fun <reified R, reified T1, reified T2, reified T3, reified T4, reified T
inline fun <reified R, reified T1, reified T2, reified T3, reified T4, reified T5, reified T6, reified T7, reified T8, reified T9, reified T10> Scope.new(
constructor: (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10) -> R,
): R = constructor(get(), get(), get(), get(), get(), get(), get(), get(), get(), get())

/**
* @see new
*/
inline fun <reified R, reified T1, reified T2, reified T3, reified T4, reified T5, reified T6, reified T7, reified T8, reified T9, reified T10, reified T11> Scope.new(
constructor: (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11) -> R,
): R = constructor(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get())

/**
* @see new
*/
inline fun <reified R, reified T1, reified T2, reified T3, reified T4, reified T5, reified T6, reified T7, reified T8, reified T9, reified T10, reified T11, reified T12> Scope.new(
constructor: (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12) -> R,
): R = constructor(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(),get())

/**
* @see new
*/
inline fun <reified R, reified T1, reified T2, reified T3, reified T4, reified T5, reified T6, reified T7, reified T8, reified T9, reified T10, reified T11, reified T12, reified T13> Scope.new(
constructor: (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13) -> R,
): R = constructor(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(),get(), get())

/**
* @see new
*/
inline fun <reified R, reified T1, reified T2, reified T3, reified T4, reified T5, reified T6, reified T7, reified T8, reified T9, reified T10, reified T11, reified T12, reified T13, reified T14> Scope.new(
constructor: (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14) -> R,
): R = constructor(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(),get(), get(), get())

/**
* @see new
*/
inline fun <reified R, reified T1, reified T2, reified T3, reified T4, reified T5, reified T6, reified T7, reified T8, reified T9, reified T10, reified T11, reified T12, reified T13, reified T14, reified T15> Scope.new(
constructor: (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15) -> R,
): R = constructor(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(),get(), get(), get(), get())

/**
* @see new
*/
inline fun <reified R, reified T1, reified T2, reified T3, reified T4, reified T5, reified T6, reified T7, reified T8, reified T9, reified T10, reified T11, reified T12, reified T13, reified T14, reified T15, reified T16> Scope.new(
constructor: (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16) -> R,
): R = constructor(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(),get(), get(), get(), get(), get())

/**
* @see new
*/
inline fun <reified R, reified T1, reified T2, reified T3, reified T4, reified T5, reified T6, reified T7, reified T8, reified T9, reified T10, reified T11, reified T12, reified T13, reified T14, reified T15, reified T16, reified T17> Scope.new(
constructor: (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17) -> R,
): R = constructor(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(),get(), get(), get(), get(), get(), get())

/**
* @see new
*/
inline fun <reified R, reified T1, reified T2, reified T3, reified T4, reified T5, reified T6, reified T7, reified T8, reified T9, reified T10, reified T11, reified T12, reified T13, reified T14, reified T15, reified T16, reified T17, reified T18> Scope.new(
constructor: (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18) -> R,
): R = constructor(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(),get(), get(), get(), get(), get(), get(), get())

/**
* @see new
*/
inline fun <reified R, reified T1, reified T2, reified T3, reified T4, reified T5, reified T6, reified T7, reified T8, reified T9, reified T10, reified T11, reified T12, reified T13, reified T14, reified T15, reified T16, reified T17, reified T18, reified T19> Scope.new(
constructor: (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19) -> R,
): R = constructor(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(),get(), get(), get(), get(), get(), get(), get(), get())

/**
* @see new
*/
inline fun <reified R, reified T1, reified T2, reified T3, reified T4, reified T5, reified T6, reified T7, reified T8, reified T9, reified T10, reified T11, reified T12, reified T13, reified T14, reified T15, reified T16, reified T17, reified T18, reified T19, reified T20> Scope.new(
constructor: (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20) -> R,
): R = constructor(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(),get(), get(), get(), get(), get(), get(), get(), get(), get())

/**
* @see new
*/
inline fun <reified R, reified T1, reified T2, reified T3, reified T4, reified T5, reified T6, reified T7, reified T8, reified T9, reified T10, reified T11, reified T12, reified T13, reified T14, reified T15, reified T16, reified T17, reified T18, reified T19, reified T20, reified T21> Scope.new(
constructor: (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21) -> R,
): R = constructor(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(),get(), get(), get(), get(), get(), get(), get(), get(), get(), get())

/**
* @see new
*/
inline fun <reified R, reified T1, reified T2, reified T3, reified T4, reified T5, reified T6, reified T7, reified T8, reified T9, reified T10, reified T11, reified T12, reified T13, reified T14, reified T15, reified T16, reified T17, reified T18, reified T19, reified T20, reified T21, reified T22> Scope.new(
constructor: (T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22) -> R,
): R = constructor(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(),get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get())
7 changes: 3 additions & 4 deletions core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/OptionDSL.kt
View file
Open in desktop
Expand Up @@ -19,16 +19,15 @@ import kotlin.reflect.KClass
*
* @author Arnaud Giuliani
*/

infix fun <T> KoinDefinition<T>.withOptions(
inline infix fun <T> KoinDefinition<T>.withOptions(
options: BeanDefinition<T>.() -> Unit
): KoinDefinition<T> {
val factory = second
val module = first
val def = second.beanDefinition
val primary = def.qualifier
def.also(options)
if (def.qualifier != primary){
if (def.qualifier != primary) {
module.indexPrimaryType(factory)
}
module.indexSecondaryTypes(factory)
Expand Down Expand Up @@ -76,4 +75,4 @@ fun BeanDefinition<*>.createdAtStart() {

fun <T> BeanDefinition<T>.onClose(onClose: OnCloseCallback<T>) {
callbacks = Callbacks(onClose)
}
}