@danielx/civet 0.5.60 → 0.5.62

package/dist/main.mjs

@@ -448,6 +448,7 @@ ${input.slice(result.pos)}
       ArgumentPart,
       BinaryOpExpression,
       BinaryOpRHS,
+      RHS,
       ParenthesizedAssignment,
       UnaryExpression,
       UnaryPostfix,
@@ -560,10 +561,14 @@ ${input.slice(result.pos)}
       Block,
       ThenClause,
       BracedOrEmptyBlock,
+      NoPostfixBracedOrEmptyBlock,
       EmptyBlock,
       EmptyBareBlock,
       BracedBlock,
+      NoPostfixBracedBlock,
+      NonSingleBracedBlock,
       SingleLineStatements,
+      PostfixedSingleLineStatements,
       BracedContent,
       NestedBlockStatements,
       NestedBlockStatement,
@@ -619,6 +624,8 @@ ${input.slice(result.pos)}
       UnaryOp,
       ModuleItem,
       StatementListItem,
+      PostfixedStatement,
+      PostfixedExpression,
       PostfixStatement,
       Statement,
       EmptyStatement,
@@ -665,7 +672,7 @@ ${input.slice(result.pos)}
       TryExpression,
       CatchClause,
       CatchBind,
-      Finally,
+      FinallyClause,
       CatchParameter,
       Condition,
       ExpressionWithIndentedApplicationSuppressed,
@@ -798,6 +805,7 @@ ${input.slice(result.pos)}
       Equals,
       Export,
       Extends,
+      Finally,
       For,
       From,
       Function,
@@ -932,6 +940,7 @@ ${input.slice(result.pos)}
       InlineInterfacePropertyDelimiter,
       TypeBinaryOp,
       FunctionType,
+      TypeArrowFunction,
       TypeArguments,
       TypeArgument,
       TypeArgumentDelimiter,
@@ -1075,41 +1084,41 @@ ${input.slice(result.pos)}
     var $L80 = $L("|");
     var $L81 = $L(";");
     var $L82 = $L("own");
-    var $L83 = $L("finally");
-    var $L84 = $L("break");
-    var $L85 = $L("continue");
-    var $L86 = $L("debugger");
-    var $L87 = $L("assert");
-    var $L88 = $L(":=");
-    var $L89 = $L(".=");
-    var $L90 = $L("/*");
-    var $L91 = $L("*/");
-    var $L92 = $L("\\");
-    var $L93 = $L("[");
-    var $L94 = $L("`");
-    var $L95 = $L("abstract");
-    var $L96 = $L("as");
-    var $L97 = $L("@");
-    var $L98 = $L("@@");
-    var $L99 = $L("async");
-    var $L100 = $L("await");
-    var $L101 = $L("by");
-    var $L102 = $L("case");
-    var $L103 = $L("catch");
-    var $L104 = $L("class");
-    var $L105 = $L("#{");
-    var $L106 = $L(",");
-    var $L107 = $L("declare");
-    var $L108 = $L("default");
-    var $L109 = $L("delete");
-    var $L110 = $L("do");
-    var $L111 = $L("..");
-    var $L112 = $L("...");
-    var $L113 = $L("::");
-    var $L114 = $L('"');
-    var $L115 = $L("else");
-    var $L116 = $L("export");
-    var $L117 = $L("extends");
+    var $L83 = $L("break");
+    var $L84 = $L("continue");
+    var $L85 = $L("debugger");
+    var $L86 = $L("assert");
+    var $L87 = $L(":=");
+    var $L88 = $L(".=");
+    var $L89 = $L("/*");
+    var $L90 = $L("*/");
+    var $L91 = $L("\\");
+    var $L92 = $L("[");
+    var $L93 = $L("`");
+    var $L94 = $L("abstract");
+    var $L95 = $L("as");
+    var $L96 = $L("@");
+    var $L97 = $L("@@");
+    var $L98 = $L("async");
+    var $L99 = $L("await");
+    var $L100 = $L("by");
+    var $L101 = $L("case");
+    var $L102 = $L("catch");
+    var $L103 = $L("class");
+    var $L104 = $L("#{");
+    var $L105 = $L(",");
+    var $L106 = $L("declare");
+    var $L107 = $L("default");
+    var $L108 = $L("delete");
+    var $L109 = $L("do");
+    var $L110 = $L("..");
+    var $L111 = $L("...");
+    var $L112 = $L("::");
+    var $L113 = $L('"');
+    var $L114 = $L("else");
+    var $L115 = $L("export");
+    var $L116 = $L("extends");
+    var $L117 = $L("finally");
     var $L118 = $L("for");
     var $L119 = $L("from");
     var $L120 = $L("function");
@@ -1165,7 +1174,7 @@ ${input.slice(result.pos)}
     var $L170 = $L("infer");
     var $L171 = $L("[]");
     var $L172 = $L("civet");
-    var $R0 = $R(new RegExp("(as|for|of|satisfies|then|when|implements)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
+    var $R0 = $R(new RegExp("(as|for|while|until|of|satisfies|then|when|implements)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
     var $R1 = $R(new RegExp("[0-9]", "suy"));
     var $R2 = $R(new RegExp("[&]", "suy"));
     var $R3 = $R(new RegExp("[!~+-]+", "suy"));
@@ -1546,7 +1555,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ForbiddenImplicitCalls$0 = $R$0($EXPECT($R0, fail, "ForbiddenImplicitCalls /(as|for|of|satisfies|then|when|implements)(?!\\p{ID_Continue}|[\\u200C\\u200D$])/"));
+    var ForbiddenImplicitCalls$0 = $R$0($EXPECT($R0, fail, "ForbiddenImplicitCalls /(as|for|while|until|of|satisfies|then|when|implements)(?!\\p{ID_Continue}|[\\u200C\\u200D$])/"));
     var ForbiddenImplicitCalls$1 = $EXPECT($L0, fail, 'ForbiddenImplicitCalls "/ "');
     var ForbiddenImplicitCalls$2 = AtAt;
     var ForbiddenImplicitCalls$3 = $S(Identifier, $EXPECT($L1, fail, 'ForbiddenImplicitCalls "="'), Whitespace);
@@ -1865,7 +1874,12 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var BinaryOpRHS$0 = $S(__, BinaryOp, __, $C(ParenthesizedAssignment, UnaryExpression, ExpressionizedStatement));
+    var BinaryOpRHS$0 = $TS($S(BinaryOp, RHS), function($skip, $loc, $0, $1, $2) {
+      var op = $1;
+      var rhs = $2;
+      return [[], op, [], rhs];
+    });
+    var BinaryOpRHS$1 = $S(__, BinaryOp, $C(_, $S(EOS, __)), RHS);
     function BinaryOpRHS(state) {
       let eventData;
       if (state.events) {
@@ -1877,17 +1891,42 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("BinaryOpRHS", state, BinaryOpRHS$0(state));
+        const result = $TOKEN("BinaryOpRHS", state, BinaryOpRHS$0(state) || BinaryOpRHS$1(state));
         if (state.events)
           state.events.exit?.("BinaryOpRHS", state, result, eventData);
         return result;
       } else {
-        const result = BinaryOpRHS$0(state);
+        const result = BinaryOpRHS$0(state) || BinaryOpRHS$1(state);
         if (state.events)
           state.events.exit?.("BinaryOpRHS", state, result, eventData);
         return result;
       }
     }
+    var RHS$0 = ParenthesizedAssignment;
+    var RHS$1 = UnaryExpression;
+    var RHS$2 = ExpressionizedStatement;
+    function RHS(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("RHS", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("RHS", state, RHS$0(state) || RHS$1(state) || RHS$2(state));
+        if (state.events)
+          state.events.exit?.("RHS", state, result, eventData);
+        return result;
+      } else {
+        const result = RHS$0(state) || RHS$1(state) || RHS$2(state);
+        if (state.events)
+          state.events.exit?.("RHS", state, result, eventData);
+        return result;
+      }
+    }
     var ParenthesizedAssignment$0 = $S(InsertOpenParen, ActualAssignment, InsertCloseParen);
     function ParenthesizedAssignment(state) {
       let eventData;
@@ -2311,10 +2350,11 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var FatArrowBody$0 = ExplicitBlock;
-    var FatArrowBody$1 = ImplicitNestedBlock;
-    var FatArrowBody$2 = AssignmentExpression;
-    var FatArrowBody$3 = EmptyBlock;
+    var FatArrowBody$0 = $T($S($N(EOS), PostfixedExpression, $N(SemicolonDelimiter)), function(value) {
+      var exp = value[1];
+      return exp;
+    });
+    var FatArrowBody$1 = BracedOrEmptyBlock;
     function FatArrowBody(state) {
       let eventData;
       if (state.events) {
@@ -2326,12 +2366,12 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("FatArrowBody", state, FatArrowBody$0(state) || FatArrowBody$1(state) || FatArrowBody$2(state) || FatArrowBody$3(state));
+        const result = $TOKEN("FatArrowBody", state, FatArrowBody$0(state) || FatArrowBody$1(state));
         if (state.events)
           state.events.exit?.("FatArrowBody", state, result, eventData);
         return result;
       } else {
-        const result = FatArrowBody$0(state) || FatArrowBody$1(state) || FatArrowBody$2(state) || FatArrowBody$3(state);
+        const result = FatArrowBody$0(state) || FatArrowBody$1(state);
         if (state.events)
           state.events.exit?.("FatArrowBody", state, result, eventData);
         return result;
@@ -2572,11 +2612,11 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ParenthesizedExpression$0 = $TS($S(OpenParen, ExtendedExpression, $E($S($Q(TrailingComment), PostfixStatement)), __, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var ParenthesizedExpression$0 = $TS($S(OpenParen, PostfixedExpression, __, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4) {
       var exp = $2;
-      var post = $3;
-      if (post) {
-        return module.attachPostfixStatementAsExpression(exp, post);
+      switch (exp.type) {
+        case "IterationExpression":
+          return $2;
       }
       return {
         type: "ParenthesizedExpression",
@@ -3238,7 +3278,12 @@ ${input.slice(result.pos)}
       }
     }
     var CallExpressionRest$0 = MemberExpressionRest;
-    var CallExpressionRest$1 = TemplateLiteral;
+    var CallExpressionRest$1 = $TV($C(TemplateLiteral, StringLiteral), function($skip, $loc, $0, $1) {
+      if ($1.type === "StringLiteral") {
+        return "`" + $1.token.slice(1, -1).replace(/(`|\$\{)/g, "\\$1") + "`";
+      }
+      return $1;
+    });
     var CallExpressionRest$2 = $TS($S($E($C(OptionalShorthand, NonNullAssertion)), ArgumentsWithTrailingMemberExpressions), function($skip, $loc, $0, $1, $2) {
       if (!$1)
         return $2;
@@ -3386,7 +3431,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var MemberBracketContent$0 = $TS($S(OpenBracket, $C(SliceParameters, ExtendedExpression), __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var MemberBracketContent$0 = $TS($S(OpenBracket, $C(SliceParameters, PostfixedExpression), __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
       var open = $1;
       var exp = $2;
       var ws = $3;
@@ -3575,7 +3620,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var SuperProperty$0 = $S($EXPECT($L16, fail, 'SuperProperty "super["'), ExtendedExpression, __, CloseBracket);
+    var SuperProperty$0 = $S($EXPECT($L16, fail, 'SuperProperty "super["'), PostfixedExpression, __, CloseBracket);
     var SuperProperty$1 = $S($EXPECT($L12, fail, 'SuperProperty "super"'), $N($C(QuestionMark, NonNullAssertion)), PropertyAccess);
     function SuperProperty(state) {
       let eventData;
@@ -4996,7 +5041,11 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var FunctionDeclaration$0 = FunctionExpression;
+    var FunctionDeclaration$0 = $TS($S(FunctionExpression), function($skip, $loc, $0, $1) {
+      if ($1.id)
+        return $1;
+      return module.makeLeftHandSideExpression($1);
+    });
     function FunctionDeclaration(state) {
       let eventData;
       if (state.events) {
@@ -5510,6 +5559,30 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var NoPostfixBracedOrEmptyBlock$0 = NoPostfixBracedBlock;
+    var NoPostfixBracedOrEmptyBlock$1 = EmptyBlock;
+    function NoPostfixBracedOrEmptyBlock(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("NoPostfixBracedOrEmptyBlock", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("NoPostfixBracedOrEmptyBlock", state, NoPostfixBracedOrEmptyBlock$0(state) || NoPostfixBracedOrEmptyBlock$1(state));
+        if (state.events)
+          state.events.exit?.("NoPostfixBracedOrEmptyBlock", state, result, eventData);
+        return result;
+      } else {
+        const result = NoPostfixBracedOrEmptyBlock$0(state) || NoPostfixBracedOrEmptyBlock$1(state);
+        if (state.events)
+          state.events.exit?.("NoPostfixBracedOrEmptyBlock", state, result, eventData);
+        return result;
+      }
+    }
     var EmptyBlock$0 = $TS($S(InsertOpenBrace, InsertCloseBrace), function($skip, $loc, $0, $1, $2) {
       const expressions = [];
       return {
@@ -5573,26 +5646,44 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var BracedBlock$0 = $TS($S($Q(TrailingComment), OpenBrace, BracedContent, __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-      var block = $3;
-      return {
-        type: "BlockStatement",
-        expressions: block.expressions,
-        children: [$1, $2, ...block.children, $4, $5],
-        bare: false
-      };
-      return block;
-    });
-    var BracedBlock$1 = ImplicitNestedBlock;
-    var BracedBlock$2 = $TS($S(InsertOpenBrace, $Y(EOS), ObjectLiteral, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var BracedBlock$0 = NonSingleBracedBlock;
+    var BracedBlock$1 = $TS($S(InsertOpenBrace, $N(EOS), PostfixedSingleLineStatements, InsertSpace, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var o = $1;
       var s = $3;
+      var ws = $4;
+      var c = $5;
+      if (!s.children.length)
+        return $skip;
       return {
         type: "BlockStatement",
-        expressions: [s],
-        children: [$1, s, $3]
+        expressions: s.expressions,
+        children: [o, s.children, ws, c]
       };
     });
-    var BracedBlock$3 = $TS($S(InsertOpenBrace, $N(EOS), SingleLineStatements, InsertSpace, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    function BracedBlock(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("BracedBlock", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("BracedBlock", state, BracedBlock$0(state) || BracedBlock$1(state));
+        if (state.events)
+          state.events.exit?.("BracedBlock", state, result, eventData);
+        return result;
+      } else {
+        const result = BracedBlock$0(state) || BracedBlock$1(state);
+        if (state.events)
+          state.events.exit?.("BracedBlock", state, result, eventData);
+        return result;
+      }
+    }
+    var NoPostfixBracedBlock$0 = NonSingleBracedBlock;
+    var NoPostfixBracedBlock$1 = $TS($S(InsertOpenBrace, $N(EOS), SingleLineStatements, InsertSpace, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var o = $1;
       var s = $3;
       var ws = $4;
@@ -5605,10 +5696,10 @@ ${input.slice(result.pos)}
         children: [o, s.children, ws, c]
       };
     });
-    function BracedBlock(state) {
+    function NoPostfixBracedBlock(state) {
       let eventData;
       if (state.events) {
-        const result = state.events.enter?.("BracedBlock", state);
+        const result = state.events.enter?.("NoPostfixBracedBlock", state);
         if (result) {
           if (result.cache)
             return result.cache;
@@ -5616,14 +5707,55 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("BracedBlock", state, BracedBlock$0(state) || BracedBlock$1(state) || BracedBlock$2(state) || BracedBlock$3(state));
+        const result = $TOKEN("NoPostfixBracedBlock", state, NoPostfixBracedBlock$0(state) || NoPostfixBracedBlock$1(state));
         if (state.events)
-          state.events.exit?.("BracedBlock", state, result, eventData);
+          state.events.exit?.("NoPostfixBracedBlock", state, result, eventData);
         return result;
       } else {
-        const result = BracedBlock$0(state) || BracedBlock$1(state) || BracedBlock$2(state) || BracedBlock$3(state);
+        const result = NoPostfixBracedBlock$0(state) || NoPostfixBracedBlock$1(state);
         if (state.events)
-          state.events.exit?.("BracedBlock", state, result, eventData);
+          state.events.exit?.("NoPostfixBracedBlock", state, result, eventData);
+        return result;
+      }
+    }
+    var NonSingleBracedBlock$0 = $TS($S($Q(TrailingComment), OpenBrace, BracedContent, __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var block = $3;
+      return {
+        type: "BlockStatement",
+        expressions: block.expressions,
+        children: [$1, $2, ...block.children, $4, $5],
+        bare: false
+      };
+      return block;
+    });
+    var NonSingleBracedBlock$1 = ImplicitNestedBlock;
+    var NonSingleBracedBlock$2 = $TS($S(InsertOpenBrace, $Y(EOS), ObjectLiteral, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var s = $3;
+      return {
+        type: "BlockStatement",
+        expressions: [s],
+        children: [$1, s, $3]
+      };
+    });
+    function NonSingleBracedBlock(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("NonSingleBracedBlock", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("NonSingleBracedBlock", state, NonSingleBracedBlock$0(state) || NonSingleBracedBlock$1(state) || NonSingleBracedBlock$2(state));
+        if (state.events)
+          state.events.exit?.("NonSingleBracedBlock", state, result, eventData);
+        return result;
+      } else {
+        const result = NonSingleBracedBlock$0(state) || NonSingleBracedBlock$1(state) || NonSingleBracedBlock$2(state);
+        if (state.events)
+          state.events.exit?.("NonSingleBracedBlock", state, result, eventData);
         return result;
       }
     }
@@ -5662,6 +5794,41 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var PostfixedSingleLineStatements$0 = $TS($S($Q($S($S($E(_), $N(EOS)), PostfixedStatement, SemicolonDelimiter)), $E($S($S($E(_), $N(EOS)), PostfixedStatement, $E(SemicolonDelimiter)))), function($skip, $loc, $0, $1, $2) {
+      var stmts = $1;
+      var last = $2;
+      const children = [...stmts];
+      if (last)
+        children.push(last);
+      return {
+        type: "BlockStatement",
+        expressions: children,
+        children,
+        bare: true
+      };
+    });
+    function PostfixedSingleLineStatements(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("PostfixedSingleLineStatements", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("PostfixedSingleLineStatements", state, PostfixedSingleLineStatements$0(state));
+        if (state.events)
+          state.events.exit?.("PostfixedSingleLineStatements", state, result, eventData);
+        return result;
+      } else {
+        const result = PostfixedSingleLineStatements$0(state);
+        if (state.events)
+          state.events.exit?.("PostfixedSingleLineStatements", state, result, eventData);
+        return result;
+      }
+    }
     var BracedContent$0 = NestedBlockStatements;
     var BracedContent$1 = $TS($S($Q(TrailingComment), Statement), function($skip, $loc, $0, $1, $2) {
       const expressions = [["", $2]];
@@ -6962,7 +7129,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ComputedPropertyName$0 = $TS($S(OpenBracket, ExtendedExpression, __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var ComputedPropertyName$0 = $TS($S(OpenBracket, PostfixedExpression, __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
       var expression = $2;
       return {
         type: "ComputedPropertyName",
@@ -7506,7 +7673,12 @@ ${input.slice(result.pos)}
       return "??";
     });
     var BinaryOpSymbol$28 = $TS($S($EXPECT($L75, fail, 'BinaryOpSymbol "instanceof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
-      return $1;
+      return {
+        $loc,
+        token: $1,
+        relational: true,
+        special: true
+      };
     });
     var BinaryOpSymbol$29 = $TS($S($EXPECT($L50, fail, 'BinaryOpSymbol "not"'), NonIdContinue, __, $EXPECT($L75, fail, 'BinaryOpSymbol "instanceof"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       return {
@@ -7664,13 +7836,7 @@ ${input.slice(result.pos)}
       }
     }
     var StatementListItem$0 = Declaration;
-    var StatementListItem$1 = $TS($S(Statement, $E($S($Q(TrailingComment), PostfixStatement))), function($skip, $loc, $0, $1, $2) {
-      var statement = $1;
-      var post = $2;
-      if (post)
-        return module.addPostfixStatement(statement, ...post);
-      return statement;
-    });
+    var StatementListItem$1 = PostfixedStatement;
     function StatementListItem(state) {
       let eventData;
       if (state.events) {
@@ -7693,6 +7859,64 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var PostfixedStatement$0 = $TS($S(Statement, $E($S($Q(TrailingComment), PostfixStatement))), function($skip, $loc, $0, $1, $2) {
+      var statement = $1;
+      var post = $2;
+      if (post)
+        return module.addPostfixStatement(statement, ...post);
+      return statement;
+    });
+    function PostfixedStatement(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("PostfixedStatement", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("PostfixedStatement", state, PostfixedStatement$0(state));
+        if (state.events)
+          state.events.exit?.("PostfixedStatement", state, result, eventData);
+        return result;
+      } else {
+        const result = PostfixedStatement$0(state);
+        if (state.events)
+          state.events.exit?.("PostfixedStatement", state, result, eventData);
+        return result;
+      }
+    }
+    var PostfixedExpression$0 = $TS($S(ExtendedExpression, $E($S($Q(TrailingComment), PostfixStatement))), function($skip, $loc, $0, $1, $2) {
+      var expression = $1;
+      var post = $2;
+      if (post)
+        return module.attachPostfixStatementAsExpression(expression, post);
+      return expression;
+    });
+    function PostfixedExpression(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("PostfixedExpression", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("PostfixedExpression", state, PostfixedExpression$0(state));
+        if (state.events)
+          state.events.exit?.("PostfixedExpression", state, result, eventData);
+        return result;
+      } else {
+        const result = PostfixedExpression$0(state);
+        if (state.events)
+          state.events.exit?.("PostfixedExpression", state, result, eventData);
+        return result;
+      }
+    }
     var PostfixStatement$0 = ForClause;
     var PostfixStatement$1 = IfClause;
     var PostfixStatement$2 = LoopClause;
@@ -7728,12 +7952,8 @@ ${input.slice(result.pos)}
     var Statement$5 = TryStatement;
     var Statement$6 = EmptyStatement;
     var Statement$7 = $TS($S(ExpressionStatement), function($skip, $loc, $0, $1) {
-      if ($1.type === "ObjectExpression") {
-        return {
-          type: "ParenthesizedExpression",
-          children: ["(", $1, ")"],
-          expression: $1
-        };
+      if ($1.type === "ObjectExpression" || $1.type === "FunctionExpression" && !$1.id) {
+        return module.makeLeftHandSideExpression($1);
       }
       return $1;
     });
@@ -7821,6 +8041,8 @@ ${input.slice(result.pos)}
         children.push(e);
       return {
         type: "IfStatement",
+        then: block,
+        else: e,
         children
       };
     });
@@ -7898,7 +8120,7 @@ ${input.slice(result.pos)}
     var UnlessClause$0 = $TS($S(Unless, Condition), function($skip, $loc, $0, $1, $2) {
       var kind = $1;
       var condition = $2;
-      kind.token = "if";
+      kind = { ...kind, token: "if" };
       return {
         type: "IfStatement",
         children: [kind, ["(!", condition, ")"]]
@@ -8127,16 +8349,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var NestedBlockExpression$0 = $TS($S(Nested, ExtendedExpression, $E($S($Q(TrailingComment), PostfixStatement)), ExpressionDelimiter), function($skip, $loc, $0, $1, $2, $3, $4) {
-      var ws = $1;
-      var exp = $2;
-      var post = $3;
-      var d = $4;
-      if (post) {
-        return [ws, module.attachPostfixStatementAsExpression(exp, post), d];
-      }
-      return [ws, exp, d];
-    });
+    var NestedBlockExpression$0 = $S(Nested, PostfixedExpression, ExpressionDelimiter);
     function NestedBlockExpression(state) {
       let eventData;
       if (state.events) {
@@ -8272,7 +8485,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var DoWhileStatement$0 = $T($S(Do, BracedBlock, __, WhileClause), function(value) {
+    var DoWhileStatement$0 = $T($S(Do, NoPostfixBracedBlock, __, WhileClause), function(value) {
       var block = value[1];
       return { "type": "IterationStatement", "children": value, "block": block };
     });
@@ -8440,9 +8653,11 @@ ${input.slice(result.pos)}
     var ForStatementControl$1 = $TS($S(CoffeeForLoopsEnabled, CoffeeForStatementParameters, $E(WhenCondition)), function($skip, $loc, $0, $1, $2, $3) {
       if ($3) {
         const indent = module.currentIndent.token + "  ";
+        const block = "continue\n";
         $2.blockPrefix.push([indent, {
           type: "IfStatement",
-          children: ["if (!(", module.insertTrimmingSpace($3, ""), ")) continue\n"]
+          then: block,
+          children: ["if (!(", module.insertTrimmingSpace($3, ""), ")) ", block]
         }]);
       }
       return $2;
@@ -9226,7 +9441,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TryStatement$0 = $TS($S(Try, BracedBlock, $E(CatchClause), $E(Finally)), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var TryStatement$0 = $TS($S(Try, NoPostfixBracedOrEmptyBlock, $E(CatchClause), $E(FinallyClause)), function($skip, $loc, $0, $1, $2, $3, $4) {
       var t = $1;
       var b = $2;
       var c = $3;
@@ -9294,7 +9509,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CatchClause$0 = $S(__, Catch, $E(CatchBind), BracedBlock);
+    var CatchClause$0 = $S($C(Samedent, _), Catch, $E(CatchBind), $C(ThenClause, BracedOrEmptyBlock));
     function CatchClause(state) {
       let eventData;
       if (state.events) {
@@ -9317,8 +9532,8 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CatchBind$0 = $S(__, OpenParen, __, CatchParameter, __, CloseParen);
-    var CatchBind$1 = $S($N(EOS), $Q(TrailingComment), InsertOpenParen, CatchParameter, InsertCloseParen);
+    var CatchBind$0 = $S($E(_), OpenParen, __, CatchParameter, __, CloseParen);
+    var CatchBind$1 = $S(_, InsertOpenParen, CatchParameter, InsertCloseParen);
     function CatchBind(state) {
       let eventData;
       if (state.events) {
@@ -9341,11 +9556,11 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Finally$0 = $S(__, $EXPECT($L83, fail, 'Finally "finally"'), NonIdContinue, BracedBlock);
-    function Finally(state) {
+    var FinallyClause$0 = $S($C(Samedent, _), Finally, $C(ThenClause, BracedOrEmptyBlock));
+    function FinallyClause(state) {
       let eventData;
       if (state.events) {
-        const result = state.events.enter?.("Finally", state);
+        const result = state.events.enter?.("FinallyClause", state);
         if (result) {
           if (result.cache)
             return result.cache;
@@ -9353,14 +9568,14 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("Finally", state, Finally$0(state));
+        const result = $TOKEN("FinallyClause", state, FinallyClause$0(state));
         if (state.events)
-          state.events.exit?.("Finally", state, result, eventData);
+          state.events.exit?.("FinallyClause", state, result, eventData);
         return result;
       } else {
-        const result = Finally$0(state);
+        const result = FinallyClause$0(state);
         if (state.events)
-          state.events.exit?.("Finally", state, result, eventData);
+          state.events.exit?.("FinallyClause", state, result, eventData);
         return result;
       }
     }
@@ -9581,13 +9796,13 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var KeywordStatement$0 = $T($S($EXPECT($L84, fail, 'KeywordStatement "break"'), NonIdContinue), function(value) {
+    var KeywordStatement$0 = $T($S($EXPECT($L83, fail, 'KeywordStatement "break"'), NonIdContinue), function(value) {
       return { "type": "BreakStatement", "children": value };
     });
-    var KeywordStatement$1 = $T($S($EXPECT($L85, fail, 'KeywordStatement "continue"'), NonIdContinue), function(value) {
+    var KeywordStatement$1 = $T($S($EXPECT($L84, fail, 'KeywordStatement "continue"'), NonIdContinue), function(value) {
       return { "type": "ContinueStatement", "children": value };
     });
-    var KeywordStatement$2 = $T($S($EXPECT($L86, fail, 'KeywordStatement "debugger"'), NonIdContinue), function(value) {
+    var KeywordStatement$2 = $T($S($EXPECT($L85, fail, 'KeywordStatement "debugger"'), NonIdContinue), function(value) {
       return { "type": "DebuggerStatement", "children": value };
     });
     var KeywordStatement$3 = $T($S(Return, $E(MaybeNestedExpression)), function(value) {
@@ -9618,7 +9833,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var DebuggerExpression$0 = $TS($S($EXPECT($L86, fail, 'DebuggerExpression "debugger"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var DebuggerExpression$0 = $TS($S($EXPECT($L85, fail, 'DebuggerExpression "debugger"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return {
         type: "DebuggerExpression",
         children: ["(()=>{", $1, "})()"]
@@ -9895,7 +10110,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ImportAssertion$0 = $S($E(_), $EXPECT($L87, fail, 'ImportAssertion "assert"'), NonIdContinue, $E(_), ObjectLiteral);
+    var ImportAssertion$0 = $S($E(_), $EXPECT($L86, fail, 'ImportAssertion "assert"'), NonIdContinue, $E(_), ObjectLiteral);
     function ImportAssertion(state) {
       let eventData;
       if (state.events) {
@@ -10499,7 +10714,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ConstAssignment$0 = $TV($EXPECT($L88, fail, 'ConstAssignment ":="'), function($skip, $loc, $0, $1) {
+    var ConstAssignment$0 = $TV($EXPECT($L87, fail, 'ConstAssignment ":="'), function($skip, $loc, $0, $1) {
       return { $loc, token: "=" };
     });
     function ConstAssignment(state) {
@@ -10524,7 +10739,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var LetAssignment$0 = $TV($EXPECT($L89, fail, 'LetAssignment ".="'), function($skip, $loc, $0, $1) {
+    var LetAssignment$0 = $TV($EXPECT($L88, fail, 'LetAssignment ".="'), function($skip, $loc, $0, $1) {
       return { $loc, token: "=" };
     });
     function LetAssignment(state) {
@@ -10722,7 +10937,7 @@ ${input.slice(result.pos)}
       }
     }
     var NumericLiteral$0 = $TS($S(NumericLiteralKind), function($skip, $loc, $0, $1) {
-      return { $loc, token: $1 };
+      return { type: "NumericLiteral", $loc, token: $1 };
     });
     function NumericLiteral(state) {
       let eventData;
@@ -10993,6 +11208,7 @@ ${input.slice(result.pos)}
     var StringLiteral$0 = $TS($S(DoubleQuote, DoubleStringCharacters, DoubleQuote), function($skip, $loc, $0, $1, $2, $3) {
       var str = $2;
       return {
+        type: "StringLiteral",
         token: `"${module.modifyString(str.token)}"`,
         $loc
       };
@@ -11000,6 +11216,7 @@ ${input.slice(result.pos)}
     var StringLiteral$1 = $TS($S(SingleQuote, SingleStringCharacters, SingleQuote), function($skip, $loc, $0, $1, $2, $3) {
       var str = $2;
       return {
+        type: "StringLiteral",
         token: `'${module.modifyString(str.token)}'`,
         $loc
       };
@@ -11126,7 +11343,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CoffeeStringSubstitution$0 = $S(CoffeeSubstitutionStart, ExtendedExpression, __, CloseBrace);
+    var CoffeeStringSubstitution$0 = $S(CoffeeSubstitutionStart, PostfixedExpression, __, CloseBrace);
     function CoffeeStringSubstitution(state) {
       let eventData;
       if (state.events) {
@@ -11566,7 +11783,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TemplateSubstitution$0 = $S(SubstitutionStart, ExtendedExpression, __, CloseBrace);
+    var TemplateSubstitution$0 = $S(SubstitutionStart, PostfixedExpression, __, CloseBrace);
     function TemplateSubstitution(state) {
       let eventData;
       if (state.events) {
@@ -11763,7 +11980,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L90, fail, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L91, fail, 'JSMultiLineComment "*/"')), $EXPECT($R40, fail, "JSMultiLineComment /./"))), $EXPECT($L91, fail, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
+    var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L89, fail, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L90, fail, 'JSMultiLineComment "*/"')), $EXPECT($R40, fail, "JSMultiLineComment /./"))), $EXPECT($L90, fail, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function JSMultiLineComment(state) {
@@ -11862,7 +12079,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InlineComment$0 = $TV($TEXT($S($EXPECT($L90, fail, 'InlineComment "/*"'), $TEXT($Q($S($N($EXPECT($L91, fail, 'InlineComment "*/"')), $EXPECT($R44, fail, "InlineComment /[^\\r\\n]/")))), $EXPECT($L91, fail, 'InlineComment "*/"'))), function($skip, $loc, $0, $1) {
+    var InlineComment$0 = $TV($TEXT($S($EXPECT($L89, fail, 'InlineComment "/*"'), $TEXT($Q($S($N($EXPECT($L90, fail, 'InlineComment "*/"')), $EXPECT($R44, fail, "InlineComment /[^\\r\\n]/")))), $EXPECT($L90, fail, 'InlineComment "*/"'))), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function InlineComment(state) {
@@ -11961,7 +12178,7 @@ ${input.slice(result.pos)}
     var NonNewlineWhitespace$0 = $TR($EXPECT($R45, 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($L92, fail, 'NonNewlineWhitespace "\\\\\\\\"'), EOL), function(value) {
+    var NonNewlineWhitespace$1 = $T($S(CoffeeLineContinuationEnabled, $EXPECT($L91, fail, 'NonNewlineWhitespace "\\\\\\\\"'), EOL), function(value) {
       return "";
     });
     function NonNewlineWhitespace(state) {
@@ -12113,7 +12330,7 @@ ${input.slice(result.pos)}
       }
     }
     var StatementDelimiter$0 = SemicolonDelimiter;
-    var StatementDelimiter$1 = $S($Y($S(Samedent, $C($EXPECT($L2, fail, 'StatementDelimiter "("'), $EXPECT($L93, fail, 'StatementDelimiter "["'), $EXPECT($L94, fail, 'StatementDelimiter "`"'), $EXPECT($L56, fail, 'StatementDelimiter "+"'), $EXPECT($L15, fail, 'StatementDelimiter "-"'), $EXPECT($L52, fail, 'StatementDelimiter "*"'), $EXPECT($L53, fail, 'StatementDelimiter "/"'), ObjectLiteral))), InsertSemicolon);
+    var StatementDelimiter$1 = $S($Y($S(Samedent, $C($EXPECT($L2, fail, 'StatementDelimiter "("'), $EXPECT($L92, fail, 'StatementDelimiter "["'), $EXPECT($L93, fail, 'StatementDelimiter "`"'), $EXPECT($L56, fail, 'StatementDelimiter "+"'), $EXPECT($L15, fail, 'StatementDelimiter "-"'), $EXPECT($L52, fail, 'StatementDelimiter "*"'), $EXPECT($L53, 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;
@@ -12213,7 +12430,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Abstract$0 = $TV($TEXT($S($EXPECT($L95, fail, 'Abstract "abstract"'), NonIdContinue, $E($EXPECT($L8, fail, 'Abstract " "')))), function($skip, $loc, $0, $1) {
+    var Abstract$0 = $TV($TEXT($S($EXPECT($L94, fail, 'Abstract "abstract"'), NonIdContinue, $E($EXPECT($L8, fail, 'Abstract " "')))), function($skip, $loc, $0, $1) {
       return { $loc, token: $1, ts: true };
     });
     function Abstract(state) {
@@ -12263,7 +12480,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var As$0 = $TS($S($EXPECT($L96, fail, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var As$0 = $TS($S($EXPECT($L95, fail, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function As(state) {
@@ -12288,7 +12505,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var At$0 = $TV($EXPECT($L97, fail, 'At "@"'), function($skip, $loc, $0, $1) {
+    var At$0 = $TV($EXPECT($L96, fail, 'At "@"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function At(state) {
@@ -12313,7 +12530,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var AtAt$0 = $TV($EXPECT($L98, fail, 'AtAt "@@"'), function($skip, $loc, $0, $1) {
+    var AtAt$0 = $TV($EXPECT($L97, fail, 'AtAt "@@"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "@" };
     });
     function AtAt(state) {
@@ -12338,7 +12555,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Async$0 = $TS($S($EXPECT($L99, fail, 'Async "async"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Async$0 = $TS($S($EXPECT($L98, fail, 'Async "async"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1, type: "Async" };
     });
     function Async(state) {
@@ -12363,7 +12580,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Await$0 = $TS($S($EXPECT($L100, fail, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Await$0 = $TS($S($EXPECT($L99, fail, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Await(state) {
@@ -12388,7 +12605,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Backtick$0 = $TV($EXPECT($L94, fail, 'Backtick "`"'), function($skip, $loc, $0, $1) {
+    var Backtick$0 = $TV($EXPECT($L93, fail, 'Backtick "`"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function Backtick(state) {
@@ -12413,7 +12630,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var By$0 = $TS($S($EXPECT($L101, fail, 'By "by"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var By$0 = $TS($S($EXPECT($L100, fail, 'By "by"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function By(state) {
@@ -12438,7 +12655,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Case$0 = $TS($S($EXPECT($L102, fail, 'Case "case"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Case$0 = $TS($S($EXPECT($L101, fail, 'Case "case"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Case(state) {
@@ -12463,7 +12680,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Catch$0 = $TS($S($EXPECT($L103, fail, 'Catch "catch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Catch$0 = $TS($S($EXPECT($L102, fail, 'Catch "catch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Catch(state) {
@@ -12488,7 +12705,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Class$0 = $TS($S($EXPECT($L104, fail, 'Class "class"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Class$0 = $TS($S($EXPECT($L103, fail, 'Class "class"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Class(state) {
@@ -12588,7 +12805,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CoffeeSubstitutionStart$0 = $TV($EXPECT($L105, fail, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
+    var CoffeeSubstitutionStart$0 = $TV($EXPECT($L104, fail, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "${" };
     });
     function CoffeeSubstitutionStart(state) {
@@ -12638,7 +12855,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Comma$0 = $TV($EXPECT($L106, fail, 'Comma ","'), function($skip, $loc, $0, $1) {
+    var Comma$0 = $TV($EXPECT($L105, fail, 'Comma ","'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function Comma(state) {
@@ -12663,7 +12880,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ConstructorShorthand$0 = $TV($EXPECT($L97, fail, 'ConstructorShorthand "@"'), function($skip, $loc, $0, $1) {
+    var ConstructorShorthand$0 = $TV($EXPECT($L96, fail, 'ConstructorShorthand "@"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "constructor" };
     });
     function ConstructorShorthand(state) {
@@ -12688,7 +12905,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Declare$0 = $TS($S($EXPECT($L107, fail, 'Declare "declare"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Declare$0 = $TS($S($EXPECT($L106, fail, 'Declare "declare"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Declare(state) {
@@ -12713,7 +12930,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Default$0 = $TS($S($EXPECT($L108, fail, 'Default "default"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Default$0 = $TS($S($EXPECT($L107, fail, 'Default "default"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Default(state) {
@@ -12738,7 +12955,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Delete$0 = $TS($S($EXPECT($L109, fail, 'Delete "delete"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Delete$0 = $TS($S($EXPECT($L108, fail, 'Delete "delete"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Delete(state) {
@@ -12763,7 +12980,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Do$0 = $TS($S($EXPECT($L110, fail, 'Do "do"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Do$0 = $TS($S($EXPECT($L109, fail, 'Do "do"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Do(state) {
@@ -12813,7 +13030,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var DotDot$0 = $TV($EXPECT($L111, fail, 'DotDot ".."'), function($skip, $loc, $0, $1) {
+    var DotDot$0 = $TV($EXPECT($L110, fail, 'DotDot ".."'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function DotDot(state) {
@@ -12838,7 +13055,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var DotDotDot$0 = $TV($EXPECT($L112, fail, 'DotDotDot "..."'), function($skip, $loc, $0, $1) {
+    var DotDotDot$0 = $TV($EXPECT($L111, fail, 'DotDotDot "..."'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function DotDotDot(state) {
@@ -12863,7 +13080,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var DoubleColon$0 = $TV($EXPECT($L113, fail, 'DoubleColon "::"'), function($skip, $loc, $0, $1) {
+    var DoubleColon$0 = $TV($EXPECT($L112, fail, 'DoubleColon "::"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function DoubleColon(state) {
@@ -12888,7 +13105,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var DoubleQuote$0 = $TV($EXPECT($L114, fail, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
+    var DoubleQuote$0 = $TV($EXPECT($L113, fail, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function DoubleQuote(state) {
@@ -12913,7 +13130,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Else$0 = $TS($S($EXPECT($L115, fail, 'Else "else"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Else$0 = $TS($S($EXPECT($L114, fail, 'Else "else"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Else(state) {
@@ -12963,7 +13180,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Export$0 = $TS($S($EXPECT($L116, fail, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Export$0 = $TS($S($EXPECT($L115, fail, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Export(state) {
@@ -12988,7 +13205,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Extends$0 = $TS($S($EXPECT($L117, fail, 'Extends "extends"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Extends$0 = $TS($S($EXPECT($L116, fail, 'Extends "extends"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Extends(state) {
@@ -13013,6 +13230,31 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var Finally$0 = $TS($S($EXPECT($L117, fail, 'Finally "finally"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      return { $loc, token: $1 };
+    });
+    function Finally(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("Finally", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("Finally", state, Finally$0(state));
+        if (state.events)
+          state.events.exit?.("Finally", state, result, eventData);
+        return result;
+      } else {
+        const result = Finally$0(state);
+        if (state.events)
+          state.events.exit?.("Finally", state, result, eventData);
+        return result;
+      }
+    }
     var For$0 = $TS($S($EXPECT($L118, fail, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
@@ -13363,7 +13605,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var OpenBracket$0 = $TV($EXPECT($L93, fail, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
+    var OpenBracket$0 = $TV($EXPECT($L92, fail, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function OpenBracket(state) {
@@ -13716,7 +13958,7 @@ ${input.slice(result.pos)}
     var Static$0 = $TS($S($EXPECT($L139, fail, 'Static "static"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
-    var Static$1 = $TS($S($EXPECT($L97, fail, 'Static "@"'), $N($C($EXPECT($L2, fail, 'Static "("'), $EXPECT($L97, fail, 'Static "@"')))), function($skip, $loc, $0, $1, $2) {
+    var Static$1 = $TS($S($EXPECT($L96, fail, 'Static "@"'), $N($C($EXPECT($L2, fail, 'Static "("'), $EXPECT($L96, fail, 'Static "@"')))), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: "static " };
     });
     function Static(state) {
@@ -14856,7 +15098,7 @@ ${input.slice(result.pos)}
       return ["{", $1, "}"];
     });
     var JSXShorthandString$2 = StringLiteral;
-    var JSXShorthandString$3 = $S(OpenBrace, ExtendedExpression, $E(Whitespace), CloseBrace);
+    var JSXShorthandString$3 = $S(OpenBrace, PostfixedExpression, $E(Whitespace), CloseBrace);
     function JSXShorthandString(state) {
       let eventData;
       if (state.events) {
@@ -14926,7 +15168,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXAttributeValue$0 = $S(OpenBrace, ExtendedExpression, $E(Whitespace), CloseBrace);
+    var JSXAttributeValue$0 = $S(OpenBrace, PostfixedExpression, $E(Whitespace), CloseBrace);
     var JSXAttributeValue$1 = JSXElement;
     var JSXAttributeValue$2 = JSXFragment;
     var JSXAttributeValue$3 = $TS($S(InsertInlineOpenBrace, InlineJSXAttributeValue, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3) {
@@ -15117,7 +15359,7 @@ ${input.slice(result.pos)}
       }
     }
     var InlineJSXCallExpression$0 = $S($EXPECT($L12, fail, 'InlineJSXCallExpression "super"'), ExplicitArguments);
-    var InlineJSXCallExpression$1 = $S($EXPECT($L13, fail, 'InlineJSXCallExpression "import"'), OpenParen, ExtendedExpression, __, CloseParen);
+    var InlineJSXCallExpression$1 = $S($EXPECT($L13, fail, 'InlineJSXCallExpression "import"'), OpenParen, PostfixedExpression, __, CloseParen);
     var InlineJSXCallExpression$2 = $TS($S(InlineJSXMemberExpression, $Q(InlineJSXCallExpressionRest)), function($skip, $loc, $0, $1, $2) {
       if ($2.length)
         return $0;
@@ -15539,7 +15781,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXChildExpression$0 = $S($E(Whitespace), $E($S(DotDotDot, $E(Whitespace))), ExtendedExpression);
+    var JSXChildExpression$0 = $S($E(Whitespace), $E($S(DotDotDot, $E(Whitespace))), PostfixedExpression);
     function JSXChildExpression(state) {
       let eventData;
       if (state.events) {
@@ -16484,7 +16726,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeConditional$0 = $TS($S(TypeBinary, $E($S(__, $EXPECT($L117, 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($L116, fail, 'TypeConditional "extends"'), NonIdContinue, Type, $E($S(__, QuestionMark, Type, __, Colon, Type))))), function($skip, $loc, $0, $1, $2) {
       if ($2)
         return $0;
       return $1;
@@ -16643,7 +16885,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var FunctionType$0 = $TS($S(Parameters, __, $EXPECT($L7, fail, 'FunctionType "=>"'), $E(Type)), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var FunctionType$0 = $TS($S(Parameters, __, TypeArrowFunction, $E(Type)), function($skip, $loc, $0, $1, $2, $3, $4) {
       var type = $4;
       if (type) {
         return $0;
@@ -16672,6 +16914,34 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    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) {
+      return { $loc, token: "=>" };
+    });
+    function TypeArrowFunction(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("TypeArrowFunction", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("TypeArrowFunction", state, TypeArrowFunction$0(state) || TypeArrowFunction$1(state));
+        if (state.events)
+          state.events.exit?.("TypeArrowFunction", state, result, eventData);
+        return result;
+      } else {
+        const result = TypeArrowFunction$0(state) || TypeArrowFunction$1(state);
+        if (state.events)
+          state.events.exit?.("TypeArrowFunction", state, result, eventData);
+        return result;
+      }
+    }
     var TypeArguments$0 = $TS($S($EXPECT($L128, fail, 'TypeArguments "<"'), $P(TypeArgument), __, $EXPECT($L29, fail, 'TypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4) {
       return { ts: true, children: $0 };
     });
@@ -16797,7 +17067,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeConstraint$0 = $S(__, $EXPECT($L117, fail, 'TypeConstraint "extends"'), NonIdContinue, Type);
+    var TypeConstraint$0 = $S(__, $EXPECT($L116, fail, 'TypeConstraint "extends"'), NonIdContinue, Type);
     function TypeConstraint(state) {
       let eventData;
       if (state.events) {
@@ -18328,10 +18598,11 @@ ${input.slice(result.pos)}
         children.push(block);
         if (!module.isWhitespaceOrEmpty(ws))
           children.push(ws);
-        return Object.assign({}, post, {
-          children,
-          block
-        });
+        post = { ...post, children, block };
+        if (post.type === "IfStatement") {
+          post.then = block;
+        }
+        return post;
       };
       function expressionizeIteration(exp) {
         const resultsRef = {
@@ -18404,9 +18675,9 @@ ${input.slice(result.pos)}
             insertPush(exp.expressions[exp.expressions.length - 1], ref);
             return;
           case "IfStatement":
-            insertPush(exp.children[2], ref);
-            if (exp.children[3])
-              insertPush(exp.children[3][2], ref);
+            insertPush(exp.then, ref);
+            if (exp.else)
+              insertPush(exp.else[2], ref);
             else
               exp.children.push([" else {\n", indent, ref, ".push(undefined)\n", indent, "}"]);
             return;
@@ -18462,7 +18733,9 @@ ${input.slice(result.pos)}
         }
         if (!Array.isArray(node))
           return;
-        const [, exp] = node;
+        const [, exp, semi] = node;
+        if (semi?.type === "SemicolonDelimiter")
+          return;
         let indent = node[0];
         if (Array.isArray(indent))
           indent = indent[indent.length - 1];
@@ -18485,9 +18758,9 @@ ${input.slice(result.pos)}
             insertReturn(exp.expressions[exp.expressions.length - 1]);
             return;
           case "IfStatement":
-            insertReturn(exp.children[2]);
-            if (exp.children[3])
-              insertReturn(exp.children[3][2]);
+            insertReturn(exp.then);
+            if (exp.else)
+              insertReturn(exp.else[2]);
             else
               exp.children.push(["\n", indent, wrapWithReturn()]);
             return;
@@ -18548,6 +18821,14 @@ ${input.slice(result.pos)}
           const op = expandedOps[i];
           if (op.special) {
             let [a, wsOp, op2, wsB, b] = expandedOps.slice(i - 2, i + 3);
+            if (op2.token === "instanceof" && b.type === "Literal" && b.children?.[0]?.type === "StringLiteral") {
+              a = ["typeof ", module.makeLeftHandSideExpression(a)];
+              if (op2.negated) {
+                op2 = { ...op2, token: "!==", negated: false };
+              } else {
+                op2 = { ...op2, token: "===" };
+              }
+            }
             if (op2.asConst) {
               a = module.makeAsConst(a);
               b = module.makeAsConst(b);
@@ -18588,7 +18869,7 @@ ${input.slice(result.pos)}
         return expandedOps;
       };
       module.expandChainedComparisons = function([first, binops]) {
-        const relationalOps = ["==", "===", "!=", "!==", "<", "<=", ">", ">=", "in", "instanceof"];
+        const relationalOps = ["==", "===", "!=", "!==", "<", "<=", ">", ">=", "in"];
         const lowerPrecedenceOps = ["??", "&&", "||", "&", "|", "^"];
         let results = [];
         let i = 0;
@@ -19149,7 +19430,7 @@ ${input.slice(result.pos)}
                       break;
                     case "Literal":
                     case "StringLiteral":
-                    case void 0:
+                    case "NumericLiteral":
                       conditions.push([name, " in ", ref]);
                       subRef = [ref, "[", name, "]"];
                       break;
@@ -19212,7 +19493,8 @@ ${input.slice(result.pos)}
                   switch (name.type) {
                     case "ComputedPropertyName":
                     case "Literal":
-                    case void 0:
+                    case "StringLiteral":
+                    case "NumericLiteral":
                       return {
                         ...p,
                         children: [ws, name, ": ", match, sep]
@@ -19335,7 +19617,9 @@ ${input.slice(result.pos)}
             const e = i < l - 1 ? ["\nelse "] : [];
             prev.push({
               type: "IfStatement",
-              children: ["if", condition, block, ...e, next]
+              children: ["if", condition, block, ...e, next],
+              then: block,
+              else: e
             });
             prev = next;
           });
@@ -20242,7 +20526,7 @@ var parse;
 var uncacheable;
 ({ parse } = import_parser.default);
 ({ SourceMap: SourceMap2, base64Encode: base64Encode2 } = util_exports);
-uncacheable = /* @__PURE__ */ new Set(["ActualAssignment", "ApplicationStart", "Arguments", "ArgumentsWithTrailingMemberExpressions", "ArrowFunction", "ArrowFunctionTail", "AssignmentExpression", "AssignmentExpressionTail", "BinaryOpExpression", "BinaryOpRHS", "BracedBlock", "BracedObjectLiteralContent", "BracedOrEmptyBlock", "CallExpression", "CallExpressionRest", "CoffeeCommentEnabled", "CommaDelimiter", "ConditionalExpression", "Declaration", "Debugger", "ElseClause", "Expression", "ExpressionStatement", "ExpressionWithIndentedApplicationSuppressed", "ExtendedExpression", "FatArrowBody", "FunctionDeclaration", "FunctionExpression", "HoistableDeclaration", "ImplicitArguments", "ImplicitInlineObjectPropertyDelimiter", "ImplicitNestedBlock", "IndentedApplicationAllowed", "IndentedFurther", "IndentedJSXChildExpression", "InlineObjectLiteral", "InsertIndent", "JSXChild", "JSXChildren", "JSXElement", "JSXFragment", "JSXImplicitFragment", "JSXMixedChildren", "JSXNested", "JSXNestedChildren", "JSXOptionalClosingElement", "JSXOptionalClosingFragment", "JSXTag", "LeftHandSideExpression", "MemberExpression", "MemberExpressionRest", "Nested", "NestedBindingElement", "NestedBindingElements", "NestedBlockExpression", "NestedBlockExpression", "NestedBlockStatement", "NestedBlockStatements", "NestedElement", "NestedElementList", "NestedImplicitObjectLiteral", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedInterfaceProperty", "NestedJSXChildExpression", "NestedObject", "NestedPropertyDefinitions", "NonSuppressedTrailingMemberExpressions", "ObjectLiteral", "PopIndent", "PrimaryExpression", "PushIndent", "PushJSXOpeningElement", "PushJSXOpeningFragment", "Samedent", "ShortCircuitExpression", "SingleLineAssignmentExpression", "SingleLineComment", "SingleLineStatements", "SnugNamedProperty", "Statement", "StatementListItem", "SuppressIndentedApplication", "SuppressTrailingMemberProperty", "ThinArrowFunction", "TrackIndented", "TrailingMemberExpressions", "TrailingMemberPropertyAllowed", "TypedJSXElement", "TypedJSXFragment", "UnaryExpression", "UpdateExpression"]);
+uncacheable = /* @__PURE__ */ new Set(["ActualAssignment", "ApplicationStart", "Arguments", "ArgumentsWithTrailingMemberExpressions", "ArrowFunction", "ArrowFunctionTail", "AssignmentExpression", "AssignmentExpressionTail", "BinaryOpExpression", "BinaryOpRHS", "BracedBlock", "BracedObjectLiteralContent", "BracedOrEmptyBlock", "CallExpression", "CallExpressionRest", "CoffeeCommentEnabled", "CommaDelimiter", "ConditionalExpression", "Declaration", "Debugger", "ElseClause", "Expression", "ExpressionStatement", "ExpressionWithIndentedApplicationSuppressed", "ExtendedExpression", "FatArrowBody", "FunctionDeclaration", "FunctionExpression", "HoistableDeclaration", "ImplicitArguments", "ImplicitInlineObjectPropertyDelimiter", "ImplicitNestedBlock", "IndentedApplicationAllowed", "IndentedFurther", "IndentedJSXChildExpression", "InlineObjectLiteral", "InsertIndent", "JSXChild", "JSXChildren", "JSXElement", "JSXFragment", "JSXImplicitFragment", "JSXMixedChildren", "JSXNested", "JSXNestedChildren", "JSXOptionalClosingElement", "JSXOptionalClosingFragment", "JSXTag", "LeftHandSideExpression", "MemberExpression", "MemberExpressionRest", "Nested", "NestedBindingElement", "NestedBindingElements", "NestedBlockExpression", "NestedBlockExpression", "NestedBlockStatement", "NestedBlockStatements", "NestedElement", "NestedElementList", "NestedImplicitObjectLiteral", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedInterfaceProperty", "NestedJSXChildExpression", "NestedObject", "NestedPropertyDefinitions", "NonSingleBracedBlock", "NonSuppressedTrailingMemberExpressions", "ObjectLiteral", "PopIndent", "PostfixedExpression", "PostfixedStatement", "PrimaryExpression", "PushIndent", "PushJSXOpeningElement", "PushJSXOpeningFragment", "RHS", "Samedent", "ShortCircuitExpression", "SingleLineAssignmentExpression", "SingleLineComment", "SingleLineStatements", "SnugNamedProperty", "Statement", "StatementListItem", "SuffixedExpression", "SuffixedStatement", "SuppressIndentedApplication", "SuppressTrailingMemberProperty", "ThinArrowFunction", "TrackIndented", "TrailingMemberExpressions", "TrailingMemberPropertyAllowed", "TypedJSXElement", "TypedJSXFragment", "UnaryExpression", "UpdateExpression"]);
 var compile = function(src, options) {
   var ast, code, events, filename, ref, result, sm, srcMapJSON;
   if (!options) {