Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public class AliasedEagerImportingStrategy implements EagerImportingStrategy {

private final ImportingData importingData;
private final String currentImportAlias;
private final Optional<String> maybeParentImportAlias;
private final String fullImportAlias;

@VisibleForTesting
Expand All @@ -34,10 +35,8 @@ public AliasedEagerImportingStrategy(
) {
this.importingData = importingData;
this.currentImportAlias = currentImportAlias;
Optional<String> maybeParentImportAlias = importingData
.getOriginalInterpreter()
.getContext()
.getImportResourceAlias();
maybeParentImportAlias =
importingData.getOriginalInterpreter().getContext().getImportResourceAlias();
if (maybeParentImportAlias.isPresent()) {
fullImportAlias =
String.format("%s.%s", maybeParentImportAlias.get(), currentImportAlias);
Expand Down Expand Up @@ -68,7 +67,7 @@ public String handleDeferredTemplateFile(DeferredValueException e) {
public void setup(JinjavaInterpreter child) {
child.getContext().getScope().put(Context.IMPORT_RESOURCE_ALIAS_KEY, fullImportAlias);
child.getContext().put(Context.IMPORT_RESOURCE_ALIAS_KEY, fullImportAlias);
constructFullAliasPathMap(currentImportAlias, child);
constructFullAliasPathMap(child);
getMapForCurrentContextAlias(currentImportAlias, child);
importingData
.getOriginalInterpreter()
Expand Down Expand Up @@ -138,15 +137,10 @@ public String getFinalOutput(String output, JinjavaInterpreter child) {
}

@SuppressWarnings("unchecked")
private static void constructFullAliasPathMap(
String currentImportAlias,
JinjavaInterpreter child
) {
String fullImportAlias = child
.getContext()
.getImportResourceAlias()
.orElse(currentImportAlias);
String[] allAliases = fullImportAlias.split("\\.");
private void constructFullAliasPathMap(JinjavaInterpreter child) {
String[] allAliases = isParentImportInProgress(child)
? fullImportAlias.split("\\.")
: new String[] { currentImportAlias };
Map<String, Object> currentMap = child.getContext().getParent();
for (int i = 0; i < allAliases.length - 1; i++) {
Object maybeNextMap = currentMap.get(allAliases[i]);
Expand All @@ -170,6 +164,13 @@ private static void constructFullAliasPathMap(
);
}

private boolean isParentImportInProgress(JinjavaInterpreter child) {
return maybeParentImportAlias
.map(MetaContextVariables::getTemporaryImportAlias)
.map(child.getContext()::containsKey)
.orElse(false);
}

@SuppressWarnings("unchecked")
private static Map<String, Object> getMapForCurrentContextAlias(
String currentImportAlias,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,26 @@ public void itKeepsImportAliasVariablesInsideOwnScope() {
assertThat(result.trim()).isEqualTo("{'key': 'val'}-B_inter_B");
}

@Test
public void itImportsInsideMacroWhenLocalVariableShadowsParentAlias() {
setupResourceLocator();
String result = interpreter.render(
"{% import 'shadowed-alias-string.jinja' as outer %}{{ outer.render() }}"
);
assertThat(interpreter.getErrors()).isEmpty();
assertThat(result.trim()).isEqualTo("B_B_B-shadowed");
}

@Test
public void itDoesNotAddImportAliasToLocalDictShadowingParentAlias() {
setupResourceLocator();
String result = interpreter.render(
"{% import 'shadowed-alias-dict.jinja' as outer %}{{ outer.render() }}"
);
assertThat(interpreter.getErrors()).isEmpty();
assertThat(result.trim()).isEqualTo("B_B_B-{'name': 'local'}");
}

@Test
public void itKeepsDeferredImportAliasesInsideOwnScope() {
setupResourceLocator();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{% macro render() -%}
{% set outer = {'name': 'local'} %}{% import 'printer-b.jinja' as printer %}{{ printer.print() }}-{{ outer }}
{%- endmacro %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{% macro render() -%}
{% set outer = 'shadowed' %}{% import 'printer-b.jinja' as printer %}{{ printer.print() }}-{{ outer }}
{%- endmacro %}
Loading