Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Serialize MutableState as a normal JsonObject #1567

Merged
merged 1 commit into from
Oct 6, 2023
Merged

Serialize MutableState as a normal JsonObject #1567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 16 additions & 22 deletions redwood-treehouse/src/commonMain/kotlin/app/cash/redwood/treehouse/StateSnapshot.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,23 @@ import kotlin.jvm.JvmInline
import kotlinx.serialization.Serializable
import kotlinx.serialization.json.JsonArray
import kotlinx.serialization.json.JsonElement
import kotlinx.serialization.json.JsonObject
import kotlinx.serialization.json.JsonPrimitive
import kotlinx.serialization.json.booleanOrNull
import kotlinx.serialization.json.buildJsonObject
import kotlinx.serialization.json.doubleOrNull
import kotlinx.serialization.json.intOrNull

private const val MutableStateKey = "androidx.compose.runtime.MutableState"

@Serializable
public class StateSnapshot(
public val content: Map<String, List<Saveable>>,
public val content: Map<String, List<JsonElement>>,
) {
public fun toValuesMap(): Map<String, List<Any?>> {
return content.mapValues { entry ->
entry.value.map {
if (it.isMutableState) {
mutableStateOf(it.value.fromJsonElement())
} else {
it.value.fromJsonElement()
}
it.fromJsonElement()
}
}
}
Expand All @@ -52,18 +52,12 @@ public class StateSnapshot(
* String, Boolean, Int, List (of supported primitive types), Map (of supported primitive types)
*/
public fun Map<String, List<Any?>>.toStateSnapshot(): StateSnapshot = StateSnapshot(
mapValues { entry ->
entry.value.map { element ->
when (element) {
is MutableState<*> -> Saveable(true, element.value.toJsonElement())
else -> Saveable(false, element.toJsonElement())
}
}
},
mapValues { entry -> entry.value.map { element -> element.toJsonElement() } },
)

private fun Any?.toJsonElement(): JsonElement {
return when (this) {
is MutableState<*> -> JsonMutableState(value.toJsonElement())
is String -> JsonPrimitive(this)
is Int -> JsonPrimitive(this)
is List<*> -> JsonArray(map { it.toJsonElement() })
Expand All @@ -74,22 +68,22 @@ private fun Any?.toJsonElement(): JsonElement {
}

private fun JsonElement?.fromJsonElement(): Any {
return when (this) {
is JsonPrimitive -> {
return when {
this is JsonPrimitive -> {
if (this.isString) return content
return booleanOrNull ?: doubleOrNull ?: intOrNull ?: error("unexpected type: $this")
// TODO add other primitive types (float, long) when needed
}

is JsonArray -> listOf({ this.forEach { it.toJsonElement() } })
this is JsonArray -> listOf({ this.forEach { it.toJsonElement() } })
this is JsonObject && containsKey(MutableStateKey) ->
mutableStateOf(getValue(MutableStateKey).fromJsonElement())
Comment on lines +79 to +80
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see!

// TODO: map, numbers
// is Map<*, *> -> JsonElement
else -> error("unexpected type: $this")
}
}

@Serializable
public data class Saveable(
val isMutableState: Boolean,
val value: JsonElement,
)
internal fun JsonMutableState(element: JsonElement): JsonObject = buildJsonObject {
put(MutableStateKey, element)
}
16 changes: 8 additions & 8 deletions redwood-treehouse/src/commonTest/kotlin/app/cash/redwood/treehouse/StateSnapshotTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,19 @@ class StateSnapshotTest {
val storedStateSnapshot = storedStateSnapshot()
val stateSnapshot = storedStateSnapshot.toStateSnapshot()
assertThat(stateSnapshot.content).containsOnly(
"key1" to listOf(Saveable(true, JsonPrimitive(1))),
"key2" to listOf(Saveable(false, JsonPrimitive(1))),
"key3" to listOf(Saveable(true, JsonPrimitive("str"))),
"key4" to listOf(Saveable(false, JsonPrimitive("str"))),
"key1" to listOf(JsonMutableState(JsonPrimitive(1))),
"key2" to listOf(JsonPrimitive(1)),
"key3" to listOf(JsonMutableState(JsonPrimitive("str"))),
"key4" to listOf(JsonPrimitive("str")),
)
}

private fun stateSnapshot() = StateSnapshot(
mapOf(
"key1" to listOf(Saveable(true, JsonPrimitive(1))),
"key2" to listOf(Saveable(false, JsonPrimitive(1))),
"key3" to listOf(Saveable(true, JsonPrimitive("str"))),
"key4" to listOf(Saveable(false, JsonPrimitive("str"))),
"key1" to listOf(JsonMutableState(JsonPrimitive(1))),
"key2" to listOf(JsonPrimitive(1)),
"key3" to listOf(JsonMutableState(JsonPrimitive("str"))),
"key4" to listOf(JsonPrimitive("str")),
),
)

Expand Down