Rename ViewModelScopeImpl to NativeViewModelScope

Author: rickclephas

kmp-observableviewmodel-core/src/appleMain/kotlin/com/rickclephas/kmp/observableviewmodel/NativeViewModelScope.kt

@@ -0,0 +1,52 @@
+package com.rickclephas.kmp.observableviewmodel
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import platform.darwin.NSObject
+
+/**
+ * Implementation of [ViewModelScope] for Apple platforms.
+ * @property coroutineScope The [CoroutineScope] associated with the [ViewModel].
+ */
+internal class NativeViewModelScope internal constructor(
+    val coroutineScope: CoroutineScope
+): NSObject(), ViewModelScope {
+
+    private val _subscriptionCount = MutableStateFlow(0)
+    /**
+     * A [StateFlow] that emits the number of subscribers to the [ViewModel].
+     */
+    val subscriptionCount: StateFlow<Int> = _subscriptionCount.asStateFlow()
+
+    override fun increaseSubscriptionCount() {
+        _subscriptionCount.update { it + 1 }
+    }
+
+    override fun decreaseSubscriptionCount() {
+        _subscriptionCount.update { it - 1 }
+    }
+
+    private var sendObjectWillChange: (() -> Unit)? = null
+
+    override fun setSendObjectWillChange(sendObjectWillChange: () -> Unit) {
+        if (this.sendObjectWillChange != null) {
+            throw IllegalStateException("ViewModel can't be wrapped more than once")
+        }
+        this.sendObjectWillChange = sendObjectWillChange
+    }
+
+    /**
+     * Invokes the object will change listener set by [setSendObjectWillChange].
+     */
+    fun sendObjectWillChange() {
+        sendObjectWillChange?.invoke()
+    }
+}
+
+/**
+ * Casts `this` [ViewModelScope] to a [NativeViewModelScope].
+ */
+internal inline fun ViewModelScope.asNative(): NativeViewModelScope = this as NativeViewModelScope

kmp-observableviewmodel-core/src/appleMain/kotlin/com/rickclephas/kmp/observableviewmodel/StateFlow.kt

@@ -11,15 +11,15 @@ import kotlin.coroutines.EmptyCoroutineContext
 public actual fun <T> MutableStateFlow(
     viewModelScope: ViewModelScope,
     value: T
-): MutableStateFlow<T> = MutableStateFlowImpl(viewModelScope.asImpl(), MutableStateFlow(value))
+): MutableStateFlow<T> = MutableStateFlowImpl(viewModelScope.asNative(), MutableStateFlow(value))
 
 /**
  * A [MutableStateFlow] that triggers [ViewModelScopeImpl.sendObjectWillChange]
  * and accounts for the [ViewModelScopeImpl.subscriptionCount].
  */
 @OptIn(ExperimentalForInheritanceCoroutinesApi::class)
 private class MutableStateFlowImpl<T>(
-    private val viewModelScope: ViewModelScopeImpl,
+    private val viewModelScope: NativeViewModelScope,
     private val stateFlow: MutableStateFlow<T>
 ): MutableStateFlow<T> {
 
@@ -97,7 +97,7 @@ public actual fun <T> Flow<T>.stateIn(
 ): StateFlow<T> {
     // Similar to kotlinx.coroutines, but using our custom MutableStateFlowImpl and CoroutineContext logic.
     // https://github.com/Kotlin/kotlinx.coroutines/blob/6dfabf763fe9fc91fbb73eb0f2d5b488f53043f1/kotlinx-coroutines-core/common/src/flow/operators/Share.kt#L135
-    val scope = viewModelScope.asImpl()
+    val scope = viewModelScope.asNative()
     val state = MutableStateFlowImpl(scope, MutableStateFlow(initialValue))
     val job = scope.coroutineScope.launchSharing(EmptyCoroutineContext, this, state, started, initialValue)
     return ReadonlyStateFlow(state, job)

kmp-observableviewmodel-core/src/appleMain/kotlin/com/rickclephas/kmp/observableviewmodel/ViewModelScope.kt

@@ -2,11 +2,6 @@ package com.rickclephas.kmp.observableviewmodel
 
 import com.rickclephas.kmp.observableviewmodel.objc.KMPOVMViewModelScopeProtocol
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
-import platform.darwin.NSObject
 
 /**
  * Holds the [CoroutineScope] of a [ViewModel].
@@ -18,56 +13,10 @@ public actual typealias ViewModelScope = KMPOVMViewModelScopeProtocol
  * Creates a new [ViewModelScope] for the provided [coroutineScope].
  */
 internal actual fun ViewModelScope(coroutineScope: CoroutineScope): ViewModelScope =
-    ViewModelScopeImpl(coroutineScope)
+    NativeViewModelScope(coroutineScope)
 
 /**
  * Gets the [CoroutineScope] associated with the [ViewModel] of `this` [ViewModelScope].
  */
 public actual val ViewModelScope.coroutineScope: CoroutineScope
-    get() = asImpl().coroutineScope
-
-/**
- * Casts `this` [ViewModelScope] to a [ViewModelScopeImpl].
- */
-@InternalKMPObservableViewModelApi
-public inline fun ViewModelScope.asImpl(): ViewModelScopeImpl = this as ViewModelScopeImpl
-
-/**
- * Implementation of [ViewModelScope].
- * @property coroutineScope The [CoroutineScope] associated with the [ViewModel].
- */
-@InternalKMPObservableViewModelApi
-public class ViewModelScopeImpl internal constructor(
-    public val coroutineScope: CoroutineScope
-): NSObject(), ViewModelScope {
-
-    private val _subscriptionCount = MutableStateFlow(0)
-    /**
-     * A [StateFlow] that emits the number of subscribers to the [ViewModel].
-     */
-    public val subscriptionCount: StateFlow<Int> = _subscriptionCount.asStateFlow()
-
-    override fun increaseSubscriptionCount() {
-        _subscriptionCount.update { it + 1 }
-    }
-
-    override fun decreaseSubscriptionCount() {
-        _subscriptionCount.update { it - 1 }
-    }
-
-    private var sendObjectWillChange: (() -> Unit)? = null
-
-    override fun setSendObjectWillChange(sendObjectWillChange: () -> Unit) {
-        if (this.sendObjectWillChange != null) {
-            throw IllegalStateException("ViewModel can't be wrapped more than once")
-        }
-        this.sendObjectWillChange = sendObjectWillChange
-    }
-
-    /**
-     * Invokes the object will change listener set by [setSendObjectWillChange].
-     */
-    public fun sendObjectWillChange() {
-        sendObjectWillChange?.invoke()
-    }
-}
+    get() = asNative().coroutineScope