Skip to content

FIO-10653: Fixed issue where the function declaration may mess up the evaluator if there is a return in the statement. #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brendanbond merged 2 commits into from
Sep 11, 2025
Merged

FIO-10653: Fixed issue where the function declaration may mess up the evaluator if there is a return in the statement. #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49b2b72
Fixed issue where the function declaration may mess up the evaluator …
travist Sep 11, 2025
9e518c7
update lockfile
brendanbond Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/ProtectedEvaluator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Utils as FormioUtils, DefaultEvaluator} from '@formio/js';
import { Utils as FormioUtils, DefaultEvaluator } from '@formio/js';
import Interpreter from '@formio/js-interpreter';

const baseEvaluator = FormioUtils.Evaluator.evaluator;
Expand Down Expand Up @@ -31,8 +31,13 @@ export class Evaluator extends DefaultEvaluator {
return baseEvaluate(func, args, ...rest);
}

func = `result = (function() { value = ${func}; return value; })()`;
const initFunc = function(interpreter, globalObject) {
if (func.indexOf(' return ') === -1) {
func = `result = (function() { value = ${func}; return value; })()`;
}
else {
func = `result = (function() { ${func} })()`;
}
const initFunc = function (interpreter, globalObject) {
Object.keys(args).forEach((variable) => {
// Exclude variables which have circular references
if (excludedVariables.indexOf(variable) !== -1) {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@
dependencies:
acorn "^8.12.1"

"@formio/js@v5.1.0-dev.6214.89da41f":
version "5.1.0-dev.6214.89da41f"
resolved "https://registry.yarnpkg.com/@formio/js/-/js-5.1.0-dev.6214.89da41f.tgz#13b69fded69203fa81579fc0af8686aa187e8cfc"
integrity sha512-qe+owbEJ+mSF+763t/t3LPg5qYQwD0plvT0CeepR5RKH3WhwrH5WV/l9QjsgtW2BdwzgUfi9ozwefPCag8Vjeg==
"@formio/js@v5.1.0-dev.6214.fdfb58b":
version "5.1.0-dev.6214.fdfb58b"
resolved "https://registry.yarnpkg.com/@formio/js/-/js-5.1.0-dev.6214.fdfb58b.tgz#2744c2c9bcb131becedcb0f6d17bbfa2ae7e5b2c"
integrity sha512-cGxSfStbH8VPYO59cQgZoMrCuar66xe9NUKC8bp/pQ3tAnKx0fO3c2kfAsK5RIZpDNtHgWlZsyvZHf74ArgHxw==
dependencies:
"@formio/bootstrap" v3.0.0-dev.121.085d187
"@formio/core" "2.5.1-rc.6"
Expand Down
Loading