Skip to content

release #3

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

Merged
kigawa01 merged 2 commits into from
Apr 8, 2025
Merged

release #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20e92e5
add: newStateContext
kigawa01 Apr 8, 2025
035173b
release: 3.2.0
kigawa01 Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion convention-plugins/src/main/kotlin/root.publication.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
}
object Conf {
const val GROUP = "net.kigawa"
const val VERSION = "3.1.0"
const val VERSION = "3.2.0"
}

group = Conf.GROUP
Expand Down
2 changes: 2 additions & 0 deletions hakate/src/commonMain/kotlin/net/kigawa/hakate/api/state/StateContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import kotlinx.coroutines.Job
import net.kigawa.hakate.impl.state.MergedStateContextImpl

interface StateContext {
val coroutineScope: CoroutineScope
fun launch(block: suspend CoroutineScope.() -> Unit): Job
fun dispatcher(): StateDispatcher
fun dispatch(block: suspend StateContext.() -> Unit): Job
Expand All @@ -18,4 +19,5 @@ interface StateContext {
fun merge(other: StateContext): StateContext {
return MergedStateContextImpl(this, other)
}
fun newStateContext(): StateContext
}
17 changes: 13 additions & 4 deletions hakate/src/commonMain/kotlin/net/kigawa/hakate/impl/state/MergedStateContextImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
package net.kigawa.hakate.impl.state

import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import kotlinx.coroutines.*
import net.kigawa.hakate.api.state.StateContext
import net.kigawa.hakate.api.state.StateDispatcher
import net.kigawa.hakate.impl.Utl.suspendApply
import kotlin.coroutines.EmptyCoroutineContext

class MergedStateContextImpl(
private val first: StateContext,
private val second: StateContext,
) : StateContext {
override val coroutineScope: CoroutineScope = CoroutineScope(
first.coroutineScope.newCoroutineContext(second.coroutineScope.coroutineContext)
)

override fun launch(block: suspend CoroutineScope.() -> Unit): Job {
return first.launch {
val f = this
Expand All @@ -37,4 +39,11 @@ class MergedStateContextImpl(
first.cancel()
second.cancel()
}

override fun newStateContext(): StateContext {
return StateContextImpl(
dispatcher(),
CoroutineScope(coroutineScope.newCoroutineContext(EmptyCoroutineContext))
)
}
}
12 changes: 7 additions & 5 deletions hakate/src/commonMain/kotlin/net/kigawa/hakate/impl/state/StateContextImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
package net.kigawa.hakate.impl.state

import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job
import kotlinx.coroutines.cancel
import kotlinx.coroutines.launch
import kotlinx.coroutines.*
import net.kigawa.hakate.api.state.StateContext
import net.kigawa.hakate.api.state.StateDispatcher
import net.kigawa.hakate.impl.Utl.suspendApply
import kotlin.coroutines.EmptyCoroutineContext

class StateContextImpl(
private val dispatcher: StateDispatcher,
val coroutineScope: CoroutineScope,
override val coroutineScope: CoroutineScope,
) : StateContext {
override fun launch(block: suspend CoroutineScope.() -> Unit): Job {
return coroutineScope.launch(block = block)
Expand All @@ -30,4 +28,8 @@ class StateContextImpl(
override fun cancel() {
coroutineScope.cancel("cancel by StateContext")
}

override fun newStateContext(): StateContext {
return StateContextImpl(dispatcher, CoroutineScope(coroutineScope.newCoroutineContext(EmptyCoroutineContext)))
}
}