Skip to content

Commit 83aa1d6

Browse files
committed
fix(model-api): IAsyncNode.getReferenceTarget failed when TreePointer was used
1 parent 3ab0c7e commit 83aa1d6

File tree

2 files changed

+51
-1
lines changed

2 files changed

+51
-1
lines changed

model-api/src/commonMain/kotlin/org/modelix/model/api/async/AsyncNode.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import org.modelix.model.api.IChildLinkReference
3232
import org.modelix.model.api.IConcept
3333
import org.modelix.model.api.INode
3434
import org.modelix.model.api.INodeReference
35+
import org.modelix.model.api.INodeResolutionScope
3536
import org.modelix.model.api.IPropertyReference
3637
import org.modelix.model.api.IReferenceLinkReference
3738
import org.modelix.model.api.resolve
@@ -81,7 +82,11 @@ class AsyncNode(
8182
}
8283

8384
override fun getReferenceTarget(role: IReferenceLinkReference): Maybe<IAsyncNode> {
84-
return getReferenceTargetRef(role).mapNotNull { it.resolveInCurrentContext()?.asAsyncNode() }
85+
return getReferenceTargetRef(role).mapNotNull {
86+
INodeResolutionScope.runWithAdditionalScope(regularNode.getArea()) {
87+
it.resolveInCurrentContext()?.asAsyncNode()
88+
}
89+
}
8590
}
8691

8792
override fun getReferenceTargetRef(role: IReferenceLinkReference): Maybe<INodeReference> {
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
/*
2+
* Copyright (c) 2024.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.modelix.model.api
18+
19+
import org.modelix.model.ModelFacade
20+
import org.modelix.model.api.async.asAsyncNode
21+
import org.modelix.model.client.IdGenerator
22+
import org.modelix.streams.getSynchronous
23+
import kotlin.test.Test
24+
import kotlin.test.assertEquals
25+
26+
class TreePointerTest {
27+
28+
@Test
29+
fun references_can_be_resolved() {
30+
val branch = TreePointer(ModelFacade.newLocalTree(useRoleIds = false), IdGenerator.newInstance(1))
31+
val rootNode = branch.getRootNode()
32+
val role = IReferenceLinkReference.fromName("refA").toLegacy()
33+
rootNode.setReferenceTarget(role, rootNode)
34+
assertEquals(rootNode, rootNode.getReferenceTarget(role))
35+
}
36+
37+
@Test
38+
fun references_can_be_resolved_async() {
39+
val branch = TreePointer(ModelFacade.newLocalTree(useRoleIds = false), IdGenerator.newInstance(1))
40+
val rootNode = branch.getRootNode()
41+
val role = IReferenceLinkReference.fromName("refA")
42+
rootNode.setReferenceTarget(role.toLegacy(), rootNode)
43+
assertEquals(rootNode, rootNode.asAsyncNode().getReferenceTarget(role).getSynchronous()?.asRegularNode())
44+
}
45+
}

0 commit comments

Comments
 (0)