Merge branch 'master' of https://github.com/HubSpot/jinjava into keep-undefined

Author: hs-lsong

.build-jdk17

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 17 ]
+        java: [ 17, 21, 25 ]
     name: jdk-${{ matrix.java }}
     steps:
       - uses: actions/checkout@v3
@@ -16,9 +16,19 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: "temurin"
-          java-version: ${{ matrix.java }}
+          # The JDK listed last will be the default and what Maven runs with
+          # https://github.com/marketplace/actions/setup-java-jdk#install-multiple-jdks
+          java-version: |
+            ${{ matrix.java }}
+            25
           cache: "maven"
       - name: "Build"
-        run: mvn --batch-mode -no-transfer-progress -V verify
+        run: |
+          mvn \
+            --batch-mode \
+            -no-transfer-progress \
+            -V \
+            -Dproject.build.jdk.version=${{ matrix.java }} \
+            verify
         env:
           JDK_JAVA_OPTIONS: --add-opens=java.base/java.lang=ALL-UNNAMED

.github/workflows/ci.yml

@@ -1,4 +1,6 @@
 # Jinjava Releases #
+### 2025-10-22 Version 2.8.2 ([Maven Central](https://search.maven.org/artifact/com.hubspot.jinjava/jinjava/2.8.2/jar)) ###
+* [Fix helper token escape handling and unescaping when unquoting strings](https://github.com/HubSpot/jinjava/pull/1263)
 ### 2025-09-16 Version 2.8.1 ([Maven Central](https://search.maven.org/artifact/com.hubspot.jinjava/jinjava/2.8.1/jar)) ###
 * Disallow accessing properties on restricted classes while rendering
 * [Make stack operations use AutoCloseable for safer usage with try-with-resources](https://github.com/HubSpot/jinjava/pull/1250)

CHANGES.md

@@ -5,24 +5,24 @@
   <parent>
     <groupId>com.hubspot</groupId>
     <artifactId>basepom</artifactId>
-    <version>63.4</version>
+    <version>65.1</version>
   </parent>
 
   <groupId>com.hubspot.jinjava</groupId>
   <artifactId>jinjava</artifactId>
-  <version>2.8.2-SNAPSHOT</version>
+  <version>2.8.3-SNAPSHOT</version>
 
   <name>${project.groupId}:${project.artifactId}</name>
   <description>Jinja templating engine implemented in Java</description>
 
   <properties>
     <project.build.targetJdk>17</project.build.targetJdk>
-    <project.build.releaseJdk>17</project.build.releaseJdk>
 
     <dep.plugin.jacoco.version>0.8.3</dep.plugin.jacoco.version>
     <dep.plugin.javadoc.version>3.0.1</dep.plugin.javadoc.version>
     <dep.hubspot-immutables.version>1.9</dep.hubspot-immutables.version>
     <dep.algebra.version>1.5</dep.algebra.version>
+    <dep.mockito.version>5.20.0</dep.mockito.version>
 
 
     <basepom.test.add.opens>
@@ -181,6 +181,10 @@
       <groupId>ch.obermuhlner</groupId>
       <artifactId>big-math</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.errorprone</groupId>
+      <artifactId>error_prone_annotations</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>ch.qos.logback</groupId>
@@ -336,6 +340,18 @@
           <argLine>@{argLine} ${basepom.test.add.opens}</argLine>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <annotationProcessorPaths>
+            <path>
+              <groupId>org.immutables</groupId>
+              <artifactId>value</artifactId>
+            </path>
+          </annotationProcessorPaths>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

pom.xml

@@ -2,6 +2,7 @@
 
 import com.hubspot.jinjava.doc.annotations.JinjavaDoc;
 import com.hubspot.jinjava.doc.annotations.JinjavaTextMateSnippet;
+import com.hubspot.jinjava.interpret.DeferredValue;
 import com.hubspot.jinjava.interpret.DeferredValueException;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.interpret.NotInLoopException;
@@ -37,6 +38,8 @@ public String interpret(TagNode tagNode, JinjavaInterpreter interpreter) {
       }
       ForLoop forLoop = (ForLoop) loop;
       forLoop.doBreak();
+    } else if (loop instanceof DeferredValue) {
+      throw new DeferredValueException("Deferred break");
     } else {
       throw new NotInLoopException(TAG_NAME);
     }

src/main/java/com/hubspot/jinjava/lib/tag/BreakTag.java

@@ -2,6 +2,7 @@
 
 import com.hubspot.jinjava.doc.annotations.JinjavaDoc;
 import com.hubspot.jinjava.doc.annotations.JinjavaTextMateSnippet;
+import com.hubspot.jinjava.interpret.DeferredValue;
 import com.hubspot.jinjava.interpret.DeferredValueException;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.interpret.NotInLoopException;
@@ -35,6 +36,8 @@ public String interpret(TagNode tagNode, JinjavaInterpreter interpreter) {
       }
       ForLoop forLoop = (ForLoop) loop;
       forLoop.doContinue();
+    } else if (loop instanceof DeferredValue) {
+      throw new DeferredValueException("Deferred continue");
     } else {
       throw new NotInLoopException(TAG_NAME);
     }

src/main/java/com/hubspot/jinjava/lib/tag/ContinueTag.java

@@ -1655,6 +1655,16 @@ public void itHandlesDeferredBreakInForLoop() {
     assertThat(interpreter.getContext().getDeferredNodes()).isNotEmpty();
   }
 
+  @Test
+  public void itHandlesBreakInDeferredForLoop() {
+    String input = expectedTemplateInterpreter.getFixtureTemplate(
+      "handles-break-in-deferred-for-loop/test"
+    );
+    interpreter.render(input);
+    // We don't support this yet
+    assertThat(interpreter.getContext().getDeferredNodes()).isNotEmpty();
+  }
+
   @Test
   public void itHandlesDeferredContinueInForLoop() {
     String input = expectedTemplateInterpreter.getFixtureTemplate(
@@ -1665,6 +1675,16 @@ public void itHandlesDeferredContinueInForLoop() {
     assertThat(interpreter.getContext().getDeferredNodes()).isNotEmpty();
   }
 
+  @Test
+  public void itHandlesContinueInDeferredForLoop() {
+    String input = expectedTemplateInterpreter.getFixtureTemplate(
+      "handles-continue-in-deferred-for-loop/test"
+    );
+    interpreter.render(input);
+    // We don't support this yet
+    assertThat(interpreter.getContext().getDeferredNodes()).isNotEmpty();
+  }
+
   @Test
   public void itReconstructsFromedMacro() {
     expectedTemplateInterpreter.assertExpectedOutput("reconstructs-fromed-macro/test");

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

@@ -0,0 +1,8 @@
+Start loop
+{% for i in deferred %}
+  {% if i %}
+    {% break %}
+  {% endif %}
+  i is: {{ i }}
+{% endfor %}
+End loop

src/test/resources/eager/handles-break-in-deferred-for-loop/test.jinja

@@ -0,0 +1,8 @@
+Start loop
+{% for i in deferred %}
+  {% if i %}
+    {% continue %}
+  {% endif %}
+  i is: {{ i }}
+{% endfor %}
+End loop