Fix #155 don't use ion escaping in JSON mode (#156)

amazon-ion · May 1, 2024 · e8b6e66 · e8b6e66
1 parent dbdc143
commit e8b6e66
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/Amazon.IonDotnet.Tests/Internals/TextWriterJsonTest.cs b/Amazon.IonDotnet.Tests/Internals/TextWriterJsonTest.cs
@@ -188,6 +188,16 @@ public void TestMinutePrecisionTimestampUtc()
             Assert.AreEqual("{\"value\":\"2010-06-15T03:30Z\"}", this.sw.ToString());
         }
 
+        [TestMethod]
+        public void TestStringEscapingDoesntUseShortForm()
+        {
+            value.SetField("value", factory.NewString("--" + (char)0x1f + "--"));
+            var reader = IonReaderBuilder.Build(value);
+            jsonWriter.WriteValues(reader);
+            // Json doesn't support the shorter \xNN form, only \uNNNN
+            Assert.AreEqual("{\"value\":\"--\\u001f--\"}", this.sw.ToString());
+        }
+
         [TestMethod]
         [ExpectedException(typeof(NotSupportedException))]
         public void TestClob()

diff --git a/Amazon.IonDotnet/Internals/Text/IonTextWriter.cs b/Amazon.IonDotnet/Internals/Text/IonTextWriter.cs
@@ -263,7 +263,12 @@ public override void WriteTimestamp(Timestamp value)
         public override void WriteString(string value)
         {
             this.StartValue();
-            if (value != null && !this.followingLongString && this.options.LongStringThreshold < value.Length)
+            if (this.options.JsonDowngrade)
+            {
+                this.textWriter.WriteJsonString(value);
+                this.CloseValue();
+            }
+            else if (value != null && !this.followingLongString && this.options.LongStringThreshold < value.Length)
             {
                 this.textWriter.WriteLongString(value);
                 this.CloseValue();