Skip to content

Fix EagerFromTag reconstruction when template file cannot be resolved #1241

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
Apr 29, 2025
Merged

Fix EagerFromTag reconstruction when template file cannot be resolved #1241

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
22 changes: 17 additions & 5 deletions src/main/java/com/hubspot/jinjava/lib/tag/eager/EagerFromTag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,18 @@
import com.hubspot.jinjava.lib.fn.eager.EagerMacroFunction;
import com.hubspot.jinjava.lib.tag.DoTag;
import com.hubspot.jinjava.lib.tag.FromTag;
import com.hubspot.jinjava.loader.RelativePathResolver;
import com.hubspot.jinjava.lib.tag.eager.importing.EagerImportingStrategyFactory;
import com.hubspot.jinjava.tree.Node;
import com.hubspot.jinjava.tree.parse.TagToken;
import com.hubspot.jinjava.util.EagerReconstructionUtils;
import com.hubspot.jinjava.util.PrefixToPreserveState;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;

@Beta
public class EagerFromTag extends EagerStateChangingTag<FromTag> {
Expand All @@ -33,6 +35,9 @@ public EagerFromTag(FromTag fromTag) {

@Override
public String getEagerTagImage(TagToken tagToken, JinjavaInterpreter interpreter) {
String initialPathSetter = EagerImportingStrategyFactory.getSetTagForCurrentPath(
interpreter
);
List<String> helper = FromTag.getHelpers(tagToken);
Map<String, String> imports = FromTag.getImportMap(helper);
Optional<String> maybeTemplateFile;
Expand All @@ -55,10 +60,17 @@ public String getEagerTagImage(TagToken tagToken, JinjavaInterpreter interpreter
interpreter.getContext().addGlobalMacro(deferredMacro);
});
return (
EagerReconstructionUtils.buildBlockOrInlineSetTag(
RelativePathResolver.CURRENT_PATH_CONTEXT_KEY,
interpreter.getContext().get(RelativePathResolver.CURRENT_PATH_CONTEXT_KEY),
interpreter
initialPathSetter +
new PrefixToPreserveState(
EagerReconstructionUtils.handleDeferredTokenAndReconstructReferences(
interpreter,
DeferredToken
.builderFromToken(tagToken)
.addUsedDeferredWords(Stream.of(helper.get(0)))
.addUsedDeferredWords(imports.keySet())
.addSetDeferredWords(imports.values())
.build()
)
) +
tagToken.getImage()
);
Expand Down
30 changes: 29 additions & 1 deletion src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerFromTagTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,37 @@ public void teardown() {
public void itDefersWhenPathIsDeferred() {
String input = "{% from deferred import foo %}";
String output = interpreter.render(input);
assertThat(output).isEqualTo("{% set current_path = null %}" + input);
assertThat(output).isEqualTo("{% set current_path = '' %}" + input);
assertThat(interpreter.getContext().getGlobalMacro("foo")).isNotNull();
assertThat(interpreter.getContext().getGlobalMacro("foo").isDeferred()).isTrue();
assertThat(interpreter.getContext().getDeferredTokens())
.isNotEmpty()
.anySatisfy(deferredToken -> {
assertThat(deferredToken.getToken().getImage())
.isEqualTo("{% from deferred import foo %}");
assertThat(deferredToken.getSetDeferredWords()).containsExactly("foo");
assertThat(deferredToken.getUsedDeferredWords())
.containsExactlyInAnyOrder("deferred", "foo");
});
}

@Test
public void itDefersWhenPathIsDeferredWithAlias() {
String input = "{% from deferred import foo as new_foo %}";
String output = interpreter.render(input);
assertThat(output).isEqualTo("{% set current_path = '' %}" + input);
assertThat(interpreter.getContext().getGlobalMacro("new_foo")).isNotNull();
assertThat(interpreter.getContext().getGlobalMacro("new_foo").isDeferred()).isTrue();
assertThat(interpreter.getContext().getDeferredTokens())
.isNotEmpty()
.anySatisfy(deferredToken -> {
assertThat(deferredToken.getToken().getImage())
.isEqualTo("{% from deferred import foo as new_foo %}");
assertThat(deferredToken.getSetDeferredWords()).containsExactly("new_foo");
assertThat(deferredToken.getUsedDeferredWords())
.containsExactlyInAnyOrder("deferred", "foo");
});
assertThat(interpreter.getContext().get("new_foo")).isInstanceOf(DeferredValue.class);
}

@Test
Expand Down