Skip to content

feat(eager): add FATAL error when a node is deferred due to an exception #1357

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
jasmith-hs merged 1 commit into from
Oct 29, 2026
Merged

feat(eager): add FATAL error when a node is deferred due to an exception #1357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src/main/java/com/hubspot/jinjava/tree/ExpressionNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import com.hubspot.jinjava.interpret.DeferredValueException;
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
import com.hubspot.jinjava.interpret.TemplateError;
import com.hubspot.jinjava.lib.expression.DefaultExpressionStrategy;
import com.hubspot.jinjava.lib.expression.ExpressionStrategy;
import com.hubspot.jinjava.tree.output.OutputNode;
Expand Down Expand Up @@ -49,6 +50,11 @@ public OutputNode render(JinjavaInterpreter interpreter) {
return expressionStrategy.interpretOutput(master, interpreter);
} catch (DeferredValueException e) {
interpreter.getContext().handleDeferredNode(this);
if (interpreter.getConfig().getExecutionMode().useEagerParser()) {
interpreter.addError(
TemplateError.fromException(e, getLineNumber(), getStartPosition())
);
}
return new RenderedOutputNode(master.getImage());
} finally {
postProcess(interpreter);
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/com/hubspot/jinjava/tree/TagNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import com.hubspot.jinjava.interpret.InvalidInputException;
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
import com.hubspot.jinjava.interpret.OutputTooBigException;
import com.hubspot.jinjava.interpret.TemplateError;
import com.hubspot.jinjava.lib.tag.FlexibleTag;
import com.hubspot.jinjava.lib.tag.Tag;
import com.hubspot.jinjava.tree.output.OutputNode;
Expand Down Expand Up @@ -58,6 +59,11 @@ public OutputNode render(JinjavaInterpreter interpreter) {
return tag.interpretOutput(this, interpreter);
} catch (DeferredValueException e) {
interpreter.getContext().handleDeferredNode(this);
if (interpreter.getConfig().getExecutionMode().useEagerParser()) {
interpreter.addError(
TemplateError.fromException(e, getLineNumber(), getStartPosition())
);
}
return new RenderedOutputNode(reconstructImage());
} catch (
InterpretException
Expand Down
9 changes: 9 additions & 0 deletions src/test/java/com/hubspot/jinjava/EagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import com.hubspot.jinjava.interpret.Context;
import com.hubspot.jinjava.interpret.DeferredValue;
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
import com.hubspot.jinjava.interpret.TemplateError.ErrorType;
import com.hubspot.jinjava.loader.LocationResolver;
import com.hubspot.jinjava.loader.RelativePathResolver;
import com.hubspot.jinjava.loader.ResourceLocator;
Expand Down Expand Up @@ -1591,6 +1592,14 @@ public void itFailsOnModificationInAliasedMacro() {
interpreter.render(input);
// We don't support this
assertThat(interpreter.getContext().getDeferredNodes()).isNotEmpty();
assertThat(interpreter.getErrors())
.singleElement()
.satisfies(error -> {
assertThat(error.getSeverity()).isEqualTo(ErrorType.FATAL);
assertThat(error.getMessage())
.contains("Cannot modify temporary import alias outside of import tag");
});
interpreter.removeLastError();
}

@Test
Expand Down
5 changes: 5 additions & 0 deletions src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstDotTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import com.hubspot.jinjava.interpret.Context;
import com.hubspot.jinjava.interpret.DeferredValue;
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
import com.hubspot.jinjava.interpret.TemplateError;
import com.hubspot.jinjava.interpret.TemplateError.ErrorType;
import com.hubspot.jinjava.mode.EagerExecutionMode;
import com.hubspot.jinjava.random.RandomNumberGeneratorStrategy;
import com.hubspot.jinjava.testobjects.EagerAstDotTestObjects;
Expand Down Expand Up @@ -74,5 +76,8 @@ public void itDefersNodeWhenNestedDeferredMapDotThrowsDeferredValueException() {
assertThat(interpreter.render("{{ foo_map.bar.deferred }}"))
.isEqualTo("{{ foo_map.bar.deferred }}");
assertThat(interpreter.getContext().getDeferredNodes()).isNotEmpty();
assertThat(interpreter.getErrors())
.extracting(TemplateError::getSeverity)
.containsExactly(ErrorType.FATAL);
}
}
11 changes: 8 additions & 3 deletions src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerDoTagTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
import com.hubspot.jinjava.LegacyOverrides;
import com.hubspot.jinjava.interpret.DeferredValue;
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
import com.hubspot.jinjava.interpret.TemplateError;
import com.hubspot.jinjava.interpret.TemplateError.ErrorReason;
import com.hubspot.jinjava.interpret.TemplateError.ErrorType;
import com.hubspot.jinjava.lib.tag.DoTagTest;
import com.hubspot.jinjava.lib.tag.Tag;
import com.hubspot.jinjava.mode.EagerExecutionMode;
Expand Down Expand Up @@ -65,8 +67,11 @@ public void itLimitsLength() {
}
context.setDeferredExecutionMode(true);
interpreter.render(String.format("{%% do deferred.append('%s') %%}", tooLong));
assertThat(interpreter.getErrors()).hasSize(1);
assertThat(interpreter.getErrors().get(0).getReason())
.isEqualTo(ErrorReason.OUTPUT_TOO_BIG);
assertThat(interpreter.getErrors())
.extracting(TemplateError::getReason)
.containsExactly(ErrorReason.EXCEPTION, ErrorReason.OUTPUT_TOO_BIG);
assertThat(interpreter.getErrors().get(0).getSeverity()).isEqualTo(ErrorType.FATAL);
assertThat(interpreter.getErrors().get(0).getMessage())
.contains("Can not convert deferred result to string");
}
}
11 changes: 8 additions & 3 deletions src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerSetTagTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
import com.hubspot.jinjava.ExpectedNodeInterpreter;
import com.hubspot.jinjava.interpret.DeferredValue;
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
import com.hubspot.jinjava.interpret.TemplateError;
import com.hubspot.jinjava.interpret.TemplateError.ErrorReason;
import com.hubspot.jinjava.interpret.TemplateError.ErrorType;
import com.hubspot.jinjava.lib.tag.SetTagTest;
import com.hubspot.jinjava.mode.EagerExecutionMode;
import com.hubspot.jinjava.objects.Namespace;
Expand Down Expand Up @@ -165,9 +167,12 @@ public void itLimitsLength() {
}
context.setDeferredExecutionMode(true);
interpreter.render(String.format("{%% set deferred = '%s' %%}", tooLong));
assertThat(interpreter.getErrors()).hasSize(1);
assertThat(interpreter.getErrors().get(0).getReason())
.isEqualTo(ErrorReason.OUTPUT_TOO_BIG);
assertThat(interpreter.getErrors())
.extracting(TemplateError::getReason)
.containsExactly(ErrorReason.EXCEPTION, ErrorReason.OUTPUT_TOO_BIG);
assertThat(interpreter.getErrors().get(0).getSeverity()).isEqualTo(ErrorType.FATAL);
assertThat(interpreter.getErrors().get(0).getMessage())
.contains("Output too big for eager execution");
}

@Test
Expand Down
Loading