@mojir/lits 2.1.6 → 2.1.8

package/dist/index.js

@@ -1429,13 +1429,15 @@ var arrayNormalExpression = {
         paramCount: 2,
     },
     flatten: {
-        evaluate: function (_a) {
-            var _b = __read(_a, 1), seq = _b[0];
-            if (!Array.isArray(seq))
-                return [];
-            return seq.flat(Number.POSITIVE_INFINITY);
+        evaluate: function (_a, sourceCodeInfo) {
+            var _b = __read(_a, 2), seq = _b[0], depth = _b[1];
+            assertArray(seq, sourceCodeInfo);
+            var actualDepth = depth === undefined || depth === Number.POSITIVE_INFINITY
+                ? Number.POSITIVE_INFINITY
+                : asNumber(depth, sourceCodeInfo, { integer: true, nonNegative: true });
+            return seq.flat(actualDepth);
         },
-        paramCount: 1,
+        paramCount: { min: 1, max: 2 },
     },
     mapcat: {
         evaluate: function (_a, sourceCodeInfo, contextStack, _b) {
@@ -3885,6 +3887,13 @@ var regexpNormalExpression = {
             assertString(sourceArg, sourceCodeInfo);
             var source = sourceArg || '(?:)';
             var flags = typeof flagsArg === 'string' ? flagsArg : '';
+            try {
+                // eslint-disable-next-line no-new
+                new RegExp(source, flags); // Throws if invalid regexp
+            }
+            catch (e) {
+                throw new LitsError("Invalid regular expression: ".concat(source, " ").concat(flags), sourceCodeInfo);
+            }
             return _b = {},
                 _b[REGEXP_SYMBOL] = true,
                 _b.sourceCodeInfo = sourceCodeInfo,
@@ -4613,6 +4622,7 @@ var gridNormalExpression = {
             return transpose(grid);
         },
         paramCount: 1,
+        aliases: ['grid:tr'],
     },
     'grid:flip-h': {
         evaluate: function (_a, sourceCodeInfo) {
@@ -6991,10 +7001,10 @@ var linearAlgebraNormalExpression = {
             assertVector(vectorA, sourceCodeInfo);
             assertVector(vectorB, sourceCodeInfo);
             if (vectorA.length < 2) {
-                throw new Error('Vectors must have at least 2 elements');
+                throw new LitsError('Vectors must have at least 2 elements', sourceCodeInfo);
             }
             if (vectorA.length !== vectorB.length) {
-                throw new Error('Vectors must be of the same length');
+                throw new LitsError('Vectors must be of the same length', sourceCodeInfo);
             }
             assertNumber(lag, sourceCodeInfo, {
                 integer: true,
@@ -8246,7 +8256,7 @@ var partitionsNormalExpressions = {
             if (n === 0)
                 return 1;
             if (n > partitionNumbers.length) {
-                throw new Error("n is too large. The maximum value is ".concat(partitionNumbers.length - 1, "."));
+                throw new LitsError("n is too large. The maximum value is ".concat(partitionNumbers.length - 1, "."), sourceCodeInfo);
             }
             return partitionNumbers[n - 1];
         },
@@ -10385,7 +10395,12 @@ var combinatoricalNormalExpression = {
             var _b = __read(_a, 2), a = _b[0], m = _b[1];
             assertNumber(a, sourceCodeInfo, { integer: true, positive: true });
             assertNumber(m, sourceCodeInfo, { integer: true, positive: true });
-            return modInverse(a, m);
+            try {
+                return modInverse(a, m);
+            }
+            catch (error) {
+                throw new LitsError(error, sourceCodeInfo);
+            }
         },
         paramCount: 2,
     },
@@ -10404,7 +10419,7 @@ var combinatoricalNormalExpression = {
             assertVector(remainders, sourceCodeInfo);
             assertVector(moduli, sourceCodeInfo);
             if (remainders.length !== moduli.length) {
-                throw new Error('Remainders and moduli must have the same length.');
+                throw new LitsError('Remainders and moduli must have the same length.', sourceCodeInfo);
             }
             try {
                 return chineseRemainder(remainders, moduli);
@@ -11913,7 +11928,11 @@ var objectSpecialExpression = {
             }
             else {
                 var key = evaluateNode(keyNode, contextStack);
-                var value = evaluateNode(params[i + 1], contextStack);
+                var valueNode = params[i + 1];
+                if (valueNode === undefined) {
+                    throw new LitsError('Missing value for key', keyNode[2]);
+                }
+                var value = evaluateNode(valueNode, contextStack);
                 assertString(key, keyNode[2]);
                 result[key] = value;
             }
@@ -12894,21 +12913,30 @@ var tokenizeNumber = function (input, position) {
         var char = input[i];
         if (char === '_') {
             if (!decimalNumberRegExp.test(input[i - 1]) || !decimalNumberRegExp.test(input[i + 1])) {
-                return NO_MATCH;
+                if (i === start) {
+                    return NO_MATCH;
+                }
+                throw new LitsError("Invalid number format at position ".concat(i, "."), undefined);
             }
         }
         else if (char === '.') {
-            if (i === start || hasDecimalPoint || hasExponent) {
+            if (i === start) {
                 return NO_MATCH;
             }
+            if (hasDecimalPoint || hasExponent) {
+                throw new LitsError("Invalid number format at position ".concat(i, "."), undefined);
+            }
             hasDecimalPoint = true;
         }
         else if (char === 'e' || char === 'E') {
-            if (i === start || hasExponent) {
+            if (i === start) {
                 return NO_MATCH;
             }
+            if (hasExponent) {
+                throw new LitsError("Invalid number format at position ".concat(i, "."), undefined);
+            }
             if (input[i - 1] === '.' || input[i - 1] === '+' || input[i - 1] === '-') {
-                return NO_MATCH;
+                throw new LitsError("Invalid number format at position ".concat(i, "."), undefined);
             }
             if (input[i + 1] === '+' || input[i + 1] === '-') {
                 i += 1;
@@ -12928,7 +12956,7 @@ var tokenizeNumber = function (input, position) {
     }
     var nextChar = input[i];
     if (nextChar && !postNumberRegExp.test(nextChar)) {
-        return NO_MATCH;
+        throw new LitsError("Invalid number format at position ".concat(i, "."), undefined);
     }
     return [length, ['Number', input.substring(position, i)]];
 };
@@ -13094,10 +13122,10 @@ function tokenize(input, debug, filePath) {
         hasDebugData: debug,
     };
     while (position < input.length) {
-        var tokenDescriptor = getCurrentToken(input, position);
         var sourceCodeInfo = debug
             ? createSourceCodeInfo(input, position, filePath)
             : undefined;
+        var tokenDescriptor = getCurrentToken(input, position);
         if (!tokenDescriptor) {
             throw new LitsError("Unrecognized character '".concat(input[position], "'."), sourceCodeInfo);
         }
@@ -13207,9 +13235,6 @@ function isOperatorToken(token, operatorName) {
 }
 function assertOperatorToken(token, operatorName) {
     if (!isOperatorToken(token, operatorName)) {
-        if (operatorName) {
-            throw new LitsError("Unexpected token: ".concat(token, ", expected operator ").concat(operatorName), token[2]);
-        }
         throwUnexpectedToken('Operator', operatorName, token);
     }
 }
@@ -13279,8 +13304,8 @@ function isA_BinaryOperatorToken(token) {
     return (token === null || token === void 0 ? void 0 : token[0]) === 'Operator' && isBinaryOperator(token[1]);
 }
 function throwUnexpectedToken(expected, expectedValue, actual) {
-    var actualOutput = "".concat(actual[0], " '").concat(actual[1], "'");
-    throw new LitsError("Unexpected token: ".concat(actualOutput, ", expected ").concat(expected).concat(expectedValue ? " '".concat(expectedValue, "'") : ''), actual[2]);
+    var actualOutput = actual ? "".concat(actual[0], " '").concat(actual[1], "'") : 'end of input';
+    throw new LitsError("Unexpected token: ".concat(actualOutput, ", expected ").concat(expected).concat(expectedValue ? " '".concat(expectedValue, "'") : ''), actual === null || actual === void 0 ? void 0 : actual[2]);
 }
 
 function minifyTokenStream(tokenStream, _a) {
@@ -13428,6 +13453,11 @@ var Parser = /** @class */ (function () {
     Parser.prototype.peek = function () {
         return this.tokenStream.tokens[this.parseState.position];
     };
+    Parser.prototype.peekSourceCodeInfo = function () {
+        var _a;
+        var currentToken = this.peek();
+        return currentToken ? currentToken[2] : (_a = this.tokenStream.tokens.at(-1)) === null || _a === void 0 ? void 0 : _a[2];
+    };
     Parser.prototype.peekAhead = function (count) {
         return this.tokenStream.tokens[this.parseState.position + count];
     };
@@ -13443,7 +13473,7 @@ var Parser = /** @class */ (function () {
             }
             else {
                 if (!this.isAtEnd()) {
-                    throw new LitsError('Expected ;', this.peek()[2]);
+                    throw new LitsError('Expected ;', this.peekSourceCodeInfo());
                 }
             }
         }
@@ -13532,15 +13562,21 @@ var Parser = /** @class */ (function () {
         }
         return left;
     };
+    Parser.prototype.asToken = function (token) {
+        if (!token) {
+            throw new LitsError('Unexpected end of input', this.peekSourceCodeInfo());
+        }
+        return token;
+    };
     Parser.prototype.parseOperand = function () {
         var operand = this.parseOperandPart();
         var token = this.peek();
         while (isOperatorToken(token, '.') || isLBracketToken(token) || isLParenToken(token)) {
             if (token[1] === '.') {
                 this.advance();
-                var symbolToken = this.peek();
+                var symbolToken = this.asToken(this.peek());
                 if (!isSymbolToken(symbolToken)) {
-                    throw new LitsError('Expected symbol', this.peek()[2]);
+                    throw new LitsError('Expected symbol', this.peekSourceCodeInfo());
                 }
                 var stringNode = withSourceCodeInfo([NodeTypes.String, symbolToken[1]], symbolToken[2]);
                 operand = createAccessorNode(operand, stringNode, token[2]);
@@ -13551,7 +13587,7 @@ var Parser = /** @class */ (function () {
                 this.advance();
                 var expression = this.parseExpression();
                 if (!isRBracketToken(this.peek())) {
-                    throw new LitsError('Expected closing bracket', this.peek()[2]);
+                    throw new LitsError('Expected closing bracket', this.peekSourceCodeInfo());
                 }
                 operand = createAccessorNode(operand, expression, token[2]);
                 this.advance();
@@ -13565,7 +13601,7 @@ var Parser = /** @class */ (function () {
         return operand;
     };
     Parser.prototype.parseOperandPart = function () {
-        var token = this.peek();
+        var token = this.asToken(this.peek());
         // Parentheses
         if (isLParenToken(token)) {
             var positionBefore = this.parseState.position;
@@ -13577,7 +13613,7 @@ var Parser = /** @class */ (function () {
             this.advance();
             var expression = this.parseExpression();
             if (!isRParenToken(this.peek())) {
-                throw new LitsError('Expected closing parenthesis', this.peek()[2]);
+                throw new LitsError('Expected closing parenthesis', this.peekSourceCodeInfo());
             }
             this.advance();
             return expression;
@@ -13637,7 +13673,7 @@ var Parser = /** @class */ (function () {
         while (!this.isAtEnd() && !isRBraceToken(this.peek())) {
             if (isOperatorToken(this.peek(), '...')) {
                 this.advance();
-                params.push(withSourceCodeInfo([NodeTypes.Spread, this.parseExpression()], this.peek()[2]));
+                params.push(withSourceCodeInfo([NodeTypes.Spread, this.parseExpression()], this.peekSourceCodeInfo()));
             }
             else {
                 var token = this.peek();
@@ -13653,7 +13689,7 @@ var Parser = /** @class */ (function () {
                     this.advance();
                 }
                 else {
-                    throw new LitsError('Expected key to be a symbol or a string', this.peek()[2]);
+                    throw new LitsError('Expected key to be a symbol or a string', this.peekSourceCodeInfo());
                 }
                 assertOperatorToken(this.peek(), ':=');
                 this.advance();
@@ -13661,7 +13697,7 @@ var Parser = /** @class */ (function () {
             }
             var nextToken = this.peek();
             if (!isOperatorToken(nextToken, ',') && !isRBraceToken(nextToken)) {
-                throw new LitsError('Expected comma or closing brace', this.peek()[2]);
+                throw new LitsError('Expected comma or closing brace', this.peekSourceCodeInfo());
             }
             if (isOperatorToken(nextToken, ',')) {
                 this.advance();
@@ -13678,14 +13714,14 @@ var Parser = /** @class */ (function () {
         while (!this.isAtEnd() && !isRBracketToken(this.peek())) {
             if (isOperatorToken(this.peek(), '...')) {
                 this.advance();
-                params.push(withSourceCodeInfo([NodeTypes.Spread, this.parseExpression()], this.peek()[2]));
+                params.push(withSourceCodeInfo([NodeTypes.Spread, this.parseExpression()], this.peekSourceCodeInfo()));
             }
             else {
                 params.push(this.parseExpression());
             }
             var nextToken = this.peek();
             if (!isOperatorToken(nextToken, ',') && !isRBracketToken(nextToken)) {
-                throw new LitsError('Expected comma or closing parenthesis', this.peek()[2]);
+                throw new LitsError('Expected comma or closing parenthesis', this.peekSourceCodeInfo());
             }
             if (isOperatorToken(nextToken, ',')) {
                 this.advance();
@@ -13696,26 +13732,27 @@ var Parser = /** @class */ (function () {
         return withSourceCodeInfo([NodeTypes.SpecialExpression, [specialExpressionTypes.array, params]], firstToken[2]);
     };
     Parser.prototype.parseFunctionCall = function (symbol) {
+        var _a;
         this.advance();
         var params = [];
         while (!this.isAtEnd() && !isRParenToken(this.peek())) {
             if (isOperatorToken(this.peek(), '...')) {
                 this.advance();
-                params.push(withSourceCodeInfo([NodeTypes.Spread, this.parseExpression()], this.peek()[2]));
+                params.push(withSourceCodeInfo([NodeTypes.Spread, this.parseExpression()], this.peekSourceCodeInfo()));
             }
             else {
                 params.push(this.parseExpression());
             }
             var nextToken = this.peek();
             if (!isOperatorToken(nextToken, ',') && !isRParenToken(nextToken)) {
-                throw new LitsError('Expected comma or closing parenthesis', this.peek()[2]);
+                throw new LitsError('Expected comma or closing parenthesis', (_a = this.peek()) === null || _a === void 0 ? void 0 : _a[2]);
             }
             if (isOperatorToken(nextToken, ',')) {
                 this.advance();
             }
         }
         if (!isRParenToken(this.peek())) {
-            throw new LitsError('Expected closing parenthesis', this.peek()[2]);
+            throw new LitsError('Expected closing parenthesis', this.peekSourceCodeInfo());
         }
         this.advance();
         if (isSpecialBuiltinSymbolNode(symbol)) { // Named function
@@ -13745,14 +13782,14 @@ var Parser = /** @class */ (function () {
                     if (params.length !== 1) {
                         throw new LitsError('Expected exactly one parameter', symbol[2]);
                     }
-                    var _a = __read(params, 1), param = _a[0];
+                    var _b = __read(params, 1), param = _b[0];
                     return withSourceCodeInfo([NodeTypes.SpecialExpression, [type, param]], symbol[2]);
                 }
                 case specialExpressionTypes.throw: {
                     if (params.length !== 1) {
                         throw new LitsError('Expected exactly one parameter', symbol[2]);
                     }
-                    var _b = __read(params, 1), param = _b[0];
+                    var _c = __read(params, 1), param = _c[0];
                     return withSourceCodeInfo([NodeTypes.SpecialExpression, [type, param]], symbol[2]);
                 }
                 case specialExpressionTypes['0_fn']:
@@ -13772,7 +13809,7 @@ var Parser = /** @class */ (function () {
         }
     };
     Parser.prototype.parseLambdaFunction = function () {
-        var firstToken = this.peek();
+        var firstToken = this.asToken(this.peek());
         if (isLParenToken(firstToken)
             && isSymbolToken(this.peekAhead(1))
             && isOperatorToken(this.peekAhead(2), '->')) {
@@ -13806,7 +13843,7 @@ var Parser = /** @class */ (function () {
         var functionArguments = [];
         while (!this.isAtEnd() && !isRParenToken(this.peek()) && !isSymbolToken(this.peek(), 'let')) {
             if (rest) {
-                throw new LitsError('Rest argument must be last', this.peek()[2]);
+                throw new LitsError('Rest argument must be last', this.peekSourceCodeInfo());
             }
             var bindingTarget = this.parseBindingTarget();
             if (bindingTarget[1][1] !== undefined) {
@@ -13816,25 +13853,25 @@ var Parser = /** @class */ (function () {
                 rest = true;
             }
             if (defaults && !bindingTarget[1][1]) {
-                throw new LitsError('Default arguments must be last', this.peek()[2]);
+                throw new LitsError('Default arguments must be last', this.peekSourceCodeInfo());
             }
             functionArguments.push(bindingTarget);
             if (!isOperatorToken(this.peek(), ',') && !isRParenToken(this.peek()) && !isSymbolToken(this.peek(), 'let')) {
-                throw new LitsError('Expected comma or closing parenthesis', this.peek()[2]);
+                throw new LitsError('Expected comma or closing parenthesis', this.peekSourceCodeInfo());
             }
             if (isOperatorToken(this.peek(), ',')) {
                 this.advance();
             }
         }
         if (!isRParenToken(this.peek())) {
-            throw new LitsError('Expected closing parenthesis', this.peek()[2]);
+            throw new LitsError('Expected closing parenthesis', this.peekSourceCodeInfo());
         }
         this.advance();
         return functionArguments;
     };
     Parser.prototype.parseShorthandLamdaFunction = function () {
         var _a;
-        var firstToken = this.peek();
+        var firstToken = this.asToken(this.peek());
         this.advance();
         var startPos = this.parseState.position;
         var exprNode = this.parseExpression();
@@ -13892,7 +13929,7 @@ var Parser = /** @class */ (function () {
             }
             var defaultValue = this.parseOptionalDefaulValue();
             if (requireDefaultValue && !defaultValue) {
-                throw new LitsError('Expected assignment', this.peek()[2]);
+                throw new LitsError('Expected assignment', this.peekSourceCodeInfo());
             }
             return withSourceCodeInfo([bindingTargetTypes.symbol, [symbol, defaultValue]], firstToken[2]);
         }
@@ -13904,7 +13941,7 @@ var Parser = /** @class */ (function () {
             this.advance();
             var symbol = asUserDefinedSymbolNode(this.parseSymbol());
             if (isOperatorToken(this.peek(), ':=')) {
-                throw new LitsError('Rest argument can not have default value', this.peek()[2]);
+                throw new LitsError('Rest argument can not have default value', this.peekSourceCodeInfo());
             }
             return withSourceCodeInfo([bindingTargetTypes.rest, [symbol[1], undefined]], firstToken[2]);
         }
@@ -13912,7 +13949,7 @@ var Parser = /** @class */ (function () {
         if (isLBracketToken(firstToken)) {
             this.advance();
             var elements = [];
-            var token = this.peek();
+            var token = this.asToken(this.peek());
             var rest = false;
             while (!isRBracketToken(token)) {
                 if (rest) {
@@ -13921,7 +13958,7 @@ var Parser = /** @class */ (function () {
                 if (isOperatorToken(token, ',')) {
                     elements.push(null);
                     this.advance();
-                    token = this.peek();
+                    token = this.asToken(this.peek());
                     continue;
                 }
                 var target = this.parseBindingTarget();
@@ -13929,17 +13966,17 @@ var Parser = /** @class */ (function () {
                     rest = true;
                 }
                 elements.push(target);
-                token = this.peek();
+                token = this.asToken(this.peek());
                 if (!isRBracketToken(token)) {
                     assertOperatorToken(token, ',');
                     this.advance();
                 }
-                token = this.peek();
+                token = this.asToken(this.peek());
             }
             this.advance();
             var defaultValue = this.parseOptionalDefaulValue();
             if (requireDefaultValue && !defaultValue) {
-                throw new LitsError('Expected assignment', this.peek()[2]);
+                throw new LitsError('Expected assignment', this.peekSourceCodeInfo());
             }
             return withSourceCodeInfo([bindingTargetTypes.array, [elements, defaultValue]], firstToken[2]);
         }
@@ -13947,7 +13984,7 @@ var Parser = /** @class */ (function () {
         if (isLBraceToken(firstToken)) {
             this.advance();
             var elements = {};
-            var token = this.peek();
+            var token = this.asToken(this.peek());
             var rest = false;
             while (!isRBraceToken(token)) {
                 if (rest) {
@@ -13958,7 +13995,7 @@ var Parser = /** @class */ (function () {
                     this.advance();
                 }
                 var key = asUserDefinedSymbolNode(this.parseSymbol());
-                token = this.peek();
+                token = this.asToken(this.peek());
                 if (isReservedSymbolToken(token, 'as')) {
                     if (rest) {
                         throw new LitsError('Rest argument can not have alias', token[2]);
@@ -13975,7 +14012,7 @@ var Parser = /** @class */ (function () {
                         throw new LitsError("Duplicate binding name: ".concat(key), token[2]);
                     }
                     if (rest && isOperatorToken(this.peek(), ':=')) {
-                        throw new LitsError('Rest argument can not have default value', this.peek()[2]);
+                        throw new LitsError('Rest argument can not have default value', this.peekSourceCodeInfo());
                     }
                     elements[key[1]] = rest
                         ? withSourceCodeInfo([bindingTargetTypes.rest, [key[1], this.parseOptionalDefaulValue()]], firstToken[2])
@@ -13988,17 +14025,17 @@ var Parser = /** @class */ (function () {
                     assertOperatorToken(this.peek(), ',');
                     this.advance();
                 }
-                token = this.peek();
+                token = this.asToken(this.peek());
             }
             this.advance();
-            token = this.peek();
+            token = this.asToken(this.peek());
             var defaultValue = this.parseOptionalDefaulValue();
             if (requireDefaultValue && !defaultValue) {
                 throw new LitsError('Expected assignment', token[2]);
             }
             return withSourceCodeInfo([bindingTargetTypes.object, [elements, defaultValue]], firstToken[2]);
         }
-        throw new LitsError('Expected symbol', this.peek()[2]);
+        throw new LitsError('Expected symbol', this.peekSourceCodeInfo());
     };
     Parser.prototype.parseLet = function (token, optionalSemicolon) {
         if (optionalSemicolon === void 0) { optionalSemicolon = false; }
@@ -14021,7 +14058,7 @@ var Parser = /** @class */ (function () {
                 this.advance();
             }
             else if (!isReservedSymbolToken(this.peek(), 'end')) {
-                throw new LitsError('Expected ;', this.peek()[2]);
+                throw new LitsError('Expected ;', this.peekSourceCodeInfo());
             }
         }
         assertReservedSymbolToken(this.peek(), 'end');
@@ -14045,7 +14082,7 @@ var Parser = /** @class */ (function () {
             token = this.peek();
         }
         if (bindingNodes.length === 0) {
-            throw new LitsError('Expected binding', this.peek()[2]);
+            throw new LitsError('Expected binding', this.peekSourceCodeInfo());
         }
         assertSymbolToken(token, 'do');
         this.advance();
@@ -14056,7 +14093,7 @@ var Parser = /** @class */ (function () {
                 this.advance();
             }
             else if (!isReservedSymbolToken(this.peek(), 'end')) {
-                throw new LitsError('Expected ;', this.peek()[2]);
+                throw new LitsError('Expected ;', this.peekSourceCodeInfo());
             }
         }
         assertReservedSymbolToken(this.peek(), 'end');
@@ -14072,7 +14109,7 @@ var Parser = /** @class */ (function () {
                 this.advance();
             }
             else if (!isReservedSymbolToken(this.peek(), 'catch')) {
-                throw new LitsError('Expected ;', this.peek()[2]);
+                throw new LitsError('Expected ;', this.peekSourceCodeInfo());
             }
         }
         var tryExpression = tryExpressions.length === 1
@@ -14094,7 +14131,7 @@ var Parser = /** @class */ (function () {
                 this.advance();
             }
             else if (!isReservedSymbolToken(this.peek(), 'end')) {
-                throw new LitsError('Expected ;', this.peek()[2]);
+                throw new LitsError('Expected ;', this.peekSourceCodeInfo());
             }
         }
         assertReservedSymbolToken(this.peek(), 'end');
@@ -14130,7 +14167,7 @@ var Parser = /** @class */ (function () {
                 this.advance();
             }
             else if (!isReservedSymbolToken(this.peek(), 'end')) {
-                throw new LitsError('Expected ;', this.peek()[2]);
+                throw new LitsError('Expected ;', this.peekSourceCodeInfo());
             }
         }
         assertReservedSymbolToken(this.peek(), 'end');
@@ -14144,13 +14181,13 @@ var Parser = /** @class */ (function () {
         this.advance();
         var bindingNode = this.parseBinding();
         var modifiers = [];
-        var token = this.peek();
+        var token = this.asToken(this.peek());
         if (!isSymbolToken(token, 'do') && !isReservedSymbolToken(this.peek(), 'each') && !isOperatorToken(token, ',')) {
             throw new LitsError('Expected do, each or comma', token[2]);
         }
         if (isOperatorToken(token, ',')) {
             this.advance();
-            token = this.peek();
+            token = this.asToken(this.peek());
         }
         if (!isSymbolToken(token, 'let')
             && !isReservedSymbolToken(token, 'when')
@@ -14170,14 +14207,14 @@ var Parser = /** @class */ (function () {
                     throw new LitsError('Duplicate binding', letNode[1][1][2]);
                 }
                 letBindings.push(letNode[1][1]);
-                token = this_2.peek();
+                token = this_2.asToken(this_2.peek());
                 if (!isSymbolToken(token, 'do') && !isReservedSymbolToken(this_2.peek(), 'each') && !isOperatorToken(token, ',')) {
                     throw new LitsError('Expected do, each or comma', token[2]);
                 }
                 if (isOperatorToken(token, ',')) {
                     this_2.advance();
                 }
-                token = this_2.peek();
+                token = this_2.asToken(this_2.peek());
             };
             var this_2 = this;
             while (isSymbolToken(token, 'let')) {
@@ -14203,14 +14240,14 @@ var Parser = /** @class */ (function () {
                 modifiers.push('&while');
                 whileNode = this.parseExpression();
             }
-            token = this.peek();
+            token = this.asToken(this.peek());
             if (!isSymbolToken(token, 'do') && !isReservedSymbolToken(this.peek(), 'each') && !isOperatorToken(token, ',')) {
                 throw new LitsError('Expected do or comma', token[2]);
             }
             if (isOperatorToken(token, ',')) {
                 this.advance();
             }
-            token = this.peek();
+            token = this.asToken(this.peek());
         }
         if (!isSymbolToken(token, 'do') && !isReservedSymbolToken(this.peek(), 'each')) {
             throw new LitsError('Expected do or each', token[2]);
@@ -14247,7 +14284,7 @@ var Parser = /** @class */ (function () {
                 this.advance();
             }
             else if (!isReservedSymbolToken(this.peek(), 'else') && !isReservedSymbolToken(this.peek(), 'end')) {
-                throw new LitsError('Expected ;', this.peek()[2]);
+                throw new LitsError('Expected ;', this.peekSourceCodeInfo());
             }
         }
         var thenExpression = thenExpressions.length === 1
@@ -14263,7 +14300,7 @@ var Parser = /** @class */ (function () {
                     this.advance();
                 }
                 else if (!isReservedSymbolToken(this.peek(), 'end')) {
-                    throw new LitsError('Expected ;', this.peek()[2]);
+                    throw new LitsError('Expected ;', this.peekSourceCodeInfo());
                 }
             }
             elseExpression = elseExpressions.length === 1
@@ -14294,7 +14331,7 @@ var Parser = /** @class */ (function () {
                     this.advance();
                 }
                 else if (!isReservedSymbolToken(this.peek(), 'case') && !isReservedSymbolToken(this.peek(), 'end')) {
-                    throw new LitsError('Expected ;', this.peek()[2]);
+                    throw new LitsError('Expected ;', this.peekSourceCodeInfo());
                 }
             }
             var thenExpression = expressions.length === 1
@@ -14329,7 +14366,7 @@ var Parser = /** @class */ (function () {
                     this.advance();
                 }
                 else if (!isReservedSymbolToken(this.peek(), 'case') && !isReservedSymbolToken(this.peek(), 'end')) {
-                    throw new LitsError('Expected ;', this.peek()[2]);
+                    throw new LitsError('Expected ;', this.peekSourceCodeInfo());
                 }
             }
             var thenExpression = expressions.length === 1
@@ -14356,7 +14393,7 @@ var Parser = /** @class */ (function () {
                 this.advance();
             }
             else if (!isReservedSymbolToken(this.peek(), 'end')) {
-                throw new LitsError('Expected ;', this.peek()[2]);
+                throw new LitsError('Expected ;', this.peekSourceCodeInfo());
             }
         }
         assertReservedSymbolToken(this.peek(), 'end');
@@ -14400,7 +14437,7 @@ var Parser = /** @class */ (function () {
                     this.advance();
                 }
                 else if (!isReservedSymbolToken(this.peek(), 'end')) {
-                    throw new LitsError('Expected ;', this.peek()[2]);
+                    throw new LitsError('Expected ;', this.peekSourceCodeInfo());
                 }
             }
             assertReservedSymbolToken(this.peek(), 'end');
@@ -14411,7 +14448,7 @@ var Parser = /** @class */ (function () {
                     ]]], token[2]);
         }
         else {
-            throw new LitsError('Expected let or function', this.peek()[2]);
+            throw new LitsError('Expected let or function', this.peekSourceCodeInfo());
         }
     };
     Parser.prototype.stringToSymbolNode = function (value, sourceCodeInfo) {
@@ -14436,7 +14473,7 @@ var Parser = /** @class */ (function () {
         });
     };
     Parser.prototype.parseSymbol = function () {
-        var token = this.peek();
+        var token = this.asToken(this.peek());
         this.advance();
         if (!isSymbolToken(token)) {
             throw new LitsError("Expected symbol token, got ".concat(token[0]), token[2]);
@@ -14458,7 +14495,7 @@ var Parser = /** @class */ (function () {
         return withSourceCodeInfo([NodeTypes.ReservedSymbol, token[1]], token[2]);
     };
     Parser.prototype.parseNumber = function () {
-        var token = this.peek();
+        var token = this.asToken(this.peek());
         this.advance();
         var value = token[1];
         var negative = value[0] === '-';
@@ -14466,7 +14503,7 @@ var Parser = /** @class */ (function () {
         return withSourceCodeInfo([NodeTypes.Number, negative ? -Number(numberString) : Number(numberString)], token[2]);
     };
     Parser.prototype.parseString = function () {
-        var token = this.peek();
+        var token = this.asToken(this.peek());
         this.advance();
         var value = token[1].substring(1, token[1].length - 1)
             .replace(/(\\{2})|(\\")|(\\n)|(\\t)|(\\r)|(\\b)|(\\f)|\\(.)/g, function (_, backslash, doubleQuote, newline, tab, carriageReturn, backspace, formFeed, normalChar) {
@@ -14498,7 +14535,7 @@ var Parser = /** @class */ (function () {
         return withSourceCodeInfo([NodeTypes.String, value], token[2]);
     };
     Parser.prototype.parseRegexpShorthand = function () {
-        var token = this.peek();
+        var token = this.asToken(this.peek());
         this.advance();
         var endStringPosition = token[1].lastIndexOf('"');
         var regexpString = token[1].substring(2, endStringPosition);
@@ -15260,7 +15297,6 @@ var arrayReference = {
         examples: [
             'flatten([1, 2, [3, 4], 5])',
             "\nlet foo := \"bar\";\nflatten([\n  1,\n  \" 2 A \",\n  [foo, [4, [\"ABC\"]]],\n  6,\n])",
-            'flatten(12)',
         ],
         noOperatorDocumentation: true,
     },
@@ -18978,6 +19014,7 @@ var gridReference = {
             "grid:transpose(".concat(exampleGrid2, ")"),
             "grid:transpose(".concat(exampleGrid3, ")"),
         ],
+        aliases: ['grid:tr'],
     },
     'grid:flip-h': {
         title: 'grid:flip-h',