diff --git a/src/main/java/com/hubspot/jinjava/lib/tag/eager/importing/AliasedEagerImportingStrategy.java b/src/main/java/com/hubspot/jinjava/lib/tag/eager/importing/AliasedEagerImportingStrategy.java index fa211714f..f73ee4180 100644 --- a/src/main/java/com/hubspot/jinjava/lib/tag/eager/importing/AliasedEagerImportingStrategy.java +++ b/src/main/java/com/hubspot/jinjava/lib/tag/eager/importing/AliasedEagerImportingStrategy.java @@ -25,6 +25,7 @@ public class AliasedEagerImportingStrategy implements EagerImportingStrategy { private final ImportingData importingData; private final String currentImportAlias; + private final Optional maybeParentImportAlias; private final String fullImportAlias; @VisibleForTesting @@ -34,10 +35,8 @@ public AliasedEagerImportingStrategy( ) { this.importingData = importingData; this.currentImportAlias = currentImportAlias; - Optional maybeParentImportAlias = importingData - .getOriginalInterpreter() - .getContext() - .getImportResourceAlias(); + maybeParentImportAlias = + importingData.getOriginalInterpreter().getContext().getImportResourceAlias(); if (maybeParentImportAlias.isPresent()) { fullImportAlias = String.format("%s.%s", maybeParentImportAlias.get(), currentImportAlias); @@ -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() @@ -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 currentMap = child.getContext().getParent(); for (int i = 0; i < allAliases.length - 1; i++) { Object maybeNextMap = currentMap.get(allAliases[i]); @@ -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 getMapForCurrentContextAlias( String currentImportAlias, diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerImportTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerImportTagTest.java index 6e082e9e8..4903444e8 100644 --- a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerImportTagTest.java +++ b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerImportTagTest.java @@ -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(); diff --git a/src/test/resources/tags/eager/importtag/shadowed-alias-dict.jinja b/src/test/resources/tags/eager/importtag/shadowed-alias-dict.jinja new file mode 100644 index 000000000..c5e0059a8 --- /dev/null +++ b/src/test/resources/tags/eager/importtag/shadowed-alias-dict.jinja @@ -0,0 +1,3 @@ +{% macro render() -%} +{% set outer = {'name': 'local'} %}{% import 'printer-b.jinja' as printer %}{{ printer.print() }}-{{ outer }} +{%- endmacro %} diff --git a/src/test/resources/tags/eager/importtag/shadowed-alias-string.jinja b/src/test/resources/tags/eager/importtag/shadowed-alias-string.jinja new file mode 100644 index 000000000..39b54161f --- /dev/null +++ b/src/test/resources/tags/eager/importtag/shadowed-alias-string.jinja @@ -0,0 +1,3 @@ +{% macro render() -%} +{% set outer = 'shadowed' %}{% import 'printer-b.jinja' as printer %}{{ printer.print() }}-{{ outer }} +{%- endmacro %}