json-repair 0.6.0__py3-none-any.whl → 0.6.2__py3-none-any.whl

json_repair/json_repair.py

@@ -67,7 +67,7 @@ class JSONParser:
         elif char.isdigit() or char == "-":
             return self.parse_number()
         # <boolean> could be (T)rue or (F)alse or (N)ull
-        elif char == "t" or char == "f" or char == "n":
+        elif char.lower() in ["t", "f", "n"]:
             return self.parse_boolean_or_null()
         # This might be a <string> that is missing the starting '"'
         elif char.isalpha():
@@ -207,16 +207,18 @@ class JSONParser:
             if fixed_quotes:
                 if self.context == "object_key" and (char == ":" or char.isspace()):
                     break
-                elif self.context == "object_value" and (char == "," or char == "}"):
+                elif self.context == "object_value" and char in [",", "}"]:
                     break
             self.index += 1
             char = self.get_char_at()
             # ChatGPT sometimes forget to quote links in markdown like: { "content": "[LINK]("https://google.com")" }
-            if char == string_terminator and (
-                fix_broken_markdown_link
-                or (
-                    self.index - 2 > 0
-                    and self.json_str[self.index - 2 : self.index] == "]("
+            if (
+                char == string_terminator
+                # Next character is not a comma
+                and self.get_char_at(1) != ","
+                and (
+                    fix_broken_markdown_link
+                    or (self.get_char_at(-2) == "]" and self.get_char_at(-1)) == "("
                 )
             ):
                 fix_broken_markdown_link = not fix_broken_markdown_link
@@ -238,7 +240,7 @@ class JSONParser:
 
         return self.json_str[start:end]
 
-    def parse_number(self) -> Union[float, int]:
+    def parse_number(self) -> Union[float, int, str]:
         # <number> is a valid real number expressed in one of a number of given formats
         number_str = ""
         number_chars = set("0123456789-.eE")
@@ -256,11 +258,11 @@ class JSONParser:
             # This is a string then
             return self.parse_string()
 
-    def parse_boolean_or_null(self) -> Union[bool, None]:
+    def parse_boolean_or_null(self) -> Union[bool, str, None]:
         # <boolean> is one of the literal strings 'true', 'false', or 'null' (unquoted)
         boolean_map = {"true": (True, 4), "false": (False, 5), "null": (None, 4)}
         for key, (value, length) in boolean_map.items():
-            if self.json_str.startswith(key, self.index):
+            if self.json_str.lower().startswith(key, self.index):
                 self.index += length
                 return value
 
@@ -271,10 +273,10 @@ class JSONParser:
         self.json_str = self.json_str[: self.index] + char + self.json_str[self.index :]
         self.index += 1
 
-    def get_char_at(self) -> Union[str, bool]:
+    def get_char_at(self, count: int = 0) -> Union[str, bool]:
         # Why not use something simpler? Because we might be out of bounds and doing this check all the time is annoying
         try:
-            return self.json_str[self.index]
+            return self.json_str[self.index + count]
         except IndexError:
             return False
 
@@ -305,8 +307,7 @@ def repair_json(
     It will return the fixed string by default.
     When `return_objects=True` is passed, it will return the decoded data structure instead.
     """
-    json_str = re.sub(r"^\s+", "", json_str)
-    json_str = re.sub(r"\s+$", "", json_str)
+    json_str = json_str.strip()
     json_str = re.sub(r"/\*.*?\*/", "", json_str)
     parser = JSONParser(json_str)
     if skip_json_loads:

{json_repair-0.6.0.dist-info → json_repair-0.6.2.dist-info}/METADATA

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

json_repair-0.6.2.dist-info/RECORD

@@ -0,0 +1,7 @@
+json_repair/__init__.py,sha256=p9mZnte8Bg18NcxqgJ7vopH2gQv_XbZ0dRnk686QuRE,92
+json_repair/json_repair.py,sha256=Zk5JFdO7n5SyDZZ8SUEFJp6--ey5Pa-jlpXEBzwqtJQ,13311
+json_repair-0.6.2.dist-info/LICENSE,sha256=wrjQo8MhNrNCicXtMe3MHmS-fx8AmQk1ue8AQwiiFV8,1076
+json_repair-0.6.2.dist-info/METADATA,sha256=6zUF2tGJnxPzvog3uw_v9970mx6MgccC4X46ScJHcxQ,6011
+json_repair-0.6.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+json_repair-0.6.2.dist-info/top_level.txt,sha256=7-VZwZN2CgB_n0NlSLk-rEUFh8ug21lESbsblOYuZqw,12
+json_repair-0.6.2.dist-info/RECORD,,

json_repair-0.6.0.dist-info/RECORD

@@ -1,7 +0,0 @@
-json_repair/__init__.py,sha256=p9mZnte8Bg18NcxqgJ7vopH2gQv_XbZ0dRnk686QuRE,92
-json_repair/json_repair.py,sha256=LsyNEo2mDgEcwyJo8A0WeH8ftl3GGxZ5rCcltXcINwI,13264
-json_repair-0.6.0.dist-info/LICENSE,sha256=wrjQo8MhNrNCicXtMe3MHmS-fx8AmQk1ue8AQwiiFV8,1076
-json_repair-0.6.0.dist-info/METADATA,sha256=t9EOoV2aaymk5054TKJK5xKLUiCax0DmCDhwpLQ31Oo,6011
-json_repair-0.6.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-json_repair-0.6.0.dist-info/top_level.txt,sha256=7-VZwZN2CgB_n0NlSLk-rEUFh8ug21lESbsblOYuZqw,12
-json_repair-0.6.0.dist-info/RECORD,,