Added ifTake, runIf, applyIf, unlessTake

Author: wkornewald

CHANGELOG.md

@@ -22,6 +22,8 @@
 * Added `childReactiveState` variant which takes an arbitrary event handler, so the parent ReactiveState doesn't have to implement the whole events interface.
 * Changed `MutableState.beforeUpdate`, `MutableState.afterUpdate` and `MutableState.withSetter` and `State.toMutable` to not be `@Composable`.
 * Removed direct dependency on JUnit 4, so you can choose more freely which JUnit version to use.
+* Added `ifTake` and `unlessTake` inversions of `takeIf` and `takeUnless`.
+* Added `runIf` and `applyIf`.
 
 ## 5.13.0
 

build-logic/build-logic-base/src/main/kotlin/com/ensody/buildlogic/Utils.kt

@@ -85,7 +85,7 @@ internal fun Project.detectProjectVersion(): String =
         }?.removePrefix("v")?.removePrefix("-")?.takeIf { System.getenv("RUNNING_ON_CI") == "true" }
         ?: run {
             val branchName = cli("git", "rev-parse", "--abbrev-ref", "HEAD")
-            "999999.0.0-${sanitizeBranchName(branchName)}.1"
+            "0.0.-${sanitizeBranchName(branchName)}.1"
         }
 
 enum class OS {
@@ -120,5 +120,5 @@ private class VersionComparable(val parts: List<String>) : Comparable<VersionCom
 private fun sanitizeBranchName(name: String): String =
     sanitizeRegex.replace(name, "-")
 
-private val versionRegex = Regex("""v-?(\d+)\.(\d+)\.(\d+)((-.+?\.)(\d+))*""")
+private val versionRegex = Regex("""v-?(\d+)\.(\d+)\.(\d+)(((?:-.+?)?\.)(\d+))*""")
 private val sanitizeRegex = Regex("""[^A-Za-z0-9\-]""")

reactivestate-core/src/commonMain/kotlin/com/ensody/reactivestate/Utils.kt

@@ -30,3 +30,19 @@ public data class Wrapped<T>(public val value: T) : JvmSerializable, ReadOnlyPro
     override fun toString(): String =
         "Wrapped($value)"
 }
+
+/** Returns the result of [block] if [value] is true, else null. Similar to [takeIf], but flipped arguments. */
+public inline fun <T> ifTake(value: Boolean, block: () -> T): T? =
+    if (value) block() else null
+
+/** Returns the result of [block] if [value] is false, else null. Similar to [takeUnless], but flipped arguments. */
+public inline fun <T> unlessTake(value: Boolean, block: () -> T): T? =
+    if (!value) block() else null
+
+/** Returns the result of [block] if [value] is true, else null. Similar to [run], but executes conditionally. */
+public inline fun <T, R> T.runIf(value: Boolean, block: T.() -> R): R? =
+    if (value) block() else null
+
+/** Executes [block] if [value] is true, else just returns `this`. Similar to [apply], but executes conditionally. */
+public inline fun <T> T.applyIf(value: Boolean, block: T.() -> Unit): T =
+    if (value) apply(block) else this

reactivestate-core/src/commonTest/kotlin/com/ensody/reactivestate/UtilsTest.kt

@@ -0,0 +1,58 @@
+package com.ensody.reactivestate
+
+import com.ensody.reactivestate.test.CoroutineTest
+import kotlinx.coroutines.delay
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertNull
+import kotlin.test.assertSame
+import kotlin.test.assertTrue
+
+internal class UtilsTest : CoroutineTest() {
+    @Test
+    fun testIfTake() = runTest {
+        val result = ifTake(true) {
+            delay(100)
+            5
+        }
+        assertEquals(5, result)
+        assertNull(ifTake(false) { 2 })
+    }
+
+    @Test
+    fun testUnlessTake() = runTest {
+        val result = unlessTake(false) {
+            delay(100)
+            5
+        }
+        assertEquals(5, result)
+        assertNull(unlessTake(true) { 2 })
+    }
+
+    @Test
+    fun testApplyIf() = runTest {
+        var done = false
+        val result = applyIf(true) {
+            delay(100)
+            done = true
+        }
+        assertSame(this, result)
+        assertTrue(done)
+
+        done = false
+        applyIf(false) { done = true }
+        assertFalse(done)
+    }
+
+    @Test
+    fun testRunIf() = runTest {
+        val result = runIf(true) {
+            assertSame(this@runTest, this)
+            delay(100)
+            5
+        }
+        assertEquals(5, result)
+        assertNull(runIf(false) { 2 })
+    }
+}