@mojir/lits 2.1.28 → 2.1.30

package/dist/lits.iife.js

@@ -13347,7 +13347,7 @@ var Lits = (function (exports) {
             nextThreeChars = input.slice(position + length, position + length + 3);
         }
         if (!char) {
-            throw new LitsError("Unclosed doc string at position ".concat(position, "."), undefined);
+            return [length, ['Error', value, undefined, "Unclosed doc string at position ".concat(position)]];
         }
         value += '"""'; // closing quote
         return [length + 3, ['DocString', value]];
@@ -13374,7 +13374,7 @@ var Lits = (function (exports) {
             char = input[position + length];
         }
         if (!char) {
-            throw new LitsError("Unclosed string at position ".concat(position, "."), undefined);
+            return [length, ['Error', value, undefined, "Unclosed string at position ".concat(position)]];
         }
         value += '"'; // closing quote
         return [length + 1, ['String', value]];
@@ -13385,16 +13385,20 @@ var Lits = (function (exports) {
         var _a = __read(tokenizeString(input, position + 1), 2), stringLength = _a[0], token = _a[1];
         if (!token)
             return NO_MATCH;
+        if (token[0] === 'Error') {
+            var errorToken = ['Error', "#".concat(token[1]), undefined, "Unclosed regexp at position ".concat(position)];
+            return [stringLength + 1, errorToken];
+        }
         position += stringLength + 1;
         var length = stringLength + 1;
         var options = '';
         while (input[position] === 'g' || input[position] === 'i') {
-            if (options.includes(input[position])) {
-                throw new LitsError("Duplicated regexp option \"".concat(input[position], "\" at position ").concat(position, "."), undefined);
-            }
             options += input[position];
             length += 1;
             position += 1;
+            if (options.includes(input[position])) {
+                return [length, ['Error', "#".concat(token[1]).concat(options), undefined, "Duplicated regexp option \"".concat(input[position], "\"")]];
+            }
         }
         return [length, ['RegexpShorthand', "#".concat(token[1]).concat(options)]];
     };
@@ -13438,7 +13442,7 @@ var Lits = (function (exports) {
                     if (i === start) {
                         return NO_MATCH;
                     }
-                    throw new LitsError("Invalid number format at position ".concat(i, "."), undefined);
+                    return [i - position + 1, ['Error', input.substring(position, i + 1), undefined, "Invalid number format at position ".concat(i + 1)]];
                 }
             }
             else if (char === '.') {
@@ -13446,7 +13450,7 @@ var Lits = (function (exports) {
                     return NO_MATCH;
                 }
                 if (hasDecimalPoint || hasExponent) {
-                    throw new LitsError("Invalid number format at position ".concat(i, "."), undefined);
+                    return [i - position + 1, ['Error', input.substring(position, i + 1), undefined, "Invalid number format at position ".concat(i + 1)]];
                 }
                 hasDecimalPoint = true;
             }
@@ -13455,10 +13459,10 @@ var Lits = (function (exports) {
                     return NO_MATCH;
                 }
                 if (hasExponent) {
-                    throw new LitsError("Invalid number format at position ".concat(i, "."), undefined);
+                    return [i - position + 1, ['Error', input.substring(position, i + 1), undefined, "Invalid number format at position ".concat(i + 1)]];
                 }
                 if (input[i - 1] === '.' || input[i - 1] === '+' || input[i - 1] === '-') {
-                    throw new LitsError("Invalid number format at position ".concat(i, "."), undefined);
+                    return [i - position + 1, ['Error', input.substring(position, i + 1), undefined, "Invalid number format at position ".concat(i + 1)]];
                 }
                 if (input[i + 1] === '+' || input[i + 1] === '-') {
                     i += 1;
@@ -13478,7 +13482,7 @@ var Lits = (function (exports) {
         }
         var nextChar = input[i];
         if (nextChar && nextChar !== ':' && !postNumberRegExp.test(nextChar)) {
-            throw new LitsError("Invalid number format at position ".concat(i, "."), undefined);
+            return [i - position + 1, ['Error', input.substring(position, i + 1), undefined, "Invalid number format at position ".concat(i + 1)]];
         }
         return [length, ['Number', input.substring(position, i)]];
     };
@@ -13528,7 +13532,7 @@ var Lits = (function (exports) {
             var escaping = false;
             while (char !== '\'' || escaping) {
                 if (char === undefined)
-                    throw new LitsError("Unclosed string at position ".concat(position, "."), undefined);
+                    return [length_1, ['Error', value, undefined, "Unclosed quoted symbol at position ".concat(position)]];
                 length_1 += 1;
                 if (escaping) {
                     escaping = false;
@@ -13599,7 +13603,7 @@ var Lits = (function (exports) {
                 length_2 += 1;
             }
             if (position + length_2 + 1 >= input.length) {
-                throw new LitsError('Comment not closed', undefined);
+                return [length_2, ['Error', value, undefined, "Unclosed multi-line comment at position ".concat(position)]];
             }
             value += '*/';
             length_2 += 2;
@@ -13652,9 +13656,6 @@ var Lits = (function (exports) {
                 ? createSourceCodeInfo(input, position, filePath)
                 : undefined;
             var tokenDescriptor = getCurrentToken(input, position);
-            if (!tokenDescriptor) {
-                throw new LitsError("Unrecognized character '".concat(input[position], "'."), sourceCodeInfo);
-            }
             var _a = __read(tokenDescriptor, 2), count = _a[0], token = _a[1];
             position += count;
             if (token) {
@@ -13705,7 +13706,7 @@ var Lits = (function (exports) {
             }
             finally { if (e_1) throw e_1.error; }
         }
-        return null;
+        return [1, ['Error', input[initialPosition], undefined, 'Unrecognized character']];
     }
 
     function isSymbolToken(token, symbolName) {
@@ -13993,6 +13994,11 @@ var Lits = (function (exports) {
             this.parseState.position += 1;
         };
         Parser.prototype.parse = function () {
+            this.tokenStream.tokens.forEach(function (token) {
+                if (token[0] === 'Error') {
+                    throw new LitsError(token[3], token[2]);
+                }
+            });
             var nodes = [];
             while (!this.isAtEnd()) {
                 nodes.push(this.parseExpression(0, true));
@@ -15059,20 +15065,14 @@ var Lits = (function (exports) {
             this.suggestions = [];
             this.suggestionIndex = null;
             var partialProgram = this.originalProgram.slice(0, this.originalPosition);
-            var tokenStream = null;
-            try {
-                tokenStream = lits.tokenize(partialProgram);
-            }
-            catch (_a) {
-                // do nothing
-            }
-            if (!tokenStream) {
-                return;
-            }
+            var tokenStream = lits.tokenize(partialProgram);
             var lastToken = tokenStream.tokens.at(-1);
             if (!lastToken) {
                 return;
             }
+            if (lastToken[0] === 'Error') {
+                return;
+            }
             this.searchString = lastToken[1];
             this.prefixProgram = this.originalProgram.slice(0, this.originalPosition - this.searchString.length);
             this.suffixProgram = this.originalProgram.slice(this.prefixProgram.length + this.searchString.length);