Merge pull request #20 from formio/FIO-10822-fixed-evaluations-for-logic-with-var-not-in-function-start

brendanbond · web-flow · commit 6d58fbd7b157 · 2025-11-06T08:29:36.000-06:00
FIO-10822: fixed an issue where evaluations donot work if returned variable is in middle of the custom logic or is not 'value'
diff --git 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} })()`;

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,10 @@ export class Evaluator extends DefaultEvaluator {`
`31`	`31`	`return baseEvaluate(func, args, ...rest);`
`32`	`32`	`}`
`33`	`33`
	`34`	`+`
`34`	`35`	`if (func.indexOf(' return ') === -1) {`
`35`		- func = `result = (function() { value = ${func}; return value; })()`;
	`36`	`+ const returnedVariable = rest[0] \|\| 'value';`
	`37`	+ func = `result = (function() { var ${returnedVariable}; ${func}; return ${returnedVariable}; })()`;
`36`	`38`	`}`
`37`	`39`	`else {`
`38`	`40`	func = `result = (function() { ${func} })()`;