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

json_repair/json_context.py

@@ -1,5 +1,5 @@
 from enum import Enum, auto
-from typing import List
+from typing import List, Optional
 
 
 class ContextValues(Enum):
@@ -11,6 +11,8 @@ class ContextValues(Enum):
 class JsonContext:
     def __init__(self) -> None:
         self.context: List[ContextValues] = []
+        self.current: Optional[ContextValues] = None
+        self.empty: bool = True
 
     def set(self, value: ContextValues) -> None:
         """
@@ -25,6 +27,8 @@ class JsonContext:
         # If a value is provided update the context variable and save in stack
         if value:
             self.context.append(value)
+            self.current = value
+            self.empty = False
 
     def reset(self) -> None:
         """
@@ -33,37 +37,9 @@ class JsonContext:
         Returns:
             None
         """
-        self.context.pop()
-
-    def is_current(self, context: ContextValues) -> bool:
-        """
-        Check if the given context is the current (most recent) context.
-
-        Args:
-            context (ContextValues): The context value to check.
-
-        Returns:
-            bool: True if the given context is the same as the most recent context in the stack, False otherwise.
-        """
-        return self.context[-1] == context
-
-    def is_any(self, context: ContextValues) -> bool:
-        """
-        Check if the given context exists anywhere in the context stack.
-
-        Args:
-            context (ContextValues): The context value to check.
-
-        Returns:
-            bool: True if the given context exists in the stack, False otherwise.
-        """
-        return context in self.context
-
-    def is_empty(self) -> bool:
-        """
-        Check if the context stack is empty.
-
-        Returns:
-            bool: True if the context stack is empty, False otherwise.
-        """
-        return len(self.context) == 0
+        try:
+            self.context.pop()
+            self.current = self.context[-1]
+        except IndexError:
+            self.current = None
+            self.empty = True

json_repair/json_parser.py

@@ -34,7 +34,8 @@ class JSONParser:
             self.logger: List[Dict[str, str]] = []
             self.log = self._log
         else:
-            self.log = self.noop
+            # No-op
+            self.log = lambda *args, **kwargs: None
 
     def parse(
         self,
@@ -88,12 +89,10 @@ class JSONParser:
                 )
                 return ""
             # <string> starts with a quote
-            elif not self.context.is_empty() and (
-                char in ['"', "'", "“"] or char.isalpha()
-            ):
+            elif not self.context.empty and (char in ['"', "'", "“"] or char.isalpha()):
                 return self.parse_string()
             # <number> starts with [0-9] or minus
-            elif not self.context.is_empty() and (
+            elif not self.context.empty and (
                 char.isdigit() or char == "-" or char == "."
             ):
                 return self.parse_number()
@@ -234,8 +233,9 @@ class JSONParser:
         elif char.isalnum():
             # This could be a <boolean> and not a string. Because (T)rue or (F)alse or (N)ull are valid
             # But remember, object keys are only of type string
-            if char.lower() in ["t", "f", "n"] and not self.context.is_current(
-                ContextValues.OBJECT_KEY
+            if (
+                char.lower() in ["t", "f", "n"]
+                and self.context.current != ContextValues.OBJECT_KEY
             ):
                 value = self.parse_boolean_or_null()
                 if value != "":
@@ -255,15 +255,13 @@ class JSONParser:
         if self.get_char_at() == lstring_delimiter:
             # If it's an empty key, this was easy
             if (
-                self.context.is_current(ContextValues.OBJECT_KEY)
+                self.context.current == ContextValues.OBJECT_KEY
                 and self.get_char_at(1) == ":"
             ):
                 self.index += 1
                 return ""
             # Find the next delimiter
-            i = self.skip_to_character(
-                character=rstring_delimiter, idx=1, move_main_index=False
-            )
+            i = self.skip_to_character(character=rstring_delimiter, idx=1)
             next_c = self.get_char_at(i)
             # Now check that the next character is also a delimiter to ensure that we have "".....""
             # In that case we ignore this rstring delimiter
@@ -296,22 +294,23 @@ class JSONParser:
         while char and char != rstring_delimiter:
             if (
                 missing_quotes
-                and self.context.is_current(ContextValues.OBJECT_KEY)
+                and self.context.current == ContextValues.OBJECT_KEY
                 and (char == ":" or char.isspace())
             ):
                 self.log(
                     "While parsing a string missing the left delimiter in object key context, we found a :, stopping here",
                 )
                 break
-            if self.context.is_current(ContextValues.OBJECT_VALUE) and char in [
+            if self.context.current == ContextValues.OBJECT_VALUE and char in [
                 ",",
                 "}",
             ]:
                 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, move_main_index=False
-                )
+                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
@@ -345,8 +344,9 @@ class JSONParser:
                         "While parsing a string, we found a doubled quote, ignoring it"
                     )
                     self.index += 1
-                elif missing_quotes and self.context.is_current(
-                    ContextValues.OBJECT_VALUE
+                elif (
+                    missing_quotes
+                    and self.context.current == ContextValues.OBJECT_VALUE
                 ):
                     # In case of missing starting quote I need to check if the delimeter is the end or the beginning of a key
                     i = 1
@@ -387,20 +387,20 @@ class JSONParser:
                         # If we are in an object context, let's check for the right delimiters
                         if (
                             (
-                                self.context.is_any(ContextValues.OBJECT_KEY)
+                                ContextValues.OBJECT_KEY in self.context.context
                                 and next_c in [":", "}"]
                             )
                             or (
-                                self.context.is_any(ContextValues.OBJECT_VALUE)
+                                ContextValues.OBJECT_VALUE in self.context.context
                                 and next_c == "}"
                             )
                             or (
-                                self.context.is_any(ContextValues.ARRAY)
+                                ContextValues.ARRAY in self.context.context
                                 and next_c in ["]", ","]
                             )
                             or (
                                 check_comma_in_object_value
-                                and self.context.is_current(ContextValues.OBJECT_VALUE)
+                                and self.context.current == ContextValues.OBJECT_VALUE
                                 and next_c == ","
                             )
                         ):
@@ -408,13 +408,17 @@ class JSONParser:
                         i += 1
                         next_c = self.get_char_at(i)
                     # If we stopped for a comma in object_value context, let's check if find a "} at the end of the string
-                    if next_c == "," and self.context.is_current(
-                        ContextValues.OBJECT_VALUE
+                    if (
+                        next_c == ","
+                        and self.context.current == ContextValues.OBJECT_VALUE
                     ):
                         i += 1
-                        i = self.skip_to_character(
-                            character=rstring_delimiter, idx=i, move_main_index=False
-                        )
+                        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
@@ -429,16 +433,19 @@ class JSONParser:
                             self.index += 1
                             char = self.get_char_at()
                     elif next_c == rstring_delimiter:
-                        if self.context.is_current(ContextValues.OBJECT_VALUE):
+                        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
                             # so find a rstring_delimiter and a colon after
                             i += 1
                             i = self.skip_to_character(
-                                character=rstring_delimiter,
-                                idx=i,
-                                move_main_index=False,
+                                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 != ":":
@@ -462,7 +469,7 @@ class JSONParser:
         if (
             char
             and missing_quotes
-            and self.context.is_current(ContextValues.OBJECT_KEY)
+            and self.context.current == ContextValues.OBJECT_KEY
             and char.isspace()
         ):
             self.log(
@@ -488,7 +495,7 @@ class JSONParser:
         number_str = ""
         number_chars = set("0123456789-.eE/,")
         char = self.get_char_at()
-        is_array = self.context.is_current(ContextValues.ARRAY)
+        is_array = self.context.current == ContextValues.ARRAY
         while char and char in number_chars and (char != "," or not is_array):
             number_str += char
             self.index += 1
@@ -561,9 +568,7 @@ class JSONParser:
                 return idx
         return idx
 
-    def skip_to_character(
-        self, character: str, idx: int = 0, move_main_index=True
-    ) -> int:
+    def skip_to_character(self, character: str, idx: int = 0) -> int:
         """
         This function quickly iterates to find a character, syntactic sugar to make the code more concise
         """
@@ -572,10 +577,7 @@ class JSONParser:
         except IndexError:
             return idx
         while char != character:
-            if move_main_index:  # pragma: no cover
-                self.index += 1
-            else:
-                idx += 1
+            idx += 1
             try:
                 char = self.json_str[self.index + idx]
             except IndexError:
@@ -593,6 +595,3 @@ class JSONParser:
                 "context": context,
             }
         )
-
-    def noop(*args: Any, **kwargs: Any) -> None:
-        pass

{json_repair-0.29.3.dist-info → json_repair-0.29.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: json_repair
-Version: 0.29.3
+Version: 0.29.5
 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/RECORD

@@ -0,0 +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_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.3.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=MOzT0z4Pc03SWhggwwEpDNXyeHm04kLfvDBOBd3xkVU,1782
-json_repair/json_parser.py,sha256=Gimn0LFUTpdGCFo9rOGjH3W39PEj00_Lrj4mPOSnBFU,25949
-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.3.dist-info/LICENSE,sha256=wrjQo8MhNrNCicXtMe3MHmS-fx8AmQk1ue8AQwiiFV8,1076
-json_repair-0.29.3.dist-info/METADATA,sha256=tQ_crOtYbu3fseCXoc-VDIHIJq0HtGRA9SvmCIldvUE,10686
-json_repair-0.29.3.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-json_repair-0.29.3.dist-info/entry_points.txt,sha256=SNfge3zPSP-ASqriYU9r3NAPaXdseYr7ciPMKdV2uSw,57
-json_repair-0.29.3.dist-info/top_level.txt,sha256=7-VZwZN2CgB_n0NlSLk-rEUFh8ug21lESbsblOYuZqw,12
-json_repair-0.29.3.dist-info/RECORD,,