json-repair 0.19.2__tar.gz → 0.20.1__tar.gz

{json_repair-0.19.2/src/json_repair.egg-info → json_repair-0.20.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: json_repair
-Version: 0.19.2
+Version: 0.20.1
 Summary: A package to repair broken json strings
 Author-email: Stefano Baccianella <4247706+mangiucugna@users.noreply.github.com>
 License: MIT License

{json_repair-0.19.2 → json_repair-0.20.1}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61.0"]
 build-backend = "setuptools.build_meta"
 [project]
 name = "json_repair"
-version = "0.19.2"
+version = "0.20.1"
 license = {file = "LICENSE"}
 authors = [
   { name="Stefano Baccianella", email="4247706+mangiucugna@users.noreply.github.com" },

{json_repair-0.19.2 → json_repair-0.20.1}/src/json_repair/json_repair.py

@@ -131,10 +131,14 @@ class JSONParser:
                     # Sometimes the string search might not move the index at all, that might lead us to an infinite loop
                     self.index += 1
 
+            self.skip_whitespaces_at()
+
             # We reached the end here
             if (self.get_char_at() or "}") == "}":
                 continue
 
+            self.skip_whitespaces_at()
+
             # An extreme case of missing ":" after a key
             if (self.get_char_at() or "") != ":":
                 self.log(
@@ -178,7 +182,7 @@ class JSONParser:
             value = self.parse_json()
 
             # It is possible that parse_json() returns nothing valid, so we stop
-            if not value:
+            if value == "":
                 break
 
             if value == "..." and self.get_char_at(-1) == ".":
@@ -335,32 +339,50 @@ class JSONParser:
                     # Check if eventually there is a rstring delimiter, otherwise we bail
                     i = 1
                     next_c = self.get_char_at(i)
-                    while next_c and next_c != rstring_delimiter:
+                    check_comma_in_object_value = True
+                    while next_c and next_c not in [
+                        rstring_delimiter,
+                        lstring_delimiter,
+                    ]:
+                        # This is a bit of a weird workaround, essentially in object_value context we don't always break on commas
+                        # This is because the routine after will make sure to correct any bad guess and this solves a corner case
+                        if next_c.isalpha():
+                            check_comma_in_object_value = False
                         # If we are in an object context, let's check for the right delimiters
                         if (
-                            next_c == lstring_delimiter
-                            or ("object_key" in self.context and next_c == ":")
-                            or ("object_value" in self.context and next_c in ["}", ","])
+                            ("object_key" in self.context and next_c in [":", "}"])
+                            or ("object_value" in self.context and next_c == "}")
                             or ("array" in self.context and next_c in ["]", ","])
+                            or (
+                                check_comma_in_object_value
+                                and self.get_context() == "object_value"
+                                and next_c == ","
+                            )
                         ):
                             break
                         i += 1
                         next_c = self.get_char_at(i)
                     if next_c == rstring_delimiter:
-                        # But this might not be it! This could be just a missing comma
-                        # We need to check if we find a rstring_delimiter and a colon after
-                        i += 1
-                        next_c = self.get_char_at(i)
-                        while next_c and next_c != rstring_delimiter:
+                        if self.get_context() == "object_value":
+                            # But this might not be it! This could be just a missing comma
+                            # We found a delimiter and we need to check if this is a key
+                            # so find a rstring_delimiter and a colon after
                             i += 1
                             next_c = self.get_char_at(i)
-                        i += 1
-                        next_c = self.get_char_at(i)
-                        while next_c and next_c != ":":
-                            if next_c in [lstring_delimiter, rstring_delimiter, ","]:
-                                break
+                            while next_c and next_c != rstring_delimiter:
+                                i += 1
+                                next_c = self.get_char_at(i)
                             i += 1
                             next_c = self.get_char_at(i)
+                            while next_c and next_c != ":":
+                                if next_c in [
+                                    lstring_delimiter,
+                                    rstring_delimiter,
+                                    ",",
+                                ]:
+                                    break
+                                i += 1
+                                next_c = self.get_char_at(i)
                         # Only if we fail to find a ':' then we know this is misplaced quote
                         if next_c != ":":
                             self.log(

{json_repair-0.19.2 → json_repair-0.20.1/src/json_repair.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: json_repair
-Version: 0.19.2
+Version: 0.20.1
 Summary: A package to repair broken json strings
 Author-email: Stefano Baccianella <4247706+mangiucugna@users.noreply.github.com>
 License: MIT License

{json_repair-0.19.2 → json_repair-0.20.1}/tests/test_json_repair.py

@@ -32,7 +32,7 @@ def test_valid_json():
     assert repair_json('{"key": "value\\nvalue"}') == '{"key": "value\\nvalue"}'
 
 def test_brackets_edge_cases():
-    assert repair_json("[{]") == "[]"
+    assert repair_json("[{]") == "[{}]"
     assert repair_json("   {  }   ") == "{}"
     assert repair_json("[") == "[]"
     assert repair_json("]") == '""'
@@ -83,6 +83,7 @@ def test_array_edge_cases():
     assert repair_json("[1, 2, 3, ...]") == "[1, 2, 3]"
     assert repair_json("[1, 2, ... , 3]") == "[1, 2, 3]"
     assert repair_json("[1, 2, '...', 3]") == '[1, 2, "...", 3]'
+    assert repair_json("[true, false, null, ...]") == '[true, false, null]'
     assert (
         repair_json('{"employees":["John", "Anna",')
         == '{"employees": ["John", "Anna"]}'
@@ -119,8 +120,9 @@ def test_object_edge_cases():
     assert repair_json('{""answer"":[{""traits"":''Female aged 60+'',""answer1"":""5""}]}') == '{"answer": [{"traits": "Female aged 60+", "answer1": "5"}]}'
     assert repair_json('{ "words": abcdef", "numbers": 12345", "words2": ghijkl" }') == '{"words": "abcdef", "numbers": 12345, "words2": "ghijkl"}'
     assert repair_json('''{"number": 1,"reason": "According...""ans": "YES"}''') == '{"number": 1, "reason": "According...", "ans": "YES"}'
-    assert repair_json('''{ "a": "{ b": {} }" }''') == '{"a": "{ b"}'
+    assert repair_json('''{ "a" : "{ b": {} }" }''') == '{"a": "{ b"}'
     assert repair_json("""{"b": "xxxxx" true}""") == '{"b": "xxxxx"}'
+    assert repair_json('{"key": "Lorem "ipsum" s,"}') == '{"key": "Lorem \\"ipsum\\" s,"}'
 
 def test_number_edge_cases():
     assert repair_json(' - { "test_key": ["test_value", "test_value2"] }') == '{"test_key": ["test_value", "test_value2"]}'