@danielx/civet 0.5.35 → 0.5.37

package/dist/main.js

@@ -436,7 +436,7 @@ ${input.slice(result.pos)}
       ExplicitArguments,
       ApplicationStart,
       IndentedApplicationAllowed,
-      ArgumentsWithTrailingCallExpressions,
+      ArgumentsWithTrailingMemberExpressions,
       ArgumentList,
       NestedArgumentList,
       NestedArgument,
@@ -850,6 +850,8 @@ ${input.slice(result.pos)}
       TypeDeclaration,
       TypeDeclarationModifier,
       TypeDeclarationRest,
+      InterfaceExtendsClause,
+      InterfaceExtendsTarget,
       TypeKeyword,
       Interface,
       Namespace,
@@ -882,10 +884,6 @@ ${input.slice(result.pos)}
       TypeBinaryOp,
       FunctionType,
       TypeArguments,
-      InlineTypeArguments,
-      InlineTypeArgument,
-      InlineTypeArgumentDelimiter,
-      CompactTypeArguments,
       TypeArgument,
       TypeArgumentDelimiter,
       TypeParameters,
@@ -940,13 +938,13 @@ ${input.slice(result.pos)}
       Nested
     });
     var $L0 = $L("");
-    var $L1 = $L("++");
-    var $L2 = $L("--");
-    var $L3 = $L("=>");
-    var $L4 = $L(" ");
-    var $L5 = $L("implements");
-    var $L6 = $L("#");
-    var $L7 = $L(".");
+    var $L1 = $L(".");
+    var $L2 = $L("++");
+    var $L3 = $L("--");
+    var $L4 = $L("=>");
+    var $L5 = $L(" ");
+    var $L6 = $L("implements");
+    var $L7 = $L("#");
     var $L8 = $L("super");
     var $L9 = $L("import");
     var $L10 = $L("!");
@@ -1106,7 +1104,7 @@ ${input.slice(result.pos)}
     var $L164 = $L("infer");
     var $L165 = $L("[]");
     var $L166 = $L("civet");
-    var $R0 = $R(new RegExp("(for|of|then|when)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
+    var $R0 = $R(new RegExp("(as|for|of|satisfies|then|when)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
     var $R1 = $R(new RegExp("[&]", "suy"));
     var $R2 = $R(new RegExp("[!~+-]+", "suy"));
     var $R3 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$])*", "suy"));
@@ -1143,7 +1141,7 @@ ${input.slice(result.pos)}
     var $R34 = $R(new RegExp("(?:by)(?!\\p{ID_Continue})", "suy"));
     var $R35 = $R(new RegExp("(?:of)(?!\\p{ID_Continue})", "suy"));
     var $R36 = $R(new RegExp("(?:not)(?!\\p{ID_Continue})", "suy"));
-    var $R37 = $R(new RegExp("(?:and|as|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|let|loop|new|null|or|private|protected|public|return|satisfies|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})", "suy"));
+    var $R37 = $R(new RegExp("(?:and|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|let|loop|new|null|or|private|protected|public|return|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})", "suy"));
     var $R38 = $R(new RegExp("\\/\\/(?!\\/)[^\\r\\n]*", "suy"));
     var $R39 = $R(new RegExp(".", "suy"));
     var $R40 = $R(new RegExp("#(?!##(?!#))([^\\r\\n]*)", "suy"));
@@ -1353,7 +1351,7 @@ ${input.slice(result.pos)}
       }
     }
     var Arguments$0 = ExplicitArguments;
-    var Arguments$1 = $TS($S($E($S(InlineTypeArguments, $N($S(__, ImplementsToken)))), ApplicationStart, InsertOpenParen, $Q(_), ArgumentList, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var Arguments$1 = $TS($S($E($S(TypeArguments, $N($S(__, ImplementsToken)))), ApplicationStart, InsertOpenParen, $Q(_), ArgumentList, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       var ta = $1;
       var open = $3;
       var ws = $4;
@@ -1457,11 +1455,11 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ArgumentsWithTrailingCallExpressions$0 = $S(Arguments, $Q($S(Samedent, $N(Backtick), CallExpressionRest)));
-    function ArgumentsWithTrailingCallExpressions(state) {
+    var ArgumentsWithTrailingMemberExpressions$0 = $S(Arguments, $Q($S(Samedent, $Y($EXPECT($L1, fail, 'ArgumentsWithTrailingMemberExpressions "."')), MemberExpressionRest)));
+    function ArgumentsWithTrailingMemberExpressions(state) {
       let eventData;
       if (state.events) {
-        const result = state.events.enter?.("ArgumentsWithTrailingCallExpressions", state);
+        const result = state.events.enter?.("ArgumentsWithTrailingMemberExpressions", state);
         if (result) {
           if (result.cache)
             return result.cache;
@@ -1469,14 +1467,14 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("ArgumentsWithTrailingCallExpressions", state, ArgumentsWithTrailingCallExpressions$0(state));
+        const result = $TOKEN("ArgumentsWithTrailingMemberExpressions", state, ArgumentsWithTrailingMemberExpressions$0(state));
         if (state.events)
-          state.events.exit?.("ArgumentsWithTrailingCallExpressions", state, result, eventData);
+          state.events.exit?.("ArgumentsWithTrailingMemberExpressions", state, result, eventData);
         return result;
       } else {
-        const result = ArgumentsWithTrailingCallExpressions$0(state);
+        const result = ArgumentsWithTrailingMemberExpressions$0(state);
         if (state.events)
-          state.events.exit?.("ArgumentsWithTrailingCallExpressions", state, result, eventData);
+          state.events.exit?.("ArgumentsWithTrailingMemberExpressions", state, result, eventData);
         return result;
       }
     }
@@ -1800,7 +1798,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var UpdateExpressionSymbol$0 = $TV($C($EXPECT($L1, fail, 'UpdateExpressionSymbol "++"'), $EXPECT($L2, fail, 'UpdateExpressionSymbol "--"')), function($skip, $loc, $0, $1) {
+    var UpdateExpressionSymbol$0 = $TV($C($EXPECT($L2, fail, 'UpdateExpressionSymbol "++"'), $EXPECT($L3, fail, 'UpdateExpressionSymbol "--"')), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function UpdateExpressionSymbol(state) {
@@ -2092,7 +2090,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var FatArrow$0 = $TS($S(__, $EXPECT($L3, fail, 'FatArrow "=>"')), function($skip, $loc, $0, $1, $2) {
+    var FatArrow$0 = $TS($S(__, $EXPECT($L4, fail, 'FatArrow "=>"')), function($skip, $loc, $0, $1, $2) {
       var ws = $1;
       if (!ws.length)
         return " =>";
@@ -2175,7 +2173,7 @@ ${input.slice(result.pos)}
       }
     }
     var TernaryRest$0 = NestedTernaryRest;
-    var TernaryRest$1 = $TS($S($N(CoffeeBinaryExistentialEnabled), $Y($EXPECT($L4, fail, 'TernaryRest " "')), $Q(TrailingComment), QuestionMark, ExtendedExpression, __, Colon, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
+    var TernaryRest$1 = $TS($S($N(CoffeeBinaryExistentialEnabled), $Y($EXPECT($L5, fail, 'TernaryRest " "')), $Q(TrailingComment), QuestionMark, ExtendedExpression, __, Colon, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
       return $0.slice(2);
     });
     function TernaryRest(state) {
@@ -2535,7 +2533,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ExtendsToken$0 = $TS($S(Loc, __, OpenAngleBracket, $E($EXPECT($L4, fail, 'ExtendsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var ExtendsToken$0 = $TS($S(Loc, __, OpenAngleBracket, $E($EXPECT($L5, fail, 'ExtendsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
       var l = $1;
       var ws = $2;
       var lt = $3;
@@ -2631,7 +2629,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ImplementsToken$0 = $TS($S($EXPECT($L5, fail, 'ImplementsToken "implements"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var ImplementsToken$0 = $TS($S($EXPECT($L6, fail, 'ImplementsToken "implements"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function ImplementsToken(state) {
@@ -2880,7 +2878,7 @@ ${input.slice(result.pos)}
       }
     }
     var ThisLiteral$0 = This;
-    var ThisLiteral$1 = $TS($S(At, $TEXT($S($E($EXPECT($L6, fail, 'ThisLiteral "#"')), IdentifierName))), function($skip, $loc, $0, $1, $2) {
+    var ThisLiteral$1 = $TS($S(At, $TEXT($S($E($EXPECT($L7, fail, 'ThisLiteral "#"')), IdentifierName))), function($skip, $loc, $0, $1, $2) {
       var t = $1;
       var id = $2;
       return [{ ...t, token: "this." }, id];
@@ -2911,7 +2909,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var LeftHandSideExpression$0 = $TS($S($Q($S(New, $N($EXPECT($L7, fail, 'LeftHandSideExpression "."')), __)), CallExpression), function($skip, $loc, $0, $1, $2) {
+    var LeftHandSideExpression$0 = $TS($S($Q($S(New, $N($EXPECT($L1, fail, 'LeftHandSideExpression "."')), __)), CallExpression), function($skip, $loc, $0, $1, $2) {
       if ($1.length)
         return $0;
       return $2;
@@ -2938,8 +2936,8 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CallExpression$0 = $S($EXPECT($L8, fail, 'CallExpression "super"'), ArgumentsWithTrailingCallExpressions, $Q(CallExpressionRest));
-    var CallExpression$1 = $TS($S($EXPECT($L9, fail, 'CallExpression "import"'), ArgumentsWithTrailingCallExpressions, $Q(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
+    var CallExpression$0 = $S($EXPECT($L8, fail, 'CallExpression "super"'), ArgumentsWithTrailingMemberExpressions, $Q(CallExpressionRest));
+    var CallExpression$1 = $TS($S($EXPECT($L9, fail, 'CallExpression "import"'), ArgumentsWithTrailingMemberExpressions, $Q(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
       return {
         type: "CallExpression",
         children: $0
@@ -2978,7 +2976,7 @@ ${input.slice(result.pos)}
     }
     var CallExpressionRest$0 = MemberExpressionRest;
     var CallExpressionRest$1 = TemplateLiteral;
-    var CallExpressionRest$2 = $S($E($C(OptionalShorthand, NonNullAssertion)), ArgumentsWithTrailingCallExpressions);
+    var CallExpressionRest$2 = $S($E($C(OptionalShorthand, NonNullAssertion)), ArgumentsWithTrailingMemberExpressions);
     function CallExpressionRest(state) {
       let eventData;
       if (state.events) {
@@ -3049,7 +3047,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var AdditionalReservedWords$0 = $R$0($EXPECT($R0, fail, "AdditionalReservedWords /(for|of|then|when)(?!\\p{ID_Continue}|[\\u200C\\u200D$])/"));
+    var AdditionalReservedWords$0 = $R$0($EXPECT($R0, fail, "AdditionalReservedWords /(as|for|of|satisfies|then|when)(?!\\p{ID_Continue}|[\\u200C\\u200D$])/"));
     var AdditionalReservedWords$1 = AtAt;
     function AdditionalReservedWords(state) {
       let eventData;
@@ -4576,16 +4574,8 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ThenClause$0 = $TS($S(Then, $Q(TrailingComment), Statement), function($skip, $loc, $0, $1, $2, $3) {
-      var ws = $2;
-      var s = $3;
-      const expressions = [[ws, s]];
-      return {
-        type: "BlockStatement",
-        expressions,
-        children: [expressions],
-        bare: true
-      };
+    var ThenClause$0 = $T($S(Then, SingleLineStatements), function(value) {
+      return value[1];
     });
     function ThenClause(state) {
       let eventData;
@@ -4690,8 +4680,8 @@ ${input.slice(result.pos)}
       var c = $5;
       return {
         type: "BlockStatement",
-        expressions: s,
-        children: [o, s, ws, c]
+        expressions: s.expressions,
+        children: [o, s.children, ws, c]
       };
     });
     function BracedBlock(state) {
@@ -4716,13 +4706,18 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var SingleLineStatements$0 = $TS($S($S($Q(TrailingComment), Statement), $Q($S(SemicolonDelimiter, $E(Statement)))), function($skip, $loc, $0, $1, $2) {
-      var first = $1;
-      var rest = $2;
-      if (rest.length) {
-        return [first, ...rest];
-      }
-      return [first];
+    var SingleLineStatements$0 = $TS($S($Q($S($Q(_), Statement, SemicolonDelimiter)), $E($S($Q(_), Statement, $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 SingleLineStatements(state) {
       let eventData;
@@ -6254,7 +6249,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var PrivateIdentifier$0 = $TV($TEXT($S($EXPECT($L6, fail, 'PrivateIdentifier "#"'), IdentifierName)), function($skip, $loc, $0, $1) {
+    var PrivateIdentifier$0 = $TV($TEXT($S($EXPECT($L7, fail, 'PrivateIdentifier "#"'), IdentifierName)), function($skip, $loc, $0, $1) {
       return {
         type: "Identifier",
         name: $0,
@@ -8015,48 +8010,34 @@ ${input.slice(result.pos)}
       }
     }
     var CaseClause$0 = $T($S(Case, CaseExpressionList, $C(NestedBlockStatements, NoExpressions)), function(value) {
-      var cases = value[1];
-      var expressions = value[2];
-      return { "type": "CaseClause", "cases": cases, "expressions": expressions, "children": value };
+      return { "type": "CaseClause", "children": value };
     });
-    var CaseClause$1 = $TS($S(When, CaseExpressionList, InsertOpenBrace, $E($C(ThenClause, NestedBlockStatements)), InsertBreak, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
+    var CaseClause$1 = $TS($S(When, CaseExpressionList, InsertOpenBrace, $C(ThenClause, NestedBlockStatements, NoExpressions), InsertBreak, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
       var cases = $2;
-      var expressions = $4;
+      var block = $4;
       var b = $5;
-      let children = $0;
-      if (!expressions) {
-        expressions = [];
-        children = children.map((c, i) => i === 3 ? expressions : c);
-      }
-      if (expressions.expressions) {
-        expressions = expressions.expressions;
-      }
       return {
         type: "WhenClause",
         cases,
-        expressions,
+        block,
         break: b,
-        children
+        children: $0
       };
     });
     var CaseClause$2 = $TS($S(Default, ImpliedColon, $C(NestedBlockStatements, NoExpressions)), function($skip, $loc, $0, $1, $2, $3) {
-      var expressions = $3;
-      if (expressions.expressions)
-        expressions = expressions.expressions;
+      var block = $3;
       return {
         type: "DefaultClause",
-        expressions,
+        block,
         children: $0
       };
     });
-    var CaseClause$3 = $TS($S(Else, ImpliedColon, InsertOpenBrace, $C(NestedBlockStatements, $S($Q(TrailingComment), Statement)), InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
-      var expressions = $4;
+    var CaseClause$3 = $TS($S(Else, ImpliedColon, InsertOpenBrace, $C(NestedBlockStatements, SingleLineStatements), InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+      var block = $4;
       $1.token = "default";
-      if (expressions.expressions)
-        expressions = expressions.expressions;
       return {
         type: "DefaultClause",
-        expressions,
+        block,
         children: $0
       };
     });
@@ -8813,7 +8794,7 @@ ${input.slice(result.pos)}
       }
     }
     var ImportAsToken$0 = $S(__, As);
-    var ImportAsToken$1 = $TS($S(Loc, __, Colon, $E($EXPECT($L4, fail, 'ImportAsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var ImportAsToken$1 = $TS($S(Loc, __, Colon, $E($EXPECT($L5, fail, 'ImportAsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
       var l = $1;
       var ws = $2;
       var c = $3;
@@ -10385,7 +10366,7 @@ ${input.slice(result.pos)}
     var ReservedWord$3 = $S(CoffeeOfEnabled, $R$0($EXPECT($R35, fail, "ReservedWord /(?:of)(?!\\p{ID_Continue})/")));
     var ReservedWord$4 = $S(CoffeeNotEnabled, $R$0($EXPECT($R36, fail, "ReservedWord /(?:not)(?!\\p{ID_Continue})/")));
     var ReservedWord$5 = $S($EXPECT($L71, fail, 'ReservedWord "not"'), NonIdContinue, __, $EXPECT($L72, fail, 'ReservedWord "in"'), NonIdContinue);
-    var ReservedWord$6 = $R$0($EXPECT($R37, fail, "ReservedWord /(?:and|as|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|let|loop|new|null|or|private|protected|public|return|satisfies|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})/"));
+    var ReservedWord$6 = $R$0($EXPECT($R37, fail, "ReservedWord /(?:and|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|let|loop|new|null|or|private|protected|public|return|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})/"));
     function ReservedWord(state) {
       let eventData;
       if (state.events) {
@@ -10903,7 +10884,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Abstract$0 = $TV($TEXT($S($EXPECT($L89, fail, 'Abstract "abstract"'), NonIdContinue, $E($EXPECT($L4, fail, 'Abstract " "')))), function($skip, $loc, $0, $1) {
+    var Abstract$0 = $TV($TEXT($S($EXPECT($L89, fail, 'Abstract "abstract"'), NonIdContinue, $E($EXPECT($L5, fail, 'Abstract " "')))), function($skip, $loc, $0, $1) {
       return { $loc, token: $1, ts: true };
     });
     function Abstract(state) {
@@ -11428,7 +11409,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Dot$0 = $TV($EXPECT($L7, fail, 'Dot "."'), function($skip, $loc, $0, $1) {
+    var Dot$0 = $TV($EXPECT($L1, fail, 'Dot "."'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function Dot(state) {
@@ -11753,7 +11734,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var If$0 = $TV($TEXT($S($EXPECT($L115, fail, 'If "if"'), NonIdContinue, $E($EXPECT($L4, fail, 'If " "')))), function($skip, $loc, $0, $1) {
+    var If$0 = $TV($TEXT($S($EXPECT($L115, fail, 'If "if"'), NonIdContinue, $E($EXPECT($L5, fail, 'If " "')))), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function If(state) {
@@ -11903,7 +11884,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Not$0 = $TS($S(CoffeeNotEnabled, $EXPECT($L71, fail, 'Not "not"'), NonIdContinue, $E($EXPECT($L4, fail, 'Not " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var Not$0 = $TS($S(CoffeeNotEnabled, $EXPECT($L71, fail, 'Not "not"'), NonIdContinue, $E($EXPECT($L5, fail, 'Not " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
       return { $loc, token: "!" };
     });
     function Not(state) {
@@ -12938,7 +12919,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXSelfClosingElement$0 = $TS($S($EXPECT($L120, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(CompactTypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L152, fail, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var JSXSelfClosingElement$0 = $TS($S($EXPECT($L120, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L152, fail, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       return { type: "JSXElement", children: $0 };
     });
     function JSXSelfClosingElement(state) {
@@ -12963,7 +12944,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXOpeningElement$0 = $S($EXPECT($L120, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(CompactTypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L25, fail, 'JSXOpeningElement ">"'));
+    var JSXOpeningElement$0 = $S($EXPECT($L120, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L25, fail, 'JSXOpeningElement ">"'));
     function JSXOpeningElement(state) {
       let eventData;
       if (state.events) {
@@ -13243,7 +13224,7 @@ ${input.slice(result.pos)}
       }
     });
     var JSXAttribute$2 = $S(InsertInlineOpenBrace, DotDotDot, InlineJSXAttributeValue, InsertCloseBrace);
-    var JSXAttribute$3 = $TS($S($EXPECT($L6, fail, 'JSXAttribute "#"'), JSXShorthandString), function($skip, $loc, $0, $1, $2) {
+    var JSXAttribute$3 = $TS($S($EXPECT($L7, fail, 'JSXAttribute "#"'), JSXShorthandString), function($skip, $loc, $0, $1, $2) {
       return [" ", "id=", $2];
     });
     var JSXAttribute$4 = $TS($S(Dot, JSXShorthandString), function($skip, $loc, $0, $1, $2) {
@@ -14043,7 +14024,7 @@ ${input.slice(result.pos)}
       }
     }
     var TypeDeclarationRest$0 = $S(TypeKeyword, $Q(TrailingComment), IdentifierName, $E(TypeParameters), __, Equals, __, Type);
-    var TypeDeclarationRest$1 = $S(Interface, $Q(TrailingComment), IdentifierName, $E(TypeParameters), InterfaceBlock);
+    var TypeDeclarationRest$1 = $S(Interface, $Q(TrailingComment), IdentifierName, $E(TypeParameters), $E(InterfaceExtendsClause), InterfaceBlock);
     var TypeDeclarationRest$2 = $S(Namespace, $Q(TrailingComment), IdentifierName, NamespaceBlock);
     var TypeDeclarationRest$3 = FunctionSignature;
     function TypeDeclarationRest(state) {
@@ -14068,6 +14049,52 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var InterfaceExtendsClause$0 = $S(ExtendsToken, InterfaceExtendsTarget);
+    function InterfaceExtendsClause(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("InterfaceExtendsClause", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("InterfaceExtendsClause", state, InterfaceExtendsClause$0(state));
+        if (state.events)
+          state.events.exit?.("InterfaceExtendsClause", state, result, eventData);
+        return result;
+      } else {
+        const result = InterfaceExtendsClause$0(state);
+        if (state.events)
+          state.events.exit?.("InterfaceExtendsClause", state, result, eventData);
+        return result;
+      }
+    }
+    var InterfaceExtendsTarget$0 = ImplementsTarget;
+    function InterfaceExtendsTarget(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("InterfaceExtendsTarget", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("InterfaceExtendsTarget", state, InterfaceExtendsTarget$0(state));
+        if (state.events)
+          state.events.exit?.("InterfaceExtendsTarget", state, result, eventData);
+        return result;
+      } else {
+        const result = InterfaceExtendsTarget$0(state);
+        if (state.events)
+          state.events.exit?.("InterfaceExtendsTarget", state, result, eventData);
+        return result;
+      }
+    }
     var TypeKeyword$0 = $S($EXPECT($L159, fail, 'TypeKeyword "type"'), NonIdContinue);
     function TypeKeyword(state) {
       let eventData;
@@ -14830,7 +14857,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var FunctionType$0 = $S(Parameters, __, $EXPECT($L3, fail, 'FunctionType "=>"'), Type);
+    var FunctionType$0 = $S(Parameters, __, $EXPECT($L4, fail, 'FunctionType "=>"'), Type);
     function FunctionType(state) {
       let eventData;
       if (state.events) {
@@ -14853,7 +14880,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeArguments$0 = $TS($S(__, $EXPECT($L120, fail, 'TypeArguments "<"'), $P(TypeArgument), __, $EXPECT($L25, fail, 'TypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var TypeArguments$0 = $TS($S($EXPECT($L120, fail, 'TypeArguments "<"'), $P(TypeArgument), __, $EXPECT($L25, fail, 'TypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4) {
       return { ts: true, children: $0 };
     });
     function TypeArguments(state) {
@@ -14878,103 +14905,6 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InlineTypeArguments$0 = $TS($S($Q(_), $EXPECT($L120, fail, 'InlineTypeArguments "<"'), $P(InlineTypeArgument), $Q(_), $EXPECT($L25, fail, 'InlineTypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-      return { ts: true, children: $0 };
-    });
-    function InlineTypeArguments(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("InlineTypeArguments", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("InlineTypeArguments", state, InlineTypeArguments$0(state));
-        if (state.events)
-          state.events.exit?.("InlineTypeArguments", state, result, eventData);
-        return result;
-      } else {
-        const result = InlineTypeArguments$0(state);
-        if (state.events)
-          state.events.exit?.("InlineTypeArguments", state, result, eventData);
-        return result;
-      }
-    }
-    var InlineTypeArgument$0 = $S($Q(_), Type, InlineTypeArgumentDelimiter);
-    function InlineTypeArgument(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("InlineTypeArgument", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("InlineTypeArgument", state, InlineTypeArgument$0(state));
-        if (state.events)
-          state.events.exit?.("InlineTypeArgument", state, result, eventData);
-        return result;
-      } else {
-        const result = InlineTypeArgument$0(state);
-        if (state.events)
-          state.events.exit?.("InlineTypeArgument", state, result, eventData);
-        return result;
-      }
-    }
-    var InlineTypeArgumentDelimiter$0 = $S($Q(_), Comma);
-    var InlineTypeArgumentDelimiter$1 = $Y($S($Q(_), $EXPECT($L25, fail, 'InlineTypeArgumentDelimiter ">"')));
-    function InlineTypeArgumentDelimiter(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("InlineTypeArgumentDelimiter", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("InlineTypeArgumentDelimiter", state, InlineTypeArgumentDelimiter$0(state) || InlineTypeArgumentDelimiter$1(state));
-        if (state.events)
-          state.events.exit?.("InlineTypeArgumentDelimiter", state, result, eventData);
-        return result;
-      } else {
-        const result = InlineTypeArgumentDelimiter$0(state) || InlineTypeArgumentDelimiter$1(state);
-        if (state.events)
-          state.events.exit?.("InlineTypeArgumentDelimiter", state, result, eventData);
-        return result;
-      }
-    }
-    var CompactTypeArguments$0 = $TS($S($EXPECT($L120, fail, 'CompactTypeArguments "<"'), $P(TypeArgument), __, $EXPECT($L25, fail, 'CompactTypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4) {
-      return { ts: true, children: $0 };
-    });
-    function CompactTypeArguments(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("CompactTypeArguments", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("CompactTypeArguments", state, CompactTypeArguments$0(state));
-        if (state.events)
-          state.events.exit?.("CompactTypeArguments", state, result, eventData);
-        return result;
-      } else {
-        const result = CompactTypeArguments$0(state);
-        if (state.events)
-          state.events.exit?.("CompactTypeArguments", state, result, eventData);
-        return result;
-      }
-    }
     var TypeArgument$0 = $S(__, Type, TypeArgumentDelimiter);
     function TypeArgument(state) {
       let eventData;
@@ -16152,6 +16082,16 @@ ${input.slice(result.pos)}
           };
           module2.prelude.push(["", ["const ", moduloRef, typeSuffix, " = (a, b) => (a % b + b) % b", "\n"]]);
         },
+        returnSymbol(ref) {
+          module2.prelude.push({
+            children: [
+              "const ",
+              ref,
+              ` = Symbol("return")';
+`
+            ]
+          });
+        },
         JSX(jsxRef) {
           module2.prelude.push({
             ts: true,
@@ -16448,35 +16388,19 @@ ${input.slice(result.pos)}
         if (!node)
           return;
         switch (node.type) {
-          case "AssignmentExpression":
-            node.children.unshift(ref, ".push(");
-            node.children.push(")");
-            return;
-          case "Identifier":
-            node.children.unshift(ref, ".push(");
-            node.children.push(")");
-            return;
           case "BlockStatement":
             insertPush(node.expressions[node.expressions.length - 1], ref);
             return;
-          case "ObjectBindingPattern":
-          case "ObjectExpression":
-            module2.insertTrimmingSpace(node.children[0], "");
-            node.children.unshift(ref, ".push(");
-            node.children.push(")");
-            return;
           case "CaseBlock":
             node.clauses.forEach((clause) => {
               insertPush(clause, ref);
             });
             return;
-          case "CaseClause":
-            return;
           case "WhenClause":
-            insertPush(node.expressions[node.expressions.length - 1], ref);
+            insertPush(node.block, ref);
             return;
           case "DefaultClause":
-            insertPush(node.expressions[node.expressions.length - 1], ref);
+            insertPush(node.block, ref);
             return;
         }
         if (!Array.isArray(node))
@@ -16522,41 +16446,35 @@ ${input.slice(result.pos)}
         node.splice(1, 0, ref, ".push(");
         node.push(")");
       }
+      function wrapWithReturn(expression) {
+        const children = expression ? ["return ", expression] : ["return"];
+        return {
+          type: "ReturnStatement",
+          children
+        };
+      }
       function insertReturn(node) {
         if (!node)
           return;
         switch (node.type) {
-          case "AssignmentExpression":
-            node.children.unshift("return ");
-            return;
-          case "Identifier":
-            node.children.unshift("return ");
-            return;
           case "BlockStatement":
             insertReturn(node.expressions[node.expressions.length - 1]);
             return;
-          case "ObjectBindingPattern":
-          case "ObjectExpression":
-            module2.insertTrimmingSpace(node.children[0], "");
-            node.children.unshift("return ");
-            return;
           case "CaseBlock":
             node.clauses.forEach((clause) => {
               insertReturn(clause);
             });
             return;
-          case "CaseClause":
-            return;
           case "WhenClause":
             node.children.splice(node.children.indexOf(node.break), 1);
-            if (node.expressions.length === 0) {
-              node.expressions.push("return");
+            if (node.block.length === 0) {
+              node.block.push(wrapWithReturn());
               return;
             }
-            insertReturn(node.expressions[node.expressions.length - 1]);
+            insertReturn(node.block);
             return;
           case "DefaultClause":
-            insertReturn(node.expressions[node.expressions.length - 1]);
+            insertReturn(node.block);
             return;
         }
         if (!Array.isArray(node))
@@ -16588,7 +16506,7 @@ ${input.slice(result.pos)}
             if (exp.children[3])
               insertReturn(exp.children[3][2]);
             else
-              exp.children.push(["\n", indent, "return"]);
+              exp.children.push(["\n", indent, wrapWithReturn()]);
             return;
           case "SwitchStatement":
             insertReturn(exp.children[2]);
@@ -16601,7 +16519,8 @@ ${input.slice(result.pos)}
         }
         if (node[node.length - 1]?.type === "SemicolonDelimiter")
           return;
-        node.splice(1, 0, "return ");
+        const returnStatement = wrapWithReturn(node[1]);
+        node.splice(1, 1, returnStatement);
       }
       module2.makeLeftHandSideExpression = function(exp) {
         switch (exp.type) {
@@ -17966,7 +17885,7 @@ var uncacheable;
 ({ parse } = import_parser.default);
 ({ SourceMap: SourceMap2, base64Encode: base64Encode2 } = util_exports);
 defaultOptions = {};
-uncacheable = /* @__PURE__ */ new Set(["TrackIndented", "Samedent", "IndentedFurther", "PushIndent", "PopIndent", "Nested", "InsertIndent", "Arguments", "ArgumentsWithTrailingCallExpressions", "ApplicationStart", "CallExpression", "CallExpressionRest", "LeftHandSideExpression", "ActualAssignment", "UpdateExpression", "UnaryExpression", "BinaryOpExpression", "BinaryOpRHS", "ConditionalExpression", "ShortCircuitExpression", "InlineObjectLiteral", "ImplicitInlineObjectPropertyDelimiter", "FatArrowBody", "ThinArrowFunction", "ArrowFunctionTail", "ArrowFunction", "ImplicitNestedBlock", "BracedBlock", "BracedOrEmptyBlock", "NestedBlockExpression", "NestedBlockExpression", "NestedBlockStatements", "SingleLineStatements", "ExpressionStatement", "Statement", "IndentedJSXChildExpression", "NestedJSXChildExpression", "ObjectLiteral", "NestedObject", "NestedImplicitObjectLiteral", "BracedObjectLiteralContent", "NestedPropertyDefinitions", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedBlockStatement", "NestedElement", "NestedElementList", "NestedBindingElement", "NestedBindingElements", "NestedInterfaceProperty", "SnugNamedProperty", "MemberExpression", "PrimaryExpression", "IndentedApplicationAllowed", "ExpressionWithIndentedApplicationSuppressed", "SuppressIndentedApplication", "AssignmentExpressionTail", "AssignmentExpression", "ExtendedExpression", "Expression", "MemberExpressionRest", "ElseClause", "CoffeeCommentEnabled", "SingleLineComment", "Debugger", "JSXImplicitFragment", "JSXTag", "JSXElement", "TypedJSXElement", "JSXFragment", "TypedJSXFragment", "JSXChild", "JSXChildren", "JSXNestedChildren", "JSXMixedChildren"]);
+uncacheable = /* @__PURE__ */ new Set(["ActualAssignment", "ApplicationStart", "Arguments", "ArgumentsWithTrailingMemberExpressions", "ArrowFunction", "ArrowFunctionTail", "AssignmentExpression", "AssignmentExpressionTail", "BinaryOpExpression", "BinaryOpRHS", "BracedBlock", "BracedObjectLiteralContent", "BracedOrEmptyBlock", "CallExpression", "CallExpressionRest", "CoffeeCommentEnabled", "ConditionalExpression", "Debugger", "ElseClause", "Expression", "ExpressionStatement", "ExpressionWithIndentedApplicationSuppressed", "ExtendedExpression", "FatArrowBody", "ImplicitInlineObjectPropertyDelimiter", "ImplicitNestedBlock", "IndentedApplicationAllowed", "IndentedFurther", "IndentedJSXChildExpression", "InlineObjectLiteral", "InsertIndent", "JSXChild", "JSXChildren", "JSXElement", "JSXFragment", "JSXImplicitFragment", "JSXMixedChildren", "JSXNestedChildren", "JSXTag", "LeftHandSideExpression", "MemberExpression", "MemberExpressionRest", "Nested", "NestedBindingElement", "NestedBindingElements", "NestedBlockExpression", "NestedBlockExpression", "NestedBlockStatement", "NestedBlockStatements", "NestedElement", "NestedElementList", "NestedImplicitObjectLiteral", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedInterfaceProperty", "NestedJSXChildExpression", "NestedObject", "NestedPropertyDefinitions", "ObjectLiteral", "PopIndent", "PrimaryExpression", "PushIndent", "Samedent", "ShortCircuitExpression", "SingleLineComment", "SingleLineStatements", "SnugNamedProperty", "Statement", "SuppressIndentedApplication", "ThinArrowFunction", "TrackIndented", "TypedJSXElement", "TypedJSXFragment", "UnaryExpression", "UpdateExpression"]);
 var compile = function(src, options = defaultOptions) {
   var ast, code, events, filename, sm, srcMapJSON;
   filename = options.filename || "unknown";