jsonata-python 0.5.2__py3-none-any.whl → 0.6.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.5.2')
+        "-v", "--version", action='version', version='%(prog)s 0.6.0')
 
     parser.add_argument(
         "-e", "--expression", metavar="<file>",
@@ -54,7 +54,7 @@ def get_options(argv: Optional[list[str]] = None) -> argparse.ArgumentParser:
     )
     parser.add_argument(
         "-o", "--output", metavar="<arg>",
-        help="JSON output file (- for stdin)"
+        help="JSON output file (default=stdout)"
     )
     parser.add_argument(
         "-oc", "--ocharset", default="utf-8", metavar="<arg>",
@@ -78,7 +78,7 @@ def get_options(argv: Optional[list[str]] = None) -> argparse.ArgumentParser:
     )
     parser.add_argument(
         "-it", "--interactive", default=False, action="store_true",
-        help="Interactive REPL"
+        help="Interactive REPL (requires input file)"
     )
 
     # The expression
@@ -160,8 +160,9 @@ def main(argv: Optional[list[str]] = None) -> int:
     options = parser.parse_args(argv)
 
     if options.expression is None and options.expr is None:
-        parser.print_help()
-        return 1
+        if not options.interactive:
+            parser.print_help()
+            return 1
 
     icharset = options.icharset
     ocharset = options.icharset
@@ -187,6 +188,9 @@ def main(argv: Optional[list[str]] = None) -> int:
         bindings = json.loads(bindings_str)
 
     if options.input == '-' or options.input is None:
+        if options.interactive:
+            parser.print_help()
+            return 1
         input = sys.stdin.read()
     else:
         with open(options.input, 'r', encoding=icharset) as fd:

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)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jsonata-python
-Version: 0.5.2
+Version: 0.6.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
@@ -278,7 +278,7 @@ options:
   -f {auto,json,string}, --format {auto,json,string}
                         Input format (default=auto)
   -o <arg>, --output <arg>
-                        JSON output file (- for stdin)
+                        JSON output file (default=stdout)
   -oc <arg>, --ocharset <arg>
                         Output character set (default=utf-8)
   -time                 Print performance timers to stderr
@@ -287,7 +287,7 @@ options:
                         JSONata variable bindings
   -bf <file>, --bindings-file <file>
                         JSONata variable bindings file
-  -it, --interactive    Interactive REPL
+  -it, --interactive    Interactive REPL (requires input file)
 ```
 
 ### Examples
@@ -317,6 +317,11 @@ helloworld.json
     "frederic.smith@very-serious.com"
   ]
 }
+
+% python3 -m jsonata.cli -i helloworld.json -it
+Enter an expression to have it evaluated.
+JSONata> (a & b)
+hello world
 ```
 
 ## Running Tests

{jsonata_python-0.5.2.dist-info → jsonata_python-0.6.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=giAtWZ92cOlnBcH7Zkapnib-LPSPyBFHrz-9AMdkhqQ,75500
+jsonata/functions.py,sha256=2vip5OJt8VMprF1vOnvr3iCQQlLGbfOItQ3MwDXzCTM,75691
 jsonata/jexception.py,sha256=6Jz7WMsIiNlQ7-1Hq8RKiE2HxcHq2PDekw0qsSe3lqo,12885
 jsonata/jsonata.py,sha256=jZIxVrNcZI3aBvE0PURZ4-cxpaK9JiJVH5Q_cllCXS0,84247
-jsonata/parser.py,sha256=U8nNxvsDIy0wVTfNCs2DNN7RjNVm0SqfociD9cRcsWM,53877
+jsonata/parser.py,sha256=dzZ6PeM5l3scTHq4DzCXt4FSRO49yzYEk7XqspCcHNU,55359
 jsonata/signature.py,sha256=j7eNKUuGx_9vCt5Qv8BPM7iV5vH26U0Kx8zrkDcctME,20194
 jsonata/timebox.py,sha256=bnevNR_ONvKUiIZCJZEWsRiR0gCWTGOwn5RCY7dKqYc,2861
-jsonata/tokenizer.py,sha256=X-JsARtkBIN6bO8_TElpw3SCageQMtfBWlexuhG2Sds,11982
+jsonata/tokenizer.py,sha256=6noGxO1L_n2V-Uva5oV044Xx0p08Gm7-XXSfLEG4rR0,12429
 jsonata/utils.py,sha256=U13I49Ie3hEn3PKGR4361TPengDAkbyHmwipDFZJlXo,5192
 jsonata/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jsonata/cli/__main__.py,sha256=MMJkVvYUzbWMG5_I142RINTmQntgL17LQKNs1iv1pn4,6971
-jsonata_python-0.5.2.dist-info/METADATA,sha256=Oozc2sFoZzLB2IKV33eI9omuQJtsqln4UmjgtnzvxGU,17297
-jsonata_python-0.5.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-jsonata_python-0.5.2.dist-info/licenses/LICENSE,sha256=y16Ofl9KOYjhBjwULGDcLfdWBfTEZRXnduOspt-XbhQ,11325
-jsonata_python-0.5.2.dist-info/RECORD,,
+jsonata/cli/__main__.py,sha256=xfwJE5nkt6tYH__Zk1PQ_R0idkmQq1XcAKRFt3-bTEo,7125
+jsonata_python-0.6.0.dist-info/METADATA,sha256=m_Srw48y9PCRzQYzqZz6TJM7mU73pWddDhw9FXEGLOo,17442
+jsonata_python-0.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+jsonata_python-0.6.0.dist-info/licenses/LICENSE,sha256=y16Ofl9KOYjhBjwULGDcLfdWBfTEZRXnduOspt-XbhQ,11325
+jsonata_python-0.6.0.dist-info/RECORD,,