Use the strategy of setting a temp variable to wrap current_path instead

Author: jasmith-hs

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

@@ -170,7 +170,7 @@ protected Triple<String, String, String> getPrefixTokenAndSuffix(
             .build()
         )
       );
-    String suffixToPreserveState = getSuffixToPreserveState(variables[0], interpreter);
+    String suffixToPreserveState = getSuffixToPreserveState(variables, interpreter);
     return Triple.of(
       prefixToPreserveState.toString(),
       joiner.toString(),

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

@@ -38,8 +38,6 @@ public String getEagerTagImage(TagToken tagToken, JinjavaInterpreter interpreter
       importingData
     );
 
-    final String newPathSetter;
-
     Optional<String> maybeTemplateFile;
     try {
       maybeTemplateFile =
@@ -53,7 +51,6 @@ public String getEagerTagImage(TagToken tagToken, JinjavaInterpreter interpreter
     String templateFile = maybeTemplateFile.get();
     try {
       Node node = ImportTag.parseTemplateAsNode(interpreter, templateFile);
-      newPathSetter = EagerImportingStrategyFactory.getSetTagForCurrentPath(interpreter);
 
       JinjavaInterpreter child = interpreter
         .getConfig()
@@ -96,7 +93,11 @@ public String getEagerTagImage(TagToken tagToken, JinjavaInterpreter interpreter
         return "";
       }
       return EagerReconstructionUtils.wrapInTag(
-        eagerImportingStrategy.getFinalOutput(newPathSetter, output, child),
+        EagerReconstructionUtils.wrapPathAroundText(
+          eagerImportingStrategy.getFinalOutput(output, child),
+          templateFile,
+          interpreter
+        ),
         DoTag.TAG_NAME,
         interpreter,
         true

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

@@ -3,7 +3,6 @@
 import com.google.common.annotations.Beta;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.lib.tag.IncludeTag;
-import com.hubspot.jinjava.lib.tag.eager.importing.EagerImportingStrategyFactory;
 import com.hubspot.jinjava.loader.RelativePathResolver;
 import com.hubspot.jinjava.tree.TagNode;
 import com.hubspot.jinjava.util.EagerReconstructionUtils;
@@ -30,14 +29,16 @@ public String innerInterpret(TagNode tagNode, JinjavaInterpreter interpreter) {
         tagNode.getStartPosition()
       );
       templateFile = interpreter.resolveResourceLocation(templateFile);
-      final String initialPathSetter =
-        EagerImportingStrategyFactory.getSetTagForCurrentPath(interpreter);
       final String newPathSetter = EagerReconstructionUtils.buildBlockOrInlineSetTag(
         RelativePathResolver.CURRENT_PATH_CONTEXT_KEY,
         templateFile,
         interpreter
       );
-      return newPathSetter + output + initialPathSetter;
+      return EagerReconstructionUtils.wrapPathAroundText(
+        output,
+        templateFile,
+        interpreter
+      );
     }
     return output;
   }

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

@@ -101,10 +101,7 @@ public Triple<String, String, String> getPrefixTokenAndSuffix(
           .build()
       )
     );
-    String suffixToPreserveState = getSuffixToPreserveState(
-      String.join(",", Arrays.asList(variables)),
-      interpreter
-    );
+    String suffixToPreserveState = getSuffixToPreserveState(variables, interpreter);
     return Triple.of(
       prefixToPreserveState.toString(),
       joiner.toString(),

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

@@ -13,6 +13,7 @@
 import java.util.Optional;
 import java.util.StringJoiner;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.apache.commons.lang3.tuple.Triple;
 
 @Beta
@@ -155,39 +156,65 @@ protected PrefixToPreserveState getPrefixToPreserveState(
   }
 
   public static String getSuffixToPreserveState(
-    String variables,
+    List<String> varList,
     JinjavaInterpreter interpreter
   ) {
-    if (variables.isEmpty()) {
+    if (varList.isEmpty()) {
       return "";
     }
+    return getSuffixToPreserveState(varList.stream(), interpreter);
+  }
+
+  public static String getSuffixToPreserveState(
+    String[] varList,
+    JinjavaInterpreter interpreter
+  ) {
+    if (varList.length == 0) {
+      return "";
+    }
+    return getSuffixToPreserveState(Arrays.stream(varList), interpreter);
+  }
+
+  private static String getSuffixToPreserveState(
+    Stream<String> varStream,
+    JinjavaInterpreter interpreter
+  ) {
     StringBuilder suffixToPreserveState = new StringBuilder();
     Optional<String> maybeTemporaryImportAlias =
       AliasedEagerImportingStrategy.getTemporaryImportAlias(interpreter.getContext());
-    if (
-      maybeTemporaryImportAlias.isPresent() &&
-      !AliasedEagerImportingStrategy.isTemporaryImportAlias(variables) &&
-      !interpreter.getContext().getComputedMetaContextVariables().contains(variables)
-    ) {
-      if (!interpreter.getContext().containsKey(maybeTemporaryImportAlias.get())) {
-        if (
-          interpreter.retraceVariable(
-            String.format(
-              "%s.%s",
-              interpreter.getContext().getImportResourceAlias().get(),
-              variables
-            ),
-            -1
-          ) !=
-          null
-        ) {
-          throw new DeferredValueException(
-            "Cannot modify temporary import alias outside of import tag"
-          );
-        }
+    if (maybeTemporaryImportAlias.isPresent()) {
+      boolean stillInsideImportTag = interpreter
+        .getContext()
+        .containsKey(maybeTemporaryImportAlias.get());
+      List<String> filteredVars = varStream
+        .filter(var -> !AliasedEagerImportingStrategy.isTemporaryImportAlias(var))
+        .filter(var ->
+          !interpreter.getContext().getComputedMetaContextVariables().contains(var)
+        )
+        .peek(var -> {
+          if (!stillInsideImportTag) {
+            if (
+              interpreter.retraceVariable(
+                String.format(
+                  "%s.%s",
+                  interpreter.getContext().getImportResourceAlias().get(),
+                  var
+                ),
+                -1
+              ) !=
+              null
+            ) {
+              throw new DeferredValueException(
+                "Cannot modify temporary import alias outside of import tag"
+              );
+            }
+          }
+        })
+        .collect(Collectors.toList());
+      if (filteredVars.isEmpty()) {
+        return "";
       }
-      String updateString = getUpdateString(variables);
-
+      String updateString = getUpdateString(filteredVars);
       // Don't need to render because the temporary import alias's value is always deferred, and rendering will do nothing
       suffixToPreserveState.append(
         EagerReconstructionUtils.buildDoUpdateTag(
@@ -197,15 +224,10 @@ public static String getSuffixToPreserveState(
         )
       );
     }
-
     return suffixToPreserveState.toString();
   }
 
-  private static String getUpdateString(String variables) {
-    List<String> varList = Arrays
-      .stream(variables.split(","))
-      .map(String::trim)
-      .collect(Collectors.toList());
+  private static String getUpdateString(List<String> varList) {
     StringJoiner updateString = new StringJoiner(",");
     // Update the alias map to the value of the set variable.
     varList.forEach(var -> updateString.add(String.format("'%s': %s", var, var)));

src/main/java/com/hubspot/jinjava/lib/tag/eager/importing/AliasedEagerImportingStrategy.java

@@ -127,14 +127,9 @@ public void integrateChild(JinjavaInterpreter child) {
   }
 
   @Override
-  public String getFinalOutput(
-    String newPathSetter,
-    String output,
-    JinjavaInterpreter child
-  ) {
+  public String getFinalOutput(String output, JinjavaInterpreter child) {
     String temporaryImportAlias = getTemporaryImportAlias(fullImportAlias);
     return (
-      newPathSetter +
       EagerReconstructionUtils.buildBlockOrInlineSetTag(
         temporaryImportAlias,
         Collections.emptyMap(),
@@ -153,8 +148,7 @@ public String getFinalOutput(
         ImmutableMap.of(currentImportAlias, temporaryImportAlias),
         importingData.getOriginalInterpreter(),
         true
-      ) +
-      importingData.getInitialPathSetter()
+      )
     );
   }
 

src/main/java/com/hubspot/jinjava/lib/tag/eager/importing/EagerImportingStrategy.java

@@ -12,7 +12,7 @@ public interface EagerImportingStrategy {
   void setup(JinjavaInterpreter child);
 
   void integrateChild(JinjavaInterpreter child);
-  String getFinalOutput(String newPathSetter, String output, JinjavaInterpreter child);
+  String getFinalOutput(String output, JinjavaInterpreter child);
 
   static String getSetTagForDeferredChildBindings(
     JinjavaInterpreter interpreter,

src/main/java/com/hubspot/jinjava/lib/tag/eager/importing/EagerImportingStrategyFactory.java

@@ -30,15 +30,7 @@ public static EagerImportingStrategy create(ImportingData importingData) {
   public static String getSetTagForCurrentPath(JinjavaInterpreter interpreter) {
     return EagerReconstructionUtils.buildBlockOrInlineSetTag(
       RelativePathResolver.CURRENT_PATH_CONTEXT_KEY,
-      interpreter
-        .getContext()
-        .getCurrentPathStack()
-        .peek()
-        .orElseGet(() ->
-          (String) interpreter
-            .getContext()
-            .getOrDefault(RelativePathResolver.CURRENT_PATH_CONTEXT_KEY, "")
-        ),
+      RelativePathResolver.getCurrentPathFromStackOrKey(interpreter),
       interpreter
     );
   }

src/main/java/com/hubspot/jinjava/lib/tag/eager/importing/FlatEagerImportingStrategy.java

@@ -63,11 +63,7 @@ public void integrateChild(JinjavaInterpreter child) {
   }
 
   @Override
-  public String getFinalOutput(
-    String newPathSetter,
-    String output,
-    JinjavaInterpreter child
-  ) {
+  public String getFinalOutput(String output, JinjavaInterpreter child) {
     if (importingData.getOriginalInterpreter().getContext().isDeferredExecutionMode()) {
       Set<String> metaContextVariables = importingData
         .getOriginalInterpreter()
@@ -90,14 +86,12 @@ public String getFinalOutput(
       );
     }
     return (
-      newPathSetter +
       EagerImportingStrategy.getSetTagForDeferredChildBindings(
         importingData.getOriginalInterpreter(),
         null,
         child.getContext().getSessionBindings()
       ) +
-      output +
-      importingData.getInitialPathSetter()
+      output
     );
   }
 }

src/main/java/com/hubspot/jinjava/loader/RelativePathResolver.java

@@ -11,13 +11,7 @@ public class RelativePathResolver implements LocationResolver {
   @Override
   public String resolve(String path, JinjavaInterpreter interpreter) {
     if (path.startsWith("./") || path.startsWith("../")) {
-      String parentPath = interpreter
-        .getContext()
-        .getCurrentPathStack()
-        .peek()
-        .orElseGet(() ->
-          (String) interpreter.getContext().getOrDefault(CURRENT_PATH_CONTEXT_KEY, "")
-        );
+      String parentPath = getCurrentPathFromStackOrKey(interpreter);
 
       Path templatePath = Paths.get(parentPath);
       Path folderPath = templatePath.getParent() != null
@@ -29,4 +23,14 @@ public String resolve(String path, JinjavaInterpreter interpreter) {
     }
     return path;
   }
+
+  public static String getCurrentPathFromStackOrKey(JinjavaInterpreter interpreter) {
+    return interpreter
+      .getContext()
+      .getCurrentPathStack()
+      .peek()
+      .orElseGet(() ->
+        (String) interpreter.getContext().getOrDefault(CURRENT_PATH_CONTEXT_KEY, "")
+      );
+  }
 }