@mojir/lits 2.1.33 → 2.1.35

package/dist/lits.iife.js

@@ -14562,6 +14562,48 @@ var Lits = (function (exports) {
                 docString,
             ];
         };
+        Parser.prototype.parseImplicitBlock = function (ends) {
+            var nodes = [];
+            while (!this.isAtEnd() && !this.isImplicitBlockEnd(ends)) {
+                if (isOperatorToken(this.peek(), ';')) {
+                    this.advance();
+                }
+                else {
+                    nodes.push(this.parseExpression());
+                }
+            }
+            this.assertImplicitBlockEnd(ends);
+            if (nodes.length === 0) {
+                throw new LitsError('Expected expression', this.peekSourceCodeInfo());
+            }
+            return nodes.length === 1
+                ? nodes[0]
+                : withSourceCodeInfo([NodeTypes.SpecialExpression, [specialExpressionTypes.block, nodes]], this.peekSourceCodeInfo());
+        };
+        Parser.prototype.assertImplicitBlockEnd = function (ends) {
+            if (!this.isImplicitBlockEnd(ends)) {
+                throw new LitsError("Expected ".concat(ends.map(function (e) { return e[1]; }).join(' or ')), this.peekSourceCodeInfo());
+            }
+        };
+        Parser.prototype.isImplicitBlockEnd = function (ends) {
+            var e_1, _a;
+            try {
+                for (var ends_1 = __values(ends), ends_1_1 = ends_1.next(); !ends_1_1.done; ends_1_1 = ends_1.next()) {
+                    var end = ends_1_1.value;
+                    if (isReservedSymbolToken(this.peek(), end)) {
+                        return true;
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (ends_1_1 && !ends_1_1.done && (_a = ends_1.return)) _a.call(ends_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            return false;
+        };
         Parser.prototype.parseLoop = function (firstToken) {
             this.advance();
             assertLParenToken(this.peek());
@@ -14590,8 +14632,7 @@ var Lits = (function (exports) {
         };
         Parser.prototype.parseTry = function (token) {
             this.advance();
-            var tryExpression = this.parseExpression();
-            assertReservedSymbolToken(this.peek(), 'catch');
+            var tryExpression = this.parseImplicitBlock(['catch']);
             this.advance();
             var errorSymbol;
             if (isLParenToken(this.peek())) {
@@ -14600,7 +14641,8 @@ var Lits = (function (exports) {
                 assertRParenToken(this.peek());
                 this.advance();
             }
-            var catchExpression = this.parseExpression();
+            var catchExpression = this.parseImplicitBlock(['end']);
+            this.advance();
             return withSourceCodeInfo([NodeTypes.SpecialExpression, [specialExpressionTypes.try, tryExpression, errorSymbol, catchExpression]], token[2]);
         };
         Parser.prototype.parseForOrDoseq = function (firstToken) {
@@ -14691,7 +14733,7 @@ var Lits = (function (exports) {
             }
         };
         Parser.prototype.isInternalLoopBindingDelimiter = function (token, symbols) {
-            var e_1, _a;
+            var e_2, _a;
             // end of loop binding
             if (isOperatorToken(token, ',') || isRParenToken(token)) {
                 return true;
@@ -14707,12 +14749,12 @@ var Lits = (function (exports) {
                     }
                 }
             }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
             finally {
                 try {
                     if (symbols_1_1 && !symbols_1_1.done && (_a = symbols_1.return)) _a.call(symbols_1);
                 }
-                finally { if (e_1) throw e_1.error; }
+                finally { if (e_2) throw e_2.error; }
             }
             return false;
         };
@@ -14737,12 +14779,13 @@ var Lits = (function (exports) {
             var condition = this.parseExpression();
             assertReservedSymbolToken(this.peek(), 'then');
             this.advance();
-            var thenExpression = this.parseExpression();
+            var thenExpression = this.parseImplicitBlock(['else', 'end']);
             var elseExpression;
             if (isReservedSymbolToken(this.peek(), 'else')) {
                 this.advance();
-                elseExpression = this.parseExpression();
+                elseExpression = this.parseImplicitBlock(['end']);
             }
+            this.advance();
             return isUnless
                 ? withSourceCodeInfo([NodeTypes.SpecialExpression, [specialExpressionTypes.unless, [condition, thenExpression, elseExpression]]], token[2])
                 : withSourceCodeInfo([NodeTypes.SpecialExpression, [specialExpressionTypes.if, [condition, thenExpression, elseExpression]]], token[2]);
@@ -14756,26 +14799,11 @@ var Lits = (function (exports) {
                 var caseExpression = this.parseExpression();
                 assertReservedSymbolToken(this.peek(), 'then');
                 this.advance();
-                var expressions = [];
-                while (!this.isAtEnd()
-                    && !isReservedSymbolToken(this.peek(), 'case')
-                    && !isReservedSymbolToken(this.peek(), 'end')) {
-                    expressions.push(this.parseExpression());
-                    if (isOperatorToken(this.peek(), ';')) {
-                        this.advance();
-                    }
-                    else if (!isReservedSymbolToken(this.peek(), 'case') && !isReservedSymbolToken(this.peek(), 'end')) {
-                        throw new LitsError('Expected case or end', this.peekSourceCodeInfo());
-                    }
-                }
-                var thenExpression = expressions.length === 1
-                    ? expressions[0]
-                    : withSourceCodeInfo([NodeTypes.SpecialExpression, [specialExpressionTypes.block, expressions]], token[2]);
+                var thenExpression = this.parseImplicitBlock(['case', 'end']);
                 params.push([caseExpression, thenExpression]);
                 if (isReservedSymbolToken(this.peek(), 'end')) {
                     break;
                 }
-                assertReservedSymbolToken(this.peek(), 'case');
             }
             assertReservedSymbolToken(this.peek());
             this.advance();
@@ -14791,26 +14819,11 @@ var Lits = (function (exports) {
                 var caseExpression = this.parseExpression();
                 assertReservedSymbolToken(this.peek(), 'then');
                 this.advance();
-                var expressions = [];
-                while (!this.isAtEnd()
-                    && !isReservedSymbolToken(this.peek(), 'case')
-                    && !isReservedSymbolToken(this.peek(), 'end')) {
-                    expressions.push(this.parseExpression());
-                    if (isOperatorToken(this.peek(), ';')) {
-                        this.advance();
-                    }
-                    else if (!isReservedSymbolToken(this.peek(), 'case') && !isReservedSymbolToken(this.peek(), 'end')) {
-                        throw new LitsError('Expected case or end', this.peekSourceCodeInfo());
-                    }
-                }
-                var thenExpression = expressions.length === 1
-                    ? expressions[0]
-                    : withSourceCodeInfo([NodeTypes.SpecialExpression, [specialExpressionTypes.block, expressions]], token[2]);
+                var thenExpression = this.parseImplicitBlock(['case', 'end']);
                 params.push([caseExpression, thenExpression]);
                 if (isReservedSymbolToken(this.peek(), 'end')) {
                     break;
                 }
-                assertReservedSymbolToken(this.peek(), 'case');
             }
             assertReservedSymbolToken(this.peek(), 'end');
             this.advance();
@@ -15758,7 +15771,7 @@ var Lits = (function (exports) {
                 { argumentNames: ['value', 'message'] },
             ],
             description: 'If $value is falsy it throws `AssertionError` with $message. If no $message is provided, message is set to $value.',
-            examples: ['try { assert(0, "Expected a positive value") } catch (e) { e.message }'],
+            examples: ['try assert(0, "Expected a positive value") catch (e) e.message end'],
             noOperatorDocumentation: true,
         },
         'assert!=': {
@@ -15776,10 +15789,10 @@ var Lits = (function (exports) {
             ],
             description: 'If $a is the same as $b it throws `AssertionError`.',
             examples: [
-                'try { assert!=(0, 0, "Expected different values") } catch (e) { e.message }',
-                'try { assert!=(0, 0) } catch (e) { e.message }',
-                'try { 0 assert!= 0 } catch (e) { e.message }',
-                'try { assert!=(0, 1) } catch (e) { e.message }',
+                'try assert!=(0, 0, "Expected different values") catch (e) e.message end',
+                'try assert!=(0, 0) catch (e) e.message end',
+                'try 0 assert!= 0 catch (e) e.message end',
+                'try assert!=(0, 1) catch (e) e.message end',
             ],
             noOperatorDocumentation: true,
         },
@@ -15798,9 +15811,9 @@ var Lits = (function (exports) {
             ],
             description: 'If $a is not structural equal to $b it throws `AssertionError`.',
             examples: [
-                'try { assert=({ "a": 1 }, { "a": 2 }, "Expected equal values") } catch (e) { e.message }',
-                'try { assert=({ "a": 1 }, { "a": 2 }) } catch (e) { e.message }',
-                'try { assert=({ "a": 1 }, { "a": 1 }) } catch (e) { e.message }',
+                'try assert=({ "a": 1 }, { "a": 2 }, "Expected equal values") catch (e) e.message end',
+                'try assert=({ "a": 1 }, { "a": 2 }) catch (e) e.message end',
+                'try assert=({ "a": 1 }, { "a": 1 }) catch (e) e.message end',
             ],
             noOperatorDocumentation: true,
         },
@@ -15819,9 +15832,9 @@ var Lits = (function (exports) {
             ],
             description: 'If $a is not greater than $b it throws `AssertionError`.',
             examples: [
-                'try { assert-gt(0, 1, "Expected greater value") } catch (e) { e.message }',
-                'try { assert-gt(0, 0) } catch (e) { e.message }',
-                'try { assert-gt(1, 0) } catch (e) { e.message }',
+                'try assert-gt(0, 1, "Expected greater value") catch (e) e.message end',
+                'try assert-gt(0, 0) catch (e) e.message end',
+                'try assert-gt(1, 0) catch (e) e.message end',
             ],
             noOperatorDocumentation: true,
         },
@@ -15840,9 +15853,9 @@ var Lits = (function (exports) {
             ],
             description: 'If $a is not less than $b it throws `AssertionError`.',
             examples: [
-                'try { assert-lte(1, 0, "Expected smaller value value") } catch (e) { e.message }',
-                'try { assert-lte(1, 1) } catch (e) { e.message }',
-                'try { assert-lte(0, 1) } catch (e) { e.message }',
+                'try assert-lte(1, 0, "Expected smaller value value") catch (e) e.message end',
+                'try assert-lte(1, 1) catch (e) e.message end',
+                'try assert-lte(0, 1) catch (e) e.message end',
             ],
             noOperatorDocumentation: true,
         },
@@ -15861,9 +15874,9 @@ var Lits = (function (exports) {
             ],
             description: 'If $a is less than $b it throws `AssertionError`.',
             examples: [
-                'try { assert-gte(0, 1, "Expected greater value") } catch (e) { e.message }',
-                'try { assert-gte(0, 1) } catch (e) { e.message }',
-                'try { assert-gte(1, 1) } catch (e) { e.message }',
+                'try assert-gte(0, 1, "Expected greater value") catch (e) e.message end',
+                'try assert-gte(0, 1) catch (e) e.message end',
+                'try assert-gte(1, 1) catch (e) e.message end',
             ],
             noOperatorDocumentation: true,
         },
@@ -15882,9 +15895,9 @@ var Lits = (function (exports) {
             ],
             description: 'If $a is grater than $b it throws `AssertionError`.',
             examples: [
-                'try { assert-lte(1, 0, "Expected smaller value value") } catch (e) { e.message }',
-                'try { assert-lte(1, 0) } catch (e) { e.message }',
-                'try { assert-lte(1, 1) } catch (e) { e.message }',
+                'try assert-lte(1, 0, "Expected smaller value value") catch (e) e.message end',
+                'try assert-lte(1, 0) catch (e) e.message end',
+                'try assert-lte(1, 1) catch (e) e.message end',
             ],
             noOperatorDocumentation: true,
         },
@@ -15908,9 +15921,9 @@ var Lits = (function (exports) {
             ],
             description: 'If $value is not `true` it throws `AssertionError`.',
             examples: [
-                'try { assert-true(false, "Expected true") } catch (e) { e.message }',
-                'try { assert-true(false) } catch (e) { e.message }',
-                'try { assert-true(true) } catch (e) { e.message }',
+                'try assert-true(false, "Expected true") catch (e) e.message end',
+                'try assert-true(false) catch (e) e.message end',
+                'try assert-true(true) catch (e) e.message end',
             ],
             noOperatorDocumentation: true,
         },
@@ -15934,9 +15947,9 @@ var Lits = (function (exports) {
             ],
             description: 'If $value is not `false` it throws `AssertionError`.',
             examples: [
-                'try { assert-false(true, "Expected false") } catch (e) { e.message }',
-                'try { assert-false(true) } catch (e) { e.message }',
-                'try { assert-false(false) } catch (e) { e.message }',
+                'try assert-false(true, "Expected false") catch (e) e.message end',
+                'try assert-false(true) catch (e) e.message end',
+                'try assert-false(false) catch (e) e.message end',
             ],
             noOperatorDocumentation: true,
         },
@@ -15960,16 +15973,16 @@ var Lits = (function (exports) {
             ],
             description: 'If $value is not `truthy` it throws `AssertionError`.',
             examples: [
-                'try { assert-truthy(false, "Expected truthy") } catch (e) { e.message }',
-                'try { assert-truthy(false) } catch (e) { e.message }',
-                'try { assert-truthy(0) } catch (e) { e.message }',
-                'try { assert-truthy(null) } catch (e) { e.message }',
-                'try { assert-truthy("") } catch (e) { e.message }',
-                'try { assert-truthy(true) } catch (e) { e.message }',
-                'try { assert-truthy(1) } catch (e) { e.message }',
-                'try { assert-truthy("x") } catch (e) { e.message }',
-                'try { assert-truthy([]) } catch (e) { e.message }',
-                'try { assert-truthy({}) } catch (e) { e.message }',
+                'try assert-truthy(false, "Expected truthy") catch (e) e.message end',
+                'try assert-truthy(false) catch (e) e.message end',
+                'try assert-truthy(0) catch (e) e.message end',
+                'try assert-truthy(null) catch (e) e.message end',
+                'try assert-truthy("") catch (e) e.message end',
+                'try assert-truthy(true) catch (e) e.message end',
+                'try assert-truthy(1) catch (e) e.message end',
+                'try assert-truthy("x") catch (e) e.message end',
+                'try assert-truthy([]) catch (e) e.message end',
+                'try assert-truthy(nd) catch (e) e.message end',
             ],
             noOperatorDocumentation: true,
         },
@@ -15993,15 +16006,15 @@ var Lits = (function (exports) {
             ],
             description: 'If $value is not `falsy` it throws `AssertionError`.',
             examples: [
-                'try { assert-falsy(true, "Expected falsy") } catch (e) { e.message }',
-                'try { assert-falsy("x") } catch (e) { e.message }',
-                'try { assert-falsy([]) } catch (e) { e.message }',
-                'try { assert-falsy({}) } catch (e) { e.message }',
-                'try { assert-falsy(1) } catch (e) { e.message }',
-                'try { assert-falsy(false) } catch (e) { e.message }',
-                'try { assert-falsy(0) } catch (e) { e.message }',
-                'try { assert-falsy(null) } catch (e) { e.message }',
-                'try { assert-falsy("") } catch (e) { e.message }',
+                'try assert-falsy(true, "Expected falsy") catch (e) e.message end',
+                'try assert-falsy("x") catch (e) e.message end',
+                'try assert-falsy([]) catch (e) e.message end',
+                'try assert-falsy(nd) catch (e) e.message end',
+                'try assert-falsy(1) catch (e) e.message end',
+                'try assert-falsy(false) catch (e) e.message end',
+                'try assert-falsy(0) catch (e) e.message end',
+                'try assert-falsy(null) catch (e) e.message end',
+                'try assert-falsy("") catch (e) e.message end',
             ],
             noOperatorDocumentation: true,
         },
@@ -16025,15 +16038,15 @@ var Lits = (function (exports) {
             ],
             description: 'If $value is not `null` it throws `AssertionError`.',
             examples: [
-                'try { assert-null(null) } catch (e) { e.message }',
-                'try { assert-null(true, "Expected null") } catch (e) { e.message }',
-                'try { assert-null("x") } catch (e) { e.message }',
-                'try { assert-null([]) } catch (e) { e.message }',
-                'try { assert-null({}) } catch (e) { e.message }',
-                'try { assert-null(1) } catch (e) { e.message }',
-                'try { assert-null(false) } catch (e) { e.message }',
-                'try { assert-null(0) } catch (e) { e.message }',
-                'try { assert-null("") } catch (e) { e.message }',
+                'try assert-null(null) catch (e) e.message end',
+                'try assert-null(true, "Expected null") catch (e) e.message end',
+                'try assert-null("x") catch (e) e.message end',
+                'try assert-null([]) catch (e) e.message end',
+                'try assert-null(nd) catch (e) e.message end',
+                'try assert-null(1) catch (e) e.message end',
+                'try assert-null(false) catch (e) e.message end',
+                'try assert-null(0) catch (e) e.message end',
+                'try assert-null("") catch (e) e.message end',
             ],
             noOperatorDocumentation: true,
         },
@@ -16058,7 +16071,7 @@ var Lits = (function (exports) {
             description: 'If $fun does not throw, it throws `AssertionError`.',
             examples: [
                 'assert-throws(-> throw("Error"))',
-                'try { assert-throws(-> identity("Error")) } catch (e) { e.message }',
+                'try assert-throws(-> identity("Error")) catch (e) e.message end',
             ],
             noOperatorDocumentation: true,
         },
@@ -16085,8 +16098,8 @@ var Lits = (function (exports) {
             ],
             description: 'If $fun does not throw $error-message, it throws `AssertionError`.',
             examples: [
-                'try { assert-throws-error(-> throw("Error"), "Error") } catch (e) { e.message }',
-                'try { assert-throws-error(-> identity("Error"), "Error") } catch (e) { e.message }',
+                'try assert-throws-error(-> throw("Error"), "Error") catch (e) e.message end',
+                'try assert-throws-error(-> identity("Error"), "Error") catch (e) e.message end',
             ],
             noOperatorDocumentation: true,
         },
@@ -16110,8 +16123,8 @@ var Lits = (function (exports) {
             ],
             description: 'If $fun throws, it throws `AssertionError`.',
             examples: [
-                'try { assert-not-throws(-> identity("Error")) } catch (e) { e.message }',
-                'try { assert-not-throws(-> throw("Error")) } catch (e) { e.message }',
+                'try assert-not-throws(-> identity("Error")) catch (e) e.message end',
+                'try assert-not-throws(-> throw("Error")) catch (e) e.message end',
             ],
             noOperatorDocumentation: true,
         },
@@ -26802,9 +26815,9 @@ var Lits = (function (exports) {
             ],
             description: 'Executes `try-body`. If that throws, the `catch-body` gets executed. See examples for details.',
             examples: [
-                "\ntry {\n  2 / 4\n} catch {\n  \"Oops!\"\n}",
-                "\ntry {\n  foo()\n} catch(error) {\n  \"Error: \" ++ error.message\n}",
-                "\ntry {\n  foo()\n} catch {\n  42\n}",
+                "\ntry\n  2 / 4\ncatch\n  \"Oops!\"\nend",
+                "\ntry\n  foo()\ncatch(error)\n  \"Error: \" ++ error.message\nend",
+                "\ntry\n  foo()\ncatch\n  42\nend",
             ],
         },
         'throw': {
@@ -26823,8 +26836,8 @@ var Lits = (function (exports) {
             ],
             description: 'Throws `UserDefinedError` with message set to $expr evaluated. $expr must evaluate to a string.',
             examples: [
-                'try { throw("You shall not pass!") } catch(error) { "Error: " ++ error.message }',
-                'try { throw(slice("You shall not pass!", 0, 3)) } catch(error) { "Error: " ++ error.message }',
+                'try throw("You shall not pass!") catch(error) "Error: " ++ error.message end',
+                'try throw(slice("You shall not pass!", 0, 3)) catch(error) "Error: " ++ error.message end',
             ],
         },
         'if': {
@@ -26838,10 +26851,10 @@ var Lits = (function (exports) {
             ],
             description: 'Either `true-expr` or `false-expr` branch is taken. `true-expr` is selected when $test is truthy. If $test is falsy `false-expr` is executed, if no `false-expr` exists, `null` is returned.',
             examples: [
-                "\nif true then {\n  write!(\"TRUE\")\n} else {\n  write!(\"FALSE\")\n}",
-                'if false then write!("TRUE") else write!("FALSE")',
-                'if true then write!("TRUE")',
-                'if false then write!("TRUE")',
+                "\nif true then\n  write!(\"TRUE\")\nelse\n  write!(\"FALSE\")\nend",
+                'if false then write!("TRUE") else write!("FALSE") end',
+                'if true then write!("TRUE") end',
+                'if false then write!("TRUE") end',
             ],
         },
         'unless': {
@@ -26855,10 +26868,10 @@ var Lits = (function (exports) {
             ],
             description: 'Either `true-expr` or `false-expr` branch is taken. `true-expr` is selected when $test is falsy. If $test is truthy `false-expr` is executed, if no `false-expr` exists, `null` is returned.',
             examples: [
-                "\nunless true then {\n  write!(\"TRUE\")\n} else {\n  write!(\"FALSE\")\n}",
-                'unless false then write!("TRUE") else write!("FALSE")',
-                'unless true then write!("TRUE")',
-                'unless false then write!("TRUE")',
+                "\nunless true then\n  write!(\"TRUE\")\nelse\n  write!(\"FALSE\")\nend",
+                'unless false then write!("TRUE") else write!("FALSE") end',
+                'unless true then write!("TRUE") end',
+                'unless false then write!("TRUE") end',
             ],
         },
         'cond': {
@@ -26912,9 +26925,9 @@ var Lits = (function (exports) {
             customVariants: ['recur(...recur-args)'],
             description: 'Recursevly calls enclosing function or loop with its evaluated `recur-args`.',
             examples: [
-                "\nlet foo = (n) -> {\n  write!(n);\n  if !(zero?(n)) then {\n    recur(n - 1)\n  }\n};\nfoo(3)",
-                "\n(n -> {\n  write!(n);\n  if !(zero?(n)) then {\n    recur(n - 1)\n  }\n})(3)",
-                "\nloop (n = 3) -> {\n  write!(n);\n  if !(zero?(n)) then {\n    recur(n - 1)\n  }\n}",
+                "\nlet foo = (n) -> {\n  write!(n);\n  if !(zero?(n)) then\n    recur(n - 1)\n  end\n};\nfoo(3)",
+                "\n(n -> {\n  write!(n);\n  if !(zero?(n)) then\n    recur(n - 1)\n  end\n})(3)",
+                "\nloop (n = 3) -> {\n  write!(n);\n  if !(zero?(n)) then\n    recur(n - 1)\n  end\n}",
             ],
         },
     };
@@ -30970,7 +30983,7 @@ var Lits = (function (exports) {
             title: 'never',
             category: 'Datatype',
             description: 'A value that can never be created',
-            examples: ["\n// throw(\"error\") will never return a value\ntry { throw(\"error\") } catch { \"never\" }",
+            examples: ["\n// throw(\"error\") will never return a value\ntry throw(\"error\") catch \"never\" end",
             ],
         },
     };