json-repair 0.47.5__py3-none-any.whl → 0.47.7__py3-none-any.whl

json_repair/json_parser.py

@@ -3,23 +3,34 @@ from typing import Literal, TextIO
 from .constants import STRING_DELIMITERS, JSONReturnType
 from .json_context import JsonContext
 from .object_comparer import ObjectComparer
-from .parse_array import parse_array
-from .parse_boolean_or_null import parse_boolean_or_null
-from .parse_comment import parse_comment
-from .parse_number import parse_number
-from .parse_object import parse_object
-from .parse_string import parse_string
+from .parse_array import parse_array as _parse_array
+from .parse_boolean_or_null import parse_boolean_or_null as _parse_boolean_or_null
+from .parse_comment import parse_comment as _parse_comment
+from .parse_number import parse_number as _parse_number
+from .parse_object import parse_object as _parse_object
+from .parse_string import parse_string as _parse_string
 from .string_file_wrapper import StringFileWrapper
 
 
 class JSONParser:
     # Split the parse methods into separate files because this one was like 3000 lines
-    parse_array = parse_array
-    parse_boolean_or_null = parse_boolean_or_null
-    parse_comment = parse_comment
-    parse_number = parse_number
-    parse_object = parse_object
-    parse_string = parse_string
+    def parse_array(self, *args, **kwargs):
+        return _parse_array(self, *args, **kwargs)
+
+    def parse_boolean_or_null(self, *args, **kwargs):
+        return _parse_boolean_or_null(self, *args, **kwargs)
+
+    def parse_comment(self, *args, **kwargs):
+        return _parse_comment(self, *args, **kwargs)
+
+    def parse_number(self, *args, **kwargs):
+        return _parse_number(self, *args, **kwargs)
+
+    def parse_object(self, *args, **kwargs):
+        return _parse_object(self, *args, **kwargs)
+
+    def parse_string(self, *args, **kwargs):
+        return _parse_string(self, *args, **kwargs)
 
     def __init__(
         self,

json_repair/parse_array.py

@@ -1,8 +1,13 @@
+from typing import TYPE_CHECKING
+
 from .constants import STRING_DELIMITERS, JSONReturnType
 from .json_context import ContextValues
 
+if TYPE_CHECKING:
+    from .json_parser import JSONParser
+
 
-def parse_array(self) -> list[JSONReturnType]:
+def parse_array(self: "JSONParser") -> list[JSONReturnType]:
     # <array> ::= '[' [ <json> *(', ' <json>) ] ']' ; A sequence of JSON values separated by commas
     arr = []
     self.context.set(ContextValues.ARRAY)

json_repair/parse_boolean_or_null.py

@@ -1,4 +1,10 @@
-def parse_boolean_or_null(self) -> bool | str | None:
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from .json_parser import JSONParser
+
+
+def parse_boolean_or_null(self: "JSONParser") -> bool | str | None:
     # <boolean> is one of the literal strings 'true', 'false', or 'null' (unquoted)
     starting_index = self.index
     char = (self.get_char_at() or "").lower()

json_repair/parse_comment.py

@@ -1,7 +1,13 @@
+from typing import TYPE_CHECKING
+
+from .constants import JSONReturnType
 from .json_context import ContextValues
 
+if TYPE_CHECKING:
+    from .json_parser import JSONParser
+
 
-def parse_comment(self) -> str:
+def parse_comment(self: "JSONParser") -> JSONReturnType:
     """
     Parse code-like comments:
 

json_repair/parse_number.py

@@ -1,10 +1,15 @@
-from .constants import JSONReturnType
+from typing import TYPE_CHECKING
+
 from .json_context import ContextValues
 
 NUMBER_CHARS: set[str] = set("0123456789-.eE/,")
 
 
-def parse_number(self) -> float | int | str | JSONReturnType:
+if TYPE_CHECKING:
+    from .json_parser import JSONParser
+
+
+def parse_number(self: "JSONParser") -> float | int | str | bool | None:
     # <number> is a valid real number expressed in one of a number of given formats
     number_str = ""
     char = self.get_char_at()

json_repair/parse_object.py

@@ -1,8 +1,13 @@
+from typing import TYPE_CHECKING
+
 from .constants import JSONReturnType
 from .json_context import ContextValues
 
+if TYPE_CHECKING:
+    from .json_parser import JSONParser
+
 
-def parse_object(self) -> dict[str, JSONReturnType]:
+def parse_object(self: "JSONParser") -> dict[str, JSONReturnType]:
     # <object> ::= '{' [ <member> *(', ' <member>) ] '}' ; A sequence of 'members'
     obj: dict[str, JSONReturnType] = {}
     # Stop when you either find the closing parentheses or you have iterated over the entire string
@@ -59,12 +64,17 @@ def parse_object(self) -> dict[str, JSONReturnType]:
                 # If the string is empty but there is a object divider, we are done here
                 break
         if ContextValues.ARRAY in self.context.context and key in obj:
-            self.log(
-                "While parsing an object we found a duplicate key, closing the object here and rolling back the index",
-            )
-            self.index = rollback_index - 1
-            # add an opening curly brace to make this work
-            self.json_str = self.json_str[: self.index + 1] + "{" + self.json_str[self.index + 1 :]
+            if self.stream_stable:
+                # This is possibly another problem, the key is incomplete and it "appears" duplicate
+                # Let's just do nothing
+                pass
+            else:
+                self.log(
+                    "While parsing an object we found a duplicate key, closing the object here and rolling back the index",
+                )
+                self.index = rollback_index - 1
+                # add an opening curly brace to make this work
+                self.json_str = self.json_str[: self.index + 1] + "{" + self.json_str[self.index + 1 :]
             break
 
         # Skip filler whitespaces

json_repair/parse_string.py

@@ -1,8 +1,13 @@
+from typing import TYPE_CHECKING
+
 from .constants import STRING_DELIMITERS
 from .json_context import ContextValues
 
+if TYPE_CHECKING:
+    from .json_parser import JSONParser
+
 
-def parse_string(self) -> str | bool | None:
+def parse_string(self: "JSONParser") -> str | bool | None:
     # <string> is a string of valid characters enclosed in quotes
     # i.e. { name: "John" }
     # Somehow all weird cases in an invalid JSON happen to be resolved in this function, so be careful here
@@ -328,7 +333,24 @@ def parse_string(self) -> str | bool | None:
                     if all(str(self.get_char_at(j)).isspace() for j in range(1, i) if self.get_char_at(j)):
                         break
                     if self.context.current == ContextValues.OBJECT_VALUE:
-                        # But this might not be it! This could be just a missing comma
+                        i = self.skip_whitespaces_at(idx=i + 1, move_main_index=False)
+                        if self.get_char_at(i) == ",":
+                            # So we found a comma, this could be a case of a single quote like "va"lue",
+                            # Search if it's followed by another key, starting with the first delimeter
+                            i = self.skip_to_character(character=lstring_delimiter, idx=i + 1)
+                            i += 1
+                            i = self.skip_to_character(character=rstring_delimiter, idx=i + 1)
+                            i += 1
+                            i = self.skip_whitespaces_at(idx=i, move_main_index=False)
+                            next_c = self.get_char_at(i)
+                            if next_c == ":":
+                                self.log(
+                                    "While parsing a string, we a misplaced quote that would have closed the string but has a different meaning here, ignoring it",
+                                )
+                                string_acc += str(char)
+                                self.index += 1
+                                char = self.get_char_at()
+                                continue
                         # We found a delimiter and we need to check if this is a key
                         # so find a rstring_delimiter and a colon after
                         i = self.skip_to_character(character=rstring_delimiter, idx=i + 1)

{json_repair-0.47.5.dist-info → json_repair-0.47.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: json_repair
-Version: 0.47.5
+Version: 0.47.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.47.7.dist-info/RECORD

@@ -0,0 +1,21 @@
+json_repair/__init__.py,sha256=JdJIZNCKV3MfIviryqK8NH8yGssCta2-192CekcwH-o,174
+json_repair/__main__.py,sha256=EsJb-y89uZEvGQQg1GdIDWzfDwfOMvVekKEtdguQXCM,67
+json_repair/constants.py,sha256=cv2gvyosuq0me0600WyTysM9avrtfXPuXYR26tawcuo,158
+json_repair/json_context.py,sha256=WsMOjqpGSr6aaDONcrk8UFtTurzWon2Qq9AoBBYseoI,934
+json_repair/json_parser.py,sha256=rTuL8ESslQ4XK9fkLmBIpS4e8xr6QwlZRVyJwzJFqBE,7356
+json_repair/json_repair.py,sha256=txblCJtcTpXcQaT15tavulkJPtyRYe2cfYpPHZcvPv0,11233
+json_repair/object_comparer.py,sha256=LlIF0MisRglzC-CiG5AxAEDCBWBHeJd-6uXYx0uRmCk,1175
+json_repair/parse_array.py,sha256=aNFJUsa_i1_wjwLKSMFfU36ArKOI5OxFG_TJW9sLGDw,2109
+json_repair/parse_boolean_or_null.py,sha256=WMSkvvxsp4wvauBcDqtt9WnLMD5SMoxeRfZFXp3FEBc,890
+json_repair/parse_comment.py,sha256=JHtQ_QlxOvPNnMh7lhUaoTjFGelqjhTNq7qn9xUE7SU,2648
+json_repair/parse_number.py,sha256=33zAtkbuVzi9Lqjxu7cXn9WlVzd3WjRx9Ln_LFzVL4o,1259
+json_repair/parse_object.py,sha256=vPxSTnPW74v8nRI_2ASt8dO4a5DWzbEt4c-zb3oFM_o,4802
+json_repair/parse_string.py,sha256=GItlhNwDGRWUxgEvZhYdwLYu5bgHiIiliH64vDzIrj4,22238
+json_repair/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+json_repair/string_file_wrapper.py,sha256=tGkWBEUPE-CZPf4uSM5NE9oSDTpskX0myJiXsl-gbds,4333
+json_repair-0.47.7.dist-info/licenses/LICENSE,sha256=wrjQo8MhNrNCicXtMe3MHmS-fx8AmQk1ue8AQwiiFV8,1076
+json_repair-0.47.7.dist-info/METADATA,sha256=Xr4XqdXIa0XWur-wt7d0rK4s7N5D2VPWJ2B_h0oHRKM,12411
+json_repair-0.47.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+json_repair-0.47.7.dist-info/entry_points.txt,sha256=SNfge3zPSP-ASqriYU9r3NAPaXdseYr7ciPMKdV2uSw,57
+json_repair-0.47.7.dist-info/top_level.txt,sha256=7-VZwZN2CgB_n0NlSLk-rEUFh8ug21lESbsblOYuZqw,12
+json_repair-0.47.7.dist-info/RECORD,,

json_repair-0.47.5.dist-info/RECORD

@@ -1,21 +0,0 @@
-json_repair/__init__.py,sha256=JdJIZNCKV3MfIviryqK8NH8yGssCta2-192CekcwH-o,174
-json_repair/__main__.py,sha256=EsJb-y89uZEvGQQg1GdIDWzfDwfOMvVekKEtdguQXCM,67
-json_repair/constants.py,sha256=cv2gvyosuq0me0600WyTysM9avrtfXPuXYR26tawcuo,158
-json_repair/json_context.py,sha256=WsMOjqpGSr6aaDONcrk8UFtTurzWon2Qq9AoBBYseoI,934
-json_repair/json_parser.py,sha256=WpU8K3E51gJ9BKbuW7LcMQGXWArte8noYMzvA9qu6Wc,6850
-json_repair/json_repair.py,sha256=txblCJtcTpXcQaT15tavulkJPtyRYe2cfYpPHZcvPv0,11233
-json_repair/object_comparer.py,sha256=LlIF0MisRglzC-CiG5AxAEDCBWBHeJd-6uXYx0uRmCk,1175
-json_repair/parse_array.py,sha256=YnESGXnRaX57zXv7NP6EcHOlqgeaLEzOy1s_l9ghTeY,2002
-json_repair/parse_boolean_or_null.py,sha256=2KoUkjiZ68fkge_n_Q4bbFVG6WskRroKD55jW2Ep2OU,782
-json_repair/parse_comment.py,sha256=kNTinpdHZftrtV190-Julq5eKFxMSmGYNbwlj4vGtsg,2492
-json_repair/parse_number.py,sha256=o7wEER7_H6xG0WsmvKS8VucoMJ7AsaJdxkDzulJ9o-Q,1192
-json_repair/parse_object.py,sha256=yQ9SilLdBBW5cYJOcQGB4ZR8MtOp4cH6WilfXF_kdgE,4456
-json_repair/parse_string.py,sha256=JVGvwFi2Cfpm8yLNp2MEKvj1_mB_gSlhuNPgxxrRnjI,20974
-json_repair/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-json_repair/string_file_wrapper.py,sha256=tGkWBEUPE-CZPf4uSM5NE9oSDTpskX0myJiXsl-gbds,4333
-json_repair-0.47.5.dist-info/licenses/LICENSE,sha256=wrjQo8MhNrNCicXtMe3MHmS-fx8AmQk1ue8AQwiiFV8,1076
-json_repair-0.47.5.dist-info/METADATA,sha256=AjNADA8PXlXl7SgDkIEmCYLxSbCKfzh8RgcHiKys9e0,12411
-json_repair-0.47.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-json_repair-0.47.5.dist-info/entry_points.txt,sha256=SNfge3zPSP-ASqriYU9r3NAPaXdseYr7ciPMKdV2uSw,57
-json_repair-0.47.5.dist-info/top_level.txt,sha256=7-VZwZN2CgB_n0NlSLk-rEUFh8ug21lESbsblOYuZqw,12
-json_repair-0.47.5.dist-info/RECORD,,