Add separate methods for whether deferred token is registered when builiding set tag

Author: jasmith-hs

src/main/java/com/hubspot/jinjava/lib/fn/eager/EagerMacroFunction.java

@@ -233,8 +233,7 @@ public String reconstructImage(String fullName) {
         EagerReconstructionUtils.buildBlockOrInlineSetTag(
           Context.DEFERRED_IMPORT_RESOURCE_PATH_KEY,
           importFile.get(),
-          interpreter,
-          false
+          interpreter
         );
       interpreter
         .getContext()
@@ -243,8 +242,7 @@ public String reconstructImage(String fullName) {
         EagerReconstructionUtils.buildBlockOrInlineSetTag(
           Context.DEFERRED_IMPORT_RESOURCE_PATH_KEY,
           currentDeferredImportResource,
-          interpreter,
-          false
+          interpreter
         );
     }
 

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

@@ -71,7 +71,7 @@ public PrefixToPreserveState getPrefixToPreserveState() {
         entry ->
           prefixToPreserveState.put(
             entry.getKey(),
-            buildBlockOrInlineSetTag(entry.getKey(), entry.getValue(), interpreter, false)
+            buildBlockOrInlineSetTag(entry.getKey(), entry.getValue(), interpreter)
           )
       );
     filteredEntries

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

@@ -60,8 +60,7 @@ public String getEagerTagImage(TagToken tagToken, JinjavaInterpreter interpreter
         EagerReconstructionUtils.buildBlockOrInlineSetTag(
           RelativePathResolver.CURRENT_PATH_CONTEXT_KEY,
           interpreter.getContext().get(RelativePathResolver.CURRENT_PATH_CONTEXT_KEY),
-          interpreter,
-          false
+          interpreter
         ) +
         tagToken.getImage()
       );

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

@@ -190,11 +190,10 @@ private String getFinalOutputWithAlias(
   ) {
     return (
       newPathSetter +
-      EagerReconstructionUtils.buildBlockOrInlineSetTag(
+      EagerReconstructionUtils.buildBlockOrInlineSetTagAndRegisterDeferredToken(
         currentImportAlias,
         Collections.emptyMap(),
-        interpreter,
-        true
+        interpreter
       ) +
       wrapInChildScope(
         interpreter,
@@ -259,11 +258,10 @@ private String getSetTagForDeferredChildBindings(
       .filter(entry -> !entry.getKey().equals(currentImportAlias))
       .map(
         entry ->
-          EagerReconstructionUtils.buildBlockOrInlineSetTag(
+          EagerReconstructionUtils.buildBlockOrInlineSetTag( // don't register deferred token so that we don't defer them on higher context scopes; they only exist in the child scope
             entry.getKey(),
             ((DeferredValue) entry.getValue()).getOriginalValue(),
-            interpreter,
-            false // false so that we don't defer them on higher context scopes; they only exist in the child scope
+            interpreter
           )
       )
       .collect(Collectors.joining());
@@ -282,8 +280,7 @@ public static String getSetTagForCurrentPath(JinjavaInterpreter interpreter) {
               .getContext()
               .getOrDefault(RelativePathResolver.CURRENT_PATH_CONTEXT_KEY, "")
         ),
-      interpreter,
-      false
+      interpreter
     );
   }
 

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

@@ -35,8 +35,7 @@ public String innerInterpret(TagNode tagNode, JinjavaInterpreter interpreter) {
       final String newPathSetter = EagerReconstructionUtils.buildBlockOrInlineSetTag(
         RelativePathResolver.CURRENT_PATH_CONTEXT_KEY,
         templateFile,
-        interpreter,
-        false
+        interpreter
       );
       return newPathSetter + output + initialPathSetter;
     }

src/main/java/com/hubspot/jinjava/util/EagerReconstructionUtils.java

@@ -258,13 +258,28 @@ private static Map<String, String> reconstructSetVariablesBeforeDeferring(
             buildBlockOrInlineSetTag(
               word,
               interpreter.getContext().get(word),
-              interpreter,
-              false
+              interpreter
             )
         )
       );
   }
 
+  public static String buildBlockOrInlineSetTag(
+    String name,
+    Object value,
+    JinjavaInterpreter interpreter
+  ) {
+    return buildBlockOrInlineSetTag(name, value, interpreter, false);
+  }
+
+  public static String buildBlockOrInlineSetTagAndRegisterDeferredToken(
+    String name,
+    Object value,
+    JinjavaInterpreter interpreter
+  ) {
+    return buildBlockOrInlineSetTag(name, value, interpreter, true);
+  }
+
   public static String buildBlockOrInlineSetTag(
     String name,
     Object value,
@@ -285,8 +300,13 @@ public static String buildBlockOrInlineSetTag(
         registerDeferredToken
       );
     }
+    String pyishStringRepresentation = PyishObjectMapper.getAsPyishString(value);
+    Set<String> dependentWords = EagerExpressionResolver.findDeferredWords(
+      pyishStringRepresentation,
+      interpreter
+    );
     return buildSetTag(
-      ImmutableMap.of(name, PyishObjectMapper.getAsPyishString(value)),
+      ImmutableMap.of(name, pyishStringRepresentation),
       interpreter,
       registerDeferredToken
     );

src/test/java/com/hubspot/jinjava/util/EagerReconstructionUtilsTest.java

@@ -2,8 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -197,11 +196,10 @@ public void itReconstructsVariablesAndMacroFunctions() {
 
   @Test
   public void itBuildsSetTagForDeferredAndRegisters() {
-    String result = EagerReconstructionUtils.buildBlockOrInlineSetTag(
+    String result = EagerReconstructionUtils.buildBlockOrInlineSetTagAndRegisterDeferredToken(
       "foo",
       "bar",
-      interpreter,
-      true
+      interpreter
     );
     assertThat(result).isEqualTo("{% set foo = 'bar' %}");
     assertThat(context.getDeferredTokens()).hasSize(1);
@@ -219,8 +217,7 @@ public void itBuildsSetTagForDeferredAndDoesntRegister() {
     String result = EagerReconstructionUtils.buildBlockOrInlineSetTag(
       "foo",
       "bar",
-      interpreter,
-      false
+      interpreter
     );
     assertThat(result).isEqualTo("{% set foo = 'bar' %}");
     assertThat(context.getDeferredTokens()).isEmpty();
@@ -254,11 +251,10 @@ public void itLimitsSetTagConstruction() {
     }
     assertThatThrownBy(
         () ->
-          EagerReconstructionUtils.buildBlockOrInlineSetTag(
+          EagerReconstructionUtils.buildBlockOrInlineSetTagAndRegisterDeferredToken(
             "foo",
             tooLong.toString(),
-            interpreter,
-            true
+            interpreter
           )
       )
       .isInstanceOf(OutputTooBigException.class);

src/test/resources/eager/reconstructs-nested-value-in-string-representation.jinja

@@ -1,5 +1,6 @@
-{% set foo = 'I am foo' %}
-{% set bar = 'I am bar' %}
+{% set i_am = 'I am' %}
+{% set foo = '{{ i_am }} foo' %}
+{% set bar = '{{ i_am }} bar' %}
 {% set map_with_vals = {'foo': 'Foo is {{ foo }}.'} %}
 {% if deferred %}
 {% do map_with_vals.put('bar', 'Bar is {{ bar }}.') %}