fix build, remove expect object usages

respawn-app · May 1, 2024 · 6874417 · 6874417
1 parent e077bd9
commit 6874417
Show file tree

Hide file tree

Showing 11 changed files with 118 additions and 136 deletions.
diff --git a/core/src/jvmTest/kotlin/pro/respawn/flowmvi/test/store/StoreExceptionsTest.kt b/core/src/jvmTest/kotlin/pro/respawn/flowmvi/test/store/StoreExceptionsTest.kt
@@ -60,14 +60,12 @@ class StoreExceptionsTest : FreeSpec({
         }
         "given store that throws on subscribe" - {
             val store = testStore {
+                recover {
+                    println("recover from $it")
+                    null
+                }
                 install {
-                    recover {
-                        println("recover from $it")
-                        null
-                    }
-                    onSubscribe { _ ->
-                        throw e
-                    }
+                    onSubscribe { _ -> throw e }
                 }
             }
             "then exceptions in subscriber scope do not cancel the pipeline" {

diff --git a/...tate/src/androidMain/kotlin/pro/respawn/flowmvi/savedstate/platform/FileAccess.android.kt b/...tate/src/androidMain/kotlin/pro/respawn/flowmvi/savedstate/platform/FileAccess.android.kt
@@ -1,50 +1,44 @@
 package pro.respawn.flowmvi.savedstate.platform
 
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import java.io.File
 import java.io.InputStream
 import java.util.zip.GZIPInputStream
 import java.util.zip.GZIPOutputStream
 
-@PublishedApi
-internal actual object FileAccess {
-
-    private fun File.outputStreamOrEmpty() = run {
-        parentFile?.mkdirs()
-        createNewFile()
-        outputStream()
-    }
+private fun File.outputStreamOrEmpty() = run {
+    parentFile?.mkdirs()
+    createNewFile()
+    outputStream()
+}
 
-    private fun InputStream.readOrNull() = bufferedReader().use { it.readText() }.takeIf { it.isNotBlank() }
+private fun InputStream.readOrNull() = bufferedReader().use { it.readText() }.takeIf { it.isNotBlank() }
 
-    actual suspend fun writeCompressed(data: String?, path: String) = withContext(Dispatchers.IO) {
-        val file = File(path)
-        if (data == null) {
-            file.delete()
-            return@withContext
-        }
-        file.outputStreamOrEmpty().let(::GZIPOutputStream).bufferedWriter().use { it.write(data) }
+internal actual suspend fun writeCompressed(data: String?, path: String) {
+    val file = File(path)
+    if (data == null) {
+        file.delete()
+        return
     }
+    return file.outputStreamOrEmpty().let(::GZIPOutputStream).bufferedWriter().use { it.write(data) }
+}
 
-    actual suspend fun readCompressed(path: String): String? = withContext(Dispatchers.IO) {
-        val file = File(path)
-        if (!file.exists()) return@withContext null
-        file.inputStream().let(::GZIPInputStream).readOrNull()
-    }
+internal actual suspend fun readCompressed(path: String): String? {
+    val file = File(path)
+    if (!file.exists()) return null
+    return file.inputStream().let(::GZIPInputStream).readOrNull()
+}
 
-    actual suspend fun write(data: String?, path: String) = withContext(Dispatchers.IO) {
-        val file = File(path)
-        if (data == null) {
-            file.delete()
-            return@withContext
-        }
-        file.outputStreamOrEmpty().bufferedWriter().use { it.write(data) }
+internal actual suspend fun write(data: String?, path: String) {
+    val file = File(path)
+    if (data == null) {
+        file.delete()
+        return
     }
+    return file.outputStreamOrEmpty().bufferedWriter().use { it.write(data) }
+}
 
-    actual suspend fun read(path: String): String? = withContext(Dispatchers.IO) {
-        val file = File(path)
-        if (!file.exists()) return@withContext null
-        file.inputStream().readOrNull()
-    }
+internal actual suspend fun read(path: String): String? {
+    val file = File(path)
+    if (!file.exists()) return null
+    return file.inputStream().readOrNull()
 }
diff --git a/savedstate/src/commonMain/kotlin/pro/respawn/flowmvi/savedstate/dsl/FileSaver.kt b/savedstate/src/commonMain/kotlin/pro/respawn/flowmvi/savedstate/dsl/FileSaver.kt
@@ -6,7 +6,10 @@ import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import pro.respawn.flowmvi.savedstate.api.Saver
 import pro.respawn.flowmvi.savedstate.api.ThrowRecover
-import pro.respawn.flowmvi.savedstate.platform.FileAccess
+import pro.respawn.flowmvi.savedstate.platform.read
+import pro.respawn.flowmvi.savedstate.platform.readCompressed
+import pro.respawn.flowmvi.savedstate.platform.write
+import pro.respawn.flowmvi.savedstate.platform.writeCompressed
 
 /**
  * A [Saver] implementation that saves the given state to a file in a specified [path]
@@ -56,8 +59,8 @@ public fun FileSaver(
 ): Saver<String> = DefaultFileSaver(
     path = path,
     recover = recover,
-    write = FileAccess::write,
-    read = FileAccess::read,
+    write = ::write,
+    read = ::read,
 )
 
 /**
@@ -79,6 +82,6 @@ public fun CompressedFileSaver(
 ): Saver<String> = DefaultFileSaver(
     path = path,
     recover = recover,
-    write = FileAccess::writeCompressed,
-    read = FileAccess::readCompressed,
+    write = ::writeCompressed,
+    read = ::readCompressed,
 )
diff --git a/savedstate/src/commonMain/kotlin/pro/respawn/flowmvi/savedstate/platform/FileAccess.kt b/savedstate/src/commonMain/kotlin/pro/respawn/flowmvi/savedstate/platform/FileAccess.kt
@@ -1,10 +1,9 @@
 package pro.respawn.flowmvi.savedstate.platform
 
-@PublishedApi
-internal expect object FileAccess {
-
-    suspend fun writeCompressed(data: String?, path: String)
-    suspend fun readCompressed(path: String): String?
-    suspend fun write(data: String?, path: String)
-    suspend fun read(path: String): String?
-}
+internal expect suspend fun writeCompressed(data: String?, path: String)
+
+internal expect suspend fun readCompressed(path: String): String?
+
+internal expect suspend fun write(data: String?, path: String)
+
+internal expect suspend fun read(path: String): String?
diff --git a/savedstate/src/jsMain/kotlin/pro/respawn/flowmvi/savedstate/platform/FileAccess.js.kt b/savedstate/src/jsMain/kotlin/pro/respawn/flowmvi/savedstate/platform/FileAccess.js.kt
@@ -2,15 +2,12 @@ package pro.respawn.flowmvi.savedstate.platform
 
 import kotlinx.browser.localStorage
 
-@PublishedApi
-internal actual object FileAccess {
+internal actual suspend fun writeCompressed(data: String?, path: String) = write(data, path)
 
-    actual suspend fun writeCompressed(data: String?, path: String) = write(data, path)
+internal actual suspend fun readCompressed(path: String): String? = read(path)
 
-    actual suspend fun readCompressed(path: String): String? = read(path)
+internal actual suspend fun write(
+    data: String?, path: String
+) = if (data != null) localStorage.setItem(path, data) else localStorage.removeItem(path)
 
-    actual suspend fun write(data: String?, path: String) =
-        if (data != null) localStorage.setItem(path, data) else localStorage.removeItem(path)
-
-    actual suspend fun read(path: String): String? = localStorage.getItem(path)
-}
+internal actual suspend fun read(path: String): String? = localStorage.getItem(path)
diff --git a/savedstate/src/jvmMain/kotlin/pro/respawn/flowmvi/savedstate/platform/FileAccess.jvm.kt b/savedstate/src/jvmMain/kotlin/pro/respawn/flowmvi/savedstate/platform/FileAccess.jvm.kt
@@ -1,50 +1,44 @@
 package pro.respawn.flowmvi.savedstate.platform
 
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import java.io.File
 import java.io.InputStream
 import java.util.zip.GZIPInputStream
 import java.util.zip.GZIPOutputStream
 
-@PublishedApi
-internal actual object FileAccess {
-
-    private fun File.outputStreamOrEmpty() = run {
-        parentFile?.mkdirs()
-        createNewFile()
-        outputStream()
-    }
+private fun File.outputStreamOrEmpty() = run {
+    parentFile?.mkdirs()
+    createNewFile()
+    outputStream()
+}
 
-    private fun InputStream.readOrNull() = bufferedReader().use { it.readText() }.takeIf { it.isNotBlank() }
+private fun InputStream.readOrNull() = bufferedReader().use { it.readText() }.takeIf { it.isNotBlank() }
 
-    actual suspend fun writeCompressed(data: String?, path: String) = withContext(Dispatchers.IO) {
-        val file = File(path)
-        if (data == null) {
-            file.delete()
-            return@withContext
-        }
-        file.outputStreamOrEmpty().let(::GZIPOutputStream).bufferedWriter().use { it.write(data) }
+internal actual suspend fun writeCompressed(data: String?, path: String) {
+    val file = File(path)
+    if (data == null) {
+        file.delete()
+        return
     }
+    return file.outputStreamOrEmpty().let(::GZIPOutputStream).bufferedWriter().use { it.write(data) }
+}
 
-    actual suspend fun readCompressed(path: String): String? = withContext(Dispatchers.IO) {
-        val file = File(path)
-        if (!file.exists()) return@withContext null
-        file.inputStream().let(::GZIPInputStream).readOrNull()
-    }
+internal actual suspend fun readCompressed(path: String): String? {
+    val file = File(path)
+    if (!file.exists()) return null
+    return file.inputStream().let(::GZIPInputStream).readOrNull()
+}
 
-    actual suspend fun write(data: String?, path: String) = withContext(Dispatchers.IO) {
-        val file = File(path)
-        if (data == null) {
-            file.delete()
-            return@withContext
-        }
-        file.outputStreamOrEmpty().bufferedWriter().use { it.write(data) }
+internal actual suspend fun write(data: String?, path: String) {
+    val file = File(path)
+    if (data == null) {
+        file.delete()
+        return
     }
+    return file.outputStreamOrEmpty().bufferedWriter().use { it.write(data) }
+}
 
-    actual suspend fun read(path: String): String? = withContext(Dispatchers.IO) {
-        val file = File(path)
-        if (!file.exists()) return@withContext null
-        file.inputStream().readOrNull()
-    }
+internal actual suspend fun read(path: String): String? {
+    val file = File(path)
+    if (!file.exists()) return null
+    return file.inputStream().readOrNull()
 }
diff --git a/...dstate/src/nativeMain/kotlin/pro/respawn/flowmvi/savedstate/platform/FileAccess.native.kt b/...dstate/src/nativeMain/kotlin/pro/respawn/flowmvi/savedstate/platform/FileAccess.native.kt
@@ -6,29 +6,25 @@ import kotlinx.io.files.SystemFileSystem
 import kotlinx.io.readString
 import kotlinx.io.writeString
 
-@PublishedApi
-internal actual object FileAccess {
+internal actual suspend fun writeCompressed(data: String?, path: String) = write(data, path)
 
-    actual suspend fun writeCompressed(data: String?, path: String) = write(data, path)
+internal actual suspend fun readCompressed(path: String): String? = read(path)
 
-    actual suspend fun readCompressed(path: String): String? = read(path)
-
-    @OptIn(ExperimentalStdlibApi::class)
-    actual suspend fun write(data: String?, path: String) {
-        SystemFileSystem.run {
-            val file = Path(path)
-            if (data == null) {
-                delete(file, false)
-                return@run
-            }
-            sink(file).buffered().use { it.writeString(data) }
+@OptIn(ExperimentalStdlibApi::class)
+internal actual suspend fun write(data: String?, path: String) {
+    SystemFileSystem.run {
+        val file = Path(path)
+        if (data == null) {
+            delete(file, false)
+            return@run
         }
+        sink(file).buffered().use { it.writeString(data) }
     }
-
-    @OptIn(ExperimentalStdlibApi::class)
-    actual suspend fun read(path: String): String? = SystemFileSystem
-        .source(Path(path))
-        .buffered()
-        .use { it.readString() }
-        .takeIf { it.isNotBlank() }
 }
+
+@OptIn(ExperimentalStdlibApi::class)
+internal actual suspend fun read(path: String): String? = SystemFileSystem
+    .source(Path(path))
+    .buffered()
+    .use { it.readString() }
+    .takeIf { it.isNotBlank() }
diff --git a/savedstate/src/nonBrowserMain/kotlin/pro/respawn/flowmvi/savedstate/dsl/DefaultFileSaver.kt b/savedstate/src/nonBrowserMain/kotlin/pro/respawn/flowmvi/savedstate/dsl/DefaultFileSaver.kt
@@ -3,7 +3,10 @@ package pro.respawn.flowmvi.savedstate.dsl
 import kotlinx.io.files.Path
 import pro.respawn.flowmvi.savedstate.api.Saver
 import pro.respawn.flowmvi.savedstate.api.ThrowRecover
-import pro.respawn.flowmvi.savedstate.platform.FileAccess
+import pro.respawn.flowmvi.savedstate.platform.read
+import pro.respawn.flowmvi.savedstate.platform.readCompressed
+import pro.respawn.flowmvi.savedstate.platform.write
+import pro.respawn.flowmvi.savedstate.platform.writeCompressed
 
 /**
  * A [Saver] implementation that saves the given state to a file in a specified [dir] and [fileName].
@@ -46,8 +49,8 @@ public fun FileSaver(
     dir = dir,
     fileName = fileName,
     recover = recover,
-    write = { data, path -> FileAccess.write(data, path.name) },
-    read = { path -> FileAccess.read(path.name) },
+    write = { data, path -> write(data, path.name) },
+    read = { path -> read(path.name) },
 )
 
 /**
@@ -71,6 +74,6 @@ public fun CompressedFileSaver(
     dir = dir,
     fileName = fileName,
     recover = recover,
-    write = { data, path -> FileAccess.writeCompressed(data, path.name) },
-    read = { path -> FileAccess.readCompressed(path.name) },
+    write = { data, path -> writeCompressed(data, path.name) },
+    read = { path -> readCompressed(path.name) },
 )
diff --git a/...dstate/src/wasmJsMain/kotlin/pro/respawn/flowmvi/savedstate/platform/FileAccess.wasmJs.kt b/...dstate/src/wasmJsMain/kotlin/pro/respawn/flowmvi/savedstate/platform/FileAccess.wasmJs.kt
@@ -2,15 +2,12 @@ package pro.respawn.flowmvi.savedstate.platform
 
 import kotlinx.browser.localStorage
 
-@PublishedApi
-internal actual object FileAccess {
+internal actual suspend fun writeCompressed(data: String?, path: String) = write(data, path)
 
-    actual suspend fun writeCompressed(data: String?, path: String) = write(data, path)
+internal actual suspend fun readCompressed(path: String): String? = read(path)
 
-    actual suspend fun readCompressed(path: String): String? = read(path)
+internal actual suspend fun write(
+    data: String?, path: String
+) = if (data != null) localStorage.setItem(path, data) else localStorage.removeItem(path)
 
-    actual suspend fun write(data: String?, path: String) =
-        if (data != null) localStorage.setItem(path, data) else localStorage.removeItem(path)
-
-    actual suspend fun read(path: String): String? = localStorage.getItem(path)
-}
+internal actual suspend fun read(path: String): String? = localStorage.getItem(path)
diff --git a/test/src/commonMain/kotlin/pro/respawn/flowmvi/test/plugin/PluginTestScope.kt b/test/src/commonMain/kotlin/pro/respawn/flowmvi/test/plugin/PluginTestScope.kt
@@ -49,5 +49,4 @@ public class PluginTestScope<S : MVIState, I : MVIIntent, A : MVIAction> private
     override fun equals(other: Any?): Boolean = ctx.plugin == other
     override fun hashCode(): Int = ctx.plugin.hashCode()
     override fun toString(): String = "PluginTestScope(plugin=${ctx.plugin.name})"
-    public val state: S by ctx::state
 }
diff --git a/test/src/commonMain/kotlin/pro/respawn/flowmvi/test/plugin/TestPipelineContext.kt b/test/src/commonMain/kotlin/pro/respawn/flowmvi/test/plugin/TestPipelineContext.kt
@@ -1,3 +1,5 @@
+@file:OptIn(DelicateStoreApi::class)
+
 package pro.respawn.flowmvi.test.plugin
 
 import kotlinx.atomicfu.atomic
@@ -17,7 +19,7 @@ internal class TestPipelineContext<S : MVIState, I : MVIIntent, A : MVIAction> @
 
     override val coroutineContext by config::coroutineContext
 
-    var state: S by atomic(config.initial)
+    override var state: S by atomic(config.initial)
         private set
 
     @DelicateStoreApi