Update to Spec 3.0.3 (#100)

* Update the comformance test suite for 3.0.3

* Fix the regex for keyed array pattern

* Update spec version number from 3.0.1 to 3.0.3

* update pmd because warnings on build

* for better reading adding linebreak.

* pmd warning fixed.

* remove unused local var.

---------

Co-authored-by: Felipe Stanzani <stanzani@gmail.com>

Author: jenspapenhagen

README.md

@@ -4,7 +4,7 @@
 [![Release](https://github.com/toon-format/toon-java/actions/workflows/release.yml/badge.svg)](https://github.com/toon-format/toon-java/actions/workflows/release.yml)
 [![Maven Central](https://img.shields.io/maven-central/v/dev.toonformat/jtoon.svg)](https://central.sonatype.com/artifact/dev.toonformat/jtoon)
 ![Coverage](.github/badges/jacoco.svg)
-[![SPEC v3.0.1](https://img.shields.io/badge/spec-v3.0.1-fef3c0?labelColor=1b1b1f)](https://github.com/toon-format/spec)
+[![SPEC v3.0.3](https://img.shields.io/badge/spec-v3.0.3-fef3c0?labelColor=1b1b1f)](https://github.com/toon-format/spec)
 [![License: MIT](https://img.shields.io/badge/license-MIT-fef3c0?labelColor=1b1b1f)](./LICENSE)
 
 > **⚠️ Beta Status (v1.x.x):** This library is in active development and working towards spec compliance. Beta published to Maven Central. API may change before 2.0.0 release.

src/main/java/dev/toonformat/jtoon/encoder/ObjectEncoder.java

@@ -104,14 +104,11 @@ public static void encodeKeyValuePair(final String key,
         final int remainingDepth = effectiveFlattenDepth - depth;
         EncodeOptions currentOptions = options;
 
-        // Attempt key folding when enabled
-        final KeyFolding flattenMode = currentOptions.flatten();
         if (remainingDepth > 0
             && !siblings.isEmpty()
             && blockedKeys != null
             && !blockedKeys.contains(key)
-            && flattenMode != null
-            && flattenMode == KeyFolding.SAFE) {
+            && KeyFolding.SAFE == currentOptions.flatten()) {
             final Flatten.FoldResult foldResult = Flatten.tryFoldKeyChain(key, value, siblings, rootLiteralKeys,
                                                                           pathPrefix, remainingDepth);
             if (foldResult != null) {

src/main/java/dev/toonformat/jtoon/util/Headers.java

@@ -22,10 +22,12 @@ public final class Headers {
 
     /**
      * Matches keyed array headers: items[2]{id,name}: or tags[3]: or data[4]{id}:.
-     * Captures: group(1)=key, group(2)=#marker, group(3)=delimiter,
+     * Also matches quoted keys with brackets: "key[test]"[3]:.
+     * Captures: group(1)=key (quoted or unquoted), group(2)=#marker, group(3)=delimiter,
      * group(4)=optional field spec
      */
-    public static final Pattern KEYED_ARRAY_PATTERN = Pattern.compile("^(.+?)\\[(#?)\\d+([\\t|])?](\\{[^}]+})?:.*$");
+    public static final Pattern KEYED_ARRAY_PATTERN = Pattern.compile(
+        "^(\"[^\"]+\"|[^\\[\\]]+)\\[(#?)\\d+([\\t|])?](\\{[^}]+})?:.*$");
 
     private Headers() {
         throw new UnsupportedOperationException("Utility class cannot be instantiated");

src/test/resources/conformance/decode/arrays-primitive.json

@@ -91,6 +91,14 @@
       },
       "specSection": "9.1"
     },
+    {
+      "name": "parses quoted empty string key with inline array",
+      "input": "\"\"[3]: 1,2,3",
+      "expected": {
+        "": [1, 2, 3]
+      },
+      "specSection": "9.1"
+    },
     {
       "name": "parses quoted key containing brackets with inline array",
       "input": "\"key[test]\"[3]: 1,2,3",
@@ -106,6 +114,14 @@
         "x-custom": []
       },
       "specSection": "9.1"
+    },
+    {
+      "name": "parses quoted empty string key with empty array",
+      "input": "\"\"[0]:",
+      "expected": {
+        "": []
+      },
+      "specSection": "9.1"
     }
   ]
 }

src/test/resources/conformance/decode/arrays-tabular.json

@@ -58,6 +58,17 @@
       },
       "specSection": "9.3"
     },
+    {
+      "name": "parses quoted empty string key with tabular array format",
+      "input": "\"\"[2]{id,name}:\n  1,Ada\n  2,Bob",
+      "expected": {
+        "": [
+          { "id": 1, "name": "Ada" },
+          { "id": 2, "name": "Bob" }
+        ]
+      },
+      "specSection": "9.3"
+    },
     {
       "name": "treats unquoted colon as terminator for tabular rows and start of key-value pair",
       "input": "items[2]{id,name}:\n  1,Alice\n  2,Bob\ncount: 2",

src/test/resources/conformance/decode/objects.json

@@ -118,6 +118,33 @@
       },
       "specSection": "8"
     },
+    {
+      "name": "treats extra brackets after valid array segment as literal key",
+      "input": "foo[1][bar]: 10",
+      "expected": {
+        "foo[1][bar]": 10
+      },
+      "specSection": "6",
+      "note": "Non-whitespace [bar] between ] and : prevents array header interpretation"
+    },
+    {
+      "name": "treats non-integer bracket content as literal key",
+      "input": "foo[bar][1]: 20",
+      "expected": {
+        "foo[bar][1]": 20
+      },
+      "specSection": "6",
+      "note": "[bar] fails integer parsing; line is not an array header"
+    },
+    {
+      "name": "treats text between bracket segment and colon as literal key",
+      "input": "foo[2]extra: a,b",
+      "expected": {
+        "foo[2]extra": "a,b"
+      },
+      "specSection": "6",
+      "note": "Non-whitespace content between ] and : prevents array header interpretation"
+    },
     {
       "name": "parses quoted key with braces",
       "input": "\"{key}\": 5",

src/test/resources/conformance/encode/arrays-primitive.json

@@ -35,6 +35,22 @@
       "expected": "items[0]:",
       "specSection": "9.1"
     },
+    {
+      "name": "encodes empty string keys for inline arrays",
+      "input": {
+        "": [1, 2, 3]
+      },
+      "expected": "\"\"[3]: 1,2,3",
+      "specSection": "9.1"
+    },
+    {
+      "name": "encodes empty string keys for empty arrays",
+      "input": {
+        "": []
+      },
+      "expected": "\"\"[0]:",
+      "specSection": "9.1"
+    },
     {
       "name": "encodes empty string in single-item array",
       "input": {

src/test/resources/conformance/encode/arrays-tabular.json

@@ -57,6 +57,17 @@
       },
       "expected": "items[2]{\"order:id\",\"full name\"}:\n  1,Ada\n  2,Bob",
       "specSection": "9.3"
+    },
+    {
+      "name": "encodes tabular arrays with empty string keys",
+      "input": {
+        "": [
+          { "id": 1, "name": "Ada" },
+          { "id": 2, "name": "Bob" }
+        ]
+      },
+      "expected": "\"\"[2]{id,name}:\n  1,Ada\n  2,Bob",
+      "specSection": "9.3"
     }
   ]
 }