jsonata-python 0.2.0__tar.gz → 0.4.0__tar.gz

{jsonata_python-0.2.0 → jsonata_python-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: jsonata-python
-Version: 0.2.0
+Version: 0.4.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
@@ -217,7 +217,8 @@ Description-Content-Type: text/markdown
 
 # jsonata-python
 
-[![Build Status][github-actions-shield]][github-actions-link] [![NuGet Package](https://img.shields.io/pypi/v/jsonata-python.svg)](https://www.pypi.org/projects/jsonata-python)
+[![Build Status][github-actions-shield]][github-actions-link]
+[![PyPI](https://img.shields.io/pypi/v/jsonata-python.svg)](https://www.pypi.org/project/jsonata-python)
 
 [github-actions-shield]: https://github.com/rayokota/jsonata-python/actions/workflows/test.yml/badge.svg?branch=master
 [github-actions-link]: https://github.com/rayokota/jsonata-python/actions
@@ -227,7 +228,7 @@ Pure Python implementation of JSONata.
 This is a Python port of the  [JSONata reference implementation](https://github.com/jsonata-js/jsonata), 
 and also borrows from the [Dashjoin Java port](https://github.com/dashjoin/jsonata-java).
 
-This implementation supports 100% of the language features of JSONata, with no external depencencies.
+This implementation supports 100% of the language features of JSONata, with no external dependencies.
 The JSONata documentation can be found [here](https://jsonata.org).
 
 
@@ -335,4 +336,4 @@ nox --sessions tests
 
 ## Notes
 
-JSONata date/time functions that use ISO 8601 formats are only supported for Python 3.11+.
+JSONata date/time functions that use ISO 8601 formats are only supported with Python 3.11+.

{jsonata_python-0.2.0 → jsonata_python-0.4.0}/README.md

@@ -1,6 +1,7 @@
 # jsonata-python
 
-[![Build Status][github-actions-shield]][github-actions-link] [![NuGet Package](https://img.shields.io/pypi/v/jsonata-python.svg)](https://www.pypi.org/projects/jsonata-python)
+[![Build Status][github-actions-shield]][github-actions-link]
+[![PyPI](https://img.shields.io/pypi/v/jsonata-python.svg)](https://www.pypi.org/project/jsonata-python)
 
 [github-actions-shield]: https://github.com/rayokota/jsonata-python/actions/workflows/test.yml/badge.svg?branch=master
 [github-actions-link]: https://github.com/rayokota/jsonata-python/actions
@@ -10,7 +11,7 @@ Pure Python implementation of JSONata.
 This is a Python port of the  [JSONata reference implementation](https://github.com/jsonata-js/jsonata), 
 and also borrows from the [Dashjoin Java port](https://github.com/dashjoin/jsonata-java).
 
-This implementation supports 100% of the language features of JSONata, with no external depencencies.
+This implementation supports 100% of the language features of JSONata, with no external dependencies.
 The JSONata documentation can be found [here](https://jsonata.org).
 
 
@@ -118,4 +119,4 @@ nox --sessions tests
 
 ## Notes
 
-JSONata date/time functions that use ISO 8601 formats are only supported for Python 3.11+.
+JSONata date/time functions that use ISO 8601 formats are only supported with Python 3.11+.

{jsonata_python-0.2.0 → jsonata_python-0.4.0}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "jsonata-python"
-version = "0.2.0"
+version = "0.4.0"
 description = "Pure Python implementation of JSONata"
 readme = "README.md"
 requires-python = ">=3.9"

{jsonata_python-0.2.0 → jsonata_python-0.4.0}/src/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.2.0')
+        "-v", "--version", action='version', version='%(prog)s 0.4.0')
 
     parser.add_argument(
         "-e", "--expression", metavar="<file>",

{jsonata_python-0.2.0 → jsonata_python-0.4.0}/src/jsonata/datetimeutils.py

@@ -146,11 +146,7 @@ class DateTimeUtils:
     @staticmethod
     def words_to_number(text: str) -> int:
         parts = re.split(",\\s|\\sand\\s|[\\s\\-]", text)
-        values = [0 for _ in range(len(parts))]
-        i = 0
-        while i < len(parts):
-            values[i] = DateTimeUtils._word_values[parts[i]]
-            i += 1
+        values = [DateTimeUtils._word_values[part] for i, part in enumerate(parts)]
         segs = deque()
         segs.append(0)
         for value in values:
@@ -170,11 +166,7 @@ class DateTimeUtils:
     @staticmethod
     def words_to_long(text: str) -> int:
         parts = re.split(",\\s|\\sand\\s|[\\s\\-]", text)
-        values = [0 for _ in range(len(parts))]
-        i = 0
-        while i < len(parts):
-            values[i] = DateTimeUtils._word_values_long[parts[i]]
-            i += 1
+        values = [DateTimeUtils._word_values_long[part] for i, part in enumerate(parts)]
         segs = deque()
         segs.append(int(0))
         for value in values:
@@ -229,8 +221,7 @@ class DateTimeUtils:
     def roman_to_decimal(roman: str) -> int:
         decimal = 0
         max = 1
-        for i in range(len(roman) - 1, -1, -1):
-            digit = roman[i]
+        for i, digit in enumerate(reversed(roman)):
             value = DateTimeUtils._roman_values[digit]
             if value < max:
                 decimal -= value
@@ -416,8 +407,7 @@ class DateTimeUtils:
             separator_position = 0
             format_codepoints = list(primary_format)
             # ArrayUtils.reverse(format_codepoints)
-            for ix in range(len(format_codepoints) - 1, -1, -1):
-                code_point = format_codepoints[ix]
+            for ix, code_point in enumerate(reversed(format_codepoints)):
                 digit = False
                 i = 0
                 while i < len(DateTimeUtils._decimal_groups):

{jsonata_python-0.2.0 → jsonata_python-0.4.0}/src/jsonata/functions.py

@@ -569,7 +569,7 @@ class Functions:
     # @returns {Array} The array of match objects
     #     
     @staticmethod
-    def match_(string: Optional[str], regex: Optional[re.Pattern], limit: Optional[int]) -> Optional[list[dict]]:
+    def match_(string: Optional[str], regex: Optional[re.Pattern], limit: Optional[int]) -> Optional[list[dict[str, Any]]]:
         # undefined inputs always return undefined
         if string is None:
             return None
@@ -676,7 +676,7 @@ class Functions:
     # @return
     #     
     @staticmethod
-    def to_jsonata_match(mr: re.Match[str]) -> dict[str, str]:
+    def to_jsonata_match(mr: re.Match[str]) -> dict[str, list[str]]:
         obj = {"match": mr.group()}
 
         groups = []
@@ -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

{jsonata_python-0.2.0 → jsonata_python-0.4.0}/src/jsonata/jsonata.py

@@ -275,7 +275,7 @@ class Jsonata:
             elif expr.type == "regex":
                 result = self.evaluate_regex(expr)  # , input, environment);
             elif expr.type == "function":
-                result = self.evaluate_function(expr, input, environment, None)
+                result = self.evaluate_function(expr, input, environment, utils.Utils.NONE)
             elif expr.type == "variable":
                 result = self.evaluate_variable(expr, input, environment)
             elif expr.type == "lambda":
@@ -1274,11 +1274,6 @@ class Jsonata:
 
         lhs = self.eval(expr.lhs, input, environment)
 
-        # Map null to NULL_VALUE before applying to functions
-        # TODO: fix more generically!
-        if lhs is None:
-            lhs = utils.Utils.NULL_VALUE
-
         if expr.rhs.type == "function":
             # Symbol applyTo = new Symbol(); applyTo.context = lhs
             # this is a Object _invocation_; invoke it with lhs expression as the first argument
@@ -1348,7 +1343,7 @@ class Jsonata:
 
         evaluated_args = []
 
-        if applyto_context is not None:
+        if applyto_context is not utils.Utils.NONE:
             evaluated_args.append(applyto_context)
         # eager evaluation - evaluate the arguments
         args = expr.arguments if expr.arguments is not None else []

{jsonata_python-0.2.0 → jsonata_python-0.4.0}/tests/string_test.py

@@ -32,10 +32,24 @@ class TestString:
         assert jsonata.Jsonata("$string($)").evaluate({"a": str('\n')}) == "{\"a\":\"\\n\"}"
         assert jsonata.Jsonata("$string($)").evaluate({"a": "</"}) == "{\"a\":\"</\"}"
 
+    def test_replace(self):
+        assert jsonata.Jsonata("$replace('hello', '.', '')").evaluate(None) == "hello"
+        assert jsonata.Jsonata("$replace('hello', 'l', 'x')").evaluate(None) == "hexxo"
+        assert jsonata.Jsonata("$replace('h.ello', '.', '')").evaluate(None) == "hello"
+        assert jsonata.Jsonata("$replace('h.e.l.l.o', '.', '',2)").evaluate(None) == "hel.l.o"
+
     #
     # Additional $split tests
     #   
     def test_split(self):
+        # Splitting on an undefined value
+        res = jsonata.Jsonata("$split(a, '-')").evaluate({})
+        assert res == None
+
+        # Splitting on an undefined value, equivalent to above
+        res = jsonata.Jsonata("a ~> $split('-')").evaluate({})
+        assert res == None
+
         # Splitting empty string with empty separator must return empty list
         res = jsonata.Jsonata("$split('', '')").evaluate(None)
         assert res == []

jsonata_python-0.2.0/src/helloworld.json

@@ -1,4 +0,0 @@
-{
-  "a": "hello",
-  "b": " world"
-}

jsonata_python-0.2.0/tangible_generate_main.py

@@ -1,6 +0,0 @@
-def main():
-    jsonata.Generate.main([])
-
-if __name__ == "__main__":
-    main()
-