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

jsonata/functions.py

@@ -1570,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)
 
     #
@@ -2007,15 +2010,9 @@ class Functions:
             arg1 = utils.Utils.create_sequence(arg1)
         if not (isinstance(arg2, list)):
             arg2 = utils.Utils.JList([arg2])
-        # else
-        #     // Arg2 was a list: add it as a list element (don't flatten)
-        #     ((List)arg1).add((List)arg2)
 
         arg1 = utils.Utils.JList(arg1)  # create a new copy!
-        if isinstance(arg2, utils.Utils.JList) and arg2.cons:
-            arg1.append(arg2)
-        else:
-            arg1.extend(arg2)
+        arg1.extend(arg2)
         return arg1
 
     @staticmethod

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

@@ -1,7 +1,5 @@
 #
-# jsonata-java is the JSONata Java reference port
-# 
-# Copyright Dashjoin GmbH. https://dashjoin.com
+# Copyright Robert Yokota
 # 
 # Licensed under the Apache License, Version 2.0 (the "License")
 # you may not use this file except in compliance with the License.
@@ -307,6 +305,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.4.0.dist-info → jsonata_python-0.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: jsonata-python
-Version: 0.4.0
+Version: 0.5.1
 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
@@ -207,7 +207,6 @@ License: Apache License
            See the License for the specific language governing permissions and
            limitations under the License.
         
-License-File: LICENSE
 Keywords: json,jsonata
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: Apache Software License

{jsonata_python-0.4.0.dist-info → jsonata_python-0.5.1.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=CnbOa_C1cOxjch23bnEX-2PLfQ0ju3SyHN6c988vq58,75605
+jsonata/functions.py,sha256=giAtWZ92cOlnBcH7Zkapnib-LPSPyBFHrz-9AMdkhqQ,75500
 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=j7eNKUuGx_9vCt5Qv8BPM7iV5vH26U0Kx8zrkDcctME,20194
 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=feeC7SseB0jundIG7FiZE89fw1McrSjLn3kZofJB0pc,6971
-jsonata_python-0.4.0.dist-info/METADATA,sha256=rqzmGkyO3-moYxtXyNtq407d3rVrEdjXhGPrywntU5k,17297
-jsonata_python-0.4.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-jsonata_python-0.4.0.dist-info/licenses/LICENSE,sha256=y16Ofl9KOYjhBjwULGDcLfdWBfTEZRXnduOspt-XbhQ,11325
-jsonata_python-0.4.0.dist-info/RECORD,,
+jsonata/cli/__main__.py,sha256=G3bgRulCyS6nekd_7ulbsfJpWewQmZgiYylBREHgJx8,6971
+jsonata_python-0.5.1.dist-info/METADATA,sha256=CHwsN5yZbO2z5AIiI6_tJxoh58Op91MYL2TCD26Ow6M,17275
+jsonata_python-0.5.1.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+jsonata_python-0.5.1.dist-info/licenses/LICENSE,sha256=y16Ofl9KOYjhBjwULGDcLfdWBfTEZRXnduOspt-XbhQ,11325
+jsonata_python-0.5.1.dist-info/RECORD,,

{jsonata_python-0.4.0.dist-info → jsonata_python-0.5.1.dist-info}/WHEEL

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