json-repair 0.41.1__py3-none-any.whl → 0.43.0__py3-none-any.whl

json_repair/json_parser.py

@@ -10,7 +10,6 @@ JSONReturnType = Union[Dict[str, Any], List[Any], str, float, int, bool, None]
 class JSONParser:
     # Constants
     STRING_DELIMITERS = ['"', "'", "“", "”"]
-    NUMBER_CHARS = set("0123456789-.eE/,")
 
     def __init__(
         self,
@@ -114,7 +113,7 @@ class JSONParser:
 
     def parse_object(self) -> Dict[str, JSONReturnType]:
         # <object> ::= '{' [ <member> *(', ' <member>) ] '}' ; A sequence of 'members'
-        obj = {}
+        obj: Dict[str, JSONReturnType] = {}
         # Stop when you either find the closing parentheses or you have iterated over the entire string
         while (self.get_char_at() or "}") != "}":
             # This is what we expect to find:
@@ -142,6 +141,27 @@ class JSONParser:
             while self.get_char_at():
                 # The rollback index needs to be updated here in case the key is empty
                 rollback_index = self.index
+                if self.get_char_at() == "[" and key == "":
+                    # Is this an array?
+                    # Need to check if the previous parsed value contained in obj is an array and in that case parse and merge the two
+                    prev_key = list(obj.keys())[-1] if obj else None
+                    if prev_key and isinstance(obj[prev_key], list):
+                        # If the previous key's value is an array, parse the new array and merge
+                        self.index += 1
+                        new_array = self.parse_array()
+                        if isinstance(new_array, list):
+                            # Merge and flatten the arrays
+                            prev_value = obj[prev_key]
+                            if isinstance(prev_value, list):
+                                prev_value.extend(
+                                    new_array[0]
+                                    if len(new_array) == 1
+                                    and isinstance(new_array[0], list)
+                                    else new_array
+                                )
+                            continue
+                        else:
+                            self.index = rollback_index
                 key = str(self.parse_string())
                 if key == "":
                     self.skip_whitespaces_at()
@@ -217,7 +237,7 @@ class JSONParser:
 
             # skip over whitespace after a value but before closing ]
             char = self.get_char_at()
-            while char and (char.isspace() or char == ","):
+            while char and char != "]" and (char.isspace() or char == ","):
                 self.index += 1
                 char = self.get_char_at()
 
@@ -663,7 +683,8 @@ class JSONParser:
         number_str = ""
         char = self.get_char_at()
         is_array = self.context.current == ContextValues.ARRAY
-        while char and char in self.NUMBER_CHARS and (not is_array or char != ","):
+        NUMBER_CHARS = set("0123456789-.eE/,")
+        while char and char in NUMBER_CHARS and (not is_array or char != ","):
             number_str += char
             self.index += 1
             char = self.get_char_at()
@@ -671,6 +692,10 @@ class JSONParser:
             # The number ends with a non valid character for a number/currency, rolling back one
             number_str = number_str[:-1]
             self.index -= 1
+        elif (self.get_char_at() or "").isalpha():
+            # this was a string instead, sorry
+            self.index -= len(number_str)
+            return self.parse_string()
         try:
             if "," in number_str:
                 return str(number_str)

{json_repair-0.41.1.dist-info → json_repair-0.43.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: json_repair
-Version: 0.41.1
+Version: 0.43.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.41.1.dist-info → json_repair-0.43.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
 json_repair/__init__.py,sha256=c4L2kZrHvWEKfj_ODU2naliNuvU6FlFVxtF0hbLe6s8,178
 json_repair/__main__.py,sha256=EsJb-y89uZEvGQQg1GdIDWzfDwfOMvVekKEtdguQXCM,67
 json_repair/json_context.py,sha256=mm6dOyrPJ1sDskTORZSXCW7W9-5veMlUKqXQ3Hw3EG4,971
-json_repair/json_parser.py,sha256=VnTlhPEuIynUt3gaAU2jpLJDddnPASxM941rYyMnGbo,38996
+json_repair/json_parser.py,sha256=GFziN2KELYDWElzPda5wPfSeFIHYF8enJSr0c2YzKmQ,40451
 json_repair/json_repair.py,sha256=k-5HRRlCqrxNmJi0u1KE3IUeL4HXqi1XZ7oAL-NFDLo,10314
 json_repair/object_comparer.py,sha256=SeicB6_N4BHAEPon7s2BELEaJc4oyR9ZhfX2RgPk6Bw,1682
 json_repair/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 json_repair/string_file_wrapper.py,sha256=koZmdq2-Z5K7XF1bDqX6dEbNaVMJYcMTjq-aGe6NQvA,4526
-json_repair-0.41.1.dist-info/licenses/LICENSE,sha256=wrjQo8MhNrNCicXtMe3MHmS-fx8AmQk1ue8AQwiiFV8,1076
-json_repair-0.41.1.dist-info/METADATA,sha256=HnZgNiwsJJ3iwtFKgeccdm-yniRJnPq70kjcpQo6aw0,11860
-json_repair-0.41.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-json_repair-0.41.1.dist-info/entry_points.txt,sha256=SNfge3zPSP-ASqriYU9r3NAPaXdseYr7ciPMKdV2uSw,57
-json_repair-0.41.1.dist-info/top_level.txt,sha256=7-VZwZN2CgB_n0NlSLk-rEUFh8ug21lESbsblOYuZqw,12
-json_repair-0.41.1.dist-info/RECORD,,
+json_repair-0.43.0.dist-info/licenses/LICENSE,sha256=wrjQo8MhNrNCicXtMe3MHmS-fx8AmQk1ue8AQwiiFV8,1076
+json_repair-0.43.0.dist-info/METADATA,sha256=fR8K3LENGHxwkjG2pVRedVsh6XGBq0JWPV3weLz1KIM,11860
+json_repair-0.43.0.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+json_repair-0.43.0.dist-info/entry_points.txt,sha256=SNfge3zPSP-ASqriYU9r3NAPaXdseYr7ciPMKdV2uSw,57
+json_repair-0.43.0.dist-info/top_level.txt,sha256=7-VZwZN2CgB_n0NlSLk-rEUFh8ug21lESbsblOYuZqw,12
+json_repair-0.43.0.dist-info/RECORD,,

{json_repair-0.41.1.dist-info → json_repair-0.43.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any