From 45ba2c7130d29cfd02a670faee3dd8065123b931 Mon Sep 17 00:00:00 2001 From: mnobile-hs <191622299+mnobile-hs@users.noreply.github.com> Date: Thu, 19 Nov 2026 13:01:10 -0800 Subject: [PATCH] Don't nest eager import aliases under a parent alias that has finished importing An aliased import inside a macro from another aliased import (e.g. a macro in `{% import 'a.jinja' as outer %}` that does `{% import 'b.jinja' as inner %}`) built the dotted alias `outer.inner` and walked `outer` by name from the calling scope to nest the new alias map. Once the parent import has finished, that lookup can hit a local variable instead of the alias map, which either threw "Encountered a problem with import alias maps" (local is not a map) or put `inner` into the user's dict (local is a map). Default execution mode has neither problem, so eager output diverged from default output. Only nest while the parent import is still in progress (its temporary import alias is in scope), the same check EagerSetTagStrategy uses; otherwise bind the alias in the current scope like a top-level import. Co-Authored-By: Claude Opus 5.5 --- .../AliasedEagerImportingStrategy.java | 29 ++++++++++--------- .../lib/tag/eager/EagerImportTagTest.java | 20 +++++++++++++ .../eager/importtag/shadowed-alias-dict.jinja | 3 ++ .../importtag/shadowed-alias-string.jinja | 3 ++ 4 files changed, 41 insertions(+), 14 deletions(-) create mode 100644 src/test/resources/tags/eager/importtag/shadowed-alias-dict.jinja create mode 100644 src/test/resources/tags/eager/importtag/shadowed-alias-string.jinja 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 %}