json-repair 0.54.3__tar.gz → 0.55.0__tar.gz

{json_repair-0.54.3/src/json_repair.egg-info → json_repair-0.55.0}/PKG-INFO

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

{json_repair-0.54.3 → json_repair-0.55.0}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61.0"]
 build-backend = "setuptools.build_meta"
 [project]
 name = "json_repair"
-version = "0.54.3"
+version = "0.55.0"
 license = "MIT"
 license-files = ["LICENSE"]
 authors = [

{json_repair-0.54.3 → json_repair-0.55.0}/src/json_repair/parse_number.py

@@ -30,7 +30,7 @@ def parse_number(self: "JSONParser") -> JSONReturnType:
         return self.parse_string()
     try:
         if "," in number_str:
-            return str(number_str)
+            return number_str
         if "." in number_str or "e" in number_str or "E" in number_str:
             return float(number_str)
         else:

{json_repair-0.54.3 → json_repair-0.55.0}/src/json_repair/parse_object.py

@@ -58,7 +58,9 @@ def parse_object(self: "JSONParser") -> JSONReturnType:
                             self.index += 1
                         self.skip_whitespaces()
                         continue
-            key = str(self.parse_string())
+            raw_key = self.parse_string()
+            assert isinstance(raw_key, str)
+            key = raw_key
             if key == "":
                 self.skip_whitespaces()
             if key != "" or (key == "" and self.get_char_at() in [":", "}"]):
@@ -108,9 +110,10 @@ def parse_object(self: "JSONParser") -> JSONReturnType:
         self.skip_whitespaces()
         # Corner case, a lone comma
         value: JSONReturnType = ""
-        if self.get_char_at() in [",", "}"]:
+        char = self.get_char_at()
+        if char in [",", "}"]:
             self.log(
-                "While parsing an object value we found a stray " + str(self.get_char_at()) + ", ignoring it",
+                f"While parsing an object value we found a stray {char}, ignoring it",
             )
         else:
             value = self.parse_json()
@@ -151,6 +154,17 @@ def parse_object(self: "JSONParser") -> JSONReturnType:
     # This handles cases like '{"key": "value"}, "key2": "value2"}'
     # But only if we're not in a nested context
     if not self.context.empty:
+        # Sometimes there could be an extra closing brace that closes the object twice
+        # So we check the context to see if the next one in the stack is an object or not
+        # If not we skip it
+        if self.get_char_at() == "}" and self.context.current not in [
+            ContextValues.OBJECT_KEY,
+            ContextValues.OBJECT_VALUE,
+        ]:
+            self.log(
+                "Found an extra closing brace that shouldn't be there, skipping it",
+            )
+            self.index += 1
         return obj
 
     self.skip_whitespaces()

{json_repair-0.54.3 → json_repair-0.55.0}/src/json_repair/parse_string.py

@@ -11,8 +11,8 @@ if TYPE_CHECKING:
 
 def parse_string(self: "JSONParser") -> JSONReturnType:
     # Utility function to append a character to the accumulator and update the index
-    def _append_literal_char(acc: str, current_char: str | None) -> tuple[str, str | None]:
-        acc += str(current_char)
+    def _append_literal_char(acc: str, current_char: str) -> tuple[str, str | None]:
+        acc += current_char
         self.index += 1
         char = self.get_char_at()
         return acc, char
@@ -246,10 +246,12 @@ def parse_string(self: "JSONParser") -> JSONReturnType:
         string_acc += char
         self.index += 1
         char = self.get_char_at()
-        # Unclosed string ends with a \ character. This character is ignored if stream_stable = True.
-        if self.stream_stable and not char and string_acc and string_acc[-1] == "\\":
-            string_acc = string_acc[:-1]
-        if char and string_acc and string_acc[-1] == "\\":
+        if char is None:
+            # Unclosed string ends with a \ character. This character is ignored if stream_stable = True.
+            if self.stream_stable and string_acc and string_acc[-1] == "\\":
+                string_acc = string_acc[:-1]
+            break
+        if string_acc 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")
             if char in [rstring_delimiter, "t", "n", "r", "b", "\\"]:
@@ -296,12 +298,11 @@ def parse_string(self: "JSONParser") -> JSONReturnType:
                     i += 1
                     # Skip spaces
                     i = self.scroll_whitespaces(idx=i)
-                    if self.get_char_at(i) in [",", "}"]:
+                    ch = self.get_char_at(i)
+                    if ch in [",", "}"]:
                         # Ok then this is a missing right quote
                         self.log(
-                            "While parsing a string missing the right delimiter in object key context, we found a "
-                            + str(self.get_char_at(i))
-                            + " stopping here",
+                            f"While parsing a string missing the right delimiter in object key context, we found a {ch} stopping here",
                         )
                         break
             else:
@@ -386,7 +387,7 @@ def parse_string(self: "JSONParser") -> JSONReturnType:
                         continue
                 elif next_c == rstring_delimiter and self.get_char_at(i - 1) != "\\":
                     # Check if self.index:self.index+i is only whitespaces, break if that's the case
-                    if all(str(self.get_char_at(j)).isspace() for j in range(1, i) if self.get_char_at(j)):
+                    if _only_whitespace_until(self, i):
                         break
                     if self.context.current == ContextValues.OBJECT_VALUE:
                         i = self.scroll_whitespaces(idx=i + 1)
@@ -481,3 +482,11 @@ def parse_string(self: "JSONParser") -> JSONReturnType:
         string_acc = string_acc.rstrip()
 
     return string_acc
+
+
+def _only_whitespace_until(self: "JSONParser", end: int) -> bool:
+    for j in range(1, end):
+        c = self.get_char_at(j)
+        if c is not None and not c.isspace():
+            return False
+    return True

{json_repair-0.54.3 → json_repair-0.55.0}/src/json_repair/utils/string_file_wrapper.py

@@ -137,6 +137,7 @@ class StringFileWrapper:
             while self.length is None:
                 chunk_index = len(self._chunk_positions)
                 self._ensure_chunk_position(chunk_index)
+        assert self.length is not None
         return self.length
 
     def __setitem__(self, index: int | slice, value: str) -> None:  # pragma: no cover

{json_repair-0.54.3 → json_repair-0.55.0/src/json_repair.egg-info}/PKG-INFO

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

{json_repair-0.54.3 → json_repair-0.55.0}/tests/test_parse_object.py

@@ -88,6 +88,7 @@ def test_parse_object_edge_cases():
         repair_json('{"array":[{"key": "value"], "key2": "value2"}')
         == '{"array": [{"key": "value"}], "key2": "value2"}'
     )
+    assert repair_json('[{"key":"value"}},{"key":"value"}]') == '[{"key": "value"}, {"key": "value"}]'
 
 
 def test_parse_object_merge_at_the_end():