json-repair 0.29.9__py3-none-any.whl → 0.30.0__py3-none-any.whl

json_repair/__init__.py

@@ -1,4 +1,4 @@
-from .json_repair import repair_json as repair_json
-from .json_repair import loads as loads
-from .json_repair import load as load
 from .json_repair import from_file as from_file
+from .json_repair import load as load
+from .json_repair import loads as loads
+from .json_repair import repair_json as repair_json

json_repair/json_parser.py

@@ -1,7 +1,7 @@
-from typing import Any, Dict, List, Optional, Union, TextIO, Tuple, Literal
+from typing import Any, Dict, List, Literal, Optional, TextIO, Tuple, Union
 
+from .json_context import ContextValues, JsonContext
 from .string_file_wrapper import StringFileWrapper
-from .json_context import JsonContext, ContextValues
 
 JSONReturnType = Union[Dict[str, Any], List[Any], str, float, int, bool, None]
 
@@ -83,7 +83,7 @@ class JSONParser:
                 return self.parse_array()
             # there can be an edge case in which a key is empty and at the end of an object
             # like "key": }. We return an empty string here to close the object properly
-            elif char == "}":
+            elif self.context.current == ContextValues.OBJECT_VALUE and char == "}":
                 self.log(
                     "At the end of an object we found a key with missing value, skipping",
                 )
@@ -171,7 +171,8 @@ class JSONParser:
         arr = []
         self.context.set(ContextValues.ARRAY)
         # Stop when you either find the closing parentheses or you have iterated over the entire string
-        while (self.get_char_at() or "]") != "]":
+        char = self.get_char_at()
+        while char and char not in ["]", "}"]:
             self.skip_whitespaces_at()
             value = self.parse_json()
 
@@ -317,7 +318,7 @@ class JSONParser:
                     next_c = self.get_char_at(i)
                     if next_c and next_c in [",", "}"]:
                         rstring_delimiter_missing = False
-                elif char == ",":
+                else:
                     # skip any whitespace first
                     i = self.skip_whitespaces_at(idx=1, move_main_index=False)
                     # We couldn't find any rstring_delimeter before the end of the string
@@ -328,6 +329,16 @@ class JSONParser:
                         # Ok it's not right after the comma
                         # Let's ignore
                         rstring_delimiter_missing = False
+                    # Check that j was not out of bound
+                    elif self.get_char_at(j):
+                        # Check for an unmatched opening brace in string_acc
+                        for c in reversed(string_acc):
+                            if c == "{":
+                                # Ok then this is part of the string
+                                rstring_delimiter_missing = False
+                                break
+                            elif c == "}":
+                                break
                 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",

json_repair/json_repair.py

@@ -23,9 +23,10 @@ All supported use cases are in the unit tests
 """
 
 import argparse
-import sys
 import json
-from typing import Dict, List, Optional, Union, TextIO, Tuple
+import sys
+from typing import Dict, List, Optional, TextIO, Tuple, Union
+
 from .json_parser import JSONParser, JSONReturnType
 
 

{json_repair-0.29.9.dist-info → json_repair-0.30.0.dist-info}/METADATA

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

json_repair-0.30.0.dist-info/RECORD

@@ -0,0 +1,13 @@
+json_repair/__init__.py,sha256=c4L2kZrHvWEKfj_ODU2naliNuvU6FlFVxtF0hbLe6s8,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=UQgXtXTRo0oLb4N7GhPAELWtS0E9zGSPBXfnnGOCgfo,27527
+json_repair/json_repair.py,sha256=Er6klw5GgmdnLmNM9GXD9gfTi8Mn9cvvTUiVITFA-1E,6101
+json_repair/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+json_repair/string_file_wrapper.py,sha256=EHLhNBWoyUitzT08thytYJiNZh_klEFwfT8zutPSdb4,3905
+json_repair-0.30.0.dist-info/LICENSE,sha256=wrjQo8MhNrNCicXtMe3MHmS-fx8AmQk1ue8AQwiiFV8,1076
+json_repair-0.30.0.dist-info/METADATA,sha256=72pBek4v2f-1zqIwWXjaPcG8reqdX9zpy1dkjT9yspI,10686
+json_repair-0.30.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+json_repair-0.30.0.dist-info/entry_points.txt,sha256=SNfge3zPSP-ASqriYU9r3NAPaXdseYr7ciPMKdV2uSw,57
+json_repair-0.30.0.dist-info/top_level.txt,sha256=7-VZwZN2CgB_n0NlSLk-rEUFh8ug21lESbsblOYuZqw,12
+json_repair-0.30.0.dist-info/RECORD,,

json_repair-0.29.9.dist-info/RECORD

@@ -1,13 +0,0 @@
-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=ceswtnAAIeVxZDioXQbgPzcJnNdQu678Nuc1phgceDA,26924
-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.9.dist-info/LICENSE,sha256=wrjQo8MhNrNCicXtMe3MHmS-fx8AmQk1ue8AQwiiFV8,1076
-json_repair-0.29.9.dist-info/METADATA,sha256=yws9nFwv5IGXUxlB-pAE540rQwRTXi_co3nbg47uXb0,10686
-json_repair-0.29.9.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-json_repair-0.29.9.dist-info/entry_points.txt,sha256=SNfge3zPSP-ASqriYU9r3NAPaXdseYr7ciPMKdV2uSw,57
-json_repair-0.29.9.dist-info/top_level.txt,sha256=7-VZwZN2CgB_n0NlSLk-rEUFh8ug21lESbsblOYuZqw,12
-json_repair-0.29.9.dist-info/RECORD,,