Change order of keyInScopeResolver parameters to solve compiler ambiguity

Author: sebaslogen

resaca/api/resaca.klib.api

@@ -100,10 +100,10 @@ final fun com.sebaslogen.resaca/com_sebaslogen_resaca_ScopedViewModelOwner$stabl
 final fun com.sebaslogen.resaca/com_sebaslogen_resaca_ScopedViewModelProvider$stableprop_getter(): kotlin/Int // com.sebaslogen.resaca/com_sebaslogen_resaca_ScopedViewModelProvider$stableprop_getter|com_sebaslogen_resaca_ScopedViewModelProvider$stableprop_getter(){}[0]
 final fun com.sebaslogen.resaca/com_sebaslogen_resaca_ScopedViewModelUtils$stableprop_getter(): kotlin/Int // com.sebaslogen.resaca/com_sebaslogen_resaca_ScopedViewModelUtils$stableprop_getter|com_sebaslogen_resaca_ScopedViewModelUtils$stableprop_getter(){}[0]
 final fun com.sebaslogen.resaca/generateKeysAndObserveLifecycle(kotlin/Any?, androidx.compose.runtime/Composer?, kotlin/Int): kotlin/Triple<com.sebaslogen.resaca/ScopedViewModelContainer, com.sebaslogen.resaca/ScopedViewModelContainer.InternalKey, com.sebaslogen.resaca/ScopedViewModelContainer.ExternalKey> // com.sebaslogen.resaca/generateKeysAndObserveLifecycle|generateKeysAndObserveLifecycle(kotlin.Any?;androidx.compose.runtime.Composer?;kotlin.Int){}[0]
-final inline fun <#A: reified androidx.lifecycle/ViewModel, #B: kotlin/Any> com.sebaslogen.resaca/viewModelScoped(#B, noinline kotlin/Function1<#B, kotlin/Boolean>, androidx.compose.runtime/Composer?, kotlin/Int): #A // com.sebaslogen.resaca/viewModelScoped|viewModelScoped(0:1;kotlin.Function1<0:1,kotlin.Boolean>;androidx.compose.runtime.Composer?;kotlin.Int){0§<androidx.lifecycle.ViewModel>;1§<kotlin.Any>}[0]
 final inline fun <#A: reified androidx.lifecycle/ViewModel, #B: kotlin/Any> com.sebaslogen.resaca/viewModelScoped(#B, noinline kotlin/Function1<#B, kotlin/Boolean>, androidx.core.bundle/Bundle, androidx.compose.runtime/Composer?, kotlin/Int): #A // com.sebaslogen.resaca/viewModelScoped|viewModelScoped(0:1;kotlin.Function1<0:1,kotlin.Boolean>;androidx.core.bundle.Bundle;androidx.compose.runtime.Composer?;kotlin.Int){0§<androidx.lifecycle.ViewModel>;1§<kotlin.Any>}[0]
 final inline fun <#A: reified androidx.lifecycle/ViewModel, #B: kotlin/Any> com.sebaslogen.resaca/viewModelScoped(#B, noinline kotlin/Function1<#B, kotlin/Boolean>, androidx.core.bundle/Bundle, noinline kotlin/Function1<androidx.lifecycle/SavedStateHandle, #A>, androidx.compose.runtime/Composer?, kotlin/Int): #A // com.sebaslogen.resaca/viewModelScoped|viewModelScoped(0:1;kotlin.Function1<0:1,kotlin.Boolean>;androidx.core.bundle.Bundle;kotlin.Function1<androidx.lifecycle.SavedStateHandle,0:0>;androidx.compose.runtime.Composer?;kotlin.Int){0§<androidx.lifecycle.ViewModel>;1§<kotlin.Any>}[0]
 final inline fun <#A: reified androidx.lifecycle/ViewModel, #B: kotlin/Any> com.sebaslogen.resaca/viewModelScoped(#B, noinline kotlin/Function1<#B, kotlin/Boolean>, noinline kotlin/Function1<androidx.lifecycle/SavedStateHandle, #A>, androidx.compose.runtime/Composer?, kotlin/Int): #A // com.sebaslogen.resaca/viewModelScoped|viewModelScoped(0:1;kotlin.Function1<0:1,kotlin.Boolean>;kotlin.Function1<androidx.lifecycle.SavedStateHandle,0:0>;androidx.compose.runtime.Composer?;kotlin.Int){0§<androidx.lifecycle.ViewModel>;1§<kotlin.Any>}[0]
+final inline fun <#A: reified androidx.lifecycle/ViewModel, #B: kotlin/Any> com.sebaslogen.resaca/viewModelScoped(noinline kotlin/Function1<#B, kotlin/Boolean>, #B, androidx.compose.runtime/Composer?, kotlin/Int): #A // com.sebaslogen.resaca/viewModelScoped|viewModelScoped(kotlin.Function1<0:1,kotlin.Boolean>;0:1;androidx.compose.runtime.Composer?;kotlin.Int){0§<androidx.lifecycle.ViewModel>;1§<kotlin.Any>}[0]
 final inline fun <#A: reified androidx.lifecycle/ViewModel> com.sebaslogen.resaca/viewModelScoped(kotlin/Any?, androidx.compose.runtime/Composer?, kotlin/Int, kotlin/Int): #A // com.sebaslogen.resaca/viewModelScoped|viewModelScoped(kotlin.Any?;androidx.compose.runtime.Composer?;kotlin.Int;kotlin.Int){0§<androidx.lifecycle.ViewModel>}[0]
 final inline fun <#A: reified androidx.lifecycle/ViewModel> com.sebaslogen.resaca/viewModelScoped(kotlin/Any?, androidx.core.bundle/Bundle, androidx.compose.runtime/Composer?, kotlin/Int, kotlin/Int): #A // com.sebaslogen.resaca/viewModelScoped|viewModelScoped(kotlin.Any?;androidx.core.bundle.Bundle;androidx.compose.runtime.Composer?;kotlin.Int;kotlin.Int){0§<androidx.lifecycle.ViewModel>}[0]
 final inline fun <#A: reified androidx.lifecycle/ViewModel> com.sebaslogen.resaca/viewModelScoped(kotlin/Any?, androidx.core.bundle/Bundle, noinline kotlin/Function1<androidx.lifecycle/SavedStateHandle, #A>, androidx.compose.runtime/Composer?, kotlin/Int, kotlin/Int): #A // com.sebaslogen.resaca/viewModelScoped|viewModelScoped(kotlin.Any?;androidx.core.bundle.Bundle;kotlin.Function1<androidx.lifecycle.SavedStateHandle,0:0>;androidx.compose.runtime.Composer?;kotlin.Int;kotlin.Int){0§<androidx.lifecycle.ViewModel>}[0]

resaca/src/commonMain/kotlin/com/sebaslogen/resaca/ScopedMemoizers.kt

@@ -100,6 +100,7 @@ public inline fun <reified T : ViewModel, K : Any> viewModelScoped(
     val scopeKeyWithResolver: ScopeKeyWithResolver<K> = remember(key, keyInScopeResolver) { ScopeKeyWithResolver(key, keyInScopeResolver) }
     return viewModelScoped(key = scopeKeyWithResolver, defaultArguments = defaultArguments)
 }
+
 /**
  * Return a [ViewModel] provided by the default [ViewModelProvider.Factory] and a [ViewModelProvider].
  * The [ViewModel] will be kept in memory for as long as needed, and until the requester Composable is permanently gone
@@ -120,8 +121,8 @@ public inline fun <reified T : ViewModel, K : Any> viewModelScoped(
  */
 @Composable
 public inline fun <reified T : ViewModel, K : Any> viewModelScoped(
-    key: K,
     noinline keyInScopeResolver: KeyInScopeResolver<K>,
+    key: K,
 ): T {
     val scopeKeyWithResolver: ScopeKeyWithResolver<K> = remember(key, keyInScopeResolver) { ScopeKeyWithResolver(key, keyInScopeResolver) }
     return viewModelScoped(key = scopeKeyWithResolver, defaultArguments = Bundle())

sample/src/main/java/com/sebaslogen/resacaapp/sample/ui/main/compose/examples/SimpleViewModel.kt

@@ -14,7 +14,7 @@ import com.sebaslogen.resacaapp.sample.ui.main.data.FakeScopedViewModel
  * In this case the [SavedStateHandle] required by [FakeScopedViewModel] will be provided by the default [SavedStateViewModelFactory]
  */
 @Composable
-fun DemoScopedViewModelComposable(key: String? = null) {
-    val fakeScopedVM: FakeScopedViewModel = viewModelScoped(key = key) { FakeScopedViewModel(stateSaver = it, viewModelId = 0) }
+fun DemoScopedViewModelComposable(key: String = "myScopedViewModel") {
+    val fakeScopedVM: FakeScopedViewModel = viewModelScoped(key) { FakeScopedViewModel(stateSaver = it, viewModelId = 0) }
     DemoComposable(inputObject = fakeScopedVM, objectType = "FakeScopedViewModel", scoped = true)
 }