Merge pull request #236 from modelix/bugfix/MODELIX-530-fix-reference…

…-resolving fix(modelql): access to references outside of queries
modelix · Sep 11, 2023 · a1d5c09 · a1d5c09
2 parents b1ab8f3 + a3aae14
commit a1d5c09
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/modelql-client/src/commonMain/kotlin/org/modelix/modelql/client/ModelQLNode.kt b/modelql-client/src/commonMain/kotlin/org/modelix/modelql/client/ModelQLNode.kt
@@ -198,7 +198,7 @@ abstract class ModelQLNode(val client: ModelQLClient) : INode, ISupportsModelQL,
     }
 
     private fun IMonoStep<INode>.nodeRefAndConcept(): IMonoStep<IZip2Output<Any?, INodeReference, ConceptReference?>> {
-        return nodeReference().zip(conceptReference())
+        return map { it.nodeReference().zip(it.conceptReference()) }
     }
 
     private fun IFluxStep<INode>.nodeRefAndConcept(): IFluxStep<IZip2Output<Any?, INodeReference, ConceptReference?>> {

diff --git a/modelql-client/src/jvmTest/kotlin/org/modelix/modelql/client/ModelQLClientTest.kt b/modelql-client/src/jvmTest/kotlin/org/modelix/modelql/client/ModelQLClientTest.kt
@@ -241,4 +241,13 @@ class ModelQLClientTest {
         println(result)
         assertEquals(listOf(1002, 2002), result)
     }
+
+    @Test
+    fun `test IMonoStep nodeRefAndConcept`() = runTest { httpClient ->
+        val client = ModelQLClient("http://localhost/query", httpClient)
+
+        val nullNode = client.getRootNode().getReferenceTarget("nonExistentReference")
+
+        assertEquals(null, nullNode)
+    }
 }