fix(core): don't trust supplied ordering when merging nodes

zlataovce · Aug 10, 2024 · 409c9f1 · 409c9f1
1 parent eafa7a4
commit 409c9f1
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/core/src/main/kotlin/me/kcra/takenaka/core/mapping/ancestry/AncestryTree.kt b/core/src/main/kotlin/me/kcra/takenaka/core/mapping/ancestry/AncestryTree.kt
@@ -127,21 +127,23 @@ class AncestryTree<T : MappingTreeView, E : ElementMappingView>(
  * Respects existing ordering in case of conflicts - only latest entries are kept, older are discarded.
  *
  * @param nodes the nodes to merge
+ * @param tree the parent tree of the merged node, defaults to the tree of the first specified node
  * @return the merged node
  */
-fun <T : MappingTreeView, E : ElementMappingView> nodeOf(vararg nodes: AncestryTree.Node<T, E>): AncestryTree.Node<T, E> {
+fun <T : MappingTreeView, E : ElementMappingView> nodeOf(
+    vararg nodes: AncestryTree.Node<T, E>,
+    tree: AncestryTree<T, E>? = null,
+): AncestryTree.Node<T, E> {
     require(nodes.isNotEmpty()) {
         "No nodes provided"
     }
 
     if (nodes.size == 1) return nodes.first()
 
     // create merged node
-    val lastNode = nodes.last()
     return AncestryTree.Node(
-        lastNode.tree,
+        tree ?: nodes.first().tree,
         nodes.flatMap { it.entries }
-            .associate { it.key to it.value },
-        last = lastNode.last
+            .associateTo(sortedMapOf()) { it.key to it.value }
     )
 }