fix(model-api): serialized referenced failed to resolve in PArea

The responsibility of deserializing references changed and PArea
wasn't adjusted to that yet.

Author: slisson

model-api/src/commonMain/kotlin/org/modelix/model/api/INodeReference.kt

@@ -49,12 +49,16 @@ fun INodeReference.resolveInCurrentContext(): INode? {
 }
 
 fun INodeReference.resolveIn(scope: INodeResolutionScope): INode? {
-    if (this is NodeReference) {
-        val deserialized = INodeReferenceSerializer.tryDeserialize(serialized)
-        if (deserialized != null) return deserialized.resolveIn(scope)
+    try {
+        if (this is NodeReference) {
+            val deserialized = INodeReferenceSerializer.tryDeserialize(serialized)
+            if (deserialized != null) return deserialized.resolveIn(scope)
+        }
+        @Suppress("DEPRECATION")
+        return scope.resolveNode(this)
+    } catch (ex: Exception) {
+        throw RuntimeException("Failed to resolve $this", ex)
     }
-    @Suppress("DEPRECATION")
-    return scope.resolveNode(this)
 }
 
 class NodeReferenceKSerializer : KSerializer<INodeReference> {

model-api/src/commonMain/kotlin/org/modelix/model/api/PNodeAdapter.kt

@@ -136,11 +136,9 @@ open class PNodeAdapter(val nodeId: Long, val branch: IBranch) : INode, INodeEx
     }
 
     private fun tryResolveNodeRef(targetRef: INodeReference): INode? {
-        (targetRef as? PNodeReference)
-            ?.takeIf { it.branchId == branch.getId() }
-            ?.resolveIn(PArea(branch))
-            ?.let { return it }
-        return targetRef.resolveInCurrentContext()
+        return INodeResolutionScope.runWithAdditionalScope(getArea()) {
+            targetRef.resolveInCurrentContext()
+        }
     }
 
     private suspend fun resolveNodeRefInCoroutine(targetRef: INodeReference): INode {

model-api/src/commonMain/kotlin/org/modelix/model/area/PArea.kt

@@ -20,8 +20,11 @@ import org.modelix.model.api.INode
 import org.modelix.model.api.INodeReference
 import org.modelix.model.api.INodeResolutionScope
 import org.modelix.model.api.ITree
+import org.modelix.model.api.LocalPNodeReference
+import org.modelix.model.api.NodeReference
 import org.modelix.model.api.PNodeAdapter
 import org.modelix.model.api.PNodeReference
+import org.modelix.model.api.getNode
 
 data class PArea(val branch: IBranch) : IArea {
 
@@ -36,14 +39,16 @@ data class PArea(val branch: IBranch) : IArea {
     }
 
     override fun resolveOriginalNode(ref: INodeReference): INode? {
-        return if (ref is PNodeReference &&
-            branch.getId() == ref.branchId &&
-            containsNode(ref.id)
-        ) {
-            PNodeAdapter(ref.id, branch)
-        } else {
-            null
+        val pref = when (ref) {
+            is NodeReference -> PNodeReference.tryDeserialize(ref.serialized)
+            else -> ref
         }
+        val nodeId = when (pref) {
+            is PNodeReference -> if (pref.branchId == branch.getId()) pref.id else return null
+            is LocalPNodeReference -> pref.id
+            else -> return null
+        }
+        return if (containsNode(nodeId)) branch.getNode(nodeId) else null
     }
 
     override fun resolveBranch(id: String): IBranch? {