Merge pull request #993 from camunda/eppdot-fix-lazy-value-mapper

eppdot-fix-lazy-value-mapper

Author: saig0

src/main/scala/org/camunda/feel/impl/builtin/ContextBuiltinFunctions.scala

@@ -136,6 +136,7 @@ class ContextBuiltinFunctions(valueMapper: ValueMapper) {
       case key :: tail =>
         val contextOfKey = contextValue.context.variableProvider
           .getVariable(key)
+          .map(valueMapper.toVal)
           .map {
             case contextOfKey: ValContext => contextOfKey
             case _                        => ValContext(EmptyContext)

src/test/scala/org/camunda/feel/impl/builtin/BuiltinContextFunctionsTest.scala

@@ -16,10 +16,12 @@
  */
 package org.camunda.feel.impl.builtin
 
-import org.camunda.feel.context.{CustomContext, VariableProvider}
+import org.camunda.feel.api.FeelEngineBuilder
+import org.camunda.feel.context.Context
 import org.camunda.feel.impl.interpreter.MyCustomContext
 import org.camunda.feel.impl.{EvaluationResultMatchers, FeelEngineTest}
 import org.camunda.feel.syntaxtree._
+import org.camunda.feel.valuemapper.CustomValueMapper
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 
@@ -234,6 +236,22 @@ class BuiltinContextFunctionsTest
     )
   }
 
+  it should "override nested context entry from a custom context" in {
+    evaluateExpression(
+      expression = """ context put(vars, ["a", "c"], 3) """,
+      variables = Map(
+        "vars" ->
+          ValContext(
+            new MyCustomContext(
+              Map("a" -> Map("b" -> 1, "c" -> 2))
+            )
+        )
+      )
+    ) should returnResult(
+      Map("a" -> Map("b" -> 1, "c" -> 3))
+    )
+  }
+
   it should "add nested context entry if key doesn't exist" in {
     evaluateExpression(""" context put({x:1}, ["y", "z"], 2) """) should returnResult(
       Map("x" -> 1, "y" -> Map("z" -> 2))