Upgrade to jsonata 2.1.0

Author: rayokota

jsonata

@@ -441,6 +441,13 @@ def pad(string: Optional[str], width: Optional[int], char: Optional[str]) -> Opt
         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:

src/jsonata/functions.py

@@ -529,6 +529,12 @@ def __init__(self):
         # 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 @@ def led(self, left):
                 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'
 

src/jsonata/parser.py

@@ -65,6 +65,8 @@ class Tokenizer:
         '<=': 40,
         '>=': 40,
         '~>': 40,
+        '?:': 40,
+        '??': 40,
         'and': 30,
         'or': 25,
         'in': 40,
@@ -216,6 +218,14 @@ def next(self, prefix: bool) -> Optional[Token]:
             # ~>  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