Sancaros/phantasmal-world
1
0
Fork 0
mirror of https://github.com/DaanVandenBosch/phantasmal-world.git synced 2025-04-04 06:28:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed Observable from observable project and renamed observable project to cell. Cell is now the most basic interface for users.

Browse Source
This commit is contained in:
Daan Vanden Bosch 2022-06-04 21:33:29 +02:00
parent b389cb9521
commit 82524f1f2d
172 changed files with 846 additions and 748 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -1,7 +1,7 @@
# Phantasmal World # Phantasmal World
Phantasmal World is a collection of software for Phantasy Star Online. Phantasmal World is a collection of software for Phantasy Star Online.
The [web aplication](https://www.phantasmal.world/) has a model viewer, quest editor and hunt The [web application](https://www.phantasmal.world/) has a model viewer, quest editor and hunt
optimizer. There is also a work-in-progress [PSO server](psoserv/README.md). optimizer. There is also a work-in-progress [PSO server](psoserv/README.md).
## Developers ## Developers
@ -70,7 +70,7 @@ assembler/disassembler and a work-in-progress script engine/VM. It also has a mo
scripting bytecode and data flow analysis for it. This subproject can be used as a library in other scripting bytecode and data flow analysis for it. This subproject can be used as a library in other
projects. projects.
#### observable #### cell
A full-fledged multiplatform implementation of the observer pattern. A full-fledged multiplatform implementation of the observer pattern.

0
observable/build.gradle.kts → cell/build.gradle.kts
View File

5
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/AbstractCell.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/AbstractCell.kt
View File

@ -1,9 +1,6 @@
package world.phantasmal.observable.cell package world.phantasmal.cell
import world.phantasmal.core.disposable.Disposable import world.phantasmal.core.disposable.Disposable
import world.phantasmal.observable.AbstractDependency
import world.phantasmal.observable.CallbackChangeObserver
import world.phantasmal.observable.ChangeObserver
abstract class AbstractCell<T> : AbstractDependency<T>(), Cell<T> { abstract class AbstractCell<T> : AbstractDependency<T>(), Cell<T> {
override fun observeChange(observer: ChangeObserver<T>): Disposable = override fun observeChange(observer: ChangeObserver<T>): Disposable =

2
observable/src/commonMain/kotlin/world/phantasmal/observable/AbstractDependency.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/AbstractDependency.kt
View File

@ -1,4 +1,4 @@
package world.phantasmal.observable package world.phantasmal.cell
import kotlin.contracts.InvocationKind import kotlin.contracts.InvocationKind
import kotlin.contracts.contract import kotlin.contracts.contract

4
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/AbstractDependentCell.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/AbstractDependentCell.kt
View File

@ -1,8 +1,6 @@
package world.phantasmal.observable.cell package world.phantasmal.cell
import world.phantasmal.core.unsafe.unsafeCast import world.phantasmal.core.unsafe.unsafeCast
import world.phantasmal.observable.ChangeEvent
import world.phantasmal.observable.Dependent
abstract class AbstractDependentCell<T, Event : ChangeEvent<T>> : AbstractCell<T>(), Dependent { abstract class AbstractDependentCell<T, Event : ChangeEvent<T>> : AbstractCell<T>(), Dependent {

8
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/AbstractFlatteningDependentCell.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/AbstractFlatteningDependentCell.kt
View File

@ -1,13 +1,9 @@
package world.phantasmal.observable.cell package world.phantasmal.cell
import world.phantasmal.core.unsafe.unsafeAssertNotNull import world.phantasmal.core.unsafe.unsafeAssertNotNull
import world.phantasmal.observable.ChangeEvent
import world.phantasmal.observable.Dependency
import world.phantasmal.observable.Dependent
import world.phantasmal.observable.Observable
abstract class AbstractFlatteningDependentCell<T, ComputedCell : Cell<T>, Event : ChangeEvent<T>>( abstract class AbstractFlatteningDependentCell<T, ComputedCell : Cell<T>, Event : ChangeEvent<T>>(
private val dependencies: Array<out Observable<*>>, private val dependencies: Array<out Cell<*>>,
private val compute: () -> ComputedCell, private val compute: () -> ComputedCell,
) : AbstractDependentCell<T, Event>() { ) : AbstractDependentCell<T, Event>() {

4
observable/src/commonMain/kotlin/world/phantasmal/observable/CallbackChangeObserver.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/CallbackChangeObserver.kt
View File

@ -1,4 +1,4 @@
package world.phantasmal.observable package world.phantasmal.cell
import world.phantasmal.core.disposable.TrackedDisposable import world.phantasmal.core.disposable.TrackedDisposable
import world.phantasmal.core.unsafe.unsafeCast import world.phantasmal.core.unsafe.unsafeCast
@ -7,7 +7,7 @@ import world.phantasmal.core.unsafe.unsafeCast
* Calls [callback] when [dependency] changes. * Calls [callback] when [dependency] changes.
*/ */
class CallbackChangeObserver<T, E : ChangeEvent<T>>( class CallbackChangeObserver<T, E : ChangeEvent<T>>(
private val dependency: Observable<T>, private val dependency: Cell<T>,
// We don't use ChangeObserver<T> because of type system limitations. It would break e.g. // We don't use ChangeObserver<T> because of type system limitations. It would break e.g.
// AbstractListCell.observeListChange. // AbstractListCell.observeListChange.
private val callback: (E) -> Unit, private val callback: (E) -> Unit,

6
observable/src/commonMain/kotlin/world/phantasmal/observable/CallbackObserver.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/CallbackObserver.kt
View File

@ -1,12 +1,12 @@
package world.phantasmal.observable package world.phantasmal.cell
import world.phantasmal.core.disposable.TrackedDisposable import world.phantasmal.core.disposable.TrackedDisposable
/** /**
* Calls [callback] when one or more observable in [dependencies] changes. * Calls [callback] when one or more cells in [dependencies] change.
*/ */
class CallbackObserver( class CallbackObserver(
private vararg val dependencies: Observable<*>, private vararg val dependencies: Cell<*>,
private val callback: () -> Unit, private val callback: () -> Unit,
) : TrackedDisposable(), Dependent, LeafDependent { ) : TrackedDisposable(), Dependent, LeafDependent {

18
cell/src/commonMain/kotlin/world/phantasmal/cell/Cell.kt Normal file
View File

@ -0,0 +1,18 @@
package world.phantasmal.cell
import world.phantasmal.core.disposable.Disposable
import kotlin.reflect.KProperty
/**
* A [value] that can change over time.
*/
interface Cell<out T> : Dependency<T> {
val value: T
operator fun getValue(thisRef: Any?, property: KProperty<*>): T = value
/**
* [observer] will be called whenever this cell changes.
*/
fun observeChange(observer: ChangeObserver<T>): Disposable
}

16
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/CellUtils.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/CellUtils.kt
View File

@ -1,7 +1,6 @@
package world.phantasmal.observable.cell package world.phantasmal.cell
import world.phantasmal.core.disposable.Disposable import world.phantasmal.core.disposable.Disposable
import world.phantasmal.observable.CallbackObserver
private val TRUE_CELL: Cell<Boolean> = ImmutableCell(true) private val TRUE_CELL: Cell<Boolean> = ImmutableCell(true)
private val FALSE_CELL: Cell<Boolean> = ImmutableCell(false) private val FALSE_CELL: Cell<Boolean> = ImmutableCell(false)
@ -39,11 +38,14 @@ fun <T> mutableCell(value: T): MutableCell<T> = SimpleCell(value)
fun <T> mutableCell(getter: () -> T, setter: (T) -> Unit): MutableCell<T> = fun <T> mutableCell(getter: () -> T, setter: (T) -> Unit): MutableCell<T> =
DelegatingCell(getter, setter) DelegatingCell(getter, setter)
fun <T> Cell<T>.observe(observer: (T) -> Unit): Disposable =
observeChange { observer(it.value) }
fun <T> Cell<T>.observeNow( fun <T> Cell<T>.observeNow(
observer: (T) -> Unit, observer: (T) -> Unit,
): Disposable { ): Disposable {
val disposable = observeChange { observer(it.value) } val disposable = observeChange { observer(it.value) }
// Call observer after observeChange to avoid double recomputation in most observables. // Call observer after observeChange to avoid double recomputation in most cells.
observer(value) observer(value)
return disposable return disposable
} }
@ -54,7 +56,7 @@ fun <T1, T2> observeNow(
observer: (T1, T2) -> Unit, observer: (T1, T2) -> Unit,
): Disposable { ): Disposable {
val disposable = CallbackObserver(c1, c2) { observer(c1.value, c2.value) } val disposable = CallbackObserver(c1, c2) { observer(c1.value, c2.value) }
// Call observer after observeChange to avoid double recomputation in most observables. // Call observer after observeChange to avoid double recomputation in most cells.
observer(c1.value, c2.value) observer(c1.value, c2.value)
return disposable return disposable
} }
@ -66,7 +68,7 @@ fun <T1, T2, T3> observeNow(
observer: (T1, T2, T3) -> Unit, observer: (T1, T2, T3) -> Unit,
): Disposable { ): Disposable {
val disposable = CallbackObserver(c1, c2, c3) { observer(c1.value, c2.value, c3.value) } val disposable = CallbackObserver(c1, c2, c3) { observer(c1.value, c2.value, c3.value) }
// Call observer after observeChange to avoid double recomputation in most observables. // Call observer after observeChange to avoid double recomputation in most cells.
observer(c1.value, c2.value, c3.value) observer(c1.value, c2.value, c3.value)
return disposable return disposable
} }
@ -80,7 +82,7 @@ fun <T1, T2, T3, T4> observeNow(
): Disposable { ): Disposable {
val disposable = val disposable =
CallbackObserver(c1, c2, c3, c4) { observer(c1.value, c2.value, c3.value, c4.value) } CallbackObserver(c1, c2, c3, c4) { observer(c1.value, c2.value, c3.value, c4.value) }
// Call observer after observeChange to avoid double recomputation in most observables. // Call observer after observeChange to avoid double recomputation in most cells.
observer(c1.value, c2.value, c3.value, c4.value) observer(c1.value, c2.value, c3.value, c4.value)
return disposable return disposable
} }
@ -96,7 +98,7 @@ fun <T1, T2, T3, T4, T5> observeNow(
val disposable = CallbackObserver(c1, c2, c3, c4, c5) { val disposable = CallbackObserver(c1, c2, c3, c4, c5) {
observer(c1.value, c2.value, c3.value, c4.value, c5.value) observer(c1.value, c2.value, c3.value, c4.value, c5.value)
} }
// Call observer after observeChange to avoid double recomputation in most observables. // Call observer after observeChange to avoid double recomputation in most cells.
observer(c1.value, c2.value, c3.value, c4.value, c5.value) observer(c1.value, c2.value, c3.value, c4.value, c5.value)
return disposable return disposable
} }

4
observable/src/commonMain/kotlin/world/phantasmal/observable/ChangeObserver.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/ChangeObserver.kt
View File

@ -1,9 +1,9 @@
package world.phantasmal.observable package world.phantasmal.cell
typealias ChangeObserver<T> = (ChangeEvent<T>) -> Unit typealias ChangeObserver<T> = (ChangeEvent<T>) -> Unit
open class ChangeEvent<out T>( open class ChangeEvent<out T>(
/** The observable's new value. */ /** The cell's new value. */
val value: T, val value: T,
) { ) {
operator fun component1() = value operator fun component1() = value

4
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/DelegatingCell.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/DelegatingCell.kt
View File

@ -1,6 +1,4 @@
package world.phantasmal.observable.cell package world.phantasmal.cell
import world.phantasmal.observable.ChangeEvent
class DelegatingCell<T>( class DelegatingCell<T>(
private val getter: () -> T, private val getter: () -> T,

4
observable/src/commonMain/kotlin/world/phantasmal/observable/Dependency.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/Dependency.kt
View File

@ -1,4 +1,4 @@
package world.phantasmal.observable package world.phantasmal.cell
interface Dependency<out T> { interface Dependency<out T> {
// TODO: Docs. // TODO: Docs.
@ -6,7 +6,7 @@ interface Dependency<out T> {
/** /**
* This method is not meant to be called from typical application code. Usually you'll want to * This method is not meant to be called from typical application code. Usually you'll want to
* use [Observable.observeChange]. * use [Cell.observeChange].
*/ */
fun addDependent(dependent: Dependent) fun addDependent(dependent: Dependent)

2
observable/src/commonMain/kotlin/world/phantasmal/observable/Dependent.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/Dependent.kt
View File

@ -1,4 +1,4 @@
package world.phantasmal.observable package world.phantasmal.cell
interface Dependent { interface Dependent {
/** /**

9
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/DependentCell.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/DependentCell.kt
View File

@ -1,15 +1,10 @@
package world.phantasmal.observable.cell package world.phantasmal.cell
import world.phantasmal.observable.ChangeEvent
import world.phantasmal.observable.Dependency
import world.phantasmal.observable.Dependent
import world.phantasmal.observable.Observable
/** /**
* Cell of which the value depends on 0 or more dependencies. * Cell of which the value depends on 0 or more dependencies.
*/ */
class DependentCell<T>( class DependentCell<T>(
private vararg val dependencies: Observable<*>, private vararg val dependencies: Cell<*>,
private val compute: () -> T, private val compute: () -> T,
) : AbstractDependentCell<T, ChangeEvent<T>>() { ) : AbstractDependentCell<T, ChangeEvent<T>>() {

7
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/FlatteningDependentCell.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/FlatteningDependentCell.kt
View File

@ -1,13 +1,10 @@
package world.phantasmal.observable.cell package world.phantasmal.cell
import world.phantasmal.observable.ChangeEvent
import world.phantasmal.observable.Observable
/** /**
* Similar to [DependentCell], except that this cell's [compute] returns a cell. * Similar to [DependentCell], except that this cell's [compute] returns a cell.
*/ */
class FlatteningDependentCell<T>( class FlatteningDependentCell<T>(
vararg dependencies: Observable<*>, vararg dependencies: Cell<*>,
compute: () -> Cell<T>, compute: () -> Cell<T>,
) : AbstractFlatteningDependentCell<T, Cell<T>, ChangeEvent<T>>(dependencies, compute) { ) : AbstractFlatteningDependentCell<T, Cell<T>, ChangeEvent<T>>(dependencies, compute) {

6
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/ImmutableCell.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/ImmutableCell.kt
View File

@ -1,11 +1,7 @@
package world.phantasmal.observable.cell package world.phantasmal.cell
import world.phantasmal.core.disposable.Disposable import world.phantasmal.core.disposable.Disposable
import world.phantasmal.core.disposable.nopDisposable import world.phantasmal.core.disposable.nopDisposable
import world.phantasmal.observable.ChangeEvent
import world.phantasmal.observable.ChangeObserver
import world.phantasmal.observable.Dependency
import world.phantasmal.observable.Dependent
class ImmutableCell<T>(override val value: T) : Dependency<T>, Cell<T> { class ImmutableCell<T>(override val value: T) : Dependency<T>, Cell<T> {
override val changeEvent: ChangeEvent<T>? get() = null override val changeEvent: ChangeEvent<T>? get() = null

2
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/MutableCell.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/MutableCell.kt
View File

@ -1,4 +1,4 @@
package world.phantasmal.observable.cell package world.phantasmal.cell
import kotlin.reflect.KProperty import kotlin.reflect.KProperty

18
cell/src/commonMain/kotlin/world/phantasmal/cell/Mutation.kt Normal file
View File

@ -0,0 +1,18 @@
package world.phantasmal.cell
/**
* Defer propagation of changes to cells until the end of a code block. All changes to cells in a
* single mutation won't be propagated to their dependencies until the mutation is completed.
*/
inline fun mutate(block: () -> Unit) {
MutationManager.mutate(block)
}
/**
* Schedule a mutation to run right after the current mutation finishes. Can be used to change cells
* in an observer callback. This is usually a bad idea, but sometimes the situation where you have
* to change cells in response to other cells changing is very hard to avoid.
*/
fun mutateDeferred(block: () -> Unit) {
MutationManager.mutateDeferred(block)
}

4
observable/src/commonMain/kotlin/world/phantasmal/observable/MutationManager.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/MutationManager.kt
View File

@ -1,4 +1,4 @@
package world.phantasmal.observable package world.phantasmal.cell
import kotlin.contracts.InvocationKind.EXACTLY_ONCE import kotlin.contracts.InvocationKind.EXACTLY_ONCE
import kotlin.contracts.contract import kotlin.contracts.contract
@ -53,7 +53,7 @@ object MutationManager {
} }
fun dependencyStartedChanging() { fun dependencyStartedChanging() {
check(!dependencyChanging) { "An observable is already changing." } check(!dependencyChanging) { "A cell is already changing." }
dependencyChanging = true dependencyChanging = true
} }

4
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/SimpleCell.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/SimpleCell.kt
View File

@ -1,6 +1,4 @@
package world.phantasmal.observable.cell package world.phantasmal.cell
import world.phantasmal.observable.ChangeEvent
class SimpleCell<T>(value: T) : AbstractCell<T>(), MutableCell<T> { class SimpleCell<T>(value: T) : AbstractCell<T>(), MutableCell<T> {
override var value: T = value override var value: T = value

2
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/AbstractElementsWrappingListCell.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/list/AbstractElementsWrappingListCell.kt
View File

@ -1,4 +1,4 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.core.unsafe.unsafeAssertNotNull import world.phantasmal.core.unsafe.unsafeAssertNotNull

6
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/AbstractFilteredListCell.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/list/AbstractFilteredListCell.kt
View File

@ -1,7 +1,7 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.observable.Dependency import world.phantasmal.cell.Dependency
import world.phantasmal.observable.Dependent import world.phantasmal.cell.Dependent
abstract class AbstractFilteredListCell<E>( abstract class AbstractFilteredListCell<E>(
protected val list: ListCell<E>, protected val list: ListCell<E>,

12
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/AbstractListCell.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/list/AbstractListCell.kt
View File

@ -1,12 +1,12 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.core.disposable.Disposable import world.phantasmal.core.disposable.Disposable
import world.phantasmal.core.unsafe.unsafeAssertNotNull import world.phantasmal.core.unsafe.unsafeAssertNotNull
import world.phantasmal.observable.CallbackChangeObserver import world.phantasmal.cell.CallbackChangeObserver
import world.phantasmal.observable.ChangeObserver import world.phantasmal.cell.ChangeObserver
import world.phantasmal.observable.cell.AbstractCell import world.phantasmal.cell.AbstractCell
import world.phantasmal.observable.cell.Cell import world.phantasmal.cell.Cell
import world.phantasmal.observable.cell.DependentCell import world.phantasmal.cell.DependentCell
abstract class AbstractListCell<E> : AbstractCell<List<E>>(), ListCell<E> { abstract class AbstractListCell<E> : AbstractCell<List<E>>(), ListCell<E> {

2
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/DelegatingList.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/list/DelegatingList.kt
View File

@ -1,4 +1,4 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
/** /**
* Simply delegates all methods to [backingList], even [equals], [hashCode] and [toString]. * Simply delegates all methods to [backingList], even [equals], [hashCode] and [toString].

26
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/DependentListCell.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/list/DependentListCell.kt
View File

@ -1,14 +1,14 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.observable.Dependency import world.phantasmal.cell.Dependency
import world.phantasmal.observable.Dependent import world.phantasmal.cell.Dependent
import world.phantasmal.observable.Observable import world.phantasmal.cell.Cell
/** /**
* ListCell of which the value depends on 0 or more other observables. * ListCell of which the value depends on 0 or more other cells.
*/ */
class DependentListCell<E>( class DependentListCell<E>(
private vararg val dependencies: Observable<*>, private vararg val dependencies: Cell<*>,
private val computeElements: () -> List<E>, private val computeElements: () -> List<E>,
) : AbstractListCell<E>(), Dependent { ) : AbstractListCell<E>(), Dependent {
@ -35,12 +35,14 @@ class DependentListCell<E>(
_value = newElements _value = newElements
changeEvent = ListChangeEvent( changeEvent = ListChangeEvent(
newElements, newElements,
listOf(ListChange( listOf(
index = 0, ListChange(
prevSize = oldElements.size, index = 0,
removed = oldElements, prevSize = oldElements.size,
inserted = newElements, removed = oldElements,
)), inserted = newElements,
)
),
) )
valid = dependents.isNotEmpty() valid = dependents.isNotEmpty()
} }

38
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/FilteredListCell.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/list/FilteredListCell.kt
View File

@ -1,12 +1,12 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.cell.Cell
import world.phantasmal.cell.ChangeEvent
import world.phantasmal.cell.Dependency
import world.phantasmal.cell.Dependent
import world.phantasmal.core.assert import world.phantasmal.core.assert
import world.phantasmal.core.assertUnreachable import world.phantasmal.core.assertUnreachable
import world.phantasmal.core.unsafe.unsafeCast import world.phantasmal.core.unsafe.unsafeCast
import world.phantasmal.observable.ChangeEvent
import world.phantasmal.observable.Dependency
import world.phantasmal.observable.Dependent
import world.phantasmal.observable.cell.Cell
class FilteredListCell<E>( class FilteredListCell<E>(
list: ListCell<E>, list: ListCell<E>,
@ -81,24 +81,28 @@ class FilteredListCell<E>(
mapping.index = insertionIndex mapping.index = insertionIndex
shift++ shift++
filteredChanges.add(ListChange( filteredChanges.add(
insertionIndex, ListChange(
prevSize, insertionIndex,
removed = emptyList(), prevSize,
inserted = listOf(element), removed = emptyList(),
)) inserted = listOf(element),
)
)
} else { } else {
val index = mapping.index + shift val index = mapping.index + shift
val element = elements.removeAt(index) val element = elements.removeAt(index)
mapping.index = -1 mapping.index = -1
shift-- shift--
filteredChanges.add(ListChange( filteredChanges.add(
index, ListChange(
prevSize, index,
removed = listOf(element), prevSize,
inserted = emptyList(), removed = listOf(element),
)) inserted = emptyList(),
)
)
} }
} else if (oldResult) { } else if (oldResult) {
mapping.index += shift mapping.index += shift

29
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/FlatteningDependentListCell.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/list/FlatteningDependentListCell.kt
View File

@ -1,19 +1,18 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.core.disposable.Disposable import world.phantasmal.core.disposable.Disposable
import world.phantasmal.core.unsafe.unsafeAssertNotNull import world.phantasmal.core.unsafe.unsafeAssertNotNull
import world.phantasmal.observable.CallbackChangeObserver import world.phantasmal.cell.CallbackChangeObserver
import world.phantasmal.observable.ChangeObserver import world.phantasmal.cell.ChangeObserver
import world.phantasmal.observable.Observable import world.phantasmal.cell.AbstractFlatteningDependentCell
import world.phantasmal.observable.cell.AbstractFlatteningDependentCell import world.phantasmal.cell.Cell
import world.phantasmal.observable.cell.Cell import world.phantasmal.cell.DependentCell
import world.phantasmal.observable.cell.DependentCell
/** /**
* Similar to [DependentListCell], except that this cell's computeElements returns a [ListCell]. * Similar to [DependentListCell], except that this cell's computeElements returns a [ListCell].
*/ */
class FlatteningDependentListCell<E>( class FlatteningDependentListCell<E>(
vararg dependencies: Observable<*>, vararg dependencies: Cell<*>,
computeElements: () -> ListCell<E>, computeElements: () -> ListCell<E>,
) : ) :
AbstractFlatteningDependentCell<List<E>, ListCell<E>, ListChangeEvent<E>>( AbstractFlatteningDependentCell<List<E>, ListCell<E>, ListChangeEvent<E>>(
@ -64,12 +63,14 @@ class FlatteningDependentListCell<E>(
val old = oldValue ?: emptyList() val old = oldValue ?: emptyList()
return ListChangeEvent( return ListChangeEvent(
newValue, newValue,
listOf(ListChange( listOf(
index = 0, ListChange(
prevSize = old.size, index = 0,
removed = old, prevSize = old.size,
inserted = newValue, removed = old,
)), inserted = newValue,
)
),
) )
} }
} }

16
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/ImmutableListCell.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/list/ImmutableListCell.kt
View File

@ -1,14 +1,14 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.core.disposable.Disposable import world.phantasmal.core.disposable.Disposable
import world.phantasmal.core.disposable.nopDisposable import world.phantasmal.core.disposable.nopDisposable
import world.phantasmal.observable.ChangeObserver import world.phantasmal.cell.ChangeObserver
import world.phantasmal.observable.Dependency import world.phantasmal.cell.Dependency
import world.phantasmal.observable.Dependent import world.phantasmal.cell.Dependent
import world.phantasmal.observable.cell.Cell import world.phantasmal.cell.Cell
import world.phantasmal.observable.cell.cell import world.phantasmal.cell.cell
import world.phantasmal.observable.cell.falseCell import world.phantasmal.cell.falseCell
import world.phantasmal.observable.cell.trueCell import world.phantasmal.cell.trueCell
class ImmutableListCell<E>(private val elements: List<E>) : Dependency<List<E>>, ListCell<E> { class ImmutableListCell<E>(private val elements: List<E>) : Dependency<List<E>>, ListCell<E> {
override val size: Cell<Int> = cell(elements.size) override val size: Cell<Int> = cell(elements.size)

4
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/ListCell.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/list/ListCell.kt
View File

@ -1,7 +1,7 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.core.disposable.Disposable import world.phantasmal.core.disposable.Disposable
import world.phantasmal.observable.cell.Cell import world.phantasmal.cell.Cell
interface ListCell<out E> : Cell<List<E>> { interface ListCell<out E> : Cell<List<E>> {
override val value: List<E> override val value: List<E>

16
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/ListCellUtils.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/list/ListCellUtils.kt
View File

@ -1,9 +1,8 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.observable.Observable import world.phantasmal.cell.Cell
import world.phantasmal.observable.cell.Cell import world.phantasmal.cell.DependentCell
import world.phantasmal.observable.cell.DependentCell import world.phantasmal.cell.ImmutableCell
import world.phantasmal.observable.cell.ImmutableCell
private val EMPTY_LIST_CELL = ImmutableListCell<Nothing>(emptyList()) private val EMPTY_LIST_CELL = ImmutableListCell<Nothing>(emptyList())
@ -21,13 +20,12 @@ fun <E> mutableListCell(vararg elements: E): MutableListCell<E> =
* Returns a cell that changes whenever this list cell is structurally changed or when its * Returns a cell that changes whenever this list cell is structurally changed or when its
* individual elements change. * individual elements change.
* *
* @param extractObservables Called on each element to determine which element changes should be * @param extractCells Called on each element to determine which element changes should be observed.
* observed.
*/ */
fun <E> ListCell<E>.dependingOnElements( fun <E> ListCell<E>.dependingOnElements(
extractObservables: (element: E) -> Array<out Observable<*>>, extractCells: (element: E) -> Array<out Cell<*>>,
): Cell<List<E>> = ): Cell<List<E>> =
ListElementsDependentCell(this, extractObservables) ListElementsDependentCell(this, extractCells)
fun <E, R> ListCell<E>.listMap(transform: (E) -> R): ListCell<R> = fun <E, R> ListCell<E>.listMap(transform: (E) -> R): ListCell<R> =
DependentListCell(this) { value.map(transform) } DependentListCell(this) { value.map(transform) }

4
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/ListChangeObserver.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/list/ListChangeObserver.kt
View File

@ -1,6 +1,6 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.observable.ChangeEvent import world.phantasmal.cell.ChangeEvent
class ListChangeEvent<out E>( class ListChangeEvent<out E>(
value: List<E>, value: List<E>,

22
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/ListElementsDependentCell.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/list/ListElementsDependentCell.kt
View File

@ -1,20 +1,20 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.core.splice import world.phantasmal.core.splice
import world.phantasmal.observable.ChangeEvent import world.phantasmal.cell.ChangeEvent
import world.phantasmal.observable.Dependency import world.phantasmal.cell.Dependency
import world.phantasmal.observable.Dependent import world.phantasmal.cell.Dependent
import world.phantasmal.observable.Observable import world.phantasmal.cell.AbstractCell
import world.phantasmal.observable.cell.AbstractCell import world.phantasmal.cell.Cell
/** /**
* Depends on a [ListCell] and zero or more observables per element in the list. * Depends on a [ListCell] and zero or more cells per element in the list.
*/ */
class ListElementsDependentCell<E>( class ListElementsDependentCell<E>(
private val list: ListCell<E>, private val list: ListCell<E>,
private val extractObservables: (element: E) -> Array<out Observable<*>>, private val extractCells: (element: E) -> Array<out Cell<*>>,
) : AbstractCell<List<E>>(), Dependent { ) : AbstractCell<List<E>>(), Dependent {
/** An array of dependencies per [list] element, extracted by [extractObservables]. */ /** An array of dependencies per [list] element, extracted by [extractCells]. */
private val elementDependencies = mutableListOf<Array<out Dependency<*>>>() private val elementDependencies = mutableListOf<Array<out Dependency<*>>>()
private var valid = false private var valid = false
@ -46,7 +46,7 @@ class ListElementsDependentCell<E>(
} }
} }
val inserted = change.inserted.map(extractObservables) val inserted = change.inserted.map(extractCells)
elementDependencies.splice( elementDependencies.splice(
startIndex = change.index, startIndex = change.index,
@ -79,7 +79,7 @@ class ListElementsDependentCell<E>(
list.addDependent(this) list.addDependent(this)
for (element in list.value) { for (element in list.value) {
val dependencies = extractObservables(element) val dependencies = extractCells(element)
for (dependency in dependencies) { for (dependency in dependencies) {
dependency.addDependent(this) dependency.addDependent(this)

4
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/MutableListCell.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/list/MutableListCell.kt
View File

@ -1,6 +1,6 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.observable.cell.MutableCell import world.phantasmal.cell.MutableCell
interface MutableListCell<E> : ListCell<E>, MutableCell<List<E>> { interface MutableListCell<E> : ListCell<E>, MutableCell<List<E>> {
operator fun set(index: Int, element: E): E operator fun set(index: Int, element: E): E

6
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/SimpleFilteredListCell.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/list/SimpleFilteredListCell.kt
View File

@ -1,8 +1,8 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.core.assertUnreachable import world.phantasmal.core.assertUnreachable
import world.phantasmal.observable.Dependency import world.phantasmal.cell.Dependency
import world.phantasmal.observable.cell.Cell import world.phantasmal.cell.Cell
class SimpleFilteredListCell<E>( class SimpleFilteredListCell<E>(
list: ListCell<E>, list: ListCell<E>,

2
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/SimpleListCell.kt → cell/src/commonMain/kotlin/world/phantasmal/cell/list/SimpleListCell.kt
View File

@ -1,4 +1,4 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.core.replaceAll import world.phantasmal.core.replaceAll

6
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/CellCreationTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/CellCreationTests.kt
View File

@ -1,9 +1,9 @@
package world.phantasmal.observable.cell package world.phantasmal.cell
import world.phantasmal.observable.test.ObservableTestSuite import world.phantasmal.cell.test.CellTestSuite
import kotlin.test.* import kotlin.test.*
class CellCreationTests : ObservableTestSuite { class CellCreationTests : CellTestSuite {
@Test @Test
fun test_cell() = test { fun test_cell() = test {
assertEquals(7, cell(7).value) assertEquals(7, cell(7).value)

86
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/CellTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/CellTests.kt
View File

@ -1,15 +1,17 @@
package world.phantasmal.observable.cell package world.phantasmal.cell
import world.phantasmal.core.disposable.use import world.phantasmal.core.disposable.use
import world.phantasmal.observable.ChangeEvent import kotlin.test.Test
import world.phantasmal.observable.ObservableTests import kotlin.test.assertEquals
import kotlin.test.* import kotlin.test.assertNotEquals
import kotlin.test.assertNotNull
import kotlin.test.assertNull
/** /**
* Test suite for all [Cell] implementations. There is a subclass of this suite for every [Cell] * Test suite for all [Cell] implementations. There is a subclass of this suite for every [Cell]
* implementation. * implementation.
*/ */
interface CellTests : ObservableTests { interface CellTests : DependencyTests {
override fun createProvider(): Provider override fun createProvider(): Provider
@Test @Test
@ -17,17 +19,61 @@ interface CellTests : ObservableTests {
val p = createProvider() val p = createProvider()
// We literally just test that accessing the value property doesn't throw or return null. // We literally just test that accessing the value property doesn't throw or return null.
assertNotNull(p.observable.value) assertNotNull(p.cell.value)
} }
@Test @Test
fun value_is_accessible_with_observers() = test { fun value_is_accessible_with_observers() = test {
val p = createProvider() val p = createProvider()
disposer.add(p.observable.observeChange {}) disposer.add(p.cell.observeChange {})
// We literally just test that accessing the value property doesn't throw or return null. // We literally just test that accessing the value property doesn't throw or return null.
assertNotNull(p.observable.value) assertNotNull(p.cell.value)
}
@Test
fun calls_observers_when_events_are_emitted() = test {
val p = createProvider()
var changes = 0
disposer.add(
p.cell.observeChange {
changes++
}
)
p.emit()
assertEquals(1, changes)
p.emit()
p.emit()
p.emit()
assertEquals(4, changes)
}
@Test
fun does_not_call_observers_after_they_are_disposed() = test {
val p = createProvider()
var changes = 0
val observer = p.cell.observeChange {
changes++
}
p.emit()
assertEquals(1, changes)
observer.dispose()
p.emit()
p.emit()
p.emit()
assertEquals(1, changes)
} }
@Test @Test
@ -36,7 +82,7 @@ interface CellTests : ObservableTests {
var observedEvent: ChangeEvent<Any>? = null var observedEvent: ChangeEvent<Any>? = null
disposer.add(p.observable.observeChange { changeEvent -> disposer.add(p.cell.observeChange { changeEvent ->
observedEvent = changeEvent observedEvent = changeEvent
}) })
@ -54,7 +100,7 @@ interface CellTests : ObservableTests {
var prevValue: Snapshot? var prevValue: Snapshot?
var observedValue: Snapshot? = null var observedValue: Snapshot? = null
disposer.add(p.observable.observeChange { changeEvent -> disposer.add(p.cell.observeChange { changeEvent ->
assertNull(observedValue) assertNull(observedValue)
observedValue = changeEvent.value.snapshot() observedValue = changeEvent.value.snapshot()
}) })
@ -69,7 +115,7 @@ interface CellTests : ObservableTests {
// it should be equal to the cell's current value. // it should be equal to the cell's current value.
assertNotNull(observedValue) assertNotNull(observedValue)
assertNotEquals(prevValue, observedValue) assertNotEquals(prevValue, observedValue)
assertEquals(p.observable.value.snapshot(), observedValue) assertEquals(p.cell.value.snapshot(), observedValue)
} }
} }
@ -86,16 +132,16 @@ interface CellTests : ObservableTests {
repeat(5) { repeat(5) {
// Value should change after emit. // Value should change after emit.
old = p.observable.value.snapshot() old = p.cell.value.snapshot()
p.emit() p.emit()
val new = p.observable.value.snapshot() val new = p.cell.value.snapshot()
assertNotEquals(old, new) assertNotEquals(old, new)
// Value should not change when emit hasn't been called since the last access. // Value should not change when emit hasn't been called since the last access.
assertEquals(new, p.observable.value.snapshot()) assertEquals(new, p.cell.value.snapshot())
} }
} }
@ -108,7 +154,7 @@ interface CellTests : ObservableTests {
val p = createProvider() val p = createProvider()
var changes = 0 var changes = 0
p.observable.observeNow { p.cell.observeNow {
changes++ changes++
}.use { }.use {
p.emit() p.emit()
@ -120,7 +166,7 @@ interface CellTests : ObservableTests {
@Test @Test
fun propagates_changes_to_mapped_cell() = test { fun propagates_changes_to_mapped_cell() = test {
val p = createProvider() val p = createProvider()
val mapped = p.observable.map { it.snapshot() } val mapped = p.cell.map { it.snapshot() }
val initialValue = mapped.value val initialValue = mapped.value
var observedValue: Snapshot? = null var observedValue: Snapshot? = null
@ -140,7 +186,7 @@ interface CellTests : ObservableTests {
fun propagates_changes_to_flat_mapped_cell() = test { fun propagates_changes_to_flat_mapped_cell() = test {
val p = createProvider() val p = createProvider()
val mapped = p.observable.flatMap { ImmutableCell(it.snapshot()) } val mapped = p.cell.flatMap { ImmutableCell(it.snapshot()) }
val initialValue = mapped.value val initialValue = mapped.value
var observedValue: Snapshot? = null var observedValue: Snapshot? = null
@ -156,8 +202,10 @@ interface CellTests : ObservableTests {
assertEquals(mapped.value, observedValue) assertEquals(mapped.value, observedValue)
} }
interface Provider : ObservableTests.Provider { interface Provider : DependencyTests.Provider {
override val observable: Cell<Any> val cell: Cell<Any>
override val dependency: Dependency<*> get() = cell
} }
} }

5
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/CellWithDependenciesTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/CellWithDependenciesTests.kt
View File

@ -1,8 +1,5 @@
package world.phantasmal.observable.cell package world.phantasmal.cell
import world.phantasmal.observable.ChangeEvent
import world.phantasmal.observable.Dependency
import world.phantasmal.observable.Dependent
import kotlin.test.Test import kotlin.test.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals
import kotlin.test.assertTrue import kotlin.test.assertTrue

7
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/ChangeTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/ChangeTests.kt
View File

@ -1,12 +1,11 @@
package world.phantasmal.observable.cell package world.phantasmal.cell
import world.phantasmal.observable.mutate import world.phantasmal.cell.test.CellTestSuite
import world.phantasmal.observable.test.ObservableTestSuite
import kotlin.test.Test import kotlin.test.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals
import kotlin.test.assertFails import kotlin.test.assertFails
class ChangeTests : ObservableTestSuite { class ChangeTests : CellTestSuite {
@Test @Test
fun exceptions_during_a_change_set_are_allowed() = test { fun exceptions_during_a_change_set_are_allowed() = test {
val dependency = mutableCell(7) val dependency = mutableCell(7)

7
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/DelegatingCellTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/DelegatingCellTests.kt
View File

@ -1,13 +1,14 @@
package world.phantasmal.observable.cell package world.phantasmal.cell
@Suppress("unused")
class DelegatingCellTests : RegularCellTests, MutableCellTests<Int> { class DelegatingCellTests : RegularCellTests, MutableCellTests<Int> {
override fun createProvider() = object : MutableCellTests.Provider<Int> { override fun createProvider() = object : MutableCellTests.Provider<Int> {
private var v = 17 private var v = 17
override val observable = DelegatingCell({ v }, { v = it }) override val cell = DelegatingCell({ v }, { v = it })
override fun emit() { override fun emit() {
observable.value += 2 cell.value += 2
} }
override fun createValue(): Int = v + 1 override fun createValue(): Int = v + 1

6
observable/src/commonTest/kotlin/world/phantasmal/observable/DependencyTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/DependencyTests.kt
View File

@ -1,9 +1,9 @@
package world.phantasmal.observable package world.phantasmal.cell
import world.phantasmal.observable.test.ObservableTestSuite import world.phantasmal.cell.test.CellTestSuite
import kotlin.test.* import kotlin.test.*
interface DependencyTests : ObservableTestSuite { interface DependencyTests : CellTestSuite {
fun createProvider(): Provider fun createProvider(): Provider
@Test @Test

5
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/DependentCellTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/DependentCellTests.kt
View File

@ -1,5 +1,6 @@
package world.phantasmal.observable.cell package world.phantasmal.cell
@Suppress("unused")
class DependentCellTests : RegularCellTests, CellWithDependenciesTests { class DependentCellTests : RegularCellTests, CellWithDependenciesTests {
override fun createProvider() = Provider() override fun createProvider() = Provider()
@ -20,7 +21,7 @@ class DependentCellTests : RegularCellTests, CellWithDependenciesTests {
class Provider : CellTests.Provider { class Provider : CellTests.Provider {
private val dependencyCell = SimpleCell(1) private val dependencyCell = SimpleCell(1)
override val observable = DependentCell(dependencyCell) { 2 * dependencyCell.value } override val cell = DependentCell(dependencyCell) { 2 * dependencyCell.value }
override fun emit() { override fun emit() {
dependencyCell.value += 2 dependencyCell.value += 2

7
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/DependentCellWithSimpleListCellTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/DependentCellWithSimpleListCellTests.kt
View File

@ -1,14 +1,15 @@
package world.phantasmal.observable.cell package world.phantasmal.cell
import world.phantasmal.observable.cell.list.SimpleListCell import world.phantasmal.cell.list.SimpleListCell
@Suppress("unused")
class DependentCellWithSimpleListCellTests : CellTests { class DependentCellWithSimpleListCellTests : CellTests {
override fun createProvider() = Provider() override fun createProvider() = Provider()
class Provider : CellTests.Provider { class Provider : CellTests.Provider {
private val dependencyCell = SimpleListCell(mutableListOf("a", "b", "c")) private val dependencyCell = SimpleListCell(mutableListOf("a", "b", "c"))
override val observable = DependentCell(dependencyCell) { dependencyCell.value } override val cell = DependentCell(dependencyCell) { dependencyCell.value }
override fun emit() { override fun emit() {
dependencyCell.add("x") dependencyCell.add("x")

5
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/FlatteningDependentCellDirectAndTransitiveDependencyEmitTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/FlatteningDependentCellDirectAndTransitiveDependencyEmitTests.kt
View File

@ -1,9 +1,10 @@
package world.phantasmal.observable.cell package world.phantasmal.cell
/** /**
* In these tests both the direct dependency and the transitive dependency of the * In these tests both the direct dependency and the transitive dependency of the
* [FlatteningDependentCell] change. * [FlatteningDependentCell] change.
*/ */
@Suppress("unused")
class FlatteningDependentCellDirectAndTransitiveDependencyEmitTests : CellTests { class FlatteningDependentCellDirectAndTransitiveDependencyEmitTests : CellTests {
override fun createProvider() = Provider() override fun createProvider() = Provider()
@ -11,7 +12,7 @@ class FlatteningDependentCellDirectAndTransitiveDependencyEmitTests : CellTests
// This cell is both the direct and transitive dependency. // This cell is both the direct and transitive dependency.
private val dependencyCell = SimpleCell('a') private val dependencyCell = SimpleCell('a')
override val observable = FlatteningDependentCell(dependencyCell) { dependencyCell } override val cell = FlatteningDependentCell(dependencyCell) { dependencyCell }
override fun emit() { override fun emit() {
dependencyCell.value += 1 dependencyCell.value += 1

5
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/FlatteningDependentCellDirectDependencyEmitsTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/FlatteningDependentCellDirectDependencyEmitsTests.kt
View File

@ -1,8 +1,9 @@
package world.phantasmal.observable.cell package world.phantasmal.cell
/** /**
* In these tests the direct dependency of the [FlatteningDependentCell] changes. * In these tests the direct dependency of the [FlatteningDependentCell] changes.
*/ */
@Suppress("unused")
class FlatteningDependentCellDirectDependencyEmitsTests : RegularCellTests { class FlatteningDependentCellDirectDependencyEmitsTests : RegularCellTests {
override fun createProvider() = object : CellTests.Provider { override fun createProvider() = object : CellTests.Provider {
// The transitive dependency can't change. // The transitive dependency can't change.
@ -11,7 +12,7 @@ class FlatteningDependentCellDirectDependencyEmitsTests : RegularCellTests {
// The direct dependency of the cell under test can change. // The direct dependency of the cell under test can change.
val directDependency = SimpleCell(transitiveDependency) val directDependency = SimpleCell(transitiveDependency)
override val observable = override val cell =
FlatteningDependentCell(directDependency) { directDependency.value } FlatteningDependentCell(directDependency) { directDependency.value }
override fun emit() { override fun emit() {

5
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/FlatteningDependentCellTransitiveDependencyEmitsTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/FlatteningDependentCellTransitiveDependencyEmitsTests.kt
View File

@ -1,8 +1,9 @@
package world.phantasmal.observable.cell package world.phantasmal.cell
/** /**
* In these tests the dependency of the [FlatteningDependentCell]'s direct dependency changes. * In these tests the dependency of the [FlatteningDependentCell]'s direct dependency changes.
*/ */
@Suppress("unused")
class FlatteningDependentCellTransitiveDependencyEmitsTests : class FlatteningDependentCellTransitiveDependencyEmitsTests :
RegularCellTests, RegularCellTests,
CellWithDependenciesTests { CellWithDependenciesTests {
@ -30,7 +31,7 @@ class FlatteningDependentCellTransitiveDependencyEmitsTests :
// The direct dependency of the cell under test can't change. // The direct dependency of the cell under test can't change.
private val directDependency = ImmutableCell(transitiveDependency) private val directDependency = ImmutableCell(transitiveDependency)
override val observable = override val cell =
FlatteningDependentCell(directDependency) { directDependency.value } FlatteningDependentCell(directDependency) { directDependency.value }
override fun emit() { override fun emit() {

6
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/ImmutableCellTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/ImmutableCellTests.kt
View File

@ -1,11 +1,11 @@
package world.phantasmal.observable.cell package world.phantasmal.cell
import world.phantasmal.cell.test.CellTestSuite
import world.phantasmal.core.disposable.DisposableTracking import world.phantasmal.core.disposable.DisposableTracking
import world.phantasmal.observable.test.ObservableTestSuite
import kotlin.test.Test import kotlin.test.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals
class ImmutableCellTests : ObservableTestSuite { class ImmutableCellTests : CellTestSuite {
/** /**
* As an optimization we simply ignore any observers and return a singleton Nop disposable. * As an optimization we simply ignore any observers and return a singleton Nop disposable.
*/ */

15
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/MutableCellTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/MutableCellTests.kt
View File

@ -1,6 +1,5 @@
package world.phantasmal.observable.cell package world.phantasmal.cell
import world.phantasmal.observable.Dependent
import kotlin.test.Test import kotlin.test.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals
import kotlin.test.assertNull import kotlin.test.assertNull
@ -14,15 +13,15 @@ interface MutableCellTests<T : Any> : CellTests {
var observedValue: Any? = null var observedValue: Any? = null
disposer.add(p.observable.observeChange { disposer.add(p.cell.observeChange {
assertNull(observedValue) assertNull(observedValue)
observedValue = it.value observedValue = it.value
}) })
val newValue = p.createValue() val newValue = p.createValue()
p.observable.value = newValue p.cell.value = newValue
assertEquals(newValue, p.observable.value) assertEquals(newValue, p.cell.value)
assertEquals(newValue, observedValue) assertEquals(newValue, observedValue)
} }
@ -139,11 +138,11 @@ interface MutableCellTests<T : Any> : CellTests {
// } // }
interface Provider<T : Any> : CellTests.Provider { interface Provider<T : Any> : CellTests.Provider {
override val observable: MutableCell<T> override val cell: MutableCell<T>
/** /**
* Returns a value that can be assigned to [observable] and that's different from * Returns a value that can be assigned to [cell] and that's different from
* [observable]'s current and all previous values. * [cell]'s current and all previous values.
*/ */
fun createValue(): T fun createValue(): T
} }

7
observable/src/commonTest/kotlin/world/phantasmal/observable/MutationTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/MutationTests.kt
View File

@ -1,11 +1,10 @@
package world.phantasmal.observable package world.phantasmal.cell
import world.phantasmal.observable.cell.mutableCell import world.phantasmal.cell.test.CellTestSuite
import world.phantasmal.observable.test.ObservableTestSuite
import kotlin.test.Test import kotlin.test.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals
class MutationTests : ObservableTestSuite { class MutationTests : CellTestSuite {
@Test @Test
fun can_change_observed_cell_with_mutateDeferred() = test { fun can_change_observed_cell_with_mutateDeferred() = test {
val cell = mutableCell(0) val cell = mutableCell(0)

2
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/RegularCellTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/RegularCellTests.kt
View File

@ -1,4 +1,4 @@
package world.phantasmal.observable.cell package world.phantasmal.cell
import kotlin.test.Test import kotlin.test.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals

9
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/SimpleCellTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/SimpleCellTests.kt
View File

@ -1,14 +1,15 @@
package world.phantasmal.observable.cell package world.phantasmal.cell
@Suppress("unused")
class SimpleCellTests : RegularCellTests, MutableCellTests<Int> { class SimpleCellTests : RegularCellTests, MutableCellTests<Int> {
override fun createProvider() = object : MutableCellTests.Provider<Int> { override fun createProvider() = object : MutableCellTests.Provider<Int> {
override val observable = SimpleCell(1) override val cell = SimpleCell(1)
override fun emit() { override fun emit() {
observable.value += 2 cell.value += 2
} }
override fun createValue(): Int = observable.value + 1 override fun createValue(): Int = cell.value + 1
} }
override fun <T> createWithValue(value: T) = SimpleCell(value) override fun <T> createWithValue(value: T) = SimpleCell(value)

9
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/DependentListCellTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/list/DependentListCellTests.kt
View File

@ -1,8 +1,9 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.observable.cell.Cell import world.phantasmal.cell.Cell
import world.phantasmal.observable.cell.CellWithDependenciesTests import world.phantasmal.cell.CellWithDependenciesTests
@Suppress("unused")
class DependentListCellTests : ListCellTests, CellWithDependenciesTests { class DependentListCellTests : ListCellTests, CellWithDependenciesTests {
override fun createProvider() = createListProvider(empty = true) override fun createProvider() = createListProvider(empty = true)
@ -21,7 +22,7 @@ class DependentListCellTests : ListCellTests, CellWithDependenciesTests {
private val dependencyCell = private val dependencyCell =
SimpleListCell(if (empty) mutableListOf() else mutableListOf(5)) SimpleListCell(if (empty) mutableListOf() else mutableListOf(5))
override val observable = override val cell =
DependentListCell(dependencyCell) { dependencyCell.value.map { 2 * it } } DependentListCell(dependencyCell) { dependencyCell.value.map { 2 * it } }
override fun addElement() { override fun addElement() {

10
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/FilteredListCellListDependencyEmitsTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/list/FilteredListCellListDependencyEmitsTests.kt
View File

@ -1,13 +1,17 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.observable.cell.* import world.phantasmal.cell.Cell
import world.phantasmal.cell.CellWithDependenciesTests
import world.phantasmal.cell.cell
import world.phantasmal.cell.map
@Suppress("unused")
class FilteredListCellListDependencyEmitsTests : ListCellTests, CellWithDependenciesTests { class FilteredListCellListDependencyEmitsTests : ListCellTests, CellWithDependenciesTests {
override fun createListProvider(empty: Boolean) = object : ListCellTests.Provider { override fun createListProvider(empty: Boolean) = object : ListCellTests.Provider {
private val dependencyCell = private val dependencyCell =
SimpleListCell(if (empty) mutableListOf(5) else mutableListOf(5, 10)) SimpleListCell(if (empty) mutableListOf(5) else mutableListOf(5, 10))
override val observable = override val cell =
FilteredListCell( FilteredListCell(
list = dependencyCell, list = dependencyCell,
predicate = cell { cell(it % 2 == 0) }, predicate = cell { cell(it % 2 == 0) },

9
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/FilteredListCellTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/list/FilteredListCellTests.kt
View File

@ -1,12 +1,13 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.observable.cell.Cell import world.phantasmal.cell.Cell
import world.phantasmal.observable.cell.cell import world.phantasmal.cell.cell
import world.phantasmal.observable.cell.map import world.phantasmal.cell.map
// TODO: A test suite that tests FilteredListCell while its predicate dependency is changing. // TODO: A test suite that tests FilteredListCell while its predicate dependency is changing.
// TODO: A test suite that tests FilteredListCell while the predicate results are changing. // TODO: A test suite that tests FilteredListCell while the predicate results are changing.
// TODO: A test suite that tests FilteredListCell while all 3 types of dependencies are changing. // TODO: A test suite that tests FilteredListCell while all 3 types of dependencies are changing.
@Suppress("unused")
class FilteredListCellTests : SuperFilteredListCellTests { class FilteredListCellTests : SuperFilteredListCellTests {
override fun <E> createFilteredListCell(list: ListCell<E>, predicate: Cell<(E) -> Boolean>) = override fun <E> createFilteredListCell(list: ListCell<E>, predicate: Cell<(E) -> Boolean>) =
FilteredListCell(list, predicate.map { p -> { cell(p(it)) } }) FilteredListCell(list, predicate.map { p -> { cell(p(it)) } })

7
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/FlatteningDependentListCellDirectDependencyEmitsTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/list/FlatteningDependentListCellDirectDependencyEmitsTests.kt
View File

@ -1,10 +1,11 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.observable.cell.SimpleCell import world.phantasmal.cell.SimpleCell
/** /**
* In these tests the direct dependency of the [FlatteningDependentListCell] changes. * In these tests the direct dependency of the [FlatteningDependentListCell] changes.
*/ */
@Suppress("unused")
class FlatteningDependentListCellDirectDependencyEmitsTests : ListCellTests { class FlatteningDependentListCellDirectDependencyEmitsTests : ListCellTests {
override fun createListProvider(empty: Boolean) = object : ListCellTests.Provider { override fun createListProvider(empty: Boolean) = object : ListCellTests.Provider {
// The transitive dependency can't change. // The transitive dependency can't change.
@ -13,7 +14,7 @@ class FlatteningDependentListCellDirectDependencyEmitsTests : ListCellTests {
// The direct dependency of the list under test can change. // The direct dependency of the list under test can change.
private val directDependency = SimpleCell<ListCell<Int>>(transitiveDependency) private val directDependency = SimpleCell<ListCell<Int>>(transitiveDependency)
override val observable = override val cell =
FlatteningDependentListCell(directDependency) { directDependency.value } FlatteningDependentListCell(directDependency) { directDependency.value }
override fun addElement() { override fun addElement() {

13
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/FlatteningDependentListCellTransitiveDependencyEmitsTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/list/FlatteningDependentListCellTransitiveDependencyEmitsTests.kt
View File

@ -1,13 +1,14 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.observable.cell.Cell import world.phantasmal.cell.Cell
import world.phantasmal.observable.cell.CellTests import world.phantasmal.cell.CellTests
import world.phantasmal.observable.cell.CellWithDependenciesTests import world.phantasmal.cell.CellWithDependenciesTests
import world.phantasmal.observable.cell.ImmutableCell import world.phantasmal.cell.ImmutableCell
/** /**
* In these tests the dependency of the [FlatteningDependentListCell]'s direct dependency changes. * In these tests the dependency of the [FlatteningDependentListCell]'s direct dependency changes.
*/ */
@Suppress("unused")
class FlatteningDependentListCellTransitiveDependencyEmitsTests : class FlatteningDependentListCellTransitiveDependencyEmitsTests :
ListCellTests, ListCellTests,
CellWithDependenciesTests { CellWithDependenciesTests {
@ -33,7 +34,7 @@ class FlatteningDependentListCellTransitiveDependencyEmitsTests :
// The direct dependency of the list under test can't change. // The direct dependency of the list under test can't change.
private val directDependency = ImmutableCell<ListCell<Int>>(transitiveDependency) private val directDependency = ImmutableCell<ListCell<Int>>(transitiveDependency)
override val observable = override val cell =
FlatteningDependentListCell(directDependency) { directDependency.value } FlatteningDependentListCell(directDependency) { directDependency.value }
override fun addElement() { override fun addElement() {

8
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ImmutableListCellTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/list/ImmutableListCellTests.kt
View File

@ -1,12 +1,12 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.core.disposable.DisposableTracking import world.phantasmal.core.disposable.DisposableTracking
import world.phantasmal.observable.cell.observeNow import world.phantasmal.cell.observeNow
import world.phantasmal.observable.test.ObservableTestSuite import world.phantasmal.cell.test.CellTestSuite
import kotlin.test.Test import kotlin.test.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals
class ImmutableListCellTests : ObservableTestSuite { class ImmutableListCellTests : CellTestSuite {
/** /**
* As an optimization we simply ignore any observers and return a singleton Nop disposable. * As an optimization we simply ignore any observers and return a singleton Nop disposable.
*/ */

17
cell/src/commonTest/kotlin/world/phantasmal/cell/list/ListCellCreationTests.kt Normal file
View File

@ -0,0 +1,17 @@
package world.phantasmal.cell.list
import world.phantasmal.cell.SimpleCell
import world.phantasmal.cell.test.CellTestSuite
import world.phantasmal.cell.test.assertListCellEquals
import kotlin.test.Test
class ListCellCreationTests : CellTestSuite {
@Test
fun test_flatMapToList() = test {
val cell = SimpleCell(SimpleListCell(mutableListOf(1, 2, 3, 4, 5)))
val mapped = cell.flatMapToList { it }
assertListCellEquals(listOf(1, 2, 3, 4, 5), mapped)
}
}

34
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ListCellTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/list/ListCellTests.kt
View File

@ -1,6 +1,6 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.observable.cell.CellTests import world.phantasmal.cell.CellTests
import kotlin.test.* import kotlin.test.*
/** /**
@ -18,18 +18,18 @@ interface ListCellTests : CellTests {
// We literally just test that accessing the value property doesn't throw or return the // We literally just test that accessing the value property doesn't throw or return the
// wrong list. // wrong list.
assertTrue(p.observable.value.isNotEmpty()) assertTrue(p.cell.value.isNotEmpty())
} }
@Test @Test
fun list_value_is_accessible_with_observers() = test { fun list_value_is_accessible_with_observers() = test {
val p = createListProvider(empty = false) val p = createListProvider(empty = false)
disposer.add(p.observable.observeListChange {}) disposer.add(p.cell.observeListChange {})
// We literally just test that accessing the value property doesn't throw or return the // We literally just test that accessing the value property doesn't throw or return the
// wrong list. // wrong list.
assertTrue(p.observable.value.isNotEmpty()) assertTrue(p.cell.value.isNotEmpty())
} }
@Test @Test
@ -38,7 +38,7 @@ interface ListCellTests : CellTests {
var observedEvent: ListChangeEvent<Any>? = null var observedEvent: ListChangeEvent<Any>? = null
disposer.add(p.observable.observeListChange { listChangeEvent -> disposer.add(p.cell.observeListChange { listChangeEvent ->
observedEvent = listChangeEvent observedEvent = listChangeEvent
}) })
@ -56,7 +56,7 @@ interface ListCellTests : CellTests {
var event: ListChangeEvent<*>? = null var event: ListChangeEvent<*>? = null
disposer.add( disposer.add(
p.observable.observeListChange { p.cell.observeListChange {
assertNull(event) assertNull(event)
event = it event = it
} }
@ -75,12 +75,12 @@ interface ListCellTests : CellTests {
fun updates_size_correctly() = test { fun updates_size_correctly() = test {
val p = createProvider() val p = createProvider()
assertEquals(0, p.observable.size.value) assertEquals(0, p.cell.size.value)
var observedSize: Int? = null var observedSize: Int? = null
disposer.add( disposer.add(
p.observable.size.observeChange { p.cell.size.observeChange {
assertNull(observedSize) assertNull(observedSize)
observedSize = it.value observedSize = it.value
} }
@ -91,7 +91,7 @@ interface ListCellTests : CellTests {
p.addElement() p.addElement()
assertEquals(i, p.observable.size.value) assertEquals(i, p.cell.size.value)
assertEquals(i, observedSize) assertEquals(i, observedSize)
} }
} }
@ -101,20 +101,20 @@ interface ListCellTests : CellTests {
val p = createProvider() val p = createProvider()
assertFailsWith(IndexOutOfBoundsException::class) { assertFailsWith(IndexOutOfBoundsException::class) {
p.observable[0] p.cell[0]
} }
p.addElement() p.addElement()
// Shouldn't throw at this point. // Shouldn't throw at this point.
p.observable[0] p.cell[0]
} }
@Test @Test
fun fold() = test { fun fold() = test {
val p = createProvider() val p = createProvider()
val fold = p.observable.fold(0) { acc, _ -> acc + 1 } val fold = p.cell.fold(0) { acc, _ -> acc + 1 }
var observedValue: Int? = null var observedValue: Int? = null
@ -139,7 +139,7 @@ interface ListCellTests : CellTests {
fun sumBy() = test { fun sumBy() = test {
val p = createProvider() val p = createProvider()
val sum = p.observable.sumOf { 1 } val sum = p.cell.sumOf { 1 }
var observedValue: Int? = null var observedValue: Int? = null
@ -164,7 +164,7 @@ interface ListCellTests : CellTests {
fun filtered() = test { fun filtered() = test {
val p = createProvider() val p = createProvider()
val filtered = p.observable.filtered { true } val filtered = p.cell.filtered { true }
var event: ListChangeEvent<*>? = null var event: ListChangeEvent<*>? = null
@ -189,7 +189,7 @@ interface ListCellTests : CellTests {
fun firstOrNull() = test { fun firstOrNull() = test {
val p = createProvider() val p = createProvider()
val firstOrNull = p.observable.firstOrNull() val firstOrNull = p.cell.firstOrNull()
var observedValue: Any? = null var observedValue: Any? = null
@ -217,7 +217,7 @@ interface ListCellTests : CellTests {
} }
interface Provider : CellTests.Provider { interface Provider : CellTests.Provider {
override val observable: ListCell<Any> override val cell: ListCell<Any>
/** /**
* Adds an element to the [ListCell] under test. * Adds an element to the [ListCell] under test.

11
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ListElementsDependentCellElementEmitsTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/list/ListElementsDependentCellElementEmitsTests.kt
View File

@ -1,6 +1,11 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.observable.cell.* import world.phantasmal.cell.Cell
import world.phantasmal.cell.CellTests
import world.phantasmal.cell.CellWithDependenciesTests
import world.phantasmal.cell.DependentCell
import world.phantasmal.cell.MutableCell
import world.phantasmal.cell.SimpleCell
/** /**
* In these tests, the direct list cell dependency of the [ListElementsDependentCell] doesn't * In these tests, the direct list cell dependency of the [ListElementsDependentCell] doesn't
@ -16,7 +21,7 @@ class ListElementsDependentCellElementEmitsTests : CellWithDependenciesTests {
private val directDependency: ListCell<Element> = private val directDependency: ListCell<Element> =
ImmutableListCell(listOf(Element(1), transitiveDependency, Element(3))) ImmutableListCell(listOf(Element(1), transitiveDependency, Element(3)))
override val observable = override val cell =
ListElementsDependentCell(directDependency) { arrayOf(it.int, it.double, it.string) } ListElementsDependentCell(directDependency) { arrayOf(it.int, it.double, it.string) }
override fun emit() { override fun emit() {

10
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ListElementsDependentCellListCellEmitsTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/list/ListElementsDependentCellListCellEmitsTests.kt
View File

@ -1,8 +1,8 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.observable.cell.Cell import world.phantasmal.cell.Cell
import world.phantasmal.observable.cell.CellTests import world.phantasmal.cell.CellTests
import world.phantasmal.observable.cell.ImmutableCell import world.phantasmal.cell.ImmutableCell
/** /**
* In these tests, the direct list cell dependency of the [ListElementsDependentCell] changes, while * In these tests, the direct list cell dependency of the [ListElementsDependentCell] changes, while
@ -15,7 +15,7 @@ class ListElementsDependentCellListCellEmitsTests : CellTests {
private val directDependency: SimpleListCell<Cell<Int>> = private val directDependency: SimpleListCell<Cell<Int>> =
SimpleListCell(mutableListOf(ImmutableCell(1), ImmutableCell(2), ImmutableCell(3))) SimpleListCell(mutableListOf(ImmutableCell(1), ImmutableCell(2), ImmutableCell(3)))
override val observable = override val cell =
ListElementsDependentCell(directDependency) { arrayOf(it) } ListElementsDependentCell(directDependency) { arrayOf(it) }
override fun emit() { override fun emit() {

10
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ListElementsDependentCellTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/list/ListElementsDependentCellTests.kt
View File

@ -1,8 +1,8 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.observable.ChangeEvent import world.phantasmal.cell.ChangeEvent
import world.phantasmal.observable.cell.SimpleCell import world.phantasmal.cell.SimpleCell
import world.phantasmal.observable.test.ObservableTestSuite import world.phantasmal.cell.test.CellTestSuite
import kotlin.test.Test import kotlin.test.Test
import kotlin.test.assertNotNull import kotlin.test.assertNotNull
import kotlin.test.assertNull import kotlin.test.assertNull
@ -11,7 +11,7 @@ import kotlin.test.assertNull
* Standard tests are done by [ListElementsDependentCellElementEmitsTests] and * Standard tests are done by [ListElementsDependentCellElementEmitsTests] and
* [ListElementsDependentCellListCellEmitsTests]. * [ListElementsDependentCellListCellEmitsTests].
*/ */
class ListElementsDependentCellTests : ObservableTestSuite { class ListElementsDependentCellTests : CellTestSuite {
@Test @Test
fun element_changes_are_correctly_propagated() = test { fun element_changes_are_correctly_propagated() = test {
val list = SimpleListCell( val list = SimpleListCell(

32
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/MutableListCellTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/list/MutableListCellTests.kt
View File

@ -1,6 +1,6 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.observable.cell.MutableCellTests import world.phantasmal.cell.MutableCellTests
import kotlin.test.* import kotlin.test.*
/** /**
@ -16,18 +16,18 @@ interface MutableListCellTests<T : Any> : ListCellTests, MutableCellTests<List<T
var changeEvent: ListChangeEvent<T>? = null var changeEvent: ListChangeEvent<T>? = null
disposer.add(p.observable.observeListChange { disposer.add(p.cell.observeListChange {
assertNull(changeEvent) assertNull(changeEvent)
changeEvent = it changeEvent = it
}) })
// Insert once. // Insert once.
val v1 = p.createElement() val v1 = p.createElement()
p.observable.add(v1) p.cell.add(v1)
run { run {
assertEquals(1, p.observable.size.value) assertEquals(1, p.cell.size.value)
assertEquals(v1, p.observable[0]) assertEquals(v1, p.cell[0])
val e = changeEvent val e = changeEvent
assertNotNull(e) assertNotNull(e)
@ -44,12 +44,12 @@ interface MutableListCellTests<T : Any> : ListCellTests, MutableCellTests<List<T
changeEvent = null changeEvent = null
val v2 = p.createElement() val v2 = p.createElement()
p.observable.add(v2) p.cell.add(v2)
run { run {
assertEquals(2, p.observable.size.value) assertEquals(2, p.cell.size.value)
assertEquals(v1, p.observable[0]) assertEquals(v1, p.cell[0])
assertEquals(v2, p.observable[1]) assertEquals(v2, p.cell[1])
val e = changeEvent val e = changeEvent
assertNotNull(e) assertNotNull(e)
@ -66,13 +66,13 @@ interface MutableListCellTests<T : Any> : ListCellTests, MutableCellTests<List<T
changeEvent = null changeEvent = null
val v3 = p.createElement() val v3 = p.createElement()
p.observable.add(1, v3) p.cell.add(1, v3)
run { run {
assertEquals(3, p.observable.size.value) assertEquals(3, p.cell.size.value)
assertEquals(v1, p.observable[0]) assertEquals(v1, p.cell[0])
assertEquals(v3, p.observable[1]) assertEquals(v3, p.cell[1])
assertEquals(v2, p.observable[2]) assertEquals(v2, p.cell[2])
val e = changeEvent val e = changeEvent
assertNotNull(e) assertNotNull(e)
@ -87,7 +87,7 @@ interface MutableListCellTests<T : Any> : ListCellTests, MutableCellTests<List<T
} }
interface Provider<T : Any> : ListCellTests.Provider, MutableCellTests.Provider<List<T>> { interface Provider<T : Any> : ListCellTests.Provider, MutableCellTests.Provider<List<T>> {
override val observable: MutableListCell<T> override val cell: MutableListCell<T>
fun createElement(): T fun createElement(): T
} }

11
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/SimpleFilteredListCellListDependencyEmitsTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/list/SimpleFilteredListCellListDependencyEmitsTests.kt
View File

@ -1,13 +1,14 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.observable.cell.Cell import world.phantasmal.cell.Cell
import world.phantasmal.observable.cell.CellWithDependenciesTests import world.phantasmal.cell.CellWithDependenciesTests
import world.phantasmal.observable.cell.cell import world.phantasmal.cell.cell
/** /**
* In these tests the list dependency of the [SimpleListCell] changes and the predicate * In these tests the list dependency of the [SimpleListCell] changes and the predicate
* dependency does not. * dependency does not.
*/ */
@Suppress("unused")
class SimpleFilteredListCellListDependencyEmitsTests : class SimpleFilteredListCellListDependencyEmitsTests :
ListCellTests, CellWithDependenciesTests { ListCellTests, CellWithDependenciesTests {
@ -15,7 +16,7 @@ class SimpleFilteredListCellListDependencyEmitsTests :
private val dependencyCell = private val dependencyCell =
SimpleListCell(if (empty) mutableListOf(5) else mutableListOf(5, 10)) SimpleListCell(if (empty) mutableListOf(5) else mutableListOf(5, 10))
override val observable = SimpleFilteredListCell( override val cell = SimpleFilteredListCell(
list = dependencyCell, list = dependencyCell,
predicate = cell { it % 2 == 0 }, predicate = cell { it % 2 == 0 },
) )

13
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/SimpleFilteredListCellPredicateDependencyEmitsTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/list/SimpleFilteredListCellPredicateDependencyEmitsTests.kt
View File

@ -1,14 +1,15 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.observable.cell.Cell import world.phantasmal.cell.Cell
import world.phantasmal.observable.cell.CellWithDependenciesTests import world.phantasmal.cell.CellWithDependenciesTests
import world.phantasmal.observable.cell.SimpleCell import world.phantasmal.cell.SimpleCell
import world.phantasmal.observable.cell.map import world.phantasmal.cell.map
/** /**
* In these tests the predicate dependency of the [SimpleListCell] changes and the list dependency * In these tests the predicate dependency of the [SimpleListCell] changes and the list dependency
* does not. * does not.
*/ */
@Suppress("unused")
class SimpleFilteredListCellPredicateDependencyEmitsTests : class SimpleFilteredListCellPredicateDependencyEmitsTests :
ListCellTests, CellWithDependenciesTests { ListCellTests, CellWithDependenciesTests {
@ -16,7 +17,7 @@ class SimpleFilteredListCellPredicateDependencyEmitsTests :
private var maxValue = if (empty) 0 else 1 private var maxValue = if (empty) 0 else 1
private val predicateCell = SimpleCell<(Int) -> Boolean> { it <= maxValue } private val predicateCell = SimpleCell<(Int) -> Boolean> { it <= maxValue }
override val observable = SimpleFilteredListCell( override val cell = SimpleFilteredListCell(
list = ImmutableListCell((1..20).toList()), list = ImmutableListCell((1..20).toList()),
predicate = predicateCell, predicate = predicateCell,
) )

5
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/SimpleFilteredListCellTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/list/SimpleFilteredListCellTests.kt
View File

@ -1,9 +1,10 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.observable.cell.Cell import world.phantasmal.cell.Cell
// TODO: A test suite that tests SimpleFilteredListCell while both types of dependencies are // TODO: A test suite that tests SimpleFilteredListCell while both types of dependencies are
// changing. // changing.
@Suppress("unused")
class SimpleFilteredListCellTests : SuperFilteredListCellTests { class SimpleFilteredListCellTests : SuperFilteredListCellTests {
override fun <E> createFilteredListCell(list: ListCell<E>, predicate: Cell<(E) -> Boolean>) = override fun <E> createFilteredListCell(list: ListCell<E>, predicate: Cell<(E) -> Boolean>) =
SimpleFilteredListCell(list, predicate) SimpleFilteredListCell(list, predicate)

8
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/SimpleListCellTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/list/SimpleListCellTests.kt
View File

@ -1,6 +1,6 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.observable.test.assertListCellEquals import world.phantasmal.cell.test.assertListCellEquals
import kotlin.test.Test import kotlin.test.Test
import kotlin.test.assertFailsWith import kotlin.test.assertFailsWith
import kotlin.test.assertFalse import kotlin.test.assertFalse
@ -12,10 +12,10 @@ class SimpleListCellTests : MutableListCellTests<Int> {
override fun createListProvider(empty: Boolean) = object : MutableListCellTests.Provider<Int> { override fun createListProvider(empty: Boolean) = object : MutableListCellTests.Provider<Int> {
private var nextElement = 0 private var nextElement = 0
override val observable = SimpleListCell(if (empty) mutableListOf() else mutableListOf(-13)) override val cell = SimpleListCell(if (empty) mutableListOf() else mutableListOf(-13))
override fun addElement() { override fun addElement() {
observable.add(createElement()) cell.add(createElement())
} }
override fun createValue(): List<Int> = listOf(createElement()) override fun createValue(): List<Int> = listOf(createElement())

18
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/SuperFilteredListCellTests.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/list/SuperFilteredListCellTests.kt
View File

@ -1,15 +1,15 @@
package world.phantasmal.observable.cell.list package world.phantasmal.cell.list
import world.phantasmal.observable.cell.Cell import world.phantasmal.cell.Cell
import world.phantasmal.observable.cell.ImmutableCell import world.phantasmal.cell.ImmutableCell
import world.phantasmal.observable.cell.SimpleCell import world.phantasmal.cell.SimpleCell
import world.phantasmal.observable.test.ObservableTestSuite import world.phantasmal.cell.test.CellTestSuite
import kotlin.test.* import kotlin.test.*
/** /**
* Tests that apply to all filtered list implementations. * Tests that apply to all filtered list implementations.
*/ */
interface SuperFilteredListCellTests : ObservableTestSuite { interface SuperFilteredListCellTests : CellTestSuite {
fun <E> createFilteredListCell(list: ListCell<E>, predicate: Cell<(E) -> Boolean>): ListCell<E> fun <E> createFilteredListCell(list: ListCell<E>, predicate: Cell<(E) -> Boolean>): ListCell<E>
@Test @Test
@ -172,12 +172,14 @@ interface SuperFilteredListCellTests : ObservableTestSuite {
val changes: MutableList<ListChange<Int>> = mutableListOf() val changes: MutableList<ListChange<Int>> = mutableListOf()
for (newElement in newElements) { for (newElement in newElements) {
changes.add(ListChange( changes.add(
ListChange(
index = elements.size, index = elements.size,
prevSize = elements.size, prevSize = elements.size,
removed = emptyList(), removed = emptyList(),
inserted = listOf(newElement), inserted = listOf(newElement),
)) )
)
elements.add(newElement) elements.add(newElement)
} }

4
observable/src/commonTest/kotlin/world/phantasmal/observable/test/ObservableTestSuite.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/test/CellTestSuite.kt
View File

@ -1,9 +1,9 @@
package world.phantasmal.observable.test package world.phantasmal.cell.test
import world.phantasmal.core.disposable.Disposer import world.phantasmal.core.disposable.Disposer
import world.phantasmal.testUtils.AbstractTestSuite import world.phantasmal.testUtils.AbstractTestSuite
import world.phantasmal.testUtils.TestContext import world.phantasmal.testUtils.TestContext
interface ObservableTestSuite : AbstractTestSuite<TestContext> { interface CellTestSuite : AbstractTestSuite<TestContext> {
override fun createContext(disposer: Disposer) = TestContext(disposer) override fun createContext(disposer: Disposer) = TestContext(disposer)
} }

4
observable/src/commonTest/kotlin/world/phantasmal/observable/test/Utils.kt → cell/src/commonTest/kotlin/world/phantasmal/cell/test/Utils.kt
View File

@ -1,6 +1,6 @@
package world.phantasmal.observable.test package world.phantasmal.cell.test
import world.phantasmal.observable.cell.list.ListCell import world.phantasmal.cell.list.ListCell
import kotlin.test.assertEquals import kotlin.test.assertEquals
fun <E> assertListCellEquals(expected: List<E>, actual: ListCell<E>) { fun <E> assertListCellEquals(expected: List<E>, actual: ListCell<E>) {

5
observable/src/commonMain/kotlin/world/phantasmal/observable/Emitter.kt
View File

@ -1,5 +0,0 @@
package world.phantasmal.observable
interface Emitter<T> : Observable<T> {
fun emit(event: ChangeEvent<T>)
}

19
observable/src/commonMain/kotlin/world/phantasmal/observable/Mutation.kt
View File

@ -1,19 +0,0 @@
package world.phantasmal.observable
/**
* Defer propagation of changes to observables until the end of a code block. All changes to
* observables in a single mutation won't be propagated to their dependencies until the mutation is
* completed.
*/
inline fun mutate(block: () -> Unit) {
MutationManager.mutate(block)
}
/**
* Schedule a mutation to run right after the current mutation finishes. You can use this to change
* observables in an observer callback. This is usually a bad idea, but sometimes the situation
* where you have to change observables in response to observables changing is very hard to avoid.
*/
fun mutateDeferred(block: () -> Unit) {
MutationManager.mutateDeferred(block)
}

10
observable/src/commonMain/kotlin/world/phantasmal/observable/Observable.kt
View File

@ -1,10 +0,0 @@
package world.phantasmal.observable
import world.phantasmal.core.disposable.Disposable
interface Observable<out T> : Dependency<T> {
/**
* [observer] will be called whenever this observable changes.
*/
fun observeChange(observer: ChangeObserver<T>): Disposable
}

8
observable/src/commonMain/kotlin/world/phantasmal/observable/ObservableUtils.kt
View File

@ -1,8 +0,0 @@
package world.phantasmal.observable
import world.phantasmal.core.disposable.Disposable
fun <T> emitter(): Emitter<T> = SimpleEmitter()
fun <T> Observable<T>.observe(observer: (T) -> Unit): Disposable =
observeChange { observer(it.value) }

19
observable/src/commonMain/kotlin/world/phantasmal/observable/SimpleEmitter.kt
View File

@ -1,19 +0,0 @@
package world.phantasmal.observable
import world.phantasmal.core.disposable.Disposable
// TODO: Should multiple events be emitted somehow during a change set? At the moment no application
// code seems to care.
class SimpleEmitter<T> : AbstractDependency<T>(), Emitter<T> {
override var changeEvent: ChangeEvent<T>? = null
private set
override fun emit(event: ChangeEvent<T>) {
applyChange {
this.changeEvent = event
}
}
override fun observeChange(observer: ChangeObserver<T>): Disposable =
CallbackChangeObserver(this, observer)
}

13
observable/src/commonMain/kotlin/world/phantasmal/observable/cell/Cell.kt
View File

@ -1,13 +0,0 @@
package world.phantasmal.observable.cell
import world.phantasmal.observable.Observable
import kotlin.reflect.KProperty
/**
* An observable with the notion of a current [value].
*/
interface Cell<out T> : Observable<T> {
val value: T
operator fun getValue(thisRef: Any?, property: KProperty<*>): T = value
}

62
observable/src/commonTest/kotlin/world/phantasmal/observable/ObservableTests.kt
View File

@ -1,62 +0,0 @@
package world.phantasmal.observable
import kotlin.test.Test
import kotlin.test.assertEquals
/**
* Test suite for all [Observable] implementations. There is a subclass of this suite for every
* [Observable] implementation.
*/
interface ObservableTests : DependencyTests {
override fun createProvider(): Provider
@Test
fun calls_observers_when_events_are_emitted() = test {
val p = createProvider()
var changes = 0
disposer.add(
p.observable.observeChange {
changes++
}
)
p.emit()
assertEquals(1, changes)
p.emit()
p.emit()
p.emit()
assertEquals(4, changes)
}
@Test
fun does_not_call_observers_after_they_are_disposed() = test {
val p = createProvider()
var changes = 0
val observer = p.observable.observeChange {
changes++
}
p.emit()
assertEquals(1, changes)
observer.dispose()
p.emit()
p.emit()
p.emit()
assertEquals(1, changes)
}
interface Provider : DependencyTests.Provider {
val observable: Observable<*>
override val dependency: Dependency<*> get() = observable
}
}

11
observable/src/commonTest/kotlin/world/phantasmal/observable/SimpleEmitterTests.kt
View File

@ -1,11 +0,0 @@
package world.phantasmal.observable
class SimpleEmitterTests : ObservableTests {
override fun createProvider() = object : ObservableTests.Provider {
override val observable = SimpleEmitter<Any>()
override fun emit() {
observable.emit(ChangeEvent(Any()))
}
}
}

17
observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ListCellCreationTests.kt
View File

@ -1,17 +0,0 @@
package world.phantasmal.observable.cell.list
import world.phantasmal.observable.cell.SimpleCell
import world.phantasmal.observable.test.ObservableTestSuite
import world.phantasmal.observable.test.assertListCellEquals
import kotlin.test.Test
class ListCellCreationTests : ObservableTestSuite {
@Test
fun test_flatMapToList() = test {
val cell = SimpleCell(SimpleListCell(mutableListOf(1, 2, 3, 4, 5)))
val mapped = cell.flatMapToList { it }
assertListCellEquals(listOf(1, 2, 3, 4, 5), mapped)
}
}

2
settings.gradle.kts
View File

@ -3,7 +3,7 @@ rootProject.name = "phantasmal-world"
include( include(
":core", ":core",
":psolib", ":psolib",
":observable", ":cell",
":psoserv", ":psoserv",
":test-utils", ":test-utils",
":web", ":web",

2
web/README.md
View File

@ -46,7 +46,7 @@ controller has no knowledge of the GUI layer.
### models ### models
The models package contains observable model objects. Models expose read-only observable properties The models package contains observable model objects. Models expose read-only cell properties
and allow their properties to be changed via setters which validate their inputs. and allow their properties to be changed via setters which validate their inputs.
### stores ### stores

2
web/src/main/kotlin/world/phantasmal/web/application/controllers/MainContentController.kt
View File

@ -1,6 +1,6 @@
package world.phantasmal.web.application.controllers package world.phantasmal.web.application.controllers
import world.phantasmal.observable.cell.Cell import world.phantasmal.cell.Cell
import world.phantasmal.web.core.PwToolType import world.phantasmal.web.core.PwToolType
import world.phantasmal.web.core.stores.UiStore import world.phantasmal.web.core.stores.UiStore
import world.phantasmal.webui.controllers.Controller import world.phantasmal.webui.controllers.Controller

4
web/src/main/kotlin/world/phantasmal/web/application/controllers/NavigationController.kt
View File

@ -4,8 +4,8 @@ import kotlinx.browser.window
import kotlinx.datetime.Clock import kotlinx.datetime.Clock
import kotlinx.datetime.TimeZone import kotlinx.datetime.TimeZone
import kotlinx.datetime.toLocalDateTime import kotlinx.datetime.toLocalDateTime
import world.phantasmal.observable.cell.Cell import world.phantasmal.cell.Cell
import world.phantasmal.observable.cell.mutableCell import world.phantasmal.cell.mutableCell
import world.phantasmal.web.core.PwToolType import world.phantasmal.web.core.PwToolType
import world.phantasmal.web.core.stores.UiStore import world.phantasmal.web.core.stores.UiStore
import world.phantasmal.webui.controllers.Controller import world.phantasmal.webui.controllers.Controller

6
web/src/main/kotlin/world/phantasmal/web/application/widgets/NavigationWidget.kt
View File

@ -1,9 +1,9 @@
package world.phantasmal.web.application.widgets package world.phantasmal.web.application.widgets
import org.w3c.dom.Node import org.w3c.dom.Node
import world.phantasmal.observable.cell.cell import world.phantasmal.cell.cell
import world.phantasmal.observable.cell.falseCell import world.phantasmal.cell.falseCell
import world.phantasmal.observable.cell.list.listCell import world.phantasmal.cell.list.listCell
import world.phantasmal.web.application.controllers.NavigationController import world.phantasmal.web.application.controllers.NavigationController
import world.phantasmal.web.core.dom.externalLink import world.phantasmal.web.core.dom.externalLink
import world.phantasmal.web.core.models.Server import world.phantasmal.web.core.models.Server

6
web/src/main/kotlin/world/phantasmal/web/application/widgets/PwToolButton.kt
View File

@ -1,9 +1,9 @@
package world.phantasmal.web.application.widgets package world.phantasmal.web.application.widgets
import org.w3c.dom.Node import org.w3c.dom.Node
import world.phantasmal.observable.cell.Cell import world.phantasmal.cell.Cell
import world.phantasmal.observable.cell.nullCell import world.phantasmal.cell.nullCell
import world.phantasmal.observable.cell.trueCell import world.phantasmal.cell.trueCell
import world.phantasmal.web.core.PwToolType import world.phantasmal.web.core.PwToolType
import world.phantasmal.webui.dom.input import world.phantasmal.webui.dom.input
import world.phantasmal.webui.dom.label import world.phantasmal.webui.dom.label

6
web/src/main/kotlin/world/phantasmal/web/core/controllers/PathAwareTabContainerController.kt
View File

@ -1,8 +1,8 @@
package world.phantasmal.web.core.controllers package world.phantasmal.web.core.controllers
import world.phantasmal.observable.cell.Cell import world.phantasmal.cell.Cell
import world.phantasmal.observable.cell.map import world.phantasmal.cell.map
import world.phantasmal.observable.mutateDeferred import world.phantasmal.cell.mutateDeferred
import world.phantasmal.web.core.PwToolType import world.phantasmal.web.core.PwToolType
import world.phantasmal.web.core.stores.UiStore import world.phantasmal.web.core.stores.UiStore
import world.phantasmal.webui.controllers.Tab import world.phantasmal.webui.controllers.Tab

19
web/src/main/kotlin/world/phantasmal/web/core/observable/Emitter.kt Normal file
View File

@ -0,0 +1,19 @@
package world.phantasmal.web.core.observable
import world.phantasmal.core.disposable.Disposable
import world.phantasmal.core.disposable.disposable
class Emitter<T> : Observable<T> {
private val observers: MutableList<(T) -> Unit> = mutableListOf()
fun emit(event: T) {
for (observer in observers) {
observer(event)
}
}
override fun observe(observer: (T) -> Unit): Disposable {
observers.add(observer)
return disposable { observers.remove(observer) }
}
}

10
web/src/main/kotlin/world/phantasmal/web/core/observable/Observable.kt Normal file
View File

@ -0,0 +1,10 @@
package world.phantasmal.web.core.observable
import world.phantasmal.core.disposable.Disposable
interface Observable<out T> {
/**
* [observer] will be called whenever this observable changes.
*/
fun observe(observer: (T) -> Unit): Disposable
}

3
web/src/main/kotlin/world/phantasmal/web/core/observable/ObservableUtils.kt Normal file
View File

@ -0,0 +1,3 @@
package world.phantasmal.web.core.observable
fun <T> emitter(): Emitter<T> = Emitter()

6
web/src/main/kotlin/world/phantasmal/web/core/stores/UiStore.kt
View File

@ -6,9 +6,9 @@ import org.w3c.dom.events.KeyboardEvent
import world.phantasmal.core.disposable.Disposable import world.phantasmal.core.disposable.Disposable
import world.phantasmal.core.disposable.TrackedDisposable import world.phantasmal.core.disposable.TrackedDisposable
import world.phantasmal.core.disposable.disposable import world.phantasmal.core.disposable.disposable
import world.phantasmal.observable.cell.Cell import world.phantasmal.cell.Cell
import world.phantasmal.observable.cell.eq import world.phantasmal.cell.eq
import world.phantasmal.observable.cell.mutableCell import world.phantasmal.cell.mutableCell
import world.phantasmal.web.core.PwToolType import world.phantasmal.web.core.PwToolType
import world.phantasmal.web.core.models.Server import world.phantasmal.web.core.models.Server
import world.phantasmal.webui.DisposableContainer import world.phantasmal.webui.DisposableContainer

2
web/src/main/kotlin/world/phantasmal/web/core/undo/Undo.kt
View File

@ -1,6 +1,6 @@
package world.phantasmal.web.core.undo package world.phantasmal.web.core.undo
import world.phantasmal.observable.cell.Cell import world.phantasmal.cell.Cell
import world.phantasmal.web.core.commands.Command import world.phantasmal.web.core.commands.Command
interface Undo { interface Undo {

13
web/src/main/kotlin/world/phantasmal/web/core/undo/UndoManager.kt
View File

@ -1,8 +1,15 @@
package world.phantasmal.web.core.undo package world.phantasmal.web.core.undo
import world.phantasmal.observable.cell.* import world.phantasmal.cell.Cell
import world.phantasmal.observable.cell.list.fold import world.phantasmal.cell.and
import world.phantasmal.observable.cell.list.mutableListCell import world.phantasmal.cell.falseCell
import world.phantasmal.cell.flatMap
import world.phantasmal.cell.flatten
import world.phantasmal.cell.list.fold
import world.phantasmal.cell.list.mutableListCell
import world.phantasmal.cell.mutableCell
import world.phantasmal.cell.nullCell
import world.phantasmal.cell.trueCell
import world.phantasmal.web.core.commands.Command import world.phantasmal.web.core.commands.Command
class UndoManager { class UndoManager {

8
web/src/main/kotlin/world/phantasmal/web/core/undo/UndoStack.kt
View File

@ -1,7 +1,11 @@
package world.phantasmal.web.core.undo package world.phantasmal.web.core.undo
import world.phantasmal.observable.cell.* import world.phantasmal.cell.Cell
import world.phantasmal.observable.cell.list.mutableListCell import world.phantasmal.cell.eq
import world.phantasmal.cell.gt
import world.phantasmal.cell.list.mutableListCell
import world.phantasmal.cell.map
import world.phantasmal.cell.mutableCell
import world.phantasmal.web.core.commands.Command import world.phantasmal.web.core.commands.Command
/** /**

4
web/src/main/kotlin/world/phantasmal/web/core/widgets/DockWidget.kt
View File

@ -3,8 +3,8 @@ package world.phantasmal.web.core.widgets
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import mu.KotlinLogging import mu.KotlinLogging
import org.w3c.dom.Node import org.w3c.dom.Node
import world.phantasmal.observable.cell.Cell import world.phantasmal.cell.Cell
import world.phantasmal.observable.cell.trueCell import world.phantasmal.cell.trueCell
import world.phantasmal.web.core.controllers.* import world.phantasmal.web.core.controllers.*
import world.phantasmal.web.externals.goldenLayout.GoldenLayout import world.phantasmal.web.externals.goldenLayout.GoldenLayout
import world.phantasmal.webui.dom.div import world.phantasmal.webui.dom.div

6
web/src/main/kotlin/world/phantasmal/web/core/widgets/UnavailableWidget.kt
View File

@ -1,9 +1,9 @@
package world.phantasmal.web.core.widgets package world.phantasmal.web.core.widgets
import org.w3c.dom.Node import org.w3c.dom.Node
import world.phantasmal.observable.cell.Cell import world.phantasmal.cell.Cell
import world.phantasmal.observable.cell.falseCell import world.phantasmal.cell.falseCell
import world.phantasmal.observable.cell.trueCell import world.phantasmal.cell.trueCell
import world.phantasmal.webui.dom.div import world.phantasmal.webui.dom.div
import world.phantasmal.webui.widgets.Label import world.phantasmal.webui.widgets.Label
import world.phantasmal.webui.widgets.Widget import world.phantasmal.webui.widgets.Widget

8
web/src/main/kotlin/world/phantasmal/web/huntOptimizer/controllers/MethodsForEpisodeController.kt
View File

@ -1,7 +1,11 @@
package world.phantasmal.web.huntOptimizer.controllers package world.phantasmal.web.huntOptimizer.controllers
import world.phantasmal.observable.cell.list.* import world.phantasmal.cell.mutableCell
import world.phantasmal.observable.cell.mutableCell import world.phantasmal.cell.list.ListCell
import world.phantasmal.cell.list.dependingOnElements
import world.phantasmal.cell.list.filtered
import world.phantasmal.cell.list.listCell
import world.phantasmal.cell.list.mapToList
import world.phantasmal.psolib.Episode import world.phantasmal.psolib.Episode
import world.phantasmal.psolib.fileFormats.quest.NpcType import world.phantasmal.psolib.fileFormats.quest.NpcType
import world.phantasmal.web.huntOptimizer.models.HuntMethodModel import world.phantasmal.web.huntOptimizer.models.HuntMethodModel

6
web/src/main/kotlin/world/phantasmal/web/huntOptimizer/controllers/OptimizationResultController.kt
View File

@ -1,8 +1,8 @@
package world.phantasmal.web.huntOptimizer.controllers package world.phantasmal.web.huntOptimizer.controllers
import world.phantasmal.observable.cell.cell import world.phantasmal.cell.cell
import world.phantasmal.observable.cell.list.ListCell import world.phantasmal.cell.list.ListCell
import world.phantasmal.observable.cell.list.mapToList import world.phantasmal.cell.list.mapToList
import world.phantasmal.web.huntOptimizer.models.OptimalMethodModel import world.phantasmal.web.huntOptimizer.models.OptimalMethodModel
import world.phantasmal.web.huntOptimizer.stores.HuntOptimizerStore import world.phantasmal.web.huntOptimizer.stores.HuntOptimizerStore
import world.phantasmal.webui.controllers.Column import world.phantasmal.webui.controllers.Column

10
web/src/main/kotlin/world/phantasmal/web/huntOptimizer/controllers/WantedItemsController.kt
View File

@ -1,10 +1,10 @@
package world.phantasmal.web.huntOptimizer.controllers package world.phantasmal.web.huntOptimizer.controllers
import world.phantasmal.observable.cell.Cell import world.phantasmal.cell.Cell
import world.phantasmal.observable.cell.MutableCell import world.phantasmal.cell.MutableCell
import world.phantasmal.observable.cell.list.ListCell import world.phantasmal.cell.list.ListCell
import world.phantasmal.observable.cell.list.filtered import world.phantasmal.cell.list.filtered
import world.phantasmal.observable.cell.mutableCell import world.phantasmal.cell.mutableCell
import world.phantasmal.web.huntOptimizer.models.WantedItemModel import world.phantasmal.web.huntOptimizer.models.WantedItemModel
import world.phantasmal.web.huntOptimizer.stores.HuntOptimizerStore import world.phantasmal.web.huntOptimizer.stores.HuntOptimizerStore
import world.phantasmal.web.shared.dto.ItemType import world.phantasmal.web.shared.dto.ItemType

6
web/src/main/kotlin/world/phantasmal/web/huntOptimizer/models/HuntMethodModel.kt
View File

@ -2,9 +2,9 @@ package world.phantasmal.web.huntOptimizer.models
import world.phantasmal.psolib.Episode import world.phantasmal.psolib.Episode
import world.phantasmal.psolib.fileFormats.quest.NpcType import world.phantasmal.psolib.fileFormats.quest.NpcType
import world.phantasmal.observable.cell.Cell import world.phantasmal.cell.Cell
import world.phantasmal.observable.cell.mutableCell import world.phantasmal.cell.mutableCell
import world.phantasmal.observable.cell.orElse import world.phantasmal.cell.orElse
import kotlin.time.Duration import kotlin.time.Duration
class HuntMethodModel( class HuntMethodModel(

Some files were not shown because too many files have changed in this diff Show More