jsonata-python 0.5.3__py3-none-any.whl → 0.6.1__py3-none-any.whl

jsonata/cli/__main__.py

@@ -32,9 +32,9 @@ from jsonata import functions, jexception, jsonata, timebox
 def get_options(argv: Optional[list[str]] = None) -> argparse.ArgumentParser:
     """Parses command-line arguments.
     """
-    parser = argparse.ArgumentParser(prog="jsonata.cli", description="Pure Python JSONata CLI")
+    parser = argparse.ArgumentParser(prog="jsonata", description="Pure Python JSONata CLI")
     parser.add_argument(
-        "-v", "--version", action='version', version='%(prog)s 0.5.3')
+        "-v", "--version", action='version', version='%(prog)s 0.6.1')
 
     parser.add_argument(
         "-e", "--expression", metavar="<file>",

jsonata/functions.py

@@ -441,6 +441,13 @@ class Functions:
         if char is None or not char:
             char = " "
 
+        # match JS: truncate width to integer
+        if width is not None:
+            try:
+                width = int(width)
+            except Exception:
+                width = 0
+
         if width < 0:
             result = Functions.left_pad(string, -width, char)
         else:
@@ -722,7 +729,7 @@ class Functions:
         r = None
         for i in range(0, 10):
             try:
-                r = re.sub(pattern, replacement, s, 1)
+                r = re.sub(pattern, replacement, s, count=1)
                 break
             except Exception as e:
                 msg = str(e)
@@ -2098,7 +2105,8 @@ class Functions:
                 dt = datetime.datetime.strptime(timestamp, "%Y")
             else:
                 dt = datetime.datetime.fromisoformat(timestamp)
-            dt = dt.replace(tzinfo=datetime.timezone.utc)
+            if dt.tzinfo is None:
+                dt = dt.replace(tzinfo=datetime.timezone.utc)
             return int(dt.timestamp() * 1000)
             # try:
             #     size = len(timestamp)

jsonata/jsonata.py

@@ -800,9 +800,9 @@ class Jsonata:
 
         result = None
         if op == "=":
-            result = lhs == rhs  # isDeepEqual(lhs, rhs);
+            result = utils.Utils.is_deep_equal(lhs, rhs)
         elif op == "!=":
-            result = lhs != rhs  # !isDeepEqual(lhs, rhs);
+            result = not utils.Utils.is_deep_equal(lhs, rhs)
         return result
 
     #

jsonata/parser.py

@@ -529,6 +529,12 @@ class Parser:
         # if/then/else ternary operator ?:
         self.register(Parser.InfixTernaryOperator(self, tokenizer.Tokenizer.operators["?"]))
 
+        # coalescing operator ??
+        self.register(Parser.InfixCoalesce(self, tokenizer.Tokenizer.operators["??"]))
+
+        # elvis/default operator ?:
+        self.register(Parser.InfixDefault(self, tokenizer.Tokenizer.operators["?:"]))
+
         # object transformer
         self.register(Parser.PrefixObjectTransformer(self))
 
@@ -854,6 +860,43 @@ class Parser:
                 self._else = self._outer_instance.expression(0)
             return self
 
+    class InfixCoalesce(Infix):
+        _outer_instance: 'Parser'
+
+        def __init__(self, outer_instance, get):
+            super().__init__(outer_instance, "??", get)
+            self._outer_instance = outer_instance
+
+        def led(self, left):
+            self.type = "condition"
+            # condition becomes function exists(left)
+            cond = Parser.Symbol(self._outer_instance)
+            cond.type = "function"
+            cond.value = "("
+            proc = Parser.Symbol(self._outer_instance)
+            proc.type = "variable"
+            proc.value = "exists"
+            cond.procedure = proc
+            cond.arguments = [left]
+            self.condition = cond
+            self.then = left
+            self._else = self._outer_instance.expression(0)
+            return self
+
+    class InfixDefault(Infix):
+        _outer_instance: 'Parser'
+
+        def __init__(self, outer_instance, get):
+            super().__init__(outer_instance, "?:", get)
+            self._outer_instance = outer_instance
+
+        def led(self, left):
+            self.type = "condition"
+            self.condition = left
+            self.then = left
+            self._else = self._outer_instance.expression(0)
+            return self
+
     class PrefixObjectTransformer(Prefix):
         _outer_instance: 'Parser'
 

jsonata/tokenizer.py

@@ -65,6 +65,8 @@ class Tokenizer:
         '<=': 40,
         '>=': 40,
         '~>': 40,
+        '?:': 40,
+        '??': 40,
         'and': 30,
         'or': 25,
         'in': 40,
@@ -216,6 +218,14 @@ class Tokenizer:
             # ~>  chain function
             self.position += 2
             return self.create("operator", "~>")
+        if current_char == '?' and have_more and self.path[self.position + 1] == ':':
+            # ?: default / elvis operator
+            self.position += 2
+            return self.create("operator", "?:")
+        if current_char == '?' and have_more and self.path[self.position + 1] == '?':
+            # ?? coalescing operator
+            self.position += 2
+            return self.create("operator", "??")
         # test for single char operators
         if Tokenizer.operators.get(str(current_char)) is not None:
             self.position += 1

jsonata/utils.py

@@ -90,6 +90,27 @@ class Utils:
         sequence.sequence = True
         return sequence
 
+    @staticmethod
+    def is_deep_equal(lhs: Optional[Any], rhs: Optional[Any]) -> bool:
+        if isinstance(lhs, list) and isinstance(rhs, list):
+            if len(lhs) != len(rhs):
+                return False
+            for ii, _ in enumerate(lhs):
+                if not Utils.is_deep_equal(lhs[ii], rhs[ii]):
+                    return False
+            return True
+        elif isinstance(lhs, dict) and isinstance(rhs, dict):
+            if lhs.keys() != rhs.keys():
+                return False
+            for key in lhs.keys():
+                if not Utils.is_deep_equal(lhs[key], rhs[key]):
+                    return False
+            return True
+        if lhs == rhs and type(lhs) == type(rhs):
+            return True
+
+        return False
+
     class JList(list):
         sequence: bool
         outer_wrapper: bool

{jsonata_python-0.5.3.dist-info → jsonata_python-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jsonata-python
-Version: 0.5.3
+Version: 0.6.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
@@ -235,7 +235,7 @@ The JSONata documentation can be found [here](https://jsonata.org).
 ## Installation
 
 ```
-pip install jsonata-python
+pipx install jsonata-python
 ```
 
 ## Getting Started
@@ -256,8 +256,8 @@ A very simple start:
 The CLI provides the same functionality as the [Dashjoin JSONata CLI](https://github.com/dashjoin/jsonata-cli).
 
 ```
-% python3 -m jsonata.cli
-usage: jsonata.cli [-h] [-v] [-e <file>] [-i <arg>] [-ic <arg>] [-f {auto,json,string}] [-o <arg>] [-oc <arg>] [-time] [-c] [-b <json-string>]
+% jsonata -h
+usage: jsonata [-h] [-v] [-e <file>] [-i <arg>] [-ic <arg>] [-f {auto,json,string}] [-o <arg>] [-oc <arg>] [-time] [-c] [-b <json-string>]
                    [-bf <file>] [-it]
                    [expr]
 
@@ -293,19 +293,19 @@ options:
 ### Examples
 
 ```
-% echo '{"a":"hello", "b":" world"}' | python3 -m jsonata.cli '(a & b)'
+% echo '{"a":"hello", "b":" world"}' | jsonata '(a & b)'
 hello world
 
-% echo '{"a":"hello", "b":" world"}' | python3 -m jsonata.cli -o helloworld.json $
+% echo '{"a":"hello", "b":" world"}' | jsonata -o helloworld.json $
 # helloworld.json written
 
-% ls | python3 -m jsonata.cli $
+% ls | jsonata $
 helloworld.json
 
-% ps -o pid="",%cpu="",%mem="" | python3 -m jsonata.cli '$.$split(/\n/).$trim().[ $split(/\s+/)[$length()>0].$number() ]' -c
+% ps -o pid="",%cpu="",%mem="" | jsonata '$.$split(/\n/).$trim().[ $split(/\s+/)[$length()>0].$number() ]' -c
 [[4105,0,0],[4646,0,0],[4666,0,0],[33696,0,0]...]
 
-% curl -s https://raw.githubusercontent.com/jsonata-js/jsonata/master/test/test-suite/datasets/dataset1.json | python3 -m jsonata.cli '{"Name": FirstName & " " & Surname, "Cities": **.City, "Emails": Email[type="home"].address}'
+% curl -s https://raw.githubusercontent.com/jsonata-js/jsonata/master/test/test-suite/datasets/dataset1.json | jsonata '{"Name": FirstName & " " & Surname, "Cities": **.City, "Emails": Email[type="home"].address}'
 {
   "Name": "Fred Smith",
   "Cities": [
@@ -318,7 +318,7 @@ helloworld.json
   ]
 }
 
-% python3 -m jsonata.cli -i helloworld.json -it
+% jsonata -i helloworld.json -it
 Enter an expression to have it evaluated.
 JSONata> (a & b)
 hello world

jsonata_python-0.6.1.dist-info/RECORD

@@ -0,0 +1,18 @@
+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=it09GOcMOJ2XDlvh_yhf-bgABaHMTrUFhzXa0kUsrNk,75729
+jsonata/jexception.py,sha256=6Jz7WMsIiNlQ7-1Hq8RKiE2HxcHq2PDekw0qsSe3lqo,12885
+jsonata/jsonata.py,sha256=YmLrus5eBOdcGIzV6nEzsFOkBRJvosE-3bjpdQZVISg,84248
+jsonata/parser.py,sha256=dzZ6PeM5l3scTHq4DzCXt4FSRO49yzYEk7XqspCcHNU,55359
+jsonata/signature.py,sha256=j7eNKUuGx_9vCt5Qv8BPM7iV5vH26U0Kx8zrkDcctME,20194
+jsonata/timebox.py,sha256=bnevNR_ONvKUiIZCJZEWsRiR0gCWTGOwn5RCY7dKqYc,2861
+jsonata/tokenizer.py,sha256=6noGxO1L_n2V-Uva5oV044Xx0p08Gm7-XXSfLEG4rR0,12429
+jsonata/utils.py,sha256=WDs-z5JRJ5pUEpmAwUY3xgDFxEIsvTqZXp8UX6cNSpQ,5952
+jsonata/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jsonata/cli/__main__.py,sha256=x1cz-w1NYBb_UNJuDnwqmGaz1SdfHwpMjKXIz5GQG-A,7121
+jsonata_python-0.6.1.dist-info/METADATA,sha256=lNCEnZXUk7pzV8kP9unZq0AVkNoB2ZngEPbdfiaoUO8,17337
+jsonata_python-0.6.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+jsonata_python-0.6.1.dist-info/entry_points.txt,sha256=a-W2yyT3IPhcC1q12BhKPcWnjNi3NXTZ3ZxoI9_UK88,54
+jsonata_python-0.6.1.dist-info/licenses/LICENSE,sha256=y16Ofl9KOYjhBjwULGDcLfdWBfTEZRXnduOspt-XbhQ,11325
+jsonata_python-0.6.1.dist-info/RECORD,,

{jsonata_python-0.5.3.dist-info → jsonata_python-0.6.1.dist-info}/WHEEL

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

jsonata_python-0.6.1.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+jsonata = jsonata.cli.__main__:main

jsonata_python-0.5.3.dist-info/RECORD

@@ -1,17 +0,0 @@
-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=giAtWZ92cOlnBcH7Zkapnib-LPSPyBFHrz-9AMdkhqQ,75500
-jsonata/jexception.py,sha256=6Jz7WMsIiNlQ7-1Hq8RKiE2HxcHq2PDekw0qsSe3lqo,12885
-jsonata/jsonata.py,sha256=jZIxVrNcZI3aBvE0PURZ4-cxpaK9JiJVH5Q_cllCXS0,84247
-jsonata/parser.py,sha256=U8nNxvsDIy0wVTfNCs2DNN7RjNVm0SqfociD9cRcsWM,53877
-jsonata/signature.py,sha256=j7eNKUuGx_9vCt5Qv8BPM7iV5vH26U0Kx8zrkDcctME,20194
-jsonata/timebox.py,sha256=bnevNR_ONvKUiIZCJZEWsRiR0gCWTGOwn5RCY7dKqYc,2861
-jsonata/tokenizer.py,sha256=X-JsARtkBIN6bO8_TElpw3SCageQMtfBWlexuhG2Sds,11982
-jsonata/utils.py,sha256=U13I49Ie3hEn3PKGR4361TPengDAkbyHmwipDFZJlXo,5192
-jsonata/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jsonata/cli/__main__.py,sha256=d_tNQ3Y_yN9o_NzBip8LdhsAVLAAA62GeowFKc6zx3Y,7125
-jsonata_python-0.5.3.dist-info/METADATA,sha256=_qkeeFX_iFWyljejtPGrx3Xjt8mgkX0tKIkTk_-uNlc,17442
-jsonata_python-0.5.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-jsonata_python-0.5.3.dist-info/licenses/LICENSE,sha256=y16Ofl9KOYjhBjwULGDcLfdWBfTEZRXnduOspt-XbhQ,11325
-jsonata_python-0.5.3.dist-info/RECORD,,