@danielx/civet 0.5.70 → 0.5.71

package/dist/main.mjs

@@ -497,6 +497,8 @@ ${input.slice(result.pos)}
       AtThis,
       LeftHandSideExpression,
       CallExpression,
+      ReturnValue,
+      AfterReturnShorthand,
       CallExpressionRest,
       OptionalShorthand,
       OptionalDot,
@@ -1039,170 +1041,171 @@ ${input.slice(result.pos)}
     var $L11 = $L("#");
     var $L12 = $L("super");
     var $L13 = $L("import");
-    var $L14 = $L("!");
-    var $L15 = $L("^");
-    var $L16 = $L("-");
-    var $L17 = $L("import.meta");
-    var $L18 = $L("");
-    var $L19 = $L(",");
-    var $L20 = $L("->");
-    var $L21 = $L("}");
-    var $L22 = $L("null");
-    var $L23 = $L("true");
-    var $L24 = $L("false");
-    var $L25 = $L("yes");
-    var $L26 = $L("on");
-    var $L27 = $L("no");
-    var $L28 = $L("off");
-    var $L29 = $L(">");
-    var $L30 = $L("]");
-    var $L31 = $L(":");
-    var $L32 = $L(")");
-    var $L33 = $L("**=");
-    var $L34 = $L("*=");
-    var $L35 = $L("/=");
-    var $L36 = $L("%=");
-    var $L37 = $L("+=");
-    var $L38 = $L("-=");
-    var $L39 = $L("<<=");
-    var $L40 = $L(">>>=");
-    var $L41 = $L(">>=");
-    var $L42 = $L("&&=");
-    var $L43 = $L("&=");
-    var $L44 = $L("^=");
-    var $L45 = $L("||=");
-    var $L46 = $L("|=");
-    var $L47 = $L("??=");
-    var $L48 = $L("?=");
-    var $L49 = $L("and=");
-    var $L50 = $L("or=");
-    var $L51 = $L("not");
-    var $L52 = $L("**");
-    var $L53 = $L("*");
-    var $L54 = $L("/");
-    var $L55 = $L("%%");
-    var $L56 = $L("%");
-    var $L57 = $L("+");
-    var $L58 = $L("<=");
-    var $L59 = $L(">=");
-    var $L60 = $L("<?");
-    var $L61 = $L("!<?");
-    var $L62 = $L("<<");
-    var $L63 = $L(">>>");
-    var $L64 = $L(">>");
-    var $L65 = $L("!==");
-    var $L66 = $L("!=");
-    var $L67 = $L("isnt");
-    var $L68 = $L("===");
-    var $L69 = $L("==");
-    var $L70 = $L("and");
-    var $L71 = $L("&&");
-    var $L72 = $L("of");
-    var $L73 = $L("or");
-    var $L74 = $L("||");
-    var $L75 = $L("^^");
-    var $L76 = $L("xor");
-    var $L77 = $L("xnor");
-    var $L78 = $L("??");
-    var $L79 = $L("instanceof");
-    var $L80 = $L("in");
-    var $L81 = $L("is");
-    var $L82 = $L("&");
-    var $L83 = $L("|");
-    var $L84 = $L(";");
-    var $L85 = $L("$:");
-    var $L86 = $L("own");
-    var $L87 = $L("break");
-    var $L88 = $L("continue");
-    var $L89 = $L("debugger");
-    var $L90 = $L("assert");
-    var $L91 = $L(":=");
-    var $L92 = $L(".=");
-    var $L93 = $L("/*");
-    var $L94 = $L("*/");
-    var $L95 = $L("\\");
-    var $L96 = $L("[");
-    var $L97 = $L("`");
-    var $L98 = $L("abstract");
-    var $L99 = $L("as");
-    var $L100 = $L("@");
-    var $L101 = $L("@@");
-    var $L102 = $L("async");
-    var $L103 = $L("await");
-    var $L104 = $L("by");
-    var $L105 = $L("case");
-    var $L106 = $L("catch");
-    var $L107 = $L("class");
-    var $L108 = $L("#{");
-    var $L109 = $L("declare");
-    var $L110 = $L("default");
-    var $L111 = $L("delete");
-    var $L112 = $L("do");
-    var $L113 = $L("..");
-    var $L114 = $L("...");
-    var $L115 = $L("::");
-    var $L116 = $L('"');
-    var $L117 = $L("else");
-    var $L118 = $L("export");
-    var $L119 = $L("extends");
-    var $L120 = $L("finally");
-    var $L121 = $L("for");
-    var $L122 = $L("from");
-    var $L123 = $L("function");
-    var $L124 = $L("get");
-    var $L125 = $L("set");
-    var $L126 = $L("if");
-    var $L127 = $L("let");
-    var $L128 = $L("const");
-    var $L129 = $L("loop");
-    var $L130 = $L("new");
-    var $L131 = $L("<");
-    var $L132 = $L("{");
-    var $L133 = $L("operator");
-    var $L134 = $L("public");
-    var $L135 = $L("private");
-    var $L136 = $L("protected");
-    var $L137 = $L("||>");
-    var $L138 = $L("|>=");
-    var $L139 = $L("|>");
-    var $L140 = $L("readonly");
-    var $L141 = $L("return");
-    var $L142 = $L("satisfies");
-    var $L143 = $L("'");
-    var $L144 = $L("static");
-    var $L145 = $L("${");
-    var $L146 = $L("switch");
-    var $L147 = $L("target");
-    var $L148 = $L("then");
-    var $L149 = $L("this");
-    var $L150 = $L("throw");
-    var $L151 = $L('"""');
-    var $L152 = $L("'''");
-    var $L153 = $L("///");
-    var $L154 = $L("```");
-    var $L155 = $L("try");
-    var $L156 = $L("typeof");
-    var $L157 = $L("unless");
-    var $L158 = $L("until");
-    var $L159 = $L("var");
-    var $L160 = $L("void");
-    var $L161 = $L("when");
-    var $L162 = $L("while");
-    var $L163 = $L("yield");
-    var $L164 = $L("/>");
-    var $L165 = $L("</");
-    var $L166 = $L("<>");
-    var $L167 = $L("</>");
-    var $L168 = $L("<!--");
-    var $L169 = $L("-->");
-    var $L170 = $L("type");
-    var $L171 = $L("interface");
-    var $L172 = $L("namespace");
-    var $L173 = $L("asserts");
-    var $L174 = $L("keyof");
-    var $L175 = $L("infer");
-    var $L176 = $L("[]");
-    var $L177 = $L("civet");
+    var $L14 = $L("return.value");
+    var $L15 = $L("!");
+    var $L16 = $L("^");
+    var $L17 = $L("-");
+    var $L18 = $L("import.meta");
+    var $L19 = $L("");
+    var $L20 = $L(",");
+    var $L21 = $L("->");
+    var $L22 = $L("}");
+    var $L23 = $L("null");
+    var $L24 = $L("true");
+    var $L25 = $L("false");
+    var $L26 = $L("yes");
+    var $L27 = $L("on");
+    var $L28 = $L("no");
+    var $L29 = $L("off");
+    var $L30 = $L(">");
+    var $L31 = $L("]");
+    var $L32 = $L(":");
+    var $L33 = $L(")");
+    var $L34 = $L("**=");
+    var $L35 = $L("*=");
+    var $L36 = $L("/=");
+    var $L37 = $L("%=");
+    var $L38 = $L("+=");
+    var $L39 = $L("-=");
+    var $L40 = $L("<<=");
+    var $L41 = $L(">>>=");
+    var $L42 = $L(">>=");
+    var $L43 = $L("&&=");
+    var $L44 = $L("&=");
+    var $L45 = $L("^=");
+    var $L46 = $L("||=");
+    var $L47 = $L("|=");
+    var $L48 = $L("??=");
+    var $L49 = $L("?=");
+    var $L50 = $L("and=");
+    var $L51 = $L("or=");
+    var $L52 = $L("not");
+    var $L53 = $L("**");
+    var $L54 = $L("*");
+    var $L55 = $L("/");
+    var $L56 = $L("%%");
+    var $L57 = $L("%");
+    var $L58 = $L("+");
+    var $L59 = $L("<=");
+    var $L60 = $L(">=");
+    var $L61 = $L("<?");
+    var $L62 = $L("!<?");
+    var $L63 = $L("<<");
+    var $L64 = $L(">>>");
+    var $L65 = $L(">>");
+    var $L66 = $L("!==");
+    var $L67 = $L("!=");
+    var $L68 = $L("isnt");
+    var $L69 = $L("===");
+    var $L70 = $L("==");
+    var $L71 = $L("and");
+    var $L72 = $L("&&");
+    var $L73 = $L("of");
+    var $L74 = $L("or");
+    var $L75 = $L("||");
+    var $L76 = $L("^^");
+    var $L77 = $L("xor");
+    var $L78 = $L("xnor");
+    var $L79 = $L("??");
+    var $L80 = $L("instanceof");
+    var $L81 = $L("in");
+    var $L82 = $L("is");
+    var $L83 = $L("&");
+    var $L84 = $L("|");
+    var $L85 = $L(";");
+    var $L86 = $L("$:");
+    var $L87 = $L("own");
+    var $L88 = $L("break");
+    var $L89 = $L("continue");
+    var $L90 = $L("debugger");
+    var $L91 = $L("assert");
+    var $L92 = $L(":=");
+    var $L93 = $L(".=");
+    var $L94 = $L("/*");
+    var $L95 = $L("*/");
+    var $L96 = $L("\\");
+    var $L97 = $L("[");
+    var $L98 = $L("`");
+    var $L99 = $L("abstract");
+    var $L100 = $L("as");
+    var $L101 = $L("@");
+    var $L102 = $L("@@");
+    var $L103 = $L("async");
+    var $L104 = $L("await");
+    var $L105 = $L("by");
+    var $L106 = $L("case");
+    var $L107 = $L("catch");
+    var $L108 = $L("class");
+    var $L109 = $L("#{");
+    var $L110 = $L("declare");
+    var $L111 = $L("default");
+    var $L112 = $L("delete");
+    var $L113 = $L("do");
+    var $L114 = $L("..");
+    var $L115 = $L("...");
+    var $L116 = $L("::");
+    var $L117 = $L('"');
+    var $L118 = $L("else");
+    var $L119 = $L("export");
+    var $L120 = $L("extends");
+    var $L121 = $L("finally");
+    var $L122 = $L("for");
+    var $L123 = $L("from");
+    var $L124 = $L("function");
+    var $L125 = $L("get");
+    var $L126 = $L("set");
+    var $L127 = $L("if");
+    var $L128 = $L("let");
+    var $L129 = $L("const");
+    var $L130 = $L("loop");
+    var $L131 = $L("new");
+    var $L132 = $L("<");
+    var $L133 = $L("{");
+    var $L134 = $L("operator");
+    var $L135 = $L("public");
+    var $L136 = $L("private");
+    var $L137 = $L("protected");
+    var $L138 = $L("||>");
+    var $L139 = $L("|>=");
+    var $L140 = $L("|>");
+    var $L141 = $L("readonly");
+    var $L142 = $L("return");
+    var $L143 = $L("satisfies");
+    var $L144 = $L("'");
+    var $L145 = $L("static");
+    var $L146 = $L("${");
+    var $L147 = $L("switch");
+    var $L148 = $L("target");
+    var $L149 = $L("then");
+    var $L150 = $L("this");
+    var $L151 = $L("throw");
+    var $L152 = $L('"""');
+    var $L153 = $L("'''");
+    var $L154 = $L("///");
+    var $L155 = $L("```");
+    var $L156 = $L("try");
+    var $L157 = $L("typeof");
+    var $L158 = $L("unless");
+    var $L159 = $L("until");
+    var $L160 = $L("var");
+    var $L161 = $L("void");
+    var $L162 = $L("when");
+    var $L163 = $L("while");
+    var $L164 = $L("yield");
+    var $L165 = $L("/>");
+    var $L166 = $L("</");
+    var $L167 = $L("<>");
+    var $L168 = $L("</>");
+    var $L169 = $L("<!--");
+    var $L170 = $L("-->");
+    var $L171 = $L("type");
+    var $L172 = $L("interface");
+    var $L173 = $L("namespace");
+    var $L174 = $L("asserts");
+    var $L175 = $L("keyof");
+    var $L176 = $L("infer");
+    var $L177 = $L("[]");
+    var $L178 = $L("civet");
     var $R0 = $R(new RegExp("(as|for|while|until|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"));
@@ -2372,7 +2375,7 @@ ${input.slice(result.pos)}
       return {
         type: "ArrowFunction",
         parameters,
-        returnType: suffix?.children?.[1]?.[0]?.[1]?.token,
+        returnType: suffix,
         ts: false,
         block: expOrBlock,
         children: $0
@@ -3160,7 +3163,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var FieldDefinition$0 = $TS($S(CoffeeClassesEnabled, ClassElementName, __, Colon, __, AssignmentExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var FieldDefinition$0 = $TS($S(CoffeeClassesEnabled, ClassElementName, $E(_), Colon, __, AssignmentExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       var id = $2;
       var exp = $6;
       switch (exp.type) {
@@ -3305,7 +3308,8 @@ ${input.slice(result.pos)}
         children: [$1, ...$2, ...rest.flat()]
       });
     });
-    var CallExpression$2 = $TS($S(MemberExpression, AllowedTrailingMemberExpressions, $Q(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
+    var CallExpression$2 = ReturnValue;
+    var CallExpression$3 = $TS($S(MemberExpression, AllowedTrailingMemberExpressions, $Q(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
       var member = $1;
       var trailing = $2;
       var rest = $3;
@@ -3329,17 +3333,69 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("CallExpression", state, CallExpression$0(state) || CallExpression$1(state) || CallExpression$2(state));
+        const result = $TOKEN("CallExpression", state, CallExpression$0(state) || CallExpression$1(state) || CallExpression$2(state) || CallExpression$3(state));
         if (state.events)
           state.events.exit?.("CallExpression", state, result, eventData);
         return result;
       } else {
-        const result = CallExpression$0(state) || CallExpression$1(state) || CallExpression$2(state);
+        const result = CallExpression$0(state) || CallExpression$1(state) || CallExpression$2(state) || CallExpression$3(state);
         if (state.events)
           state.events.exit?.("CallExpression", state, result, eventData);
         return result;
       }
     }
+    var ReturnValue$0 = $TV($C($S($EXPECT($L14, fail, 'ReturnValue "return.value"'), NonIdContinue), $S(Return, $Y(AfterReturnShorthand))), function($skip, $loc, $0, $1) {
+      return { type: "ReturnValue", children: [$1[0]] };
+    });
+    function ReturnValue(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("ReturnValue", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("ReturnValue", state, ReturnValue$0(state));
+        if (state.events)
+          state.events.exit?.("ReturnValue", state, result, eventData);
+        return result;
+      } else {
+        const result = ReturnValue$0(state);
+        if (state.events)
+          state.events.exit?.("ReturnValue", state, result, eventData);
+        return result;
+      }
+    }
+    var AfterReturnShorthand$0 = WAssignmentOp;
+    var AfterReturnShorthand$1 = UpdateExpressionSymbol;
+    var AfterReturnShorthand$2 = TypeSuffix;
+    var AfterReturnShorthand$3 = $S(__, LetAssignment);
+    var AfterReturnShorthand$4 = $S(__, ConstAssignment);
+    function AfterReturnShorthand(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("AfterReturnShorthand", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("AfterReturnShorthand", state, AfterReturnShorthand$0(state) || AfterReturnShorthand$1(state) || AfterReturnShorthand$2(state) || AfterReturnShorthand$3(state) || AfterReturnShorthand$4(state));
+        if (state.events)
+          state.events.exit?.("AfterReturnShorthand", state, result, eventData);
+        return result;
+      } else {
+        const result = AfterReturnShorthand$0(state) || AfterReturnShorthand$1(state) || AfterReturnShorthand$2(state) || AfterReturnShorthand$3(state) || AfterReturnShorthand$4(state);
+        if (state.events)
+          state.events.exit?.("AfterReturnShorthand", state, result, eventData);
+        return result;
+      }
+    }
     var CallExpressionRest$0 = MemberExpressionRest;
     var CallExpressionRest$1 = $TV($C(TemplateLiteral, StringLiteral), function($skip, $loc, $0, $1) {
       if ($1.type === "StringLiteral") {
@@ -3426,7 +3482,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var NonNullAssertion$0 = $T($S($EXPECT($L14, fail, 'NonNullAssertion "!"'), $N($EXPECT($L15, fail, 'NonNullAssertion "^"'))), function(value) {
+    var NonNullAssertion$0 = $T($S($EXPECT($L15, fail, 'NonNullAssertion "!"'), $N($EXPECT($L16, fail, 'NonNullAssertion "^"'))), function(value) {
       return { "type": "NonNullAssertion", "ts": true, "children": value[0] };
     });
     function NonNullAssertion(state) {
@@ -3564,7 +3620,7 @@ ${input.slice(result.pos)}
         ]
       };
     });
-    var MemberBracketContent$3 = $TS($S(Dot, $EXPECT($L16, fail, 'MemberBracketContent "-"'), IntegerLiteral), function($skip, $loc, $0, $1, $2, $3) {
+    var MemberBracketContent$3 = $TS($S(Dot, $EXPECT($L17, fail, 'MemberBracketContent "-"'), IntegerLiteral), function($skip, $loc, $0, $1, $2, $3) {
       var dot = $1;
       var neg = $2;
       var num = $3;
@@ -3761,7 +3817,7 @@ ${input.slice(result.pos)}
       }
     }
     var MetaProperty$0 = $S(New, Dot, Target);
-    var MetaProperty$1 = $TS($S($EXPECT($L17, fail, 'MetaProperty "import.meta"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var MetaProperty$1 = $TS($S($EXPECT($L18, fail, 'MetaProperty "import.meta"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function MetaProperty(state) {
@@ -3787,7 +3843,7 @@ ${input.slice(result.pos)}
       }
     }
     var Parameters$0 = NonEmptyParameters;
-    var Parameters$1 = $TV($EXPECT($L18, fail, 'Parameters ""'), function($skip, $loc, $0, $1) {
+    var Parameters$1 = $TV($EXPECT($L19, fail, 'Parameters ""'), function($skip, $loc, $0, $1) {
       return {
         type: "Parameters",
         children: [{ $loc, token: "()" }],
@@ -4010,6 +4066,9 @@ ${input.slice(result.pos)}
       };
     });
     var NWBindingIdentifier$1 = Identifier;
+    var NWBindingIdentifier$2 = $TS($S(ReturnValue), function($skip, $loc, $0, $1) {
+      return { children: [$1], names: [] };
+    });
     function NWBindingIdentifier(state) {
       let eventData;
       if (state.events) {
@@ -4021,12 +4080,12 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("NWBindingIdentifier", state, NWBindingIdentifier$0(state) || NWBindingIdentifier$1(state));
+        const result = $TOKEN("NWBindingIdentifier", state, NWBindingIdentifier$0(state) || NWBindingIdentifier$1(state) || NWBindingIdentifier$2(state));
         if (state.events)
           state.events.exit?.("NWBindingIdentifier", state, result, eventData);
         return result;
       } else {
-        const result = NWBindingIdentifier$0(state) || NWBindingIdentifier$1(state);
+        const result = NWBindingIdentifier$0(state) || NWBindingIdentifier$1(state) || NWBindingIdentifier$2(state);
         if (state.events)
           state.events.exit?.("NWBindingIdentifier", state, result, eventData);
         return result;
@@ -4407,7 +4466,7 @@ ${input.slice(result.pos)}
       }
     }
     var BindingProperty$0 = BindingRestProperty;
-    var BindingProperty$1 = $TS($S($E(_), PropertyName, __, Colon, $C(BindingIdentifier, BindingPattern), $E(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var BindingProperty$1 = $TS($S($E(_), PropertyName, $E(_), Colon, $C(BindingIdentifier, BindingPattern), $E(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       var name = $2;
       var b = $5;
       var init = $6;
@@ -4568,7 +4627,7 @@ ${input.slice(result.pos)}
         children: $0
       };
     });
-    var BindingElement$2 = $TV($Y($S($E(_), $EXPECT($L19, fail, 'BindingElement ","'))), function($skip, $loc, $0, $1) {
+    var BindingElement$2 = $TV($Y($S($E(_), $EXPECT($L20, fail, 'BindingElement ","'))), function($skip, $loc, $0, $1) {
       return {
         children: [{
           type: "ElisionElement",
@@ -4641,7 +4700,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var EmptyBindingPattern$0 = $TV($EXPECT($L18, fail, 'EmptyBindingPattern ""'), function($skip, $loc, $0, $1) {
+    var EmptyBindingPattern$0 = $TV($EXPECT($L19, fail, 'EmptyBindingPattern ""'), function($skip, $loc, $0, $1) {
       const ref = {
         type: "Ref",
         base: "ref",
@@ -4859,7 +4918,7 @@ ${input.slice(result.pos)}
       }
     }
     var MatchingProperty$0 = MatchingRestProperty;
-    var MatchingProperty$1 = $TS($S($E(_), PropertyName, __, Colon, $E(_), $C(BindingIdentifier, MatchingPattern)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var MatchingProperty$1 = $TS($S($E(_), PropertyName, $E(_), Colon, $E(_), $C(BindingIdentifier, MatchingPattern)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       var name = $2;
       var match = $6;
       return {
@@ -5085,7 +5144,7 @@ ${input.slice(result.pos)}
       }
     }
     var MatchingElement$0 = MatchingRestElement;
-    var MatchingElement$1 = $TS($S($E(_), BindingIdentifier, __, Colon, $E(_), $C(BindingIdentifier, MatchingPattern)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var MatchingElement$1 = $TS($S($E(_), BindingIdentifier, $E(_), Colon, $E(_), $C(BindingIdentifier, MatchingPattern)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       var ws = $1;
       var name = $2;
       var match = $6;
@@ -5117,7 +5176,7 @@ ${input.slice(result.pos)}
         children: [ws, binding]
       };
     });
-    var MatchingElement$3 = $TV($Y($S($E(_), $EXPECT($L19, fail, 'MatchingElement ","'))), function($skip, $loc, $0, $1) {
+    var MatchingElement$3 = $TV($Y($S($E(_), $EXPECT($L20, fail, 'MatchingElement ","'))), function($skip, $loc, $0, $1) {
       return {
         children: [{
           type: "ElisionElement",
@@ -5210,7 +5269,7 @@ ${input.slice(result.pos)}
         type: "FunctionSignature",
         id: wid?.[1],
         parameters,
-        returnType: suffix?.children?.[1]?.[0]?.[1]?.token,
+        returnType: suffix,
         ts: false,
         block: null,
         children: !parameters.implicit ? $0 : [async, func, star, wid, parameters, w, suffix]
@@ -5369,7 +5428,7 @@ ${input.slice(result.pos)}
         type: "FunctionSignature",
         id,
         parameters,
-        returnType: suffix?.children?.[1]?.[0]?.[1]?.token,
+        returnType: suffix,
         ts: false,
         block: null,
         children: [func, w1, id, w2, parameters, suffix]
@@ -5478,7 +5537,7 @@ ${input.slice(result.pos)}
         type: "FunctionExpression",
         id: void 0,
         parameters,
-        returnType: suffix?.children?.[1]?.[0]?.[1]?.token,
+        returnType: suffix,
         ts: false,
         block,
         children: [
@@ -5511,7 +5570,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Arrow$0 = $TV($EXPECT($L20, fail, 'Arrow "->"'), function($skip, $loc, $0, $1) {
+    var Arrow$0 = $TV($EXPECT($L21, fail, 'Arrow "->"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function Arrow(state) {
@@ -5575,12 +5634,16 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ImplicitNestedBlock$0 = $TS($S(InsertOpenBrace, NestedBlockStatements, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-      var block = $2;
-      return Object.assign({}, block, {
-        children: [$1, ...block.children, $3, $4, $5],
+    var ImplicitNestedBlock$0 = $TS($S($Y(EOS), InsertOpenBrace, AllowAll, $E($S(NestedBlockStatements, InsertNewline, InsertIndent, InsertCloseBrace)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var open = $2;
+      if (!$4)
+        return $skip;
+      const [block, ...tail] = $4;
+      return {
+        ...block,
+        children: [open, ...block.children, ...tail],
         bare: false
-      });
+      };
     });
     function ImplicitNestedBlock(state) {
       let eventData;
@@ -5745,7 +5808,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var EmptyBareBlock$0 = $TV($EXPECT($L18, fail, 'EmptyBareBlock ""'), function($skip, $loc, $0, $1) {
+    var EmptyBareBlock$0 = $TV($EXPECT($L19, fail, 'EmptyBareBlock ""'), function($skip, $loc, $0, $1) {
       const expressions = [];
       return {
         type: "BlockStatement",
@@ -5848,12 +5911,16 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var NonSingleBracedBlock$0 = $TS($S($Q(TrailingComment), OpenBrace, BracedContent, __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-      var block = $3;
+    var NonSingleBracedBlock$0 = $TS($S($Q(TrailingComment), OpenBrace, AllowAll, $E($S(BracedContent, __, CloseBrace)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var ws1 = $1;
+      var open = $2;
+      if (!$4)
+        return $skip;
+      const [block, ws2, close] = $4;
       return {
         type: "BlockStatement",
         expressions: block.expressions,
-        children: [$1, $2, ...block.children, $4, $5],
+        children: [ws1, open, ...block.children, ws2, close],
         bare: false
       };
       return block;
@@ -5968,7 +6035,7 @@ ${input.slice(result.pos)}
         children: [$1, expressions]
       };
     });
-    var BracedContent$2 = $TV($Y($S(__, $EXPECT($L21, fail, 'BracedContent "}"'))), function($skip, $loc, $0, $1) {
+    var BracedContent$2 = $TV($Y($S(__, $EXPECT($L22, fail, 'BracedContent "}"'))), function($skip, $loc, $0, $1) {
       const expressions = [];
       return {
         type: "BlockStatement",
@@ -6113,7 +6180,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var NullLiteral$0 = $TS($S($EXPECT($L22, fail, 'NullLiteral "null"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var NullLiteral$0 = $TS($S($EXPECT($L23, fail, 'NullLiteral "null"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function NullLiteral(state) {
@@ -6141,7 +6208,7 @@ ${input.slice(result.pos)}
     var BooleanLiteral$0 = $T($S(CoffeeBooleansEnabled, CoffeeScriptBooleanLiteral), function(value) {
       return value[1];
     });
-    var BooleanLiteral$1 = $TS($S($C($EXPECT($L23, fail, 'BooleanLiteral "true"'), $EXPECT($L24, fail, 'BooleanLiteral "false"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var BooleanLiteral$1 = $TS($S($C($EXPECT($L24, fail, 'BooleanLiteral "true"'), $EXPECT($L25, fail, 'BooleanLiteral "false"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function BooleanLiteral(state) {
@@ -6166,10 +6233,10 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CoffeeScriptBooleanLiteral$0 = $TS($S($C($EXPECT($L25, fail, 'CoffeeScriptBooleanLiteral "yes"'), $EXPECT($L26, fail, 'CoffeeScriptBooleanLiteral "on"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var CoffeeScriptBooleanLiteral$0 = $TS($S($C($EXPECT($L26, fail, 'CoffeeScriptBooleanLiteral "yes"'), $EXPECT($L27, fail, 'CoffeeScriptBooleanLiteral "on"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: "true" };
     });
-    var CoffeeScriptBooleanLiteral$1 = $TS($S($C($EXPECT($L27, fail, 'CoffeeScriptBooleanLiteral "no"'), $EXPECT($L28, fail, 'CoffeeScriptBooleanLiteral "off"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var CoffeeScriptBooleanLiteral$1 = $TS($S($C($EXPECT($L28, fail, 'CoffeeScriptBooleanLiteral "no"'), $EXPECT($L29, fail, 'CoffeeScriptBooleanLiteral "off"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: "false" };
     });
     function CoffeeScriptBooleanLiteral(state) {
@@ -6275,7 +6342,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var UpcomingAssignment$0 = $Y($S(__, $EXPECT($L1, fail, 'UpcomingAssignment "="'), $N($C($EXPECT($L1, fail, 'UpcomingAssignment "="'), $EXPECT($L29, fail, 'UpcomingAssignment ">"')))));
+    var UpcomingAssignment$0 = $Y($S(__, $EXPECT($L1, fail, 'UpcomingAssignment "="'), $N($C($EXPECT($L1, fail, 'UpcomingAssignment "="'), $EXPECT($L30, fail, 'UpcomingAssignment ">"')))));
     function UpcomingAssignment(state) {
       let eventData;
       if (state.events) {
@@ -6541,7 +6608,7 @@ ${input.slice(result.pos)}
       }
     }
     var ArrayElementDelimiter$0 = $S(__, Comma);
-    var ArrayElementDelimiter$1 = $Y($S(__, $EXPECT($L30, fail, 'ArrayElementDelimiter "]"')));
+    var ArrayElementDelimiter$1 = $Y($S(__, $EXPECT($L31, fail, 'ArrayElementDelimiter "]"')));
     var ArrayElementDelimiter$2 = $T($S($Y(EOS), InsertComma), function(value) {
       return value[1];
     });
@@ -6968,7 +7035,7 @@ ${input.slice(result.pos)}
     var ImplicitInlineObjectPropertyDelimiter$1 = $T($S($Y($S($C(Samedent, $Q(_)), NamedProperty)), InsertComma), function(value) {
       return value[1];
     });
-    var ImplicitInlineObjectPropertyDelimiter$2 = $T($Y($S(__, $C($EXPECT($L31, fail, 'ImplicitInlineObjectPropertyDelimiter ":"'), $EXPECT($L32, fail, 'ImplicitInlineObjectPropertyDelimiter ")"'), $EXPECT($L30, fail, 'ImplicitInlineObjectPropertyDelimiter "]"'), $EXPECT($L21, fail, 'ImplicitInlineObjectPropertyDelimiter "}"'), ReservedWord))), function(value) {
+    var ImplicitInlineObjectPropertyDelimiter$2 = $T($Y($S(__, $C($EXPECT($L32, fail, 'ImplicitInlineObjectPropertyDelimiter ":"'), $EXPECT($L33, fail, 'ImplicitInlineObjectPropertyDelimiter ")"'), $EXPECT($L31, fail, 'ImplicitInlineObjectPropertyDelimiter "]"'), $EXPECT($L22, fail, 'ImplicitInlineObjectPropertyDelimiter "}"'), ReservedWord))), function(value) {
       return "";
     });
     var ImplicitInlineObjectPropertyDelimiter$3 = $T($Y(EOS), function(value) {
@@ -6997,7 +7064,7 @@ ${input.slice(result.pos)}
       }
     }
     var ObjectPropertyDelimiter$0 = $S($Q(_), Comma);
-    var ObjectPropertyDelimiter$1 = $Y($S(__, $EXPECT($L21, fail, 'ObjectPropertyDelimiter "}"')));
+    var ObjectPropertyDelimiter$1 = $Y($S(__, $EXPECT($L22, fail, 'ObjectPropertyDelimiter "}"')));
     var ObjectPropertyDelimiter$2 = $T($S($Y(EOS), InsertComma), function(value) {
       return value[1];
     });
@@ -7167,7 +7234,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var NamedProperty$0 = $TS($S(PropertyName, __, Colon, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var NamedProperty$0 = $TS($S(PropertyName, $E(_), Colon, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4) {
       var name = $1;
       var exp = $4;
       return {
@@ -7200,7 +7267,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ImplicitNamedProperty$0 = $TS($S(PropertyName, __, Colon, $C(MultiLineImplicitObjectLiteralAllowed, $N(EOS)), ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var ImplicitNamedProperty$0 = $TS($S(PropertyName, $E(_), Colon, $C(MultiLineImplicitObjectLiteralAllowed, $N(EOS)), ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var name = $1;
       var exp = $5;
       return {
@@ -7307,7 +7374,7 @@ ${input.slice(result.pos)}
         expression
       };
     });
-    var ComputedPropertyName$2 = $TS($S(InsertOpenBracket, $EXPECT($L16, fail, 'ComputedPropertyName "-"'), NumericLiteral, InsertCloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var ComputedPropertyName$2 = $TS($S(InsertOpenBracket, $EXPECT($L17, fail, 'ComputedPropertyName "-"'), NumericLiteral, InsertCloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
       return {
         type: "ComputedPropertyName",
         children: $0
@@ -7475,7 +7542,7 @@ ${input.slice(result.pos)}
         children: $0,
         name,
         modifier: $1?.[0]?.token,
-        returnType: void 0,
+        returnType: suffix,
         parameters
       };
     });
@@ -7656,22 +7723,22 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var AssignmentOpSymbol$0 = $EXPECT($L33, fail, 'AssignmentOpSymbol "**="');
-    var AssignmentOpSymbol$1 = $EXPECT($L34, fail, 'AssignmentOpSymbol "*="');
-    var AssignmentOpSymbol$2 = $EXPECT($L35, fail, 'AssignmentOpSymbol "/="');
-    var AssignmentOpSymbol$3 = $EXPECT($L36, fail, 'AssignmentOpSymbol "%="');
-    var AssignmentOpSymbol$4 = $EXPECT($L37, fail, 'AssignmentOpSymbol "+="');
-    var AssignmentOpSymbol$5 = $EXPECT($L38, fail, 'AssignmentOpSymbol "-="');
-    var AssignmentOpSymbol$6 = $EXPECT($L39, fail, 'AssignmentOpSymbol "<<="');
-    var AssignmentOpSymbol$7 = $EXPECT($L40, fail, 'AssignmentOpSymbol ">>>="');
-    var AssignmentOpSymbol$8 = $EXPECT($L41, fail, 'AssignmentOpSymbol ">>="');
-    var AssignmentOpSymbol$9 = $EXPECT($L42, fail, 'AssignmentOpSymbol "&&="');
-    var AssignmentOpSymbol$10 = $EXPECT($L43, fail, 'AssignmentOpSymbol "&="');
-    var AssignmentOpSymbol$11 = $EXPECT($L44, fail, 'AssignmentOpSymbol "^="');
-    var AssignmentOpSymbol$12 = $EXPECT($L45, fail, 'AssignmentOpSymbol "||="');
-    var AssignmentOpSymbol$13 = $EXPECT($L46, fail, 'AssignmentOpSymbol "|="');
-    var AssignmentOpSymbol$14 = $EXPECT($L47, fail, 'AssignmentOpSymbol "??="');
-    var AssignmentOpSymbol$15 = $T($EXPECT($L48, fail, 'AssignmentOpSymbol "?="'), function(value) {
+    var AssignmentOpSymbol$0 = $EXPECT($L34, fail, 'AssignmentOpSymbol "**="');
+    var AssignmentOpSymbol$1 = $EXPECT($L35, fail, 'AssignmentOpSymbol "*="');
+    var AssignmentOpSymbol$2 = $EXPECT($L36, fail, 'AssignmentOpSymbol "/="');
+    var AssignmentOpSymbol$3 = $EXPECT($L37, fail, 'AssignmentOpSymbol "%="');
+    var AssignmentOpSymbol$4 = $EXPECT($L38, fail, 'AssignmentOpSymbol "+="');
+    var AssignmentOpSymbol$5 = $EXPECT($L39, fail, 'AssignmentOpSymbol "-="');
+    var AssignmentOpSymbol$6 = $EXPECT($L40, fail, 'AssignmentOpSymbol "<<="');
+    var AssignmentOpSymbol$7 = $EXPECT($L41, fail, 'AssignmentOpSymbol ">>>="');
+    var AssignmentOpSymbol$8 = $EXPECT($L42, fail, 'AssignmentOpSymbol ">>="');
+    var AssignmentOpSymbol$9 = $EXPECT($L43, fail, 'AssignmentOpSymbol "&&="');
+    var AssignmentOpSymbol$10 = $EXPECT($L44, fail, 'AssignmentOpSymbol "&="');
+    var AssignmentOpSymbol$11 = $EXPECT($L45, fail, 'AssignmentOpSymbol "^="');
+    var AssignmentOpSymbol$12 = $EXPECT($L46, fail, 'AssignmentOpSymbol "||="');
+    var AssignmentOpSymbol$13 = $EXPECT($L47, fail, 'AssignmentOpSymbol "|="');
+    var AssignmentOpSymbol$14 = $EXPECT($L48, fail, 'AssignmentOpSymbol "??="');
+    var AssignmentOpSymbol$15 = $T($EXPECT($L49, fail, 'AssignmentOpSymbol "?="'), function(value) {
       return "??=";
     });
     var AssignmentOpSymbol$16 = $T($S($EXPECT($L1, fail, 'AssignmentOpSymbol "="'), $N($EXPECT($L1, fail, 'AssignmentOpSymbol "="'))), function(value) {
@@ -7702,10 +7769,10 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CoffeeWordAssignmentOp$0 = $T($EXPECT($L49, fail, 'CoffeeWordAssignmentOp "and="'), function(value) {
+    var CoffeeWordAssignmentOp$0 = $T($EXPECT($L50, fail, 'CoffeeWordAssignmentOp "and="'), function(value) {
       return "&&=";
     });
-    var CoffeeWordAssignmentOp$1 = $T($EXPECT($L50, fail, 'CoffeeWordAssignmentOp "or="'), function(value) {
+    var CoffeeWordAssignmentOp$1 = $T($EXPECT($L51, fail, 'CoffeeWordAssignmentOp "or="'), function(value) {
       return "||=";
     });
     function CoffeeWordAssignmentOp(state) {
@@ -7744,7 +7811,7 @@ ${input.slice(result.pos)}
         special: true
       };
     });
-    var BinaryOp$2 = $TS($S($EXPECT($L51, fail, 'BinaryOp "not"'), NonIdContinue, __, Identifier), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var BinaryOp$2 = $TS($S($EXPECT($L52, fail, 'BinaryOp "not"'), NonIdContinue, __, Identifier), function($skip, $loc, $0, $1, $2, $3, $4) {
       var id = $4;
       if (!module.operators.has(id.name))
         return $skip;
@@ -7776,21 +7843,21 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var BinaryOpSymbol$0 = $EXPECT($L52, fail, 'BinaryOpSymbol "**"');
-    var BinaryOpSymbol$1 = $EXPECT($L53, fail, 'BinaryOpSymbol "*"');
-    var BinaryOpSymbol$2 = $EXPECT($L54, fail, 'BinaryOpSymbol "/"');
-    var BinaryOpSymbol$3 = $TV($EXPECT($L55, fail, 'BinaryOpSymbol "%%"'), function($skip, $loc, $0, $1) {
+    var BinaryOpSymbol$0 = $EXPECT($L53, fail, 'BinaryOpSymbol "**"');
+    var BinaryOpSymbol$1 = $EXPECT($L54, fail, 'BinaryOpSymbol "*"');
+    var BinaryOpSymbol$2 = $EXPECT($L55, fail, 'BinaryOpSymbol "/"');
+    var BinaryOpSymbol$3 = $TV($EXPECT($L56, fail, 'BinaryOpSymbol "%%"'), function($skip, $loc, $0, $1) {
       return {
         call: module.getRef("modulo"),
         special: true
       };
     });
-    var BinaryOpSymbol$4 = $EXPECT($L56, fail, 'BinaryOpSymbol "%"');
-    var BinaryOpSymbol$5 = $EXPECT($L57, fail, 'BinaryOpSymbol "+"');
-    var BinaryOpSymbol$6 = $EXPECT($L16, fail, 'BinaryOpSymbol "-"');
-    var BinaryOpSymbol$7 = $EXPECT($L58, fail, 'BinaryOpSymbol "<="');
-    var BinaryOpSymbol$8 = $EXPECT($L59, fail, 'BinaryOpSymbol ">="');
-    var BinaryOpSymbol$9 = $TV($EXPECT($L60, fail, 'BinaryOpSymbol "<?"'), function($skip, $loc, $0, $1) {
+    var BinaryOpSymbol$4 = $EXPECT($L57, fail, 'BinaryOpSymbol "%"');
+    var BinaryOpSymbol$5 = $EXPECT($L58, fail, 'BinaryOpSymbol "+"');
+    var BinaryOpSymbol$6 = $EXPECT($L17, fail, 'BinaryOpSymbol "-"');
+    var BinaryOpSymbol$7 = $EXPECT($L59, fail, 'BinaryOpSymbol "<="');
+    var BinaryOpSymbol$8 = $EXPECT($L60, fail, 'BinaryOpSymbol ">="');
+    var BinaryOpSymbol$9 = $TV($EXPECT($L61, fail, 'BinaryOpSymbol "<?"'), function($skip, $loc, $0, $1) {
       return {
         $loc,
         token: "instanceof",
@@ -7798,7 +7865,7 @@ ${input.slice(result.pos)}
         special: true
       };
     });
-    var BinaryOpSymbol$10 = $TV($EXPECT($L61, fail, 'BinaryOpSymbol "!<?"'), function($skip, $loc, $0, $1) {
+    var BinaryOpSymbol$10 = $TV($EXPECT($L62, fail, 'BinaryOpSymbol "!<?"'), function($skip, $loc, $0, $1) {
       return {
         $loc,
         token: "instanceof",
@@ -7807,58 +7874,58 @@ ${input.slice(result.pos)}
         negated: true
       };
     });
-    var BinaryOpSymbol$11 = $EXPECT($L62, fail, 'BinaryOpSymbol "<<"');
+    var BinaryOpSymbol$11 = $EXPECT($L63, fail, 'BinaryOpSymbol "<<"');
     var BinaryOpSymbol$12 = $TR($EXPECT($R7, fail, "BinaryOpSymbol /<(?!\\p{ID_Start}|[_$])/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
       return "<";
     });
-    var BinaryOpSymbol$13 = $EXPECT($L63, fail, 'BinaryOpSymbol ">>>"');
-    var BinaryOpSymbol$14 = $EXPECT($L64, fail, 'BinaryOpSymbol ">>"');
-    var BinaryOpSymbol$15 = $EXPECT($L29, fail, 'BinaryOpSymbol ">"');
-    var BinaryOpSymbol$16 = $EXPECT($L65, fail, 'BinaryOpSymbol "!=="');
-    var BinaryOpSymbol$17 = $TV($EXPECT($L66, fail, 'BinaryOpSymbol "!="'), function($skip, $loc, $0, $1) {
+    var BinaryOpSymbol$13 = $EXPECT($L64, fail, 'BinaryOpSymbol ">>>"');
+    var BinaryOpSymbol$14 = $EXPECT($L65, fail, 'BinaryOpSymbol ">>"');
+    var BinaryOpSymbol$15 = $EXPECT($L30, fail, 'BinaryOpSymbol ">"');
+    var BinaryOpSymbol$16 = $EXPECT($L66, fail, 'BinaryOpSymbol "!=="');
+    var BinaryOpSymbol$17 = $TV($EXPECT($L67, fail, 'BinaryOpSymbol "!="'), function($skip, $loc, $0, $1) {
       if (module.config.coffeeEq)
         return "!==";
       return $1;
     });
-    var BinaryOpSymbol$18 = $TS($S($EXPECT($L67, fail, 'BinaryOpSymbol "isnt"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var BinaryOpSymbol$18 = $TS($S($EXPECT($L68, fail, 'BinaryOpSymbol "isnt"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       if (module.config.coffeeIsnt)
         return "!==";
       return $skip;
     });
-    var BinaryOpSymbol$19 = $EXPECT($L68, fail, 'BinaryOpSymbol "==="');
-    var BinaryOpSymbol$20 = $TV($EXPECT($L69, fail, 'BinaryOpSymbol "=="'), function($skip, $loc, $0, $1) {
+    var BinaryOpSymbol$19 = $EXPECT($L69, fail, 'BinaryOpSymbol "==="');
+    var BinaryOpSymbol$20 = $TV($EXPECT($L70, fail, 'BinaryOpSymbol "=="'), function($skip, $loc, $0, $1) {
       if (module.config.coffeeEq)
         return "===";
       return $1;
     });
-    var BinaryOpSymbol$21 = $T($S($EXPECT($L70, fail, 'BinaryOpSymbol "and"'), NonIdContinue), function(value) {
+    var BinaryOpSymbol$21 = $T($S($EXPECT($L71, fail, 'BinaryOpSymbol "and"'), NonIdContinue), function(value) {
       return "&&";
     });
-    var BinaryOpSymbol$22 = $EXPECT($L71, fail, 'BinaryOpSymbol "&&"');
-    var BinaryOpSymbol$23 = $T($S(CoffeeOfEnabled, $EXPECT($L72, fail, 'BinaryOpSymbol "of"'), NonIdContinue), function(value) {
+    var BinaryOpSymbol$22 = $EXPECT($L72, fail, 'BinaryOpSymbol "&&"');
+    var BinaryOpSymbol$23 = $T($S(CoffeeOfEnabled, $EXPECT($L73, fail, 'BinaryOpSymbol "of"'), NonIdContinue), function(value) {
       return "in";
     });
-    var BinaryOpSymbol$24 = $T($S($EXPECT($L73, fail, 'BinaryOpSymbol "or"'), NonIdContinue), function(value) {
+    var BinaryOpSymbol$24 = $T($S($EXPECT($L74, fail, 'BinaryOpSymbol "or"'), NonIdContinue), function(value) {
       return "||";
     });
-    var BinaryOpSymbol$25 = $EXPECT($L74, fail, 'BinaryOpSymbol "||"');
-    var BinaryOpSymbol$26 = $TV($C($EXPECT($L75, fail, 'BinaryOpSymbol "^^"'), $S($EXPECT($L76, fail, 'BinaryOpSymbol "xor"'), NonIdContinue)), function($skip, $loc, $0, $1) {
+    var BinaryOpSymbol$25 = $EXPECT($L75, fail, 'BinaryOpSymbol "||"');
+    var BinaryOpSymbol$26 = $TV($C($EXPECT($L76, fail, 'BinaryOpSymbol "^^"'), $S($EXPECT($L77, fail, 'BinaryOpSymbol "xor"'), NonIdContinue)), function($skip, $loc, $0, $1) {
       return {
         call: module.getRef("xor"),
         special: true
       };
     });
-    var BinaryOpSymbol$27 = $TV($C($EXPECT($R8, fail, "BinaryOpSymbol /!\\^\\^?/"), $S($EXPECT($L77, fail, 'BinaryOpSymbol "xnor"'), NonIdContinue)), function($skip, $loc, $0, $1) {
+    var BinaryOpSymbol$27 = $TV($C($EXPECT($R8, fail, "BinaryOpSymbol /!\\^\\^?/"), $S($EXPECT($L78, fail, 'BinaryOpSymbol "xnor"'), NonIdContinue)), function($skip, $loc, $0, $1) {
       return {
         call: module.getRef("xnor"),
         special: true
       };
     });
-    var BinaryOpSymbol$28 = $EXPECT($L78, fail, 'BinaryOpSymbol "??"');
+    var BinaryOpSymbol$28 = $EXPECT($L79, fail, 'BinaryOpSymbol "??"');
     var BinaryOpSymbol$29 = $T($S(CoffeeBinaryExistentialEnabled, $EXPECT($L3, fail, 'BinaryOpSymbol "?"')), function(value) {
       return "??";
     });
-    var BinaryOpSymbol$30 = $TS($S($EXPECT($L79, fail, 'BinaryOpSymbol "instanceof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var BinaryOpSymbol$30 = $TS($S($EXPECT($L80, fail, 'BinaryOpSymbol "instanceof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return {
         $loc,
         token: $1,
@@ -7866,7 +7933,7 @@ ${input.slice(result.pos)}
         special: true
       };
     });
-    var BinaryOpSymbol$31 = $TS($S($EXPECT($L51, fail, 'BinaryOpSymbol "not"'), NonIdContinue, __, $EXPECT($L79, fail, 'BinaryOpSymbol "instanceof"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var BinaryOpSymbol$31 = $TS($S($EXPECT($L52, fail, 'BinaryOpSymbol "not"'), NonIdContinue, __, $EXPECT($L80, fail, 'BinaryOpSymbol "instanceof"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       return {
         $loc,
         token: "instanceof",
@@ -7875,7 +7942,7 @@ ${input.slice(result.pos)}
         negated: true
       };
     });
-    var BinaryOpSymbol$32 = $TV($C($S($N(CoffeeOfEnabled), $EXPECT($L51, fail, 'BinaryOpSymbol "not"'), NonIdContinue, __, $EXPECT($L80, fail, 'BinaryOpSymbol "in"'), NonIdContinue), $S(CoffeeOfEnabled, $EXPECT($L51, fail, 'BinaryOpSymbol "not"'), NonIdContinue, __, $EXPECT($L72, fail, 'BinaryOpSymbol "of"'), NonIdContinue)), function($skip, $loc, $0, $1) {
+    var BinaryOpSymbol$32 = $TV($C($S($N(CoffeeOfEnabled), $EXPECT($L52, fail, 'BinaryOpSymbol "not"'), NonIdContinue, __, $EXPECT($L81, fail, 'BinaryOpSymbol "in"'), NonIdContinue), $S(CoffeeOfEnabled, $EXPECT($L52, fail, 'BinaryOpSymbol "not"'), NonIdContinue, __, $EXPECT($L73, fail, 'BinaryOpSymbol "of"'), NonIdContinue)), function($skip, $loc, $0, $1) {
       return {
         $loc,
         token: "in",
@@ -7883,7 +7950,7 @@ ${input.slice(result.pos)}
         negated: true
       };
     });
-    var BinaryOpSymbol$33 = $TS($S($EXPECT($L81, fail, 'BinaryOpSymbol "is"'), NonIdContinue, __, $EXPECT($L80, fail, 'BinaryOpSymbol "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var BinaryOpSymbol$33 = $TS($S($EXPECT($L82, fail, 'BinaryOpSymbol "is"'), NonIdContinue, __, $EXPECT($L81, fail, 'BinaryOpSymbol "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       return {
         method: "includes",
         relational: true,
@@ -7891,7 +7958,7 @@ ${input.slice(result.pos)}
         special: true
       };
     });
-    var BinaryOpSymbol$34 = $TS($S(CoffeeOfEnabled, $EXPECT($L80, fail, 'BinaryOpSymbol "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
+    var BinaryOpSymbol$34 = $TS($S(CoffeeOfEnabled, $EXPECT($L81, fail, 'BinaryOpSymbol "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
       return {
         call: [module.getRef("indexOf"), ".call"],
         relational: true,
@@ -7900,7 +7967,7 @@ ${input.slice(result.pos)}
         special: true
       };
     });
-    var BinaryOpSymbol$35 = $TS($S($EXPECT($L81, fail, 'BinaryOpSymbol "is"'), NonIdContinue, __, $EXPECT($L51, fail, 'BinaryOpSymbol "not"'), NonIdContinue, __, $EXPECT($L80, fail, 'BinaryOpSymbol "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
+    var BinaryOpSymbol$35 = $TS($S($EXPECT($L82, fail, 'BinaryOpSymbol "is"'), NonIdContinue, __, $EXPECT($L52, fail, 'BinaryOpSymbol "not"'), NonIdContinue, __, $EXPECT($L81, fail, 'BinaryOpSymbol "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
       return {
         method: "includes",
         relational: true,
@@ -7909,7 +7976,7 @@ ${input.slice(result.pos)}
         negated: true
       };
     });
-    var BinaryOpSymbol$36 = $TS($S(CoffeeOfEnabled, $EXPECT($L51, fail, 'BinaryOpSymbol "not"'), NonIdContinue, __, $EXPECT($L80, fail, 'BinaryOpSymbol "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var BinaryOpSymbol$36 = $TS($S(CoffeeOfEnabled, $EXPECT($L52, fail, 'BinaryOpSymbol "not"'), NonIdContinue, __, $EXPECT($L81, fail, 'BinaryOpSymbol "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       return {
         call: [module.getRef("indexOf"), ".call"],
         relational: true,
@@ -7918,7 +7985,7 @@ ${input.slice(result.pos)}
         special: true
       };
     });
-    var BinaryOpSymbol$37 = $TS($S($N(CoffeeNotEnabled), $EXPECT($L81, fail, 'BinaryOpSymbol "is"'), NonIdContinue, __, $EXPECT($L51, fail, 'BinaryOpSymbol "not"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var BinaryOpSymbol$37 = $TS($S($N(CoffeeNotEnabled), $EXPECT($L82, fail, 'BinaryOpSymbol "is"'), NonIdContinue, __, $EXPECT($L52, fail, 'BinaryOpSymbol "not"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       if (module.config.objectIs) {
         return {
           call: module.getRef("is"),
@@ -7930,7 +7997,7 @@ ${input.slice(result.pos)}
       }
       return "!==";
     });
-    var BinaryOpSymbol$38 = $TS($S($EXPECT($L81, fail, 'BinaryOpSymbol "is"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var BinaryOpSymbol$38 = $TS($S($EXPECT($L82, fail, 'BinaryOpSymbol "is"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       if (module.config.objectIs) {
         return {
           call: module.getRef("is"),
@@ -7941,12 +8008,12 @@ ${input.slice(result.pos)}
       }
       return "===";
     });
-    var BinaryOpSymbol$39 = $TS($S($EXPECT($L80, fail, 'BinaryOpSymbol "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var BinaryOpSymbol$39 = $TS($S($EXPECT($L81, fail, 'BinaryOpSymbol "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return $1;
     });
-    var BinaryOpSymbol$40 = $EXPECT($L82, fail, 'BinaryOpSymbol "&"');
-    var BinaryOpSymbol$41 = $EXPECT($L15, fail, 'BinaryOpSymbol "^"');
-    var BinaryOpSymbol$42 = $EXPECT($L83, fail, 'BinaryOpSymbol "|"');
+    var BinaryOpSymbol$40 = $EXPECT($L83, fail, 'BinaryOpSymbol "&"');
+    var BinaryOpSymbol$41 = $EXPECT($L16, fail, 'BinaryOpSymbol "^"');
+    var BinaryOpSymbol$42 = $EXPECT($L84, fail, 'BinaryOpSymbol "|"');
     function BinaryOpSymbol(state) {
       let eventData;
       if (state.events) {
@@ -7969,8 +8036,8 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Xor$0 = $EXPECT($L75, fail, 'Xor "^^"');
-    var Xor$1 = $S($EXPECT($L76, fail, 'Xor "xor"'), NonIdContinue);
+    var Xor$0 = $EXPECT($L76, fail, 'Xor "^^"');
+    var Xor$1 = $S($EXPECT($L77, fail, 'Xor "xor"'), NonIdContinue);
     function Xor(state) {
       let eventData;
       if (state.events) {
@@ -7994,7 +8061,7 @@ ${input.slice(result.pos)}
       }
     }
     var Xnor$0 = $R$0($EXPECT($R8, fail, "Xnor /!\\^\\^?/"));
-    var Xnor$1 = $EXPECT($L77, fail, 'Xnor "xnor"');
+    var Xnor$1 = $EXPECT($L78, fail, 'Xnor "xnor"');
     function Xnor(state) {
       let eventData;
       if (state.events) {
@@ -8215,7 +8282,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var EmptyStatement$0 = $T($S($Q(TrailingComment), $Y($EXPECT($L84, fail, 'EmptyStatement ";"'))), function(value) {
+    var EmptyStatement$0 = $T($S($Q(TrailingComment), $Y($EXPECT($L85, fail, 'EmptyStatement ";"'))), function(value) {
       return { "type": "EmptyStatement", "children": value[0] };
     });
     function EmptyStatement(state) {
@@ -8294,7 +8361,7 @@ ${input.slice(result.pos)}
       var w = $3;
       return [id, colon, w];
     });
-    var Label$1 = $S($EXPECT($L85, fail, 'Label "$:"'), Whitespace);
+    var Label$1 = $S($EXPECT($L86, fail, 'Label "$:"'), Whitespace);
     function Label(state) {
       let eventData;
       if (state.events) {
@@ -9246,7 +9313,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CoffeeForDeclaration$0 = $TS($S($E($S(__, $EXPECT($L86, fail, 'CoffeeForDeclaration "own"'), NonIdContinue)), ForBinding), function($skip, $loc, $0, $1, $2) {
+    var CoffeeForDeclaration$0 = $TS($S($E($S(__, $EXPECT($L87, fail, 'CoffeeForDeclaration "own"'), NonIdContinue)), ForBinding), function($skip, $loc, $0, $1, $2) {
       var own = $1;
       var binding = $2;
       return {
@@ -9730,8 +9797,8 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ImpliedColon$0 = $S(__, Colon);
-    var ImpliedColon$1 = $TV($EXPECT($L18, fail, 'ImpliedColon ""'), function($skip, $loc, $0, $1) {
+    var ImpliedColon$0 = $S($E(_), Colon);
+    var ImpliedColon$1 = $TV($EXPECT($L19, fail, 'ImpliedColon ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: ":" };
     });
     function ImpliedColon(state) {
@@ -9984,7 +10051,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ForbidIndentedApplication$0 = $TV($EXPECT($L18, fail, 'ForbidIndentedApplication ""'), function($skip, $loc, $0, $1) {
+    var ForbidIndentedApplication$0 = $TV($EXPECT($L19, fail, 'ForbidIndentedApplication ""'), function($skip, $loc, $0, $1) {
       module.forbidIndentedApplication.push(true);
     });
     function ForbidIndentedApplication(state) {
@@ -10009,7 +10076,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var AllowIndentedApplication$0 = $TV($EXPECT($L18, fail, 'AllowIndentedApplication ""'), function($skip, $loc, $0, $1) {
+    var AllowIndentedApplication$0 = $TV($EXPECT($L19, fail, 'AllowIndentedApplication ""'), function($skip, $loc, $0, $1) {
       module.forbidIndentedApplication.push(false);
     });
     function AllowIndentedApplication(state) {
@@ -10034,7 +10101,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var RestoreIndentedApplication$0 = $TV($EXPECT($L18, fail, 'RestoreIndentedApplication ""'), function($skip, $loc, $0, $1) {
+    var RestoreIndentedApplication$0 = $TV($EXPECT($L19, fail, 'RestoreIndentedApplication ""'), function($skip, $loc, $0, $1) {
       module.forbidIndentedApplication.pop();
     });
     function RestoreIndentedApplication(state) {
@@ -10059,7 +10126,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var IndentedApplicationAllowed$0 = $TV($EXPECT($L18, fail, 'IndentedApplicationAllowed ""'), function($skip, $loc, $0, $1) {
+    var IndentedApplicationAllowed$0 = $TV($EXPECT($L19, fail, 'IndentedApplicationAllowed ""'), function($skip, $loc, $0, $1) {
       if (module.config.verbose) {
         console.log("forbidIndentedApplication:", module.forbidIndentedApplication);
       }
@@ -10089,7 +10156,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ForbidTrailingMemberProperty$0 = $TV($EXPECT($L18, fail, 'ForbidTrailingMemberProperty ""'), function($skip, $loc, $0, $1) {
+    var ForbidTrailingMemberProperty$0 = $TV($EXPECT($L19, fail, 'ForbidTrailingMemberProperty ""'), function($skip, $loc, $0, $1) {
       module.forbidTrailingMemberProperty.push(true);
     });
     function ForbidTrailingMemberProperty(state) {
@@ -10114,7 +10181,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var AllowTrailingMemberProperty$0 = $TV($EXPECT($L18, fail, 'AllowTrailingMemberProperty ""'), function($skip, $loc, $0, $1) {
+    var AllowTrailingMemberProperty$0 = $TV($EXPECT($L19, fail, 'AllowTrailingMemberProperty ""'), function($skip, $loc, $0, $1) {
       module.forbidTrailingMemberProperty.push(false);
     });
     function AllowTrailingMemberProperty(state) {
@@ -10139,7 +10206,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var RestoreTrailingMemberProperty$0 = $TV($EXPECT($L18, fail, 'RestoreTrailingMemberProperty ""'), function($skip, $loc, $0, $1) {
+    var RestoreTrailingMemberProperty$0 = $TV($EXPECT($L19, fail, 'RestoreTrailingMemberProperty ""'), function($skip, $loc, $0, $1) {
       module.forbidTrailingMemberProperty.pop();
     });
     function RestoreTrailingMemberProperty(state) {
@@ -10164,7 +10231,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TrailingMemberPropertyAllowed$0 = $TV($EXPECT($L18, fail, 'TrailingMemberPropertyAllowed ""'), function($skip, $loc, $0, $1) {
+    var TrailingMemberPropertyAllowed$0 = $TV($EXPECT($L19, fail, 'TrailingMemberPropertyAllowed ""'), function($skip, $loc, $0, $1) {
       if (module.config.verbose) {
         console.log("forbidTrailingMemberProperty:", module.forbidTrailingMemberProperty);
       }
@@ -10193,7 +10260,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ForbidMultiLineImplicitObjectLiteral$0 = $TV($EXPECT($L18, fail, 'ForbidMultiLineImplicitObjectLiteral ""'), function($skip, $loc, $0, $1) {
+    var ForbidMultiLineImplicitObjectLiteral$0 = $TV($EXPECT($L19, fail, 'ForbidMultiLineImplicitObjectLiteral ""'), function($skip, $loc, $0, $1) {
       module.forbidMultiLineImplicitObjectLiteral.push(true);
     });
     function ForbidMultiLineImplicitObjectLiteral(state) {
@@ -10218,7 +10285,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var AllowMultiLineImplicitObjectLiteral$0 = $TV($EXPECT($L18, fail, 'AllowMultiLineImplicitObjectLiteral ""'), function($skip, $loc, $0, $1) {
+    var AllowMultiLineImplicitObjectLiteral$0 = $TV($EXPECT($L19, fail, 'AllowMultiLineImplicitObjectLiteral ""'), function($skip, $loc, $0, $1) {
       module.forbidMultiLineImplicitObjectLiteral.push(false);
     });
     function AllowMultiLineImplicitObjectLiteral(state) {
@@ -10243,7 +10310,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var RestoreMultiLineImplicitObjectLiteral$0 = $TV($EXPECT($L18, fail, 'RestoreMultiLineImplicitObjectLiteral ""'), function($skip, $loc, $0, $1) {
+    var RestoreMultiLineImplicitObjectLiteral$0 = $TV($EXPECT($L19, fail, 'RestoreMultiLineImplicitObjectLiteral ""'), function($skip, $loc, $0, $1) {
       module.forbidMultiLineImplicitObjectLiteral.pop();
     });
     function RestoreMultiLineImplicitObjectLiteral(state) {
@@ -10268,7 +10335,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var MultiLineImplicitObjectLiteralAllowed$0 = $TV($EXPECT($L18, fail, 'MultiLineImplicitObjectLiteralAllowed ""'), function($skip, $loc, $0, $1) {
+    var MultiLineImplicitObjectLiteralAllowed$0 = $TV($EXPECT($L19, fail, 'MultiLineImplicitObjectLiteralAllowed ""'), function($skip, $loc, $0, $1) {
       if (module.config.verbose) {
         console.log("forbidMultiLineImplicitObjectLiteral:", module.forbidMultiLineImplicitObjectLiteral);
       }
@@ -10381,8 +10448,9 @@ ${input.slice(result.pos)}
     var KeywordStatement$2 = $T($S(Debugger), function(value) {
       return { "type": "DebuggerStatement", "children": value };
     });
-    var KeywordStatement$3 = $T($S(Return, $E(MaybeNestedExpression)), function(value) {
-      return { "type": "ReturnStatement", "children": value };
+    var KeywordStatement$3 = $T($S(Return, $N($C($EXPECT($L4, fail, 'KeywordStatement "."'), AfterReturnShorthand)), $E(MaybeNestedExpression)), function(value) {
+      var expression = value[2];
+      return { "type": "ReturnStatement", "expression": expression, "children": value };
     });
     var KeywordStatement$4 = $T($S(Throw, ExtendedExpression), function(value) {
       return { "type": "ThrowStatement", "children": value };
@@ -10409,7 +10477,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Break$0 = $TS($S($EXPECT($L87, fail, 'Break "break"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Break$0 = $TS($S($EXPECT($L88, fail, 'Break "break"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Break(state) {
@@ -10434,7 +10502,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Continue$0 = $TS($S($EXPECT($L88, fail, 'Continue "continue"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Continue$0 = $TS($S($EXPECT($L89, fail, 'Continue "continue"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Continue(state) {
@@ -10459,7 +10527,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Debugger$0 = $TS($S($EXPECT($L89, fail, 'Debugger "debugger"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Debugger$0 = $TS($S($EXPECT($L90, fail, 'Debugger "debugger"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Debugger(state) {
@@ -10612,7 +10680,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ImpliedImport$0 = $TV($EXPECT($L18, fail, 'ImpliedImport ""'), function($skip, $loc, $0, $1) {
+    var ImpliedImport$0 = $TV($EXPECT($L19, fail, 'ImpliedImport ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: "import " };
     });
     function ImpliedImport(state) {
@@ -10761,7 +10829,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ImportAssertion$0 = $S($E(_), $EXPECT($L90, fail, 'ImportAssertion "assert"'), NonIdContinue, $E(_), ObjectLiteral);
+    var ImportAssertion$0 = $S($E(_), $EXPECT($L91, fail, 'ImportAssertion "assert"'), NonIdContinue, $E(_), ObjectLiteral);
     function ImportAssertion(state) {
       let eventData;
       if (state.events) {
@@ -11365,7 +11433,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ConstAssignment$0 = $TV($EXPECT($L91, fail, 'ConstAssignment ":="'), function($skip, $loc, $0, $1) {
+    var ConstAssignment$0 = $TV($EXPECT($L92, fail, 'ConstAssignment ":="'), function($skip, $loc, $0, $1) {
       return { $loc, token: "=" };
     });
     function ConstAssignment(state) {
@@ -11390,7 +11458,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var LetAssignment$0 = $TV($EXPECT($L92, fail, 'LetAssignment ".="'), function($skip, $loc, $0, $1) {
+    var LetAssignment$0 = $TV($EXPECT($L93, fail, 'LetAssignment ".="'), function($skip, $loc, $0, $1) {
       return { $loc, token: "=" };
     });
     function LetAssignment(state) {
@@ -12088,7 +12156,7 @@ ${input.slice(result.pos)}
       }
     }
     var RegularExpressionLiteral$0 = HeregexLiteral;
-    var RegularExpressionLiteral$1 = $TV($TEXT($S($EXPECT($L54, fail, 'RegularExpressionLiteral "/"'), RegularExpressionBody, $EXPECT($L54, fail, 'RegularExpressionLiteral "/"'), RegularExpressionFlags)), function($skip, $loc, $0, $1) {
+    var RegularExpressionLiteral$1 = $TV($TEXT($S($EXPECT($L55, fail, 'RegularExpressionLiteral "/"'), RegularExpressionBody, $EXPECT($L55, fail, 'RegularExpressionLiteral "/"'), RegularExpressionFlags)), function($skip, $loc, $0, $1) {
       return { type: "RegularExpressionLiteral", $loc, token: $1 };
     });
     function RegularExpressionLiteral(state) {
@@ -12655,7 +12723,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L93, fail, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L94, fail, 'JSMultiLineComment "*/"')), $EXPECT($R42, fail, "JSMultiLineComment /./"))), $EXPECT($L94, fail, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
+    var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L94, fail, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L95, fail, 'JSMultiLineComment "*/"')), $EXPECT($R42, fail, "JSMultiLineComment /./"))), $EXPECT($L95, fail, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function JSMultiLineComment(state) {
@@ -12754,7 +12822,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InlineComment$0 = $TV($TEXT($S($EXPECT($L93, fail, 'InlineComment "/*"'), $TEXT($Q($S($N($EXPECT($L94, fail, 'InlineComment "*/"')), $EXPECT($R46, fail, "InlineComment /[^\\r\\n]/")))), $EXPECT($L94, fail, 'InlineComment "*/"'))), function($skip, $loc, $0, $1) {
+    var InlineComment$0 = $TV($TEXT($S($EXPECT($L94, fail, 'InlineComment "/*"'), $TEXT($Q($S($N($EXPECT($L95, fail, 'InlineComment "*/"')), $EXPECT($R46, fail, "InlineComment /[^\\r\\n]/")))), $EXPECT($L95, fail, 'InlineComment "*/"'))), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function InlineComment(state) {
@@ -12853,7 +12921,7 @@ ${input.slice(result.pos)}
     var NonNewlineWhitespace$0 = $TR($EXPECT($R47, fail, "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($L95, fail, 'NonNewlineWhitespace "\\\\\\\\"'), EOL), function(value) {
+    var NonNewlineWhitespace$1 = $T($S(CoffeeLineContinuationEnabled, $EXPECT($L96, fail, 'NonNewlineWhitespace "\\\\\\\\"'), EOL), function(value) {
       return "";
     });
     function NonNewlineWhitespace(state) {
@@ -13005,7 +13073,7 @@ ${input.slice(result.pos)}
       }
     }
     var StatementDelimiter$0 = SemicolonDelimiter;
-    var StatementDelimiter$1 = $S($Y($S(Samedent, $C($EXPECT($L2, fail, 'StatementDelimiter "("'), $EXPECT($L96, fail, 'StatementDelimiter "["'), $EXPECT($L97, fail, 'StatementDelimiter "`"'), $EXPECT($L57, fail, 'StatementDelimiter "+"'), $EXPECT($L16, fail, 'StatementDelimiter "-"'), $EXPECT($L53, fail, 'StatementDelimiter "*"'), $EXPECT($L54, fail, 'StatementDelimiter "/"'), ObjectLiteral, Arrow, $S(Function, $E($S($E(_), Star)), $E(_), $EXPECT($L2, fail, 'StatementDelimiter "("'))))), InsertSemicolon);
+    var StatementDelimiter$1 = $S($Y($S(Samedent, $C($EXPECT($L2, fail, 'StatementDelimiter "("'), $EXPECT($L97, fail, 'StatementDelimiter "["'), $EXPECT($L98, fail, 'StatementDelimiter "`"'), $EXPECT($L58, fail, 'StatementDelimiter "+"'), $EXPECT($L17, fail, 'StatementDelimiter "-"'), $EXPECT($L54, fail, 'StatementDelimiter "*"'), $EXPECT($L55, fail, 'StatementDelimiter "/"'), ObjectLiteral, Arrow, $S(Function, $E($S($E(_), Star)), $E(_), $EXPECT($L2, fail, 'StatementDelimiter "("'))))), InsertSemicolon);
     var StatementDelimiter$2 = $Y(EOS);
     function StatementDelimiter(state) {
       let eventData;
@@ -13080,7 +13148,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Loc$0 = $TV($EXPECT($L18, fail, 'Loc ""'), function($skip, $loc, $0, $1) {
+    var Loc$0 = $TV($EXPECT($L19, fail, 'Loc ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: "" };
     });
     function Loc(state) {
@@ -13105,7 +13173,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Abstract$0 = $TV($TEXT($S($EXPECT($L98, fail, 'Abstract "abstract"'), NonIdContinue, $E($EXPECT($L8, fail, 'Abstract " "')))), function($skip, $loc, $0, $1) {
+    var Abstract$0 = $TV($TEXT($S($EXPECT($L99, fail, 'Abstract "abstract"'), NonIdContinue, $E($EXPECT($L8, fail, 'Abstract " "')))), function($skip, $loc, $0, $1) {
       return { $loc, token: $1, ts: true };
     });
     function Abstract(state) {
@@ -13130,7 +13198,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Ampersand$0 = $TV($EXPECT($L82, fail, 'Ampersand "&"'), function($skip, $loc, $0, $1) {
+    var Ampersand$0 = $TV($EXPECT($L83, fail, 'Ampersand "&"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function Ampersand(state) {
@@ -13155,7 +13223,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var As$0 = $TS($S($EXPECT($L99, fail, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var As$0 = $TS($S($EXPECT($L100, fail, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function As(state) {
@@ -13180,7 +13248,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var At$0 = $TV($EXPECT($L100, fail, 'At "@"'), function($skip, $loc, $0, $1) {
+    var At$0 = $TV($EXPECT($L101, fail, 'At "@"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function At(state) {
@@ -13205,7 +13273,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var AtAt$0 = $TV($EXPECT($L101, fail, 'AtAt "@@"'), function($skip, $loc, $0, $1) {
+    var AtAt$0 = $TV($EXPECT($L102, fail, 'AtAt "@@"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "@" };
     });
     function AtAt(state) {
@@ -13230,7 +13298,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Async$0 = $TS($S($EXPECT($L102, fail, 'Async "async"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Async$0 = $TS($S($EXPECT($L103, fail, 'Async "async"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1, type: "Async" };
     });
     function Async(state) {
@@ -13255,7 +13323,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Await$0 = $TS($S($EXPECT($L103, fail, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Await$0 = $TS($S($EXPECT($L104, fail, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Await(state) {
@@ -13280,7 +13348,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Backtick$0 = $TV($EXPECT($L97, fail, 'Backtick "`"'), function($skip, $loc, $0, $1) {
+    var Backtick$0 = $TV($EXPECT($L98, fail, 'Backtick "`"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function Backtick(state) {
@@ -13305,7 +13373,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var By$0 = $TS($S($EXPECT($L104, fail, 'By "by"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var By$0 = $TS($S($EXPECT($L105, fail, 'By "by"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function By(state) {
@@ -13330,7 +13398,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Case$0 = $TS($S($EXPECT($L105, fail, 'Case "case"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Case$0 = $TS($S($EXPECT($L106, fail, 'Case "case"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Case(state) {
@@ -13355,7 +13423,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Catch$0 = $TS($S($EXPECT($L106, fail, 'Catch "catch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Catch$0 = $TS($S($EXPECT($L107, fail, 'Catch "catch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Catch(state) {
@@ -13380,7 +13448,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Class$0 = $TS($S($EXPECT($L107, fail, 'Class "class"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Class$0 = $TS($S($EXPECT($L108, fail, 'Class "class"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Class(state) {
@@ -13405,7 +13473,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CloseBrace$0 = $TV($EXPECT($L21, fail, 'CloseBrace "}"'), function($skip, $loc, $0, $1) {
+    var CloseBrace$0 = $TV($EXPECT($L22, fail, 'CloseBrace "}"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function CloseBrace(state) {
@@ -13430,7 +13498,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CloseBracket$0 = $TV($EXPECT($L30, fail, 'CloseBracket "]"'), function($skip, $loc, $0, $1) {
+    var CloseBracket$0 = $TV($EXPECT($L31, fail, 'CloseBracket "]"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function CloseBracket(state) {
@@ -13455,7 +13523,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CloseParen$0 = $TV($EXPECT($L32, fail, 'CloseParen ")"'), function($skip, $loc, $0, $1) {
+    var CloseParen$0 = $TV($EXPECT($L33, fail, 'CloseParen ")"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function CloseParen(state) {
@@ -13480,7 +13548,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CoffeeSubstitutionStart$0 = $TV($EXPECT($L108, fail, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
+    var CoffeeSubstitutionStart$0 = $TV($EXPECT($L109, fail, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "${" };
     });
     function CoffeeSubstitutionStart(state) {
@@ -13505,7 +13573,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Colon$0 = $TV($EXPECT($L31, fail, 'Colon ":"'), function($skip, $loc, $0, $1) {
+    var Colon$0 = $TV($EXPECT($L32, fail, 'Colon ":"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function Colon(state) {
@@ -13530,7 +13598,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Comma$0 = $TV($EXPECT($L19, fail, 'Comma ","'), function($skip, $loc, $0, $1) {
+    var Comma$0 = $TV($EXPECT($L20, fail, 'Comma ","'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function Comma(state) {
@@ -13555,7 +13623,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ConstructorShorthand$0 = $TV($EXPECT($L100, fail, 'ConstructorShorthand "@"'), function($skip, $loc, $0, $1) {
+    var ConstructorShorthand$0 = $TV($EXPECT($L101, fail, 'ConstructorShorthand "@"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "constructor" };
     });
     function ConstructorShorthand(state) {
@@ -13580,7 +13648,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Declare$0 = $TS($S($EXPECT($L109, fail, 'Declare "declare"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Declare$0 = $TS($S($EXPECT($L110, fail, 'Declare "declare"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Declare(state) {
@@ -13605,7 +13673,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Default$0 = $TS($S($EXPECT($L110, fail, 'Default "default"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Default$0 = $TS($S($EXPECT($L111, fail, 'Default "default"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Default(state) {
@@ -13630,7 +13698,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Delete$0 = $TS($S($EXPECT($L111, fail, 'Delete "delete"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Delete$0 = $TS($S($EXPECT($L112, fail, 'Delete "delete"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Delete(state) {
@@ -13655,7 +13723,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Do$0 = $TS($S($EXPECT($L112, fail, 'Do "do"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Do$0 = $TS($S($EXPECT($L113, fail, 'Do "do"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Do(state) {
@@ -13705,7 +13773,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var DotDot$0 = $TV($EXPECT($L113, fail, 'DotDot ".."'), function($skip, $loc, $0, $1) {
+    var DotDot$0 = $TV($EXPECT($L114, fail, 'DotDot ".."'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function DotDot(state) {
@@ -13730,7 +13798,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var DotDotDot$0 = $TV($EXPECT($L114, fail, 'DotDotDot "..."'), function($skip, $loc, $0, $1) {
+    var DotDotDot$0 = $TV($EXPECT($L115, fail, 'DotDotDot "..."'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function DotDotDot(state) {
@@ -13755,7 +13823,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var DoubleColon$0 = $TV($EXPECT($L115, fail, 'DoubleColon "::"'), function($skip, $loc, $0, $1) {
+    var DoubleColon$0 = $TV($EXPECT($L116, fail, 'DoubleColon "::"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function DoubleColon(state) {
@@ -13780,7 +13848,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var DoubleQuote$0 = $TV($EXPECT($L116, fail, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
+    var DoubleQuote$0 = $TV($EXPECT($L117, fail, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function DoubleQuote(state) {
@@ -13805,7 +13873,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Else$0 = $TS($S($EXPECT($L117, fail, 'Else "else"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Else$0 = $TS($S($EXPECT($L118, fail, 'Else "else"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Else(state) {
@@ -13855,7 +13923,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Export$0 = $TS($S($EXPECT($L118, fail, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Export$0 = $TS($S($EXPECT($L119, fail, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Export(state) {
@@ -13880,7 +13948,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Extends$0 = $TS($S($EXPECT($L119, fail, 'Extends "extends"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Extends$0 = $TS($S($EXPECT($L120, fail, 'Extends "extends"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Extends(state) {
@@ -13905,7 +13973,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Finally$0 = $TS($S($EXPECT($L120, fail, 'Finally "finally"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Finally$0 = $TS($S($EXPECT($L121, fail, 'Finally "finally"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Finally(state) {
@@ -13930,7 +13998,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var For$0 = $TS($S($EXPECT($L121, fail, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var For$0 = $TS($S($EXPECT($L122, fail, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function For(state) {
@@ -13955,7 +14023,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var From$0 = $TS($S($EXPECT($L122, fail, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var From$0 = $TS($S($EXPECT($L123, fail, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function From(state) {
@@ -13980,7 +14048,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Function$0 = $TS($S($EXPECT($L123, fail, 'Function "function"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Function$0 = $TS($S($EXPECT($L124, fail, 'Function "function"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Function(state) {
@@ -14005,7 +14073,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var GetOrSet$0 = $TS($S($C($EXPECT($L124, fail, 'GetOrSet "get"'), $EXPECT($L125, fail, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var GetOrSet$0 = $TS($S($C($EXPECT($L125, fail, 'GetOrSet "get"'), $EXPECT($L126, fail, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1, type: "GetOrSet" };
     });
     function GetOrSet(state) {
@@ -14030,7 +14098,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var If$0 = $TV($TEXT($S($EXPECT($L126, fail, 'If "if"'), NonIdContinue, $E($EXPECT($L8, fail, 'If " "')))), function($skip, $loc, $0, $1) {
+    var If$0 = $TV($TEXT($S($EXPECT($L127, fail, 'If "if"'), NonIdContinue, $E($EXPECT($L8, fail, 'If " "')))), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function If(state) {
@@ -14080,7 +14148,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var In$0 = $TS($S($EXPECT($L80, fail, 'In "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var In$0 = $TS($S($EXPECT($L81, fail, 'In "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function In(state) {
@@ -14105,7 +14173,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var LetOrConst$0 = $TS($S($C($EXPECT($L127, fail, 'LetOrConst "let"'), $EXPECT($L128, fail, 'LetOrConst "const"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var LetOrConst$0 = $TS($S($C($EXPECT($L128, fail, 'LetOrConst "let"'), $EXPECT($L129, fail, 'LetOrConst "const"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function LetOrConst(state) {
@@ -14130,7 +14198,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Loop$0 = $TS($S($EXPECT($L129, fail, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Loop$0 = $TS($S($EXPECT($L130, fail, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: "while(true)" };
     });
     function Loop(state) {
@@ -14155,7 +14223,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var New$0 = $TS($S($EXPECT($L130, fail, 'New "new"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var New$0 = $TS($S($EXPECT($L131, fail, 'New "new"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function New(state) {
@@ -14180,7 +14248,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Not$0 = $TS($S(CoffeeNotEnabled, $EXPECT($L51, fail, 'Not "not"'), NonIdContinue, $E($EXPECT($L8, fail, 'Not " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var Not$0 = $TS($S(CoffeeNotEnabled, $EXPECT($L52, fail, 'Not "not"'), NonIdContinue, $E($EXPECT($L8, fail, 'Not " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
       return { $loc, token: "!" };
     });
     function Not(state) {
@@ -14205,7 +14273,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Of$0 = $TS($S($EXPECT($L72, fail, 'Of "of"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Of$0 = $TS($S($EXPECT($L73, fail, 'Of "of"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Of(state) {
@@ -14230,7 +14298,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var OpenAngleBracket$0 = $TV($EXPECT($L131, fail, 'OpenAngleBracket "<"'), function($skip, $loc, $0, $1) {
+    var OpenAngleBracket$0 = $TV($EXPECT($L132, fail, 'OpenAngleBracket "<"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function OpenAngleBracket(state) {
@@ -14255,7 +14323,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var OpenBrace$0 = $TV($EXPECT($L132, fail, 'OpenBrace "{"'), function($skip, $loc, $0, $1) {
+    var OpenBrace$0 = $TV($EXPECT($L133, fail, 'OpenBrace "{"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function OpenBrace(state) {
@@ -14280,7 +14348,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var OpenBracket$0 = $TV($EXPECT($L96, fail, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
+    var OpenBracket$0 = $TV($EXPECT($L97, fail, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function OpenBracket(state) {
@@ -14330,7 +14398,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Operator$0 = $TS($S($EXPECT($L133, fail, 'Operator "operator"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Operator$0 = $TS($S($EXPECT($L134, fail, 'Operator "operator"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Operator(state) {
@@ -14355,7 +14423,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Public$0 = $TS($S($EXPECT($L134, fail, 'Public "public"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Public$0 = $TS($S($EXPECT($L135, fail, 'Public "public"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Public(state) {
@@ -14380,7 +14448,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Private$0 = $TS($S($EXPECT($L135, fail, 'Private "private"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Private$0 = $TS($S($EXPECT($L136, fail, 'Private "private"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Private(state) {
@@ -14405,7 +14473,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Protected$0 = $TS($S($EXPECT($L136, fail, 'Protected "protected"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Protected$0 = $TS($S($EXPECT($L137, fail, 'Protected "protected"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Protected(state) {
@@ -14430,13 +14498,13 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Pipe$0 = $TV($EXPECT($L137, fail, 'Pipe "||>"'), function($skip, $loc, $0, $1) {
+    var Pipe$0 = $TV($EXPECT($L138, fail, 'Pipe "||>"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
-    var Pipe$1 = $TV($EXPECT($L138, fail, 'Pipe "|>="'), function($skip, $loc, $0, $1) {
+    var Pipe$1 = $TV($EXPECT($L139, fail, 'Pipe "|>="'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
-    var Pipe$2 = $TV($EXPECT($L139, fail, 'Pipe "|>"'), function($skip, $loc, $0, $1) {
+    var Pipe$2 = $TV($EXPECT($L140, fail, 'Pipe "|>"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function Pipe(state) {
@@ -14486,7 +14554,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Readonly$0 = $TS($S($EXPECT($L140, fail, 'Readonly "readonly"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Readonly$0 = $TS($S($EXPECT($L141, fail, 'Readonly "readonly"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1, ts: true };
     });
     function Readonly(state) {
@@ -14511,7 +14579,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Return$0 = $TS($S($EXPECT($L141, fail, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Return$0 = $TS($S($EXPECT($L142, fail, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Return(state) {
@@ -14536,7 +14604,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Satisfies$0 = $TS($S($EXPECT($L142, fail, 'Satisfies "satisfies"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Satisfies$0 = $TS($S($EXPECT($L143, fail, 'Satisfies "satisfies"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Satisfies(state) {
@@ -14561,7 +14629,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Semicolon$0 = $TV($EXPECT($L84, fail, 'Semicolon ";"'), function($skip, $loc, $0, $1) {
+    var Semicolon$0 = $TV($EXPECT($L85, fail, 'Semicolon ";"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function Semicolon(state) {
@@ -14586,7 +14654,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var SingleQuote$0 = $TV($EXPECT($L143, fail, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
+    var SingleQuote$0 = $TV($EXPECT($L144, fail, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function SingleQuote(state) {
@@ -14611,7 +14679,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Star$0 = $TV($EXPECT($L53, fail, 'Star "*"'), function($skip, $loc, $0, $1) {
+    var Star$0 = $TV($EXPECT($L54, fail, 'Star "*"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function Star(state) {
@@ -14636,10 +14704,10 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Static$0 = $TS($S($EXPECT($L144, fail, 'Static "static"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Static$0 = $TS($S($EXPECT($L145, fail, 'Static "static"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
-    var Static$1 = $TS($S($EXPECT($L100, fail, 'Static "@"'), $N($C($EXPECT($L2, fail, 'Static "("'), $EXPECT($L100, fail, 'Static "@"')))), function($skip, $loc, $0, $1, $2) {
+    var Static$1 = $TS($S($EXPECT($L101, fail, 'Static "@"'), $N($C($EXPECT($L2, fail, 'Static "("'), $EXPECT($L101, fail, 'Static "@"')))), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: "static " };
     });
     function Static(state) {
@@ -14664,7 +14732,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var SubstitutionStart$0 = $TV($EXPECT($L145, fail, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
+    var SubstitutionStart$0 = $TV($EXPECT($L146, fail, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function SubstitutionStart(state) {
@@ -14689,7 +14757,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Switch$0 = $TS($S($EXPECT($L146, fail, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Switch$0 = $TS($S($EXPECT($L147, fail, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Switch(state) {
@@ -14714,7 +14782,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Target$0 = $TS($S($EXPECT($L147, fail, 'Target "target"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Target$0 = $TS($S($EXPECT($L148, fail, 'Target "target"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Target(state) {
@@ -14739,7 +14807,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Then$0 = $TS($S(__, $EXPECT($L148, fail, 'Then "then"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
+    var Then$0 = $TS($S(__, $EXPECT($L149, fail, 'Then "then"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
       return { $loc, token: "" };
     });
     function Then(state) {
@@ -14764,7 +14832,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var This$0 = $TS($S($EXPECT($L149, fail, 'This "this"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var This$0 = $TS($S($EXPECT($L150, fail, 'This "this"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function This(state) {
@@ -14789,7 +14857,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Throw$0 = $TS($S($EXPECT($L150, fail, 'Throw "throw"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Throw$0 = $TS($S($EXPECT($L151, fail, 'Throw "throw"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Throw(state) {
@@ -14814,7 +14882,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TripleDoubleQuote$0 = $TV($EXPECT($L151, fail, 'TripleDoubleQuote "\\\\\\"\\\\\\"\\\\\\""'), function($skip, $loc, $0, $1) {
+    var TripleDoubleQuote$0 = $TV($EXPECT($L152, fail, 'TripleDoubleQuote "\\\\\\"\\\\\\"\\\\\\""'), function($skip, $loc, $0, $1) {
       return { $loc, token: "`" };
     });
     function TripleDoubleQuote(state) {
@@ -14839,7 +14907,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TripleSingleQuote$0 = $TV($EXPECT($L152, fail, `TripleSingleQuote "'''"`), function($skip, $loc, $0, $1) {
+    var TripleSingleQuote$0 = $TV($EXPECT($L153, fail, `TripleSingleQuote "'''"`), function($skip, $loc, $0, $1) {
       return { $loc, token: "`" };
     });
     function TripleSingleQuote(state) {
@@ -14864,7 +14932,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TripleSlash$0 = $TV($EXPECT($L153, fail, 'TripleSlash "///"'), function($skip, $loc, $0, $1) {
+    var TripleSlash$0 = $TV($EXPECT($L154, fail, 'TripleSlash "///"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "/" };
     });
     function TripleSlash(state) {
@@ -14889,7 +14957,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TripleTick$0 = $TV($EXPECT($L154, fail, 'TripleTick "```"'), function($skip, $loc, $0, $1) {
+    var TripleTick$0 = $TV($EXPECT($L155, fail, 'TripleTick "```"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "`" };
     });
     function TripleTick(state) {
@@ -14914,7 +14982,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Try$0 = $TS($S($EXPECT($L155, fail, 'Try "try"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Try$0 = $TS($S($EXPECT($L156, fail, 'Try "try"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Try(state) {
@@ -14939,7 +15007,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Typeof$0 = $TS($S($EXPECT($L156, fail, 'Typeof "typeof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Typeof$0 = $TS($S($EXPECT($L157, fail, 'Typeof "typeof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Typeof(state) {
@@ -14964,7 +15032,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Unless$0 = $TS($S($EXPECT($L157, fail, 'Unless "unless"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Unless$0 = $TS($S($EXPECT($L158, fail, 'Unless "unless"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Unless(state) {
@@ -14989,7 +15057,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Until$0 = $TS($S($EXPECT($L158, fail, 'Until "until"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Until$0 = $TS($S($EXPECT($L159, fail, 'Until "until"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Until(state) {
@@ -15014,7 +15082,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Var$0 = $TS($S($EXPECT($L159, fail, 'Var "var"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Var$0 = $TS($S($EXPECT($L160, fail, 'Var "var"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Var(state) {
@@ -15039,7 +15107,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Void$0 = $TS($S($EXPECT($L160, fail, 'Void "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Void$0 = $TS($S($EXPECT($L161, fail, 'Void "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Void(state) {
@@ -15064,7 +15132,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var When$0 = $TS($S($EXPECT($L161, fail, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var When$0 = $TS($S($EXPECT($L162, fail, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: "case" };
     });
     function When(state) {
@@ -15089,7 +15157,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var While$0 = $TS($S($EXPECT($L162, fail, 'While "while"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var While$0 = $TS($S($EXPECT($L163, fail, 'While "while"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function While(state) {
@@ -15114,7 +15182,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Yield$0 = $TS($S($EXPECT($L163, fail, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Yield$0 = $TS($S($EXPECT($L164, fail, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Yield(state) {
@@ -15259,7 +15327,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXSelfClosingElement$0 = $TS($S($EXPECT($L131, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L164, fail, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var JSXSelfClosingElement$0 = $TS($S($EXPECT($L132, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L165, fail, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       return { type: "JSXElement", children: $0, tag: $2 };
     });
     function JSXSelfClosingElement(state) {
@@ -15310,7 +15378,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var PopJSXStack$0 = $TV($EXPECT($L18, fail, 'PopJSXStack ""'), function($skip, $loc, $0, $1) {
+    var PopJSXStack$0 = $TV($EXPECT($L19, fail, 'PopJSXStack ""'), function($skip, $loc, $0, $1) {
       module.JSXTagStack.pop();
     });
     function PopJSXStack(state) {
@@ -15335,7 +15403,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXOpeningElement$0 = $S($EXPECT($L131, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L29, fail, 'JSXOpeningElement ">"'));
+    var JSXOpeningElement$0 = $S($EXPECT($L132, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L30, fail, 'JSXOpeningElement ">"'));
     function JSXOpeningElement(state) {
       let eventData;
       if (state.events) {
@@ -15364,7 +15432,7 @@ ${input.slice(result.pos)}
         return $skip;
       return $0;
     });
-    var JSXOptionalClosingElement$1 = $EXPECT($L18, fail, 'JSXOptionalClosingElement ""');
+    var JSXOptionalClosingElement$1 = $EXPECT($L19, fail, 'JSXOptionalClosingElement ""');
     function JSXOptionalClosingElement(state) {
       let eventData;
       if (state.events) {
@@ -15387,7 +15455,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXClosingElement$0 = $S($EXPECT($L165, fail, 'JSXClosingElement "</"'), $E(Whitespace), $TEXT(JSXElementName), $E(Whitespace), $EXPECT($L29, fail, 'JSXClosingElement ">"'));
+    var JSXClosingElement$0 = $S($EXPECT($L166, fail, 'JSXClosingElement "</"'), $E(Whitespace), $TEXT(JSXElementName), $E(Whitespace), $EXPECT($L30, fail, 'JSXClosingElement ">"'));
     function JSXClosingElement(state) {
       let eventData;
       if (state.events) {
@@ -15425,7 +15493,7 @@ ${input.slice(result.pos)}
       ];
       return { type: "JSXFragment", children: parts, jsxChildren: children.jsxChildren };
     });
-    var JSXFragment$1 = $TS($S(CoffeeJSXEnabled, $EXPECT($L166, fail, 'JSXFragment "<>"'), $E(JSXChildren), $E(Whitespace), JSXClosingFragment), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var JSXFragment$1 = $TS($S(CoffeeJSXEnabled, $EXPECT($L167, fail, 'JSXFragment "<>"'), $E(JSXChildren), $E(Whitespace), JSXClosingFragment), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var children = $3;
       $0 = $0.slice(1);
       return {
@@ -15456,7 +15524,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var PushJSXOpeningFragment$0 = $TV($EXPECT($L166, fail, 'PushJSXOpeningFragment "<>"'), function($skip, $loc, $0, $1) {
+    var PushJSXOpeningFragment$0 = $TV($EXPECT($L167, fail, 'PushJSXOpeningFragment "<>"'), function($skip, $loc, $0, $1) {
       module.JSXTagStack.push("");
       return $1;
     });
@@ -15487,7 +15555,7 @@ ${input.slice(result.pos)}
         return $skip;
       return $0;
     });
-    var JSXOptionalClosingFragment$1 = $EXPECT($L18, fail, 'JSXOptionalClosingFragment ""');
+    var JSXOptionalClosingFragment$1 = $EXPECT($L19, fail, 'JSXOptionalClosingFragment ""');
     function JSXOptionalClosingFragment(state) {
       let eventData;
       if (state.events) {
@@ -15510,7 +15578,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXClosingFragment$0 = $EXPECT($L167, fail, 'JSXClosingFragment "</>"');
+    var JSXClosingFragment$0 = $EXPECT($L168, fail, 'JSXClosingFragment "</>"');
     function JSXClosingFragment(state) {
       let eventData;
       if (state.events) {
@@ -16277,7 +16345,7 @@ ${input.slice(result.pos)}
       }
       return $skip;
     });
-    var JSXNestedChildren$1 = $TV($Y($C(JSXEOS, $EXPECT($L21, fail, 'JSXNestedChildren "}"'), JSXClosingElement, JSXClosingFragment)), function($skip, $loc, $0, $1) {
+    var JSXNestedChildren$1 = $TV($Y($C(JSXEOS, $EXPECT($L22, fail, 'JSXNestedChildren "}"'), JSXClosingElement, JSXClosingFragment)), function($skip, $loc, $0, $1) {
       return { children: [], jsxChildren: [] };
     });
     function JSXNestedChildren(state) {
@@ -16406,7 +16474,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXComment$0 = $TS($S($EXPECT($L168, fail, 'JSXComment "<!--"'), JSXCommentContent, $EXPECT($L169, fail, 'JSXComment "-->"')), function($skip, $loc, $0, $1, $2, $3) {
+    var JSXComment$0 = $TS($S($EXPECT($L169, fail, 'JSXComment "<!--"'), JSXCommentContent, $EXPECT($L170, fail, 'JSXComment "-->"')), function($skip, $loc, $0, $1, $2, $3) {
       return ["{/*", $2, "*/}"];
     });
     function JSXComment(state) {
@@ -16704,7 +16772,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeKeyword$0 = $S($EXPECT($L170, fail, 'TypeKeyword "type"'), NonIdContinue);
+    var TypeKeyword$0 = $S($EXPECT($L171, fail, 'TypeKeyword "type"'), NonIdContinue);
     function TypeKeyword(state) {
       let eventData;
       if (state.events) {
@@ -16727,7 +16795,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Interface$0 = $S($EXPECT($L171, fail, 'Interface "interface"'), NonIdContinue);
+    var Interface$0 = $S($EXPECT($L172, fail, 'Interface "interface"'), NonIdContinue);
     function Interface(state) {
       let eventData;
       if (state.events) {
@@ -16750,7 +16818,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Namespace$0 = $S($EXPECT($L172, fail, 'Namespace "namespace"'), NonIdContinue);
+    var Namespace$0 = $S($EXPECT($L173, fail, 'Namespace "namespace"'), NonIdContinue);
     function Namespace(state) {
       let eventData;
       if (state.events) {
@@ -16998,7 +17066,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R57, fail, "TypeIndexSignature /[+-]?/")), $EXPECT($L140, fail, 'TypeIndexSignature "readonly"'), __)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R58, fail, "TypeIndexSignature /[+-]/")), QuestionMark)));
+    var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R57, fail, "TypeIndexSignature /[+-]?/")), $EXPECT($L141, fail, 'TypeIndexSignature "readonly"'), __)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R58, fail, "TypeIndexSignature /[+-]/")), QuestionMark)));
     function TypeIndexSignature(state) {
       let eventData;
       if (state.events) {
@@ -17045,7 +17113,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeSuffix$0 = $T($S($E(QuestionMark), __, Colon, Type), function(value) {
+    var TypeSuffix$0 = $T($S($E(QuestionMark), $E(_), Colon, Type), function(value) {
       return { "type": "TypeSuffix", "ts": true, "children": value };
     });
     function TypeSuffix(state) {
@@ -17070,14 +17138,20 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ReturnTypeSuffix$0 = $TS($S(__, Colon, $E($S(__, $EXPECT($L173, fail, 'ReturnTypeSuffix "asserts"'), NonIdContinue)), TypePredicate), function($skip, $loc, $0, $1, $2, $3, $4) {
-      const children = [...$1, $2];
-      if ($3)
-        children.push($3);
-      children.push($4);
+    var ReturnTypeSuffix$0 = $TS($S($E(_), Colon, $E($S(__, $EXPECT($L174, fail, 'ReturnTypeSuffix "asserts"'), NonIdContinue)), TypePredicate), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var asserts = $3;
+      var t = $4;
+      if (asserts) {
+        t = {
+          type: "AssertsType",
+          t,
+          children: [asserts[0], asserts[1], t]
+        };
+      }
       return {
         type: "ReturnTypeAnnotation",
-        children,
+        children: [$1, $2, t],
+        t,
         ts: true
       };
     });
@@ -17103,10 +17177,17 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypePredicate$0 = $TS($S(Type, $E($S(__, $EXPECT($L81, fail, 'TypePredicate "is"'), NonIdContinue, Type))), function($skip, $loc, $0, $1, $2) {
-      if (!$2)
-        return $1;
-      return $0;
+    var TypePredicate$0 = $TS($S(Type, $E($S(__, $EXPECT($L82, fail, 'TypePredicate "is"'), NonIdContinue, Type))), function($skip, $loc, $0, $1, $2) {
+      var lhs = $1;
+      var rhs = $2;
+      if (!rhs)
+        return lhs;
+      return {
+        type: "TypePredicate",
+        lhs,
+        rhs: rhs[3],
+        children: [lhs, ...rhs]
+      };
     });
     function TypePredicate(state) {
       let eventData;
@@ -17181,6 +17262,8 @@ ${input.slice(result.pos)}
       }
     }
     var TypeUnary$0 = $TS($S($Q($S(__, TypeUnaryOp, NonIdContinue)), TypePrimary, $Q(TypeUnarySuffix)), function($skip, $loc, $0, $1, $2, $3) {
+      if (!$1.length && !$3.length)
+        return $2;
       return [...$1, $2, ...$3];
     });
     function TypeUnary(state) {
@@ -17229,10 +17312,10 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeUnaryOp$0 = $S($EXPECT($L174, fail, 'TypeUnaryOp "keyof"'), NonIdContinue);
-    var TypeUnaryOp$1 = $S($EXPECT($L156, fail, 'TypeUnaryOp "typeof"'), NonIdContinue);
-    var TypeUnaryOp$2 = $S($EXPECT($L175, fail, 'TypeUnaryOp "infer"'), NonIdContinue);
-    var TypeUnaryOp$3 = $S($EXPECT($L140, fail, 'TypeUnaryOp "readonly"'), NonIdContinue);
+    var TypeUnaryOp$0 = $S($EXPECT($L175, fail, 'TypeUnaryOp "keyof"'), NonIdContinue);
+    var TypeUnaryOp$1 = $S($EXPECT($L157, fail, 'TypeUnaryOp "typeof"'), NonIdContinue);
+    var TypeUnaryOp$2 = $S($EXPECT($L176, fail, 'TypeUnaryOp "infer"'), NonIdContinue);
+    var TypeUnaryOp$3 = $S($EXPECT($L141, fail, 'TypeUnaryOp "readonly"'), NonIdContinue);
     function TypeUnaryOp(state) {
       let eventData;
       if (state.events) {
@@ -17283,8 +17366,23 @@ ${input.slice(result.pos)}
     var TypePrimary$2 = $S($E(_), InlineInterfaceLiteral);
     var TypePrimary$3 = $S($E(_), TypeTuple);
     var TypePrimary$4 = $S($E(_), ImportType);
-    var TypePrimary$5 = $S($E(_), TypeLiteral);
-    var TypePrimary$6 = $S($E(_), IdentifierName, $Q($S(Dot, IdentifierName)), $E(TypeArguments));
+    var TypePrimary$5 = $TS($S($E(_), TypeLiteral), function($skip, $loc, $0, $1, $2) {
+      var t = $2;
+      return {
+        type: "LiteralType",
+        t,
+        children: $0
+      };
+    });
+    var TypePrimary$6 = $TS($S($E(_), IdentifierName, $Q($S(Dot, IdentifierName)), $E(TypeArguments)), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var args = $4;
+      return {
+        type: "IdentifierType",
+        children: $0,
+        raw: [$2.name, ...$3.map(([dot, id]) => dot.token + id.name)].join(""),
+        args
+      };
+    });
     var TypePrimary$7 = $S(__, OpenParen, $C(Type, $S(EOS, Type)), __, CloseParen);
     function TypePrimary(state) {
       let eventData;
@@ -17430,7 +17528,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeConditional$0 = $TS($S(TypeBinary, $E($S(__, $EXPECT($L119, fail, '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($L120, fail, 'TypeConditional "extends"'), NonIdContinue, Type, $E($S(__, QuestionMark, Type, __, Colon, Type))))), function($skip, $loc, $0, $1, $2) {
       if ($2)
         return $0;
       return $1;
@@ -17459,10 +17557,10 @@ ${input.slice(result.pos)}
     }
     var TypeLiteral$0 = TemplateLiteral;
     var TypeLiteral$1 = Literal;
-    var TypeLiteral$2 = $TS($S($EXPECT($L160, fail, 'TypeLiteral "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
-      return { $loc, token: "void" };
+    var TypeLiteral$2 = $TS($S($EXPECT($L161, fail, 'TypeLiteral "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      return { type: "VoidType", $loc, token: $1 };
     });
-    var TypeLiteral$3 = $TV($EXPECT($L176, fail, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
+    var TypeLiteral$3 = $TV($EXPECT($L177, fail, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "[]" };
     });
     function TypeLiteral(state) {
@@ -17537,7 +17635,7 @@ ${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($L31, fail, 'InlineInterfacePropertyDelimiter ":"'), $EXPECT($L32, fail, 'InlineInterfacePropertyDelimiter ")"'), $EXPECT($L30, fail, 'InlineInterfacePropertyDelimiter "]"'), $EXPECT($L21, fail, 'InlineInterfacePropertyDelimiter "}"'))));
+    var InlineInterfacePropertyDelimiter$2 = $Y($S(__, $C($EXPECT($L32, fail, 'InlineInterfacePropertyDelimiter ":"'), $EXPECT($L33, fail, 'InlineInterfacePropertyDelimiter ")"'), $EXPECT($L31, fail, 'InlineInterfacePropertyDelimiter "]"'), $EXPECT($L22, fail, 'InlineInterfacePropertyDelimiter "}"'))));
     var InlineInterfacePropertyDelimiter$3 = $Y(EOS);
     function InlineInterfacePropertyDelimiter(state) {
       let eventData;
@@ -17561,10 +17659,10 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeBinaryOp$0 = $TV($EXPECT($L83, fail, 'TypeBinaryOp "|"'), function($skip, $loc, $0, $1) {
+    var TypeBinaryOp$0 = $TV($EXPECT($L84, fail, 'TypeBinaryOp "|"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "|" };
     });
-    var TypeBinaryOp$1 = $TV($EXPECT($L82, fail, 'TypeBinaryOp "&"'), function($skip, $loc, $0, $1) {
+    var TypeBinaryOp$1 = $TV($EXPECT($L83, fail, 'TypeBinaryOp "&"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "&" };
     });
     function TypeBinaryOp(state) {
@@ -17621,7 +17719,7 @@ ${input.slice(result.pos)}
     var TypeArrowFunction$0 = $TV($EXPECT($L7, fail, 'TypeArrowFunction "=>"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "=>" };
     });
-    var TypeArrowFunction$1 = $TV($EXPECT($L20, fail, 'TypeArrowFunction "->"'), function($skip, $loc, $0, $1) {
+    var TypeArrowFunction$1 = $TV($EXPECT($L21, fail, 'TypeArrowFunction "->"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "=>" };
     });
     function TypeArrowFunction(state) {
@@ -17646,7 +17744,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeArguments$0 = $TS($S($EXPECT($L131, fail, 'TypeArguments "<"'), $P(TypeArgument), __, $EXPECT($L29, fail, 'TypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var TypeArguments$0 = $TS($S($EXPECT($L132, fail, 'TypeArguments "<"'), $P(TypeArgument), __, $EXPECT($L30, fail, 'TypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4) {
       return { ts: true, children: $0 };
     });
     function TypeArguments(state) {
@@ -17717,7 +17815,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeParameters$0 = $TS($S(__, $EXPECT($L131, fail, 'TypeParameters "<"'), $P(TypeParameter), __, $EXPECT($L29, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var TypeParameters$0 = $TS($S(__, $EXPECT($L132, fail, 'TypeParameters "<"'), $P(TypeParameter), __, $EXPECT($L30, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var parameters = $3;
       return {
         type: "TypeParameters",
@@ -17771,7 +17869,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeConstraint$0 = $S(__, $EXPECT($L119, fail, 'TypeConstraint "extends"'), NonIdContinue, Type);
+    var TypeConstraint$0 = $S(__, $EXPECT($L120, fail, 'TypeConstraint "extends"'), NonIdContinue, Type);
     function TypeConstraint(state) {
       let eventData;
       if (state.events) {
@@ -17818,7 +17916,7 @@ ${input.slice(result.pos)}
       }
     }
     var TypeParameterDelimiter$0 = $S($Q(_), Comma);
-    var TypeParameterDelimiter$1 = $Y($S(__, $EXPECT($L29, fail, 'TypeParameterDelimiter ">"')));
+    var TypeParameterDelimiter$1 = $Y($S(__, $EXPECT($L30, fail, 'TypeParameterDelimiter ">"')));
     var TypeParameterDelimiter$2 = $T($S($Y(EOS), InsertComma), function(value) {
       return value[1];
     });
@@ -17922,7 +18020,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CivetPrologueContent$0 = $TS($S($EXPECT($L177, fail, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R61, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var CivetPrologueContent$0 = $TS($S($EXPECT($L178, fail, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R61, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
       var options = $3;
       return {
         type: "CivetPrologue",
@@ -18083,7 +18181,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var DebugHere$0 = $TV($EXPECT($L18, fail, 'DebugHere ""'), function($skip, $loc, $0, $1) {
+    var DebugHere$0 = $TV($EXPECT($L19, fail, 'DebugHere ""'), function($skip, $loc, $0, $1) {
       debugger;
     });
     function DebugHere(state) {
@@ -18108,7 +18206,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InsertSemicolon$0 = $TV($EXPECT($L18, fail, 'InsertSemicolon ""'), function($skip, $loc, $0, $1) {
+    var InsertSemicolon$0 = $TV($EXPECT($L19, fail, 'InsertSemicolon ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: ";" };
     });
     function InsertSemicolon(state) {
@@ -18133,7 +18231,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InsertOpenParen$0 = $TV($EXPECT($L18, fail, 'InsertOpenParen ""'), function($skip, $loc, $0, $1) {
+    var InsertOpenParen$0 = $TV($EXPECT($L19, fail, 'InsertOpenParen ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: "(" };
     });
     function InsertOpenParen(state) {
@@ -18158,7 +18256,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InsertCloseParen$0 = $TV($EXPECT($L18, fail, 'InsertCloseParen ""'), function($skip, $loc, $0, $1) {
+    var InsertCloseParen$0 = $TV($EXPECT($L19, fail, 'InsertCloseParen ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: ")" };
     });
     function InsertCloseParen(state) {
@@ -18183,7 +18281,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InsertOpenBrace$0 = $TV($EXPECT($L18, fail, 'InsertOpenBrace ""'), function($skip, $loc, $0, $1) {
+    var InsertOpenBrace$0 = $TV($EXPECT($L19, fail, 'InsertOpenBrace ""'), function($skip, $loc, $0, $1) {
       return [{ $loc, token: " " }, { $loc, token: "{" }];
     });
     function InsertOpenBrace(state) {
@@ -18208,7 +18306,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InsertInlineOpenBrace$0 = $TV($EXPECT($L18, fail, 'InsertInlineOpenBrace ""'), function($skip, $loc, $0, $1) {
+    var InsertInlineOpenBrace$0 = $TV($EXPECT($L19, fail, 'InsertInlineOpenBrace ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: "{" };
     });
     function InsertInlineOpenBrace(state) {
@@ -18233,7 +18331,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InsertCloseBrace$0 = $TV($EXPECT($L18, fail, 'InsertCloseBrace ""'), function($skip, $loc, $0, $1) {
+    var InsertCloseBrace$0 = $TV($EXPECT($L19, fail, 'InsertCloseBrace ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: "}" };
     });
     function InsertCloseBrace(state) {
@@ -18258,7 +18356,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InsertOpenBracket$0 = $TV($EXPECT($L18, fail, 'InsertOpenBracket ""'), function($skip, $loc, $0, $1) {
+    var InsertOpenBracket$0 = $TV($EXPECT($L19, fail, 'InsertOpenBracket ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: "[" };
     });
     function InsertOpenBracket(state) {
@@ -18283,7 +18381,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InsertCloseBracket$0 = $TV($EXPECT($L18, fail, 'InsertCloseBracket ""'), function($skip, $loc, $0, $1) {
+    var InsertCloseBracket$0 = $TV($EXPECT($L19, fail, 'InsertCloseBracket ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: "]" };
     });
     function InsertCloseBracket(state) {
@@ -18308,7 +18406,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InsertComma$0 = $TV($EXPECT($L18, fail, 'InsertComma ""'), function($skip, $loc, $0, $1) {
+    var InsertComma$0 = $TV($EXPECT($L19, fail, 'InsertComma ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: "," };
     });
     function InsertComma(state) {
@@ -18333,7 +18431,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InsertConst$0 = $TV($EXPECT($L18, fail, 'InsertConst ""'), function($skip, $loc, $0, $1) {
+    var InsertConst$0 = $TV($EXPECT($L19, fail, 'InsertConst ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: "const " };
     });
     function InsertConst(state) {
@@ -18358,7 +18456,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InsertLet$0 = $TV($EXPECT($L18, fail, 'InsertLet ""'), function($skip, $loc, $0, $1) {
+    var InsertLet$0 = $TV($EXPECT($L19, fail, 'InsertLet ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: "let " };
     });
     function InsertLet(state) {
@@ -18383,7 +18481,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InsertReadonly$0 = $TV($EXPECT($L18, fail, 'InsertReadonly ""'), function($skip, $loc, $0, $1) {
+    var InsertReadonly$0 = $TV($EXPECT($L19, fail, 'InsertReadonly ""'), function($skip, $loc, $0, $1) {
       return { ts: true, children: [{ $loc, token: "readonly " }] };
     });
     function InsertReadonly(state) {
@@ -18408,7 +18506,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InsertNewline$0 = $TV($EXPECT($L18, fail, 'InsertNewline ""'), function($skip, $loc, $0, $1) {
+    var InsertNewline$0 = $TV($EXPECT($L19, fail, 'InsertNewline ""'), function($skip, $loc, $0, $1) {
       return "\n";
     });
     function InsertNewline(state) {
@@ -18433,7 +18531,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InsertIndent$0 = $TV($EXPECT($L18, fail, 'InsertIndent ""'), function($skip, $loc, $0, $1) {
+    var InsertIndent$0 = $TV($EXPECT($L19, fail, 'InsertIndent ""'), function($skip, $loc, $0, $1) {
       return module.currentIndent.token;
     });
     function InsertIndent(state) {
@@ -18458,7 +18556,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InsertSpace$0 = $TV($EXPECT($L18, fail, 'InsertSpace ""'), function($skip, $loc, $0, $1) {
+    var InsertSpace$0 = $TV($EXPECT($L19, fail, 'InsertSpace ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: " " };
     });
     function InsertSpace(state) {
@@ -18483,7 +18581,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InsertDot$0 = $TV($EXPECT($L18, fail, 'InsertDot ""'), function($skip, $loc, $0, $1) {
+    var InsertDot$0 = $TV($EXPECT($L19, fail, 'InsertDot ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: "." };
     });
     function InsertDot(state) {
@@ -18508,7 +18606,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InsertBreak$0 = $TV($EXPECT($L18, fail, 'InsertBreak ""'), function($skip, $loc, $0, $1) {
+    var InsertBreak$0 = $TV($EXPECT($L19, fail, 'InsertBreak ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: ";break;" };
     });
     function InsertBreak(state) {
@@ -18533,7 +18631,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InsertVar$0 = $TV($EXPECT($L18, fail, 'InsertVar ""'), function($skip, $loc, $0, $1) {
+    var InsertVar$0 = $TV($EXPECT($L19, fail, 'InsertVar ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: "var " };
     });
     function InsertVar(state) {
@@ -18558,7 +18656,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CoffeeBinaryExistentialEnabled$0 = $TV($EXPECT($L18, fail, 'CoffeeBinaryExistentialEnabled ""'), function($skip, $loc, $0, $1) {
+    var CoffeeBinaryExistentialEnabled$0 = $TV($EXPECT($L19, fail, 'CoffeeBinaryExistentialEnabled ""'), function($skip, $loc, $0, $1) {
       if (module.config.coffeeBinaryExistential)
         return;
       return $skip;
@@ -18585,7 +18683,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CoffeeBooleansEnabled$0 = $TV($EXPECT($L18, fail, 'CoffeeBooleansEnabled ""'), function($skip, $loc, $0, $1) {
+    var CoffeeBooleansEnabled$0 = $TV($EXPECT($L19, fail, 'CoffeeBooleansEnabled ""'), function($skip, $loc, $0, $1) {
       if (module.config.coffeeBooleans)
         return;
       return $skip;
@@ -18612,7 +18710,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CoffeeClassesEnabled$0 = $TV($EXPECT($L18, fail, 'CoffeeClassesEnabled ""'), function($skip, $loc, $0, $1) {
+    var CoffeeClassesEnabled$0 = $TV($EXPECT($L19, fail, 'CoffeeClassesEnabled ""'), function($skip, $loc, $0, $1) {
       if (module.config.coffeeClasses)
         return;
       return $skip;
@@ -18639,7 +18737,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CoffeeCommentEnabled$0 = $TV($EXPECT($L18, fail, 'CoffeeCommentEnabled ""'), function($skip, $loc, $0, $1) {
+    var CoffeeCommentEnabled$0 = $TV($EXPECT($L19, fail, 'CoffeeCommentEnabled ""'), function($skip, $loc, $0, $1) {
       if (module.config.coffeeComment)
         return;
       return $skip;
@@ -18666,7 +18764,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CoffeeDoEnabled$0 = $TV($EXPECT($L18, fail, 'CoffeeDoEnabled ""'), function($skip, $loc, $0, $1) {
+    var CoffeeDoEnabled$0 = $TV($EXPECT($L19, fail, 'CoffeeDoEnabled ""'), function($skip, $loc, $0, $1) {
       if (module.config.coffeeDo)
         return;
       return $skip;
@@ -18693,7 +18791,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CoffeeForLoopsEnabled$0 = $TV($EXPECT($L18, fail, 'CoffeeForLoopsEnabled ""'), function($skip, $loc, $0, $1) {
+    var CoffeeForLoopsEnabled$0 = $TV($EXPECT($L19, fail, 'CoffeeForLoopsEnabled ""'), function($skip, $loc, $0, $1) {
       if (module.config.coffeeForLoops)
         return;
       return $skip;
@@ -18720,7 +18818,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CoffeeInterpolationEnabled$0 = $TV($EXPECT($L18, fail, 'CoffeeInterpolationEnabled ""'), function($skip, $loc, $0, $1) {
+    var CoffeeInterpolationEnabled$0 = $TV($EXPECT($L19, fail, 'CoffeeInterpolationEnabled ""'), function($skip, $loc, $0, $1) {
       if (module.config.coffeeInterpolation)
         return;
       return $skip;
@@ -18747,7 +18845,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CoffeeIsntEnabled$0 = $TV($EXPECT($L18, fail, 'CoffeeIsntEnabled ""'), function($skip, $loc, $0, $1) {
+    var CoffeeIsntEnabled$0 = $TV($EXPECT($L19, fail, 'CoffeeIsntEnabled ""'), function($skip, $loc, $0, $1) {
       if (module.config.coffeeIsnt)
         return;
       return $skip;
@@ -18774,7 +18872,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CoffeeJSXEnabled$0 = $TV($EXPECT($L18, fail, 'CoffeeJSXEnabled ""'), function($skip, $loc, $0, $1) {
+    var CoffeeJSXEnabled$0 = $TV($EXPECT($L19, fail, 'CoffeeJSXEnabled ""'), function($skip, $loc, $0, $1) {
       if (module.config.coffeeJSX)
         return;
       return $skip;
@@ -18801,7 +18899,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CoffeeLineContinuationEnabled$0 = $TV($EXPECT($L18, fail, 'CoffeeLineContinuationEnabled ""'), function($skip, $loc, $0, $1) {
+    var CoffeeLineContinuationEnabled$0 = $TV($EXPECT($L19, fail, 'CoffeeLineContinuationEnabled ""'), function($skip, $loc, $0, $1) {
       if (module.config.coffeeLineContinuation)
         return;
       return $skip;
@@ -18828,7 +18926,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CoffeeNotEnabled$0 = $TV($EXPECT($L18, fail, 'CoffeeNotEnabled ""'), function($skip, $loc, $0, $1) {
+    var CoffeeNotEnabled$0 = $TV($EXPECT($L19, fail, 'CoffeeNotEnabled ""'), function($skip, $loc, $0, $1) {
       if (module.config.coffeeNot)
         return;
       return $skip;
@@ -18855,7 +18953,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CoffeeOfEnabled$0 = $TV($EXPECT($L18, fail, 'CoffeeOfEnabled ""'), function($skip, $loc, $0, $1) {
+    var CoffeeOfEnabled$0 = $TV($EXPECT($L19, fail, 'CoffeeOfEnabled ""'), function($skip, $loc, $0, $1) {
       if (module.config.coffeeOf)
         return;
       return $skip;
@@ -18882,7 +18980,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CoffeePrototypeEnabled$0 = $TV($EXPECT($L18, fail, 'CoffeePrototypeEnabled ""'), function($skip, $loc, $0, $1) {
+    var CoffeePrototypeEnabled$0 = $TV($EXPECT($L19, fail, 'CoffeePrototypeEnabled ""'), function($skip, $loc, $0, $1) {
       if (module.config.coffeePrototype)
         return;
       return $skip;
@@ -18909,7 +19007,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ObjectIsEnabled$0 = $TV($EXPECT($L18, fail, 'ObjectIsEnabled ""'), function($skip, $loc, $0, $1) {
+    var ObjectIsEnabled$0 = $TV($EXPECT($L19, fail, 'ObjectIsEnabled ""'), function($skip, $loc, $0, $1) {
       if (module.config.objectIs)
         return;
       return $skip;
@@ -18936,7 +19034,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Reset$0 = $TV($EXPECT($L18, fail, 'Reset ""'), function($skip, $loc, $0, $1) {
+    var Reset$0 = $TV($EXPECT($L19, fail, 'Reset ""'), function($skip, $loc, $0, $1) {
       module.indentLevels = [{
         level: 0,
         token: ""
@@ -19243,7 +19341,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Init$0 = $TS($S($E(Shebang), $Q(DirectivePrologue), $EXPECT($L18, fail, 'Init ""')), function($skip, $loc, $0, $1, $2, $3) {
+    var Init$0 = $TS($S($E(Shebang), $Q(DirectivePrologue), $EXPECT($L19, fail, 'Init ""')), function($skip, $loc, $0, $1, $2, $3) {
       var directives = $2;
       directives.forEach((directive) => {
         if (directive.type === "CivetPrologue") {
@@ -19546,6 +19644,12 @@ ${input.slice(result.pos)}
             return;
         }
       }
+      function getIndent(statement) {
+        let indent = statement?.[0];
+        if (Array.isArray(indent))
+          indent = indent[indent.length - 1];
+        return indent;
+      }
       function insertReturn(node) {
         if (!node)
           return;
@@ -19570,9 +19674,7 @@ ${input.slice(result.pos)}
         const [, exp, semi] = node;
         if (semi?.type === "SemicolonDelimiter")
           return;
-        let indent = node[0];
-        if (Array.isArray(indent))
-          indent = indent[indent.length - 1];
+        let indent = getIndent(node);
         if (!exp)
           return;
         switch (exp.type) {
@@ -19992,12 +20094,14 @@ ${input.slice(result.pos)}
         }
         return [];
       }
-      function gatherRecursive(node, predicate) {
+      function gatherRecursive(node, predicate, skipPredicate) {
         if (node == null)
           return [];
         if (Array.isArray(node)) {
           return node.flatMap((n) => gatherRecursive(n, predicate));
         }
+        if (skipPredicate?.(node))
+          return [];
         if (predicate(node)) {
           return [node];
         }
@@ -20015,6 +20119,36 @@ ${input.slice(result.pos)}
         }
         return nodes;
       }
+      function isFunction({ type }) {
+        return type === "FunctionExpression" || type === "ArrowFunction" || type === "MethodDefinition";
+      }
+      function gatherRecursiveWithinFunction(node, predicate) {
+        return gatherRecursive(node, predicate, isFunction);
+      }
+      function addParentPointers(node, parent) {
+        if (node == null)
+          return;
+        if (typeof node !== "object")
+          return;
+        node.parent = parent;
+        if (Array.isArray(node)) {
+          for (const child of node) {
+            addParentPointers(child, node);
+          }
+        } else if (node.children) {
+          for (const child of node.children) {
+            addParentPointers(child, node);
+          }
+        }
+      }
+      function findAncestor(node, predicate, stopPredicate) {
+        node = node.parent;
+        while (node && !stopPredicate?.(node)) {
+          if (predicate(node))
+            return node;
+          node = node.parent;
+        }
+      }
       function processParams(f) {
         const { type, parameters, block } = f;
         if (type === "ArrowFunction" && parameters && parameters.tp && parameters.tp.parameters.length === 1) {
@@ -20060,26 +20194,89 @@ ${input.slice(result.pos)}
           }
         });
       }
+      function processReturnValue(func) {
+        const { block } = func;
+        const values = gatherRecursiveWithinFunction(
+          block,
+          ({ type }) => type === "ReturnValue"
+        );
+        if (!values.length)
+          return false;
+        const ref = {
+          type: "Ref",
+          base: "ret",
+          id: "ret"
+        };
+        let declared;
+        values.forEach((value) => {
+          value.children = [ref];
+          const ancestor = findAncestor(
+            value,
+            ({ type }) => type === "Declaration",
+            isFunction
+          );
+          if (ancestor)
+            declared = true;
+        });
+        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;
+            }
+          }
+          block.expressions.unshift([
+            getIndent(block.expressions[0]),
+            {
+              type: "Declaration",
+              children: ["let ", ref, returnType, ";\n"],
+              names: []
+            }
+          ]);
+        }
+        gatherRecursiveWithinFunction(
+          block,
+          (r) => r.type === "ReturnStatement" && !r.expression
+        ).forEach((r) => {
+          r.expression = ref;
+          r.children.splice(-1, 1, " ", ref);
+        });
+        if (block.children.at(-2)?.type !== "ReturnStatement") {
+          block.expressions.push([
+            ["\n", getIndent(block.expressions.at(-1))],
+            {
+              type: "ReturnStatement",
+              expression: ref,
+              children: ["return ", ref]
+            }
+          ]);
+        }
+        return true;
+      }
+      function isVoidType(t) {
+        return t?.type === "LiteralType" && t.t.type === "VoidType";
+      }
       function processFunctions(statements) {
-        gatherRecursiveAll(statements, (n) => {
-          return n.type === "FunctionExpression" || n.type === "ArrowFunction";
-        }).forEach((f) => {
+        gatherRecursiveAll(statements, ({ type }) => type === "FunctionExpression" || type === "ArrowFunction").forEach((f) => {
           processParams(f);
-          const { block, returnType } = f;
-          if (module.config.implicitReturns) {
-            const isVoid = returnType === "void";
+          if (!processReturnValue(f) && module.config.implicitReturns) {
+            const { block, returnType } = f;
+            const isVoid = isVoidType(returnType?.t);
             const isBlock = block?.type === "BlockStatement";
             if (!isVoid && isBlock) {
               insertReturn(block);
             }
           }
         });
-        gatherRecursiveAll(statements, (n) => n.type === "MethodDefinition").forEach((f) => {
+        gatherRecursiveAll(statements, ({ type }) => type === "MethodDefinition").forEach((f) => {
           processParams(f);
-          const { signature, block } = f;
-          if (module.config.implicitReturns) {
+          if (!processReturnValue(f) && module.config.implicitReturns) {
+            const { signature, block } = f;
             const isConstructor = signature.name === "constructor";
-            const isVoid = signature.returnType === "void";
+            const isVoid = isVoidType(signature.returnType?.t);
             const isSet = signature.modifier === "set";
             if (!isConstructor && !isSet && !isVoid) {
               insertReturn(block);
@@ -20567,6 +20764,7 @@ ${input.slice(result.pos)}
         });
       }
       module.processProgram = function(statements) {
+        addParentPointers(statements);
         processPipelineExpressions(statements);
         processAssignments(statements);
         processFunctions(statements);
@@ -20593,18 +20791,7 @@ ${input.slice(result.pos)}
         return new Set(declarationNames);
       }
       function populateRefs(statements) {
-        const refNodes = gatherNodes(statements, ({ type }) => type === "Ref");
-        const blockNodes = new Set(gatherNodes(statements, ({ type }) => type === "BlockStatement"));
-        const forNodes = gatherNodes(statements, ({ type }) => type === "ForStatement");
-        forNodes.forEach(({ declaration, block }) => {
-          if (block.type === "BlockStatement") {
-            populateRefs([declaration, ...block.children]);
-          } else {
-            populateRefs([declaration, ...block]);
-          }
-          blockNodes.delete(block);
-        });
-        blockNodes.forEach(({ expressions }) => populateRefs(expressions));
+        const refNodes = gatherRecursive(statements, ({ type }) => type === "Ref");
         if (refNodes.length) {
           const ids = gatherRecursive(statements, (s) => s.type === "Identifier");
           const names = new Set(ids.flatMap(({ names: names2 }) => names2 || []));
@@ -21010,7 +21197,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var PopIndent$0 = $TV($EXPECT($L18, fail, 'PopIndent ""'), function($skip, $loc, $0, $1) {
+    var PopIndent$0 = $TV($EXPECT($L19, fail, 'PopIndent ""'), function($skip, $loc, $0, $1) {
       if (module.config.verbose) {
         console.log("popping indent", module.indentLevels[module.indentLevels.length - 1], "->", module.indentLevels[module.indentLevels.length - 2]);
       }
@@ -21149,6 +21336,9 @@ var prune = function(node) {
   if (node.length === 0) {
     return;
   }
+  if (node.parent != null) {
+    delete node.parent;
+  }
   if (Array.isArray(node)) {
     a = node.map(function(n) {
       return prune(n);