json-repair 0.29.5__tar.gz → 0.29.7__tar.gz

{json_repair-0.29.5/src/json_repair.egg-info → json_repair-0.29.7}/PKG-INFO

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

{json_repair-0.29.5 → json_repair-0.29.7}/pyproject.toml

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

{json_repair-0.29.5 → json_repair-0.29.7}/src/json_repair/json_parser.py

@@ -308,9 +308,6 @@ class JSONParser:
                 rstring_delimiter_missing = True
                 # check if this is a case in which the closing comma is NOT missing instead
                 i = self.skip_to_character(character=rstring_delimiter, idx=1)
-                # If the rstring_delimeter is escaped then it's not what we are looking for
-                while self.get_char_at(i - 1) == "\\":
-                    i = self.skip_to_character(character=rstring_delimiter, idx=i + 1)
                 next_c = self.get_char_at(i)
                 if next_c:
                     i += 1
@@ -319,6 +316,15 @@ class JSONParser:
                     next_c = self.get_char_at(i)
                     if next_c and next_c in [",", "}"]:
                         rstring_delimiter_missing = False
+                elif char == ",":
+                    # We couldn't find any rstring_delimeter before the end of the string
+                    # check if this is the last string of an object and therefore we can keep going
+                    # make an exception if this is the last char before the closing brace
+                    i = self.skip_to_character(character="}", idx=1)
+                    if i > 1:
+                        # Ok it's not right after the comma
+                        # Let's ignore
+                        rstring_delimiter_missing = False
                 if rstring_delimiter_missing:
                     self.log(
                         "While parsing a string missing the left delimiter in object value context, we found a , or } and we couldn't determine that a right delimiter was present. Stopping here",
@@ -330,8 +336,8 @@ class JSONParser:
             if char and len(string_acc) > 0 and string_acc[-1] == "\\":
                 # This is a special case, if people use real strings this might happen
                 self.log("Found a stray escape sequence, normalizing it")
-                string_acc = string_acc[:-1]
                 if char in [rstring_delimiter, "t", "n", "r", "b", "\\"]:
+                    string_acc = string_acc[:-1]
                     escape_seqs = {"t": "\t", "n": "\n", "r": "\r", "b": "\b"}
                     string_acc += escape_seqs.get(char, char) or char
                     self.index += 1
@@ -414,11 +420,6 @@ class JSONParser:
                     ):
                         i += 1
                         i = self.skip_to_character(character=rstring_delimiter, idx=i)
-                        # If the rstring_delimeter is escaped then it's not what we are looking for
-                        while self.get_char_at(i - 1) == "\\":
-                            i = self.skip_to_character(
-                                character=rstring_delimiter, idx=i + 1
-                            )
                         next_c = self.get_char_at(i)
                         # Ok now I found a delimiter, let's skip whitespaces and see if next we find a }
                         i += 1
@@ -432,7 +433,9 @@ class JSONParser:
                             string_acc += str(char)
                             self.index += 1
                             char = self.get_char_at()
-                    elif next_c == rstring_delimiter:
+                    elif (
+                        next_c == rstring_delimiter and self.get_char_at(i - 1) != "\\"
+                    ):
                         if self.context.current == ContextValues.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
@@ -441,19 +444,13 @@ class JSONParser:
                             i = self.skip_to_character(
                                 character=rstring_delimiter, idx=i
                             )
-                            # If the rstring_delimeter is escaped then it's not what we are looking for
-                            while self.get_char_at(i - 1) == "\\":
-                                i = self.skip_to_character(
-                                    character=rstring_delimiter, idx=i + 1
-                                )
                             i += 1
                             next_c = self.get_char_at(i)
                             while next_c and next_c != ":":
-                                if next_c in [
-                                    lstring_delimiter,
-                                    rstring_delimiter,
-                                    ",",
-                                ]:
+                                if next_c == "," or (
+                                    next_c == rstring_delimiter
+                                    and self.get_char_at(i - 1) != "\\"
+                                ):
                                     break
                                 i += 1
                                 next_c = self.get_char_at(i)
@@ -582,6 +579,9 @@ class JSONParser:
                 char = self.json_str[self.index + idx]
             except IndexError:
                 return idx
+        if self.index + idx > 0 and self.json_str[self.index + idx - 1] == "\\":
+            # Ah this is an escaped character, try again
+            return self.skip_to_character(character=character, idx=idx + 1)
         return idx
 
     def _log(self, text: str) -> None:

{json_repair-0.29.5 → json_repair-0.29.7/src/json_repair.egg-info}/PKG-INFO

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

{json_repair-0.29.5 → json_repair-0.29.7}/tests/test_json_repair.py

@@ -120,7 +120,7 @@ def test_array_edge_cases():
     
 def test_escaping():
     assert repair_json("'\"'") == '""'
-    assert repair_json("{\"key\": 'string\"\n\t\le'") == '{"key": "string\\"\\n\\tle"}'
+    assert repair_json("{\"key\": 'string\"\n\t\le'") == '{"key": "string\\"\\n\\t\\\\le"}'
     assert repair_json(r'{"real_content": "Some string: Some other string \t Some string <a href=\"https://domain.com\">Some link</a>"') == r'{"real_content": "Some string: Some other string \t Some string <a href=\"https://domain.com\">Some link</a>"}'
     assert repair_json('{"key_1\n": "value"}') == '{"key_1": "value"}'
     assert repair_json('{"key\t_": "value"}') == '{"key\\t_": "value"}'
@@ -140,6 +140,7 @@ def test_object_edge_cases():
     assert repair_json('{"key": "Lorem "ipsum" s,"}') == '{"key": "Lorem \\"ipsum\\" s,"}'
     assert repair_json('{"lorem": ipsum, sic, datum.",}') == '{"lorem": "ipsum, sic, datum."}'
     assert repair_json('{"lorem": sic tamet. "ipsum": sic tamet, quick brown fox. "sic": ipsum}') == '{"lorem": "sic tamet.", "ipsum": "sic tamet", "sic": "ipsum"}'
+    assert repair_json('{"lorem_ipsum": "sic tamet, quick brown fox. }') == '{"lorem_ipsum": "sic tamet, quick brown fox."}'
     assert repair_json('{"key":value, " key2":"value2" }') == '{"key": "value", " key2": "value2"}'
     assert repair_json('{"key":value "key2":"value2" }') == '{"key": "value", "key2": "value2"}'