@marimo-team/islands 0.16.5 → 0.17.1

package/dist/{chunk-4KMFLZZN-CloTfTwP.js → chunk-4KMFLZZN-BirZvvJS.js}

@@ -3,17 +3,17 @@ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { en
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var _a, _b, _c, _d, _e;
 import { i as __reExport, r as __export, s as __toESM, t as __commonJSMin } from "./chunk-DgPTj83v.js";
-import { B as isObject_default, C as _isIterateeCall_default, E as _baseRest_default, H as isObjectLike_default, O as _copyObject_default, R as isFunction_default, S as _createAssigner_default, U as _baseGetTag_default, V as isArray_default, _ as _baseUnary_default, g as _nodeUtil_default, j as _baseAssignValue_default, k as _assignValue_default, t as isArrayLikeObject_default, w as isArrayLike_default, x as _isPrototype_default, z as identity_default } from "./isArrayLikeObject-DiDsNamC.js";
-import { n as _arrayMap_default } from "./toString-BvCd3yJc.js";
-import { i as toInteger_default, r as flatten_default, t as _basePickBy_default } from "./_basePickBy-CYvzhRjy.js";
-import { a as _SetCache_default, f as _arrayFilter_default, i as _arraySome_default, m as keys_default, r as _cacheHas_default } from "./_baseIsEqual-oN7pRNcM.js";
-import { a as filter_default, f as _baseIteratee_default, g as _baseIndexOf_default, h as _arrayIncludes_default, i as values_default, l as _arrayIncludesWith_default, m as _getAllKeysIn_default, n as reduce_default, o as _baseFilter_default, r as isUndefined_default, s as forEach_default, t as _baseUniq_default, u as _baseEach_default, v as noop_default } from "./_baseUniq-B5gfSl8S.js";
-import { i as _baseFlatten_default } from "./_baseProperty-DGUdIBuu.js";
-import { t as _baseSlice_default } from "./_baseSlice-OgpvpOOJ.js";
-import { t as clone_default } from "./clone-Dk4FkKH0.js";
-import { a as has_default, c as find_default, i as isString_default, l as last_default, o as map_default, t as min_default, u as defaults_default } from "./min-BzhKOmZo.js";
-import { t as isEmpty_default } from "./isEmpty-BBG-u1GM.js";
-import { n as Range, r as init_main, t as Position } from "./main-Czi9-LVy.js";
+import { B as isObject_default, C as _isIterateeCall_default, E as _baseRest_default, H as isObjectLike_default, O as _copyObject_default, R as isFunction_default, S as _createAssigner_default, U as _baseGetTag_default, V as isArray_default, _ as _baseUnary_default, g as _nodeUtil_default, j as _baseAssignValue_default, k as _assignValue_default, t as isArrayLikeObject_default, w as isArrayLike_default, x as _isPrototype_default, z as identity_default } from "./isArrayLikeObject-DU5MCuQM.js";
+import { n as _arrayMap_default } from "./toString-CbuxCRDG.js";
+import { i as toInteger_default, r as flatten_default, t as _basePickBy_default } from "./_basePickBy-gCCvtjgp.js";
+import { a as _SetCache_default, f as _arrayFilter_default, i as _arraySome_default, m as keys_default, r as _cacheHas_default } from "./_baseIsEqual-BFlyFUxC.js";
+import { a as filter_default, f as _baseIteratee_default, g as _baseIndexOf_default, h as _arrayIncludes_default, i as values_default, l as _arrayIncludesWith_default, m as _getAllKeysIn_default, n as reduce_default, o as _baseFilter_default, r as isUndefined_default, s as forEach_default, t as _baseUniq_default, u as _baseEach_default, v as noop_default } from "./_baseUniq-CKN9mEDq.js";
+import { i as _baseFlatten_default } from "./_baseProperty-BuqBC0Ie.js";
+import { t as _baseSlice_default } from "./_baseSlice-CE9WsQZm.js";
+import { t as clone_default } from "./clone-CCgVUJ6x.js";
+import { a as has_default, c as find_default, i as isString_default, l as last_default, o as map_default, t as min_default, u as defaults_default } from "./min-Dwa_NbP6.js";
+import { t as isEmpty_default } from "./isEmpty-Do_v2sls.js";
+import { n as Range, r as init_main, t as Position } from "./main-BMTpe7M0.js";
 var hasOwnProperty$1 = Object.prototype.hasOwnProperty, assign_default = _createAssigner_default(function(e5, m) {
   if (_isPrototype_default(m) || isArrayLike_default(m)) {
     _copyObject_default(m, keys_default(m), e5);
@@ -1632,10 +1632,10 @@ function streamContents(e5, m) {
           };
         } else if (Array.isArray(_)) {
           for (; m2.arrayIndex < _.length; ) {
-            let e6 = m2.arrayIndex++, g2 = _[e6];
-            if (isAstNode(g2) && isAstNodeInRange(g2, h)) return {
+            let e6 = _[m2.arrayIndex++];
+            if (isAstNode(e6) && isAstNodeInRange(e6, h)) return {
               done: false,
-              value: g2
+              value: e6
             };
           }
           m2.arrayIndex = 0;
@@ -2100,10 +2100,9 @@ var hexDigitPattern = /[0-9a-fA-F]/, decimalPattern = /[0-9]/, decimalPatternNoZ
     return this.consumeChar("u"), this.parseHexDigits(4);
   }
   identityEscapeAtom() {
-    let e5 = this.popChar();
     return {
       type: "Character",
-      value: cc(e5)
+      value: cc(this.popChar())
     };
   }
   classPatternCharacterAtom() {
@@ -2116,10 +2115,9 @@ var hexDigitPattern = /[0-9a-fA-F]/, decimalPattern = /[0-9]/, decimalPatternNoZ
       case "]":
         throw Error("TBD");
       default:
-        let e5 = this.popChar();
         return {
           type: "Character",
-          value: cc(e5)
+          value: cc(this.popChar())
         };
     }
   }
@@ -3230,8 +3228,7 @@ function firstForSequence(e5) {
   return uniq_default(m);
 }
 function firstForBranching(e5) {
-  let m = map_default(e5.definition, (e6) => first(e6));
-  return uniq_default(flatten_default(m));
+  return uniq_default(flatten_default(map_default(e5.definition, (e6) => first(e6))));
 }
 function firstForTerminal(e5) {
   return [e5.terminalType];
@@ -3247,15 +3244,14 @@ var ResyncFollowsWalker = class extends RestWalker {
   walkTerminal(e5, m, h) {
   }
   walkProdRef(e5, m, h) {
-    let g = buildBetweenProdsFollowPrefix(e5.referencedRule, e5.idx) + this.topProd.name, _ = m.concat(h), v = new Alternative({ definition: _ }), y = first(v);
-    this.follows[g] = y;
+    let g = buildBetweenProdsFollowPrefix(e5.referencedRule, e5.idx) + this.topProd.name, _ = first(new Alternative({ definition: m.concat(h) }));
+    this.follows[g] = _;
   }
 };
 function computeAllProdsFollows(e5) {
   let m = {};
   return forEach_default(e5, (e6) => {
-    let h = new ResyncFollowsWalker(e6).startWalking();
-    assign_default(m, h);
+    assign_default(m, new ResyncFollowsWalker(e6).startWalking());
   }), m;
 }
 function buildBetweenProdsFollowPrefix(e5, m) {
@@ -3505,14 +3501,12 @@ function analyzeTokenTypes(e5, m) {
   let j = true, M = [];
   return m.safeMode || h("First Char Optimization", () => {
     M = reduce_default(g, (e6, h2, g2) => {
-      if (typeof h2.PATTERN == "string") {
-        let m2 = h2.PATTERN.charCodeAt(0), _2 = charCodeToOptimizedIndex(m2);
-        addToMapOfArrays(e6, _2, A[g2]);
-      } else if (isArray_default(h2.START_CHARS_HINT)) {
+      if (typeof h2.PATTERN == "string") addToMapOfArrays(e6, charCodeToOptimizedIndex(h2.PATTERN.charCodeAt(0)), A[g2]);
+      else if (isArray_default(h2.START_CHARS_HINT)) {
         let m2;
         forEach_default(h2.START_CHARS_HINT, (h3) => {
-          let _2 = typeof h3 == "string" ? h3.charCodeAt(0) : h3, v2 = charCodeToOptimizedIndex(_2);
-          m2 !== v2 && (m2 = v2, addToMapOfArrays(e6, v2, A[g2]));
+          let _2 = charCodeToOptimizedIndex(typeof h3 == "string" ? h3.charCodeAt(0) : h3);
+          m2 !== _2 && (m2 = _2, addToMapOfArrays(e6, _2, A[g2]));
         });
       } else if (isRegExp_default(h2.PATTERN)) if (h2.PATTERN.unicode) j = false, m.ensureOptimizations && PRINT_ERROR(`${failedOptimizationPrefixMsg}	Unable to analyze < ${h2.PATTERN.toString()} > pattern.
 	The regexp unicode flag is not currently supported by the regexp-to-ast library.
@@ -3548,28 +3542,28 @@ function validateRegExpPattern(e5) {
   return m = m.concat(findEndOfInputAnchor(h)), m = m.concat(findStartOfInputAnchor(h)), m = m.concat(findUnsupportedFlags(h)), m = m.concat(findDuplicatePatterns(h)), m = m.concat(findEmptyMatchRegExps(h)), m;
 }
 function findMissingPatterns(e5) {
-  let m = filter_default(e5, (e6) => !has_default(e6, PATTERN)), h = map_default(m, (e6) => ({
-    message: "Token Type: ->" + e6.name + "<- missing static 'PATTERN' property",
-    type: LexerDefinitionErrorType.MISSING_PATTERN,
-    tokenTypes: [e6]
-  })), g = difference_default(e5, m);
+  let m = filter_default(e5, (e6) => !has_default(e6, PATTERN));
   return {
-    errors: h,
-    valid: g
+    errors: map_default(m, (e6) => ({
+      message: "Token Type: ->" + e6.name + "<- missing static 'PATTERN' property",
+      type: LexerDefinitionErrorType.MISSING_PATTERN,
+      tokenTypes: [e6]
+    })),
+    valid: difference_default(e5, m)
   };
 }
 function findInvalidPatterns(e5) {
   let m = filter_default(e5, (e6) => {
     let m2 = e6[PATTERN];
     return !isRegExp_default(m2) && !isFunction_default(m2) && !has_default(m2, "exec") && !isString_default(m2);
-  }), h = map_default(m, (e6) => ({
-    message: "Token Type: ->" + e6.name + "<- static 'PATTERN' can only be a RegExp, a Function matching the {CustomPatternMatcherFunc} type or an Object matching the {ICustomPattern} interface.",
-    type: LexerDefinitionErrorType.INVALID_PATTERN,
-    tokenTypes: [e6]
-  })), g = difference_default(e5, m);
+  });
   return {
-    errors: h,
-    valid: g
+    errors: map_default(m, (e6) => ({
+      message: "Token Type: ->" + e6.name + "<- static 'PATTERN' can only be a RegExp, a Function matching the {CustomPatternMatcherFunc} type or an Object matching the {ICustomPattern} interface.",
+      type: LexerDefinitionErrorType.INVALID_PATTERN,
+      tokenTypes: [e6]
+    })),
+    valid: difference_default(e5, m)
   };
 }
 var end_of_input = /[^\\][$]/;
@@ -3582,24 +3576,22 @@ function findEndOfInputAnchor(e5) {
       this.found = true;
     }
   }
-  let h = filter_default(e5, (e6) => {
-    let h2 = e6.PATTERN;
+  return map_default(filter_default(e5, (e6) => {
+    let h = e6.PATTERN;
     try {
-      let e7 = getRegExpAst(h2), g = new m();
+      let e7 = getRegExpAst(h), g = new m();
       return g.visit(e7), g.found;
     } catch {
-      return end_of_input.test(h2.source);
+      return end_of_input.test(h.source);
     }
-  });
-  return map_default(h, (e6) => ({
+  }), (e6) => ({
     message: "Unexpected RegExp Anchor Error:\n	Token Type: ->" + e6.name + "<- static 'PATTERN' cannot contain end of input anchor '$'\n	See chevrotain.io/docs/guide/resolving_lexer_errors.html#ANCHORS	for details.",
     type: LexerDefinitionErrorType.EOI_ANCHOR_FOUND,
     tokenTypes: [e6]
   }));
 }
 function findEmptyMatchRegExps(e5) {
-  let m = filter_default(e5, (e6) => e6.PATTERN.test(""));
-  return map_default(m, (e6) => ({
+  return map_default(filter_default(e5, (e6) => e6.PATTERN.test("")), (e6) => ({
     message: "Token Type: ->" + e6.name + "<- static 'PATTERN' must not match an empty string",
     type: LexerDefinitionErrorType.EMPTY_MATCH_PATTERN,
     tokenTypes: [e6]
@@ -3615,37 +3607,33 @@ function findStartOfInputAnchor(e5) {
       this.found = true;
     }
   }
-  let h = filter_default(e5, (e6) => {
-    let h2 = e6.PATTERN;
+  return map_default(filter_default(e5, (e6) => {
+    let h = e6.PATTERN;
     try {
-      let e7 = getRegExpAst(h2), g = new m();
+      let e7 = getRegExpAst(h), g = new m();
       return g.visit(e7), g.found;
     } catch {
-      return start_of_input.test(h2.source);
+      return start_of_input.test(h.source);
     }
-  });
-  return map_default(h, (e6) => ({
+  }), (e6) => ({
     message: "Unexpected RegExp Anchor Error:\n	Token Type: ->" + e6.name + "<- static 'PATTERN' cannot contain start of input anchor '^'\n	See https://chevrotain.io/docs/guide/resolving_lexer_errors.html#ANCHORS	for details.",
     type: LexerDefinitionErrorType.SOI_ANCHOR_FOUND,
     tokenTypes: [e6]
   }));
 }
 function findUnsupportedFlags(e5) {
-  let m = filter_default(e5, (e6) => {
-    let m2 = e6[PATTERN];
-    return m2 instanceof RegExp && (m2.multiline || m2.global);
-  });
-  return map_default(m, (e6) => ({
+  return map_default(filter_default(e5, (e6) => {
+    let m = e6[PATTERN];
+    return m instanceof RegExp && (m.multiline || m.global);
+  }), (e6) => ({
     message: "Token Type: ->" + e6.name + "<- static 'PATTERN' may NOT contain global('g') or multiline('m')",
     type: LexerDefinitionErrorType.UNSUPPORTED_FLAGS_FOUND,
     tokenTypes: [e6]
   }));
 }
 function findDuplicatePatterns(e5) {
-  let m = [], h = map_default(e5, (h2) => reduce_default(e5, (e6, g2) => h2.PATTERN.source === g2.PATTERN.source && !includes_default(m, g2) && g2.PATTERN !== Lexer.NA ? (m.push(g2), e6.push(g2), e6) : e6, []));
-  h = compact_default(h);
-  let g = filter_default(h, (e6) => e6.length > 1);
-  return map_default(g, (e6) => {
+  let m = [], h = map_default(e5, (h2) => reduce_default(e5, (e6, g) => h2.PATTERN.source === g.PATTERN.source && !includes_default(m, g) && g.PATTERN !== Lexer.NA ? (m.push(g), e6.push(g), e6) : e6, []));
+  return h = compact_default(h), map_default(filter_default(h, (e6) => e6.length > 1), (e6) => {
     let m2 = map_default(e6, (e7) => e7.name);
     return {
       message: `The same RegExp pattern ->${head_default(e6).PATTERN}<-has been used in all of the following Token Types: ${m2.join(", ")} <-`,
@@ -3655,20 +3643,18 @@ function findDuplicatePatterns(e5) {
   });
 }
 function findInvalidGroupType(e5) {
-  let m = filter_default(e5, (e6) => {
+  return map_default(filter_default(e5, (e6) => {
     if (!has_default(e6, "GROUP")) return false;
-    let m2 = e6.GROUP;
-    return m2 !== Lexer.SKIPPED && m2 !== Lexer.NA && !isString_default(m2);
-  });
-  return map_default(m, (e6) => ({
+    let m = e6.GROUP;
+    return m !== Lexer.SKIPPED && m !== Lexer.NA && !isString_default(m);
+  }), (e6) => ({
     message: "Token Type: ->" + e6.name + "<- static 'GROUP' can only be Lexer.SKIPPED/Lexer.NA/A String",
     type: LexerDefinitionErrorType.INVALID_GROUP_TYPE_FOUND,
     tokenTypes: [e6]
   }));
 }
 function findModesThatDoNotExist(e5, m) {
-  let h = filter_default(e5, (e6) => e6.PUSH_MODE !== void 0 && !includes_default(m, e6.PUSH_MODE));
-  return map_default(h, (e6) => ({
+  return map_default(filter_default(e5, (e6) => e6.PUSH_MODE !== void 0 && !includes_default(m, e6.PUSH_MODE)), (e6) => ({
     message: `Token Type: ->${e6.name}<- static 'PUSH_MODE' value cannot refer to a Lexer Mode ->${e6.PUSH_MODE}<-which does not exist`,
     type: LexerDefinitionErrorType.PUSH_MODE_DOES_NOT_EXIST,
     tokenTypes: [e6]
@@ -3750,28 +3736,24 @@ function performRuntimeChecks(e5, m, h) {
     type: LexerDefinitionErrorType.MULTI_MODE_LEXER_DEFAULT_MODE_VALUE_DOES_NOT_EXIST
   }), has_default(e5, "modes") && forEach_default(e5.modes, (e6, m2) => {
     forEach_default(e6, (h2, _) => {
-      if (isUndefined_default(h2)) g.push({
+      isUndefined_default(h2) ? g.push({
         message: `A Lexer cannot be initialized using an undefined Token Type. Mode:<${m2}> at index: <${_}>
 `,
         type: LexerDefinitionErrorType.LEXER_DEFINITION_CANNOT_CONTAIN_UNDEFINED
-      });
-      else if (has_default(h2, "LONGER_ALT")) {
-        let _2 = isArray_default(h2.LONGER_ALT) ? h2.LONGER_ALT : [h2.LONGER_ALT];
-        forEach_default(_2, (_3) => {
-          !isUndefined_default(_3) && !includes_default(e6, _3) && g.push({
-            message: `A MultiMode Lexer cannot be initialized with a longer_alt <${_3.name}> on token <${h2.name}> outside of mode <${m2}>
+      }) : has_default(h2, "LONGER_ALT") && forEach_default(isArray_default(h2.LONGER_ALT) ? h2.LONGER_ALT : [h2.LONGER_ALT], (_2) => {
+        !isUndefined_default(_2) && !includes_default(e6, _2) && g.push({
+          message: `A MultiMode Lexer cannot be initialized with a longer_alt <${_2.name}> on token <${h2.name}> outside of mode <${m2}>
 `,
-            type: LexerDefinitionErrorType.MULTI_MODE_LEXER_LONGER_ALT_NOT_IN_CURRENT_MODE
-          });
+          type: LexerDefinitionErrorType.MULTI_MODE_LEXER_LONGER_ALT_NOT_IN_CURRENT_MODE
         });
-      }
+      });
     });
   }), g;
 }
 function performWarningRuntimeChecks(e5, m, h) {
-  let g = [], _ = false, v = compact_default(flatten_default(values_default(e5.modes))), y = reject_default(v, (e6) => e6[PATTERN] === Lexer.NA), b = getCharCodes(h);
-  return m && forEach_default(y, (e6) => {
-    let m2 = checkLineBreaksIssues(e6, b);
+  let g = [], _ = false, v = reject_default(compact_default(flatten_default(values_default(e5.modes))), (e6) => e6[PATTERN] === Lexer.NA), y = getCharCodes(h);
+  return m && forEach_default(v, (e6) => {
+    let m2 = checkLineBreaksIssues(e6, y);
     if (m2 !== false) {
       let h2 = {
         message: buildLineBreakIssueMessage(e6, m2),
@@ -3779,17 +3761,17 @@ function performWarningRuntimeChecks(e5, m, h) {
         tokenType: e6
       };
       g.push(h2);
-    } else has_default(e6, "LINE_BREAKS") ? e6.LINE_BREAKS === true && (_ = true) : canMatchCharCode(b, e6.PATTERN) && (_ = true);
+    } else has_default(e6, "LINE_BREAKS") ? e6.LINE_BREAKS === true && (_ = true) : canMatchCharCode(y, e6.PATTERN) && (_ = true);
   }), m && !_ && g.push({
     message: "Warning: No LINE_BREAKS Found.\n	This Lexer has been defined to track line and column information,\n	But none of the Token Types can be identified as matching a line terminator.\n	See https://chevrotain.io/docs/guide/resolving_lexer_errors.html#LINE_BREAKS \n	for details.",
     type: LexerDefinitionErrorType.NO_LINE_BREAKS_FLAGS
   }), g;
 }
 function cloneEmptyGroups(e5) {
-  let m = {}, h = keys_default(e5);
-  return forEach_default(h, (h2) => {
-    let g = e5[h2];
-    if (isArray_default(g)) m[h2] = [];
+  let m = {};
+  return forEach_default(keys_default(e5), (h) => {
+    let g = e5[h];
+    if (isArray_default(g)) m[h] = [];
     else throw Error("non exhaustive match");
   }), m;
 }
@@ -4229,22 +4211,14 @@ const defaultParserErrorProvider = {
     return "Redundant input, expecting EOF but found: " + e5.image;
   },
   buildNoViableAltMessage({ expectedPathsPerAlt: e5, actual: m, previous: h, customUserDescription: g, ruleName: _ }) {
-    let v = "Expecting: ", y = "\nbut found: '" + head_default(m).image + "'";
-    if (g) return v + g + y;
-    {
-      let m2 = reduce_default(e5, (e6, m3) => e6.concat(m3), []), h2 = map_default(m2, (e6) => `[${map_default(e6, (e7) => tokenLabel(e7)).join(", ")}]`), g2 = `one of these possible Token sequences:
-${map_default(h2, (e6, m3) => `  ${m3 + 1}. ${e6}`).join("\n")}`;
-      return v + g2 + y;
-    }
+    let v = "\nbut found: '" + head_default(m).image + "'";
+    return g ? "Expecting: " + g + v : `Expecting: one of these possible Token sequences:
+${map_default(map_default(reduce_default(e5, (e6, m2) => e6.concat(m2), []), (e6) => `[${map_default(e6, (e7) => tokenLabel(e7)).join(", ")}]`), (e6, m2) => `  ${m2 + 1}. ${e6}`).join("\n")}` + v;
   },
   buildEarlyExitMessage({ expectedIterationPaths: e5, actual: m, customUserDescription: h, ruleName: g }) {
-    let _ = "Expecting: ", v = "\nbut found: '" + head_default(m).image + "'";
-    if (h) return _ + h + v;
-    {
-      let m2 = `expecting at least one iteration which starts with one of these possible Token sequences::
-  <${map_default(e5, (e6) => `[${map_default(e6, (e7) => tokenLabel(e7)).join(",")}]`).join(" ,")}>`;
-      return _ + m2 + v;
-    }
+    let _ = "\nbut found: '" + head_default(m).image + "'";
+    return h ? "Expecting: " + h + _ : `Expecting: expecting at least one iteration which starts with one of these possible Token sequences::
+  <${map_default(e5, (e6) => `[${map_default(e6, (e7) => tokenLabel(e7)).join(",")}]`).join(" ,")}>` + _;
   }
 };
 Object.freeze(defaultParserErrorProvider);
@@ -4300,11 +4274,11 @@ Only the last alternative may be an empty alternative.`;
  has ${e5.alternation.definition.length + 1} alternatives.`;
   },
   buildLeftRecursionError(e5) {
-    let m = e5.topLevelRule.name, h = map_default(e5.leftRecursionPath, (e6) => e6.name), g = `${m} --> ${h.concat([m]).join(" --> ")}`;
+    let m = e5.topLevelRule.name;
     return `Left Recursion found in grammar.
 rule: <${m}> can be invoked from itself (directly or indirectly)
 without consuming any Tokens. The grammar path that causes this is: 
- ${g}
+ ${`${m} --> ${map_default(e5.leftRecursionPath, (e6) => e6.name).concat([m]).join(" --> ")}`}
  To fix this refactor your grammar to remove the left recursion.
 see: https://en.wikipedia.org/wiki/LL_parser#Left_factoring.`;
   },
@@ -4367,10 +4341,7 @@ var GastRefResolverVisitor = class extends GAstVisitor {
     super(e5, m), this.path = m, this.nextTerminalName = "", this.nextTerminalOccurrence = 0, this.nextTerminalName = this.path.lastTok.name, this.nextTerminalOccurrence = this.path.lastTokOccurrence;
   }
   walkTerminal(e5, m, h) {
-    if (this.isAtEndOfPath && e5.terminalType.name === this.nextTerminalName && e5.idx === this.nextTerminalOccurrence && !this.found) {
-      let e6 = m.concat(h), g = new Alternative({ definition: e6 });
-      this.possibleTokTypes = first(g), this.found = true;
-    }
+    this.isAtEndOfPath && e5.terminalType.name === this.nextTerminalName && e5.idx === this.nextTerminalOccurrence && !this.found && (this.possibleTokTypes = first(new Alternative({ definition: m.concat(h) })), this.found = true);
   }
 }, AbstractNextTerminalAfterProductionWalker = class extends RestWalker {
   constructor(e5, m) {
@@ -4426,19 +4397,11 @@ function possiblePathsFrom(e5, m, h = []) {
     let m2 = e5[_];
     if (m2 instanceof Alternative || m2 instanceof NonTerminal) return y(m2.definition);
     if (m2 instanceof Option$1) g = y(m2.definition);
-    else if (m2 instanceof RepetitionMandatory) {
-      let e6 = m2.definition.concat([new Repetition({ definition: m2.definition })]);
-      return y(e6);
-    } else if (m2 instanceof RepetitionMandatoryWithSeparator) {
-      let e6 = [new Alternative({ definition: m2.definition }), new Repetition({ definition: [new Terminal({ terminalType: m2.separator })].concat(m2.definition) })];
-      return y(e6);
-    } else if (m2 instanceof RepetitionWithSeparator) {
-      let e6 = m2.definition.concat([new Repetition({ definition: [new Terminal({ terminalType: m2.separator })].concat(m2.definition) })]);
-      g = y(e6);
-    } else if (m2 instanceof Repetition) {
-      let e6 = m2.definition.concat([new Repetition({ definition: m2.definition })]);
-      g = y(e6);
-    } else if (m2 instanceof Alternation) return forEach_default(m2.definition, (e6) => {
+    else if (m2 instanceof RepetitionMandatory) return y(m2.definition.concat([new Repetition({ definition: m2.definition })]));
+    else if (m2 instanceof RepetitionMandatoryWithSeparator) return y([new Alternative({ definition: m2.definition }), new Repetition({ definition: [new Terminal({ terminalType: m2.separator })].concat(m2.definition) })]);
+    else if (m2 instanceof RepetitionWithSeparator) g = y(m2.definition.concat([new Repetition({ definition: [new Terminal({ terminalType: m2.separator })].concat(m2.definition) })]));
+    else if (m2 instanceof Repetition) g = y(m2.definition.concat([new Repetition({ definition: m2.definition })]));
+    else if (m2 instanceof Alternation) return forEach_default(m2.definition, (e6) => {
       isEmpty_default(e6.definition) === false && (g = y(e6.definition));
     }), g;
     else if (m2 instanceof Terminal) h.push(m2.terminalType);
@@ -4524,24 +4487,24 @@ function nextPossibleTokensAfter(e5, m, h, g) {
       let e7 = new Repetition({
         definition: O.definition,
         idx: O.idx
-      }), m2 = O.definition.concat([e7], drop_default(g2)), h2 = {
+      }), m2 = {
         idx: T,
-        def: m2,
+        def: O.definition.concat([e7], drop_default(g2)),
         ruleStack: E,
         occurrenceStack: D
       };
-      w.push(h2);
+      w.push(m2);
     } else if (O instanceof RepetitionMandatoryWithSeparator) {
-      let e7 = new Terminal({ terminalType: O.separator }), m2 = new Repetition({
-        definition: [e7].concat(O.definition),
+      let e7 = new Repetition({
+        definition: [new Terminal({ terminalType: O.separator })].concat(O.definition),
         idx: O.idx
-      }), h2 = O.definition.concat([m2], drop_default(g2)), _2 = {
+      }), m2 = {
         idx: T,
-        def: h2,
+        def: O.definition.concat([e7], drop_default(g2)),
         ruleStack: E,
         occurrenceStack: D
       };
-      w.push(_2);
+      w.push(m2);
     } else if (O instanceof RepetitionWithSeparator) {
       let e7 = {
         idx: T,
@@ -4550,16 +4513,16 @@ function nextPossibleTokensAfter(e5, m, h, g) {
         occurrenceStack: D
       };
       w.push(e7), w.push(y);
-      let m2 = new Terminal({ terminalType: O.separator }), h2 = new Repetition({
-        definition: [m2].concat(O.definition),
+      let m2 = new Repetition({
+        definition: [new Terminal({ terminalType: O.separator })].concat(O.definition),
         idx: O.idx
-      }), _2 = O.definition.concat([h2], drop_default(g2)), v2 = {
+      }), h2 = {
         idx: T,
-        def: _2,
+        def: O.definition.concat([m2], drop_default(g2)),
         ruleStack: E,
         occurrenceStack: D
       };
-      w.push(v2);
+      w.push(h2);
     } else if (O instanceof Repetition) {
       let e7 = {
         idx: T,
@@ -4571,21 +4534,21 @@ function nextPossibleTokensAfter(e5, m, h, g) {
       let m2 = new Repetition({
         definition: O.definition,
         idx: O.idx
-      }), h2 = O.definition.concat([m2], drop_default(g2)), _2 = {
+      }), h2 = {
         idx: T,
-        def: h2,
+        def: O.definition.concat([m2], drop_default(g2)),
         ruleStack: E,
         occurrenceStack: D
       };
-      w.push(_2);
+      w.push(h2);
     } else if (O instanceof Alternation) for (let e7 = O.definition.length - 1; e7 >= 0; e7--) {
-      let m2 = O.definition[e7], h2 = {
+      let m2 = {
         idx: T,
-        def: m2.definition.concat(drop_default(g2)),
+        def: O.definition[e7].definition.concat(drop_default(g2)),
         ruleStack: E,
         occurrenceStack: D
       };
-      w.push(h2), w.push(y);
+      w.push(m2), w.push(y);
     }
     else if (O instanceof Alternative) w.push({
       idx: T,
@@ -4627,8 +4590,8 @@ function getLookaheadPaths(e5) {
   return v === PROD_TYPE.ALTERNATION ? getLookaheadPathsForOr(m, h, _) : getLookaheadPathsForOptionalProd(m, h, v, _);
 }
 function buildLookaheadFuncForOr(e5, m, h, g, _, v) {
-  let y = getLookaheadPathsForOr(e5, m, h), b = areTokenCategoriesNotUsed(y) ? tokenStructuredMatcherNoCategories : tokenStructuredMatcher;
-  return v(y, g, b, _);
+  let y = getLookaheadPathsForOr(e5, m, h);
+  return v(y, g, areTokenCategoriesNotUsed(y) ? tokenStructuredMatcherNoCategories : tokenStructuredMatcher, _);
 }
 function buildLookaheadFuncForOptionalProd(e5, m, h, g, _, v) {
   let y = getLookaheadPathsForOptionalProd(e5, m, _, h), b = areTokenCategoriesNotUsed(y) ? tokenStructuredMatcherNoCategories : tokenStructuredMatcher;
@@ -4642,33 +4605,26 @@ function buildAlternativesLookAheadFunc(e5, m, h, g) {
       let _2 = e5[m3], v2 = _2.length, y = g2[m3];
       if (!(y !== void 0 && y.call(this) === false)) nextPath: for (let e6 = 0; e6 < v2; e6++) {
         let g3 = _2[e6], v3 = g3.length;
-        for (let e7 = 0; e7 < v3; e7++) {
-          let m4 = this.LA(e7 + 1);
-          if (h(m4, g3[e7]) === false) continue nextPath;
-        }
+        for (let e7 = 0; e7 < v3; e7++) if (h(this.LA(e7 + 1), g3[e7]) === false) continue nextPath;
         return m3;
       }
     }
   };
   if (v && !g) {
-    let m2 = map_default(e5, (e6) => flatten_default(e6)), h2 = reduce_default(m2, (e6, m3, h3) => (forEach_default(m3, (m4) => {
-      has_default(e6, m4.tokenTypeIdx) || (e6[m4.tokenTypeIdx] = h3), forEach_default(m4.categoryMatches, (m5) => {
-        has_default(e6, m5) || (e6[m5] = h3);
+    let m2 = reduce_default(map_default(e5, (e6) => flatten_default(e6)), (e6, m3, h2) => (forEach_default(m3, (m4) => {
+      has_default(e6, m4.tokenTypeIdx) || (e6[m4.tokenTypeIdx] = h2), forEach_default(m4.categoryMatches, (m5) => {
+        has_default(e6, m5) || (e6[m5] = h2);
       });
     }), e6), {});
     return function() {
-      let e6 = this.LA(1);
-      return h2[e6.tokenTypeIdx];
+      return m2[this.LA(1).tokenTypeIdx];
     };
   } else return function() {
     for (let m2 = 0; m2 < _; m2++) {
       let g2 = e5[m2], _2 = g2.length;
       nextPath: for (let e6 = 0; e6 < _2; e6++) {
         let _3 = g2[e6], v2 = _3.length;
-        for (let e7 = 0; e7 < v2; e7++) {
-          let m3 = this.LA(e7 + 1);
-          if (h(m3, _3[e7]) === false) continue nextPath;
-        }
+        for (let e7 = 0; e7 < v2; e7++) if (h(this.LA(e7 + 1), _3[e7]) === false) continue nextPath;
         return m2;
       }
     }
@@ -4688,17 +4644,13 @@ function buildSingleAlternativeLookaheadFunction(e5, m, h) {
         e7[m4] = true;
       }), e7), []);
       return function() {
-        let m3 = this.LA(1);
-        return e6[m3.tokenTypeIdx] === true;
+        return e6[this.LA(1).tokenTypeIdx] === true;
       };
     }
   } else return function() {
     nextPath: for (let h2 = 0; h2 < _; h2++) {
       let g2 = e5[h2], _2 = g2.length;
-      for (let e6 = 0; e6 < _2; e6++) {
-        let h3 = this.LA(e6 + 1);
-        if (m(h3, g2[e6]) === false) continue nextPath;
-      }
+      for (let e6 = 0; e6 < _2; e6++) if (m(this.LA(e6 + 1), g2[e6]) === false) continue nextPath;
       return true;
     }
     return false;
@@ -4780,10 +4732,7 @@ function isUniquePrefixHash(e5, m, h) {
   for (let g = 0; g < e5.length; g++) {
     if (g === h) continue;
     let _ = e5[g];
-    for (let e6 = 0; e6 < m.length; e6++) {
-      let h2 = m[e6];
-      if (_[h2] === true) return false;
-    }
+    for (let e6 = 0; e6 < m.length; e6++) if (_[m[e6]] === true) return false;
   }
   return true;
 }
@@ -4791,8 +4740,7 @@ function lookAheadSequenceFromAlternatives(e5, m) {
   let h = map_default(e5, (e6) => possiblePathsFrom([e6], 1)), g = initializeArrayOfArrays(h.length), _ = map_default(h, (e6) => {
     let m2 = {};
     return forEach_default(e6, (e7) => {
-      let h2 = pathToHashKeys(e7.partialPath);
-      forEach_default(h2, (e8) => {
+      forEach_default(pathToHashKeys(e7.partialPath), (e8) => {
         m2[e8] = true;
       });
     }), m2;
@@ -4816,8 +4764,7 @@ function lookAheadSequenceFromAlternatives(e5, m) {
         } else {
           let m2 = possiblePathsFrom(S, e6 + 1, x);
           v[y] = v[y].concat(m2), forEach_default(m2, (e7) => {
-            let m3 = pathToHashKeys(e7.partialPath);
-            forEach_default(m3, (e8) => {
+            forEach_default(pathToHashKeys(e7.partialPath), (e8) => {
               _[y][e8] = true;
             });
           });
@@ -4834,8 +4781,8 @@ function getLookaheadPathsForOr(e5, m, h, g) {
 function getLookaheadPathsForOptionalProd(e5, m, h, g) {
   let _ = new InsideDefinitionFinderVisitor(e5, h);
   m.accept(_);
-  let v = _.result, y = new RestDefinitionFinderWalker(m, e5, h).startWalking(), b = new Alternative({ definition: v }), x = new Alternative({ definition: y });
-  return lookAheadSequenceFromAlternatives([b, x], g);
+  let v = _.result, y = new RestDefinitionFinderWalker(m, e5, h).startWalking();
+  return lookAheadSequenceFromAlternatives([new Alternative({ definition: v }), new Alternative({ definition: y })], g);
 }
 function containsPath(e5, m) {
   compareOtherPath: for (let h = 0; h < e5.length; h++) {
@@ -4860,12 +4807,11 @@ function areTokenCategoriesNotUsed(e5) {
   return every_default(e5, (e6) => every_default(e6, (e7) => every_default(e7, (e8) => isEmpty_default(e8.categoryMatches))));
 }
 function validateLookahead(e5) {
-  let m = e5.lookaheadStrategy.validate({
+  return map_default(e5.lookaheadStrategy.validate({
     rules: e5.rules,
     tokenTypes: e5.tokenTypes,
     grammarName: e5.grammarName
-  });
-  return map_default(m, (e6) => Object.assign({ type: ParserDefinitionErrorType.CUSTOM_LOOKAHEAD_VALIDATION }, e6));
+  }), (e6) => Object.assign({ type: ParserDefinitionErrorType.CUSTOM_LOOKAHEAD_VALIDATION }, e6));
 }
 function validateGrammar$1(e5, m, h, g) {
   let _ = flatMap_default(e5, (e6) => validateDuplicateProductions(e6, h)), v = checkTerminalAndNoneTerminalsNameSpace(e5, m, h), y = flatMap_default(e5, (e6) => validateTooManyAlts(e6, h)), b = flatMap_default(e5, (m2) => validateRuleDoesNotAlreadyExist(m2, e5, g, h));
@@ -4874,13 +4820,13 @@ function validateGrammar$1(e5, m, h, g) {
 function validateDuplicateProductions(e5, m) {
   let h = new OccurrenceValidationCollector();
   e5.accept(h);
-  let g = h.allProductions, _ = groupBy_default(g, identifyProductionForDuplicates), v = pickBy_default(_, (e6) => e6.length > 1);
-  return map_default(values_default(v), (h2) => {
-    let g2 = head_default(h2), _2 = m.buildDuplicateFoundError(e5, h2), v2 = getProductionDslName$1(g2), y = {
-      message: _2,
+  let g = h.allProductions;
+  return map_default(values_default(pickBy_default(groupBy_default(g, identifyProductionForDuplicates), (e6) => e6.length > 1)), (h2) => {
+    let g2 = head_default(h2), _ = m.buildDuplicateFoundError(e5, h2), v = getProductionDslName$1(g2), y = {
+      message: _,
       type: ParserDefinitionErrorType.DUPLICATE_PRODUCTIONS,
       ruleName: e5.name,
-      dslName: v2,
+      dslName: v,
       occurrence: g2.idx
     }, b = getExtraProductionArgument(g2);
     return b && (y.parameter = b), y;
@@ -4957,11 +4903,11 @@ function validateNoLeftRecursion(e5, m, h, g = []) {
       type: ParserDefinitionErrorType.LEFT_RECURSION,
       ruleName: m2
     });
-    let y = difference_default(v, g.concat([e5])), b = flatMap_default(y, (m3) => {
+    let y = flatMap_default(difference_default(v, g.concat([e5])), (m3) => {
       let _2 = clone_default(g);
       return _2.push(m3), validateNoLeftRecursion(e5, m3, h, _2);
     });
-    return _.concat(b);
+    return _.concat(y);
   }
 }
 function getFirstNoneTerminal(e5) {
@@ -4990,31 +4936,25 @@ function validateEmptyOrAlternative(e5, m) {
   let h = new OrCollector();
   e5.accept(h);
   let g = h.alternations;
-  return flatMap_default(g, (h2) => {
-    let g2 = dropRight_default(h2.definition);
-    return flatMap_default(g2, (g3, _) => {
-      let v = nextPossibleTokensAfter([g3], [], tokenStructuredMatcher, 1);
-      return isEmpty_default(v) ? [{
-        message: m.buildEmptyAlternationError({
-          topLevelRule: e5,
-          alternation: h2,
-          emptyChoiceIdx: _
-        }),
-        type: ParserDefinitionErrorType.NONE_LAST_EMPTY_ALT,
-        ruleName: e5.name,
-        occurrence: h2.idx,
-        alternative: _ + 1
-      }] : [];
-    });
-  });
+  return flatMap_default(g, (h2) => flatMap_default(dropRight_default(h2.definition), (g2, _) => isEmpty_default(nextPossibleTokensAfter([g2], [], tokenStructuredMatcher, 1)) ? [{
+    message: m.buildEmptyAlternationError({
+      topLevelRule: e5,
+      alternation: h2,
+      emptyChoiceIdx: _
+    }),
+    type: ParserDefinitionErrorType.NONE_LAST_EMPTY_ALT,
+    ruleName: e5.name,
+    occurrence: h2.idx,
+    alternative: _ + 1
+  }] : []));
 }
 function validateAmbiguousAlternationAlternatives(e5, m, h) {
   let g = new OrCollector();
   e5.accept(g);
   let _ = g.alternations;
   return _ = reject_default(_, (e6) => e6.ignoreAmbiguities === true), flatMap_default(_, (g2) => {
-    let _2 = g2.idx, v = g2.maxLookahead || m, y = getLookaheadPathsForOr(_2, e5, v, g2), b = checkAlternativesAmbiguities(y, g2, e5, h), x = checkPrefixAlternativesAmbiguities(y, g2, e5, h);
-    return b.concat(x);
+    let _2 = g2.idx, v = getLookaheadPathsForOr(_2, e5, g2.maxLookahead || m, g2), y = checkAlternativesAmbiguities(v, g2, e5, h), b = checkPrefixAlternativesAmbiguities(v, g2, e5, h);
+    return y.concat(b);
   });
 }
 var RepetitionCollector = class extends GAstVisitor {
@@ -5071,16 +5011,16 @@ function validateSomeNonEmptyLookaheadPath(e5, m, h) {
   }), g;
 }
 function checkAlternativesAmbiguities(e5, m, h, g) {
-  let _ = [], v = reduce_default(e5, (h2, g2, v2) => (m.definition[v2].ignoreAmbiguities === true || forEach_default(g2, (g3) => {
-    let y = [v2];
+  let _ = [];
+  return map_default(reduce_default(e5, (h2, g2, v) => (m.definition[v].ignoreAmbiguities === true || forEach_default(g2, (g3) => {
+    let y = [v];
     forEach_default(e5, (e6, h3) => {
-      v2 !== h3 && containsPath(e6, g3) && m.definition[h3].ignoreAmbiguities !== true && y.push(h3);
+      v !== h3 && containsPath(e6, g3) && m.definition[h3].ignoreAmbiguities !== true && y.push(h3);
     }), y.length > 1 && !containsPath(_, g3) && (_.push(g3), h2.push({
       alts: y,
       path: g3
     }));
-  }), h2), []);
-  return map_default(v, (e6) => {
+  }), h2), []), (e6) => {
     let _2 = map_default(e6.alts, (e7) => e7 + 1);
     return {
       message: g.buildAlternationAmbiguityError({
@@ -5106,8 +5046,8 @@ function checkPrefixAlternativesAmbiguities(e5, m, h, g) {
   }, []);
   return compact_default(flatMap_default(_, (e6) => {
     if (m.definition[e6.idx].ignoreAmbiguities === true) return [];
-    let v = e6.idx, y = e6.path, b = filter_default(_, (e7) => m.definition[e7.idx].ignoreAmbiguities !== true && e7.idx < v && isStrictPrefixOfPath(e7.path, y));
-    return map_default(b, (e7) => {
+    let v = e6.idx, y = e6.path;
+    return map_default(filter_default(_, (e7) => m.definition[e7.idx].ignoreAmbiguities !== true && e7.idx < v && isStrictPrefixOfPath(e7.path, y)), (e7) => {
       let _2 = [e7.idx + 1, v + 1], y2 = m.idx === 0 ? "" : m.idx;
       return {
         message: g.buildAlternationPrefixAmbiguityError({
@@ -5199,13 +5139,13 @@ var InRuleRecoveryException = class extends Error {
   }
   tryInRepetitionRecovery(e5, m, h, g) {
     let _ = this.findReSyncTokenType(), v = this.exportLexerState(), y = [], b = false, x = this.LA(1), S = this.LA(1), C = () => {
-      let e6 = this.LA(0), m2 = this.errorMessageProvider.buildMismatchTokenMessage({
+      let e6 = this.LA(0), m2 = new MismatchedTokenException(this.errorMessageProvider.buildMismatchTokenMessage({
         expected: g,
         actual: x,
         previous: e6,
         ruleName: this.getCurrRuleFullName()
-      }), h2 = new MismatchedTokenException(m2, x, this.LA(0));
-      h2.resyncedTokens = dropRight_default(y), this.SAVE_ERROR(h2);
+      }), x, this.LA(0));
+      m2.resyncedTokens = dropRight_default(y), this.SAVE_ERROR(m2);
     };
     for (; !b; ) if (this.tokenMatcher(S, g)) {
       C();
@@ -5243,8 +5183,8 @@ var InRuleRecoveryException = class extends Error {
     return this.canTokenTypeBeDeletedInRecovery(e5) ? this.tokenMatcher(this.LA(2), e5) : false;
   }
   isInCurrentRuleReSyncSet(e5) {
-    let m = this.getCurrFollowKey(), h = this.getFollowSetFromFollowKey(m);
-    return includes_default(h, e5);
+    let m = this.getCurrFollowKey();
+    return includes_default(this.getFollowSetFromFollowKey(m), e5);
   }
   findReSyncTokenType() {
     let e5 = this.flattenFollowSet(), m = this.LA(1), h = 2;
@@ -5272,8 +5212,7 @@ var InRuleRecoveryException = class extends Error {
     });
   }
   flattenFollowSet() {
-    let e5 = map_default(this.buildFullFollowKeyStack(), (e6) => this.getFollowSetFromFollowKey(e6));
-    return flatten_default(e5);
+    return flatten_default(map_default(this.buildFullFollowKeyStack(), (e5) => this.getFollowSetFromFollowKey(e5)));
   }
   getFollowSetFromFollowKey(e5) {
     if (e5 === EOF_FOLLOW_KEY) return [EOF];
@@ -5291,10 +5230,9 @@ var InRuleRecoveryException = class extends Error {
   attemptInRepetitionRecovery(e5, m, h, g, _, v, y) {
   }
   getCurrentGrammarPath(e5, m) {
-    let h = this.getHumanReadableRuleStack(), g = clone_default(this.RULE_OCCURRENCE_STACK);
     return {
-      ruleStack: h,
-      occurrenceStack: g,
+      ruleStack: this.getHumanReadableRuleStack(),
+      occurrenceStack: clone_default(this.RULE_OCCURRENCE_STACK),
       lastTok: e5,
       lastTokOccurrence: m
     };
@@ -5398,8 +5336,7 @@ var LLkLookaheadStrategy = class {
     });
   }
   getKeyForAutomaticLookahead(e5, m) {
-    let h = this.getLastExplicitRuleShortName();
-    return getKeyForAutomaticLookahead(h, e5, m);
+    return getKeyForAutomaticLookahead(this.getLastExplicitRuleShortName(), e5, m);
   }
   getLaFuncFromCache(e5) {
     return this.lookAheadFuncsCache.get(e5);
@@ -5477,9 +5414,9 @@ function defineNameProp(e5, m) {
 function defaultVisit(e5, m) {
   let h = keys_default(e5), g = h.length;
   for (let _ = 0; _ < g; _++) {
-    let g2 = h[_], v = e5[g2], y = v.length;
-    for (let e6 = 0; e6 < y; e6++) {
-      let h2 = v[e6];
+    let g2 = e5[h[_]], v = g2.length;
+    for (let e6 = 0; e6 < v; e6++) {
+      let h2 = g2[e6];
       h2.tokenTypeIdx === void 0 && this[h2.name](h2.children, m);
     }
   }
@@ -5518,12 +5455,11 @@ function validateVisitor(e5, m) {
   return validateMissingCstMethods(e5, m);
 }
 function validateMissingCstMethods(e5, m) {
-  let h = filter_default(m, (m2) => isFunction_default(e5[m2]) === false), g = map_default(h, (m2) => ({
+  return compact_default(map_default(filter_default(m, (m2) => isFunction_default(e5[m2]) === false), (m2) => ({
     msg: `Missing visitor method: <${m2}> on ${e5.constructor.name} CST Visitor.`,
     type: CstVisitorDefinitionError.MISSING_METHOD,
     methodName: m2
-  }));
-  return compact_default(g);
+  })));
 }
 var TreeBuilder = class {
   initTreeBuilder(e5) {
@@ -5966,14 +5902,10 @@ var TreeBuilder = class {
       if (typeof e5[0].startOffset == "number") throw Error("The Parser constructor no longer accepts a token vector as the first argument.\n	See: https://chevrotain.io/docs/changes/BREAKING_CHANGES.html#_4-0-0\n	For Further details.");
     }
     if (isArray_default(e5)) this.tokensMap = reduce_default(e5, (e6, m2) => (e6[m2.name] = m2, e6), {});
-    else if (has_default(e5, "modes") && every_default(flatten_default(values_default(e5.modes)), isTokenType)) {
-      let m2 = flatten_default(values_default(e5.modes)), h2 = uniq_default(m2);
-      this.tokensMap = reduce_default(h2, (e6, m3) => (e6[m3.name] = m3, e6), {});
-    } else if (isObject_default(e5)) this.tokensMap = clone_default(e5);
+    else if (has_default(e5, "modes") && every_default(flatten_default(values_default(e5.modes)), isTokenType)) this.tokensMap = reduce_default(uniq_default(flatten_default(values_default(e5.modes))), (e6, m2) => (e6[m2.name] = m2, e6), {});
+    else if (isObject_default(e5)) this.tokensMap = clone_default(e5);
     else throw Error("<tokensDictionary> argument must be An Array of Token constructors, A dictionary of Token constructors or an IMultiModeLexerDefinition");
-    this.tokensMap.EOF = EOF;
-    let h = has_default(e5, "modes") ? flatten_default(values_default(e5.modes)) : values_default(e5);
-    this.tokenMatcher = every_default(h, (e6) => isEmpty_default(e6.categoryMatches)) ? tokenStructuredMatcherNoCategories : tokenStructuredMatcher, augmentTokenTypes(values_default(this.tokensMap));
+    this.tokensMap.EOF = EOF, this.tokenMatcher = every_default(has_default(e5, "modes") ? flatten_default(values_default(e5.modes)) : values_default(e5), (e6) => isEmpty_default(e6.categoryMatches)) ? tokenStructuredMatcherNoCategories : tokenStructuredMatcher, augmentTokenTypes(values_default(this.tokensMap));
   }
   defineRule(e5, m, h) {
     if (this.selfAnalysisDone) throw Error(`Grammar rule <${e5}> may not be defined after the 'performSelfAnalysis' method has been called'
@@ -6617,39 +6549,27 @@ function atom(e5, m, h) {
 }
 function repetition(e5, m, h) {
   let g = newState(e5, m, h, { type: 5 });
-  defineDecisionState(e5, g);
-  let _ = makeAlts(e5, m, g, h, block(e5, m, h));
-  return star(e5, m, h, _);
+  return defineDecisionState(e5, g), star(e5, m, h, makeAlts(e5, m, g, h, block(e5, m, h)));
 }
 function repetitionSep(e5, m, h) {
   let g = newState(e5, m, h, { type: 5 });
-  defineDecisionState(e5, g);
-  let _ = makeAlts(e5, m, g, h, block(e5, m, h)), v = tokenRef(e5, m, h.separator, h);
-  return star(e5, m, h, _, v);
+  return defineDecisionState(e5, g), star(e5, m, h, makeAlts(e5, m, g, h, block(e5, m, h)), tokenRef(e5, m, h.separator, h));
 }
 function repetitionMandatory(e5, m, h) {
   let g = newState(e5, m, h, { type: 4 });
-  defineDecisionState(e5, g);
-  let _ = makeAlts(e5, m, g, h, block(e5, m, h));
-  return plus(e5, m, h, _);
+  return defineDecisionState(e5, g), plus(e5, m, h, makeAlts(e5, m, g, h, block(e5, m, h)));
 }
 function repetitionMandatorySep(e5, m, h) {
   let g = newState(e5, m, h, { type: 4 });
-  defineDecisionState(e5, g);
-  let _ = makeAlts(e5, m, g, h, block(e5, m, h)), v = tokenRef(e5, m, h.separator, h);
-  return plus(e5, m, h, _, v);
+  return defineDecisionState(e5, g), plus(e5, m, h, makeAlts(e5, m, g, h, block(e5, m, h)), tokenRef(e5, m, h.separator, h));
 }
 function alternation(e5, m, h) {
   let g = newState(e5, m, h, { type: 1 });
-  defineDecisionState(e5, g);
-  let _ = map_default(h.definition, (h2) => atom(e5, m, h2));
-  return makeAlts(e5, m, g, h, ..._);
+  return defineDecisionState(e5, g), makeAlts(e5, m, g, h, ...map_default(h.definition, (h2) => atom(e5, m, h2)));
 }
 function option(e5, m, h) {
   let g = newState(e5, m, h, { type: 1 });
-  defineDecisionState(e5, g);
-  let _ = makeAlts(e5, m, g, h, block(e5, m, h));
-  return optional(e5, m, h, _);
+  return defineDecisionState(e5, g), optional(e5, m, h, makeAlts(e5, m, g, h, block(e5, m, h)));
 }
 function block(e5, m, h) {
   let g = filter_default(map_default(h.definition, (h2) => atom(e5, m, h2)), (e6) => e6 !== void 0);
@@ -6724,8 +6644,8 @@ function tokenRef(e5, m, h, g) {
   };
 }
 function ruleRef(e5, m, h) {
-  let g = h.referencedRule, _ = e5.ruleToStartState.get(g), v = newState(e5, m, h, { type: 1 }), y = newState(e5, m, h, { type: 1 }), b = new RuleTransition(_, g, y);
-  return addTransition(v, b), {
+  let g = h.referencedRule, _ = e5.ruleToStartState.get(g), v = newState(e5, m, h, { type: 1 }), y = newState(e5, m, h, { type: 1 });
+  return addTransition(v, new RuleTransition(_, g, y)), {
     left: v,
     right: y
   };
@@ -6740,8 +6660,7 @@ function buildRuleHandle(e5, m, h) {
   };
 }
 function epsilon(e5, m) {
-  let h = new EpsilonTransition(m);
-  addTransition(e5, h);
+  addTransition(e5, new EpsilonTransition(m));
 }
 function newState(e5, m, h, g) {
   let _ = Object.assign({
@@ -6845,15 +6764,14 @@ var PredicateSet = class {
       }), e7), {});
       return g ? function(m2) {
         var _a2;
-        let h2 = this.LA(1), g2 = e6[h2.tokenTypeIdx];
-        if (m2 !== void 0 && g2 !== void 0) {
-          let e7 = (_a2 = m2[g2]) == null ? void 0 : _a2.GATE;
+        let h2 = e6[this.LA(1).tokenTypeIdx];
+        if (m2 !== void 0 && h2 !== void 0) {
+          let e7 = (_a2 = m2[h2]) == null ? void 0 : _a2.GATE;
           if (e7 !== void 0 && e7.call(this) === false) return;
         }
-        return g2;
+        return h2;
       } : function() {
-        let m2 = this.LA(1);
-        return e6[m2.tokenTypeIdx];
+        return e6[this.LA(1).tokenTypeIdx];
       };
     } else if (g) return function(e6) {
       let m2 = new PredicateSet(), h2 = e6 === void 0 ? 0 : e6.length;
@@ -6888,8 +6806,7 @@ var PredicateSet = class {
           e8[m4] = true;
         })), e8), {});
         return function() {
-          let m3 = this.LA(1);
-          return e7[m3.tokenTypeIdx] === true;
+          return e7[this.LA(1).tokenTypeIdx] === true;
         };
       }
     }
@@ -6923,11 +6840,7 @@ function initATNSimulator(e5) {
 }
 function adaptivePredict(e5, m, h, g) {
   let _ = e5[m](h), v = _.start;
-  if (v === void 0) {
-    let e6 = computeStartState(_.atnStartState);
-    v = addDFAState(_, newDFAState(e6)), _.start = v;
-  }
-  return performLookahead.apply(this, [
+  return v === void 0 && (v = addDFAState(_, newDFAState(computeStartState(_.atnStartState))), _.start = v), performLookahead.apply(this, [
     _,
     v,
     h,
@@ -6969,13 +6882,13 @@ function computeLookaheadTarget(e5, m, h, g, _, v) {
 function reportLookaheadAmbiguity(e5, m, h, g) {
   let _ = [];
   for (let e6 = 1; e6 <= m; e6++) _.push(this.LA(e6).tokenType);
-  let v = e5.atnStartState, y = v.rule, b = v.production, x = buildAmbiguityError({
+  let v = e5.atnStartState, y = v.rule, b = v.production;
+  g(buildAmbiguityError({
     topLevelRule: y,
     ambiguityIndices: h,
     production: b,
     prefixPath: _
-  });
-  g(x);
+  }));
 }
 function buildAmbiguityError(e5) {
   let m = map_default(e5.prefixPath, (e6) => tokenLabel(e6)).join(", "), h = e5.production.idx === 0 ? "" : e5.production.idx, g = `Ambiguous Alternatives Detected: <${e5.ambiguityIndices.join(", ")}> in <${getProductionDslName(e5.production)}${h}> inside <${e5.topLevelRule.name}> Rule,
@@ -6995,10 +6908,9 @@ function getProductionDslName(e5) {
   throw Error("non exhaustive match");
 }
 function buildAdaptivePredictError(e5, m, h) {
-  let g = flatMap_default(m.configs.elements, (e6) => e6.state.transitions), _ = uniqBy_default(g.filter((e6) => e6 instanceof AtomTransition).map((e6) => e6.tokenType), (e6) => e6.tokenTypeIdx);
   return {
     actualToken: h,
-    possibleTokenTypes: _,
+    possibleTokenTypes: uniqBy_default(flatMap_default(m.configs.elements, (e6) => e6.state.transitions).filter((e6) => e6 instanceof AtomTransition).map((e6) => e6.tokenType), (e6) => e6.tokenTypeIdx),
     tokenPath: e5
   };
 }
@@ -7060,26 +6972,23 @@ function addDFAState(e5, m) {
 }
 function computeStartState(e5) {
   let m = new ATNConfigSet(), h = e5.transitions.length;
-  for (let g = 0; g < h; g++) {
-    let h2 = {
-      state: e5.transitions[g].target,
-      alt: g,
-      stack: []
-    };
-    closure(h2, m);
-  }
+  for (let g = 0; g < h; g++) closure({
+    state: e5.transitions[g].target,
+    alt: g,
+    stack: []
+  }, m);
   return m;
 }
 function closure(e5, m) {
   let h = e5.state;
   if (h.type === 7) {
     if (e5.stack.length > 0) {
-      let h2 = [...e5.stack], g2 = {
+      let h2 = [...e5.stack];
+      closure({
         state: h2.pop(),
         alt: e5.alt,
         stack: h2
-      };
-      closure(g2, m);
+      }, m);
     } else m.add(e5);
     return;
   }
@@ -7704,10 +7613,7 @@ function buildUnorderedGroup(e5, m) {
     let m2 = { ALT: buildElement(e5, g2, true) }, _2 = getGuardCondition(g2);
     _2 && (m2.GATE = buildPredicate(_2)), h.push(m2);
   }
-  let g = e5.or++, _ = (e6, m2) => {
-    let h2 = m2.getRuleStack().join("-");
-    return `uGroup_${e6}_${h2}`;
-  }, v = wrap(e5, getGuardCondition(m), (m2) => e5.parser.alternatives(g, h.map((h2, v2) => {
+  let g = e5.or++, _ = (e6, m2) => `uGroup_${e6}_${m2.getRuleStack().join("-")}`, v = wrap(e5, getGuardCondition(m), (m2) => e5.parser.alternatives(g, h.map((h2, v2) => {
     let y = { ALT: () => true }, b = e5.parser;
     y.ALT = () => {
       if (h2.ALT(m2), !b.isRecording()) {
@@ -7824,8 +7730,8 @@ function createLangiumParser(e5) {
   return m.finalize(), m;
 }
 function prepareLangiumParser(e5) {
-  let m = e5.Grammar, h = e5.parser.Lexer, g = new LangiumParser(e5);
-  return createParser(m, g, h.definition);
+  let m = e5.Grammar, h = e5.parser.Lexer;
+  return createParser(m, new LangiumParser(e5), h.definition);
 }
 var DefaultTokenBuilder = class {
   constructor() {
@@ -8130,7 +8036,7 @@ var require_ral = /* @__PURE__ */ __commonJSMin(((e5) => {
     }
   };
 })), cancellation_exports = {};
-__reExport(cancellation_exports, /* @__PURE__ */ __toESM(require_cancellation()));
+__reExport(cancellation_exports, /* @__PURE__ */ __toESM(require_cancellation(), 1));
 function delayNextTick() {
   return new Promise((e5) => {
     typeof setImmediate > "u" ? setTimeout(e5, 0) : setImmediate(e5);
@@ -8683,8 +8589,7 @@ var UriUtils;
   function h(e6, m2) {
     let h2 = typeof e6 == "string" ? e6 : e6.path, g2 = typeof m2 == "string" ? m2 : m2.path, _ = h2.split("/").filter((e7) => e7.length > 0), v = g2.split("/").filter((e7) => e7.length > 0), y = 0;
     for (; y < _.length && _[y] === v[y]; y++) ;
-    let b = "../".repeat(_.length - y), x = v.slice(y).join("/");
-    return b + x;
+    return "../".repeat(_.length - y) + v.slice(y).join("/");
   }
   e5.relative = h;
   function g(e6) {
@@ -9228,11 +9133,10 @@ var DisposableCache = class {
     return new StreamScope(stream(e5), m, h);
   }
   createScopeForNodes(e5, m, h) {
-    let g = stream(e5).map((e6) => {
+    return new StreamScope(stream(e5).map((e6) => {
       let m2 = this.nameProvider.getName(e6);
       if (m2) return this.descriptions.createDescription(e6, m2);
-    }).nonNullable();
-    return new StreamScope(g, m, h);
+    }).nonNullable(), m, h);
   }
   getGlobalScope(e5, m) {
     return this.globalScopeCache.get(e5, () => new MapScope(this.indexManager.allElements(e5)));
@@ -9431,9 +9335,7 @@ var ValidationRegistry = class {
       await e5();
     } catch (e6) {
       if (isOperationCancelled(e6)) throw e6;
-      console.error(`${m}:`, e6), e6 instanceof Error && e6.stack && console.error(e6.stack);
-      let _ = e6 instanceof Error ? e6.message : String(e6);
-      h("error", `${m}: ${_}`, { node: g });
+      console.error(`${m}:`, e6), e6 instanceof Error && e6.stack && console.error(e6.stack), h("error", `${m}: ${e6 instanceof Error ? e6.message : String(e6)}`, { node: g });
     }
   }
   addEntry(e5, m) {
@@ -9728,7 +9630,7 @@ var DefaultAstNodeDescriptionProvider = class {
     }, e5);
   }
 }, event_exports = {};
-__reExport(event_exports, /* @__PURE__ */ __toESM(require_events()));
+__reExport(event_exports, /* @__PURE__ */ __toESM(require_events(), 1));
 var DefaultConfigurationProvider = class {
   constructor(e5) {
     this._ready = new Deferred(), this.settings = {}, this.workspaceConfig = false, this.onConfigurationSectionUpdateEmitter = new event_exports.Emitter(), this.serviceRegistry = e5.ServiceRegistry;
@@ -9900,10 +9802,8 @@ var DefaultDocumentBuilder = class {
     }
     return this.currentState >= e5 ? Promise.resolve(void 0) : h.isCancellationRequested ? Promise.reject(OperationCancelled) : new Promise((m2, _) => {
       let v = this.onBuildPhase(e5, () => {
-        if (v.dispose(), y.dispose(), g) {
-          let e6 = this.langiumDocuments.getDocument(g);
-          m2(e6 == null ? void 0 : e6.uri);
-        } else m2(void 0);
+        var _a2;
+        v.dispose(), y.dispose(), m2(g ? (_a2 = this.langiumDocuments.getDocument(g)) == null ? void 0 : _a2.uri : void 0);
       }), y = h.onCancellationRequested(() => {
         v.dispose(), y.dispose(), _(OperationCancelled);
       });
@@ -10009,13 +9909,7 @@ var DefaultDocumentBuilder = class {
   async traverseFolder(e5, m, h, g) {
     let _ = await this.fileSystemProvider.readDirectory(m);
     await Promise.all(_.map(async (m2) => {
-      if (this.includeEntry(e5, m2, h)) {
-        if (m2.isDirectory) await this.traverseFolder(e5, m2.uri, h, g);
-        else if (m2.isFile) {
-          let e6 = await this.langiumDocuments.getOrCreateDocument(m2.uri);
-          g(e6);
-        }
-      }
+      this.includeEntry(e5, m2, h) && (m2.isDirectory ? await this.traverseFolder(e5, m2.uri, h, g) : m2.isFile && g(await this.langiumDocuments.getOrCreateDocument(m2.uri)));
     }));
   }
   includeEntry(e5, m, h) {
@@ -10041,11 +9935,9 @@ var DefaultLexer = class {
   constructor(e5) {
     this.errorMessageProvider = e5.parser.LexerErrorMessageProvider, this.tokenBuilder = e5.parser.TokenBuilder;
     let m = this.tokenBuilder.buildTokens(e5.Grammar, { caseInsensitive: e5.LanguageMetaData.caseInsensitive });
-    this.tokenTypes = this.toTokenTypeDictionary(m);
-    let h = isTokenTypeDictionary(m) ? Object.values(m) : m, g = e5.LanguageMetaData.mode === "production";
-    this.chevrotainLexer = new Lexer(h, {
+    this.tokenTypes = this.toTokenTypeDictionary(m), this.chevrotainLexer = new Lexer(isTokenTypeDictionary(m) ? Object.values(m) : m, {
       positionTracking: "full",
-      skipValidations: g,
+      skipValidations: e5.LanguageMetaData.mode === "production",
       errorMessageProvider: this.errorMessageProvider
     });
   }
@@ -10082,14 +9974,14 @@ init_main();
 function parseJSDoc(e5, m, h) {
   let g, _;
   typeof e5 == "string" ? (_ = m, g = h) : (_ = e5.range.start, g = m), _ || (_ = Position.create(0, 0));
-  let v = getLines(e5), y = normalizeOptions(g), b = tokenize({
-    lines: v,
-    position: _,
-    options: y
-  });
+  let v = getLines(e5), y = normalizeOptions(g);
   return parseJSDocComment({
     index: 0,
-    tokens: b,
+    tokens: tokenize({
+      lines: v,
+      position: _,
+      options: y
+    }),
     position: _
   });
 }
@@ -10398,8 +10290,8 @@ var JSDocDocumentationProvider = class {
   documentationLinkRenderer(e5, m, h) {
     let g = this.findNameInPrecomputedScopes(e5, m) ?? this.findNameInGlobalScope(e5, m);
     if (g && g.nameSegment) {
-      let e6 = g.nameSegment.range.start.line + 1, m2 = g.nameSegment.range.start.character + 1, _ = g.documentUri.with({ fragment: `L${e6},${m2}` });
-      return `[${h}](${_.toString()})`;
+      let e6 = g.nameSegment.range.start.line + 1, m2 = g.nameSegment.range.start.character + 1;
+      return `[${h}](${g.documentUri.with({ fragment: `L${e6},${m2}` }).toString()})`;
     } else return;
   }
   documentationTagRenderer(e5, m) {
@@ -10717,7 +10609,7 @@ var Module;
   e5.merge = (e6, m) => _merge(_merge({}, e6), m);
 })(Module || (Module = {}));
 function inject(e5, m, h, g, _, v, y, b, x) {
-  let S = [
+  return _inject([
     e5,
     m,
     h,
@@ -10727,8 +10619,7 @@ function inject(e5, m, h, g, _, v, y, b, x) {
     y,
     b,
     x
-  ].reduce(_merge, {});
-  return _inject(S);
+  ].reduce(_merge, {}));
 }
 var isProxy = Symbol("isProxy");
 function eagerLoad(e5) {