jsonata-python 0.2.0__py3-none-any.whl → 0.3.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.2.0')
+        "-v", "--version", action='version', version='%(prog)s 0.3.0')
 
     parser.add_argument(
         "-e", "--expression", metavar="<file>",

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/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 = []

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.dist-info → jsonata_python-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: jsonata-python
-Version: 0.2.0
+Version: 0.3.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.dist-info → jsonata_python-0.3.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=u63pxK-508hFD3usZBNUCoBbbHnn24aUN2bIpvrphNc,48810
-jsonata/functions.py,sha256=igWTB7EFXO9uEqn-iCbfs9PvLqb8E5SsxKum64dPLpk,73244
+jsonata/datetimeutils.py,sha256=IzU6y-vwyhwobHyw9rsImBye-RfWDV7K8Vk0Xs-yiG0,48567
+jsonata/functions.py,sha256=VAHFQtXQI7tY-EVwIrku95jKniUimTTKY6-exBTQo1k,73260
 jsonata/jexception.py,sha256=6Jz7WMsIiNlQ7-1Hq8RKiE2HxcHq2PDekw0qsSe3lqo,12885
-jsonata/jsonata.py,sha256=p3BZOFiKJs5wrhohLht5DgMJErk0XEUW5k4DaFPIYLg,84389
+jsonata/jsonata.py,sha256=jZIxVrNcZI3aBvE0PURZ4-cxpaK9JiJVH5Q_cllCXS0,84247
 jsonata/parser.py,sha256=OSxO9eNQy2WrDOPX_Obow487PWwngRN7bCMtDoK55AI,53794
 jsonata/signature.py,sha256=zTO9zmT7XzxA4GHYf2Rgquu419D7UZ-NYzIwiqqNvCM,20184
 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=OBv_dtdBjhUt-oB5O4Je9_Nf02DAwKYjkpBVyCT5Qz4,6971
-jsonata_python-0.2.0.dist-info/METADATA,sha256=3F8-ikcGYtAYcry63fIhpGLys0Wewtip88183L1DjK8,17306
-jsonata_python-0.2.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-jsonata_python-0.2.0.dist-info/licenses/LICENSE,sha256=y16Ofl9KOYjhBjwULGDcLfdWBfTEZRXnduOspt-XbhQ,11325
-jsonata_python-0.2.0.dist-info/RECORD,,
+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_python-0.2.0.dist-info → jsonata_python-0.3.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.24.2
+Generator: hatchling 1.25.0
 Root-Is-Purelib: true
 Tag: py3-none-any