Use single quote char for pyish serialization

jasmith-hs · jasmith-hs · commit ac2a06368ede · 2022-09-09T14:12:01.000-04:00
diff --git a/pom.xml b/pom.xml
@@ -61,7 +61,6 @@
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-annotations</artifactId>
-        <!--Using 2.12.6 instead of 2.13 https://github.com/FasterXML/jackson-databind/issues/3380#issuecomment-1018129505-->
         <version>2.12.6</version>
       </dependency>
       <dependency>
diff --git a/src/main/java/com/hubspot/jinjava/objects/date/PyishDate.java b/src/main/java/com/hubspot/jinjava/objects/date/PyishDate.java
@@ -2,6 +2,7 @@
 
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.objects.PyWrapper;
+import com.hubspot.jinjava.objects.serialization.PyishObjectMapper;
 import com.hubspot.jinjava.objects.serialization.PyishSerializable;
 import java.io.Serializable;
 import java.time.Instant;
@@ -149,9 +150,9 @@ public boolean equals(Object obj) {
   @Override
   public String toPyishString() {
     return String.format(
-      "\"%s\"|strtotime(\"%s\")",
+      "'%s'|strtotime(%s)",
       strftime(FULL_DATE_FORMAT),
-      FULL_DATE_FORMAT
+      PyishObjectMapper.getAsPyishString(FULL_DATE_FORMAT)
     );
   }
 }
diff --git a/src/main/java/com/hubspot/jinjava/objects/serialization/PyishCharacterEscapes.java b/src/main/java/com/hubspot/jinjava/objects/serialization/PyishCharacterEscapes.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.core.SerializableString;
 import com.fasterxml.jackson.core.io.CharacterEscapes;
+import com.fasterxml.jackson.core.io.SerializedString;
 import java.util.Arrays;
 
 public class PyishCharacterEscapes extends CharacterEscapes {
@@ -11,9 +12,11 @@ public class PyishCharacterEscapes extends CharacterEscapes {
   private PyishCharacterEscapes() {
     int[] escapes = CharacterEscapes.standardAsciiEscapesForJSON();
     escapes['\n'] = CharacterEscapes.ESCAPE_NONE;
+    escapes['"'] = CharacterEscapes.ESCAPE_NONE;
     escapes['\t'] = CharacterEscapes.ESCAPE_NONE;
     escapes['\r'] = CharacterEscapes.ESCAPE_NONE;
     escapes['\f'] = CharacterEscapes.ESCAPE_NONE;
+    escapes['\''] = CharacterEscapes.ESCAPE_CUSTOM;
     asciiEscapes = escapes;
   }
 
@@ -23,7 +26,10 @@ public int[] getEscapeCodesForAscii() {
   }
 
   @Override
-  public SerializableString getEscapeSequence(int i) {
+  public SerializableString getEscapeSequence(int ch) {
+    if (ch == '\'') {
+      return new SerializedString("\\'");
+    }
     return null;
   }
 }
diff --git a/src/main/java/com/hubspot/jinjava/objects/serialization/PyishObjectMapper.java b/src/main/java/com/hubspot/jinjava/objects/serialization/PyishObjectMapper.java
@@ -1,5 +1,6 @@
 package com.hubspot.jinjava.objects.serialization;
 
+import com.fasterxml.jackson.core.JsonFactoryBuilder;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
@@ -18,7 +19,9 @@ public class PyishObjectMapper {
   public static final ObjectWriter PYISH_OBJECT_WRITER;
 
   static {
-    ObjectMapper mapper = new ObjectMapper()
+    ObjectMapper mapper = new ObjectMapper(
+      new JsonFactoryBuilder().quoteChar('\'').build()
+    )
     .registerModule(
         new SimpleModule()
           .setSerializerModifier(PyishBeanSerializerModifier.INSTANCE)
@@ -54,14 +57,10 @@ public static String getAsPyishStringOrThrow(Object val)
     if (maxStringLength.map(max -> string.length() > max).orElse(false)) {
       throw new OutputTooBigException(maxStringLength.get(), string.length());
     }
-    String result = string
-      .replace("'", "\\'")
-      // Replace double-quotes with single quote as they are preferred in Jinja
-      .replaceAll("(?<!\\\\)(\\\\\\\\)*(?:\")", "$1'");
-    if (!result.contains("{{")) {
-      return String.join("} ", result.split("}(?=})"));
+    if (string.contains("}}") && !string.contains("{{")) {
+      return String.join("} ", string.split("}(?=})"));
     }
-    return result;
+    return string;
   }
 
   public static class NullKeySerializer extends JsonSerializer<Object> {
diff --git a/src/main/java/com/hubspot/jinjava/objects/serialization/PyishSerializable.java b/src/main/java/com/hubspot/jinjava/objects/serialization/PyishSerializable.java
@@ -1,13 +1,16 @@
 package com.hubspot.jinjava.objects.serialization;
 
+import com.fasterxml.jackson.core.JsonFactoryBuilder;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.hubspot.jinjava.objects.PyWrapper;
 import java.util.Objects;
 
 public interface PyishSerializable extends PyWrapper {
-  ObjectWriter SELF_WRITER = new ObjectMapper()
+  ObjectWriter SELF_WRITER = new ObjectMapper(
+    new JsonFactoryBuilder().quoteChar('\'').build()
+  )
     .writer(PyishPrettyPrinter.INSTANCE)
     .with(PyishCharacterEscapes.INSTANCE);
   /**
@@ -31,7 +34,7 @@ static String writeValueAsString(Object value) {
     try {
       return SELF_WRITER.writeValueAsString(value);
     } catch (JsonProcessingException e) {
-      return '"' + Objects.toString(value) + '"';
+      return '\'' + Objects.toString(value) + '\'';
     }
   }
 }
diff --git a/src/main/java/com/hubspot/jinjava/util/EagerReconstructionUtils.java b/src/main/java/com/hubspot/jinjava/util/EagerReconstructionUtils.java
@@ -122,7 +122,8 @@ public static EagerExecutionResult executeInChildContext(
             .stream()
             .filter(entry -> initiallyResolvedHashes.containsKey(entry.getKey()))
             .filter(
-              entry -> EagerExpressionResolver.isResolvableObject(entry.getValue(), 2, 20) // TODO make this configurable
+              entry ->
+                EagerExpressionResolver.isResolvableObject(entry.getValue(), 4, 400) // TODO make this configurable
             );
       } else {
         entryStream =
@@ -132,7 +133,8 @@ public static EagerExecutionResult executeInChildContext(
             .stream()
             .filter(entry -> initiallyResolvedHashes.containsKey(entry.getKey()))
             .filter(
-              entry -> EagerExpressionResolver.isResolvableObject(entry.getValue(), 2, 20) // TODO make this configurable
+              entry ->
+                EagerExpressionResolver.isResolvableObject(entry.getValue(), 4, 400) // TODO make this configurable
             );
       }
       entryStream.forEach(
diff --git a/src/test/java/com/hubspot/jinjava/util/EagerExpressionResolverTest.java b/src/test/java/com/hubspot/jinjava/util/EagerExpressionResolverTest.java
@@ -310,7 +310,18 @@ public void itSerializesDateProperly() {
     EagerExpressionResult eagerExpressionResult = eagerResolveExpression("date");
 
     assertThat(WhitespaceUtils.unquoteAndUnescape(eagerExpressionResult.toString()))
-      .isEqualTo(date.toPyishString().replace("'", "\\'").replace('"', '\''));
+      .isEqualTo(date.toPyishString());
+    interpreter.render(
+      "{% set foo = " +
+      PyishObjectMapper.getAsPyishString(ImmutableMap.of("a", date)) +
+      " %}"
+    );
+    assertThat(
+        (
+          (PyishDate) ((Map<String, Object>) interpreter.getContext().get("foo")).get("a")
+        ).toDateTime()
+      )
+      .isEqualTo(date.toDateTime());
   }
 
   @Test
