Fix auto adding comma case and update README

Author: coderphonui

README.md

@@ -1,4 +1,23 @@
-# Agent Plugin Container
+# LLM JSON auto repair
 
-This is the plugin container for agent plugins. It is responsible for loading and managing agent plugins.
-Any application that wants to use agent plugins should use this package.
+A tiny library to repair JSON string output from LLM. It fixes most of the common issues from the LLM JSON output, eg:
+* Remove the ```json``` code block
+* Add missing commas
+* Add missing double quotes
+* Escape special characters \t \n
+
+## Usage
+
+```java
+ String originalJSON = """
+                ```json
+                {
+                    "name": "Alice",
+                    "sex": "female"
+                    "address": "123 Andrew Street,
+                    ward 3, district 10"
+                }
+                ```
+                """;
+String fixedJSON = jsonAutoRepairer.repair(originalJSON);
+```

src/main/java/com/cdpn/jsonautorepair/internal/EscapeProcessor.java

@@ -25,40 +25,38 @@ public String process() {
     private void processQuoteCharacter(char currentChar, int i) {
         if (!inQuotes) {
             inQuotes = true;
-            if(!isPreviousCloseQuoteGood(i)) {
-                escapedJson.append(',');
-            }
             escapedJson.append(currentChar);
             return;
         }
-        if(!isValidCloseQuote(i)) {
-            escapedJson.append('\\');
+        if(isValidCloseQuote(i)) {
+            inQuotes = false;
             escapedJson.append(currentChar);
             return;
         }
-        inQuotes = false;
+        if(findNextValidChar(i + 1) == '\"') {
+            int nextValidCharPosition = getNextValidCharPosition(i + 1);
+            if(isValidCloseQuote(nextValidCharPosition)) {
+                escapedJson.append('\\');
+                escapedJson.append(currentChar);
+                return;
+            }
+            inQuotes = false;
+            escapedJson.append(currentChar);
+            escapedJson.append(',');
+            return;
+        }
+        escapedJson.append('\\');
         escapedJson.append(currentChar);
     }
 
-    private boolean isPreviousCloseQuoteGood(int position) {
-        // If the quote is the first character, there is no need to check for a good close quote
-        if(position == 0) {
-            return true;
-        }
-        // The previous close quote is good when it ends with a comma, or a curly brace,
-        // or a square bracket, or a colon
-        for (int i = position - 1; i >= 0; i--) {
+    private int getNextValidCharPosition(int position) {
+        for (int i = position; i < inputString.length(); i++) {
             char currentChar = inputString.charAt(i);
-            if (currentChar != ' '
-                    && currentChar != '\n'
-                    && currentChar != '\t') {
-                return currentChar == ','
-                        || currentChar == '{'
-                        || currentChar == '['
-                        || currentChar == ':';
+            if (currentChar != ' ' && currentChar != '\n' && currentChar != '\t') {
+                return i;
             }
         }
-        return false;
+        return -1;
     }
 
 
@@ -82,15 +80,15 @@ private String getEscapeSequence(char currentChar) {
         };
     }
     private boolean isValidCloseQuote(int i) {
-        char nextValidChar = findNextValidChar(inputString, i + 1);
+        char nextValidChar = findNextValidChar(i + 1);
         return  nextValidChar == EOF
                 || nextValidChar == ','
                 || nextValidChar == '}'
                 || nextValidChar == ']'
                 || nextValidChar == ':';
     }
 
-    private char findNextValidChar(String inputString, int position) {
+    private char findNextValidChar(int position) {
         for (int i = position; i < inputString.length(); i++) {
             char currentChar = inputString.charAt(i);
             if (currentChar != ' ' && currentChar != '\n' && currentChar != '\t') {

src/test/java/com/cdpn/jsonautorepair/JSONAutoRepairerTest.java

@@ -5,8 +5,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class JSONAutoRepairerTest {
     private JSONAutoRepairer jsonAutoRepairer;
@@ -78,17 +77,17 @@ public void repair_should_add_quotes_around_unquoted_keys() {
     }
 
     @Test
-    public void repair_should_escape_internal_quote_for_both_key_and_value() {
+    public void repair_should_escape_internal_quote() {
         String originalJSON = """
                 {
-                    ""sentence"": "Alice said: "hello"",
+                    "sentence": "Alice said: "hello"",
                     "sentiment": "normal"
                 }
                 """;
 
         assertEquals(JsonParser.parseString("""
                 {
-                    "\\"sentence\\"": "Alice said: \\"hello\\"",
+                    "sentence": "Alice said: \\"hello\\"",
                     "sentiment": "normal"
                 }
                 """).toString(),
@@ -115,23 +114,43 @@ public void repair_should_auto_add_comma_before_a_new_start_quote_to_fix_missing
         String originalJSON = """
                 {
                     "name": "Alice",
-                    "age": 30
-                    "address": "123 Andrew Street,\\n \\tward 3"
+                    "sex": "female"
+                    "address": "123 Andrew Street"
                 }
                 """;
         assertEquals(JsonParser.parseString("""
                 {
                     "name": "Alice",
-                    "age": 30,
-                    "address": "123 Andrew Street,\\n \\tward 3"
+                    "sex": "female",
+                    "address": "123 Andrew Street"
                 }
                 """).toString() , jsonAutoRepairer.repair(originalJSON));
 
+        assertEquals(JsonParser.parseString("""
+                ["apple", "banana", "cherry"]
+                """).toString() , jsonAutoRepairer.repair("[\"apple\" \"banana\" \"cherry\"]"));
+
     }
 
     @Test
     public void repair_should_return_null_when_cannot_fix_the_JSON() {
         assertNull(jsonAutoRepairer.repair("This is not a valid {} JSON"));
     }
 
+    @Test
+    public void demo_case() {
+        String originalJSON = """
+                ```json
+                {
+                    "name": "Alice",
+                    "sex": "female"
+                    "address": "123 Andrew Street,
+                    ward 3, district 10"
+                }
+                ```
+                """;
+        String fixedJSON = jsonAutoRepairer.repair(originalJSON);
+        assertNotNull(fixedJSON);
+    }
+
 }