json-repair 0.29.9__tar.gz → 0.30.0__tar.gz

{json_repair-0.29.9/src/json_repair.egg-info → json_repair-0.30.0}/PKG-INFO

@@ -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.29.9 → json_repair-0.30.0}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61.0"]
 build-backend = "setuptools.build_meta"
 [project]
 name = "json_repair"
-version = "0.29.9"
+version = "0.30.0"
 license = {file = "LICENSE"}
 authors = [
   { name="Stefano Baccianella", email="4247706+mangiucugna@users.noreply.github.com" },

{json_repair-0.29.9 → json_repair-0.30.0}/src/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-0.29.9 → json_repair-0.30.0}/src/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 → json_repair-0.30.0/src/json_repair.egg-info}/PKG-INFO

@@ -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.29.9 → json_repair-0.30.0}/tests/test_json_repair.py

@@ -145,6 +145,9 @@ def test_object_edge_cases():
     assert repair_json('{"lorem_ipsum": "sic tamet, quick brown fox. }') == '{"lorem_ipsum": "sic tamet, quick brown fox."}'
     assert repair_json('{"key":value, " key2":"value2" }') == '{"key": "value", " key2": "value2"}'
     assert repair_json('{"key":value "key2":"value2" }') == '{"key": "value", "key2": "value2"}'
+    assert repair_json("{'text': 'words{words in brackets}more words'}") == '{"text": "words{words in brackets}more words"}'
+    assert repair_json('{text:words{words in brackets}}') == '{"text": "words{words in brackets}"}'
+    assert repair_json('{text:words{words in brackets}m}') == '{"text": "words{words in brackets}m"}'
 
 def test_number_edge_cases():
     assert repair_json(' - { "test_key": ["test_value", "test_value2"] }') == '{"test_key": ["test_value", "test_value2"]}'

{json_repair-0.29.9 → json_repair-0.30.0}/src/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