Merge pull request #1097 from HubSpot/better-nested-reconstruction

Handle nested representations inside of fully evaluated objects

Author: jasmith-hs

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

@@ -393,6 +393,23 @@ public String toString(boolean forOutput) {
       } else {
         asString = PyishObjectMapper.getAsPyishString(resolvedObject);
       }
+      if (
+        !forOutput &&
+        interpreter != null &&
+        interpreter.getConfig().isNestedInterpretationEnabled() &&
+        asString.contains(
+          interpreter.getConfig().getTokenScannerSymbols().getExpressionStart()
+        )
+      ) {
+        Set<String> dependentWords = EagerExpressionResolver.findDeferredWords(
+          asString,
+          interpreter
+        );
+        if (!dependentWords.isEmpty()) {
+          deferredWords.addAll(dependentWords);
+          return asString;
+        }
+      }
       return asString;
     }
 

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

@@ -1,2 +1,11 @@
 map.foo: Foo is I am foo.
 map.bar: Bar is I am bar.
+
+
+
+a
+
+
+
+
+{'b': 'b'}

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

@@ -2,4 +2,14 @@
 {% do map_with_vals.put('bar', 'Bar is {{ bar }}.') %}
 {% endif %}
 map.foo: {{ map_with_vals.foo }}
-map.bar: {{ map_with_vals.bar }}
+map.bar: {{ map_with_vals.bar }}
+
+{% set a = 'a' %}{% set aa = '{{ a }}' %}{% if deferred %}
+{% set aaa = '{{ aa }}' %}
+{{ aa }}
+{% endif %}
+
+{% set b = 'b' %}{% set bb = '{{ b }}' %}{% if deferred %}
+{% set bbb = {'b': '{{ bb }}'}  %}
+{'b': '{{ bb }}'}
+{% endif %}

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

@@ -7,3 +7,18 @@
 {% endif %}
 map.foo: {{ map_with_vals.foo }}
 map.bar: {{ map_with_vals.bar }}
+
+{%- set a = 'a' %}
+{% set aa = '{{ a }}' %}
+{% if deferred %}
+{% set aaa = '{{ aa }}' %}
+{{ aaa }}
+{% endif -%}
+
+{%- set b = 'b' %}
+{% set bb = '{{ b }}' %}
+{% if deferred %}
+{% set bbb = {'b': '{{ bb }}'} %}
+{{ bbb }}
+{% endif -%}
+