refactor(state): optimize StateValue building methods

2026-10-25 10:53:50 +00:00 · 2026-05-15 23:07:40 +08:00
parent ed743521ec
commit ef096e76b3
7 changed files with 267 additions and 93 deletions
@@ -148,10 +148,130 @@ sealed interface StateValue {
        fun str(value: String) = Str(value)

        @JvmStatic
-        fun arr(value: List<StateValue>) = Arr(value)
+        fun arr(value: List<*>): Arr {
+            val visiting = java.util.IdentityHashMap<Any, Unit>()
+            return Arr(convertList(value, visiting))
+        }

        @JvmStatic
-        fun obj(value: Map<String, StateValue>) = Obj(value)
+        fun obj(value: Map<String, *>): Obj {
+            val visiting = java.util.IdentityHashMap<Any, Unit>()
+            return Obj(convertMap(value, visiting))
+        }
+
+        private fun convertValue(
+            value: Any?,
+            visiting: java.util.IdentityHashMap<Any, Unit>
+        ): StateValue {
+            return when (value) {
+                null -> error("StateValue does not support null")
+                is StateValue -> normalizeStateValue(value, visiting)
+                is String -> Str(value)
+                is Number -> Num(value)
+                is Boolean -> Bool(value)
+                is List<*> -> Arr(convertList(value, visiting))
+                is Map<*, *> -> Obj(convertGenericMap(value, visiting))
+                else -> error("Unsupported state value type: ${value::class.qualifiedName}")
+            }
+        }
+
+        private fun normalizeStateValue(
+            value: StateValue,
+            visiting: java.util.IdentityHashMap<Any, Unit>
+        ): StateValue {
+            return when (value) {
+                is Num -> value
+                is Bool -> value
+                is Str -> value
+                is Arr -> Arr(convertStateValueList(value.value, visiting))
+                is Obj -> Obj(convertStateValueMap(value.value, visiting))
+            }
+        }
+
+        private fun convertList(
+            value: List<*>,
+            visiting: java.util.IdentityHashMap<Any, Unit>
+        ): List<StateValue> {
+            enterContainer(value, visiting)
+            try {
+                return value.map { convertValue(it, visiting) }
+            } finally {
+                leaveContainer(value, visiting)
+            }
+        }
+
+        private fun convertMap(
+            value: Map<String, *>,
+            visiting: java.util.IdentityHashMap<Any, Unit>
+        ): Map<String, StateValue> {
+            enterContainer(value, visiting)
+            try {
+                return value.entries.associateTo(LinkedHashMap()) { (key, mapValue) ->
+                    key to convertValue(mapValue, visiting)
+                }
+            } finally {
+                leaveContainer(value, visiting)
+            }
+        }
+
+        private fun convertGenericMap(
+            value: Map<*, *>,
+            visiting: java.util.IdentityHashMap<Any, Unit>
+        ): Map<String, StateValue> {
+            enterContainer(value, visiting)
+            try {
+                return value.entries.associateTo(LinkedHashMap()) { (key, mapValue) ->
+                    check(key is String) {
+                        "StateValue object key must be String, but got: ${key?.let { it::class.qualifiedName }}"
+                    }
+                    key to convertValue(mapValue, visiting)
+                }
+            } finally {
+                leaveContainer(value, visiting)
+            }
+        }
+
+        private fun convertStateValueList(
+            value: List<StateValue>,
+            visiting: java.util.IdentityHashMap<Any, Unit>
+        ): List<StateValue> {
+            enterContainer(value, visiting)
+            try {
+                return value.map { normalizeStateValue(it, visiting) }
+            } finally {
+                leaveContainer(value, visiting)
+            }
+        }
+
+        private fun convertStateValueMap(
+            value: Map<String, StateValue>,
+            visiting: java.util.IdentityHashMap<Any, Unit>
+        ): Map<String, StateValue> {
+            enterContainer(value, visiting)
+            try {
+                return value.entries.associateTo(LinkedHashMap()) { (key, mapValue) ->
+                    key to normalizeStateValue(mapValue, visiting)
+                }
+            } finally {
+                leaveContainer(value, visiting)
+            }
+        }
+
+        private fun enterContainer(
+            container: Any,
+            visiting: java.util.IdentityHashMap<Any, Unit>
+        ) {
+            check(visiting.put(container, Unit) == null) {
+                "Circular reference detected while constructing StateValue"
+            }
+        }
+
+        private fun leaveContainer(
+            container: Any,
+            visiting: java.util.IdentityHashMap<Any, Unit>
+        ) {
+            visiting.remove(container)
+        }
    }
 }

@@ -0,0 +1,60 @@
+package work.slhaf.partner.framework.agent.state
+
+fun main() {
+    testNormalStateJson()
+    println()
+    testCircularReference()
+}
+
+private fun testNormalStateJson() {
+    val nestedMap = linkedMapOf(
+        "name" to "partner",
+        "enabled" to true,
+        "count" to 3,
+        "tags" to listOf("agent", "runtime", "state-center"),
+        "meta" to linkedMapOf(
+            "version" to "0.1.0",
+            "experimental" to false
+        )
+    )
+
+    val state = State()
+    state.append("root", StateValue.obj(nestedMap))
+    state.append(
+        "arr",
+        StateValue.arr(
+            listOf(
+                "hello",
+                123,
+                true,
+                linkedMapOf(
+                    "nested" to "value"
+                )
+            )
+        )
+    )
+
+    println("=== normal state ===")
+    println(state.toString())
+}
+
+private fun testCircularReference() {
+    val cyclicMap = linkedMapOf<String, Any>()
+    cyclicMap["name"] = "cyclic"
+    cyclicMap["self"] = cyclicMap
+
+    println("=== circular reference ===")
+
+    try {
+        val state = State()
+        state.append("cyclic", StateValue.obj(cyclicMap))
+
+        // 如果前面没有抛错，这里再触发最终 JSON 输出
+        println(state.toString())
+        error("Expected circular reference detection, but no exception was thrown.")
+    } catch (e: IllegalStateException) {
+        println("circular reference detected as expected:")
+        println(e.message)
+    }
+}
+