more contortions around #1558

Author: ptrthomas

karate-core/src/main/java/com/intuit/karate/core/ScenarioEngine.java

@@ -1025,14 +1025,27 @@ public void init() { // not in constructor because it has to be on Runnable.run(
             AttachResult ar = recurseAndAttach(k, v, seen);
             JS.put(k, ar.value);
         });
-        // re-hydrate any functions from caller or background
         vars.forEach((k, v) -> {
+            // re-hydrate any functions from caller or background  
             AttachResult ar = recurseAndAttach(k, v.getValue(), seen);
             // note that we don't update the vars !
             // if we do, any "bad" out-of-context values will crash the constructor of Variable
             // it is possible the vars are detached / re-used later, so we kind of defer the inevitable
             JS.put(k, ar.value);
         });
+        if (runtime.caller.arg != null && runtime.caller.arg.isMap()) {
+            // add the call arg as separate "over ride" variables
+            Map<String, Object> arg = runtime.caller.arg.getValue();
+            arg.forEach((k, v) -> {
+                AttachResult ar = recurseAndAttach(k, v, seen);
+                try {
+                    vars.put(k, new Variable(ar.value));
+                } catch (Exception e) {
+                    logger.warn("[*** init call-arg ***] ignoring non-json value: '{}' - {}", k, e.getMessage());
+                }
+                JS.put(k, ar.value);
+            });
+        }
         JS.put(KARATE, bridge);
         JS.put(READ, readFunction);
         HttpClient client = runtime.featureRuntime.suite.clientFactory.create(this);
@@ -1096,7 +1109,7 @@ private AttachResult recurseAndAttach(String name, Object o, Set<Object> seen) {
                 }
             } catch (Exception e) {
                 logger.warn("[*** attach ***] ignoring non-json value: '{}' - {}", name, e.getMessage());
-                // here we sweep things under the carpet and hope that graal does not notice !
+                // here we try our luck and hope that graal does not notice !
                 return AttachResult.dirty(value);
             }
         } else if (o instanceof JsFunction) {
@@ -1196,19 +1209,14 @@ private Object recurseAndDetachAndDeepClone(String name, Object o, Set<Object> s
         if (o instanceof Value) {
             Value value = (Value) o;
             try {
-                if (value.canExecute()) {
-                    if (value.isMetaObject()) { // js function
-                        return new JsFunction(value);
-                    } else { // java function
-                        return new JsExecutable(value);
-                    }
+                if (value.canExecute() && value.isMetaObject()) { // js function
+                    return new JsFunction(value);
                 } else {
-                    // everything else including java-type references that do not need special attach handling
-                    o = JsValue.toJava(value);
+                    return value;
                 }
             } catch (Exception e) {
                 logger.warn("[*** detach deep ***] ignoring non-json value in callonce / callSingle: '{}' - {}", e.getMessage());
-                return null;
+                return value; // try our luck
             }
         }
         if (o instanceof List) {
@@ -1301,31 +1309,35 @@ public void setHiddenVariable(String key, Object value) {
 
     public void setVariable(String key, Object value) {
         Variable v;
+        Object o;
         if (value instanceof Variable) {
             v = (Variable) value;
+            o = v.getValue();
         } else {
-            v = new Variable(value);
+            o = value;
+            try {
+                v = new Variable(value);                
+            } catch (Exception e) {
+                v = null;
+                logger.warn("[*** set variable ***] ignoring non-json value: {} - {}", key, e.getMessage());
+            }
+        }
+        if (v != null) {
+            vars.put(key, v);
         }
-        vars.put(key, v);
         if (JS != null) {
-            JS.put(key, v.getValue());
+            JS.put(key, o);
         }
         if (children != null) {
-            children.forEach(c -> c.setVariable(key, value));
+            children.forEach(c -> c.setVariable(key, o));
         }
     }
 
     public void setVariables(Map<String, Object> map) {
         if (map == null) {
             return;
         }
-        map.forEach((k, v) -> {
-            try {
-                setVariable(k, v);
-            } catch (Exception e) {
-                logger.warn("[*** set variables ***] ignoring non-json value: {} - {}", k, e.getMessage());
-            }
-        });
+        map.forEach((k, v) -> setVariable(k, v));
     }
 
     private static Map<String, Variable> copy(Map<String, Variable> source, boolean deep) {

karate-core/src/main/java/com/intuit/karate/core/ScenarioRuntime.java

@@ -258,20 +258,13 @@ protected void logError(String message) {
 
     private Map<String, Object> initMagicVariables() {
         Map<String, Object> map = new HashMap();
-        if (caller.isNone()) { // if feature called via java api
-            if (caller.arg != null && caller.arg.isMap()) {
-                engine.setVariables(caller.arg.getValue());
-            }
-        } else {
+        if (!caller.isNone()) {
             // karate principle: parent variables are always "visible"
             // so we inject the parent magic variables
             // but they will be over-written by what is local to this scenario
             map.putAll(caller.parentRuntime.magicVariables);
             map.put("__arg", caller.arg == null ? null : caller.arg.getValue());
             map.put("__loop", caller.getLoopIndex());
-            if (caller.arg != null && caller.arg.isMap()) {
-                engine.setVariables(caller.arg.getValue());
-            }
         }
         if (scenario.isOutlineExample() && !this.isDynamicBackground()) { // init examples row magic variables
             Map<String, Object> exampleData = scenario.getExampleData();