Merge pull request #1088 from HubSpot/reconstruct-nested-in-string-representation

Reconstruct nested interpretation variables in string representation

Author: jasmith-hs

src/main/java/com/hubspot/jinjava/lib/expression/EagerExpressionStrategy.java

@@ -67,11 +67,10 @@ private String eagerResolveExpression(
         prefixToPreserveState.toString() + postProcessResult(master, result, interpreter)
       );
     }
-    prefixToPreserveState.putAll(
-      EagerReconstructionUtils.reconstructFromContextBeforeDeferringAsMap(
-        eagerExecutionResult.getResult().getDeferredWords(),
-        interpreter
-      )
+    EagerReconstructionUtils.hydrateReconstructionFromContextBeforeDeferring(
+      prefixToPreserveState,
+      eagerExecutionResult.getResult().getDeferredWords(),
+      interpreter
     );
     String deferredExpressionImage = wrapInExpression(
       eagerExecutionResult.getResult().toString(),

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/DeferredToken.java

@@ -250,7 +250,7 @@ private static CallStack acquireMacroStack() {
       .orElse(null);
   }
 
-  private static Set<String> getBases(Set<String> original) {
+  public static Set<String> getBases(Set<String> original) {
     return original
       .stream()
       .map(prop -> prop.split("\\.", 2)[0])

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

@@ -96,11 +96,10 @@ public String eagerInterpret(
         );
       }
       caller.setDeferred(true);
-      prefixToPreserveState.putAll(
-        EagerReconstructionUtils.reconstructFromContextBeforeDeferringAsMap(
-          eagerExecutionResult.getResult().getDeferredWords(),
-          interpreter
-        )
+      EagerReconstructionUtils.hydrateReconstructionFromContextBeforeDeferring(
+        prefixToPreserveState,
+        eagerExecutionResult.getResult().getDeferredWords(),
+        interpreter
       );
 
       LengthLimitingStringJoiner joiner = new LengthLimitingStringJoiner(

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

@@ -86,11 +86,10 @@ public String getEagerTagImage(TagToken tagToken, JinjavaInterpreter interpreter
       if (!eagerExecutionResult.getResult().isFullyResolved()) {
         resolvedValues =
           new HelperStringTokenizer(resolvedExpression).splitComma(true).allTokens();
-        prefixToPreserveState.putAll(
-          EagerReconstructionUtils.reconstructFromContextBeforeDeferringAsMap(
-            eagerExecutionResult.getResult().getDeferredWords(),
-            interpreter
-          )
+        EagerReconstructionUtils.hydrateReconstructionFromContextBeforeDeferring(
+          prefixToPreserveState,
+          eagerExecutionResult.getResult().getDeferredWords(),
+          interpreter
         );
       } else {
         List<?> objects = eagerExecutionResult.getResult().toList();

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

@@ -1,6 +1,5 @@
 package com.hubspot.jinjava.lib.tag.eager;
 
-import static com.hubspot.jinjava.util.EagerReconstructionUtils.buildBlockOrInlineSetTag;
 import static com.hubspot.jinjava.util.EagerReconstructionUtils.buildSetTag;
 
 import com.google.common.annotations.Beta;
@@ -10,6 +9,7 @@
 import com.hubspot.jinjava.interpret.LazyReference;
 import com.hubspot.jinjava.objects.serialization.PyishObjectMapper;
 import com.hubspot.jinjava.util.EagerExpressionResolver.EagerExpressionResult;
+import com.hubspot.jinjava.util.EagerReconstructionUtils;
 import com.hubspot.jinjava.util.PrefixToPreserveState;
 import java.util.AbstractMap;
 import java.util.Collection;
@@ -69,9 +69,11 @@ public PrefixToPreserveState getPrefixToPreserveState() {
       .filter(entry -> !(entry.getValue() instanceof LazyReference))
       .forEach(
         entry ->
-          prefixToPreserveState.put(
+          EagerReconstructionUtils.hydrateBlockOrInlineSetTagRecursively(
+            prefixToPreserveState,
             entry.getKey(),
-            buildBlockOrInlineSetTag(entry.getKey(), entry.getValue(), interpreter, false)
+            entry.getValue(),
+            interpreter
           )
       );
     filteredEntries

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

@@ -234,13 +234,13 @@ public String getEagerTagImage(TagToken tagToken, JinjavaInterpreter interpreter
       .add("in")
       .add(eagerExpressionResult.toString())
       .add(tagToken.getSymbols().getExpressionEndWithTag());
-    PrefixToPreserveState prefixToPreserveState = new PrefixToPreserveState(
-      EagerReconstructionUtils.reconstructFromContextBeforeDeferringAsMap(
+    PrefixToPreserveState prefixToPreserveState = EagerReconstructionUtils
+      .hydrateReconstructionFromContextBeforeDeferring(
+        new PrefixToPreserveState(),
         eagerExpressionResult.getDeferredWords(),
         interpreter
       )
-    )
-    .withAllInFront(
+      .withAllInFront(
         EagerReconstructionUtils.handleDeferredTokenAndReconstructReferences(
           interpreter,
           new DeferredToken(

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;
     }