Skip to content

fix: extract mutable eval state into EvalContext — fixes #90, #93 #103

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

Open
matanzwix wants to merge 2 commits into
base: main
Choose a base branch
from
+445 −151
Open

fix: extract mutable eval state into EvalContext — fixes #90, #93 #103

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
900c653
fix: extract mutable evaluation state into EvalContext (fixes #90, #93)
matanzwix Mar 28, 2026
5a9598e
test: add $millis() timestamp advancement test
matanzwix Mar 28, 2026
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
18 changes: 10 additions & 8 deletions src/main/java/com/dashjoin/jsonata/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1561,9 +1561,10 @@ public static List hofFuncArgs(Object func, Object arg1, Object arg2, Object arg
*/
public static Object funcApply(Object func, List funcArgs) throws Throwable {
Object res;
if (isLambda(func))
res = Jsonata.current.get().apply(func, funcArgs, null, Jsonata.current.get().environment);
else
if (isLambda(func)) {
Jsonata.EvalContext ctx = Jsonata.evalContext.get();
res = ctx.instance.apply(func, funcArgs, null, ctx.environment);
} else
res = ((JFunction)func).call(null, funcArgs);
return res;
}
Expand Down Expand Up @@ -2375,7 +2376,8 @@ public static Object functionEval(String expr, Object focus) {
if(expr == null) {
return null;
}
Object input = Jsonata.current.get().input; // = this.input;
Jsonata.EvalContext ctx = Jsonata.evalContext.get();
Object input = ctx.input;
if(focus != null) {
input = focus;
// if the input is a JSON array, then wrap it in a singleton sequence so it gets treated as a single input
Expand All @@ -2386,7 +2388,7 @@ public static Object functionEval(String expr, Object focus) {
}

Jsonata ast;
Jsonata.Frame env = Jsonata.current.get().environment;
Jsonata.Frame env = ctx.environment;
try {
ast = jsonata(expr);
} catch(Throwable err) {
Expand All @@ -2397,7 +2399,7 @@ public static Object functionEval(String expr, Object focus) {
}
Object result = null;
try {
result = Jsonata.current.get().evaluate(ast.ast, input, env);
result = ctx.instance.evaluate(ast.ast, input, env);
} catch(Throwable err) {
// error evaluating the expression passed to $eval
//populateMessage(err);
Expand All @@ -2412,15 +2414,15 @@ public static Object functionEval(String expr, Object focus) {
// return datetime.fromMillis(timestamp.getTime(), picture, timezone);
// }, "<s?s?:s>"));
public static String now(String picture, String timezone) {
long t = Jsonata.current.get().timestamp;
long t = Jsonata.evalContext.get().timestamp;
return dateTimeFromMillis(t, picture, timezone);
}

// environment.bind("millis", defineFunction(function() {
// return timestamp.getTime();
// }, "<:n>"));
public static long millis() {
long t = Jsonata.current.get().timestamp;
long t = Jsonata.evalContext.get().timestamp;
return t;
}
}
Loading