@mojir/lits 2.1.11 → 2.1.12

package/dist/cli/cli.js

@@ -92,7 +92,7 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-var version = "2.1.11";
+var version = "2.1.12";
 
 function getCodeMarker(sourceCodeInfo) {
     if (!sourceCodeInfo.position || !sourceCodeInfo.code)
@@ -12899,6 +12899,8 @@ var binaryOperators = [
     '|>', // pipe
 ];
 var otherOperators = [
+    '?', // conditional operator
+    ':', // conditional operator
     '->', // lambda
     '...', // rest
     '.', // property accessor
@@ -12908,17 +12910,12 @@ var otherOperators = [
 ];
 var symbolicOperators = __spreadArray(__spreadArray([], __read(binaryOperators), false), __read(otherOperators), false);
 var nonFunctionOperators = [
-    '??',
-    '&&',
-    '||',
     'comment',
     'cond',
     'def',
     'defined?',
-    // 'defn',
     'do',
     'doseq',
-    // 'fn',
     'if',
     'let',
     'loop',
@@ -13496,8 +13493,9 @@ function untokenize(tokenStream) {
     }, '');
 }
 
-var exponentiationPrecedence = 11;
-var binaryFunctionalOperatorPrecedence = 2;
+var exponentiationPrecedence = 12;
+var binaryFunctionalOperatorPrecedence = 3;
+var conditionalOperatorPrecedence = 1;
 var placeholderRegexp = /^\$([1-9]\d?)?$/;
 function withSourceCodeInfo(node, sourceCodeInfo) {
     if (sourceCodeInfo) {
@@ -13512,38 +13510,39 @@ function getPrecedence(operatorSign, sourceCodeInfo) {
         case '*': // multiplication
         case '/': // division
         case '%': // remainder
-            return 10;
+            return 11;
         case '+': // addition
         case '-': // subtraction
-            return 9;
+            return 10;
         case '<<': // left shift
         case '>>': // signed right shift
         case '>>>': // unsigned right shift
-            return 8;
+            return 9;
         case '++': // string concatenation
-            return 7;
+            return 8;
         case '<': // less than
         case '<=': // less than or equal
         case '≤': // less than or equal
         case '>': // greater than
         case '>=': // greater than or equal
         case '≥': // greater than or equal
-            return 6;
+            return 7;
         case '=': // equal
         case '!=': // not equal
         case '≠': // not equal
-            return 5;
+            return 6;
         case '&': // bitwise AND
         case 'xor': // bitwise XOR
         case '|': // bitwise OR
-            return 4;
+            return 5;
         case '&&': // logical AND
         case '||': // logical OR
         case '??': // nullish coalescing
-            return 3;
+            return 4;
+        // leave room for binaryFunctionalOperatorPrecedence = 3
         case '|>': // pipe
-            return 1;
-        // leave room for binaryFunctionalOperatorPrecedence = 2
+            return 2;
+        // leave room for conditionalOperatorPrecedence = 1
         /* v8 ignore next 2 */
         default:
             throw new LitsError("Unknown binary operator: ".concat(operatorSign), sourceCodeInfo);
@@ -13591,13 +13590,15 @@ function fromBinaryOperatorToNode(operator, symbolNode, left, right, sourceCodeI
         case '||':
         case '??':
             return withSourceCodeInfo([NodeTypes.SpecialExpression, [specialExpressionTypes[operatorName], [left, right]]], sourceCodeInfo);
-        /* v8 ignore next 10 */
+        /* v8 ignore next 11 */
         case '.':
         case ';':
         case ':=':
         case ',':
         case '->':
         case '...':
+        case '?':
+        case ':':
             throw new LitsError("Unknown binary operator: ".concat(operatorName), sourceCodeInfo);
         default:
             throw new LitsError("Unknown binary operator: ".concat(operatorName), sourceCodeInfo);
@@ -13713,6 +13714,19 @@ var Parser = /** @class */ (function () {
                 }
                 left = createNamedNormalExpressionNode(operatorSymbol, [left, right], operator[2]);
             }
+            else if ((operator === null || operator === void 0 ? void 0 : operator[1]) === '?') {
+                if (conditionalOperatorPrecedence <= precedence) {
+                    break;
+                }
+                this.advance();
+                var trueNode = this.parseExpression();
+                if (!isOperatorToken(this.peek(), ':')) {
+                    throw new LitsError('Expected :', this.peekSourceCodeInfo());
+                }
+                this.advance();
+                var falseNode = this.parseExpression();
+                left = withSourceCodeInfo([NodeTypes.SpecialExpression, [specialExpressionTypes.if, [left, trueNode, falseNode]]], left[2]);
+            }
             else {
                 break;
             }

package/dist/cli/src/tokenizer/operators.d.ts

@@ -1,5 +1,5 @@
 declare const binaryOperators: readonly ["^", "*", "/", "%", "+", "-", "<<", ">>", ">>>", "++", "<", "<=", "≤", ">", ">=", "≥", "=", "!=", "≠", "&", "xor", "|", "&&", "||", "??", "|>"];
-declare const symbolicOperators: readonly ["^", "*", "/", "%", "+", "-", "<<", ">>", ">>>", "++", "<", "<=", "≤", ">", ">=", "≥", "=", "!=", "≠", "&", "xor", "|", "&&", "||", "??", "|>", "->", "...", ".", ",", ":=", ";"];
+declare const symbolicOperators: readonly ["^", "*", "/", "%", "+", "-", "<<", ">>", ">>>", "++", "<", "<=", "≤", ">", ">=", "≥", "=", "!=", "≠", "&", "xor", "|", "&&", "||", "??", "|>", "?", ":", "->", "...", ".", ",", ":=", ";"];
 export declare function isFunctionOperator(operator: string): boolean;
 export type SymbolicBinaryOperator = typeof binaryOperators[number];
 export type SymbolicOperator = typeof symbolicOperators[number];

package/dist/index.esm.js

@@ -12936,6 +12936,8 @@ var binaryOperators = [
     '|>', // pipe
 ];
 var otherOperators = [
+    '?', // conditional operator
+    ':', // conditional operator
     '->', // lambda
     '...', // rest
     '.', // property accessor
@@ -12945,17 +12947,12 @@ var otherOperators = [
 ];
 var symbolicOperators = __spreadArray(__spreadArray([], __read(binaryOperators), false), __read(otherOperators), false);
 var nonFunctionOperators = [
-    '??',
-    '&&',
-    '||',
     'comment',
     'cond',
     'def',
     'defined?',
-    // 'defn',
     'do',
     'doseq',
-    // 'fn',
     'if',
     'let',
     'loop',
@@ -13533,8 +13530,9 @@ function untokenize(tokenStream) {
     }, '');
 }
 
-var exponentiationPrecedence = 11;
-var binaryFunctionalOperatorPrecedence = 2;
+var exponentiationPrecedence = 12;
+var binaryFunctionalOperatorPrecedence = 3;
+var conditionalOperatorPrecedence = 1;
 var placeholderRegexp = /^\$([1-9]\d?)?$/;
 function withSourceCodeInfo(node, sourceCodeInfo) {
     if (sourceCodeInfo) {
@@ -13549,38 +13547,39 @@ function getPrecedence(operatorSign, sourceCodeInfo) {
         case '*': // multiplication
         case '/': // division
         case '%': // remainder
-            return 10;
+            return 11;
         case '+': // addition
         case '-': // subtraction
-            return 9;
+            return 10;
         case '<<': // left shift
         case '>>': // signed right shift
         case '>>>': // unsigned right shift
-            return 8;
+            return 9;
         case '++': // string concatenation
-            return 7;
+            return 8;
         case '<': // less than
         case '<=': // less than or equal
         case '≤': // less than or equal
         case '>': // greater than
         case '>=': // greater than or equal
         case '≥': // greater than or equal
-            return 6;
+            return 7;
         case '=': // equal
         case '!=': // not equal
         case '≠': // not equal
-            return 5;
+            return 6;
         case '&': // bitwise AND
         case 'xor': // bitwise XOR
         case '|': // bitwise OR
-            return 4;
+            return 5;
         case '&&': // logical AND
         case '||': // logical OR
         case '??': // nullish coalescing
-            return 3;
+            return 4;
+        // leave room for binaryFunctionalOperatorPrecedence = 3
         case '|>': // pipe
-            return 1;
-        // leave room for binaryFunctionalOperatorPrecedence = 2
+            return 2;
+        // leave room for conditionalOperatorPrecedence = 1
         /* v8 ignore next 2 */
         default:
             throw new LitsError("Unknown binary operator: ".concat(operatorSign), sourceCodeInfo);
@@ -13628,13 +13627,15 @@ function fromBinaryOperatorToNode(operator, symbolNode, left, right, sourceCodeI
         case '||':
         case '??':
             return withSourceCodeInfo([NodeTypes.SpecialExpression, [specialExpressionTypes[operatorName], [left, right]]], sourceCodeInfo);
-        /* v8 ignore next 10 */
+        /* v8 ignore next 11 */
         case '.':
         case ';':
         case ':=':
         case ',':
         case '->':
         case '...':
+        case '?':
+        case ':':
             throw new LitsError("Unknown binary operator: ".concat(operatorName), sourceCodeInfo);
         default:
             throw new LitsError("Unknown binary operator: ".concat(operatorName), sourceCodeInfo);
@@ -13750,6 +13751,19 @@ var Parser = /** @class */ (function () {
                 }
                 left = createNamedNormalExpressionNode(operatorSymbol, [left, right], operator[2]);
             }
+            else if ((operator === null || operator === void 0 ? void 0 : operator[1]) === '?') {
+                if (conditionalOperatorPrecedence <= precedence) {
+                    break;
+                }
+                this.advance();
+                var trueNode = this.parseExpression();
+                if (!isOperatorToken(this.peek(), ':')) {
+                    throw new LitsError('Expected :', this.peekSourceCodeInfo());
+                }
+                this.advance();
+                var falseNode = this.parseExpression();
+                left = withSourceCodeInfo([NodeTypes.SpecialExpression, [specialExpressionTypes.if, [left, trueNode, falseNode]]], left[2]);
+            }
             else {
                 break;
             }