Merge pull request #751 from HubSpot/deferred-import-choice

[Eager Execution] Fix deferred import selection

Author: jasmith-hs

src/main/java/com/hubspot/jinjava/lib/tag/eager/EagerImportTag.java

@@ -101,6 +101,11 @@ public String getEagerTagImage(TagToken tagToken, JinjavaInterpreter interpreter
         // Since some values got deferred, output a DoTag that will load the currentImportAlias on the context.
         return (
           newPathSetter +
+          EagerReconstructionUtils.buildSetTag(
+            ImmutableMap.of(currentImportAlias, "{}"),
+            interpreter,
+            true
+          ) +
           output +
           getDoTagToPreserve(interpreter, currentImportAlias) +
           initialPathSetter
@@ -152,14 +157,6 @@ private static String getDoTagToPreserve(
       .getContext()
       .getSessionBindings()
       .get(currentImportAlias);
-    if ((!(currentAliasMap instanceof DeferredValue))) {
-      // Make sure that the map is deferred.
-      if (!(currentAliasMap instanceof Map)) {
-        currentAliasMap = new PyMap(new HashMap<>());
-      }
-      currentAliasMap = DeferredValue.instance(currentAliasMap);
-      interpreter.getContext().put(currentImportAlias, currentAliasMap);
-    }
     for (Map.Entry<String, Object> entry : (
       (Map<String, Object>) ((DeferredValue) currentAliasMap).getOriginalValue()
     ).entrySet()) {

src/test/java/com/hubspot/jinjava/EagerTest.java

@@ -929,4 +929,11 @@ public void itDefersChangesWithinDeferredSetBlockSecondPass() {
       "defers-changes-within-deferred-set-block.expected"
     );
   }
+
+  @Test
+  public void itHandlesImportInDeferredIf() {
+    expectedTemplateInterpreter.assertExpectedOutputNonIdempotent(
+      "handles-import-in-deferred-if"
+    );
+  }
 }

src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerImportTagTest.java

@@ -447,6 +447,29 @@ public void itDefersQuadLayer() {
     assertThat(interpreter.render(result).trim()).isEqualTo("12345 cbaabaaba");
   }
 
+  @Test
+  public void itHandlesQuadLayerInDeferredIf() {
+    setupResourceLocator();
+    context.put("a_val", "a");
+    context.put("b_val", "b");
+    String result = interpreter.render(
+      "{% if deferred %}{% import 'import-tree-b.jinja' as b %}{% endif %}"
+    );
+    assertThat(result)
+      .isEqualTo(
+        "{% if deferred %}{% set current_path = 'import-tree-b.jinja' %}{% set b = {} %}{% set current_path = 'import-tree-a.jinja' %}{% set a = {} %}{% set something = 'somn' %}{% do a.update({\"something\": something}) %}\n" +
+        "{% set foo_a = 'a' %}{% do a.update({\"foo_a\": foo_a}) %}\n" +
+        "{% do a.update({'foo_a': 'a','import_resource_path': 'import-tree-a.jinja','something': 'somn'}) %}{% set current_path = 'import-tree-b.jinja' %}\n" +
+        "{% set foo_b = 'b' + a.foo_a %}{% do b.update({\"foo_b\": foo_b}) %}\n" +
+        "{% do b.update({'a': a,'foo_b': foo_b,'import_resource_path': 'import-tree-b.jinja'}) %}{% set current_path = '' %}{% endif %}"
+      );
+
+    context.put("deferred", true);
+    interpreter.render(result);
+    assertThat(interpreter.render("{{ b.foo_b }}")).isEqualTo("ba");
+    assertThat(interpreter.render("{{ b.a.foo_a }}")).isEqualTo("a");
+  }
+
   @Test
   public void itCorrectlySetsAliasedPath() {
     setupResourceLocator();

src/test/resources/eager/handles-deferred-import-vars.expected.jinja

@@ -4,7 +4,7 @@ Hello {{ myname }}
 
 foo: Hello {{ myname }}
 bar: {{ bar }}
----{% set myname = deferred + 7 %}{% set current_path = 'macro-and-set.jinja' %}
+---{% set myname = deferred + 7 %}{% set current_path = 'macro-and-set.jinja' %}{% set simple = {} %}
 {% set bar = myname + 19 %}{% set simple = {} %}{% do simple.update({"bar": bar}) %}
 Hello {{ myname }}
 {% do simple.update({'import_resource_path': 'macro-and-set.jinja'}) %}{% set current_path = '' %}

src/test/resources/eager/handles-import-in-deferred-if.expected.jinja

@@ -0,0 +1,11 @@
+{% if deferred %}{% set current_path = 'macro-and-set.jinja' %}{% set simple = {} %}
+{% set bar = 'person19' %}{% do simple.update({"bar": bar}) %}
+Hello person
+{% do simple.update({'bar': 'person19','import_resource_path': 'macro-and-set.jinja'}) %}{% set current_path = '' %}
+{% else %}{% set current_path = 'macro-and-set.jinja' %}{% set simple = {} %}
+{% set bar = 'person19' %}{% do simple.update({"bar": bar}) %}
+Hello person
+{% do simple.update({'bar': 'person19','import_resource_path': 'macro-and-set.jinja'}) %}{% set current_path = '' %}
+{% endif %}
+simple.foo: {{ simple.foo() }}
+simple.bar: {{ simple.bar }}

src/test/resources/eager/handles-import-in-deferred-if.jinja

@@ -0,0 +1,8 @@
+{% set myname = 'person' %}
+{% if deferred %}
+{%- import "macro-and-set.jinja" as simple -%}
+{% else %}
+{%- import "macro-and-set.jinja" as simple -%}
+{% endif %}
+simple.foo: {{ simple.foo() }}
+simple.bar: {{ simple.bar }}