@danielx/civet 0.6.42 → 0.6.44

package/dist/browser.js

@@ -902,18 +902,18 @@ ${input.slice(result.pos)}
         }
         if (subtype === "DoStatement") {
           insertReturn(block);
-          children.splice(i, 1, ...wrapIIFE(statement, async));
+          children.splice(i, 1, ...wrapIIFE(["", statement, void 0], async));
           return;
         }
         const resultsRef = makeRef("results");
         insertPush(block, resultsRef);
+        braceBlock(block);
         children.splice(
           i,
           1,
           ...wrapIIFE([
             ["", ["const ", resultsRef, "=[]"], ";"],
-            ...children,
-            ["", "; "],
+            ...children.map((c) => ["", c, void 0]),
             ["", wrapWithReturn(resultsRef)]
           ], async)
         );
@@ -1317,6 +1317,7 @@ ${input.slice(result.pos)}
         };
         const prefix = splices.map((s) => ["let ", s]).concat(thisAssignments).map(
           (s) => s.type ? {
+            // TODO: figure out how to get JS only statement tuples
             ...s,
             children: [indent, ...s.children, delimiter]
           } : [indent, s, delimiter]
@@ -1715,6 +1716,31 @@ ${input.slice(result.pos)}
           return target.token.match(/^ ?/)[0];
         return;
       }
+      function startsWith(target, value) {
+        if (!target)
+          return;
+        if (Array.isArray(target)) {
+          let i = 0;
+          let l = target.length;
+          while (i < l) {
+            const t = target[i];
+            if (t && (t.length || t.token || t.children)) {
+              break;
+            }
+            i++;
+          }
+          if (i < l) {
+            return startsWith(target[i], value);
+          }
+        }
+        if (target.children)
+          return startsWith(target.children, value);
+        if (target.token)
+          return value.test(target.token);
+        if (typeof target === "string")
+          return value.test(target);
+        return;
+      }
       function processForInOf($0, getRef) {
         let [awaits, eachOwn, open, declaration, declaration2, ws, inOf, exp, step, close] = $0;
         if (exp.type === "RangeExpression" && inOf.token === "of" && !declaration2) {
@@ -1827,7 +1853,7 @@ ${input.slice(result.pos)}
             }
             if (own) {
               const hasPropRef = getRef("hasProp");
-              blockPrefix.push(["", "if (!", hasPropRef, "(", insertTrimmingSpace(expRef2, ""), ", ", insertTrimmingSpace(binding, ""), ")) continue", ";"]);
+              blockPrefix.push(["", ["if (!", hasPropRef, "(", insertTrimmingSpace(expRef2, ""), ", ", insertTrimmingSpace(binding, ""), ")) continue"], ";"]);
             }
             if (decl2) {
               blockPrefix.push(["", {
@@ -1986,6 +2012,15 @@ ${input.slice(result.pos)}
           empty: true
         };
       }
+      function braceBlock(block) {
+        if (block.bare) {
+          block.children.unshift(" {");
+          block.children.push("}");
+          return block.bare = false;
+        }
+        ;
+        return;
+      }
       function makeLeftHandSideExpression(expression) {
         switch (expression.type) {
           case "Ref":
@@ -2514,6 +2549,68 @@ ${input.slice(result.pos)}
           return exp.children.splice(index + 1, 0, ...tail);
         });
       }
+      function processBlocks(statements) {
+        insertSemicolon(statements);
+        gatherRecursive(statements, ($) => $.type === "BlockStatement").forEach(function({ expressions }) {
+          return processBlocks(expressions);
+        });
+      }
+      function insertSemicolon(statements) {
+        const l = statements.length;
+        statements.forEach(function(s, i) {
+          if (i < l - 1) {
+            if (needsPrecedingSemicolon(statements[i + 1])) {
+              const delim = s[2];
+              if (!delim) {
+                return s[2] = ";";
+              } else if (typeof delim === "string" && !delim.match(/;/)) {
+                return s[2] = `;${delim}`;
+              }
+              ;
+              return;
+            }
+            ;
+            return;
+          }
+          ;
+          return;
+        });
+      }
+      function needsPrecedingSemicolon(exp) {
+        let following;
+        if (Array.isArray(exp)) {
+          [, following] = exp;
+        } else {
+          following = exp;
+        }
+        if (!following) {
+          return false;
+        }
+        if (Array.isArray(following)) {
+          return needsPrecedingSemicolon(following[0]);
+        }
+        switch (following.type) {
+          case "ParenthesizedExpression":
+          case "ArrowFunction":
+          case "TemplateLiteral":
+          case "RegularExpressionLiteral": {
+            return true;
+          }
+          case "AssignmentExpression": {
+            return startsWith(following, /^(\[|\()/);
+          }
+          case "Literal": {
+            return following.raw?.startsWith("-") || following.raw?.startsWith("+");
+          }
+          default: {
+            if (following.children) {
+              return needsPrecedingSemicolon(following.children[0]);
+            }
+            ;
+            return;
+          }
+        }
+      }
       function attachPostfixStatementAsExpression(exp, post) {
         switch (post[1].type) {
           case "ForStatement":
@@ -2855,11 +2952,7 @@ ${input.slice(result.pos)}
             }
             block.expressions.unshift(...prefix);
             const next = [];
-            if (block.bare) {
-              block.children.unshift(" {");
-              block.children.push("}");
-              block.bare = false;
-            }
+            braceBlock(block);
             if (i < l - 1)
               next.push("\n", "else ");
             prev.push(["", {
@@ -3030,6 +3123,7 @@ ${input.slice(result.pos)}
         } else if (config.autoVar) {
           createVarDecs(statements, []);
         }
+        processBlocks(statements);
         populateRefs(statements);
         adjustAtBindings(statements);
       }
@@ -3111,7 +3205,10 @@ ${input.slice(result.pos)}
           if (statements[0][1]?.parent?.root) {
             delimiter = ";\n";
           }
-          statements.unshift([indent, "var ", varIds.join(", "), delimiter]);
+          statements.unshift([indent, {
+            type: "Declaration",
+            children: ["var ", varIds.join(", ")]
+          }, delimiter]);
         }
         return scopes.pop();
       }
@@ -3181,13 +3278,17 @@ ${input.slice(result.pos)}
               if (gatherNodes(indent, (node) => node.token && node.token.endsWith("\n")).length > 0) {
                 tail = void 0;
               }
-              targetStatements.push([indent, `let `, undeclaredIdentifiers.join(", "), tail]);
+              targetStatements.push([indent, {
+                type: "Declaration",
+                children: ["let ", ...undeclaredIdentifiers.join(", ")],
+                names: undeclaredIdentifiers
+              }, tail]);
             }
           }
           targetStatements.push(statement);
         }
         scopes.pop();
-        statements.splice(0, statements.length, targetStatements);
+        statements.splice(0, statements.length, ...targetStatements);
       }
       function processReturnValue(func) {
         const { block } = func;
@@ -3195,31 +3296,39 @@ ${input.slice(result.pos)}
           block,
           ({ type }) => type === "ReturnValue"
         );
-        if (!values.length)
+        if (!values.length) {
           return false;
+        }
         const ref = makeRef("ret");
-        let declared;
+        let declaration;
         values.forEach((value) => {
           value.children = [ref];
-          const { ancestor } = findAncestor(
+          const { ancestor, child } = findAncestor(
             value,
             ({ type }) => type === "Declaration",
             isFunction
           );
-          if (ancestor)
-            return declared = true;
+          if (ancestor) {
+            return declaration ?? (declaration = child);
+          }
+          ;
           return;
         });
-        if (!declared) {
-          let returnType = func.returnType ?? func.signature?.returnType;
-          if (returnType) {
-            const { t } = returnType;
-            if (t.type === "TypePredicate") {
-              returnType = ": boolean";
-            } else if (t.type === "AssertsType") {
-              returnType = void 0;
-            }
+        let returnType = func.returnType ?? func.signature?.returnType;
+        if (returnType) {
+          const { t } = returnType;
+          let m1;
+          if (m1 = t.type, m1 === "TypePredicate") {
+            returnType = ": boolean";
+          } else if (m1 === "AssertsType") {
+            returnType = void 0;
           }
+        }
+        if (declaration) {
+          if (!(declaration.suffix != null)) {
+            declaration.children[1] = declaration.suffix = returnType;
+          }
+        } else {
           block.expressions.unshift([
             getIndent(block.expressions[0]),
             {
@@ -3237,7 +3346,7 @@ ${input.slice(result.pos)}
           r.expression = ref;
           return r.children.splice(-1, 1, " ", ref);
         });
-        if (block.children.at(-2)?.type !== "ReturnStatement") {
+        if (!(block.children.at(-2)?.type === "ReturnStatement")) {
           block.expressions.push([
             [getIndent(block.expressions.at(-1))],
             {
@@ -3282,15 +3391,18 @@ ${input.slice(result.pos)}
           return exp;
         }
         if (exp.type === "Literal") {
-          if (pre.length === 1 && pre[0].token === "-") {
-            const children = [pre[0], ...exp.children];
-            if (post)
-              exp.children.push(post);
-            return {
-              type: "Literal",
-              children,
-              raw: `-${exp.raw}`
-            };
+          if (pre.length === 1) {
+            const { token } = pre[0];
+            if (token === "-" || token === "+") {
+              const children = [pre[0], ...exp.children];
+              if (post)
+                exp.children.push(post);
+              return {
+                type: "Literal",
+                children,
+                raw: `${token}${exp.raw}`
+              };
+            }
           }
         }
         const l = pre.length;
@@ -3542,7 +3654,6 @@ ${input.slice(result.pos)}
         dedentBlockSubstitutions,
         deepCopy,
         expressionizeIfClause,
-        expressionizeIteration,
         findAncestor,
         forRange,
         gatherBindingCode,
@@ -3637,6 +3748,7 @@ ${input.slice(result.pos)}
         NestedNonAssignmentExtendedExpression,
         ExpressionizedStatementWithTrailingCallExpressions,
         ExpressionizedStatement,
+        _ExpressionizedStatement,
         Expression,
         Arguments,
         ImplicitArguments,
@@ -3728,6 +3840,7 @@ ${input.slice(result.pos)}
         MemberBracketContent,
         SliceParameters,
         AccessStart,
+        PropertyAccessModifier,
         PropertyAccess,
         PropertyGlob,
         PropertyBind,
@@ -3798,12 +3911,14 @@ ${input.slice(result.pos)}
         LiteralContent,
         NullLiteral,
         BooleanLiteral,
+        _BooleanLiteral,
         CoffeeScriptBooleanLiteral,
         Identifier,
         IdentifierName,
         IdentifierReference,
         UpcomingAssignment,
         ArrayLiteral,
+        _ArrayLiteral,
         RangeExpression,
         ArrayLiteralContent,
         NestedElementList,
@@ -3844,7 +3959,10 @@ ${input.slice(result.pos)}
         NotDedentedBinaryOp,
         IdentifierBinaryOp,
         BinaryOp,
+        _BinaryOp,
         BinaryOpSymbol,
+        CoffeeOfOp,
+        NotOp,
         Xor,
         Xnor,
         UnaryOp,
@@ -3855,6 +3973,7 @@ ${input.slice(result.pos)}
         PostfixedExpression,
         NonPipelinePostfixedExpression,
         PostfixStatement,
+        _PostfixStatement,
         Statement,
         EmptyStatement,
         BlockStatement,
@@ -3874,6 +3993,7 @@ ${input.slice(result.pos)}
         NestedBlockExpression,
         BlockExpressionPart,
         IterationStatement,
+        _IterationStatement,
         IterationExpression,
         LoopStatement,
         LoopClause,
@@ -4010,6 +4130,7 @@ ${input.slice(result.pos)}
         RegExpCharacter,
         RegularExpressionFlags,
         TemplateLiteral,
+        _TemplateLiteral,
         TemplateSubstitution,
         TemplateCharacters,
         TemplateBlockCharacters,
@@ -4128,6 +4249,7 @@ ${input.slice(result.pos)}
         Yield,
         JSXImplicitFragment,
         JSXTag,
+        _JSXTag,
         JSXElement,
         JSXSelfClosingElement,
         PushJSXOpeningElement,
@@ -4315,8 +4437,8 @@ ${input.slice(result.pos)}
       var $L8 = $L("--");
       var $L9 = $L("=>");
       var $L10 = $L("\u21D2");
-      var $L11 = $L(" ");
-      var $L12 = $L(":");
+      var $L11 = $L(":");
+      var $L12 = $L(" ");
       var $L13 = $L("implements");
       var $L14 = $L("<:");
       var $L15 = $L("import");
@@ -4388,78 +4510,78 @@ ${input.slice(result.pos)}
       var $L81 = $L("\u2A75");
       var $L82 = $L("and");
       var $L83 = $L("&&");
-      var $L84 = $L("of");
-      var $L85 = $L("or");
-      var $L86 = $L("||");
-      var $L87 = $L("\u2016");
-      var $L88 = $L("^^");
-      var $L89 = $L("xor");
-      var $L90 = $L("xnor");
-      var $L91 = $L("??");
-      var $L92 = $L("\u2047");
-      var $L93 = $L("instanceof");
-      var $L94 = $L("\u2208");
-      var $L95 = $L("\u220B");
-      var $L96 = $L("\u220C");
-      var $L97 = $L("\u2209");
-      var $L98 = $L("&");
-      var $L99 = $L("|");
-      var $L100 = $L(";");
-      var $L101 = $L("$:");
-      var $L102 = $L("break");
-      var $L103 = $L("continue");
-      var $L104 = $L("debugger");
-      var $L105 = $L("assert");
-      var $L106 = $L(":=");
-      var $L107 = $L("\u2254");
-      var $L108 = $L(".=");
-      var $L109 = $L("/*");
-      var $L110 = $L("*/");
-      var $L111 = $L("\\");
-      var $L112 = $L("[");
-      var $L113 = $L("`");
-      var $L114 = $L(")");
-      var $L115 = $L("abstract");
-      var $L116 = $L("as");
-      var $L117 = $L("@");
-      var $L118 = $L("@@");
-      var $L119 = $L("async");
-      var $L120 = $L("await");
-      var $L121 = $L("by");
-      var $L122 = $L("case");
-      var $L123 = $L("catch");
-      var $L124 = $L("class");
-      var $L125 = $L("#{");
-      var $L126 = $L("declare");
-      var $L127 = $L("default");
-      var $L128 = $L("delete");
-      var $L129 = $L("do");
-      var $L130 = $L("..");
-      var $L131 = $L("\u2025");
-      var $L132 = $L("...");
-      var $L133 = $L("\u2026");
-      var $L134 = $L("::");
-      var $L135 = $L('"');
-      var $L136 = $L("each");
-      var $L137 = $L("else");
-      var $L138 = $L("export");
-      var $L139 = $L("extends");
-      var $L140 = $L("finally");
-      var $L141 = $L("for");
-      var $L142 = $L("from");
-      var $L143 = $L("function");
-      var $L144 = $L("get");
-      var $L145 = $L("set");
-      var $L146 = $L("#");
-      var $L147 = $L("if");
-      var $L148 = $L("in");
-      var $L149 = $L("let");
-      var $L150 = $L("const");
-      var $L151 = $L("is");
-      var $L152 = $L("loop");
-      var $L153 = $L("new");
-      var $L154 = $L("not");
-      var $L155 = $L("<");
+      var $L84 = $L("or");
+      var $L85 = $L("||");
+      var $L86 = $L("\u2016");
+      var $L87 = $L("^^");
+      var $L88 = $L("xor");
+      var $L89 = $L("xnor");
+      var $L90 = $L("??");
+      var $L91 = $L("\u2047");
+      var $L92 = $L("instanceof");
+      var $L93 = $L("\u2208");
+      var $L94 = $L("\u220B");
+      var $L95 = $L("\u220C");
+      var $L96 = $L("\u2209");
+      var $L97 = $L("&");
+      var $L98 = $L("|");
+      var $L99 = $L(";");
+      var $L100 = $L("$:");
+      var $L101 = $L("break");
+      var $L102 = $L("continue");
+      var $L103 = $L("debugger");
+      var $L104 = $L("assert");
+      var $L105 = $L(":=");
+      var $L106 = $L("\u2254");
+      var $L107 = $L(".=");
+      var $L108 = $L("/*");
+      var $L109 = $L("*/");
+      var $L110 = $L("\\");
+      var $L111 = $L(")");
+      var $L112 = $L("abstract");
+      var $L113 = $L("as");
+      var $L114 = $L("@");
+      var $L115 = $L("@@");
+      var $L116 = $L("async");
+      var $L117 = $L("await");
+      var $L118 = $L("`");
+      var $L119 = $L("by");
+      var $L120 = $L("case");
+      var $L121 = $L("catch");
+      var $L122 = $L("class");
+      var $L123 = $L("#{");
+      var $L124 = $L("declare");
+      var $L125 = $L("default");
+      var $L126 = $L("delete");
+      var $L127 = $L("do");
+      var $L128 = $L("..");
+      var $L129 = $L("\u2025");
+      var $L130 = $L("...");
+      var $L131 = $L("\u2026");
+      var $L132 = $L("::");
+      var $L133 = $L('"');
+      var $L134 = $L("each");
+      var $L135 = $L("else");
+      var $L136 = $L("export");
+      var $L137 = $L("extends");
+      var $L138 = $L("finally");
+      var $L139 = $L("for");
+      var $L140 = $L("from");
+      var $L141 = $L("function");
+      var $L142 = $L("get");
+      var $L143 = $L("set");
+      var $L144 = $L("#");
+      var $L145 = $L("if");
+      var $L146 = $L("in");
+      var $L147 = $L("let");
+      var $L148 = $L("const");
+      var $L149 = $L("is");
+      var $L150 = $L("loop");
+      var $L151 = $L("new");
+      var $L152 = $L("not");
+      var $L153 = $L("of");
+      var $L154 = $L("<");
+      var $L155 = $L("[");
       var $L156 = $L("operator");
       var $L157 = $L("own");
       var $L158 = $L("public");
@@ -4515,77 +4637,94 @@ ${input.slice(result.pos)}
       var $L208 = $L("???");
       var $L209 = $L("[]");
       var $L210 = $L("civet");
-      var $R0 = $R(new RegExp("(as|of|satisfies|then|when|implements|xor|xnor)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
-      var $R1 = $R(new RegExp("[0-9]", "suy"));
-      var $R2 = $R(new RegExp("[)}]", "suy"));
-      var $R3 = $R(new RegExp("[&]", "suy"));
-      var $R4 = $R(new RegExp("[!~+-]+", "suy"));
-      var $R5 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$])*", "suy"));
-      var $R6 = $R(new RegExp("[!+-]", "suy"));
-      var $R7 = $R(new RegExp("<(?!\\p{ID_Start}|[_$])", "suy"));
-      var $R8 = $R(new RegExp("!\\^\\^?", "suy"));
-      var $R9 = $R(new RegExp("(?!\\+\\+|--)[!~+-](?!\\s|[!~+-]*[&.])", "suy"));
-      var $R10 = $R(new RegExp("(?=[\\s\\),])", "suy"));
-      var $R11 = $R(new RegExp('[^;"\\s]+', "suy"));
-      var $R12 = $R(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)n", "suy"));
-      var $R13 = $R(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)(?=\\.(?:\\p{ID_Start}|[_$]))", "suy"));
-      var $R14 = $R(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)(?:\\.(?:[0-9](?:_[0-9]|[0-9])*))?", "suy"));
-      var $R15 = $R(new RegExp("(?:\\.[0-9](?:_[0-9]|[0-9])*)", "suy"));
-      var $R16 = $R(new RegExp("(?:[eE][+-]?[0-9]+(?:_[0-9]|[0-9])*)", "suy"));
-      var $R17 = $R(new RegExp("0[bB][01](?:[01]|_[01])*n?", "suy"));
-      var $R18 = $R(new RegExp("0[oO][0-7](?:[0-7]|_[0-7])*n?", "suy"));
-      var $R19 = $R(new RegExp("0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_[0-9a-fA-F])*n?", "suy"));
-      var $R20 = $R(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)", "suy"));
-      var $R21 = $R(new RegExp('(?:\\\\.|[^"])*', "suy"));
-      var $R22 = $R(new RegExp("(?:\\\\.|[^'])*", "suy"));
-      var $R23 = $R(new RegExp('(?:"(?!"")|#(?!\\{)|\\\\.|[^#"])+', "suy"));
-      var $R24 = $R(new RegExp("(?:'(?!'')|\\\\.|[^'])*", "suy"));
-      var $R25 = $R(new RegExp('(?:\\\\.|#(?!\\{)|[^"#])+', "suy"));
-      var $R26 = $R(new RegExp("(?:\\\\.|[^\\]])*", "suy"));
-      var $R27 = $R(new RegExp("(?:\\\\.)", "suy"));
-      var $R28 = $R(new RegExp("[\\s]+", "suy"));
-      var $R29 = $R(new RegExp("\\/(?!\\/\\/)", "suy"));
-      var $R30 = $R(new RegExp("[^[\\/\\s#\\\\]+", "suy"));
-      var $R31 = $R(new RegExp("[*\\/\\r\\n]", "suy"));
-      var $R32 = $R(new RegExp("(?:\\\\.|[^[\\/\\r\\n])+", "suy"));
-      var $R33 = $R(new RegExp("(?:\\p{ID_Continue}|[\\u200C\\u200D$])*", "suy"));
-      var $R34 = $R(new RegExp("(?:\\$(?!\\{)|\\\\.|[^$`])+", "suy"));
-      var $R35 = $R(new RegExp("(?:\\$(?!\\{)|`(?!``)|\\\\.|[^$`])+", "suy"));
-      var $R36 = $R(new RegExp("(?:on|off|yes|no)(?!\\p{ID_Continue})", "suy"));
-      var $R37 = $R(new RegExp("(?:isnt)(?!\\p{ID_Continue})", "suy"));
-      var $R38 = $R(new RegExp("(?:by)(?!\\p{ID_Continue})", "suy"));
-      var $R39 = $R(new RegExp("(?:of)(?!\\p{ID_Continue})", "suy"));
-      var $R40 = $R(new RegExp("(?:and|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|let|loop|new|not|null|or|private|protected|public|return|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})", "suy"));
-      var $R41 = $R(new RegExp("(?=\\/|#)", "suy"));
-      var $R42 = $R(new RegExp("\\/\\/(?!\\/)[^\\r\\n]*", "suy"));
-      var $R43 = $R(new RegExp(".", "suy"));
-      var $R44 = $R(new RegExp("#(?!##(?!#))([^\\r\\n]*)", "suy"));
-      var $R45 = $R(new RegExp("[^]*?###", "suy"));
-      var $R46 = $R(new RegExp("###(?!#)", "suy"));
-      var $R47 = $R(new RegExp("\\/\\*(?:(?!\\*\\/)[^\\r\\n])*\\*\\/", "suy"));
-      var $R48 = $R(new RegExp("(?=[ \\t\\/])", "suy"));
-      var $R49 = $R(new RegExp("[ \\t]+", "suy"));
-      var $R50 = $R(new RegExp("(?!\\p{ID_Continue})", "suy"));
-      var $R51 = $R(new RegExp("['\u2019]s", "suy"));
-      var $R52 = $R(new RegExp("\\s", "suy"));
-      var $R53 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*", "suy"));
-      var $R54 = $R(new RegExp("[\\s>]|\\/>", "suy"));
-      var $R55 = $R(new RegExp("(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+", "suy"));
-      var $R56 = $R(new RegExp(`"[^"]*"|'[^']*'`, "suy"));
-      var $R57 = $R(new RegExp("[<>]", "suy"));
-      var $R58 = $R(new RegExp("[!~+-](?!\\s|[!~+-]*&)", "suy"));
-      var $R59 = $R(new RegExp("(?:-[^-]|[^-]*)*", "suy"));
-      var $R60 = $R(new RegExp("[^{}<>\\r\\n]+", "suy"));
-      var $R61 = $R(new RegExp("[+-]?", "suy"));
-      var $R62 = $R(new RegExp("[+-]", "suy"));
-      var $R63 = $R(new RegExp("#![^\\r\\n]*", "suy"));
-      var $R64 = $R(new RegExp("[\\t ]*", "suy"));
-      var $R65 = $R(new RegExp("[\\s]*", "suy"));
-      var $R66 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
-      var $R67 = $R(new RegExp("\\/\\/\\/[^\\r\\n]*", "suy"));
-      var $R68 = $R(new RegExp("(?=[ \\t\\r\\n\\/#]|$)", "suy"));
-      var $R69 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
-      var $R70 = $R(new RegExp("[ \\t]*", "suy"));
+      var $R0 = $R(new RegExp("(?=debugger|if|unless|do|for|loop|until|while|switch|throw|try)", "suy"));
+      var $R1 = $R(new RegExp("(as|of|satisfies|then|when|implements|xor|xnor)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
+      var $R2 = $R(new RegExp("[0-9]", "suy"));
+      var $R3 = $R(new RegExp("[ \\t]", "suy"));
+      var $R4 = $R(new RegExp("(?=['\"`])", "suy"));
+      var $R5 = $R(new RegExp("(?=[\\/?])", "suy"));
+      var $R6 = $R(new RegExp("(?=[\\/\\[{?.!@'\u2019:])", "suy"));
+      var $R7 = $R(new RegExp("[)}]", "suy"));
+      var $R8 = $R(new RegExp("[&]", "suy"));
+      var $R9 = $R(new RegExp("[!~+-]+", "suy"));
+      var $R10 = $R(new RegExp(`(?=[0-9.'"tfyno])`, "suy"));
+      var $R11 = $R(new RegExp("(?=true|false|yes|no|on|off)", "suy"));
+      var $R12 = $R(new RegExp("(?=\\p{ID_Start}|[_$])", "suy"));
+      var $R13 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$])*", "suy"));
+      var $R14 = $R(new RegExp("(?=\\[)", "suy"));
+      var $R15 = $R(new RegExp("[!+-]", "suy"));
+      var $R16 = $R(new RegExp("(?=\\p{ID_Start}|[_$^\xAB\xBB\u22D9\u2264\u2265\u2208\u220B\u2209\u220C\u2263\u2261\u2262\u2260=\u2016\u2047&|*\\/!?%<>+-])", "suy"));
+      var $R17 = $R(new RegExp("<(?!\\p{ID_Start}|[_$])", "suy"));
+      var $R18 = $R(new RegExp("!\\^\\^?", "suy"));
+      var $R19 = $R(new RegExp("(?!\\+\\+|--)[!~+-](?!\\s|[!~+-]*[&.])", "suy"));
+      var $R20 = $R(new RegExp("(?=for|if|loop|unless|until|while)", "suy"));
+      var $R21 = $R(new RegExp("(?=loop|do|for|until|while)", "suy"));
+      var $R22 = $R(new RegExp("(?=[\\s\\),])", "suy"));
+      var $R23 = $R(new RegExp('[^;"\\s]+', "suy"));
+      var $R24 = $R(new RegExp("(?=[0-9.])", "suy"));
+      var $R25 = $R(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)n", "suy"));
+      var $R26 = $R(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)(?=\\.(?:\\p{ID_Start}|[_$]))", "suy"));
+      var $R27 = $R(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)(?:\\.(?:[0-9](?:_[0-9]|[0-9])*))?", "suy"));
+      var $R28 = $R(new RegExp("(?:\\.[0-9](?:_[0-9]|[0-9])*)", "suy"));
+      var $R29 = $R(new RegExp("(?:[eE][+-]?[0-9]+(?:_[0-9]|[0-9])*)", "suy"));
+      var $R30 = $R(new RegExp("0[bB][01](?:[01]|_[01])*n?", "suy"));
+      var $R31 = $R(new RegExp("0[oO][0-7](?:[0-7]|_[0-7])*n?", "suy"));
+      var $R32 = $R(new RegExp("0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_[0-9a-fA-F])*n?", "suy"));
+      var $R33 = $R(new RegExp("(?=[0-9])", "suy"));
+      var $R34 = $R(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)", "suy"));
+      var $R35 = $R(new RegExp('(?:\\\\.|[^"])*', "suy"));
+      var $R36 = $R(new RegExp("(?:\\\\.|[^'])*", "suy"));
+      var $R37 = $R(new RegExp('(?:"(?!"")|#(?!\\{)|\\\\.|[^#"])+', "suy"));
+      var $R38 = $R(new RegExp("(?:'(?!'')|\\\\.|[^'])*", "suy"));
+      var $R39 = $R(new RegExp('(?:\\\\.|#(?!\\{)|[^"#])+', "suy"));
+      var $R40 = $R(new RegExp("(?:\\\\.|[^\\]])*", "suy"));
+      var $R41 = $R(new RegExp("(?:\\\\.)", "suy"));
+      var $R42 = $R(new RegExp("[\\s]+", "suy"));
+      var $R43 = $R(new RegExp("\\/(?!\\/\\/)", "suy"));
+      var $R44 = $R(new RegExp("[^[\\/\\s#\\\\]+", "suy"));
+      var $R45 = $R(new RegExp("[*\\/\\r\\n]", "suy"));
+      var $R46 = $R(new RegExp("(?:\\\\.|[^[\\/\\r\\n])+", "suy"));
+      var $R47 = $R(new RegExp("(?:\\p{ID_Continue}|[\\u200C\\u200D$])*", "suy"));
+      var $R48 = $R(new RegExp("(?=[`'\"])", "suy"));
+      var $R49 = $R(new RegExp("(?:\\$(?!\\{)|\\\\.|[^$`])+", "suy"));
+      var $R50 = $R(new RegExp("(?:\\$(?!\\{)|`(?!``)|\\\\.|[^$`])+", "suy"));
+      var $R51 = $R(new RegExp("(?:on|off|yes|no)(?!\\p{ID_Continue})", "suy"));
+      var $R52 = $R(new RegExp("(?:isnt)(?!\\p{ID_Continue})", "suy"));
+      var $R53 = $R(new RegExp("(?:by)(?!\\p{ID_Continue})", "suy"));
+      var $R54 = $R(new RegExp("(?:of)(?!\\p{ID_Continue})", "suy"));
+      var $R55 = $R(new RegExp("(?:and|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|let|loop|new|not|null|or|private|protected|public|return|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})", "suy"));
+      var $R56 = $R(new RegExp("(?=\\/|#)", "suy"));
+      var $R57 = $R(new RegExp("\\/\\/(?!\\/)[^\\r\\n]*", "suy"));
+      var $R58 = $R(new RegExp(".", "suy"));
+      var $R59 = $R(new RegExp("#(?!##(?!#))([^\\r\\n]*)", "suy"));
+      var $R60 = $R(new RegExp("[^]*?###", "suy"));
+      var $R61 = $R(new RegExp("###(?!#)", "suy"));
+      var $R62 = $R(new RegExp("\\/\\*(?:(?!\\*\\/)[^\\r\\n])*\\*\\/", "suy"));
+      var $R63 = $R(new RegExp("(?=[ \\t\\/\\\\])", "suy"));
+      var $R64 = $R(new RegExp("[ \\t]+", "suy"));
+      var $R65 = $R(new RegExp("(?=\\s|\\/|#)", "suy"));
+      var $R66 = $R(new RegExp("(?!\\p{ID_Continue})", "suy"));
+      var $R67 = $R(new RegExp("['\u2019]s", "suy"));
+      var $R68 = $R(new RegExp("\\s", "suy"));
+      var $R69 = $R(new RegExp("(?=[<])", "suy"));
+      var $R70 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*", "suy"));
+      var $R71 = $R(new RegExp("[\\s>]|\\/>", "suy"));
+      var $R72 = $R(new RegExp("(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+", "suy"));
+      var $R73 = $R(new RegExp(`"[^"]*"|'[^']*'`, "suy"));
+      var $R74 = $R(new RegExp("[<>]", "suy"));
+      var $R75 = $R(new RegExp("[!~+-](?!\\s|[!~+-]*&)", "suy"));
+      var $R76 = $R(new RegExp("(?:-[^-]|[^-]*)*", "suy"));
+      var $R77 = $R(new RegExp("[^{}<>\\r\\n]+", "suy"));
+      var $R78 = $R(new RegExp("[+-]?", "suy"));
+      var $R79 = $R(new RegExp("[+-]", "suy"));
+      var $R80 = $R(new RegExp("#![^\\r\\n]*", "suy"));
+      var $R81 = $R(new RegExp("[\\t ]*", "suy"));
+      var $R82 = $R(new RegExp("[\\s]*", "suy"));
+      var $R83 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
+      var $R84 = $R(new RegExp("\\/\\/\\/[^\\r\\n]*", "suy"));
+      var $R85 = $R(new RegExp("(?=[ \\t\\r\\n\\/#]|$)", "suy"));
+      var $R86 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
+      var $R87 = $R(new RegExp("[ \\t]*", "suy"));
       var Program$0 = $TS($S(Reset, Init, $E(EOS), TopLevelStatements, __), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         var statements = $4;
         processProgram({
@@ -4716,16 +4855,22 @@ ${input.slice(result.pos)}
       function ExpressionizedStatementWithTrailingCallExpressions(ctx, state) {
         return $EVENT(ctx, state, "ExpressionizedStatementWithTrailingCallExpressions", ExpressionizedStatementWithTrailingCallExpressions$0);
       }
-      var ExpressionizedStatement$0 = DebuggerExpression;
-      var ExpressionizedStatement$1 = IfExpression;
-      var ExpressionizedStatement$2 = UnlessExpression;
-      var ExpressionizedStatement$3 = IterationExpression;
-      var ExpressionizedStatement$4 = SwitchExpression;
-      var ExpressionizedStatement$5 = ThrowExpression;
-      var ExpressionizedStatement$6 = TryExpression;
-      var ExpressionizedStatement$$ = [ExpressionizedStatement$0, ExpressionizedStatement$1, ExpressionizedStatement$2, ExpressionizedStatement$3, ExpressionizedStatement$4, ExpressionizedStatement$5, ExpressionizedStatement$6];
+      var ExpressionizedStatement$0 = $T($S($EXPECT($R0, "ExpressionizedStatement /(?=debugger|if|unless|do|for|loop|until|while|switch|throw|try)/"), _ExpressionizedStatement), function(value) {
+        return value[1];
+      });
       function ExpressionizedStatement(ctx, state) {
-        return $EVENT_C(ctx, state, "ExpressionizedStatement", ExpressionizedStatement$$);
+        return $EVENT(ctx, state, "ExpressionizedStatement", ExpressionizedStatement$0);
+      }
+      var _ExpressionizedStatement$0 = DebuggerExpression;
+      var _ExpressionizedStatement$1 = IfExpression;
+      var _ExpressionizedStatement$2 = UnlessExpression;
+      var _ExpressionizedStatement$3 = IterationExpression;
+      var _ExpressionizedStatement$4 = SwitchExpression;
+      var _ExpressionizedStatement$5 = ThrowExpression;
+      var _ExpressionizedStatement$6 = TryExpression;
+      var _ExpressionizedStatement$$ = [_ExpressionizedStatement$0, _ExpressionizedStatement$1, _ExpressionizedStatement$2, _ExpressionizedStatement$3, _ExpressionizedStatement$4, _ExpressionizedStatement$5, _ExpressionizedStatement$6];
+      function _ExpressionizedStatement(ctx, state) {
+        return $EVENT_C(ctx, state, "_ExpressionizedStatement", _ExpressionizedStatement$$);
       }
       var Expression$0 = $TS($S(AssignmentExpression, $Q($S(CommaDelimiter, AssignmentExpression))), function($skip, $loc, $0, $1, $2) {
         if ($2.length == 0)
@@ -4746,7 +4891,7 @@ ${input.slice(result.pos)}
       function Arguments(ctx, state) {
         return $EVENT_C(ctx, state, "Arguments", Arguments$$);
       }
-      var ImplicitArguments$0 = $TS($S($E($S(TypeArguments, $N(ImplementsToken))), ApplicationStart, InsertOpenParen, $Q(_), NonPipelineArgumentList, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+      var ImplicitArguments$0 = $TS($S($E($S(TypeArguments, $N(ImplementsToken))), ApplicationStart, InsertOpenParen, $E(_), NonPipelineArgumentList, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
         var ta = $1;
         var open = $3;
         var ws = $4;
@@ -4770,7 +4915,7 @@ ${input.slice(result.pos)}
       function ApplicationStart(ctx, state) {
         return $EVENT_C(ctx, state, "ApplicationStart", ApplicationStart$$);
       }
-      var ForbiddenImplicitCalls$0 = $R$0($EXPECT($R0, "ForbiddenImplicitCalls /(as|of|satisfies|then|when|implements|xor|xnor)(?!\\p{ID_Continue}|[\\u200C\\u200D$])/"));
+      var ForbiddenImplicitCalls$0 = $R$0($EXPECT($R1, "ForbiddenImplicitCalls /(as|of|satisfies|then|when|implements|xor|xnor)(?!\\p{ID_Continue}|[\\u200C\\u200D$])/"));
       var ForbiddenImplicitCalls$1 = $EXPECT($L2, 'ForbiddenImplicitCalls "/ "');
       var ForbiddenImplicitCalls$2 = $S(ClassImplicitCallForbidden, $C(Class, AtAt));
       var ForbiddenImplicitCalls$3 = $S(Identifier, $EXPECT($L3, 'ForbiddenImplicitCalls "="'), Whitespace);
@@ -4802,7 +4947,7 @@ ${input.slice(result.pos)}
       function ArgumentsWithTrailingMemberExpressions(ctx, state) {
         return $EVENT(ctx, state, "ArgumentsWithTrailingMemberExpressions", ArgumentsWithTrailingMemberExpressions$0);
       }
-      var TrailingMemberExpressions$0 = $TS($S($Q(MemberExpressionRest), $Q($S(IndentedAtLeast, $Y($S($E($EXPECT($L5, 'TrailingMemberExpressions "?"')), $EXPECT($L6, 'TrailingMemberExpressions "."'), $N($EXPECT($R1, "TrailingMemberExpressions /[0-9]/")))), MemberExpressionRest))), function($skip, $loc, $0, $1, $2) {
+      var TrailingMemberExpressions$0 = $TS($S($Q(MemberExpressionRest), $Q($S(IndentedAtLeast, $Y($S($E($EXPECT($L5, 'TrailingMemberExpressions "?"')), $EXPECT($L6, 'TrailingMemberExpressions "."'), $N($EXPECT($R2, "TrailingMemberExpressions /[0-9]/")))), MemberExpressionRest))), function($skip, $loc, $0, $1, $2) {
         return $1.concat($2);
       });
       function TrailingMemberExpressions(ctx, state) {
@@ -4816,7 +4961,7 @@ ${input.slice(result.pos)}
       function AllowedTrailingMemberExpressions(ctx, state) {
         return $EVENT_C(ctx, state, "AllowedTrailingMemberExpressions", AllowedTrailingMemberExpressions$$);
       }
-      var TrailingCallExpressions$0 = $P($S(IndentedAtLeast, $Y($S($E($EXPECT($L5, 'TrailingCallExpressions "?"')), $EXPECT($L6, 'TrailingCallExpressions "."'), $N($R$0($EXPECT($R1, "TrailingCallExpressions /[0-9]/"))))), $P(CallExpressionRest)));
+      var TrailingCallExpressions$0 = $P($S(IndentedAtLeast, $Y($S($E($EXPECT($L5, 'TrailingCallExpressions "?"')), $EXPECT($L6, 'TrailingCallExpressions "."'), $N($R$0($EXPECT($R2, "TrailingCallExpressions /[0-9]/"))))), $P(CallExpressionRest)));
       function TrailingCallExpressions(ctx, state) {
         return $EVENT(ctx, state, "TrailingCallExpressions", TrailingCallExpressions$0);
       }
@@ -5134,7 +5279,7 @@ ${input.slice(result.pos)}
       function FatArrow(ctx, state) {
         return $EVENT(ctx, state, "FatArrow", FatArrow$0);
       }
-      var TrailingDeclaration$0 = $S($Q(_), $C(ConstAssignment, LetAssignment));
+      var TrailingDeclaration$0 = $S($E(_), $C(ConstAssignment, LetAssignment));
       function TrailingDeclaration(ctx, state) {
         return $EVENT(ctx, state, "TrailingDeclaration", TrailingDeclaration$0);
       }
@@ -5157,7 +5302,7 @@ ${input.slice(result.pos)}
         return $EVENT(ctx, state, "ConditionalExpression", ConditionalExpression$0);
       }
       var TernaryRest$0 = NestedTernaryRest;
-      var TernaryRest$1 = $TS($S($N(CoffeeBinaryExistentialEnabled), $Y($EXPECT($L11, 'TernaryRest " "')), $E(_), QuestionMark, ExtendedExpression, __, Colon, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
+      var TernaryRest$1 = $TS($S($N(CoffeeBinaryExistentialEnabled), $Y($EXPECT($R3, "TernaryRest /[ \\t]/")), _, QuestionMark, ExtendedExpression, __, Colon, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
         return $0.slice(2);
       });
       var TernaryRest$$ = [TernaryRest$0, TernaryRest$1];
@@ -5186,6 +5331,18 @@ ${input.slice(result.pos)}
             type: "PipelineExpression",
             children: [ws, ref, body]
           };
+          const parameters = {
+            type: "Parameters",
+            children: [ref],
+            names: []
+          };
+          const expressions = [arrowBody];
+          const block = {
+            bare: true,
+            expressions,
+            children: [expressions]
+          };
+          const children = [parameters, " => ", block];
           return {
             type: "ArrowFunction",
             signature: {
@@ -5193,10 +5350,12 @@ ${input.slice(result.pos)}
                 children: []
               }
             },
-            children: [ref, " => ", arrowBody],
+            children,
             ref,
             body: [arrowBody],
-            ampersandBlock: true
+            ampersandBlock: true,
+            parameters,
+            block
           };
         }
         return {
@@ -5271,7 +5430,7 @@ ${input.slice(result.pos)}
       function ClassDeclaration(ctx, state) {
         return $EVENT(ctx, state, "ClassDeclaration", ClassDeclaration$0);
       }
-      var ClassExpression$0 = $S($E(Decorators), $E($S(Abstract, __)), Class, $N($EXPECT($L12, 'ClassExpression ":"')), $E(ClassBinding), $E(ClassHeritage), ClassBody);
+      var ClassExpression$0 = $S($E(Decorators), $E($S(Abstract, __)), Class, $N($EXPECT($L11, 'ClassExpression ":"')), $E(ClassBinding), $E(ClassHeritage), ClassBody);
       function ClassExpression(ctx, state) {
         return $EVENT(ctx, state, "ClassExpression", ClassExpression$0);
       }
@@ -5291,7 +5450,7 @@ ${input.slice(result.pos)}
       function ExtendsClause(ctx, state) {
         return $EVENT(ctx, state, "ExtendsClause", ExtendsClause$0);
       }
-      var ExtendsToken$0 = $TS($S(Loc, __, OpenAngleBracket, $E($EXPECT($L11, 'ExtendsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var ExtendsToken$0 = $TS($S(Loc, __, OpenAngleBracket, $E($EXPECT($L12, 'ExtendsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
         var l = $1;
         var ws = $2;
         var lt = $3;
@@ -5329,7 +5488,7 @@ ${input.slice(result.pos)}
       function ImplementsClause(ctx, state) {
         return $EVENT(ctx, state, "ImplementsClause", ImplementsClause$0);
       }
-      var ImplementsToken$0 = $TS($S(Loc, __, ImplementsShorthand, $E($EXPECT($L11, 'ImplementsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var ImplementsToken$0 = $TS($S(Loc, __, ImplementsShorthand, $E($EXPECT($L12, 'ImplementsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
         var l = $1;
         var ws = $2;
         var token = $3;
@@ -5559,7 +5718,7 @@ ${input.slice(result.pos)}
       function AtThis(ctx, state) {
         return $EVENT(ctx, state, "AtThis", AtThis$0);
       }
-      var LeftHandSideExpression$0 = $S($P($S(New, $N($C($EXPECT($L6, 'LeftHandSideExpression "."'), $EXPECT($L12, 'LeftHandSideExpression ":"'))), __)), CallExpression, $E(TypeArguments));
+      var LeftHandSideExpression$0 = $S($P($S(New, $N($C($EXPECT($L6, 'LeftHandSideExpression "."'), $EXPECT($L11, 'LeftHandSideExpression ":"'))), __)), CallExpression, $E(TypeArguments));
       var LeftHandSideExpression$1 = CallExpression;
       var LeftHandSideExpression$$ = [LeftHandSideExpression$0, LeftHandSideExpression$1];
       function LeftHandSideExpression(ctx, state) {
@@ -5597,13 +5756,14 @@ ${input.slice(result.pos)}
         return $EVENT_C(ctx, state, "CallExpression", CallExpression$$);
       }
       var CallExpressionRest$0 = MemberExpressionRest;
-      var CallExpressionRest$1 = $TV($C(TemplateLiteral, StringLiteral), function($skip, $loc, $0, $1) {
-        if ($1.type === "StringLiteral") {
-          return "`" + $1.token.slice(1, -1).replace(/(`|\$\{)/g, "\\$1") + "`";
+      var CallExpressionRest$1 = $TS($S($EXPECT($R4, "CallExpressionRest /(?=['\"`])/"), $C(TemplateLiteral, StringLiteral)), function($skip, $loc, $0, $1, $2) {
+        var literal = $2;
+        if (literal.type === "StringLiteral") {
+          return "`" + literal.token.slice(1, -1).replace(/(`|\$\{)/g, "\\$1") + "`";
         }
-        return $1;
+        return literal;
       });
-      var CallExpressionRest$2 = $TS($S($E($C(OptionalShorthand, NonNullAssertion)), ArgumentsWithTrailingMemberExpressions), function($skip, $loc, $0, $1, $2) {
+      var CallExpressionRest$2 = $TS($S($E(OptionalShorthand), ArgumentsWithTrailingMemberExpressions), function($skip, $loc, $0, $1, $2) {
         if (!$1)
           return $2;
         return [$1, ...$2];
@@ -5612,17 +5772,19 @@ ${input.slice(result.pos)}
       function CallExpressionRest(ctx, state) {
         return $EVENT_C(ctx, state, "CallExpressionRest", CallExpressionRest$$);
       }
-      var OptionalShorthand$0 = $TS($S($Q(InlineComment), QuestionMark, OptionalDot), function($skip, $loc, $0, $1, $2, $3) {
+      var OptionalShorthand$0 = $TS($S($EXPECT($R5, "OptionalShorthand /(?=[\\/?])/"), $Q(InlineComment), QuestionMark, OptionalDot), function($skip, $loc, $0, $1, $2, $3, $4) {
         return {
           type: "Optional",
           children: $0
         };
       });
+      var OptionalShorthand$1 = NonNullAssertion;
+      var OptionalShorthand$$ = [OptionalShorthand$0, OptionalShorthand$1];
       function OptionalShorthand(ctx, state) {
-        return $EVENT(ctx, state, "OptionalShorthand", OptionalShorthand$0);
+        return $EVENT_C(ctx, state, "OptionalShorthand", OptionalShorthand$$);
       }
       var OptionalDot$0 = $S($Q(InlineComment), Dot);
-      var OptionalDot$1 = $S(InsertDot, $Q(InlineComment));
+      var OptionalDot$1 = InsertDot;
       var OptionalDot$$ = [OptionalDot$0, OptionalDot$1];
       function OptionalDot(ctx, state) {
         return $EVENT_C(ctx, state, "OptionalDot", OptionalDot$$);
@@ -5653,9 +5815,9 @@ ${input.slice(result.pos)}
       function MemberBase(ctx, state) {
         return $EVENT_C(ctx, state, "MemberBase", MemberBase$$);
       }
-      var MemberExpressionRest$0 = $TS($S($Q(InlineComment), MemberExpressionRestBody), function($skip, $loc, $0, $1, $2) {
-        var comments = $1;
-        var body = $2;
+      var MemberExpressionRest$0 = $TS($S($EXPECT($R6, "MemberExpressionRest /(?=[\\/\\[{?.!@'\u2019:])/"), $Q(InlineComment), MemberExpressionRestBody), function($skip, $loc, $0, $1, $2, $3) {
+        var comments = $2;
+        var body = $3;
         if (Array.isArray(body))
           return [...comments, ...body];
         return {
@@ -5666,7 +5828,7 @@ ${input.slice(result.pos)}
       function MemberExpressionRest(ctx, state) {
         return $EVENT(ctx, state, "MemberExpressionRest", MemberExpressionRest$0);
       }
-      var MemberExpressionRestBody$0 = $TS($S($E($C(OptionalShorthand, NonNullAssertion)), $Q(InlineComment), MemberBracketContent), function($skip, $loc, $0, $1, $2, $3) {
+      var MemberExpressionRestBody$0 = $TS($S($E(OptionalShorthand), $Q(InlineComment), MemberBracketContent), function($skip, $loc, $0, $1, $2, $3) {
         var dot = $1;
         var comments = $2;
         var content = $3;
@@ -5710,35 +5872,21 @@ ${input.slice(result.pos)}
           expression
         };
       });
-      var MemberBracketContent$1 = $TS($S(Dot, $C(TemplateLiteral, StringLiteral)), function($skip, $loc, $0, $1, $2) {
-        var dot = $1;
-        var str = $2;
-        if (Array.isArray(dot))
-          dot = dot[0];
-        return {
-          type: "Index",
-          children: [
-            { token: "[", $loc: dot.$loc },
-            str,
-            "]"
-          ]
-        };
-      });
-      var MemberBracketContent$2 = $TS($S(Dot, IntegerLiteral), function($skip, $loc, $0, $1, $2) {
+      var MemberBracketContent$1 = $TS($S(Dot, $C(TemplateLiteral, StringLiteral, IntegerLiteral)), function($skip, $loc, $0, $1, $2) {
         var dot = $1;
-        var num = $2;
+        var literal = $2;
         if (Array.isArray(dot))
           dot = dot[0];
         return {
           type: "Index",
           children: [
             { token: "[", $loc: dot.$loc },
-            num,
+            literal,
             "]"
           ]
         };
       });
-      var MemberBracketContent$3 = $TS($S(Dot, $EXPECT($L18, 'MemberBracketContent "-"'), IntegerLiteral), function($skip, $loc, $0, $1, $2, $3) {
+      var MemberBracketContent$2 = $TS($S(Dot, $EXPECT($L18, 'MemberBracketContent "-"'), IntegerLiteral), function($skip, $loc, $0, $1, $2, $3) {
         var dot = $1;
         var neg = $2;
         var num = $3;
@@ -5748,7 +5896,7 @@ ${input.slice(result.pos)}
           { type: "Call", children: ["(", neg, num, ")"] }
         ];
       });
-      var MemberBracketContent$$ = [MemberBracketContent$0, MemberBracketContent$1, MemberBracketContent$2, MemberBracketContent$3];
+      var MemberBracketContent$$ = [MemberBracketContent$0, MemberBracketContent$1, MemberBracketContent$2];
       function MemberBracketContent(ctx, state) {
         return $EVENT_C(ctx, state, "MemberBracketContent", MemberBracketContent$$);
       }
@@ -5816,7 +5964,7 @@ ${input.slice(result.pos)}
       function SliceParameters(ctx, state) {
         return $EVENT_C(ctx, state, "SliceParameters", SliceParameters$$);
       }
-      var AccessStart$0 = $TS($S($E($C(QuestionMark, NonNullAssertion)), Dot, $N(Dot)), function($skip, $loc, $0, $1, $2, $3) {
+      var AccessStart$0 = $TS($S($E(PropertyAccessModifier), Dot, $N(Dot)), function($skip, $loc, $0, $1, $2, $3) {
         if ($1)
           return [$1, $2];
         return $2;
@@ -5824,6 +5972,12 @@ ${input.slice(result.pos)}
       function AccessStart(ctx, state) {
         return $EVENT(ctx, state, "AccessStart", AccessStart$0);
       }
+      var PropertyAccessModifier$0 = QuestionMark;
+      var PropertyAccessModifier$1 = NonNullAssertion;
+      var PropertyAccessModifier$$ = [PropertyAccessModifier$0, PropertyAccessModifier$1];
+      function PropertyAccessModifier(ctx, state) {
+        return $EVENT_C(ctx, state, "PropertyAccessModifier", PropertyAccessModifier$$);
+      }
       var PropertyAccess$0 = $TS($S(AccessStart, $Q(InlineComment), $C(IdentifierName, PrivateIdentifier)), function($skip, $loc, $0, $1, $2, $3) {
         var access = $1;
         var comments = $2;
@@ -5856,7 +6010,7 @@ ${input.slice(result.pos)}
       function PropertyAccess(ctx, state) {
         return $EVENT_C(ctx, state, "PropertyAccess", PropertyAccess$$);
       }
-      var PropertyGlob$0 = $TS($S($S($E($C(QuestionMark, NonNullAssertion)), OptionalDot), $Q(InlineComment), BracedObjectLiteral), function($skip, $loc, $0, $1, $2, $3) {
+      var PropertyGlob$0 = $TS($S($S($E(PropertyAccessModifier), OptionalDot), $Q(InlineComment), BracedObjectLiteral), function($skip, $loc, $0, $1, $2, $3) {
         var dot = $1;
         var object = $3;
         return {
@@ -5869,7 +6023,7 @@ ${input.slice(result.pos)}
       function PropertyGlob(ctx, state) {
         return $EVENT(ctx, state, "PropertyGlob", PropertyGlob$0);
       }
-      var PropertyBind$0 = $TS($S($E($C(QuestionMark, NonNullAssertion)), At, OptionalDot, $C(IdentifierName, PrivateIdentifier)), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var PropertyBind$0 = $TS($S($E(PropertyAccessModifier), At, OptionalDot, $C(IdentifierName, PrivateIdentifier)), function($skip, $loc, $0, $1, $2, $3, $4) {
         var modifier = $1;
         var dot = $3;
         var id = $4;
@@ -5884,7 +6038,7 @@ ${input.slice(result.pos)}
         return $EVENT(ctx, state, "PropertyBind", PropertyBind$0);
       }
       var SuperProperty$0 = $S(Super, MemberBracketContent);
-      var SuperProperty$1 = $S(Super, $N($C(QuestionMark, NonNullAssertion)), PropertyAccess);
+      var SuperProperty$1 = $S(Super, $N(PropertyAccessModifier), PropertyAccess);
       var SuperProperty$$ = [SuperProperty$0, SuperProperty$1];
       function SuperProperty(ctx, state) {
         return $EVENT_C(ctx, state, "SuperProperty", SuperProperty$$);
@@ -6015,8 +6169,8 @@ ${input.slice(result.pos)}
       function ParameterElement(ctx, state) {
         return $EVENT(ctx, state, "ParameterElement", ParameterElement$0);
       }
-      var ParameterElementDelimiter$0 = $S($Q(_), Comma);
-      var ParameterElementDelimiter$1 = $Y($S(__, $R$0($EXPECT($R2, "ParameterElementDelimiter /[)}]/"))));
+      var ParameterElementDelimiter$0 = $S($E(_), Comma);
+      var ParameterElementDelimiter$1 = $Y($S(__, $R$0($EXPECT($R7, "ParameterElementDelimiter /[)}]/"))));
       var ParameterElementDelimiter$2 = $T($S($Y(EOS), InsertComma), function(value) {
         return value[1];
       });
@@ -6090,10 +6244,14 @@ ${input.slice(result.pos)}
         return $EVENT_C(ctx, state, "BindingPattern", BindingPattern$$);
       }
       var ObjectBindingPattern$0 = $TS($S($E(_), OpenBrace, ObjectBindingPatternContent, __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+        var ws1 = $1;
+        var open = $2;
         var c = $3;
+        var ws2 = $4;
+        var close = $5;
         return {
           type: "ObjectBindingPattern",
-          children: [$1, $2, c.children, $4, $5],
+          children: [ws1, open, c.children, ws2, close],
           names: c.names,
           properties: c.children
         };
@@ -6126,13 +6284,17 @@ ${input.slice(result.pos)}
         return $EVENT(ctx, state, "BindingPropertyList", BindingPropertyList$0);
       }
       var ArrayBindingPattern$0 = $TS($S($E(_), OpenBracket, ArrayBindingPatternContent, __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+        var ws1 = $1;
+        var open = $2;
         var c = $3;
+        var ws2 = $4;
+        var close = $5;
         return {
           ...c,
           // names, blockPrefix, length
           type: "ArrayBindingPattern",
           elements: c.children,
-          children: [$1, $2, c.children, $4, $5]
+          children: [ws1, open, c.children, ws2, close]
         };
       });
       function ArrayBindingPattern(ctx, state) {
@@ -6434,6 +6596,14 @@ ${input.slice(result.pos)}
       });
       var FunctionExpression$1 = $TV($EXPECT($L22, 'FunctionExpression "(&)"'), function($skip, $loc, $0, $1) {
         const ref = makeRef("$"), body = [ref];
+        const parameters = {
+          type: "Parameters",
+          children: [ref],
+          names: []
+        };
+        const block = {
+          expressions: [ref]
+        };
         return {
           type: "ArrowFunction",
           signature: {
@@ -6442,7 +6612,9 @@ ${input.slice(result.pos)}
           children: [ref, " => ", body],
           ref,
           body,
-          ampersandBlock: true
+          ampersandBlock: true,
+          block,
+          parameters
         };
       });
       var FunctionExpression$2 = AmpersandFunctionExpression;
@@ -6485,7 +6657,18 @@ ${input.slice(result.pos)}
             children: [prefix, body, void 0]
           };
         }
-        const children = [ref, " => ", body];
+        const parameters = {
+          type: "Parameters",
+          children: [ref],
+          names: []
+        };
+        const expressions = [body];
+        const block = {
+          bare: true,
+          expressions,
+          children: [expressions]
+        };
+        const children = [parameters, " => ", block];
         const async = hasAwait(body);
         if (async) {
           children.unshift("async ");
@@ -6500,7 +6683,9 @@ ${input.slice(result.pos)}
           children,
           ref,
           body,
-          ampersandBlock: true
+          ampersandBlock: true,
+          block,
+          parameters
         };
       });
       function AmpersandFunctionExpression(ctx, state) {
@@ -6574,7 +6759,7 @@ ${input.slice(result.pos)}
       function AmpersandBlockRHS(ctx, state) {
         return $EVENT(ctx, state, "AmpersandBlockRHS", AmpersandBlockRHS$0);
       }
-      var AmpersandBlockRHSBody$0 = $TS($S($E($S($N(_), $P(CallExpressionRest))), $E(QuestionMark), $E($S($N($EXPECT($R3, "AmpersandBlockRHSBody /[&]/")), $P(BinaryOpRHS)))), function($skip, $loc, $0, $1, $2, $3) {
+      var AmpersandBlockRHSBody$0 = $TS($S($E($S($N(_), $P(CallExpressionRest))), $E(QuestionMark), $E($S($N($EXPECT($R8, "AmpersandBlockRHSBody /[&]/")), $P(BinaryOpRHS)))), function($skip, $loc, $0, $1, $2, $3) {
         var callExpRest = $1;
         var unaryPostfix = $2;
         var binopRHS = $3;
@@ -6604,7 +6789,7 @@ ${input.slice(result.pos)}
       function AmpersandBlockRHSBody(ctx, state) {
         return $EVENT(ctx, state, "AmpersandBlockRHSBody", AmpersandBlockRHSBody$0);
       }
-      var AmpersandUnaryPrefix$0 = $R$0($EXPECT($R4, "AmpersandUnaryPrefix /[!~+-]+/"));
+      var AmpersandUnaryPrefix$0 = $R$0($EXPECT($R9, "AmpersandUnaryPrefix /[!~+-]+/"));
       function AmpersandUnaryPrefix(ctx, state) {
         return $EVENT(ctx, state, "AmpersandUnaryPrefix", AmpersandUnaryPrefix$0);
       }
@@ -6938,12 +7123,13 @@ ${input.slice(result.pos)}
       function BlockStatementPart(ctx, state) {
         return $EVENT(ctx, state, "BlockStatementPart", BlockStatementPart$0);
       }
-      var Literal$0 = $TS($S(LiteralContent), function($skip, $loc, $0, $1) {
+      var Literal$0 = $TS($S($EXPECT($R10, `Literal /(?=[0-9.'"tfyno])/`), LiteralContent), function($skip, $loc, $0, $1, $2) {
+        var literal = $2;
         return {
           type: "Literal",
-          subtype: $1.type,
-          children: $0,
-          raw: $1.token
+          subtype: literal.type,
+          children: [literal],
+          raw: literal.token
         };
       });
       function Literal(ctx, state) {
@@ -6963,15 +7149,21 @@ ${input.slice(result.pos)}
       function NullLiteral(ctx, state) {
         return $EVENT(ctx, state, "NullLiteral", NullLiteral$0);
       }
-      var BooleanLiteral$0 = $T($S(CoffeeBooleansEnabled, CoffeeScriptBooleanLiteral), function(value) {
+      var BooleanLiteral$0 = $T($S($EXPECT($R11, "BooleanLiteral /(?=true|false|yes|no|on|off)/"), _BooleanLiteral), function(value) {
+        return value[1];
+      });
+      function BooleanLiteral(ctx, state) {
+        return $EVENT(ctx, state, "BooleanLiteral", BooleanLiteral$0);
+      }
+      var _BooleanLiteral$0 = $T($S(CoffeeBooleansEnabled, CoffeeScriptBooleanLiteral), function(value) {
         return value[1];
       });
-      var BooleanLiteral$1 = $TS($S($C($EXPECT($L27, 'BooleanLiteral "true"'), $EXPECT($L28, 'BooleanLiteral "false"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var _BooleanLiteral$1 = $TS($S($C($EXPECT($L27, '_BooleanLiteral "true"'), $EXPECT($L28, '_BooleanLiteral "false"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
-      var BooleanLiteral$$ = [BooleanLiteral$0, BooleanLiteral$1];
-      function BooleanLiteral(ctx, state) {
-        return $EVENT_C(ctx, state, "BooleanLiteral", BooleanLiteral$$);
+      var _BooleanLiteral$$ = [_BooleanLiteral$0, _BooleanLiteral$1];
+      function _BooleanLiteral(ctx, state) {
+        return $EVENT_C(ctx, state, "_BooleanLiteral", _BooleanLiteral$$);
       }
       var CoffeeScriptBooleanLiteral$0 = $TS($S($C($EXPECT($L29, 'CoffeeScriptBooleanLiteral "yes"'), $EXPECT($L30, 'CoffeeScriptBooleanLiteral "on"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "true" };
@@ -6983,13 +7175,14 @@ ${input.slice(result.pos)}
       function CoffeeScriptBooleanLiteral(ctx, state) {
         return $EVENT_C(ctx, state, "CoffeeScriptBooleanLiteral", CoffeeScriptBooleanLiteral$$);
       }
-      var Identifier$0 = $T($S($N(ReservedWord), IdentifierName), function(value) {
-        return value[1];
+      var Identifier$0 = $T($S($EXPECT($R12, "Identifier /(?=\\p{ID_Start}|[_$])/"), $N(ReservedWord), IdentifierName), function(value) {
+        var id = value[2];
+        return id;
       });
       function Identifier(ctx, state) {
         return $EVENT(ctx, state, "Identifier", Identifier$0);
       }
-      var IdentifierName$0 = $TR($EXPECT($R5, "IdentifierName /(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$])*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var IdentifierName$0 = $TR($EXPECT($R13, "IdentifierName /(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$])*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return {
           type: "Identifier",
           name: $0,
@@ -7011,10 +7204,16 @@ ${input.slice(result.pos)}
       function UpcomingAssignment(ctx, state) {
         return $EVENT(ctx, state, "UpcomingAssignment", UpcomingAssignment$0);
       }
-      var ArrayLiteral$0 = $T($S(ArrayBindingPattern, UpcomingAssignment), function(value) {
+      var ArrayLiteral$0 = $T($S($EXPECT($R14, "ArrayLiteral /(?=\\[)/"), _ArrayLiteral), function(value) {
+        return value[1];
+      });
+      function ArrayLiteral(ctx, state) {
+        return $EVENT(ctx, state, "ArrayLiteral", ArrayLiteral$0);
+      }
+      var _ArrayLiteral$0 = $T($S(ArrayBindingPattern, UpcomingAssignment), function(value) {
         return value[0];
       });
-      var ArrayLiteral$1 = $TS($S(OpenBracket, AllowAll, $E($S(ArrayLiteralContent, __, CloseBracket)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var _ArrayLiteral$1 = $TS($S(OpenBracket, AllowAll, $E($S(ArrayLiteralContent, __, CloseBracket)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4) {
         var open = $1;
         if (!$3)
           return $skip;
@@ -7038,9 +7237,9 @@ ${input.slice(result.pos)}
           names
         };
       });
-      var ArrayLiteral$$ = [ArrayLiteral$0, ArrayLiteral$1];
-      function ArrayLiteral(ctx, state) {
-        return $EVENT_C(ctx, state, "ArrayLiteral", ArrayLiteral$$);
+      var _ArrayLiteral$$ = [_ArrayLiteral$0, _ArrayLiteral$1];
+      function _ArrayLiteral(ctx, state) {
+        return $EVENT_C(ctx, state, "_ArrayLiteral", _ArrayLiteral$$);
       }
       var RangeExpression$0 = $TS($S(ExtendedExpression, __, $C(DotDotDot, DotDot), ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4) {
         var s = $1;
@@ -7405,7 +7604,7 @@ ${input.slice(result.pos)}
           children: [ws, ...prop.children]
         };
       });
-      var PropertyDefinition$1 = $TS($S($E(_), $TEXT($EXPECT($R6, "PropertyDefinition /[!+-]/")), PropertyName), function($skip, $loc, $0, $1, $2, $3) {
+      var PropertyDefinition$1 = $TS($S($E(_), $TEXT($EXPECT($R15, "PropertyDefinition /[!+-]/")), PropertyName), function($skip, $loc, $0, $1, $2, $3) {
         var ws = $1;
         var toggle = $2;
         var id = $3;
@@ -7928,12 +8127,19 @@ ${input.slice(result.pos)}
       function IdentifierBinaryOp(ctx, state) {
         return $EVENT(ctx, state, "IdentifierBinaryOp", IdentifierBinaryOp$0);
       }
-      var BinaryOp$0 = $TS($S(BinaryOpSymbol), function($skip, $loc, $0, $1) {
+      var BinaryOp$0 = $T($S($EXPECT($R16, "BinaryOp /(?=\\p{ID_Start}|[_$^\xAB\xBB\u22D9\u2264\u2265\u2208\u220B\u2209\u220C\u2263\u2261\u2262\u2260=\u2016\u2047&|*\\/!?%<>+-])/"), _BinaryOp), function(value) {
+        var op = value[1];
+        return op;
+      });
+      function BinaryOp(ctx, state) {
+        return $EVENT(ctx, state, "BinaryOp", BinaryOp$0);
+      }
+      var _BinaryOp$0 = $TS($S(BinaryOpSymbol), function($skip, $loc, $0, $1) {
         if (typeof $1 === "string")
           return { $loc, token: $1 };
         return $1;
       });
-      var BinaryOp$1 = $TV(Identifier, function($skip, $loc, $0, $1) {
+      var _BinaryOp$1 = $TV(Identifier, function($skip, $loc, $0, $1) {
         var id = $0;
         if (!module.operators.has(id.name))
           return $skip;
@@ -7942,7 +8148,7 @@ ${input.slice(result.pos)}
           special: true
         };
       });
-      var BinaryOp$2 = $TS($S(Not, __, Identifier), function($skip, $loc, $0, $1, $2, $3) {
+      var _BinaryOp$2 = $TS($S(Not, __, Identifier), function($skip, $loc, $0, $1, $2, $3) {
         var id = $3;
         if (!module.operators.has(id.name))
           return $skip;
@@ -7952,9 +8158,9 @@ ${input.slice(result.pos)}
           negated: true
         };
       });
-      var BinaryOp$$ = [BinaryOp$0, BinaryOp$1, BinaryOp$2];
-      function BinaryOp(ctx, state) {
-        return $EVENT_C(ctx, state, "BinaryOp", BinaryOp$$);
+      var _BinaryOp$$ = [_BinaryOp$0, _BinaryOp$1, _BinaryOp$2];
+      function _BinaryOp(ctx, state) {
+        return $EVENT_C(ctx, state, "_BinaryOp", _BinaryOp$$);
       }
       var BinaryOpSymbol$0 = $EXPECT($L53, 'BinaryOpSymbol "**"');
       var BinaryOpSymbol$1 = $EXPECT($L54, 'BinaryOpSymbol "*"');
@@ -7997,7 +8203,7 @@ ${input.slice(result.pos)}
       var BinaryOpSymbol$14 = $T($EXPECT($L66, 'BinaryOpSymbol "\xAB"'), function(value) {
         return "<<";
       });
-      var BinaryOpSymbol$15 = $TR($EXPECT($R7, "BinaryOpSymbol /<(?!\\p{ID_Start}|[_$])/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var BinaryOpSymbol$15 = $TR($EXPECT($R17, "BinaryOpSymbol /<(?!\\p{ID_Start}|[_$])/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return "<";
       });
       var BinaryOpSymbol$16 = $EXPECT($L67, 'BinaryOpSymbol ">>>"');
@@ -8036,36 +8242,33 @@ ${input.slice(result.pos)}
         return "&&";
       });
       var BinaryOpSymbol$29 = $EXPECT($L83, 'BinaryOpSymbol "&&"');
-      var BinaryOpSymbol$30 = $T($S(CoffeeOfEnabled, $EXPECT($L84, 'BinaryOpSymbol "of"'), NonIdContinue), function(value) {
-        return "in";
-      });
-      var BinaryOpSymbol$31 = $T($S($EXPECT($L85, 'BinaryOpSymbol "or"'), NonIdContinue), function(value) {
+      var BinaryOpSymbol$30 = $T($S($EXPECT($L84, 'BinaryOpSymbol "or"'), NonIdContinue), function(value) {
         return "||";
       });
-      var BinaryOpSymbol$32 = $EXPECT($L86, 'BinaryOpSymbol "||"');
-      var BinaryOpSymbol$33 = $T($EXPECT($L87, 'BinaryOpSymbol "\u2016"'), function(value) {
+      var BinaryOpSymbol$31 = $EXPECT($L85, 'BinaryOpSymbol "||"');
+      var BinaryOpSymbol$32 = $T($EXPECT($L86, 'BinaryOpSymbol "\u2016"'), function(value) {
         return "||";
       });
-      var BinaryOpSymbol$34 = $TV($C($EXPECT($L88, 'BinaryOpSymbol "^^"'), $S($EXPECT($L89, 'BinaryOpSymbol "xor"'), NonIdContinue)), function($skip, $loc, $0, $1) {
+      var BinaryOpSymbol$33 = $TV($C($EXPECT($L87, 'BinaryOpSymbol "^^"'), $S($EXPECT($L88, 'BinaryOpSymbol "xor"'), NonIdContinue)), function($skip, $loc, $0, $1) {
         return {
           call: module.getRef("xor"),
           special: true
         };
       });
-      var BinaryOpSymbol$35 = $TV($C($EXPECT($R8, "BinaryOpSymbol /!\\^\\^?/"), $S($EXPECT($L90, 'BinaryOpSymbol "xnor"'), NonIdContinue)), function($skip, $loc, $0, $1) {
+      var BinaryOpSymbol$34 = $TV($C($EXPECT($R18, "BinaryOpSymbol /!\\^\\^?/"), $S($EXPECT($L89, 'BinaryOpSymbol "xnor"'), NonIdContinue)), function($skip, $loc, $0, $1) {
         return {
           call: module.getRef("xnor"),
           special: true
         };
       });
-      var BinaryOpSymbol$36 = $EXPECT($L91, 'BinaryOpSymbol "??"');
-      var BinaryOpSymbol$37 = $T($EXPECT($L92, 'BinaryOpSymbol "\u2047"'), function(value) {
+      var BinaryOpSymbol$35 = $EXPECT($L90, 'BinaryOpSymbol "??"');
+      var BinaryOpSymbol$36 = $T($EXPECT($L91, 'BinaryOpSymbol "\u2047"'), function(value) {
         return "??";
       });
-      var BinaryOpSymbol$38 = $T($S(CoffeeBinaryExistentialEnabled, $EXPECT($L5, 'BinaryOpSymbol "?"')), function(value) {
+      var BinaryOpSymbol$37 = $T($S($EXPECT($L5, 'BinaryOpSymbol "?"'), CoffeeBinaryExistentialEnabled), function(value) {
         return "??";
       });
-      var BinaryOpSymbol$39 = $TS($S($EXPECT($L93, 'BinaryOpSymbol "instanceof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var BinaryOpSymbol$38 = $TS($S($EXPECT($L92, 'BinaryOpSymbol "instanceof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return {
           $loc,
           token: $1,
@@ -8074,24 +8277,15 @@ ${input.slice(result.pos)}
           // for typeof shorthand
         };
       });
-      var BinaryOpSymbol$40 = $TS($S(Not, __, $EXPECT($L93, 'BinaryOpSymbol "instanceof"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4) {
-        return {
-          $loc,
-          token: "instanceof",
-          relational: true,
-          special: true,
-          negated: true
-        };
+      var BinaryOpSymbol$39 = $T($S(CoffeeOfEnabled, CoffeeOfOp), function(value) {
+        var op = value[1];
+        return op;
       });
-      var BinaryOpSymbol$41 = $TV($C($S($N(CoffeeOfEnabled), Not, __, In), $S(CoffeeOfEnabled, Not, __, $EXPECT($L84, 'BinaryOpSymbol "of"'), NonIdContinue)), function($skip, $loc, $0, $1) {
-        return {
-          $loc,
-          token: "in",
-          special: true,
-          negated: true
-        };
+      var BinaryOpSymbol$40 = $TS($S(Not, __, NotOp), function($skip, $loc, $0, $1, $2, $3) {
+        var op = $3;
+        return { ...op, $loc };
       });
-      var BinaryOpSymbol$42 = $TV($C($S(Is, __, In), $EXPECT($L94, 'BinaryOpSymbol "\u2208"')), function($skip, $loc, $0, $1) {
+      var BinaryOpSymbol$41 = $TV($C($S(Is, __, In), $EXPECT($L93, 'BinaryOpSymbol "\u2208"')), function($skip, $loc, $0, $1) {
         return {
           method: "includes",
           relational: true,
@@ -8099,14 +8293,14 @@ ${input.slice(result.pos)}
           special: true
         };
       });
-      var BinaryOpSymbol$43 = $TV($EXPECT($L95, 'BinaryOpSymbol "\u220B"'), function($skip, $loc, $0, $1) {
+      var BinaryOpSymbol$42 = $TV($EXPECT($L94, 'BinaryOpSymbol "\u220B"'), function($skip, $loc, $0, $1) {
         return {
           method: "includes",
           relational: true,
           special: true
         };
       });
-      var BinaryOpSymbol$44 = $TV($EXPECT($L96, 'BinaryOpSymbol "\u220C"'), function($skip, $loc, $0, $1) {
+      var BinaryOpSymbol$43 = $TV($EXPECT($L95, 'BinaryOpSymbol "\u220C"'), function($skip, $loc, $0, $1) {
         return {
           method: "includes",
           relational: true,
@@ -8114,16 +8308,7 @@ ${input.slice(result.pos)}
           negated: true
         };
       });
-      var BinaryOpSymbol$45 = $TS($S(CoffeeOfEnabled, In), function($skip, $loc, $0, $1, $2) {
-        return {
-          call: [module.getRef("indexOf"), ".call"],
-          relational: true,
-          reversed: true,
-          suffix: " >= 0",
-          special: true
-        };
-      });
-      var BinaryOpSymbol$46 = $TV($C($S(Is, __, Not, __, In), $EXPECT($L97, 'BinaryOpSymbol "\u2209"')), function($skip, $loc, $0, $1) {
+      var BinaryOpSymbol$44 = $TV($C($S(Is, __, Not, __, In), $EXPECT($L96, 'BinaryOpSymbol "\u2209"')), function($skip, $loc, $0, $1) {
         return {
           method: "includes",
           relational: true,
@@ -8132,16 +8317,7 @@ ${input.slice(result.pos)}
           negated: true
         };
       });
-      var BinaryOpSymbol$47 = $TS($S(CoffeeOfEnabled, Not, __, In), function($skip, $loc, $0, $1, $2, $3, $4) {
-        return {
-          call: [module.getRef("indexOf"), ".call"],
-          relational: true,
-          reversed: true,
-          suffix: " < 0",
-          special: true
-        };
-      });
-      var BinaryOpSymbol$48 = $TS($S($N(CoffeeNotEnabled), Is, __, Not), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var BinaryOpSymbol$45 = $TS($S($N(CoffeeNotEnabled), Is, __, Not), function($skip, $loc, $0, $1, $2, $3, $4) {
         if (module.config.objectIs) {
           return {
             call: module.getRef("is"),
@@ -8153,7 +8329,7 @@ ${input.slice(result.pos)}
         }
         return "!==";
       });
-      var BinaryOpSymbol$49 = $TS($S(Is), function($skip, $loc, $0, $1) {
+      var BinaryOpSymbol$46 = $TS($S(Is), function($skip, $loc, $0, $1) {
         if (module.config.objectIs) {
           return {
             call: module.getRef("is"),
@@ -8164,34 +8340,86 @@ ${input.slice(result.pos)}
         }
         return "===";
       });
-      var BinaryOpSymbol$50 = $TS($S(In), function($skip, $loc, $0, $1) {
-        return "in";
-      });
-      var BinaryOpSymbol$51 = $EXPECT($L98, 'BinaryOpSymbol "&"');
-      var BinaryOpSymbol$52 = $EXPECT($L17, 'BinaryOpSymbol "^"');
-      var BinaryOpSymbol$53 = $EXPECT($L99, 'BinaryOpSymbol "|"');
-      var BinaryOpSymbol$$ = [BinaryOpSymbol$0, BinaryOpSymbol$1, BinaryOpSymbol$2, BinaryOpSymbol$3, BinaryOpSymbol$4, BinaryOpSymbol$5, BinaryOpSymbol$6, BinaryOpSymbol$7, BinaryOpSymbol$8, BinaryOpSymbol$9, BinaryOpSymbol$10, BinaryOpSymbol$11, BinaryOpSymbol$12, BinaryOpSymbol$13, BinaryOpSymbol$14, BinaryOpSymbol$15, BinaryOpSymbol$16, BinaryOpSymbol$17, BinaryOpSymbol$18, BinaryOpSymbol$19, BinaryOpSymbol$20, BinaryOpSymbol$21, BinaryOpSymbol$22, BinaryOpSymbol$23, BinaryOpSymbol$24, BinaryOpSymbol$25, BinaryOpSymbol$26, BinaryOpSymbol$27, BinaryOpSymbol$28, BinaryOpSymbol$29, BinaryOpSymbol$30, BinaryOpSymbol$31, BinaryOpSymbol$32, BinaryOpSymbol$33, BinaryOpSymbol$34, BinaryOpSymbol$35, BinaryOpSymbol$36, BinaryOpSymbol$37, BinaryOpSymbol$38, BinaryOpSymbol$39, BinaryOpSymbol$40, BinaryOpSymbol$41, BinaryOpSymbol$42, BinaryOpSymbol$43, BinaryOpSymbol$44, BinaryOpSymbol$45, BinaryOpSymbol$46, BinaryOpSymbol$47, BinaryOpSymbol$48, BinaryOpSymbol$49, BinaryOpSymbol$50, BinaryOpSymbol$51, BinaryOpSymbol$52, BinaryOpSymbol$53];
+      var BinaryOpSymbol$47 = In;
+      var BinaryOpSymbol$48 = $EXPECT($L97, 'BinaryOpSymbol "&"');
+      var BinaryOpSymbol$49 = $EXPECT($L17, 'BinaryOpSymbol "^"');
+      var BinaryOpSymbol$50 = $EXPECT($L98, 'BinaryOpSymbol "|"');
+      var BinaryOpSymbol$$ = [BinaryOpSymbol$0, BinaryOpSymbol$1, BinaryOpSymbol$2, BinaryOpSymbol$3, BinaryOpSymbol$4, BinaryOpSymbol$5, BinaryOpSymbol$6, BinaryOpSymbol$7, BinaryOpSymbol$8, BinaryOpSymbol$9, BinaryOpSymbol$10, BinaryOpSymbol$11, BinaryOpSymbol$12, BinaryOpSymbol$13, BinaryOpSymbol$14, BinaryOpSymbol$15, BinaryOpSymbol$16, BinaryOpSymbol$17, BinaryOpSymbol$18, BinaryOpSymbol$19, BinaryOpSymbol$20, BinaryOpSymbol$21, BinaryOpSymbol$22, BinaryOpSymbol$23, BinaryOpSymbol$24, BinaryOpSymbol$25, BinaryOpSymbol$26, BinaryOpSymbol$27, BinaryOpSymbol$28, BinaryOpSymbol$29, BinaryOpSymbol$30, BinaryOpSymbol$31, BinaryOpSymbol$32, BinaryOpSymbol$33, BinaryOpSymbol$34, BinaryOpSymbol$35, BinaryOpSymbol$36, BinaryOpSymbol$37, BinaryOpSymbol$38, BinaryOpSymbol$39, BinaryOpSymbol$40, BinaryOpSymbol$41, BinaryOpSymbol$42, BinaryOpSymbol$43, BinaryOpSymbol$44, BinaryOpSymbol$45, BinaryOpSymbol$46, BinaryOpSymbol$47, BinaryOpSymbol$48, BinaryOpSymbol$49, BinaryOpSymbol$50];
       function BinaryOpSymbol(ctx, state) {
         return $EVENT_C(ctx, state, "BinaryOpSymbol", BinaryOpSymbol$$);
       }
-      var Xor$0 = $EXPECT($L88, 'Xor "^^"');
-      var Xor$1 = $S($EXPECT($L89, 'Xor "xor"'), NonIdContinue);
+      var CoffeeOfOp$0 = $T($S(Of), function(value) {
+        return "in";
+      });
+      var CoffeeOfOp$1 = $TS($S(In), function($skip, $loc, $0, $1) {
+        return {
+          call: [module.getRef("indexOf"), ".call"],
+          relational: true,
+          reversed: true,
+          suffix: " >= 0",
+          special: true
+        };
+      });
+      var CoffeeOfOp$2 = $TS($S(Not, __, Of, NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4) {
+        return {
+          $loc,
+          token: "in",
+          special: true,
+          negated: true
+        };
+      });
+      var CoffeeOfOp$3 = $TS($S(Not, __, In), function($skip, $loc, $0, $1, $2, $3) {
+        return {
+          call: [module.getRef("indexOf"), ".call"],
+          relational: true,
+          reversed: true,
+          suffix: " < 0",
+          special: true
+        };
+      });
+      var CoffeeOfOp$$ = [CoffeeOfOp$0, CoffeeOfOp$1, CoffeeOfOp$2, CoffeeOfOp$3];
+      function CoffeeOfOp(ctx, state) {
+        return $EVENT_C(ctx, state, "CoffeeOfOp", CoffeeOfOp$$);
+      }
+      var NotOp$0 = $TS($S($EXPECT($L92, 'NotOp "instanceof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+        return {
+          $loc,
+          token: "instanceof",
+          relational: true,
+          special: true,
+          negated: true
+        };
+      });
+      var NotOp$1 = $TS($S(In), function($skip, $loc, $0, $1) {
+        return {
+          $loc,
+          token: "in",
+          special: true,
+          negated: true
+        };
+      });
+      var NotOp$$ = [NotOp$0, NotOp$1];
+      function NotOp(ctx, state) {
+        return $EVENT_C(ctx, state, "NotOp", NotOp$$);
+      }
+      var Xor$0 = $EXPECT($L87, 'Xor "^^"');
+      var Xor$1 = $S($EXPECT($L88, 'Xor "xor"'), NonIdContinue);
       var Xor$$ = [Xor$0, Xor$1];
       function Xor(ctx, state) {
         return $EVENT_C(ctx, state, "Xor", Xor$$);
       }
-      var Xnor$0 = $R$0($EXPECT($R8, "Xnor /!\\^\\^?/"));
-      var Xnor$1 = $EXPECT($L90, 'Xnor "xnor"');
+      var Xnor$0 = $R$0($EXPECT($R18, "Xnor /!\\^\\^?/"));
+      var Xnor$1 = $EXPECT($L89, 'Xnor "xnor"');
       var Xnor$$ = [Xnor$0, Xnor$1];
       function Xnor(ctx, state) {
         return $EVENT_C(ctx, state, "Xnor", Xnor$$);
       }
-      var UnaryOp$0 = $TR($EXPECT($R9, "UnaryOp /(?!\\+\\+|--)[!~+-](?!\\s|[!~+-]*[&.])/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var UnaryOp$0 = $TR($EXPECT($R19, "UnaryOp /(?!\\+\\+|--)[!~+-](?!\\s|[!~+-]*[&.])/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       var UnaryOp$1 = AwaitOp;
-      var UnaryOp$2 = $S($C(Delete, Void, Typeof), $N($EXPECT($L12, 'UnaryOp ":"')), $E(_));
-      var UnaryOp$3 = $T($S(Not, $E($EXPECT($L11, 'UnaryOp " "')), $E(_)), function(value) {
+      var UnaryOp$2 = $S($C(Delete, Void, Typeof), $N($EXPECT($L11, 'UnaryOp ":"')), $E(_));
+      var UnaryOp$3 = $T($S(Not, $E($EXPECT($L12, 'UnaryOp " "')), $E(_)), function(value) {
         return [value[0], value[2]];
       });
       var UnaryOp$$ = [UnaryOp$0, UnaryOp$1, UnaryOp$2, UnaryOp$3];
@@ -8257,14 +8485,20 @@ ${input.slice(result.pos)}
       function NonPipelinePostfixedExpression(ctx, state) {
         return $EVENT(ctx, state, "NonPipelinePostfixedExpression", NonPipelinePostfixedExpression$0);
       }
-      var PostfixStatement$0 = ForClause;
-      var PostfixStatement$1 = IfClause;
-      var PostfixStatement$2 = LoopClause;
-      var PostfixStatement$3 = UnlessClause;
-      var PostfixStatement$4 = WhileClause;
-      var PostfixStatement$$ = [PostfixStatement$0, PostfixStatement$1, PostfixStatement$2, PostfixStatement$3, PostfixStatement$4];
+      var PostfixStatement$0 = $T($S($EXPECT($R20, "PostfixStatement /(?=for|if|loop|unless|until|while)/"), _PostfixStatement), function(value) {
+        return value[1];
+      });
       function PostfixStatement(ctx, state) {
-        return $EVENT_C(ctx, state, "PostfixStatement", PostfixStatement$$);
+        return $EVENT(ctx, state, "PostfixStatement", PostfixStatement$0);
+      }
+      var _PostfixStatement$0 = ForClause;
+      var _PostfixStatement$1 = IfClause;
+      var _PostfixStatement$2 = LoopClause;
+      var _PostfixStatement$3 = UnlessClause;
+      var _PostfixStatement$4 = WhileClause;
+      var _PostfixStatement$$ = [_PostfixStatement$0, _PostfixStatement$1, _PostfixStatement$2, _PostfixStatement$3, _PostfixStatement$4];
+      function _PostfixStatement(ctx, state) {
+        return $EVENT_C(ctx, state, "_PostfixStatement", _PostfixStatement$$);
       }
       var Statement$0 = KeywordStatement;
       var Statement$1 = VariableStatement;
@@ -8285,7 +8519,7 @@ ${input.slice(result.pos)}
       function Statement(ctx, state) {
         return $EVENT_C(ctx, state, "Statement", Statement$$);
       }
-      var EmptyStatement$0 = $TS($S($E(_), $Y($EXPECT($L100, 'EmptyStatement ";"'))), function($skip, $loc, $0, $1, $2) {
+      var EmptyStatement$0 = $TS($S($E(_), $Y($EXPECT($L99, 'EmptyStatement ";"'))), function($skip, $loc, $0, $1, $2) {
         return { type: "EmptyStatement", children: $1 || [] };
       });
       function EmptyStatement(ctx, state) {
@@ -8307,7 +8541,7 @@ ${input.slice(result.pos)}
         var w = $3;
         return [id, colon, w];
       });
-      var Label$1 = $S($EXPECT($L101, 'Label "$:"'), Whitespace);
+      var Label$1 = $S($EXPECT($L100, 'Label "$:"'), Whitespace);
       var Label$$ = [Label$0, Label$1];
       function Label(ctx, state) {
         return $EVENT_C(ctx, state, "Label", Label$$);
@@ -8480,18 +8714,24 @@ ${input.slice(result.pos)}
       function BlockExpressionPart(ctx, state) {
         return $EVENT(ctx, state, "BlockExpressionPart", BlockExpressionPart$0);
       }
-      var IterationStatement$0 = LoopStatement;
-      var IterationStatement$1 = $T($S($N(CoffeeDoEnabled), DoWhileStatement), function(value) {
+      var IterationStatement$0 = $T($S($EXPECT($R21, "IterationStatement /(?=loop|do|for|until|while)/"), _IterationStatement), function(value) {
         return value[1];
       });
-      var IterationStatement$2 = $T($S($N(CoffeeDoEnabled), DoStatement), function(value) {
+      function IterationStatement(ctx, state) {
+        return $EVENT(ctx, state, "IterationStatement", IterationStatement$0);
+      }
+      var _IterationStatement$0 = LoopStatement;
+      var _IterationStatement$1 = $T($S($N(CoffeeDoEnabled), DoWhileStatement), function(value) {
         return value[1];
       });
-      var IterationStatement$3 = WhileStatement;
-      var IterationStatement$4 = ForStatement;
-      var IterationStatement$$ = [IterationStatement$0, IterationStatement$1, IterationStatement$2, IterationStatement$3, IterationStatement$4];
-      function IterationStatement(ctx, state) {
-        return $EVENT_C(ctx, state, "IterationStatement", IterationStatement$$);
+      var _IterationStatement$2 = $T($S($N(CoffeeDoEnabled), DoStatement), function(value) {
+        return value[1];
+      });
+      var _IterationStatement$3 = WhileStatement;
+      var _IterationStatement$4 = ForStatement;
+      var _IterationStatement$$ = [_IterationStatement$0, _IterationStatement$1, _IterationStatement$2, _IterationStatement$3, _IterationStatement$4];
+      function _IterationStatement(ctx, state) {
+        return $EVENT_C(ctx, state, "_IterationStatement", _IterationStatement$$);
       }
       var IterationExpression$0 = $TS($S($E($S(Async, __)), IterationStatement), function($skip, $loc, $0, $1, $2) {
         var async = $1;
@@ -8606,8 +8846,9 @@ ${input.slice(result.pos)}
         return value[1];
       });
       var ForStatementControl$1 = $TS($S(CoffeeForLoopsEnabled, CoffeeForStatementParameters, $E(WhenCondition)), function($skip, $loc, $0, $1, $2, $3) {
-        if ($3) {
-          const block = "continue;";
+        var condition = $3;
+        if (condition) {
+          const block = "continue";
           $2 = {
             ...$2,
             blockPrefix: [
@@ -8615,8 +8856,8 @@ ${input.slice(result.pos)}
               ["", {
                 type: "IfStatement",
                 then: block,
-                children: ["if (!(", insertTrimmingSpace($3, ""), ")) ", block]
-              }]
+                children: ["if (!(", insertTrimmingSpace(condition, ""), ")) ", block]
+              }, ";"]
             ]
           };
         }
@@ -8655,7 +8896,7 @@ ${input.slice(result.pos)}
           }
           if (declaration.own) {
             const hasPropRef = module.getRef("hasProp");
-            blockPrefix.push(["", "if (!", hasPropRef, "(", exp, ", ", declaration, ")) continue", ";"]);
+            blockPrefix.push(["", ["if (!", hasPropRef, "(", exp, ", ", declaration, ")) continue"], ";"]);
           }
           if (index) {
             blockPrefix.push(["", {
@@ -8826,7 +9067,7 @@ ${input.slice(result.pos)}
           names: binding.names
         };
       });
-      var ForDeclaration$1 = $TS($S(InsertConst, ForBinding, $EXPECT($R10, "ForDeclaration /(?=[\\s\\),])/")), function($skip, $loc, $0, $1, $2, $3) {
+      var ForDeclaration$1 = $TS($S(InsertConst, ForBinding, $EXPECT($R22, "ForDeclaration /(?=[\\s\\),])/")), function($skip, $loc, $0, $1, $2, $3) {
         var c = $1;
         var binding = $2;
         return {
@@ -9052,7 +9293,7 @@ ${input.slice(result.pos)}
       function IgnoreColon(ctx, state) {
         return $EVENT(ctx, state, "IgnoreColon", IgnoreColon$0);
       }
-      var TryStatement$0 = $TS($S(Try, $N($EXPECT($L12, 'TryStatement ":"')), NoPostfixBracedOrEmptyBlock, $E(CatchClause), $E(FinallyClause)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var TryStatement$0 = $TS($S(Try, $N($EXPECT($L11, 'TryStatement ":"')), NoPostfixBracedOrEmptyBlock, $E(CatchClause), $E(FinallyClause)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         var t = $1;
         var b = $3;
         var c = $4;
@@ -9360,7 +9601,7 @@ ${input.slice(result.pos)}
         };
       });
       var KeywordStatement$2 = DebuggerStatement;
-      var KeywordStatement$3 = $T($S(Return, $N($C($EXPECT($L12, 'KeywordStatement ":"'), $EXPECT($L6, 'KeywordStatement "."'), AfterReturnShorthand)), $E(MaybeNestedExpression)), function(value) {
+      var KeywordStatement$3 = $T($S(Return, $N($C($EXPECT($L11, 'KeywordStatement ":"'), $EXPECT($L6, 'KeywordStatement "."'), AfterReturnShorthand)), $E(MaybeNestedExpression)), function(value) {
         var expression = value[2];
         return { "type": "ReturnStatement", "expression": expression, "children": value };
       });
@@ -9381,19 +9622,19 @@ ${input.slice(result.pos)}
       function ThrowStatement(ctx, state) {
         return $EVENT(ctx, state, "ThrowStatement", ThrowStatement$0);
       }
-      var Break$0 = $TS($S($EXPECT($L102, 'Break "break"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Break$0 = $TS($S($EXPECT($L101, 'Break "break"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Break(ctx, state) {
         return $EVENT(ctx, state, "Break", Break$0);
       }
-      var Continue$0 = $TS($S($EXPECT($L103, 'Continue "continue"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Continue$0 = $TS($S($EXPECT($L102, 'Continue "continue"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Continue(ctx, state) {
         return $EVENT(ctx, state, "Continue", Continue$0);
       }
-      var Debugger$0 = $TS($S($EXPECT($L104, 'Debugger "debugger"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Debugger$0 = $TS($S($EXPECT($L103, 'Debugger "debugger"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Debugger(ctx, state) {
@@ -9514,7 +9755,7 @@ ${input.slice(result.pos)}
       function FromClause(ctx, state) {
         return $EVENT(ctx, state, "FromClause", FromClause$0);
       }
-      var ImportAssertion$0 = $S($E(_), $EXPECT($L105, 'ImportAssertion "assert"'), NonIdContinue, $E(_), ObjectLiteral);
+      var ImportAssertion$0 = $S($E(_), $EXPECT($L104, 'ImportAssertion "assert"'), NonIdContinue, $E(_), ObjectLiteral);
       function ImportAssertion(ctx, state) {
         return $EVENT(ctx, state, "ImportAssertion", ImportAssertion$0);
       }
@@ -9562,7 +9803,7 @@ ${input.slice(result.pos)}
         return $EVENT_C(ctx, state, "ImportSpecifier", ImportSpecifier$$);
       }
       var ImportAsToken$0 = $S(__, As);
-      var ImportAsToken$1 = $TS($S(Loc, __, Colon, $E($EXPECT($L11, 'ImportAsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var ImportAsToken$1 = $TS($S(Loc, __, Colon, $E($EXPECT($L12, 'ImportAsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
         var l = $1;
         var ws = $2;
         var c = $3;
@@ -9602,7 +9843,7 @@ ${input.slice(result.pos)}
       function UnprocessedModuleSpecifier(ctx, state) {
         return $EVENT_C(ctx, state, "UnprocessedModuleSpecifier", UnprocessedModuleSpecifier$$);
       }
-      var UnquotedSpecifier$0 = $TV($EXPECT($R11, 'UnquotedSpecifier /[^;"\\s]+/'), function($skip, $loc, $0, $1) {
+      var UnquotedSpecifier$0 = $TV($EXPECT($R23, 'UnquotedSpecifier /[^;"\\s]+/'), function($skip, $loc, $0, $1) {
         var spec = $0;
         return { $loc, token: `"${spec}"` };
       });
@@ -9734,13 +9975,13 @@ ${input.slice(result.pos)}
       function LexicalDeclaration(ctx, state) {
         return $EVENT_C(ctx, state, "LexicalDeclaration", LexicalDeclaration$$);
       }
-      var ConstAssignment$0 = $TV($C($EXPECT($L106, 'ConstAssignment ":="'), $EXPECT($L107, 'ConstAssignment "\u2254"')), function($skip, $loc, $0, $1) {
+      var ConstAssignment$0 = $TV($C($EXPECT($L105, 'ConstAssignment ":="'), $EXPECT($L106, 'ConstAssignment "\u2254"')), function($skip, $loc, $0, $1) {
         return { $loc, token: "=" };
       });
       function ConstAssignment(ctx, state) {
         return $EVENT(ctx, state, "ConstAssignment", ConstAssignment$0);
       }
-      var LetAssignment$0 = $TV($EXPECT($L108, 'LetAssignment ".="'), function($skip, $loc, $0, $1) {
+      var LetAssignment$0 = $TV($EXPECT($L107, 'LetAssignment ".="'), function($skip, $loc, $0, $1) {
         return { $loc, token: "=" };
       });
       function LetAssignment(ctx, state) {
@@ -9808,8 +10049,9 @@ ${input.slice(result.pos)}
       function VariableDeclarationList(ctx, state) {
         return $EVENT(ctx, state, "VariableDeclarationList", VariableDeclarationList$0);
       }
-      var NumericLiteral$0 = $TS($S(NumericLiteralKind), function($skip, $loc, $0, $1) {
-        return { type: "NumericLiteral", $loc, token: $1 };
+      var NumericLiteral$0 = $TS($S($EXPECT($R24, "NumericLiteral /(?=[0-9.])/"), NumericLiteralKind), function($skip, $loc, $0, $1, $2) {
+        var token = $2;
+        return { type: "NumericLiteral", $loc, token };
       });
       function NumericLiteral(ctx, state) {
         return $EVENT(ctx, state, "NumericLiteral", NumericLiteral$0);
@@ -9823,37 +10065,38 @@ ${input.slice(result.pos)}
       function NumericLiteralKind(ctx, state) {
         return $EVENT_C(ctx, state, "NumericLiteralKind", NumericLiteralKind$$);
       }
-      var DecimalBigIntegerLiteral$0 = $R$0($EXPECT($R12, "DecimalBigIntegerLiteral /(?:0|[1-9](?:_[0-9]|[0-9])*)n/"));
+      var DecimalBigIntegerLiteral$0 = $R$0($EXPECT($R25, "DecimalBigIntegerLiteral /(?:0|[1-9](?:_[0-9]|[0-9])*)n/"));
       function DecimalBigIntegerLiteral(ctx, state) {
         return $EVENT(ctx, state, "DecimalBigIntegerLiteral", DecimalBigIntegerLiteral$0);
       }
-      var DecimalLiteral$0 = $TV($TEXT($EXPECT($R13, "DecimalLiteral /(?:0|[1-9](?:_[0-9]|[0-9])*)(?=\\.(?:\\p{ID_Start}|[_$]))/")), function($skip, $loc, $0, $1) {
+      var DecimalLiteral$0 = $TV($TEXT($EXPECT($R26, "DecimalLiteral /(?:0|[1-9](?:_[0-9]|[0-9])*)(?=\\.(?:\\p{ID_Start}|[_$]))/")), function($skip, $loc, $0, $1) {
         return $1 + ".";
       });
-      var DecimalLiteral$1 = $TEXT($S($EXPECT($R14, "DecimalLiteral /(?:0|[1-9](?:_[0-9]|[0-9])*)(?:\\.(?:[0-9](?:_[0-9]|[0-9])*))?/"), $E(ExponentPart)));
-      var DecimalLiteral$2 = $TEXT($S($EXPECT($R15, "DecimalLiteral /(?:\\.[0-9](?:_[0-9]|[0-9])*)/"), $E(ExponentPart)));
+      var DecimalLiteral$1 = $TEXT($S($EXPECT($R27, "DecimalLiteral /(?:0|[1-9](?:_[0-9]|[0-9])*)(?:\\.(?:[0-9](?:_[0-9]|[0-9])*))?/"), $E(ExponentPart)));
+      var DecimalLiteral$2 = $TEXT($S($EXPECT($R28, "DecimalLiteral /(?:\\.[0-9](?:_[0-9]|[0-9])*)/"), $E(ExponentPart)));
       var DecimalLiteral$$ = [DecimalLiteral$0, DecimalLiteral$1, DecimalLiteral$2];
       function DecimalLiteral(ctx, state) {
         return $EVENT_C(ctx, state, "DecimalLiteral", DecimalLiteral$$);
       }
-      var ExponentPart$0 = $R$0($EXPECT($R16, "ExponentPart /(?:[eE][+-]?[0-9]+(?:_[0-9]|[0-9])*)/"));
+      var ExponentPart$0 = $R$0($EXPECT($R29, "ExponentPart /(?:[eE][+-]?[0-9]+(?:_[0-9]|[0-9])*)/"));
       function ExponentPart(ctx, state) {
         return $EVENT(ctx, state, "ExponentPart", ExponentPart$0);
       }
-      var BinaryIntegerLiteral$0 = $R$0($EXPECT($R17, "BinaryIntegerLiteral /0[bB][01](?:[01]|_[01])*n?/"));
+      var BinaryIntegerLiteral$0 = $R$0($EXPECT($R30, "BinaryIntegerLiteral /0[bB][01](?:[01]|_[01])*n?/"));
       function BinaryIntegerLiteral(ctx, state) {
         return $EVENT(ctx, state, "BinaryIntegerLiteral", BinaryIntegerLiteral$0);
       }
-      var OctalIntegerLiteral$0 = $R$0($EXPECT($R18, "OctalIntegerLiteral /0[oO][0-7](?:[0-7]|_[0-7])*n?/"));
+      var OctalIntegerLiteral$0 = $R$0($EXPECT($R31, "OctalIntegerLiteral /0[oO][0-7](?:[0-7]|_[0-7])*n?/"));
       function OctalIntegerLiteral(ctx, state) {
         return $EVENT(ctx, state, "OctalIntegerLiteral", OctalIntegerLiteral$0);
       }
-      var HexIntegerLiteral$0 = $R$0($EXPECT($R19, "HexIntegerLiteral /0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_[0-9a-fA-F])*n?/"));
+      var HexIntegerLiteral$0 = $R$0($EXPECT($R32, "HexIntegerLiteral /0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_[0-9a-fA-F])*n?/"));
       function HexIntegerLiteral(ctx, state) {
         return $EVENT(ctx, state, "HexIntegerLiteral", HexIntegerLiteral$0);
       }
-      var IntegerLiteral$0 = $TS($S(IntegerLiteralKind), function($skip, $loc, $0, $1) {
-        return { $loc, token: $1 };
+      var IntegerLiteral$0 = $TS($S($EXPECT($R33, "IntegerLiteral /(?=[0-9])/"), IntegerLiteralKind), function($skip, $loc, $0, $1, $2) {
+        var token = $2;
+        return { $loc, token };
       });
       function IntegerLiteral(ctx, state) {
         return $EVENT(ctx, state, "IntegerLiteral", IntegerLiteral$0);
@@ -9867,7 +10110,7 @@ ${input.slice(result.pos)}
       function IntegerLiteralKind(ctx, state) {
         return $EVENT_C(ctx, state, "IntegerLiteralKind", IntegerLiteralKind$$);
       }
-      var DecimalIntegerLiteral$0 = $R$0($EXPECT($R20, "DecimalIntegerLiteral /(?:0|[1-9](?:_[0-9]|[0-9])*)/"));
+      var DecimalIntegerLiteral$0 = $R$0($EXPECT($R34, "DecimalIntegerLiteral /(?:0|[1-9](?:_[0-9]|[0-9])*)/"));
       function DecimalIntegerLiteral(ctx, state) {
         return $EVENT(ctx, state, "DecimalIntegerLiteral", DecimalIntegerLiteral$0);
       }
@@ -9891,25 +10134,25 @@ ${input.slice(result.pos)}
       function StringLiteral(ctx, state) {
         return $EVENT_C(ctx, state, "StringLiteral", StringLiteral$$);
       }
-      var DoubleStringCharacters$0 = $TR($EXPECT($R21, 'DoubleStringCharacters /(?:\\\\.|[^"])*/'), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var DoubleStringCharacters$0 = $TR($EXPECT($R35, 'DoubleStringCharacters /(?:\\\\.|[^"])*/'), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       function DoubleStringCharacters(ctx, state) {
         return $EVENT(ctx, state, "DoubleStringCharacters", DoubleStringCharacters$0);
       }
-      var SingleStringCharacters$0 = $TR($EXPECT($R22, "SingleStringCharacters /(?:\\\\.|[^'])*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var SingleStringCharacters$0 = $TR($EXPECT($R36, "SingleStringCharacters /(?:\\\\.|[^'])*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       function SingleStringCharacters(ctx, state) {
         return $EVENT(ctx, state, "SingleStringCharacters", SingleStringCharacters$0);
       }
-      var TripleDoubleStringCharacters$0 = $TR($EXPECT($R23, 'TripleDoubleStringCharacters /(?:"(?!"")|#(?!\\{)|\\\\.|[^#"])+/'), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var TripleDoubleStringCharacters$0 = $TR($EXPECT($R37, 'TripleDoubleStringCharacters /(?:"(?!"")|#(?!\\{)|\\\\.|[^#"])+/'), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       function TripleDoubleStringCharacters(ctx, state) {
         return $EVENT(ctx, state, "TripleDoubleStringCharacters", TripleDoubleStringCharacters$0);
       }
-      var TripleSingleStringCharacters$0 = $TR($EXPECT($R24, "TripleSingleStringCharacters /(?:'(?!'')|\\\\.|[^'])*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var TripleSingleStringCharacters$0 = $TR($EXPECT($R38, "TripleSingleStringCharacters /(?:'(?!'')|\\\\.|[^'])*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       function TripleSingleStringCharacters(ctx, state) {
@@ -9928,7 +10171,7 @@ ${input.slice(result.pos)}
       function CoffeeInterpolatedDoubleQuotedString(ctx, state) {
         return $EVENT(ctx, state, "CoffeeInterpolatedDoubleQuotedString", CoffeeInterpolatedDoubleQuotedString$0);
       }
-      var CoffeeDoubleQuotedStringCharacters$0 = $TR($EXPECT($R25, 'CoffeeDoubleQuotedStringCharacters /(?:\\\\.|#(?!\\{)|[^"#])+/'), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var CoffeeDoubleQuotedStringCharacters$0 = $TR($EXPECT($R39, 'CoffeeDoubleQuotedStringCharacters /(?:\\\\.|#(?!\\{)|[^"#])+/'), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       function CoffeeDoubleQuotedStringCharacters(ctx, state) {
@@ -9948,7 +10191,7 @@ ${input.slice(result.pos)}
       function RegularExpressionClass(ctx, state) {
         return $EVENT(ctx, state, "RegularExpressionClass", RegularExpressionClass$0);
       }
-      var RegularExpressionClassCharacters$0 = $TR($EXPECT($R26, "RegularExpressionClassCharacters /(?:\\\\.|[^\\]])*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var RegularExpressionClassCharacters$0 = $TR($EXPECT($R40, "RegularExpressionClassCharacters /(?:\\\\.|[^\\]])*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       function RegularExpressionClassCharacters(ctx, state) {
@@ -10002,7 +10245,7 @@ ${input.slice(result.pos)}
       var HeregexPart$2 = $T($S(TemplateSubstitution), function(value) {
         return { "type": "Substitution", "children": value[0] };
       });
-      var HeregexPart$3 = $TR($EXPECT($R27, "HeregexPart /(?:\\\\.)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var HeregexPart$3 = $TR($EXPECT($R41, "HeregexPart /(?:\\\\.)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         let token = $0;
         switch ($0[1]) {
           case "\n":
@@ -10020,13 +10263,13 @@ ${input.slice(result.pos)}
       var HeregexPart$4 = $TS($S(HeregexComment), function($skip, $loc, $0, $1) {
         return { $loc, token: "" };
       });
-      var HeregexPart$5 = $TR($EXPECT($R28, "HeregexPart /[\\s]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var HeregexPart$5 = $TR($EXPECT($R42, "HeregexPart /[\\s]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: "" };
       });
-      var HeregexPart$6 = $TR($EXPECT($R29, "HeregexPart /\\/(?!\\/\\/)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var HeregexPart$6 = $TR($EXPECT($R43, "HeregexPart /\\/(?!\\/\\/)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: "\\/" };
       });
-      var HeregexPart$7 = $TR($EXPECT($R30, "HeregexPart /[^[\\/\\s#\\\\]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var HeregexPart$7 = $TR($EXPECT($R44, "HeregexPart /[^[\\/\\s#\\\\]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       var HeregexPart$$ = [HeregexPart$0, HeregexPart$1, HeregexPart$2, HeregexPart$3, HeregexPart$4, HeregexPart$5, HeregexPart$6, HeregexPart$7];
@@ -10039,7 +10282,7 @@ ${input.slice(result.pos)}
       function HeregexComment(ctx, state) {
         return $EVENT_C(ctx, state, "HeregexComment", HeregexComment$$);
       }
-      var RegularExpressionBody$0 = $S($N($R$0($EXPECT($R31, "RegularExpressionBody /[*\\/\\r\\n]/"))), $Q(RegExpPart));
+      var RegularExpressionBody$0 = $S($N($R$0($EXPECT($R45, "RegularExpressionBody /[*\\/\\r\\n]/"))), $Q(RegExpPart));
       function RegularExpressionBody(ctx, state) {
         return $EVENT(ctx, state, "RegularExpressionBody", RegularExpressionBody$0);
       }
@@ -10049,27 +10292,33 @@ ${input.slice(result.pos)}
       function RegExpPart(ctx, state) {
         return $EVENT_C(ctx, state, "RegExpPart", RegExpPart$$);
       }
-      var RegExpCharacter$0 = $R$0($EXPECT($R32, "RegExpCharacter /(?:\\\\.|[^[\\/\\r\\n])+/"));
+      var RegExpCharacter$0 = $R$0($EXPECT($R46, "RegExpCharacter /(?:\\\\.|[^[\\/\\r\\n])+/"));
       function RegExpCharacter(ctx, state) {
         return $EVENT(ctx, state, "RegExpCharacter", RegExpCharacter$0);
       }
-      var RegularExpressionFlags$0 = $R$0($EXPECT($R33, "RegularExpressionFlags /(?:\\p{ID_Continue}|[\\u200C\\u200D$])*/"));
+      var RegularExpressionFlags$0 = $R$0($EXPECT($R47, "RegularExpressionFlags /(?:\\p{ID_Continue}|[\\u200C\\u200D$])*/"));
       function RegularExpressionFlags(ctx, state) {
         return $EVENT(ctx, state, "RegularExpressionFlags", RegularExpressionFlags$0);
       }
-      var TemplateLiteral$0 = $TS($S(TripleTick, $Q($C(TemplateBlockCharacters, TemplateSubstitution)), TripleTick), function($skip, $loc, $0, $1, $2, $3) {
+      var TemplateLiteral$0 = $T($S($EXPECT($R48, "TemplateLiteral /(?=[`'\"])/"), _TemplateLiteral), function(value) {
+        return value[1];
+      });
+      function TemplateLiteral(ctx, state) {
+        return $EVENT(ctx, state, "TemplateLiteral", TemplateLiteral$0);
+      }
+      var _TemplateLiteral$0 = $TS($S(TripleTick, $Q($C(TemplateBlockCharacters, TemplateSubstitution)), TripleTick), function($skip, $loc, $0, $1, $2, $3) {
         return dedentBlockSubstitutions($0, module.config.tab);
       });
-      var TemplateLiteral$1 = $TS($S(Backtick, $Q($C(TemplateCharacters, TemplateSubstitution)), Backtick), function($skip, $loc, $0, $1, $2, $3) {
+      var _TemplateLiteral$1 = $TS($S(Backtick, $Q($C(TemplateCharacters, TemplateSubstitution)), Backtick), function($skip, $loc, $0, $1, $2, $3) {
         return {
           type: "TemplateLiteral",
           children: $0
         };
       });
-      var TemplateLiteral$2 = $TS($S(TripleDoubleQuote, $Q($C(TripleDoubleStringCharacters, CoffeeStringSubstitution)), TripleDoubleQuote), function($skip, $loc, $0, $1, $2, $3) {
+      var _TemplateLiteral$2 = $TS($S(TripleDoubleQuote, $Q($C(TripleDoubleStringCharacters, CoffeeStringSubstitution)), TripleDoubleQuote), function($skip, $loc, $0, $1, $2, $3) {
         return dedentBlockSubstitutions($0, module.config.tab);
       });
-      var TemplateLiteral$3 = $TS($S(TripleSingleQuote, TripleSingleStringCharacters, TripleSingleQuote), function($skip, $loc, $0, $1, $2, $3) {
+      var _TemplateLiteral$3 = $TS($S(TripleSingleQuote, TripleSingleStringCharacters, TripleSingleQuote), function($skip, $loc, $0, $1, $2, $3) {
         var s = $1;
         var str = $2;
         var e = $3;
@@ -10078,37 +10327,37 @@ ${input.slice(result.pos)}
           children: [s, dedentBlockString(str, module.config.tab), e]
         };
       });
-      var TemplateLiteral$4 = CoffeeInterpolatedDoubleQuotedString;
-      var TemplateLiteral$$ = [TemplateLiteral$0, TemplateLiteral$1, TemplateLiteral$2, TemplateLiteral$3, TemplateLiteral$4];
-      function TemplateLiteral(ctx, state) {
-        return $EVENT_C(ctx, state, "TemplateLiteral", TemplateLiteral$$);
+      var _TemplateLiteral$4 = CoffeeInterpolatedDoubleQuotedString;
+      var _TemplateLiteral$$ = [_TemplateLiteral$0, _TemplateLiteral$1, _TemplateLiteral$2, _TemplateLiteral$3, _TemplateLiteral$4];
+      function _TemplateLiteral(ctx, state) {
+        return $EVENT_C(ctx, state, "_TemplateLiteral", _TemplateLiteral$$);
       }
       var TemplateSubstitution$0 = $S(SubstitutionStart, PostfixedExpression, __, CloseBrace);
       function TemplateSubstitution(ctx, state) {
         return $EVENT(ctx, state, "TemplateSubstitution", TemplateSubstitution$0);
       }
-      var TemplateCharacters$0 = $TR($EXPECT($R34, "TemplateCharacters /(?:\\$(?!\\{)|\\\\.|[^$`])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var TemplateCharacters$0 = $TR($EXPECT($R49, "TemplateCharacters /(?:\\$(?!\\{)|\\\\.|[^$`])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       function TemplateCharacters(ctx, state) {
         return $EVENT(ctx, state, "TemplateCharacters", TemplateCharacters$0);
       }
-      var TemplateBlockCharacters$0 = $TR($EXPECT($R35, "TemplateBlockCharacters /(?:\\$(?!\\{)|`(?!``)|\\\\.|[^$`])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var TemplateBlockCharacters$0 = $TR($EXPECT($R50, "TemplateBlockCharacters /(?:\\$(?!\\{)|`(?!``)|\\\\.|[^$`])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       function TemplateBlockCharacters(ctx, state) {
         return $EVENT(ctx, state, "TemplateBlockCharacters", TemplateBlockCharacters$0);
       }
-      var ReservedWord$0 = $S(CoffeeBooleansEnabled, $R$0($EXPECT($R36, "ReservedWord /(?:on|off|yes|no)(?!\\p{ID_Continue})/")));
-      var ReservedWord$1 = $S(CoffeeIsntEnabled, $R$0($EXPECT($R37, "ReservedWord /(?:isnt)(?!\\p{ID_Continue})/")));
-      var ReservedWord$2 = $S(CoffeeForLoopsEnabled, $R$0($EXPECT($R38, "ReservedWord /(?:by)(?!\\p{ID_Continue})/")));
-      var ReservedWord$3 = $S(CoffeeOfEnabled, $R$0($EXPECT($R39, "ReservedWord /(?:of)(?!\\p{ID_Continue})/")));
-      var ReservedWord$4 = $R$0($EXPECT($R40, "ReservedWord /(?:and|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|let|loop|new|not|null|or|private|protected|public|return|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})/"));
+      var ReservedWord$0 = $S($R$0($EXPECT($R51, "ReservedWord /(?:on|off|yes|no)(?!\\p{ID_Continue})/")), CoffeeBooleansEnabled);
+      var ReservedWord$1 = $S($R$0($EXPECT($R52, "ReservedWord /(?:isnt)(?!\\p{ID_Continue})/")), CoffeeIsntEnabled);
+      var ReservedWord$2 = $S($R$0($EXPECT($R53, "ReservedWord /(?:by)(?!\\p{ID_Continue})/")), CoffeeForLoopsEnabled);
+      var ReservedWord$3 = $S($R$0($EXPECT($R54, "ReservedWord /(?:of)(?!\\p{ID_Continue})/")), CoffeeOfEnabled);
+      var ReservedWord$4 = $R$0($EXPECT($R55, "ReservedWord /(?:and|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|let|loop|new|not|null|or|private|protected|public|return|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})/"));
       var ReservedWord$$ = [ReservedWord$0, ReservedWord$1, ReservedWord$2, ReservedWord$3, ReservedWord$4];
       function ReservedWord(ctx, state) {
         return $EVENT_C(ctx, state, "ReservedWord", ReservedWord$$);
       }
-      var Comment$0 = $T($S($EXPECT($R41, "Comment /(?=\\/|#)/"), _Comment), function(value) {
+      var Comment$0 = $T($S($EXPECT($R56, "Comment /(?=\\/|#)/"), _Comment), function(value) {
         return value[1];
       });
       function Comment(ctx, state) {
@@ -10126,7 +10375,7 @@ ${input.slice(result.pos)}
       function SingleLineComment(ctx, state) {
         return $EVENT_C(ctx, state, "SingleLineComment", SingleLineComment$$);
       }
-      var JSSingleLineComment$0 = $TR($EXPECT($R42, "JSSingleLineComment /\\/\\/(?!\\/)[^\\r\\n]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var JSSingleLineComment$0 = $TR($EXPECT($R57, "JSSingleLineComment /\\/\\/(?!\\/)[^\\r\\n]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { type: "Comment", $loc, token: $0 };
       });
       function JSSingleLineComment(ctx, state) {
@@ -10138,30 +10387,30 @@ ${input.slice(result.pos)}
       function MultiLineComment(ctx, state) {
         return $EVENT_C(ctx, state, "MultiLineComment", MultiLineComment$$);
       }
-      var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L109, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L110, 'JSMultiLineComment "*/"')), $EXPECT($R43, "JSMultiLineComment /./"))), $EXPECT($L110, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
+      var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L108, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L109, 'JSMultiLineComment "*/"')), $EXPECT($R58, "JSMultiLineComment /./"))), $EXPECT($L109, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
         return { type: "Comment", $loc, token: $1 };
       });
       function JSMultiLineComment(ctx, state) {
         return $EVENT(ctx, state, "JSMultiLineComment", JSMultiLineComment$0);
       }
-      var CoffeeSingleLineComment$0 = $TR($EXPECT($R44, "CoffeeSingleLineComment /#(?!##(?!#))([^\\r\\n]*)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var CoffeeSingleLineComment$0 = $TR($EXPECT($R59, "CoffeeSingleLineComment /#(?!##(?!#))([^\\r\\n]*)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { type: "Comment", $loc, token: `//${$1}` };
       });
       function CoffeeSingleLineComment(ctx, state) {
         return $EVENT(ctx, state, "CoffeeSingleLineComment", CoffeeSingleLineComment$0);
       }
-      var CoffeeMultiLineComment$0 = $TS($S(CoffeeHereCommentStart, $TEXT($EXPECT($R45, "CoffeeMultiLineComment /[^]*?###/"))), function($skip, $loc, $0, $1, $2) {
+      var CoffeeMultiLineComment$0 = $TS($S(CoffeeHereCommentStart, $TEXT($EXPECT($R60, "CoffeeMultiLineComment /[^]*?###/"))), function($skip, $loc, $0, $1, $2) {
         $2 = $2.slice(0, $2.length - 3).replace(/\*\//g, "* /");
         return { type: "Comment", $loc, token: `/*${$2}*/` };
       });
       function CoffeeMultiLineComment(ctx, state) {
         return $EVENT(ctx, state, "CoffeeMultiLineComment", CoffeeMultiLineComment$0);
       }
-      var CoffeeHereCommentStart$0 = $R$0($EXPECT($R46, "CoffeeHereCommentStart /###(?!#)/"));
+      var CoffeeHereCommentStart$0 = $R$0($EXPECT($R61, "CoffeeHereCommentStart /###(?!#)/"));
       function CoffeeHereCommentStart(ctx, state) {
         return $EVENT(ctx, state, "CoffeeHereCommentStart", CoffeeHereCommentStart$0);
       }
-      var InlineComment$0 = $TR($EXPECT($R47, "InlineComment /\\/\\*(?:(?!\\*\\/)[^\\r\\n])*\\*\\//"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var InlineComment$0 = $TR($EXPECT($R62, "InlineComment /\\/\\*(?:(?!\\*\\/)[^\\r\\n])*\\*\\//"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       function InlineComment(ctx, state) {
@@ -10175,34 +10424,38 @@ ${input.slice(result.pos)}
       function TrailingComment(ctx, state) {
         return $EVENT(ctx, state, "TrailingComment", TrailingComment$0);
       }
-      var _$0 = $T($S($EXPECT($R48, "_ /(?=[ \\t\\/])/"), $P($C(NonNewlineWhitespace, InlineComment))), function(value) {
+      var _$0 = $T($S($EXPECT($R63, "_ /(?=[ \\t\\/\\\\])/"), $P($C(NonNewlineWhitespace, InlineComment))), function(value) {
         return value[1];
       });
       function _(ctx, state) {
         return $EVENT(ctx, state, "_", _$0);
       }
-      var NonNewlineWhitespace$0 = $TR($EXPECT($R49, "NonNewlineWhitespace /[ \\t]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var NonNewlineWhitespace$0 = $TR($EXPECT($R64, "NonNewlineWhitespace /[ \\t]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
-      var NonNewlineWhitespace$1 = $T($S(CoffeeLineContinuationEnabled, $EXPECT($L111, 'NonNewlineWhitespace "\\\\\\\\"'), EOL), function(value) {
-        return "";
+      var NonNewlineWhitespace$1 = $T($S($EXPECT($L110, 'NonNewlineWhitespace "\\\\\\\\"'), CoffeeLineContinuationEnabled, EOL), function(value) {
+        return " ";
       });
       var NonNewlineWhitespace$$ = [NonNewlineWhitespace$0, NonNewlineWhitespace$1];
       function NonNewlineWhitespace(ctx, state) {
         return $EVENT_C(ctx, state, "NonNewlineWhitespace", NonNewlineWhitespace$$);
       }
-      var Trimmed_$0 = $TV($Q(_), function($skip, $loc, $0, $1) {
+      var Trimmed_$0 = $TV($E(_), function($skip, $loc, $0, $1) {
         var ws = $0;
         return insertTrimmingSpace(ws, "");
       });
       function Trimmed_(ctx, state) {
         return $EVENT(ctx, state, "Trimmed_", Trimmed_$0);
       }
-      var __$0 = $Q($C(Whitespace, Comment));
+      var __$0 = $T($S($EXPECT($R65, "__ /(?=\\s|\\/|#)/"), $Q($C(Whitespace, Comment))), function(value) {
+        return value[1];
+      });
+      var __$1 = $EXPECT($L0, '__ ""');
+      var __$$ = [__$0, __$1];
       function __(ctx, state) {
-        return $EVENT(ctx, state, "__", __$0);
+        return $EVENT_C(ctx, state, "__", __$$);
       }
-      var Whitespace$0 = $TR($EXPECT($R28, "Whitespace /[\\s]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var Whitespace$0 = $TR($EXPECT($R42, "Whitespace /[\\s]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       function Whitespace(ctx, state) {
@@ -10218,17 +10471,16 @@ ${input.slice(result.pos)}
       function ExpressionDelimiter(ctx, state) {
         return $EVENT_C(ctx, state, "ExpressionDelimiter", ExpressionDelimiter$$);
       }
-      var SimpleStatementDelimiter$0 = SemicolonDelimiter;
-      var SimpleStatementDelimiter$1 = $Y(EOS);
+      var SimpleStatementDelimiter$0 = $Y(EOS);
+      var SimpleStatementDelimiter$1 = SemicolonDelimiter;
       var SimpleStatementDelimiter$$ = [SimpleStatementDelimiter$0, SimpleStatementDelimiter$1];
       function SimpleStatementDelimiter(ctx, state) {
         return $EVENT_C(ctx, state, "SimpleStatementDelimiter", SimpleStatementDelimiter$$);
       }
-      var StatementDelimiter$0 = SemicolonDelimiter;
-      var StatementDelimiter$1 = $S($Y($S(Nested, $C($EXPECT($L4, 'StatementDelimiter "("'), $EXPECT($L112, 'StatementDelimiter "["'), $EXPECT($L113, 'StatementDelimiter "`"'), $EXPECT($L58, 'StatementDelimiter "+"'), $EXPECT($L18, 'StatementDelimiter "-"'), $EXPECT($L54, 'StatementDelimiter "*"'), $EXPECT($L55, 'StatementDelimiter "/"'), ObjectLiteral, Arrow, FatArrow, $S(Function, $E($S($E(_), Star)), $E(_), $EXPECT($L4, 'StatementDelimiter "("'))))), InsertSemicolon);
-      var StatementDelimiter$2 = $Y(EOS);
-      var StatementDelimiter$3 = $Y($S($Q(_), $C($EXPECT($L25, 'StatementDelimiter "}"'), $EXPECT($L114, 'StatementDelimiter ")"'), $EXPECT($L34, 'StatementDelimiter "]"'))));
-      var StatementDelimiter$$ = [StatementDelimiter$0, StatementDelimiter$1, StatementDelimiter$2, StatementDelimiter$3];
+      var StatementDelimiter$0 = $Y(EOS);
+      var StatementDelimiter$1 = SemicolonDelimiter;
+      var StatementDelimiter$2 = $Y($S($E(_), $C($EXPECT($L25, 'StatementDelimiter "}"'), $EXPECT($L111, 'StatementDelimiter ")"'), $EXPECT($L34, 'StatementDelimiter "]"'))));
+      var StatementDelimiter$$ = [StatementDelimiter$0, StatementDelimiter$1, StatementDelimiter$2];
       function StatementDelimiter(ctx, state) {
         return $EVENT_C(ctx, state, "StatementDelimiter", StatementDelimiter$$);
       }
@@ -10241,7 +10493,7 @@ ${input.slice(result.pos)}
       function SemicolonDelimiter(ctx, state) {
         return $EVENT(ctx, state, "SemicolonDelimiter", SemicolonDelimiter$0);
       }
-      var NonIdContinue$0 = $R$0($EXPECT($R50, "NonIdContinue /(?!\\p{ID_Continue})/"));
+      var NonIdContinue$0 = $R$0($EXPECT($R66, "NonIdContinue /(?!\\p{ID_Continue})/"));
       function NonIdContinue(ctx, state) {
         return $EVENT(ctx, state, "NonIdContinue", NonIdContinue$0);
       }
@@ -10251,73 +10503,73 @@ ${input.slice(result.pos)}
       function Loc(ctx, state) {
         return $EVENT(ctx, state, "Loc", Loc$0);
       }
-      var Abstract$0 = $TV($TEXT($S($EXPECT($L115, 'Abstract "abstract"'), NonIdContinue, $E($EXPECT($L11, 'Abstract " "')))), function($skip, $loc, $0, $1) {
+      var Abstract$0 = $TV($TEXT($S($EXPECT($L112, 'Abstract "abstract"'), NonIdContinue, $E($EXPECT($L12, 'Abstract " "')))), function($skip, $loc, $0, $1) {
         return { $loc, token: $1, ts: true };
       });
       function Abstract(ctx, state) {
         return $EVENT(ctx, state, "Abstract", Abstract$0);
       }
-      var Ampersand$0 = $TV($EXPECT($L98, 'Ampersand "&"'), function($skip, $loc, $0, $1) {
+      var Ampersand$0 = $TV($EXPECT($L97, 'Ampersand "&"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Ampersand(ctx, state) {
         return $EVENT(ctx, state, "Ampersand", Ampersand$0);
       }
-      var As$0 = $TS($S($EXPECT($L116, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var As$0 = $TS($S($EXPECT($L113, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function As(ctx, state) {
         return $EVENT(ctx, state, "As", As$0);
       }
-      var At$0 = $TV($EXPECT($L117, 'At "@"'), function($skip, $loc, $0, $1) {
+      var At$0 = $TV($EXPECT($L114, 'At "@"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function At(ctx, state) {
         return $EVENT(ctx, state, "At", At$0);
       }
-      var AtAt$0 = $TV($EXPECT($L118, 'AtAt "@@"'), function($skip, $loc, $0, $1) {
+      var AtAt$0 = $TV($EXPECT($L115, 'AtAt "@@"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "@" };
       });
       function AtAt(ctx, state) {
         return $EVENT(ctx, state, "AtAt", AtAt$0);
       }
-      var Async$0 = $TS($S($EXPECT($L119, 'Async "async"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Async$0 = $TS($S($EXPECT($L116, 'Async "async"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1, type: "Async" };
       });
       function Async(ctx, state) {
         return $EVENT(ctx, state, "Async", Async$0);
       }
-      var Await$0 = $TS($S($EXPECT($L120, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Await$0 = $TS($S($EXPECT($L117, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1, type: "Await" };
       });
       function Await(ctx, state) {
         return $EVENT(ctx, state, "Await", Await$0);
       }
-      var Backtick$0 = $TV($EXPECT($L113, 'Backtick "`"'), function($skip, $loc, $0, $1) {
+      var Backtick$0 = $TV($EXPECT($L118, 'Backtick "`"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Backtick(ctx, state) {
         return $EVENT(ctx, state, "Backtick", Backtick$0);
       }
-      var By$0 = $TS($S($EXPECT($L121, 'By "by"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var By$0 = $TS($S($EXPECT($L119, 'By "by"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function By(ctx, state) {
         return $EVENT(ctx, state, "By", By$0);
       }
-      var Case$0 = $TS($S($EXPECT($L122, 'Case "case"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Case$0 = $TS($S($EXPECT($L120, 'Case "case"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Case(ctx, state) {
         return $EVENT(ctx, state, "Case", Case$0);
       }
-      var Catch$0 = $TS($S($EXPECT($L123, 'Catch "catch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Catch$0 = $TS($S($EXPECT($L121, 'Catch "catch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Catch(ctx, state) {
         return $EVENT(ctx, state, "Catch", Catch$0);
       }
-      var Class$0 = $TS($S($EXPECT($L124, 'Class "class"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Class$0 = $TS($S($EXPECT($L122, 'Class "class"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Class(ctx, state) {
@@ -10335,19 +10587,19 @@ ${input.slice(result.pos)}
       function CloseBracket(ctx, state) {
         return $EVENT(ctx, state, "CloseBracket", CloseBracket$0);
       }
-      var CloseParen$0 = $TV($EXPECT($L114, 'CloseParen ")"'), function($skip, $loc, $0, $1) {
+      var CloseParen$0 = $TV($EXPECT($L111, 'CloseParen ")"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function CloseParen(ctx, state) {
         return $EVENT(ctx, state, "CloseParen", CloseParen$0);
       }
-      var CoffeeSubstitutionStart$0 = $TV($EXPECT($L125, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
+      var CoffeeSubstitutionStart$0 = $TV($EXPECT($L123, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "${" };
       });
       function CoffeeSubstitutionStart(ctx, state) {
         return $EVENT(ctx, state, "CoffeeSubstitutionStart", CoffeeSubstitutionStart$0);
       }
-      var Colon$0 = $TS($S($EXPECT($L12, 'Colon ":"'), $N($EXPECT($L3, 'Colon "="'))), function($skip, $loc, $0, $1, $2) {
+      var Colon$0 = $TS($S($EXPECT($L11, 'Colon ":"'), $N($EXPECT($L3, 'Colon "="'))), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Colon(ctx, state) {
@@ -10359,31 +10611,31 @@ ${input.slice(result.pos)}
       function Comma(ctx, state) {
         return $EVENT(ctx, state, "Comma", Comma$0);
       }
-      var ConstructorShorthand$0 = $TV($EXPECT($L117, 'ConstructorShorthand "@"'), function($skip, $loc, $0, $1) {
+      var ConstructorShorthand$0 = $TV($EXPECT($L114, 'ConstructorShorthand "@"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "constructor" };
       });
       function ConstructorShorthand(ctx, state) {
         return $EVENT(ctx, state, "ConstructorShorthand", ConstructorShorthand$0);
       }
-      var Declare$0 = $TS($S($EXPECT($L126, 'Declare "declare"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Declare$0 = $TS($S($EXPECT($L124, 'Declare "declare"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Declare(ctx, state) {
         return $EVENT(ctx, state, "Declare", Declare$0);
       }
-      var Default$0 = $TS($S($EXPECT($L127, 'Default "default"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Default$0 = $TS($S($EXPECT($L125, 'Default "default"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Default(ctx, state) {
         return $EVENT(ctx, state, "Default", Default$0);
       }
-      var Delete$0 = $TS($S($EXPECT($L128, 'Delete "delete"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Delete$0 = $TS($S($EXPECT($L126, 'Delete "delete"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Delete(ctx, state) {
         return $EVENT(ctx, state, "Delete", Delete$0);
       }
-      var Do$0 = $TS($S($EXPECT($L129, 'Do "do"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Do$0 = $TS($S($EXPECT($L127, 'Do "do"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Do(ctx, state) {
@@ -10392,7 +10644,7 @@ ${input.slice(result.pos)}
       var Dot$0 = $TV($EXPECT($L6, 'Dot "."'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
-      var Dot$1 = $TS($S($EXPECT($R51, "Dot /['\u2019]s/"), _), function($skip, $loc, $0, $1, $2) {
+      var Dot$1 = $TS($S($EXPECT($R67, "Dot /['\u2019]s/"), _), function($skip, $loc, $0, $1, $2) {
         var ws = $2;
         return [
           { $loc, token: "." },
@@ -10403,45 +10655,45 @@ ${input.slice(result.pos)}
       function Dot(ctx, state) {
         return $EVENT_C(ctx, state, "Dot", Dot$$);
       }
-      var DotDot$0 = $TS($S($EXPECT($L130, 'DotDot ".."'), $N($EXPECT($L6, 'DotDot "."'))), function($skip, $loc, $0, $1, $2) {
+      var DotDot$0 = $TS($S($EXPECT($L128, 'DotDot ".."'), $N($EXPECT($L6, 'DotDot "."'))), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
-      var DotDot$1 = $TV($EXPECT($L131, 'DotDot "\u2025"'), function($skip, $loc, $0, $1) {
+      var DotDot$1 = $TV($EXPECT($L129, 'DotDot "\u2025"'), function($skip, $loc, $0, $1) {
         return { $loc, token: ".." };
       });
       var DotDot$$ = [DotDot$0, DotDot$1];
       function DotDot(ctx, state) {
         return $EVENT_C(ctx, state, "DotDot", DotDot$$);
       }
-      var DotDotDot$0 = $TV($EXPECT($L132, 'DotDotDot "..."'), function($skip, $loc, $0, $1) {
+      var DotDotDot$0 = $TV($EXPECT($L130, 'DotDotDot "..."'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
-      var DotDotDot$1 = $TV($EXPECT($L133, 'DotDotDot "\u2026"'), function($skip, $loc, $0, $1) {
+      var DotDotDot$1 = $TV($EXPECT($L131, 'DotDotDot "\u2026"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "..." };
       });
       var DotDotDot$$ = [DotDotDot$0, DotDotDot$1];
       function DotDotDot(ctx, state) {
         return $EVENT_C(ctx, state, "DotDotDot", DotDotDot$$);
       }
-      var DoubleColon$0 = $TV($EXPECT($L134, 'DoubleColon "::"'), function($skip, $loc, $0, $1) {
+      var DoubleColon$0 = $TV($EXPECT($L132, 'DoubleColon "::"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function DoubleColon(ctx, state) {
         return $EVENT(ctx, state, "DoubleColon", DoubleColon$0);
       }
-      var DoubleQuote$0 = $TV($EXPECT($L135, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
+      var DoubleQuote$0 = $TV($EXPECT($L133, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function DoubleQuote(ctx, state) {
         return $EVENT(ctx, state, "DoubleQuote", DoubleQuote$0);
       }
-      var Each$0 = $TS($S($EXPECT($L136, 'Each "each"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Each$0 = $TS($S($EXPECT($L134, 'Each "each"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Each(ctx, state) {
         return $EVENT(ctx, state, "Each", Each$0);
       }
-      var Else$0 = $TS($S($EXPECT($L137, 'Else "else"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Else$0 = $TS($S($EXPECT($L135, 'Else "else"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Else(ctx, state) {
@@ -10453,85 +10705,85 @@ ${input.slice(result.pos)}
       function Equals(ctx, state) {
         return $EVENT(ctx, state, "Equals", Equals$0);
       }
-      var Export$0 = $TS($S($EXPECT($L138, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Export$0 = $TS($S($EXPECT($L136, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Export(ctx, state) {
         return $EVENT(ctx, state, "Export", Export$0);
       }
-      var Extends$0 = $TS($S($EXPECT($L139, 'Extends "extends"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Extends$0 = $TS($S($EXPECT($L137, 'Extends "extends"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Extends(ctx, state) {
         return $EVENT(ctx, state, "Extends", Extends$0);
       }
-      var Finally$0 = $TS($S($EXPECT($L140, 'Finally "finally"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Finally$0 = $TS($S($EXPECT($L138, 'Finally "finally"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Finally(ctx, state) {
         return $EVENT(ctx, state, "Finally", Finally$0);
       }
-      var For$0 = $TS($S($EXPECT($L141, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var For$0 = $TS($S($EXPECT($L139, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function For(ctx, state) {
         return $EVENT(ctx, state, "For", For$0);
       }
-      var From$0 = $TS($S($EXPECT($L142, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var From$0 = $TS($S($EXPECT($L140, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function From(ctx, state) {
         return $EVENT(ctx, state, "From", From$0);
       }
-      var Function$0 = $TS($S($EXPECT($L143, 'Function "function"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Function$0 = $TS($S($EXPECT($L141, 'Function "function"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Function(ctx, state) {
         return $EVENT(ctx, state, "Function", Function$0);
       }
-      var GetOrSet$0 = $TS($S($C($EXPECT($L144, 'GetOrSet "get"'), $EXPECT($L145, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var GetOrSet$0 = $TS($S($C($EXPECT($L142, 'GetOrSet "get"'), $EXPECT($L143, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1, type: "GetOrSet" };
       });
       function GetOrSet(ctx, state) {
         return $EVENT(ctx, state, "GetOrSet", GetOrSet$0);
       }
-      var Hash$0 = $TV($EXPECT($L146, 'Hash "#"'), function($skip, $loc, $0, $1) {
+      var Hash$0 = $TV($EXPECT($L144, 'Hash "#"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Hash(ctx, state) {
         return $EVENT(ctx, state, "Hash", Hash$0);
       }
-      var If$0 = $TV($TEXT($S($EXPECT($L147, 'If "if"'), NonIdContinue, $E($EXPECT($L11, 'If " "')))), function($skip, $loc, $0, $1) {
+      var If$0 = $TV($TEXT($S($EXPECT($L145, 'If "if"'), NonIdContinue, $E($EXPECT($L12, 'If " "')))), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function If(ctx, state) {
         return $EVENT(ctx, state, "If", If$0);
       }
-      var Import$0 = $TS($S($EXPECT($L15, 'Import "import"'), $Y($EXPECT($R52, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
+      var Import$0 = $TS($S($EXPECT($L15, 'Import "import"'), $Y($EXPECT($R68, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Import(ctx, state) {
         return $EVENT(ctx, state, "Import", Import$0);
       }
-      var In$0 = $TS($S($EXPECT($L148, 'In "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var In$0 = $TS($S($EXPECT($L146, 'In "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function In(ctx, state) {
         return $EVENT(ctx, state, "In", In$0);
       }
-      var LetOrConst$0 = $TS($S($C($EXPECT($L149, 'LetOrConst "let"'), $EXPECT($L150, 'LetOrConst "const"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var LetOrConst$0 = $TS($S($C($EXPECT($L147, 'LetOrConst "let"'), $EXPECT($L148, 'LetOrConst "const"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function LetOrConst(ctx, state) {
         return $EVENT(ctx, state, "LetOrConst", LetOrConst$0);
       }
-      var Const$0 = $TS($S($EXPECT($L150, 'Const "const"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Const$0 = $TS($S($EXPECT($L148, 'Const "const"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Const(ctx, state) {
         return $EVENT(ctx, state, "Const", Const$0);
       }
-      var Is$0 = $TS($S($EXPECT($L151, 'Is "is"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Is$0 = $TS($S($EXPECT($L149, 'Is "is"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Is(ctx, state) {
@@ -10543,31 +10795,31 @@ ${input.slice(result.pos)}
       function LetOrConstOrVar(ctx, state) {
         return $EVENT_C(ctx, state, "LetOrConstOrVar", LetOrConstOrVar$$);
       }
-      var Loop$0 = $TS($S($EXPECT($L152, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Loop$0 = $TS($S($EXPECT($L150, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "while(true)" };
       });
       function Loop(ctx, state) {
         return $EVENT(ctx, state, "Loop", Loop$0);
       }
-      var New$0 = $TS($S($EXPECT($L153, 'New "new"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var New$0 = $TS($S($EXPECT($L151, 'New "new"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function New(ctx, state) {
         return $EVENT(ctx, state, "New", New$0);
       }
-      var Not$0 = $TS($S($EXPECT($L154, 'Not "not"'), NonIdContinue, $N($S($E(_), $EXPECT($L12, 'Not ":"')))), function($skip, $loc, $0, $1, $2, $3) {
+      var Not$0 = $TS($S($EXPECT($L152, 'Not "not"'), NonIdContinue, $N($S($E(_), $EXPECT($L11, 'Not ":"')))), function($skip, $loc, $0, $1, $2, $3) {
         return { $loc, token: "!" };
       });
       function Not(ctx, state) {
         return $EVENT(ctx, state, "Not", Not$0);
       }
-      var Of$0 = $TS($S($EXPECT($L84, 'Of "of"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Of$0 = $TS($S($EXPECT($L153, 'Of "of"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Of(ctx, state) {
         return $EVENT(ctx, state, "Of", Of$0);
       }
-      var OpenAngleBracket$0 = $TV($EXPECT($L155, 'OpenAngleBracket "<"'), function($skip, $loc, $0, $1) {
+      var OpenAngleBracket$0 = $TV($EXPECT($L154, 'OpenAngleBracket "<"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function OpenAngleBracket(ctx, state) {
@@ -10579,7 +10831,7 @@ ${input.slice(result.pos)}
       function OpenBrace(ctx, state) {
         return $EVENT(ctx, state, "OpenBrace", OpenBrace$0);
       }
-      var OpenBracket$0 = $TV($EXPECT($L112, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
+      var OpenBracket$0 = $TV($EXPECT($L155, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function OpenBracket(ctx, state) {
@@ -10658,7 +10910,7 @@ ${input.slice(result.pos)}
       function Satisfies(ctx, state) {
         return $EVENT(ctx, state, "Satisfies", Satisfies$0);
       }
-      var Semicolon$0 = $TV($EXPECT($L100, 'Semicolon ";"'), function($skip, $loc, $0, $1) {
+      var Semicolon$0 = $TV($EXPECT($L99, 'Semicolon ";"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Semicolon(ctx, state) {
@@ -10679,7 +10931,7 @@ ${input.slice(result.pos)}
       var Static$0 = $TS($S($EXPECT($L171, 'Static "static"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
-      var Static$1 = $TS($S($EXPECT($L117, 'Static "@"'), $N($C($EXPECT($L4, 'Static "("'), $EXPECT($L117, 'Static "@"')))), function($skip, $loc, $0, $1, $2) {
+      var Static$1 = $TS($S($EXPECT($L114, 'Static "@"'), $N($C($EXPECT($L4, 'Static "("'), $EXPECT($L114, 'Static "@"')))), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "static " };
       });
       var Static$$ = [Static$0, Static$1];
@@ -10835,12 +11087,18 @@ ${input.slice(result.pos)}
       function JSXImplicitFragment(ctx, state) {
         return $EVENT(ctx, state, "JSXImplicitFragment", JSXImplicitFragment$0);
       }
-      var JSXTag$0 = JSXElement;
-      var JSXTag$1 = JSXFragment;
-      var JSXTag$2 = JSXComment;
-      var JSXTag$$ = [JSXTag$0, JSXTag$1, JSXTag$2];
+      var JSXTag$0 = $T($S($EXPECT($R69, "JSXTag /(?=[<])/"), _JSXTag), function(value) {
+        return value[1];
+      });
       function JSXTag(ctx, state) {
-        return $EVENT_C(ctx, state, "JSXTag", JSXTag$$);
+        return $EVENT(ctx, state, "JSXTag", JSXTag$0);
+      }
+      var _JSXTag$0 = JSXElement;
+      var _JSXTag$1 = JSXFragment;
+      var _JSXTag$2 = JSXComment;
+      var _JSXTag$$ = [_JSXTag$0, _JSXTag$1, _JSXTag$2];
+      function _JSXTag(ctx, state) {
+        return $EVENT_C(ctx, state, "_JSXTag", _JSXTag$$);
       }
       var JSXElement$0 = JSXSelfClosingElement;
       var JSXElement$1 = $TS($S($N(CoffeeJSXEnabled), PushJSXOpeningElement, $E(JSXMixedChildren), JSXOptionalClosingElement, PopJSXStack), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
@@ -10879,7 +11137,7 @@ ${input.slice(result.pos)}
       function JSXElement(ctx, state) {
         return $EVENT_C(ctx, state, "JSXElement", JSXElement$$);
       }
-      var JSXSelfClosingElement$0 = $TS($S($EXPECT($L155, 'JSXSelfClosingElement "<"'), JSXElementName, $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L193, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+      var JSXSelfClosingElement$0 = $TS($S($EXPECT($L154, 'JSXSelfClosingElement "<"'), JSXElementName, $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L193, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
         return { type: "JSXElement", children: $0, tag: $2 };
       });
       function JSXSelfClosingElement(ctx, state) {
@@ -10898,7 +11156,7 @@ ${input.slice(result.pos)}
       function PopJSXStack(ctx, state) {
         return $EVENT(ctx, state, "PopJSXStack", PopJSXStack$0);
       }
-      var JSXOpeningElement$0 = $S($EXPECT($L155, 'JSXOpeningElement "<"'), JSXElementName, $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L33, 'JSXOpeningElement ">"'));
+      var JSXOpeningElement$0 = $S($EXPECT($L154, 'JSXOpeningElement "<"'), JSXElementName, $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L33, 'JSXOpeningElement ">"'));
       function JSXOpeningElement(ctx, state) {
         return $EVENT(ctx, state, "JSXOpeningElement", JSXOpeningElement$0);
       }
@@ -10968,7 +11226,7 @@ ${input.slice(result.pos)}
       function JSXClosingFragment(ctx, state) {
         return $EVENT(ctx, state, "JSXClosingFragment", JSXClosingFragment$0);
       }
-      var JSXElementName$0 = $TV($Y($S($C($EXPECT($L146, 'JSXElementName "#"'), Dot), JSXShorthandString)), function($skip, $loc, $0, $1) {
+      var JSXElementName$0 = $TV($Y($S($C($EXPECT($L144, 'JSXElementName "#"'), Dot), JSXShorthandString)), function($skip, $loc, $0, $1) {
         return module.config.defaultElement;
       });
       var JSXElementName$1 = $TEXT($S(JSXIdentifierName, $C($S(Colon, JSXIdentifierName), $Q($S(Dot, JSXIdentifierName)))));
@@ -10976,7 +11234,7 @@ ${input.slice(result.pos)}
       function JSXElementName(ctx, state) {
         return $EVENT_C(ctx, state, "JSXElementName", JSXElementName$$);
       }
-      var JSXIdentifierName$0 = $R$0($EXPECT($R53, "JSXIdentifierName /(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*/"));
+      var JSXIdentifierName$0 = $R$0($EXPECT($R70, "JSXIdentifierName /(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*/"));
       function JSXIdentifierName(ctx, state) {
         return $EVENT(ctx, state, "JSXIdentifierName", JSXIdentifierName$0);
       }
@@ -11140,7 +11398,7 @@ ${input.slice(result.pos)}
         }
         return $skip;
       });
-      var JSXAttribute$5 = $TS($S($EXPECT($L146, 'JSXAttribute "#"'), JSXShorthandString), function($skip, $loc, $0, $1, $2) {
+      var JSXAttribute$5 = $TS($S($EXPECT($L144, 'JSXAttribute "#"'), JSXShorthandString), function($skip, $loc, $0, $1, $2) {
         return [" ", "id=", $2];
       });
       var JSXAttribute$6 = $TS($S(Dot, JSXShorthandString), function($skip, $loc, $0, $1, $2) {
@@ -11149,7 +11407,7 @@ ${input.slice(result.pos)}
           class: $2
         };
       });
-      var JSXAttribute$7 = $TS($S($TEXT($EXPECT($R6, "JSXAttribute /[!+-]/")), JSXAttributeName, $Y(JSXAttributeSpace)), function($skip, $loc, $0, $1, $2, $3) {
+      var JSXAttribute$7 = $TS($S($TEXT($EXPECT($R15, "JSXAttribute /[!+-]/")), JSXAttributeName, $Y(JSXAttributeSpace)), function($skip, $loc, $0, $1, $2, $3) {
         var toggle = $1;
         var id = $2;
         const value = toggle === "+" ? "true" : "false";
@@ -11159,11 +11417,11 @@ ${input.slice(result.pos)}
       function JSXAttribute(ctx, state) {
         return $EVENT_C(ctx, state, "JSXAttribute", JSXAttribute$$);
       }
-      var JSXAttributeSpace$0 = $R$0($EXPECT($R54, "JSXAttributeSpace /[\\s>]|\\/>/"));
+      var JSXAttributeSpace$0 = $R$0($EXPECT($R71, "JSXAttributeSpace /[\\s>]|\\/>/"));
       function JSXAttributeSpace(ctx, state) {
         return $EVENT(ctx, state, "JSXAttributeSpace", JSXAttributeSpace$0);
       }
-      var JSXShorthandString$0 = $TR($EXPECT($R55, "JSXShorthandString /(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var JSXShorthandString$0 = $TR($EXPECT($R72, "JSXShorthandString /(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return quoteString($0);
       });
       var JSXShorthandString$1 = $TS($S(TemplateLiteral), function($skip, $loc, $0, $1) {
@@ -11197,7 +11455,7 @@ ${input.slice(result.pos)}
         }
         return [open, value, close];
       });
-      var JSXAttributeValue$4 = $R$0($EXPECT($R56, `JSXAttributeValue /"[^"]*"|'[^']*'/`));
+      var JSXAttributeValue$4 = $R$0($EXPECT($R73, `JSXAttributeValue /"[^"]*"|'[^']*'/`));
       var JSXAttributeValue$$ = [JSXAttributeValue$0, JSXAttributeValue$1, JSXAttributeValue$2, JSXAttributeValue$3, JSXAttributeValue$4];
       function JSXAttributeValue(ctx, state) {
         return $EVENT_C(ctx, state, "JSXAttributeValue", JSXAttributeValue$$);
@@ -11210,7 +11468,7 @@ ${input.slice(result.pos)}
       function InlineJSXAttributeValue(ctx, state) {
         return $EVENT(ctx, state, "InlineJSXAttributeValue", InlineJSXAttributeValue$0);
       }
-      var InlineJSXBinaryOpRHS$0 = $TS($S($N($EXPECT($R57, "InlineJSXBinaryOpRHS /[<>]/")), BinaryOp, InlineJSXUnaryExpression), function($skip, $loc, $0, $1, $2, $3) {
+      var InlineJSXBinaryOpRHS$0 = $TS($S($N($EXPECT($R74, "InlineJSXBinaryOpRHS /[<>]/")), BinaryOp, InlineJSXUnaryExpression), function($skip, $loc, $0, $1, $2, $3) {
         var op = $2;
         var rhs = $3;
         return [[], op, [], rhs];
@@ -11227,7 +11485,7 @@ ${input.slice(result.pos)}
       function InlineJSXUnaryExpression(ctx, state) {
         return $EVENT(ctx, state, "InlineJSXUnaryExpression", InlineJSXUnaryExpression$0);
       }
-      var InlineJSXUnaryOp$0 = $TR($EXPECT($R58, "InlineJSXUnaryOp /[!~+-](?!\\s|[!~+-]*&)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var InlineJSXUnaryOp$0 = $TR($EXPECT($R75, "InlineJSXUnaryOp /[!~+-](?!\\s|[!~+-]*&)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       function InlineJSXUnaryOp(ctx, state) {
@@ -11294,7 +11552,7 @@ ${input.slice(result.pos)}
         }
         return $1;
       });
-      var InlineJSXCallExpressionRest$2 = $TS($S($E($C(OptionalShorthand, NonNullAssertion)), ExplicitArguments), function($skip, $loc, $0, $1, $2) {
+      var InlineJSXCallExpressionRest$2 = $TS($S($E(OptionalShorthand), ExplicitArguments), function($skip, $loc, $0, $1, $2) {
         var args = $2;
         args = { type: "Call", children: args };
         if (!$1)
@@ -11318,7 +11576,7 @@ ${input.slice(result.pos)}
       function InlineJSXMemberExpression(ctx, state) {
         return $EVENT(ctx, state, "InlineJSXMemberExpression", InlineJSXMemberExpression$0);
       }
-      var InlineJSXMemberExpressionRest$0 = $TS($S($E($C(OptionalShorthand, NonNullAssertion)), MemberBracketContent), function($skip, $loc, $0, $1, $2) {
+      var InlineJSXMemberExpressionRest$0 = $TS($S($E(OptionalShorthand), MemberBracketContent), function($skip, $loc, $0, $1, $2) {
         if ($1) {
           if ($1.type === "Optional" && $2.type === "SliceExpression") {
             return [$1.children[0], $2];
@@ -11439,13 +11697,13 @@ ${input.slice(result.pos)}
       function JSXComment(ctx, state) {
         return $EVENT(ctx, state, "JSXComment", JSXComment$0);
       }
-      var JSXCommentContent$0 = $TR($EXPECT($R59, "JSXCommentContent /(?:-[^-]|[^-]*)*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var JSXCommentContent$0 = $TR($EXPECT($R76, "JSXCommentContent /(?:-[^-]|[^-]*)*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0.replace(/\*\//g, "* /") };
       });
       function JSXCommentContent(ctx, state) {
         return $EVENT(ctx, state, "JSXCommentContent", JSXCommentContent$0);
       }
-      var JSXText$0 = $TR($EXPECT($R60, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var JSXText$0 = $TR($EXPECT($R77, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return {
           type: "JSXText",
           token: $0,
@@ -11810,7 +12068,7 @@ ${input.slice(result.pos)}
       function TypeProperty(ctx, state) {
         return $EVENT(ctx, state, "TypeProperty", TypeProperty$0);
       }
-      var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R61, "TypeIndexSignature /[+-]?/")), Readonly, NotDedented)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R62, "TypeIndexSignature /[+-]/")), $Y($S($E(_), QuestionMark)))));
+      var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R78, "TypeIndexSignature /[+-]?/")), Readonly, NotDedented)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R79, "TypeIndexSignature /[+-]/")), $Y($S($E(_), QuestionMark)))));
       function TypeIndexSignature(ctx, state) {
         return $EVENT(ctx, state, "TypeIndexSignature", TypeIndexSignature$0);
       }
@@ -11861,7 +12119,7 @@ ${input.slice(result.pos)}
       function ReturnType(ctx, state) {
         return $EVENT(ctx, state, "ReturnType", ReturnType$0);
       }
-      var TypePredicate$0 = $TS($S(Type, $E($S(__, $EXPECT($L151, 'TypePredicate "is"'), NonIdContinue, Type))), function($skip, $loc, $0, $1, $2) {
+      var TypePredicate$0 = $TS($S(Type, $E($S(__, $EXPECT($L149, 'TypePredicate "is"'), NonIdContinue, Type))), function($skip, $loc, $0, $1, $2) {
         var lhs = $1;
         var rhs = $2;
         if (!rhs)
@@ -12023,7 +12281,7 @@ ${input.slice(result.pos)}
       function NestedType(ctx, state) {
         return $EVENT(ctx, state, "NestedType", NestedType$0);
       }
-      var TypeConditional$0 = $TS($S(TypeBinary, $E($S(__, $EXPECT($L139, 'TypeConditional "extends"'), NonIdContinue, Type, $E($S(__, QuestionMark, Type, __, Colon, Type))))), function($skip, $loc, $0, $1, $2) {
+      var TypeConditional$0 = $TS($S(TypeBinary, $E($S(__, $EXPECT($L137, 'TypeConditional "extends"'), NonIdContinue, Type, $E($S(__, QuestionMark, Type, __, Colon, Type))))), function($skip, $loc, $0, $1, $2) {
         if ($2)
           return $0;
         return $1;
@@ -12083,16 +12341,16 @@ ${input.slice(result.pos)}
       var InlineInterfacePropertyDelimiter$1 = $T($S($Y($S($C(IndentedFurther, $E(_)), InlineBasicInterfaceProperty)), InsertComma), function(value) {
         return value[1];
       });
-      var InlineInterfacePropertyDelimiter$2 = $Y($S(__, $C($EXPECT($L12, 'InlineInterfacePropertyDelimiter ":"'), $EXPECT($L114, 'InlineInterfacePropertyDelimiter ")"'), $EXPECT($L34, 'InlineInterfacePropertyDelimiter "]"'), $EXPECT($L25, 'InlineInterfacePropertyDelimiter "}"'))));
+      var InlineInterfacePropertyDelimiter$2 = $Y($S(__, $C($EXPECT($L11, 'InlineInterfacePropertyDelimiter ":"'), $EXPECT($L111, 'InlineInterfacePropertyDelimiter ")"'), $EXPECT($L34, 'InlineInterfacePropertyDelimiter "]"'), $EXPECT($L25, 'InlineInterfacePropertyDelimiter "}"'))));
       var InlineInterfacePropertyDelimiter$3 = $Y(EOS);
       var InlineInterfacePropertyDelimiter$$ = [InlineInterfacePropertyDelimiter$0, InlineInterfacePropertyDelimiter$1, InlineInterfacePropertyDelimiter$2, InlineInterfacePropertyDelimiter$3];
       function InlineInterfacePropertyDelimiter(ctx, state) {
         return $EVENT_C(ctx, state, "InlineInterfacePropertyDelimiter", InlineInterfacePropertyDelimiter$$);
       }
-      var TypeBinaryOp$0 = $TV($EXPECT($L99, 'TypeBinaryOp "|"'), function($skip, $loc, $0, $1) {
+      var TypeBinaryOp$0 = $TV($EXPECT($L98, 'TypeBinaryOp "|"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "|" };
       });
-      var TypeBinaryOp$1 = $TV($EXPECT($L98, 'TypeBinaryOp "&"'), function($skip, $loc, $0, $1) {
+      var TypeBinaryOp$1 = $TV($EXPECT($L97, 'TypeBinaryOp "&"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "&" };
       });
       var TypeBinaryOp$$ = [TypeBinaryOp$0, TypeBinaryOp$1];
@@ -12115,7 +12373,7 @@ ${input.slice(result.pos)}
       function TypeArrowFunction(ctx, state) {
         return $EVENT(ctx, state, "TypeArrowFunction", TypeArrowFunction$0);
       }
-      var TypeArguments$0 = $TS($S($EXPECT($L155, 'TypeArguments "<"'), $P(TypeArgument), __, $EXPECT($L33, 'TypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var TypeArguments$0 = $TS($S($EXPECT($L154, 'TypeArguments "<"'), $P(TypeArgument), __, $EXPECT($L33, 'TypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4) {
         var args = $2;
         return { ts: true, types: args.map(([, t]) => t), children: $0 };
       });
@@ -12130,7 +12388,7 @@ ${input.slice(result.pos)}
       function TypeArgumentDelimiter(ctx, state) {
         return $EVENT(ctx, state, "TypeArgumentDelimiter", TypeArgumentDelimiter$0);
       }
-      var TypeParameters$0 = $TS($S($E(_), $EXPECT($L155, 'TypeParameters "<"'), $P(TypeParameter), __, $EXPECT($L33, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var TypeParameters$0 = $TS($S($E(_), $EXPECT($L154, 'TypeParameters "<"'), $P(TypeParameter), __, $EXPECT($L33, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         var parameters = $3;
         return {
           type: "TypeParameters",
@@ -12142,11 +12400,11 @@ ${input.slice(result.pos)}
       function TypeParameters(ctx, state) {
         return $EVENT(ctx, state, "TypeParameters", TypeParameters$0);
       }
-      var TypeParameter$0 = $S(__, $E($S($EXPECT($L150, 'TypeParameter "const"'), $E(_))), Identifier, $E(TypeConstraint), $E(TypeInitializer), TypeParameterDelimiter);
+      var TypeParameter$0 = $S(__, $E($S($EXPECT($L148, 'TypeParameter "const"'), $E(_))), Identifier, $E(TypeConstraint), $E(TypeInitializer), TypeParameterDelimiter);
       function TypeParameter(ctx, state) {
         return $EVENT(ctx, state, "TypeParameter", TypeParameter$0);
       }
-      var TypeConstraint$0 = $S(__, $EXPECT($L139, 'TypeConstraint "extends"'), NonIdContinue, Type);
+      var TypeConstraint$0 = $S(__, $EXPECT($L137, 'TypeConstraint "extends"'), NonIdContinue, Type);
       function TypeConstraint(ctx, state) {
         return $EVENT(ctx, state, "TypeConstraint", TypeConstraint$0);
       }
@@ -12154,7 +12412,7 @@ ${input.slice(result.pos)}
       function TypeInitializer(ctx, state) {
         return $EVENT(ctx, state, "TypeInitializer", TypeInitializer$0);
       }
-      var TypeParameterDelimiter$0 = $S($Q(_), Comma);
+      var TypeParameterDelimiter$0 = $S($E(_), Comma);
       var TypeParameterDelimiter$1 = $Y($S(__, $EXPECT($L33, 'TypeParameterDelimiter ">"')));
       var TypeParameterDelimiter$2 = $T($S($Y(EOS), InsertComma), function(value) {
         return value[1];
@@ -12169,15 +12427,15 @@ ${input.slice(result.pos)}
       function ThisType(ctx, state) {
         return $EVENT(ctx, state, "ThisType", ThisType$0);
       }
-      var Shebang$0 = $S($R$0($EXPECT($R63, "Shebang /#![^\\r\\n]*/")), EOL);
+      var Shebang$0 = $S($R$0($EXPECT($R80, "Shebang /#![^\\r\\n]*/")), EOL);
       function Shebang(ctx, state) {
         return $EVENT(ctx, state, "Shebang", Shebang$0);
       }
-      var CivetPrologue$0 = $T($S($EXPECT($R64, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, SimpleStatementDelimiter, $E(EOS)), function(value) {
+      var CivetPrologue$0 = $T($S($EXPECT($R81, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, SimpleStatementDelimiter, $E(EOS)), function(value) {
         var content = value[2];
         return content;
       });
-      var CivetPrologue$1 = $T($S($EXPECT($R64, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, SimpleStatementDelimiter, $E(EOS)), function(value) {
+      var CivetPrologue$1 = $T($S($EXPECT($R81, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, SimpleStatementDelimiter, $E(EOS)), function(value) {
         var content = value[2];
         return content;
       });
@@ -12185,7 +12443,7 @@ ${input.slice(result.pos)}
       function CivetPrologue(ctx, state) {
         return $EVENT_C(ctx, state, "CivetPrologue", CivetPrologue$$);
       }
-      var CivetPrologueContent$0 = $TS($S($EXPECT($L210, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R65, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var CivetPrologueContent$0 = $TS($S($EXPECT($L210, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R82, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
         var options = $3;
         return {
           type: "CivetPrologue",
@@ -12196,7 +12454,7 @@ ${input.slice(result.pos)}
       function CivetPrologueContent(ctx, state) {
         return $EVENT(ctx, state, "CivetPrologueContent", CivetPrologueContent$0);
       }
-      var CivetOption$0 = $TR($EXPECT($R66, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var CivetOption$0 = $TR($EXPECT($R83, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         const optionName = $2.replace(/-+([a-z]?)/g, (_2, l) => {
           if (l)
             return l.toUpperCase();
@@ -12213,11 +12471,11 @@ ${input.slice(result.pos)}
       function CivetOption(ctx, state) {
         return $EVENT(ctx, state, "CivetOption", CivetOption$0);
       }
-      var UnknownPrologue$0 = $S($R$0($EXPECT($R64, "UnknownPrologue /[\\t ]*/")), StringLiteral, $TEXT(SimpleStatementDelimiter), EOS);
+      var UnknownPrologue$0 = $S($R$0($EXPECT($R81, "UnknownPrologue /[\\t ]*/")), StringLiteral, $TEXT(SimpleStatementDelimiter), EOS);
       function UnknownPrologue(ctx, state) {
         return $EVENT(ctx, state, "UnknownPrologue", UnknownPrologue$0);
       }
-      var TripleSlashDirective$0 = $S($R$0($EXPECT($R67, "TripleSlashDirective /\\/\\/\\/[^\\r\\n]*/")), $E(EOS));
+      var TripleSlashDirective$0 = $S($R$0($EXPECT($R84, "TripleSlashDirective /\\/\\/\\/[^\\r\\n]*/")), $E(EOS));
       function TripleSlashDirective(ctx, state) {
         return $EVENT(ctx, state, "TripleSlashDirective", TripleSlashDirective$0);
       }
@@ -12231,13 +12489,13 @@ ${input.slice(result.pos)}
       function PrologueString(ctx, state) {
         return $EVENT_C(ctx, state, "PrologueString", PrologueString$$);
       }
-      var EOS$0 = $T($S($EXPECT($R68, "EOS /(?=[ \\t\\r\\n\\/#]|$)/"), $P(RestOfLine)), function(value) {
+      var EOS$0 = $T($S($EXPECT($R85, "EOS /(?=[ \\t\\r\\n\\/#]|$)/"), $P(RestOfLine)), function(value) {
         return value[1];
       });
       function EOS(ctx, state) {
         return $EVENT(ctx, state, "EOS", EOS$0);
       }
-      var EOL$0 = $TR($EXPECT($R69, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var EOL$0 = $TR($EXPECT($R86, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       function EOL(ctx, state) {
@@ -12731,7 +12989,7 @@ ${input.slice(result.pos)}
       function Init(ctx, state) {
         return $EVENT(ctx, state, "Init", Init$0);
       }
-      var Indent$0 = $TR($EXPECT($R70, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var Indent$0 = $TR($EXPECT($R87, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         const level = getIndentLevel($0, module.config.tab);
         return {
           $loc,
@@ -12853,6 +13111,7 @@ ${input.slice(result.pos)}
       exports.NestedNonAssignmentExtendedExpression = NestedNonAssignmentExtendedExpression;
       exports.ExpressionizedStatementWithTrailingCallExpressions = ExpressionizedStatementWithTrailingCallExpressions;
       exports.ExpressionizedStatement = ExpressionizedStatement;
+      exports._ExpressionizedStatement = _ExpressionizedStatement;
       exports.Expression = Expression;
       exports.Arguments = Arguments;
       exports.ImplicitArguments = ImplicitArguments;
@@ -12944,6 +13203,7 @@ ${input.slice(result.pos)}
       exports.MemberBracketContent = MemberBracketContent;
       exports.SliceParameters = SliceParameters;
       exports.AccessStart = AccessStart;
+      exports.PropertyAccessModifier = PropertyAccessModifier;
       exports.PropertyAccess = PropertyAccess;
       exports.PropertyGlob = PropertyGlob;
       exports.PropertyBind = PropertyBind;
@@ -13014,12 +13274,14 @@ ${input.slice(result.pos)}
       exports.LiteralContent = LiteralContent;
       exports.NullLiteral = NullLiteral;
       exports.BooleanLiteral = BooleanLiteral;
+      exports._BooleanLiteral = _BooleanLiteral;
       exports.CoffeeScriptBooleanLiteral = CoffeeScriptBooleanLiteral;
       exports.Identifier = Identifier;
       exports.IdentifierName = IdentifierName;
       exports.IdentifierReference = IdentifierReference;
       exports.UpcomingAssignment = UpcomingAssignment;
       exports.ArrayLiteral = ArrayLiteral;
+      exports._ArrayLiteral = _ArrayLiteral;
       exports.RangeExpression = RangeExpression;
       exports.ArrayLiteralContent = ArrayLiteralContent;
       exports.NestedElementList = NestedElementList;
@@ -13060,7 +13322,10 @@ ${input.slice(result.pos)}
       exports.NotDedentedBinaryOp = NotDedentedBinaryOp;
       exports.IdentifierBinaryOp = IdentifierBinaryOp;
       exports.BinaryOp = BinaryOp;
+      exports._BinaryOp = _BinaryOp;
       exports.BinaryOpSymbol = BinaryOpSymbol;
+      exports.CoffeeOfOp = CoffeeOfOp;
+      exports.NotOp = NotOp;
       exports.Xor = Xor;
       exports.Xnor = Xnor;
       exports.UnaryOp = UnaryOp;
@@ -13071,6 +13336,7 @@ ${input.slice(result.pos)}
       exports.PostfixedExpression = PostfixedExpression;
       exports.NonPipelinePostfixedExpression = NonPipelinePostfixedExpression;
       exports.PostfixStatement = PostfixStatement;
+      exports._PostfixStatement = _PostfixStatement;
       exports.Statement = Statement;
       exports.EmptyStatement = EmptyStatement;
       exports.BlockStatement = BlockStatement;
@@ -13090,6 +13356,7 @@ ${input.slice(result.pos)}
       exports.NestedBlockExpression = NestedBlockExpression;
       exports.BlockExpressionPart = BlockExpressionPart;
       exports.IterationStatement = IterationStatement;
+      exports._IterationStatement = _IterationStatement;
       exports.IterationExpression = IterationExpression;
       exports.LoopStatement = LoopStatement;
       exports.LoopClause = LoopClause;
@@ -13226,6 +13493,7 @@ ${input.slice(result.pos)}
       exports.RegExpCharacter = RegExpCharacter;
       exports.RegularExpressionFlags = RegularExpressionFlags;
       exports.TemplateLiteral = TemplateLiteral;
+      exports._TemplateLiteral = _TemplateLiteral;
       exports.TemplateSubstitution = TemplateSubstitution;
       exports.TemplateCharacters = TemplateCharacters;
       exports.TemplateBlockCharacters = TemplateBlockCharacters;
@@ -13344,6 +13612,7 @@ ${input.slice(result.pos)}
       exports.Yield = Yield;
       exports.JSXImplicitFragment = JSXImplicitFragment;
       exports.JSXTag = JSXTag;
+      exports._JSXTag = _JSXTag;
       exports.JSXElement = JSXElement;
       exports.JSXSelfClosingElement = JSXSelfClosingElement;
       exports.PushJSXOpeningElement = PushJSXOpeningElement;
@@ -14182,7 +14451,8 @@ ${counts}`;
           return;
         }
         ;
-        const key = [ruleName, state.pos, ...getStateKey()];
+        const [stateKey, tagKey] = getStateKey();
+        const key = [tagKey, stateKey, state.pos, ruleName];
         if (stateCache.has(key)) {
           if (trace) {
             logs.push("".padStart(stack.length * 2, " ") + ruleName + ":" + state.pos + "\u{1F4B0}");
@@ -14203,12 +14473,9 @@ ${counts}`;
           ({ getStateKey } = result.value);
         }
         if (!uncacheable.has(ruleName)) {
-          const key = [ruleName, state.pos, ...getStateKey()];
-          if (result) {
-            stateCache.set(key, { ...result });
-          } else {
-            stateCache.set(key, result);
-          }
+          const [stateKey, tagKey] = getStateKey();
+          const key = [tagKey, stateKey, state.pos, ruleName];
+          stateCache.set(key, result);
         }
         if (parse.config.verbose && result) {
           console.log(`Parsed ${JSON.stringify(state.input.slice(state.pos, result.pos))} [pos ${state.pos}-${result.pos}] as ${ruleName}`);