From 02253cde1b35234a509da64840b83c2ce6879cb1 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Tue, 16 Sep 2025 23:09:49 +0200
Subject: [PATCH 01/48] feat: implement data structure holding a number with an
 associated radix base

---
 .../marhali/json5/internal/RadixNumber.java   | 78 +++++++++++++++++++
 .../json5/internal/RadixNumberTest.java       | 37 +++++++++
 2 files changed, 115 insertions(+)
 create mode 100644 src/main/java/de/marhali/json5/internal/RadixNumber.java
 create mode 100644 src/test/java/de/marhali/json5/internal/RadixNumberTest.java

diff --git a/src/main/java/de/marhali/json5/internal/RadixNumber.java b/src/main/java/de/marhali/json5/internal/RadixNumber.java
new file mode 100644
index 0000000..d633c21
--- /dev/null
+++ b/src/main/java/de/marhali/json5/internal/RadixNumber.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5.internal;
+
+import java.util.Objects;
+
+/**
+ * Simple wrapper around {@link Number} that tracks the used radix base.
+ *
+ * @author Marcel Haßlinger
+ */
+public class RadixNumber {
+
+    /**
+     * Referenced number.
+     */
+    private final Number number;
+
+    /**
+     * Radix base to use.
+     * <p>
+     * Supported values are:
+     * <ul>
+     *     <li>Binary: <code>2</code></li>
+     *     <li>Octal: <code>8</code></li>
+     *     <li>Decimal: <code>10</code></li>
+     *     <li>Hex: <code>16</code></li>
+     * </ol>
+     */
+    private final int radix;
+
+    public RadixNumber(Number number, int radix) {
+        this.number = number;
+        this.radix = radix;
+    }
+
+    public Number getNumber() {
+        return number;
+    }
+
+    public int getRadix() {
+        return radix;
+    }
+
+    @Override
+    public String toString() {
+        return "RadixNumber{" +
+            "number=" + number +
+            ", radix=" + radix +
+            '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) return false;
+        RadixNumber that = (RadixNumber) o;
+        return radix == that.radix && Objects.equals(number, that.number);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(number, radix);
+    }
+}
diff --git a/src/test/java/de/marhali/json5/internal/RadixNumberTest.java b/src/test/java/de/marhali/json5/internal/RadixNumberTest.java
new file mode 100644
index 0000000..1e7c408
--- /dev/null
+++ b/src/test/java/de/marhali/json5/internal/RadixNumberTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5.internal;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class RadixNumberTest {
+
+    @Test
+    void testNumberGetter() {
+        assertEquals(187, new RadixNumber(187, 10).getNumber());
+    }
+
+    @Test
+    void testRadixGetter() {
+        assertEquals(10, new RadixNumber(187, 10).getRadix());
+    }
+}

From 6bde43f98903da42feb009a05b3a60409298fc45 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Tue, 16 Sep 2025 23:14:56 +0200
Subject: [PATCH 02/48] feat: implement a ecmascript identifier checker

---
 .../json5/internal/EcmaScriptIdentifier.java  | 131 +++++++++++++++
 .../internal/EcmaScriptIdentifierTest.java    | 158 ++++++++++++++++++
 2 files changed, 289 insertions(+)
 create mode 100644 src/main/java/de/marhali/json5/internal/EcmaScriptIdentifier.java
 create mode 100644 src/test/java/de/marhali/json5/internal/EcmaScriptIdentifierTest.java

diff --git a/src/main/java/de/marhali/json5/internal/EcmaScriptIdentifier.java b/src/main/java/de/marhali/json5/internal/EcmaScriptIdentifier.java
new file mode 100644
index 0000000..6abfdad
--- /dev/null
+++ b/src/main/java/de/marhali/json5/internal/EcmaScriptIdentifier.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5.internal;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class EcmaScriptIdentifier {
+    // Zero Width Non-Joiner / Joiner
+    private static final int ZWNJ = 0x200C;
+    private static final int ZWJ  = 0x200D;
+
+    private EcmaScriptIdentifier() {}
+
+    /**
+     * Checks whether the provided {@link String} is a valid ES5.1 IdentifierName.
+     * @return true if valid identifier, otherwise false
+     * @see <a href="https://262.ecma-international.org/5.1/#sec-7.6">https://262.ecma-international.org/5.1/#sec-7.6</a>
+     */
+    public static boolean isValid(String raw) {
+        if (raw == null || raw.isEmpty()) return false;
+
+        // Transform \\uXXXX-Escapes into real codepoints (ES5.1 allows escape in IdentifierName
+        String unescaped = decodeEs5UnicodeEscapes(raw);
+        if (unescaped == null || unescaped.isEmpty()) return false;
+
+        int i = 0;
+        int cp = unescaped.codePointAt(i);
+        if (!isIdentifierStartES5(cp)) return false;
+        i += Character.charCount(cp);
+
+        while (i < unescaped.length()) {
+            cp = unescaped.codePointAt(i);
+            if (!isIdentifierPartES5(cp)) return false;
+            i += Character.charCount(cp);
+        }
+        return true;
+    }
+
+    private static boolean isIdentifierStartES5(int cp) {
+        // '$' and '_' explicit
+        if (cp == '$' || cp == '_') return true;
+
+        int t = Character.getType(cp);
+        // Unicode categories: Lu, Ll, Lt, Lm, Lo, Nl
+        switch (t) {
+            case Character.UPPERCASE_LETTER:      // Lu
+            case Character.LOWERCASE_LETTER:      // Ll
+            case Character.TITLECASE_LETTER:      // Lt
+            case Character.MODIFIER_LETTER:       // Lm
+            case Character.OTHER_LETTER:          // Lo
+            case Character.LETTER_NUMBER:         // Nl
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    private static boolean isIdentifierPartES5(int cp) {
+        if (isIdentifierStartES5(cp)) return true;
+        if (cp == ZWNJ || cp == ZWJ) return true; // U+200C/U+200D are alowed
+
+        int t = Character.getType(cp);
+        // Additional categories: Mn, Mc, Nd, Pc
+        switch (t) {
+            case Character.NON_SPACING_MARK:        // Mn
+            case Character.COMBINING_SPACING_MARK:  // Mc
+            case Character.DECIMAL_DIGIT_NUMBER:    // Nd
+            case Character.CONNECTOR_PUNCTUATION:   // Pc (e.g. underline, but already covered)
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * Decodes ES5-style Unicode-Escapes \\uXXXX inside a Identifier.
+     * @return {@code null}, if an escape is syntactically invalid
+     */
+    private static String decodeEs5UnicodeEscapes(String s) {
+        StringBuilder out = new StringBuilder(s.length());
+        for (int i = 0; i < s.length();) {
+            char ch = s.charAt(i);
+            if (ch == '\\') {
+                if (i + 1 < s.length() && s.charAt(i + 1) == 'u') {
+                    // Expect 4 hex chars (ES5.1; no \\u{...} syntax)
+                    if (i + 6 > s.length()) return null;
+                    String hex = s.substring(i + 2, i + 6);
+                    int codeUnit = parse4Hex(hex);
+                    if (codeUnit < 0) return null;
+                    out.append((char) codeUnit);
+                    i += 6;
+                } else {
+                    // Other backslashes are not allowed
+                    return null;
+                }
+            } else {
+                out.append(ch);
+                i++;
+            }
+        }
+        // Maybe Surrogates...
+        return out.toString();
+    }
+
+    private static int parse4Hex(String hex4) {
+        if (hex4.length() != 4) return -1;
+        int val = 0;
+        for (int i = 0; i < 4; i++) {
+            char c = hex4.charAt(i);
+            int d = Character.digit(c, 16);
+            if (d < 0) return -1;
+            val = (val << 4) | d;
+        }
+        return val;
+    }
+}
diff --git a/src/test/java/de/marhali/json5/internal/EcmaScriptIdentifierTest.java b/src/test/java/de/marhali/json5/internal/EcmaScriptIdentifierTest.java
new file mode 100644
index 0000000..9e3a70a
--- /dev/null
+++ b/src/test/java/de/marhali/json5/internal/EcmaScriptIdentifierTest.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5.internal;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author Marcel Haßlinger
+ */
+class EcmaScriptIdentifierTest {
+
+    @Test
+    @DisplayName("ASCII: valid identifiers")
+    void asciiValid() {
+        assertTrue(EcmaScriptIdentifier.isValid("foo"));
+        assertTrue(EcmaScriptIdentifier.isValid("_bar"));
+        assertTrue(EcmaScriptIdentifier.isValid("$baz"));
+        assertTrue(EcmaScriptIdentifier.isValid("a1"));
+        assertTrue(EcmaScriptIdentifier.isValid("A9_$_x"));
+    }
+
+    @Test
+    @DisplayName("ASCII: invalid forms")
+    void asciiInvalid() {
+        assertFalse(EcmaScriptIdentifier.isValid(""));           // empty identifier
+        assertFalse(EcmaScriptIdentifier.isValid("1abc"));       // starts with digit
+        assertFalse(EcmaScriptIdentifier.isValid("with space")); // space
+        assertFalse(EcmaScriptIdentifier.isValid("some-key"));   // hyphen
+        assertFalse(EcmaScriptIdentifier.isValid("foo.bar"));    // dot
+        assertFalse(EcmaScriptIdentifier.isValid("a,b"));        // comma
+        assertFalse(EcmaScriptIdentifier.isValid("😀face"));     // symbol
+    }
+
+    @Test
+    @DisplayName("Reserved words are allowed")
+    void reservedWordsAllowed() {
+        assertTrue(EcmaScriptIdentifier.isValid("class"));
+        assertTrue(EcmaScriptIdentifier.isValid("default"));
+        assertTrue(EcmaScriptIdentifier.isValid("function"));
+        assertTrue(EcmaScriptIdentifier.isValid("if"));
+        assertTrue(EcmaScriptIdentifier.isValid("true"));
+        assertTrue(EcmaScriptIdentifier.isValid("false"));
+        assertTrue(EcmaScriptIdentifier.isValid("null"));
+        assertTrue(EcmaScriptIdentifier.isValid("NaN"));
+        assertTrue(EcmaScriptIdentifier.isValid("Infinity"));
+    }
+
+    @Test
+    @DisplayName("Unicode letters as start are allowed")
+    void unicodeLettersStart() {
+        assertTrue(EcmaScriptIdentifier.isValid("café"));         // Lo
+        assertTrue(EcmaScriptIdentifier.isValid("naïve"));        // Lo + combining
+        assertTrue(EcmaScriptIdentifier.isValid("äpfel"));        // Ll
+        assertTrue(EcmaScriptIdentifier.isValid("Русский"));      // Cyrillic
+        assertTrue(EcmaScriptIdentifier.isValid("你好"));          // CJK
+        assertTrue(EcmaScriptIdentifier.isValid("ʰello"));        // Lm (U+02B0)
+        assertTrue(EcmaScriptIdentifier.isValid("Ⅻwert"));        // Nl (U+216B)
+    }
+
+    @Test
+    @DisplayName("Digit at start is invalid (even Unicode Nd)")
+    void unicodeDigitStartInvalid() {
+        assertFalse(EcmaScriptIdentifier.isValid("١abc")); // U+0661 ARABIC-INDIC DIGIT ONE (Nd) at start
+    }
+
+    @Test
+    @DisplayName("IdentifierPart categories")
+    void identifierPartCategories() {
+        // digits (Nd) in part
+        assertTrue(EcmaScriptIdentifier.isValid("foo1"));
+        assertTrue(EcmaScriptIdentifier.isValid("a\u0661"));     // arabic-indic digit one in part
+
+        // combining marks (Mn/Mc) in part
+        assertTrue(EcmaScriptIdentifier.isValid("e\u0301"));     // 'e' + COMBINING ACUTE ACCENT (Mn)
+        assertFalse(EcmaScriptIdentifier.isValid("\u0301e"));    // mark at start -> invalid
+
+        // connector punctuation (Pc) in part
+        assertTrue(EcmaScriptIdentifier.isValid("a_b"));         // U+005F LOW LINE
+        assertTrue(EcmaScriptIdentifier.isValid("a\u203Fbc"));   // U+203F UNDERTIE (Pc)
+        assertTrue(EcmaScriptIdentifier.isValid("a\u2054bc"));   // U+2054 INVERTED UNDERTIE (Pc)
+
+        // Pc at start (not '_') is not allowed
+        assertFalse(EcmaScriptIdentifier.isValid("\u203Fabc"));
+    }
+
+    @Test
+    @DisplayName("ZWNJ/ZWJ allowed in part, not at start")
+    void zwnjZwjRules() {
+        assertTrue(EcmaScriptIdentifier.isValid("a\u200Cbc")); // ZWNJ
+        assertTrue(EcmaScriptIdentifier.isValid("a\u200Dbc")); // ZWJ
+        assertFalse(EcmaScriptIdentifier.isValid("\u200Cabc"));
+        assertFalse(EcmaScriptIdentifier.isValid("\u200Dabc"));
+    }
+
+    @Test
+    @DisplayName("Other Cf (format) not allowed")
+    void otherCfNotAllowed() {
+        assertFalse(EcmaScriptIdentifier.isValid("a\u00ADb")); // SOFT HYPHEN (Cf)
+    }
+
+    @Test
+    @DisplayName("\\uXXXX escapes: valid")
+    void unicodeEscapesValid() {
+        assertTrue(EcmaScriptIdentifier.isValid("\\u0061bc"));       // 'a'bc
+        assertTrue(EcmaScriptIdentifier.isValid("\\u00E4pfel"));     // 'ä'pfel
+        assertTrue(EcmaScriptIdentifier.isValid("a\\u0301"));        // combining accent in part
+        assertTrue(EcmaScriptIdentifier.isValid("a\\u200C"));        // ZWNJ in part
+        assertTrue(EcmaScriptIdentifier.isValid("a\\u200D"));        // ZWJ in part
+        assertTrue(EcmaScriptIdentifier.isValid("a\\u005Fb"));       // '_' in part
+        assertTrue(EcmaScriptIdentifier.isValid("\\u0041\\u0030x")); // 'A''0'x
+        // valid surrogate pair literal (astral letter) as UTF-16, not via \\u{...}
+        assertTrue(EcmaScriptIdentifier.isValid("\uD801\uDC00abc")); // U+10400
+    }
+
+    @Test
+    @DisplayName("\\uXXXX escapes: invalid or disallowed")
+    void unicodeEscapesInvalid() {
+        assertFalse(EcmaScriptIdentifier.isValid("\\u00G1"));     // not hex
+        assertFalse(EcmaScriptIdentifier.isValid("\\u12"));       // too short
+        assertFalse(EcmaScriptIdentifier.isValid("a\\x61"));      // \x not allowed
+        assertFalse(EcmaScriptIdentifier.isValid("abc\\"));       // bare backslash
+        assertFalse(EcmaScriptIdentifier.isValid("\\u200Cabc"));  // ZWNJ at start
+        assertFalse(EcmaScriptIdentifier.isValid("\\uD800abc"));  // lone high surrogate
+    }
+
+    @Test
+    @DisplayName("$ behaves like in JS")
+    void dollarRules() {
+        assertTrue(EcmaScriptIdentifier.isValid("$"));
+        assertTrue(EcmaScriptIdentifier.isValid("$x"));
+        assertTrue(EcmaScriptIdentifier.isValid("a$1"));
+        assertTrue(EcmaScriptIdentifier.isValid("ä$"));
+    }
+
+    @Test
+    @DisplayName("Null/empty")
+    void nullAndEmpty() {
+        assertFalse(EcmaScriptIdentifier.isValid(null));
+        assertFalse(EcmaScriptIdentifier.isValid(""));
+    }
+}

From bbc478c38f1dbd4d7240f1b861509eea0941e8bc Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Tue, 16 Sep 2025 23:15:52 +0200
Subject: [PATCH 03/48] feat: rework configuration options

---
 .../java/de/marhali/json5/Json5Options.java   |  86 ---
 .../de/marhali/json5/Json5OptionsBuilder.java |  96 ---
 .../DigitSeparatorStrategy.java}              |  27 +-
 .../json5/config/DuplicateKeyStrategy.java    |  54 ++
 .../de/marhali/json5/config/Json5Options.java | 565 ++++++++++++++++++
 5 files changed, 639 insertions(+), 189 deletions(-)
 delete mode 100644 src/main/java/de/marhali/json5/Json5Options.java
 delete mode 100644 src/main/java/de/marhali/json5/Json5OptionsBuilder.java
 rename src/main/java/de/marhali/json5/{Json5Boolean.java => config/DigitSeparatorStrategy.java} (57%)
 create mode 100644 src/main/java/de/marhali/json5/config/DuplicateKeyStrategy.java
 create mode 100644 src/main/java/de/marhali/json5/config/Json5Options.java

diff --git a/src/main/java/de/marhali/json5/Json5Options.java b/src/main/java/de/marhali/json5/Json5Options.java
deleted file mode 100644
index c73704f..0000000
--- a/src/main/java/de/marhali/json5/Json5Options.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2022 Marcel Haßlinger
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package de.marhali.json5;
-
-/**
- * Configuration options for Json5 parsing and serialization.
- *
- * @author Marcel Haßlinger
- */
-public class Json5Options {
-
-    /**
-     * Default configuration options. Allow invalid surrogate, disabled pretty-printing.
-     */
-    public static final Json5Options DEFAULT = new Json5OptionsBuilder()
-            .allowInvalidSurrogate()
-            .trailingComma()
-            .prettyPrinting()
-            .build();
-
-    /**
-     * @return Builder pattern to configure json5 behaviour.
-     */
-    public static Json5OptionsBuilder builder() {
-        return new Json5OptionsBuilder();
-    }
-
-    /**
-     * Whether invalid unicode surrogate pairs should be allowed
-     */
-    private final boolean allowInvalidSurrogates;
-
-    /**
-     * Whether strings should be single-quoted ({@code '}) instead of double-quoted ({@code "}).
-     * This also includes all member names of {@link Json5Object}.
-     */
-    private final boolean quoteSingle;
-
-    /**
-     * Whether all Json5 values should be marked with a trailing comma ({@code ,}) or only where it is mandatory.
-     */
-    private final boolean trailingComma;
-
-    /**
-     * Defines how many spaces ({@code ' '}) should be placed before each key/value pair.
-     * A factor of {@code < 1} disables pretty-printing and discards any optional whitespace characters.
-     */
-    private final int indentFactor;
-
-    public Json5Options(boolean allowInvalidSurrogates, boolean quoteSingle, boolean trailingComma, int indentFactor) {
-        this.allowInvalidSurrogates = allowInvalidSurrogates;
-        this.quoteSingle = quoteSingle;
-        this.trailingComma = trailingComma;
-        this.indentFactor = Math.max(0, indentFactor);
-    }
-
-    public boolean isAllowInvalidSurrogates() {
-        return allowInvalidSurrogates;
-    }
-
-    public boolean isQuoteSingle() {
-        return quoteSingle;
-    }
-
-    public boolean isTrailingComma() {
-        return trailingComma;
-    }
-
-    public int getIndentFactor() {
-        return indentFactor;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/de/marhali/json5/Json5OptionsBuilder.java b/src/main/java/de/marhali/json5/Json5OptionsBuilder.java
deleted file mode 100644
index 69dedf2..0000000
--- a/src/main/java/de/marhali/json5/Json5OptionsBuilder.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2022 Marcel Haßlinger
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package de.marhali.json5;
-
-/**
- * Options builder to configure behaviour of json5 parsing and serialization.
- *
- * @author Marcel Haßlinger
- * @see Json5Options
- */
-public class Json5OptionsBuilder {
-
-    private boolean allowInvalidSurrogates = false;
-    private boolean quoteSingle = false;
-    private boolean trailingComma = false;
-
-    private int indentFactor = 0;
-
-    /**
-     * Constructs a new builder instance.
-     */
-    public Json5OptionsBuilder() {}
-
-    /**
-     * @see Json5Options#isAllowInvalidSurrogates()
-     * @return Current builder instance
-     */
-    public Json5OptionsBuilder allowInvalidSurrogate() {
-        this.allowInvalidSurrogates = true;
-        return this;
-    }
-
-    /**
-     * @see Json5Options#isQuoteSingle()
-     * @return Current builder instance
-     */
-    public Json5OptionsBuilder quoteSingle() {
-        this.quoteSingle = true;
-        return this;
-    }
-
-    /**
-     * @see Json5Options#isTrailingComma()
-     * @return Current builder instance
-     */
-    public Json5OptionsBuilder trailingComma() {
-        this.trailingComma = true;
-        return this;
-    }
-
-    /**
-     * The indentation factor enables pretty-printing and defines
-     * how many spaces ( {@code ' '}) should be placed before each key/value pair.
-     * A factor of {@code < 1} disables pretty-printing and discards
-     * any optional whitespace characters.
-     * @see Json5Options#getIndentFactor()
-     * @param indentFactor Indent factor to apply
-     * @return Current builder instance
-     */
-    public Json5OptionsBuilder indentFactor(int indentFactor) {
-        this.indentFactor = indentFactor;
-        return this;
-    }
-
-    /**
-     * Configures to output Json5 that fits in a page for pretty printing. This option only affects Json serialization.
-     * Applies an indent factor of 2.
-     * @see #indentFactor(int)
-     * @return Current builder instance
-     */
-    public Json5OptionsBuilder prettyPrinting() {
-        this.indentFactor = 2;
-        return this;
-    }
-
-    /**
-     * @return Configured {@link Json5Options}
-     */
-    public Json5Options build() {
-        return new Json5Options(allowInvalidSurrogates, quoteSingle, trailingComma, indentFactor);
-    }
-}
diff --git a/src/main/java/de/marhali/json5/Json5Boolean.java b/src/main/java/de/marhali/json5/config/DigitSeparatorStrategy.java
similarity index 57%
rename from src/main/java/de/marhali/json5/Json5Boolean.java
rename to src/main/java/de/marhali/json5/config/DigitSeparatorStrategy.java
index 374fc0b..a1f9c46 100644
--- a/src/main/java/de/marhali/json5/Json5Boolean.java
+++ b/src/main/java/de/marhali/json5/config/DigitSeparatorStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Marcel Haßlinger
+ * Copyright (C) 2022 - 2025 Marcel Haßlinger
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,28 @@
  * limitations under the License.
  */
 
-package de.marhali.json5;
+package de.marhali.json5.config;
 
 /**
- * A class representing a json5 boolean value.
+ * An enum containing all supported behaviors for handling digit separators.
  *
  * @author Marcel Haßlinger
  */
-public final class Json5Boolean extends Json5Primitive {
-    public Json5Boolean(Boolean value) {
-        super(value);
-    }
+public enum DigitSeparatorStrategy {
+
+    /**
+     * Expect no digit separators
+     */
+    NONE,
+
+    /**
+     * Uses Java-style digit separators (e.g. {@code 123_456}).
+     */
+    JAVA_STYLE,
+
+    /**
+     * Uses C-style digit separators (e.g. {@code 123'456}).
+     */
+    C_STYLE,
+
 }
diff --git a/src/main/java/de/marhali/json5/config/DuplicateKeyStrategy.java b/src/main/java/de/marhali/json5/config/DuplicateKeyStrategy.java
new file mode 100644
index 0000000..70df845
--- /dev/null
+++ b/src/main/java/de/marhali/json5/config/DuplicateKeyStrategy.java
@@ -0,0 +1,54 @@
+/*
+ * MIT License
+ *
+ * Copyright (C) 2021 SyntaxError404
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package de.marhali.json5.config;
+
+/**
+ * An enum containing all supported behaviors for duplicate keys
+ *
+ * @author SyntaxError404
+ * @author Marcel Haßlinger
+ */
+public enum DuplicateKeyStrategy {
+
+    /**
+     * Throws an {@link de.marhali.json5.exception.Json5Exception exception} when a key
+     * is encountered multiple times within the same object
+     */
+    UNIQUE,
+
+    /**
+     * Only the last encountered value is significant,
+     * all previous occurrences are silently discarded
+     */
+    LAST_WINS,
+
+    /**
+     * Wraps duplicate values inside an {@link de.marhali.json5.Json5Array array},
+     * effectively treating them as if they were declared as one
+     */
+    DUPLICATE
+
+}
diff --git a/src/main/java/de/marhali/json5/config/Json5Options.java b/src/main/java/de/marhali/json5/config/Json5Options.java
new file mode 100644
index 0000000..73a88f0
--- /dev/null
+++ b/src/main/java/de/marhali/json5/config/Json5Options.java
@@ -0,0 +1,565 @@
+/*
+ * MIT License
+ *
+ * Copyright (C) 2021 SyntaxError404
+ * Copyright (C) 2022 - 2025 Marcel Haßlinger
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package de.marhali.json5.config;
+
+import de.marhali.json5.Json5Array;
+import de.marhali.json5.Json5Object;
+
+import java.util.Objects;
+
+/**
+ * Definition of all configuration options for parsing and writing Json5 data.
+ *
+ * @author SyntaxError404
+ * @author Marcel Haßlinger
+ */
+public final class Json5Options {
+
+    /**
+     * Whether instants should be stringifyed as unix timestamps.
+     * If this is {@code false}, instants will be stringifyed as strings
+     * (according to <a href="https://datatracker.ietf.org/doc/html/rfc3339#section-5.6">RFC 3339, Section 5.6</a>).
+     * <p>
+     * <i>This is a {@link de.marhali.json5.stream.Json5Writer writer}-only option</i>
+     */
+    private final boolean stringifyUnixInstants;
+
+    /**
+     * Whether stringifying should only yield ASCII strings.
+     * All non-ASCII characters will be converted to their
+     * Unicode escape sequence (<code>&#92;uXXXX</code>).
+     * <p>
+     * <i>This is a {@link de.marhali.json5.stream.Json5Writer writer}-only option</i>
+     */
+    private final boolean stringifyAscii;
+
+    /**
+     * Whether {@code NaN} should be allowed as a number
+     */
+    private final boolean allowNaN;
+
+    /**
+     * Whether {@code Infinity} should be allowed as a number.
+     * This applies to both {@code +Infinity} and {@code -Infinity}
+     */
+    private final boolean allowInfinity;
+
+    /**
+     * Whether invalid unicode surrogate pairs should be allowed
+     * <p>
+     * <i>This is a {@link de.marhali.json5.stream.Json5Parser parser}-only option</i>
+     */
+    private final boolean allowInvalidSurrogates;
+
+    /**
+     * Whether strings should be single-quoted ({@code '}) instead of double-quoted ({@code "}).
+     * This also includes a {@link Json5Object JSON5Object's} member names
+     * <p>
+     * <i>This is a {@link de.marhali.json5.stream.Json5Writer writer}-only option</i>
+     */
+    private final boolean quoteSingle;
+
+    /**
+     * Whether member names of {@link Json5Object Json5Object's} should be quoteless.
+     * E.g. <code>{ enabled: true }</code> instead of <code>{ "enabled": true }</code>.
+     * <p>
+     * <i>This is a {@link de.marhali.json5.stream.Json5Writer writer}-only option</i>
+     */
+    private final boolean quoteless;
+
+    /**
+     * Whether binary literals ({@code 0b10101...}) should be allowed
+     * <p>
+     * <i>This is a {@link de.marhali.json5.stream.Json5Parser parser}-only option</i>
+     */
+    private final boolean allowBinaryLiterals;
+
+    /**
+     * Whether octal literals ({@code 0o567...}) should be allowed
+     * <p>
+     * <i>This is a {@link de.marhali.json5.stream.Json5Parser parser}-only option</i>
+     */
+    private final boolean allowOctalLiterals;
+
+    /**
+     * Whether hexadecimal floating-point literals (e.g. {@code 0xA.BCp+12}) should be allowed
+     * <p>
+     * <i>This is a {@link de.marhali.json5.stream.Json5Parser parser}-only option</i>
+     */
+    private final boolean allowHexFloatingLiterals;
+
+    /**
+     * Whether 32-bit unicode escape sequences ({@code \U00123456}) should be allowed
+     * <p>
+     * <i>This is a {@link de.marhali.json5.stream.Json5Parser parser}-only option</i>
+     */
+    private final boolean allowLongUnicodeEscapes;
+
+    /**
+     * Specifies whether trailing data should be allowed.<br>
+     * If {@code false}, parsing the following will produce an error
+     * due to the trailing {@code abc}:
+     *
+     * <pre><code>{ }abc</code></pre>
+     *
+     * If {@code true}, however, this will be interpreted as an empty
+     * {@link Json5Object} and any trailing will be ignored.
+     * <p>
+     * Whitespace never counts as trailing data.
+     * <p>
+     * <i>This is a {@link de.marhali.json5.stream.Json5Parser parser}-only option</i>
+     */
+    private final boolean allowTrailingData;
+
+    /**
+     * Specifies whether comments on {@link de.marhali.json5.Json5Element Json5Element's} should be parsed.
+     * If {@code false}, no comments will be parsed.
+     * <p>
+     * <i>This is a {@link de.marhali.json5.stream.Json5Parser parser}-only option</i>
+     */
+    private final boolean parseComments;
+
+    /**
+     * Specifies whether comments on {@link de.marhali.json5.Json5Element Json5Element's} should be written.
+     * If {@code false}, no set comments will be written.
+     * <p>
+     * <i>This is a {@link de.marhali.json5.stream.Json5Writer writer}-only option</i>
+     */
+    private final boolean writeComments;
+
+    /**
+     * Specifies whether to apply trailing commas whenever possible or not.
+     * If {@code false}, commas are only written when necessary.
+     * <pre>
+     * {@code
+     * // trailingComma: false
+     * {
+     *   "firstKey": "myValue",
+     *   "secondKey": "myValue" // <-- no comma
+     * }
+     *
+     * // trailingComma: true
+     * {
+     *   "firstKey": "myValue",
+     *   "secondKey": "myValue", // <-- trailing comma
+     * }
+     * }
+     * </pre>
+     * <p>
+     * <i>This is a {@link de.marhali.json5.stream.Json5Writer writer}-only option</i>
+     */
+    private final boolean trailingComma;
+
+    /**
+     * Specifies the behaviour for digit separator's on numbers.
+     * <p>
+     * <i>This option applies to both {@link de.marhali.json5.stream.Json5Parser parsing} and {@link de.marhali.json5.stream.Json5Writer writing}.</i>
+     */
+    private final DigitSeparatorStrategy digitSeparatorStrategy;
+
+    /**
+     * Specifies the behaviour when the same key is encountered multiple times within the same {@link Json5Object}
+     * <p>
+     * <i>This is a {@link de.marhali.json5.stream.Json5Parser parser}-only option</i>
+     */
+    private final DuplicateKeyStrategy duplicateBehaviour;
+
+
+    /**
+     * Defines the amount of whitespace's to use for the indentation of {@link Json5Object}'s or {@link Json5Array}'s.
+     * A factor of {@code < 1} disables pretty-printing and discards any optional whitespace characters.
+     * <p>
+     * <i>This is a {@link de.marhali.json5.stream.Json5Writer writer}-only option</i>
+     */
+    private final int indentFactor;
+
+    /**
+     * Configure options using the builder pattern.
+     * @return builder
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Recommended default configuration options.
+     * <p>
+     * Defaults:
+     * <ul>
+     *     <li>allowNaN: <code>true</code></li>
+     *     <li>allowInfinity: <code>true</code></li>
+     *     <li>allowInvalidSurrogates: <code>true</code></li>
+     *     <li>parseComments: <code>true</code></li>
+     *     <li>writeComments: <code>true</code></li>
+     *     <li>trailingComma: <code>true</code></li>
+     *     <li>digitSeparatorStrategy: <code>NONE</code></li>
+     *     <li>duplicateKeyStrategy: <code>UNIQUE</code></li>
+     *     <li>prettyPrinting: <code>true</code></li>
+     * </ul>
+     */
+    public static Json5Options DEFAULT = builder()
+            .allowNaN()
+            .allowInfinity()
+            .allowInvalidSurrogates()
+            .parseComments()
+            .writeComments()
+            .trailingComma()
+            .digitSeparatorStrategy(DigitSeparatorStrategy.NONE)
+            .duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE)
+            .prettyPrinting()
+            .build();
+
+    private Json5Options(Builder builder) {
+        this.stringifyUnixInstants = builder.stringifyUnixInstants;
+        this.stringifyAscii = builder.stringifyAscii;
+        this.allowNaN = builder.allowNaN;
+        this.allowInfinity = builder.allowInfinity;
+        this.allowInvalidSurrogates = builder.allowInvalidSurrogates;
+        this.quoteSingle = builder.quoteSingle;
+        this.quoteless = builder.quoteless;
+        this.allowBinaryLiterals = builder.allowBinaryLiterals;
+        this.allowOctalLiterals = builder.allowOctalLiterals;
+        this.allowHexFloatingLiterals = builder.allowHexFloatingLiterals;
+        this.allowLongUnicodeEscapes = builder.allowLongUnicodeEscapes;
+        this.allowTrailingData = builder.allowTrailingData;
+        this.parseComments = builder.parseComments;
+        this.writeComments = builder.writeComments;
+        this.trailingComma = builder.trailingComma;
+        this.digitSeparatorStrategy = builder.digitSeparatorStrategy;
+        this.duplicateBehaviour = builder.duplicateKeyStrategy;this.indentFactor = builder.indentFactor;
+    }
+
+    public boolean isStringifyUnixInstants() {
+        return stringifyUnixInstants;
+    }
+
+    public boolean isStringifyAscii() {
+        return stringifyAscii;
+    }
+
+    public boolean isAllowNaN() {
+        return allowNaN;
+    }
+
+    public boolean isAllowInfinity() {
+        return allowInfinity;
+    }
+
+    public boolean isAllowInvalidSurrogates() {
+        return allowInvalidSurrogates;
+    }
+
+    public boolean isQuoteSingle() {
+        return quoteSingle;
+    }
+
+    public boolean isQuoteless() {
+        return quoteless;
+    }
+
+    public boolean isAllowBinaryLiterals() {
+        return allowBinaryLiterals;
+    }
+
+    public boolean isAllowOctalLiterals() {
+        return allowOctalLiterals;
+    }
+
+    public boolean isAllowHexFloatingLiterals() {
+        return allowHexFloatingLiterals;
+    }
+
+    public boolean isAllowLongUnicodeEscapes() {
+        return allowLongUnicodeEscapes;
+    }
+
+    public boolean isAllowTrailingData() {
+        return allowTrailingData;
+    }
+
+    public boolean isWriteComments() {
+        return writeComments;
+    }
+
+    public boolean isParseComments() {
+        return parseComments;
+    }
+
+    public boolean isTrailingComma() {
+        return trailingComma;
+    }
+
+    public DigitSeparatorStrategy getDigitSeparatorStrategy() {
+        return digitSeparatorStrategy;
+    }
+
+    public DuplicateKeyStrategy getDuplicateBehaviour() {
+        return duplicateBehaviour;
+    }
+
+    public int getIndentFactor() {
+        return indentFactor;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) return false;
+        Json5Options that = (Json5Options) o;
+        return stringifyUnixInstants == that.stringifyUnixInstants && stringifyAscii == that.stringifyAscii && allowNaN == that.allowNaN && allowInfinity == that.allowInfinity && allowInvalidSurrogates == that.allowInvalidSurrogates && quoteSingle == that.quoteSingle && quoteless == that.quoteless && allowBinaryLiterals == that.allowBinaryLiterals && allowOctalLiterals == that.allowOctalLiterals && allowHexFloatingLiterals == that.allowHexFloatingLiterals && allowLongUnicodeEscapes == that.allowLongUnicodeEscapes && allowTrailingData == that.allowTrailingData && parseComments == that.parseComments && writeComments == that.writeComments && trailingComma == that.trailingComma && indentFactor == that.indentFactor && digitSeparatorStrategy == that.digitSeparatorStrategy && duplicateBehaviour == that.duplicateBehaviour;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(stringifyUnixInstants, stringifyAscii, allowNaN, allowInfinity, allowInvalidSurrogates, quoteSingle, quoteless, allowBinaryLiterals, allowOctalLiterals, allowHexFloatingLiterals, allowLongUnicodeEscapes, allowTrailingData, parseComments, writeComments, trailingComma, digitSeparatorStrategy, duplicateBehaviour, indentFactor);
+    }
+
+    @Override
+    public String toString() {
+        return "Json5Options{" +
+                "stringifyUnixInstants=" + stringifyUnixInstants +
+                ", stringifyAscii=" + stringifyAscii +
+                ", allowNaN=" + allowNaN +
+                ", allowInfinity=" + allowInfinity +
+                ", allowInvalidSurrogates=" + allowInvalidSurrogates +
+                ", quoteSingle=" + quoteSingle +
+                ", quoteless=" + quoteless +
+                ", allowBinaryLiterals=" + allowBinaryLiterals +
+                ", allowOctalLiterals=" + allowOctalLiterals +
+                ", allowHexFloatingLiterals=" + allowHexFloatingLiterals +
+                ", allowLongUnicodeEscapes=" + allowLongUnicodeEscapes +
+                ", allowTrailingData=" + allowTrailingData +
+                ", parseComments=" + parseComments +
+                ", writeComments=" + writeComments +
+                ", trailingComma=" + trailingComma +
+                ", digitSeparatorStrategy=" + digitSeparatorStrategy +
+                ", duplicateBehaviour=" + duplicateBehaviour +
+                ", indentFactor=" + indentFactor +
+                '}';
+    }
+
+    public static final class Builder {
+        private boolean stringifyUnixInstants = false;
+        private boolean stringifyAscii = false;
+        private boolean allowNaN = false;
+        private boolean allowInfinity = false;
+        private boolean allowInvalidSurrogates = false;
+        private boolean quoteSingle = false;
+        private boolean quoteless = false;
+        private boolean allowBinaryLiterals = false;
+        private boolean allowOctalLiterals = false;
+        private boolean allowHexFloatingLiterals = false;
+        private boolean allowLongUnicodeEscapes = false;
+        private boolean allowTrailingData =  false;
+        private boolean parseComments = false;
+        private boolean writeComments = false;
+        private boolean trailingComma = false;
+        private DigitSeparatorStrategy digitSeparatorStrategy = DigitSeparatorStrategy.NONE;
+        private DuplicateKeyStrategy duplicateKeyStrategy = DuplicateKeyStrategy.UNIQUE;
+        private int indentFactor = 0;
+
+        private Builder() {}
+
+        /**
+         * @return built {@link Json5Options}
+         */
+        public Json5Options build() {
+            return new Json5Options(this);
+        }
+
+        /**
+         * @see Json5Options#stringifyUnixInstants
+         * @return builder
+         */
+        public Builder stringifyUnixInstants() {
+            this.stringifyUnixInstants = true;
+            return this;
+        }
+
+        /**
+         * @see Json5Options#stringifyAscii
+         * @return builder
+         */
+        public Builder stringifyAscii() {
+            this.stringifyAscii = true;
+            return this;
+        }
+
+        /**
+         * @see Json5Options#allowNaN
+         * @return builder
+         */
+        public Builder allowNaN() {
+            this.allowNaN = true;
+            return this;
+        }
+
+        /**
+         * @see Json5Options#allowInfinity
+         * @return builder
+         */
+        public Builder allowInfinity() {
+            this.allowInfinity = true;
+            return this;
+        }
+
+        /**
+         * @see Json5Options#allowInvalidSurrogates
+         * @return builder
+         */
+        public Builder allowInvalidSurrogates() {
+            this.allowInvalidSurrogates = true;
+            return this;
+        }
+
+        /**
+         * @see Json5Options#quoteSingle
+         * @return builder
+         */
+        public Builder quoteSingle() {
+            this.quoteSingle = true;
+            return this;
+        }
+
+        /**
+         * @see Json5Options#quoteless
+         * @return builder
+         */
+        public Builder quoteless() {
+            this.quoteless = true;
+            return this;
+        }
+
+        /**
+         * @see Json5Options#allowBinaryLiterals
+         * @return builder
+         */
+        public Builder allowBinaryLiterals() {
+            this.allowBinaryLiterals = true;
+            return this;
+        }
+
+        /**
+         * @see Json5Options#allowOctalLiterals
+         * @return builder
+         */
+        public Builder allowOctalLiterals() {
+            this.allowOctalLiterals = true;
+            return this;
+        }
+
+        /**
+         * @see Json5Options#allowHexFloatingLiterals
+         * @return builder
+         */
+        public Builder allowHexFloatingLiterals() {
+            this.allowHexFloatingLiterals = true;
+            return this;
+        }
+
+        /**
+         * @see Json5Options#allowLongUnicodeEscapes
+         * @return builder
+         */
+        public Builder allowLongUnicodeEscapes() {
+            this.allowLongUnicodeEscapes = true;
+            return this;
+        }
+
+        /**
+         * @see Json5Options#allowTrailingData
+         * @return builder
+         */
+        public Builder allowTrailingData() {
+            this.allowTrailingData = true;
+            return this;
+        }
+
+        /**
+         * @see Json5Options#parseComments
+         * @return builder
+         */
+        public Builder parseComments() {
+            this.parseComments = true;
+            return this;
+        }
+
+        /**
+         * @see Json5Options#writeComments
+         * @return builder
+         */
+        public Builder writeComments() {
+            this.writeComments = true;
+            return this;
+        }
+
+        /**
+         * @see Json5Options#trailingComma
+         * @return builder
+         */
+        public Builder trailingComma() {
+            this.trailingComma = true;
+            return this;
+        }
+
+        /**
+         * @see Json5Options#digitSeparatorStrategy
+         * @return builder
+         */
+        public Builder digitSeparatorStrategy(DigitSeparatorStrategy digitSeparatorStrategy) {
+            this.digitSeparatorStrategy = digitSeparatorStrategy;
+            return this;
+        }
+
+        /**
+         * @see Json5Options#duplicateBehaviour
+         * @return builder
+         */
+        public Builder duplicateKeyStrategy(DuplicateKeyStrategy duplicateKeyStrategy) {
+            this.duplicateKeyStrategy = duplicateKeyStrategy;
+            return this;
+        }
+
+        /**
+         * @see Json5Options#indentFactor
+         * @return builder
+         */
+        public Builder indentFactor(int indentFactor) {
+            this.indentFactor = indentFactor;
+            return this;
+        }
+
+        /**
+         * Configures pretty printing using 2 whitespaces for serialization (writing).
+         * Shorthand for {@code indentFactor(2)}.
+         * @see Json5Options#indentFactor
+         * @see #indentFactor(int)
+         * @return builder
+         */
+        public Builder prettyPrinting() {
+            return indentFactor(2);
+        }
+    }
+}

From 7b3612103f100291ec96b03decc508aff6fb8379 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Tue, 16 Sep 2025 23:16:57 +0200
Subject: [PATCH 04/48] feat: update gson internals

---
 .../marhali/json5/internal/LinkedTreeMap.java | 261 ++++++++++--------
 .../internal/NonNullElementWrapperList.java   | 132 +++++++++
 .../marhali/json5/internal/NumberLimits.java  |  36 +++
 3 files changed, 321 insertions(+), 108 deletions(-)
 create mode 100644 src/main/java/de/marhali/json5/internal/NonNullElementWrapperList.java
 create mode 100644 src/main/java/de/marhali/json5/internal/NumberLimits.java

diff --git a/src/main/java/de/marhali/json5/internal/LinkedTreeMap.java b/src/main/java/de/marhali/json5/internal/LinkedTreeMap.java
index edd7ad7..9916170 100644
--- a/src/main/java/de/marhali/json5/internal/LinkedTreeMap.java
+++ b/src/main/java/de/marhali/json5/internal/LinkedTreeMap.java
@@ -29,78 +29,103 @@
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.NoSuchElementException;
+import java.util.Objects;
 import java.util.Set;
 
 /**
- * A map of comparable keys to values. Unlike {@code TreeMap}, this class uses
- * insertion order for iteration order. Comparison order is only used as an
- * optimization for efficient insertion and removal.
+ * A map of comparable keys to values. Unlike {@code TreeMap}, this class uses insertion order for
+ * iteration order. Comparison order is only used as an optimization for efficient insertion and
+ * removal.
  *
  * <p>This implementation was derived from Android 4.1's TreeMap class.
  */
+@SuppressWarnings("serial") // ignore warning about missing serialVersionUID
 public final class LinkedTreeMap<K, V> extends AbstractMap<K, V> implements Serializable {
-    @SuppressWarnings({ "unchecked", "rawtypes" }) // to avoid Comparable<Comparable<Comparable<...>>>
-    private static final Comparator<Comparable> NATURAL_ORDER = new Comparator<Comparable>() {
-        public int compare(Comparable a, Comparable b) {
-            return a.compareTo(b);
-        }
-    };
+    @SuppressWarnings({"unchecked", "rawtypes"}) // to avoid Comparable<Comparable<Comparable<...>>>
+    private static final Comparator<Comparable> NATURAL_ORDER =
+        new Comparator<Comparable>() {
+            @Override
+            public int compare(Comparable a, Comparable b) {
+                return a.compareTo(b);
+            }
+        };
 
-    Comparator<? super K> comparator;
+    private final Comparator<? super K> comparator;
+    private final boolean allowNullValues;
     Node<K, V> root;
     int size = 0;
     int modCount = 0;
 
     // Used to preserve iteration order
-    final Node<K, V> header = new Node<K, V>();
+    final Node<K, V> header;
 
     /**
-     * Create a natural order, empty tree map whose keys must be mutually
-     * comparable and non-null.
+     * Create a natural order, empty tree map whose keys must be mutually comparable and non-null, and
+     * whose values can be {@code null}.
      */
     @SuppressWarnings("unchecked") // unsafe! this assumes K is comparable
     public LinkedTreeMap() {
-        this((Comparator<? super K>) NATURAL_ORDER);
+        this((Comparator<? super K>) NATURAL_ORDER, true);
+    }
+
+    /**
+     * Create a natural order, empty tree map whose keys must be mutually comparable and non-null.
+     *
+     * @param allowNullValues whether {@code null} is allowed as entry value
+     */
+    @SuppressWarnings("unchecked") // unsafe! this assumes K is comparable
+    public LinkedTreeMap(boolean allowNullValues) {
+        this((Comparator<? super K>) NATURAL_ORDER, allowNullValues);
     }
 
     /**
-     * Create a tree map ordered by {@code comparator}. This map's keys may only
-     * be null if {@code comparator} permits.
+     * Create a tree map ordered by {@code comparator}. This map's keys may only be null if {@code
+     * comparator} permits.
      *
-     * @param comparator the comparator to order elements with, or {@code null} to
-     *     use the natural ordering.
+     * @param comparator the comparator to order elements with, or {@code null} to use the natural
+     *     ordering.
+     * @param allowNullValues whether {@code null} is allowed as entry value
      */
-    @SuppressWarnings({ "unchecked", "rawtypes" }) // unsafe! if comparator is null, this assumes K is comparable
-    public LinkedTreeMap(Comparator<? super K> comparator) {
-        this.comparator = comparator != null
-                ? comparator
-                : (Comparator) NATURAL_ORDER;
+    // unsafe! if comparator is null, this assumes K is comparable
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public LinkedTreeMap(Comparator<? super K> comparator, boolean allowNullValues) {
+        this.comparator = comparator != null ? comparator : (Comparator) NATURAL_ORDER;
+        this.allowNullValues = allowNullValues;
+        this.header = new Node<>(allowNullValues);
     }
 
-    @Override public int size() {
+    @Override
+    public int size() {
         return size;
     }
 
-    @Override public V get(Object key) {
+    @Override
+    public V get(Object key) {
         Node<K, V> node = findByObject(key);
         return node != null ? node.value : null;
     }
 
-    @Override public boolean containsKey(Object key) {
+    @Override
+    public boolean containsKey(Object key) {
         return findByObject(key) != null;
     }
 
-    @Override public V put(K key, V value) {
+    @Override
+    public V put(K key, V value) {
         if (key == null) {
             throw new NullPointerException("key == null");
         }
+        if (value == null && !allowNullValues) {
+            throw new NullPointerException("value == null");
+        }
         Node<K, V> created = find(key, true);
         V result = created.value;
         created.value = value;
         return result;
     }
 
-    @Override public void clear() {
+    @Override
+    public void clear() {
         root = null;
         size = 0;
         modCount++;
@@ -110,7 +135,8 @@ public LinkedTreeMap(Comparator<? super K> comparator) {
         header.next = header.prev = header;
     }
 
-    @Override public V remove(Object key) {
+    @Override
+    public V remove(Object key) {
         Node<K, V> node = removeInternalByKey(key);
         return node != null ? node.value : null;
     }
@@ -118,8 +144,7 @@ public LinkedTreeMap(Comparator<? super K> comparator) {
     /**
      * Returns the node at or adjacent to the given key, creating it if requested.
      *
-     * @throws ClassCastException if {@code key} and the tree's keys aren't
-     *     mutually comparable.
+     * @throws ClassCastException if {@code key} and the tree's keys aren't mutually comparable.
      */
     Node<K, V> find(K key, boolean create) {
         Comparator<? super K> comparator = this.comparator;
@@ -129,12 +154,12 @@ Node<K, V> find(K key, boolean create) {
         if (nearest != null) {
             // Micro-optimization: avoid polymorphic calls to Comparator.compare().
             @SuppressWarnings("unchecked") // Throws a ClassCastException below if there's trouble.
-            Comparable<Object> comparableKey = (comparator == NATURAL_ORDER)
-                    ? (Comparable<Object>) key
-                    : null;
+            Comparable<Object> comparableKey =
+                (comparator == NATURAL_ORDER) ? (Comparable<Object>) key : null;
 
             while (true) {
-                comparison = (comparableKey != null)
+                comparison =
+                    (comparableKey != null)
                         ? comparableKey.compareTo(nearest.key)
                         : comparator.compare(key, nearest.key);
 
@@ -166,10 +191,10 @@ Node<K, V> find(K key, boolean create) {
             if (comparator == NATURAL_ORDER && !(key instanceof Comparable)) {
                 throw new ClassCastException(key.getClass().getName() + " is not Comparable");
             }
-            created = new Node<K, V>(nearest, key, header, header.prev);
+            created = new Node<>(allowNullValues, nearest, key, header, header.prev);
             root = created;
         } else {
-            created = new Node<K, V>(nearest, key, header, header.prev);
+            created = new Node<>(allowNullValues, nearest, key, header, header.prev);
             if (comparison < 0) { // nearest.key is higher
                 nearest.left = created;
             } else { // comparison > 0, nearest.key is lower
@@ -193,13 +218,12 @@ Node<K, V> findByObject(Object key) {
     }
 
     /**
-     * Returns this map's entry that has the same key and value as {@code
-     * entry}, or null if this map has no such entry.
+     * Returns this map's entry that has the same key and value as {@code entry}, or null if this map
+     * has no such entry.
      *
-     * <p>This method uses the comparator for key equality rather than {@code
-     * equals}. If this map's comparator isn't consistent with equals (such as
-     * {@code String.CASE_INSENSITIVE_ORDER}), then {@code remove()} and {@code
-     * contains()} will violate the collections API.
+     * <p>This method uses the comparator for key equality rather than {@code equals}. If this map's
+     * comparator isn't consistent with equals (such as {@code String.CASE_INSENSITIVE_ORDER}), then
+     * {@code remove()} and {@code contains()} will violate the collections API.
      */
     Node<K, V> findByEntry(Entry<?, ?> entry) {
         Node<K, V> mine = findByObject(entry.getKey());
@@ -207,13 +231,12 @@ Node<K, V> findByEntry(Entry<?, ?> entry) {
         return valuesEqual ? mine : null;
     }
 
-    private boolean equal(Object a, Object b) {
-        return a == b || (a != null && a.equals(b));
+    private static boolean equal(Object a, Object b) {
+        return Objects.equals(a, b);
     }
 
     /**
-     * Removes {@code node} from this tree, rearranging the tree's structure as
-     * necessary.
+     * Removes {@code node} from this tree, rearranging the tree's structure as necessary.
      *
      * @param unlink true to also unlink this node from the iteration linked list.
      */
@@ -284,6 +307,7 @@ Node<K, V> removeInternalByKey(Object key) {
         return node;
     }
 
+    @SuppressWarnings("ReferenceEquality")
     private void replaceInParent(Node<K, V> node, Node<K, V> replacement) {
         Node<K, V> parent = node.parent;
         node.parent = null;
@@ -295,7 +319,7 @@ private void replaceInParent(Node<K, V> node, Node<K, V> replacement) {
             if (parent.left == node) {
                 parent.left = replacement;
             } else {
-                assert (parent.right == node);
+                assert parent.right == node;
                 parent.right = replacement;
             }
         } else {
@@ -304,11 +328,10 @@ private void replaceInParent(Node<K, V> node, Node<K, V> replacement) {
     }
 
     /**
-     * Rebalances the tree by making any AVL rotations necessary between the
-     * newly-unbalanced node and the tree's root.
+     * Rebalances the tree by making any AVL rotations necessary between the newly-unbalanced node and
+     * the tree's root.
      *
-     * @param insert true if the node was unbalanced by an insert; false if it
-     *     was by a removal.
+     * @param insert true if the node was unbalanced by an insert; false if it was by a removal.
      */
     private void rebalance(Node<K, V> unbalanced, boolean insert) {
         for (Node<K, V> node = unbalanced; node != null; node = node.parent) {
@@ -370,9 +393,7 @@ private void rebalance(Node<K, V> unbalanced, boolean insert) {
         }
     }
 
-    /**
-     * Rotates the subtree so that its root's right child is the new root.
-     */
+    /** Rotates the subtree so that its root's right child is the new root. */
     private void rotateLeft(Node<K, V> root) {
         Node<K, V> left = root.left;
         Node<K, V> pivot = root.right;
@@ -392,15 +413,12 @@ private void rotateLeft(Node<K, V> root) {
         root.parent = pivot;
 
         // fix heights
-        root.height = Math.max(left != null ? left.height : 0,
-                pivotLeft != null ? pivotLeft.height : 0) + 1;
-        pivot.height = Math.max(root.height,
-                pivotRight != null ? pivotRight.height : 0) + 1;
+        root.height =
+            Math.max(left != null ? left.height : 0, pivotLeft != null ? pivotLeft.height : 0) + 1;
+        pivot.height = Math.max(root.height, pivotRight != null ? pivotRight.height : 0) + 1;
     }
 
-    /**
-     * Rotates the subtree so that its root's left child is the new root.
-     */
+    /** Rotates the subtree so that its root's left child is the new root. */
     private void rotateRight(Node<K, V> root) {
         Node<K, V> pivot = root.left;
         Node<K, V> right = root.right;
@@ -420,23 +438,30 @@ private void rotateRight(Node<K, V> root) {
         root.parent = pivot;
 
         // fixup heights
-        root.height = Math.max(right != null ? right.height : 0,
-                pivotRight != null ? pivotRight.height : 0) + 1;
-        pivot.height = Math.max(root.height,
-                pivotLeft != null ? pivotLeft.height : 0) + 1;
+        root.height =
+            Math.max(right != null ? right.height : 0, pivotRight != null ? pivotRight.height : 0) + 1;
+        pivot.height = Math.max(root.height, pivotLeft != null ? pivotLeft.height : 0) + 1;
     }
 
     private EntrySet entrySet;
     private KeySet keySet;
 
-    @Override public Set<Entry<K, V>> entrySet() {
+    @Override
+    public Set<Entry<K, V>> entrySet() {
         EntrySet result = entrySet;
-        return result != null ? result : (entrySet = new EntrySet());
+        if (result == null) {
+            result = entrySet = new EntrySet();
+        }
+        return result;
     }
 
-    @Override public Set<K> keySet() {
+    @Override
+    public Set<K> keySet() {
         KeySet result = keySet;
-        return result != null ? result : (keySet = new KeySet());
+        if (result == null) {
+            result = keySet = new KeySet();
+        }
+        return result;
     }
 
     static final class Node<K, V> implements Entry<K, V> {
@@ -446,19 +471,22 @@ static final class Node<K, V> implements Entry<K, V> {
         Node<K, V> next;
         Node<K, V> prev;
         final K key;
+        final boolean allowNullValue;
         V value;
         int height;
 
         /** Create the header entry */
-        Node() {
+        Node(boolean allowNullValue) {
             key = null;
+            this.allowNullValue = allowNullValue;
             next = prev = this;
         }
 
         /** Create a regular entry */
-        Node(Node<K, V> parent, K key, Node<K, V> next, Node<K, V> prev) {
+        Node(boolean allowNullValue, Node<K, V> parent, K key, Node<K, V> next, Node<K, V> prev) {
             this.parent = parent;
             this.key = key;
+            this.allowNullValue = allowNullValue;
             this.height = 1;
             this.next = next;
             this.prev = prev;
@@ -466,42 +494,47 @@ static final class Node<K, V> implements Entry<K, V> {
             next.prev = this;
         }
 
+        @Override
         public K getKey() {
             return key;
         }
 
+        @Override
         public V getValue() {
             return value;
         }
 
+        @Override
         public V setValue(V value) {
+            if (value == null && !allowNullValue) {
+                throw new NullPointerException("value == null");
+            }
             V oldValue = this.value;
             this.value = value;
             return oldValue;
         }
 
-        @SuppressWarnings("rawtypes")
-        @Override public boolean equals(Object o) {
+        @Override
+        public boolean equals(Object o) {
             if (o instanceof Entry) {
-                Entry other = (Entry) o;
+                Entry<?, ?> other = (Entry<?, ?>) o;
                 return (key == null ? other.getKey() == null : key.equals(other.getKey()))
-                        && (value == null ? other.getValue() == null : value.equals(other.getValue()));
+                    && (value == null ? other.getValue() == null : value.equals(other.getValue()));
             }
             return false;
         }
 
-        @Override public int hashCode() {
-            return (key == null ? 0 : key.hashCode())
-                    ^ (value == null ? 0 : value.hashCode());
+        @Override
+        public int hashCode() {
+            return (key == null ? 0 : key.hashCode()) ^ (value == null ? 0 : value.hashCode());
         }
 
-        @Override public String toString() {
+        @Override
+        public String toString() {
             return key + "=" + value;
         }
 
-        /**
-         * Returns the first node in this subtree.
-         */
+        /** Returns the first node in this subtree. */
         public Node<K, V> first() {
             Node<K, V> node = this;
             Node<K, V> child = node.left;
@@ -512,9 +545,7 @@ public Node<K, V> first() {
             return node;
         }
 
-        /**
-         * Returns the last node in this subtree.
-         */
+        /** Returns the last node in this subtree. */
         public Node<K, V> last() {
             Node<K, V> node = this;
             Node<K, V> child = node.right;
@@ -531,13 +562,15 @@ private abstract class LinkedTreeMapIterator<T> implements Iterator<T> {
         Node<K, V> lastReturned = null;
         int expectedModCount = modCount;
 
-        LinkedTreeMapIterator() {
-        }
+        LinkedTreeMapIterator() {}
 
+        @Override
+        @SuppressWarnings("ReferenceEquality")
         public final boolean hasNext() {
             return next != header;
         }
 
+        @SuppressWarnings("ReferenceEquality")
         final Node<K, V> nextNode() {
             Node<K, V> e = next;
             if (e == header) {
@@ -547,9 +580,11 @@ final Node<K, V> nextNode() {
                 throw new ConcurrentModificationException();
             }
             next = e.next;
-            return lastReturned = e;
+            lastReturned = e;
+            return e;
         }
 
+        @Override
         public final void remove() {
             if (lastReturned == null) {
                 throw new IllegalStateException();
@@ -561,23 +596,28 @@ public final void remove() {
     }
 
     class EntrySet extends AbstractSet<Entry<K, V>> {
-        @Override public int size() {
+        @Override
+        public int size() {
             return size;
         }
 
-        @Override public Iterator<Entry<K, V>> iterator() {
+        @Override
+        public Iterator<Entry<K, V>> iterator() {
             return new LinkedTreeMapIterator<Entry<K, V>>() {
+                @Override
                 public Entry<K, V> next() {
                     return nextNode();
                 }
             };
         }
 
-        @Override public boolean contains(Object o) {
+        @Override
+        public boolean contains(Object o) {
             return o instanceof Entry && findByEntry((Entry<?, ?>) o) != null;
         }
 
-        @Override public boolean remove(Object o) {
+        @Override
+        public boolean remove(Object o) {
             if (!(o instanceof Entry)) {
                 return false;
             }
@@ -590,51 +630,56 @@ public Entry<K, V> next() {
             return true;
         }
 
-        @Override public void clear() {
+        @Override
+        public void clear() {
             LinkedTreeMap.this.clear();
         }
     }
 
     final class KeySet extends AbstractSet<K> {
-        @Override public int size() {
+        @Override
+        public int size() {
             return size;
         }
 
-        @Override public Iterator<K> iterator() {
+        @Override
+        public Iterator<K> iterator() {
             return new LinkedTreeMapIterator<K>() {
+                @Override
                 public K next() {
                     return nextNode().key;
                 }
             };
         }
 
-        @Override public boolean contains(Object o) {
+        @Override
+        public boolean contains(Object o) {
             return containsKey(o);
         }
 
-        @Override public boolean remove(Object key) {
+        @Override
+        public boolean remove(Object key) {
             return removeInternalByKey(key) != null;
         }
 
-        @Override public void clear() {
+        @Override
+        public void clear() {
             LinkedTreeMap.this.clear();
         }
     }
 
     /**
-     * If somebody is unlucky enough to have to serialize one of these, serialize
-     * it as a LinkedHashMap so that they won't need Gson on the other side to
-     * deserialize it. Using serialization defeats our DoS defence, so most apps
-     * shouldn't use it.
-     * @return LinkedHashMap
-     * @throws ObjectStreamException Stream exception
+     * If somebody is unlucky enough to have to serialize one of these, serialize it as a
+     * LinkedHashMap so that they won't need Gson on the other side to deserialize it. Using
+     * serialization defeats our DoS defence, so most apps shouldn't use it.
      */
     private Object writeReplace() throws ObjectStreamException {
-        return new LinkedHashMap<K, V>(this);
+        return new LinkedHashMap<>(this);
     }
 
     private void readObject(ObjectInputStream in) throws IOException {
-        // Don't permit directly deserializing this class; writeReplace() should have written a replacement
+        // Don't permit directly deserializing this class; writeReplace() should have written a
+        // replacement
         throw new InvalidObjectException("Deserialization is unsupported");
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/de/marhali/json5/internal/NonNullElementWrapperList.java b/src/main/java/de/marhali/json5/internal/NonNullElementWrapperList.java
new file mode 100644
index 0000000..5c3def1
--- /dev/null
+++ b/src/main/java/de/marhali/json5/internal/NonNullElementWrapperList.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2018 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5.internal;
+
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.RandomAccess;
+
+/**
+ * {@link List} which wraps another {@code List} but prevents insertion of {@code null} elements.
+ * Methods which only perform checks with the element argument (e.g. {@link #contains(Object)}) do
+ * not throw exceptions for {@code null} arguments.
+ */
+public class NonNullElementWrapperList<E> extends AbstractList<E> implements RandomAccess {
+    // Explicitly specify ArrayList as type to guarantee that delegate implements RandomAccess
+    private final ArrayList<E> delegate;
+
+    @SuppressWarnings("NonApiType")
+    public NonNullElementWrapperList(ArrayList<E> delegate) {
+        this.delegate = Objects.requireNonNull(delegate);
+    }
+
+    @Override
+    public E get(int index) {
+        return delegate.get(index);
+    }
+
+    @Override
+    public int size() {
+        return delegate.size();
+    }
+
+    private E nonNull(E element) {
+        if (element == null) {
+            throw new NullPointerException("Element must be non-null");
+        }
+        return element;
+    }
+
+    @Override
+    public E set(int index, E element) {
+        return delegate.set(index, nonNull(element));
+    }
+
+    @Override
+    public void add(int index, E element) {
+        delegate.add(index, nonNull(element));
+    }
+
+    @Override
+    public E remove(int index) {
+        return delegate.remove(index);
+    }
+
+    /* The following methods are overridden because their default implementation is inefficient */
+
+    @Override
+    public void clear() {
+        delegate.clear();
+    }
+
+    @SuppressWarnings("UngroupedOverloads") // this is intentionally ungrouped, see comment above
+    @Override
+    public boolean remove(Object o) {
+        return delegate.remove(o);
+    }
+
+    @Override
+    public boolean removeAll(Collection<?> c) {
+        return delegate.removeAll(c);
+    }
+
+    @Override
+    public boolean retainAll(Collection<?> c) {
+        return delegate.retainAll(c);
+    }
+
+    @Override
+    public boolean contains(Object o) {
+        return delegate.contains(o);
+    }
+
+    @Override
+    public int indexOf(Object o) {
+        return delegate.indexOf(o);
+    }
+
+    @Override
+    public int lastIndexOf(Object o) {
+        return delegate.lastIndexOf(o);
+    }
+
+    @Override
+    public Object[] toArray() {
+        return delegate.toArray();
+    }
+
+    @Override
+    public <T> T[] toArray(T[] a) {
+        return delegate.toArray(a);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return delegate.equals(o);
+    }
+
+    @Override
+    public int hashCode() {
+        return delegate.hashCode();
+    }
+
+    // Maybe also delegate List#sort and List#spliterator in the future, but that
+    // requires Android API level 24
+}
diff --git a/src/main/java/de/marhali/json5/internal/NumberLimits.java b/src/main/java/de/marhali/json5/internal/NumberLimits.java
new file mode 100644
index 0000000..f5cb6ca
--- /dev/null
+++ b/src/main/java/de/marhali/json5/internal/NumberLimits.java
@@ -0,0 +1,36 @@
+package de.marhali.json5.internal;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+/**
+ * This class enforces limits on numbers parsed from Json5 to avoid potential performance problems
+ * when extremely large numbers are used.
+ */
+public class NumberLimits {
+    private NumberLimits() {}
+
+    private static final int MAX_NUMBER_STRING_LENGTH = 10_000;
+
+    private static void checkNumberStringLength(String s) {
+        if (s.length() > MAX_NUMBER_STRING_LENGTH) {
+            throw new NumberFormatException("Number string too large: " + s.substring(0, 30) + "...");
+        }
+    }
+
+    public static BigDecimal parseBigDecimal(String s) throws NumberFormatException {
+        checkNumberStringLength(s);
+        BigDecimal decimal = new BigDecimal(s);
+
+        // Cast to long to avoid issues with abs when value is Integer.MIN_VALUE
+        if (Math.abs((long) decimal.scale()) >= 10_000) {
+            throw new NumberFormatException("Number has unsupported scale: " + s);
+        }
+        return decimal;
+    }
+
+    public static BigInteger parseBigInteger(String s) throws NumberFormatException {
+        checkNumberStringLength(s);
+        return new BigInteger(s);
+    }
+}

From f844e9d9010c97a5d6430a2442019012f736f381 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Tue, 16 Sep 2025 23:18:20 +0200
Subject: [PATCH 05/48] feat: use new config options and minor docs change

---
 src/main/java/de/marhali/json5/Json5.java | 29 ++++++++++++-----------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/main/java/de/marhali/json5/Json5.java b/src/main/java/de/marhali/json5/Json5.java
index 1aa56ad..a25cf4c 100644
--- a/src/main/java/de/marhali/json5/Json5.java
+++ b/src/main/java/de/marhali/json5/Json5.java
@@ -16,6 +16,7 @@
 
 package de.marhali.json5;
 
+import de.marhali.json5.config.Json5Options;
 import de.marhali.json5.stream.Json5Lexer;
 import de.marhali.json5.stream.Json5Parser;
 import de.marhali.json5.stream.Json5Writer;
@@ -25,7 +26,7 @@
 import java.util.function.Function;
 
 /**
- * This is the main class for using JSON5. This class provides methods to parse and
+ * This is the main class for using Json5. This class provides methods to parse and
  * serialize Json5 data according to the specification and the configured {@link Json5Options options}.
  *
  * <p>
@@ -46,12 +47,12 @@
 public final class Json5 {
 
     /**
-     * Constructs a new json5 instance by using the {@link Json5OptionsBuilder}.
+     * Constructs a new json5 instance by using the {@link Json5Options#builder()}.
      * @param builder Options builder
-     * @return Provide built options by returning {@link Json5OptionsBuilder#build()} method
+     * @return Built options
      */
-    public static Json5 builder(Function<Json5OptionsBuilder, Json5Options> builder) {
-        return new Json5(builder.apply(new Json5OptionsBuilder()));
+    public static Json5 builder(Function<Json5Options.Builder, Json5Options> builder) {
+        return new Json5(builder.apply(Json5Options.builder()));
     }
 
     private final Json5Options options;
@@ -92,7 +93,7 @@ public Json5Element parse(InputStream in) {
      * <p><b>Note:</b> The reader must be closed after operation</p>
      * @param reader Can be any applicable {@link Reader}
      * @return Parsed json5 tree. Can be {@code null} if the provided stream does not contain any data
-     * @see Json5Parser#parse(Json5Lexer) 
+     * @see Json5Parser#parse(Json5Lexer)
      */
     public Json5Element parse(Reader reader) {
         Objects.requireNonNull(reader);
@@ -104,14 +105,14 @@ public Json5Element parse(Reader reader) {
     /**
      * Parses the provided json5-encoded {@link String} into a parse tree of {@link Json5Element}'s.
      * There must be a root element based on a {@link Json5Object} or {@link Json5Array}.
-     * @param jsonString Json5 encoded {@link String}
+     * @param json5String Json5 encoded {@link String}
      * @return Parsed json5 tree. Can be {@code null} if the provided {@link String} is empty
-     * @see #parse(Reader) 
+     * @see #parse(Reader)
      */
-    public Json5Element parse(String jsonString) {
-        Objects.requireNonNull(jsonString);
+    public Json5Element parse(String json5String) {
+        Objects.requireNonNull(json5String);
 
-        StringReader reader = new StringReader(jsonString);
+        StringReader reader = new StringReader(json5String);
         Json5Element element = this.parse(reader);
         reader.close();
         return element;
@@ -138,7 +139,7 @@ public void serialize(Json5Element element, OutputStream out) throws IOException
      * @param element {@link Json5Element} to serialize
      * @param writer Can be any applicable {@link Writer}
      * @throws IOException If an I/O error occurs
-     * @see Json5Writer#write(Json5Element) 
+     * @see Json5Writer#write(Json5Element)
      */
     public void serialize(Json5Element element, Writer writer) throws IOException {
         Objects.requireNonNull(element);
@@ -153,7 +154,7 @@ public void serialize(Json5Element element, Writer writer) throws IOException {
      * @param element {@link Json5Element} to serialize
      * @return Json5 encoded {@link String}
      * @throws IOException If an I/O error occurs
-     * @see #serialize(Json5Element, Writer) 
+     * @see #serialize(Json5Element, Writer)
      */
     public String serialize(Json5Element element) throws IOException {
         Objects.requireNonNull(element);
@@ -163,4 +164,4 @@ public String serialize(Json5Element element) throws IOException {
         writer.close();
         return writer.toString();
     }
-}
\ No newline at end of file
+}

From 0516cf5341b19ea06dbb12d3a225a6e74042c6b8 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Tue, 16 Sep 2025 23:19:48 +0200
Subject: [PATCH 06/48] feat: add comment support and prepare primitive rework

---
 .../java/de/marhali/json5/Json5Element.java   | 349 ++++++++++++------
 1 file changed, 238 insertions(+), 111 deletions(-)

diff --git a/src/main/java/de/marhali/json5/Json5Element.java b/src/main/java/de/marhali/json5/Json5Element.java
index bd7167a..d778c77 100644
--- a/src/main/java/de/marhali/json5/Json5Element.java
+++ b/src/main/java/de/marhali/json5/Json5Element.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2008 Google Inc.
- * Copyright (C) 2022 Marcel Haßlinger
+ * Copyright (C) 2022 - 2025 Marcel Haßlinger
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 package de.marhali.json5;
 
+import de.marhali.json5.config.Json5Options;
 import de.marhali.json5.stream.Json5Writer;
 
 import java.io.IOException;
@@ -26,22 +27,62 @@
 import java.util.Objects;
 
 /**
- * A class representing an element of Json5. It could either be a {@link Json5Object}, a
- * {@link Json5Array}, a {@link Json5Primitive} or a {@link Json5Null}.
+ * A class representing an element of Json5. It could either be a {@link Json5Object}, a {@link
+ * Json5Array}, a {@link Json5Primitive} or a {@link Json5Null}.
+ *
+ * <p>This class provides multiple {@code getAs} methods which allow
+ *
+ * <ul>
+ *   <li>obtaining the represented primitive value, for example {@link #getAsString()}
+ *   <li>casting to the {@code Json5Element} subclasses in a convenient way, for example {@link
+ *       #getAsJson5Object()}
+ * </ul>
  *
- * @author Marcel Haßlinger
  * @author Inderjeet Singh
  * @author Joel Leitch
+ * @author Marcel Haßlinger
  */
 public abstract class Json5Element {
     /**
-     * @return A deep copy of this element. Immutable elements like primitives
-     * and nulls are not copied.
+     * Associated comment on this element. Can be <code>null</code> to omit.
+     * Supports multi-line comments by using the break-line control character <code>\n</code>.
+     */
+    protected String comment;
+
+    /**
+     * Provides a check for verifying if this element has an associated comment.
+     * @return true if this element has an associated comment, false otherwise.
+     */
+    public boolean hasComment() {
+        return this.comment != null;
+    }
+
+    /**
+     * Returns the associated comment on this element. Can be <code>null</code> if not set.
+     *
+     * @return optional comment string
+     */
+    public String getComment() {
+        return comment;
+    }
+
+    /**
+     * Updates the associated comment on this element.
+     * Supports multi-line comments with break-line control character.
+     *
+     * @param comment Comment to set. Can be <code>null</code> to omit.
+     */
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+    /**
+     * Returns a deep copy of this element.
      */
     public abstract Json5Element deepCopy();
 
     /**
-     * provides check for verifying if this element is an array or not.
+     * Provides a check for verifying if this element is a Json5 array or not.
      *
      * @return true if this element is of type {@link Json5Array}, false otherwise.
      */
@@ -50,7 +91,7 @@ public boolean isJson5Array() {
     }
 
     /**
-     * provides check for verifying if this element is a Json object or not.
+     * Provides a check for verifying if this element is a Json5 object or not.
      *
      * @return true if this element is of type {@link Json5Object}, false otherwise.
      */
@@ -59,7 +100,7 @@ public boolean isJson5Object() {
     }
 
     /**
-     * provides check for verifying if this element is a primitive or not.
+     * Provides a check for verifying if this element is a primitive or not.
      *
      * @return true if this element is of type {@link Json5Primitive}, false otherwise.
      */
@@ -68,7 +109,7 @@ public boolean isJson5Primitive() {
     }
 
     /**
-     * provides check for verifying if this element represents a null value or not.
+     * Provides a check for verifying if this element represents a null value or not.
      *
      * @return true if this element is of type {@link Json5Null}, false otherwise.
      */
@@ -77,226 +118,267 @@ public boolean isJson5Null() {
     }
 
     /**
-     * convenience method to get this element as a {@link Json5Object}. If the element is of some
-     * other type, a {@link IllegalStateException} will result. Hence it is best to use this method
+     * Convenience method to get this element as a {@link Json5Object}. If this element is of some
+     * other type, an {@link IllegalStateException} will result. Hence it is best to use this method
      * after ensuring that this element is of the desired type by calling {@link #isJson5Object()}
      * first.
      *
-     * @return get this element as a {@link Json5Object}.
-     * @throws IllegalStateException if the element is of another type.
+     * @return this element as a {@link Json5Object}.
+     * @throws IllegalStateException if this element is of another type.
      */
     public Json5Object getAsJson5Object() {
         if (isJson5Object()) {
             return (Json5Object) this;
         }
-        throw new IllegalStateException("Not a JSON Object: " + this);
+        throw new IllegalStateException("Not a Json5Object: " + this);
     }
 
     /**
-     * convenience method to get this element as a {@link Json5Array}. If the element is of some
-     * other type, a {@link IllegalStateException} will result. Hence it is best to use this method
-     * after ensuring that this element is of the desired type by calling {@link #isJson5Array()}
-     * first.
+     * Convenience method to get this element as a {@link Json5Array}. If this element is of some other
+     * type, an {@link IllegalStateException} will result. Hence it is best to use this method after
+     * ensuring that this element is of the desired type by calling {@link #isJson5Array()} first.
      *
-     * @return get this element as a {@link Json5Array}.
-     * @throws IllegalStateException if the element is of another type.
+     * @return this element as a {@link Json5Array}.
+     * @throws IllegalStateException if this element is of another type.
      */
     public Json5Array getAsJson5Array() {
         if (isJson5Array()) {
             return (Json5Array) this;
         }
-        throw new IllegalStateException("Not a JSON Array: " + this);
+        throw new IllegalStateException("Not a Json5Array: " + this);
     }
 
     /**
-     * convenience method to get this element as a {@link Json5Primitive}. If the element is of some
-     * other type, a {@link IllegalStateException} will result. Hence it is best to use this method
+     * Convenience method to get this element as a {@link Json5Primitive}. If this element is of some
+     * other type, an {@link IllegalStateException} will result. Hence it is best to use this method
      * after ensuring that this element is of the desired type by calling {@link #isJson5Primitive()}
      * first.
      *
-     * @return get this element as a {@link Json5Primitive}.
-     * @throws IllegalStateException if the element is of another type.
+     * @return this element as a {@link Json5Primitive}.
+     * @throws IllegalStateException if this element is of another type.
      */
     public Json5Primitive getAsJson5Primitive() {
         if (isJson5Primitive()) {
             return (Json5Primitive) this;
         }
-        throw new IllegalStateException("Not a JSON Primitive: " + this);
+        throw new IllegalStateException("Not a Json5Primitive: " + this);
     }
 
     /**
-     * convenience method to get this element as a {@link Json5Null}. If the element is of some
-     * other type, a {@link IllegalStateException} will result. Hence it is best to use this method
-     * after ensuring that this element is of the desired type by calling {@link #isJson5Null()}
-     * first.
+     * Convenience method to get this element as a {@link Json5Null}. If this element is of some other
+     * type, an {@link IllegalStateException} will result. Hence it is best to use this method after
+     * ensuring that this element is of the desired type by calling {@link #isJson5Null()} first.
      *
-     * @return get this element as a {@link Json5Null}.
-     * @throws IllegalStateException if the element is of another type.
+     * @return this element as a {@link Json5Null}.
+     * @throws IllegalStateException if this element is of another type.
      */
     public Json5Null getAsJson5Null() {
         if (isJson5Null()) {
             return (Json5Null) this;
         }
-        throw new IllegalStateException("Not a JSON Null: " + this);
+        throw new IllegalStateException("Not a Json5Null: " + this);
     }
 
     /**
-     * convenience method to get this element as a boolean value.
+     * Convenience method to get this element as a boolean value.
      *
-     * @return get this element as a primitive boolean value.
-     * @throws ClassCastException if the element is of not a {@link Json5Primitive} and is not a valid
-     * boolean value.
-     * @throws IllegalStateException if the element is of the type {@link Json5Array} but contains
-     * more than a single element.
+     * @return this element as a primitive boolean value.
+     * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
+     *     Json5Array}.
+     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
+     *     more than a single element.
      */
     public boolean getAsBoolean() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
     }
 
     /**
-     * convenience method to get this element as a {@link Number}.
+     * Convenience method to get this element as a {@link Number}.
      *
-     * @return get this element as a {@link Number}.
-     * @throws ClassCastException if the element is of not a {@link Json5Primitive} and is not a valid
-     * number.
-     * @throws IllegalStateException if the element is of the type {@link Json5Array} but contains
-     * more than a single element.
+     * @return this element as a {@link Number}.
+     * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
+     *     Json5Array}, or cannot be converted to a number.
+     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
+     *     more than a single element.
      */
     public Number getAsNumber() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
     }
 
     /**
-     * convenience method to get this element as a string value.
+     * Convenience method to get this element as a string value.
      *
-     * @return get this element as a string value.
-     * @throws ClassCastException if the element is of not a {@link Json5Primitive} and is not a valid
-     * string value.
-     * @throws IllegalStateException if the element is of the type {@link Json5Array} but contains
-     * more than a single element.
+     * @return this element as a string value.
+     * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
+     *     Json5Array}.
+     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
+     *     more than a single element.
      */
     public String getAsString() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
     }
 
     /**
-     * convenience method to get this element as a primitive double value.
+     * Convenience method to get this element as a primitive double value.
      *
-     * @return get this element as a primitive double value.
-     * @throws ClassCastException if the element is of not a {@link Json5Primitive} and is not a valid
-     * double value.
-     * @throws IllegalStateException if the element is of the type {@link Json5Array} but contains
-     * more than a single element.
+     * @return this element as a primitive double value.
+     * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
+     *     Json5Array}.
+     * @throws NumberFormatException if the value contained is not a valid double.
+     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
+     *     more than a single element.
      */
     public double getAsDouble() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
     }
 
     /**
-     * convenience method to get this element as a primitive float value.
+     * Convenience method to get this element as a primitive float value.
      *
-     * @return get this element as a primitive float value.
-     * @throws ClassCastException if the element is of not a {@link Json5Primitive} and is not a valid
-     * float value.
-     * @throws IllegalStateException if the element is of the type {@link Json5Array} but contains
-     * more than a single element.
+     * @return this element as a primitive float value.
+     * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
+     *     Json5Array}.
+     * @throws NumberFormatException if the value contained is not a valid float.
+     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
+     *     more than a single element.
      */
     public float getAsFloat() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
     }
 
     /**
-     * convenience method to get this element as a primitive long value.
+     * Convenience method to get this element as a primitive long value.
      *
-     * @return get this element as a primitive long value.
-     * @throws ClassCastException if the element is of not a {@link Json5Primitive} and is not a valid
-     * long value.
-     * @throws IllegalStateException if the element is of the type {@link Json5Array} but contains
-     * more than a single element.
+     * @return this element as a primitive long value.
+     * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
+     *     Json5Array}.
+     * @throws NumberFormatException if the value contained is not a valid long.
+     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
+     *     more than a single element.
      */
     public long getAsLong() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
     }
 
     /**
-     * convenience method to get this element as a primitive integer value.
+     * Convenience method to get this element as a primitive integer value.
      *
-     * @return get this element as a primitive integer value.
-     * @throws ClassCastException if the element is of not a {@link Json5Primitive} and is not a valid
-     * integer value.
-     * @throws IllegalStateException if the element is of the type {@link Json5Array} but contains
-     * more than a single element.
+     * @return this element as a primitive integer value.
+     * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
+     *     Json5Array}.
+     * @throws NumberFormatException if the value contained is not a valid integer.
+     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
+     *     more than a single element.
      */
     public int getAsInt() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
     }
 
     /**
-     * convenience method to get this element as a primitive byte value.
+     * Convenience method to get this element as a primitive byte value.
      *
-     * @return get this element as a primitive byte value.
-     * @throws ClassCastException if the element is of not a {@link Json5Primitive} and is not a valid
-     * byte value.
-     * @throws IllegalStateException if the element is of the type {@link Json5Array} but contains
-     * more than a single element.
+     * @return this element as a primitive byte value.
+     * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
+     *     Json5Array}.
+     * @throws NumberFormatException if the value contained is not a valid byte.
+     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
+     *     more than a single element.
      */
     public byte getAsByte() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
     }
 
     /**
-     * convenience method to get this element as a {@link BigDecimal}.
+     * Convenience method to get this element as a {@link BigDecimal}.
      *
-     * @return get this element as a {@link BigDecimal}.
-     * @throws ClassCastException if the element is of not a {@link Json5Primitive}.
-     * * @throws NumberFormatException if the element is not a valid {@link BigDecimal}.
-     * @throws IllegalStateException if the element is of the type {@link Json5Array} but contains
-     * more than a single element.
+     * @return this element as a {@link BigDecimal}.
+     * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
+     *     Json5Array}.
+     * @throws NumberFormatException if this element is not a valid {@link BigDecimal}.
+     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
+     *     more than a single element.
      */
     public BigDecimal getAsBigDecimal() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
     }
 
     /**
-     * convenience method to get this element as a {@link BigInteger}.
+     * Convenience method to get this element as a {@link BigInteger}.
      *
-     * @return get this element as a {@link BigInteger}.
-     * @throws ClassCastException if the element is of not a {@link Json5Primitive}.
-     * @throws NumberFormatException if the element is not a valid {@link BigInteger}.
-     * @throws IllegalStateException if the element is of the type {@link Json5Array} but contains
-     * more than a single element.
+     * @return this element as a {@link BigInteger}.
+     * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
+     *     Json5Array}.
+     * @throws NumberFormatException if this element is not a valid {@link BigInteger}.
+     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
+     *     more than a single element.
      */
     public BigInteger getAsBigInteger() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
     }
 
     /**
-     * convenience method to get this element as a primitive short value.
+     * Convenience method to get this element as a primitive short value.
      *
-     * @return get this element as a primitive short value.
-     * @throws ClassCastException if the element is of not a {@link Json5Primitive} and is not a valid
-     * short value.
-     * @throws IllegalStateException if the element is of the type {@link Json5Array} but contains
-     * more than a single element.
+     * @return this element as a primitive short value.
+     * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
+     *     Json5Array}.
+     * @throws NumberFormatException if the value contained is not a valid short.
+     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
+     *     more than a single element.
      */
     public short getAsShort() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
     }
 
     /**
-     * Returns a simple String representation of this element.
-     * For pretty-printing use {@link Json5Writer} with custom configuration options.
-     * @see #toString(Json5Options)
+     * Convenience method to get this element as a primitive binary number (radix base {@code 2}) value.
+     * <p>
+     * <i>This is an extension that is not compliant to the official Json5 spec.</i>
+     * @return this element as a primitive binary number value string.
+     * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
+     *     Json5Array}.
+     * @throws NumberFormatException if the value contained is not a valid short.
+     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
+     *     more than a single element.
      */
-    @Override
-    public String toString() {
-        return toString(Json5Options.DEFAULT);
+    public String getAsBinaryString() {
+        throw new UnsupportedOperationException(getClass().getSimpleName());
+
     }
 
     /**
-     * Returns the String representation of this element.
-     * @param options Configured serialization behaviour
-     * @return Stringified representation of this element
+     * Convenience method to get this element as a primitive octal number (radix base {@code 8}) value.
+     * <p>
+     * <i>This is an extension that is not compliant to the official Json5 spec.</i>
+     * @return this element as a primitive octal number value string.
+     * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
+     *     Json5Array}.
+     * @throws NumberFormatException if the value contained is not a valid short.
+     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
+     *     more than a single element.
+     */
+    public String getAsOctalString() {
+        throw new UnsupportedOperationException(getClass().getSimpleName());
+
+    }
+
+    /**
+     * Convenience method to get this element as a primitive hex number (radix base {@code 16}) value.
+     * @return this element as a primitive hex number value string.
+     * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
+     *     Json5Array}.
+     * @throws NumberFormatException if the value contained is not a valid short.
+     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
+     *     more than a single element.
+     */
+    public String getAsHexString() {
+        throw new UnsupportedOperationException(getClass().getSimpleName());
+    }
+
+    /**
+     * Converts this element to a Json5 string using the provided configuration options for formatting.
+     * @param options Configuration options.
+     * @return Json5 string representation of this element.
      */
     public String toString(Json5Options options) {
         Objects.requireNonNull(options);
@@ -306,9 +388,54 @@ public String toString(Json5Options options) {
             Json5Writer json5Writer = new Json5Writer(options, stringWriter);
             json5Writer.write(this);
             return stringWriter.toString();
-
         } catch (IOException e) {
             throw new AssertionError(e);
         }
     }
-}
\ No newline at end of file
+
+    /**
+     * Converts this element to a Json5 string.
+     *
+     * <p>For example:
+     *
+     * <pre>
+     * Json5Object object = new Json5Object();
+     * object.add("a", new Json5Null());
+     * Json5Array array = new Json5Array();
+     * array.add(1);
+     * object.add("b", array);
+     *
+     * String json = object.toString();
+     * // json: {"a":null,"b":[1]}
+     * </pre>
+     *
+     * <p>To get the contained String value (without enclosing {@code "} and without escaping), use
+     * {@link #getAsString()} instead:
+     *
+     * <pre>
+     * Json5Primitive Json5Primitive = new Json5Primitive("with \" quote");
+     * String json = Json5Primitive.toString();
+     * // json: "with \" quote"
+     * String value = Json5Primitive.getAsString();
+     * // value: with " quote
+     * </pre>
+     *
+     * @see #toString(Json5Options)
+     */
+    @Override
+    public String toString() {
+        return toString(Json5Options.DEFAULT);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) return false;
+        Json5Element that = (Json5Element) o;
+        return Objects.equals(comment, that.comment);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(comment);
+    }
+}

From d758f719af03cd694b925dd9f85f14344def14fe Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Tue, 16 Sep 2025 23:20:51 +0200
Subject: [PATCH 07/48] feat(breaking): json5 null is no longer a singleton

---
 src/main/java/de/marhali/json5/Json5Null.java | 39 ++++---------------
 1 file changed, 8 insertions(+), 31 deletions(-)

diff --git a/src/main/java/de/marhali/json5/Json5Null.java b/src/main/java/de/marhali/json5/Json5Null.java
index 1e1f2bc..705bf9a 100644
--- a/src/main/java/de/marhali/json5/Json5Null.java
+++ b/src/main/java/de/marhali/json5/Json5Null.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2008 Google Inc.
+ * Copyright (C) 2025 Marcel Haßlinger
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,39 +22,15 @@
  *
  * @author Inderjeet Singh
  * @author Joel Leitch
+ * @author Marcel Haßlinger
  */
 public final class Json5Null extends Json5Element {
-    /**
-     * Singleton for json {@code null} literal
-     */
-    public static final Json5Null INSTANCE = new Json5Null();
+    public Json5Null() {}
 
-    /**
-     * Constructor for internal use only. Use {@link #INSTANCE} instead.
-     */
-    private Json5Null() {}
-
-    /**
-     * Returns the same instance since it is an immutable value
-     */
-    @Override
-    public Json5Null deepCopy() {
-        return INSTANCE;
-    }
-
-    /**
-     * All instances of JsonNull have the same hash code since they are indistinguishable
-     */
-    @Override
-    public int hashCode() {
-        return Json5Null.class.hashCode();
-    }
-
-    /**
-     * All instances of JsonNull are the same
-     */
     @Override
-    public boolean equals(Object other) {
-        return this == other || other instanceof Json5Null;
+    public Json5Element deepCopy() {
+        Json5Null copy = new Json5Null();
+        copy.setComment(comment);
+        return copy;
     }
-}
\ No newline at end of file
+}

From 7656809524408c903d2c97afbaea655aa47123ea Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Tue, 16 Sep 2025 23:22:39 +0200
Subject: [PATCH 08/48] feat(breaking): let json5 primitive hold boolean,
 number (including hex) and strings

---
 .../de/marhali/json5/Json5Hexadecimal.java    |  93 -----
 .../java/de/marhali/json5/Json5Number.java    |  28 --
 .../java/de/marhali/json5/Json5Primitive.java | 364 ++++++++++++------
 .../java/de/marhali/json5/Json5String.java    |  28 --
 4 files changed, 242 insertions(+), 271 deletions(-)
 delete mode 100644 src/main/java/de/marhali/json5/Json5Hexadecimal.java
 delete mode 100644 src/main/java/de/marhali/json5/Json5Number.java
 delete mode 100644 src/main/java/de/marhali/json5/Json5String.java

diff --git a/src/main/java/de/marhali/json5/Json5Hexadecimal.java b/src/main/java/de/marhali/json5/Json5Hexadecimal.java
deleted file mode 100644
index 391a905..0000000
--- a/src/main/java/de/marhali/json5/Json5Hexadecimal.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2022 Marcel Haßlinger
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package de.marhali.json5;
-
-import java.math.BigInteger;
-import java.util.Objects;
-
-/**
- * A class representing a hexadecimal json5 value. Hex values will be stored as {@link BigInteger} internally.
- *
- * @author Marcel Haßlinger
- */
-public final class Json5Hexadecimal extends Json5Primitive {
-
-    /**
-     * Converts the provided hex string into it's number representation.
-     * Allowed is the character representation of a hex key. Format must be: 0x..., +0x... or -0x...
-     *
-     * @param hex the hexadecimal value including prefix
-     * @return Number representation of hexadecimal string
-     */
-    public static BigInteger parseHexString(String hex) {
-        Objects.requireNonNull(hex);
-
-        switch (hex.charAt(0)) {
-            case '+': // +0x...
-                return new BigInteger(hex.substring(3), 16);
-            case '-': // -0x...
-                return new BigInteger(hex.substring(3), 16).negate();
-            default: // 0x...
-                return new BigInteger(hex.substring(2), 16);
-        }
-    }
-
-    /**
-     * Converts the provided number into it's hex literal character representation.
-     *
-     * @param bigInteger     the number value
-     * @param prefixPositive Prefix positive values with {@code +0x...} if true otherwise {@code 0x...}.
-     * @return Hex character string including prefix
-     */
-    public static String serializeHexString(BigInteger bigInteger, boolean prefixPositive) {
-        Objects.requireNonNull(bigInteger);
-
-        if(bigInteger.signum() >= 0) {
-            return (prefixPositive ? "+0x" : "0x") + bigInteger.toString(16);
-        } else {
-            return "-0x" + bigInteger.abs().toString(16);
-        }
-    }
-
-    /**
-     * Creates a primitive containing a hex value.
-     *
-     * @param hex the value to create the primitive with.
-     */
-    public Json5Hexadecimal(BigInteger hex) {
-        super(hex);
-    }
-
-    /**
-     * Creates a primitive containing a hex value. For String to Number conversion see {@link #parseHexString(String)}
-     *
-     * @param hex the value to create the primitive with.
-     */
-    public Json5Hexadecimal(String hex) {
-        super(parseHexString(hex));
-    }
-
-    /**
-     * Constructs the string representation of the stored hex value.
-     *
-     * @return Hex value as character literal.
-     */
-    @Override
-    public String getAsString() {
-        return serializeHexString(super.getAsBigInteger(), false);
-    }
-}
diff --git a/src/main/java/de/marhali/json5/Json5Number.java b/src/main/java/de/marhali/json5/Json5Number.java
deleted file mode 100644
index a988d6b..0000000
--- a/src/main/java/de/marhali/json5/Json5Number.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2022 Marcel Haßlinger
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package de.marhali.json5;
-
-/**
- * A class representing a json5 number value.
- *
- * @author Marcel Haßlinger
- */
-public final class Json5Number extends Json5Primitive {
-    public Json5Number(Number number) {
-        super(number);
-    }
-}
diff --git a/src/main/java/de/marhali/json5/Json5Primitive.java b/src/main/java/de/marhali/json5/Json5Primitive.java
index f442a53..7269df8 100644
--- a/src/main/java/de/marhali/json5/Json5Primitive.java
+++ b/src/main/java/de/marhali/json5/Json5Primitive.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2008 Google Inc.
- * Copyright (C) 2022 Marcel Haßlinger
+ * Copyright (C) 2022 - 2025 Marcel Haßlinger
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,72 +18,151 @@
 package de.marhali.json5;
 
 import de.marhali.json5.internal.LazilyParsedNumber;
+import de.marhali.json5.internal.NumberLimits;
+import de.marhali.json5.internal.RadixNumber;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Objects;
 
 /**
- * A class representing a Json primitive value. A primitive value
- * is either a String, a Hexadecimal, a Java primitive, or a Java primitive
- * wrapper type.
+ * A class representing a Json5 primitive value. A primitive value is either a String, a Java
+ * primitive, or a Java primitive wrapper type.
+ *
+ * <p>See the {@link Json5Element} documentation for details on how to convert {@code Json5Primitive}
+ * and generally any {@code Json5Element} from and to Json5.
  *
- * @author Marcel Haßlinger
  * @author Inderjeet Singh
  * @author Joel Leitch
+ * @author Marcel Haßlinger
  */
-public abstract class Json5Primitive extends Json5Element {
+public final class Json5Primitive extends Json5Element {
+
+    private final Object value;
 
     /**
-     * Quick creator for a primitive with boolean value.
-     * @param value Boolean value to apply.
-     * @return Corresponding primitive with provided value.
+     * Create a primitive containing a boolean value.
+     *
+     * @param bool the value to create the primitive with.
      */
-    public static Json5Primitive of(Boolean value) {
-        return new Json5Boolean(value);
+    public static Json5Primitive fromBoolean(Boolean bool) {
+        return new Json5Primitive(Objects.requireNonNull(bool));
     }
 
     /**
-     * Quick creator for a primitive with number value.
-     * @param value Number value to apply.
-     * @return Corresponding primitive with provided value.
+     * Creates a primitive containing a {@link Number} with specified radix base.
+     * If a radix base of {@code 2}, {@code 8} or {@code 16} is set,
+     * this method will ensure that the underlying number implementation is a {@link BigInteger}.
+     * @param number The number
+     * @param radix Radix base
      */
-    public static Json5Primitive of(Number value) {
-        return new Json5Number(value);
+    public static Json5Primitive fromNumber(Number number, int radix) {
+        Objects.requireNonNull(number);
+
+        if ((radix == 2 || radix == 8 || radix == 16) && !(number instanceof BigInteger)) {
+            // Ensure that every binary, octal or hex number is stored as a big integer
+            return new Json5Primitive(new RadixNumber(BigInteger.valueOf(number.longValue()), radix));
+        }
+
+        return new Json5Primitive(new RadixNumber(number, radix));
     }
 
     /**
-     * Quick creator for a primitive with string value.
-     * Set hexadecimal to true to receive a {@link Json5Hexadecimal}.
-     * @param value String value to apply.
-     * @param hexadecimal Is the provided value a hex string literal?
-     * @return Corresponding primitive with provided value.
+     * Create a primitive containing a decimal {@link Number} (radix base 10).
+     *
+     * @param number the value to create the primitive with.
      */
-    public static Json5Primitive of(String value, boolean hexadecimal) {
-        return hexadecimal ? new Json5Hexadecimal(value) : new Json5String(value);
+    public static Json5Primitive fromNumber(Number number) {
+        return Json5Primitive.fromNumber(Objects.requireNonNull(number), 10);
+    }
+
+    public static Json5Primitive fromBinaryString(String binaryString) {
+        Objects.requireNonNull(binaryString);
+
+        BigInteger hexInteger;
+
+        switch (binaryString.charAt(0)) {
+            case '+': // +0b...
+                hexInteger = new BigInteger(binaryString.substring(3), 2);
+            case '-': // -0b...
+                hexInteger = new BigInteger(binaryString.substring(3), 2).negate();
+            default: // 0b...
+                hexInteger = new BigInteger(binaryString.substring(2), 2);
+        }
+
+        return new Json5Primitive(new RadixNumber(hexInteger, 2));
+    }
+
+    public static Json5Primitive fromOctalString(String octalString) {
+        Objects.requireNonNull(octalString);
+
+        BigInteger hexInteger;
+
+        switch (octalString.charAt(0)) {
+            case '+': // +0b...
+                hexInteger = new BigInteger(octalString.substring(3), 8);
+            case '-': // -0b...
+                hexInteger = new BigInteger(octalString.substring(3), 8).negate();
+            default: // 0b...
+                hexInteger = new BigInteger(octalString.substring(2), 8);
+        }
+
+        return new Json5Primitive(new RadixNumber(hexInteger, 8));
+    }
+
+    public static Json5Primitive fromHexString(String hexString) {
+        Objects.requireNonNull(hexString);
+
+        BigInteger hexInteger;
+
+        switch (hexString.charAt(0)) {
+            case '+': // +0x...
+                hexInteger = new BigInteger(hexString.substring(3), 16);
+            case '-': // -0x...
+                hexInteger = new BigInteger(hexString.substring(3), 16).negate();
+            default: // 0x...
+                hexInteger = new BigInteger(hexString.substring(2), 16);
+        }
+
+        return new Json5Primitive(new RadixNumber(hexInteger, 16));
     }
 
     /**
-     * Quick creator for a primitive with string value.
-     * @param value String value to apply.
-     * @return Corresponding primitive with provided value.
+     * Create a primitive containing a String value.
+     *
+     * @param string the value to create the primitive with.
      */
-    public static Json5Primitive of(String value) {
-        return new Json5String(value);
+    public static Json5Primitive fromString(String string) {
+        return new Json5Primitive(Objects.requireNonNull(string));
     }
 
-    protected final Object value;
-
-    public Json5Primitive(Object value) {
-        this.value = Objects.requireNonNull(value);
+    /**
+     * Create a primitive containing a character. The character is turned into a one character String
+     * since Json5 only supports String.
+     *
+     * @param c the value to create the primitive with.
+     */
+    public static Json5Primitive fromCharacter(Character c) {
+        // convert characters to strings since in Json5, characters are represented as a single
+        // character string
+        return new Json5Primitive(Objects.requireNonNull(c).toString());
     }
 
+    /**
+     * Internal constructor with primitive value
+     * @param value Internal value
+     */
+    private Json5Primitive(Object value) {
+        this.value = value;
+    }
     /**
      * Returns the same value as primitives are immutable.
      */
     @Override
-    public Json5Element deepCopy() {
-        return this;
+    public Json5Primitive deepCopy() {
+        Json5Primitive copy = new Json5Primitive(value);
+        copy.setComment(comment);
+        return copy;
     }
 
     /**
@@ -96,14 +175,15 @@ public boolean isBoolean() {
     }
 
     /**
-     * convenience method to get this element as a boolean value.
-     *
-     * @return get this element as a primitive boolean value.
+     * Convenience method to get this element as a boolean value. If this primitive {@linkplain
+     * #isBoolean() is not a boolean}, the string value is parsed using {@link
+     * Boolean#parseBoolean(String)}. This means {@code "true"} (ignoring case) is considered {@code
+     * true} and any other value is considered {@code false}.
      */
     @Override
     public boolean getAsBoolean() {
         if (isBoolean()) {
-            return ((Boolean) value).booleanValue();
+            return (Boolean) value;
         }
         // Check to see if the value as a String is "true" in any case.
         return Boolean.parseBoolean(getAsString());
@@ -115,18 +195,81 @@ public boolean getAsBoolean() {
      * @return true if this primitive contains a Number, false otherwise.
      */
     public boolean isNumber() {
-        return value instanceof Number;
+        return value instanceof RadixNumber;
+    }
+
+    private RadixNumber getAsRadixNumber() {
+        if (isNumber()) {
+            return (RadixNumber) value;
+        }
+        throw new UnsupportedOperationException("Primitive is not a number");
+
+    }
+
+    public int getNumberRadix() {
+       return getAsRadixNumber().getRadix();
+    }
+
+    public boolean isBinaryNumber() {
+        return getNumberRadix() == 2;
+    }
+
+    public boolean isOctalNumber() {
+        return getNumberRadix() == 8;
+    }
+
+    public boolean isHexNumber() {
+        return getNumberRadix() == 16;
     }
 
     /**
-     * convenience method to get this element as a Number.
+     * Convenience method to get this element as a {@link Number}. If this primitive {@linkplain
+     * #isString() is a string}, a lazily parsed {@code Number} is constructed which parses the string
+     * when any of its methods are called (which can lead to a {@link NumberFormatException}).
      *
-     * @return get this element as a Number.
-     * @throws NumberFormatException if the value contained is not a valid Number.
+     * @throws UnsupportedOperationException if this primitive is neither a number nor a string.
      */
     @Override
     public Number getAsNumber() {
-        return value instanceof String ? new LazilyParsedNumber((String) value) : (Number) value;
+        if (isNumber()) {
+            return getAsRadixNumber().getNumber();
+        } else if (isString()) {
+            return new LazilyParsedNumber((String) value);
+        }
+        throw new UnsupportedOperationException("Primitive is neither a number nor a string");
+    }
+
+    @Override
+    public String getAsBinaryString() {
+        BigInteger bigInteger = getAsBigInteger();
+
+        if (bigInteger.signum() >= 0) {
+            return "0b" + bigInteger.toString(2);
+        } else {
+            return "-0b" + bigInteger.abs().toString(2);
+        }
+    }
+
+    @Override
+    public String getAsOctalString() {
+        BigInteger bigInteger = getAsBigInteger();
+
+        if (bigInteger.signum() >= 0) {
+            return "0o" + bigInteger.toString(8);
+        } else {
+            return "-0o" + bigInteger.abs().toString(8);
+        }
+    }
+
+    @Override
+    public String getAsHexString() {
+        BigInteger bigInteger = getAsBigInteger();
+
+        if (bigInteger.signum() >= 0) {
+            return "0x" + bigInteger.toString(16);
+        } else {
+            return "-0x" + bigInteger.abs().toString(16);
+        }
     }
 
     /**
@@ -138,27 +281,27 @@ public boolean isString() {
         return value instanceof String;
     }
 
-    /**
-     * convenience method to get this element as a String.
-     *
-     * @return get this element as a String.
-     */
+    // Don't add Javadoc, inherit it from super implementation; no exceptions are thrown here
     @Override
     public String getAsString() {
-        if (isNumber()) {
+        if (value instanceof String) {
+            return (String) value;
+        } else if (isBinaryNumber()) {
+            return getAsBinaryString();
+        } else if (isOctalNumber()) {
+            return getAsOctalString();
+        } else if (isHexNumber()) {
+            return getAsHexString();
+        } else if (isNumber()) {
             return getAsNumber().toString();
         } else if (isBoolean()) {
             return ((Boolean) value).toString();
-        } else {
-            return (String) value;
         }
+        throw new AssertionError("Unexpected value type: " + value.getClass());
     }
 
     /**
-     * convenience method to get this element as a primitive double.
-     *
-     * @return get this element as a primitive double.
-     * @throws NumberFormatException if the value contained is not a valid double.
+     * @throws NumberFormatException {@inheritDoc}
      */
     @Override
     public double getAsDouble() {
@@ -166,33 +309,39 @@ public double getAsDouble() {
     }
 
     /**
-     * convenience method to get this element as a {@link BigDecimal}.
-     *
-     * @return get this element as a {@link BigDecimal}.
-     * @throws NumberFormatException if the value contained is not a valid {@link BigDecimal}.
+     * @throws NumberFormatException {@inheritDoc}
      */
     @Override
     public BigDecimal getAsBigDecimal() {
-        return value instanceof BigDecimal ? (BigDecimal) value : new BigDecimal(value.toString());
+        if (isNumber()) {
+            var number = getAsRadixNumber().getNumber();
+            if (number instanceof BigDecimal) {
+                return (BigDecimal) number;
+            }
+        }
+
+        return NumberLimits.parseBigDecimal(getAsString());
     }
 
     /**
-     * convenience method to get this element as a {@link BigInteger}.
-     *
-     * @return get this element as a {@link BigInteger}.
-     * @throws NumberFormatException if the value contained is not a valid {@link BigInteger}.
+     * @throws NumberFormatException {@inheritDoc}
      */
     @Override
     public BigInteger getAsBigInteger() {
-        return value instanceof BigInteger ?
-                (BigInteger) value : new BigInteger(value.toString());
+        if (isNumber()) {
+            var number = getAsRadixNumber().getNumber();
+            if (number instanceof BigInteger) {
+                if (isIntegral(this)) {
+                    return BigInteger.valueOf(number.longValue());
+                }
+            }
+        }
+
+        return NumberLimits.parseBigInteger(getAsString());
     }
 
     /**
-     * convenience method to get this element as a float.
-     *
-     * @return get this element as a float.
-     * @throws NumberFormatException if the value contained is not a valid float.
+     * @throws NumberFormatException {@inheritDoc}
      */
     @Override
     public float getAsFloat() {
@@ -200,10 +349,10 @@ public float getAsFloat() {
     }
 
     /**
-     * convenience method to get this element as a primitive long.
+     * Convenience method to get this element as a primitive long.
      *
-     * @return get this element as a primitive long.
-     * @throws NumberFormatException if the value contained is not a valid long.
+     * @return this element as a primitive long.
+     * @throws NumberFormatException {@inheritDoc}
      */
     @Override
     public long getAsLong() {
@@ -211,10 +360,7 @@ public long getAsLong() {
     }
 
     /**
-     * convenience method to get this element as a primitive short.
-     *
-     * @return get this element as a primitive short.
-     * @throws NumberFormatException if the value contained is not a valid short value.
+     * @throws NumberFormatException {@inheritDoc}
      */
     @Override
     public short getAsShort() {
@@ -222,16 +368,16 @@ public short getAsShort() {
     }
 
     /**
-     * convenience method to get this element as a primitive integer.
-     *
-     * @return get this element as a primitive integer.
-     * @throws NumberFormatException if the value contained is not a valid integer.
+     * @throws NumberFormatException {@inheritDoc}
      */
     @Override
     public int getAsInt() {
         return isNumber() ? getAsNumber().intValue() : Integer.parseInt(getAsString());
     }
 
+    /**
+     * @throws NumberFormatException {@inheritDoc}
+     */
     @Override
     public byte getAsByte() {
         return isNumber() ? getAsNumber().byteValue() : Byte.parseByte(getAsString());
@@ -239,55 +385,29 @@ public byte getAsByte() {
 
     @Override
     public int hashCode() {
-        if (value == null) {
-            return 31;
-        }
-        // Using recommended hashing algorithm from Effective Java for longs and doubles
-        if (isIntegral(this)) {
-            long value = getAsNumber().longValue();
-            return (int) (value ^ (value >>> 32));
-        }
-        if (value instanceof Number) {
-            long value = Double.doubleToLongBits(getAsNumber().doubleValue());
-            return (int) (value ^ (value >>> 32));
-        }
-        return value.hashCode();
+        return Objects.hash(super.hashCode(), value);
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        Json5Primitive other = (Json5Primitive)obj;
-        if (value == null) {
-            return other.value == null;
-        }
-        if (isIntegral(this) && isIntegral(other)) {
-            return getAsNumber().longValue() == other.getAsNumber().longValue();
-        }
-        if (value instanceof Number && other.value instanceof Number) {
-            double a = getAsNumber().doubleValue();
-            // Java standard types other than double return true for two NaN. So, need
-            // special handling for double.
-            double b = other.getAsNumber().doubleValue();
-            return a == b || (Double.isNaN(a) && Double.isNaN(b));
-        }
-        return value.equals(other.value);
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) return false;
+        if (!super.equals(o)) return false;
+        Json5Primitive that = (Json5Primitive) o;
+        return Objects.equals(value, that.value);
     }
 
     /**
-     * Returns true if the specified number is an integral type
-     * (Long, Integer, Short, Byte, BigInteger)
+     * Returns true if the specified number is an integral type (Long, Integer, Short, Byte,
+     * BigInteger)
      */
     private static boolean isIntegral(Json5Primitive primitive) {
-        if (primitive.value instanceof Number) {
-            Number number = (Number) primitive.value;
-            return number instanceof BigInteger || number instanceof Long || number instanceof Integer
-                    || number instanceof Short || number instanceof Byte;
+        if (primitive.value instanceof RadixNumber) {
+            Number number = ((RadixNumber) primitive.value).getNumber();
+            return number instanceof BigInteger
+                || number instanceof Long
+                || number instanceof Integer
+                || number instanceof Short
+                || number instanceof Byte;
         }
         return false;
     }
diff --git a/src/main/java/de/marhali/json5/Json5String.java b/src/main/java/de/marhali/json5/Json5String.java
deleted file mode 100644
index d774bd3..0000000
--- a/src/main/java/de/marhali/json5/Json5String.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2022 Marcel Haßlinger
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package de.marhali.json5;
-
-/**
- * A class representing a json5 string value.
- *
- * @author Marcel Haßlinger
- */
-public final class Json5String extends Json5Primitive {
-    public Json5String(String string) {
-        super(string);
-    }
-}

From 39dc615111448a288dc01938b4221d49cc838770 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Tue, 16 Sep 2025 23:25:52 +0200
Subject: [PATCH 09/48] feat(breaking): rework lexer and parser and apply
 latest updates from SyntaxError404

---
 .../de/marhali/json5/stream/Json5Lexer.java   | 685 +++++++++++++++---
 .../de/marhali/json5/stream/Json5Parser.java  | 114 ++-
 2 files changed, 652 insertions(+), 147 deletions(-)

diff --git a/src/main/java/de/marhali/json5/stream/Json5Lexer.java b/src/main/java/de/marhali/json5/stream/Json5Lexer.java
index 98da822..bf760b4 100644
--- a/src/main/java/de/marhali/json5/stream/Json5Lexer.java
+++ b/src/main/java/de/marhali/json5/stream/Json5Lexer.java
@@ -2,7 +2,7 @@
  * MIT License
  *
  * Copyright (C) 2021 SyntaxError404
- * Copyright (C) 2022 Marcel Haßlinger
+ * Copyright (C) 2022 - 2025 Marcel Haßlinger
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,45 +26,35 @@
 package de.marhali.json5.stream;
 
 import de.marhali.json5.*;
+import de.marhali.json5.config.DigitSeparatorStrategy;
+import de.marhali.json5.config.Json5Options;
 import de.marhali.json5.exception.Json5Exception;
+import de.marhali.json5.internal.RadixNumber;
 
 import java.io.BufferedReader;
 import java.io.Reader;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Objects;
-import java.util.regex.Pattern;
 
 /**
  * This is a lexer to convert the provided data into tokens according to the json5 specification.
  * The resulting tokens can then be used in an appropriate parser to construct
  * {@link Json5Object}'s and {@link Json5Array}'s.
  *
- * @author Marcel Haßlinger
  * @author SyntaxError404
+ * @author Marcel Haßlinger
  * @see <a href="https://spec.json5.org/">Json5 Standard</a>.
  */
 public class Json5Lexer {
 
-    private static final Pattern PATTERN_BOOLEAN = Pattern.compile(
-            "true|false"
-    );
-
-    private static final Pattern PATTERN_NUMBER_FLOAT = Pattern.compile(
-            "[+-]?((0|[1-9]\\d*)(\\.\\d*)?|\\.\\d+)([eE][+-]?\\d+)?"
-    );
-    private static final Pattern PATTERN_NUMBER_INTEGER = Pattern.compile(
-            "[+-]?(0|[1-9]\\d*)"
-    );
-    private static final Pattern PATTERN_NUMBER_HEX = Pattern.compile(
-            "[+-]?0[xX][0-9a-fA-F]+"
-    );
-    private static final Pattern PATTERN_NUMBER_SPECIAL = Pattern.compile(
-            "[+-]?(Infinity|NaN)"
-    );
-
     private final Reader reader;
-    private final Json5Options options;
+    protected final Json5Options options;
+
+    /**
+     * whether we're currently parsing the root object/array
+     */
+    protected boolean root;
 
     /**
      * whether the end of the file has been reached
@@ -98,6 +88,11 @@ public class Json5Lexer {
      */
     private char current;
 
+    /**
+     * Current comment. Can be <code>null</code>.
+     */
+    private StringBuilder comment;
+
     /**
      * Constructs a new lexer from a specific {@link Reader}.
      * <p><b>Note:</b> The reader must be closed after operation ({@link Reader#close()})!</p>
@@ -117,6 +112,22 @@ public Json5Lexer(Reader reader, Json5Options options) {
 
         previous = 0;
         current = 0;
+        comment = null;
+    }
+
+    /**
+     * Returns the last comment that was read and clears it.
+     *
+     * @return The captured comment content, or <code>null</code> if no comment was found.
+     */
+    public String consumeComment() {
+        if (comment == null) {
+            return null;
+        }
+
+        String result = comment.toString().strip();
+        comment = null;
+        return result;
     }
 
     private boolean more() {
@@ -226,22 +237,42 @@ private boolean isDecimalDigit(char c) {
     }
 
     private void nextMultiLineComment() {
+        if (comment == null) {
+            comment = new StringBuilder();
+        } else if (comment.length() != 0) {
+            comment.append('\n');
+        }
+
         while (true) {
             char n = next();
 
+            if (n == 0) {
+                throw syntaxError("Unterminated multi-line comment");
+            }
+
             if (n == '*' && peek() == '/') {
                 next();
                 return;
             }
+
+            comment.append(n);
         }
     }
 
     private void nextSingleLineComment() {
+        if (comment == null) {
+            comment = new StringBuilder();
+        } else if (comment.length() != 0) {
+            comment.append('\n');
+        }
+
         while (true) {
             char n = next();
 
             if (isLineTerminator(n) || n == 0)
                 return;
+
+            comment.append(n);
         }
     }
 
@@ -253,12 +284,9 @@ private void nextSingleLineComment() {
      */
     public char nextClean() {
         while (true) {
-            if (!more()) {
-                if(index == -1) { // Empty stream
-                    return 0;
-                }
-                throw syntaxError("Unexpected end of data");
-            }
+            if (!more())
+                // TODO: check if empty stream, like index === -1?
+                return 0;
 
             char n = next();
 
@@ -281,11 +309,11 @@ private String nextCleanTo(String delimiters) {
         StringBuilder result = new StringBuilder();
 
         while (true) {
-            if (!more())
-                throw syntaxError("Unexpected end of data");
-
             char n = nextClean();
 
+            if (n == 0)
+                return null;
+
             if (delimiters.indexOf(n) > -1 || isWhitespace(n)) {
                 back();
                 break;
@@ -297,54 +325,45 @@ private String nextCleanTo(String delimiters) {
         return result.toString();
     }
 
-    private int dehex(char c) {
-        if (c >= '0' && c <= '9')
-            return c - '0';
-
-        if (c >= 'a' && c <= 'f')
-            return c - 'a' + 0xA;
-
-        if (c >= 'A' && c <= 'F')
-            return c - 'A' + 0xA;
-
-        return -1;
-    }
+    private char[] unicodeEscape(boolean member, boolean part, boolean utf32) {
+        if (utf32 && !options.isAllowLongUnicodeEscapes())
+            throw syntaxError("Long unicode escape sequences are not allowed");
 
-    private char unicodeEscape(boolean member, boolean part) {
         String where = member ? "key" : "string";
+        String escChar = utf32 ? "U" : "u";
 
         String value = "";
         int codepoint = 0;
 
-        for (int i = 0; i < 4; ++i) {
+        int numDigits = utf32 ? 8 : 4;
+
+        for(int i = 0; i < numDigits; ++i) {
             char n = next();
             value += n;
 
             int hex = dehex(n);
 
             if (hex == -1)
-                throw syntaxError("Illegal unicode escape sequence '\\u" + value + "' in " + where);
+                throw syntaxError("Illegal unicode escape sequence '\\" + escChar + value + "' in " + where);
 
-            codepoint |= hex << ((3 - i) << 2);
+            codepoint |= hex << ((numDigits - i - 1) << 2);
         }
 
         if (member && !isMemberNameChar((char) codepoint, part))
-            throw syntaxError("Illegal unicode escape sequence '\\u" + value + "' in key");
+            throw syntaxError("Illegal unicode escape sequence '\\" + escChar + value + "' in key");
 
-        return (char) codepoint;
+        return Character.toChars(codepoint);
     }
 
     private void checkSurrogate(char hi, char lo) {
         if (options.isAllowInvalidSurrogates())
             return;
 
-        if (!Character.isHighSurrogate(hi) || !Character.isLowSurrogate(lo))
-            return;
-
-        if (!Character.isSurrogatePair(hi, lo))
+        if ((Character.isHighSurrogate(hi) && !Character.isSurrogate(lo)) ||
+            (!Character.isSurrogate(hi) && Character.isLowSurrogate(lo)))
             throw syntaxError(String.format(
-                    "Invalid surrogate pair: U+%04X and U+%04X",
-                    hi, lo
+                "Invalid surrogate pair: U+%04X and U+%04X",
+                (int) hi, (int) lo
             ));
     }
 
@@ -360,13 +379,15 @@ private String nextString(char quote) {
 
         while (true) {
             if (!more())
-                throw syntaxError("Unexpected end of data");
+                throw syntaxError("Expected '" + quote + "' to close string, got EOF instead");
 
             prev = n;
             n = next();
 
-            if (n == quote)
+            if (n == quote) {
+                checkSurrogate(prev, (char) 0);
                 break;
+            }
 
             if (isLineTerminator(n) && n != 0x2028 && n != 0x2029)
                 throw syntaxError("Unescaped line terminator in string");
@@ -380,7 +401,12 @@ private String nextString(char quote) {
 
                     // escaped line terminator/ line continuation
                     continue;
-                } else switch (n) {
+                }
+
+                else switch(n) {
+                    case 0:
+                        throw syntaxError("Expected escape sequence in string, got EOF instead");
+
                     case '\'':
                     case '"':
                     case '\\':
@@ -420,6 +446,10 @@ private String nextString(char quote) {
 
                         for (int i = 0; i < 2; ++i) {
                             n = next();
+
+                            if (n == 0)
+                                throw syntaxError("Expected hexadecimal digit for hexadecimal escape sequence in string, got EOF instead");
+
                             value += n;
 
                             int hex = dehex(n);
@@ -433,8 +463,19 @@ private String nextString(char quote) {
                         n = (char) codepoint;
                         break;
 
-                    case 'u': // Unicode escape sequence
-                        n = unicodeEscape(false, false);
+                    case 'u': // Unicode escape sequence (16-bit)
+                    case 'U': // Unicode escape sequence (32-bit)
+                        char[] chars = unicodeEscape(false, false, n == 'U');
+
+                        if (chars.length == 2) {
+                            checkSurrogate(prev, chars[0]);
+                            prev = chars[0];
+                            n = chars[1];
+
+                            result.append(prev);
+                        }
+                        else n = chars[0];
+
                         break;
 
                     default:
@@ -492,16 +533,16 @@ public String nextMemberName() {
         char prev;
         char n = next();
 
+        if (n == 0)
+            throw syntaxError("Expected key, got EOF instead");
+
         if (n == '"' || n == '\'')
             return nextString(n);
 
         back();
         n = 0;
 
-        while (true) {
-            if (!more())
-                throw syntaxError("Unexpected end of data");
-
+        do {
             boolean part = result.length() > 0;
 
             prev = n;
@@ -510,22 +551,36 @@ public String nextMemberName() {
             if (n == '\\') { // unicode escape sequence
                 n = next();
 
-                if (n != 'u')
+                if (n == 0)
+                    throw syntaxError("Expected escape sequence in key, got EOF instead");
+
+                if (n != 'u' && n != 'U')
                     throw syntaxError("Illegal escape sequence '\\" + n + "' in key");
 
-                n = unicodeEscape(true, part);
-            } else if (!isMemberNameChar(n, part)) {
+                char[] chars = unicodeEscape(true, part, n == 'U');
+
+                if (chars.length == 2) {
+                    checkSurrogate(prev, chars[0]);
+                    prev = chars[0];
+                    n = chars[1];
+
+                    result.append(prev);
+                }
+                else n = chars[0];
+            }
+            else if (!isMemberNameChar(n, part)) {
                 back();
+                checkSurrogate(prev, (char) 0);
                 break;
             }
 
             checkSurrogate(prev, n);
 
             result.append(n);
-        }
+        } while(more());
 
         if (result.length() == 0)
-            throw syntaxError("Empty key");
+            throw syntaxError("Expected key");
 
         return result.toString();
     }
@@ -534,102 +589,433 @@ public String nextMemberName() {
      * Reads a value from the source according to the
      * <a href="https://spec.json5.org/#prod-JSON5Value">JSON5 Specification</a>
      *
-     * @return an member name
+     * @return a {@link Json5Element} value
      */
     public Json5Element nextValue() {
         char n = nextClean();
+        boolean wasRoot = root;
 
-        switch (n) {
-            case '"':
-            case '\'':
-                String string = nextString(n);
-                return new Json5String(string);
-            case '{':
-                back();
-                return Json5Parser.parseObject(this);
-            case '[':
-                back();
-                return Json5Parser.parseArray(this);
+        try {
+            switch(n) {
+                case '"':
+                case '\'':
+                    return Json5Primitive.fromString(nextString(n));
+                case '{':
+                    back();
+                    root = false;
+                    return Json5Parser.parseObject(this);
+                case '[':
+                    back();
+                    root = false;
+                    return Json5Parser.parseArray(this);
+            }
+        } finally {
+            root = wasRoot;
         }
 
         back();
 
         String string = nextCleanTo(",]}");
 
+        if (string == null)
+            throw syntaxError("Expected value, got EOF instead");
+
         if (string.equals("null"))
-            return Json5Null.INSTANCE;
+            return new Json5Null();
+
+        if (string.equals("true"))
+            return Json5Primitive.fromBoolean(true);
+
+        if (string.equals("false"))
+            return Json5Primitive.fromBoolean(false);
+
+        if (!string.isEmpty()) {
+            char leading = string.charAt(0);
+            String rest = string;
+
+            double sign = 1;
+
+            if(leading == '+') {
+                rest = string.substring(1);
+            }
+            else if(leading == '-') {
+                rest = string.substring(1);
+                sign = -1;
+            }
+
+            if (rest.equals("Infinity")) {
+                if (!options.isAllowInfinity())
+                    throw syntaxError("Infinity is not allowed");
+
+                return Json5Primitive.fromNumber(Math.copySign(Double.POSITIVE_INFINITY, sign));
+            }
+
+            if (rest.equals("NaN")) {
+                if (!options.isAllowNaN())
+                    throw syntaxError("NaN is not allowed");
+
+                return Json5Primitive.fromNumber(Math.copySign(Double.NaN, sign));
+            }
+
+            if (!rest.isEmpty()) {
+                leading = rest.charAt(0);
 
-        if (PATTERN_BOOLEAN.matcher(string).matches())
-            return new Json5Boolean(string.equals("true"));
+                if ((leading >= '0' && leading <= '9') || leading == '.') {
+                    RadixNumber parsedNum = parseNumber(leading, rest);
+                    Number num = parsedNum.getNumber();
+                    int radix = parsedNum.getRadix();
 
-        if (PATTERN_NUMBER_INTEGER.matcher(string).matches()) {
-            BigInteger bigint = new BigInteger(string);
-            return new Json5Number(bigint);
+                    if (sign < 0) {
+                        if(num instanceof BigInteger)
+                            return Json5Primitive.fromNumber(((BigInteger) num).negate(), radix);
+
+                        if(num instanceof BigDecimal)
+                            return Json5Primitive.fromNumber(((BigDecimal) num).negate(), radix);
+                    }
+
+                    return Json5Primitive.fromNumber(num, radix);
+                }
+            }
         }
 
-        if (PATTERN_NUMBER_FLOAT.matcher(string).matches())
-            return new Json5Number(new BigDecimal(string));
+        throw new Json5Exception("Illegal value '" + string + "'");
+    }
+
+    private RadixNumber parseNumber(char leading, String input) {
+        BigInteger intValue = BigInteger.ZERO;
+
+        int n = input.length();
+        boolean floating = false;
+        boolean hex = false;
+        int off = 0;
+        char c = 0;
+
+        if (leading == '0') {
+            if (n == 1)
+                return new RadixNumber(intValue, 10);
+
+            /************
+             * PREFIXES *
+             ************/
+            switch(c = input.charAt(1)) {
+                /**********
+                 * BINARY *
+                 **********/
+                case 'b':
+                case 'B':
+                    if (!options.isAllowBinaryLiterals())
+                        throw syntaxError("Binary literals are not allowed");
+
+                    off = 2;
+
+                    while (off < n) {
+                        c = input.charAt(off++);
+
+                        if (checkDigitSeparator(c)) {
+                            if (off == 3 || off >= n || !isbin(input.charAt(off)))
+                                throw syntaxError("Illegal position for digit separator");
+
+                            continue;
+                        }
 
-        if (PATTERN_NUMBER_SPECIAL.matcher(string).matches()) {
-            String special;
+                        if (!isbin(c))
+                            throw syntaxError("Expected binary digit for literal");
 
-            int factor;
-            double d = 0;
+                        intValue = intValue.shiftLeft(1);
 
-            switch (string.charAt(0)) { // +, -, or 0
-                case '+':
-                    special = string.substring(1); // +
-                    factor = 1;
-                    break;
+                        if (c == '1')
+                            intValue = intValue.setBit(0);
+                    }
+
+                    if (off == 2)
+                        throw syntaxError("Expected binary digit after '0b'");
+
+                    return new RadixNumber(intValue, 2);
+
+                /*********
+                 * OCTAL *
+                 *********/
+                case 'o':
+                case 'O':
+                    if (!options.isAllowOctalLiterals())
+                        throw syntaxError("Octal literals are not allowed");
+
+                    off = 2;
+
+                    while (off < n) {
+                        c = input.charAt(off++);
+
+                        if (checkDigitSeparator(c)) {
+                            if (off == 3 || off >= n || !isoct(input.charAt(off)))
+                                throw syntaxError("Illegal position for digit separator");
+
+                            continue;
+                        }
+
+                        if (!isoct(c))
+                            throw syntaxError("Expected octal digit for literal");
+
+                        intValue = intValue.shiftLeft(3);
+
+                        if (c != '0')
+                            intValue = intValue.or(BigInteger.valueOf(c - '0'));
+                    }
+
+                    if (off == 2)
+                        throw syntaxError("Expected octal digit after '0o'");
+
+                    return new RadixNumber(intValue, 8);
+
+
+                /***************
+                 * HEXADECIMAL *
+                 ***************/
+                case 'x':
+                case 'X':
+                    off = 2;
+                    hex = true;
+
+                    while (off < n) {
+                        c = input.charAt(off++);
+
+                        if (checkDigitSeparator(c)) {
+                            if (off == 3 || off >= n || !ishex(input.charAt(off)))
+                                throw syntaxError("Illegal position for digit separator");
+
+                            continue;
+                        }
+
+                        if (c == '.' || c == 'p' || c == 'P') {
+                            if (!options.isAllowHexFloatingLiterals())
+                                throw syntaxError("Hexadecimal floating-point literals are not allowed");
+
+                            floating = true;
+                            break;
+                        }
+
+                        if  (!ishex(c))
+                            throw syntaxError("Expected hexadecimal digit for literal");
+
+                        intValue = intValue.shiftLeft(4);
+
+                        if (c != '0')
+                            intValue = intValue.or(BigInteger.valueOf(dehex(c)));
+                    }
+
+                    if (off == 2)
+                        throw syntaxError("Expected hexadecimal digit after '0x'");
+
+                    if (!floating)
+                        return new RadixNumber(intValue, 16);
 
-                case '-':
-                    special = string.substring(1); // -
-                    factor = -1;
                     break;
 
                 default:
-                    special = string;
-                    factor = 1;
                     break;
-            }
+            };
+        }
 
-            switch (special) {
-                case "NaN":
-                    d = Double.NaN;
-                    break;
-                case "Infinity":
-                    d = Double.POSITIVE_INFINITY;
+        StringBuilder num = new StringBuilder();
+
+        if (!hex) {
+            /***********
+             * DECIMAL *
+             ***********/
+            while (off < n) {
+                c = input.charAt(off++);
+
+                if (checkDigitSeparator(c)) {
+                    if (num.length() == 0 || off >= n || !isDecimalDigit(input.charAt(off)))
+                        throw syntaxError("Illegal position for digit separator");
+
+                    continue;
+                }
+
+                if (c == '.' || c == 'e' || c == 'E') {
+                    floating = true;
                     break;
+                }
+
+                if (!isDecimalDigit(c))
+                    throw syntaxError("Expected decimal digit for literal");
+
+                num.append(c);
+            }
+
+            if (off >= n) {
+                if (options.getDigitSeparatorStrategy() == DigitSeparatorStrategy.JAVA_STYLE)
+                    input = input.replace("_", "");
+
+                if (options.getDigitSeparatorStrategy() == DigitSeparatorStrategy.C_STYLE)
+                    input = input.replace("'", "");
+
+                return new RadixNumber(new BigInteger(input), 10);
+            }
+        }
+
+        BigInteger fractionInt = BigInteger.ZERO;
+        int numFracDigits = 0;
+
+        if (c == '.') {
+            /************
+             * FRACTION *
+             ************/
+            if (!hex)
+                num.append('.');
+
+            while (off < n) {
+                c = input.charAt(off++);
+
+                if (checkDigitSeparator(c)) {
+                    if (numFracDigits == 0 || off >= n)
+                        throw syntaxError("Illegal position for digit separator");
+
+                    c = input.charAt(off);
+
+                    if ((!hex && !isDecimalDigit(c)) || (hex && !ishex(c)))
+                        throw syntaxError("Illegal position for digit separator");
+
+                    continue;
+                }
+
+                if (hex) {
+                    if (c == 'p' || c == 'P')
+                        break;
+
+                    if (!ishex(c))
+                        throw syntaxError("Expected hexadecimal digit for literal");
+
+                    fractionInt = fractionInt.shiftLeft(4);
+
+                    if (c != '0')
+                        fractionInt = fractionInt.or(BigInteger.valueOf(dehex(c)));
+                }
+                else {
+                    if (c == 'e' || c == 'E')
+                        break;
+
+                    if (!isDecimalDigit(c))
+                        throw syntaxError("Expected decimal digit for literal");
+
+                    num.append(c);
+                }
+
+                ++numFracDigits;
             }
 
-            return new Json5Number(factor * d);
+            if (off >= n && !hex)
+                return new RadixNumber(new BigDecimal(num.toString()), 10);
         }
 
-        if (PATTERN_NUMBER_HEX.matcher(string).matches()) {
-            return new Json5Hexadecimal(string);
+        /************
+         * EXPONENT *
+         ************/
+        if (hex && c != 'p' && c != 'P')
+            throw syntaxError("Expected exponent for hexadecimal floating-point literal");
+
+        if (!hex)
+            num.append('e');
+
+        int numExpDigits = 0;
+
+        if (++off >= n)
+            throw syntaxError("Expected digit sequence for exponent");
+
+        c = input.charAt(off);
+
+        if (c == '+' || c == '-') {
+            num.append(c);
+            ++off;
         }
 
-        throw new Json5Exception("Illegal value '" + string + "'");
+        while (off < n) {
+            c = input.charAt(off++);
+
+            if (checkDigitSeparator(c)) {
+                if( numExpDigits == 0 || off >= n || !isDecimalDigit(input.charAt(off)))
+                    throw syntaxError("Illegal position for digit separator");
+
+                continue;
+            }
+
+            if (!isDecimalDigit(c))
+                throw syntaxError("Expected decimal digit for exponent");
+
+            num.append(c);
+            ++numExpDigits;
+        }
+
+        if (numExpDigits == 0)
+            throw syntaxError("Expected digit sequence for exponent");
+
+        if (!hex)
+            return new RadixNumber(new BigDecimal(num.toString()), 10);
+
+        /******************************
+         * HEXADECIMAL FLOATING-POINT *
+         ******************************/
+        BigInteger exponent = new BigInteger(num.toString());
+        BigDecimal value = new BigDecimal(intValue);
+
+        BigDecimal two = BigDecimal.valueOf(2);
+        BigDecimal frac = BigDecimal.valueOf(.5);
+
+        for (int i = (4 * numFracDigits) - 1; i >= 0; --i) {
+            if (fractionInt.testBit(i)) {
+                value = value.add(frac);
+            }
+
+            frac = frac.divide(two);
+        }
+
+        BigDecimal scale;
+
+        try {
+            scale = new BigDecimal(BigInteger.TWO.pow(exponent.intValueExact()));
+        }
+        catch (Exception e) {
+            throw syntaxError("Hexadecimal floating-point literal's exponent is too large");
+        }
+
+        return new RadixNumber(value.multiply(scale), 16);
+    }
+
+    private boolean checkDigitSeparator(char c) {
+        if (c == '_') {
+            if (options.getDigitSeparatorStrategy() != DigitSeparatorStrategy.JAVA_STYLE)
+                throw syntaxError("Java-style digit separators are not allowed");
+
+            return true;
+        }
+
+        if (c == '\'') {
+            if (options.getDigitSeparatorStrategy() != DigitSeparatorStrategy.C_STYLE)
+                throw syntaxError("C-style digit separators are not allowed");
+
+            return true;
+        }
+
+        return false;
     }
 
     /**
-     * Constructs a new JSONException with a detail message and a causing exception
+     * Constructs a new {@link Json5Exception} with a detail message and a causing exception
      *
      * @param message the detail message
-     * @param cause   the causing exception
-     * @return a JSONException
+     * @param cause the causing exception
+     * @return a {@link Json5Exception}
      */
-    protected Json5Exception syntaxError(String message, Throwable cause) {
+    public Json5Exception syntaxError(String message, Throwable cause) {
         return new Json5Exception(message + this, cause);
     }
 
     /**
-     * Constructs a new JSONException with a detail message
+     * Constructs a new {@link Json5Exception} with a detail message
      *
      * @param message the detail message
-     * @return a JSONException
+     * @return a {@link Json5Exception}
      */
-    protected Json5Exception syntaxError(String message) {
+    public Json5Exception syntaxError(String message) {
         return new Json5Exception(message + this);
     }
 
@@ -637,4 +1023,63 @@ protected Json5Exception syntaxError(String message) {
     public String toString() {
         return " at index " + index + " [character " + character + " in line " + line + "]";
     }
+
+    private static int dehex(char c) {
+        if(c >= '0' && c <= '9')
+            return c - '0';
+
+        if(c >= 'a' && c <= 'f')
+            return c - 'a' + 0xA;
+
+        if(c >= 'A' && c <= 'F')
+            return c - 'A' + 0xA;
+
+        return -1;
+    }
+
+    private static boolean isbin(char c) {
+        return c == '0' || c == '1';
+    }
+
+    private static boolean isoct(char c) {
+        return c >= '0' && c <= '7';
+    }
+
+    private static boolean ishex(char c) {
+        return (c >= '0' && c <= '9')
+            || (c >= 'a' && c <= 'f')
+            || (c >= 'A' && c <= 'F');
+    }
+
+    /**
+     * Converts a character into a string representation:
+     *
+     * <ul>
+     * <li>if {@code c == 0}, {@code "EOF"} is returned</li>
+     * <li>if {@code c} fulfills one of the following conditions, {@code "'x'"}
+     *   is returned, where {@code x} is the value returned by {@link Character#toString(char)}:
+     *   <ul>
+     *   <li>if {@code c} is an extended ASCII character ({@code U+0001-U+00FF}),
+     *       except {@link Character#isISOControl(char) control characters}</li>
+     *   <li>if {@code c} is a {@link Character#isLetter(char) Unicode letter}</li>
+     *   <li>if {@code c} is a {@link Character#isDigit(char) Unicode digit}</li>
+     *   </ul>
+     * </li>
+     * <li>otherwise, {@code "U+XXXX"} is returned, where {@code XXXX} is the uppercase
+     *     hexadecimal representation of {@code c}'s Unicode codepoint, padded with zeros
+     *     ({@code 0}) to a length of 4 characters</li>
+     * </ul>
+     *
+     * @param c the character
+     * @return the string representation
+     */
+    protected static String charToString(char c) {
+        if (c == 0)
+            return "EOF";
+
+        if ((c <= 0xFF && !Character.isISOControl(c)) || Character.isLetterOrDigit(c))
+            return "'" + c + "'";
+
+        return String.format("U+%04X", (int) c);
+    }
 }
diff --git a/src/main/java/de/marhali/json5/stream/Json5Parser.java b/src/main/java/de/marhali/json5/stream/Json5Parser.java
index c7422ca..5126416 100644
--- a/src/main/java/de/marhali/json5/stream/Json5Parser.java
+++ b/src/main/java/de/marhali/json5/stream/Json5Parser.java
@@ -28,9 +28,12 @@
 import de.marhali.json5.Json5Array;
 import de.marhali.json5.Json5Element;
 import de.marhali.json5.Json5Object;
+import de.marhali.json5.config.DuplicateKeyStrategy;
 import de.marhali.json5.exception.Json5Exception;
 
+import java.util.HashSet;
 import java.util.Objects;
+import java.util.Set;
 
 /**
  * A parser to parse tokenized Json5 data into a parse tree of {@link Json5Element}'s.
@@ -51,18 +54,30 @@ private Json5Parser() {}
     public static Json5Element parse(Json5Lexer lexer) {
         Objects.requireNonNull(lexer);
 
-        switch (lexer.nextClean()) {
+        char control = lexer.nextClean();
+        String comment = lexer.consumeComment();
+        Json5Element element;
+
+        switch (control) {
             case '{':
                 lexer.back();
-                return parseObject(lexer);
+                element = parseObject(lexer);
+                break;
             case '[':
                 lexer.back();
-                return parseArray(lexer);
+                element = parseArray(lexer);
+                break;
             case 0:
                 return null;
             default:
                 throw lexer.syntaxError("Unknown or unexpected control character");
         }
+
+        if (lexer.options.isParseComments() && comment != null) {
+            element.setComment(comment);
+        }
+
+        return element;
     }
 
     /**
@@ -76,44 +91,78 @@ public static Json5Object parseObject(Json5Lexer lexer) {
         Objects.requireNonNull(lexer);
 
         if(lexer.nextClean() != '{') {
-            throw lexer.syntaxError("A json object must begin with '{'");
+            throw lexer.syntaxError("A Json5Object must begin with '{'");
         }
 
         Json5Object object = new Json5Object();
 
+        DuplicateKeyStrategy duplicateKeyStrategy = lexer.options.getDuplicateBehaviour();
+        Set<String> duplicates = new HashSet<>();
+
         char control;
+        String comment;
         String key;
 
-        while (true) {
+        while(true) {
             control = lexer.nextClean();
-            switch (control) {
+            comment = lexer.consumeComment();
+
+            switch(control) {
                 case 0:
-                    throw lexer.syntaxError("A json object must end with '}'");
+                    throw lexer.syntaxError("A Json5Object must end with '}'");
                 case '}':
+                    if (lexer.root && !lexer.options.isAllowTrailingData() && lexer.nextClean() != 0) {
+                        throw lexer.syntaxError("Trailing data after Json5Object");
+                    }
                     return object;
                 default:
                     lexer.back();
                     key = lexer.nextMemberName();
             }
 
-            if(object.has(key)) {
-                throw new Json5Exception("Duplicate key " + key);
+            boolean duplicate = object.has(key);
+
+            if (duplicate && duplicateKeyStrategy == DuplicateKeyStrategy.UNIQUE)
+                throw new Json5Exception("Duplicate key " + Json5Writer.quote(key, lexer.options));
+
+            control = lexer.nextClean();
+
+            if (control != ':')
+                throw lexer.syntaxError("Expected ':' after a key, got " + Json5Lexer.charToString(control) + " instead");
+
+            Json5Element value = lexer.nextValue();
+
+            if (lexer.options.isParseComments() && comment != null) {
+                value.setComment(comment);
             }
 
-            if(lexer.nextClean() != ':') {
-                throw lexer.syntaxError("Expected ':' after a key, got '" + control + "' instead");
+            if (duplicate && duplicateKeyStrategy == DuplicateKeyStrategy.DUPLICATE) {
+                Json5Array array;
+
+                if (duplicates.contains(key))
+                    array = object.getAsJson5Array(key);
+
+                else {
+                    array = new Json5Array();
+                    // TODO: is that right?
+                    array.add(object.get(key));
+
+                    duplicates.add(key);
+                }
+
+                array.add(value);
+                value = array;
             }
 
-            object.add(key, lexer.nextValue());
+            object.add(key, value);
+
             control = lexer.nextClean();
 
-            if(control == '}') {
+            if (control == '}')
                 return object;
-            }
 
-            if(control != ',') {
-                throw lexer.syntaxError("Expected ',' or '}' after value, got '" + control + "' instead");
-            }
+            if (control != ',')
+                throw lexer.syntaxError("Expected ',' or '}' after value, got " + Json5Lexer.charToString(control) + " instead");
         }
     }
 
@@ -127,34 +176,45 @@ public static Json5Object parseObject(Json5Lexer lexer) {
     public static Json5Array parseArray(Json5Lexer lexer) {
         Objects.requireNonNull(lexer);
 
-        if(lexer.nextClean() != '[') {
-            throw lexer.syntaxError("A json array must begin with '['");
+        if (lexer.nextClean() != '[') {
+            throw lexer.syntaxError("A Json5Array must begin with '['");
         }
 
         Json5Array array = new Json5Array();
         char control;
+        String comment;
 
-        while(true) {
+        while (true) {
             control = lexer.nextClean();
+            comment = lexer.consumeComment();
+
             switch (control) {
                 case 0:
-                    throw lexer.syntaxError("A json array must end with ']'");
+                    throw lexer.syntaxError("A Json5Array must end with ']'");
                 case ']':
+                    if(lexer.root && !lexer.options.isAllowTrailingData() && lexer.nextClean() != 0) {
+                        throw lexer.syntaxError("Trailing data after Json5Array");
+                    }
                     return array;
                 default:
                     lexer.back();
             }
 
-            array.add(lexer.nextValue());
+            Json5Element value = lexer.nextValue();
+
+            if (lexer.options.isParseComments() && comment != null) {
+                value.setComment(comment);
+            }
+
+            array.add(value);
+
             control = lexer.nextClean();
 
-            if(control == ']') {
+            if (control == ']')
                 return array;
-            }
 
-            if(control != ',') {
-                throw lexer.syntaxError("Expected ',' or ']' after value, got '" + control + "' instead");
-            }
+            if (control != ',')
+                throw lexer.syntaxError("Expected ',' or ']' after value, got " + Json5Lexer.charToString(control) + " instead");
         }
     }
 }

From 7bc0d95172ebfd62f349ac24d12525f481bc7877 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Tue, 16 Sep 2025 23:26:39 +0200
Subject: [PATCH 10/48] feat(breaking): rework writer to support comments and
 other new options

---
 .../de/marhali/json5/stream/Json5Writer.java  | 259 ++++++++++++------
 1 file changed, 180 insertions(+), 79 deletions(-)

diff --git a/src/main/java/de/marhali/json5/stream/Json5Writer.java b/src/main/java/de/marhali/json5/stream/Json5Writer.java
index 7f2a2ae..5f166c8 100644
--- a/src/main/java/de/marhali/json5/stream/Json5Writer.java
+++ b/src/main/java/de/marhali/json5/stream/Json5Writer.java
@@ -2,7 +2,8 @@
  * MIT License
  *
  * Copyright (C) 2021 SyntaxError404
- * Copyright (C) 2022 Marcel Haßlinger
+ * Copyright (C) 2024 Ultreon Team
+ * Copyright (C) 2022 - 2025 Marcel Haßlinger
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,6 +27,8 @@
 package de.marhali.json5.stream;
 
 import de.marhali.json5.*;
+import de.marhali.json5.config.Json5Options;
+import de.marhali.json5.internal.EcmaScriptIdentifier;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -36,8 +39,9 @@
  * Writes a tree of {@link Json5Element}'s into their
  * string literal representation by using a {@link Writer write} stream.
  *
- * @author Marcel Haßlinger
  * @author SyntaxError404
+ * @author Ultreon Team
+ * @author Marcel Haßlinger
  */
 public final class Json5Writer {
 
@@ -48,45 +52,49 @@ public final class Json5Writer {
      * Creates a new instance that writes a JSON5-encoded stream to {@code writer}.
      * <p><b>Note:</b> The writer must be closed after operation ({@link Writer#close()})!</p>
      * @param options Parsing and serialization options
-     * @param writer Output stream. For best performance, use a {@link java.io.BufferedWriter}
+     * @param writer Output stream. For the best performance, use a {@link java.io.BufferedWriter}.
      */
     public Json5Writer(Json5Options options, Writer writer) {
-        this.options = Objects.requireNonNull(options);
-        this.writer = Objects.requireNonNull(writer);
+        Objects.requireNonNull(options);
+        Objects.requireNonNull(writer);
+
+        this.options = options;
+        this.writer = writer;
     }
 
     /**
      * Encodes and writes the provided {@link Json5Element} into json5 according to the specification
      * and the configured options. The element can be any json5 element. All child trees will be included.
+     * This function writes with depth {@code 0} and expects a root element.
+     * For nested elements, see the other write methods.
      * @param element Element to encode
      * @throws IOException If an I/O error occurs
      * @see #Json5Writer(Json5Options, Writer) Configuration options
-     * @see #write(Json5Element, String)
+     * @see #write(Json5Element, int)
      */
     public void write(Json5Element element) throws IOException {
-        write(element, "");
+        write(element, 0);
     }
 
     /**
      * Encodes and writes the provided {@link Json5Element} into json5 according to the specification
      * and the configured options. The element can be any json5 element. All child trees will be included.
      * @param element Element to encode
-     * @param indent Indent to apply (for nested elements)
+     * @param depth Depth of the current Json5 tree. Root node is {@code 0}. Counts {@code +1} on every child element.
      * @throws IOException If an I/O error occurs
      * @see #Json5Writer(Json5Options, Writer) Configuration options
-     * @see #write(Json5Element) without indent
+     * @see #write(Json5Element)
      */
-    public void write(Json5Element element, String indent) throws IOException {
+    public void write(Json5Element element, int depth) throws IOException {
         Objects.requireNonNull(element);
-        Objects.requireNonNull(indent);
 
-        if(element.isJson5Null()) {
+        if (element.isJson5Null()) {
             writeNull();
-        } else if(element.isJson5Object()) {
-            writeObject(element.getAsJson5Object(), indent);
-        } else if(element.isJson5Array()) {
-            writeArray(element.getAsJson5Array(), indent);
-        } else if(element.isJson5Primitive()) {
+        } else if (element.isJson5Object()) {
+            writeObject(element.getAsJson5Object(), depth);
+        } else if (element.isJson5Array()) {
+            writeArray(element.getAsJson5Array(), depth);
+        } else if (element.isJson5Primitive()) {
             writePrimitive(element.getAsJson5Primitive());
         } else {
             throw new UnsupportedOperationException("Unknown json element with type class "
@@ -94,12 +102,53 @@ public void write(Json5Element element, String indent) throws IOException {
         }
     }
 
+    /**
+     * Writes any associated comments for the provided {@link Json5Element}.
+     * Checks if {@link Json5Options#isWriteComments()} is {@code true} and if the element has any comment assigned.
+     * @param element Element target
+     * @param depth Depth to use for writing
+     */
+    public void writeComment(Json5Element element, int depth) throws IOException {
+        if (!options.isWriteComments() || !element.hasComment()) {
+            return;
+        }
+
+        String indent = depthToIndent(depth);
+        String comment = element.getComment();
+        String[] lines = comment.split("\n");
+        boolean multiLineComment = lines.length > 1;
+
+        if (options.getIndentFactor() > 0) {
+            // pretty-printing
+            if (multiLineComment) {
+                writer.append(indent).append("/*\n");
+                for (String line : lines) {
+                    writer.append(indent).append(" * ").append(line).append("\n");
+                }
+                writer.append(indent).append(" */\n");
+            } else {
+                writer.append(indent).append("// ").append(comment).append("\n");
+            }
+        } else {
+            // write in the shortest possible style
+            writer.append("/*");
+            for (int i = 0; i < lines.length; i++) {
+                writer.append(lines[i]);
+                if (i != lines.length - 1) {
+                    // Use whitespace for simulated break-lines
+                    writer.append(" ");
+                }
+            }
+            writer.append("*/");
+        }
+    }
+
     /**
      * Writes the equivalent of a {@link de.marhali.json5.Json5Null}({@code null}) value.
      * @throws IOException If an I/O error occurs.
      */
     public void writeNull() throws IOException {
-        writer.write("null");
+        writer.append("null");
     }
 
     /**
@@ -110,7 +159,7 @@ public void writeNull() throws IOException {
     public void writePrimitive(Json5Primitive primitive) throws IOException {
         Objects.requireNonNull(primitive);
 
-        if(primitive instanceof Json5String) {
+        if (primitive.isString()) {
             writer.append(quote(primitive.getAsString()));
         } else {
             writer.append(primitive.getAsString());
@@ -120,42 +169,52 @@ public void writePrimitive(Json5Primitive primitive) throws IOException {
     /**
      * Writes the provided {@link Json5Object} to the stream.
      * @param object Object to encode
-     * @param indent Indent to apply (for nested elements)
+     * @param depth Depth to use for writing
      * @throws IOException If an I/O error occurs.
      * @see #write(Json5Element)
      */
-    public void writeObject(Json5Object object, String indent) throws IOException {
+    public void writeObject(Json5Object object, int depth) throws IOException {
         Objects.requireNonNull(object);
-        Objects.requireNonNull(indent);
 
-        String childIndent = indent + " ".repeat(options.getIndentFactor());
+        if (depth == 0) {
+            // Root element comment
+            writeComment(object, depth);
+        }
+
+        int childDepth = depth + 1;
+        String indent = depthToIndent(depth);
+        String childIndent = depthToIndent(childDepth);
+
+        writer.append('{');
 
-        writer.write("{");
+        int index = -1;
+        for (Map.Entry<String, Json5Element> entry : object.entrySet()) {
+            index++;
 
-        int index = 0;
-        for(Map.Entry<String, Json5Element> entry : object.entrySet()) {
-            if(options.getIndentFactor() > 0) {
-                writer.append('\n').append(childIndent);
+            if (options.getIndentFactor() > 0) {
+               writer.append("\n");
             }
 
-            writer.append(quote(entry.getKey())).append(":");
+            writeComment(entry.getValue(), childDepth);
 
-            if(options.getIndentFactor() > 0) {
+            if (options.getIndentFactor() > 0)
+                writer.append(childIndent);
+
+            writer.append(quoteKey(entry.getKey()))
+                .append(':');
+
+            if (options.getIndentFactor() > 0)
                 writer.append(' ');
-            }
 
-            write(entry.getValue(), childIndent);
+            write(entry.getValue(), childDepth);
 
-            if(options.isTrailingComma() || index < object.size() - 1) {
-                writer.append(',');
+            if (options.isTrailingComma() || index < object.size() - 1) {
+                writer.append(",");
             }
-
-            index++;
         }
 
-        if(options.getIndentFactor() > 0 && object.size() > 0) {
+        if (options.getIndentFactor() > 0)
             writer.append('\n').append(indent);
-        }
 
         writer.append('}');
     }
@@ -163,56 +222,80 @@ public void writeObject(Json5Object object, String indent) throws IOException {
     /**
      * Writes the provided {@link Json5Array} to the stream.
      * @param array Array to encode
-     * @param indent Indent to apply (for nested elements)
+     * @param depth Depth to use for writing
      * @throws IOException If an I/O error occurs.
      * @see #write(Json5Element)
      */
-    public void writeArray(Json5Array array, String indent) throws IOException {
+    public void writeArray(Json5Array array, int depth) throws IOException {
         Objects.requireNonNull(array);
-        Objects.requireNonNull(indent);
 
-        String childIndent = indent + " ".repeat(options.getIndentFactor());
+        if (depth == 0) {
+            // Root element comment
+            writeComment(array, depth);
+        }
 
-        writer.write('[');
+        int childDepth = depth + 1;
+        String indent = depthToIndent(depth);
+        String childIndent = depthToIndent(childDepth);
 
-        for(int i = 0; i < array.size(); i++) {
-            Json5Element currentElement = array.get(i);
+        writer.append('[');
 
-            if(options.getIndentFactor() > 0) {
-                writer.append('\n').append(childIndent);
-            }
+        int index = -1;
+        for (Json5Element value : array) {
+            index++;
+
+            if (options.getIndentFactor() > 0)
+                writer.append('\n');
+
+            writeComment(value, childDepth);
+
+            writer.append(childIndent);
 
-            write(currentElement, childIndent);
+            write(value, childDepth);
 
-            if(options.isTrailingComma() || i < array.size() - 1) {
-                writer.append(',');
+            if (options.isTrailingComma() || index < array.size() - 1) {
+                writer.append(",");
             }
         }
 
-        if(options.getIndentFactor() > 0 && !array.isEmpty()) {
+        if(options.getIndentFactor() > 0)
             writer.append('\n').append(indent);
+
+        writer.append(']');
+    }
+
+    public String quoteKey(String key) {
+        if (options.isQuoteless() && EcmaScriptIdentifier.isValid(key)) {
+            return key;
+        } else {
+            return quote(key);
         }
+    }
 
-        writer.write(']');
+    public String quote(String string) {
+        return quote(string, options);
     }
 
     /**
      * Quotes the provided string according to the json5 <a href="https://spec.json5.org/#strings">specification</a>.
      * @param string String to quote
-     * @return Quoted string
+     * @return quoted string
      */
-    public String quote(String string) {
-        final char qt = options.isQuoteSingle() ? '\'' : '"';
+    static String quote(String string, Json5Options options) {
+        final char quote = options.isQuoteSingle() ? '\'' : '"';
 
-        if(string == null || string.isEmpty()) {
-            return String.valueOf(qt).repeat(2);
-        }
+        if (string == null || string.isEmpty())
+            return String.valueOf(quote).repeat(2);
 
         StringBuilder quoted = new StringBuilder(string.length() + 2);
-        quoted.append(qt);
+        boolean ascii = options.isStringifyAscii();
+
+        quoted.append(quote);
 
-        for(char c : string.toCharArray()) {
-            if(c == qt) {
+        for (int i = 0, n = string.length(); i < n; ++i) {
+            char c = string.charAt(i);
+
+            if(c == quote) {
                 quoted.append('\\');
                 quoted.append(c);
                 continue;
@@ -241,26 +324,44 @@ public String quote(String string) {
                     quoted.append("\\v");
                     break;
                 default:
-                    // escape non-graphical characters (https://www.unicode.org/versions/Unicode13.0.0/ch02.pdf#G286941)
-                    switch(Character.getType(c)) {
-                        case Character.FORMAT:
-                        case Character.LINE_SEPARATOR:
-                        case Character.PARAGRAPH_SEPARATOR:
-                        case Character.CONTROL:
-                        case Character.PRIVATE_USE:
-                        case Character.SURROGATE:
-                        case Character.UNASSIGNED:
-                            quoted.append("\\u");
-                            quoted.append(String.format("%04X", c));
-                            break;
-                        default:
-                            quoted.append(c);
-                            break;
+                    boolean unicode = false;
+
+                    if (!ascii) {
+                        // escape non-graphical characters (https://www.unicode.org/versions/Unicode13.0.0/ch02.pdf#G286941)
+                        switch(Character.getType(c)) {
+                            case Character.FORMAT:
+                            case Character.LINE_SEPARATOR:
+                            case Character.PARAGRAPH_SEPARATOR:
+                            case Character.CONTROL:
+                            case Character.PRIVATE_USE:
+                            case Character.SURROGATE:
+                            case Character.UNASSIGNED:
+                                unicode = true;
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                    else unicode = c > 0x7F;
+
+                    if(unicode) {
+                        quoted.append("\\u");
+                        quoted.append(String.format("%04X", (int) c));
                     }
+                    else quoted.append(c);
             }
         }
 
-        quoted.append(qt);
+        quoted.append(quote);
+
         return quoted.toString();
     }
-}
\ No newline at end of file
+
+    private String depthToIndent(int depth) {
+        if (options.getIndentFactor() > 0) {
+            return " ".repeat(depth * options.getIndentFactor());
+        }
+
+        return "";
+    }
+}

From 96aa52ae388f32eb214dcf7ccf317220f16cfef3 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Tue, 16 Sep 2025 23:27:53 +0200
Subject: [PATCH 11/48] feat(breaking): update json5 object with latest updates
 from gson and add comment support

---
 .../java/de/marhali/json5/Json5Object.java    | 117 ++++++++++++------
 1 file changed, 82 insertions(+), 35 deletions(-)

diff --git a/src/main/java/de/marhali/json5/Json5Object.java b/src/main/java/de/marhali/json5/Json5Object.java
index 88a3341..061859c 100644
--- a/src/main/java/de/marhali/json5/Json5Object.java
+++ b/src/main/java/de/marhali/json5/Json5Object.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2008 Google Inc.
- * Copyright (C) 2022 Marcel Haßlinger
+ * Copyright (C) 2025 Marcel Haßlinger
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,22 +20,31 @@
 import de.marhali.json5.internal.LinkedTreeMap;
 
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 /**
- * A class representing an object type in Json. An object consists of name-value pairs where names
+ * A class representing an object type in Json5. An object consists of name-value pairs where names
  * are strings, and values are any other type of {@link Json5Element}. This allows for a creating a
  * tree of Json5Elements. The member elements of this object are maintained in order they were added.
+ * This class does not support {@code null} values. If {@code null} is provided as value argument to
+ * any of the methods, it is converted to a {@link Json5Null}.
+ *
+ * <p>{@code Json5Object} does not implement the {@link Map} interface, but a {@code Map} view of it
+ * can be obtained with {@link #asMap()}.
+ *
+ * <p>See the {@link Json5} documentation for details on how to convert {@code Json5Object} and
+ * generally any {@code Json5Element} from and to Json5.
  *
  * @author Inderjeet Singh
  * @author Joel Leitch
+ * @author Marcel Haßlinger
  */
 public final class Json5Object extends Json5Element {
-    private final LinkedTreeMap<String, Json5Element> members =
-            new LinkedTreeMap<String, Json5Element>();
+    private final LinkedTreeMap<String, Json5Element> members = new LinkedTreeMap<>(false);
 
     /**
-     * Creates a deep copy of this element and all its children
+     * Creates a deep copy of this element and all its children.
      */
     @Override
     public Json5Object deepCopy() {
@@ -43,73 +52,79 @@ public Json5Object deepCopy() {
         for (Map.Entry<String, Json5Element> entry : members.entrySet()) {
             result.add(entry.getKey(), entry.getValue().deepCopy());
         }
+        result.setComment(comment);
         return result;
     }
 
     /**
      * Adds a member, which is a name-value pair, to self. The name must be a String, but the value
-     * can be an arbitrary Json5Element, thereby allowing you to build a full tree of Json5Elements
-     * rooted at this node.
+     * can be an arbitrary {@link Json5Element}, thereby allowing you to build a full tree of
+     * Json5Elements rooted at this node.
      *
      * @param property name of the member.
      * @param value the member object.
      */
     public void add(String property, Json5Element value) {
-        members.put(property, value == null ? Json5Null.INSTANCE : value);
+        members.put(property, value == null ? new Json5Null() : value);
     }
 
     /**
-     * Removes the {@code property} from this {@link Json5Object}.
+     * Removes the {@code property} from this object.
      *
      * @param property name of the member that should be removed.
-     * @return the {@link Json5Element} object that is being removed.
+     * @return the {@link Json5Element} object that is being removed, or {@code null} if no member with
+     *     this name exists.
      */
     public Json5Element remove(String property) {
         return members.remove(property);
     }
 
     /**
-     * Convenience method to add a primitive member. The specified value is converted to a
-     * Json5Primitive of String.
+     * Convenience method to add a string member. The specified value is converted to a {@link
+     * Json5Primitive} of String.
      *
      * @param property name of the member.
      * @param value the string value associated with the member.
      */
     public void addProperty(String property, String value) {
-        add(property, value == null ? Json5Null.INSTANCE : new Json5String(value));
+        add(property, value == null ? new Json5Null() : Json5Primitive.fromString(value));
     }
 
     /**
-     * Convenience method to add a primitive member. The specified value is converted to a
-     * Json5Primitive of Number.
+     * Convenience method to add a number member. The specified value is converted to a {@link
+     * Json5Primitive} of Number.
      *
      * @param property name of the member.
      * @param value the number value associated with the member.
      */
     public void addProperty(String property, Number value) {
-        add(property, value == null ? Json5Null.INSTANCE : new Json5Number(value));
+        add(property, value == null ? new Json5Null() : Json5Primitive.fromNumber(value));
+    }
+
+    public void addProperty(String property, Number value, int radix) {
+        add(property, value == null ? new Json5Null() : Json5Primitive.fromNumber(value, radix));
     }
 
     /**
-     * Convenience method to add a boolean member. The specified value is converted to a
-     * Json5Primitive of Boolean.
+     * Convenience method to add a boolean member. The specified value is converted to a {@link
+     * Json5Primitive} of Boolean.
      *
      * @param property name of the member.
-     * @param value the number value associated with the member.
+     * @param value the boolean value associated with the member.
      */
     public void addProperty(String property, Boolean value) {
-        add(property, value == null ? Json5Null.INSTANCE : new Json5Boolean(value));
+        add(property, value == null ? new Json5Null() : Json5Primitive.fromBoolean(value));
     }
 
     /**
-     * Convenience method to add a char member. The specified value is converted to a
-     * Json5Primitive of Character.
+     * Convenience method to add a char member. The specified value is converted to a {@link
+     * Json5Primitive} of Character.
      *
      * @param property name of the member.
-     * @param value the number value associated with the member.
+     * @param value the char value associated with the member.
      */
     public void addProperty(String property, Character value) {
-        add(property, value == null ? Json5Null.INSTANCE : new Json5String(value.toString()));
+        add(property, value == null ? new Json5Null() : Json5Primitive.fromCharacter(value));
     }
 
     /**
@@ -140,6 +155,15 @@ public int size() {
         return members.size();
     }
 
+    /**
+     * Returns true if the number of key/value pairs in the object is zero.
+     *
+     * @return true if the number of key/value pairs in the object is zero.
+     */
+    public boolean isEmpty() {
+        return members.isEmpty();
+    }
+
     /**
      * Convenience method to check if a member with the specified name is present in this object.
      *
@@ -154,50 +178,73 @@ public boolean has(String memberName) {
      * Returns the member with the specified name.
      *
      * @param memberName name of the member that is being requested.
-     * @return the member matching the name. Null if no such member exists.
+     * @return the member matching the name, or {@code null} if no such member exists.
      */
     public Json5Element get(String memberName) {
         return members.get(memberName);
     }
 
     /**
-     * Convenience method to get the specified member as a Json5Primitive element.
+     * Convenience method to get the specified member as a {@link Json5Primitive}.
      *
      * @param memberName name of the member being requested.
-     * @return the Json5Primitive corresponding to the specified member.
+     * @return the {@code Json5Primitive} corresponding to the specified member, or {@code null} if no
+     *     member with this name exists.
+     * @throws ClassCastException if the member is not of type {@code Json5Primitive}.
      */
     public Json5Primitive getAsJson5Primitive(String memberName) {
         return (Json5Primitive) members.get(memberName);
     }
 
     /**
-     * Convenience method to get the specified member as a Json5Array.
+     * Convenience method to get the specified member as a {@link Json5Array}.
      *
      * @param memberName name of the member being requested.
-     * @return the Json5Array corresponding to the specified member.
+     * @return the {@code Json5Array} corresponding to the specified member, or {@code null} if no
+     *     member with this name exists.
+     * @throws ClassCastException if the member is not of type {@code Json5Array}.
      */
     public Json5Array getAsJson5Array(String memberName) {
         return (Json5Array) members.get(memberName);
     }
 
     /**
-     * Convenience method to get the specified member as a Json5Object.
+     * Convenience method to get the specified member as a {@link Json5Object}.
      *
      * @param memberName name of the member being requested.
-     * @return the Json5Object corresponding to the specified member.
+     * @return the {@code Json5Object} corresponding to the specified member, or {@code null} if no
+     *     member with this name exists.
+     * @throws ClassCastException if the member is not of type {@code Json5Object}.
      */
     public Json5Object getAsJson5Object(String memberName) {
         return (Json5Object) members.get(memberName);
     }
 
+    /**
+     * Returns a mutable {@link Map} view of this {@code Json5Object}. Changes to the {@code Map} are
+     * visible in this {@code Json5Object} and the other way around.
+     *
+     * <p>The {@code Map} does not permit {@code null} keys or values. Unlike {@code Json5Object}'s
+     * {@code null} handling, a {@link NullPointerException} is thrown when trying to add {@code
+     * null}. Use {@link Json5Null} for Json5 null values.
+     *
+     * @return mutable {@code Map} view
+     */
+    public Map<String, Json5Element> asMap() {
+        // It is safe to expose the underlying map because it disallows null keys and values
+        return members;
+    }
+
     @Override
     public boolean equals(Object o) {
-        return (o == this) || (o instanceof Json5Object
-                && ((Json5Object) o).members.equals(members));
+        if (o == null || getClass() != o.getClass()) return false;
+        if (!super.equals(o)) return false;
+        Json5Object that = (Json5Object) o;
+        return Objects.equals(members, that.members);
     }
 
     @Override
     public int hashCode() {
-        return members.hashCode();
+        return Objects.hash(super.hashCode(), members);
     }
-}
\ No newline at end of file
+}

From edc98ed423b6f7c4e248bde33af88f2afbd4a0f3 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Tue, 16 Sep 2025 23:35:32 +0200
Subject: [PATCH 12/48] feat: make getter for RadixNumber public

---
 src/main/java/de/marhali/json5/Json5Element.java   | 14 ++++++++++++++
 src/main/java/de/marhali/json5/Json5Primitive.java |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/marhali/json5/Json5Element.java b/src/main/java/de/marhali/json5/Json5Element.java
index d778c77..341bb4d 100644
--- a/src/main/java/de/marhali/json5/Json5Element.java
+++ b/src/main/java/de/marhali/json5/Json5Element.java
@@ -18,6 +18,7 @@
 package de.marhali.json5;
 
 import de.marhali.json5.config.Json5Options;
+import de.marhali.json5.internal.RadixNumber;
 import de.marhali.json5.stream.Json5Writer;
 
 import java.io.IOException;
@@ -205,6 +206,19 @@ public Number getAsNumber() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
     }
 
+    /**
+     * Convenience method to get this element as a {@link RadixNumber}.
+     *
+     * @return this element as a {@link RadixNumber}.
+     * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
+     *     Json5Array}, or cannot be converted to a radix number.
+     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
+     *     more than a single element.
+     */
+    public RadixNumber getAsRadixNumber() {
+        throw new UnsupportedOperationException(getClass().getSimpleName());
+    }
+
     /**
      * Convenience method to get this element as a string value.
      *
diff --git a/src/main/java/de/marhali/json5/Json5Primitive.java b/src/main/java/de/marhali/json5/Json5Primitive.java
index 7269df8..a2457a1 100644
--- a/src/main/java/de/marhali/json5/Json5Primitive.java
+++ b/src/main/java/de/marhali/json5/Json5Primitive.java
@@ -198,12 +198,12 @@ public boolean isNumber() {
         return value instanceof RadixNumber;
     }
 
-    private RadixNumber getAsRadixNumber() {
+    @Override
+    public RadixNumber getAsRadixNumber() {
         if (isNumber()) {
             return (RadixNumber) value;
         }
         throw new UnsupportedOperationException("Primitive is not a number");
-
     }
 
     public int getNumberRadix() {

From 0d28086c3ee1be59f105c3e68cc5370550b94000 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Tue, 16 Sep 2025 23:39:07 +0200
Subject: [PATCH 13/48] feat(breaking): update json5 array to latest update
 from gson and add support for comments

---
 .../java/de/marhali/json5/Json5Array.java     | 342 +++++++++++-------
 1 file changed, 210 insertions(+), 132 deletions(-)

diff --git a/src/main/java/de/marhali/json5/Json5Array.java b/src/main/java/de/marhali/json5/Json5Array.java
index 86349e9..b0dbb91 100644
--- a/src/main/java/de/marhali/json5/Json5Array.java
+++ b/src/main/java/de/marhali/json5/Json5Array.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2008 Google Inc.
- * Copyright (C) 2022 Marcel Haßlinger
+ * Copyright (C) 2022 - 2025 Marcel Haßlinger
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,48 +17,61 @@
 
 package de.marhali.json5;
 
+import de.marhali.json5.internal.NonNullElementWrapperList;
+import de.marhali.json5.internal.RadixNumber;
+
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * A class representing an array type in Json5. An array is a list of {@link Json5Element}s each of
  * which can be of a different type. This is an ordered list, meaning that the order in which
- * elements are added is preserved.
+ * elements are added is preserved. This class does not support {@code null} values. If {@code null}
+ * is provided as element argument to any of the methods, it is converted to a {@link Json5Null}.
+ *
+ * <p>{@code Json5Array} only implements the {@link Iterable} interface but not the {@link List}
+ * interface. A {@code List} view of it can be obtained with {@link #asList()}.
+ *
+ * <p>See the {@link Json5} documentation for details on how to convert {@code Json5Array} and
+ * generally any {@code Json5Element} from and to Json5.
  *
- * @author Marcel Haßlinger
  * @author Inderjeet Singh
  * @author Joel Leitch
+ * @author Marcel Haßlinger
  */
 public final class Json5Array extends Json5Element implements Iterable<Json5Element> {
-    private final List<Json5Element> elements;
+    private final ArrayList<Json5Element> elements;
 
-    /**
-     * Creates an empty Json5Array.
-     */
+    /** Creates an empty Json5Array. */
     public Json5Array() {
-        elements = new ArrayList<Json5Element>();
+        elements = new ArrayList<>();
     }
 
+    /**
+     * Creates an empty Json5Array with the desired initial capacity.
+     *
+     * @param capacity initial capacity.
+     * @throws IllegalArgumentException if the {@code capacity} is negative
+     */
     public Json5Array(int capacity) {
-        elements = new ArrayList<Json5Element>(capacity);
+        elements = new ArrayList<>(capacity);
     }
 
     /**
-     * Creates a deep copy of this element and all its children
+     * Creates a deep copy of this element and all its children.
      */
     @Override
     public Json5Array deepCopy() {
-        if (!elements.isEmpty()) {
-            Json5Array result = new Json5Array(elements.size());
-            for (Json5Element element : elements) {
-                result.add(element.deepCopy());
-            }
-            return result;
+        Json5Array result = new Json5Array(elements.size());
+        for (Json5Element element : elements) {
+            result.add(element.deepCopy());
         }
-        return new Json5Array();
+        result.setComment(comment);
+        return result;
     }
 
     /**
@@ -67,7 +80,7 @@ public Json5Array deepCopy() {
      * @param bool the boolean that needs to be added to the array.
      */
     public void add(Boolean bool) {
-        elements.add(bool == null ? Json5Null.INSTANCE : new Json5Boolean(bool));
+        elements.add(bool == null ? new Json5Null() : Json5Primitive.fromBoolean(bool));
     }
 
     /**
@@ -76,7 +89,7 @@ public void add(Boolean bool) {
      * @param character the character that needs to be added to the array.
      */
     public void add(Character character) {
-        elements.add(character == null ? Json5Null.INSTANCE : new Json5String(character.toString()));
+        elements.add(character == null ? new Json5Null() : Json5Primitive.fromCharacter(character));
     }
 
     /**
@@ -85,7 +98,11 @@ public void add(Character character) {
      * @param number the number that needs to be added to the array.
      */
     public void add(Number number) {
-        elements.add(number == null ? Json5Null.INSTANCE : new Json5Number(number));
+        elements.add(number == null ? new Json5Null() : Json5Primitive.fromNumber(number));
+    }
+
+    public void add(Number number, int radix) {
+        elements.add(number == null ? new Json5Null() : Json5Primitive.fromNumber(number, radix));
     }
 
     /**
@@ -94,7 +111,7 @@ public void add(Number number) {
      * @param string the string that needs to be added to the array.
      */
     public void add(String string) {
-        elements.add(string == null ? Json5Null.INSTANCE : new Json5String(string));
+        elements.add(string == null ? new Json5Null() : Json5Primitive.fromString(string));
     }
 
     /**
@@ -104,7 +121,7 @@ public void add(String string) {
      */
     public void add(Json5Element element) {
         if (element == null) {
-            element = Json5Null.INSTANCE;
+            element = new Json5Null();
         }
         elements.add(element);
     }
@@ -120,19 +137,20 @@ public void addAll(Json5Array array) {
 
     /**
      * Replaces the element at the specified position in this array with the specified element.
-     *   Element can be null.
+     *
      * @param index index of the element to replace
      * @param element element to be stored at the specified position
      * @return the element previously at the specified position
      * @throws IndexOutOfBoundsException if the specified index is outside the array bounds
      */
     public Json5Element set(int index, Json5Element element) {
-        return elements.set(index, element);
+        return elements.set(index, element == null ? new Json5Null() : element);
     }
 
     /**
-     * Removes the first occurrence of the specified element from this array, if it is present.
-     * If the array does not contain the element, it is unchanged.
+     * Removes the first occurrence of the specified element from this array, if it is present. If the
+     * array does not contain the element, it is unchanged.
+     *
      * @param element element to be removed from this array, if present
      * @return true if this array contained the specified element, false otherwise
      */
@@ -141,9 +159,10 @@ public boolean remove(Json5Element element) {
     }
 
     /**
-     * Removes the element at the specified position in this array. Shifts any subsequent elements
-     * to the left (subtracts one from their indices). Returns the element that was removed from
-     * the array.
+     * Removes the element at the specified position in this array. Shifts any subsequent elements to
+     * the left (subtracts one from their indices). Returns the element that was removed from the
+     * array.
+     *
      * @param index index the index of the element to be removed
      * @return the element previously at the specified position
      * @throws IndexOutOfBoundsException if the specified index is outside the array bounds
@@ -154,6 +173,7 @@ public Json5Element remove(int index) {
 
     /**
      * Returns true if this array contains the specified element.
+     *
      * @return true if this array contains the specified element.
      * @param element whose presence in this array is to be tested
      */
@@ -171,9 +191,9 @@ public int size() {
     }
 
     /**
-     * Returns true if the array is empty
+     * Returns true if the array is empty.
      *
-     * @return true if the array is empty
+     * @return true if the array is empty.
      */
     public boolean isEmpty() {
         return elements.isEmpty();
@@ -185,197 +205,255 @@ public boolean isEmpty() {
      *
      * @return an iterator to navigate the elements of the array.
      */
+    @Override
     public Iterator<Json5Element> iterator() {
         return elements.iterator();
     }
 
     /**
-     * Returns the ith element of the array.
+     * Returns the i-th element of the array.
      *
      * @param i the index of the element that is being sought.
-     * @return the element present at the ith index.
-     * @throws IndexOutOfBoundsException if i is negative or greater than or equal to the
-     * {@link #size()} of the array.
+     * @return the element present at the i-th index.
+     * @throws IndexOutOfBoundsException if {@code i} is negative or greater than or equal to the
+     *     {@link #size()} of the array.
      */
     public Json5Element get(int i) {
         return elements.get(i);
     }
 
+    private Json5Element getAsSingleElement() {
+        int size = elements.size();
+        if (size == 1) {
+            return elements.get(0);
+        }
+        throw new IllegalStateException("Array must have size 1, but has size " + size);
+    }
+
+    @Override
+    public Json5Null getAsJson5Null() {
+        return getAsSingleElement().getAsJson5Null();
+    }
+
     /**
-     * convenience method to get this array as a {@link Number} if it contains a single element.
+     * Convenience method to get this array as a {@link Number} if it contains a single element. This
+     * method calls {@link Json5Element#getAsNumber()} on the element, therefore any of the exceptions
+     * declared by that method can occur.
      *
-     * @return get this element as a number if it is single element array.
-     * @throws ClassCastException if the element in the array is of not a {@link Json5Primitive} and
-     * is not a valid Number.
-     * @throws IllegalStateException if the array has more than one element.
+     * @return this element as a number if it is single element array.
+     * @throws IllegalStateException if the array is empty or has more than one element.
      */
     @Override
     public Number getAsNumber() {
-        if (elements.size() == 1) {
-            return elements.get(0).getAsNumber();
-        }
-        throw new IllegalStateException();
+        return getAsSingleElement().getAsNumber();
     }
 
     /**
-     * convenience method to get this array as a {@link String} if it contains a single element.
+     * Convenience method to get this array as a {@link RadixNumber} if it contains a single element. This
+     * method calls {@link Json5Element#getAsRadixNumber()} on the element, therefore any of the exceptions
+     * declared by that method can occur.
      *
-     * @return get this element as a String if it is single element array.
-     * @throws ClassCastException if the element in the array is of not a {@link Json5Primitive} and
-     * is not a valid String.
-     * @throws IllegalStateException if the array has more than one element.
+     * @return this element as a radix number if it is single element array.
+     * @throws IllegalStateException if the array is empty or has more than one element.
+     */
+    @Override
+    public RadixNumber getAsRadixNumber() {
+        return getAsSingleElement().getAsRadixNumber();
+    }
+
+    /**
+     * Convenience method to get this array as a binary number string if it contains a single element. This
+     * method calls {@link Json5Element#getAsBinaryString()} on the element, therefore any of the exceptions
+     * declared by that method can occur.
+     *
+     * @return this element as a binary number string if it is single element array.
+     * @throws IllegalStateException if the array is empty or has more than one element.
+     */
+    @Override
+    public String getAsBinaryString() {
+        return getAsSingleElement().getAsBinaryString();
+    }
+
+    /**
+     * Convenience method to get this array as a octal number string if it contains a single element. This
+     * method calls {@link Json5Element#getAsOctalString()} on the element, therefore any of the exceptions
+     * declared by that method can occur.
+     *
+     * @return this element as a octal number string if it is single element array.
+     * @throws IllegalStateException if the array is empty or has more than one element.
+     */
+    @Override
+    public String getAsOctalString() {
+        return getAsSingleElement().getAsOctalString();
+    }
+
+    /**
+     * Convenience method to get this array as a hex number string if it contains a single element. This
+     * method calls {@link Json5Element#getAsHexString()} on the element, therefore any of the exceptions
+     * declared by that method can occur.
+     *
+     * @return this element as a hex number string if it is single element array.
+     * @throws IllegalStateException if the array is empty or has more than one element.
+     */
+    @Override
+    public String getAsHexString() {
+        return getAsSingleElement().getAsHexString();
+    }
+
+    /**
+     * Convenience method to get this array as a {@link String} if it contains a single element. This
+     * method calls {@link Json5Element#getAsString()} on the element, therefore any of the exceptions
+     * declared by that method can occur.
+     *
+     * @return this element as a String if it is single element array.
+     * @throws IllegalStateException if the array is empty or has more than one element.
      */
     @Override
     public String getAsString() {
-        if (elements.size() == 1) {
-            return elements.get(0).getAsString();
-        }
-        throw new IllegalStateException();
+        return getAsSingleElement().getAsString();
     }
 
     /**
-     * convenience method to get this array as a double if it contains a single element.
+     * Convenience method to get this array as a double if it contains a single element. This method
+     * calls {@link Json5Element#getAsDouble()} on the element, therefore any of the exceptions
+     * declared by that method can occur.
      *
-     * @return get this element as a double if it is single element array.
-     * @throws ClassCastException if the element in the array is of not a {@link Json5Primitive} and
-     * is not a valid double.
-     * @throws IllegalStateException if the array has more than one element.
+     * @return this element as a double if it is single element array.
+     * @throws IllegalStateException if the array is empty or has more than one element.
      */
     @Override
     public double getAsDouble() {
-        if (elements.size() == 1) {
-            return elements.get(0).getAsDouble();
-        }
-        throw new IllegalStateException();
+        return getAsSingleElement().getAsDouble();
     }
 
     /**
-     * convenience method to get this array as a {@link BigDecimal} if it contains a single element.
+     * Convenience method to get this array as a {@link BigDecimal} if it contains a single element.
+     * This method calls {@link Json5Element#getAsBigDecimal()} on the element, therefore any of the
+     * exceptions declared by that method can occur.
      *
-     * @return get this element as a {@link BigDecimal} if it is single element array.
-     * @throws ClassCastException if the element in the array is of not a {@link Json5Primitive}.
-     * @throws NumberFormatException if the element at index 0 is not a valid {@link BigDecimal}.
-     * @throws IllegalStateException if the array has more than one element.
+     * @return this element as a {@link BigDecimal} if it is single element array.
+     * @throws IllegalStateException if the array is empty or has more than one element.
      */
     @Override
     public BigDecimal getAsBigDecimal() {
-        if (elements.size() == 1) {
-            return elements.get(0).getAsBigDecimal();
-        }
-        throw new IllegalStateException();
+        return getAsSingleElement().getAsBigDecimal();
     }
 
     /**
-     * convenience method to get this array as a {@link BigInteger} if it contains a single element.
+     * Convenience method to get this array as a {@link BigInteger} if it contains a single element.
+     * This method calls {@link Json5Element#getAsBigInteger()} on the element, therefore any of the
+     * exceptions declared by that method can occur.
      *
-     * @return get this element as a {@link BigInteger} if it is single element array.
-     * @throws ClassCastException if the element in the array is of not a {@link Json5Primitive}.
-     * @throws NumberFormatException if the element at index 0 is not a valid {@link BigInteger}.
-     * @throws IllegalStateException if the array has more than one element.
+     * @return this element as a {@link BigInteger} if it is single element array.
+     * @throws IllegalStateException if the array is empty or has more than one element.
      */
     @Override
     public BigInteger getAsBigInteger() {
-        if (elements.size() == 1) {
-            return elements.get(0).getAsBigInteger();
-        }
-        throw new IllegalStateException();
+        return getAsSingleElement().getAsBigInteger();
     }
 
     /**
-     * convenience method to get this array as a float if it contains a single element.
+     * Convenience method to get this array as a float if it contains a single element. This method
+     * calls {@link Json5Element#getAsFloat()} on the element, therefore any of the exceptions declared
+     * by that method can occur.
      *
-     * @return get this element as a float if it is single element array.
-     * @throws ClassCastException if the element in the array is of not a {@link Json5Primitive} and
-     * is not a valid float.
-     * @throws IllegalStateException if the array has more than one element.
+     * @return this element as a float if it is single element array.
+     * @throws IllegalStateException if the array is empty or has more than one element.
      */
     @Override
     public float getAsFloat() {
-        if (elements.size() == 1) {
-            return elements.get(0).getAsFloat();
-        }
-        throw new IllegalStateException();
+        return getAsSingleElement().getAsFloat();
     }
 
     /**
-     * convenience method to get this array as a long if it contains a single element.
+     * Convenience method to get this array as a long if it contains a single element. This method
+     * calls {@link Json5Element#getAsLong()} on the element, therefore any of the exceptions declared
+     * by that method can occur.
      *
-     * @return get this element as a long if it is single element array.
-     * @throws ClassCastException if the element in the array is of not a {@link Json5Primitive} and
-     * is not a valid long.
-     * @throws IllegalStateException if the array has more than one element.
+     * @return this element as a long if it is single element array.
+     * @throws IllegalStateException if the array is empty or has more than one element.
      */
     @Override
     public long getAsLong() {
-        if (elements.size() == 1) {
-            return elements.get(0).getAsLong();
-        }
-        throw new IllegalStateException();
+        return getAsSingleElement().getAsLong();
     }
 
     /**
-     * convenience method to get this array as an integer if it contains a single element.
+     * Convenience method to get this array as an integer if it contains a single element. This method
+     * calls {@link Json5Element#getAsInt()} on the element, therefore any of the exceptions declared
+     * by that method can occur.
      *
-     * @return get this element as an integer if it is single element array.
-     * @throws ClassCastException if the element in the array is of not a {@link Json5Primitive} and
-     * is not a valid integer.
-     * @throws IllegalStateException if the array has more than one element.
+     * @return this element as an integer if it is single element array.
+     * @throws IllegalStateException if the array is empty or has more than one element.
      */
     @Override
     public int getAsInt() {
-        if (elements.size() == 1) {
-            return elements.get(0).getAsInt();
-        }
-        throw new IllegalStateException();
+        return getAsSingleElement().getAsInt();
     }
 
+    /**
+     * Convenience method to get this array as a primitive byte if it contains a single element. This
+     * method calls {@link Json5Element#getAsByte()} on the element, therefore any of the exceptions
+     * declared by that method can occur.
+     *
+     * @return this element as a primitive byte if it is single element array.
+     * @throws IllegalStateException if the array is empty or has more than one element.
+     */
     @Override
     public byte getAsByte() {
-        if (elements.size() == 1) {
-            return elements.get(0).getAsByte();
-        }
-        throw new IllegalStateException();
+        return getAsSingleElement().getAsByte();
     }
 
     /**
-     * convenience method to get this array as a primitive short if it contains a single element.
+     * Convenience method to get this array as a primitive short if it contains a single element. This
+     * method calls {@link Json5Element#getAsShort()} on the element, therefore any of the exceptions
+     * declared by that method can occur.
      *
-     * @return get this element as a primitive short if it is single element array.
-     * @throws ClassCastException if the element in the array is of not a {@link Json5Primitive} and
-     * is not a valid short.
-     * @throws IllegalStateException if the array has more than one element.
+     * @return this element as a primitive short if it is single element array.
+     * @throws IllegalStateException if the array is empty or has more than one element.
      */
     @Override
     public short getAsShort() {
-        if (elements.size() == 1) {
-            return elements.get(0).getAsShort();
-        }
-        throw new IllegalStateException();
+        return getAsSingleElement().getAsShort();
     }
 
     /**
-     * convenience method to get this array as a boolean if it contains a single element.
+     * Convenience method to get this array as a boolean if it contains a single element. This method
+     * calls {@link Json5Element#getAsBoolean()} on the element, therefore any of the exceptions
+     * declared by that method can occur.
      *
-     * @return get this element as a boolean if it is single element array.
-     * @throws ClassCastException if the element in the array is of not a {@link Json5Primitive} and
-     * is not a valid boolean.
-     * @throws IllegalStateException if the array has more than one element.
+     * @return this element as a boolean if it is single element array.
+     * @throws IllegalStateException if the array is empty or has more than one element.
      */
     @Override
     public boolean getAsBoolean() {
-        if (elements.size() == 1) {
-            return elements.get(0).getAsBoolean();
-        }
-        throw new IllegalStateException();
+        return getAsSingleElement().getAsBoolean();
+    }
+
+    /**
+     * Returns a mutable {@link List} view of this {@code Json5Array}. Changes to the {@code List} are
+     * visible in this {@code Json5Array} and the other way around.
+     *
+     * <p>The {@code List} does not permit {@code null} elements. Unlike {@code Json5Array}'s {@code
+     * null} handling, a {@link NullPointerException} is thrown when trying to add {@code null}. Use
+     * {@link Json5Null} for Json5 null values.
+     *
+     * @return mutable {@code List} view
+     */
+    public List<Json5Element> asList() {
+        return new NonNullElementWrapperList<>(elements);
     }
 
     @Override
     public boolean equals(Object o) {
-        return (o == this) || (o instanceof Json5Array && ((Json5Array) o).elements.equals(elements));
+        if (o == null || getClass() != o.getClass()) return false;
+        if (!super.equals(o)) return false;
+        Json5Array that = (Json5Array) o;
+        return Objects.equals(elements, that.elements);
     }
 
     @Override
     public int hashCode() {
-        return elements.hashCode();
+        return Objects.hash(super.hashCode(), elements);
     }
-}
\ No newline at end of file
+}

From 3a3e837375b1e07024680b36bdad13725eb118af Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Thu, 18 Sep 2025 20:56:15 +0200
Subject: [PATCH 14/48] feat: add support for instant primitives

---
 .../java/de/marhali/json5/Json5Array.java     |  37 ++-
 .../java/de/marhali/json5/Json5Element.java   |  14 +
 .../java/de/marhali/json5/Json5Object.java    |  47 ++-
 .../de/marhali/json5/stream/Json5Lexer.java   |   2 +-
 .../de/marhali/json5/stream/Json5Writer.java  |  32 ++
 .../java/de/marhali/json5/Json5ArrayTest.java | 312 ++++++++++++++++++
 6 files changed, 421 insertions(+), 23 deletions(-)
 create mode 100644 src/test/java/de/marhali/json5/Json5ArrayTest.java

diff --git a/src/main/java/de/marhali/json5/Json5Array.java b/src/main/java/de/marhali/json5/Json5Array.java
index b0dbb91..78c8bf4 100644
--- a/src/main/java/de/marhali/json5/Json5Array.java
+++ b/src/main/java/de/marhali/json5/Json5Array.java
@@ -22,6 +22,7 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -74,13 +75,22 @@ public Json5Array deepCopy() {
         return result;
     }
 
+    /**
+     * Adds the specified {@link Instant} to self.
+     *
+     * @param instant the {@link Instant} that needs to be added to the array.
+     */
+    public void add(Instant instant) {
+        elements.add(instant == null ? Json5Primitive.fromNull() : Json5Primitive.fromInstant(instant));
+    }
+
     /**
      * Adds the specified boolean to self.
      *
      * @param bool the boolean that needs to be added to the array.
      */
     public void add(Boolean bool) {
-        elements.add(bool == null ? new Json5Null() : Json5Primitive.fromBoolean(bool));
+        elements.add(bool == null ? Json5Primitive.fromNull() : Json5Primitive.fromBoolean(bool));
     }
 
     /**
@@ -89,7 +99,7 @@ public void add(Boolean bool) {
      * @param character the character that needs to be added to the array.
      */
     public void add(Character character) {
-        elements.add(character == null ? new Json5Null() : Json5Primitive.fromCharacter(character));
+        elements.add(character == null ? Json5Primitive.fromNull() : Json5Primitive.fromCharacter(character));
     }
 
     /**
@@ -98,11 +108,11 @@ public void add(Character character) {
      * @param number the number that needs to be added to the array.
      */
     public void add(Number number) {
-        elements.add(number == null ? new Json5Null() : Json5Primitive.fromNumber(number));
+        elements.add(number == null ? Json5Primitive.fromNull() : Json5Primitive.fromNumber(number));
     }
 
     public void add(Number number, int radix) {
-        elements.add(number == null ? new Json5Null() : Json5Primitive.fromNumber(number, radix));
+        elements.add(number == null ? Json5Primitive.fromNull() : Json5Primitive.fromNumber(number, radix));
     }
 
     /**
@@ -111,7 +121,7 @@ public void add(Number number, int radix) {
      * @param string the string that needs to be added to the array.
      */
     public void add(String string) {
-        elements.add(string == null ? new Json5Null() : Json5Primitive.fromString(string));
+        elements.add(string == null ? Json5Primitive.fromNull() : Json5Primitive.fromString(string));
     }
 
     /**
@@ -121,7 +131,7 @@ public void add(String string) {
      */
     public void add(Json5Element element) {
         if (element == null) {
-            element = new Json5Null();
+            element = Json5Primitive.fromNull();
         }
         elements.add(element);
     }
@@ -144,7 +154,7 @@ public void addAll(Json5Array array) {
      * @throws IndexOutOfBoundsException if the specified index is outside the array bounds
      */
     public Json5Element set(int index, Json5Element element) {
-        return elements.set(index, element == null ? new Json5Null() : element);
+        return elements.set(index, element == null ? Json5Primitive.fromNull() : element);
     }
 
     /**
@@ -417,6 +427,19 @@ public short getAsShort() {
         return getAsSingleElement().getAsShort();
     }
 
+    /**
+     * Convenience method to get this array as a Insta if it contains a single element. This method
+     * calls {@link Json5Element#getAsBoolean()} on the element, therefore any of the exceptions
+     * declared by that method can occur.
+     *
+     * @return this element as a boolean if it is single element array.
+     * @throws IllegalStateException if the array is empty or has more than one element.
+     */
+    @Override
+    public Instant getAsInstant() {
+        return getAsSingleElement().getAsInstant();
+    }
+
     /**
      * Convenience method to get this array as a boolean if it contains a single element. This method
      * calls {@link Json5Element#getAsBoolean()} on the element, therefore any of the exceptions
diff --git a/src/main/java/de/marhali/json5/Json5Element.java b/src/main/java/de/marhali/json5/Json5Element.java
index 341bb4d..78f3449 100644
--- a/src/main/java/de/marhali/json5/Json5Element.java
+++ b/src/main/java/de/marhali/json5/Json5Element.java
@@ -25,6 +25,7 @@
 import java.io.StringWriter;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.time.Instant;
 import java.util.Objects;
 
 /**
@@ -193,6 +194,19 @@ public boolean getAsBoolean() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
     }
 
+    /**
+     * Convenience method to get this element as a {@link Instant} value.
+     *
+     * @return this element as a primitive {@link Instant} value.
+     * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
+     *     Json5Array}.
+     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
+     *     more than a single element.
+     */
+    public Instant getAsInstant() {
+        throw new UnsupportedOperationException(getClass().getSimpleName());
+    }
+
     /**
      * Convenience method to get this element as a {@link Number}.
      *
diff --git a/src/main/java/de/marhali/json5/Json5Object.java b/src/main/java/de/marhali/json5/Json5Object.java
index 061859c..c952371 100644
--- a/src/main/java/de/marhali/json5/Json5Object.java
+++ b/src/main/java/de/marhali/json5/Json5Object.java
@@ -19,6 +19,7 @@
 
 import de.marhali.json5.internal.LinkedTreeMap;
 
+import java.time.Instant;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -43,6 +44,11 @@
 public final class Json5Object extends Json5Element {
     private final LinkedTreeMap<String, Json5Element> members = new LinkedTreeMap<>(false);
 
+    /**
+     * Creates a new instance of a {@link Json5Object}.
+     */
+    public Json5Object() {}
+
     /**
      * Creates a deep copy of this element and all its children.
      */
@@ -59,13 +65,13 @@ public Json5Object deepCopy() {
     /**
      * Adds a member, which is a name-value pair, to self. The name must be a String, but the value
      * can be an arbitrary {@link Json5Element}, thereby allowing you to build a full tree of
-     * Json5Elements rooted at this node.
+     * {@link Json5Element Json5Elements} rooted at this node.
      *
      * @param property name of the member.
      * @param value the member object.
      */
     public void add(String property, Json5Element value) {
-        members.put(property, value == null ? new Json5Null() : value);
+        members.put(property, value == null ? Json5Primitive.fromNull() : value);
     }
 
     /**
@@ -79,6 +85,17 @@ public Json5Element remove(String property) {
         return members.remove(property);
     }
 
+    /**
+     * Convenience method to add a char member. The specified value is converted to a {@link
+     * Json5Primitive} of Character.
+     *
+     * @param property name of the member.
+     * @param value the char value associated with the member.
+     */
+    public void addProperty(String property, Character value) {
+        add(property, value == null ? Json5Primitive.fromNull() : Json5Primitive.fromCharacter(value));
+    }
+
     /**
      * Convenience method to add a string member. The specified value is converted to a {@link
      * Json5Primitive} of String.
@@ -87,7 +104,7 @@ public Json5Element remove(String property) {
      * @param value the string value associated with the member.
      */
     public void addProperty(String property, String value) {
-        add(property, value == null ? new Json5Null() : Json5Primitive.fromString(value));
+        add(property, value == null ? Json5Primitive.fromNull() : Json5Primitive.fromString(value));
     }
 
     /**
@@ -98,33 +115,33 @@ public void addProperty(String property, String value) {
      * @param value the number value associated with the member.
      */
     public void addProperty(String property, Number value) {
-        add(property, value == null ? new Json5Null() : Json5Primitive.fromNumber(value));
+        add(property, value == null ? Json5Primitive.fromNull() : Json5Primitive.fromNumber(value));
     }
 
     public void addProperty(String property, Number value, int radix) {
-        add(property, value == null ? new Json5Null() : Json5Primitive.fromNumber(value, radix));
+        add(property, value == null ? Json5Primitive.fromNull() : Json5Primitive.fromNumber(value, radix));
     }
 
     /**
-     * Convenience method to add a boolean member. The specified value is converted to a {@link
-     * Json5Primitive} of Boolean.
+     * Convenience method to add a {@link Instant} member. The specified value is converted to a {@link
+     * Json5Primitive} of {@link Instant}.
      *
      * @param property name of the member.
-     * @param value the boolean value associated with the member.
+     * @param value the {@link Instant} value associated with the member.
      */
-    public void addProperty(String property, Boolean value) {
-        add(property, value == null ? new Json5Null() : Json5Primitive.fromBoolean(value));
+    public void addProperty(String property, Instant value) {
+        add(property, value == null ? Json5Primitive.fromNull() : Json5Primitive.fromInstant(value));
     }
 
     /**
-     * Convenience method to add a char member. The specified value is converted to a {@link
-     * Json5Primitive} of Character.
+     * Convenience method to add a boolean member. The specified value is converted to a {@link
+     * Json5Primitive} of Boolean.
      *
      * @param property name of the member.
-     * @param value the char value associated with the member.
+     * @param value the boolean value associated with the member.
      */
-    public void addProperty(String property, Character value) {
-        add(property, value == null ? new Json5Null() : Json5Primitive.fromCharacter(value));
+    public void addProperty(String property, Boolean value) {
+        add(property, value == null ? Json5Primitive.fromNull() : Json5Primitive.fromBoolean(value));
     }
 
     /**
diff --git a/src/main/java/de/marhali/json5/stream/Json5Lexer.java b/src/main/java/de/marhali/json5/stream/Json5Lexer.java
index bf760b4..f67287c 100644
--- a/src/main/java/de/marhali/json5/stream/Json5Lexer.java
+++ b/src/main/java/de/marhali/json5/stream/Json5Lexer.java
@@ -621,7 +621,7 @@ public Json5Element nextValue() {
             throw syntaxError("Expected value, got EOF instead");
 
         if (string.equals("null"))
-            return new Json5Null();
+            return Json5Primitive.fromNull();
 
         if (string.equals("true"))
             return Json5Primitive.fromBoolean(true);
diff --git a/src/main/java/de/marhali/json5/stream/Json5Writer.java b/src/main/java/de/marhali/json5/stream/Json5Writer.java
index 5f166c8..7e00641 100644
--- a/src/main/java/de/marhali/json5/stream/Json5Writer.java
+++ b/src/main/java/de/marhali/json5/stream/Json5Writer.java
@@ -161,6 +161,15 @@ public void writePrimitive(Json5Primitive primitive) throws IOException {
 
         if (primitive.isString()) {
             writer.append(quote(primitive.getAsString()));
+        } else if (primitive.isInstant()) {
+            var instant = primitive.getAsInstant();
+            if (options.isStringifyUnixInstants()) {
+                writer.write(String.valueOf(instant.getEpochSecond()));
+            } else {
+                writer.write(quote(instant.toString()));
+            }
+        } else if (primitive.isNumber()) {
+            writer.append(formatNumberString(primitive.getAsString()));
         } else {
             writer.append(primitive.getAsString());
         }
@@ -264,6 +273,29 @@ public void writeArray(Json5Array array, int depth) throws IOException {
         writer.append(']');
     }
 
+    public String applyNumberSeparator(String numberString, char separator) {
+        StringBuilder sb = new StringBuilder(numberString);
+        int len = sb.length();
+
+        for (int i = len - 3; i > 0; i -= 3) {
+            sb.insert(i, separator);
+        }
+
+        return sb.toString();
+    }
+
+    public String formatNumberString(String numberString) {
+        var strategy = options.getDigitSeparatorStrategy();
+        switch (strategy) {
+            case JAVA_STYLE:
+                return applyNumberSeparator(numberString, '_');
+            case C_STYLE:
+                return applyNumberSeparator(numberString, '\'');
+            default:
+                return numberString;
+        }
+    }
+
     public String quoteKey(String key) {
         if (options.isQuoteless() && EcmaScriptIdentifier.isValid(key)) {
             return key;
diff --git a/src/test/java/de/marhali/json5/Json5ArrayTest.java b/src/test/java/de/marhali/json5/Json5ArrayTest.java
new file mode 100644
index 0000000..5cab78e
--- /dev/null
+++ b/src/test/java/de/marhali/json5/Json5ArrayTest.java
@@ -0,0 +1,312 @@
+/*
+ * Copyright (C) 2022 - 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Instant;
+import java.util.Iterator;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class Json5ArrayTest {
+    @Test
+    void constructors_and_capacity_validation() {
+        assertDoesNotThrow(() -> new Json5Array());
+        assertDoesNotThrow(() -> new Json5Array(4));
+        assertThrows(IllegalArgumentException.class, () -> new Json5Array(-1));
+    }
+
+    @Nested
+    class AddOverloadsAndNullConversions {
+
+        @Test
+        void add_Instant_boolean_char_number_string_element_and_nulls() {
+            Json5Array arr = new Json5Array();
+
+            arr.add(Instant.EPOCH);
+            arr.add(true);
+            arr.add('X');
+            arr.add(123);
+            arr.add("hi");
+
+            // nulls -> Json5Null
+            arr.add((Instant) null);
+            arr.add((Boolean) null);
+            arr.add((Character) null);
+            arr.add((Number) null);
+            arr.add((String) null);
+            arr.add((Json5Element) null); // generic add null
+
+            assertEquals(11, arr.size());
+            assertEquals(Json5Primitive.fromInstant(Instant.EPOCH), arr.get(0));
+            assertEquals(Json5Primitive.fromBoolean(true), arr.get(1));
+            assertEquals(Json5Primitive.fromCharacter('X'), arr.get(2));
+            assertEquals(Json5Primitive.fromNumber(123), arr.get(3));
+            assertEquals(Json5Primitive.fromString("hi"), arr.get(4));
+
+            assertEquals(Json5Primitive.fromNull(), arr.get(5));
+            assertEquals(Json5Primitive.fromNull(), arr.get(6));
+            assertEquals(Json5Primitive.fromNull(), arr.get(7));
+            assertEquals(Json5Primitive.fromNull(), arr.get(8));
+            assertEquals(Json5Primitive.fromNull(), arr.get(9));
+        }
+
+        @Test
+        void add_number_with_radix() {
+            Json5Array arr = new Json5Array();
+            arr.add(255, 16);
+            assertEquals(Json5Primitive.fromNumber(255, 16), arr.get(0));
+        }
+
+        @Test
+        void addAll_appends_in_order() {
+            Json5Array a = new Json5Array();
+            a.add(1);
+            a.add(2);
+
+            Json5Array b = new Json5Array();
+            b.add(3);
+            b.add(4);
+
+            a.addAll(b);
+            assertEquals(4, a.size());
+            assertEquals(Json5Primitive.fromNumber(1), a.get(0));
+            assertEquals(Json5Primitive.fromNumber(2), a.get(1));
+            assertEquals(Json5Primitive.fromNumber(3), a.get(2));
+            assertEquals(Json5Primitive.fromNumber(4), a.get(3));
+        }
+    }
+
+    @Nested
+    class SetRemoveContainsAndGet {
+
+        @Test
+        void set_replaces_and_returns_previous_converts_null() {
+            Json5Array arr = new Json5Array();
+            arr.add("a");
+            arr.add("b");
+
+            Json5Element previous = arr.set(1, Json5Primitive.fromNumber(7));
+            assertEquals(Json5Primitive.fromString("b"), previous);
+            assertEquals(Json5Primitive.fromNumber(7), arr.get(1));
+
+            // set null -> Json5Null
+            previous = arr.set(0, null);
+            assertEquals(Json5Primitive.fromString("a"), previous);
+            assertEquals(Json5Primitive.fromNull(), arr.get(0));
+        }
+
+        @Test
+        void remove_by_element_and_index_and_contains() {
+            Json5Array arr = new Json5Array();
+            Json5Element one = Json5Primitive.fromNumber(1);
+            arr.add(one);
+            arr.add(one.deepCopy()); // same value, other instance
+            arr.add("x");
+
+            assertTrue(arr.contains(Json5Primitive.fromNumber(1)));
+            assertEquals(3, arr.size());
+
+            // remove(element) remove first occurrence
+            boolean removed = arr.remove(Json5Primitive.fromNumber(1));
+            assertTrue(removed);
+            assertEquals(2, arr.size());
+            assertEquals(Json5Primitive.fromNumber(1), arr.get(0)); // second element stays
+            assertEquals(Json5Primitive.fromString("x"), arr.get(1));
+
+            // remove(index)
+            Json5Element rem = arr.remove(0);
+            assertEquals(Json5Primitive.fromNumber(1), rem);
+            assertEquals(1, arr.size());
+            assertEquals(Json5Primitive.fromString("x"), arr.get(0));
+
+            // remove not existing
+            assertFalse(arr.remove(Json5Primitive.fromBoolean(true)));
+        }
+
+        @Test
+        void get_and_bounds() {
+            Json5Array arr = new Json5Array();
+            arr.add("a");
+            assertEquals(Json5Primitive.fromString("a"), arr.get(0));
+            assertThrows(IndexOutOfBoundsException.class, () -> arr.get(-1));
+            assertThrows(IndexOutOfBoundsException.class, () -> arr.get(1));
+            assertThrows(IndexOutOfBoundsException.class, () -> arr.remove(1));
+            assertThrows(IndexOutOfBoundsException.class, () -> arr.set(1, Json5Primitive.fromNull()));
+        }
+
+        @Test
+        void size_and_isEmpty_and_iterator_order() {
+            Json5Array arr = new Json5Array();
+            assertTrue(arr.isEmpty());
+            assertEquals(0, arr.size());
+
+            arr.add(10);
+            arr.add(20);
+            arr.add(30);
+
+            assertFalse(arr.isEmpty());
+            assertEquals(3, arr.size());
+
+            Iterator<Json5Element> it = arr.iterator();
+            assertTrue(it.hasNext());
+            assertEquals(Json5Primitive.fromNumber(10), it.next());
+            assertEquals(Json5Primitive.fromNumber(20), it.next());
+            assertEquals(Json5Primitive.fromNumber(30), it.next());
+            assertFalse(it.hasNext());
+        }
+    }
+
+    @Nested
+    class SingleElementGetters {
+
+        @Test
+        void getters_throw_if_not_singleton() {
+            Json5Array empty = new Json5Array();
+            Json5Array multi = new Json5Array();
+            multi.add(1);
+            multi.add(2);
+
+            assertAll(
+                () -> assertThrows(IllegalStateException.class, empty::getAsBoolean),
+                () -> assertThrows(IllegalStateException.class, empty::getAsString),
+                () -> assertThrows(IllegalStateException.class, multi::getAsNumber),
+                () -> assertThrows(IllegalStateException.class, multi::getAsJson5Null)
+            );
+        }
+
+        @Test
+        void getters_delegate_when_singleton_primitive_number() {
+            Json5Primitive prim = Json5Primitive.fromNumber(42);
+            Json5Array arr = new Json5Array();
+            arr.add(prim);
+
+            assertEquals(42, arr.getAsInt());
+            assertEquals(42L, arr.getAsLong());
+            assertEquals(42.0, arr.getAsDouble());
+            assertEquals((short) 42, arr.getAsShort());
+            assertEquals((byte) 42, arr.getAsByte());
+            assertEquals(42.0f, arr.getAsFloat());
+            assertEquals(new BigInteger("42"), arr.getAsBigInteger());
+            assertEquals(new BigDecimal("42"), arr.getAsBigDecimal());
+            assertEquals("42", arr.getAsString());
+            assertFalse(arr.getAsBoolean());
+        }
+
+        @Test
+        void getters_delegate_radix_and_null_and_boolean() {
+            Json5Array radix = new Json5Array();
+            radix.add(255, 16);
+            assertEquals(radix.get(0).getAsHexString(), radix.getAsHexString());
+            assertEquals(radix.get(0).getAsOctalString(), radix.getAsOctalString());
+            assertEquals(radix.get(0).getAsBinaryString(), radix.getAsBinaryString());
+            assertEquals(radix.get(0).getAsRadixNumber().toString(),
+                radix.getAsRadixNumber().toString());
+
+            Json5Array nul = new Json5Array();
+            nul.add((String) null);
+            assertEquals(Json5Primitive.fromNull(), nul.getAsJson5Null());
+
+            Json5Array bool = new Json5Array();
+            bool.add(true);
+            assertTrue(bool.getAsBoolean());
+        }
+    }
+
+    @Nested
+    class ListView {
+
+        @Test
+        void asList_is_mutable_and_bidirectional_and_disallows_nulls() {
+            Json5Array arr = new Json5Array();
+            arr.add("a");
+
+            List<Json5Element> view = arr.asList();
+
+            view.add(Json5Primitive.fromNumber(7));
+            assertEquals(2, arr.size());
+            assertEquals(Json5Primitive.fromNumber(7), arr.get(1));
+
+            arr.add(false);
+            assertEquals(Json5Primitive.fromBoolean(false), view.get(2));
+
+            assertThrows(NullPointerException.class, () -> view.add(null));
+        }
+    }
+
+    @Nested
+    class DeepCopyEqualsHashCode {
+
+        @Test
+        void deepCopy_is_deep_and_copies_comment() {
+            Json5Array original = new Json5Array();
+            original.add(1);
+            Json5Array inner = new Json5Array();
+            inner.add("x");
+            original.add(inner);
+            original.setComment("note!");
+
+            Json5Array copy = original.deepCopy();
+
+            assertNotSame(original, copy);
+            assertNotSame(original.get(1), copy.get(1)); // inner array deep-copied
+            assertEquals(original, copy);
+            assertEquals(original.hashCode(), copy.hashCode());
+            assertEquals("note!", copy.getComment());
+
+            // independent mutation
+            ((Json5Array) copy.get(1)).set(0, Json5Primitive.fromString("changed"));
+            assertNotEquals(original, copy);
+        }
+
+        @Test
+        void equals_and_hashCode_contract() {
+            Json5Array a = new Json5Array();
+            a.add(1);
+            a.add("x");
+
+            Json5Array b = new Json5Array();
+            b.add(1);
+            b.add("x");
+
+            Json5Array c = new Json5Array();
+            c.add(1);
+            c.add("x");
+
+            assertEquals(a, a);           // reflexive
+            assertEquals(a, b);           // symmetric
+            assertEquals(b, a);
+            assertEquals(b, c);           // transitive
+            assertEquals(a, c);
+
+            assertEquals(a.hashCode(), b.hashCode());
+            assertEquals(a.hashCode(), c.hashCode());
+
+            Json5Array d = new Json5Array();
+            d.add(2);
+            assertNotEquals(a, d);
+        }
+    }
+}

From ffe3488c44cdb615241aab9f761d123ca5901c7e Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Thu, 18 Sep 2025 20:56:29 +0200
Subject: [PATCH 15/48] fix: getAsString on Json5Null

---
 src/main/java/de/marhali/json5/Json5Null.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/de/marhali/json5/Json5Null.java b/src/main/java/de/marhali/json5/Json5Null.java
index 705bf9a..4ea29b6 100644
--- a/src/main/java/de/marhali/json5/Json5Null.java
+++ b/src/main/java/de/marhali/json5/Json5Null.java
@@ -33,4 +33,9 @@ public Json5Element deepCopy() {
         copy.setComment(comment);
         return copy;
     }
+
+    @Override
+    public String getAsString() {
+        return "null";
+    }
 }

From 2162978df2835af9edb3253d291c8ef84a8f24de Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Thu, 18 Sep 2025 20:57:13 +0200
Subject: [PATCH 16/48] feat: add more tests

---
 .../java/de/marhali/json5/Json5Primitive.java | 106 ++++-
 .../de/marhali/json5/stream/Json5Parser.java  |   2 +-
 .../java/de/marhali/json5/Json5NullTest.java  |  57 +++
 .../de/marhali/json5/Json5ObjectTest.java     | 287 ++++++++++++++
 .../de/marhali/json5/Json5PrimitiveTest.java  | 367 ++++++++++++++++++
 src/test/java/de/marhali/json5/Json5Test.java | 105 +++++
 .../marhali/json5/e2e/TestResourceHelper.java |  48 +++
 .../failures/DisallowBinaryNumberTest.java    |  42 ++
 .../failures/DisallowCDigitSeparatorTest.java |  42 ++
 .../e2e/failures/DisallowHexFloatingTest.java |  42 ++
 .../e2e/failures/DisallowInfinityTest.java    |  42 ++
 .../DisallowJavaDigitSeparatorTest.java       |  42 ++
 .../json5/e2e/failures/DisallowNaNTest.java   |  41 ++
 .../e2e/failures/DisallowOctalNumberTest.java |  42 ++
 .../json5/fixtures/ToStringFixtures.java      |  42 ++
 .../json5/internal/NumberLimitsTest.java      | 103 +++++
 .../json5/internal/RadixNumberTest.java       |  10 +-
 .../e2e/failures/disallow-Infinity.json5      |   3 +
 .../resources/e2e/failures/disallow-NaN.json5 |   3 +
 .../e2e/failures/disallow-binary-number.json5 |   3 +
 .../failures/disallow-c-digit-separator.json5 |   3 +
 .../e2e/failures/disallow-hex-floating.json5  |   3 +
 .../disallow-java-digit-separator.json5       |   3 +
 .../e2e/failures/disallow-octal-number.json5  |   3 +
 24 files changed, 1425 insertions(+), 16 deletions(-)
 create mode 100644 src/test/java/de/marhali/json5/Json5NullTest.java
 create mode 100644 src/test/java/de/marhali/json5/Json5ObjectTest.java
 create mode 100644 src/test/java/de/marhali/json5/Json5PrimitiveTest.java
 create mode 100644 src/test/java/de/marhali/json5/Json5Test.java
 create mode 100644 src/test/java/de/marhali/json5/e2e/TestResourceHelper.java
 create mode 100644 src/test/java/de/marhali/json5/e2e/failures/DisallowBinaryNumberTest.java
 create mode 100644 src/test/java/de/marhali/json5/e2e/failures/DisallowCDigitSeparatorTest.java
 create mode 100644 src/test/java/de/marhali/json5/e2e/failures/DisallowHexFloatingTest.java
 create mode 100644 src/test/java/de/marhali/json5/e2e/failures/DisallowInfinityTest.java
 create mode 100644 src/test/java/de/marhali/json5/e2e/failures/DisallowJavaDigitSeparatorTest.java
 create mode 100644 src/test/java/de/marhali/json5/e2e/failures/DisallowNaNTest.java
 create mode 100644 src/test/java/de/marhali/json5/e2e/failures/DisallowOctalNumberTest.java
 create mode 100644 src/test/java/de/marhali/json5/fixtures/ToStringFixtures.java
 create mode 100644 src/test/java/de/marhali/json5/internal/NumberLimitsTest.java
 create mode 100644 src/test/resources/e2e/failures/disallow-Infinity.json5
 create mode 100644 src/test/resources/e2e/failures/disallow-NaN.json5
 create mode 100644 src/test/resources/e2e/failures/disallow-binary-number.json5
 create mode 100644 src/test/resources/e2e/failures/disallow-c-digit-separator.json5
 create mode 100644 src/test/resources/e2e/failures/disallow-hex-floating.json5
 create mode 100644 src/test/resources/e2e/failures/disallow-java-digit-separator.json5
 create mode 100644 src/test/resources/e2e/failures/disallow-octal-number.json5

diff --git a/src/main/java/de/marhali/json5/Json5Primitive.java b/src/main/java/de/marhali/json5/Json5Primitive.java
index a2457a1..802d007 100644
--- a/src/main/java/de/marhali/json5/Json5Primitive.java
+++ b/src/main/java/de/marhali/json5/Json5Primitive.java
@@ -23,6 +23,7 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.time.Instant;
 import java.util.Objects;
 
 /**
@@ -40,6 +41,13 @@ public final class Json5Primitive extends Json5Element {
 
     private final Object value;
 
+    /**
+     * Create a primitive containing a {@code null} value.
+     */
+    public static Json5Null fromNull() {
+        return new Json5Null();
+    }
+
     /**
      * Create a primitive containing a boolean value.
      *
@@ -49,6 +57,16 @@ public static Json5Primitive fromBoolean(Boolean bool) {
         return new Json5Primitive(Objects.requireNonNull(bool));
     }
 
+    /**
+     * Create a primitive containing a {@link Instant} value.
+     * @param instant the value to create the primitive with.
+     * <p>
+     * <i>This is an extension that is not compliant to the official Json5 spec.</i>
+     */
+    public static Json5Primitive fromInstant(Instant instant) {
+        return new Json5Primitive(Objects.requireNonNull(instant));
+    }
+
     /**
      * Creates a primitive containing a {@link Number} with specified radix base.
      * If a radix base of {@code 2}, {@code 8} or {@code 16} is set,
@@ -68,7 +86,7 @@ public static Json5Primitive fromNumber(Number number, int radix) {
     }
 
     /**
-     * Create a primitive containing a decimal {@link Number} (radix base 10).
+     * Create a primitive containing a decimal {@link Number} (radix base {@code 10}).
      *
      * @param number the value to create the primitive with.
      */
@@ -76,6 +94,13 @@ public static Json5Primitive fromNumber(Number number) {
         return Json5Primitive.fromNumber(Objects.requireNonNull(number), 10);
     }
 
+    /**
+     * Create a primitive containing a binary number (radix base {@code 2}).
+     * For example {@code +0b1010...}, {@code 0b1010...} or {@code -0b1010...}.
+     * <p>
+     * <i>This is an extension that is not compliant to the official Json5 spec.</i>
+     * @param binaryString the value to create the primitive with.
+     */
     public static Json5Primitive fromBinaryString(String binaryString) {
         Objects.requireNonNull(binaryString);
 
@@ -84,15 +109,25 @@ public static Json5Primitive fromBinaryString(String binaryString) {
         switch (binaryString.charAt(0)) {
             case '+': // +0b...
                 hexInteger = new BigInteger(binaryString.substring(3), 2);
+                break;
             case '-': // -0b...
                 hexInteger = new BigInteger(binaryString.substring(3), 2).negate();
+                break;
             default: // 0b...
                 hexInteger = new BigInteger(binaryString.substring(2), 2);
+                break;
         }
 
         return new Json5Primitive(new RadixNumber(hexInteger, 2));
     }
 
+    /**
+     * Create a primitive containing an octal number (radix base {@code 8}).
+     * For example {@code +0o107...}, {@code 0o107...} or {@code -0o107...}.
+     * <p>
+     * <i>This is an extension that is not compliant to the official Json5 spec.</i>
+     * @param octalString the value to create the primitive with.
+     */
     public static Json5Primitive fromOctalString(String octalString) {
         Objects.requireNonNull(octalString);
 
@@ -101,15 +136,23 @@ public static Json5Primitive fromOctalString(String octalString) {
         switch (octalString.charAt(0)) {
             case '+': // +0b...
                 hexInteger = new BigInteger(octalString.substring(3), 8);
+                break;
             case '-': // -0b...
                 hexInteger = new BigInteger(octalString.substring(3), 8).negate();
+                break;
             default: // 0b...
                 hexInteger = new BigInteger(octalString.substring(2), 8);
+                break;
         }
 
         return new Json5Primitive(new RadixNumber(hexInteger, 8));
     }
 
+    /**
+     * Create a primitive containing a binary number (radix base {@code 16}).
+     * For example {@code +0x09af...}, {@code 0x09af...} or {@code -0x09af...}.
+     * @param hexString the value to create the primitive with.
+     */
     public static Json5Primitive fromHexString(String hexString) {
         Objects.requireNonNull(hexString);
 
@@ -118,10 +161,13 @@ public static Json5Primitive fromHexString(String hexString) {
         switch (hexString.charAt(0)) {
             case '+': // +0x...
                 hexInteger = new BigInteger(hexString.substring(3), 16);
+                break;
             case '-': // -0x...
                 hexInteger = new BigInteger(hexString.substring(3), 16).negate();
+                break;
             default: // 0x...
                 hexInteger = new BigInteger(hexString.substring(2), 16);
+                break;
         }
 
         return new Json5Primitive(new RadixNumber(hexInteger, 16));
@@ -155,6 +201,7 @@ public static Json5Primitive fromCharacter(Character c) {
     private Json5Primitive(Object value) {
         this.value = value;
     }
+
     /**
      * Returns the same value as primitives are immutable.
      */
@@ -189,6 +236,34 @@ public boolean getAsBoolean() {
         return Boolean.parseBoolean(getAsString());
     }
 
+    /**
+     * Check whether this primitive contains a {@link Instant} value.
+     *
+     * @return true if this primitive contains a {@link Instant} value, false otherwise.
+     */
+    public boolean isInstant() {
+        return value instanceof Instant;
+    }
+
+    @Override
+    public Instant getAsInstant() {
+        if (isInstant()) {
+            return (Instant) value;
+        } else if (isString()) {
+            return Instant.parse((String) value);
+        } else if (isNumber()) {
+            var radixNumber = getAsRadixNumber();
+            var number = radixNumber.getNumber();
+
+            if(number instanceof Byte || number instanceof Short || number instanceof Integer || number instanceof Long)
+                return Instant.ofEpochSecond((long) value);
+
+            if (number instanceof BigInteger)
+                return Instant.ofEpochSecond(((BigInteger) number).longValueExact());
+        }
+        throw new UnsupportedOperationException("Primitive is neither a number nor a string");
+    }
+
     /**
      * Check whether this primitive contains a Number.
      *
@@ -211,15 +286,15 @@ public int getNumberRadix() {
     }
 
     public boolean isBinaryNumber() {
-        return getNumberRadix() == 2;
+        return isNumber() && getNumberRadix() == 2;
     }
 
     public boolean isOctalNumber() {
-        return getNumberRadix() == 8;
+        return isNumber() && getNumberRadix() == 8;
     }
 
     public boolean isHexNumber() {
-        return getNumberRadix() == 16;
+        return isNumber() && getNumberRadix() == 16;
     }
 
     /**
@@ -284,19 +359,24 @@ public boolean isString() {
     // Don't add Javadoc, inherit it from super implementation; no exceptions are thrown here
     @Override
     public String getAsString() {
-        if (value instanceof String) {
+        if (isString()) {
             return (String) value;
-        } else if (isBinaryNumber()) {
-            return getAsBinaryString();
-        } else if (isOctalNumber()) {
-            return getAsOctalString();
-        } else if (isHexNumber()) {
-            return getAsHexString();
-        } else if (isNumber()) {
-            return getAsNumber().toString();
+        } else if (isInstant()) {
+            return ((Instant) value).toString();
         } else if (isBoolean()) {
             return ((Boolean) value).toString();
+        } else if (isNumber()) {
+            if (isBinaryNumber()) {
+                return getAsBinaryString();
+            } else if (isOctalNumber()) {
+                return getAsOctalString();
+            } else if (isHexNumber()) {
+                return getAsHexString();
+            } else {
+                return getAsNumber().toString();
+            }
         }
+
         throw new AssertionError("Unexpected value type: " + value.getClass());
     }
 
diff --git a/src/main/java/de/marhali/json5/stream/Json5Parser.java b/src/main/java/de/marhali/json5/stream/Json5Parser.java
index 5126416..7b6a4bc 100644
--- a/src/main/java/de/marhali/json5/stream/Json5Parser.java
+++ b/src/main/java/de/marhali/json5/stream/Json5Parser.java
@@ -82,7 +82,7 @@ public static Json5Element parse(Json5Lexer lexer) {
 
     /**
      * Parses the specified {@link Json5Lexer lexer} into a parse tree of an {@link Json5Object}.
-     * If the provided data does not correspond to a json object a {@link Json5Exception} will be thrown.
+     * If the provided data does not correspond to a {@link Json5Object} a {@link Json5Exception} will be thrown.
      * @param lexer Tokenized json5 data.
      * @return a parse tree of {@link Json5Object} corresponding to the specified JSON5.
      * @see #parse(Json5Lexer)
diff --git a/src/test/java/de/marhali/json5/Json5NullTest.java b/src/test/java/de/marhali/json5/Json5NullTest.java
new file mode 100644
index 0000000..d78ec18
--- /dev/null
+++ b/src/test/java/de/marhali/json5/Json5NullTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5;
+
+import de.marhali.json5.fixtures.ToStringFixtures;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class Json5NullTest {
+    @Test
+    @DisplayName("deepCopy(): it should just copy comment")
+    void test_deepCopy() {
+        Json5Null source = new Json5Null();
+        String sourceComment = "my comment";
+        source.setComment(sourceComment);
+
+        Json5Element copy = source.deepCopy();
+        String newComment = "new comment";
+        source.setComment(newComment);
+
+        assertTrue(copy.isJson5Null());
+        assertEquals(sourceComment, copy.getComment());
+        assertEquals(newComment, source.getComment());
+    }
+
+    @Test
+    @DisplayName("getAsString(): it should return null value")
+    void test_getAsString() {
+        var element = new Json5Null();
+        assertEquals("null", element.getAsString());
+    }
+
+    @Test
+    void test_toString() {
+        var element = new Json5Null();
+        assertEquals("null", element.toString(ToStringFixtures.OPTIONS));
+    }
+}
diff --git a/src/test/java/de/marhali/json5/Json5ObjectTest.java b/src/test/java/de/marhali/json5/Json5ObjectTest.java
new file mode 100644
index 0000000..eb0c704
--- /dev/null
+++ b/src/test/java/de/marhali/json5/Json5ObjectTest.java
@@ -0,0 +1,287 @@
+/*
+ * Copyright (C) 2022 - 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class Json5ObjectTest {
+
+    @Test
+    void add_and_get_and_has_and_size() {
+        Json5Object obj = new Json5Object();
+        assertTrue(obj.isEmpty());
+        assertEquals(0, obj.size());
+
+        obj.add("a", Json5Primitive.fromString("x"));
+        obj.add("b", Json5Primitive.fromNumber(42));
+
+        assertFalse(obj.isEmpty());
+        assertEquals(2, obj.size());
+
+        assertTrue(obj.has("a"));
+        assertTrue(obj.has("b"));
+        assertFalse(obj.has("c"));
+
+        assertEquals(Json5Primitive.fromString("x"), obj.get("a"));
+        assertEquals(Json5Primitive.fromNumber(42), obj.get("b"));
+        assertNull(obj.get("c"));
+    }
+
+    @Test
+    void add_converts_null_to_json5null() {
+        Json5Object obj = new Json5Object();
+        obj.add("n", null);
+
+        Json5Element got = obj.get("n");
+        assertNotNull(got);
+        assertEquals(Json5Primitive.fromNull(), got); // should point to Json5Null
+    }
+
+    @Test
+    void remove_returns_removed_value_and_unsets() {
+        Json5Object obj = new Json5Object();
+        obj.add("k", Json5Primitive.fromBoolean(true));
+
+        Json5Element removed = obj.remove("k");
+        assertEquals(Json5Primitive.fromBoolean(true), removed);
+        assertFalse(obj.has("k"));
+        assertNull(obj.get("k"));
+
+        assertNull(obj.remove("doesNotExist"));
+    }
+
+    @Test
+    void entrySet_and_keySet_preserve_insertion_order() {
+        Json5Object obj = new Json5Object();
+        obj.add("first", Json5Primitive.fromNumber(1));
+        obj.add("second", Json5Primitive.fromNumber(2));
+        obj.add("third", Json5Primitive.fromNumber(3));
+
+        // keySet order
+        List<String> keys = new ArrayList<>(obj.keySet());
+        assertEquals(List.of("first", "second", "third"), keys);
+
+        // entrySet order
+        Iterator<Map.Entry<String, Json5Element>> it = obj.entrySet().iterator();
+        assertTrue(it.hasNext());
+        assertEquals("first", it.next().getKey());
+        assertEquals("second", it.next().getKey());
+        assertEquals("third", it.next().getKey());
+        assertFalse(it.hasNext());
+    }
+
+    @Nested
+    class AddPropertyOverloads {
+
+        @Test
+        void addProperty_string() {
+            Json5Object obj = new Json5Object();
+            obj.addProperty("s", "hello");
+            assertEquals(Json5Primitive.fromString("hello"), obj.get("s"));
+
+            obj.addProperty("sn", (String) null);
+            assertEquals(Json5Primitive.fromNull(), obj.get("sn"));
+        }
+
+        @Test
+        void addProperty_number_default() {
+            Json5Object obj = new Json5Object();
+            obj.addProperty("n", 123);
+            assertEquals(Json5Primitive.fromNumber(123), obj.get("n"));
+
+            obj.addProperty("nn", (Number) null);
+            assertEquals(Json5Primitive.fromNull(), obj.get("nn"));
+        }
+
+        @Test
+        void addProperty_number_with_radix() {
+            Json5Object obj = new Json5Object();
+            obj.addProperty("r", 255, 16);
+            assertEquals(Json5Primitive.fromNumber(255, 16), obj.get("r"));
+        }
+
+        @Test
+        void addProperty_Instant() {
+            Json5Object obj = new Json5Object();
+            obj.addProperty("i", Instant.EPOCH);
+            assertEquals(Json5Primitive.fromInstant(Instant.EPOCH), obj.get("i"));
+        }
+
+        @Test
+        void addProperty_boolean() {
+            Json5Object obj = new Json5Object();
+            obj.addProperty("b1", true);
+            obj.addProperty("b2", false);
+            assertEquals(Json5Primitive.fromBoolean(true), obj.get("b1"));
+            assertEquals(Json5Primitive.fromBoolean(false), obj.get("b2"));
+
+            obj.addProperty("bn", (Boolean) null);
+            assertEquals(Json5Primitive.fromNull(), obj.get("bn"));
+        }
+
+        @Test
+        void addProperty_character() {
+            Json5Object obj = new Json5Object();
+            obj.addProperty("c", 'Z');
+            assertEquals(Json5Primitive.fromCharacter('Z'), obj.get("c"));
+
+            obj.addProperty("cn", (Character) null);
+            assertEquals(Json5Primitive.fromNull(), obj.get("cn"));
+        }
+    }
+
+    @Nested
+    class TypedGetters {
+
+        @Test
+        void getAsJson5Primitive_and_type_casting() {
+            Json5Object obj = new Json5Object();
+            obj.addProperty("p", "str");
+            assertEquals(Json5Primitive.fromString("str"), obj.getAsJson5Primitive("p"));
+
+            // wrong type -> ClassCastException
+            obj.add("arr", new Json5Array());
+            assertThrows(ClassCastException.class, () -> obj.getAsJson5Primitive("arr"));
+        }
+
+        @Test
+        void getAsJson5Array_and_getAsJson5Object() {
+            Json5Object obj = new Json5Object();
+
+            Json5Array array = new Json5Array();
+            array.add(Json5Primitive.fromNumber(1));
+            obj.add("a", array);
+
+            Json5Object inner = new Json5Object();
+            inner.addProperty("x", 7);
+            obj.add("o", inner);
+
+            assertSame(array, obj.getAsJson5Array("a"));
+            assertSame(inner, obj.getAsJson5Object("o"));
+
+            assertThrows(ClassCastException.class, () -> obj.getAsJson5Array("o"));
+            assertThrows(ClassCastException.class, () -> obj.getAsJson5Object("a"));
+        }
+    }
+
+    @Nested
+    class MapView {
+
+        @Test
+        void asMap_is_mutable_and_bidirectional() {
+            Json5Object obj = new Json5Object();
+            obj.addProperty("a", 1);
+
+            Map<String, Json5Element> view = obj.asMap();
+
+            view.put("b", Json5Primitive.fromString("x"));
+            assertTrue(obj.has("b"));
+            assertEquals(Json5Primitive.fromString("x"), obj.get("b"));
+
+            obj.addProperty("c", true);
+            assertEquals(Json5Primitive.fromBoolean(true), view.get("c"));
+        }
+
+        @Test
+        void asMap_disallows_null_keys_and_values() {
+            Json5Object obj = new Json5Object();
+            Map<String, Json5Element> view = obj.asMap();
+
+            assertThrows(NullPointerException.class, () -> view.put(null, Json5Primitive.fromNull()));
+            assertThrows(NullPointerException.class, () -> view.put("k", null));
+        }
+    }
+
+    @Nested
+    class DeepCopy_Equals_HashCode {
+
+        @Test
+        void deepCopy_is_deep_and_copies_comment() {
+            Json5Object original = new Json5Object();
+            original.addProperty("num", 1);
+            Json5Object inner = new Json5Object();
+            inner.addProperty("s", "t");
+            original.add("inner", inner);
+            original.setComment("note");
+
+            Json5Object copy = original.deepCopy();
+
+            // difference instances
+            assertNotSame(original, copy);
+            assertNotSame(original.getAsJson5Object("inner"), copy.getAsJson5Object("inner"));
+
+            // same content
+            assertEquals(original, copy);
+            assertEquals(original.hashCode(), copy.hashCode());
+
+            // same comment
+            assertEquals("note", copy.getComment());
+
+            // independent mutations
+            copy.getAsJson5Object("inner").addProperty("s", "changed");
+            assertNotEquals(original, copy);
+            assertEquals("t",
+                ((Json5Primitive) original.getAsJson5Object("inner").get("s")).getAsString());
+        }
+
+        @Test
+        void equals_and_hashCode_contract() {
+            Json5Object a = new Json5Object();
+            a.addProperty("x", 1);
+            a.addProperty("y", "z");
+
+            Json5Object b = new Json5Object();
+            b.addProperty("x", 1);
+            b.addProperty("y", "z");
+
+            Json5Object c = new Json5Object();
+            c.addProperty("x", 1);
+            c.addProperty("y", "z");
+
+            // reflexive
+            assertEquals(a, a);
+            // symmetric
+            assertEquals(a, b);
+            assertEquals(b, a);
+            // transitive
+            assertEquals(b, c);
+            assertEquals(a, c);
+
+            // consistent to hashCode
+            assertEquals(a.hashCode(), b.hashCode());
+            assertEquals(a.hashCode(), c.hashCode());
+
+            // not equals on not equal content
+            Json5Object d = new Json5Object();
+            d.addProperty("x", 2);
+            assertNotEquals(a, d);
+        }
+    }
+
+}
diff --git a/src/test/java/de/marhali/json5/Json5PrimitiveTest.java b/src/test/java/de/marhali/json5/Json5PrimitiveTest.java
new file mode 100644
index 0000000..1954287
--- /dev/null
+++ b/src/test/java/de/marhali/json5/Json5PrimitiveTest.java
@@ -0,0 +1,367 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5;
+
+import de.marhali.json5.fixtures.ToStringFixtures;
+import de.marhali.json5.internal.RadixNumber;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Instant;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class Json5PrimitiveTest {
+    @Test
+    @DisplayName("deepCopy(): it should copy primitive value and comment")
+    void test_deepCopy() {
+        var source = Json5Primitive.fromBoolean(true);
+        String sourceComment = "my comment";
+        source.setComment(sourceComment);
+
+        Json5Element copy = source.deepCopy();
+        String newComment = "new comment";
+        source.setComment(newComment);
+
+        assertTrue(copy.isJson5Primitive());
+        assertTrue(copy.getAsJson5Primitive().isBoolean());
+        assertTrue(copy.getAsJson5Primitive().getAsBoolean());
+        assertEquals(sourceComment, copy.getComment());
+        assertEquals(newComment, source.getComment());
+    }
+
+    @Test
+    void test_equals() {
+        var source = Json5Primitive.fromBoolean(true);
+        source.setComment("my comment");
+
+        var other = Json5Primitive.fromBoolean(true);
+        other.setComment("my comment");
+
+        assertEquals(source, other);
+        assertNotEquals(source, Json5Primitive.fromBoolean(true));
+    }
+
+    @Nested
+    class NullPrimitive {
+        @Test
+        @DisplayName("fromNull(): it should provide shorthand initializer to create Json5Null")
+        void fromNull() {
+            var element = Json5Primitive.fromNull();
+            assertInstanceOf(Json5Null.class, element);
+            assertEquals("null", element.getAsString());
+            assertEquals("null", element.toString(ToStringFixtures.OPTIONS));
+        }
+    }
+
+    @Nested
+    class InstantPrimitive {
+        @Test
+        @DisplayName("fromInstant(): it should provide shorthand initializer to create primitive from Instant")
+        void fromInstant() {
+            var element = Json5Primitive.fromInstant(Instant.EPOCH);
+            assertInstanceOf(Json5Primitive.class, element);
+            assertTrue(element.isInstant());
+            assertEquals(Instant.EPOCH, element.getAsInstant());
+            assertEquals("1970-01-01T00:00:00Z", element.getAsString());
+            assertEquals("'1970-01-01T00:00:00Z'", element.toString(ToStringFixtures.OPTIONS));
+        }
+    }
+
+    @Nested
+    class BooleanPrimitive {
+        @Test
+        @DisplayName("fromBoolean(): it should provide shorthand initializer to create primitive from Boolean")
+        void fromBoolean() {
+            var element = Json5Primitive.fromBoolean(true);
+            assertInstanceOf(Json5Primitive.class, element);
+            assertTrue(element.isBoolean());
+            assertTrue(element.getAsBoolean());
+            assertEquals("true", element.getAsString());
+            assertEquals("true", element.toString(ToStringFixtures.OPTIONS));
+        }
+    }
+
+    @Nested
+    class StringPrimitive {
+        @Test
+        @DisplayName("fromCharacter(): it should provide shorthand initializer to create primitive from Character")
+        void fromCharacter() {
+            var element = Json5Primitive.fromCharacter('a');
+            assertInstanceOf(Json5Primitive.class, element);
+            assertTrue(element.isString());
+            assertEquals("a", element.getAsString());
+            assertEquals("'a'", element.toString(ToStringFixtures.OPTIONS));
+        }
+
+        @Test
+        @DisplayName("fromString(): it should provide shorthand initializer to create primitive from String")
+        void fromString() {
+            var element = Json5Primitive.fromString("myString");
+            assertInstanceOf(Json5Primitive.class, element);
+            assertTrue(element.isString());
+            assertEquals("myString", element.getAsString());
+            assertEquals("'myString'", element.toString(ToStringFixtures.OPTIONS));
+        }
+    }
+
+    @Nested
+    class NumberPrimitive {
+        @Test
+        void getAsNumberThrows() {
+            assertThrows(UnsupportedOperationException.class, () -> Json5Primitive.fromBoolean(true).getAsNumber(), "Primitive is not a number nor a string");
+        }
+
+        @Test
+        void getAsRadixNumberThrows() {
+            assertThrows(UnsupportedOperationException.class, () -> Json5Primitive.fromBoolean(true).getAsRadixNumber(), "Primitive is not a number");
+        }
+
+        @Test
+        @DisplayName("fromNumber(): it should provide shorthand initializer to create primitive from Number")
+        void fromNumber() {
+            var element = Json5Primitive.fromNumber(187);
+            assertInstanceOf(Json5Primitive.class, element);
+            assertTrue(element.isNumber());
+            assertEquals(187, element.getAsNumber());
+            assertEquals(10, element.getNumberRadix());
+            assertEquals("187", element.getAsString());
+            assertEquals("187", element.toString(ToStringFixtures.OPTIONS));
+        }
+
+        @Test
+        @DisplayName("fromNumber(): it should provide shorthand initializer to create primitive from Number and radix base")
+        void fromNumberWithRadix() {
+            var element = Json5Primitive.fromNumber(187, 10);
+            assertInstanceOf(Json5Primitive.class, element);
+            assertTrue(element.isNumber());
+            assertEquals(new RadixNumber(187, 10), element.getAsRadixNumber());
+            assertEquals(187, element.getAsNumber());
+            assertEquals(10, element.getNumberRadix());
+            assertEquals("187", element.getAsString());
+            assertEquals("187", element.toString(ToStringFixtures.OPTIONS));
+        }
+
+        @Test
+        void getAsDouble() {
+            var element = Json5Primitive.fromNumber(1.87);
+            assertEquals(1.87, element.getAsDouble());
+        }
+
+        @Test
+        void getAsDoubleFromString() {
+            var element = Json5Primitive.fromString("1.87");
+            assertEquals(1.87, element.getAsDouble());
+        }
+
+        @Test
+        void getAsBigDecimal() {
+            var element = Json5Primitive.fromNumber(1.87);
+            assertEquals(new BigDecimal("1.87"), element.getAsBigDecimal());
+        }
+
+        @Test
+        void getAsBigDecimalFromString() {
+            var element = Json5Primitive.fromString("1.87");
+            assertEquals(new BigDecimal("1.87"), element.getAsBigDecimal());
+        }
+
+        @Test
+        void getAsBigInteger() {
+            var element = Json5Primitive.fromNumber(187);
+            assertEquals(new BigInteger("187"), element.getAsBigInteger());
+        }
+
+        @Test
+        void getAsBigIntegerFromString() {
+            var element = Json5Primitive.fromString("187");
+            assertEquals(new BigInteger("187"), element.getAsBigInteger());
+        }
+
+        @Test
+        void getAsFloat() {
+            var element = Json5Primitive.fromNumber(1.87);
+            assertEquals(1.87f, element.getAsFloat());
+        }
+
+        @Test
+        void getAsFloatFromString() {
+            var element = Json5Primitive.fromString("1.87");
+            assertEquals(1.87f, element.getAsFloat());
+        }
+
+        @Test
+        void getAsLong() {
+            var element = Json5Primitive.fromNumber(187L);
+            assertEquals(187L, element.getAsLong());
+        }
+
+        @Test
+        void getAsLongFromString() {
+            var element = Json5Primitive.fromString("187");
+            assertEquals(187L, element.getAsLong());
+        }
+
+        @Test
+        void getAsShort() {
+            var element = Json5Primitive.fromNumber((short) 187);
+            assertEquals((short) 187, element.getAsShort());
+        }
+
+        @Test
+        void getAsShortFromString() {
+            var element = Json5Primitive.fromString("187");
+            assertEquals((short) 187, element.getAsShort());
+        }
+
+        @Test
+        void getAsInt() {
+            var element = Json5Primitive.fromNumber(187);
+            assertEquals((int) 187, element.getAsInt());
+        }
+
+        @Test
+        void getAsIntFromString() {
+            var element = Json5Primitive.fromString("187");
+            assertEquals((int) 187, element.getAsInt());
+        }
+
+        @Test
+        void getAsByte() {
+            var element = Json5Primitive.fromNumber((byte) 187);
+            assertEquals((byte) 187, element.getAsByte());
+        }
+
+        @Test
+        void getAsByteFromString() {
+            // 187 does not work, because it is a signed byte (+ / -)
+            var element = Json5Primitive.fromString("87");
+            assertEquals((byte) 87, element.getAsByte());
+        }
+    }
+
+    @Nested
+    class BinaryPrimitive {
+        @Test
+        @DisplayName("fromBinaryString(): it should provide shorthand initializer to create primitive from binary number string")
+        void fromBinaryString() {
+            var element = Json5Primitive.fromBinaryString("0b1010");
+            assertInstanceOf(Json5Primitive.class, element);
+            assertTrue(element.isNumber());
+            assertEquals(BigInteger.valueOf(10), element.getAsNumber());
+            assertEquals(2, element.getNumberRadix());
+            assertEquals("0b1010", element.getAsString());
+            assertEquals("0b1010", element.toString(ToStringFixtures.OPTIONS));
+        }
+
+        @Test
+        void fromPositiveBinaryString() {
+            var element = Json5Primitive.fromBinaryString("+0b1010");
+            assertInstanceOf(Json5Primitive.class, element);
+            assertEquals(BigInteger.valueOf(10), element.getAsNumber());
+            assertEquals(2, element.getNumberRadix());
+            assertEquals("0b1010", element.getAsString());
+            assertEquals("0b1010", element.toString(ToStringFixtures.OPTIONS));
+        }
+
+        @Test
+        void fromNegateBinaryString() {
+            var element = Json5Primitive.fromBinaryString("-0b1010");
+            assertInstanceOf(Json5Primitive.class, element);
+            assertEquals(BigInteger.valueOf(-10), element.getAsNumber());
+            assertEquals(2, element.getNumberRadix());
+            assertEquals("-0b1010", element.getAsString());
+            assertEquals("-0b1010", element.toString(ToStringFixtures.OPTIONS));
+        }
+    }
+
+    @Nested
+    class OctalPrimitive {
+        @Test
+        @DisplayName("fromOctalString(): it should provide shorthand initializer to create primitive from octal number string")
+        void fromOctalString() {
+            var element = Json5Primitive.fromOctalString("0o273");
+            assertInstanceOf(Json5Primitive.class, element);
+            assertTrue(element.isNumber());
+            assertEquals(BigInteger.valueOf(187), element.getAsNumber());
+            assertEquals(8, element.getNumberRadix());
+            assertEquals("0o273", element.getAsString());
+            assertEquals("0o273", element.toString(ToStringFixtures.OPTIONS));
+        }
+
+        @Test
+        void fromPositiveOctalBinaryString() {
+            var element = Json5Primitive.fromOctalString("+0o273");
+            assertInstanceOf(Json5Primitive.class, element);
+            assertEquals(BigInteger.valueOf(187), element.getAsNumber());
+            assertEquals(8, element.getNumberRadix());
+            assertEquals("0o273", element.getAsString());
+            assertEquals("0o273", element.toString(ToStringFixtures.OPTIONS));
+        }
+
+        @Test
+        void fromNegateOctalString() {
+            var element = Json5Primitive.fromOctalString("-0o273");
+            assertInstanceOf(Json5Primitive.class, element);
+            assertEquals(BigInteger.valueOf(-187), element.getAsNumber());
+            assertEquals(8, element.getNumberRadix());
+            assertEquals("-0o273", element.getAsString());
+            assertEquals("-0o273", element.toString(ToStringFixtures.OPTIONS));
+        }
+    }
+
+    @Nested
+    class HexPrimitive {
+        @Test
+        @DisplayName("fromHexString(): it should provide shorthand initializer to create primitive from hex number string")
+        void fromHexString() {
+            var element = Json5Primitive.fromHexString("0xBB");
+            assertInstanceOf(Json5Primitive.class, element);
+            assertTrue(element.isNumber());
+            assertEquals(BigInteger.valueOf(187), element.getAsNumber());
+            assertEquals(16, element.getNumberRadix());
+            assertEquals("0xbb", element.getAsString());
+            assertEquals("0xbb", element.toString(ToStringFixtures.OPTIONS));
+        }
+
+        @Test
+        void fromPositiveHexBinaryString() {
+            var element = Json5Primitive.fromHexString("+0xBB");
+            assertInstanceOf(Json5Primitive.class, element);
+            assertEquals(BigInteger.valueOf(187), element.getAsNumber());
+            assertEquals(16, element.getNumberRadix());
+            assertEquals("0xbb", element.getAsString());
+            assertEquals("0xbb", element.toString(ToStringFixtures.OPTIONS));
+        }
+
+        @Test
+        void fromNegateHexString() {
+            var element = Json5Primitive.fromHexString("-0xBB");
+            assertInstanceOf(Json5Primitive.class, element);
+            assertEquals(BigInteger.valueOf(-187), element.getAsNumber());
+            assertEquals(16, element.getNumberRadix());
+            assertEquals("-0xbb", element.getAsString());
+            assertEquals("-0xbb", element.toString(ToStringFixtures.OPTIONS));
+        }
+    }
+}
diff --git a/src/test/java/de/marhali/json5/Json5Test.java b/src/test/java/de/marhali/json5/Json5Test.java
new file mode 100644
index 0000000..10fe1ca
--- /dev/null
+++ b/src/test/java/de/marhali/json5/Json5Test.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5;
+
+import de.marhali.json5.config.Json5Options;
+import org.junit.jupiter.api.Test;
+
+import java.io.*;
+import java.util.function.Function;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class Json5Test {
+
+    // --- helpers ---
+    private static Json5Object sampleObject() {
+        Json5Object o = new Json5Object();
+        o.addProperty("n", 42);
+        o.addProperty("s", "hi");
+        o.addProperty("b", true);
+        Json5Array a = new Json5Array();
+        a.add(1);
+        a.add("x");
+        o.add("arr", a);
+        return o;
+    }
+
+    @Test
+    void builder_applies_function_and_returns_instance() {
+        Function<Json5Options.Builder, Json5Options> fn = b -> Json5Options.DEFAULT;
+        Json5 j = Json5.builder(fn);
+        assertNotNull(j);
+        assertInstanceOf(Json5Object.class, j.parse("{}"));
+    }
+
+    @Test
+    void constructor_with_options_and_default_and_null_checks() {
+        assertDoesNotThrow(() -> new Json5(Json5Options.DEFAULT));
+        assertDoesNotThrow(() -> new Json5());
+
+        assertThrows(NullPointerException.class, () -> new Json5(null));
+    }
+
+    @Test
+    void parse_from_string_object_array_and_empty() {
+        Json5 json5 = new Json5();
+
+        assertInstanceOf(Json5Object.class, json5.parse("{ }"));
+        assertInstanceOf(Json5Array.class, json5.parse("[ ]"));
+
+        assertNull(json5.parse(""));
+    }
+
+    @Test
+    void parse_from_reader_and_stream() {
+        Json5 json5 = new Json5();
+
+        // Reader
+        Reader r = new StringReader("{a:1}");
+        Json5Element e1 = json5.parse(r);
+        assertInstanceOf(Json5Object.class, e1);
+
+        // InputStream
+        InputStream in = new ByteArrayInputStream("[1,2]".getBytes());
+        Json5Element e2 = json5.parse(in);
+        assertInstanceOf(Json5Array.class, e2);
+    }
+
+    @Test
+    void parse_null_arguments_throw_npe() {
+        Json5 json5 = new Json5();
+        assertThrows(NullPointerException.class, () -> json5.parse((String) null));
+        assertThrows(NullPointerException.class, () -> json5.parse((Reader) null));
+        assertThrows(NullPointerException.class, () -> json5.parse((InputStream) null));
+    }
+
+    @Test
+    void serialize_null_arguments_throw_npe() {
+        Json5 json5 = new Json5();
+        Json5Element elem = sampleObject();
+
+        assertThrows(NullPointerException.class, () -> json5.serialize(null));
+        assertThrows(NullPointerException.class, () -> json5.serialize(null, new StringWriter()));
+        assertThrows(NullPointerException.class, () -> json5.serialize(elem, (Writer) null));
+        assertThrows(NullPointerException.class, () -> json5.serialize(null, new ByteArrayOutputStream()));
+        assertThrows(NullPointerException.class, () -> json5.serialize(elem, (OutputStream) null));
+    }
+}
diff --git a/src/test/java/de/marhali/json5/e2e/TestResourceHelper.java b/src/test/java/de/marhali/json5/e2e/TestResourceHelper.java
new file mode 100644
index 0000000..14d7151
--- /dev/null
+++ b/src/test/java/de/marhali/json5/e2e/TestResourceHelper.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5.e2e;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Optional;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class TestResourceHelper {
+    public static InputStream getTestResource(String fileName) {
+        return Thread.currentThread().getContextClassLoader().getResourceAsStream(fileName);
+    }
+
+    public static String getTestResourceContent(String fileName) throws IOException {
+        try (BufferedInputStream bis = new BufferedInputStream(getTestResource(fileName))) {
+            ByteArrayOutputStream buf = new ByteArrayOutputStream();
+
+            for (int result = bis.read(); result != -1; result = bis.read()) {
+                buf.write((byte) result);
+            }
+
+            return Optional.ofNullable(buf.toString(StandardCharsets.UTF_8))
+                .map(s->s.replace("\r\n","\n"))
+                .map(s->s.replace("\r","\n"))
+                .orElse(null);
+        }
+    }
+}
diff --git a/src/test/java/de/marhali/json5/e2e/failures/DisallowBinaryNumberTest.java b/src/test/java/de/marhali/json5/e2e/failures/DisallowBinaryNumberTest.java
new file mode 100644
index 0000000..205def5
--- /dev/null
+++ b/src/test/java/de/marhali/json5/e2e/failures/DisallowBinaryNumberTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5.e2e.failures;
+
+import de.marhali.json5.Json5;
+import de.marhali.json5.config.Json5Options;
+import de.marhali.json5.e2e.TestResourceHelper;
+import de.marhali.json5.exception.Json5Exception;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class DisallowBinaryNumberTest {
+    @Test
+    @DisplayName("Parse: disallowed binary number throws exception")
+    void disallowBinaryNumber() {
+        var json5 = Json5.builder(Json5Options.Builder::build);
+
+        var ex = assertThrows(Json5Exception.class, () -> json5.parse(TestResourceHelper.getTestResourceContent("e2e/failures/disallow-binary-number.json5")));
+
+        assertEquals("Binary literals are not allowed at index 25 [character 1 in line 3]", ex.getMessage());
+    }
+}
diff --git a/src/test/java/de/marhali/json5/e2e/failures/DisallowCDigitSeparatorTest.java b/src/test/java/de/marhali/json5/e2e/failures/DisallowCDigitSeparatorTest.java
new file mode 100644
index 0000000..17375e7
--- /dev/null
+++ b/src/test/java/de/marhali/json5/e2e/failures/DisallowCDigitSeparatorTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5.e2e.failures;
+
+import de.marhali.json5.Json5;
+import de.marhali.json5.config.Json5Options;
+import de.marhali.json5.e2e.TestResourceHelper;
+import de.marhali.json5.exception.Json5Exception;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class DisallowCDigitSeparatorTest {
+    @Test
+    @DisplayName("Parse: disallowed C-style digit separators throws exception")
+    void disallowCCDigitSeparator() {
+        var json5 = Json5.builder(Json5Options.Builder::build);
+
+        var ex = assertThrows(Json5Exception.class, () -> json5.parse(TestResourceHelper.getTestResourceContent("e2e/failures/disallow-c-digit-separator.json5")));
+
+        assertEquals("C-style digit separators are not allowed at index 28 [character 1 in line 3]", ex.getMessage());
+    }
+}
diff --git a/src/test/java/de/marhali/json5/e2e/failures/DisallowHexFloatingTest.java b/src/test/java/de/marhali/json5/e2e/failures/DisallowHexFloatingTest.java
new file mode 100644
index 0000000..af5e616
--- /dev/null
+++ b/src/test/java/de/marhali/json5/e2e/failures/DisallowHexFloatingTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5.e2e.failures;
+
+import de.marhali.json5.Json5;
+import de.marhali.json5.config.Json5Options;
+import de.marhali.json5.e2e.TestResourceHelper;
+import de.marhali.json5.exception.Json5Exception;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class DisallowHexFloatingTest {
+    @Test
+    @DisplayName("Parse: disallowed hex floating-point throws exception")
+    void disallowHexFloating() {
+        var json5 = Json5.builder(Json5Options.Builder::build);
+
+        var ex = assertThrows(Json5Exception.class, () -> json5.parse(TestResourceHelper.getTestResourceContent("e2e/failures/disallow-hex-floating.json5")));
+
+        assertEquals("Hexadecimal floating-point literals are not allowed at index 28 [character 1 in line 3]", ex.getMessage());
+    }
+}
diff --git a/src/test/java/de/marhali/json5/e2e/failures/DisallowInfinityTest.java b/src/test/java/de/marhali/json5/e2e/failures/DisallowInfinityTest.java
new file mode 100644
index 0000000..169ce96
--- /dev/null
+++ b/src/test/java/de/marhali/json5/e2e/failures/DisallowInfinityTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5.e2e.failures;
+
+import de.marhali.json5.Json5;
+import de.marhali.json5.config.Json5Options;
+import de.marhali.json5.e2e.TestResourceHelper;
+import de.marhali.json5.exception.Json5Exception;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class DisallowInfinityTest {
+    @Test
+    @DisplayName("Parse: disallowed Infinity throws exception")
+    void disallowInfinity() {
+        var json5 = Json5.builder(Json5Options.Builder::build);
+
+        var ex = assertThrows(Json5Exception.class, () -> json5.parse(TestResourceHelper.getTestResourceContent("e2e/failures/disallow-Infinity.json5")));
+
+        assertEquals("Infinity is not allowed at index 27 [character 1 in line 3]", ex.getMessage());
+    }
+}
diff --git a/src/test/java/de/marhali/json5/e2e/failures/DisallowJavaDigitSeparatorTest.java b/src/test/java/de/marhali/json5/e2e/failures/DisallowJavaDigitSeparatorTest.java
new file mode 100644
index 0000000..02a4de3
--- /dev/null
+++ b/src/test/java/de/marhali/json5/e2e/failures/DisallowJavaDigitSeparatorTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5.e2e.failures;
+
+import de.marhali.json5.Json5;
+import de.marhali.json5.config.Json5Options;
+import de.marhali.json5.e2e.TestResourceHelper;
+import de.marhali.json5.exception.Json5Exception;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class DisallowJavaDigitSeparatorTest {
+    @Test
+    @DisplayName("Parse: disallowed Java-style digit separators throws exception")
+    void disallowJavaDigitSeparator() {
+        var json5 = Json5.builder(Json5Options.Builder::build);
+
+        var ex = assertThrows(Json5Exception.class, () -> json5.parse(TestResourceHelper.getTestResourceContent("e2e/failures/disallow-java-digit-separator.json5")));
+
+        assertEquals("Java-style digit separators are not allowed at index 28 [character 1 in line 3]", ex.getMessage());
+    }
+}
diff --git a/src/test/java/de/marhali/json5/e2e/failures/DisallowNaNTest.java b/src/test/java/de/marhali/json5/e2e/failures/DisallowNaNTest.java
new file mode 100644
index 0000000..4134aab
--- /dev/null
+++ b/src/test/java/de/marhali/json5/e2e/failures/DisallowNaNTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5.e2e.failures;
+
+import de.marhali.json5.Json5;
+import de.marhali.json5.config.Json5Options;
+import de.marhali.json5.e2e.TestResourceHelper;
+import de.marhali.json5.exception.Json5Exception;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class DisallowNaNTest {
+    @Test
+    @DisplayName("Parse: disallowed NaN throws exception")
+    void disallowNaN() {
+        var json5 = Json5.builder(Json5Options.Builder::build);
+
+        var ex = assertThrows(Json5Exception.class, () -> json5.parse(TestResourceHelper.getTestResourceContent("e2e/failures/disallow-NaN.json5")));
+
+        assertEquals("NaN is not allowed at index 22 [character 1 in line 3]", ex.getMessage());
+    }
+}
diff --git a/src/test/java/de/marhali/json5/e2e/failures/DisallowOctalNumberTest.java b/src/test/java/de/marhali/json5/e2e/failures/DisallowOctalNumberTest.java
new file mode 100644
index 0000000..31ace44
--- /dev/null
+++ b/src/test/java/de/marhali/json5/e2e/failures/DisallowOctalNumberTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5.e2e.failures;
+
+import de.marhali.json5.Json5;
+import de.marhali.json5.config.Json5Options;
+import de.marhali.json5.e2e.TestResourceHelper;
+import de.marhali.json5.exception.Json5Exception;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class DisallowOctalNumberTest {
+    @Test
+    @DisplayName("Parse: disallowed octal number throws exception")
+    void disallowOctalNumber() {
+        var json5 = Json5.builder(Json5Options.Builder::build);
+
+        var ex = assertThrows(Json5Exception.class, () -> json5.parse(TestResourceHelper.getTestResourceContent("e2e/failures/disallow-octal-number.json5")));
+
+        assertEquals("Octal literals are not allowed at index 24 [character 1 in line 3]", ex.getMessage());
+    }
+}
diff --git a/src/test/java/de/marhali/json5/fixtures/ToStringFixtures.java b/src/test/java/de/marhali/json5/fixtures/ToStringFixtures.java
new file mode 100644
index 0000000..bda7fa3
--- /dev/null
+++ b/src/test/java/de/marhali/json5/fixtures/ToStringFixtures.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5.fixtures;
+
+import de.marhali.json5.config.DigitSeparatorStrategy;
+import de.marhali.json5.config.DuplicateKeyStrategy;
+import de.marhali.json5.config.Json5Options;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class ToStringFixtures {
+    /**
+     * Options to use for testing {@link de.marhali.json5.Json5Element#toString(Json5Options)} methods.
+     */
+    public static Json5Options OPTIONS = Json5Options.builder()
+        .allowNaN()
+        .allowInfinity()
+        .allowInvalidSurrogates()
+        .parseComments()
+        .writeComments()
+        .trailingComma()
+        .quoteSingle()
+        .digitSeparatorStrategy(DigitSeparatorStrategy.NONE)
+        .duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE)
+        .prettyPrinting()
+        .build();
+}
diff --git a/src/test/java/de/marhali/json5/internal/NumberLimitsTest.java b/src/test/java/de/marhali/json5/internal/NumberLimitsTest.java
new file mode 100644
index 0000000..456d5eb
--- /dev/null
+++ b/src/test/java/de/marhali/json5/internal/NumberLimitsTest.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5.internal;
+
+import org.junit.jupiter.api.Test;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class NumberLimitsTest {
+    private static String repeat(char c, int n) {
+        StringBuilder sb = new StringBuilder(n);
+        for (int i = 0; i < n; i++) sb.append(c);
+        return sb.toString();
+    }
+
+    @Test
+    void parseBigInteger_allows_exactly_10000_chars() {
+        String s = repeat('7', 10_000);
+        BigInteger bi = assertDoesNotThrow(() -> NumberLimits.parseBigInteger(s));
+        assertEquals(new BigInteger(s), bi);
+    }
+
+    @Test
+    void parseBigInteger_rejects_length_over_10000_and_includes_prefix_in_message() {
+        String s = repeat('9', 10_001);
+        NumberFormatException ex =
+            assertThrows(NumberFormatException.class, () -> NumberLimits.parseBigInteger(s));
+        String expectedPrefix = "Number string too large: " + s.substring(0, 30) + "...";
+        assertTrue(ex.getMessage().startsWith(expectedPrefix),
+            () -> "Msg mismatch.\nExpected prefix: " + expectedPrefix + "\nActual: " + ex.getMessage());
+    }
+
+    @Test
+    void parseBigDecimal_allows_exactly_10000_chars() {
+        String s = repeat('1', 10_000);
+        BigDecimal bd = assertDoesNotThrow(() -> NumberLimits.parseBigDecimal(s));
+        assertEquals(new BigDecimal(s), bd);
+    }
+
+    @Test
+    void parseBigDecimal_rejects_length_over_10000_and_includes_prefix_in_message() {
+        String s = repeat('3', 10_001);
+        NumberFormatException ex =
+            assertThrows(NumberFormatException.class, () -> NumberLimits.parseBigDecimal(s));
+        String expectedPrefix = "Number string too large: " + s.substring(0, 30) + "...";
+        assertTrue(ex.getMessage().startsWith(expectedPrefix));
+    }
+
+    @Test
+    void parseBigDecimal_allows_scale_abs_9999_both_signs() {
+        BigDecimal bdNegExp = assertDoesNotThrow(() -> NumberLimits.parseBigDecimal("1E-9999"));
+        assertEquals(9_999, bdNegExp.scale());
+
+        BigDecimal bdPosExp = assertDoesNotThrow(() -> NumberLimits.parseBigDecimal("1E+9999"));
+        assertEquals(-9_999, bdPosExp.scale());
+    }
+
+    @Test
+    void parseBigDecimal_rejects_scale_10000_or_more_negative() {
+        NumberFormatException ex =
+            assertThrows(NumberFormatException.class, () -> NumberLimits.parseBigDecimal("1E-10000"));
+        assertTrue(ex.getMessage().contains("unsupported scale"));
+    }
+
+    @Test
+    void parseBigDecimal_rejects_scale_10000_or_more_positive() {
+        NumberFormatException ex =
+            assertThrows(NumberFormatException.class, () -> NumberLimits.parseBigDecimal("1E+10000"));
+        assertTrue(ex.getMessage().contains("unsupported scale"));
+    }
+
+    @Test
+    void parseBigDecimal_parses_normal_numbers() {
+        BigDecimal bd = assertDoesNotThrow(() -> NumberLimits.parseBigDecimal("12345.6789"));
+        assertEquals(new BigDecimal("12345.6789"), bd);
+    }
+
+    @Test
+    void parseBigInteger_parses_normal_numbers() {
+        BigInteger bi = assertDoesNotThrow(() -> NumberLimits.parseBigInteger("-9007199254740993"));
+        assertEquals(new BigInteger("-9007199254740993"), bi);
+    }
+}
diff --git a/src/test/java/de/marhali/json5/internal/RadixNumberTest.java b/src/test/java/de/marhali/json5/internal/RadixNumberTest.java
index 1e7c408..566e4c6 100644
--- a/src/test/java/de/marhali/json5/internal/RadixNumberTest.java
+++ b/src/test/java/de/marhali/json5/internal/RadixNumberTest.java
@@ -26,12 +26,18 @@
 public class RadixNumberTest {
 
     @Test
-    void testNumberGetter() {
+    void test_getNumber() {
         assertEquals(187, new RadixNumber(187, 10).getNumber());
     }
 
     @Test
-    void testRadixGetter() {
+    void test_getRadix() {
         assertEquals(10, new RadixNumber(187, 10).getRadix());
     }
+
+    @Test
+    void test_equals() {
+        assertEquals(new RadixNumber(187, 10), new RadixNumber(187, 10));
+    }
+
 }
diff --git a/src/test/resources/e2e/failures/disallow-Infinity.json5 b/src/test/resources/e2e/failures/disallow-Infinity.json5
new file mode 100644
index 0000000..1ef65d0
--- /dev/null
+++ b/src/test/resources/e2e/failures/disallow-Infinity.json5
@@ -0,0 +1,3 @@
+{
+  "disallowed": Infinity
+}
diff --git a/src/test/resources/e2e/failures/disallow-NaN.json5 b/src/test/resources/e2e/failures/disallow-NaN.json5
new file mode 100644
index 0000000..69d0425
--- /dev/null
+++ b/src/test/resources/e2e/failures/disallow-NaN.json5
@@ -0,0 +1,3 @@
+{
+  "disallowed": NaN
+}
diff --git a/src/test/resources/e2e/failures/disallow-binary-number.json5 b/src/test/resources/e2e/failures/disallow-binary-number.json5
new file mode 100644
index 0000000..b3e13fe
--- /dev/null
+++ b/src/test/resources/e2e/failures/disallow-binary-number.json5
@@ -0,0 +1,3 @@
+{
+  "disallowed": 0b1010
+}
diff --git a/src/test/resources/e2e/failures/disallow-c-digit-separator.json5 b/src/test/resources/e2e/failures/disallow-c-digit-separator.json5
new file mode 100644
index 0000000..b530fc4
--- /dev/null
+++ b/src/test/resources/e2e/failures/disallow-c-digit-separator.json5
@@ -0,0 +1,3 @@
+{
+  "disallowed": 1'123'456
+}
diff --git a/src/test/resources/e2e/failures/disallow-hex-floating.json5 b/src/test/resources/e2e/failures/disallow-hex-floating.json5
new file mode 100644
index 0000000..ca3f3ee
--- /dev/null
+++ b/src/test/resources/e2e/failures/disallow-hex-floating.json5
@@ -0,0 +1,3 @@
+{
+  "disallowed": 0x1.8p-12
+}
diff --git a/src/test/resources/e2e/failures/disallow-java-digit-separator.json5 b/src/test/resources/e2e/failures/disallow-java-digit-separator.json5
new file mode 100644
index 0000000..3034c92
--- /dev/null
+++ b/src/test/resources/e2e/failures/disallow-java-digit-separator.json5
@@ -0,0 +1,3 @@
+{
+  "disallowed": 1_123_456
+}
diff --git a/src/test/resources/e2e/failures/disallow-octal-number.json5 b/src/test/resources/e2e/failures/disallow-octal-number.json5
new file mode 100644
index 0000000..881acc6
--- /dev/null
+++ b/src/test/resources/e2e/failures/disallow-octal-number.json5
@@ -0,0 +1,3 @@
+{
+  "disallowed": 0o167
+}

From eaa843ddbe66043aa9c178601de7e50470272359 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Sat, 20 Sep 2025 17:41:18 +0200
Subject: [PATCH 17/48] feat: allow and document empty parser

---
 src/main/java/de/marhali/json5/Json5.java         | 15 ++++++---------
 .../java/de/marhali/json5/stream/Json5Lexer.java  |  1 -
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/main/java/de/marhali/json5/Json5.java b/src/main/java/de/marhali/json5/Json5.java
index a25cf4c..871812a 100644
--- a/src/main/java/de/marhali/json5/Json5.java
+++ b/src/main/java/de/marhali/json5/Json5.java
@@ -75,8 +75,7 @@ public Json5() {
     }
 
     /**
-     * Parses the data from the {@link InputStream} into a tree of {@link Json5Element}'s. There must be
-     * a root element based on a {@link Json5Object} or {@link Json5Array}.
+     * Parses the data from the {@link InputStream} into a tree of {@link Json5Element}'s.
      * <p><b>Note:</b> The stream must be closed after operation</p>
      * @param in Can be any applicable {@link InputStream}
      * @return Parsed json5 tree. Can be {@code null} if the provided stream does not contain any data
@@ -88,8 +87,7 @@ public Json5Element parse(InputStream in) {
     }
 
     /**
-     * Parses the provided read-stream into a tree of {@link Json5Element}'s. There must be
-     * a root element based on a {@link Json5Object} or {@link Json5Array}.
+     * Parses the provided read-stream into a tree of {@link Json5Element}'s.
      * <p><b>Note:</b> The reader must be closed after operation</p>
      * @param reader Can be any applicable {@link Reader}
      * @return Parsed json5 tree. Can be {@code null} if the provided stream does not contain any data
@@ -104,15 +102,14 @@ public Json5Element parse(Reader reader) {
 
     /**
      * Parses the provided json5-encoded {@link String} into a parse tree of {@link Json5Element}'s.
-     * There must be a root element based on a {@link Json5Object} or {@link Json5Array}.
-     * @param json5String Json5 encoded {@link String}
+     * @param string Json5 encoded {@link String}
      * @return Parsed json5 tree. Can be {@code null} if the provided {@link String} is empty
      * @see #parse(Reader)
      */
-    public Json5Element parse(String json5String) {
-        Objects.requireNonNull(json5String);
+    public Json5Element parse(String string) {
+        Objects.requireNonNull(string);
 
-        StringReader reader = new StringReader(json5String);
+        StringReader reader = new StringReader(string);
         Json5Element element = this.parse(reader);
         reader.close();
         return element;
diff --git a/src/main/java/de/marhali/json5/stream/Json5Lexer.java b/src/main/java/de/marhali/json5/stream/Json5Lexer.java
index f67287c..ebb2e1e 100644
--- a/src/main/java/de/marhali/json5/stream/Json5Lexer.java
+++ b/src/main/java/de/marhali/json5/stream/Json5Lexer.java
@@ -285,7 +285,6 @@ private void nextSingleLineComment() {
     public char nextClean() {
         while (true) {
             if (!more())
-                // TODO: check if empty stream, like index === -1?
                 return 0;
 
             char n = next();

From 1508f4ff9b8934e837c106845f29aa62eb46dd04 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Sat, 20 Sep 2025 17:41:39 +0200
Subject: [PATCH 18/48] fix: root element parsing

---
 src/main/java/de/marhali/json5/stream/Json5Lexer.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/de/marhali/json5/stream/Json5Lexer.java b/src/main/java/de/marhali/json5/stream/Json5Lexer.java
index ebb2e1e..755d2f0 100644
--- a/src/main/java/de/marhali/json5/stream/Json5Lexer.java
+++ b/src/main/java/de/marhali/json5/stream/Json5Lexer.java
@@ -113,6 +113,8 @@ public Json5Lexer(Reader reader, Json5Options options) {
         previous = 0;
         current = 0;
         comment = null;
+
+        root = true;
     }
 
     /**

From 4e0e1132d52aede68c66cf4111081c4f1d069cf4 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Sat, 20 Sep 2025 17:43:14 +0200
Subject: [PATCH 19/48] feat: add an option to insert final newline to json5
 writer

---
 .../de/marhali/json5/config/Json5Options.java | 55 ++++++++++---------
 .../de/marhali/json5/stream/Json5Writer.java  |  4 ++
 2 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/main/java/de/marhali/json5/config/Json5Options.java b/src/main/java/de/marhali/json5/config/Json5Options.java
index 73a88f0..005548b 100644
--- a/src/main/java/de/marhali/json5/config/Json5Options.java
+++ b/src/main/java/de/marhali/json5/config/Json5Options.java
@@ -173,6 +173,14 @@ public final class Json5Options {
      */
     private final boolean trailingComma;
 
+    /**
+     * Specifies whether a final newline (empty line) is appended at the end of written Json5 data.
+     * If {@code true}, this option inserts the final newline after a root {@link Json5Object} or {@link Json5Array}.
+     * <p>
+     * <i>This is a {@link de.marhali.json5.stream.Json5Writer writer}-only option</i>
+     */
+    private final boolean insertFinalNewline;
+
     /**
      * Specifies the behaviour for digit separator's on numbers.
      * <p>
@@ -212,9 +220,11 @@ public static Builder builder() {
      *     <li>allowNaN: <code>true</code></li>
      *     <li>allowInfinity: <code>true</code></li>
      *     <li>allowInvalidSurrogates: <code>true</code></li>
+     *     <li>quoteless: <code>true</code></li>
      *     <li>parseComments: <code>true</code></li>
      *     <li>writeComments: <code>true</code></li>
      *     <li>trailingComma: <code>true</code></li>
+     *     <li>insertFinalNewline: <code>true</code></li>
      *     <li>digitSeparatorStrategy: <code>NONE</code></li>
      *     <li>duplicateKeyStrategy: <code>UNIQUE</code></li>
      *     <li>prettyPrinting: <code>true</code></li>
@@ -224,9 +234,11 @@ public static Builder builder() {
             .allowNaN()
             .allowInfinity()
             .allowInvalidSurrogates()
+            .quoteless()
             .parseComments()
             .writeComments()
             .trailingComma()
+            .insertFinalNewline()
             .digitSeparatorStrategy(DigitSeparatorStrategy.NONE)
             .duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE)
             .prettyPrinting()
@@ -248,6 +260,7 @@ private Json5Options(Builder builder) {
         this.parseComments = builder.parseComments;
         this.writeComments = builder.writeComments;
         this.trailingComma = builder.trailingComma;
+        this.insertFinalNewline = builder.insertFinalNewline;
         this.digitSeparatorStrategy = builder.digitSeparatorStrategy;
         this.duplicateBehaviour = builder.duplicateKeyStrategy;this.indentFactor = builder.indentFactor;
     }
@@ -312,6 +325,10 @@ public boolean isTrailingComma() {
         return trailingComma;
     }
 
+    public boolean isInsertFinalNewline() {
+        return insertFinalNewline;
+    }
+
     public DigitSeparatorStrategy getDigitSeparatorStrategy() {
         return digitSeparatorStrategy;
     }
@@ -328,36 +345,12 @@ public int getIndentFactor() {
     public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) return false;
         Json5Options that = (Json5Options) o;
-        return stringifyUnixInstants == that.stringifyUnixInstants && stringifyAscii == that.stringifyAscii && allowNaN == that.allowNaN && allowInfinity == that.allowInfinity && allowInvalidSurrogates == that.allowInvalidSurrogates && quoteSingle == that.quoteSingle && quoteless == that.quoteless && allowBinaryLiterals == that.allowBinaryLiterals && allowOctalLiterals == that.allowOctalLiterals && allowHexFloatingLiterals == that.allowHexFloatingLiterals && allowLongUnicodeEscapes == that.allowLongUnicodeEscapes && allowTrailingData == that.allowTrailingData && parseComments == that.parseComments && writeComments == that.writeComments && trailingComma == that.trailingComma && indentFactor == that.indentFactor && digitSeparatorStrategy == that.digitSeparatorStrategy && duplicateBehaviour == that.duplicateBehaviour;
+        return stringifyUnixInstants == that.stringifyUnixInstants && stringifyAscii == that.stringifyAscii && allowNaN == that.allowNaN && allowInfinity == that.allowInfinity && allowInvalidSurrogates == that.allowInvalidSurrogates && quoteSingle == that.quoteSingle && quoteless == that.quoteless && allowBinaryLiterals == that.allowBinaryLiterals && allowOctalLiterals == that.allowOctalLiterals && allowHexFloatingLiterals == that.allowHexFloatingLiterals && allowLongUnicodeEscapes == that.allowLongUnicodeEscapes && allowTrailingData == that.allowTrailingData && parseComments == that.parseComments && writeComments == that.writeComments && trailingComma == that.trailingComma && insertFinalNewline == that.insertFinalNewline && indentFactor == that.indentFactor && digitSeparatorStrategy == that.digitSeparatorStrategy && duplicateBehaviour == that.duplicateBehaviour;
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(stringifyUnixInstants, stringifyAscii, allowNaN, allowInfinity, allowInvalidSurrogates, quoteSingle, quoteless, allowBinaryLiterals, allowOctalLiterals, allowHexFloatingLiterals, allowLongUnicodeEscapes, allowTrailingData, parseComments, writeComments, trailingComma, digitSeparatorStrategy, duplicateBehaviour, indentFactor);
-    }
-
-    @Override
-    public String toString() {
-        return "Json5Options{" +
-                "stringifyUnixInstants=" + stringifyUnixInstants +
-                ", stringifyAscii=" + stringifyAscii +
-                ", allowNaN=" + allowNaN +
-                ", allowInfinity=" + allowInfinity +
-                ", allowInvalidSurrogates=" + allowInvalidSurrogates +
-                ", quoteSingle=" + quoteSingle +
-                ", quoteless=" + quoteless +
-                ", allowBinaryLiterals=" + allowBinaryLiterals +
-                ", allowOctalLiterals=" + allowOctalLiterals +
-                ", allowHexFloatingLiterals=" + allowHexFloatingLiterals +
-                ", allowLongUnicodeEscapes=" + allowLongUnicodeEscapes +
-                ", allowTrailingData=" + allowTrailingData +
-                ", parseComments=" + parseComments +
-                ", writeComments=" + writeComments +
-                ", trailingComma=" + trailingComma +
-                ", digitSeparatorStrategy=" + digitSeparatorStrategy +
-                ", duplicateBehaviour=" + duplicateBehaviour +
-                ", indentFactor=" + indentFactor +
-                '}';
+        return Objects.hash(stringifyUnixInstants, stringifyAscii, allowNaN, allowInfinity, allowInvalidSurrogates, quoteSingle, quoteless, allowBinaryLiterals, allowOctalLiterals, allowHexFloatingLiterals, allowLongUnicodeEscapes, allowTrailingData, parseComments, writeComments, trailingComma, insertFinalNewline, digitSeparatorStrategy, duplicateBehaviour, indentFactor);
     }
 
     public static final class Builder {
@@ -376,6 +369,7 @@ public static final class Builder {
         private boolean parseComments = false;
         private boolean writeComments = false;
         private boolean trailingComma = false;
+        private boolean insertFinalNewline = false;
         private DigitSeparatorStrategy digitSeparatorStrategy = DigitSeparatorStrategy.NONE;
         private DuplicateKeyStrategy duplicateKeyStrategy = DuplicateKeyStrategy.UNIQUE;
         private int indentFactor = 0;
@@ -524,6 +518,15 @@ public Builder trailingComma() {
             return this;
         }
 
+        /**
+         * @see Json5Options#insertFinalNewline
+         * @return builder
+         */
+        public Builder insertFinalNewline() {
+            this.insertFinalNewline = true;
+            return this;
+        }
+
         /**
          * @see Json5Options#digitSeparatorStrategy
          * @return builder
diff --git a/src/main/java/de/marhali/json5/stream/Json5Writer.java b/src/main/java/de/marhali/json5/stream/Json5Writer.java
index 7e00641..69c5231 100644
--- a/src/main/java/de/marhali/json5/stream/Json5Writer.java
+++ b/src/main/java/de/marhali/json5/stream/Json5Writer.java
@@ -100,6 +100,10 @@ public void write(Json5Element element, int depth) throws IOException {
             throw new UnsupportedOperationException("Unknown json element with type class "
                     + element.getClass().getName());
         }
+
+        if (depth == 0 && options.isInsertFinalNewline()) {
+            writer.write('\n');
+        }
     }
 
     /**

From 75d0418d7fe9369cfc08a437a4495e652c39bc60 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Sat, 20 Sep 2025 17:43:55 +0200
Subject: [PATCH 20/48] feat: use syntax error to throw duplicate key errors

---
 src/main/java/de/marhali/json5/stream/Json5Parser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/de/marhali/json5/stream/Json5Parser.java b/src/main/java/de/marhali/json5/stream/Json5Parser.java
index 7b6a4bc..b1d4a72 100644
--- a/src/main/java/de/marhali/json5/stream/Json5Parser.java
+++ b/src/main/java/de/marhali/json5/stream/Json5Parser.java
@@ -123,7 +123,7 @@ public static Json5Object parseObject(Json5Lexer lexer) {
             boolean duplicate = object.has(key);
 
             if (duplicate && duplicateKeyStrategy == DuplicateKeyStrategy.UNIQUE)
-                throw new Json5Exception("Duplicate key " + Json5Writer.quote(key, lexer.options));
+                throw lexer.syntaxError("Duplicate key " + Json5Writer.quote(key, lexer.options));
 
             control = lexer.nextClean();
 

From 93a1f327e00247f44abfdfe16ee6d9fdf073fd64 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Sat, 20 Sep 2025 17:45:49 +0200
Subject: [PATCH 21/48] feat: enhance comment parsing

---
 .../de/marhali/json5/stream/Json5Lexer.java   | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/marhali/json5/stream/Json5Lexer.java b/src/main/java/de/marhali/json5/stream/Json5Lexer.java
index 755d2f0..3c59d64 100644
--- a/src/main/java/de/marhali/json5/stream/Json5Lexer.java
+++ b/src/main/java/de/marhali/json5/stream/Json5Lexer.java
@@ -127,7 +127,7 @@ public String consumeComment() {
             return null;
         }
 
-        String result = comment.toString().strip();
+        String result = comment.toString();
         comment = null;
         return result;
     }
@@ -245,6 +245,8 @@ private void nextMultiLineComment() {
             comment.append('\n');
         }
 
+        long offset = character;
+
         while (true) {
             char n = next();
 
@@ -254,9 +256,24 @@ private void nextMultiLineComment() {
 
             if (n == '*' && peek() == '/') {
                 next();
+                if (isLineTerminator(comment.charAt(comment.length() - 1))) {
+                    // Remove trailing line-terminators
+                    comment.deleteCharAt(comment.length() - 1);
+                }
                 return;
             }
 
+            if (comment.length() == 0 && isLineTerminator(n)) {
+                // Skip heading line-terminators
+                continue;
+            } else if (character == offset+1 && isWhitespace(n)) {
+                // Skip stylistic whitespace between comment indicator and actual comment content
+                continue;
+            } else if (character <= offset && (isWhitespace(n) || n == '*') && !isLineTerminator(n)) {
+                // Skip whitespace offset until comments start in a new-line
+                continue;
+            }
+
             comment.append(n);
         }
     }
@@ -268,12 +285,19 @@ private void nextSingleLineComment() {
             comment.append('\n');
         }
 
+        long offset = character;
+
         while (true) {
             char n = next();
 
             if (isLineTerminator(n) || n == 0)
                 return;
 
+            if (character == offset+1 && isWhitespace(n)) {
+                // Skip stylistic whitespace between comment indicator and actual comment content
+                continue;
+            }
+
             comment.append(n);
         }
     }

From 43590ebd119d83c40489a85fc61f9ce4b7982a13 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Sat, 20 Sep 2025 17:46:34 +0200
Subject: [PATCH 22/48] chore: format file

---
 src/main/java/de/marhali/json5/stream/Json5Parser.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/de/marhali/json5/stream/Json5Parser.java b/src/main/java/de/marhali/json5/stream/Json5Parser.java
index b1d4a72..24c8bd8 100644
--- a/src/main/java/de/marhali/json5/stream/Json5Parser.java
+++ b/src/main/java/de/marhali/json5/stream/Json5Parser.java
@@ -144,9 +144,7 @@ public static Json5Object parseObject(Json5Lexer lexer) {
 
                 else {
                     array = new Json5Array();
-                    // TODO: is that right?
                     array.add(object.get(key));
-
                     duplicates.add(key);
                 }
 
@@ -192,7 +190,7 @@ public static Json5Array parseArray(Json5Lexer lexer) {
                 case 0:
                     throw lexer.syntaxError("A Json5Array must end with ']'");
                 case ']':
-                    if(lexer.root && !lexer.options.isAllowTrailingData() && lexer.nextClean() != 0) {
+                    if (lexer.root && !lexer.options.isAllowTrailingData() && lexer.nextClean() != 0) {
                         throw lexer.syntaxError("Trailing data after Json5Array");
                     }
                     return array;

From 1b74651a01298c5755a9deb0efbc172f01d569b1 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Sat, 20 Sep 2025 17:49:06 +0200
Subject: [PATCH 23/48] feat: test duplicate key strategy

---
 .../e2e/failures/DuplicateObjectKeyTest.java  | 78 +++++++++++++++++++
 .../e2e/failures/duplicate-object-key.json5   |  7 ++
 2 files changed, 85 insertions(+)
 create mode 100644 src/test/java/de/marhali/json5/e2e/failures/DuplicateObjectKeyTest.java
 create mode 100644 src/test/resources/e2e/failures/duplicate-object-key.json5

diff --git a/src/test/java/de/marhali/json5/e2e/failures/DuplicateObjectKeyTest.java b/src/test/java/de/marhali/json5/e2e/failures/DuplicateObjectKeyTest.java
new file mode 100644
index 0000000..25056ab
--- /dev/null
+++ b/src/test/java/de/marhali/json5/e2e/failures/DuplicateObjectKeyTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5.e2e.failures;
+
+import de.marhali.json5.Json5;
+import de.marhali.json5.Json5Element;
+import de.marhali.json5.Json5Primitive;
+import de.marhali.json5.config.DuplicateKeyStrategy;
+import de.marhali.json5.e2e.TestResourceHelper;
+import de.marhali.json5.exception.Json5Exception;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class DuplicateObjectKeyTest {
+    @Test
+    @DisplayName("Parse: duplicate key on object throws with DuplicateStrategy.UNIQUE")
+    void disallowDuplicateObjectKey() {
+        var json5 = Json5.builder(builder -> builder.duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE).build());
+
+        var ex = assertThrows(Json5Exception.class, () -> json5.parse(TestResourceHelper.getTestResourceContent("e2e/failures/duplicate-object-key.json5")));
+
+        assertEquals("Duplicate key \"alpha\" at index 37 [character 8 in line 3]", ex.getMessage());
+    }
+
+    @Test
+    @DisplayName("Parse: duplicate key on object, but last one wins with DuplicateStrategy.LAST_WINS")
+    void duplicateObjectKeyLastWins() {
+        var json5 = Json5.builder(builder -> builder.duplicateKeyStrategy(DuplicateKeyStrategy.LAST_WINS).build());
+
+        Json5Element element = json5.parse(TestResourceHelper.getTestResource("e2e/failures/duplicate-object-key.json5"));
+
+        assertTrue(element.isJson5Object());
+        var object = element.getAsJson5Object();
+
+        assertEquals(3, object.size());
+        assertEquals("secondAlphaValue", object.get("alpha").getAsString());
+        assertEquals("bravoValue", object.get("bravo").getAsString());
+        assertEquals("secondCharlieValue", object.get("charlie").getAsString());
+    }
+
+    @Test
+    @DisplayName("Parse: duplicate key on object, but all entries are converted to array with DuplicateStrategy.DUPLICATE")
+    void duplicateObjectKeyAsArray() {
+        var json5 = Json5.builder(builder -> builder.duplicateKeyStrategy(DuplicateKeyStrategy.DUPLICATE).build());
+
+        Json5Element element = json5.parse(TestResourceHelper.getTestResource("e2e/failures/duplicate-object-key.json5"));
+
+        assertTrue(element.isJson5Object());
+        var object = element.getAsJson5Object();
+
+        assertEquals(3, object.size());
+        assertTrue(object.get("alpha").isJson5Array());
+        assertEquals(Json5Primitive.fromString("firstAlphaValue"), object.get("alpha").getAsJson5Array().get(0));
+        assertEquals(Json5Primitive.fromString("secondAlphaValue"), object.get("alpha").getAsJson5Array().get(1));
+        assertEquals("bravoValue", object.get("bravo").getAsString());
+        assertEquals(Json5Primitive.fromString("firstCharlieValue"), object.get("charlie").getAsJson5Array().get(0));
+        assertEquals(Json5Primitive.fromString("secondCharlieValue"), object.get("charlie").getAsJson5Array().get(1));
+    }
+}
diff --git a/src/test/resources/e2e/failures/duplicate-object-key.json5 b/src/test/resources/e2e/failures/duplicate-object-key.json5
new file mode 100644
index 0000000..5f87fe1
--- /dev/null
+++ b/src/test/resources/e2e/failures/duplicate-object-key.json5
@@ -0,0 +1,7 @@
+{
+  alpha: "firstAlphaValue",
+  alpha: "secondAlphaValue",
+  bravo: "bravoValue",
+  charlie: "firstCharlieValue",
+  charlie: "secondCharlieValue"
+}

From 12ca6c93876b6ca6a046a80df98288791ab110c6 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Sat, 20 Sep 2025 17:49:31 +0200
Subject: [PATCH 24/48] feat: test trailing object rule

---
 .../failures/DisallowTrailingObjectTest.java  | 42 +++++++++++++++++++
 .../failures/disallow-trailing-object.json5   |  1 +
 2 files changed, 43 insertions(+)
 create mode 100644 src/test/java/de/marhali/json5/e2e/failures/DisallowTrailingObjectTest.java
 create mode 100644 src/test/resources/e2e/failures/disallow-trailing-object.json5

diff --git a/src/test/java/de/marhali/json5/e2e/failures/DisallowTrailingObjectTest.java b/src/test/java/de/marhali/json5/e2e/failures/DisallowTrailingObjectTest.java
new file mode 100644
index 0000000..baebbed
--- /dev/null
+++ b/src/test/java/de/marhali/json5/e2e/failures/DisallowTrailingObjectTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5.e2e.failures;
+
+import de.marhali.json5.Json5;
+import de.marhali.json5.config.Json5Options;
+import de.marhali.json5.e2e.TestResourceHelper;
+import de.marhali.json5.exception.Json5Exception;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class DisallowTrailingObjectTest {
+    @Test
+    @DisplayName("Parse: disallowed trailing data on object throws exception")
+    void disallowTrailingObject() {
+        var json5 = Json5.builder(Json5Options.Builder::build);
+
+        var ex = assertThrows(Json5Exception.class, () -> json5.parse(TestResourceHelper.getTestResourceContent("e2e/failures/disallow-trailing-object.json5")));
+
+        assertEquals("Trailing data after Json5Object at index 2 [character 3 in line 1]", ex.getMessage());
+    }
+}
diff --git a/src/test/resources/e2e/failures/disallow-trailing-object.json5 b/src/test/resources/e2e/failures/disallow-trailing-object.json5
new file mode 100644
index 0000000..30e290e
--- /dev/null
+++ b/src/test/resources/e2e/failures/disallow-trailing-object.json5
@@ -0,0 +1 @@
+{}abc

From 87ce67214e5cd23a762e0dcb0a0f24ab0e3032bc Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Sat, 20 Sep 2025 17:49:37 +0200
Subject: [PATCH 25/48] feat: test trailing array rule

---
 .../failures/DisallowTrailingArrayTest.java   | 42 +++++++++++++++++++
 .../failures/disallow-trailing-array.json5    |  1 +
 2 files changed, 43 insertions(+)
 create mode 100644 src/test/java/de/marhali/json5/e2e/failures/DisallowTrailingArrayTest.java
 create mode 100644 src/test/resources/e2e/failures/disallow-trailing-array.json5

diff --git a/src/test/java/de/marhali/json5/e2e/failures/DisallowTrailingArrayTest.java b/src/test/java/de/marhali/json5/e2e/failures/DisallowTrailingArrayTest.java
new file mode 100644
index 0000000..0697040
--- /dev/null
+++ b/src/test/java/de/marhali/json5/e2e/failures/DisallowTrailingArrayTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5.e2e.failures;
+
+import de.marhali.json5.Json5;
+import de.marhali.json5.config.Json5Options;
+import de.marhali.json5.e2e.TestResourceHelper;
+import de.marhali.json5.exception.Json5Exception;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class DisallowTrailingArrayTest {
+    @Test
+    @DisplayName("Parse: disallowed trailing data on array throws exception")
+    void disallowTrailingArray() {
+        var json5 = Json5.builder(Json5Options.Builder::build);
+
+        var ex = assertThrows(Json5Exception.class, () -> json5.parse(TestResourceHelper.getTestResourceContent("e2e/failures/disallow-trailing-array.json5")));
+
+        assertEquals("Trailing data after Json5Array at index 2 [character 3 in line 1]", ex.getMessage());
+    }
+}
diff --git a/src/test/resources/e2e/failures/disallow-trailing-array.json5 b/src/test/resources/e2e/failures/disallow-trailing-array.json5
new file mode 100644
index 0000000..4498874
--- /dev/null
+++ b/src/test/resources/e2e/failures/disallow-trailing-array.json5
@@ -0,0 +1 @@
+[]abc

From ad03942ba9aeaa6b017e1a9fd3567956a28bade4 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Sat, 20 Sep 2025 17:49:49 +0200
Subject: [PATCH 26/48] feat: rework roundtrip tests

---
 src/test/java/de/marhali/json5/TestJson5.java | 103 -------
 .../java/de/marhali/json5/TestJson5Array.java | 171 -----------
 .../marhali/json5/TestJson5Hexadecimal.java   |  66 -----
 .../de/marhali/json5/TestJson5Object.java     |  77 -----
 .../de/marhali/json5/TestJson5Options.java    |  78 -----
 .../de/marhali/json5/TestJson5Parser.java     | 268 ------------------
 .../de/marhali/json5/TestJson5Writer.java     | 148 ----------
 .../e2e/roundtrips/ParserAndWriterTest.java   | 203 +++++++++++++
 .../array-minify-no-comment.writer.json5      |   1 +
 .../array-minify-to-prettify.writer.json5     |  44 +++
 .../e2e/roundtrips/array-minify.parser.json5  |   1 +
 .../e2e/roundtrips/array-minify.writer.json5  |   1 +
 .../roundtrips/array-no-comment.writer.json5  |  28 ++
 .../e2e/roundtrips/array.parser.json5         |  50 ++++
 .../e2e/roundtrips/array.writer.json5         |  50 ++++
 .../object-minify-no-comment.writer.json5     |   1 +
 .../object-minify-to-prettify.writer.json5    |  49 ++++
 .../e2e/roundtrips/object-minify.parser.json5 |   1 +
 .../e2e/roundtrips/object-minify.writer.json5 |   1 +
 .../roundtrips/object-no-comment.writer.json5 |  32 +++
 .../e2e/roundtrips/object.parser.json5        |  52 ++++
 .../e2e/roundtrips/object.writer.json5        |  52 ++++
 src/test/resources/expect.array.json5         |  18 --
 src/test/resources/expect.object.json5        |  25 --
 src/test/resources/test.array.json5           |  18 --
 src/test/resources/test.object.json5          |  25 --
 26 files changed, 566 insertions(+), 997 deletions(-)
 delete mode 100644 src/test/java/de/marhali/json5/TestJson5.java
 delete mode 100644 src/test/java/de/marhali/json5/TestJson5Array.java
 delete mode 100644 src/test/java/de/marhali/json5/TestJson5Hexadecimal.java
 delete mode 100644 src/test/java/de/marhali/json5/TestJson5Object.java
 delete mode 100644 src/test/java/de/marhali/json5/TestJson5Options.java
 delete mode 100644 src/test/java/de/marhali/json5/TestJson5Parser.java
 delete mode 100644 src/test/java/de/marhali/json5/TestJson5Writer.java
 create mode 100644 src/test/java/de/marhali/json5/e2e/roundtrips/ParserAndWriterTest.java
 create mode 100644 src/test/resources/e2e/roundtrips/array-minify-no-comment.writer.json5
 create mode 100644 src/test/resources/e2e/roundtrips/array-minify-to-prettify.writer.json5
 create mode 100644 src/test/resources/e2e/roundtrips/array-minify.parser.json5
 create mode 100644 src/test/resources/e2e/roundtrips/array-minify.writer.json5
 create mode 100644 src/test/resources/e2e/roundtrips/array-no-comment.writer.json5
 create mode 100644 src/test/resources/e2e/roundtrips/array.parser.json5
 create mode 100644 src/test/resources/e2e/roundtrips/array.writer.json5
 create mode 100644 src/test/resources/e2e/roundtrips/object-minify-no-comment.writer.json5
 create mode 100644 src/test/resources/e2e/roundtrips/object-minify-to-prettify.writer.json5
 create mode 100644 src/test/resources/e2e/roundtrips/object-minify.parser.json5
 create mode 100644 src/test/resources/e2e/roundtrips/object-minify.writer.json5
 create mode 100644 src/test/resources/e2e/roundtrips/object-no-comment.writer.json5
 create mode 100644 src/test/resources/e2e/roundtrips/object.parser.json5
 create mode 100644 src/test/resources/e2e/roundtrips/object.writer.json5
 delete mode 100644 src/test/resources/expect.array.json5
 delete mode 100644 src/test/resources/expect.object.json5
 delete mode 100644 src/test/resources/test.array.json5
 delete mode 100644 src/test/resources/test.object.json5

diff --git a/src/test/java/de/marhali/json5/TestJson5.java b/src/test/java/de/marhali/json5/TestJson5.java
deleted file mode 100644
index 164bd5d..0000000
--- a/src/test/java/de/marhali/json5/TestJson5.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2022 Marcel Haßlinger
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package de.marhali.json5;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.io.*;
-import java.nio.charset.StandardCharsets;
-import java.util.Optional;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-/**
- * Unit tests for the {@link Json5} core class.
- *
- * @author Marcel Haßlinger
- */
-public class TestJson5 {
-
-    private Json5 json5;
-
-    private InputStream getTestResource(String fileName) {
-        return Thread.currentThread().getContextClassLoader().getResourceAsStream(fileName);
-    }
-
-    private String getTestResourceContent(String fileName) throws IOException {
-        try (BufferedInputStream bis = new BufferedInputStream(getTestResource(fileName))) {
-            ByteArrayOutputStream buf = new ByteArrayOutputStream();
-
-            for (int result = bis.read(); result != -1; result = bis.read()) {
-                buf.write((byte) result);
-            }
-
-            return Optional.ofNullable(buf.toString(StandardCharsets.UTF_8))
-                    .map(s->s.replace("\r\n","\n"))
-                    .map(s->s.replace("\r","\n"))
-                    .orElse(null);
-        }
-    }
-
-    @BeforeEach
-    void setup() {
-        json5 = Json5.builder(builder ->
-                builder.allowInvalidSurrogate().quoteSingle().indentFactor(2).build());
-    }
-
-    @Test
-    void parseString() {
-        String jsonString = "{\n  'key': 'value',\n  'bool': true,\n  'hex': 0x100\n}";
-        Json5Element element = json5.parse(jsonString);
-
-        assertTrue(element.isJson5Object());
-        assertEquals("value", element.getAsJson5Object().get("key").getAsString());
-        assertTrue(element.getAsJson5Object().get("bool").getAsBoolean());
-        assertInstanceOf(Json5Hexadecimal.class, element.getAsJson5Object().get("hex").getAsJson5Primitive());
-    }
-
-    @Test
-    void serializeString() throws IOException {
-        Json5Object element = new Json5Object();
-        element.addProperty("key", "value");
-        element.addProperty("bool", true);
-        element.add("hex",  new Json5Hexadecimal("0x100"));
-
-        String jsonString = json5.serialize(element);
-        String expect = "{\n  'key': 'value',\n  'bool': true,\n  'hex': 0x100\n}";
-
-        assertEquals(expect, jsonString);
-    }
-
-    @Test
-    void ioArrayFile() throws IOException {
-        try(InputStream stream = getTestResource("test.array.json5")) {
-            Json5Element element = json5.parse(stream);
-            assertTrue(element.isJson5Array());
-            assertEquals(getTestResourceContent("expect.array.json5"), json5.serialize(element));
-        }
-    }
-
-    @Test
-    void ioObjectFile() throws IOException {
-        try(InputStream stream = getTestResource("test.object.json5")) {
-            Json5Element element = json5.parse(stream);
-            assertTrue(element.isJson5Object());
-            assertEquals(getTestResourceContent("expect.object.json5"), json5.serialize(element));
-        }
-    }
-}
diff --git a/src/test/java/de/marhali/json5/TestJson5Array.java b/src/test/java/de/marhali/json5/TestJson5Array.java
deleted file mode 100644
index 0c4c39a..0000000
--- a/src/test/java/de/marhali/json5/TestJson5Array.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (C) 2022 Marcel Haßlinger
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package de.marhali.json5;
-
-import org.junit.jupiter.api.Test;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-/**
- * Unit tests for {@link Json5Array}
- *
- * @author Marcel Haßlinger
- */
-public class TestJson5Array {
-
-    @Test
-    void deepCopy() {
-        Json5Array array = new Json5Array();
-        array.add(true);
-        array.add(123);
-        array.add(new Json5Hexadecimal("0x100"));
-        array.add("Lorem ipsum");
-        array.add(Json5Null.INSTANCE);
-        array.add(new Json5Object());
-        array.add(new Json5String("Lorem ipsum"));
-
-        Json5Array target = array.deepCopy();
-
-        assertEquals(new Json5Array(), new Json5Array());
-        assertNotEquals(new Json5Array(), array);
-        assertEquals(target, array);
-        array.remove(1);
-        assertNotEquals(target, array);
-    }
-
-    @Test
-    void notAArray() {
-        Json5Element element = new Json5Object();
-        assertThrows(IllegalStateException.class, element::getAsJson5Array);
-    }
-
-    @Test
-    void add() {
-        Json5Array array = new Json5Array();
-        array.add("Lorem ipsum");
-        assertEquals(1, array.size());
-        assertTrue(array.contains(Json5Primitive.of("Lorem ipsum")));
-    }
-
-    @Test
-    void addAll() {
-        Json5Array array = new Json5Array();
-        array.add("Lorem ipsum");
-
-        Json5Array target = new Json5Array();
-        target.add("Lorem ipsum");
-        target.add("Lorem ipsum");
-
-        array.addAll(target);
-        assertEquals(3, array.size());
-    }
-
-    @Test
-    void getAsThrows() {
-        assertThrows(IllegalStateException.class, (() -> new Json5Array().getAsNumber()));
-        assertThrows(IllegalStateException.class, (() -> new Json5Array().getAsBigInteger()));
-        assertThrows(IllegalStateException.class, (() -> new Json5Array().getAsBigDecimal()));
-        assertThrows(IllegalStateException.class, (() -> new Json5Array().getAsDouble()));
-        assertThrows(IllegalStateException.class, (() -> new Json5Array().getAsFloat()));
-        assertThrows(IllegalStateException.class, (() -> new Json5Array().getAsLong()));
-        assertThrows(IllegalStateException.class, (() -> new Json5Array().getAsInt()));
-        assertThrows(IllegalStateException.class, (() -> new Json5Array().getAsShort()));
-        assertThrows(IllegalStateException.class, (() -> new Json5Array().getAsByte()));
-        assertThrows(IllegalStateException.class, (() -> new Json5Array().getAsBoolean()));
-        assertThrows(IllegalStateException.class, (() -> new Json5Array().getAsString()));
-    }
-
-    @Test
-    void getAsNumber() {
-        Json5Array array = new Json5Array();
-        array.add(123);
-        assertEquals(123, array.getAsNumber());
-    }
-
-    @Test
-    void getAsBigInt() {
-        Json5Array array = new Json5Array();
-        array.add(new BigInteger("123"));
-        assertEquals(new BigInteger("123"), array.getAsBigInteger());
-    }
-
-    @Test
-    void getAsBigDecimal() {
-        Json5Array array = new Json5Array();
-        array.add(new BigDecimal("123"));
-        assertEquals(new BigDecimal("123"), array.getAsBigDecimal());
-    }
-
-    @Test
-    void getAsDouble() {
-        Json5Array array = new Json5Array();
-        array.add(1.23d);
-        assertEquals(1.23d, array.getAsDouble());
-    }
-
-    @Test
-    void getAsFloat() {
-        Json5Array array = new Json5Array();
-        array.add(1.23f);
-        assertEquals(1.23f, array.getAsFloat());
-    }
-
-    @Test
-    void getAsLong() {
-        Json5Array array = new Json5Array();
-        array.add(123L);
-        assertEquals(123L, array.getAsLong());
-    }
-
-    @Test
-    void getAsInt() {
-        Json5Array array = new Json5Array();
-        array.add(123);
-        assertEquals(123, array.getAsInt());
-    }
-
-    @Test
-    void getAsShort() {
-        Json5Array array = new Json5Array();
-        array.add(Short.parseShort("123"));
-        assertEquals(Short.parseShort("123"), array.getAsShort());
-    }
-
-    @Test
-    void getAsByte() {
-        Json5Array array = new Json5Array();
-        array.add((byte)0x100);
-        assertEquals((byte)0x100, array.getAsByte());
-    }
-
-    @Test
-    void getAsBoolean() {
-        Json5Array array = new Json5Array();
-        array.add(true);
-        assertTrue(array.getAsBoolean());
-    }
-
-    @Test
-    void getAsString() {
-        Json5Array array = new Json5Array();
-        array.add("Lorem ipsum");
-        assertEquals("Lorem ipsum", array.getAsString());
-    }
-}
diff --git a/src/test/java/de/marhali/json5/TestJson5Hexadecimal.java b/src/test/java/de/marhali/json5/TestJson5Hexadecimal.java
deleted file mode 100644
index 17dceb8..0000000
--- a/src/test/java/de/marhali/json5/TestJson5Hexadecimal.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2022 Marcel Haßlinger
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package de.marhali.json5;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-/**
- * Unit tests for {@link Json5Hexadecimal} primitive data type.
- *
- * @author Marcel Haßlinger
- */
-public class TestJson5Hexadecimal {
-
-    @Test
-    void neutralHex() {
-        String hex = "0x100";
-        Json5Primitive primitive = new Json5Hexadecimal(hex);
-        assertEquals(primitive.getAsInt(), 256);
-        assertEquals(hex, primitive.getAsString());
-    }
-
-    @Test
-    void positiveHex() {
-        String hex = "+0x100";
-        Json5Primitive primitive = new Json5Hexadecimal(hex);
-        assertEquals(primitive.getAsInt(), 256);
-        assertEquals("0x100", primitive.getAsString()); // We cut the '+' by default since we cannot track this state
-    }
-
-    @Test
-    void positivePrefixedHex() {
-        String hex = "0x100";
-        Json5Primitive primitive = new Json5Hexadecimal(hex);
-        assertEquals("+0x100", Json5Hexadecimal.serializeHexString(primitive.getAsBigInteger(), true));
-    }
-
-    @Test
-    void negateHex() {
-        String hex = "-0x100";
-        Json5Primitive primitive = new Json5Hexadecimal(hex);
-        assertEquals(primitive.getAsInt(), -256);
-        assertEquals(hex, primitive.getAsString());
-    }
-
-    @Test
-    void instance() {
-        assertTrue(Json5Primitive.of("0x100", true) instanceof Json5Hexadecimal);
-        assertFalse(Json5Primitive.of("0x100", false) instanceof Json5Hexadecimal);
-    }
-}
diff --git a/src/test/java/de/marhali/json5/TestJson5Object.java b/src/test/java/de/marhali/json5/TestJson5Object.java
deleted file mode 100644
index 6801455..0000000
--- a/src/test/java/de/marhali/json5/TestJson5Object.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2022 Marcel Haßlinger
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package de.marhali.json5;
-
-import org.junit.jupiter.api.Test;
-
-import java.util.Set;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-/**
- * Unit tests for {@link Json5Object}
- *
- * @author Marcel Haßlinger
- */
-public class TestJson5Object {
-
-    @Test
-    void remove() {
-        Json5Object element = new Json5Object();
-        element.addProperty("str", "Lorem ipsum");
-        element.remove("str");
-        assertEquals(0, element.size());
-        assertFalse(element.has("str"));
-    }
-
-    @Test
-    void notAObject() {
-        Json5Element element = new Json5Array();
-        assertThrows(IllegalStateException.class, element::getAsJson5Object);
-    }
-
-    @Test
-    void deepCopy() {
-        Json5Object element = new Json5Object();
-        element.addProperty("str", "Lorem ipsum");
-        element.addProperty("bool", true);
-
-        Json5Object target = element.deepCopy();
-
-        element.remove("str");
-        element.remove("bool");
-        assertEquals(0, element.size());
-
-        assertEquals(2, target.size());
-        assertInstanceOf(Json5String.class, target.getAsJson5Primitive("str"));
-        assertInstanceOf(Json5Boolean.class, target.getAsJson5Primitive("bool"));
-    }
-
-    @Test
-    void add() {
-        Json5Object object = new Json5Object();
-        object.addProperty("char", 'c');
-        object.add("obj", new Json5Object());
-        object.add("array", new Json5Array());
-
-        assertInstanceOf(Json5String.class, object.get("char"));
-        assertEquals(new Json5Object(), object.getAsJson5Object("obj"));
-        assertEquals(Set.of("char", "obj", "array"), object.keySet());
-        assertInstanceOf(Json5Array.class, object.getAsJson5Array("array"));
-        assertEquals(0, object.getAsJson5Array("array").size());
-    }
-}
diff --git a/src/test/java/de/marhali/json5/TestJson5Options.java b/src/test/java/de/marhali/json5/TestJson5Options.java
deleted file mode 100644
index c0302a2..0000000
--- a/src/test/java/de/marhali/json5/TestJson5Options.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2022 Marcel Haßlinger
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package de.marhali.json5;
-
-import de.marhali.json5.stream.Json5Lexer;
-import de.marhali.json5.stream.Json5Parser;
-
-import org.junit.jupiter.api.Test;
-
-import java.io.StringReader;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-/**
- * Unit tests to check if all {@link Json5Options} are applied correctly.
- *
- * @author Marcel Haßlinger
- */
-public class TestJson5Options {
-
-    @Test
-    void singleQuoted() {
-        String payload = "['hello',1,'two']";
-
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        Json5Array element = Json5Parser.parseArray(lexer);
-
-        assertEquals("['hello',1,'two']", element.toString(options));
-    }
-
-    @Test
-    void doubleQuoted() {
-        String payload = "['hello',1,'two']";
-
-        Json5Options options = new Json5Options(true, false, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        Json5Array element = Json5Parser.parseArray(lexer);
-
-        assertEquals("[\"hello\",1,\"two\"]", element.toString(options));
-    }
-
-    @Test
-    void trailingComma() {
-        String payload = "['hello',1,'two']";
-
-        Json5Options options = new Json5Options(true, true, true, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        Json5Array element = Json5Parser.parseArray(lexer);
-
-        assertEquals("['hello',1,'two',]", element.toString(options));
-    }
-
-    @Test
-    void prettyPrinting() {
-        String payload = "['hello',1,'two']";
-
-        Json5Options options = new Json5Options(true, true, true, 2);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        Json5Array element = Json5Parser.parseArray(lexer);
-
-        assertEquals("[\n  'hello',\n  1,\n  'two',\n]", element.toString(options));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/de/marhali/json5/TestJson5Parser.java b/src/test/java/de/marhali/json5/TestJson5Parser.java
deleted file mode 100644
index 47b536e..0000000
--- a/src/test/java/de/marhali/json5/TestJson5Parser.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Copyright (C) 2022 Marcel Haßlinger
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package de.marhali.json5;
-
-import de.marhali.json5.exception.Json5Exception;
-import de.marhali.json5.stream.Json5Lexer;
-import de.marhali.json5.stream.Json5Parser;
-
-import org.junit.jupiter.api.Test;
-
-import java.io.StringReader;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-/**
- * Unit tests for the {@link Json5Parser}.
- *
- * @author Marcel Haßlinger
- */
-public class TestJson5Parser {
-
-    @Test
-    void array() {
-        String payload = "['hello',1,'two',{'key':'value'}]";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        Json5Array element = Json5Parser.parseArray(lexer);
-        assertEquals(payload, element.toString(options));
-        assertTrue(element.get(0).getAsJson5Primitive() instanceof Json5String);
-        assertTrue(element.get(1).getAsJson5Primitive() instanceof Json5Number);
-        assertTrue(element.get(3).isJson5Object());
-    }
-
-    @Test
-    void object() {
-        String payload = "{'key':'value','array':['first','second'],'nested':{'key':'value'}}";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        Json5Object element = Json5Parser.parseObject(lexer);
-        assertEquals(payload, element.toString(options));
-        assertEquals("value", element.get("key").getAsString());
-        assertTrue(element.get("array").isJson5Array());
-    }
-
-    @Test
-    void determineArrayType() {
-        String payload = "['first','second']";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        Json5Element element = Json5Parser.parse(lexer);
-        assertTrue(element.isJson5Array());
-        assertInstanceOf(Json5Array.class, element);
-    }
-
-    @Test
-    void determineObjectType() {
-        String payload = "{'key':'value'}";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        Json5Element element = Json5Parser.parse(lexer);
-        assertTrue(element.isJson5Object());
-        assertInstanceOf(Json5Object.class, element);
-    }
-
-    @Test
-    void hexadecimal() {
-        String payload = "{'key':0x100}";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        Json5Object element = Json5Parser.parseObject(lexer);
-        assertEquals(payload, element.toString(options));
-        assertInstanceOf(Json5Hexadecimal.class, element.getAsJson5Primitive("key"));
-    }
-
-    @Test
-    void insideQuotes() {
-        String payload = "[\"example\",'other']";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        Json5Array element = Json5Parser.parseArray(lexer);
-        assertEquals("['example','other']", element.toString(options));
-    }
-
-    @Test
-    void mixedQuotes() {
-        String payload = "{ a: \"Test \\' 123\" }";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        Json5Object element = Json5Parser.parseObject(lexer);
-        assertEquals("Test ' 123", element.get("a").getAsString());
-    }
-
-    @Test
-    void escapeChars() {
-        String payload = "{ a: \"\\n\\r\\f\\b\\t\\v\\0\u12fa\\x7F\" }";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        Json5Object element = Json5Parser.parseObject(lexer);
-        assertEquals("\n\r\f\b\t\u000B\0\u12fa\u007F", element.get("a").getAsString());
-        assertInstanceOf(Json5String.class, element.get("a"));
-    }
-
-    @Test
-    void specialNumbers() {
-        String payload = "[+NaN,NaN,-NaN,+Infinity,Infinity,-Infinity]";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        Json5Array element = Json5Parser.parseArray(lexer);
-        assertEquals("[NaN,NaN,NaN,Infinity,Infinity,-Infinity]", element.toString(options));
-        assertInstanceOf(Json5Number.class, element.get(0));
-    }
-
-    @Test
-    void malformed() {
-        String payload = "[10}";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        assertThrows(Json5Exception.class, () -> Json5Parser.parse(lexer));
-    }
-
-    @Test
-    void notAObject() {
-        String payload = "[]";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        assertThrows(Json5Exception.class, () -> Json5Parser.parseObject(lexer));
-    }
-
-    @Test
-    void incompleteObject() {
-        String payload = "{";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        assertThrows(Json5Exception.class, () -> Json5Parser.parseObject(lexer));
-    }
-
-    @Test
-    void notAArray() {
-        String payload = "{}";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        assertThrows(Json5Exception.class, () -> Json5Parser.parseArray(lexer));
-    }
-
-    @Test
-    void incompleteArray() {
-        String payload = "[";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        assertThrows(Json5Exception.class, () -> Json5Parser.parseArray(lexer));
-    }
-
-    @Test
-    void duplicateObjectKeys() {
-        String payload = "{'key':'value','key':'value'}";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        assertThrows(Json5Exception.class, () -> Json5Parser.parseObject(lexer));
-    }
-
-    @Test
-    void noDivider() {
-        String payload = "{'key''value'}";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        assertThrows(Json5Exception.class, () -> Json5Parser.parseObject(lexer));
-    }
-
-    @Test
-    void noComma() {
-        String payload = "{'key':'value''otherKey':'value'}";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        assertThrows(Json5Exception.class, () -> Json5Parser.parseObject(lexer));
-    }
-
-    @Test
-    void unknownControlCharacter() {
-        String payload = "|";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        assertThrows(Json5Exception.class, () -> Json5Parser.parse(lexer));
-    }
-
-    @Test
-    void empty() {
-        String payload = "";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        assertNull(Json5Parser.parse(lexer));
-    }
-
-    @Test
-    void memberNames() {
-        String payload = "{ $Lorem\\u0041_Ipsum123指事字: 0 }";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        Json5Object element = Json5Parser.parseObject(lexer);
-        assertTrue(element.has("$LoremA_Ipsum123指事字"));
-    }
-
-    @Test
-    void multiComments() {
-        String payload = "/**/{/**/a/**/:/**/'b'/**/}/**/";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        Json5Object element = Json5Parser.parseObject(lexer);
-        assertTrue(element.has("a"));
-    }
-
-    @Test
-    void singleComments() {
-        String payload = "// test\n{ // lorem ipsum\n a: 'b'\n// test\n}// test";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        Json5Object element = Json5Parser.parseObject(lexer);
-        assertTrue(element.has("a"));
-    }
-
-    @Test
-    void booleans() {
-        String payload = "[true,false]";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        Json5Array element = Json5Parser.parseArray(lexer);
-        assertEquals(payload, element.toString(options));
-        assertInstanceOf(Json5Boolean.class, element.get(0));
-    }
-
-    @Test
-    void numbers() {
-        String payload = "[123e+45,-123e45,123]";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        Json5Array element = Json5Parser.parseArray(lexer);
-        assertEquals(123e+45, element.get(0).getAsNumber().doubleValue());
-        assertEquals(-123e45, element.get(1).getAsNumber().doubleValue());
-        assertEquals(123, element.get(2).getAsNumber().doubleValue());
-        assertTrue(element.get(0).isJson5Primitive());
-        assertTrue(element.get(0).getAsJson5Primitive().isNumber());
-        assertInstanceOf(Json5Number.class, element.get(2));
-    }
-
-    @Test
-    void nullLiteral() {
-        String payload = "[null,{'key':null}]";
-        Json5Options options = new Json5Options(true, true, false, 0);
-        Json5Lexer lexer = new Json5Lexer(new StringReader(payload), options);
-        Json5Array element = Json5Parser.parseArray(lexer);
-        assertEquals(payload, element.toString(options));
-        assertTrue(element.get(0).isJson5Null());
-        assertInstanceOf(Json5Null.class, element.get(0));
-    }
-}
diff --git a/src/test/java/de/marhali/json5/TestJson5Writer.java b/src/test/java/de/marhali/json5/TestJson5Writer.java
deleted file mode 100644
index 6b59f0c..0000000
--- a/src/test/java/de/marhali/json5/TestJson5Writer.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (C) 2022 Marcel Haßlinger
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package de.marhali.json5;
-
-import de.marhali.json5.stream.Json5Writer;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.io.IOException;
-import java.io.StringWriter;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-/**
- * Unit tests for the {@link Json5Writer}.
- *
- * @author Marcel Haßlinger
- */
-public class TestJson5Writer {
-
-    private final Json5Options options
-            = new Json5Options(true, true, false, 0);
-
-    private StringWriter stringWriter;
-    private Json5Writer json5Writer;
-
-    @BeforeEach
-    void beforeEach() {
-        stringWriter = new StringWriter();
-        json5Writer = new Json5Writer(options, stringWriter);
-    }
-
-    @Test
-    void quoteEmpty() {
-        assertEquals("''", json5Writer.quote(null));
-        assertEquals("''", json5Writer.quote(""));
-    }
-
-    @Test
-    void quoteEscape() {
-        assertEquals("'\\\\n'", json5Writer.quote("\\n"));
-    }
-
-    @Test
-    void array() throws IOException {
-        Json5Array array = new Json5Array();
-        array.add(true);
-        array.add(123);
-        array.add(new Json5Hexadecimal("0x100"));
-        array.add("Lorem ipsum");
-        array.add(Json5Null.INSTANCE);
-        array.add(new Json5Object());
-
-        json5Writer.write(array);
-
-        assertEquals("[true,123,0x100,'Lorem ipsum',null,{}]", stringWriter.toString());
-    }
-
-    @Test
-    void object() throws IOException {
-        Json5Object object = new Json5Object();
-        object.add("bool", Json5Primitive.of(false));
-        object.add("num", Json5Primitive.of(123));
-        object.add("hex", new Json5Hexadecimal("0x100"));
-        object.add("str", Json5Primitive.of("Lorem ipsum"));
-        object.add("nulled", Json5Null.INSTANCE);
-        object.add("array", new Json5Array());
-
-        json5Writer.write(object);
-
-        assertEquals("{'bool':false,'num':123,'hex':0x100,'str':'Lorem ipsum','nulled':null,'array':[]}",
-                stringWriter.toString());
-    }
-
-    @Test
-    void nullLiteral() throws IOException {
-        json5Writer.write(Json5Null.INSTANCE);
-        assertEquals("null", stringWriter.toString());
-    }
-
-    @Test
-    void booleans() throws IOException {
-        json5Writer.write(new Json5Boolean(false));
-        assertEquals("false", stringWriter.toString());
-    }
-
-    @Test
-    void largeNumber() throws IOException {
-        json5Writer.write(new Json5Number(123e+45));
-        assertEquals("1.23E47", stringWriter.toString());
-    }
-
-    @Test
-    void largeNumberNegate() throws IOException {
-        json5Writer.write(new Json5Number(-123e+45));
-        assertEquals("-1.23E47", stringWriter.toString());
-    }
-
-    @Test
-    void hexadecimal() throws IOException {
-        json5Writer.write(new Json5Hexadecimal("0x100"));
-        assertEquals("0x100", stringWriter.toString());
-    }
-
-    @Test
-    void number() throws IOException {
-        json5Writer.write(new Json5Number(123));
-        assertEquals("123", stringWriter.toString());
-    }
-
-    @Test
-    void string() throws IOException {
-        json5Writer.write(new Json5String("Lorem ipsum"));
-        assertEquals("'Lorem ipsum'", stringWriter.toString());
-    }
-
-    @Test
-    void memberNames() throws IOException {
-        Json5Object object = new Json5Object();
-        object.addProperty("$LoremA_Ipsum123指事字", 0);
-        json5Writer.write(object);
-        assertEquals("{'$LoremA_Ipsum123指事字':0}", stringWriter.toString());
-    }
-
-    @Test
-    void escapeChars() throws IOException {
-        Json5Array array = new Json5Array();
-        array.add("\\\n\r\f\b\t\u000B\u12fa\u000b");
-        json5Writer.write(array);
-        assertEquals("['\\\\\\n\\r\\f\\b\\t\\v\u12fa\\v']", stringWriter.toString());
-        // Cannot test \x7F
-    }
-}
diff --git a/src/test/java/de/marhali/json5/e2e/roundtrips/ParserAndWriterTest.java b/src/test/java/de/marhali/json5/e2e/roundtrips/ParserAndWriterTest.java
new file mode 100644
index 0000000..160888e
--- /dev/null
+++ b/src/test/java/de/marhali/json5/e2e/roundtrips/ParserAndWriterTest.java
@@ -0,0 +1,203 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5.e2e.roundtrips;
+
+import de.marhali.json5.Json5;
+import de.marhali.json5.config.Json5Options;
+import de.marhali.json5.e2e.TestResourceHelper;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class ParserAndWriterTest {
+    @Test
+    void objectRoundtrip() throws IOException {
+        var json5 = new Json5();
+
+        var element = json5.parse(TestResourceHelper.getTestResource("e2e/roundtrips/object.parser.json5"));
+        var stringifiedElement = json5.serialize(element);
+
+        var expectedStringifiedElement = TestResourceHelper.getTestResourceContent("e2e/roundtrips/object.writer.json5");
+
+        assertEquals(expectedStringifiedElement, stringifiedElement);
+    }
+
+    @Test
+    void objectRoundtripNoComment() throws IOException {
+        var json5 = new Json5(Json5Options.builder()
+            .allowNaN()
+            .allowInfinity()
+            .parseComments()
+            .trailingComma()
+            .indentFactor(2)
+            .quoteless()
+            .insertFinalNewline()
+            .build()
+        );
+
+        var element = json5.parse(TestResourceHelper.getTestResource("e2e/roundtrips/object.parser.json5"));
+        var stringifiedElement = json5.serialize(element);
+
+        var expectedStringifiedElement = TestResourceHelper.getTestResourceContent("e2e/roundtrips/object-no-comment.writer.json5");
+
+        assertEquals(expectedStringifiedElement, stringifiedElement);
+    }
+
+    @Test
+    void objectRoundtripMinifyNoComment() throws IOException {
+        var json5 = new Json5(Json5Options.builder()
+            .allowNaN()
+            .allowInfinity()
+            .parseComments()
+            .indentFactor(0)
+            .quoteless()
+            .insertFinalNewline()
+            .build()
+        );
+
+        var element = json5.parse(TestResourceHelper.getTestResource("e2e/roundtrips/object.parser.json5"));
+        var stringifiedElement = json5.serialize(element);
+
+        var expectedStringifiedElement = TestResourceHelper.getTestResourceContent("e2e/roundtrips/object-minify-no-comment.writer.json5");
+
+        assertEquals(expectedStringifiedElement, stringifiedElement);
+    }
+
+    @Test
+    void objectRoundtripMinify() throws IOException {
+        var json5 = new Json5(Json5Options.builder()
+            .allowNaN()
+            .allowInfinity()
+            .parseComments()
+            .writeComments()
+            .indentFactor(0)
+            .quoteless()
+            .insertFinalNewline()
+            .build()
+        );
+
+        var element = json5.parse(TestResourceHelper.getTestResource("e2e/roundtrips/object.parser.json5"));
+        var stringifiedElement = json5.serialize(element);
+
+        var expectedStringifiedElement = TestResourceHelper.getTestResourceContent("e2e/roundtrips/object-minify.writer.json5");
+
+        assertEquals(expectedStringifiedElement, stringifiedElement);
+    }
+
+    @Test
+    void objectRoundtripMinifyToPretty() throws IOException {
+        var json5 = new Json5();
+
+        var element = json5.parse(TestResourceHelper.getTestResource("e2e/roundtrips/object-minify.parser.json5"));
+        var stringifiedElement = json5.serialize(element);
+
+        var expectedStringifiedElement = TestResourceHelper.getTestResourceContent("e2e/roundtrips/object-minify-to-prettify.writer.json5");
+
+        assertEquals(expectedStringifiedElement, stringifiedElement);
+    }
+
+    @Test
+    void arrayRoundtrip() throws IOException {
+        var json5 = new Json5();
+
+        var element = json5.parse(TestResourceHelper.getTestResource("e2e/roundtrips/array.parser.json5"));
+        var stringifiedElement = json5.serialize(element);
+
+        var expectedStringifiedElement = TestResourceHelper.getTestResourceContent("e2e/roundtrips/array.writer.json5");
+
+        assertEquals(expectedStringifiedElement, stringifiedElement);
+    }
+
+    @Test
+    void arrayRoundtripNoComment() throws IOException {
+        var json5 = new Json5(Json5Options.builder()
+            .allowNaN()
+            .allowInfinity()
+            .parseComments()
+            .trailingComma()
+            .indentFactor(2)
+            .quoteless()
+            .insertFinalNewline()
+            .build()
+        );
+
+        var element = json5.parse(TestResourceHelper.getTestResource("e2e/roundtrips/array.parser.json5"));
+        var stringifiedElement = json5.serialize(element);
+
+        var expectedStringifiedElement = TestResourceHelper.getTestResourceContent("e2e/roundtrips/array-no-comment.writer.json5");
+
+        assertEquals(expectedStringifiedElement, stringifiedElement);
+    }
+
+    @Test
+    void arrayRoundtripMinifyNoComment() throws IOException {
+        var json5 = new Json5(Json5Options.builder()
+            .allowNaN()
+            .allowInfinity()
+            .parseComments()
+            .indentFactor(0)
+            .quoteless()
+            .insertFinalNewline()
+            .build()
+        );
+
+        var element = json5.parse(TestResourceHelper.getTestResource("e2e/roundtrips/array.parser.json5"));
+        var stringifiedElement = json5.serialize(element);
+
+        var expectedStringifiedElement = TestResourceHelper.getTestResourceContent("e2e/roundtrips/array-minify-no-comment.writer.json5");
+
+        assertEquals(expectedStringifiedElement, stringifiedElement);
+    }
+
+    @Test
+    void arrayRoundtripMinify() throws IOException {
+        var json5 = new Json5(Json5Options.builder()
+            .allowNaN()
+            .allowInfinity()
+            .parseComments()
+            .writeComments()
+            .indentFactor(0)
+            .quoteless()
+            .insertFinalNewline()
+            .build()
+        );
+
+        var element = json5.parse(TestResourceHelper.getTestResource("e2e/roundtrips/array.parser.json5"));
+        var stringifiedElement = json5.serialize(element);
+
+        var expectedStringifiedElement = TestResourceHelper.getTestResourceContent("e2e/roundtrips/array-minify.writer.json5");
+
+        assertEquals(expectedStringifiedElement, stringifiedElement);
+    }
+
+    @Test
+    void arrayRoundtripMinifyToPretty() throws IOException {
+        var json5 = new Json5();
+
+        var element = json5.parse(TestResourceHelper.getTestResource("e2e/roundtrips/array-minify.parser.json5"));
+        var stringifiedElement = json5.serialize(element);
+
+        var expectedStringifiedElement = TestResourceHelper.getTestResourceContent("e2e/roundtrips/array-minify-to-prettify.writer.json5");
+
+        assertEquals(expectedStringifiedElement, stringifiedElement);
+    }
+}
diff --git a/src/test/resources/e2e/roundtrips/array-minify-no-comment.writer.json5 b/src/test/resources/e2e/roundtrips/array-minify-no-comment.writer.json5
new file mode 100644
index 0000000..2f2ea62
--- /dev/null
+++ b/src/test/resources/e2e/roundtrips/array-minify-no-comment.writer.json5
@@ -0,0 +1 @@
+[true,false,"Test \" 123","Test ' 123","Test ' 123","\\n\\r\\f\\b\\t\\u000B\\0\\u12Fa\\u007F",true,0x303030,0x303030,-0x303030,NaN,NaN,NaN,Infinity,Infinity,-Infinity,123,123,-123,{key:"value",array:[true,false]}]
diff --git a/src/test/resources/e2e/roundtrips/array-minify-to-prettify.writer.json5 b/src/test/resources/e2e/roundtrips/array-minify-to-prettify.writer.json5
new file mode 100644
index 0000000..79993e7
--- /dev/null
+++ b/src/test/resources/e2e/roundtrips/array-minify-to-prettify.writer.json5
@@ -0,0 +1,44 @@
+// Multi-line comment on root array element
+[
+  // Comment on truly primitive boolean
+  true,
+  // Comment on falsy primitive boolean
+  false,
+  // Double quoted string with escaped quote
+  "Test \" 123",
+  // Single quoted string with escaped quote
+  "Test ' 123",
+  // String with mixed quotes
+  "Test ' 123",
+  // Escapes
+  "\\n\\r\\f\\b\\t\\u000B\\0\\u12Fa\\u007F",
+  // Multi-line comment on primitive value
+  true,
+  // Neutral hex number
+  0x303030,
+  // Positive hex number
+  0x303030,
+  // Negative hex number
+  -0x303030,
+  NaN,
+  NaN,
+  NaN,
+  Infinity,
+  Infinity,
+  -Infinity,
+  123,
+  123,
+  -123,
+  // Object within array
+  {
+    // Sample member
+    key: "value",
+    // Nested array
+    array: [
+      // any true
+      true,
+      // any false
+      false,
+    ],
+  },
+]
diff --git a/src/test/resources/e2e/roundtrips/array-minify.parser.json5 b/src/test/resources/e2e/roundtrips/array-minify.parser.json5
new file mode 100644
index 0000000..e76fde5
--- /dev/null
+++ b/src/test/resources/e2e/roundtrips/array-minify.parser.json5
@@ -0,0 +1 @@
+/*Multi-line comment on root array element*/[/*Comment on truly primitive boolean*/true,/*Comment on falsy primitive boolean*/false,/*Double quoted string with escaped quote*/"Test \" 123",/*Single quoted string with escaped quote*/'Test \' 123',/*String with mixed quotes*/"Test ' 123",/*Escapes*/"\\n\\r\\f\\b\\t\\u000B\\0\\u12Fa\\u007F",/*Multi-line comment on primitive value*/true,/*Neutral hex number*/0x303030,/*Positive hex number*/0x303030,/*Negative hex number*/-0x303030,NaN,+NaN,-NaN,Infinity,+Infinity,-Infinity,123,+123,-123,/*Object within array*/{/*Sample member*/key:"value",/*Nested array*/array:[/*any true*/true,/*any false*/false]}]
diff --git a/src/test/resources/e2e/roundtrips/array-minify.writer.json5 b/src/test/resources/e2e/roundtrips/array-minify.writer.json5
new file mode 100644
index 0000000..fb2c547
--- /dev/null
+++ b/src/test/resources/e2e/roundtrips/array-minify.writer.json5
@@ -0,0 +1 @@
+/*Multi-line comment on root array element*/[/*Comment on truly primitive boolean*/true,/*Comment on falsy primitive boolean*/false,/*Double quoted string with escaped quote*/"Test \" 123",/*Single quoted string with escaped quote*/"Test ' 123",/*String with mixed quotes*/"Test ' 123",/*Escapes*/"\\n\\r\\f\\b\\t\\u000B\\0\\u12Fa\\u007F",/*Multi-line comment on primitive value*/true,/*Neutral hex number*/0x303030,/*Positive hex number*/0x303030,/*Negative hex number*/-0x303030,NaN,NaN,NaN,Infinity,Infinity,-Infinity,123,123,-123,/*Object within array*/{/*Sample member*/key:"value",/*Nested array*/array:[/*any true*/true,/*any false*/false]}]
diff --git a/src/test/resources/e2e/roundtrips/array-no-comment.writer.json5 b/src/test/resources/e2e/roundtrips/array-no-comment.writer.json5
new file mode 100644
index 0000000..e876b8f
--- /dev/null
+++ b/src/test/resources/e2e/roundtrips/array-no-comment.writer.json5
@@ -0,0 +1,28 @@
+[
+  true,
+  false,
+  "Test \" 123",
+  "Test ' 123",
+  "Test ' 123",
+  "\\n\\r\\f\\b\\t\\u000B\\0\\u12Fa\\u007F",
+  true,
+  0x303030,
+  0x303030,
+  -0x303030,
+  NaN,
+  NaN,
+  NaN,
+  Infinity,
+  Infinity,
+  -Infinity,
+  123,
+  123,
+  -123,
+  {
+    key: "value",
+    array: [
+      true,
+      false,
+    ],
+  },
+]
diff --git a/src/test/resources/e2e/roundtrips/array.parser.json5 b/src/test/resources/e2e/roundtrips/array.parser.json5
new file mode 100644
index 0000000..2c661fb
--- /dev/null
+++ b/src/test/resources/e2e/roundtrips/array.parser.json5
@@ -0,0 +1,50 @@
+/*
+ * Multi-line comment
+ * on root array element
+ */
+[
+  // Comment on truly primitive boolean
+  true,
+  // Comment on falsy primitive boolean
+  false,
+  // Double quoted string with escaped quote
+  "Test \" 123",
+  // Single quoted string with escaped quote
+  'Test \' 123',
+  // String with mixed quotes
+  "Test ' 123",
+  // Escapes
+  "\\n\\r\\f\\b\\t\\u000B\\0\\u12Fa\\u007F",
+  /*
+   * Multi-line comment
+   * on primitive value
+   */
+  true,
+  // Neutral hex number
+  0x303030,
+  // Positive hex number
+  +0x303030,
+  // Negative hex number
+  -0x303030,
+  NaN,
+  +NaN,
+  -NaN,
+  Infinity,
+  +Infinity,
+  -Infinity,
+  123,
+  +123,
+  -123,
+  // Object within array
+  {
+    // Sample member
+    key: "value",
+    // Nested array
+    array: [
+      // any true
+      true,
+      // any false
+      false
+    ]
+  }
+]
diff --git a/src/test/resources/e2e/roundtrips/array.writer.json5 b/src/test/resources/e2e/roundtrips/array.writer.json5
new file mode 100644
index 0000000..94d83af
--- /dev/null
+++ b/src/test/resources/e2e/roundtrips/array.writer.json5
@@ -0,0 +1,50 @@
+/*
+ * Multi-line comment
+ * on root array element
+ */
+[
+  // Comment on truly primitive boolean
+  true,
+  // Comment on falsy primitive boolean
+  false,
+  // Double quoted string with escaped quote
+  "Test \" 123",
+  // Single quoted string with escaped quote
+  "Test ' 123",
+  // String with mixed quotes
+  "Test ' 123",
+  // Escapes
+  "\\n\\r\\f\\b\\t\\u000B\\0\\u12Fa\\u007F",
+  /*
+   * Multi-line comment
+   * on primitive value
+   */
+  true,
+  // Neutral hex number
+  0x303030,
+  // Positive hex number
+  0x303030,
+  // Negative hex number
+  -0x303030,
+  NaN,
+  NaN,
+  NaN,
+  Infinity,
+  Infinity,
+  -Infinity,
+  123,
+  123,
+  -123,
+  // Object within array
+  {
+    // Sample member
+    key: "value",
+    // Nested array
+    array: [
+      // any true
+      true,
+      // any false
+      false,
+    ],
+  },
+]
diff --git a/src/test/resources/e2e/roundtrips/object-minify-no-comment.writer.json5 b/src/test/resources/e2e/roundtrips/object-minify-no-comment.writer.json5
new file mode 100644
index 0000000..bbcb535
--- /dev/null
+++ b/src/test/resources/e2e/roundtrips/object-minify-no-comment.writer.json5
@@ -0,0 +1 @@
+{quotes:{doubleQuoted:"Test \" 123",singleQuoted:"Test ' 123",testMixedQuoted:"Test ' 123"},falsy:false,truly:true,escapes:"\\n\\r\\f\\b\\t\\u000B\\0\\u12Fa\\u007F",memberNames:{$LoremA_Ipsum123指事字:0},multiLineComment:false,hexNumbers:[0x303030,0x303030,-0x303030],specialNumbers:[NaN,NaN,NaN,Infinity,Infinity,-Infinity],literals:[123,123,-123]}
diff --git a/src/test/resources/e2e/roundtrips/object-minify-to-prettify.writer.json5 b/src/test/resources/e2e/roundtrips/object-minify-to-prettify.writer.json5
new file mode 100644
index 0000000..4741edf
--- /dev/null
+++ b/src/test/resources/e2e/roundtrips/object-minify-to-prettify.writer.json5
@@ -0,0 +1,49 @@
+// Object comment
+{
+  // Quotes tests
+  quotes: {
+    // Test double-quoted member name and string value
+    doubleQuoted: "Test \" 123",
+    // Test single-quoted member name and string value
+    singleQuoted: "Test ' 123",
+    // Test mixed quotes with double- and single-quotes
+    testMixedQuoted: "Test ' 123",
+  },
+  // Falsy boolean,
+  falsy: false,
+  // Truly boolean
+  truly: true,
+  // Test escape characters
+  escapes: "\\n\\r\\f\\b\\t\\u000B\\0\\u12Fa\\u007F",
+  // Test member names
+  memberNames: {
+    // Test member names
+    $LoremA_Ipsum123指事字: 0,
+  },
+  // Some multi-line comment
+  multiLineComment: false,
+  // Hex numbers
+  hexNumbers: [
+    // Neutral hex number
+    0x303030,
+    // Positive hex number
+    0x303030,
+    // Negative hex number
+    -0x303030,
+  ],
+  // Special numbers
+  specialNumbers: [
+    NaN,
+    NaN,
+    NaN,
+    Infinity,
+    Infinity,
+    -Infinity,
+  ],
+  // Literals
+  literals: [
+    123,
+    123,
+    -123,
+  ],
+}
diff --git a/src/test/resources/e2e/roundtrips/object-minify.parser.json5 b/src/test/resources/e2e/roundtrips/object-minify.parser.json5
new file mode 100644
index 0000000..75cd438
--- /dev/null
+++ b/src/test/resources/e2e/roundtrips/object-minify.parser.json5
@@ -0,0 +1 @@
+/*Object comment*/{/*Quotes tests*/quotes:{/*Test double-quoted member name and string value*/"doubleQuoted":"Test \" 123",/*Test single-quoted member name and string value*/'singleQuoted':'Test \' 123',/*Test mixed quotes with double- and single-quotes*/testMixedQuoted:"Test ' 123"},/*Falsy boolean,*/falsy:false,/*Truly boolean*/truly:true,/*Test escape characters*/escapes:"\\n\\r\\f\\b\\t\\u000B\\0\\u12Fa\\u007F",/*Test member names*/memberNames:{/*Test member names*/"$Lorem\u0041_Ipsum123指事字":0},/*Some multi-line comment*/multiLineComment:false,/*Hex numbers*/hexNumbers:[/*Neutral hex number*/0x303030,/*Positive hex number*/+0x303030,/*Negative hex number*/-0x303030],/*Special numbers*/specialNumbers:[NaN,+NaN,-NaN,Infinity,+Infinity,-Infinity],/*Literals*/literals:[123,+123,-123]}
diff --git a/src/test/resources/e2e/roundtrips/object-minify.writer.json5 b/src/test/resources/e2e/roundtrips/object-minify.writer.json5
new file mode 100644
index 0000000..cfedbda
--- /dev/null
+++ b/src/test/resources/e2e/roundtrips/object-minify.writer.json5
@@ -0,0 +1 @@
+/*Object comment*/{/*Quotes tests*/quotes:{/*Test double-quoted member name and string value*/doubleQuoted:"Test \" 123",/*Test single-quoted member name and string value*/singleQuoted:"Test ' 123",/*Test mixed quotes with double- and single-quotes*/testMixedQuoted:"Test ' 123"},/*Falsy boolean,*/falsy:false,/*Truly boolean*/truly:true,/*Test escape characters*/escapes:"\\n\\r\\f\\b\\t\\u000B\\0\\u12Fa\\u007F",/*Test member names*/memberNames:{/*Test member names*/$LoremA_Ipsum123指事字:0},/*Some multi-line comment*/multiLineComment:false,/*Hex numbers*/hexNumbers:[/*Neutral hex number*/0x303030,/*Positive hex number*/0x303030,/*Negative hex number*/-0x303030],/*Special numbers*/specialNumbers:[NaN,NaN,NaN,Infinity,Infinity,-Infinity],/*Literals*/literals:[123,123,-123]}
diff --git a/src/test/resources/e2e/roundtrips/object-no-comment.writer.json5 b/src/test/resources/e2e/roundtrips/object-no-comment.writer.json5
new file mode 100644
index 0000000..0930cc1
--- /dev/null
+++ b/src/test/resources/e2e/roundtrips/object-no-comment.writer.json5
@@ -0,0 +1,32 @@
+{
+  quotes: {
+    doubleQuoted: "Test \" 123",
+    singleQuoted: "Test ' 123",
+    testMixedQuoted: "Test ' 123",
+  },
+  falsy: false,
+  truly: true,
+  escapes: "\\n\\r\\f\\b\\t\\u000B\\0\\u12Fa\\u007F",
+  memberNames: {
+    $LoremA_Ipsum123指事字: 0,
+  },
+  multiLineComment: false,
+  hexNumbers: [
+    0x303030,
+    0x303030,
+    -0x303030,
+  ],
+  specialNumbers: [
+    NaN,
+    NaN,
+    NaN,
+    Infinity,
+    Infinity,
+    -Infinity,
+  ],
+  literals: [
+    123,
+    123,
+    -123,
+  ],
+}
diff --git a/src/test/resources/e2e/roundtrips/object.parser.json5 b/src/test/resources/e2e/roundtrips/object.parser.json5
new file mode 100644
index 0000000..18de9ca
--- /dev/null
+++ b/src/test/resources/e2e/roundtrips/object.parser.json5
@@ -0,0 +1,52 @@
+// Object comment
+{
+  // Quotes tests
+  quotes: {
+    // Test double-quoted member name and string value
+    "doubleQuoted": "Test \" 123",
+    // Test single-quoted member name and string value
+    'singleQuoted': 'Test \' 123',
+    // Test mixed quotes with double- and single-quotes
+    testMixedQuoted: "Test ' 123"
+  },
+  // Falsy boolean,
+  falsy: false,
+  // Truly boolean
+  truly: true,
+  // Test escape characters
+  "escapes": "\\n\\r\\f\\b\\t\\u000B\\0\\u12Fa\\u007F",
+  // Test member names
+  memberNames: {
+    // Test member names
+    "$Lorem\u0041_Ipsum123指事字": 0
+  },
+  /*
+   * Some multi-line
+   * comment
+   */
+  multiLineComment: false,
+  // Hex numbers
+  hexNumbers: [
+    // Neutral hex number
+    0x303030,
+    // Positive hex number
+    +0x303030,
+    // Negative hex number
+    -0x303030
+  ],
+  // Special numbers
+  specialNumbers: [
+    NaN,
+    +NaN,
+    -NaN,
+    Infinity,
+    +Infinity,
+    -Infinity
+  ],
+  // Literals
+  literals: [
+    123,
+    +123,
+    -123
+  ]
+}
diff --git a/src/test/resources/e2e/roundtrips/object.writer.json5 b/src/test/resources/e2e/roundtrips/object.writer.json5
new file mode 100644
index 0000000..7787e25
--- /dev/null
+++ b/src/test/resources/e2e/roundtrips/object.writer.json5
@@ -0,0 +1,52 @@
+// Object comment
+{
+  // Quotes tests
+  quotes: {
+    // Test double-quoted member name and string value
+    doubleQuoted: "Test \" 123",
+    // Test single-quoted member name and string value
+    singleQuoted: "Test ' 123",
+    // Test mixed quotes with double- and single-quotes
+    testMixedQuoted: "Test ' 123",
+  },
+  // Falsy boolean,
+  falsy: false,
+  // Truly boolean
+  truly: true,
+  // Test escape characters
+  escapes: "\\n\\r\\f\\b\\t\\u000B\\0\\u12Fa\\u007F",
+  // Test member names
+  memberNames: {
+    // Test member names
+    $LoremA_Ipsum123指事字: 0,
+  },
+  /*
+   * Some multi-line
+   * comment
+   */
+  multiLineComment: false,
+  // Hex numbers
+  hexNumbers: [
+    // Neutral hex number
+    0x303030,
+    // Positive hex number
+    0x303030,
+    // Negative hex number
+    -0x303030,
+  ],
+  // Special numbers
+  specialNumbers: [
+    NaN,
+    NaN,
+    NaN,
+    Infinity,
+    Infinity,
+    -Infinity,
+  ],
+  // Literals
+  literals: [
+    123,
+    123,
+    -123,
+  ],
+}
diff --git a/src/test/resources/expect.array.json5 b/src/test/resources/expect.array.json5
deleted file mode 100644
index cffdc2a..0000000
--- a/src/test/resources/expect.array.json5
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-  'Lorem ipsum',
-  'Lorem ipsum',
-  true,
-  false,
-  123,
-  -123,
-  0x100,
-  -0x100,
-  NaN,
-  Infinity,
-  null,
-  {
-    'key': 'value',
-    'array': [],
-    'obj': {}
-  }
-]
\ No newline at end of file
diff --git a/src/test/resources/expect.object.json5 b/src/test/resources/expect.object.json5
deleted file mode 100644
index 5f84ee9..0000000
--- a/src/test/resources/expect.object.json5
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  'str': 'Lorem ipsum',
-  'bool': [
-    true,
-    false
-  ],
-  'numbers': {
-    'pos': 123,
-    'neg': -123,
-    'hex': 0x100,
-    'hex-neg': -0x100,
-    'nan': NaN,
-    'infinity': Infinity
-  },
-  'null': null,
-  'array': [],
-  'obj': {},
-  'arrayVariant': [
-    'Lorem ipsum',
-    [
-      'first',
-      'second'
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/src/test/resources/test.array.json5 b/src/test/resources/test.array.json5
deleted file mode 100644
index ffcae97..0000000
--- a/src/test/resources/test.array.json5
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-  "Lorem ipsum",
-  'Lorem ipsum',
-  true,
-  false,
-  123,
-  -123,
-  0x100,
-  -0x100,
-  NaN,
-  Infinity,
-  null,
-  {
-    "key": "value",
-    "array": [],
-    "obj": {},
-  }
-]
\ No newline at end of file
diff --git a/src/test/resources/test.object.json5 b/src/test/resources/test.object.json5
deleted file mode 100644
index ac83c20..0000000
--- a/src/test/resources/test.object.json5
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  'str': "Lorem ipsum",
-  "bool": [
-    true,
-    false
-  ],
-  "numbers": {
-    "pos": 123,
-    "neg": -123,
-    "hex": 0x100,
-    "hex-neg": -0x100,
-    "nan": NaN,
-    "infinity": Infinity
-  },
-  "null": null,
-  'array': [],
-  'obj': {},
-  "arrayVariant": [
-    "Lorem ipsum",
-    [
-      "first",
-      "second"
-    ]
-  ]
-}
\ No newline at end of file

From 351d54d767e6412792151a7fa50369dedd65a564 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Sat, 20 Sep 2025 18:07:31 +0200
Subject: [PATCH 27/48] feat(tests): add test for NonNullElementWrapperList

---
 .../NonNullElementWrapperListTest.java        | 144 ++++++++++++++++++
 1 file changed, 144 insertions(+)
 create mode 100644 src/test/java/de/marhali/json5/internal/NonNullElementWrapperListTest.java

diff --git a/src/test/java/de/marhali/json5/internal/NonNullElementWrapperListTest.java b/src/test/java/de/marhali/json5/internal/NonNullElementWrapperListTest.java
new file mode 100644
index 0000000..7a43866
--- /dev/null
+++ b/src/test/java/de/marhali/json5/internal/NonNullElementWrapperListTest.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5.internal;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author Marcel Haßlinger
+ */
+class NonNullElementWrapperListTest {
+
+    private static <E> NonNullElementWrapperList<E> wrap(ArrayList<E> delegate) {
+        return new NonNullElementWrapperList<>(delegate);
+    }
+
+    @Test
+    void constructor_nullDelegate_throwsNPE() {
+        assertThrows(NullPointerException.class, () -> new NonNullElementWrapperList<>(null));
+    }
+
+    @Test
+    void isRandomAccess() {
+        NonNullElementWrapperList<String> list = wrap(new ArrayList<>());
+        assertTrue(list instanceof RandomAccess, "Wrapper should implement RandomAccess");
+    }
+
+    @Test
+    void size_get_add_nonNull_ok() {
+        NonNullElementWrapperList<String> list = wrap(new ArrayList<>());
+        assertEquals(0, list.size());
+        list.add(0, "a");
+        list.add(1, "b");
+        assertEquals(2, list.size());
+        assertEquals("a", list.get(0));
+        assertEquals("b", list.get(1));
+    }
+
+    @Test
+    void add_null_throwsNPE() {
+        NonNullElementWrapperList<String> list = wrap(new ArrayList<>());
+        NullPointerException ex = assertThrows(NullPointerException.class, () -> list.add(0, null));
+        assertTrue(ex.getMessage() == null || ex.getMessage().toLowerCase().contains("non-null"));
+    }
+
+    @Test
+    void set_replacesAndReturnsOld_nonNull_ok() {
+        NonNullElementWrapperList<String> list = wrap(new ArrayList<>(Arrays.asList("x", "y")));
+        String old = list.set(1, "z");
+        assertEquals("y", old);
+        assertEquals(Arrays.asList("x", "z"), new ArrayList<>(list));
+    }
+
+    @Test
+    void set_null_throwsNPE() {
+        NonNullElementWrapperList<String> list = wrap(new ArrayList<>(Arrays.asList("x")));
+        assertThrows(NullPointerException.class, () -> list.set(0, null));
+        assertEquals(Collections.singletonList("x"), new ArrayList<>(list));
+    }
+
+    @Test
+    void contains_and_indexOf_withNull_doNotThrow() {
+        NonNullElementWrapperList<String> list = wrap(new ArrayList<>(Arrays.asList("a", "b")));
+        assertFalse(list.contains(null));
+        assertEquals(-1, list.indexOf(null));
+        assertEquals(-1, list.lastIndexOf(null));
+    }
+
+    @Test
+    void remove_byIndex_and_byObject_behave() {
+        NonNullElementWrapperList<String> list = wrap(new ArrayList<>(Arrays.asList("a", "b", "c")));
+        assertEquals("b", list.remove(1));
+        assertEquals(Arrays.asList("a", "c"), new ArrayList<>(list));
+
+        // remove(Object) with null must not throw and should return false
+        assertDoesNotThrow(() -> {
+            boolean removed = list.remove((Object) null);
+            assertFalse(removed);
+        });
+
+        // remove existing object
+        assertTrue(list.remove("a"));
+        assertEquals(Collections.singletonList("c"), new ArrayList<>(list));
+    }
+
+    @Test
+    void clear_removeAll_retainAll_delegateCorrectly() {
+        NonNullElementWrapperList<String> list = wrap(new ArrayList<>(Arrays.asList("a", "b", "c", "d")));
+        assertTrue(list.removeAll(Arrays.asList("b", "x"))); // removes b
+        assertEquals(Arrays.asList("a", "c", "d"), new ArrayList<>(list));
+
+        assertTrue(list.retainAll(new HashSet<>(Arrays.asList("a", "d")))); // keeps a,d
+        assertEquals(Arrays.asList("a", "d"), new ArrayList<>(list));
+
+        list.clear();
+        assertTrue(list.isEmpty());
+    }
+
+    @Test
+    void toArray_variants_matchDelegate() {
+        NonNullElementWrapperList<String> list = wrap(new ArrayList<>(Arrays.asList("a", "b")));
+        Object[] arr = list.toArray();
+        assertArrayEquals(new Object[]{"a", "b"}, arr);
+
+        String[] into = new String[0];
+        String[] arr2 = list.toArray(into);
+        assertArrayEquals(new String[]{"a", "b"}, arr2);
+    }
+
+    @Test
+    void equals_and_hashCode_delegateBehavior_and_symmetry() {
+        ArrayList<String> base = new ArrayList<>(Arrays.asList("a", "b"));
+        NonNullElementWrapperList<String> w1 = wrap(new ArrayList<>(base));
+        NonNullElementWrapperList<String> w2 = wrap(new ArrayList<>(base));
+        ArrayList<String> otherList = new ArrayList<>(base);
+
+        // equals compares by elements via delegate.equals(o)
+        assertEquals(w1, w2);                 // wrapper vs wrapper
+        assertEquals(w1, otherList);          // wrapper vs plain List
+        assertEquals(otherList, w1);          // symmetry from the other side
+
+        assertEquals(otherList.hashCode(), w1.hashCode());
+        // change elements -> not equal
+        w2.add(2, "c");
+        assertNotEquals(w1, w2);
+    }
+}

From e3070c43284046b0c948d193ebc9ca3a43b9c189 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Sat, 20 Sep 2025 18:13:16 +0200
Subject: [PATCH 28/48] feat(tests): add test for LazilyParsedNumber

---
 .../internal/LazilyParsedNumberTest.java      | 116 ++++++++++++++++++
 1 file changed, 116 insertions(+)
 create mode 100644 src/test/java/de/marhali/json5/internal/LazilyParsedNumberTest.java

diff --git a/src/test/java/de/marhali/json5/internal/LazilyParsedNumberTest.java b/src/test/java/de/marhali/json5/internal/LazilyParsedNumberTest.java
new file mode 100644
index 0000000..d24c463
--- /dev/null
+++ b/src/test/java/de/marhali/json5/internal/LazilyParsedNumberTest.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5.internal;
+
+import org.junit.jupiter.api.Test;
+
+import java.io.*;
+import java.math.BigDecimal;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author Marcel Haßlinger
+ */
+class LazilyParsedNumberTest {
+
+    @Test
+    void toString_returnsOriginal() {
+        assertEquals("123", new LazilyParsedNumber("123").toString());
+        assertEquals("1.50", new LazilyParsedNumber("1.50").toString());
+    }
+
+    @Test
+    void int_long_parse_directInteger() {
+        LazilyParsedNumber n = new LazilyParsedNumber("123");
+        assertEquals(123, n.intValue());
+        assertEquals(123L, n.longValue());
+    }
+
+    @Test
+    void float_double_parse_decimal() {
+        LazilyParsedNumber n = new LazilyParsedNumber("1.5");
+        assertEquals(1.5f, n.floatValue(), 0.000001f);
+        assertEquals(1.5, n.doubleValue(), 0.0000000001);
+        // Integer/Long parse fails -> BigDecimal.intValue()
+        assertEquals(new BigDecimal("1.5").intValue(), n.intValue());
+    }
+
+    @Test
+    void intValue_fallsBackToLongAndNarrows() {
+        // 2147483648 = Integer.MAX_VALUE + 1
+        String s = "2147483648";
+        LazilyParsedNumber n = new LazilyParsedNumber(s);
+
+        // Long.parseLong works, intValue uses (int) long → Overflows to MIN_VALUE
+        long expectedLong = Long.parseLong(s);
+        int expectedInt = (int) expectedLong;
+
+        assertEquals(expectedLong, n.longValue());
+        assertEquals(expectedInt, n.intValue());
+    }
+
+    @Test
+    void longAndInt_fallBackToBigDecimalWhenTooLargeForLong() {
+        // Long.MAX_VALUE + 1 -> Long.parseLong causes NFE, BigDecimal will be used
+        String s = "9223372036854775808";
+        LazilyParsedNumber n = new LazilyParsedNumber(s);
+
+        long expectedLong = new BigDecimal(s).longValue();
+        int expectedInt = new BigDecimal(s).intValue();
+
+        assertEquals(expectedLong, n.longValue());
+        assertEquals(expectedInt, n.intValue());
+        assertEquals(Double.parseDouble(s), n.doubleValue(), 0.0);
+    }
+
+    @Test
+    void equals_and_hashCode_behave() {
+        LazilyParsedNumber a1 = new LazilyParsedNumber("42");
+        LazilyParsedNumber a2 = new LazilyParsedNumber("42");
+        LazilyParsedNumber b  = new LazilyParsedNumber("043");
+
+        assertEquals(a1, a1);              // reflexive
+        assertEquals(a1, a2);              // same string content
+        assertNotEquals(a1, b);            // other content
+        assertNotEquals(a1, new Object()); // other type
+
+        assertEquals("42".hashCode(), a1.hashCode());
+    }
+
+    @Test
+    void serialization_usesWriteReplace_returnsBigDecimalOnRead() throws Exception {
+        LazilyParsedNumber n = new LazilyParsedNumber("123.45");
+        Object roundTripped = roundTrip(n);
+
+        assertTrue(roundTripped instanceof BigDecimal, "Deserialize should return BigDecimal");
+        assertEquals(new BigDecimal("123.45"), roundTripped);
+    }
+
+    private static Object roundTrip(Object o) throws IOException, ClassNotFoundException {
+        byte[] bytes;
+        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
+             ObjectOutputStream oos = new ObjectOutputStream(baos)) {
+            oos.writeObject(o);
+            oos.flush();
+            bytes = baos.toByteArray();
+        }
+        try (ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(bytes))) {
+            return ois.readObject();
+        }
+    }
+}

From cea55afc631917e8bd4c8a2f1206c8834446e9d3 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Sun, 21 Sep 2025 17:02:05 +0200
Subject: [PATCH 29/48] refactor(breaking): remove insertFinalNewline() from
 default options

---
 .../de/marhali/json5/config/Json5Options.java |  2 -
 .../e2e/roundtrips/ParserAndWriterTest.java   | 74 +++---------------
 .../json5/fixtures/Json5OptionsFixtures.java  | 76 +++++++++++++++++++
 3 files changed, 87 insertions(+), 65 deletions(-)
 create mode 100644 src/test/java/de/marhali/json5/fixtures/Json5OptionsFixtures.java

diff --git a/src/main/java/de/marhali/json5/config/Json5Options.java b/src/main/java/de/marhali/json5/config/Json5Options.java
index 005548b..49243f4 100644
--- a/src/main/java/de/marhali/json5/config/Json5Options.java
+++ b/src/main/java/de/marhali/json5/config/Json5Options.java
@@ -224,7 +224,6 @@ public static Builder builder() {
      *     <li>parseComments: <code>true</code></li>
      *     <li>writeComments: <code>true</code></li>
      *     <li>trailingComma: <code>true</code></li>
-     *     <li>insertFinalNewline: <code>true</code></li>
      *     <li>digitSeparatorStrategy: <code>NONE</code></li>
      *     <li>duplicateKeyStrategy: <code>UNIQUE</code></li>
      *     <li>prettyPrinting: <code>true</code></li>
@@ -238,7 +237,6 @@ public static Builder builder() {
             .parseComments()
             .writeComments()
             .trailingComma()
-            .insertFinalNewline()
             .digitSeparatorStrategy(DigitSeparatorStrategy.NONE)
             .duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE)
             .prettyPrinting()
diff --git a/src/test/java/de/marhali/json5/e2e/roundtrips/ParserAndWriterTest.java b/src/test/java/de/marhali/json5/e2e/roundtrips/ParserAndWriterTest.java
index 160888e..a7ecf0f 100644
--- a/src/test/java/de/marhali/json5/e2e/roundtrips/ParserAndWriterTest.java
+++ b/src/test/java/de/marhali/json5/e2e/roundtrips/ParserAndWriterTest.java
@@ -17,8 +17,8 @@
 package de.marhali.json5.e2e.roundtrips;
 
 import de.marhali.json5.Json5;
-import de.marhali.json5.config.Json5Options;
 import de.marhali.json5.e2e.TestResourceHelper;
+import de.marhali.json5.fixtures.Json5OptionsFixtures;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
@@ -31,7 +31,7 @@
 public class ParserAndWriterTest {
     @Test
     void objectRoundtrip() throws IOException {
-        var json5 = new Json5();
+        var json5 = new Json5(Json5OptionsFixtures.PRETTY);
 
         var element = json5.parse(TestResourceHelper.getTestResource("e2e/roundtrips/object.parser.json5"));
         var stringifiedElement = json5.serialize(element);
@@ -43,16 +43,7 @@ void objectRoundtrip() throws IOException {
 
     @Test
     void objectRoundtripNoComment() throws IOException {
-        var json5 = new Json5(Json5Options.builder()
-            .allowNaN()
-            .allowInfinity()
-            .parseComments()
-            .trailingComma()
-            .indentFactor(2)
-            .quoteless()
-            .insertFinalNewline()
-            .build()
-        );
+        var json5 = new Json5(Json5OptionsFixtures.PRETTY_NO_COMMENTS);
 
         var element = json5.parse(TestResourceHelper.getTestResource("e2e/roundtrips/object.parser.json5"));
         var stringifiedElement = json5.serialize(element);
@@ -64,15 +55,7 @@ void objectRoundtripNoComment() throws IOException {
 
     @Test
     void objectRoundtripMinifyNoComment() throws IOException {
-        var json5 = new Json5(Json5Options.builder()
-            .allowNaN()
-            .allowInfinity()
-            .parseComments()
-            .indentFactor(0)
-            .quoteless()
-            .insertFinalNewline()
-            .build()
-        );
+        var json5 = new Json5(Json5OptionsFixtures.MINIFY_NO_COMMENTS);
 
         var element = json5.parse(TestResourceHelper.getTestResource("e2e/roundtrips/object.parser.json5"));
         var stringifiedElement = json5.serialize(element);
@@ -84,16 +67,7 @@ void objectRoundtripMinifyNoComment() throws IOException {
 
     @Test
     void objectRoundtripMinify() throws IOException {
-        var json5 = new Json5(Json5Options.builder()
-            .allowNaN()
-            .allowInfinity()
-            .parseComments()
-            .writeComments()
-            .indentFactor(0)
-            .quoteless()
-            .insertFinalNewline()
-            .build()
-        );
+        var json5 = new Json5(Json5OptionsFixtures.MINIFY);
 
         var element = json5.parse(TestResourceHelper.getTestResource("e2e/roundtrips/object.parser.json5"));
         var stringifiedElement = json5.serialize(element);
@@ -105,7 +79,7 @@ void objectRoundtripMinify() throws IOException {
 
     @Test
     void objectRoundtripMinifyToPretty() throws IOException {
-        var json5 = new Json5();
+        var json5 = new Json5(Json5OptionsFixtures.PRETTY);
 
         var element = json5.parse(TestResourceHelper.getTestResource("e2e/roundtrips/object-minify.parser.json5"));
         var stringifiedElement = json5.serialize(element);
@@ -117,7 +91,7 @@ void objectRoundtripMinifyToPretty() throws IOException {
 
     @Test
     void arrayRoundtrip() throws IOException {
-        var json5 = new Json5();
+        var json5 = new Json5(Json5OptionsFixtures.PRETTY);
 
         var element = json5.parse(TestResourceHelper.getTestResource("e2e/roundtrips/array.parser.json5"));
         var stringifiedElement = json5.serialize(element);
@@ -129,16 +103,7 @@ void arrayRoundtrip() throws IOException {
 
     @Test
     void arrayRoundtripNoComment() throws IOException {
-        var json5 = new Json5(Json5Options.builder()
-            .allowNaN()
-            .allowInfinity()
-            .parseComments()
-            .trailingComma()
-            .indentFactor(2)
-            .quoteless()
-            .insertFinalNewline()
-            .build()
-        );
+        var json5 = new Json5(Json5OptionsFixtures.PRETTY_NO_COMMENTS);
 
         var element = json5.parse(TestResourceHelper.getTestResource("e2e/roundtrips/array.parser.json5"));
         var stringifiedElement = json5.serialize(element);
@@ -150,15 +115,7 @@ void arrayRoundtripNoComment() throws IOException {
 
     @Test
     void arrayRoundtripMinifyNoComment() throws IOException {
-        var json5 = new Json5(Json5Options.builder()
-            .allowNaN()
-            .allowInfinity()
-            .parseComments()
-            .indentFactor(0)
-            .quoteless()
-            .insertFinalNewline()
-            .build()
-        );
+        var json5 = new Json5(Json5OptionsFixtures.MINIFY_NO_COMMENTS);
 
         var element = json5.parse(TestResourceHelper.getTestResource("e2e/roundtrips/array.parser.json5"));
         var stringifiedElement = json5.serialize(element);
@@ -170,16 +127,7 @@ void arrayRoundtripMinifyNoComment() throws IOException {
 
     @Test
     void arrayRoundtripMinify() throws IOException {
-        var json5 = new Json5(Json5Options.builder()
-            .allowNaN()
-            .allowInfinity()
-            .parseComments()
-            .writeComments()
-            .indentFactor(0)
-            .quoteless()
-            .insertFinalNewline()
-            .build()
-        );
+        var json5 = new Json5(Json5OptionsFixtures.MINIFY);
 
         var element = json5.parse(TestResourceHelper.getTestResource("e2e/roundtrips/array.parser.json5"));
         var stringifiedElement = json5.serialize(element);
@@ -191,7 +139,7 @@ void arrayRoundtripMinify() throws IOException {
 
     @Test
     void arrayRoundtripMinifyToPretty() throws IOException {
-        var json5 = new Json5();
+        var json5 = new Json5(Json5OptionsFixtures.PRETTY);
 
         var element = json5.parse(TestResourceHelper.getTestResource("e2e/roundtrips/array-minify.parser.json5"));
         var stringifiedElement = json5.serialize(element);
diff --git a/src/test/java/de/marhali/json5/fixtures/Json5OptionsFixtures.java b/src/test/java/de/marhali/json5/fixtures/Json5OptionsFixtures.java
new file mode 100644
index 0000000..5693b4e
--- /dev/null
+++ b/src/test/java/de/marhali/json5/fixtures/Json5OptionsFixtures.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5.fixtures;
+
+import de.marhali.json5.config.DigitSeparatorStrategy;
+import de.marhali.json5.config.DuplicateKeyStrategy;
+import de.marhali.json5.config.Json5Options;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class Json5OptionsFixtures {
+    public static Json5Options PRETTY = Json5Options.builder()
+        .allowNaN()
+        .allowInfinity()
+        .allowInvalidSurrogates()
+        .quoteless()
+        .parseComments()
+        .writeComments()
+        .trailingComma()
+        .insertFinalNewline()
+        .digitSeparatorStrategy(DigitSeparatorStrategy.NONE)
+        .duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE)
+        .prettyPrinting()
+        .build();
+
+    public static Json5Options PRETTY_NO_COMMENTS = Json5Options.builder()
+        .allowNaN()
+        .allowInfinity()
+        .allowInvalidSurrogates()
+        .quoteless()
+        .trailingComma()
+        .insertFinalNewline()
+        .digitSeparatorStrategy(DigitSeparatorStrategy.NONE)
+        .duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE)
+        .prettyPrinting()
+        .build();
+
+    public static Json5Options MINIFY = Json5Options.builder()
+        .allowNaN()
+        .allowInfinity()
+        .allowInvalidSurrogates()
+        .quoteless()
+        .parseComments()
+        .writeComments()
+        .insertFinalNewline()
+        .digitSeparatorStrategy(DigitSeparatorStrategy.NONE)
+        .duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE)
+        .indentFactor(0)
+        .build();
+
+    public static Json5Options MINIFY_NO_COMMENTS = Json5Options.builder()
+        .allowNaN()
+        .allowInfinity()
+        .allowInvalidSurrogates()
+        .quoteless()
+        .insertFinalNewline()
+        .digitSeparatorStrategy(DigitSeparatorStrategy.NONE)
+        .duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE)
+        .indentFactor(0)
+        .build();
+}

From c487c99d82a155883a6226f0599c283a66b00577 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Sun, 21 Sep 2025 17:08:42 +0200
Subject: [PATCH 30/48] feat: add some tests on Json5Element getters

---
 .../de/marhali/json5/Json5ElementTest.java    | 146 ++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100644 src/test/java/de/marhali/json5/Json5ElementTest.java

diff --git a/src/test/java/de/marhali/json5/Json5ElementTest.java b/src/test/java/de/marhali/json5/Json5ElementTest.java
new file mode 100644
index 0000000..70cbfa6
--- /dev/null
+++ b/src/test/java/de/marhali/json5/Json5ElementTest.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2022 - 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class Json5ElementTest {
+    @Test
+    void getAsJson5Array_throws_on_non_object() {
+        var ex = assertThrows(IllegalStateException.class, () -> Json5Primitive.fromString("anyString").getAsJson5Object());
+        assertEquals("Not a Json5Object: \"anyString\"", ex.getMessage());
+    }
+
+    @Test
+    void getAsJson5Object_throws_on_non_array() {
+        var ex = assertThrows(IllegalStateException.class, () -> Json5Primitive.fromString("anyString").getAsJson5Array());
+        assertEquals("Not a Json5Array: \"anyString\"", ex.getMessage());
+    }
+
+    @Test
+    void getAsJson5Primitive_throws_on_non_primitive() {
+        var ex = assertThrows(IllegalStateException.class, () -> new Json5Object().getAsJson5Primitive());
+        assertEquals("Not a Json5Primitive: {\n}", ex.getMessage());
+    }
+
+    @Test
+    void getAsJson5Null_throws_on_null() {
+        var ex = assertThrows(IllegalStateException.class, () -> Json5Primitive.fromString("anyString").getAsJson5Null());
+        assertEquals("Not a Json5Null: \"anyString\"", ex.getMessage());
+    }
+
+    @Test
+    void getAsBoolean_throws_on_non_boolean() {
+        var ex = assertThrows(UnsupportedOperationException.class, () -> new Json5Object().getAsBoolean());
+        assertEquals("Json5Object", ex.getMessage());
+    }
+
+    @Test
+    void getAsInstant_throws_on_non_boolean() {
+        var ex = assertThrows(UnsupportedOperationException.class, () -> new Json5Object().getAsInstant());
+        assertEquals("Json5Object", ex.getMessage());
+    }
+
+    @Test
+    void getAsNumber_throws_on_non_boolean() {
+        var ex = assertThrows(UnsupportedOperationException.class, () -> new Json5Object().getAsNumber());
+        assertEquals("Json5Object", ex.getMessage());
+    }
+
+    @Test
+    void getAsRadixNumber_throws_on_non_boolean() {
+        var ex = assertThrows(UnsupportedOperationException.class, () -> new Json5Object().getAsRadixNumber());
+        assertEquals("Json5Object", ex.getMessage());
+    }
+
+    @Test
+    void getAsString_throws_on_non_boolean() {
+        var ex = assertThrows(UnsupportedOperationException.class, () -> new Json5Object().getAsString());
+        assertEquals("Json5Object", ex.getMessage());
+    }
+
+    @Test
+    void getAsDouble_throws_on_non_boolean() {
+        var ex = assertThrows(UnsupportedOperationException.class, () -> new Json5Object().getAsDouble());
+        assertEquals("Json5Object", ex.getMessage());
+    }
+
+    @Test
+    void getAsFloat_throws_on_non_boolean() {
+        var ex = assertThrows(UnsupportedOperationException.class, () -> new Json5Object().getAsFloat());
+        assertEquals("Json5Object", ex.getMessage());
+    }
+
+    @Test
+    void getAsLong_throws_on_non_boolean() {
+        var ex = assertThrows(UnsupportedOperationException.class, () -> new Json5Object().getAsLong());
+        assertEquals("Json5Object", ex.getMessage());
+    }
+
+    @Test
+    void getAsInt_throws_on_non_boolean() {
+        var ex = assertThrows(UnsupportedOperationException.class, () -> new Json5Object().getAsInt());
+        assertEquals("Json5Object", ex.getMessage());
+    }
+
+    @Test
+    void getAsByte_throws_on_non_boolean() {
+        var ex = assertThrows(UnsupportedOperationException.class, () -> new Json5Object().getAsByte());
+        assertEquals("Json5Object", ex.getMessage());
+    }
+
+    @Test
+    void getAsBigDecimal_throws_on_non_boolean() {
+        var ex = assertThrows(UnsupportedOperationException.class, () -> new Json5Object().getAsBigDecimal());
+        assertEquals("Json5Object", ex.getMessage());
+    }
+
+    @Test
+    void getAsBigInteger_throws_on_non_boolean() {
+        var ex = assertThrows(UnsupportedOperationException.class, () -> new Json5Object().getAsBigInteger());
+        assertEquals("Json5Object", ex.getMessage());
+    }
+
+    @Test
+    void getAsShort_throws_on_non_boolean() {
+        var ex = assertThrows(UnsupportedOperationException.class, () -> new Json5Object().getAsShort());
+        assertEquals("Json5Object", ex.getMessage());
+    }
+
+    @Test
+    void getAsBinaryString_throws_on_non_boolean() {
+        var ex = assertThrows(UnsupportedOperationException.class, () -> new Json5Object().getAsBinaryString());
+        assertEquals("Json5Object", ex.getMessage());
+    }
+
+    @Test
+    void getAsOctalString_throws_on_non_boolean() {
+        var ex = assertThrows(UnsupportedOperationException.class, () -> new Json5Object().getAsOctalString());
+        assertEquals("Json5Object", ex.getMessage());
+    }
+
+    @Test
+    void getAsHexString_throws_on_non_boolean() {
+        var ex = assertThrows(UnsupportedOperationException.class, () -> new Json5Object().getAsHexString());
+        assertEquals("Json5Object", ex.getMessage());
+    }
+}

From 04b54b2d957e885c13d8fefb65db414d990699bc Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Sun, 21 Sep 2025 17:23:29 +0200
Subject: [PATCH 31/48] feat(tests): add tests on missing element closing tags

---
 .../failures/MissingElementClosingTest.java   | 49 +++++++++++++++++++
 .../e2e/failures/invalid-closing-array.json5  |  2 +
 .../e2e/failures/invalid-closing-object.json5 |  3 ++
 3 files changed, 54 insertions(+)
 create mode 100644 src/test/java/de/marhali/json5/e2e/failures/MissingElementClosingTest.java
 create mode 100644 src/test/resources/e2e/failures/invalid-closing-array.json5
 create mode 100644 src/test/resources/e2e/failures/invalid-closing-object.json5

diff --git a/src/test/java/de/marhali/json5/e2e/failures/MissingElementClosingTest.java b/src/test/java/de/marhali/json5/e2e/failures/MissingElementClosingTest.java
new file mode 100644
index 0000000..1a0c41f
--- /dev/null
+++ b/src/test/java/de/marhali/json5/e2e/failures/MissingElementClosingTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5.e2e.failures;
+
+import de.marhali.json5.Json5;
+import de.marhali.json5.config.DuplicateKeyStrategy;
+import de.marhali.json5.e2e.TestResourceHelper;
+import de.marhali.json5.exception.Json5Exception;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class MissingElementClosingTest {
+    @Test
+    void missing_object_closing_throws() {
+        var json5 = Json5.builder(builder -> builder.duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE).build());
+
+        var ex = assertThrows(Json5Exception.class, () -> json5.parse(TestResourceHelper.getTestResourceContent("e2e/failures/invalid-closing-object.json5")));
+
+        assertEquals("A Json5Object must end with '}' at index 42 [character 0 in line 4]", ex.getMessage());
+    }
+
+    @Test
+    void missing_array_closing_throws() {
+        var json5 = Json5.builder(builder -> builder.duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE).build());
+
+        var ex = assertThrows(Json5Exception.class, () -> json5.parse(TestResourceHelper.getTestResourceContent("e2e/failures/invalid-closing-array.json5")));
+
+        assertEquals("A Json5Array must end with ']' at index 17 [character 0 in line 3]", ex.getMessage());
+    }
+}
diff --git a/src/test/resources/e2e/failures/invalid-closing-array.json5 b/src/test/resources/e2e/failures/invalid-closing-array.json5
new file mode 100644
index 0000000..6fcfba7
--- /dev/null
+++ b/src/test/resources/e2e/failures/invalid-closing-array.json5
@@ -0,0 +1,2 @@
+[
+  "some value",
diff --git a/src/test/resources/e2e/failures/invalid-closing-object.json5 b/src/test/resources/e2e/failures/invalid-closing-object.json5
new file mode 100644
index 0000000..e094acc
--- /dev/null
+++ b/src/test/resources/e2e/failures/invalid-closing-object.json5
@@ -0,0 +1,3 @@
+{
+  alpha: "firstAlphaValue",
+  array: [],

From 4fe160a3c8689b63d2d6ba655c58c404bf99eef6 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Sun, 21 Sep 2025 17:39:51 +0200
Subject: [PATCH 32/48] feat(tests): add more parser tests

---
 ...gTest.java => InvalidArrayParserTest.java} | 18 +++---
 .../e2e/failures/InvalidObjectParserTest.java | 57 +++++++++++++++++++
 ...json5 => invalid-array-closing-tags.json5} |  0
 .../invalid-array-missing-comma.json5         |  4 ++
 ...son5 => invalid-object-closing-tags.json5} |  0
 .../invalid-object-missing-comma.json5        |  4 ++
 .../invalid-object-missing-key-suffix.json5   |  3 +
 7 files changed, 77 insertions(+), 9 deletions(-)
 rename src/test/java/de/marhali/json5/e2e/failures/{MissingElementClosingTest.java => InvalidArrayParserTest.java} (77%)
 create mode 100644 src/test/java/de/marhali/json5/e2e/failures/InvalidObjectParserTest.java
 rename src/test/resources/e2e/failures/{invalid-closing-array.json5 => invalid-array-closing-tags.json5} (100%)
 create mode 100644 src/test/resources/e2e/failures/invalid-array-missing-comma.json5
 rename src/test/resources/e2e/failures/{invalid-closing-object.json5 => invalid-object-closing-tags.json5} (100%)
 create mode 100644 src/test/resources/e2e/failures/invalid-object-missing-comma.json5
 create mode 100644 src/test/resources/e2e/failures/invalid-object-missing-key-suffix.json5

diff --git a/src/test/java/de/marhali/json5/e2e/failures/MissingElementClosingTest.java b/src/test/java/de/marhali/json5/e2e/failures/InvalidArrayParserTest.java
similarity index 77%
rename from src/test/java/de/marhali/json5/e2e/failures/MissingElementClosingTest.java
rename to src/test/java/de/marhali/json5/e2e/failures/InvalidArrayParserTest.java
index 1a0c41f..0f7fd18 100644
--- a/src/test/java/de/marhali/json5/e2e/failures/MissingElementClosingTest.java
+++ b/src/test/java/de/marhali/json5/e2e/failures/InvalidArrayParserTest.java
@@ -20,30 +20,30 @@
 import de.marhali.json5.config.DuplicateKeyStrategy;
 import de.marhali.json5.e2e.TestResourceHelper;
 import de.marhali.json5.exception.Json5Exception;
-import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * @author Marcel Haßlinger
  */
-public class MissingElementClosingTest {
+public class InvalidArrayParserTest {
     @Test
-    void missing_object_closing_throws() {
+    void invalid_array_closing_tags_throws() {
         var json5 = Json5.builder(builder -> builder.duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE).build());
 
-        var ex = assertThrows(Json5Exception.class, () -> json5.parse(TestResourceHelper.getTestResourceContent("e2e/failures/invalid-closing-object.json5")));
+        var ex = assertThrows(Json5Exception.class, () -> json5.parse(TestResourceHelper.getTestResourceContent("e2e/failures/invalid-array-closing-tags.json5")));
 
-        assertEquals("A Json5Object must end with '}' at index 42 [character 0 in line 4]", ex.getMessage());
+        assertEquals("A Json5Array must end with ']' at index 17 [character 0 in line 3]", ex.getMessage());
     }
 
     @Test
-    void missing_array_closing_throws() {
+    void invalid_array_missing_comma_throws() {
         var json5 = Json5.builder(builder -> builder.duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE).build());
 
-        var ex = assertThrows(Json5Exception.class, () -> json5.parse(TestResourceHelper.getTestResourceContent("e2e/failures/invalid-closing-array.json5")));
+        var ex = assertThrows(Json5Exception.class, () -> json5.parse(TestResourceHelper.getTestResourceContent("e2e/failures/invalid-array-missing-comma.json5")));
 
-        assertEquals("A Json5Array must end with ']' at index 17 [character 0 in line 3]", ex.getMessage());
+        assertEquals("Expected ',' or ']' after value, got '[' instead at index 9 [character 3 in line 3]", ex.getMessage());
     }
 }
diff --git a/src/test/java/de/marhali/json5/e2e/failures/InvalidObjectParserTest.java b/src/test/java/de/marhali/json5/e2e/failures/InvalidObjectParserTest.java
new file mode 100644
index 0000000..7380998
--- /dev/null
+++ b/src/test/java/de/marhali/json5/e2e/failures/InvalidObjectParserTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2025 Marcel Haßlinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.marhali.json5.e2e.failures;
+
+import de.marhali.json5.Json5;
+import de.marhali.json5.config.DuplicateKeyStrategy;
+import de.marhali.json5.e2e.TestResourceHelper;
+import de.marhali.json5.exception.Json5Exception;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author Marcel Haßlinger
+ */
+public class InvalidObjectParserTest {
+    @Test
+    void invalid_object_closing_tags_throws() {
+        var json5 = Json5.builder(builder -> builder.duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE).build());
+
+        var ex = assertThrows(Json5Exception.class, () -> json5.parse(TestResourceHelper.getTestResourceContent("e2e/failures/invalid-object-closing-tags.json5")));
+
+        assertEquals("A Json5Object must end with '}' at index 42 [character 0 in line 4]", ex.getMessage());
+    }
+
+    @Test
+    void invalid_object_missing_key_suffix_throws() {
+        var json5 = Json5.builder(builder -> builder.duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE).build());
+
+        var ex = assertThrows(Json5Exception.class, () -> json5.parse(TestResourceHelper.getTestResourceContent("e2e/failures/invalid-object-missing-key-suffix.json5")));
+
+        assertEquals("Expected ':' after a key, got 'f' instead at index 12 [character 11 in line 2]", ex.getMessage());
+    }
+
+    @Test
+    void invalid_object_missing_comma_throws() {
+        var json5 = Json5.builder(builder -> builder.duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE).build());
+
+        var ex = assertThrows(Json5Exception.class, () -> json5.parse(TestResourceHelper.getTestResourceContent("e2e/failures/invalid-object-missing-comma.json5")));
+
+        assertEquals("Expected ',' or '}' after value, got 's' instead at index 22 [character 3 in line 3]", ex.getMessage());
+    }
+}
diff --git a/src/test/resources/e2e/failures/invalid-closing-array.json5 b/src/test/resources/e2e/failures/invalid-array-closing-tags.json5
similarity index 100%
rename from src/test/resources/e2e/failures/invalid-closing-array.json5
rename to src/test/resources/e2e/failures/invalid-array-closing-tags.json5
diff --git a/src/test/resources/e2e/failures/invalid-array-missing-comma.json5 b/src/test/resources/e2e/failures/invalid-array-missing-comma.json5
new file mode 100644
index 0000000..895dc69
--- /dev/null
+++ b/src/test/resources/e2e/failures/invalid-array-missing-comma.json5
@@ -0,0 +1,4 @@
+[
+  []
+  []
+]
diff --git a/src/test/resources/e2e/failures/invalid-closing-object.json5 b/src/test/resources/e2e/failures/invalid-object-closing-tags.json5
similarity index 100%
rename from src/test/resources/e2e/failures/invalid-closing-object.json5
rename to src/test/resources/e2e/failures/invalid-object-closing-tags.json5
diff --git a/src/test/resources/e2e/failures/invalid-object-missing-comma.json5 b/src/test/resources/e2e/failures/invalid-object-missing-comma.json5
new file mode 100644
index 0000000..5e302dd
--- /dev/null
+++ b/src/test/resources/e2e/failures/invalid-object-missing-comma.json5
@@ -0,0 +1,4 @@
+{
+  firstObject: {}
+  secondObject: {}
+}
diff --git a/src/test/resources/e2e/failures/invalid-object-missing-key-suffix.json5 b/src/test/resources/e2e/failures/invalid-object-missing-key-suffix.json5
new file mode 100644
index 0000000..96d63ee
--- /dev/null
+++ b/src/test/resources/e2e/failures/invalid-object-missing-key-suffix.json5
@@ -0,0 +1,3 @@
+{
+  "myKey" false,
+}

From 545955e3c9dcc2c7e157f4c8c23b49ab58f9f30a Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Sun, 21 Sep 2025 17:48:35 +0200
Subject: [PATCH 33/48] feat(tests): test element opening tags

---
 .../e2e/failures/InvalidArrayParserTest.java  | 19 +++++++++++++++--
 .../e2e/failures/InvalidObjectParserTest.java | 21 ++++++++++++++++---
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/test/java/de/marhali/json5/e2e/failures/InvalidArrayParserTest.java b/src/test/java/de/marhali/json5/e2e/failures/InvalidArrayParserTest.java
index 0f7fd18..ba0249b 100644
--- a/src/test/java/de/marhali/json5/e2e/failures/InvalidArrayParserTest.java
+++ b/src/test/java/de/marhali/json5/e2e/failures/InvalidArrayParserTest.java
@@ -18,10 +18,15 @@
 
 import de.marhali.json5.Json5;
 import de.marhali.json5.config.DuplicateKeyStrategy;
+import de.marhali.json5.config.Json5Options;
 import de.marhali.json5.e2e.TestResourceHelper;
 import de.marhali.json5.exception.Json5Exception;
+import de.marhali.json5.stream.Json5Lexer;
+import de.marhali.json5.stream.Json5Parser;
 import org.junit.jupiter.api.Test;
 
+import java.io.StringReader;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
@@ -29,9 +34,19 @@
  * @author Marcel Haßlinger
  */
 public class InvalidArrayParserTest {
+    @Test
+    void invalid_array_opening_tags_throws() {
+        var reader = new StringReader("{}");
+        var lexer = new Json5Lexer(reader, Json5Options.DEFAULT);
+
+        var ex = assertThrows(Json5Exception.class, () -> Json5Parser.parseArray(lexer));
+
+        assertEquals("A Json5Array must begin with '[' at index 0 [character 1 in line 1]", ex.getMessage());
+    }
+
     @Test
     void invalid_array_closing_tags_throws() {
-        var json5 = Json5.builder(builder -> builder.duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE).build());
+        var json5 = new Json5();
 
         var ex = assertThrows(Json5Exception.class, () -> json5.parse(TestResourceHelper.getTestResourceContent("e2e/failures/invalid-array-closing-tags.json5")));
 
@@ -40,7 +55,7 @@ void invalid_array_closing_tags_throws() {
 
     @Test
     void invalid_array_missing_comma_throws() {
-        var json5 = Json5.builder(builder -> builder.duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE).build());
+        var json5 = new Json5();
 
         var ex = assertThrows(Json5Exception.class, () -> json5.parse(TestResourceHelper.getTestResourceContent("e2e/failures/invalid-array-missing-comma.json5")));
 
diff --git a/src/test/java/de/marhali/json5/e2e/failures/InvalidObjectParserTest.java b/src/test/java/de/marhali/json5/e2e/failures/InvalidObjectParserTest.java
index 7380998..4a0fe50 100644
--- a/src/test/java/de/marhali/json5/e2e/failures/InvalidObjectParserTest.java
+++ b/src/test/java/de/marhali/json5/e2e/failures/InvalidObjectParserTest.java
@@ -18,19 +18,34 @@
 
 import de.marhali.json5.Json5;
 import de.marhali.json5.config.DuplicateKeyStrategy;
+import de.marhali.json5.config.Json5Options;
 import de.marhali.json5.e2e.TestResourceHelper;
 import de.marhali.json5.exception.Json5Exception;
+import de.marhali.json5.stream.Json5Lexer;
+import de.marhali.json5.stream.Json5Parser;
 import org.junit.jupiter.api.Test;
 
+import java.io.StringReader;
+
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author Marcel Haßlinger
  */
 public class InvalidObjectParserTest {
+    @Test
+    void invalid_object_opening_tags_throws() {
+        var reader = new StringReader("[]");
+        var lexer = new Json5Lexer(reader, Json5Options.DEFAULT);
+
+        var ex = assertThrows(Json5Exception.class, () -> Json5Parser.parseObject(lexer));
+
+        assertEquals("A Json5Object must begin with '{' at index 0 [character 1 in line 1]", ex.getMessage());
+    }
+
     @Test
     void invalid_object_closing_tags_throws() {
-        var json5 = Json5.builder(builder -> builder.duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE).build());
+        var json5 = new Json5();
 
         var ex = assertThrows(Json5Exception.class, () -> json5.parse(TestResourceHelper.getTestResourceContent("e2e/failures/invalid-object-closing-tags.json5")));
 
@@ -39,7 +54,7 @@ void invalid_object_closing_tags_throws() {
 
     @Test
     void invalid_object_missing_key_suffix_throws() {
-        var json5 = Json5.builder(builder -> builder.duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE).build());
+        var json5 = new Json5();
 
         var ex = assertThrows(Json5Exception.class, () -> json5.parse(TestResourceHelper.getTestResourceContent("e2e/failures/invalid-object-missing-key-suffix.json5")));
 
@@ -48,7 +63,7 @@ void invalid_object_missing_key_suffix_throws() {
 
     @Test
     void invalid_object_missing_comma_throws() {
-        var json5 = Json5.builder(builder -> builder.duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE).build());
+        var json5 = new Json5();
 
         var ex = assertThrows(Json5Exception.class, () -> json5.parse(TestResourceHelper.getTestResourceContent("e2e/failures/invalid-object-missing-comma.json5")));
 

From dfcf31eced529d57ab48fe189ca692a947676b87 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Sun, 21 Sep 2025 23:04:41 +0200
Subject: [PATCH 34/48] fix: properly write digit separators

---
 .../de/marhali/json5/stream/Json5Writer.java  | 38 +++++++++++++++----
 .../e2e/roundtrips/ParserAndWriterTest.java   | 24 ++++++++++++
 .../json5/fixtures/Json5OptionsFixtures.java  | 36 ++++++++++++++++++
 .../extensions-c-style.parser.json5           | 15 ++++++++
 .../extensions-c-style.writer.json5           | 15 ++++++++
 .../extensions-java-style.parser.json5        | 15 ++++++++
 .../extensions-java-style.writer.json5        | 15 ++++++++
 7 files changed, 151 insertions(+), 7 deletions(-)
 create mode 100644 src/test/resources/e2e/roundtrips/extensions-c-style.parser.json5
 create mode 100644 src/test/resources/e2e/roundtrips/extensions-c-style.writer.json5
 create mode 100644 src/test/resources/e2e/roundtrips/extensions-java-style.parser.json5
 create mode 100644 src/test/resources/e2e/roundtrips/extensions-java-style.writer.json5

diff --git a/src/main/java/de/marhali/json5/stream/Json5Writer.java b/src/main/java/de/marhali/json5/stream/Json5Writer.java
index 69c5231..d6489f8 100644
--- a/src/main/java/de/marhali/json5/stream/Json5Writer.java
+++ b/src/main/java/de/marhali/json5/stream/Json5Writer.java
@@ -173,7 +173,7 @@ public void writePrimitive(Json5Primitive primitive) throws IOException {
                 writer.write(quote(instant.toString()));
             }
         } else if (primitive.isNumber()) {
-            writer.append(formatNumberString(primitive.getAsString()));
+            writer.append(formatNumberString(primitive.getAsString(), primitive.getNumberRadix()));
         } else {
             writer.append(primitive.getAsString());
         }
@@ -276,25 +276,49 @@ public void writeArray(Json5Array array, int depth) throws IOException {
 
         writer.append(']');
     }
-
-    public String applyNumberSeparator(String numberString, char separator) {
+    private String applyNumberSeparator(String numberString, int numberRadix, char separator) {
         StringBuilder sb = new StringBuilder(numberString);
+
+        boolean hasSign = numberString.startsWith("+")  || numberString.startsWith("-");
+        int offset, separatorOffset;
+
+        switch (numberRadix) {
+            case 2:
+                offset = hasSign ? 3 : 2;
+                separatorOffset = 4;
+                break;
+            case 8:
+                offset = hasSign ? 3 : 2;
+                separatorOffset = 3;
+                break;
+            case 10:
+                offset = 0;
+                separatorOffset = 3;
+                break;
+            case 16:
+                offset = hasSign ? 3 : 2;
+                separatorOffset = 2;
+                break;
+            default:
+                throw new IllegalArgumentException("Invalid number radix: " + numberRadix);
+        }
+
         int len = sb.length();
 
-        for (int i = len - 3; i > 0; i -= 3) {
+        for (int i = len - separatorOffset; i > offset; i -= separatorOffset) {
             sb.insert(i, separator);
         }
 
         return sb.toString();
     }
 
-    public String formatNumberString(String numberString) {
+    public String formatNumberString(String numberString, int numberRadix) {
         var strategy = options.getDigitSeparatorStrategy();
         switch (strategy) {
             case JAVA_STYLE:
-                return applyNumberSeparator(numberString, '_');
+                return applyNumberSeparator(numberString, numberRadix, '_');
             case C_STYLE:
-                return applyNumberSeparator(numberString, '\'');
+                return applyNumberSeparator(numberString, numberRadix, '\'');
             default:
                 return numberString;
         }
diff --git a/src/test/java/de/marhali/json5/e2e/roundtrips/ParserAndWriterTest.java b/src/test/java/de/marhali/json5/e2e/roundtrips/ParserAndWriterTest.java
index a7ecf0f..1d6a936 100644
--- a/src/test/java/de/marhali/json5/e2e/roundtrips/ParserAndWriterTest.java
+++ b/src/test/java/de/marhali/json5/e2e/roundtrips/ParserAndWriterTest.java
@@ -148,4 +148,28 @@ void arrayRoundtripMinifyToPretty() throws IOException {
 
         assertEquals(expectedStringifiedElement, stringifiedElement);
     }
+
+    @Test
+    void extensionsRoundtripCStyle() throws IOException {
+        var json5 = new Json5(Json5OptionsFixtures.EXTENSIONS_C_STYLE);
+
+        var element = json5.parse(TestResourceHelper.getTestResource("e2e/roundtrips/extensions-c-style.parser.json5"));
+        var stringifiedElement = json5.serialize(element);
+
+        var expectedStringifiedElement = TestResourceHelper.getTestResourceContent("e2e/roundtrips/extensions-c-style.writer.json5");
+
+        assertEquals(expectedStringifiedElement, stringifiedElement);
+    }
+
+    @Test
+    void extensionsRoundtripJavaStyle() throws IOException {
+        var json5 = new Json5(Json5OptionsFixtures.EXTENSIONS_JAVA_STYLE);
+
+        var element = json5.parse(TestResourceHelper.getTestResource("e2e/roundtrips/extensions-java-style.parser.json5"));
+        var stringifiedElement = json5.serialize(element);
+
+        var expectedStringifiedElement = TestResourceHelper.getTestResourceContent("e2e/roundtrips/extensions-java-style.writer.json5");
+
+        assertEquals(expectedStringifiedElement, stringifiedElement);
+    }
 }
diff --git a/src/test/java/de/marhali/json5/fixtures/Json5OptionsFixtures.java b/src/test/java/de/marhali/json5/fixtures/Json5OptionsFixtures.java
index 5693b4e..2c494ed 100644
--- a/src/test/java/de/marhali/json5/fixtures/Json5OptionsFixtures.java
+++ b/src/test/java/de/marhali/json5/fixtures/Json5OptionsFixtures.java
@@ -73,4 +73,40 @@ public class Json5OptionsFixtures {
         .duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE)
         .indentFactor(0)
         .build();
+
+    public static Json5Options EXTENSIONS_C_STYLE = Json5Options.builder()
+        .allowNaN()
+        .allowInfinity()
+        .allowInvalidSurrogates()
+        .allowBinaryLiterals()
+        .allowOctalLiterals()
+        .allowHexFloatingLiterals()
+        .allowLongUnicodeEscapes()
+        .quoteless()
+        .parseComments()
+        .writeComments()
+        .trailingComma()
+        .insertFinalNewline()
+        .digitSeparatorStrategy(DigitSeparatorStrategy.C_STYLE)
+        .duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE)
+        .prettyPrinting()
+        .build();
+
+    public static Json5Options EXTENSIONS_JAVA_STYLE = Json5Options.builder()
+        .allowNaN()
+        .allowInfinity()
+        .allowInvalidSurrogates()
+        .allowBinaryLiterals()
+        .allowOctalLiterals()
+        .allowHexFloatingLiterals()
+        .allowLongUnicodeEscapes()
+        .quoteless()
+        .parseComments()
+        .writeComments()
+        .trailingComma()
+        .insertFinalNewline()
+        .digitSeparatorStrategy(DigitSeparatorStrategy.JAVA_STYLE)
+        .duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE)
+        .prettyPrinting()
+        .build();
 }
diff --git a/src/test/resources/e2e/roundtrips/extensions-c-style.parser.json5 b/src/test/resources/e2e/roundtrips/extensions-c-style.parser.json5
new file mode 100644
index 0000000..5ff2774
--- /dev/null
+++ b/src/test/resources/e2e/roundtrips/extensions-c-style.parser.json5
@@ -0,0 +1,15 @@
+// Number extensions with digit separator C-style
+{
+  decimalNumber: 1234567,
+  decimalNumberNegative: -11234567,
+  decimalNumberPositive: +111234567,
+  binaryNumber: 0b10101100,
+  binaryNumberNegative: -0b101100,
+  binaryNumberPositive: +0b1101100,
+  octalNumber: 0o1234567,
+  octalNumberNegative: -0o12345671,
+  octalNumberPositive: +0o123456712,
+  hexNumber: 0xDEADBEEF,
+  hexNumberNegative: -0xADBEEFA,
+  hexNumberPositive: +0xEADBEEFB
+}
diff --git a/src/test/resources/e2e/roundtrips/extensions-c-style.writer.json5 b/src/test/resources/e2e/roundtrips/extensions-c-style.writer.json5
new file mode 100644
index 0000000..b4af543
--- /dev/null
+++ b/src/test/resources/e2e/roundtrips/extensions-c-style.writer.json5
@@ -0,0 +1,15 @@
+// Number extensions with digit separator C-style
+{
+  decimalNumber: 1'234'567,
+  decimalNumberNegative: -11'234'567,
+  decimalNumberPositive: 111'234'567,
+  binaryNumber: 0b1010'1100,
+  binaryNumberNegative: -0b10'1100,
+  binaryNumberPositive: 0b110'1100,
+  octalNumber: 0o1'234'567,
+  octalNumberNegative: -0o12'345'671,
+  octalNumberPositive: 0o123'456'712,
+  hexNumber: 0xde'ad'be'ef,
+  hexNumberNegative: -0xa'db'ee'fa,
+  hexNumberPositive: 0xea'db'ee'fb,
+}
diff --git a/src/test/resources/e2e/roundtrips/extensions-java-style.parser.json5 b/src/test/resources/e2e/roundtrips/extensions-java-style.parser.json5
new file mode 100644
index 0000000..3f09d2d
--- /dev/null
+++ b/src/test/resources/e2e/roundtrips/extensions-java-style.parser.json5
@@ -0,0 +1,15 @@
+// Number extensions with digit separator Java-style
+{
+  decimalNumber: 1234567,
+  decimalNumberNegative: -11234567,
+  decimalNumberPositive: +111234567,
+  binaryNumber: 0b10101100,
+  binaryNumberNegative: -0b101100,
+  binaryNumberPositive: +0b1101100,
+  octalNumber: 0o1234567,
+  octalNumberNegative: -0o12345671,
+  octalNumberPositive: +0o123456712,
+  hexNumber: 0xDEADBEEF,
+  hexNumberNegative: -0xADBEEFA,
+  hexNumberPositive: +0xEADBEEFB
+}
diff --git a/src/test/resources/e2e/roundtrips/extensions-java-style.writer.json5 b/src/test/resources/e2e/roundtrips/extensions-java-style.writer.json5
new file mode 100644
index 0000000..40279cd
--- /dev/null
+++ b/src/test/resources/e2e/roundtrips/extensions-java-style.writer.json5
@@ -0,0 +1,15 @@
+// Number extensions with digit separator Java-style
+{
+  decimalNumber: 1_234_567,
+  decimalNumberNegative: -11_234_567,
+  decimalNumberPositive: 111_234_567,
+  binaryNumber: 0b1010_1100,
+  binaryNumberNegative: -0b10_1100,
+  binaryNumberPositive: 0b110_1100,
+  octalNumber: 0o1_234_567,
+  octalNumberNegative: -0o12_345_671,
+  octalNumberPositive: 0o123_456_712,
+  hexNumber: 0xde_ad_be_ef,
+  hexNumberNegative: -0xa_db_ee_fa,
+  hexNumberPositive: 0xea_db_ee_fb,
+}

From d1c9ef9f9188f58a56681fd7eece96e34e4c0356 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Sun, 21 Sep 2025 23:09:04 +0200
Subject: [PATCH 35/48] feat: also include hex floating point

---
 .../resources/e2e/roundtrips/extensions-c-style.parser.json5   | 3 ++-
 .../resources/e2e/roundtrips/extensions-c-style.writer.json5   | 1 +
 .../e2e/roundtrips/extensions-java-style.parser.json5          | 3 ++-
 .../e2e/roundtrips/extensions-java-style.writer.json5          | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/test/resources/e2e/roundtrips/extensions-c-style.parser.json5 b/src/test/resources/e2e/roundtrips/extensions-c-style.parser.json5
index 5ff2774..50ccc37 100644
--- a/src/test/resources/e2e/roundtrips/extensions-c-style.parser.json5
+++ b/src/test/resources/e2e/roundtrips/extensions-c-style.parser.json5
@@ -11,5 +11,6 @@
   octalNumberPositive: +0o123456712,
   hexNumber: 0xDEADBEEF,
   hexNumberNegative: -0xADBEEFA,
-  hexNumberPositive: +0xEADBEEFB
+  hexNumberPositive: +0xEADBEEFB,
+  hexFloatingPoint: 0x1.8p-12
 }
diff --git a/src/test/resources/e2e/roundtrips/extensions-c-style.writer.json5 b/src/test/resources/e2e/roundtrips/extensions-c-style.writer.json5
index b4af543..d5408a7 100644
--- a/src/test/resources/e2e/roundtrips/extensions-c-style.writer.json5
+++ b/src/test/resources/e2e/roundtrips/extensions-c-style.writer.json5
@@ -12,4 +12,5 @@
   hexNumber: 0xde'ad'be'ef,
   hexNumberNegative: -0xa'db'ee'fa,
   hexNumberPositive: 0xea'db'ee'fb,
+  hexFloatingPoint: 0x18'00,
 }
diff --git a/src/test/resources/e2e/roundtrips/extensions-java-style.parser.json5 b/src/test/resources/e2e/roundtrips/extensions-java-style.parser.json5
index 3f09d2d..42beedd 100644
--- a/src/test/resources/e2e/roundtrips/extensions-java-style.parser.json5
+++ b/src/test/resources/e2e/roundtrips/extensions-java-style.parser.json5
@@ -11,5 +11,6 @@
   octalNumberPositive: +0o123456712,
   hexNumber: 0xDEADBEEF,
   hexNumberNegative: -0xADBEEFA,
-  hexNumberPositive: +0xEADBEEFB
+  hexNumberPositive: +0xEADBEEFB,
+  hexFloatingPoint: 0x1800,
 }
diff --git a/src/test/resources/e2e/roundtrips/extensions-java-style.writer.json5 b/src/test/resources/e2e/roundtrips/extensions-java-style.writer.json5
index 40279cd..566f46f 100644
--- a/src/test/resources/e2e/roundtrips/extensions-java-style.writer.json5
+++ b/src/test/resources/e2e/roundtrips/extensions-java-style.writer.json5
@@ -12,4 +12,5 @@
   hexNumber: 0xde_ad_be_ef,
   hexNumberNegative: -0xa_db_ee_fa,
   hexNumberPositive: 0xea_db_ee_fb,
+  hexFloatingPoint: 0x18_00,
 }

From 3de0e445aeee9d49be82ee04f629409c1cd205d5 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Sun, 21 Sep 2025 23:20:40 +0200
Subject: [PATCH 36/48] feat: enhance docs

---
 src/main/java/de/marhali/json5/Json5.java | 40 ++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/marhali/json5/Json5.java b/src/main/java/de/marhali/json5/Json5.java
index 871812a..74a4f27 100644
--- a/src/main/java/de/marhali/json5/Json5.java
+++ b/src/main/java/de/marhali/json5/Json5.java
@@ -39,8 +39,46 @@
  *     {@link Reader}, {@link Writer} or simple {@link String} instances.
  * </p>
  *
+ * <pre>
+ * {@code
+ * // Create Json5 instance using builder pattern to configure desired options
+ * Json5 json5 = Json5.builder(builder -> builder
+ *     .quoteless()
+ *     .quoteSingle()
+ *     .parseComments()
+ *     .writeComments()
+ *     .prettyPrinting()
+ *     .build()
+ *     );
+ *
+ * // Parse from a String
+ * Json5Element element =
+ *         json5.parse("{ 'key': 'value', 'array': ['first val','second val'] }");
+ *
+ * // Or parse from a Reader or InputStream
+ * try (InputStream stream = ...) {
+ *     Json5Element element = json5.parse(stream);
+ *     // ...
+ * } catch (IOException e) {
+ *     // ...
+ * }
+ *
+ * // Serialize to a String
+ * String json5String = json5.serialize(element);
+ *
+ * // Serialize to a Writer or OutputStream
+ * try (OutputStream stream = ...) {
+ *     json5.serialize(element, stream);
+ *     // ...
+ * } catch (IOException e) {
+ *     // ...
+ * }
+ *
+ * }
+ * </pre>
+ *
  * @author Marcel Haßlinger
- * @see <a href="https://spec.json5.org/">JSON5 Specification</a>
+ * @see <a href="https://spec.json5.org/">Json5 Specification</a>
  * @see Json5Parser
  * @see Json5Writer
  */

From b12190aa72d07b9f28bd08525314e04c5a66e638 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Mon, 22 Sep 2025 00:33:32 +0200
Subject: [PATCH 37/48] feat: update README

---
 README.md | 127 +++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 106 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index ad27a17..e9802e9 100644
--- a/README.md
+++ b/README.md
@@ -1,29 +1,55 @@
 # json5-java 
-[![Build](https://img.shields.io/github/actions/workflow/status/marhali/json5-java/cd.yml?branch=main)](https://github.com/marhali/json5-java/actions)
-[![JavaDoc](https://javadoc.io/badge2/de.marhali/json5-java/javadoc.svg)](https://javadoc.io/doc/de.marhali/json5-java)
-[![Coverage](https://img.shields.io/codecov/c/github/marhali/json5-java)](https://codecov.io/gh/marhali/json5-java)
-[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/marhalide)
+[![Build](https://img.shields.io/github/actions/workflow/status/marhali/json5-java/ci.yml?branch=main&style=for-the-badge)](https://github.com/marhali/json5-java/actions)
+[![JavaDoc](https://javadoc.io/badge2/de.marhali/json5-java/javadoc.svg?style=for-the-badge)](https://javadoc.io/doc/de.marhali/json5-java)
+[![Coverage](https://img.shields.io/codecov/c/github/marhali/json5-java?style=for-the-badge)](https://codecov.io/gh/marhali/json5-java)
+[![Release](https://img.shields.io/github/v/release/marhali/json5-java?style=for-the-badge)](https://github.com/marhali/json5-java/releases)
+[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg?style=for-the-badge)](https://paypal.me/marhalide)
 
 This is a reference implementation of the [JSON5 standard](https://json5.org/) in Java 11+, 
 capable of parsing and serialization of JSON5 data.
 
 This library is an enhanced version of [Synt4xErr0r4 / json5](https://github.com/Synt4xErr0r4/json5), 
-which provides a better full-fledged API inspired by the [GSON](https://github.com/google/gson) library.
+which provides a better full-fledged API inspired by Google's [Gson](https://github.com/google/gson) library.
+
+## Features
+
+- Fully supports JSON5 according to the [specification](https://spec.json5.org/)
+- Extensive API for interacting with elements, inspired by Google's [Gson](https://github.com/google/gson) library
+- Supports comment parsing and writing (if they can be associated with an [Json5Element](src/main/java/de/marhali/json5/Json5Element.java))
+- Fine-grained configuration options
+- No runtime dependencies – ensures a clean supply chain
+
+## Installation
+
+Download the [latest release](https://github.com/marhali/json5-java/releases/latest) manually or add it as a Maven dependency.
+Don't worry the project is already in the [Maven Central Repository](https://central.sonatype.com/artifact/de.marhali/json5-java). See the configuration below for your favorite build system.
+
+### Add via Maven
 
-## Download
-Download the [latest release](https://search.maven.org/artifact/de.marhali/json5-java) manually or add a Maven dependency. 
-Don't worry the project is already in the Maven Central Repository. Just add the following configuration:
 ```xml
 <dependencies>
     <dependency>
         <groupId>de.marhali</groupId>
         <artifactId>json5-java</artifactId>
-        <version>2.0.0</version>
+        <version>3.0.0</version>
     </dependency>
 </dependencies>
 ```
 
+### Add via Gradle
+
+```kotlin
+repositories {
+  mavenCentral()
+}
+
+dependencies {
+  implementation("de.marhali:json5-java:3.0.0")
+}
+```
+
 ## Usage
+
 This library can be used by either configuring a [Json5](src/main/java/de/marhali/json5/Json5.java) 
 instance or by using the underlying [Json5Parser](src/main/java/de/marhali/json5/stream/Json5Parser.java) 
 and [Json5Writer](src/main/java/de/marhali/json5/stream/Json5Writer.java).
@@ -32,29 +58,44 @@ The following section describes how to use this library with the
 [Json5](src/main/java/de/marhali/json5/Json5.java) core class.
 
 ### Configure Json5 instance
-See [Parsing & Serialization Options](#parsing--serialization-options) to see a list of possible configuration options.
+
+See [Configuration Options](#configuration-options) for a full overview of possible options.
+
 ```java
-// Using builder pattern
-Json5 json5 = Json5.builder(options ->
-        options.allowInvalidSurrogate().quoteSingle().prettyPrinting().build());
+import de.marhali.json5.config.Json5Options;
+
+// Create Json5 instance using builder pattern to configure desired options
+Json5 json5 = Json5.builder(builder -> builder
+    .quoteless()
+    .quoteSingle()
+    .parseComments()
+    .writeComments()
+    .prettyPrinting()
+    .build()
+);
 
 // Using configuration object
-Json5Options options = new Json5Options(true, true, true, 2);
+Json5Options options = Json5Options.builder()
+    // ...
+    .build();
 Json5 json5 = new Json5(options);
 ```
 
-### Parsing 
+### Parsing
+
+During parsing, a JSON5 file or string is converted into the corresponding [Json5Element's](src/main/java/de/marhali/json5/Json5Element.java).
+
 ```java
 Json5 json5 = ...
 
-// Parse from a String literal
+// Parse from a String
 Json5Element element = 
         json5.parse("{ 'key': 'value', 'array': ['first val','second val'] }");
 
 // ...
 
 // Parse from a Reader or InputStream
-try(InputStream stream = ...) {
+try (InputStream stream = ...) {
     Json5Element element = json5.parse(stream);
     // ...
 } catch (IOException e) {
@@ -63,6 +104,9 @@ try(InputStream stream = ...) {
 ```
 
 ### Serialization
+
+During serialization, [Json5Element's](src/main/java/de/marhali/json5/Json5Element.java) are converted to their string representation so that they can be written to a file, for example.
+
 ```java
 Json5Element element = ...
 
@@ -72,7 +116,7 @@ String jsonString = json5.serialize(element);
 // ...
 
 // Serialize to a Writer or OutputStream        
-try(OutputStream stream = ...) {
+try (OutputStream stream = ...) {
     json5.serialize(element, stream);
     // ...
 } catch (IOException e) {
@@ -83,16 +127,57 @@ try(OutputStream stream = ...) {
 ## Documentation
 Detailed javadoc documentation can be found at [javadoc.io](https://javadoc.io/doc/de.marhali/json5-java).
 
-### Parsing & Serialization Options
+### API
+
+This library provides a few core classes to interact with JSON5 elements.
+
+- [Json5](src/main/java/de/marhali/json5/Json5.java): Core class for parsing and serialization
+- [Json5Options](src/main/java/de/marhali/json5/config/Json5Options.java): Library configuration and options builder
+- [Json5Element](src/main/java/de/marhali/json5/Json5Element.java): Root class for every JSON5 element
+- [Json5Null](src/main/java/de/marhali/json5/Json5Null.java): Class representing the JSON5 `null` value
+- [Json5Object](src/main/java/de/marhali/json5/Json5Object.java): Represents a JSON5 object
+- [Json5Array](src/main/java/de/marhali/json5/Json5Array.java): Represents a JSON5 array
+- [Json5Primitive](src/main/java/de/marhali/json5/Json5Primitive.java): Holds any primitive value (`Boolean`, `Number` or `String`)
+
+> For a better understanding of how to use the API, take a look at the [unit tests](src/test/java/de/marhali/json5).
+
+### Configuration Options
 This library supports a few customizations to adjust the behaviour of parsing and serialization.
-For a detailed explanation see the [Json5Options](src/main/java/de/marhali/json5/Json5Options.java) class.
+For a detailed explanation see the [Json5Options](src/main/java/de/marhali/json5/config/Json5Options.java) class.
 
+- stringifyUnixInstants
+- stringifyAscii
+- allowNaN
+- allowInfinity
 - allowInvalidSurrogates
 - quoteSingle
+- quoteless
+- allowBinaryLiterals
+- allowOctalLiterals
+- allowHexFloatingLiterals
+- allowLongUnicodeEscapes
+- allowTrailingData
+- parseComments
+- writeComments
 - trailingComma
+- insertFinalNewline
+- digitSeparatorStrategy
+- duplicateBehaviour
 - indentFactor
 
+To get started using this library, `Json5Options.DEFAULT` may be a good starting point, as these are the recommended options.
+
 ## License
 This library is released under the [Apache 2.0 license](LICENSE).
 
-Partial parts of the project are based on [GSON](https://github.com/google/gson) and [Synt4xErr0r4 / json5](https://github.com/Synt4xErr0r4/json5). The affected classes contain the respective license notice. 
+Partial parts of the project are based on [Gson](https://github.com/google/gson) and [Synt4xErr0r4 / json5](https://github.com/Synt4xErr0r4/json5). The affected classes contain the respective license notice. 
+
+## Contact
+
+Marcel Haßlinger - [@marhali_de](https://twitter.com/marhali_de) - [Portfolio Website](https://marhali.de)
+
+Project Link: [https://github.com/marhali/json5-java](https://github.com/marhali/json5-java)
+
+## Donation
+
+If this library helps you to reduce development time, you can give me a [cup of coffee](https://paypal.me/marhalide) :)

From 232fab1461e5dc0254adc2124315f342f89e2eed Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Mon, 22 Sep 2025 00:35:46 +0200
Subject: [PATCH 38/48] feat: link options

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e9802e9..cac856a 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ which provides a better full-fledged API inspired by Google's [Gson](https://git
 - Fully supports JSON5 according to the [specification](https://spec.json5.org/)
 - Extensive API for interacting with elements, inspired by Google's [Gson](https://github.com/google/gson) library
 - Supports comment parsing and writing (if they can be associated with an [Json5Element](src/main/java/de/marhali/json5/Json5Element.java))
-- Fine-grained configuration options
+- Fine-grained [configuration options](#configuration-options)
 - No runtime dependencies – ensures a clean supply chain
 
 ## Installation

From 48feaae0ebe48c54d7da3446ac5783ef9743b8c4 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Mon, 22 Sep 2025 00:36:16 +0200
Subject: [PATCH 39/48] refactor: reorder badges

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cac856a..432ee89 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # json5-java 
 [![Build](https://img.shields.io/github/actions/workflow/status/marhali/json5-java/ci.yml?branch=main&style=for-the-badge)](https://github.com/marhali/json5-java/actions)
+[![Release](https://img.shields.io/github/v/release/marhali/json5-java?style=for-the-badge)](https://github.com/marhali/json5-java/releases)
 [![JavaDoc](https://javadoc.io/badge2/de.marhali/json5-java/javadoc.svg?style=for-the-badge)](https://javadoc.io/doc/de.marhali/json5-java)
 [![Coverage](https://img.shields.io/codecov/c/github/marhali/json5-java?style=for-the-badge)](https://codecov.io/gh/marhali/json5-java)
-[![Release](https://img.shields.io/github/v/release/marhali/json5-java?style=for-the-badge)](https://github.com/marhali/json5-java/releases)
 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg?style=for-the-badge)](https://paypal.me/marhalide)
 
 This is a reference implementation of the [JSON5 standard](https://json5.org/) in Java 11+, 

From 4e7493d1fa94d518efb3ea8f03e1b938b56659b5 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Mon, 22 Sep 2025 22:01:41 +0200
Subject: [PATCH 40/48] feat: enhance README.md

---
 README.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 432ee89..2d960be 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,7 @@ See [Configuration Options](#configuration-options) for a full overview of possi
 
 ```java
 import de.marhali.json5.config.Json5Options;
+import de.marhali.json5.Json5;
 
 // Create Json5 instance using builder pattern to configure desired options
 Json5 json5 = Json5.builder(builder -> builder
@@ -86,6 +87,9 @@ Json5 json5 = new Json5(options);
 During parsing, a JSON5 file or string is converted into the corresponding [Json5Element's](src/main/java/de/marhali/json5/Json5Element.java).
 
 ```java
+import de.marhali.json5.Json5;
+import de.marhali.json5.Json5Element;
+
 Json5 json5 = ...
 
 // Parse from a String
@@ -108,6 +112,9 @@ try (InputStream stream = ...) {
 During serialization, [Json5Element's](src/main/java/de/marhali/json5/Json5Element.java) are converted to their string representation so that they can be written to a file, for example.
 
 ```java
+import de.marhali.json5.Json5;
+import de.marhali.json5.Json5Element;
+
 Json5Element element = ...
 
 // Serialize to a String literal
@@ -165,7 +172,7 @@ For a detailed explanation see the [Json5Options](src/main/java/de/marhali/json5
 - duplicateBehaviour
 - indentFactor
 
-To get started using this library, `Json5Options.DEFAULT` may be a good starting point, as these are the recommended options.
+> To get started using this library, `Json5Options.DEFAULT` may be a good starting point, as these are the recommended options.
 
 ## License
 This library is released under the [Apache 2.0 license](LICENSE).

From 4f17924bf06e35ee23d8a5554594b8993ffd9bfa Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Mon, 22 Sep 2025 22:01:58 +0200
Subject: [PATCH 41/48] feat: add missing javadoc properties

---
 src/main/java/de/marhali/json5/Json5Element.java      |  1 +
 src/main/java/de/marhali/json5/Json5Primitive.java    | 11 +++++++++++
 .../java/de/marhali/json5/config/Json5Options.java    |  3 +++
 .../marhali/json5/internal/EcmaScriptIdentifier.java  |  1 +
 .../java/de/marhali/json5/internal/LinkedTreeMap.java |  2 ++
 .../java/de/marhali/json5/stream/Json5Writer.java     |  1 +
 6 files changed, 19 insertions(+)

diff --git a/src/main/java/de/marhali/json5/Json5Element.java b/src/main/java/de/marhali/json5/Json5Element.java
index 78f3449..7293481 100644
--- a/src/main/java/de/marhali/json5/Json5Element.java
+++ b/src/main/java/de/marhali/json5/Json5Element.java
@@ -80,6 +80,7 @@ public void setComment(String comment) {
 
     /**
      * Returns a deep copy of this element.
+     * @return Deep copy
      */
     public abstract Json5Element deepCopy();
 
diff --git a/src/main/java/de/marhali/json5/Json5Primitive.java b/src/main/java/de/marhali/json5/Json5Primitive.java
index 802d007..c0d166a 100644
--- a/src/main/java/de/marhali/json5/Json5Primitive.java
+++ b/src/main/java/de/marhali/json5/Json5Primitive.java
@@ -43,6 +43,8 @@ public final class Json5Primitive extends Json5Element {
 
     /**
      * Create a primitive containing a {@code null} value.
+     *
+     * @return New {@link Json5Null} value
      */
     public static Json5Null fromNull() {
         return new Json5Null();
@@ -52,6 +54,7 @@ public static Json5Null fromNull() {
      * Create a primitive containing a boolean value.
      *
      * @param bool the value to create the primitive with.
+     * @return Json5Primitive containing the provided {@link Boolean} value
      */
     public static Json5Primitive fromBoolean(Boolean bool) {
         return new Json5Primitive(Objects.requireNonNull(bool));
@@ -60,6 +63,7 @@ public static Json5Primitive fromBoolean(Boolean bool) {
     /**
      * Create a primitive containing a {@link Instant} value.
      * @param instant the value to create the primitive with.
+     * @return Json5Primitive containing the provided {@link Instant} value
      * <p>
      * <i>This is an extension that is not compliant to the official Json5 spec.</i>
      */
@@ -73,6 +77,7 @@ public static Json5Primitive fromInstant(Instant instant) {
      * this method will ensure that the underlying number implementation is a {@link BigInteger}.
      * @param number The number
      * @param radix Radix base
+     * @return Json5Primitive containing the provided {@link Number} with specified radix base
      */
     public static Json5Primitive fromNumber(Number number, int radix) {
         Objects.requireNonNull(number);
@@ -89,6 +94,7 @@ public static Json5Primitive fromNumber(Number number, int radix) {
      * Create a primitive containing a decimal {@link Number} (radix base {@code 10}).
      *
      * @param number the value to create the primitive with.
+     * @return Json5Primitive containing the provided {@link Number} with radix base {@code 10}
      */
     public static Json5Primitive fromNumber(Number number) {
         return Json5Primitive.fromNumber(Objects.requireNonNull(number), 10);
@@ -100,6 +106,7 @@ public static Json5Primitive fromNumber(Number number) {
      * <p>
      * <i>This is an extension that is not compliant to the official Json5 spec.</i>
      * @param binaryString the value to create the primitive with.
+     * @return Json5Primitive containing the provided binary number with radix base {@code 2}
      */
     public static Json5Primitive fromBinaryString(String binaryString) {
         Objects.requireNonNull(binaryString);
@@ -127,6 +134,7 @@ public static Json5Primitive fromBinaryString(String binaryString) {
      * <p>
      * <i>This is an extension that is not compliant to the official Json5 spec.</i>
      * @param octalString the value to create the primitive with.
+     * @return Json5Primitive containing the provided octal number with radix base {@code 8}
      */
     public static Json5Primitive fromOctalString(String octalString) {
         Objects.requireNonNull(octalString);
@@ -152,6 +160,7 @@ public static Json5Primitive fromOctalString(String octalString) {
      * Create a primitive containing a binary number (radix base {@code 16}).
      * For example {@code +0x09af...}, {@code 0x09af...} or {@code -0x09af...}.
      * @param hexString the value to create the primitive with.
+     * @return Json5Primitive containing the provided hex number with radix base {@code 16}
      */
     public static Json5Primitive fromHexString(String hexString) {
         Objects.requireNonNull(hexString);
@@ -177,6 +186,7 @@ public static Json5Primitive fromHexString(String hexString) {
      * Create a primitive containing a String value.
      *
      * @param string the value to create the primitive with.
+     * @return Json5Primitive containing the provided {@link String}
      */
     public static Json5Primitive fromString(String string) {
         return new Json5Primitive(Objects.requireNonNull(string));
@@ -187,6 +197,7 @@ public static Json5Primitive fromString(String string) {
      * since Json5 only supports String.
      *
      * @param c the value to create the primitive with.
+     * @return Json5Primitive containing the provided {@link Character}
      */
     public static Json5Primitive fromCharacter(Character c) {
         // convert characters to strings since in Json5, characters are represented as a single
diff --git a/src/main/java/de/marhali/json5/config/Json5Options.java b/src/main/java/de/marhali/json5/config/Json5Options.java
index 49243f4..50becde 100644
--- a/src/main/java/de/marhali/json5/config/Json5Options.java
+++ b/src/main/java/de/marhali/json5/config/Json5Options.java
@@ -527,6 +527,7 @@ public Builder insertFinalNewline() {
 
         /**
          * @see Json5Options#digitSeparatorStrategy
+         * @param digitSeparatorStrategy Strategy to apply
          * @return builder
          */
         public Builder digitSeparatorStrategy(DigitSeparatorStrategy digitSeparatorStrategy) {
@@ -536,6 +537,7 @@ public Builder digitSeparatorStrategy(DigitSeparatorStrategy digitSeparatorStrat
 
         /**
          * @see Json5Options#duplicateBehaviour
+         * @param duplicateKeyStrategy Strategy to apply
          * @return builder
          */
         public Builder duplicateKeyStrategy(DuplicateKeyStrategy duplicateKeyStrategy) {
@@ -545,6 +547,7 @@ public Builder duplicateKeyStrategy(DuplicateKeyStrategy duplicateKeyStrategy) {
 
         /**
          * @see Json5Options#indentFactor
+         * @param indentFactor Indent factor to apply
          * @return builder
          */
         public Builder indentFactor(int indentFactor) {
diff --git a/src/main/java/de/marhali/json5/internal/EcmaScriptIdentifier.java b/src/main/java/de/marhali/json5/internal/EcmaScriptIdentifier.java
index 6abfdad..92617a5 100644
--- a/src/main/java/de/marhali/json5/internal/EcmaScriptIdentifier.java
+++ b/src/main/java/de/marhali/json5/internal/EcmaScriptIdentifier.java
@@ -28,6 +28,7 @@ private EcmaScriptIdentifier() {}
 
     /**
      * Checks whether the provided {@link String} is a valid ES5.1 IdentifierName.
+     * @param raw Input to check
      * @return true if valid identifier, otherwise false
      * @see <a href="https://262.ecma-international.org/5.1/#sec-7.6">https://262.ecma-international.org/5.1/#sec-7.6</a>
      */
diff --git a/src/main/java/de/marhali/json5/internal/LinkedTreeMap.java b/src/main/java/de/marhali/json5/internal/LinkedTreeMap.java
index 9916170..dd06b03 100644
--- a/src/main/java/de/marhali/json5/internal/LinkedTreeMap.java
+++ b/src/main/java/de/marhali/json5/internal/LinkedTreeMap.java
@@ -672,6 +672,8 @@ public void clear() {
      * If somebody is unlucky enough to have to serialize one of these, serialize it as a
      * LinkedHashMap so that they won't need Gson on the other side to deserialize it. Using
      * serialization defeats our DoS defence, so most apps shouldn't use it.
+     * @return Object
+     * @throws ObjectStreamException If an I/O error occurs
      */
     private Object writeReplace() throws ObjectStreamException {
         return new LinkedHashMap<>(this);
diff --git a/src/main/java/de/marhali/json5/stream/Json5Writer.java b/src/main/java/de/marhali/json5/stream/Json5Writer.java
index d6489f8..814e7ab 100644
--- a/src/main/java/de/marhali/json5/stream/Json5Writer.java
+++ b/src/main/java/de/marhali/json5/stream/Json5Writer.java
@@ -111,6 +111,7 @@ public void write(Json5Element element, int depth) throws IOException {
      * Checks if {@link Json5Options#isWriteComments()} is {@code true} and if the element has any comment assigned.
      * @param element Element target
      * @param depth Depth to use for writing
+     * @throws IOException If an I/O error occurs
      */
     public void writeComment(Json5Element element, int depth) throws IOException {
         if (!options.isWriteComments() || !element.hasComment()) {

From 2e18d3b938f4e9629b7c0af51aa93a51bc1c0d6c Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Tue, 23 Sep 2025 00:00:24 +0200
Subject: [PATCH 42/48] feat: migrate to gradle

---
 .github/dependabot.yml                   |   6 +-
 .github/workflows/build.yml              | 167 +++++++++++++++
 .github/workflows/cd.yml                 |  32 ---
 .github/workflows/ci.yml                 |  34 ---
 .github/workflows/release.yml            |  91 ++++++++
 .gitignore                               |  14 +-
 .run/Run build.run.xml                   |  24 +++
 .run/Run tests.run.xml                   |  24 +++
 build.gradle.kts                         |  75 +++++++
 gradle.properties                        |   1 +
 gradle/libs.versions.toml                |   6 +
 gradle/wrapper/gradle-wrapper.jar        | Bin 0 -> 43764 bytes
 gradle/wrapper/gradle-wrapper.properties |   7 +
 gradlew                                  | 251 +++++++++++++++++++++++
 gradlew.bat                              |  94 +++++++++
 pom.xml                                  | 161 ---------------
 qodana.yml                               |  10 +
 settings.gradle.kts                      |   1 +
 18 files changed, 757 insertions(+), 241 deletions(-)
 create mode 100644 .github/workflows/build.yml
 delete mode 100644 .github/workflows/cd.yml
 delete mode 100644 .github/workflows/ci.yml
 create mode 100644 .github/workflows/release.yml
 create mode 100644 .run/Run build.run.xml
 create mode 100644 .run/Run tests.run.xml
 create mode 100644 build.gradle.kts
 create mode 100644 gradle.properties
 create mode 100644 gradle/libs.versions.toml
 create mode 100644 gradle/wrapper/gradle-wrapper.jar
 create mode 100644 gradle/wrapper/gradle-wrapper.properties
 create mode 100755 gradlew
 create mode 100644 gradlew.bat
 delete mode 100644 pom.xml
 create mode 100644 qodana.yml
 create mode 100644 settings.gradle.kts

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 67676e9..c581a8b 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -6,8 +6,8 @@ updates:
     schedule:
       interval: monthly
 
-  # Maintain dependencies for Maven
-  - package-ecosystem: maven
+  # Maintain dependencies for Gradle
+  - package-ecosystem: gradle
     directory: /
     schedule:
-      interval: monthly
\ No newline at end of file
+      interval: monthly
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..3328bbf
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,167 @@
+# GitHub Actions Workflow is created for testing and preparing the library release in the following steps:
+# - Validate Gradle Wrapper.
+# - Run 'test' task.
+# - Run Qodana inspections.
+# - Run the 'buildLibrary' task and prepare artifact for further tests.
+# - Create a draft release.
+#
+# The workflow is triggered on push and pull_request events.
+#
+# GitHub Actions reference: https://help.github.com/en/actions
+
+name: Build
+on:
+  # Trigger the workflow on pushes to only the 'main' branch (this avoids duplicate checks being run e.g., for dependabot pull requests)
+  push:
+    branches: [ main ]
+  # Trigger the workflow on any pull request
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+
+  # Prepare the environment and build the library
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+
+      # Check out the current repository
+      - name: Fetch Sources
+        uses: actions/checkout@v4
+
+      # Set up the Java environment for the next steps
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: adopt
+          java-version: 11
+
+      # Setup Gradle
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      # Build the library
+      - name: Build Library
+        run: ./gradlew build
+
+      # Store an already-built library as an artifact for downloading
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          path: ./build/libs/*
+
+  # Run tests and upload a code coverage report
+  test:
+    name: Test
+    needs: [ build ]
+    runs-on: ubuntu-latest
+    steps:
+
+      # Check out the current repository
+      - name: Fetch Sources
+        uses: actions/checkout@v4
+
+      # Set up the Java environment for the next steps
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: adopt
+          java-version: 11
+
+      # Setup Gradle
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          cache-read-only: true
+
+      # Run tests
+      - name: Run Tests
+        run: ./gradlew check
+
+      # Collect Tests Result of failed tests
+      - name: Collect Tests Result
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: tests-result
+          path: ${{ github.workspace }}/build/reports/tests
+
+      # Upload the Kover report to CodeCov
+      - name: Upload Code Coverage Report
+        uses: codecov/codecov-action@v5
+        with:
+          files: ${{ github.workspace }}/build/reports/jacoco/jacocoTestReport.xml
+          token: ${{ secrets.CODECOV_TOKEN }}
+
+  # Run Qodana inspections and provide a report
+  inspectCode:
+    name: Inspect code
+    needs: [ build ]
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      checks: write
+      pull-requests: write
+    steps:
+
+      # Check out the current repository
+      - name: Fetch Sources
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
+          fetch-depth: 0  # a full history is required for pull request analysis
+
+      # Set up the Java environment for the next steps
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: adopt
+          java-version: 11
+
+      # Run Qodana inspections
+      - name: Qodana - Code Inspection
+        uses: JetBrains/qodana-action@v2025.1.1
+        with:
+          cache-default-branch-only: true
+
+  # Prepare a draft release for GitHub Releases page for the manual verification
+  # If accepted and published, the release workflow would be triggered
+  releaseDraft:
+    name: Release draft
+    if: github.event_name != 'pull_request'
+    needs: [ build, test, inspectCode ]
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+
+      # Check out the current repository
+      - name: Fetch Sources
+        uses: actions/checkout@v4
+
+      # Remove old release drafts by using the curl request for the available releases with a draft flag
+      - name: Remove Old Release Drafts
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh api repos/{owner}/{repo}/releases \
+            --jq '.[] | select(.draft == true) | .id' \
+            | xargs -I '{}' gh api -X DELETE repos/{owner}/{repo}/releases/{}
+
+      # Create a new release draft which is not publicly visible and requires manual acceptance
+      - name: Create Release Draft
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          VERSION=$(./gradlew properties --property version --quiet --console=plain | tail -n 1 | cut -f2- -d ' ')
+          RELEASE_NOTE="./build/tmp/release_note.txt"
+          ./gradlew getChangelog --unreleased --no-header --quiet --console=plain --output-file=$RELEASE_NOTE
+
+          gh release create $VERSION \
+            --draft \
+            --title $VERSION \
+            --notes-file $RELEASE_NOTE
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
deleted file mode 100644
index cec54df..0000000
--- a/.github/workflows/cd.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: Maven CD
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v5
-
-      - name: Set up JDK 11
-        uses: actions/setup-java@v5
-        with:
-          java-version: '11'
-          distribution: 'adopt'
-          cache: maven
-          server-id: central
-          server-username: MAVEN_USERNAME
-          server-password: MAVEN_PASSWORD
-          gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
-          gpg-passphrase: MAVEN_GPG_PASSPHRASE
-
-      - name: Deploy with Maven
-        run: mvn -B clean deploy -Pci-cd
-        env:
-          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
deleted file mode 100644
index e833119..0000000
--- a/.github/workflows/ci.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Maven CI
-
-on: [push]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v5
-
-      - name: Set up JDK 11
-        uses: actions/setup-java@v5
-        with:
-          java-version: '11'
-          distribution: 'adopt'
-          cache: maven
-
-      - name: Build with Maven
-        run: mvn --batch-mode --fail-at-end --update-snapshots verify
-
-      - name: Publish Test-Report
-        if: ${{ always() }}
-        uses: scacap/action-surefire-report@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          directory: ./target/site/jacoco/
-          fail_ci_if_error: true
-          verbose: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..86db6e5
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,91 @@
+# GitHub Actions Workflow created for handling the release process based on the draft release prepared with the Build workflow.
+
+name: Release
+on:
+  release:
+    types: [prereleased, released]
+
+jobs:
+
+  # Prepare and publish the library to Maven Central and GitHub Packages
+  release:
+    name: Publish Library
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+
+      # Check out the current repository
+      - name: Fetch Sources
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.release.tag_name }}
+
+      # Set up the Java environment for the next steps
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: adopt
+          java-version: 11
+
+      # Setup Gradle
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          cache-read-only: true
+
+      # Update the Unreleased section with the current release note
+      - name: Patch Changelog
+        if: ${{ github.event.release.body != '' }}
+        env:
+          CHANGELOG: ${{ github.event.release.body }}
+        run: |
+          RELEASE_NOTE="./build/tmp/release_note.txt"
+          mkdir -p "$(dirname "$RELEASE_NOTE")"
+          echo "$CHANGELOG" > $RELEASE_NOTE
+
+          ./gradlew patchChangelog --release-note-file=$RELEASE_NOTE
+
+      # Publish the library to Maven Central
+      - name: Publish Library
+        env:
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.ORG_GRADLE_PROJECT_mavenCentralUsername }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.ORG_GRADLE_PROJECT_mavenCentralPassword }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ORG_GRADLE_PROJECT_signingInMemoryKey }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ ORG_GRADLE_PROJECT_signingInMemoryKeyPassword }}
+        run: ./gradlew publishToMavenCentral
+
+      # Upload an artifact as a release asset
+      - name: Upload Release Asset
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: gh release upload ${{ github.event.release.tag_name }} ./build/libs/*
+
+      # Create a pull request
+      - name: Create Pull Request
+        if: ${{ steps.properties.outputs.changelog != '' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          VERSION="${{ github.event.release.tag_name }}"
+          BRANCH="changelog-update-$VERSION"
+          LABEL="release changelog"
+
+          git config user.email "action@github.com"
+          git config user.name "GitHub Action"
+
+          git checkout -b $BRANCH
+          git commit -am "Changelog update - $VERSION"
+          git push --set-upstream origin $BRANCH
+
+          gh label create "$LABEL" \
+            --description "Pull requests with release changelog update" \
+            --force \
+            || true
+
+          gh pr create \
+            --title "Changelog update - \`$VERSION\`" \
+            --body "Current pull request contains patched \`CHANGELOG.md\` file for the \`$VERSION\` version." \
+            --label "$LABEL" \
+            --head $BRANCH
diff --git a/.gitignore b/.gitignore
index cea2657..ca643f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,6 @@
 target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
-# https://github.com/takari/maven-wrapper#usage-without-binary-jar
-.mvn/wrapper/maven-wrapper.jar
+build
+.gradle
 
 # Eclipse m2e generated files
 # Eclipse Core
@@ -17,4 +9,4 @@ buildNumber.properties
 .classpath
 
 # IntelliJ IDE
-.idea
\ No newline at end of file
+.idea
diff --git a/.run/Run build.run.xml b/.run/Run build.run.xml
new file mode 100644
index 0000000..cd36cb8
--- /dev/null
+++ b/.run/Run build.run.xml	
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run build" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="build" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/Run tests.run.xml b/.run/Run tests.run.xml
new file mode 100644
index 0000000..83d988a
--- /dev/null
+++ b/.run/Run tests.run.xml	
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run tests" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="test" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..47cbee3
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,75 @@
+plugins {
+    `java-library`
+    jacoco
+    id("org.jetbrains.changelog") version "2.4.0"
+    id("com.vanniktech.maven.publish") version "0.34.0"
+}
+
+group = "de.marhali"
+version = "3.0.0"
+description = "A lightweight library to parse and serialize JSON5 data"
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testImplementation(libs.junit.jupiter)
+    testRuntimeOnly(libs.junit.platform.launcher)
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
+    withSourcesJar()
+    withJavadocJar()
+}
+
+mavenPublishing {
+    publishToMavenCentral(automaticRelease = true)
+    signAllPublications()
+
+    coordinates(project.group.toString(), project.name.toString(), project.version.toString())
+
+    pom {
+        name.set(project.name)
+        description.set(project.description)
+        inceptionYear.set("2022")
+        url.set("https://github.com/marhali/json5-java")
+        licenses {
+            licenses {
+                name.set("The Apache License, Version 2.0")
+                url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+            }
+        }
+        developers {
+            developer {
+                id.set("marhali")
+                name.set("Marcel Haßlinger")
+                email.set("code@shield.marhali.de")
+                url.set("https://marhali.de")
+            }
+        }
+        scm {
+            connection.set("scm:git:git@github.com:marhali/json5-java.git")
+            developerConnection.set("scm:git:ssh://git@github.com/marhali/json5-java.git")
+            url.set("https://github.com/marhali/json5-java/tree/main")
+        }
+    }
+}
+
+tasks {
+    named<Test>("test") {
+        useJUnitPlatform()
+        finalizedBy("jacocoTestReport")
+    }
+
+    named<JacocoReport>("jacocoTestReport") {
+        dependsOn("test")
+        reports {
+            xml.required.set(true)
+            html.required.set(true)
+        }
+    }
+}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..5ad6974
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1 @@
+org.gradle.configuration-cache=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..e42625a
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,6 @@
+[versions]
+junit = "5.13.4"
+
+[libraries]
+junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
+junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..1b33c55baabb587c669f562ae36f953de2481846
GIT binary patch
literal 43764
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
Mi07c5C&+LA2gVWY(f|Me

literal 0
HcmV?d00001

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..d4081da
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..23d15a9
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,251 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH="\\\"\\\""
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..db3a6ac
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,94 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 1154fc5..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>de.marhali</groupId>
-    <artifactId>json5-java</artifactId>
-    <version>2.0.1</version>
-    <name>${project.groupId}:${project.artifactId}</name>
-    <description>A lightweight library to parse and serialize JSON5 data</description>
-    <url>https://github.com/marhali/json5-java</url>
-
-    <licenses>
-        <license>
-            <name>The Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-        </license>
-    </licenses>
-
-    <developers>
-        <developer>
-            <id>marhali</id>
-            <name>Marcel Haßlinger</name>
-            <email>contact@marhali.de</email>
-        </developer>
-    </developers>
-
-    <scm>
-        <connection>scm:git:git@github.com:marhali/json5-java.git</connection>
-        <developerConnection>scm:git:ssh://github.com:marhali/json5-java.git</developerConnection>
-        <url>https://github.com/marhali/json5-java/tree/main</url>
-    </scm>
-
-    <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-    </properties>
-
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-        <repository>
-            <id>ossrh</id>
-            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-    </distributionManagement>
-
-    <dependencies>
-        <!-- JUnit for unit tests -->
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.13.4</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>3.3.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.11.3</version>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.5.3</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.5.3</version>
-            </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.13</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>report</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-          <plugin>
-            <groupId>org.sonatype.central</groupId>
-            <artifactId>central-publishing-maven-plugin</artifactId>
-            <version>0.8.0</version>
-            <extensions>true</extensions>
-            <configuration>
-              <publishingServerId>central</publishingServerId>
-            </configuration>
-          </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>ci-cd</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.2.8</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifact</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                                <configuration>
-                                    <!-- Prevent gpg from using pin entry programs.
-                                        Fixes: gpg: signing failed: Inappropriate ioctl for device -->
-                                    <gpgArguments>
-                                        <arg>--pinentry-mode</arg>
-                                        <arg>loopback</arg>
-                                    </gpgArguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
diff --git a/qodana.yml b/qodana.yml
new file mode 100644
index 0000000..6408d57
--- /dev/null
+++ b/qodana.yml
@@ -0,0 +1,10 @@
+# Qodana configuration:
+# https://www.jetbrains.com/help/qodana/qodana-yaml.html
+
+version: "1.0"
+linter: jetbrains/qodana-jvm:2024.3
+profile:
+  name: qodana.recommended
+projectJDK: "11"
+include:
+  - name: All
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..8acd8e7
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1 @@
+rootProject.name = "json5-java"

From 6db942c4111b8c70df41bc40da5bb6cfbeb84b57 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Tue, 23 Sep 2025 00:16:04 +0200
Subject: [PATCH 43/48] chore: update changelog

---
 CHANGELOG.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7c6e31..3550b25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,29 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- Option: `stringifyUnixInstants`
+- Option: `stringifyAscii`
+- Option: `allowNaN`
+- Option: `allowInfinity`
+- Option: `quoteSingle`
+- Option: `quoteless`
+- Option: `allowBinaryLiterals`
+- Option: `allowOctalLiterals`
+- Option: `allowHexFloatingLiterals`
+- Option: `allowLongUnicodeEscapes`
+- Option: `allowTrailingData`
+- Option: `parseComments`
+- Option: `writeComments`
+- Option: `insertFinalNewline`
+- Option: `digitSeparatorStrategy`
+- Option: `duplicateBehaviour`
+### Changed
+- `Json5Null` is no longer a singleton as it allows individual comments
+- `Json5Primitive` holds any primitive value besides `Json5Null`
+- `Json5Options` with more advanced builder
+### Removed
+- `Json5Boolean`, `Json5Hexadecimal`, `Json5Number` and `Json5String` in favor of `Json5Primitive`.
 
 ## [2.0.1] - 2025-09-03
 ### Changed

From 5ae50ecefa0d6965f556283d27ef83829643c108 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Tue, 23 Sep 2025 00:18:33 +0200
Subject: [PATCH 44/48] chore: update qodana linter

---
 .github/workflows/build.yml | 2 +-
 qodana.yml                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3328bbf..e5b4c1c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -124,7 +124,7 @@ jobs:
 
       # Run Qodana inspections
       - name: Qodana - Code Inspection
-        uses: JetBrains/qodana-action@v2025.1.1
+        uses: JetBrains/qodana-action@v2025.2.1
         with:
           cache-default-branch-only: true
 
diff --git a/qodana.yml b/qodana.yml
index 6408d57..e98e2ee 100644
--- a/qodana.yml
+++ b/qodana.yml
@@ -2,7 +2,7 @@
 # https://www.jetbrains.com/help/qodana/qodana-yaml.html
 
 version: "1.0"
-linter: jetbrains/qodana-jvm:2024.3
+linter: jetbrains/qodana-jvm:2025.2
 profile:
   name: qodana.recommended
 projectJDK: "11"

From 1556de6df348a97795e50e292f2e5ff7af6b7db1 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Tue, 23 Sep 2025 18:18:54 +0200
Subject: [PATCH 45/48] fix: qodana job

---
 .github/workflows/build.yml | 16 ++++++----------
 qodana.yml                  |  3 +--
 settings.gradle.kts         |  4 ++++
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e5b4c1c..64483bc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -115,18 +115,14 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
           fetch-depth: 0  # a full history is required for pull request analysis
 
-      # Set up the Java environment for the next steps
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: adopt
-          java-version: 11
-
       # Run Qodana inspections
-      - name: Qodana - Code Inspection
-        uses: JetBrains/qodana-action@v2025.2.1
+      - name: 'Qodana Scan'
+        uses: JetBrains/qodana-action@v2025.2
         with:
-          cache-default-branch-only: true
+          pr-mode: false
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN_2073039781 }}
+          QODANA_ENDPOINT: 'https://qodana.cloud'
 
   # Prepare a draft release for GitHub Releases page for the manual verification
   # If accepted and published, the release workflow would be triggered
diff --git a/qodana.yml b/qodana.yml
index e98e2ee..2e1c995 100644
--- a/qodana.yml
+++ b/qodana.yml
@@ -2,9 +2,8 @@
 # https://www.jetbrains.com/help/qodana/qodana-yaml.html
 
 version: "1.0"
-linter: jetbrains/qodana-jvm:2025.2
+linter: jetbrains/qodana-jvm-community:2025.2
 profile:
   name: qodana.recommended
-projectJDK: "11"
 include:
   - name: All
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8acd8e7..a93277d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1 +1,5 @@
 rootProject.name = "json5-java"
+
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
+}

From f49834b40d0b68a8420645f6c4d1558b42aeb733 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Tue, 23 Sep 2025 19:06:55 +0200
Subject: [PATCH 46/48] chore: apply formatting rules

---
 src/main/java/de/marhali/json5/Json5.java     |  23 +++-
 .../java/de/marhali/json5/Json5Array.java     |  10 +-
 .../java/de/marhali/json5/Json5Element.java   | 124 +++++++++---------
 src/main/java/de/marhali/json5/Json5Null.java |   3 +-
 .../java/de/marhali/json5/Json5Object.java    |  23 ++--
 .../java/de/marhali/json5/Json5Primitive.java |  12 +-
 .../de/marhali/json5/config/Json5Options.java |  74 ++++++-----
 .../json5/exception/Json5Exception.java       |   4 +-
 .../json5/internal/EcmaScriptIdentifier.java  |   9 +-
 .../json5/internal/LazilyParsedNumber.java    |   7 +-
 .../marhali/json5/internal/LinkedTreeMap.java |  32 +++--
 .../marhali/json5/internal/NumberLimits.java  |   3 +-
 .../de/marhali/json5/stream/Json5Lexer.java   |  55 ++++----
 .../de/marhali/json5/stream/Json5Parser.java  |  12 +-
 .../de/marhali/json5/stream/Json5Writer.java  |  40 +++---
 .../marhali/json5/e2e/TestResourceHelper.java |   4 +-
 .../internal/LazilyParsedNumberTest.java      |   2 +-
 17 files changed, 246 insertions(+), 191 deletions(-)

diff --git a/src/main/java/de/marhali/json5/Json5.java b/src/main/java/de/marhali/json5/Json5.java
index 74a4f27..ac8a677 100644
--- a/src/main/java/de/marhali/json5/Json5.java
+++ b/src/main/java/de/marhali/json5/Json5.java
@@ -30,13 +30,13 @@
  * serialize Json5 data according to the specification and the configured {@link Json5Options options}.
  *
  * <p>
- *     You can create a Json5 instance by invoking {@link #Json5(Json5Options)}
- *     or by using {@link #builder(Function)}.
- *     </p>
+ * You can create a Json5 instance by invoking {@link #Json5(Json5Options)}
+ * or by using {@link #builder(Function)}.
+ * </p>
  *
  * <p>
- *     This class contains several utility methods to parse and serialize json5 data by passing
- *     {@link Reader}, {@link Writer} or simple {@link String} instances.
+ * This class contains several utility methods to parse and serialize json5 data by passing
+ * {@link Reader}, {@link Writer} or simple {@link String} instances.
  * </p>
  *
  * <pre>
@@ -86,6 +86,7 @@ public final class Json5 {
 
     /**
      * Constructs a new json5 instance by using the {@link Json5Options#builder()}.
+     *
      * @param builder Options builder
      * @return Built options
      */
@@ -97,6 +98,7 @@ public static Json5 builder(Function<Json5Options.Builder, Json5Options> builder
 
     /**
      * Constructs a new json5 instance with custom configuration for parsing and serialization.
+     *
      * @param options Configuration options
      * @see #builder(Function)
      */
@@ -106,6 +108,7 @@ public Json5(Json5Options options) {
 
     /**
      * Constructs a json5 instance by using {@link Json5Options#DEFAULT} as configuration.
+     *
      * @see #Json5(Json5Options)
      */
     public Json5() {
@@ -115,6 +118,7 @@ public Json5() {
     /**
      * Parses the data from the {@link InputStream} into a tree of {@link Json5Element}'s.
      * <p><b>Note:</b> The stream must be closed after operation</p>
+     *
      * @param in Can be any applicable {@link InputStream}
      * @return Parsed json5 tree. Can be {@code null} if the provided stream does not contain any data
      * @see #parse(Reader)
@@ -127,6 +131,7 @@ public Json5Element parse(InputStream in) {
     /**
      * Parses the provided read-stream into a tree of {@link Json5Element}'s.
      * <p><b>Note:</b> The reader must be closed after operation</p>
+     *
      * @param reader Can be any applicable {@link Reader}
      * @return Parsed json5 tree. Can be {@code null} if the provided stream does not contain any data
      * @see Json5Parser#parse(Json5Lexer)
@@ -140,6 +145,7 @@ public Json5Element parse(Reader reader) {
 
     /**
      * Parses the provided json5-encoded {@link String} into a parse tree of {@link Json5Element}'s.
+     *
      * @param string Json5 encoded {@link String}
      * @return Parsed json5 tree. Can be {@code null} if the provided {@link String} is empty
      * @see #parse(Reader)
@@ -156,8 +162,9 @@ public Json5Element parse(String string) {
     /**
      * Encodes the provided element into its character literal representation by using an output-stream.
      * <p><b>Note:</b> The stream must be closed after operation ({@link OutputStream#close()})!</p>
+     *
      * @param element {@link Json5Element} to serialize
-     * @param out Can be any applicable {@link OutputStream}
+     * @param out     Can be any applicable {@link OutputStream}
      * @throws IOException If an I/O error occurs
      * @see #serialize(Json5Element, Writer)
      */
@@ -171,8 +178,9 @@ public void serialize(Json5Element element, OutputStream out) throws IOException
     /**
      * Encodes the provided element into its character literal representation by using a write-stream.
      * <p><b>Note:</b> The writer must be closed after operation ({@link Writer#close()})!</p>
+     *
      * @param element {@link Json5Element} to serialize
-     * @param writer Can be any applicable {@link Writer}
+     * @param writer  Can be any applicable {@link Writer}
      * @throws IOException If an I/O error occurs
      * @see Json5Writer#write(Json5Element)
      */
@@ -186,6 +194,7 @@ public void serialize(Json5Element element, Writer writer) throws IOException {
 
     /**
      * Encodes the provided element into its character literal representation.
+     *
      * @param element {@link Json5Element} to serialize
      * @return Json5 encoded {@link String}
      * @throws IOException If an I/O error occurs
diff --git a/src/main/java/de/marhali/json5/Json5Array.java b/src/main/java/de/marhali/json5/Json5Array.java
index 78c8bf4..9110c50 100644
--- a/src/main/java/de/marhali/json5/Json5Array.java
+++ b/src/main/java/de/marhali/json5/Json5Array.java
@@ -47,7 +47,9 @@
 public final class Json5Array extends Json5Element implements Iterable<Json5Element> {
     private final ArrayList<Json5Element> elements;
 
-    /** Creates an empty Json5Array. */
+    /**
+     * Creates an empty Json5Array.
+     */
     public Json5Array() {
         elements = new ArrayList<>();
     }
@@ -148,7 +150,7 @@ public void addAll(Json5Array array) {
     /**
      * Replaces the element at the specified position in this array with the specified element.
      *
-     * @param index index of the element to replace
+     * @param index   index of the element to replace
      * @param element element to be stored at the specified position
      * @return the element previously at the specified position
      * @throws IndexOutOfBoundsException if the specified index is outside the array bounds
@@ -184,8 +186,8 @@ public Json5Element remove(int index) {
     /**
      * Returns true if this array contains the specified element.
      *
-     * @return true if this array contains the specified element.
      * @param element whose presence in this array is to be tested
+     * @return true if this array contains the specified element.
      */
     public boolean contains(Json5Element element) {
         return elements.contains(element);
@@ -226,7 +228,7 @@ public Iterator<Json5Element> iterator() {
      * @param i the index of the element that is being sought.
      * @return the element present at the i-th index.
      * @throws IndexOutOfBoundsException if {@code i} is negative or greater than or equal to the
-     *     {@link #size()} of the array.
+     *                                   {@link #size()} of the array.
      */
     public Json5Element get(int i) {
         return elements.get(i);
diff --git a/src/main/java/de/marhali/json5/Json5Element.java b/src/main/java/de/marhali/json5/Json5Element.java
index 7293481..db1305c 100644
--- a/src/main/java/de/marhali/json5/Json5Element.java
+++ b/src/main/java/de/marhali/json5/Json5Element.java
@@ -53,6 +53,7 @@ public abstract class Json5Element {
 
     /**
      * Provides a check for verifying if this element has an associated comment.
+     *
      * @return true if this element has an associated comment, false otherwise.
      */
     public boolean hasComment() {
@@ -80,6 +81,7 @@ public void setComment(String comment) {
 
     /**
      * Returns a deep copy of this element.
+     *
      * @return Deep copy
      */
     public abstract Json5Element deepCopy();
@@ -187,9 +189,9 @@ public Json5Null getAsJson5Null() {
      *
      * @return this element as a primitive boolean value.
      * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
-     *     Json5Array}.
-     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
-     *     more than a single element.
+     *                                       Json5Array}.
+     * @throws IllegalStateException         if this element is of the type {@link Json5Array} but contains
+     *                                       more than a single element.
      */
     public boolean getAsBoolean() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
@@ -200,9 +202,9 @@ public boolean getAsBoolean() {
      *
      * @return this element as a primitive {@link Instant} value.
      * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
-     *     Json5Array}.
-     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
-     *     more than a single element.
+     *                                       Json5Array}.
+     * @throws IllegalStateException         if this element is of the type {@link Json5Array} but contains
+     *                                       more than a single element.
      */
     public Instant getAsInstant() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
@@ -213,9 +215,9 @@ public Instant getAsInstant() {
      *
      * @return this element as a {@link Number}.
      * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
-     *     Json5Array}, or cannot be converted to a number.
-     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
-     *     more than a single element.
+     *                                       Json5Array}, or cannot be converted to a number.
+     * @throws IllegalStateException         if this element is of the type {@link Json5Array} but contains
+     *                                       more than a single element.
      */
     public Number getAsNumber() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
@@ -226,9 +228,9 @@ public Number getAsNumber() {
      *
      * @return this element as a {@link RadixNumber}.
      * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
-     *     Json5Array}, or cannot be converted to a radix number.
-     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
-     *     more than a single element.
+     *                                       Json5Array}, or cannot be converted to a radix number.
+     * @throws IllegalStateException         if this element is of the type {@link Json5Array} but contains
+     *                                       more than a single element.
      */
     public RadixNumber getAsRadixNumber() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
@@ -239,9 +241,9 @@ public RadixNumber getAsRadixNumber() {
      *
      * @return this element as a string value.
      * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
-     *     Json5Array}.
-     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
-     *     more than a single element.
+     *                                       Json5Array}.
+     * @throws IllegalStateException         if this element is of the type {@link Json5Array} but contains
+     *                                       more than a single element.
      */
     public String getAsString() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
@@ -252,10 +254,10 @@ public String getAsString() {
      *
      * @return this element as a primitive double value.
      * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
-     *     Json5Array}.
-     * @throws NumberFormatException if the value contained is not a valid double.
-     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
-     *     more than a single element.
+     *                                       Json5Array}.
+     * @throws NumberFormatException         if the value contained is not a valid double.
+     * @throws IllegalStateException         if this element is of the type {@link Json5Array} but contains
+     *                                       more than a single element.
      */
     public double getAsDouble() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
@@ -266,10 +268,10 @@ public double getAsDouble() {
      *
      * @return this element as a primitive float value.
      * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
-     *     Json5Array}.
-     * @throws NumberFormatException if the value contained is not a valid float.
-     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
-     *     more than a single element.
+     *                                       Json5Array}.
+     * @throws NumberFormatException         if the value contained is not a valid float.
+     * @throws IllegalStateException         if this element is of the type {@link Json5Array} but contains
+     *                                       more than a single element.
      */
     public float getAsFloat() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
@@ -280,10 +282,10 @@ public float getAsFloat() {
      *
      * @return this element as a primitive long value.
      * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
-     *     Json5Array}.
-     * @throws NumberFormatException if the value contained is not a valid long.
-     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
-     *     more than a single element.
+     *                                       Json5Array}.
+     * @throws NumberFormatException         if the value contained is not a valid long.
+     * @throws IllegalStateException         if this element is of the type {@link Json5Array} but contains
+     *                                       more than a single element.
      */
     public long getAsLong() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
@@ -294,10 +296,10 @@ public long getAsLong() {
      *
      * @return this element as a primitive integer value.
      * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
-     *     Json5Array}.
-     * @throws NumberFormatException if the value contained is not a valid integer.
-     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
-     *     more than a single element.
+     *                                       Json5Array}.
+     * @throws NumberFormatException         if the value contained is not a valid integer.
+     * @throws IllegalStateException         if this element is of the type {@link Json5Array} but contains
+     *                                       more than a single element.
      */
     public int getAsInt() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
@@ -308,10 +310,10 @@ public int getAsInt() {
      *
      * @return this element as a primitive byte value.
      * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
-     *     Json5Array}.
-     * @throws NumberFormatException if the value contained is not a valid byte.
-     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
-     *     more than a single element.
+     *                                       Json5Array}.
+     * @throws NumberFormatException         if the value contained is not a valid byte.
+     * @throws IllegalStateException         if this element is of the type {@link Json5Array} but contains
+     *                                       more than a single element.
      */
     public byte getAsByte() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
@@ -322,10 +324,10 @@ public byte getAsByte() {
      *
      * @return this element as a {@link BigDecimal}.
      * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
-     *     Json5Array}.
-     * @throws NumberFormatException if this element is not a valid {@link BigDecimal}.
-     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
-     *     more than a single element.
+     *                                       Json5Array}.
+     * @throws NumberFormatException         if this element is not a valid {@link BigDecimal}.
+     * @throws IllegalStateException         if this element is of the type {@link Json5Array} but contains
+     *                                       more than a single element.
      */
     public BigDecimal getAsBigDecimal() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
@@ -336,10 +338,10 @@ public BigDecimal getAsBigDecimal() {
      *
      * @return this element as a {@link BigInteger}.
      * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
-     *     Json5Array}.
-     * @throws NumberFormatException if this element is not a valid {@link BigInteger}.
-     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
-     *     more than a single element.
+     *                                       Json5Array}.
+     * @throws NumberFormatException         if this element is not a valid {@link BigInteger}.
+     * @throws IllegalStateException         if this element is of the type {@link Json5Array} but contains
+     *                                       more than a single element.
      */
     public BigInteger getAsBigInteger() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
@@ -350,10 +352,10 @@ public BigInteger getAsBigInteger() {
      *
      * @return this element as a primitive short value.
      * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
-     *     Json5Array}.
-     * @throws NumberFormatException if the value contained is not a valid short.
-     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
-     *     more than a single element.
+     *                                       Json5Array}.
+     * @throws NumberFormatException         if the value contained is not a valid short.
+     * @throws IllegalStateException         if this element is of the type {@link Json5Array} but contains
+     *                                       more than a single element.
      */
     public short getAsShort() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
@@ -363,12 +365,13 @@ public short getAsShort() {
      * Convenience method to get this element as a primitive binary number (radix base {@code 2}) value.
      * <p>
      * <i>This is an extension that is not compliant to the official Json5 spec.</i>
+     *
      * @return this element as a primitive binary number value string.
      * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
-     *     Json5Array}.
-     * @throws NumberFormatException if the value contained is not a valid short.
-     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
-     *     more than a single element.
+     *                                       Json5Array}.
+     * @throws NumberFormatException         if the value contained is not a valid short.
+     * @throws IllegalStateException         if this element is of the type {@link Json5Array} but contains
+     *                                       more than a single element.
      */
     public String getAsBinaryString() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
@@ -379,12 +382,13 @@ public String getAsBinaryString() {
      * Convenience method to get this element as a primitive octal number (radix base {@code 8}) value.
      * <p>
      * <i>This is an extension that is not compliant to the official Json5 spec.</i>
+     *
      * @return this element as a primitive octal number value string.
      * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
-     *     Json5Array}.
-     * @throws NumberFormatException if the value contained is not a valid short.
-     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
-     *     more than a single element.
+     *                                       Json5Array}.
+     * @throws NumberFormatException         if the value contained is not a valid short.
+     * @throws IllegalStateException         if this element is of the type {@link Json5Array} but contains
+     *                                       more than a single element.
      */
     public String getAsOctalString() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
@@ -393,12 +397,13 @@ public String getAsOctalString() {
 
     /**
      * Convenience method to get this element as a primitive hex number (radix base {@code 16}) value.
+     *
      * @return this element as a primitive hex number value string.
      * @throws UnsupportedOperationException if this element is not a {@link Json5Primitive} or {@link
-     *     Json5Array}.
-     * @throws NumberFormatException if the value contained is not a valid short.
-     * @throws IllegalStateException if this element is of the type {@link Json5Array} but contains
-     *     more than a single element.
+     *                                       Json5Array}.
+     * @throws NumberFormatException         if the value contained is not a valid short.
+     * @throws IllegalStateException         if this element is of the type {@link Json5Array} but contains
+     *                                       more than a single element.
      */
     public String getAsHexString() {
         throw new UnsupportedOperationException(getClass().getSimpleName());
@@ -406,6 +411,7 @@ public String getAsHexString() {
 
     /**
      * Converts this element to a Json5 string using the provided configuration options for formatting.
+     *
      * @param options Configuration options.
      * @return Json5 string representation of this element.
      */
diff --git a/src/main/java/de/marhali/json5/Json5Null.java b/src/main/java/de/marhali/json5/Json5Null.java
index 4ea29b6..a883302 100644
--- a/src/main/java/de/marhali/json5/Json5Null.java
+++ b/src/main/java/de/marhali/json5/Json5Null.java
@@ -25,7 +25,8 @@
  * @author Marcel Haßlinger
  */
 public final class Json5Null extends Json5Element {
-    public Json5Null() {}
+    public Json5Null() {
+    }
 
     @Override
     public Json5Element deepCopy() {
diff --git a/src/main/java/de/marhali/json5/Json5Object.java b/src/main/java/de/marhali/json5/Json5Object.java
index c952371..390d1f9 100644
--- a/src/main/java/de/marhali/json5/Json5Object.java
+++ b/src/main/java/de/marhali/json5/Json5Object.java
@@ -47,7 +47,8 @@ public final class Json5Object extends Json5Element {
     /**
      * Creates a new instance of a {@link Json5Object}.
      */
-    public Json5Object() {}
+    public Json5Object() {
+    }
 
     /**
      * Creates a deep copy of this element and all its children.
@@ -68,7 +69,7 @@ public Json5Object deepCopy() {
      * {@link Json5Element Json5Elements} rooted at this node.
      *
      * @param property name of the member.
-     * @param value the member object.
+     * @param value    the member object.
      */
     public void add(String property, Json5Element value) {
         members.put(property, value == null ? Json5Primitive.fromNull() : value);
@@ -79,7 +80,7 @@ public void add(String property, Json5Element value) {
      *
      * @param property name of the member that should be removed.
      * @return the {@link Json5Element} object that is being removed, or {@code null} if no member with
-     *     this name exists.
+     * this name exists.
      */
     public Json5Element remove(String property) {
         return members.remove(property);
@@ -90,7 +91,7 @@ public Json5Element remove(String property) {
      * Json5Primitive} of Character.
      *
      * @param property name of the member.
-     * @param value the char value associated with the member.
+     * @param value    the char value associated with the member.
      */
     public void addProperty(String property, Character value) {
         add(property, value == null ? Json5Primitive.fromNull() : Json5Primitive.fromCharacter(value));
@@ -101,7 +102,7 @@ public void addProperty(String property, Character value) {
      * Json5Primitive} of String.
      *
      * @param property name of the member.
-     * @param value the string value associated with the member.
+     * @param value    the string value associated with the member.
      */
     public void addProperty(String property, String value) {
         add(property, value == null ? Json5Primitive.fromNull() : Json5Primitive.fromString(value));
@@ -112,7 +113,7 @@ public void addProperty(String property, String value) {
      * Json5Primitive} of Number.
      *
      * @param property name of the member.
-     * @param value the number value associated with the member.
+     * @param value    the number value associated with the member.
      */
     public void addProperty(String property, Number value) {
         add(property, value == null ? Json5Primitive.fromNull() : Json5Primitive.fromNumber(value));
@@ -127,7 +128,7 @@ public void addProperty(String property, Number value, int radix) {
      * Json5Primitive} of {@link Instant}.
      *
      * @param property name of the member.
-     * @param value the {@link Instant} value associated with the member.
+     * @param value    the {@link Instant} value associated with the member.
      */
     public void addProperty(String property, Instant value) {
         add(property, value == null ? Json5Primitive.fromNull() : Json5Primitive.fromInstant(value));
@@ -138,7 +139,7 @@ public void addProperty(String property, Instant value) {
      * Json5Primitive} of Boolean.
      *
      * @param property name of the member.
-     * @param value the boolean value associated with the member.
+     * @param value    the boolean value associated with the member.
      */
     public void addProperty(String property, Boolean value) {
         add(property, value == null ? Json5Primitive.fromNull() : Json5Primitive.fromBoolean(value));
@@ -206,7 +207,7 @@ public Json5Element get(String memberName) {
      *
      * @param memberName name of the member being requested.
      * @return the {@code Json5Primitive} corresponding to the specified member, or {@code null} if no
-     *     member with this name exists.
+     * member with this name exists.
      * @throws ClassCastException if the member is not of type {@code Json5Primitive}.
      */
     public Json5Primitive getAsJson5Primitive(String memberName) {
@@ -218,7 +219,7 @@ public Json5Primitive getAsJson5Primitive(String memberName) {
      *
      * @param memberName name of the member being requested.
      * @return the {@code Json5Array} corresponding to the specified member, or {@code null} if no
-     *     member with this name exists.
+     * member with this name exists.
      * @throws ClassCastException if the member is not of type {@code Json5Array}.
      */
     public Json5Array getAsJson5Array(String memberName) {
@@ -230,7 +231,7 @@ public Json5Array getAsJson5Array(String memberName) {
      *
      * @param memberName name of the member being requested.
      * @return the {@code Json5Object} corresponding to the specified member, or {@code null} if no
-     *     member with this name exists.
+     * member with this name exists.
      * @throws ClassCastException if the member is not of type {@code Json5Object}.
      */
     public Json5Object getAsJson5Object(String memberName) {
diff --git a/src/main/java/de/marhali/json5/Json5Primitive.java b/src/main/java/de/marhali/json5/Json5Primitive.java
index c0d166a..316f7d1 100644
--- a/src/main/java/de/marhali/json5/Json5Primitive.java
+++ b/src/main/java/de/marhali/json5/Json5Primitive.java
@@ -62,6 +62,7 @@ public static Json5Primitive fromBoolean(Boolean bool) {
 
     /**
      * Create a primitive containing a {@link Instant} value.
+     *
      * @param instant the value to create the primitive with.
      * @return Json5Primitive containing the provided {@link Instant} value
      * <p>
@@ -75,8 +76,9 @@ public static Json5Primitive fromInstant(Instant instant) {
      * Creates a primitive containing a {@link Number} with specified radix base.
      * If a radix base of {@code 2}, {@code 8} or {@code 16} is set,
      * this method will ensure that the underlying number implementation is a {@link BigInteger}.
+     *
      * @param number The number
-     * @param radix Radix base
+     * @param radix  Radix base
      * @return Json5Primitive containing the provided {@link Number} with specified radix base
      */
     public static Json5Primitive fromNumber(Number number, int radix) {
@@ -105,6 +107,7 @@ public static Json5Primitive fromNumber(Number number) {
      * For example {@code +0b1010...}, {@code 0b1010...} or {@code -0b1010...}.
      * <p>
      * <i>This is an extension that is not compliant to the official Json5 spec.</i>
+     *
      * @param binaryString the value to create the primitive with.
      * @return Json5Primitive containing the provided binary number with radix base {@code 2}
      */
@@ -133,6 +136,7 @@ public static Json5Primitive fromBinaryString(String binaryString) {
      * For example {@code +0o107...}, {@code 0o107...} or {@code -0o107...}.
      * <p>
      * <i>This is an extension that is not compliant to the official Json5 spec.</i>
+     *
      * @param octalString the value to create the primitive with.
      * @return Json5Primitive containing the provided octal number with radix base {@code 8}
      */
@@ -159,6 +163,7 @@ public static Json5Primitive fromOctalString(String octalString) {
     /**
      * Create a primitive containing a binary number (radix base {@code 16}).
      * For example {@code +0x09af...}, {@code 0x09af...} or {@code -0x09af...}.
+     *
      * @param hexString the value to create the primitive with.
      * @return Json5Primitive containing the provided hex number with radix base {@code 16}
      */
@@ -207,6 +212,7 @@ public static Json5Primitive fromCharacter(Character c) {
 
     /**
      * Internal constructor with primitive value
+     *
      * @param value Internal value
      */
     private Json5Primitive(Object value) {
@@ -266,7 +272,7 @@ public Instant getAsInstant() {
             var radixNumber = getAsRadixNumber();
             var number = radixNumber.getNumber();
 
-            if(number instanceof Byte || number instanceof Short || number instanceof Integer || number instanceof Long)
+            if (number instanceof Byte || number instanceof Short || number instanceof Integer || number instanceof Long)
                 return Instant.ofEpochSecond((long) value);
 
             if (number instanceof BigInteger)
@@ -293,7 +299,7 @@ public RadixNumber getAsRadixNumber() {
     }
 
     public int getNumberRadix() {
-       return getAsRadixNumber().getRadix();
+        return getAsRadixNumber().getRadix();
     }
 
     public boolean isBinaryNumber() {
diff --git a/src/main/java/de/marhali/json5/config/Json5Options.java b/src/main/java/de/marhali/json5/config/Json5Options.java
index 50becde..0c3df92 100644
--- a/src/main/java/de/marhali/json5/config/Json5Options.java
+++ b/src/main/java/de/marhali/json5/config/Json5Options.java
@@ -124,7 +124,7 @@ public final class Json5Options {
      * due to the trailing {@code abc}:
      *
      * <pre><code>{ }abc</code></pre>
-     *
+     * <p>
      * If {@code true}, however, this will be interpreted as an empty
      * {@link Json5Object} and any trailing will be ignored.
      * <p>
@@ -206,6 +206,7 @@ public final class Json5Options {
 
     /**
      * Configure options using the builder pattern.
+     *
      * @return builder
      */
     public static Builder builder() {
@@ -230,17 +231,17 @@ public static Builder builder() {
      * </ul>
      */
     public static Json5Options DEFAULT = builder()
-            .allowNaN()
-            .allowInfinity()
-            .allowInvalidSurrogates()
-            .quoteless()
-            .parseComments()
-            .writeComments()
-            .trailingComma()
-            .digitSeparatorStrategy(DigitSeparatorStrategy.NONE)
-            .duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE)
-            .prettyPrinting()
-            .build();
+        .allowNaN()
+        .allowInfinity()
+        .allowInvalidSurrogates()
+        .quoteless()
+        .parseComments()
+        .writeComments()
+        .trailingComma()
+        .digitSeparatorStrategy(DigitSeparatorStrategy.NONE)
+        .duplicateKeyStrategy(DuplicateKeyStrategy.UNIQUE)
+        .prettyPrinting()
+        .build();
 
     private Json5Options(Builder builder) {
         this.stringifyUnixInstants = builder.stringifyUnixInstants;
@@ -260,7 +261,8 @@ private Json5Options(Builder builder) {
         this.trailingComma = builder.trailingComma;
         this.insertFinalNewline = builder.insertFinalNewline;
         this.digitSeparatorStrategy = builder.digitSeparatorStrategy;
-        this.duplicateBehaviour = builder.duplicateKeyStrategy;this.indentFactor = builder.indentFactor;
+        this.duplicateBehaviour = builder.duplicateKeyStrategy;
+        this.indentFactor = builder.indentFactor;
     }
 
     public boolean isStringifyUnixInstants() {
@@ -363,7 +365,7 @@ public static final class Builder {
         private boolean allowOctalLiterals = false;
         private boolean allowHexFloatingLiterals = false;
         private boolean allowLongUnicodeEscapes = false;
-        private boolean allowTrailingData =  false;
+        private boolean allowTrailingData = false;
         private boolean parseComments = false;
         private boolean writeComments = false;
         private boolean trailingComma = false;
@@ -372,7 +374,8 @@ public static final class Builder {
         private DuplicateKeyStrategy duplicateKeyStrategy = DuplicateKeyStrategy.UNIQUE;
         private int indentFactor = 0;
 
-        private Builder() {}
+        private Builder() {
+        }
 
         /**
          * @return built {@link Json5Options}
@@ -382,8 +385,8 @@ public Json5Options build() {
         }
 
         /**
-         * @see Json5Options#stringifyUnixInstants
          * @return builder
+         * @see Json5Options#stringifyUnixInstants
          */
         public Builder stringifyUnixInstants() {
             this.stringifyUnixInstants = true;
@@ -391,8 +394,8 @@ public Builder stringifyUnixInstants() {
         }
 
         /**
-         * @see Json5Options#stringifyAscii
          * @return builder
+         * @see Json5Options#stringifyAscii
          */
         public Builder stringifyAscii() {
             this.stringifyAscii = true;
@@ -400,8 +403,8 @@ public Builder stringifyAscii() {
         }
 
         /**
-         * @see Json5Options#allowNaN
          * @return builder
+         * @see Json5Options#allowNaN
          */
         public Builder allowNaN() {
             this.allowNaN = true;
@@ -409,8 +412,8 @@ public Builder allowNaN() {
         }
 
         /**
-         * @see Json5Options#allowInfinity
          * @return builder
+         * @see Json5Options#allowInfinity
          */
         public Builder allowInfinity() {
             this.allowInfinity = true;
@@ -418,8 +421,8 @@ public Builder allowInfinity() {
         }
 
         /**
-         * @see Json5Options#allowInvalidSurrogates
          * @return builder
+         * @see Json5Options#allowInvalidSurrogates
          */
         public Builder allowInvalidSurrogates() {
             this.allowInvalidSurrogates = true;
@@ -427,8 +430,8 @@ public Builder allowInvalidSurrogates() {
         }
 
         /**
-         * @see Json5Options#quoteSingle
          * @return builder
+         * @see Json5Options#quoteSingle
          */
         public Builder quoteSingle() {
             this.quoteSingle = true;
@@ -436,8 +439,8 @@ public Builder quoteSingle() {
         }
 
         /**
-         * @see Json5Options#quoteless
          * @return builder
+         * @see Json5Options#quoteless
          */
         public Builder quoteless() {
             this.quoteless = true;
@@ -445,8 +448,8 @@ public Builder quoteless() {
         }
 
         /**
-         * @see Json5Options#allowBinaryLiterals
          * @return builder
+         * @see Json5Options#allowBinaryLiterals
          */
         public Builder allowBinaryLiterals() {
             this.allowBinaryLiterals = true;
@@ -454,8 +457,8 @@ public Builder allowBinaryLiterals() {
         }
 
         /**
-         * @see Json5Options#allowOctalLiterals
          * @return builder
+         * @see Json5Options#allowOctalLiterals
          */
         public Builder allowOctalLiterals() {
             this.allowOctalLiterals = true;
@@ -463,8 +466,8 @@ public Builder allowOctalLiterals() {
         }
 
         /**
-         * @see Json5Options#allowHexFloatingLiterals
          * @return builder
+         * @see Json5Options#allowHexFloatingLiterals
          */
         public Builder allowHexFloatingLiterals() {
             this.allowHexFloatingLiterals = true;
@@ -472,8 +475,8 @@ public Builder allowHexFloatingLiterals() {
         }
 
         /**
-         * @see Json5Options#allowLongUnicodeEscapes
          * @return builder
+         * @see Json5Options#allowLongUnicodeEscapes
          */
         public Builder allowLongUnicodeEscapes() {
             this.allowLongUnicodeEscapes = true;
@@ -481,8 +484,8 @@ public Builder allowLongUnicodeEscapes() {
         }
 
         /**
-         * @see Json5Options#allowTrailingData
          * @return builder
+         * @see Json5Options#allowTrailingData
          */
         public Builder allowTrailingData() {
             this.allowTrailingData = true;
@@ -490,8 +493,8 @@ public Builder allowTrailingData() {
         }
 
         /**
-         * @see Json5Options#parseComments
          * @return builder
+         * @see Json5Options#parseComments
          */
         public Builder parseComments() {
             this.parseComments = true;
@@ -499,8 +502,8 @@ public Builder parseComments() {
         }
 
         /**
-         * @see Json5Options#writeComments
          * @return builder
+         * @see Json5Options#writeComments
          */
         public Builder writeComments() {
             this.writeComments = true;
@@ -508,8 +511,8 @@ public Builder writeComments() {
         }
 
         /**
-         * @see Json5Options#trailingComma
          * @return builder
+         * @see Json5Options#trailingComma
          */
         public Builder trailingComma() {
             this.trailingComma = true;
@@ -517,8 +520,8 @@ public Builder trailingComma() {
         }
 
         /**
-         * @see Json5Options#insertFinalNewline
          * @return builder
+         * @see Json5Options#insertFinalNewline
          */
         public Builder insertFinalNewline() {
             this.insertFinalNewline = true;
@@ -526,9 +529,9 @@ public Builder insertFinalNewline() {
         }
 
         /**
-         * @see Json5Options#digitSeparatorStrategy
          * @param digitSeparatorStrategy Strategy to apply
          * @return builder
+         * @see Json5Options#digitSeparatorStrategy
          */
         public Builder digitSeparatorStrategy(DigitSeparatorStrategy digitSeparatorStrategy) {
             this.digitSeparatorStrategy = digitSeparatorStrategy;
@@ -536,9 +539,9 @@ public Builder digitSeparatorStrategy(DigitSeparatorStrategy digitSeparatorStrat
         }
 
         /**
-         * @see Json5Options#duplicateBehaviour
          * @param duplicateKeyStrategy Strategy to apply
          * @return builder
+         * @see Json5Options#duplicateBehaviour
          */
         public Builder duplicateKeyStrategy(DuplicateKeyStrategy duplicateKeyStrategy) {
             this.duplicateKeyStrategy = duplicateKeyStrategy;
@@ -546,9 +549,9 @@ public Builder duplicateKeyStrategy(DuplicateKeyStrategy duplicateKeyStrategy) {
         }
 
         /**
-         * @see Json5Options#indentFactor
          * @param indentFactor Indent factor to apply
          * @return builder
+         * @see Json5Options#indentFactor
          */
         public Builder indentFactor(int indentFactor) {
             this.indentFactor = indentFactor;
@@ -558,9 +561,10 @@ public Builder indentFactor(int indentFactor) {
         /**
          * Configures pretty printing using 2 whitespaces for serialization (writing).
          * Shorthand for {@code indentFactor(2)}.
+         *
+         * @return builder
          * @see Json5Options#indentFactor
          * @see #indentFactor(int)
-         * @return builder
          */
         public Builder prettyPrinting() {
             return indentFactor(2);
diff --git a/src/main/java/de/marhali/json5/exception/Json5Exception.java b/src/main/java/de/marhali/json5/exception/Json5Exception.java
index faa04cf..2a47f7e 100644
--- a/src/main/java/de/marhali/json5/exception/Json5Exception.java
+++ b/src/main/java/de/marhali/json5/exception/Json5Exception.java
@@ -59,10 +59,10 @@ public Json5Exception(Throwable cause) {
      * Constructs a new JSONException with a detail message and a causing exception
      *
      * @param message the detail message
-     * @param cause the causing exception
+     * @param cause   the causing exception
      */
     public Json5Exception(String message, Throwable cause) {
         super(message, cause);
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/de/marhali/json5/internal/EcmaScriptIdentifier.java b/src/main/java/de/marhali/json5/internal/EcmaScriptIdentifier.java
index 92617a5..403a3b1 100644
--- a/src/main/java/de/marhali/json5/internal/EcmaScriptIdentifier.java
+++ b/src/main/java/de/marhali/json5/internal/EcmaScriptIdentifier.java
@@ -22,12 +22,14 @@
 public class EcmaScriptIdentifier {
     // Zero Width Non-Joiner / Joiner
     private static final int ZWNJ = 0x200C;
-    private static final int ZWJ  = 0x200D;
+    private static final int ZWJ = 0x200D;
 
-    private EcmaScriptIdentifier() {}
+    private EcmaScriptIdentifier() {
+    }
 
     /**
      * Checks whether the provided {@link String} is a valid ES5.1 IdentifierName.
+     *
      * @param raw Input to check
      * @return true if valid identifier, otherwise false
      * @see <a href="https://262.ecma-international.org/5.1/#sec-7.6">https://262.ecma-international.org/5.1/#sec-7.6</a>
@@ -90,11 +92,12 @@ private static boolean isIdentifierPartES5(int cp) {
 
     /**
      * Decodes ES5-style Unicode-Escapes \\uXXXX inside a Identifier.
+     *
      * @return {@code null}, if an escape is syntactically invalid
      */
     private static String decodeEs5UnicodeEscapes(String s) {
         StringBuilder out = new StringBuilder(s.length());
-        for (int i = 0; i < s.length();) {
+        for (int i = 0; i < s.length(); ) {
             char ch = s.charAt(i);
             if (ch == '\\') {
                 if (i + 1 < s.length() && s.charAt(i + 1) == 'u') {
diff --git a/src/main/java/de/marhali/json5/internal/LazilyParsedNumber.java b/src/main/java/de/marhali/json5/internal/LazilyParsedNumber.java
index 19f1b9a..be57aef 100644
--- a/src/main/java/de/marhali/json5/internal/LazilyParsedNumber.java
+++ b/src/main/java/de/marhali/json5/internal/LazilyParsedNumber.java
@@ -29,7 +29,9 @@
 public final class LazilyParsedNumber extends Number {
     private final String value;
 
-    /** @param value must not be null */
+    /**
+     * @param value must not be null
+     */
     public LazilyParsedNumber(String value) {
         this.value = value;
     }
@@ -75,6 +77,7 @@ public String toString() {
      * If somebody is unlucky enough to have to serialize one of these, serialize
      * it as a BigDecimal so that they won't need Gson on the other side to
      * deserialize it.
+     *
      * @return Value as {@link BigDecimal}
      * @throws ObjectStreamException Stream exception
      */
@@ -103,4 +106,4 @@ public boolean equals(Object obj) {
         }
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/de/marhali/json5/internal/LinkedTreeMap.java b/src/main/java/de/marhali/json5/internal/LinkedTreeMap.java
index dd06b03..1dba093 100644
--- a/src/main/java/de/marhali/json5/internal/LinkedTreeMap.java
+++ b/src/main/java/de/marhali/json5/internal/LinkedTreeMap.java
@@ -82,8 +82,8 @@ public LinkedTreeMap(boolean allowNullValues) {
      * Create a tree map ordered by {@code comparator}. This map's keys may only be null if {@code
      * comparator} permits.
      *
-     * @param comparator the comparator to order elements with, or {@code null} to use the natural
-     *     ordering.
+     * @param comparator      the comparator to order elements with, or {@code null} to use the natural
+     *                        ordering.
      * @param allowNullValues whether {@code null} is allowed as entry value
      */
     // unsafe! if comparator is null, this assumes K is comparable
@@ -393,7 +393,9 @@ private void rebalance(Node<K, V> unbalanced, boolean insert) {
         }
     }
 
-    /** Rotates the subtree so that its root's right child is the new root. */
+    /**
+     * Rotates the subtree so that its root's right child is the new root.
+     */
     private void rotateLeft(Node<K, V> root) {
         Node<K, V> left = root.left;
         Node<K, V> pivot = root.right;
@@ -418,7 +420,9 @@ private void rotateLeft(Node<K, V> root) {
         pivot.height = Math.max(root.height, pivotRight != null ? pivotRight.height : 0) + 1;
     }
 
-    /** Rotates the subtree so that its root's left child is the new root. */
+    /**
+     * Rotates the subtree so that its root's left child is the new root.
+     */
     private void rotateRight(Node<K, V> root) {
         Node<K, V> pivot = root.left;
         Node<K, V> right = root.right;
@@ -475,14 +479,18 @@ static final class Node<K, V> implements Entry<K, V> {
         V value;
         int height;
 
-        /** Create the header entry */
+        /**
+         * Create the header entry
+         */
         Node(boolean allowNullValue) {
             key = null;
             this.allowNullValue = allowNullValue;
             next = prev = this;
         }
 
-        /** Create a regular entry */
+        /**
+         * Create a regular entry
+         */
         Node(boolean allowNullValue, Node<K, V> parent, K key, Node<K, V> next, Node<K, V> prev) {
             this.parent = parent;
             this.key = key;
@@ -534,7 +542,9 @@ public String toString() {
             return key + "=" + value;
         }
 
-        /** Returns the first node in this subtree. */
+        /**
+         * Returns the first node in this subtree.
+         */
         public Node<K, V> first() {
             Node<K, V> node = this;
             Node<K, V> child = node.left;
@@ -545,7 +555,9 @@ public Node<K, V> first() {
             return node;
         }
 
-        /** Returns the last node in this subtree. */
+        /**
+         * Returns the last node in this subtree.
+         */
         public Node<K, V> last() {
             Node<K, V> node = this;
             Node<K, V> child = node.right;
@@ -562,7 +574,8 @@ private abstract class LinkedTreeMapIterator<T> implements Iterator<T> {
         Node<K, V> lastReturned = null;
         int expectedModCount = modCount;
 
-        LinkedTreeMapIterator() {}
+        LinkedTreeMapIterator() {
+        }
 
         @Override
         @SuppressWarnings("ReferenceEquality")
@@ -672,6 +685,7 @@ public void clear() {
      * If somebody is unlucky enough to have to serialize one of these, serialize it as a
      * LinkedHashMap so that they won't need Gson on the other side to deserialize it. Using
      * serialization defeats our DoS defence, so most apps shouldn't use it.
+     *
      * @return Object
      * @throws ObjectStreamException If an I/O error occurs
      */
diff --git a/src/main/java/de/marhali/json5/internal/NumberLimits.java b/src/main/java/de/marhali/json5/internal/NumberLimits.java
index f5cb6ca..07a4f70 100644
--- a/src/main/java/de/marhali/json5/internal/NumberLimits.java
+++ b/src/main/java/de/marhali/json5/internal/NumberLimits.java
@@ -8,7 +8,8 @@
  * when extremely large numbers are used.
  */
 public class NumberLimits {
-    private NumberLimits() {}
+    private NumberLimits() {
+    }
 
     private static final int MAX_NUMBER_STRING_LENGTH = 10_000;
 
diff --git a/src/main/java/de/marhali/json5/stream/Json5Lexer.java b/src/main/java/de/marhali/json5/stream/Json5Lexer.java
index 3c59d64..8779d16 100644
--- a/src/main/java/de/marhali/json5/stream/Json5Lexer.java
+++ b/src/main/java/de/marhali/json5/stream/Json5Lexer.java
@@ -96,6 +96,7 @@ public class Json5Lexer {
     /**
      * Constructs a new lexer from a specific {@link Reader}.
      * <p><b>Note:</b> The reader must be closed after operation ({@link Reader#close()})!</p>
+     *
      * @param reader  a reader.
      * @param options the options for lexing.
      */
@@ -266,7 +267,7 @@ private void nextMultiLineComment() {
             if (comment.length() == 0 && isLineTerminator(n)) {
                 // Skip heading line-terminators
                 continue;
-            } else if (character == offset+1 && isWhitespace(n)) {
+            } else if (character == offset + 1 && isWhitespace(n)) {
                 // Skip stylistic whitespace between comment indicator and actual comment content
                 continue;
             } else if (character <= offset && (isWhitespace(n) || n == '*') && !isLineTerminator(n)) {
@@ -293,7 +294,7 @@ private void nextSingleLineComment() {
             if (isLineTerminator(n) || n == 0)
                 return;
 
-            if (character == offset+1 && isWhitespace(n)) {
+            if (character == offset + 1 && isWhitespace(n)) {
                 // Skip stylistic whitespace between comment indicator and actual comment content
                 continue;
             }
@@ -362,7 +363,7 @@ private char[] unicodeEscape(boolean member, boolean part, boolean utf32) {
 
         int numDigits = utf32 ? 8 : 4;
 
-        for(int i = 0; i < numDigits; ++i) {
+        for (int i = 0; i < numDigits; ++i) {
             char n = next();
             value += n;
 
@@ -426,9 +427,7 @@ private String nextString(char quote) {
 
                     // escaped line terminator/ line continuation
                     continue;
-                }
-
-                else switch(n) {
+                } else switch (n) {
                     case 0:
                         throw syntaxError("Expected escape sequence in string, got EOF instead");
 
@@ -498,8 +497,7 @@ else switch(n) {
                             n = chars[1];
 
                             result.append(prev);
-                        }
-                        else n = chars[0];
+                        } else n = chars[0];
 
                         break;
 
@@ -590,10 +588,8 @@ public String nextMemberName() {
                     n = chars[1];
 
                     result.append(prev);
-                }
-                else n = chars[0];
-            }
-            else if (!isMemberNameChar(n, part)) {
+                } else n = chars[0];
+            } else if (!isMemberNameChar(n, part)) {
                 back();
                 checkSurrogate(prev, (char) 0);
                 break;
@@ -602,7 +598,7 @@ else if (!isMemberNameChar(n, part)) {
             checkSurrogate(prev, n);
 
             result.append(n);
-        } while(more());
+        } while (more());
 
         if (result.length() == 0)
             throw syntaxError("Expected key");
@@ -621,7 +617,7 @@ public Json5Element nextValue() {
         boolean wasRoot = root;
 
         try {
-            switch(n) {
+            switch (n) {
                 case '"':
                 case '\'':
                     return Json5Primitive.fromString(nextString(n));
@@ -660,10 +656,9 @@ public Json5Element nextValue() {
 
             double sign = 1;
 
-            if(leading == '+') {
+            if (leading == '+') {
                 rest = string.substring(1);
-            }
-            else if(leading == '-') {
+            } else if (leading == '-') {
                 rest = string.substring(1);
                 sign = -1;
             }
@@ -691,10 +686,10 @@ else if(leading == '-') {
                     int radix = parsedNum.getRadix();
 
                     if (sign < 0) {
-                        if(num instanceof BigInteger)
+                        if (num instanceof BigInteger)
                             return Json5Primitive.fromNumber(((BigInteger) num).negate(), radix);
 
-                        if(num instanceof BigDecimal)
+                        if (num instanceof BigDecimal)
                             return Json5Primitive.fromNumber(((BigDecimal) num).negate(), radix);
                     }
 
@@ -722,7 +717,7 @@ private RadixNumber parseNumber(char leading, String input) {
             /************
              * PREFIXES *
              ************/
-            switch(c = input.charAt(1)) {
+            switch (c = input.charAt(1)) {
                 /**********
                  * BINARY *
                  **********/
@@ -818,7 +813,7 @@ private RadixNumber parseNumber(char leading, String input) {
                             break;
                         }
 
-                        if  (!ishex(c))
+                        if (!ishex(c))
                             throw syntaxError("Expected hexadecimal digit for literal");
 
                         intValue = intValue.shiftLeft(4);
@@ -837,7 +832,7 @@ private RadixNumber parseNumber(char leading, String input) {
 
                 default:
                     break;
-            };
+            }
         }
 
         StringBuilder num = new StringBuilder();
@@ -914,8 +909,7 @@ private RadixNumber parseNumber(char leading, String input) {
 
                     if (c != '0')
                         fractionInt = fractionInt.or(BigInteger.valueOf(dehex(c)));
-                }
-                else {
+                } else {
                     if (c == 'e' || c == 'E')
                         break;
 
@@ -957,7 +951,7 @@ private RadixNumber parseNumber(char leading, String input) {
             c = input.charAt(off++);
 
             if (checkDigitSeparator(c)) {
-                if( numExpDigits == 0 || off >= n || !isDecimalDigit(input.charAt(off)))
+                if (numExpDigits == 0 || off >= n || !isDecimalDigit(input.charAt(off)))
                     throw syntaxError("Illegal position for digit separator");
 
                 continue;
@@ -997,8 +991,7 @@ private RadixNumber parseNumber(char leading, String input) {
 
         try {
             scale = new BigDecimal(BigInteger.TWO.pow(exponent.intValueExact()));
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             throw syntaxError("Hexadecimal floating-point literal's exponent is too large");
         }
 
@@ -1027,7 +1020,7 @@ private boolean checkDigitSeparator(char c) {
      * Constructs a new {@link Json5Exception} with a detail message and a causing exception
      *
      * @param message the detail message
-     * @param cause the causing exception
+     * @param cause   the causing exception
      * @return a {@link Json5Exception}
      */
     public Json5Exception syntaxError(String message, Throwable cause) {
@@ -1050,13 +1043,13 @@ public String toString() {
     }
 
     private static int dehex(char c) {
-        if(c >= '0' && c <= '9')
+        if (c >= '0' && c <= '9')
             return c - '0';
 
-        if(c >= 'a' && c <= 'f')
+        if (c >= 'a' && c <= 'f')
             return c - 'a' + 0xA;
 
-        if(c >= 'A' && c <= 'F')
+        if (c >= 'A' && c <= 'F')
             return c - 'A' + 0xA;
 
         return -1;
diff --git a/src/main/java/de/marhali/json5/stream/Json5Parser.java b/src/main/java/de/marhali/json5/stream/Json5Parser.java
index 24c8bd8..7b94b0b 100644
--- a/src/main/java/de/marhali/json5/stream/Json5Parser.java
+++ b/src/main/java/de/marhali/json5/stream/Json5Parser.java
@@ -43,11 +43,13 @@
  */
 public final class Json5Parser {
 
-    private Json5Parser() {}
+    private Json5Parser() {
+    }
 
     /**
      * Parses the specified {@link Json5Lexer lexer} into a parse tree of {@link Json5Element}'s.
      * Thereby it does not matter if the provided root element is an array or object.
+     *
      * @param lexer Tokenized json5 data
      * @return a parse tree of {@link Json5Element}'s corresponding to the specified JSON5 or {@code null} if lexer does not provide any data
      */
@@ -83,6 +85,7 @@ public static Json5Element parse(Json5Lexer lexer) {
     /**
      * Parses the specified {@link Json5Lexer lexer} into a parse tree of an {@link Json5Object}.
      * If the provided data does not correspond to a {@link Json5Object} a {@link Json5Exception} will be thrown.
+     *
      * @param lexer Tokenized json5 data.
      * @return a parse tree of {@link Json5Object} corresponding to the specified JSON5.
      * @see #parse(Json5Lexer)
@@ -90,7 +93,7 @@ public static Json5Element parse(Json5Lexer lexer) {
     public static Json5Object parseObject(Json5Lexer lexer) {
         Objects.requireNonNull(lexer);
 
-        if(lexer.nextClean() != '{') {
+        if (lexer.nextClean() != '{') {
             throw lexer.syntaxError("A Json5Object must begin with '{'");
         }
 
@@ -103,11 +106,11 @@ public static Json5Object parseObject(Json5Lexer lexer) {
         String comment;
         String key;
 
-        while(true) {
+        while (true) {
             control = lexer.nextClean();
             comment = lexer.consumeComment();
 
-            switch(control) {
+            switch (control) {
                 case 0:
                     throw lexer.syntaxError("A Json5Object must end with '}'");
                 case '}':
@@ -167,6 +170,7 @@ public static Json5Object parseObject(Json5Lexer lexer) {
     /**
      * Parses the specified {@link Json5Lexer lexer} into a parse tree of an {@link Json5Array}.
      * If the provided data does not correspond to a json array a {@link Json5Exception} will be thrown.
+     *
      * @param lexer Tokenized json5 data.
      * @return a parse tree of {@link Json5Array} corresponding to the specified JSON5.
      * @see #parse(Json5Lexer)
diff --git a/src/main/java/de/marhali/json5/stream/Json5Writer.java b/src/main/java/de/marhali/json5/stream/Json5Writer.java
index 814e7ab..d39a9f0 100644
--- a/src/main/java/de/marhali/json5/stream/Json5Writer.java
+++ b/src/main/java/de/marhali/json5/stream/Json5Writer.java
@@ -51,8 +51,9 @@ public final class Json5Writer {
     /**
      * Creates a new instance that writes a JSON5-encoded stream to {@code writer}.
      * <p><b>Note:</b> The writer must be closed after operation ({@link Writer#close()})!</p>
+     *
      * @param options Parsing and serialization options
-     * @param writer Output stream. For the best performance, use a {@link java.io.BufferedWriter}.
+     * @param writer  Output stream. For the best performance, use a {@link java.io.BufferedWriter}.
      */
     public Json5Writer(Json5Options options, Writer writer) {
         Objects.requireNonNull(options);
@@ -67,6 +68,7 @@ public Json5Writer(Json5Options options, Writer writer) {
      * and the configured options. The element can be any json5 element. All child trees will be included.
      * This function writes with depth {@code 0} and expects a root element.
      * For nested elements, see the other write methods.
+     *
      * @param element Element to encode
      * @throws IOException If an I/O error occurs
      * @see #Json5Writer(Json5Options, Writer) Configuration options
@@ -79,8 +81,9 @@ public void write(Json5Element element) throws IOException {
     /**
      * Encodes and writes the provided {@link Json5Element} into json5 according to the specification
      * and the configured options. The element can be any json5 element. All child trees will be included.
+     *
      * @param element Element to encode
-     * @param depth Depth of the current Json5 tree. Root node is {@code 0}. Counts {@code +1} on every child element.
+     * @param depth   Depth of the current Json5 tree. Root node is {@code 0}. Counts {@code +1} on every child element.
      * @throws IOException If an I/O error occurs
      * @see #Json5Writer(Json5Options, Writer) Configuration options
      * @see #write(Json5Element)
@@ -98,7 +101,7 @@ public void write(Json5Element element, int depth) throws IOException {
             writePrimitive(element.getAsJson5Primitive());
         } else {
             throw new UnsupportedOperationException("Unknown json element with type class "
-                    + element.getClass().getName());
+                + element.getClass().getName());
         }
 
         if (depth == 0 && options.isInsertFinalNewline()) {
@@ -109,8 +112,9 @@ public void write(Json5Element element, int depth) throws IOException {
     /**
      * Writes any associated comments for the provided {@link Json5Element}.
      * Checks if {@link Json5Options#isWriteComments()} is {@code true} and if the element has any comment assigned.
+     *
      * @param element Element target
-     * @param depth Depth to use for writing
+     * @param depth   Depth to use for writing
      * @throws IOException If an I/O error occurs
      */
     public void writeComment(Json5Element element, int depth) throws IOException {
@@ -150,6 +154,7 @@ public void writeComment(Json5Element element, int depth) throws IOException {
 
     /**
      * Writes the equivalent of a {@link de.marhali.json5.Json5Null}({@code null}) value.
+     *
      * @throws IOException If an I/O error occurs.
      */
     public void writeNull() throws IOException {
@@ -158,6 +163,7 @@ public void writeNull() throws IOException {
 
     /**
      * Writes the provided primitive to the stream and encodes it if necessary.
+     *
      * @param primitive Primitive value.
      * @throws IOException If an I/O error occurs.
      */
@@ -182,8 +188,9 @@ public void writePrimitive(Json5Primitive primitive) throws IOException {
 
     /**
      * Writes the provided {@link Json5Object} to the stream.
+     *
      * @param object Object to encode
-     * @param depth Depth to use for writing
+     * @param depth  Depth to use for writing
      * @throws IOException If an I/O error occurs.
      * @see #write(Json5Element)
      */
@@ -206,7 +213,7 @@ public void writeObject(Json5Object object, int depth) throws IOException {
             index++;
 
             if (options.getIndentFactor() > 0) {
-               writer.append("\n");
+                writer.append("\n");
             }
 
             writeComment(entry.getValue(), childDepth);
@@ -235,6 +242,7 @@ public void writeObject(Json5Object object, int depth) throws IOException {
 
     /**
      * Writes the provided {@link Json5Array} to the stream.
+     *
      * @param array Array to encode
      * @param depth Depth to use for writing
      * @throws IOException If an I/O error occurs.
@@ -272,15 +280,16 @@ public void writeArray(Json5Array array, int depth) throws IOException {
             }
         }
 
-        if(options.getIndentFactor() > 0)
+        if (options.getIndentFactor() > 0)
             writer.append('\n').append(indent);
 
         writer.append(']');
     }
+
     private String applyNumberSeparator(String numberString, int numberRadix, char separator) {
         StringBuilder sb = new StringBuilder(numberString);
 
-        boolean hasSign = numberString.startsWith("+")  || numberString.startsWith("-");
+        boolean hasSign = numberString.startsWith("+") || numberString.startsWith("-");
         int offset, separatorOffset;
 
         switch (numberRadix) {
@@ -339,6 +348,7 @@ public String quote(String string) {
 
     /**
      * Quotes the provided string according to the json5 <a href="https://spec.json5.org/#strings">specification</a>.
+     *
      * @param string String to quote
      * @return quoted string
      */
@@ -356,13 +366,13 @@ static String quote(String string, Json5Options options) {
         for (int i = 0, n = string.length(); i < n; ++i) {
             char c = string.charAt(i);
 
-            if(c == quote) {
+            if (c == quote) {
                 quoted.append('\\');
                 quoted.append(c);
                 continue;
             }
 
-            switch(c) {
+            switch (c) {
                 case '\\':
                     quoted.append("\\\\");
                     break;
@@ -389,7 +399,7 @@ static String quote(String string, Json5Options options) {
 
                     if (!ascii) {
                         // escape non-graphical characters (https://www.unicode.org/versions/Unicode13.0.0/ch02.pdf#G286941)
-                        switch(Character.getType(c)) {
+                        switch (Character.getType(c)) {
                             case Character.FORMAT:
                             case Character.LINE_SEPARATOR:
                             case Character.PARAGRAPH_SEPARATOR:
@@ -402,14 +412,12 @@ static String quote(String string, Json5Options options) {
                             default:
                                 break;
                         }
-                    }
-                    else unicode = c > 0x7F;
+                    } else unicode = c > 0x7F;
 
-                    if(unicode) {
+                    if (unicode) {
                         quoted.append("\\u");
                         quoted.append(String.format("%04X", (int) c));
-                    }
-                    else quoted.append(c);
+                    } else quoted.append(c);
             }
         }
 
diff --git a/src/test/java/de/marhali/json5/e2e/TestResourceHelper.java b/src/test/java/de/marhali/json5/e2e/TestResourceHelper.java
index 14d7151..c37c340 100644
--- a/src/test/java/de/marhali/json5/e2e/TestResourceHelper.java
+++ b/src/test/java/de/marhali/json5/e2e/TestResourceHelper.java
@@ -40,8 +40,8 @@ public static String getTestResourceContent(String fileName) throws IOException
             }
 
             return Optional.ofNullable(buf.toString(StandardCharsets.UTF_8))
-                .map(s->s.replace("\r\n","\n"))
-                .map(s->s.replace("\r","\n"))
+                .map(s -> s.replace("\r\n", "\n"))
+                .map(s -> s.replace("\r", "\n"))
                 .orElse(null);
         }
     }
diff --git a/src/test/java/de/marhali/json5/internal/LazilyParsedNumberTest.java b/src/test/java/de/marhali/json5/internal/LazilyParsedNumberTest.java
index d24c463..3f6a0be 100644
--- a/src/test/java/de/marhali/json5/internal/LazilyParsedNumberTest.java
+++ b/src/test/java/de/marhali/json5/internal/LazilyParsedNumberTest.java
@@ -82,7 +82,7 @@ void longAndInt_fallBackToBigDecimalWhenTooLargeForLong() {
     void equals_and_hashCode_behave() {
         LazilyParsedNumber a1 = new LazilyParsedNumber("42");
         LazilyParsedNumber a2 = new LazilyParsedNumber("42");
-        LazilyParsedNumber b  = new LazilyParsedNumber("043");
+        LazilyParsedNumber b = new LazilyParsedNumber("043");
 
         assertEquals(a1, a1);              // reflexive
         assertEquals(a1, a2);              // same string content

From 6506cc5f15f53d7e324acdbd2217cd626d61a7c5 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Tue, 23 Sep 2025 19:18:37 +0200
Subject: [PATCH 47/48] refactor: remove unnecessary toString()

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 47cbee3..c1ff359 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -30,7 +30,7 @@ mavenPublishing {
     publishToMavenCentral(automaticRelease = true)
     signAllPublications()
 
-    coordinates(project.group.toString(), project.name.toString(), project.version.toString())
+    coordinates(project.group.toString(), project.name, project.version.toString())
 
     pom {
         name.set(project.name)

From a5ac1a077d9015e9b7527b3876d1f6f0962654e3 Mon Sep 17 00:00:00 2001
From: marhali <code@shield.marhali.de>
Date: Tue, 23 Sep 2025 19:36:24 +0200
Subject: [PATCH 48/48] feat(ci): upload test-results to codecov

---
 .github/workflows/build.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 64483bc..bb19a63 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -90,13 +90,21 @@ jobs:
           name: tests-result
           path: ${{ github.workspace }}/build/reports/tests
 
-      # Upload the Kover report to CodeCov
+      # Upload the jacoco report to CodeCov
       - name: Upload Code Coverage Report
         uses: codecov/codecov-action@v5
         with:
           files: ${{ github.workspace }}/build/reports/jacoco/jacocoTestReport.xml
           token: ${{ secrets.CODECOV_TOKEN }}
 
+     # Upload the test results to CodeCov
+      - name: Upload test results to Codecov
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@v1
+        with:
+          files: ${{ github.workspace }}/build/test-results/test/*.xml
+          token: ${{ secrets.CODECOV_TOKEN }}
+
   # Run Qodana inspections and provide a report
   inspectCode:
     name: Inspect code