jsonata-python 0.3.0__py3-none-any.whl → 0.5.0__py3-none-any.whl

jsonata/cli/__main__.py

@@ -34,7 +34,7 @@ def get_options(argv: Optional[list[str]] = None) -> argparse.ArgumentParser:
     """
     parser = argparse.ArgumentParser(prog="jsonata.cli", description="Pure Python JSONata CLI")
     parser.add_argument(
-        "-v", "--version", action='version', version='%(prog)s 0.3.0')
+        "-v", "--version", action='version', version='%(prog)s 0.5.0')
 
     parser.add_argument(
         "-e", "--expression", metavar="<file>",

jsonata/functions.py

@@ -755,22 +755,82 @@ class Functions:
         if isinstance(pattern, str):
             if not pattern:
                 raise jexception.JException("Second argument of replace function cannot be an empty string", 0)
-        if limit is None:
-            if isinstance(pattern, str):
-                return re.sub(pattern, str(replacement), string)
-            else:
-                return Functions.safe_replace_all(string, pattern, replacement)
-        else:
+        
+        if limit is not None and limit < 0:
+            raise jexception.JException("Fourth argument of replace function must evaluate to a positive number", 0)
+
+        def string_replacer(match):
+            result = ''
+            position = 0
+            repl = str(replacement)
+            while position < len(repl):
+                index = repl.find('$', position)
+                if index == -1:
+                    result += repl[position:]
+                    break
+                result += repl[position:index]
+                position = index + 1
+                if position < len(repl):
+                    dollar_val = repl[position]
+                    if dollar_val == '$':
+                        result += '$'
+                        position += 1
+                    elif dollar_val == '0':
+                        result += match.group(0)
+                        position += 1
+                    else:
+                        max_digits = len(str(len(match.groups())))
+                        group_num = repl[position:position+max_digits]
+                        if group_num.isdigit():
+                            group_index = int(group_num)
+                            if 0 < group_index <= len(match.groups()):
+                                result += match.group(group_index) or ''
+                                position += len(group_num)
+                            else:
+                                result += '$'
+                        else:
+                            result += '$'
+                else:
+                    result += '$'
+            return result
 
-            if limit < 0:
-                raise jexception.JException("Fourth argument of replace function must evaluate to a positive number", 0)
+        if callable(replacement):
+            replacer = lambda m: replacement(m.groupdict())
+        elif isinstance(replacement, str):
+            replacer = string_replacer
+        else:
+            replacer = lambda m: str(replacement)
 
-            for i in range(0, limit):
-                if isinstance(pattern, str):
-                    string = re.sub(pattern, str(replacement), string, 1)
-                else:
-                    string = Functions.safe_replace_first(string, pattern, str(replacement))
-            return string
+        if isinstance(pattern, str):
+            # Use string methods for literal string patterns
+            result = ''
+            position = 0
+            count = 0
+            while True:
+                if limit is not None and count >= limit:
+                    result += string[position:]
+                    break
+                index = string.find(pattern, position)
+                if index == -1:
+                    result += string[position:]
+                    break
+                result += string[position:index]
+                match = re.match(re.escape(pattern), string[index:])
+                result += replacer(match)
+                position = index + len(pattern)
+                count += 1
+            return result
+        else:
+            # Use regex for pattern objects
+            if limit is None:
+                return Functions.safe_replace_all(string, pattern, replacement)
+            else:
+                count = 0
+                result = string
+                while count < limit:
+                    result = Functions.safe_replace_first(result, pattern, str(replacement))
+                    count += 1
+                return result
 
     #
     # Base64 encode a string
@@ -1510,8 +1570,11 @@ class Functions:
         from jsonata import jsonata
         if isinstance(func, jsonata.Jsonata.JFunction):
             return func.signature.get_min_number_of_args()
+        elif isinstance(func, jsonata.Jsonata.JLambda):
+            from inspect import signature
+
+            return len(signature(func.function).parameters)
         else:
-            # Lambda
             return len(func.arguments)
 
     #

jsonata/parser.py

@@ -1180,6 +1180,7 @@ class Parser:
                 result.position = expr.position
                 result.lhs = self.process_ast(expr.lhs)
                 result.rhs = self.process_ast(expr.rhs)
+                result.keep_array = result.lhs.keep_array or result.rhs.keep_array
             else:
                 result = Parser.Infix(self, None)
                 result.type = expr.type

jsonata/signature.py

@@ -307,6 +307,7 @@ class Signature:
                             validated_args.append(arg)
                             arg_index += 1
                         else:
+                            arg = args[arg_index] if arg_index < len(args) else None
                             validated_args.append(arg)
                             arg_index += 1
             return validated_args

{jsonata_python-0.3.0.dist-info → jsonata_python-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: jsonata-python
-Version: 0.3.0
+Version: 0.5.0
 Summary: Pure Python implementation of JSONata
 Project-URL: Homepage, https://github.com/rayokota/jsonata-python
 Project-URL: Bug Reports, https://github.com/rayokota/jsonata-python/issues

{jsonata_python-0.3.0.dist-info → jsonata_python-0.5.0.dist-info}/RECORD

@@ -1,17 +1,17 @@
 jsonata/__init__.py,sha256=4r8USHj4SoBy_TD8dLxt9HJIgpLfXApFrZBipi4rgr0,388
 jsonata/constants.py,sha256=WtdH_l_s5KD-SiOJ4GR2az7WpVgKB2HguXUnyfy4tvs,3017
 jsonata/datetimeutils.py,sha256=IzU6y-vwyhwobHyw9rsImBye-RfWDV7K8Vk0Xs-yiG0,48567
-jsonata/functions.py,sha256=VAHFQtXQI7tY-EVwIrku95jKniUimTTKY6-exBTQo1k,73260
+jsonata/functions.py,sha256=FryvSvotfvoUvLy0Kem1RvHudCrTJL-YK0d23xDq6l8,75743
 jsonata/jexception.py,sha256=6Jz7WMsIiNlQ7-1Hq8RKiE2HxcHq2PDekw0qsSe3lqo,12885
 jsonata/jsonata.py,sha256=jZIxVrNcZI3aBvE0PURZ4-cxpaK9JiJVH5Q_cllCXS0,84247
-jsonata/parser.py,sha256=OSxO9eNQy2WrDOPX_Obow487PWwngRN7bCMtDoK55AI,53794
-jsonata/signature.py,sha256=zTO9zmT7XzxA4GHYf2Rgquu419D7UZ-NYzIwiqqNvCM,20184
+jsonata/parser.py,sha256=U8nNxvsDIy0wVTfNCs2DNN7RjNVm0SqfociD9cRcsWM,53877
+jsonata/signature.py,sha256=pP6Y8XHUkFYqSsKwLSl0mX3Dz5TXJpTdXM-3TE2Lf48,20269
 jsonata/timebox.py,sha256=bnevNR_ONvKUiIZCJZEWsRiR0gCWTGOwn5RCY7dKqYc,2861
 jsonata/tokenizer.py,sha256=6WMK6M-XxmOwPtr7ZqWMTtaZPdGFhVMcGHxQlP97jdk,11856
 jsonata/utils.py,sha256=U13I49Ie3hEn3PKGR4361TPengDAkbyHmwipDFZJlXo,5192
 jsonata/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jsonata/cli/__main__.py,sha256=pzzkZomVSkoDpiWg1f_0-TrC5uLHg1wu2aNYNPnT3zM,6971
-jsonata_python-0.3.0.dist-info/METADATA,sha256=29v4aOPgmo8ZKgPUy49Mq0kHf7ewahj1j9bYP6p8H1w,17297
-jsonata_python-0.3.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-jsonata_python-0.3.0.dist-info/licenses/LICENSE,sha256=y16Ofl9KOYjhBjwULGDcLfdWBfTEZRXnduOspt-XbhQ,11325
-jsonata_python-0.3.0.dist-info/RECORD,,
+jsonata/cli/__main__.py,sha256=fXmXJ5YcxEP6ih8rguW64HymAXorC1tjrbrZ9V9TKQU,6971
+jsonata_python-0.5.0.dist-info/METADATA,sha256=eqwggupt-9XE2Oooomxad_mKAyWy-mRoO4_bUi0EPFo,17297
+jsonata_python-0.5.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+jsonata_python-0.5.0.dist-info/licenses/LICENSE,sha256=y16Ofl9KOYjhBjwULGDcLfdWBfTEZRXnduOspt-XbhQ,11325
+jsonata_python-0.5.0.dist-info/RECORD,,