add new pretty formatting style

Author: mudkipdev

build.gradle.kts

@@ -48,7 +48,7 @@ subprojects {
     apply(plugin = "java")
 
     group = "dev.mudkip"
-    version = "0.2.0"
+    version = "0.3.0"
     java.toolchain.languageVersion = JavaLanguageVersion.of(25)
 
     repositories {

json/src/main/java/alpine/json/ArrayElement.java

@@ -39,7 +39,7 @@ public boolean equals(Object object) {
 
     @Override
     public String toString() {
-        return Json.write(this, Json.Formatting.PRETTY);
+        return Json.write(this, Json.Formatting.INLINE_PRETTY);
     }
 
     @Override

json/src/main/java/alpine/json/BooleanElement.java

@@ -25,7 +25,7 @@ public boolean equals(Object object) {
 
     @Override
     public String toString() {
-        return Json.write(this, Json.Formatting.PRETTY);
+        return Json.write(this, Json.Formatting.INLINE_PRETTY);
     }
 
     public boolean value() {

json/src/main/java/alpine/json/Json.java

@@ -63,17 +63,26 @@ public record Formatting(String indentation, String newLine, String comma, Strin
          */
         public static final Formatting COMPACT = new Formatting(
                 "",
-                System.lineSeparator(),
+                "\n",
                 String.valueOf(COMMA),
                 String.valueOf(COLON));
 
         /**
-         * Represents a beautified format ideal for human readability.
+         * Represents a single-line beautified format with spaces between values.
+         */
+        public static final Formatting INLINE_PRETTY = new Formatting(
+                "",
+                "\n",
+                COMPACT.comma + SPACE,
+                COMPACT.colon + SPACE);
+
+        /**
+         * Represents a multi-line beautified format ideal for human readability.
          */
         public static final Formatting PRETTY = new Formatting(
                 String.valueOf(SPACE).repeat(4),
-                System.lineSeparator(),
-                COMPACT.comma + SPACE,
+                "\n",
+                String.valueOf(COMMA),
                 COMPACT.colon + SPACE);
     }
 }

json/src/main/java/alpine/json/JsonWriter.java

@@ -16,18 +16,18 @@ String write(Element value, Json.Formatting formatting) {
             default -> 32;
         });
 
-        this.write(builder, value, formatting);
+        this.write(builder, value, formatting, 0);
         return builder.toString();
     }
 
-    private void write(StringBuilder builder, Element value, Json.Formatting formatting) {
+    private void write(StringBuilder builder, Element value, Json.Formatting formatting, int depth) {
         switch (value) {
             case NullElement _ -> builder.append(NULL);
             case BooleanElement element -> builder.append(element.value() ? TRUE : FALSE);
             case NumberElement element -> this.writeNumber(builder, element.value());
             case StringElement element -> this.writeString(builder, element.value());
-            case ArrayElement element -> this.writeArray(builder, element, formatting);
-            case ObjectElement element -> this.writeObject(builder, element, formatting);
+            case ArrayElement element -> this.writeArray(builder, element, formatting, depth);
+            case ObjectElement element -> this.writeObject(builder, element, formatting, depth);
         }
     }
 
@@ -89,7 +89,16 @@ private void writeString(StringBuilder builder, String string) {
         builder.append(QUOTE);
     }
 
-    private void writeArray(StringBuilder builder, ArrayElement element, Json.Formatting formatting) {
+    private void writeIndentation(StringBuilder builder, Json.Formatting formatting, int depth) {
+        if (formatting.indentation().isEmpty()) {
+            return;
+        }
+
+        builder.append(formatting.newLine());
+        builder.append(formatting.indentation().repeat(depth));
+    }
+
+    private void writeArray(StringBuilder builder, ArrayElement element, Json.Formatting formatting, int depth) {
         builder.append(BEGIN_ARRAY);
         var firstElement = true;
 
@@ -98,14 +107,19 @@ private void writeArray(StringBuilder builder, ArrayElement element, Json.Format
                 builder.append(formatting.comma());
             }
 
-            this.write(builder, value, formatting);
+            this.writeIndentation(builder, formatting, depth + 1);
+            this.write(builder, value, formatting, depth + 1);
             firstElement = false;
         }
 
+        if (!firstElement) {
+            this.writeIndentation(builder, formatting, depth);
+        }
+
         builder.append(END_ARRAY);
     }
 
-    private void writeObject(StringBuilder builder, ObjectElement element, Json.Formatting formatting) {
+    private void writeObject(StringBuilder builder, ObjectElement element, Json.Formatting formatting, int depth) {
         builder.append(BEGIN_OBJECT);
         var firstElement = new boolean[] { true };
 
@@ -116,11 +130,16 @@ private void writeObject(StringBuilder builder, ObjectElement element, Json.Form
                 builder.append(formatting.comma());
             }
 
+            this.writeIndentation(builder, formatting, depth + 1);
             this.writeString(builder, key);
             builder.append(formatting.colon());
-            this.write(builder, value, formatting);
+            this.write(builder, value, formatting, depth + 1);
         });
 
+        if (!firstElement[0]) {
+            writeIndent(builder, formatting, depth);
+        }
+
         builder.append(END_OBJECT);
     }
 }

json/src/main/java/alpine/json/NullElement.java

@@ -16,6 +16,6 @@ private NullElement() {
 
     @Override
     public String toString() {
-        return Json.write(this, Json.Formatting.PRETTY);
+        return Json.write(this, Json.Formatting.INLINE_PRETTY);
     }
 }

json/src/main/java/alpine/json/NumberElement.java

@@ -25,7 +25,7 @@ public boolean equals(Object object) {
 
     @Override
     public String toString() {
-        return Json.write(this, Json.Formatting.PRETTY);
+        return Json.write(this, Json.Formatting.INLINE_PRETTY);
     }
 
     public double value() {

json/src/main/java/alpine/json/ObjectElement.java

@@ -38,7 +38,7 @@ public boolean equals(Object object) {
 
     @Override
     public String toString() {
-        return Json.write(this, Json.Formatting.PRETTY);
+        return Json.write(this, Json.Formatting.INLINE_PRETTY);
     }
 
     public Stream<Map.Entry<String, Element>> stream() {

json/src/main/java/alpine/json/StringElement.java

@@ -31,7 +31,7 @@ public boolean equals(Object object) {
 
     @Override
     public String toString() {
-        return Json.write(this, Json.Formatting.PRETTY);
+        return Json.write(this, Json.Formatting.INLINE_PRETTY);
     }
 
     public String value() {

json/src/test/java/alpine/json/FormattingTest.java

@@ -0,0 +1,39 @@
+package alpine.json;
+
+import org.junit.jupiter.api.Test;
+
+import static alpine.json.Element.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+final class FormattingTest {
+    private static final ObjectElement OBJECT = object()
+            .set("a", "b")
+            .set("c", "d")
+            .set("nested", object().set("x", 1));
+
+    @Test
+    void testCompact() {
+        assertEquals(
+                "{\"a\":\"b\",\"c\":\"d\",\"nested\":{\"x\":1}}",
+                Json.write(OBJECT, Json.Formatting.COMPACT));
+    }
+
+    @Test
+    void testInlinePretty() {
+        assertEquals(
+                "{\"a\": \"b\", \"c\": \"d\", \"nested\": {\"x\": 1}}",
+                Json.write(OBJECT, Json.Formatting.INLINE_PRETTY));
+    }
+
+    @Test
+    void testPretty() {
+        assertEquals("""
+        {
+            "a": "b",
+            "c": "d",
+            "nested": {
+                "x": 1
+            }
+        }""", Json.write(OBJECT, Json.Formatting.PRETTY));
+    }
+}