From 82524f1f2dcc23ead5f9024008205131537203c3 Mon Sep 17 00:00:00 2001 From: Daan Vanden Bosch Date: Sat, 4 Jun 2022 21:33:29 +0200 Subject: [PATCH] Removed Observable from observable project and renamed observable project to cell. Cell is now the most basic interface for users. --- README.md | 4 +- {observable => cell}/build.gradle.kts | 0 .../world/phantasmal}/cell/AbstractCell.kt | 5 +- .../phantasmal/cell}/AbstractDependency.kt | 2 +- .../phantasmal}/cell/AbstractDependentCell.kt | 4 +- .../cell/AbstractFlatteningDependentCell.kt | 8 +- .../cell}/CallbackChangeObserver.kt | 4 +- .../phantasmal/cell}/CallbackObserver.kt | 6 +- .../kotlin/world/phantasmal/cell/Cell.kt | 18 ++++ .../world/phantasmal}/cell/CellUtils.kt | 16 ++-- .../world/phantasmal/cell}/ChangeObserver.kt | 4 +- .../world/phantasmal}/cell/DelegatingCell.kt | 4 +- .../world/phantasmal/cell}/Dependency.kt | 4 +- .../world/phantasmal/cell}/Dependent.kt | 2 +- .../world/phantasmal}/cell/DependentCell.kt | 9 +- .../cell/FlatteningDependentCell.kt | 7 +- .../world/phantasmal}/cell/ImmutableCell.kt | 6 +- .../world/phantasmal}/cell/MutableCell.kt | 2 +- .../kotlin/world/phantasmal/cell/Mutation.kt | 18 ++++ .../world/phantasmal/cell}/MutationManager.kt | 4 +- .../world/phantasmal}/cell/SimpleCell.kt | 4 +- .../list/AbstractElementsWrappingListCell.kt | 2 +- .../cell/list/AbstractFilteredListCell.kt | 6 +- .../phantasmal}/cell/list/AbstractListCell.kt | 12 +-- .../phantasmal}/cell/list/DelegatingList.kt | 2 +- .../cell/list/DependentListCell.kt | 26 +++--- .../phantasmal}/cell/list/FilteredListCell.kt | 38 ++++---- .../cell/list/FlatteningDependentListCell.kt | 29 ++++--- .../cell/list/ImmutableListCell.kt | 16 ++-- .../world/phantasmal}/cell/list/ListCell.kt | 4 +- .../phantasmal}/cell/list/ListCellUtils.kt | 16 ++-- .../cell/list/ListChangeObserver.kt | 4 +- .../cell/list/ListElementsDependentCell.kt | 22 ++--- .../phantasmal}/cell/list/MutableListCell.kt | 4 +- .../cell/list/SimpleFilteredListCell.kt | 6 +- .../phantasmal}/cell/list/SimpleListCell.kt | 2 +- .../phantasmal}/cell/CellCreationTests.kt | 6 +- .../world/phantasmal}/cell/CellTests.kt | 86 +++++++++++++++---- .../cell/CellWithDependenciesTests.kt | 5 +- .../world/phantasmal}/cell/ChangeTests.kt | 7 +- .../phantasmal}/cell/DelegatingCellTests.kt | 7 +- .../world/phantasmal/cell}/DependencyTests.kt | 6 +- .../phantasmal}/cell/DependentCellTests.kt | 5 +- .../DependentCellWithSimpleListCellTests.kt | 7 +- ...lDirectAndTransitiveDependencyEmitTests.kt | 5 +- ...DependentCellDirectDependencyEmitsTests.kt | 5 +- ...ndentCellTransitiveDependencyEmitsTests.kt | 5 +- .../phantasmal}/cell/ImmutableCellTests.kt | 6 +- .../phantasmal}/cell/MutableCellTests.kt | 15 ++-- .../world/phantasmal/cell}/MutationTests.kt | 7 +- .../phantasmal}/cell/RegularCellTests.kt | 2 +- .../world/phantasmal}/cell/SimpleCellTests.kt | 9 +- .../cell/list/DependentListCellTests.kt | 9 +- ...ilteredListCellListDependencyEmitsTests.kt | 10 ++- .../cell/list/FilteredListCellTests.kt | 9 +- ...ndentListCellDirectDependencyEmitsTests.kt | 7 +- ...tListCellTransitiveDependencyEmitsTests.kt | 13 +-- .../cell/list/ImmutableListCellTests.kt | 8 +- .../cell/list/ListCellCreationTests.kt | 17 ++++ .../phantasmal}/cell/list/ListCellTests.kt | 34 ++++---- ...tElementsDependentCellElementEmitsTests.kt | 11 ++- ...ElementsDependentCellListCellEmitsTests.kt | 10 +-- .../list/ListElementsDependentCellTests.kt | 10 +-- .../cell/list/MutableListCellTests.kt | 32 +++---- ...ilteredListCellListDependencyEmitsTests.kt | 11 +-- ...edListCellPredicateDependencyEmitsTests.kt | 13 +-- .../cell/list/SimpleFilteredListCellTests.kt | 5 +- .../cell/list/SimpleListCellTests.kt | 8 +- .../cell/list/SuperFilteredListCellTests.kt | 18 ++-- .../phantasmal/cell/test/CellTestSuite.kt | 4 +- .../world/phantasmal/cell}/test/Utils.kt | 4 +- .../world/phantasmal/observable/Emitter.kt | 5 -- .../world/phantasmal/observable/Mutation.kt | 19 ---- .../world/phantasmal/observable/Observable.kt | 10 --- .../phantasmal/observable/ObservableUtils.kt | 8 -- .../phantasmal/observable/SimpleEmitter.kt | 19 ---- .../world/phantasmal/observable/cell/Cell.kt | 13 --- .../phantasmal/observable/ObservableTests.kt | 62 ------------- .../observable/SimpleEmitterTests.kt | 11 --- .../cell/list/ListCellCreationTests.kt | 17 ---- settings.gradle.kts | 2 +- web/README.md | 2 +- .../controllers/MainContentController.kt | 2 +- .../controllers/NavigationController.kt | 4 +- .../application/widgets/NavigationWidget.kt | 6 +- .../web/application/widgets/PwToolButton.kt | 6 +- .../PathAwareTabContainerController.kt | 6 +- .../phantasmal/web/core/observable/Emitter.kt | 19 ++++ .../web/core/observable/Observable.kt | 10 +++ .../web/core/observable/ObservableUtils.kt | 3 + .../phantasmal/web/core/stores/UiStore.kt | 6 +- .../world/phantasmal/web/core/undo/Undo.kt | 2 +- .../phantasmal/web/core/undo/UndoManager.kt | 13 ++- .../phantasmal/web/core/undo/UndoStack.kt | 8 +- .../phantasmal/web/core/widgets/DockWidget.kt | 4 +- .../web/core/widgets/UnavailableWidget.kt | 6 +- .../MethodsForEpisodeController.kt | 8 +- .../OptimizationResultController.kt | 6 +- .../controllers/WantedItemsController.kt | 10 +-- .../huntOptimizer/models/HuntMethodModel.kt | 6 +- .../huntOptimizer/models/WantedItemModel.kt | 4 +- .../huntOptimizer/stores/HuntMethodStore.kt | 4 +- .../stores/HuntOptimizerStore.kt | 12 +-- .../phantasmal/web/questEditor/QuestRunner.kt | 4 +- .../web/questEditor/asm/AsmAnalyser.kt | 30 +++++-- .../controllers/AsmEditorController.kt | 9 +- .../controllers/EntityInfoController.kt | 15 ++-- .../controllers/EntityListController.kt | 4 +- .../controllers/EventsController.kt | 10 ++- .../controllers/NpcCountsController.kt | 10 +-- .../QuestEditorToolbarController.kt | 9 +- .../controllers/QuestInfoController.kt | 7 +- .../questEditor/models/AreaVariantModel.kt | 4 +- .../questEditor/models/QuestEntityModel.kt | 10 +-- .../models/QuestEntityPropModel.kt | 6 +- .../models/QuestEventActionModel.kt | 4 +- .../web/questEditor/models/QuestEventModel.kt | 10 +-- .../web/questEditor/models/QuestModel.kt | 14 +-- .../web/questEditor/models/QuestNpcModel.kt | 6 +- .../questEditor/models/QuestObjectModel.kt | 4 +- .../rendering/EntityMeshManager.kt | 2 +- .../rendering/QuestEditorMeshManager.kt | 12 +-- .../questEditor/rendering/QuestMeshManager.kt | 4 +- .../rendering/input/state/StateContext.kt | 4 +- .../web/questEditor/stores/AsmStore.kt | 10 +-- .../questEditor/stores/QuestEditorStore.kt | 18 ++-- .../web/questEditor/undo/TextModelUndo.kt | 18 ++-- .../questEditor/widgets/AsmEditorWidget.kt | 13 +-- .../questEditor/widgets/EntityInfoWidget.kt | 6 +- .../questEditor/widgets/EventActionWidget.kt | 2 +- .../web/questEditor/widgets/EventWidget.kt | 2 +- .../web/questEditor/widgets/EventsWidget.kt | 2 +- .../widgets/QuestEditorToolbarWidget.kt | 4 +- .../CharacterClassOptionsController.kt | 8 +- .../viewer/controllers/ViewerController.kt | 2 +- .../controllers/ViewerToolbarController.kt | 10 +-- .../web/viewer/stores/ViewerStore.kt | 14 +-- .../widgets/CharacterClassOptionsWidget.kt | 2 +- .../web/viewer/widgets/SelectionWidget.kt | 4 +- .../web/core/observable/EmitterTests.kt | 53 ++++++++++++ webui/build.gradle.kts | 2 +- .../phantasmal/webui/DisposableContainer.kt | 19 ++-- .../phantasmal/webui/LoadingStatusCell.kt | 4 +- .../controllers/TabContainerController.kt | 2 +- .../webui/controllers/TableController.kt | 6 +- .../kotlin/world/phantasmal/webui/dom/Dom.kt | 6 +- .../webui/dom/HTMLElementSizeCell.kt | 6 +- .../world/phantasmal/webui/widgets/Button.kt | 6 +- .../phantasmal/webui/widgets/Checkbox.kt | 6 +- .../phantasmal/webui/widgets/ComboBox.kt | 8 +- .../world/phantasmal/webui/widgets/Control.kt | 2 +- .../world/phantasmal/webui/widgets/Dialog.kt | 8 +- .../phantasmal/webui/widgets/DoubleInput.kt | 8 +- .../phantasmal/webui/widgets/DropDown.kt | 10 +-- .../phantasmal/webui/widgets/DurationInput.kt | 6 +- .../phantasmal/webui/widgets/FileButton.kt | 6 +- .../world/phantasmal/webui/widgets/Input.kt | 2 +- .../phantasmal/webui/widgets/IntInput.kt | 8 +- .../world/phantasmal/webui/widgets/Label.kt | 4 +- .../webui/widgets/LabelledControl.kt | 2 +- .../phantasmal/webui/widgets/LazyLoader.kt | 6 +- .../world/phantasmal/webui/widgets/Menu.kt | 8 +- .../phantasmal/webui/widgets/NumberInput.kt | 2 +- .../phantasmal/webui/widgets/ResultDialog.kt | 6 +- .../world/phantasmal/webui/widgets/Select.kt | 8 +- .../phantasmal/webui/widgets/TabContainer.kt | 6 +- .../world/phantasmal/webui/widgets/Table.kt | 6 +- .../phantasmal/webui/widgets/TextArea.kt | 8 +- .../phantasmal/webui/widgets/TextInput.kt | 8 +- .../world/phantasmal/webui/widgets/Toolbar.kt | 4 +- .../world/phantasmal/webui/widgets/Widget.kt | 6 +- .../phantasmal/webui/widgets/WidgetTests.kt | 10 +-- 172 files changed, 846 insertions(+), 748 deletions(-) rename {observable => cell}/build.gradle.kts (100%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/AbstractCell.kt (59%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal/cell}/AbstractDependency.kt (95%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/AbstractDependentCell.kt (82%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/AbstractFlatteningDependentCell.kt (92%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal/cell}/CallbackChangeObserver.kt (92%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal/cell}/CallbackObserver.kt (84%) create mode 100644 cell/src/commonMain/kotlin/world/phantasmal/cell/Cell.kt rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/CellUtils.kt (96%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal/cell}/ChangeObserver.kt (66%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/DelegatingCell.kt (85%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal/cell}/Dependency.kt (83%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal/cell}/Dependent.kt (96%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/DependentCell.kt (85%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/FlatteningDependentCell.kt (66%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/ImmutableCell.kt (74%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/MutableCell.kt (83%) create mode 100644 cell/src/commonMain/kotlin/world/phantasmal/cell/Mutation.kt rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal/cell}/MutationManager.kt (95%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/SimpleCell.kt (81%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/list/AbstractElementsWrappingListCell.kt (96%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/list/AbstractFilteredListCell.kt (98%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/list/AbstractListCell.kt (81%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/list/DelegatingList.kt (96%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/list/DependentListCell.kt (73%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/list/FilteredListCell.kt (87%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/list/FlatteningDependentListCell.kt (75%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/list/ImmutableListCell.kt (75%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/list/ListCell.kt (86%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/list/ListCellUtils.kt (85%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/list/ListChangeObserver.kt (88%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/list/ListElementsDependentCell.kt (87%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/list/MutableListCell.kt (82%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/list/SimpleFilteredListCell.kt (94%) rename {observable/src/commonMain/kotlin/world/phantasmal/observable => cell/src/commonMain/kotlin/world/phantasmal}/cell/list/SimpleListCell.kt (99%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/CellCreationTests.kt (84%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/CellTests.kt (69%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/CellWithDependenciesTests.kt (93%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/ChangeTests.kt (83%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/DelegatingCellTests.kt (74%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal/cell}/DependencyTests.kt (85%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/DependentCellTests.kt (84%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/DependentCellWithSimpleListCellTests.kt (62%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/FlatteningDependentCellDirectAndTransitiveDependencyEmitTests.kt (78%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/FlatteningDependentCellDirectDependencyEmitsTests.kt (92%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/FlatteningDependentCellTransitiveDependencyEmitsTests.kt (94%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/ImmutableCellTests.kt (82%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/MutableCellTests.kt (91%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal/cell}/MutationTests.kt (72%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/RegularCellTests.kt (99%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/SimpleCellTests.kt (58%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/list/DependentListCellTests.kt (81%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/list/FilteredListCellListDependencyEmitsTests.kt (80%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/list/FilteredListCellTests.kt (74%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/list/FlatteningDependentListCellDirectDependencyEmitsTests.kt (87%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/list/FlatteningDependentListCellTransitiveDependencyEmitsTests.kt (81%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/list/ImmutableListCellTests.kt (78%) create mode 100644 cell/src/commonTest/kotlin/world/phantasmal/cell/list/ListCellCreationTests.kt rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/list/ListCellTests.kt (84%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/list/ListElementsDependentCellElementEmitsTests.kt (82%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/list/ListElementsDependentCellListCellEmitsTests.kt (76%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/list/ListElementsDependentCellTests.kt (82%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/list/MutableListCellTests.kt (72%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/list/SimpleFilteredListCellListDependencyEmitsTests.kt (79%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/list/SimpleFilteredListCellPredicateDependencyEmitsTests.kt (78%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/list/SimpleFilteredListCellTests.kt (78%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/list/SimpleListCellTests.kt (94%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal}/cell/list/SuperFilteredListCellTests.kt (95%) rename observable/src/commonTest/kotlin/world/phantasmal/observable/test/ObservableTestSuite.kt => cell/src/commonTest/kotlin/world/phantasmal/cell/test/CellTestSuite.kt (68%) rename {observable/src/commonTest/kotlin/world/phantasmal/observable => cell/src/commonTest/kotlin/world/phantasmal/cell}/test/Utils.kt (67%) delete mode 100644 observable/src/commonMain/kotlin/world/phantasmal/observable/Emitter.kt delete mode 100644 observable/src/commonMain/kotlin/world/phantasmal/observable/Mutation.kt delete mode 100644 observable/src/commonMain/kotlin/world/phantasmal/observable/Observable.kt delete mode 100644 observable/src/commonMain/kotlin/world/phantasmal/observable/ObservableUtils.kt delete mode 100644 observable/src/commonMain/kotlin/world/phantasmal/observable/SimpleEmitter.kt delete mode 100644 observable/src/commonMain/kotlin/world/phantasmal/observable/cell/Cell.kt delete mode 100644 observable/src/commonTest/kotlin/world/phantasmal/observable/ObservableTests.kt delete mode 100644 observable/src/commonTest/kotlin/world/phantasmal/observable/SimpleEmitterTests.kt delete mode 100644 observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ListCellCreationTests.kt create mode 100644 web/src/main/kotlin/world/phantasmal/web/core/observable/Emitter.kt create mode 100644 web/src/main/kotlin/world/phantasmal/web/core/observable/Observable.kt create mode 100644 web/src/main/kotlin/world/phantasmal/web/core/observable/ObservableUtils.kt create mode 100644 web/src/test/kotlin/world/phantasmal/web/core/observable/EmitterTests.kt diff --git a/README.md b/README.md index f53d4a3c..b8d1c96f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Phantasmal World 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). ## 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 projects. -#### observable +#### cell A full-fledged multiplatform implementation of the observer pattern. diff --git a/observable/build.gradle.kts b/cell/build.gradle.kts similarity index 100% rename from observable/build.gradle.kts rename to cell/build.gradle.kts diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/AbstractCell.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/AbstractCell.kt similarity index 59% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/AbstractCell.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/AbstractCell.kt index fd33c234..f53b4df1 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/AbstractCell.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/AbstractCell.kt @@ -1,9 +1,6 @@ -package world.phantasmal.observable.cell +package world.phantasmal.cell import world.phantasmal.core.disposable.Disposable -import world.phantasmal.observable.AbstractDependency -import world.phantasmal.observable.CallbackChangeObserver -import world.phantasmal.observable.ChangeObserver abstract class AbstractCell : AbstractDependency(), Cell { override fun observeChange(observer: ChangeObserver): Disposable = diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/AbstractDependency.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/AbstractDependency.kt similarity index 95% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/AbstractDependency.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/AbstractDependency.kt index 2d0752e0..5200cc15 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/AbstractDependency.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/AbstractDependency.kt @@ -1,4 +1,4 @@ -package world.phantasmal.observable +package world.phantasmal.cell import kotlin.contracts.InvocationKind import kotlin.contracts.contract diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/AbstractDependentCell.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/AbstractDependentCell.kt similarity index 82% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/AbstractDependentCell.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/AbstractDependentCell.kt index 5a556f3c..6b3a42f5 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/AbstractDependentCell.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/AbstractDependentCell.kt @@ -1,8 +1,6 @@ -package world.phantasmal.observable.cell +package world.phantasmal.cell import world.phantasmal.core.unsafe.unsafeCast -import world.phantasmal.observable.ChangeEvent -import world.phantasmal.observable.Dependent abstract class AbstractDependentCell> : AbstractCell(), Dependent { diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/AbstractFlatteningDependentCell.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/AbstractFlatteningDependentCell.kt similarity index 92% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/AbstractFlatteningDependentCell.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/AbstractFlatteningDependentCell.kt index d8bf7232..521ce691 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/AbstractFlatteningDependentCell.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/AbstractFlatteningDependentCell.kt @@ -1,13 +1,9 @@ -package world.phantasmal.observable.cell +package world.phantasmal.cell 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, Event : ChangeEvent>( - private val dependencies: Array>, + private val dependencies: Array>, private val compute: () -> ComputedCell, ) : AbstractDependentCell() { diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/CallbackChangeObserver.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/CallbackChangeObserver.kt similarity index 92% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/CallbackChangeObserver.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/CallbackChangeObserver.kt index 89fe58e2..cd1b34ff 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/CallbackChangeObserver.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/CallbackChangeObserver.kt @@ -1,4 +1,4 @@ -package world.phantasmal.observable +package world.phantasmal.cell import world.phantasmal.core.disposable.TrackedDisposable import world.phantasmal.core.unsafe.unsafeCast @@ -7,7 +7,7 @@ import world.phantasmal.core.unsafe.unsafeCast * Calls [callback] when [dependency] changes. */ class CallbackChangeObserver>( - private val dependency: Observable, + private val dependency: Cell, // We don't use ChangeObserver because of type system limitations. It would break e.g. // AbstractListCell.observeListChange. private val callback: (E) -> Unit, diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/CallbackObserver.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/CallbackObserver.kt similarity index 84% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/CallbackObserver.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/CallbackObserver.kt index 5c818dbc..a2a403c1 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/CallbackObserver.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/CallbackObserver.kt @@ -1,12 +1,12 @@ -package world.phantasmal.observable +package world.phantasmal.cell 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( - private vararg val dependencies: Observable<*>, + private vararg val dependencies: Cell<*>, private val callback: () -> Unit, ) : TrackedDisposable(), Dependent, LeafDependent { diff --git a/cell/src/commonMain/kotlin/world/phantasmal/cell/Cell.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/Cell.kt new file mode 100644 index 00000000..2f42b2a9 --- /dev/null +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/Cell.kt @@ -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 : Dependency { + val value: T + + operator fun getValue(thisRef: Any?, property: KProperty<*>): T = value + + /** + * [observer] will be called whenever this cell changes. + */ + fun observeChange(observer: ChangeObserver): Disposable +} diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/CellUtils.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/CellUtils.kt similarity index 96% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/CellUtils.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/CellUtils.kt index e2b44e77..66aea72b 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/CellUtils.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/CellUtils.kt @@ -1,7 +1,6 @@ -package world.phantasmal.observable.cell +package world.phantasmal.cell import world.phantasmal.core.disposable.Disposable -import world.phantasmal.observable.CallbackObserver private val TRUE_CELL: Cell = ImmutableCell(true) private val FALSE_CELL: Cell = ImmutableCell(false) @@ -39,11 +38,14 @@ fun mutableCell(value: T): MutableCell = SimpleCell(value) fun mutableCell(getter: () -> T, setter: (T) -> Unit): MutableCell = DelegatingCell(getter, setter) +fun Cell.observe(observer: (T) -> Unit): Disposable = + observeChange { observer(it.value) } + fun Cell.observeNow( observer: (T) -> Unit, ): Disposable { 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) return disposable } @@ -54,7 +56,7 @@ fun observeNow( observer: (T1, T2) -> Unit, ): Disposable { 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) return disposable } @@ -66,7 +68,7 @@ fun observeNow( observer: (T1, T2, T3) -> Unit, ): Disposable { 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) return disposable } @@ -80,7 +82,7 @@ fun observeNow( ): Disposable { val disposable = 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) return disposable } @@ -96,7 +98,7 @@ fun observeNow( val disposable = CallbackObserver(c1, c2, c3, c4, c5) { 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) return disposable } diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/ChangeObserver.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/ChangeObserver.kt similarity index 66% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/ChangeObserver.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/ChangeObserver.kt index fdfae8f3..853206f4 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/ChangeObserver.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/ChangeObserver.kt @@ -1,9 +1,9 @@ -package world.phantasmal.observable +package world.phantasmal.cell typealias ChangeObserver = (ChangeEvent) -> Unit open class ChangeEvent( - /** The observable's new value. */ + /** The cell's new value. */ val value: T, ) { operator fun component1() = value diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/DelegatingCell.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/DelegatingCell.kt similarity index 85% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/DelegatingCell.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/DelegatingCell.kt index 55294903..8f149af3 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/DelegatingCell.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/DelegatingCell.kt @@ -1,6 +1,4 @@ -package world.phantasmal.observable.cell - -import world.phantasmal.observable.ChangeEvent +package world.phantasmal.cell class DelegatingCell( private val getter: () -> T, diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/Dependency.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/Dependency.kt similarity index 83% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/Dependency.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/Dependency.kt index 16bdb41a..280c9463 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/Dependency.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/Dependency.kt @@ -1,4 +1,4 @@ -package world.phantasmal.observable +package world.phantasmal.cell interface Dependency { // TODO: Docs. @@ -6,7 +6,7 @@ interface Dependency { /** * 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) diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/Dependent.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/Dependent.kt similarity index 96% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/Dependent.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/Dependent.kt index 93367110..ae2f4e96 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/Dependent.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/Dependent.kt @@ -1,4 +1,4 @@ -package world.phantasmal.observable +package world.phantasmal.cell interface Dependent { /** diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/DependentCell.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/DependentCell.kt similarity index 85% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/DependentCell.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/DependentCell.kt index e525bd4d..202f2f4a 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/DependentCell.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/DependentCell.kt @@ -1,15 +1,10 @@ -package world.phantasmal.observable.cell - -import world.phantasmal.observable.ChangeEvent -import world.phantasmal.observable.Dependency -import world.phantasmal.observable.Dependent -import world.phantasmal.observable.Observable +package world.phantasmal.cell /** * Cell of which the value depends on 0 or more dependencies. */ class DependentCell( - private vararg val dependencies: Observable<*>, + private vararg val dependencies: Cell<*>, private val compute: () -> T, ) : AbstractDependentCell>() { diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/FlatteningDependentCell.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/FlatteningDependentCell.kt similarity index 66% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/FlatteningDependentCell.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/FlatteningDependentCell.kt index 37a3cd15..e57bd635 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/FlatteningDependentCell.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/FlatteningDependentCell.kt @@ -1,13 +1,10 @@ -package world.phantasmal.observable.cell - -import world.phantasmal.observable.ChangeEvent -import world.phantasmal.observable.Observable +package world.phantasmal.cell /** * Similar to [DependentCell], except that this cell's [compute] returns a cell. */ class FlatteningDependentCell( - vararg dependencies: Observable<*>, + vararg dependencies: Cell<*>, compute: () -> Cell, ) : AbstractFlatteningDependentCell, ChangeEvent>(dependencies, compute) { diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/ImmutableCell.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/ImmutableCell.kt similarity index 74% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/ImmutableCell.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/ImmutableCell.kt index c16193af..7dbe8031 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/ImmutableCell.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/ImmutableCell.kt @@ -1,11 +1,7 @@ -package world.phantasmal.observable.cell +package world.phantasmal.cell import world.phantasmal.core.disposable.Disposable 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(override val value: T) : Dependency, Cell { override val changeEvent: ChangeEvent? get() = null diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/MutableCell.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/MutableCell.kt similarity index 83% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/MutableCell.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/MutableCell.kt index 87a75c55..8a387a8c 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/MutableCell.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/MutableCell.kt @@ -1,4 +1,4 @@ -package world.phantasmal.observable.cell +package world.phantasmal.cell import kotlin.reflect.KProperty diff --git a/cell/src/commonMain/kotlin/world/phantasmal/cell/Mutation.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/Mutation.kt new file mode 100644 index 00000000..7ec8085d --- /dev/null +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/Mutation.kt @@ -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) +} diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/MutationManager.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/MutationManager.kt similarity index 95% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/MutationManager.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/MutationManager.kt index 1fa503d9..8ead737d 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/MutationManager.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/MutationManager.kt @@ -1,4 +1,4 @@ -package world.phantasmal.observable +package world.phantasmal.cell import kotlin.contracts.InvocationKind.EXACTLY_ONCE import kotlin.contracts.contract @@ -53,7 +53,7 @@ object MutationManager { } fun dependencyStartedChanging() { - check(!dependencyChanging) { "An observable is already changing." } + check(!dependencyChanging) { "A cell is already changing." } dependencyChanging = true } diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/SimpleCell.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/SimpleCell.kt similarity index 81% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/SimpleCell.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/SimpleCell.kt index 8df608ca..4a9229bd 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/SimpleCell.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/SimpleCell.kt @@ -1,6 +1,4 @@ -package world.phantasmal.observable.cell - -import world.phantasmal.observable.ChangeEvent +package world.phantasmal.cell class SimpleCell(value: T) : AbstractCell(), MutableCell { override var value: T = value diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/AbstractElementsWrappingListCell.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/AbstractElementsWrappingListCell.kt similarity index 96% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/AbstractElementsWrappingListCell.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/list/AbstractElementsWrappingListCell.kt index b8f36be1..6dc49b18 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/AbstractElementsWrappingListCell.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/AbstractElementsWrappingListCell.kt @@ -1,4 +1,4 @@ -package world.phantasmal.observable.cell.list +package world.phantasmal.cell.list import world.phantasmal.core.unsafe.unsafeAssertNotNull diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/AbstractFilteredListCell.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/AbstractFilteredListCell.kt similarity index 98% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/AbstractFilteredListCell.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/list/AbstractFilteredListCell.kt index 4ac511d0..6e7544f5 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/AbstractFilteredListCell.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/AbstractFilteredListCell.kt @@ -1,7 +1,7 @@ -package world.phantasmal.observable.cell.list +package world.phantasmal.cell.list -import world.phantasmal.observable.Dependency -import world.phantasmal.observable.Dependent +import world.phantasmal.cell.Dependency +import world.phantasmal.cell.Dependent abstract class AbstractFilteredListCell( protected val list: ListCell, diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/AbstractListCell.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/AbstractListCell.kt similarity index 81% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/AbstractListCell.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/list/AbstractListCell.kt index 89f4e3c2..1c64f58a 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/AbstractListCell.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/AbstractListCell.kt @@ -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.unsafe.unsafeAssertNotNull -import world.phantasmal.observable.CallbackChangeObserver -import world.phantasmal.observable.ChangeObserver -import world.phantasmal.observable.cell.AbstractCell -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.DependentCell +import world.phantasmal.cell.CallbackChangeObserver +import world.phantasmal.cell.ChangeObserver +import world.phantasmal.cell.AbstractCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.DependentCell abstract class AbstractListCell : AbstractCell>(), ListCell { diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/DelegatingList.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/DelegatingList.kt similarity index 96% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/DelegatingList.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/list/DelegatingList.kt index 0aa7c136..3545b740 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/DelegatingList.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/DelegatingList.kt @@ -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]. diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/DependentListCell.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/DependentListCell.kt similarity index 73% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/DependentListCell.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/list/DependentListCell.kt index dd76b7d3..a9afd97a 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/DependentListCell.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/DependentListCell.kt @@ -1,14 +1,14 @@ -package world.phantasmal.observable.cell.list +package world.phantasmal.cell.list -import world.phantasmal.observable.Dependency -import world.phantasmal.observable.Dependent -import world.phantasmal.observable.Observable +import world.phantasmal.cell.Dependency +import world.phantasmal.cell.Dependent +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( - private vararg val dependencies: Observable<*>, + private vararg val dependencies: Cell<*>, private val computeElements: () -> List, ) : AbstractListCell(), Dependent { @@ -35,12 +35,14 @@ class DependentListCell( _value = newElements changeEvent = ListChangeEvent( newElements, - listOf(ListChange( - index = 0, - prevSize = oldElements.size, - removed = oldElements, - inserted = newElements, - )), + listOf( + ListChange( + index = 0, + prevSize = oldElements.size, + removed = oldElements, + inserted = newElements, + ) + ), ) valid = dependents.isNotEmpty() } diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/FilteredListCell.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/FilteredListCell.kt similarity index 87% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/FilteredListCell.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/list/FilteredListCell.kt index 678eb69e..9df03a6d 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/FilteredListCell.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/FilteredListCell.kt @@ -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.assertUnreachable 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( list: ListCell, @@ -81,24 +81,28 @@ class FilteredListCell( mapping.index = insertionIndex shift++ - filteredChanges.add(ListChange( - insertionIndex, - prevSize, - removed = emptyList(), - inserted = listOf(element), - )) + filteredChanges.add( + ListChange( + insertionIndex, + prevSize, + removed = emptyList(), + inserted = listOf(element), + ) + ) } else { val index = mapping.index + shift val element = elements.removeAt(index) mapping.index = -1 shift-- - filteredChanges.add(ListChange( - index, - prevSize, - removed = listOf(element), - inserted = emptyList(), - )) + filteredChanges.add( + ListChange( + index, + prevSize, + removed = listOf(element), + inserted = emptyList(), + ) + ) } } else if (oldResult) { mapping.index += shift diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/FlatteningDependentListCell.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/FlatteningDependentListCell.kt similarity index 75% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/FlatteningDependentListCell.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/list/FlatteningDependentListCell.kt index ccd59a24..edc24e6c 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/FlatteningDependentListCell.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/FlatteningDependentListCell.kt @@ -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.unsafe.unsafeAssertNotNull -import world.phantasmal.observable.CallbackChangeObserver -import world.phantasmal.observable.ChangeObserver -import world.phantasmal.observable.Observable -import world.phantasmal.observable.cell.AbstractFlatteningDependentCell -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.DependentCell +import world.phantasmal.cell.CallbackChangeObserver +import world.phantasmal.cell.ChangeObserver +import world.phantasmal.cell.AbstractFlatteningDependentCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.DependentCell /** * Similar to [DependentListCell], except that this cell's computeElements returns a [ListCell]. */ class FlatteningDependentListCell( - vararg dependencies: Observable<*>, + vararg dependencies: Cell<*>, computeElements: () -> ListCell, ) : AbstractFlatteningDependentCell, ListCell, ListChangeEvent>( @@ -64,12 +63,14 @@ class FlatteningDependentListCell( val old = oldValue ?: emptyList() return ListChangeEvent( newValue, - listOf(ListChange( - index = 0, - prevSize = old.size, - removed = old, - inserted = newValue, - )), + listOf( + ListChange( + index = 0, + prevSize = old.size, + removed = old, + inserted = newValue, + ) + ), ) } } diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/ImmutableListCell.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/ImmutableListCell.kt similarity index 75% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/ImmutableListCell.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/list/ImmutableListCell.kt index 34017c63..8cfd17e6 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/ImmutableListCell.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/ImmutableListCell.kt @@ -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.nopDisposable -import world.phantasmal.observable.ChangeObserver -import world.phantasmal.observable.Dependency -import world.phantasmal.observable.Dependent -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.cell -import world.phantasmal.observable.cell.falseCell -import world.phantasmal.observable.cell.trueCell +import world.phantasmal.cell.ChangeObserver +import world.phantasmal.cell.Dependency +import world.phantasmal.cell.Dependent +import world.phantasmal.cell.Cell +import world.phantasmal.cell.cell +import world.phantasmal.cell.falseCell +import world.phantasmal.cell.trueCell class ImmutableListCell(private val elements: List) : Dependency>, ListCell { override val size: Cell = cell(elements.size) diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/ListCell.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/ListCell.kt similarity index 86% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/ListCell.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/list/ListCell.kt index 82e4d010..d20f979e 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/ListCell.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/ListCell.kt @@ -1,7 +1,7 @@ -package world.phantasmal.observable.cell.list +package world.phantasmal.cell.list import world.phantasmal.core.disposable.Disposable -import world.phantasmal.observable.cell.Cell +import world.phantasmal.cell.Cell interface ListCell : Cell> { override val value: List diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/ListCellUtils.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/ListCellUtils.kt similarity index 85% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/ListCellUtils.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/list/ListCellUtils.kt index 2196657f..6cc912b4 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/ListCellUtils.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/ListCellUtils.kt @@ -1,9 +1,8 @@ -package world.phantasmal.observable.cell.list +package world.phantasmal.cell.list -import world.phantasmal.observable.Observable -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.DependentCell -import world.phantasmal.observable.cell.ImmutableCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.DependentCell +import world.phantasmal.cell.ImmutableCell private val EMPTY_LIST_CELL = ImmutableListCell(emptyList()) @@ -21,13 +20,12 @@ fun mutableListCell(vararg elements: E): MutableListCell = * Returns a cell that changes whenever this list cell is structurally changed or when its * individual elements change. * - * @param extractObservables Called on each element to determine which element changes should be - * observed. + * @param extractCells Called on each element to determine which element changes should be observed. */ fun ListCell.dependingOnElements( - extractObservables: (element: E) -> Array>, + extractCells: (element: E) -> Array>, ): Cell> = - ListElementsDependentCell(this, extractObservables) + ListElementsDependentCell(this, extractCells) fun ListCell.listMap(transform: (E) -> R): ListCell = DependentListCell(this) { value.map(transform) } diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/ListChangeObserver.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/ListChangeObserver.kt similarity index 88% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/ListChangeObserver.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/list/ListChangeObserver.kt index f47b3db2..cb3571f0 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/ListChangeObserver.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/ListChangeObserver.kt @@ -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( value: List, diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/ListElementsDependentCell.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/ListElementsDependentCell.kt similarity index 87% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/ListElementsDependentCell.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/list/ListElementsDependentCell.kt index d2fdab2a..2e4e328f 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/ListElementsDependentCell.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/ListElementsDependentCell.kt @@ -1,20 +1,20 @@ -package world.phantasmal.observable.cell.list +package world.phantasmal.cell.list import world.phantasmal.core.splice -import world.phantasmal.observable.ChangeEvent -import world.phantasmal.observable.Dependency -import world.phantasmal.observable.Dependent -import world.phantasmal.observable.Observable -import world.phantasmal.observable.cell.AbstractCell +import world.phantasmal.cell.ChangeEvent +import world.phantasmal.cell.Dependency +import world.phantasmal.cell.Dependent +import world.phantasmal.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( private val list: ListCell, - private val extractObservables: (element: E) -> Array>, + private val extractCells: (element: E) -> Array>, ) : AbstractCell>(), 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>>() private var valid = false @@ -46,7 +46,7 @@ class ListElementsDependentCell( } } - val inserted = change.inserted.map(extractObservables) + val inserted = change.inserted.map(extractCells) elementDependencies.splice( startIndex = change.index, @@ -79,7 +79,7 @@ class ListElementsDependentCell( list.addDependent(this) for (element in list.value) { - val dependencies = extractObservables(element) + val dependencies = extractCells(element) for (dependency in dependencies) { dependency.addDependent(this) diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/MutableListCell.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/MutableListCell.kt similarity index 82% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/MutableListCell.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/list/MutableListCell.kt index 1e883391..95607507 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/MutableListCell.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/MutableListCell.kt @@ -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 : ListCell, MutableCell> { operator fun set(index: Int, element: E): E diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/SimpleFilteredListCell.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/SimpleFilteredListCell.kt similarity index 94% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/SimpleFilteredListCell.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/list/SimpleFilteredListCell.kt index 2985e6c5..7e6f4005 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/SimpleFilteredListCell.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/SimpleFilteredListCell.kt @@ -1,8 +1,8 @@ -package world.phantasmal.observable.cell.list +package world.phantasmal.cell.list import world.phantasmal.core.assertUnreachable -import world.phantasmal.observable.Dependency -import world.phantasmal.observable.cell.Cell +import world.phantasmal.cell.Dependency +import world.phantasmal.cell.Cell class SimpleFilteredListCell( list: ListCell, diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/SimpleListCell.kt b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/SimpleListCell.kt similarity index 99% rename from observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/SimpleListCell.kt rename to cell/src/commonMain/kotlin/world/phantasmal/cell/list/SimpleListCell.kt index d3aeb607..8646e835 100644 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/list/SimpleListCell.kt +++ b/cell/src/commonMain/kotlin/world/phantasmal/cell/list/SimpleListCell.kt @@ -1,4 +1,4 @@ -package world.phantasmal.observable.cell.list +package world.phantasmal.cell.list import world.phantasmal.core.replaceAll diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/CellCreationTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/CellCreationTests.kt similarity index 84% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/CellCreationTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/CellCreationTests.kt index 12b59271..f76aed66 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/CellCreationTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/CellCreationTests.kt @@ -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.* -class CellCreationTests : ObservableTestSuite { +class CellCreationTests : CellTestSuite { @Test fun test_cell() = test { assertEquals(7, cell(7).value) diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/CellTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/CellTests.kt similarity index 69% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/CellTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/CellTests.kt index 125c0e2d..1309a153 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/CellTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/CellTests.kt @@ -1,15 +1,17 @@ -package world.phantasmal.observable.cell +package world.phantasmal.cell import world.phantasmal.core.disposable.use -import world.phantasmal.observable.ChangeEvent -import world.phantasmal.observable.ObservableTests -import kotlin.test.* +import kotlin.test.Test +import kotlin.test.assertEquals +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] * implementation. */ -interface CellTests : ObservableTests { +interface CellTests : DependencyTests { override fun createProvider(): Provider @Test @@ -17,17 +19,61 @@ interface CellTests : ObservableTests { val p = createProvider() // 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 value_is_accessible_with_observers() = test { 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. - 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 @@ -36,7 +82,7 @@ interface CellTests : ObservableTests { var observedEvent: ChangeEvent? = null - disposer.add(p.observable.observeChange { changeEvent -> + disposer.add(p.cell.observeChange { changeEvent -> observedEvent = changeEvent }) @@ -54,7 +100,7 @@ interface CellTests : ObservableTests { var prevValue: Snapshot? var observedValue: Snapshot? = null - disposer.add(p.observable.observeChange { changeEvent -> + disposer.add(p.cell.observeChange { changeEvent -> assertNull(observedValue) observedValue = changeEvent.value.snapshot() }) @@ -69,7 +115,7 @@ interface CellTests : ObservableTests { // it should be equal to the cell's current value. assertNotNull(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) { // Value should change after emit. - old = p.observable.value.snapshot() + old = p.cell.value.snapshot() p.emit() - val new = p.observable.value.snapshot() + val new = p.cell.value.snapshot() assertNotEquals(old, new) // 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() var changes = 0 - p.observable.observeNow { + p.cell.observeNow { changes++ }.use { p.emit() @@ -120,7 +166,7 @@ interface CellTests : ObservableTests { @Test fun propagates_changes_to_mapped_cell() = test { val p = createProvider() - val mapped = p.observable.map { it.snapshot() } + val mapped = p.cell.map { it.snapshot() } val initialValue = mapped.value var observedValue: Snapshot? = null @@ -140,7 +186,7 @@ interface CellTests : ObservableTests { fun propagates_changes_to_flat_mapped_cell() = test { val p = createProvider() - val mapped = p.observable.flatMap { ImmutableCell(it.snapshot()) } + val mapped = p.cell.flatMap { ImmutableCell(it.snapshot()) } val initialValue = mapped.value var observedValue: Snapshot? = null @@ -156,8 +202,10 @@ interface CellTests : ObservableTests { assertEquals(mapped.value, observedValue) } - interface Provider : ObservableTests.Provider { - override val observable: Cell + interface Provider : DependencyTests.Provider { + val cell: Cell + + override val dependency: Dependency<*> get() = cell } } diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/CellWithDependenciesTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/CellWithDependenciesTests.kt similarity index 93% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/CellWithDependenciesTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/CellWithDependenciesTests.kt index ae4de4ed..735d0ca6 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/CellWithDependenciesTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/CellWithDependenciesTests.kt @@ -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.assertEquals import kotlin.test.assertTrue diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/ChangeTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/ChangeTests.kt similarity index 83% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/ChangeTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/ChangeTests.kt index 29eded7c..7d56eee1 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/ChangeTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/ChangeTests.kt @@ -1,12 +1,11 @@ -package world.phantasmal.observable.cell +package world.phantasmal.cell -import world.phantasmal.observable.mutate -import world.phantasmal.observable.test.ObservableTestSuite +import world.phantasmal.cell.test.CellTestSuite import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFails -class ChangeTests : ObservableTestSuite { +class ChangeTests : CellTestSuite { @Test fun exceptions_during_a_change_set_are_allowed() = test { val dependency = mutableCell(7) diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/DelegatingCellTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/DelegatingCellTests.kt similarity index 74% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/DelegatingCellTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/DelegatingCellTests.kt index 1d37bbd1..38282cb5 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/DelegatingCellTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/DelegatingCellTests.kt @@ -1,13 +1,14 @@ -package world.phantasmal.observable.cell +package world.phantasmal.cell +@Suppress("unused") class DelegatingCellTests : RegularCellTests, MutableCellTests { override fun createProvider() = object : MutableCellTests.Provider { private var v = 17 - override val observable = DelegatingCell({ v }, { v = it }) + override val cell = DelegatingCell({ v }, { v = it }) override fun emit() { - observable.value += 2 + cell.value += 2 } override fun createValue(): Int = v + 1 diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/DependencyTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/DependencyTests.kt similarity index 85% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/DependencyTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/DependencyTests.kt index 7098a4b8..0be4c127 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/DependencyTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/DependencyTests.kt @@ -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.* -interface DependencyTests : ObservableTestSuite { +interface DependencyTests : CellTestSuite { fun createProvider(): Provider @Test diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/DependentCellTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/DependentCellTests.kt similarity index 84% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/DependentCellTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/DependentCellTests.kt index 1e87eb45..2ed84412 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/DependentCellTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/DependentCellTests.kt @@ -1,5 +1,6 @@ -package world.phantasmal.observable.cell +package world.phantasmal.cell +@Suppress("unused") class DependentCellTests : RegularCellTests, CellWithDependenciesTests { override fun createProvider() = Provider() @@ -20,7 +21,7 @@ class DependentCellTests : RegularCellTests, CellWithDependenciesTests { class Provider : CellTests.Provider { private val dependencyCell = SimpleCell(1) - override val observable = DependentCell(dependencyCell) { 2 * dependencyCell.value } + override val cell = DependentCell(dependencyCell) { 2 * dependencyCell.value } override fun emit() { dependencyCell.value += 2 diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/DependentCellWithSimpleListCellTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/DependentCellWithSimpleListCellTests.kt similarity index 62% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/DependentCellWithSimpleListCellTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/DependentCellWithSimpleListCellTests.kt index f6b285d0..91edf65f 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/DependentCellWithSimpleListCellTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/DependentCellWithSimpleListCellTests.kt @@ -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 { override fun createProvider() = Provider() class Provider : CellTests.Provider { 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() { dependencyCell.add("x") diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/FlatteningDependentCellDirectAndTransitiveDependencyEmitTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/FlatteningDependentCellDirectAndTransitiveDependencyEmitTests.kt similarity index 78% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/FlatteningDependentCellDirectAndTransitiveDependencyEmitTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/FlatteningDependentCellDirectAndTransitiveDependencyEmitTests.kt index 7d4df814..3471df39 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/FlatteningDependentCellDirectAndTransitiveDependencyEmitTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/FlatteningDependentCellDirectAndTransitiveDependencyEmitTests.kt @@ -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 * [FlatteningDependentCell] change. */ +@Suppress("unused") class FlatteningDependentCellDirectAndTransitiveDependencyEmitTests : CellTests { override fun createProvider() = Provider() @@ -11,7 +12,7 @@ class FlatteningDependentCellDirectAndTransitiveDependencyEmitTests : CellTests // This cell is both the direct and transitive dependency. private val dependencyCell = SimpleCell('a') - override val observable = FlatteningDependentCell(dependencyCell) { dependencyCell } + override val cell = FlatteningDependentCell(dependencyCell) { dependencyCell } override fun emit() { dependencyCell.value += 1 diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/FlatteningDependentCellDirectDependencyEmitsTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/FlatteningDependentCellDirectDependencyEmitsTests.kt similarity index 92% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/FlatteningDependentCellDirectDependencyEmitsTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/FlatteningDependentCellDirectDependencyEmitsTests.kt index 174ee55b..c96e9a1a 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/FlatteningDependentCellDirectDependencyEmitsTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/FlatteningDependentCellDirectDependencyEmitsTests.kt @@ -1,8 +1,9 @@ -package world.phantasmal.observable.cell +package world.phantasmal.cell /** * In these tests the direct dependency of the [FlatteningDependentCell] changes. */ +@Suppress("unused") class FlatteningDependentCellDirectDependencyEmitsTests : RegularCellTests { override fun createProvider() = object : CellTests.Provider { // The transitive dependency can't change. @@ -11,7 +12,7 @@ class FlatteningDependentCellDirectDependencyEmitsTests : RegularCellTests { // The direct dependency of the cell under test can change. val directDependency = SimpleCell(transitiveDependency) - override val observable = + override val cell = FlatteningDependentCell(directDependency) { directDependency.value } override fun emit() { diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/FlatteningDependentCellTransitiveDependencyEmitsTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/FlatteningDependentCellTransitiveDependencyEmitsTests.kt similarity index 94% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/FlatteningDependentCellTransitiveDependencyEmitsTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/FlatteningDependentCellTransitiveDependencyEmitsTests.kt index 6312e9f6..bb24af27 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/FlatteningDependentCellTransitiveDependencyEmitsTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/FlatteningDependentCellTransitiveDependencyEmitsTests.kt @@ -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. */ +@Suppress("unused") class FlatteningDependentCellTransitiveDependencyEmitsTests : RegularCellTests, CellWithDependenciesTests { @@ -30,7 +31,7 @@ class FlatteningDependentCellTransitiveDependencyEmitsTests : // The direct dependency of the cell under test can't change. private val directDependency = ImmutableCell(transitiveDependency) - override val observable = + override val cell = FlatteningDependentCell(directDependency) { directDependency.value } override fun emit() { diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/ImmutableCellTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/ImmutableCellTests.kt similarity index 82% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/ImmutableCellTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/ImmutableCellTests.kt index fc13ad55..2c9f3522 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/ImmutableCellTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/ImmutableCellTests.kt @@ -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.observable.test.ObservableTestSuite import kotlin.test.Test import kotlin.test.assertEquals -class ImmutableCellTests : ObservableTestSuite { +class ImmutableCellTests : CellTestSuite { /** * As an optimization we simply ignore any observers and return a singleton Nop disposable. */ diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/MutableCellTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/MutableCellTests.kt similarity index 91% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/MutableCellTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/MutableCellTests.kt index 7963094a..fc493f58 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/MutableCellTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/MutableCellTests.kt @@ -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.assertEquals import kotlin.test.assertNull @@ -14,15 +13,15 @@ interface MutableCellTests : CellTests { var observedValue: Any? = null - disposer.add(p.observable.observeChange { + disposer.add(p.cell.observeChange { assertNull(observedValue) observedValue = it.value }) 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) } @@ -139,11 +138,11 @@ interface MutableCellTests : CellTests { // } interface Provider : CellTests.Provider { - override val observable: MutableCell + override val cell: MutableCell /** - * Returns a value that can be assigned to [observable] and that's different from - * [observable]'s current and all previous values. + * Returns a value that can be assigned to [cell] and that's different from + * [cell]'s current and all previous values. */ fun createValue(): T } diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/MutationTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/MutationTests.kt similarity index 72% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/MutationTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/MutationTests.kt index 81272a46..b9f64003 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/MutationTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/MutationTests.kt @@ -1,11 +1,10 @@ -package world.phantasmal.observable +package world.phantasmal.cell -import world.phantasmal.observable.cell.mutableCell -import world.phantasmal.observable.test.ObservableTestSuite +import world.phantasmal.cell.test.CellTestSuite import kotlin.test.Test import kotlin.test.assertEquals -class MutationTests : ObservableTestSuite { +class MutationTests : CellTestSuite { @Test fun can_change_observed_cell_with_mutateDeferred() = test { val cell = mutableCell(0) diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/RegularCellTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/RegularCellTests.kt similarity index 99% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/RegularCellTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/RegularCellTests.kt index bc17d7a5..7c60dad5 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/RegularCellTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/RegularCellTests.kt @@ -1,4 +1,4 @@ -package world.phantasmal.observable.cell +package world.phantasmal.cell import kotlin.test.Test import kotlin.test.assertEquals diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/SimpleCellTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/SimpleCellTests.kt similarity index 58% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/SimpleCellTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/SimpleCellTests.kt index 348cab62..06f9f154 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/SimpleCellTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/SimpleCellTests.kt @@ -1,14 +1,15 @@ -package world.phantasmal.observable.cell +package world.phantasmal.cell +@Suppress("unused") class SimpleCellTests : RegularCellTests, MutableCellTests { override fun createProvider() = object : MutableCellTests.Provider { - override val observable = SimpleCell(1) + override val cell = SimpleCell(1) 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 createWithValue(value: T) = SimpleCell(value) diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/DependentListCellTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/DependentListCellTests.kt similarity index 81% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/DependentListCellTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/list/DependentListCellTests.kt index 7030d239..7aece41e 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/DependentListCellTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/DependentListCellTests.kt @@ -1,8 +1,9 @@ -package world.phantasmal.observable.cell.list +package world.phantasmal.cell.list -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.CellWithDependenciesTests +import world.phantasmal.cell.Cell +import world.phantasmal.cell.CellWithDependenciesTests +@Suppress("unused") class DependentListCellTests : ListCellTests, CellWithDependenciesTests { override fun createProvider() = createListProvider(empty = true) @@ -21,7 +22,7 @@ class DependentListCellTests : ListCellTests, CellWithDependenciesTests { private val dependencyCell = SimpleListCell(if (empty) mutableListOf() else mutableListOf(5)) - override val observable = + override val cell = DependentListCell(dependencyCell) { dependencyCell.value.map { 2 * it } } override fun addElement() { diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/FilteredListCellListDependencyEmitsTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/FilteredListCellListDependencyEmitsTests.kt similarity index 80% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/FilteredListCellListDependencyEmitsTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/list/FilteredListCellListDependencyEmitsTests.kt index 61c4bbc9..6330d942 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/FilteredListCellListDependencyEmitsTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/FilteredListCellListDependencyEmitsTests.kt @@ -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 { override fun createListProvider(empty: Boolean) = object : ListCellTests.Provider { private val dependencyCell = SimpleListCell(if (empty) mutableListOf(5) else mutableListOf(5, 10)) - override val observable = + override val cell = FilteredListCell( list = dependencyCell, predicate = cell { cell(it % 2 == 0) }, diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/FilteredListCellTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/FilteredListCellTests.kt similarity index 74% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/FilteredListCellTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/list/FilteredListCellTests.kt index a63396d6..0c2b7f84 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/FilteredListCellTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/FilteredListCellTests.kt @@ -1,12 +1,13 @@ -package world.phantasmal.observable.cell.list +package world.phantasmal.cell.list -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.cell -import world.phantasmal.observable.cell.map +import world.phantasmal.cell.Cell +import world.phantasmal.cell.cell +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 the predicate results are changing. // TODO: A test suite that tests FilteredListCell while all 3 types of dependencies are changing. +@Suppress("unused") class FilteredListCellTests : SuperFilteredListCellTests { override fun createFilteredListCell(list: ListCell, predicate: Cell<(E) -> Boolean>) = FilteredListCell(list, predicate.map { p -> { cell(p(it)) } }) diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/FlatteningDependentListCellDirectDependencyEmitsTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/FlatteningDependentListCellDirectDependencyEmitsTests.kt similarity index 87% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/FlatteningDependentListCellDirectDependencyEmitsTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/list/FlatteningDependentListCellDirectDependencyEmitsTests.kt index 57b97353..5da7626e 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/FlatteningDependentListCellDirectDependencyEmitsTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/FlatteningDependentListCellDirectDependencyEmitsTests.kt @@ -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. */ +@Suppress("unused") class FlatteningDependentListCellDirectDependencyEmitsTests : ListCellTests { override fun createListProvider(empty: Boolean) = object : ListCellTests.Provider { // The transitive dependency can't change. @@ -13,7 +14,7 @@ class FlatteningDependentListCellDirectDependencyEmitsTests : ListCellTests { // The direct dependency of the list under test can change. private val directDependency = SimpleCell>(transitiveDependency) - override val observable = + override val cell = FlatteningDependentListCell(directDependency) { directDependency.value } override fun addElement() { diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/FlatteningDependentListCellTransitiveDependencyEmitsTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/FlatteningDependentListCellTransitiveDependencyEmitsTests.kt similarity index 81% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/FlatteningDependentListCellTransitiveDependencyEmitsTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/list/FlatteningDependentListCellTransitiveDependencyEmitsTests.kt index 5ce3da89..ccf508c7 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/FlatteningDependentListCellTransitiveDependencyEmitsTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/FlatteningDependentListCellTransitiveDependencyEmitsTests.kt @@ -1,13 +1,14 @@ -package world.phantasmal.observable.cell.list +package world.phantasmal.cell.list -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.CellTests -import world.phantasmal.observable.cell.CellWithDependenciesTests -import world.phantasmal.observable.cell.ImmutableCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.CellTests +import world.phantasmal.cell.CellWithDependenciesTests +import world.phantasmal.cell.ImmutableCell /** * In these tests the dependency of the [FlatteningDependentListCell]'s direct dependency changes. */ +@Suppress("unused") class FlatteningDependentListCellTransitiveDependencyEmitsTests : ListCellTests, CellWithDependenciesTests { @@ -33,7 +34,7 @@ class FlatteningDependentListCellTransitiveDependencyEmitsTests : // The direct dependency of the list under test can't change. private val directDependency = ImmutableCell>(transitiveDependency) - override val observable = + override val cell = FlatteningDependentListCell(directDependency) { directDependency.value } override fun addElement() { diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ImmutableListCellTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/ImmutableListCellTests.kt similarity index 78% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ImmutableListCellTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/list/ImmutableListCellTests.kt index 6f327aee..408be908 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ImmutableListCellTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/ImmutableListCellTests.kt @@ -1,12 +1,12 @@ -package world.phantasmal.observable.cell.list +package world.phantasmal.cell.list import world.phantasmal.core.disposable.DisposableTracking -import world.phantasmal.observable.cell.observeNow -import world.phantasmal.observable.test.ObservableTestSuite +import world.phantasmal.cell.observeNow +import world.phantasmal.cell.test.CellTestSuite import kotlin.test.Test import kotlin.test.assertEquals -class ImmutableListCellTests : ObservableTestSuite { +class ImmutableListCellTests : CellTestSuite { /** * As an optimization we simply ignore any observers and return a singleton Nop disposable. */ diff --git a/cell/src/commonTest/kotlin/world/phantasmal/cell/list/ListCellCreationTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/ListCellCreationTests.kt new file mode 100644 index 00000000..7916a908 --- /dev/null +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/ListCellCreationTests.kt @@ -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) + } +} diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ListCellTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/ListCellTests.kt similarity index 84% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ListCellTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/list/ListCellTests.kt index ed207f58..1697e2d2 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ListCellTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/ListCellTests.kt @@ -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.* /** @@ -18,18 +18,18 @@ interface ListCellTests : CellTests { // We literally just test that accessing the value property doesn't throw or return the // wrong list. - assertTrue(p.observable.value.isNotEmpty()) + assertTrue(p.cell.value.isNotEmpty()) } @Test fun list_value_is_accessible_with_observers() = test { 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 // wrong list. - assertTrue(p.observable.value.isNotEmpty()) + assertTrue(p.cell.value.isNotEmpty()) } @Test @@ -38,7 +38,7 @@ interface ListCellTests : CellTests { var observedEvent: ListChangeEvent? = null - disposer.add(p.observable.observeListChange { listChangeEvent -> + disposer.add(p.cell.observeListChange { listChangeEvent -> observedEvent = listChangeEvent }) @@ -56,7 +56,7 @@ interface ListCellTests : CellTests { var event: ListChangeEvent<*>? = null disposer.add( - p.observable.observeListChange { + p.cell.observeListChange { assertNull(event) event = it } @@ -75,12 +75,12 @@ interface ListCellTests : CellTests { fun updates_size_correctly() = test { val p = createProvider() - assertEquals(0, p.observable.size.value) + assertEquals(0, p.cell.size.value) var observedSize: Int? = null disposer.add( - p.observable.size.observeChange { + p.cell.size.observeChange { assertNull(observedSize) observedSize = it.value } @@ -91,7 +91,7 @@ interface ListCellTests : CellTests { p.addElement() - assertEquals(i, p.observable.size.value) + assertEquals(i, p.cell.size.value) assertEquals(i, observedSize) } } @@ -101,20 +101,20 @@ interface ListCellTests : CellTests { val p = createProvider() assertFailsWith(IndexOutOfBoundsException::class) { - p.observable[0] + p.cell[0] } p.addElement() // Shouldn't throw at this point. - p.observable[0] + p.cell[0] } @Test fun fold() = test { 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 @@ -139,7 +139,7 @@ interface ListCellTests : CellTests { fun sumBy() = test { val p = createProvider() - val sum = p.observable.sumOf { 1 } + val sum = p.cell.sumOf { 1 } var observedValue: Int? = null @@ -164,7 +164,7 @@ interface ListCellTests : CellTests { fun filtered() = test { val p = createProvider() - val filtered = p.observable.filtered { true } + val filtered = p.cell.filtered { true } var event: ListChangeEvent<*>? = null @@ -189,7 +189,7 @@ interface ListCellTests : CellTests { fun firstOrNull() = test { val p = createProvider() - val firstOrNull = p.observable.firstOrNull() + val firstOrNull = p.cell.firstOrNull() var observedValue: Any? = null @@ -217,7 +217,7 @@ interface ListCellTests : CellTests { } interface Provider : CellTests.Provider { - override val observable: ListCell + override val cell: ListCell /** * Adds an element to the [ListCell] under test. diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ListElementsDependentCellElementEmitsTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/ListElementsDependentCellElementEmitsTests.kt similarity index 82% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ListElementsDependentCellElementEmitsTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/list/ListElementsDependentCellElementEmitsTests.kt index f4a68e1f..f9acf8d3 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ListElementsDependentCellElementEmitsTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/ListElementsDependentCellElementEmitsTests.kt @@ -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 @@ -16,7 +21,7 @@ class ListElementsDependentCellElementEmitsTests : CellWithDependenciesTests { private val directDependency: ListCell = ImmutableListCell(listOf(Element(1), transitiveDependency, Element(3))) - override val observable = + override val cell = ListElementsDependentCell(directDependency) { arrayOf(it.int, it.double, it.string) } override fun emit() { diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ListElementsDependentCellListCellEmitsTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/ListElementsDependentCellListCellEmitsTests.kt similarity index 76% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ListElementsDependentCellListCellEmitsTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/list/ListElementsDependentCellListCellEmitsTests.kt index 3d9565d0..0f19121c 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ListElementsDependentCellListCellEmitsTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/ListElementsDependentCellListCellEmitsTests.kt @@ -1,8 +1,8 @@ -package world.phantasmal.observable.cell.list +package world.phantasmal.cell.list -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.CellTests -import world.phantasmal.observable.cell.ImmutableCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.CellTests +import world.phantasmal.cell.ImmutableCell /** * In these tests, the direct list cell dependency of the [ListElementsDependentCell] changes, while @@ -15,7 +15,7 @@ class ListElementsDependentCellListCellEmitsTests : CellTests { private val directDependency: SimpleListCell> = SimpleListCell(mutableListOf(ImmutableCell(1), ImmutableCell(2), ImmutableCell(3))) - override val observable = + override val cell = ListElementsDependentCell(directDependency) { arrayOf(it) } override fun emit() { diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ListElementsDependentCellTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/ListElementsDependentCellTests.kt similarity index 82% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ListElementsDependentCellTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/list/ListElementsDependentCellTests.kt index 7ea2f5c9..980125dd 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ListElementsDependentCellTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/ListElementsDependentCellTests.kt @@ -1,8 +1,8 @@ -package world.phantasmal.observable.cell.list +package world.phantasmal.cell.list -import world.phantasmal.observable.ChangeEvent -import world.phantasmal.observable.cell.SimpleCell -import world.phantasmal.observable.test.ObservableTestSuite +import world.phantasmal.cell.ChangeEvent +import world.phantasmal.cell.SimpleCell +import world.phantasmal.cell.test.CellTestSuite import kotlin.test.Test import kotlin.test.assertNotNull import kotlin.test.assertNull @@ -11,7 +11,7 @@ import kotlin.test.assertNull * Standard tests are done by [ListElementsDependentCellElementEmitsTests] and * [ListElementsDependentCellListCellEmitsTests]. */ -class ListElementsDependentCellTests : ObservableTestSuite { +class ListElementsDependentCellTests : CellTestSuite { @Test fun element_changes_are_correctly_propagated() = test { val list = SimpleListCell( diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/MutableListCellTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/MutableListCellTests.kt similarity index 72% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/MutableListCellTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/list/MutableListCellTests.kt index 09b99b1d..50ec12e7 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/MutableListCellTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/MutableListCellTests.kt @@ -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.* /** @@ -16,18 +16,18 @@ interface MutableListCellTests : ListCellTests, MutableCellTests? = null - disposer.add(p.observable.observeListChange { + disposer.add(p.cell.observeListChange { assertNull(changeEvent) changeEvent = it }) // Insert once. val v1 = p.createElement() - p.observable.add(v1) + p.cell.add(v1) run { - assertEquals(1, p.observable.size.value) - assertEquals(v1, p.observable[0]) + assertEquals(1, p.cell.size.value) + assertEquals(v1, p.cell[0]) val e = changeEvent assertNotNull(e) @@ -44,12 +44,12 @@ interface MutableListCellTests : ListCellTests, MutableCellTests : ListCellTests, MutableCellTests : ListCellTests, MutableCellTests : ListCellTests.Provider, MutableCellTests.Provider> { - override val observable: MutableListCell + override val cell: MutableListCell fun createElement(): T } diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/SimpleFilteredListCellListDependencyEmitsTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/SimpleFilteredListCellListDependencyEmitsTests.kt similarity index 79% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/SimpleFilteredListCellListDependencyEmitsTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/list/SimpleFilteredListCellListDependencyEmitsTests.kt index d88e90b7..43fd8c3c 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/SimpleFilteredListCellListDependencyEmitsTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/SimpleFilteredListCellListDependencyEmitsTests.kt @@ -1,13 +1,14 @@ -package world.phantasmal.observable.cell.list +package world.phantasmal.cell.list -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.CellWithDependenciesTests -import world.phantasmal.observable.cell.cell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.CellWithDependenciesTests +import world.phantasmal.cell.cell /** * In these tests the list dependency of the [SimpleListCell] changes and the predicate * dependency does not. */ +@Suppress("unused") class SimpleFilteredListCellListDependencyEmitsTests : ListCellTests, CellWithDependenciesTests { @@ -15,7 +16,7 @@ class SimpleFilteredListCellListDependencyEmitsTests : private val dependencyCell = SimpleListCell(if (empty) mutableListOf(5) else mutableListOf(5, 10)) - override val observable = SimpleFilteredListCell( + override val cell = SimpleFilteredListCell( list = dependencyCell, predicate = cell { it % 2 == 0 }, ) diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/SimpleFilteredListCellPredicateDependencyEmitsTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/SimpleFilteredListCellPredicateDependencyEmitsTests.kt similarity index 78% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/SimpleFilteredListCellPredicateDependencyEmitsTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/list/SimpleFilteredListCellPredicateDependencyEmitsTests.kt index a987bd3e..a30b0e42 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/SimpleFilteredListCellPredicateDependencyEmitsTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/SimpleFilteredListCellPredicateDependencyEmitsTests.kt @@ -1,14 +1,15 @@ -package world.phantasmal.observable.cell.list +package world.phantasmal.cell.list -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.CellWithDependenciesTests -import world.phantasmal.observable.cell.SimpleCell -import world.phantasmal.observable.cell.map +import world.phantasmal.cell.Cell +import world.phantasmal.cell.CellWithDependenciesTests +import world.phantasmal.cell.SimpleCell +import world.phantasmal.cell.map /** * In these tests the predicate dependency of the [SimpleListCell] changes and the list dependency * does not. */ +@Suppress("unused") class SimpleFilteredListCellPredicateDependencyEmitsTests : ListCellTests, CellWithDependenciesTests { @@ -16,7 +17,7 @@ class SimpleFilteredListCellPredicateDependencyEmitsTests : private var maxValue = if (empty) 0 else 1 private val predicateCell = SimpleCell<(Int) -> Boolean> { it <= maxValue } - override val observable = SimpleFilteredListCell( + override val cell = SimpleFilteredListCell( list = ImmutableListCell((1..20).toList()), predicate = predicateCell, ) diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/SimpleFilteredListCellTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/SimpleFilteredListCellTests.kt similarity index 78% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/SimpleFilteredListCellTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/list/SimpleFilteredListCellTests.kt index c35981f5..36aec3da 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/SimpleFilteredListCellTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/SimpleFilteredListCellTests.kt @@ -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 // changing. +@Suppress("unused") class SimpleFilteredListCellTests : SuperFilteredListCellTests { override fun createFilteredListCell(list: ListCell, predicate: Cell<(E) -> Boolean>) = SimpleFilteredListCell(list, predicate) diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/SimpleListCellTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/SimpleListCellTests.kt similarity index 94% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/SimpleListCellTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/list/SimpleListCellTests.kt index ee9dd12f..46c7a046 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/SimpleListCellTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/SimpleListCellTests.kt @@ -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.assertFailsWith import kotlin.test.assertFalse @@ -12,10 +12,10 @@ class SimpleListCellTests : MutableListCellTests { override fun createListProvider(empty: Boolean) = object : MutableListCellTests.Provider { 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() { - observable.add(createElement()) + cell.add(createElement()) } override fun createValue(): List = listOf(createElement()) diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/SuperFilteredListCellTests.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/SuperFilteredListCellTests.kt similarity index 95% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/SuperFilteredListCellTests.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/list/SuperFilteredListCellTests.kt index f674b5bf..6437969b 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/SuperFilteredListCellTests.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/list/SuperFilteredListCellTests.kt @@ -1,15 +1,15 @@ -package world.phantasmal.observable.cell.list +package world.phantasmal.cell.list -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.ImmutableCell -import world.phantasmal.observable.cell.SimpleCell -import world.phantasmal.observable.test.ObservableTestSuite +import world.phantasmal.cell.Cell +import world.phantasmal.cell.ImmutableCell +import world.phantasmal.cell.SimpleCell +import world.phantasmal.cell.test.CellTestSuite import kotlin.test.* /** * Tests that apply to all filtered list implementations. */ -interface SuperFilteredListCellTests : ObservableTestSuite { +interface SuperFilteredListCellTests : CellTestSuite { fun createFilteredListCell(list: ListCell, predicate: Cell<(E) -> Boolean>): ListCell @Test @@ -172,12 +172,14 @@ interface SuperFilteredListCellTests : ObservableTestSuite { val changes: MutableList> = mutableListOf() for (newElement in newElements) { - changes.add(ListChange( + changes.add( + ListChange( index = elements.size, prevSize = elements.size, removed = emptyList(), inserted = listOf(newElement), - )) + ) + ) elements.add(newElement) } diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/test/ObservableTestSuite.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/test/CellTestSuite.kt similarity index 68% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/test/ObservableTestSuite.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/test/CellTestSuite.kt index 03450dc0..45395688 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/test/ObservableTestSuite.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/test/CellTestSuite.kt @@ -1,9 +1,9 @@ -package world.phantasmal.observable.test +package world.phantasmal.cell.test import world.phantasmal.core.disposable.Disposer import world.phantasmal.testUtils.AbstractTestSuite import world.phantasmal.testUtils.TestContext -interface ObservableTestSuite : AbstractTestSuite { +interface CellTestSuite : AbstractTestSuite { override fun createContext(disposer: Disposer) = TestContext(disposer) } diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/test/Utils.kt b/cell/src/commonTest/kotlin/world/phantasmal/cell/test/Utils.kt similarity index 67% rename from observable/src/commonTest/kotlin/world/phantasmal/observable/test/Utils.kt rename to cell/src/commonTest/kotlin/world/phantasmal/cell/test/Utils.kt index c67b7b71..6a2f6092 100644 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/test/Utils.kt +++ b/cell/src/commonTest/kotlin/world/phantasmal/cell/test/Utils.kt @@ -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 fun assertListCellEquals(expected: List, actual: ListCell) { diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/Emitter.kt b/observable/src/commonMain/kotlin/world/phantasmal/observable/Emitter.kt deleted file mode 100644 index 7966fd47..00000000 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/Emitter.kt +++ /dev/null @@ -1,5 +0,0 @@ -package world.phantasmal.observable - -interface Emitter : Observable { - fun emit(event: ChangeEvent) -} diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/Mutation.kt b/observable/src/commonMain/kotlin/world/phantasmal/observable/Mutation.kt deleted file mode 100644 index 6ebd6b6e..00000000 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/Mutation.kt +++ /dev/null @@ -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) -} diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/Observable.kt b/observable/src/commonMain/kotlin/world/phantasmal/observable/Observable.kt deleted file mode 100644 index 054eea1e..00000000 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/Observable.kt +++ /dev/null @@ -1,10 +0,0 @@ -package world.phantasmal.observable - -import world.phantasmal.core.disposable.Disposable - -interface Observable : Dependency { - /** - * [observer] will be called whenever this observable changes. - */ - fun observeChange(observer: ChangeObserver): Disposable -} diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/ObservableUtils.kt b/observable/src/commonMain/kotlin/world/phantasmal/observable/ObservableUtils.kt deleted file mode 100644 index 46258bac..00000000 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/ObservableUtils.kt +++ /dev/null @@ -1,8 +0,0 @@ -package world.phantasmal.observable - -import world.phantasmal.core.disposable.Disposable - -fun emitter(): Emitter = SimpleEmitter() - -fun Observable.observe(observer: (T) -> Unit): Disposable = - observeChange { observer(it.value) } diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/SimpleEmitter.kt b/observable/src/commonMain/kotlin/world/phantasmal/observable/SimpleEmitter.kt deleted file mode 100644 index 7484b932..00000000 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/SimpleEmitter.kt +++ /dev/null @@ -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 : AbstractDependency(), Emitter { - override var changeEvent: ChangeEvent? = null - private set - - override fun emit(event: ChangeEvent) { - applyChange { - this.changeEvent = event - } - } - - override fun observeChange(observer: ChangeObserver): Disposable = - CallbackChangeObserver(this, observer) -} diff --git a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/Cell.kt b/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/Cell.kt deleted file mode 100644 index 77aad022..00000000 --- a/observable/src/commonMain/kotlin/world/phantasmal/observable/cell/Cell.kt +++ /dev/null @@ -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 : Observable { - val value: T - - operator fun getValue(thisRef: Any?, property: KProperty<*>): T = value -} diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/ObservableTests.kt b/observable/src/commonTest/kotlin/world/phantasmal/observable/ObservableTests.kt deleted file mode 100644 index 43fe062d..00000000 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/ObservableTests.kt +++ /dev/null @@ -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 - } -} diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/SimpleEmitterTests.kt b/observable/src/commonTest/kotlin/world/phantasmal/observable/SimpleEmitterTests.kt deleted file mode 100644 index 489ade7b..00000000 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/SimpleEmitterTests.kt +++ /dev/null @@ -1,11 +0,0 @@ -package world.phantasmal.observable - -class SimpleEmitterTests : ObservableTests { - override fun createProvider() = object : ObservableTests.Provider { - override val observable = SimpleEmitter() - - override fun emit() { - observable.emit(ChangeEvent(Any())) - } - } -} diff --git a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ListCellCreationTests.kt b/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ListCellCreationTests.kt deleted file mode 100644 index 8e7101c5..00000000 --- a/observable/src/commonTest/kotlin/world/phantasmal/observable/cell/list/ListCellCreationTests.kt +++ /dev/null @@ -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) - } -} diff --git a/settings.gradle.kts b/settings.gradle.kts index faf05a30..28069460 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,7 +3,7 @@ rootProject.name = "phantasmal-world" include( ":core", ":psolib", - ":observable", + ":cell", ":psoserv", ":test-utils", ":web", diff --git a/web/README.md b/web/README.md index 3971e0dc..1a05ab71 100644 --- a/web/README.md +++ b/web/README.md @@ -46,7 +46,7 @@ controller has no knowledge of the GUI layer. ### 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. ### stores diff --git a/web/src/main/kotlin/world/phantasmal/web/application/controllers/MainContentController.kt b/web/src/main/kotlin/world/phantasmal/web/application/controllers/MainContentController.kt index 94080019..ec2f2bcd 100644 --- a/web/src/main/kotlin/world/phantasmal/web/application/controllers/MainContentController.kt +++ b/web/src/main/kotlin/world/phantasmal/web/application/controllers/MainContentController.kt @@ -1,6 +1,6 @@ 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.stores.UiStore import world.phantasmal.webui.controllers.Controller diff --git a/web/src/main/kotlin/world/phantasmal/web/application/controllers/NavigationController.kt b/web/src/main/kotlin/world/phantasmal/web/application/controllers/NavigationController.kt index ed8da885..27509cc0 100644 --- a/web/src/main/kotlin/world/phantasmal/web/application/controllers/NavigationController.kt +++ b/web/src/main/kotlin/world/phantasmal/web/application/controllers/NavigationController.kt @@ -4,8 +4,8 @@ import kotlinx.browser.window import kotlinx.datetime.Clock import kotlinx.datetime.TimeZone import kotlinx.datetime.toLocalDateTime -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.mutableCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.mutableCell import world.phantasmal.web.core.PwToolType import world.phantasmal.web.core.stores.UiStore import world.phantasmal.webui.controllers.Controller diff --git a/web/src/main/kotlin/world/phantasmal/web/application/widgets/NavigationWidget.kt b/web/src/main/kotlin/world/phantasmal/web/application/widgets/NavigationWidget.kt index 032741a8..9b1a59a3 100644 --- a/web/src/main/kotlin/world/phantasmal/web/application/widgets/NavigationWidget.kt +++ b/web/src/main/kotlin/world/phantasmal/web/application/widgets/NavigationWidget.kt @@ -1,9 +1,9 @@ package world.phantasmal.web.application.widgets import org.w3c.dom.Node -import world.phantasmal.observable.cell.cell -import world.phantasmal.observable.cell.falseCell -import world.phantasmal.observable.cell.list.listCell +import world.phantasmal.cell.cell +import world.phantasmal.cell.falseCell +import world.phantasmal.cell.list.listCell import world.phantasmal.web.application.controllers.NavigationController import world.phantasmal.web.core.dom.externalLink import world.phantasmal.web.core.models.Server diff --git a/web/src/main/kotlin/world/phantasmal/web/application/widgets/PwToolButton.kt b/web/src/main/kotlin/world/phantasmal/web/application/widgets/PwToolButton.kt index 9e8a52c1..fc35f211 100644 --- a/web/src/main/kotlin/world/phantasmal/web/application/widgets/PwToolButton.kt +++ b/web/src/main/kotlin/world/phantasmal/web/application/widgets/PwToolButton.kt @@ -1,9 +1,9 @@ package world.phantasmal.web.application.widgets import org.w3c.dom.Node -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.nullCell -import world.phantasmal.observable.cell.trueCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.nullCell +import world.phantasmal.cell.trueCell import world.phantasmal.web.core.PwToolType import world.phantasmal.webui.dom.input import world.phantasmal.webui.dom.label diff --git a/web/src/main/kotlin/world/phantasmal/web/core/controllers/PathAwareTabContainerController.kt b/web/src/main/kotlin/world/phantasmal/web/core/controllers/PathAwareTabContainerController.kt index acdbfd7b..658f8a0a 100644 --- a/web/src/main/kotlin/world/phantasmal/web/core/controllers/PathAwareTabContainerController.kt +++ b/web/src/main/kotlin/world/phantasmal/web/core/controllers/PathAwareTabContainerController.kt @@ -1,8 +1,8 @@ package world.phantasmal.web.core.controllers -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.map -import world.phantasmal.observable.mutateDeferred +import world.phantasmal.cell.Cell +import world.phantasmal.cell.map +import world.phantasmal.cell.mutateDeferred import world.phantasmal.web.core.PwToolType import world.phantasmal.web.core.stores.UiStore import world.phantasmal.webui.controllers.Tab diff --git a/web/src/main/kotlin/world/phantasmal/web/core/observable/Emitter.kt b/web/src/main/kotlin/world/phantasmal/web/core/observable/Emitter.kt new file mode 100644 index 00000000..2702ed50 --- /dev/null +++ b/web/src/main/kotlin/world/phantasmal/web/core/observable/Emitter.kt @@ -0,0 +1,19 @@ +package world.phantasmal.web.core.observable + +import world.phantasmal.core.disposable.Disposable +import world.phantasmal.core.disposable.disposable + +class Emitter : Observable { + 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) } + } +} diff --git a/web/src/main/kotlin/world/phantasmal/web/core/observable/Observable.kt b/web/src/main/kotlin/world/phantasmal/web/core/observable/Observable.kt new file mode 100644 index 00000000..97b85469 --- /dev/null +++ b/web/src/main/kotlin/world/phantasmal/web/core/observable/Observable.kt @@ -0,0 +1,10 @@ +package world.phantasmal.web.core.observable + +import world.phantasmal.core.disposable.Disposable + +interface Observable { + /** + * [observer] will be called whenever this observable changes. + */ + fun observe(observer: (T) -> Unit): Disposable +} diff --git a/web/src/main/kotlin/world/phantasmal/web/core/observable/ObservableUtils.kt b/web/src/main/kotlin/world/phantasmal/web/core/observable/ObservableUtils.kt new file mode 100644 index 00000000..e5c8de9e --- /dev/null +++ b/web/src/main/kotlin/world/phantasmal/web/core/observable/ObservableUtils.kt @@ -0,0 +1,3 @@ +package world.phantasmal.web.core.observable + +fun emitter(): Emitter = Emitter() diff --git a/web/src/main/kotlin/world/phantasmal/web/core/stores/UiStore.kt b/web/src/main/kotlin/world/phantasmal/web/core/stores/UiStore.kt index 7b58a517..06e2453a 100644 --- a/web/src/main/kotlin/world/phantasmal/web/core/stores/UiStore.kt +++ b/web/src/main/kotlin/world/phantasmal/web/core/stores/UiStore.kt @@ -6,9 +6,9 @@ import org.w3c.dom.events.KeyboardEvent import world.phantasmal.core.disposable.Disposable import world.phantasmal.core.disposable.TrackedDisposable import world.phantasmal.core.disposable.disposable -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.eq -import world.phantasmal.observable.cell.mutableCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.eq +import world.phantasmal.cell.mutableCell import world.phantasmal.web.core.PwToolType import world.phantasmal.web.core.models.Server import world.phantasmal.webui.DisposableContainer diff --git a/web/src/main/kotlin/world/phantasmal/web/core/undo/Undo.kt b/web/src/main/kotlin/world/phantasmal/web/core/undo/Undo.kt index 388ba105..cbf82046 100644 --- a/web/src/main/kotlin/world/phantasmal/web/core/undo/Undo.kt +++ b/web/src/main/kotlin/world/phantasmal/web/core/undo/Undo.kt @@ -1,6 +1,6 @@ package world.phantasmal.web.core.undo -import world.phantasmal.observable.cell.Cell +import world.phantasmal.cell.Cell import world.phantasmal.web.core.commands.Command interface Undo { diff --git a/web/src/main/kotlin/world/phantasmal/web/core/undo/UndoManager.kt b/web/src/main/kotlin/world/phantasmal/web/core/undo/UndoManager.kt index 096f75ee..e3a5d2cf 100644 --- a/web/src/main/kotlin/world/phantasmal/web/core/undo/UndoManager.kt +++ b/web/src/main/kotlin/world/phantasmal/web/core/undo/UndoManager.kt @@ -1,8 +1,15 @@ package world.phantasmal.web.core.undo -import world.phantasmal.observable.cell.* -import world.phantasmal.observable.cell.list.fold -import world.phantasmal.observable.cell.list.mutableListCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.and +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 class UndoManager { diff --git a/web/src/main/kotlin/world/phantasmal/web/core/undo/UndoStack.kt b/web/src/main/kotlin/world/phantasmal/web/core/undo/UndoStack.kt index 57f1423a..56d284b2 100644 --- a/web/src/main/kotlin/world/phantasmal/web/core/undo/UndoStack.kt +++ b/web/src/main/kotlin/world/phantasmal/web/core/undo/UndoStack.kt @@ -1,7 +1,11 @@ package world.phantasmal.web.core.undo -import world.phantasmal.observable.cell.* -import world.phantasmal.observable.cell.list.mutableListCell +import world.phantasmal.cell.Cell +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 /** diff --git a/web/src/main/kotlin/world/phantasmal/web/core/widgets/DockWidget.kt b/web/src/main/kotlin/world/phantasmal/web/core/widgets/DockWidget.kt index 33a60a6d..fc659c1c 100644 --- a/web/src/main/kotlin/world/phantasmal/web/core/widgets/DockWidget.kt +++ b/web/src/main/kotlin/world/phantasmal/web/core/widgets/DockWidget.kt @@ -3,8 +3,8 @@ package world.phantasmal.web.core.widgets import kotlinx.coroutines.launch import mu.KotlinLogging import org.w3c.dom.Node -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.trueCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.trueCell import world.phantasmal.web.core.controllers.* import world.phantasmal.web.externals.goldenLayout.GoldenLayout import world.phantasmal.webui.dom.div diff --git a/web/src/main/kotlin/world/phantasmal/web/core/widgets/UnavailableWidget.kt b/web/src/main/kotlin/world/phantasmal/web/core/widgets/UnavailableWidget.kt index 347aa9ed..485b7b9a 100644 --- a/web/src/main/kotlin/world/phantasmal/web/core/widgets/UnavailableWidget.kt +++ b/web/src/main/kotlin/world/phantasmal/web/core/widgets/UnavailableWidget.kt @@ -1,9 +1,9 @@ package world.phantasmal.web.core.widgets import org.w3c.dom.Node -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.falseCell -import world.phantasmal.observable.cell.trueCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.falseCell +import world.phantasmal.cell.trueCell import world.phantasmal.webui.dom.div import world.phantasmal.webui.widgets.Label import world.phantasmal.webui.widgets.Widget diff --git a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/controllers/MethodsForEpisodeController.kt b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/controllers/MethodsForEpisodeController.kt index e1df8fc1..34872f88 100644 --- a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/controllers/MethodsForEpisodeController.kt +++ b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/controllers/MethodsForEpisodeController.kt @@ -1,7 +1,11 @@ package world.phantasmal.web.huntOptimizer.controllers -import world.phantasmal.observable.cell.list.* -import world.phantasmal.observable.cell.mutableCell +import world.phantasmal.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.fileFormats.quest.NpcType import world.phantasmal.web.huntOptimizer.models.HuntMethodModel diff --git a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/controllers/OptimizationResultController.kt b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/controllers/OptimizationResultController.kt index 1d0b395b..d3ffb144 100644 --- a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/controllers/OptimizationResultController.kt +++ b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/controllers/OptimizationResultController.kt @@ -1,8 +1,8 @@ package world.phantasmal.web.huntOptimizer.controllers -import world.phantasmal.observable.cell.cell -import world.phantasmal.observable.cell.list.ListCell -import world.phantasmal.observable.cell.list.mapToList +import world.phantasmal.cell.cell +import world.phantasmal.cell.list.ListCell +import world.phantasmal.cell.list.mapToList import world.phantasmal.web.huntOptimizer.models.OptimalMethodModel import world.phantasmal.web.huntOptimizer.stores.HuntOptimizerStore import world.phantasmal.webui.controllers.Column diff --git a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/controllers/WantedItemsController.kt b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/controllers/WantedItemsController.kt index e81544ab..e981fe0e 100644 --- a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/controllers/WantedItemsController.kt +++ b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/controllers/WantedItemsController.kt @@ -1,10 +1,10 @@ package world.phantasmal.web.huntOptimizer.controllers -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.MutableCell -import world.phantasmal.observable.cell.list.ListCell -import world.phantasmal.observable.cell.list.filtered -import world.phantasmal.observable.cell.mutableCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.MutableCell +import world.phantasmal.cell.list.ListCell +import world.phantasmal.cell.list.filtered +import world.phantasmal.cell.mutableCell import world.phantasmal.web.huntOptimizer.models.WantedItemModel import world.phantasmal.web.huntOptimizer.stores.HuntOptimizerStore import world.phantasmal.web.shared.dto.ItemType diff --git a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/models/HuntMethodModel.kt b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/models/HuntMethodModel.kt index aab41923..6961cba9 100644 --- a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/models/HuntMethodModel.kt +++ b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/models/HuntMethodModel.kt @@ -2,9 +2,9 @@ package world.phantasmal.web.huntOptimizer.models import world.phantasmal.psolib.Episode import world.phantasmal.psolib.fileFormats.quest.NpcType -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.mutableCell -import world.phantasmal.observable.cell.orElse +import world.phantasmal.cell.Cell +import world.phantasmal.cell.mutableCell +import world.phantasmal.cell.orElse import kotlin.time.Duration class HuntMethodModel( diff --git a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/models/WantedItemModel.kt b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/models/WantedItemModel.kt index 8d2bcddd..81abb836 100644 --- a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/models/WantedItemModel.kt +++ b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/models/WantedItemModel.kt @@ -1,7 +1,7 @@ package world.phantasmal.web.huntOptimizer.models -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.mutableCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.mutableCell import world.phantasmal.web.shared.dto.ItemType class WantedItemModel(val itemType: ItemType, amount: Int) { diff --git a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/stores/HuntMethodStore.kt b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/stores/HuntMethodStore.kt index 8a791ca3..60204523 100644 --- a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/stores/HuntMethodStore.kt +++ b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/stores/HuntMethodStore.kt @@ -2,8 +2,8 @@ package world.phantasmal.web.huntOptimizer.stores import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -import world.phantasmal.observable.cell.list.ListCell -import world.phantasmal.observable.cell.list.mutableListCell +import world.phantasmal.cell.list.ListCell +import world.phantasmal.cell.list.mutableListCell import world.phantasmal.psolib.Episode import world.phantasmal.psolib.fileFormats.quest.NpcType import world.phantasmal.web.core.loading.AssetLoader diff --git a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/stores/HuntOptimizerStore.kt b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/stores/HuntOptimizerStore.kt index 6eadbe18..9bd7aedb 100644 --- a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/stores/HuntOptimizerStore.kt +++ b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/stores/HuntOptimizerStore.kt @@ -10,12 +10,12 @@ import world.phantasmal.core.component2 import world.phantasmal.core.disposable.Disposable import world.phantasmal.core.unsafe.UnsafeMap import world.phantasmal.core.unsafe.UnsafeSet -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.list.ListCell -import world.phantasmal.observable.cell.list.dependingOnElements -import world.phantasmal.observable.cell.list.mutableListCell -import world.phantasmal.observable.cell.mutableCell -import world.phantasmal.observable.observe +import world.phantasmal.cell.Cell +import world.phantasmal.cell.list.ListCell +import world.phantasmal.cell.list.dependingOnElements +import world.phantasmal.cell.list.mutableListCell +import world.phantasmal.cell.mutableCell +import world.phantasmal.cell.observe import world.phantasmal.psolib.fileFormats.quest.NpcType import world.phantasmal.web.core.models.Server import world.phantasmal.web.core.stores.EnemyDropTable diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/QuestRunner.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/QuestRunner.kt index 5c1aa4f1..8513aa52 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/QuestRunner.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/QuestRunner.kt @@ -1,7 +1,7 @@ package world.phantasmal.web.questEditor -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.falseCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.falseCell /** * Orchestrates everything related to emulating a quest run. Drives a VirtualMachine and diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/asm/AsmAnalyser.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/asm/AsmAnalyser.kt index 9525809e..49af8d03 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/asm/AsmAnalyser.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/asm/AsmAnalyser.kt @@ -9,13 +9,25 @@ import kotlinx.serialization.decodeFromString import kotlinx.serialization.encodeToString import mu.KotlinLogging import org.w3c.dom.Worker -import world.phantasmal.observable.ChangeEvent -import world.phantasmal.observable.Observable -import world.phantasmal.observable.cell.list.ListCell -import world.phantasmal.observable.cell.list.mutableListCell -import world.phantasmal.observable.emitter +import world.phantasmal.cell.Cell +import world.phantasmal.cell.MutableCell +import world.phantasmal.cell.list.ListCell +import world.phantasmal.cell.list.mutableListCell +import world.phantasmal.cell.mutableCell import world.phantasmal.web.shared.JSON_FORMAT -import world.phantasmal.web.shared.messages.* +import world.phantasmal.web.shared.messages.AsmChange +import world.phantasmal.web.shared.messages.AsmRange +import world.phantasmal.web.shared.messages.AssemblyProblem +import world.phantasmal.web.shared.messages.ClientMessage +import world.phantasmal.web.shared.messages.ClientNotification +import world.phantasmal.web.shared.messages.CompletionItem +import world.phantasmal.web.shared.messages.Hover +import world.phantasmal.web.shared.messages.Label +import world.phantasmal.web.shared.messages.Request +import world.phantasmal.web.shared.messages.Response +import world.phantasmal.web.shared.messages.ServerMessage +import world.phantasmal.web.shared.messages.ServerNotification +import world.phantasmal.web.shared.messages.SignatureHelp import kotlin.coroutines.Continuation import kotlin.coroutines.resume @@ -23,7 +35,7 @@ private val logger = KotlinLogging.logger {} class AsmAnalyser { private var inlineStackArgs: Boolean = true - private var _mapDesignations = emitter>() + private var _mapDesignations: MutableCell> = mutableCell(emptyMap()) private val _problems = mutableListCell() private val worker = Worker("/assembly-worker.js") @@ -34,7 +46,7 @@ class AsmAnalyser { */ private val inFlightRequests = mutableMapOf>() - val mapDesignations: Observable> = _mapDesignations + val mapDesignations: Cell> = _mapDesignations val problems: ListCell = _problems init { @@ -96,7 +108,7 @@ class AsmAnalyser { private fun receiveMessage(message: ServerMessage) = when (message) { is ServerNotification.MapDesignations -> { - _mapDesignations.emit(ChangeEvent(message.mapDesignations)) + _mapDesignations.value = message.mapDesignations } is ServerNotification.Problems -> { diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/AsmEditorController.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/AsmEditorController.kt index b6c4992d..0f7ad9d8 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/AsmEditorController.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/AsmEditorController.kt @@ -1,7 +1,12 @@ package world.phantasmal.web.questEditor.controllers -import world.phantasmal.observable.Observable -import world.phantasmal.observable.cell.* +import world.phantasmal.cell.Cell +import world.phantasmal.cell.isNull +import world.phantasmal.cell.map +import world.phantasmal.cell.not +import world.phantasmal.cell.or +import world.phantasmal.cell.orElse +import world.phantasmal.web.core.observable.Observable import world.phantasmal.web.externals.monacoEditor.ITextModel import world.phantasmal.web.externals.monacoEditor.createModel import world.phantasmal.web.questEditor.stores.AsmStore diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/EntityInfoController.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/EntityInfoController.kt index 6eca6c70..3329e657 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/EntityInfoController.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/EntityInfoController.kt @@ -2,11 +2,16 @@ package world.phantasmal.web.questEditor.controllers import world.phantasmal.core.math.degToRad import world.phantasmal.core.math.radToDeg -import world.phantasmal.observable.cell.* -import world.phantasmal.observable.cell.list.ListCell -import world.phantasmal.observable.cell.list.emptyListCell -import world.phantasmal.observable.cell.list.flatMapToList -import world.phantasmal.observable.cell.list.listMap +import world.phantasmal.cell.Cell +import world.phantasmal.cell.cell +import world.phantasmal.cell.flatMap +import world.phantasmal.cell.isNull +import world.phantasmal.cell.list.ListCell +import world.phantasmal.cell.list.emptyListCell +import world.phantasmal.cell.list.flatMapToList +import world.phantasmal.cell.list.listMap +import world.phantasmal.cell.map +import world.phantasmal.cell.zeroIntCell import world.phantasmal.psolib.fileFormats.quest.EntityPropType import world.phantasmal.web.core.euler import world.phantasmal.web.externals.three.Euler diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/EntityListController.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/EntityListController.kt index 8e4e4b83..3fc6f19e 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/EntityListController.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/EntityListController.kt @@ -4,8 +4,8 @@ import world.phantasmal.psolib.Episode import world.phantasmal.psolib.fileFormats.quest.EntityType import world.phantasmal.psolib.fileFormats.quest.NpcType import world.phantasmal.psolib.fileFormats.quest.ObjectType -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.map +import world.phantasmal.cell.Cell +import world.phantasmal.cell.map import world.phantasmal.web.questEditor.stores.QuestEditorStore import world.phantasmal.webui.controllers.Controller diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/EventsController.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/EventsController.kt index 2f1b6ceb..5ff95190 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/EventsController.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/EventsController.kt @@ -1,8 +1,12 @@ package world.phantasmal.web.questEditor.controllers -import world.phantasmal.observable.cell.* -import world.phantasmal.observable.cell.list.ListCell -import world.phantasmal.observable.cell.list.listCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.and +import world.phantasmal.cell.eq +import world.phantasmal.cell.isNotNull +import world.phantasmal.cell.isNull +import world.phantasmal.cell.list.ListCell +import world.phantasmal.cell.list.listCell import world.phantasmal.web.questEditor.commands.* import world.phantasmal.web.questEditor.models.QuestEventActionModel import world.phantasmal.web.questEditor.models.QuestEventModel diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/NpcCountsController.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/NpcCountsController.kt index 328f3b33..4ae48018 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/NpcCountsController.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/NpcCountsController.kt @@ -1,11 +1,11 @@ package world.phantasmal.web.questEditor.controllers import world.phantasmal.psolib.fileFormats.quest.NpcType -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.flatMap -import world.phantasmal.observable.cell.isNull -import world.phantasmal.observable.cell.list.emptyListCell -import world.phantasmal.observable.cell.map +import world.phantasmal.cell.Cell +import world.phantasmal.cell.flatMap +import world.phantasmal.cell.isNull +import world.phantasmal.cell.list.emptyListCell +import world.phantasmal.cell.map import world.phantasmal.web.questEditor.models.QuestNpcModel import world.phantasmal.web.questEditor.stores.QuestEditorStore import world.phantasmal.webui.controllers.Controller diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/QuestEditorToolbarController.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/QuestEditorToolbarController.kt index 00fa8ac6..e82fa167 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/QuestEditorToolbarController.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/QuestEditorToolbarController.kt @@ -3,7 +3,14 @@ package world.phantasmal.web.questEditor.controllers import kotlinx.coroutines.await import mu.KotlinLogging import world.phantasmal.core.* -import world.phantasmal.observable.cell.* +import world.phantasmal.cell.Cell +import world.phantasmal.cell.and +import world.phantasmal.cell.cell +import world.phantasmal.cell.flatMap +import world.phantasmal.cell.isNotNull +import world.phantasmal.cell.map +import world.phantasmal.cell.mutableCell +import world.phantasmal.cell.not import world.phantasmal.psolib.Endianness import world.phantasmal.psolib.Episode import world.phantasmal.psolib.fileFormats.quest.* diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/QuestInfoController.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/QuestInfoController.kt index 2be8f758..6151cd9d 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/QuestInfoController.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/QuestInfoController.kt @@ -1,6 +1,11 @@ package world.phantasmal.web.questEditor.controllers -import world.phantasmal.observable.cell.* +import world.phantasmal.cell.Cell +import world.phantasmal.cell.cell +import world.phantasmal.cell.emptyStringCell +import world.phantasmal.cell.flatMap +import world.phantasmal.cell.isNull +import world.phantasmal.cell.map import world.phantasmal.web.questEditor.commands.EditQuestPropertyCommand import world.phantasmal.web.questEditor.models.QuestModel import world.phantasmal.web.questEditor.stores.QuestEditorStore diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/AreaVariantModel.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/AreaVariantModel.kt index 925a839c..6bbd339c 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/AreaVariantModel.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/AreaVariantModel.kt @@ -1,8 +1,8 @@ package world.phantasmal.web.questEditor.models import world.phantasmal.core.requireNonNegative -import world.phantasmal.observable.cell.list.ListCell -import world.phantasmal.observable.cell.list.mutableListCell +import world.phantasmal.cell.list.ListCell +import world.phantasmal.cell.list.mutableListCell class AreaVariantModel(val id: Int, val area: AreaModel) { private val _sections = mutableListCell() diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestEntityModel.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestEntityModel.kt index 3aaf6b69..431333f8 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestEntityModel.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestEntityModel.kt @@ -2,11 +2,11 @@ package world.phantasmal.web.questEditor.models import world.phantasmal.psolib.fileFormats.quest.EntityType import world.phantasmal.psolib.fileFormats.quest.QuestEntity -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.list.ListCell -import world.phantasmal.observable.cell.list.listCell -import world.phantasmal.observable.cell.mutableCell -import world.phantasmal.observable.mutate +import world.phantasmal.cell.Cell +import world.phantasmal.cell.list.ListCell +import world.phantasmal.cell.list.listCell +import world.phantasmal.cell.mutableCell +import world.phantasmal.cell.mutate import world.phantasmal.web.core.minus import world.phantasmal.web.core.rendering.conversion.vec3ToEuler import world.phantasmal.web.core.rendering.conversion.vec3ToThree diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestEntityPropModel.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestEntityPropModel.kt index 5fac49a9..8bb9aa1f 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestEntityPropModel.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestEntityPropModel.kt @@ -4,9 +4,9 @@ import world.phantasmal.psolib.fileFormats.ninja.angleToRad import world.phantasmal.psolib.fileFormats.ninja.radToAngle import world.phantasmal.psolib.fileFormats.quest.EntityProp import world.phantasmal.psolib.fileFormats.quest.EntityPropType -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.MutableCell -import world.phantasmal.observable.cell.mutableCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.MutableCell +import world.phantasmal.cell.mutableCell import world.phantasmal.web.externals.three.Vector3 class QuestEntityPropModel(private val entity: QuestEntityModel<*, *>, prop: EntityProp) { diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestEventActionModel.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestEventActionModel.kt index ef85ca94..e702b622 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestEventActionModel.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestEventActionModel.kt @@ -1,7 +1,7 @@ package world.phantasmal.web.questEditor.models -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.mutableCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.mutableCell sealed class QuestEventActionModel { abstract val shortName: String diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestEventModel.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestEventModel.kt index ef152113..a4638843 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestEventModel.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestEventModel.kt @@ -1,10 +1,10 @@ package world.phantasmal.web.questEditor.models -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.list.ListCell -import world.phantasmal.observable.cell.list.SimpleListCell -import world.phantasmal.observable.cell.map -import world.phantasmal.observable.cell.mutableCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.list.ListCell +import world.phantasmal.cell.list.SimpleListCell +import world.phantasmal.cell.map +import world.phantasmal.cell.mutableCell class QuestEventModel( id: Int, diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestModel.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestModel.kt index 80282de9..41ce9b9e 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestModel.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestModel.kt @@ -3,13 +3,13 @@ package world.phantasmal.web.questEditor.models import world.phantasmal.psolib.Episode import world.phantasmal.psolib.asm.BytecodeIr import world.phantasmal.psolib.fileFormats.quest.DatUnknown -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.list.ListCell -import world.phantasmal.observable.cell.list.SimpleListCell -import world.phantasmal.observable.cell.list.flatMapToList -import world.phantasmal.observable.cell.list.listCell -import world.phantasmal.observable.cell.map -import world.phantasmal.observable.cell.mutableCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.list.ListCell +import world.phantasmal.cell.list.SimpleListCell +import world.phantasmal.cell.list.flatMapToList +import world.phantasmal.cell.list.listCell +import world.phantasmal.cell.map +import world.phantasmal.cell.mutableCell class QuestModel( id: Int, diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestNpcModel.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestNpcModel.kt index 67d63638..904d9158 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestNpcModel.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestNpcModel.kt @@ -2,9 +2,9 @@ package world.phantasmal.web.questEditor.models import world.phantasmal.psolib.fileFormats.quest.NpcType import world.phantasmal.psolib.fileFormats.quest.QuestNpc -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.map -import world.phantasmal.observable.cell.mutableCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.map +import world.phantasmal.cell.mutableCell class QuestNpcModel(npc: QuestNpc, waveId: Int) : QuestEntityModel(npc) { private val _waveId = mutableCell(waveId) diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestObjectModel.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestObjectModel.kt index d45dc31a..72ce30c6 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestObjectModel.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestObjectModel.kt @@ -2,8 +2,8 @@ package world.phantasmal.web.questEditor.models import world.phantasmal.psolib.fileFormats.quest.ObjectType import world.phantasmal.psolib.fileFormats.quest.QuestObject -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.mutableCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.mutableCell import world.phantasmal.web.core.rendering.conversion.vec3ToThree import world.phantasmal.web.externals.three.Vector3 diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/EntityMeshManager.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/EntityMeshManager.kt index 38c6810c..b4012790 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/EntityMeshManager.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/EntityMeshManager.kt @@ -5,7 +5,7 @@ import mu.KotlinLogging import org.khronos.webgl.Float32Array import world.phantasmal.core.disposable.DisposableSupervisedScope import world.phantasmal.core.disposable.Disposer -import world.phantasmal.observable.cell.observeNow +import world.phantasmal.cell.observeNow import world.phantasmal.psolib.fileFormats.quest.EntityType import world.phantasmal.web.core.rendering.disposeObject3DResources import world.phantasmal.web.externals.three.* diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/QuestEditorMeshManager.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/QuestEditorMeshManager.kt index 714d1ee0..c162e80f 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/QuestEditorMeshManager.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/QuestEditorMeshManager.kt @@ -1,11 +1,11 @@ package world.phantasmal.web.questEditor.rendering -import world.phantasmal.observable.cell.and -import world.phantasmal.observable.cell.eq -import world.phantasmal.observable.cell.flatMapNull -import world.phantasmal.observable.cell.list.emptyListCell -import world.phantasmal.observable.cell.list.filteredCell -import world.phantasmal.observable.cell.or +import world.phantasmal.cell.and +import world.phantasmal.cell.eq +import world.phantasmal.cell.flatMapNull +import world.phantasmal.cell.list.emptyListCell +import world.phantasmal.cell.list.filteredCell +import world.phantasmal.cell.or import world.phantasmal.web.questEditor.loading.AreaAssetLoader import world.phantasmal.web.questEditor.loading.EntityAssetLoader import world.phantasmal.web.questEditor.stores.QuestEditorStore diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/QuestMeshManager.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/QuestMeshManager.kt index 1f4c9225..9b6eda4b 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/QuestMeshManager.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/QuestMeshManager.kt @@ -5,8 +5,8 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.launch import world.phantasmal.core.disposable.Disposable import world.phantasmal.core.disposable.DisposableSupervisedScope -import world.phantasmal.observable.cell.list.ListCell -import world.phantasmal.observable.cell.list.ListChangeEvent +import world.phantasmal.cell.list.ListCell +import world.phantasmal.cell.list.ListChangeEvent import world.phantasmal.psolib.Episode import world.phantasmal.web.questEditor.loading.AreaAssetLoader import world.phantasmal.web.questEditor.loading.EntityAssetLoader diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/input/state/StateContext.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/input/state/StateContext.kt index 37b45e37..28d461b7 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/input/state/StateContext.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/input/state/StateContext.kt @@ -2,8 +2,8 @@ package world.phantasmal.web.questEditor.rendering.input.state import mu.KotlinLogging import world.phantasmal.core.asJsArray -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.flatMapNull +import world.phantasmal.cell.Cell +import world.phantasmal.cell.flatMapNull import world.phantasmal.psolib.fileFormats.ninja.XjObject import world.phantasmal.web.core.dot import world.phantasmal.web.core.minusAssign diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/AsmStore.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/AsmStore.kt index 2b902018..4714e902 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/AsmStore.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/AsmStore.kt @@ -5,13 +5,13 @@ import kotlinx.coroutines.launch import world.phantasmal.core.Severity import world.phantasmal.core.disposable.Disposer import world.phantasmal.core.disposable.disposable -import world.phantasmal.observable.Observable -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.list.ListCell -import world.phantasmal.observable.cell.mutableCell -import world.phantasmal.observable.mutateDeferred +import world.phantasmal.cell.Cell +import world.phantasmal.cell.list.ListCell +import world.phantasmal.cell.mutableCell +import world.phantasmal.cell.mutateDeferred import world.phantasmal.psolib.asm.assemble import world.phantasmal.psolib.asm.disassemble +import world.phantasmal.web.core.observable.Observable import world.phantasmal.web.core.undo.UndoManager import world.phantasmal.web.externals.monacoEditor.* import world.phantasmal.web.questEditor.asm.AsmAnalyser diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/QuestEditorStore.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/QuestEditorStore.kt index 4daa07c4..b2ce9891 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/QuestEditorStore.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/QuestEditorStore.kt @@ -2,12 +2,18 @@ package world.phantasmal.web.questEditor.stores import kotlinx.coroutines.launch import mu.KotlinLogging -import world.phantasmal.observable.cell.* -import world.phantasmal.observable.cell.list.ListCell -import world.phantasmal.observable.cell.list.emptyListCell -import world.phantasmal.observable.cell.list.filtered -import world.phantasmal.observable.cell.list.flatMapToList -import world.phantasmal.observable.mutate +import world.phantasmal.cell.Cell +import world.phantasmal.cell.and +import world.phantasmal.cell.flatMapNull +import world.phantasmal.cell.isNotNull +import world.phantasmal.cell.list.ListCell +import world.phantasmal.cell.list.emptyListCell +import world.phantasmal.cell.list.filtered +import world.phantasmal.cell.list.flatMapToList +import world.phantasmal.cell.map +import world.phantasmal.cell.mutableCell +import world.phantasmal.cell.mutate +import world.phantasmal.cell.not import world.phantasmal.psolib.Episode import world.phantasmal.web.core.PwToolType import world.phantasmal.web.core.commands.Command diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/undo/TextModelUndo.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/undo/TextModelUndo.kt index 8ae07cc9..3397cc2b 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/undo/TextModelUndo.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/undo/TextModelUndo.kt @@ -2,12 +2,16 @@ package world.phantasmal.web.questEditor.undo import world.phantasmal.core.disposable.Disposable import world.phantasmal.core.disposable.TrackedDisposable -import world.phantasmal.observable.ChangeEvent -import world.phantasmal.observable.Observable -import world.phantasmal.observable.cell.* -import world.phantasmal.observable.emitter -import world.phantasmal.observable.mutateDeferred +import world.phantasmal.cell.Cell +import world.phantasmal.cell.MutableCell +import world.phantasmal.cell.eq +import world.phantasmal.cell.map +import world.phantasmal.cell.mutableCell +import world.phantasmal.cell.observeNow +import world.phantasmal.cell.mutateDeferred import world.phantasmal.web.core.commands.Command +import world.phantasmal.web.core.observable.Observable +import world.phantasmal.web.core.observable.emitter import world.phantasmal.web.core.undo.Undo import world.phantasmal.web.core.undo.UndoManager import world.phantasmal.web.externals.monacoEditor.IDisposable @@ -22,11 +26,11 @@ class TextModelUndo( override val description: String get() = this@TextModelUndo.description override fun execute() { - _didRedo.emit(ChangeEvent(Unit)) + _didRedo.emit(Unit) } override fun undo() { - _didUndo.emit(ChangeEvent(Unit)) + _didUndo.emit(Unit) } } diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/AsmEditorWidget.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/AsmEditorWidget.kt index 4d2ed1eb..9664303b 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/AsmEditorWidget.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/AsmEditorWidget.kt @@ -2,7 +2,7 @@ package world.phantasmal.web.questEditor.widgets import org.w3c.dom.Node import world.phantasmal.core.disposable.disposable -import world.phantasmal.observable.mutateDeferred +import world.phantasmal.cell.mutateDeferred import world.phantasmal.web.externals.monacoEditor.* import world.phantasmal.web.questEditor.asm.monaco.EditorHistory import world.phantasmal.web.questEditor.controllers.AsmEditorController @@ -61,7 +61,7 @@ class AsmEditorWidget(private val ctrl: AsmEditorController) : Widget() { }) // Undo/redo. - observe(ctrl.didUndo) { + addDisposable(ctrl.didUndo.observe { editor.focus() mutateDeferred { @@ -73,9 +73,9 @@ class AsmEditorWidget(private val ctrl: AsmEditorController) : Widget() { ) } } - } + }) - observe(ctrl.didRedo) { + addDisposable(ctrl.didRedo.observe { editor.focus() mutateDeferred { @@ -87,7 +87,7 @@ class AsmEditorWidget(private val ctrl: AsmEditorController) : Widget() { ) } } - } + }) editor.onDidFocusEditorWidget(ctrl::makeUndoCurrent) @@ -129,7 +129,8 @@ class AsmEditorWidget(private val ctrl: AsmEditorController) : Widget() { .pw-quest-editor-asm-editor .editor-widget { z-index: 30; } - """.trimIndent()) + """.trimIndent() + ) } } } diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EntityInfoWidget.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EntityInfoWidget.kt index 3a73ca1a..df754d45 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EntityInfoWidget.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EntityInfoWidget.kt @@ -5,9 +5,9 @@ import kotlinx.coroutines.launch import org.w3c.dom.Node import world.phantasmal.core.disposable.Disposable import world.phantasmal.core.disposable.Disposer -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.cell -import world.phantasmal.observable.cell.mutableCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.cell +import world.phantasmal.cell.mutableCell import world.phantasmal.web.core.widgets.UnavailableWidget import world.phantasmal.web.questEditor.controllers.EntityInfoController import world.phantasmal.web.questEditor.controllers.EntityInfoPropModel diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EventActionWidget.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EventActionWidget.kt index 1fec8f52..45ea2a1c 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EventActionWidget.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EventActionWidget.kt @@ -1,7 +1,7 @@ package world.phantasmal.web.questEditor.widgets import org.w3c.dom.Node -import world.phantasmal.observable.cell.cell +import world.phantasmal.cell.cell import world.phantasmal.web.questEditor.controllers.EventsController import world.phantasmal.web.questEditor.models.QuestEventActionModel import world.phantasmal.web.questEditor.models.QuestEventModel diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EventWidget.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EventWidget.kt index 2280d527..0c8c9ac4 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EventWidget.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EventWidget.kt @@ -1,7 +1,7 @@ package world.phantasmal.web.questEditor.widgets import org.w3c.dom.* -import world.phantasmal.observable.cell.map +import world.phantasmal.cell.map import world.phantasmal.web.questEditor.controllers.EventsController import world.phantasmal.web.questEditor.models.QuestEventModel import world.phantasmal.webui.dom.* diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EventsWidget.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EventsWidget.kt index 0348190b..2dbfaef9 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EventsWidget.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EventsWidget.kt @@ -1,7 +1,7 @@ package world.phantasmal.web.questEditor.widgets import org.w3c.dom.Node -import world.phantasmal.observable.cell.cell +import world.phantasmal.cell.cell import world.phantasmal.web.core.widgets.UnavailableWidget import world.phantasmal.web.questEditor.controllers.EventsController import world.phantasmal.webui.dom.Icon diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/QuestEditorToolbarWidget.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/QuestEditorToolbarWidget.kt index d2377246..01dda0fe 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/QuestEditorToolbarWidget.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/QuestEditorToolbarWidget.kt @@ -5,8 +5,8 @@ import org.w3c.dom.Node import org.w3c.dom.events.KeyboardEvent import world.phantasmal.psolib.Episode import world.phantasmal.psolib.fileFormats.quest.Version -import world.phantasmal.observable.cell.cell -import world.phantasmal.observable.cell.list.listCell +import world.phantasmal.cell.cell +import world.phantasmal.cell.list.listCell import world.phantasmal.web.questEditor.controllers.QuestEditorToolbarController import world.phantasmal.webui.dom.Icon import world.phantasmal.webui.dom.div diff --git a/web/src/main/kotlin/world/phantasmal/web/viewer/controllers/CharacterClassOptionsController.kt b/web/src/main/kotlin/world/phantasmal/web/viewer/controllers/CharacterClassOptionsController.kt index 4a34305b..34b6d4e1 100644 --- a/web/src/main/kotlin/world/phantasmal/web/viewer/controllers/CharacterClassOptionsController.kt +++ b/web/src/main/kotlin/world/phantasmal/web/viewer/controllers/CharacterClassOptionsController.kt @@ -1,9 +1,9 @@ package world.phantasmal.web.viewer.controllers -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.isNotNull -import world.phantasmal.observable.cell.map -import world.phantasmal.observable.cell.plus +import world.phantasmal.cell.Cell +import world.phantasmal.cell.isNotNull +import world.phantasmal.cell.map +import world.phantasmal.cell.plus import world.phantasmal.web.shared.dto.SectionId import world.phantasmal.web.viewer.stores.ViewerStore import world.phantasmal.webui.controllers.Controller diff --git a/web/src/main/kotlin/world/phantasmal/web/viewer/controllers/ViewerController.kt b/web/src/main/kotlin/world/phantasmal/web/viewer/controllers/ViewerController.kt index 0797d63a..5fda6ac5 100644 --- a/web/src/main/kotlin/world/phantasmal/web/viewer/controllers/ViewerController.kt +++ b/web/src/main/kotlin/world/phantasmal/web/viewer/controllers/ViewerController.kt @@ -1,6 +1,6 @@ package world.phantasmal.web.viewer.controllers -import world.phantasmal.observable.cell.Cell +import world.phantasmal.cell.Cell import world.phantasmal.web.core.PwToolType import world.phantasmal.web.core.controllers.PathAwareTab import world.phantasmal.web.core.controllers.PathAwareTabContainerController diff --git a/web/src/main/kotlin/world/phantasmal/web/viewer/controllers/ViewerToolbarController.kt b/web/src/main/kotlin/world/phantasmal/web/viewer/controllers/ViewerToolbarController.kt index 31dc923f..433580a1 100644 --- a/web/src/main/kotlin/world/phantasmal/web/viewer/controllers/ViewerToolbarController.kt +++ b/web/src/main/kotlin/world/phantasmal/web/viewer/controllers/ViewerToolbarController.kt @@ -13,11 +13,11 @@ import world.phantasmal.psolib.fileFormats.ninja.* import world.phantasmal.psolib.fileFormats.parseAfs import world.phantasmal.psolib.fileFormats.parseAreaCollisionGeometry import world.phantasmal.psolib.fileFormats.parseAreaRenderGeometry -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.isNotNull -import world.phantasmal.observable.cell.map -import world.phantasmal.observable.cell.mutableCell -import world.phantasmal.observable.mutate +import world.phantasmal.cell.Cell +import world.phantasmal.cell.isNotNull +import world.phantasmal.cell.map +import world.phantasmal.cell.mutableCell +import world.phantasmal.cell.mutate import world.phantasmal.web.core.files.cursor import world.phantasmal.web.viewer.stores.NinjaGeometry import world.phantasmal.web.viewer.stores.ViewerStore diff --git a/web/src/main/kotlin/world/phantasmal/web/viewer/stores/ViewerStore.kt b/web/src/main/kotlin/world/phantasmal/web/viewer/stores/ViewerStore.kt index 9fc10d05..d91afffb 100644 --- a/web/src/main/kotlin/world/phantasmal/web/viewer/stores/ViewerStore.kt +++ b/web/src/main/kotlin/world/phantasmal/web/viewer/stores/ViewerStore.kt @@ -4,13 +4,13 @@ import kotlinx.coroutines.launch import mu.KotlinLogging import world.phantasmal.core.enumValueOfOrNull import world.phantasmal.core.math.clamp -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.and -import world.phantasmal.observable.cell.list.ListCell -import world.phantasmal.observable.cell.list.mutableListCell -import world.phantasmal.observable.cell.map -import world.phantasmal.observable.cell.mutableCell -import world.phantasmal.observable.mutate +import world.phantasmal.cell.Cell +import world.phantasmal.cell.and +import world.phantasmal.cell.list.ListCell +import world.phantasmal.cell.list.mutableListCell +import world.phantasmal.cell.map +import world.phantasmal.cell.mutableCell +import world.phantasmal.cell.mutate import world.phantasmal.psolib.fileFormats.AreaGeometry import world.phantasmal.psolib.fileFormats.CollisionGeometry import world.phantasmal.psolib.fileFormats.ninja.NinjaObject diff --git a/web/src/main/kotlin/world/phantasmal/web/viewer/widgets/CharacterClassOptionsWidget.kt b/web/src/main/kotlin/world/phantasmal/web/viewer/widgets/CharacterClassOptionsWidget.kt index 3d04e13f..cae94f4f 100644 --- a/web/src/main/kotlin/world/phantasmal/web/viewer/widgets/CharacterClassOptionsWidget.kt +++ b/web/src/main/kotlin/world/phantasmal/web/viewer/widgets/CharacterClassOptionsWidget.kt @@ -2,7 +2,7 @@ package world.phantasmal.web.viewer.widgets import kotlinx.coroutines.launch import org.w3c.dom.Node -import world.phantasmal.observable.cell.cell +import world.phantasmal.cell.cell import world.phantasmal.web.shared.dto.SectionId import world.phantasmal.web.viewer.controllers.CharacterClassOptionsController import world.phantasmal.webui.dom.div diff --git a/web/src/main/kotlin/world/phantasmal/web/viewer/widgets/SelectionWidget.kt b/web/src/main/kotlin/world/phantasmal/web/viewer/widgets/SelectionWidget.kt index 3a407534..56359c7b 100644 --- a/web/src/main/kotlin/world/phantasmal/web/viewer/widgets/SelectionWidget.kt +++ b/web/src/main/kotlin/world/phantasmal/web/viewer/widgets/SelectionWidget.kt @@ -1,8 +1,8 @@ package world.phantasmal.web.viewer.widgets import org.w3c.dom.Node -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.eq +import world.phantasmal.cell.Cell +import world.phantasmal.cell.eq import world.phantasmal.webui.dom.li import world.phantasmal.webui.dom.ul import world.phantasmal.webui.widgets.Widget diff --git a/web/src/test/kotlin/world/phantasmal/web/core/observable/EmitterTests.kt b/web/src/test/kotlin/world/phantasmal/web/core/observable/EmitterTests.kt new file mode 100644 index 00000000..88d06aaf --- /dev/null +++ b/web/src/test/kotlin/world/phantasmal/web/core/observable/EmitterTests.kt @@ -0,0 +1,53 @@ +package world.phantasmal.web.core.observable + +import world.phantasmal.web.test.WebTestSuite +import kotlin.test.Test +import kotlin.test.assertEquals + +class EmitterTests : WebTestSuite { + @Test + fun calls_observers_when_events_are_emitted() = test { + val emitter = Emitter() + var changes = 0 + + disposer.add( + emitter.observe { + assertEquals(changes, it) + changes++ + } + ) + + emitter.emit(0) + + assertEquals(1, changes) + + emitter.emit(1) + emitter.emit(2) + emitter.emit(3) + + assertEquals(4, changes) + } + + @Test + fun does_not_call_observers_after_they_are_disposed() = test { + val emitter = Emitter() + var changes = 0 + + val observer = emitter.observe { + assertEquals(changes, it) + changes++ + } + + emitter.emit(0) + + assertEquals(1, changes) + + observer.dispose() + + emitter.emit(1) + emitter.emit(2) + emitter.emit(3) + + assertEquals(1, changes) + } +} diff --git a/webui/build.gradle.kts b/webui/build.gradle.kts index 8f9bb36f..3f6a5ef1 100644 --- a/webui/build.gradle.kts +++ b/webui/build.gradle.kts @@ -4,7 +4,7 @@ plugins { dependencies { api(project(":core")) - api(project(":observable")) + api(project(":cell")) implementation(npm("@fortawesome/fontawesome-svg-core", "^1.2.36")) implementation(npm("@fortawesome/free-regular-svg-icons", "^5.15.4")) implementation(npm("@fortawesome/free-solid-svg-icons", "^5.15.4")) diff --git a/webui/src/main/kotlin/world/phantasmal/webui/DisposableContainer.kt b/webui/src/main/kotlin/world/phantasmal/webui/DisposableContainer.kt index d2abe958..42cccf74 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/DisposableContainer.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/DisposableContainer.kt @@ -3,10 +3,9 @@ package world.phantasmal.webui import world.phantasmal.core.disposable.Disposable import world.phantasmal.core.disposable.Disposer import world.phantasmal.core.disposable.TrackedDisposable -import world.phantasmal.observable.Observable -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.observeNow -import world.phantasmal.observable.observe +import world.phantasmal.cell.Cell +import world.phantasmal.cell.observe +import world.phantasmal.cell.observeNow abstract class DisposableContainer : TrackedDisposable() { private val disposer = Disposer() @@ -31,10 +30,10 @@ abstract class DisposableContainer : TrackedDisposable() { } protected fun observe( - o1: Observable, + c1: Cell, observer: (T) -> Unit, ) { - addDisposable(o1.observe(observer)) + addDisposable(c1.observe(observer)) } protected fun observeNow( @@ -49,7 +48,7 @@ abstract class DisposableContainer : TrackedDisposable() { c2: Cell, observer: (T1, T2) -> Unit, ) { - addDisposable(world.phantasmal.observable.cell.observeNow(c1, c2, observer)) + addDisposable(world.phantasmal.cell.observeNow(c1, c2, observer)) } protected fun observeNow( @@ -58,7 +57,7 @@ abstract class DisposableContainer : TrackedDisposable() { c3: Cell, observer: (T1, T2, T3) -> Unit, ) { - addDisposable(world.phantasmal.observable.cell.observeNow(c1, c2, c3, observer)) + addDisposable(world.phantasmal.cell.observeNow(c1, c2, c3, observer)) } protected fun observeNow( @@ -68,7 +67,7 @@ abstract class DisposableContainer : TrackedDisposable() { c4: Cell, observer: (T1, T2, T3, T4) -> Unit, ) { - addDisposable(world.phantasmal.observable.cell.observeNow(c1, c2, c3, c4, observer)) + addDisposable(world.phantasmal.cell.observeNow(c1, c2, c3, c4, observer)) } protected fun observeNow( @@ -79,6 +78,6 @@ abstract class DisposableContainer : TrackedDisposable() { c5: Cell, observer: (T1, T2, T3, T4, T5) -> Unit, ) { - addDisposable(world.phantasmal.observable.cell.observeNow(c1, c2, c3, c4, c5, observer)) + addDisposable(world.phantasmal.cell.observeNow(c1, c2, c3, c4, c5, observer)) } } diff --git a/webui/src/main/kotlin/world/phantasmal/webui/LoadingStatusCell.kt b/webui/src/main/kotlin/world/phantasmal/webui/LoadingStatusCell.kt index b17e2bb4..3b75a4be 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/LoadingStatusCell.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/LoadingStatusCell.kt @@ -2,8 +2,8 @@ package world.phantasmal.webui import kotlinx.coroutines.* import mu.KotlinLogging -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.SimpleCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.SimpleCell import kotlin.time.measureTime private val logger = KotlinLogging.logger {} diff --git a/webui/src/main/kotlin/world/phantasmal/webui/controllers/TabContainerController.kt b/webui/src/main/kotlin/world/phantasmal/webui/controllers/TabContainerController.kt index efd5062c..16d389be 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/controllers/TabContainerController.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/controllers/TabContainerController.kt @@ -1,6 +1,6 @@ package world.phantasmal.webui.controllers -import world.phantasmal.observable.cell.Cell +import world.phantasmal.cell.Cell interface Tab { val title: String diff --git a/webui/src/main/kotlin/world/phantasmal/webui/controllers/TableController.kt b/webui/src/main/kotlin/world/phantasmal/webui/controllers/TableController.kt index 8940bdf2..62c7dfda 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/controllers/TableController.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/controllers/TableController.kt @@ -1,8 +1,8 @@ package world.phantasmal.webui.controllers -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.list.ListCell -import world.phantasmal.observable.cell.nullCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.list.ListCell +import world.phantasmal.cell.nullCell import world.phantasmal.webui.LoadingStatusCell class Column( diff --git a/webui/src/main/kotlin/world/phantasmal/webui/dom/Dom.kt b/webui/src/main/kotlin/world/phantasmal/webui/dom/Dom.kt index 2bb317d1..c5c0d751 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/dom/Dom.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/dom/Dom.kt @@ -12,9 +12,9 @@ import world.phantasmal.core.disposable.Disposer import world.phantasmal.core.disposable.disposable import world.phantasmal.core.unsafe.UnsafeMap import world.phantasmal.core.unsafe.getOrPut -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.list.ListCell -import world.phantasmal.observable.cell.list.ListChangeEvent +import world.phantasmal.cell.Cell +import world.phantasmal.cell.list.ListCell +import world.phantasmal.cell.list.ListChangeEvent import world.phantasmal.webui.externals.fontawesome.IconDefinition import world.phantasmal.webui.externals.fontawesome.freeBrandsSvgIcons.faGithub import world.phantasmal.webui.externals.fontawesome.freeRegularSvgIcons.faCaretSquareRight diff --git a/webui/src/main/kotlin/world/phantasmal/webui/dom/HTMLElementSizeCell.kt b/webui/src/main/kotlin/world/phantasmal/webui/dom/HTMLElementSizeCell.kt index 63a98e44..dd3edcfb 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/dom/HTMLElementSizeCell.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/dom/HTMLElementSizeCell.kt @@ -4,9 +4,9 @@ import org.w3c.dom.HTMLElement import world.phantasmal.core.ResizeObserver import world.phantasmal.core.ResizeObserverEntry import world.phantasmal.core.unsafe.unsafeAssertNotNull -import world.phantasmal.observable.ChangeEvent -import world.phantasmal.observable.Dependent -import world.phantasmal.observable.cell.AbstractCell +import world.phantasmal.cell.ChangeEvent +import world.phantasmal.cell.Dependent +import world.phantasmal.cell.AbstractCell data class Size(val width: Double, val height: Double) diff --git a/webui/src/main/kotlin/world/phantasmal/webui/widgets/Button.kt b/webui/src/main/kotlin/world/phantasmal/webui/widgets/Button.kt index b8d4bc17..6e8744bd 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/widgets/Button.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/widgets/Button.kt @@ -3,9 +3,9 @@ package world.phantasmal.webui.widgets import org.w3c.dom.Node import org.w3c.dom.events.KeyboardEvent import org.w3c.dom.events.MouseEvent -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.nullCell -import world.phantasmal.observable.cell.trueCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.nullCell +import world.phantasmal.cell.trueCell import world.phantasmal.webui.dom.Icon import world.phantasmal.webui.dom.button import world.phantasmal.webui.dom.icon diff --git a/webui/src/main/kotlin/world/phantasmal/webui/widgets/Checkbox.kt b/webui/src/main/kotlin/world/phantasmal/webui/widgets/Checkbox.kt index c676626a..0c768ddf 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/widgets/Checkbox.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/widgets/Checkbox.kt @@ -1,9 +1,9 @@ package world.phantasmal.webui.widgets import org.w3c.dom.Node -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.nullCell -import world.phantasmal.observable.cell.trueCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.nullCell +import world.phantasmal.cell.trueCell import world.phantasmal.webui.dom.input class Checkbox( diff --git a/webui/src/main/kotlin/world/phantasmal/webui/widgets/ComboBox.kt b/webui/src/main/kotlin/world/phantasmal/webui/widgets/ComboBox.kt index 13abb07d..a1d17784 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/widgets/ComboBox.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/widgets/ComboBox.kt @@ -4,8 +4,12 @@ import org.w3c.dom.HTMLInputElement import org.w3c.dom.Node import org.w3c.dom.events.KeyboardEvent import org.w3c.dom.events.MouseEvent -import world.phantasmal.observable.cell.* -import world.phantasmal.observable.cell.list.emptyListCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.list.emptyListCell +import world.phantasmal.cell.mutableCell +import world.phantasmal.cell.not +import world.phantasmal.cell.nullCell +import world.phantasmal.cell.trueCell import world.phantasmal.webui.dom.* class ComboBox( diff --git a/webui/src/main/kotlin/world/phantasmal/webui/widgets/Control.kt b/webui/src/main/kotlin/world/phantasmal/webui/widgets/Control.kt index 57c54def..5f400d9f 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/widgets/Control.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/widgets/Control.kt @@ -1,6 +1,6 @@ package world.phantasmal.webui.widgets -import world.phantasmal.observable.cell.Cell +import world.phantasmal.cell.Cell /** * Represents all widgets that allow for user interaction such as buttons, text inputs, combo boxes, diff --git a/webui/src/main/kotlin/world/phantasmal/webui/widgets/Dialog.kt b/webui/src/main/kotlin/world/phantasmal/webui/widgets/Dialog.kt index 5a536303..0be6e3e5 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/widgets/Dialog.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/widgets/Dialog.kt @@ -7,10 +7,10 @@ import org.w3c.dom.events.Event import org.w3c.dom.events.KeyboardEvent import org.w3c.dom.get import org.w3c.dom.pointerevents.PointerEvent -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.emptyStringCell -import world.phantasmal.observable.cell.isEmpty -import world.phantasmal.observable.cell.trueCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.emptyStringCell +import world.phantasmal.cell.isEmpty +import world.phantasmal.cell.trueCell import world.phantasmal.webui.dom.div import world.phantasmal.webui.dom.dom import world.phantasmal.webui.dom.h1 diff --git a/webui/src/main/kotlin/world/phantasmal/webui/widgets/DoubleInput.kt b/webui/src/main/kotlin/world/phantasmal/webui/widgets/DoubleInput.kt index 2dec1e3d..3d363ba9 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/widgets/DoubleInput.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/widgets/DoubleInput.kt @@ -1,10 +1,10 @@ package world.phantasmal.webui.widgets import org.w3c.dom.HTMLInputElement -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.cell -import world.phantasmal.observable.cell.nullCell -import world.phantasmal.observable.cell.trueCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.cell +import world.phantasmal.cell.nullCell +import world.phantasmal.cell.trueCell import kotlin.math.abs import kotlin.math.pow import kotlin.math.round diff --git a/webui/src/main/kotlin/world/phantasmal/webui/widgets/DropDown.kt b/webui/src/main/kotlin/world/phantasmal/webui/widgets/DropDown.kt index 5e149738..c5d06a48 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/widgets/DropDown.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/widgets/DropDown.kt @@ -3,11 +3,11 @@ package world.phantasmal.webui.widgets import org.w3c.dom.Node import org.w3c.dom.events.KeyboardEvent import org.w3c.dom.events.MouseEvent -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.list.emptyListCell -import world.phantasmal.observable.cell.mutableCell -import world.phantasmal.observable.cell.nullCell -import world.phantasmal.observable.cell.trueCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.list.emptyListCell +import world.phantasmal.cell.mutableCell +import world.phantasmal.cell.nullCell +import world.phantasmal.cell.trueCell import world.phantasmal.webui.dom.Icon import world.phantasmal.webui.dom.div diff --git a/webui/src/main/kotlin/world/phantasmal/webui/widgets/DurationInput.kt b/webui/src/main/kotlin/world/phantasmal/webui/widgets/DurationInput.kt index ce947028..6d1e737d 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/widgets/DurationInput.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/widgets/DurationInput.kt @@ -1,9 +1,9 @@ package world.phantasmal.webui.widgets import org.w3c.dom.HTMLInputElement -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.nullCell -import world.phantasmal.observable.cell.trueCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.nullCell +import world.phantasmal.cell.trueCell import world.phantasmal.webui.formatAsHoursAndMinutes import kotlin.time.Duration diff --git a/webui/src/main/kotlin/world/phantasmal/webui/widgets/FileButton.kt b/webui/src/main/kotlin/world/phantasmal/webui/widgets/FileButton.kt index 13a34c90..7877dcac 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/widgets/FileButton.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/widgets/FileButton.kt @@ -2,9 +2,9 @@ package world.phantasmal.webui.widgets import kotlinx.coroutines.launch import org.w3c.dom.HTMLElement -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.nullCell -import world.phantasmal.observable.cell.trueCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.nullCell +import world.phantasmal.cell.trueCell import world.phantasmal.webui.dom.Icon import world.phantasmal.webui.files.FileHandle import world.phantasmal.webui.files.FileType diff --git a/webui/src/main/kotlin/world/phantasmal/webui/widgets/Input.kt b/webui/src/main/kotlin/world/phantasmal/webui/widgets/Input.kt index c5edf5f0..3cf18a5e 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/widgets/Input.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/widgets/Input.kt @@ -2,7 +2,7 @@ package world.phantasmal.webui.widgets import org.w3c.dom.HTMLInputElement import org.w3c.dom.Node -import world.phantasmal.observable.cell.Cell +import world.phantasmal.cell.Cell import world.phantasmal.webui.dom.input import world.phantasmal.webui.dom.span diff --git a/webui/src/main/kotlin/world/phantasmal/webui/widgets/IntInput.kt b/webui/src/main/kotlin/world/phantasmal/webui/widgets/IntInput.kt index 29a468cf..138bfcc9 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/widgets/IntInput.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/widgets/IntInput.kt @@ -1,10 +1,10 @@ package world.phantasmal.webui.widgets import org.w3c.dom.HTMLInputElement -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.cell -import world.phantasmal.observable.cell.nullCell -import world.phantasmal.observable.cell.trueCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.cell +import world.phantasmal.cell.nullCell +import world.phantasmal.cell.trueCell class IntInput( visible: Cell = trueCell(), diff --git a/webui/src/main/kotlin/world/phantasmal/webui/widgets/Label.kt b/webui/src/main/kotlin/world/phantasmal/webui/widgets/Label.kt index 04718844..d535925f 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/widgets/Label.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/widgets/Label.kt @@ -1,8 +1,8 @@ package world.phantasmal.webui.widgets import org.w3c.dom.Node -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.trueCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.trueCell import world.phantasmal.webui.dom.label class Label( diff --git a/webui/src/main/kotlin/world/phantasmal/webui/widgets/LabelledControl.kt b/webui/src/main/kotlin/world/phantasmal/webui/widgets/LabelledControl.kt index 33b4ce47..29518b65 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/widgets/LabelledControl.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/widgets/LabelledControl.kt @@ -1,6 +1,6 @@ package world.phantasmal.webui.widgets -import world.phantasmal.observable.cell.Cell +import world.phantasmal.cell.Cell enum class LabelPosition { Before, diff --git a/webui/src/main/kotlin/world/phantasmal/webui/widgets/LazyLoader.kt b/webui/src/main/kotlin/world/phantasmal/webui/widgets/LazyLoader.kt index b2e47ebe..03a6ac01 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/widgets/LazyLoader.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/widgets/LazyLoader.kt @@ -1,9 +1,9 @@ package world.phantasmal.webui.widgets import org.w3c.dom.Node -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.trueCell -import world.phantasmal.observable.mutateDeferred +import world.phantasmal.cell.Cell +import world.phantasmal.cell.trueCell +import world.phantasmal.cell.mutateDeferred import world.phantasmal.webui.dom.div class LazyLoader( diff --git a/webui/src/main/kotlin/world/phantasmal/webui/widgets/Menu.kt b/webui/src/main/kotlin/world/phantasmal/webui/widgets/Menu.kt index b6b419f1..72aeda46 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/widgets/Menu.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/widgets/Menu.kt @@ -6,10 +6,10 @@ import org.w3c.dom.events.Event import org.w3c.dom.events.KeyboardEvent import org.w3c.dom.events.MouseEvent import world.phantasmal.core.disposable.Disposable -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.list.emptyListCell -import world.phantasmal.observable.cell.nullCell -import world.phantasmal.observable.cell.trueCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.list.emptyListCell +import world.phantasmal.cell.nullCell +import world.phantasmal.cell.trueCell import world.phantasmal.webui.dom.disposableListener import world.phantasmal.webui.dom.div import world.phantasmal.webui.obj diff --git a/webui/src/main/kotlin/world/phantasmal/webui/widgets/NumberInput.kt b/webui/src/main/kotlin/world/phantasmal/webui/widgets/NumberInput.kt index fb5e8082..54c36296 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/widgets/NumberInput.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/widgets/NumberInput.kt @@ -1,7 +1,7 @@ package world.phantasmal.webui.widgets import org.w3c.dom.HTMLInputElement -import world.phantasmal.observable.cell.Cell +import world.phantasmal.cell.Cell abstract class NumberInput( visible: Cell, diff --git a/webui/src/main/kotlin/world/phantasmal/webui/widgets/ResultDialog.kt b/webui/src/main/kotlin/world/phantasmal/webui/widgets/ResultDialog.kt index 0114e018..cabc2f63 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/widgets/ResultDialog.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/widgets/ResultDialog.kt @@ -3,7 +3,11 @@ package world.phantasmal.webui.widgets import org.w3c.dom.Node import world.phantasmal.core.Failure import world.phantasmal.core.PwResult -import world.phantasmal.observable.cell.* +import world.phantasmal.cell.Cell +import world.phantasmal.cell.emptyStringCell +import world.phantasmal.cell.isNull +import world.phantasmal.cell.map +import world.phantasmal.cell.trueCell import world.phantasmal.webui.dom.div import world.phantasmal.webui.dom.li import world.phantasmal.webui.dom.ul diff --git a/webui/src/main/kotlin/world/phantasmal/webui/widgets/Select.kt b/webui/src/main/kotlin/world/phantasmal/webui/widgets/Select.kt index c12abe51..cf3edd78 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/widgets/Select.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/widgets/Select.kt @@ -3,8 +3,12 @@ package world.phantasmal.webui.widgets import org.w3c.dom.Node import org.w3c.dom.events.KeyboardEvent import org.w3c.dom.events.MouseEvent -import world.phantasmal.observable.cell.* -import world.phantasmal.observable.cell.list.emptyListCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.list.emptyListCell +import world.phantasmal.cell.map +import world.phantasmal.cell.mutableCell +import world.phantasmal.cell.nullCell +import world.phantasmal.cell.trueCell import world.phantasmal.webui.dom.Icon import world.phantasmal.webui.dom.div diff --git a/webui/src/main/kotlin/world/phantasmal/webui/widgets/TabContainer.kt b/webui/src/main/kotlin/world/phantasmal/webui/widgets/TabContainer.kt index ab1aacfb..0ce44679 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/widgets/TabContainer.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/widgets/TabContainer.kt @@ -1,9 +1,9 @@ package world.phantasmal.webui.widgets import org.w3c.dom.Node -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.eq -import world.phantasmal.observable.cell.trueCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.eq +import world.phantasmal.cell.trueCell import world.phantasmal.webui.controllers.Tab import world.phantasmal.webui.controllers.TabContainerController import world.phantasmal.webui.dom.div diff --git a/webui/src/main/kotlin/world/phantasmal/webui/widgets/Table.kt b/webui/src/main/kotlin/world/phantasmal/webui/widgets/Table.kt index 00040393..6c83cbfd 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/widgets/Table.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/widgets/Table.kt @@ -3,9 +3,9 @@ package world.phantasmal.webui.widgets import org.w3c.dom.* import world.phantasmal.core.disposable.Disposable import world.phantasmal.core.disposable.Disposer -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.observeNow -import world.phantasmal.observable.cell.trueCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.observeNow +import world.phantasmal.cell.trueCell import world.phantasmal.webui.LoadingStatus import world.phantasmal.webui.controllers.Column import world.phantasmal.webui.controllers.TableController diff --git a/webui/src/main/kotlin/world/phantasmal/webui/widgets/TextArea.kt b/webui/src/main/kotlin/world/phantasmal/webui/widgets/TextArea.kt index b15239cf..47e490f9 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/widgets/TextArea.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/widgets/TextArea.kt @@ -1,10 +1,10 @@ package world.phantasmal.webui.widgets import org.w3c.dom.Node -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.emptyStringCell -import world.phantasmal.observable.cell.nullCell -import world.phantasmal.observable.cell.trueCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.emptyStringCell +import world.phantasmal.cell.nullCell +import world.phantasmal.cell.trueCell import world.phantasmal.webui.dom.div import world.phantasmal.webui.dom.textarea diff --git a/webui/src/main/kotlin/world/phantasmal/webui/widgets/TextInput.kt b/webui/src/main/kotlin/world/phantasmal/webui/widgets/TextInput.kt index 06399db8..64fb4411 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/widgets/TextInput.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/widgets/TextInput.kt @@ -1,10 +1,10 @@ package world.phantasmal.webui.widgets import org.w3c.dom.HTMLInputElement -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.emptyStringCell -import world.phantasmal.observable.cell.nullCell -import world.phantasmal.observable.cell.trueCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.emptyStringCell +import world.phantasmal.cell.nullCell +import world.phantasmal.cell.trueCell class TextInput( visible: Cell = trueCell(), diff --git a/webui/src/main/kotlin/world/phantasmal/webui/widgets/Toolbar.kt b/webui/src/main/kotlin/world/phantasmal/webui/widgets/Toolbar.kt index 3de61a17..a26791ee 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/widgets/Toolbar.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/widgets/Toolbar.kt @@ -1,8 +1,8 @@ package world.phantasmal.webui.widgets import org.w3c.dom.Node -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.trueCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.trueCell import world.phantasmal.webui.dom.div /** diff --git a/webui/src/main/kotlin/world/phantasmal/webui/widgets/Widget.kt b/webui/src/main/kotlin/world/phantasmal/webui/widgets/Widget.kt index 4212f5fd..1addca4d 100644 --- a/webui/src/main/kotlin/world/phantasmal/webui/widgets/Widget.kt +++ b/webui/src/main/kotlin/world/phantasmal/webui/widgets/Widget.kt @@ -12,9 +12,9 @@ import org.w3c.dom.pointerevents.PointerEvent import world.phantasmal.core.disposable.Disposable import world.phantasmal.core.disposable.DisposableSupervisedScope import world.phantasmal.core.disposable.disposable -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.nullCell -import world.phantasmal.observable.cell.trueCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.nullCell +import world.phantasmal.cell.trueCell import world.phantasmal.webui.DisposableContainer import world.phantasmal.webui.dom.* diff --git a/webui/src/test/kotlin/world/phantasmal/webui/widgets/WidgetTests.kt b/webui/src/test/kotlin/world/phantasmal/webui/widgets/WidgetTests.kt index 421462f0..9f6e021d 100644 --- a/webui/src/test/kotlin/world/phantasmal/webui/widgets/WidgetTests.kt +++ b/webui/src/test/kotlin/world/phantasmal/webui/widgets/WidgetTests.kt @@ -1,11 +1,11 @@ package world.phantasmal.webui.widgets import org.w3c.dom.Node -import world.phantasmal.observable.cell.Cell -import world.phantasmal.observable.cell.falseCell -import world.phantasmal.observable.cell.list.mutableListCell -import world.phantasmal.observable.cell.mutableCell -import world.phantasmal.observable.cell.trueCell +import world.phantasmal.cell.Cell +import world.phantasmal.cell.falseCell +import world.phantasmal.cell.list.mutableListCell +import world.phantasmal.cell.mutableCell +import world.phantasmal.cell.trueCell import world.phantasmal.webui.dom.div import world.phantasmal.webui.test.WebuiTestSuite import kotlin.test.Test