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} })()`;