From a69323864d511a7b8c91c12600e7d4ad96289e09 Mon Sep 17 00:00:00 2001
From: Efeturi Money <efeturi.money@gmail.com>
Date: Wed, 10 Apr 2024 11:34:31 +0200
Subject: [PATCH] Some changes

Signed-off-by: Efeturi Money <efeturi.money@gmail.com>
---
 .idea/gradle.xml                              |  5 ++
 engine/api/build.gradle.kts                   | 11 ++++
 .../src/dev/efemoney/lexiko/engine/api/bag.kt | 23 +++++++
 .../dev/efemoney/lexiko/engine/api/board.kt   | 36 +----------
 .../dev/efemoney/lexiko/engine/api/players.kt |  0
 .../efemoney/lexiko/engine/api/position.kt    |  7 +--
 .../dev/efemoney/lexiko/engine/api/tile.kt    | 31 +++++-----
 .../dev/efemoney/lexiko/engine/api/util.kt    |  6 ++
 .../dev/efemoney/lexiko/engine/api/word.kt    |  7 +++
 .../efemoney/lexiko/engine/impl/multiplier.kt |  0
 engine/{ => impl}/build.gradle.kts            |  6 +-
 .../src/dev/efemoney/lexiko/engine/api/bag.kt |  5 ++
 .../dev/efemoney/lexiko/engine/api/board.kt   | 53 ++++++++++++++++
 .../src/dev/efemoney/lexiko/engine/game.kt    |  6 +-
 .../dev/efemoney/lexiko/engine/impl/bag.kt    | 60 ++++++++++---------
 .../dev/efemoney/lexiko/engine/impl/board.kt  |  2 +-
 .../dev/efemoney/lexiko/engine/impl/slot.kt   |  4 +-
 .../src/dev/efemoney/lexiko/engine/api/bag.kt | 17 ------
 .../dev/efemoney/lexiko/engine/api/word.kt    | 12 ----
 .../efemoney/lexiko/engine/di/annotation.kt   |  3 -
 .../efemoney/lexiko/engine/di/component.kt    | 28 ---------
 .../lexiko/engine/events/StartGameHandler.kt  | 19 ------
 .../efemoney/lexiko/engine/events/event.kt    | 20 -------
 .../dev/efemoney/lexiko/engine/impl/player.kt |  3 -
 .../dev/efemoney/lexiko/engine/impl/util.kt   | 33 ----------
 .../dev/efemoney/lexiko/engine/test.kt        | 40 -------------
 gradle.properties                             |  1 +
 settings.gradle.kts                           |  9 ++-
 28 files changed, 179 insertions(+), 268 deletions(-)
 create mode 100644 engine/api/build.gradle.kts
 create mode 100644 engine/api/src/dev/efemoney/lexiko/engine/api/bag.kt
 rename engine/{ => api}/src/dev/efemoney/lexiko/engine/api/board.kt (60%)
 rename engine/{ => api}/src/dev/efemoney/lexiko/engine/api/players.kt (100%)
 rename engine/{ => api}/src/dev/efemoney/lexiko/engine/api/position.kt (88%)
 rename engine/{ => api}/src/dev/efemoney/lexiko/engine/api/tile.kt (70%)
 create mode 100644 engine/api/src/dev/efemoney/lexiko/engine/api/util.kt
 create mode 100644 engine/api/src/dev/efemoney/lexiko/engine/api/word.kt
 rename engine/{ => api}/src/dev/efemoney/lexiko/engine/impl/multiplier.kt (100%)
 rename engine/{ => impl}/build.gradle.kts (75%)
 create mode 100644 engine/impl/src/dev/efemoney/lexiko/engine/api/bag.kt
 create mode 100644 engine/impl/src/dev/efemoney/lexiko/engine/api/board.kt
 rename engine/{ => impl}/src/dev/efemoney/lexiko/engine/game.kt (94%)
 rename engine/{ => impl}/src/dev/efemoney/lexiko/engine/impl/bag.kt (62%)
 rename engine/{ => impl}/src/dev/efemoney/lexiko/engine/impl/board.kt (96%)
 rename engine/{ => impl}/src/dev/efemoney/lexiko/engine/impl/slot.kt (97%)
 delete mode 100644 engine/src/dev/efemoney/lexiko/engine/api/bag.kt
 delete mode 100644 engine/src/dev/efemoney/lexiko/engine/api/word.kt
 delete mode 100644 engine/src/dev/efemoney/lexiko/engine/di/annotation.kt
 delete mode 100644 engine/src/dev/efemoney/lexiko/engine/di/component.kt
 delete mode 100644 engine/src/dev/efemoney/lexiko/engine/events/StartGameHandler.kt
 delete mode 100644 engine/src/dev/efemoney/lexiko/engine/events/event.kt
 delete mode 100644 engine/src/dev/efemoney/lexiko/engine/impl/player.kt
 delete mode 100644 engine/src/dev/efemoney/lexiko/engine/impl/util.kt
 delete mode 100644 engine/test-src/dev/efemoney/lexiko/engine/test.kt

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 2d5e708..2d9ed0f 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -10,10 +10,15 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/app/android" />
+            <option value="$PROJECT_DIR$/app/common" />
+            <option value="$PROJECT_DIR$/app/iOS" />
             <option value="$PROJECT_DIR$/dubbed" />
             <option value="$PROJECT_DIR$/dubbed/compiler-plugin" />
             <option value="$PROJECT_DIR$/dubbed/gradle-plugin" />
             <option value="$PROJECT_DIR$/engine" />
+            <option value="$PROJECT_DIR$/engine/api" />
+            <option value="$PROJECT_DIR$/engine/impl" />
             <option value="$PROJECT_DIR$/libs" />
             <option value="$PROJECT_DIR$/libs/di" />
             <option value="$PROJECT_DIR$/libs/di/codegen" />
diff --git a/engine/api/build.gradle.kts b/engine/api/build.gradle.kts
new file mode 100644
index 0000000..cc0deb9
--- /dev/null
+++ b/engine/api/build.gradle.kts
@@ -0,0 +1,11 @@
+plugins {
+  alias(libs.plugins.kotlin.jvm)
+}
+
+dependencies {
+  implementation(libs.kotlin.stdlib)
+  implementation(libs.kotlinx.immutable)
+  implementation(libs.kotlinx.coroutines.core)
+  implementation(libs.jetbrains.compose.runtime)
+  implementation(libs.jetbrains.compose.ui.util)
+}
diff --git a/engine/api/src/dev/efemoney/lexiko/engine/api/bag.kt b/engine/api/src/dev/efemoney/lexiko/engine/api/bag.kt
new file mode 100644
index 0000000..954f477
--- /dev/null
+++ b/engine/api/src/dev/efemoney/lexiko/engine/api/bag.kt
@@ -0,0 +1,23 @@
+package dev.efemoney.lexiko.engine.api
+
+import androidx.compose.runtime.Stable
+import androidx.compose.ui.util.fastForEach
+
+@Stable
+interface BagOfTiles {
+  val remainingTilesCount: Int
+  val isEmpty get() = remainingTilesCount == 0
+
+  fun pickRandomTile(): Tile?
+  fun pickRandomTiles(max: Int): List<Tile> =
+    if (isEmpty) emptyList() else buildList { for (i in 0..<max) add(pickRandomTile() ?: break) }
+
+  fun returnTile(tile: Tile)
+  fun returnTiles(tiles: List<Tile>) = tiles.fastForEach(::returnTile)
+}
+
+interface InitialBagOfTiles : BagOfTiles {
+  fun pickTile(char: TileChar): Tile?
+  fun pickTiles(chars: List<TileChar>): List<Tile> =
+    chars.mapNotNull(::pickTile).also { require(it.size == chars.size) { "Some tiles are not available" } }
+}
diff --git a/engine/src/dev/efemoney/lexiko/engine/api/board.kt b/engine/api/src/dev/efemoney/lexiko/engine/api/board.kt
similarity index 60%
rename from engine/src/dev/efemoney/lexiko/engine/api/board.kt
rename to engine/api/src/dev/efemoney/lexiko/engine/api/board.kt
index c9b123d..8ff3847 100644
--- a/engine/src/dev/efemoney/lexiko/engine/api/board.kt
+++ b/engine/api/src/dev/efemoney/lexiko/engine/api/board.kt
@@ -1,7 +1,6 @@
 package dev.efemoney.lexiko.engine.api
 
 import androidx.compose.runtime.Stable
-import dev.efemoney.lexiko.engine.impl.BoardImpl
 
 @Stable
 interface Board {
@@ -20,16 +19,6 @@ interface MutableBoard : Board {
   override operator fun get(position: TilePosition): MutableTileSlot = get(position.row, position.col)
 }
 
-fun Board(tilePlacement: TilePlacement = TilePlacement.None): Board =
-  BoardImpl(initialTilePlacement = tilePlacement)
-
-fun Board(placeTiles: MutableBoard.() -> Unit): Board =
-  BoardImpl().also(placeTiles)
-
-context(MutableBoard)
-fun Tile.placeAt(position: TilePosition) = internal.place(tile = this, at = position)
-
-
 @Stable
 interface TileSlot {
   val position: TilePosition
@@ -42,14 +31,12 @@ interface MutableTileSlot : TileSlot {
 }
 
 operator fun TileSlot.component1() = position
-
 operator fun TileSlot.component2() = multiplier
-
 operator fun TileSlot.component3() = tile
 
 
 @JvmInline
-value class TilePlacement private constructor(private val tiles: Map<TilePosition, Tile> = emptyMap()) {
+value class TilePlacement private constructor(private val tiles: Map<TilePosition, Tile>) {
 
   constructor(build: Builder.() -> Unit) : this(buildMap { Builder(this).apply(build) })
 
@@ -62,25 +49,6 @@ value class TilePlacement private constructor(private val tiles: Map<TilePositio
   }
 
   companion object {
-    val None = TilePlacement()
-  }
-}
-
-// region Internal
-
-internal interface BoardInternal : MutableBoard {
-  fun place(tile: Tile, at: TilePosition)
-  fun place(tiles: List<Tile>, startAt: TilePosition, direction: Direction)
-}
-
-internal fun interface OnConflict {
-  operator fun invoke(slot: TileSlot, old: Tile, new: Tile)
-
-  companion object {
-    val DoNothing = OnConflict { _, _, _ -> }
+    val None = TilePlacement(emptyMap())
   }
 }
-
-internal val MutableBoard.internal get() = this as BoardInternal
-
-// endregion
diff --git a/engine/src/dev/efemoney/lexiko/engine/api/players.kt b/engine/api/src/dev/efemoney/lexiko/engine/api/players.kt
similarity index 100%
rename from engine/src/dev/efemoney/lexiko/engine/api/players.kt
rename to engine/api/src/dev/efemoney/lexiko/engine/api/players.kt
diff --git a/engine/src/dev/efemoney/lexiko/engine/api/position.kt b/engine/api/src/dev/efemoney/lexiko/engine/api/position.kt
similarity index 88%
rename from engine/src/dev/efemoney/lexiko/engine/api/position.kt
rename to engine/api/src/dev/efemoney/lexiko/engine/api/position.kt
index d7acd81..a288003 100644
--- a/engine/src/dev/efemoney/lexiko/engine/api/position.kt
+++ b/engine/api/src/dev/efemoney/lexiko/engine/api/position.kt
@@ -2,10 +2,9 @@
 
 package dev.efemoney.lexiko.engine.api
 
-import dev.efemoney.lexiko.engine.impl.packInts
-import dev.efemoney.lexiko.engine.impl.requireIn
-import dev.efemoney.lexiko.engine.impl.unpackInt1
-import dev.efemoney.lexiko.engine.impl.unpackInt2
+import androidx.compose.ui.util.packInts
+import androidx.compose.ui.util.unpackInt1
+import androidx.compose.ui.util.unpackInt2
 
 @JvmInline
 value class TilePosition private constructor(private val packed: Long) {
diff --git a/engine/src/dev/efemoney/lexiko/engine/api/tile.kt b/engine/api/src/dev/efemoney/lexiko/engine/api/tile.kt
similarity index 70%
rename from engine/src/dev/efemoney/lexiko/engine/api/tile.kt
rename to engine/api/src/dev/efemoney/lexiko/engine/api/tile.kt
index 7f97b9a..fa982ff 100644
--- a/engine/src/dev/efemoney/lexiko/engine/api/tile.kt
+++ b/engine/api/src/dev/efemoney/lexiko/engine/api/tile.kt
@@ -1,31 +1,20 @@
 package dev.efemoney.lexiko.engine.api
 
-import dev.efemoney.lexiko.engine.impl.DoubleLetterMultiplier
-import dev.efemoney.lexiko.engine.impl.DoubleWordMultiplier
-import dev.efemoney.lexiko.engine.impl.Multiplier
-import dev.efemoney.lexiko.engine.impl.TripleLetterMultiplier
-import dev.efemoney.lexiko.engine.impl.TripleWordMultiplier
-import dev.efemoney.lexiko.engine.impl.hasMultiplier
-
 class Tile internal constructor(
   val char: TileChar,
   val point: TilePoint,
 ) : Comparable<Tile> {
-
   override fun compareTo(other: Tile) = char.compareTo(other.char)
-
+  override fun hashCode() = 31 * char.hashCode() + point.hashCode()
   override fun equals(other: Any?): Boolean {
     if (this === other) return true
     if (other !is Tile) return false
     return char != other.char && point == other.point
   }
-
-  override fun hashCode() = 31 * char.hashCode() + point.hashCode()
 }
 
 @JvmInline
 value class TileChar(private val char: Char) {
-
   val value get() = char.uppercaseChar()
 
   init {
@@ -46,7 +35,19 @@ value class TilePoint(val value: Int) {
   }
 }
 
-enum class TileMultiplier(internal val value: Multiplier, val string: String) {
+sealed interface TileMultiplier {
+  val string: String
+
+  data class Word(private val multiplier: Int) : TileMultiplier {
+    override val string = "${multiplier}W"
+  }
+
+  data class Letter(private val multiplier: Int) : TileMultiplier {
+    override val string = "${multiplier}L"
+  }
+}
+
+/*enum class TileMultiplier(internal val value: Multiplier, val string: String) {
   TripleWord(TripleWordMultiplier, "3W"),
   TripleLetter(TripleLetterMultiplier, "3L"),
   DoubleWord(DoubleWordMultiplier, "2W"),
@@ -54,8 +55,8 @@ enum class TileMultiplier(internal val value: Multiplier, val string: String) {
   ;
 
   internal companion object {
-    fun forPosition(position: TilePosition) =
+    fun of(position: TilePosition) =
       TileMultiplier.entries.firstOrNull { position.hasMultiplier(it.value) }
   }
-}
+}*/
 
diff --git a/engine/api/src/dev/efemoney/lexiko/engine/api/util.kt b/engine/api/src/dev/efemoney/lexiko/engine/api/util.kt
new file mode 100644
index 0000000..c09ab51
--- /dev/null
+++ b/engine/api/src/dev/efemoney/lexiko/engine/api/util.kt
@@ -0,0 +1,6 @@
+package dev.efemoney.lexiko.engine.api
+
+internal inline fun Int.requireIn(range: IntRange, lazyMessage: () -> Any): Int {
+  require(this in range, lazyMessage)
+  return this
+}
diff --git a/engine/api/src/dev/efemoney/lexiko/engine/api/word.kt b/engine/api/src/dev/efemoney/lexiko/engine/api/word.kt
new file mode 100644
index 0000000..142fb70
--- /dev/null
+++ b/engine/api/src/dev/efemoney/lexiko/engine/api/word.kt
@@ -0,0 +1,7 @@
+package dev.efemoney.lexiko.engine.api
+
+@JvmInline
+value class Word(private val tiles: Sequence<Tile>)
+
+@JvmInline
+value class Letter(private val tile: Tile)
diff --git a/engine/src/dev/efemoney/lexiko/engine/impl/multiplier.kt b/engine/api/src/dev/efemoney/lexiko/engine/impl/multiplier.kt
similarity index 100%
rename from engine/src/dev/efemoney/lexiko/engine/impl/multiplier.kt
rename to engine/api/src/dev/efemoney/lexiko/engine/impl/multiplier.kt
diff --git a/engine/build.gradle.kts b/engine/impl/build.gradle.kts
similarity index 75%
rename from engine/build.gradle.kts
rename to engine/impl/build.gradle.kts
index dcfb14c..08f2fd8 100644
--- a/engine/build.gradle.kts
+++ b/engine/impl/build.gradle.kts
@@ -7,6 +7,7 @@ dependencies {
   kotlinCompilerPluginClasspath(libs.androidx.compose.compiler)
   ksp(libs.kotlinInject.compiler)
 
+  implementation(projects.engine.api)
   implementation(libs.kotlin.stdlib)
   implementation(libs.kotlinx.immutable)
   implementation(libs.kotlinx.coroutines.core)
@@ -14,9 +15,4 @@ dependencies {
   implementation(libs.jetbrains.compose.ui.util)
   implementation(libs.molecule.runtime)
   implementation(libs.kotlinInject.runtime)
-
-  testImplementation(libs.kotlin.test)
-  testImplementation(libs.kotlinx.coroutines.test)
-  testImplementation(libs.turbine)
-  testImplementation(libs.junit)
 }
diff --git a/engine/impl/src/dev/efemoney/lexiko/engine/api/bag.kt b/engine/impl/src/dev/efemoney/lexiko/engine/api/bag.kt
new file mode 100644
index 0000000..754fec3
--- /dev/null
+++ b/engine/impl/src/dev/efemoney/lexiko/engine/api/bag.kt
@@ -0,0 +1,5 @@
+package dev.efemoney.lexiko.engine.api
+
+import dev.efemoney.lexiko.engine.impl.DefaultBagOfTiles
+
+fun BagOfTiles(): BagOfTiles = DefaultBagOfTiles()
diff --git a/engine/impl/src/dev/efemoney/lexiko/engine/api/board.kt b/engine/impl/src/dev/efemoney/lexiko/engine/api/board.kt
new file mode 100644
index 0000000..148c676
--- /dev/null
+++ b/engine/impl/src/dev/efemoney/lexiko/engine/api/board.kt
@@ -0,0 +1,53 @@
+package dev.efemoney.lexiko.engine.api
+
+import dev.efemoney.lexiko.engine.impl.BoardImpl
+
+fun Board(tilePlacement: TilePlacement = TilePlacement.None): Board =
+  BoardImpl(initialTilePlacement = tilePlacement)
+
+context(InitialBagOfTiles)
+fun Board(placeTiles: context(InitialBagOfTiles) MutableBoard.() -> Unit): Board {
+  return BoardImpl().also { placeTiles(self, it) }
+}
+
+context(MutableBoard)
+fun Tile.placeAt(position: TilePosition) = internal.place(this, at = position)
+
+@JvmInline
+value class TilePlacement private constructor(private val placement: Map<TilePosition, Tile>) {
+
+  constructor(build: Builder.() -> Unit) : this(buildMap { Builder(this).apply(build) })
+
+  operator fun get(position: TilePosition) = placement[position]
+
+  @JvmInline
+  value class Builder internal constructor(private val map: MutableMap<TilePosition, Tile>) {
+
+    infix fun Tile.at(position: TilePosition) = map.put(position, this)
+  }
+
+  companion object {
+    val None = TilePlacement(emptyMap())
+  }
+}
+
+// region Implementation
+
+private val InitialBagOfTiles.self get() = this
+
+internal interface BoardInternal : MutableBoard {
+  fun place(tile: Tile, at: TilePosition)
+  fun place(tiles: List<Tile>, startAt: TilePosition, direction: Direction)
+}
+
+internal val Board.internal get() = this as BoardInternal
+
+internal fun interface OnConflict {
+  operator fun invoke(slot: TileSlot, old: Tile, new: Tile)
+
+  companion object {
+    val DoNothing = OnConflict { _, _, _ -> }
+  }
+}
+
+// endregion
diff --git a/engine/src/dev/efemoney/lexiko/engine/game.kt b/engine/impl/src/dev/efemoney/lexiko/engine/game.kt
similarity index 94%
rename from engine/src/dev/efemoney/lexiko/engine/game.kt
rename to engine/impl/src/dev/efemoney/lexiko/engine/game.kt
index 616a3da..fdda02d 100644
--- a/engine/src/dev/efemoney/lexiko/engine/game.kt
+++ b/engine/impl/src/dev/efemoney/lexiko/engine/game.kt
@@ -11,8 +11,8 @@ import dev.efemoney.lexiko.engine.api.Board
 import dev.efemoney.lexiko.engine.api.PlayerId
 import dev.efemoney.lexiko.engine.events.GameEvent
 import dev.efemoney.lexiko.engine.events.GameEventHandlers
-import dev.efemoney.lexiko.engine.impl.BagOfTilesImpl
 import dev.efemoney.lexiko.engine.impl.BoardImpl
+import dev.efemoney.lexiko.engine.impl.DefaultBagOfTiles
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.Channel
@@ -25,7 +25,7 @@ internal class GameContext(
   val host: PlayerId,
   val players: SnapshotStateList<PlayerId>,
   val board: BoardImpl,
-  val bag: BagOfTilesImpl,
+  val bag: DefaultBagOfTiles,
 ) {
   fun send(event: GameEvent) = scope.launch { events.send(event) }
 }
@@ -47,7 +47,7 @@ class Game internal constructor(private val eventHandlers: GameEventHandlers) {
         host = host,
         players = mutableStateListOf(host),
         board = BoardImpl(),
-        bag = BagOfTilesImpl(),
+        bag = DefaultBagOfTiles(),
       )
     }
     LaunchedEffect(context) {
diff --git a/engine/src/dev/efemoney/lexiko/engine/impl/bag.kt b/engine/impl/src/dev/efemoney/lexiko/engine/impl/bag.kt
similarity index 62%
rename from engine/src/dev/efemoney/lexiko/engine/impl/bag.kt
rename to engine/impl/src/dev/efemoney/lexiko/engine/impl/bag.kt
index c49e335..c114485 100644
--- a/engine/src/dev/efemoney/lexiko/engine/impl/bag.kt
+++ b/engine/impl/src/dev/efemoney/lexiko/engine/impl/bag.kt
@@ -1,18 +1,25 @@
-@file:Suppress("SpellCheckingInspection", "NOTHING_TO_INLINE")
+@file:Suppress(
+  "SpellCheckingInspection",
+  "NOTHING_TO_INLINE",
+  "CANNOT_OVERRIDE_INVISIBLE_MEMBER",
+  "INVISIBLE_MEMBER",
+  "INVISIBLE_REFERENCE",
+)
 
 package dev.efemoney.lexiko.engine.impl
 
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.toMutableStateList
+import androidx.compose.runtime.snapshots.SnapshotStateList
 import dev.efemoney.lexiko.engine.api.BagOfTiles
+import dev.efemoney.lexiko.engine.api.InitialBagOfTiles
 import dev.efemoney.lexiko.engine.api.Tile
 import dev.efemoney.lexiko.engine.api.TileChar
 import dev.efemoney.lexiko.engine.api.TilePoint
 
 internal val TileCounts = listOf(
   1 to "JKQXZ",
-  2 to " BCFHMPVWY",
+  2 to "BCFHMPVWY ",
   3 to "G",
   4 to "DLSU",
   6 to "NRT",
@@ -36,28 +43,26 @@ internal val TilePoints = listOf(
   chars.map { TileChar(it) to point }
 }.toMap()
 
+internal inline fun pointOf(char: TileChar) = TilePoint(TilePoints[char]!!)
 internal inline fun countOf(char: TileChar) = TileCounts[char]!!
 internal inline fun countOf(tile: Tile) = countOf(tile.char)
 
-internal class BagOfTilesImpl : BagOfTiles {
+internal class DefaultBagOfTiles : BagOfTiles, InitialBagOfTiles {
 
-  private val tiles = buildMap {
-    val fillMap = { char: TileChar ->
-      val point = TilePoints[char]!!
-      put(
-        key = char,
-        value = List(countOf(char)) { Tile(char, TilePoint(point)) }
-          .toMutableStateList()
-      )
+  private val tiles = sequence { yieldAll('A'..'Z'); yield(' ') }
+    .map(::TileChar)
+    .associateWith { char ->
+      SnapshotStateList<Tile>().apply {
+        repeat(countOf(char)) {
+          add(Tile(char, pointOf(char)))
+        }
+      }
     }
-    ('A'..'Z').forEach { fillMap(TileChar(it)) }
-    fillMap(TileChar(' '))
-  }
 
   private val remainingChars by derivedStateOf {
     buildSet {
-      tiles.forEach {
-        if (it.value.isNotEmpty()) add(it.key)
+      tiles.forEach { (char, remaining) ->
+        if (remaining.isNotEmpty()) add(char)
       }
     }
   }
@@ -67,17 +72,7 @@ internal class BagOfTilesImpl : BagOfTiles {
   }
 
   override fun pickRandomTile(): Tile? {
-    return when {
-      isEmpty -> null
-      else -> pick(remainingChars.random())
-    }
-  }
-
-  override fun pickRandomTiles(max: Int): List<Tile> {
-    return when {
-      isEmpty -> emptyList()
-      else -> List(max) { pick(remainingChars.random()) }
-    }
+    return if (isEmpty) null else pick(remainingChars.random())
   }
 
   override fun returnTile(tile: Tile) {
@@ -87,6 +82,14 @@ internal class BagOfTilesImpl : BagOfTiles {
     }
   }
 
+  override fun pickTile(char: TileChar): Tile? {
+    return if (char in remainingChars) pick(char) else null
+  }
+
+  override fun pickTiles(chars: List<TileChar>): List<Tile> {
+    TODO("Not yet implemented")
+  }
+
   override fun toString(): String = buildString {
     append("Bag(")
     remainingChars.joinTo(this) { "$it=${tilesOf(it).size}" }
@@ -101,5 +104,6 @@ internal class BagOfTilesImpl : BagOfTiles {
   internal inline fun pick(chars: CharSequence): List<Tile> = chars.map { pick(TileChar(it)) }
 
   private inline fun tilesOf(char: TileChar) = tiles[char]!!
+
   private inline fun tilesOf(tile: Tile) = tilesOf(tile.char)
 }
diff --git a/engine/src/dev/efemoney/lexiko/engine/impl/board.kt b/engine/impl/src/dev/efemoney/lexiko/engine/impl/board.kt
similarity index 96%
rename from engine/src/dev/efemoney/lexiko/engine/impl/board.kt
rename to engine/impl/src/dev/efemoney/lexiko/engine/impl/board.kt
index d693cd8..cae340b 100644
--- a/engine/src/dev/efemoney/lexiko/engine/impl/board.kt
+++ b/engine/impl/src/dev/efemoney/lexiko/engine/impl/board.kt
@@ -20,7 +20,7 @@ internal class BoardImpl(
   private val slots = TileSlots(15, 15) { position ->
     TileSlot(
       position = position,
-      multiplier = TileMultiplier.forPosition(position),
+      multiplier = TileMultiplier.of(position),
       initialTile = initialTilePlacement[position],
     )
   }
diff --git a/engine/src/dev/efemoney/lexiko/engine/impl/slot.kt b/engine/impl/src/dev/efemoney/lexiko/engine/impl/slot.kt
similarity index 97%
rename from engine/src/dev/efemoney/lexiko/engine/impl/slot.kt
rename to engine/impl/src/dev/efemoney/lexiko/engine/impl/slot.kt
index 479284d..7084294 100644
--- a/engine/src/dev/efemoney/lexiko/engine/impl/slot.kt
+++ b/engine/impl/src/dev/efemoney/lexiko/engine/impl/slot.kt
@@ -11,8 +11,8 @@ import dev.efemoney.lexiko.engine.api.TileMultiplier
 import dev.efemoney.lexiko.engine.api.TilePosition
 
 internal class TileSlots(
-  val rows: Int,
-  val cols: Int,
+  private val rows: Int,
+  private val cols: Int,
   initSlot: (position: TilePosition) -> TileSlot,
 ) : Array2d<TileSlot>, Iterable<TileSlot> {
 
diff --git a/engine/src/dev/efemoney/lexiko/engine/api/bag.kt b/engine/src/dev/efemoney/lexiko/engine/api/bag.kt
deleted file mode 100644
index c4b828d..0000000
--- a/engine/src/dev/efemoney/lexiko/engine/api/bag.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package dev.efemoney.lexiko.engine.api
-
-import androidx.compose.runtime.Stable
-import androidx.compose.ui.util.fastForEach
-import dev.efemoney.lexiko.engine.impl.BagOfTilesImpl
-
-@Stable
-interface BagOfTiles {
-  val remainingTilesCount: Int
-  val isEmpty get() = remainingTilesCount == 0
-  fun pickRandomTile(): Tile?
-  fun pickRandomTiles(max: Int): List<Tile>
-  fun returnTile(tile: Tile)
-  fun returnTiles(tiles: List<Tile>) = tiles.fastForEach(::returnTile)
-}
-
-fun BagOfTiles(): BagOfTiles = BagOfTilesImpl()
diff --git a/engine/src/dev/efemoney/lexiko/engine/api/word.kt b/engine/src/dev/efemoney/lexiko/engine/api/word.kt
deleted file mode 100644
index f1c859b..0000000
--- a/engine/src/dev/efemoney/lexiko/engine/api/word.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package dev.efemoney.lexiko.engine.api
-
-@JvmInline
-value class Word(private val tiles: List<Tile>) {
-
-  constructor(vararg tiles: Tile) : this(tiles.toList())
-
-  fun asSequence() = tiles.asSequence()
-}
-
-@JvmInline
-value class Letter(private val tile: Tile)
diff --git a/engine/src/dev/efemoney/lexiko/engine/di/annotation.kt b/engine/src/dev/efemoney/lexiko/engine/di/annotation.kt
deleted file mode 100644
index 7ec6ed3..0000000
--- a/engine/src/dev/efemoney/lexiko/engine/di/annotation.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package dev.efemoney.lexiko.engine.di
-
-internal annotation class GameEvent
diff --git a/engine/src/dev/efemoney/lexiko/engine/di/component.kt b/engine/src/dev/efemoney/lexiko/engine/di/component.kt
deleted file mode 100644
index b48daca..0000000
--- a/engine/src/dev/efemoney/lexiko/engine/di/component.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package dev.efemoney.lexiko.engine.di
-
-import dev.efemoney.lexiko.engine.Game
-import dev.efemoney.lexiko.engine.events.GameEvent
-import dev.efemoney.lexiko.engine.events.GameEventHandler
-import dev.efemoney.lexiko.engine.events.StartGameEvent
-import me.tatarka.inject.annotations.Component
-import me.tatarka.inject.annotations.IntoMap
-import me.tatarka.inject.annotations.Provides
-import kotlin.reflect.KType
-import kotlin.reflect.typeOf
-
-@Component
-@Suppress("UNCHECKED_CAST")
-internal interface EventHandlersComponent {
-  val handlersMapping: Map<KType, () -> GameEventHandler<GameEvent>>
-
-  @Provides @IntoMap
-  fun (() -> StartGameEvent.Handler).provide() =
-    typeOf<StartGameEvent>() to (this as () -> GameEventHandler<GameEvent>)
-}
-
-@Component
-internal abstract class EngineComponent(
-  @Component val eventHandlers: EventHandlersComponent,
-) {
-  abstract val newGame: () -> Game
-}
diff --git a/engine/src/dev/efemoney/lexiko/engine/events/StartGameHandler.kt b/engine/src/dev/efemoney/lexiko/engine/events/StartGameHandler.kt
deleted file mode 100644
index d3f4be9..0000000
--- a/engine/src/dev/efemoney/lexiko/engine/events/StartGameHandler.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package dev.efemoney.lexiko.engine.events
-
-import dev.efemoney.lexiko.engine.GameContext
-import dev.efemoney.lexiko.engine.api.Board
-import dev.efemoney.lexiko.engine.api.Direction
-import me.tatarka.inject.annotations.Inject
-
-data object StartGameEvent : GameEvent {
-
-  @Inject internal class Handler : GameEventHandler<StartGameEvent> {
-    context(GameContext) override suspend fun handle(event: StartGameEvent) {
-      board.place(
-        tiles = bag.pick("hello"),
-        startAt = Board.Center,
-        direction = Direction.Horizontal,
-      )
-    }
-  }
-}
diff --git a/engine/src/dev/efemoney/lexiko/engine/events/event.kt b/engine/src/dev/efemoney/lexiko/engine/events/event.kt
deleted file mode 100644
index 0696bf1..0000000
--- a/engine/src/dev/efemoney/lexiko/engine/events/event.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package dev.efemoney.lexiko.engine.events
-
-import dev.efemoney.lexiko.engine.GameContext
-import me.tatarka.inject.annotations.Inject
-import kotlin.reflect.KType
-
-sealed interface GameEvent
-
-internal fun interface GameEventHandler<in E : GameEvent> {
-  context(GameContext) suspend fun handle(event: E)
-}
-
-@Inject
-internal class GameEventHandlers(eventHandlerMappings: Map<KType, () -> GameEventHandler<GameEvent>>) {
-
-  private val eventHandlerMappings =
-    eventHandlerMappings.entries.associate { it.key.classifier!! to lazy(it.value) }
-
-  context(GameContext) suspend fun handle(event: GameEvent) = eventHandlerMappings[event::class]!!.value.handle(event)
-}
diff --git a/engine/src/dev/efemoney/lexiko/engine/impl/player.kt b/engine/src/dev/efemoney/lexiko/engine/impl/player.kt
deleted file mode 100644
index 2a451e1..0000000
--- a/engine/src/dev/efemoney/lexiko/engine/impl/player.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package dev.efemoney.lexiko.engine.impl
-
-
diff --git a/engine/src/dev/efemoney/lexiko/engine/impl/util.kt b/engine/src/dev/efemoney/lexiko/engine/impl/util.kt
deleted file mode 100644
index 242d669..0000000
--- a/engine/src/dev/efemoney/lexiko/engine/impl/util.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-@file:Suppress("NOTHING_TO_INLINE")
-
-package dev.efemoney.lexiko.engine.impl
-
-/**
- * Packs two Int values into one Long value for use in inline classes.
- */
-inline fun packInts(val1: Int, val2: Int): Long {
-  return val1.toLong().shl(32) or (val2.toLong() and 0xFFFFFFFF)
-}
-
-/**
- * Unpacks the first Int value in [packInts] from its returned ULong.
- */
-inline fun unpackInt1(value: Long): Int {
-  return value.shr(32).toInt()
-}
-
-/**
- * Unpacks the second Int value in [packInts] from its returned ULong.
- */
-inline fun unpackInt2(value: Long): Int {
-  return value.and(0xFFFFFFFF).toInt()
-}
-
-// region Lexiko
-
-inline fun Int.requireIn(range: IntRange, lazyMessage: () -> Any): Int {
-  require(this in range, lazyMessage)
-  return this
-}
-
-// endregion
diff --git a/engine/test-src/dev/efemoney/lexiko/engine/test.kt b/engine/test-src/dev/efemoney/lexiko/engine/test.kt
deleted file mode 100644
index cd957cf..0000000
--- a/engine/test-src/dev/efemoney/lexiko/engine/test.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package dev.efemoney.lexiko.engine
-
-import app.cash.molecule.RecompositionMode.Immediate
-import app.cash.molecule.moleculeFlow
-import app.cash.turbine.Event
-import app.cash.turbine.test
-import dev.efemoney.lexiko.engine.api.PlayerId
-import dev.efemoney.lexiko.engine.di.InjectEngineComponent
-import dev.efemoney.lexiko.engine.di.InjectEventHandlersComponent
-import dev.efemoney.lexiko.engine.events.GameEvent
-import dev.efemoney.lexiko.engine.events.StartGameEvent
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.test.runTest
-import org.junit.Test
-import kotlin.time.Duration
-
-class GameTest {
-
-  @Test
-  fun run() = runTest(timeout = Duration.INFINITE) {
-    val events = Channel<GameEvent>()
-    val game = InjectEngineComponent(InjectEventHandlersComponent()).newGame()
-
-    moleculeFlow(Immediate) {
-      game.rememberGameState(
-        host = PlayerId("one"),
-        events = events,
-      )
-    }.test(timeout = Duration.INFINITE) {
-      backgroundScope.launch {
-        events.send(StartGameEvent)
-      }
-      while (true) awaitEvent().let {
-        if (it is Event.Item) println(it.value)
-        if (it.isTerminal) break
-      }
-    }
-  }
-}
diff --git a/gradle.properties b/gradle.properties
index 536f7be..da2fbbe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -60,6 +60,7 @@ kotlin.code.style=official
 # kotlin.mpp.enableGranularSourceSetsMetadata=true
 # https://kotlinlang.org/docs/whatsnew18.html#ability-to-disable-the-kotlin-daemon-fallback-strategy
 kotlin.daemon.useFallbackStrategy=false
+kotlin.project.persistent.dir.gradle.disableWrite=true
 kotlin.js.yarn=false
 
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ceb7d45..79122b1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -38,8 +38,15 @@ include("libs:di:codegen")
 include("libs:navigation")
 include("libs:ui")
 include("ui:board")
+
 include("server")
+
 include("engine")
-include("app")
+include("engine:api")
+include("engine:impl")
+
+include("app:android")
+include("app:iOS")
+include("app:common")
 
 rootProject.name = "lexiko"