From ff59499c0e2162b76460b96fa6da5599010f3252 Mon Sep 17 00:00:00 2001
From: "ICX\\Tatsiana.Hashtold" <tanya@form.io>
Date: Thu, 6 Nov 2025 12:31:04 +0300
Subject: [PATCH] FIO-10822: fixed an issue where evaluations donot work if
 returned variable is in middle of the custom logic or is not 'value'

---
 src/ProtectedEvaluator.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ProtectedEvaluator.ts b/src/ProtectedEvaluator.ts
index 5031d09..6cda6d4 100644
--- a/src/ProtectedEvaluator.ts
+++ b/src/ProtectedEvaluator.ts
@@ -31,8 +31,10 @@ export class Evaluator extends DefaultEvaluator {
       return baseEvaluate(func, args, ...rest);
     }
 
+  
     if (func.indexOf(' return ') === -1) {
-      func = `result = (function() { value = ${func}; return value; })()`;
+      const returnedVariable = rest[0] || 'value';
+      func = `result = (function() { var ${returnedVariable}; ${func}; return ${returnedVariable}; })()`;
     }
     else {
       func = `result = (function() { ${func} })()`;