json-repair 0.29.5__py3-none-any.whl → 0.29.6__py3-none-any.whl

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",
@@ -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.dist-info → json_repair-0.29.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: json_repair
-Version: 0.29.5
+Version: 0.29.6
 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.dist-info → json_repair-0.29.6.dist-info}/RECORD

@@ -1,13 +1,13 @@
 json_repair/__init__.py,sha256=IIzSm1DsCRrr8seF3UeMZXwxcq-tE3j-8d1WBxvEJvE,178
 json_repair/__main__.py,sha256=EsJb-y89uZEvGQQg1GdIDWzfDwfOMvVekKEtdguQXCM,67
 json_repair/json_context.py,sha256=DdJu3DJR-ANvr8KrWfJqdtOE3uI6_B0VQidKvE3PjJA,1080
-json_repair/json_parser.py,sha256=jwpaUQlWXIr1LpgJa0K-J6Mb5YDNypzdmdzRr8t9HyQ,26419
+json_repair/json_parser.py,sha256=6d8R2m29meyFz2_gxvF5olYs1VytAQTV-rDqIYzwjnE,26385
 json_repair/json_repair.py,sha256=GTg3OAXRbAJAHWs8oiQDqUHh4h6qKDVvWPXcrqafzLY,6100
 json_repair/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 json_repair/string_file_wrapper.py,sha256=EHLhNBWoyUitzT08thytYJiNZh_klEFwfT8zutPSdb4,3905
-json_repair-0.29.5.dist-info/LICENSE,sha256=wrjQo8MhNrNCicXtMe3MHmS-fx8AmQk1ue8AQwiiFV8,1076
-json_repair-0.29.5.dist-info/METADATA,sha256=hN659VLMQsy-hceD0ZBJnBhCKnQXi3NC_4JS0vttGYc,10686
-json_repair-0.29.5.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-json_repair-0.29.5.dist-info/entry_points.txt,sha256=SNfge3zPSP-ASqriYU9r3NAPaXdseYr7ciPMKdV2uSw,57
-json_repair-0.29.5.dist-info/top_level.txt,sha256=7-VZwZN2CgB_n0NlSLk-rEUFh8ug21lESbsblOYuZqw,12
-json_repair-0.29.5.dist-info/RECORD,,
+json_repair-0.29.6.dist-info/LICENSE,sha256=wrjQo8MhNrNCicXtMe3MHmS-fx8AmQk1ue8AQwiiFV8,1076
+json_repair-0.29.6.dist-info/METADATA,sha256=Us1Nn8o5yaJHnssGY5t7X1yfii0NRCvlSjBH9TyANnw,10686
+json_repair-0.29.6.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+json_repair-0.29.6.dist-info/entry_points.txt,sha256=SNfge3zPSP-ASqriYU9r3NAPaXdseYr7ciPMKdV2uSw,57
+json_repair-0.29.6.dist-info/top_level.txt,sha256=7-VZwZN2CgB_n0NlSLk-rEUFh8ug21lESbsblOYuZqw,12
+json_repair-0.29.6.dist-info/RECORD,,