@danielx/civet 0.7.28 → 0.7.30

package/dist/browser.js

@@ -70,7 +70,7 @@ var Civet = (() => {
         $N: () => $N2,
         $P: () => $P2,
         $Q: () => $Q2,
-        $R: () => $R98,
+        $R: () => $R100,
         $R$0: () => $R$02,
         $S: () => $S2,
         $T: () => $T2,
@@ -107,7 +107,7 @@ var Civet = (() => {
           return;
         };
       }
-      function $R98(regExp) {
+      function $R100(regExp) {
         return function(_ctx, state2) {
           const { input, pos } = state2;
           regExp.lastIndex = state2.pos;
@@ -518,6 +518,7 @@ ${body}`;
     addPostfixStatement: () => addPostfixStatement,
     adjustBindingElements: () => adjustBindingElements,
     adjustIndexAccess: () => adjustIndexAccess,
+    append: () => append,
     attachPostfixStatementAsExpression: () => attachPostfixStatementAsExpression,
     blockWithPrefix: () => blockWithPrefix,
     convertNamedImportsToObject: () => convertNamedImportsToObject,
@@ -684,7 +685,7 @@ ${body}`;
     "ForStatement",
     "IfStatement",
     "IterationStatement",
-    "LabeledStatement",
+    "LabelledStatement",
     "ReturnStatement",
     "SwitchStatement",
     "ThrowStatement",
@@ -729,13 +730,16 @@ ${body}`;
         return node.expressions.some((s) => isExit(s[1]));
       }
       case "IterationStatement": {
-        return node.condition?.type === "ParenthesizedExpression" && node.condition.expression?.type === "Literal" && node.condition.expression?.raw === "true" && gatherRecursiveWithinFunction(node.block, ($) => $.type === "BreakStatement").length === 0;
+        return isLoopStatement(node) && gatherRecursiveWithinFunction(node.block, ($) => $.type === "BreakStatement").length === 0;
       }
       default: {
         return false;
       }
     }
   }
+  function isLoopStatement(node) {
+    return node.type === "IterationStatement" && node.condition?.type === "ParenthesizedExpression" && node.condition.expression?.type === "Literal" && node.condition.expression?.raw === "true";
+  }
   function isComma(node) {
     if (node?.token === ",") {
       return node;
@@ -806,7 +810,7 @@ ${body}`;
     return;
   }
   function prepend(prefix, node) {
-    if (!(prefix && prefix.length)) {
+    if (!prefix || Array.isArray(prefix) && len(prefix, 0)) {
       return node;
     }
     if (Array.isArray(node)) {
@@ -820,6 +824,21 @@ ${body}`;
       return [prefix, node];
     }
   }
+  function append(node, suffix) {
+    if (!suffix || Array.isArray(suffix) && len(suffix, 0)) {
+      return node;
+    }
+    if (Array.isArray(node)) {
+      return [...node, suffix];
+    } else if (isParent(node)) {
+      return {
+        ...node,
+        children: [...node.children, suffix]
+      };
+    } else {
+      return [node, suffix];
+    }
+  }
   function inplacePrepend(prefix, node) {
     if (!prefix) {
       return;
@@ -1086,7 +1105,7 @@ ${body}`;
     }
     return ["(", type, ")"];
   }
-  function wrapIIFE(expressions, asyncFlag) {
+  function wrapIIFE(expressions, asyncFlag, generator) {
     let prefix;
     const async = [];
     if (asyncFlag) {
@@ -1112,23 +1131,49 @@ ${body}`;
     };
     const signature = {
       modifier: {
-        async: !!async.length
+        async: !!async.length,
+        generator: !!generator
       },
       returnType: void 0
     };
-    const fn = makeNode({
-      type: "ArrowFunction",
-      signature,
-      parameters,
-      returnType: void 0,
-      ts: false,
-      async,
-      block,
-      children: [async, parameters, "=>", block]
-    });
+    let fn;
+    if (generator) {
+      fn = makeNode({
+        type: "FunctionExpression",
+        signature,
+        parameters,
+        returnType: void 0,
+        ts: false,
+        async,
+        block,
+        generator,
+        children: [async, "function", generator, parameters, block]
+      });
+    } else {
+      fn = makeNode({
+        type: "ArrowFunction",
+        signature,
+        parameters,
+        returnType: void 0,
+        ts: false,
+        async,
+        block,
+        children: [async, parameters, "=>", block]
+      });
+    }
+    const children = [makeLeftHandSideExpression(fn), "()"];
+    if (fn.type === "FunctionExpression") {
+      if (gatherRecursiveWithinFunction(block, (a1) => typeof a1 === "object" && a1 != null && "token" in a1 && a1.token === "this").length) {
+        children.splice(1, 0, ".bind(this)");
+      }
+      if (gatherRecursiveWithinFunction(block, (a2) => typeof a2 === "object" && a2 != null && "token" in a2 && a2.token === "arguments").length) {
+        let ref2;
+        children[children.length - 1] = (ref2 = parameters.children)[ref2.length - 1] = "(arguments)";
+      }
+    }
     const exp = makeNode({
       type: "CallExpression",
-      children: [makeLeftHandSideExpression(fn), "()"]
+      children
     });
     if (prefix) {
       return makeLeftHandSideExpression([prefix, exp]);
@@ -1749,7 +1794,7 @@ ${body}`;
       ({ type } = exp);
     }
     let ref4;
-    switch (exp.type) {
+    switch (type) {
       case "BreakStatement":
       case "ContinueStatement":
       case "DebuggerStatement":
@@ -1970,6 +2015,58 @@ ${body}`;
       return insertReturn(clause);
     });
   }
+  function processBreakContinueWith(statement) {
+    let changed = false;
+    for (const control of gatherRecursiveWithinFunction(
+      statement.block,
+      ($) => $.type === "BreakStatement" || $.type === "ContinueStatement"
+    )) {
+      let controlName2 = function() {
+        switch (control.type) {
+          case "BreakStatement": {
+            return "break";
+          }
+          case "ContinueStatement": {
+            return "continue";
+          }
+        }
+      };
+      var controlName = controlName2;
+      if (control.with) {
+        if (control.label) {
+          let m1;
+          if (!(m1 = statement.parent, typeof m1 === "object" && m1 != null && "type" in m1 && m1.type === "LabelledStatement" && "label" in m1 && typeof m1.label === "object" && m1.label != null && "name" in m1.label && m1.label.name === control.label.name)) {
+            continue;
+          }
+        } else {
+          const { ancestor } = findAncestor(
+            control,
+            (s) => s === statement || s.type === "IterationStatement" || s.type === "ForStatement" || s.type === "SwitchStatement" && control.type === "BreakStatement"
+          );
+          if (!(ancestor === statement)) {
+            continue;
+          }
+        }
+        control.children.unshift(
+          control.type === "BreakStatement" ? (changed = true, [statement.resultsRef, " =", control.with, ";"]) : (
+            // control.type is "ContinueStatement"
+            [statement.resultsRef, ".push(", trimFirstSpace(control.with), ");"]
+          )
+        );
+        updateParentPointers(control.with, control);
+        const i = control.children.findIndex(($1) => $1?.type === "Error");
+        if (i >= 0) {
+          control.children.splice(i, 1);
+        }
+        const block = control.parent;
+        if (!(block?.type === "BlockStatement")) {
+          throw new Error(`Expected parent of ${controlName2()} to be BlockStatement`);
+        }
+        braceBlock(block);
+      }
+    }
+    return changed;
+  }
   function wrapIterationReturningResults(statement, outer, collect) {
     if (statement.type === "DoStatement" || statement.type === "ComptimeStatement") {
       if (collect) {
@@ -1985,14 +2082,37 @@ ${body}`;
       "wrapIterationReturningResults should not be called twice on the same statement"
     );
     const resultsRef = statement.resultsRef = makeRef("results");
+    let decl = "const";
+    if (statement.type === "IterationStatement" || statement.type === "ForStatement") {
+      if (processBreakContinueWith(statement)) {
+        decl = "let";
+      }
+    }
+    const breakWithOnly = decl === "let" && isLoopStatement(statement) && gatherRecursive(
+      statement.block,
+      (s) => s.type === "BreakStatement" && !s.with,
+      (s) => isFunction(s) || s.type === "IterationStatement"
+    ).length === 0;
     const declaration = {
       type: "Declaration",
-      children: ["const ", resultsRef, "=[]"]
+      children: [decl, " ", resultsRef],
+      decl,
+      names: [],
+      bindings: []
     };
+    if (decl === "const") {
+      declaration.children.push("=[]");
+    } else {
+      if (!breakWithOnly) {
+        declaration.children.push(";", resultsRef, "=[]");
+      }
+    }
     outer.children.unshift(["", declaration, ";"]);
-    assignResults(statement.block, (node) => {
-      return [resultsRef, ".push(", node, ")"];
-    });
+    if (!breakWithOnly) {
+      assignResults(statement.block, (node) => {
+        return [resultsRef, ".push(", node, ")"];
+      });
+    }
     if (collect) {
       statement.children.push(collect(resultsRef));
     } else {
@@ -2058,8 +2178,8 @@ ${body}`;
     }
     if (hasYield(block) && !f.generator?.length) {
       if (f.type === "ArrowFunction") {
-        gatherRecursiveWithinFunction(block, ($) => $.type === "YieldExpression").forEach((y) => {
-          const i = y.children.findIndex(($1) => $1.type === "Yield");
+        gatherRecursiveWithinFunction(block, ($2) => $2.type === "YieldExpression").forEach((y) => {
+          const i = y.children.findIndex(($3) => $3.type === "Yield");
           return y.children.splice(i + 1, 0, {
             type: "Error",
             message: "Can't use yield inside of => arrow function"
@@ -2087,31 +2207,55 @@ ${body}`;
     });
   }
   function expressionizeIteration(exp) {
-    const { async, subtype, block, children, statement } = exp;
+    const { async, generator, subtype, block, children, statement } = exp;
     const i = children.indexOf(statement);
     if (i < 0) {
       throw new Error("Could not find iteration statement in iteration expression");
     }
     if (subtype === "DoStatement" || subtype === "ComptimeStatement") {
-      children.splice(i, 1, wrapIIFE([["", statement, void 0]], async));
+      children.splice(i, 1, wrapIIFE([["", statement, void 0]], async, generator));
       updateParentPointers(exp);
       return;
     }
-    exp.resultsRef ??= makeRef("results");
-    const { resultsRef } = exp;
-    assignResults(block, (node) => {
-      return [resultsRef, ".push(", node, ")"];
-    });
-    braceBlock(block);
-    children.splice(
-      i,
-      1,
-      wrapIIFE([
-        ["", ["const ", resultsRef, "=[]"], ";"],
-        ...children.map((c) => ["", c, void 0]),
-        ["", wrapWithReturn(resultsRef)]
-      ], async)
-    );
+    if (generator) {
+      assignResults(block, (node) => {
+        return {
+          type: "YieldExpression",
+          expression: node,
+          children: ["yield ", node]
+        };
+      });
+      braceBlock(block);
+      children.splice(
+        i,
+        1,
+        wrapIIFE([
+          ["", statement, void 0],
+          // Prevent implicit return in generator, by adding an explicit return
+          ["", {
+            type: "ReturnStatement",
+            expression: void 0,
+            children: [";return"]
+          }, void 0]
+        ], async, generator)
+      );
+    } else {
+      exp.resultsRef ??= makeRef("results");
+      const { resultsRef } = exp;
+      assignResults(block, (node) => {
+        return [resultsRef, ".push(", node, ")"];
+      });
+      braceBlock(block);
+      children.splice(
+        i,
+        1,
+        wrapIIFE([
+          ["", ["const ", resultsRef, "=[]"], ";"],
+          ["", statement, void 0],
+          ["", wrapWithReturn(resultsRef)]
+        ], async)
+      );
+    }
     updateParentPointers(exp);
   }
   function skipImplicitArguments(args) {
@@ -2125,7 +2269,7 @@ ${body}`;
     return false;
   }
   function processCoffeeDo(ws, expression) {
-    ws = insertTrimmingSpace(ws, "");
+    ws = trimFirstSpace(ws);
     const args = [];
     if (typeof expression === "object" && expression != null && "type" in expression && expression.type === "ArrowFunction" || typeof expression === "object" && expression != null && "type" in expression && expression.type === "FunctionExpression") {
       const { parameters } = expression;
@@ -2159,7 +2303,7 @@ ${body}`;
       expression = {
         ...expression,
         parameters: newParameters,
-        children: expression.children.map(($2) => $2 === parameters ? newParameters : $2)
+        children: expression.children.map(($4) => $4 === parameters ? newParameters : $4)
       };
     }
     return {
@@ -2180,7 +2324,7 @@ ${body}`;
       ref = makeRef("$");
       inplacePrepend(ref, body);
     }
-    if (startsWithPredicate(body, ($3) => $3.type === "ObjectExpression")) {
+    if (startsWithPredicate(body, ($5) => $5.type === "ObjectExpression")) {
       body = makeLeftHandSideExpression(body);
     }
     const parameters = makeNode({
@@ -3284,26 +3428,24 @@ ${body}`;
   function aggregateDuplicateBindings(bindings) {
     const props = gatherRecursiveAll(bindings, ($10) => $10.type === "BindingProperty");
     const arrayBindings = gatherRecursiveAll(bindings, ($11) => $11.type === "ArrayBindingPattern");
-    arrayBindings.forEach((a) => {
-      const { elements } = a;
-      return elements.forEach((element) => {
+    for (let i5 = 0, len4 = arrayBindings.length; i5 < len4; i5++) {
+      const { elements } = arrayBindings[i5];
+      for (let i6 = 0, len5 = elements.length; i6 < len5; i6++) {
+        const element = elements[i6];
         if (Array.isArray(element)) {
           const [, e] = element;
           if (e.type === "Identifier") {
-            return props.push(e);
+            props.push(e);
           } else if (e.type === "BindingRestElement") {
-            return props.push(e);
+            props.push(e);
           }
-          ;
-          return;
         }
-        ;
-        return;
-      });
-    });
+      }
+    }
     const declarations = [];
     const propsGroupedByName = /* @__PURE__ */ new Map();
-    for (const p of props) {
+    for (let i7 = 0, len6 = props.length; i7 < len6; i7++) {
+      const p = props[i7];
       const { name, value } = p;
       let m1;
       if (m1 = value?.type, m1 === "ArrayBindingPattern" || m1 === "ObjectBindingPattern") {
@@ -3325,9 +3467,10 @@ ${body}`;
         pos: 0,
         input: key
       })) {
-        shared.forEach((p) => {
-          return aliasBinding(p, makeRef(`_${key}`, key));
-        });
+        for (let i8 = 0, len7 = shared.length; i8 < len7; i8++) {
+          const p = shared[i8];
+          aliasBinding(p, makeRef(`_${key}`, key));
+        }
         return;
       }
       if (shared.length === 1) {
@@ -3442,7 +3585,7 @@ ${body}`;
     const blockStatement = ["", statementExp];
     let ref;
     if (statementExp.type === "IterationExpression") {
-      if (statementExp.async) {
+      if (statementExp.async || statementExp.generator) {
         return;
       }
       const statement2 = statementExp.statement;
@@ -5220,9 +5363,8 @@ ${js}`
       children
     });
   }
-  function expressionizeTypeIf([ws, ifOp, condition, t, e]) {
+  function expressionizeTypeIf([ifOp, condition, t, e]) {
     const children = [
-      ws,
       "(",
       insertTrimmingSpace(condition, ""),
       "?"
@@ -6006,7 +6148,8 @@ ${js}`
           type: "IterationExpression",
           children: [statement],
           block: statement.block,
-          statement
+          statement,
+          generator: statement.generator
         };
       }
       case "IfStatement": {
@@ -6533,6 +6676,7 @@ ${js}`
     ReservedBinary,
     ArgumentsWithTrailingMemberExpressions,
     TrailingMemberExpressions,
+    IndentedTrailingMemberExpression,
     AllowedTrailingMemberExpressions,
     TrailingCallExpressions,
     AllowedTrailingCallExpressions,
@@ -6801,6 +6945,7 @@ ${js}`
     BlockStatement,
     LabelledStatement,
     Label,
+    LabelIdentifier,
     LabelledItem,
     IfStatement,
     ElseClause,
@@ -7179,6 +7324,8 @@ ${js}`
     TypePredicate,
     Type,
     TypeBinary,
+    NestedTypeBinaryChain,
+    NestedTypeBinary,
     TypeUnary,
     TypeUnarySuffix,
     TypeUnaryOp,
@@ -7187,13 +7334,21 @@ ${js}`
     TypePrimary,
     ImportType,
     TypeTuple,
-    TypeList,
+    TypeTupleContent,
+    TypeElementListWithIndentedApplicationForbidden,
+    TypeElementList,
     TypeElement,
-    NestedTypeList,
-    NestedType,
+    NestedTypeElementList,
+    NestedTypeElement,
+    NestedTypeBulletedTuple,
+    TypeBulletedTuple,
+    NestedTypeBullet,
+    TypeBullet,
+    TypeWithPostfix,
     TypeConditional,
     TypeCondition,
     TypeIfThenElse,
+    TypeIfClause,
     TypeElse,
     TypeBlock,
     TypeTemplateSubstitution,
@@ -7208,6 +7363,14 @@ ${js}`
     TypeFunction,
     TypeArrowFunction,
     TypeArguments,
+    ImplicitTypeArguments,
+    TypeApplicationStart,
+    ForbiddenImplicitTypeCalls,
+    TypeArgumentList,
+    NestedTypeArgumentList,
+    NestedTypeArgument,
+    SingleLineTypeArgumentList,
+    TypeArgumentDelimited,
     TypeArgument,
     TypeArgumentDelimiter,
     TypeParameters,
@@ -7236,6 +7399,8 @@ ${js}`
     InsertCloseBrace,
     InsertOpenBracket,
     InsertCloseBracket,
+    InsertOpenAngleBracket,
+    InsertCloseAngleBracket,
     InsertComma,
     InsertSpaceEquals,
     InsertConst,
@@ -7277,7 +7442,8 @@ ${js}`
     IndentedFurther,
     IndentedAtLeast,
     NotDedented,
-    Dedented
+    Dedented,
+    PushExtraIndent1
   };
   var $L0 = (0, import_lib3.$L)("");
   var $L1 = (0, import_lib3.$L)("{");
@@ -7524,7 +7690,7 @@ ${js}`
   var $R3 = (0, import_lib3.$R)(new RegExp("[0-9]", "suy"));
   var $R4 = (0, import_lib3.$R)(new RegExp("(?!\\p{ID_Start}|[_$0-9(\\[{])", "suy"));
   var $R5 = (0, import_lib3.$R)(new RegExp("[ \\t]", "suy"));
-  var $R6 = (0, import_lib3.$R)(new RegExp("\\p{ID_Continue}|[\\u200C\\u200D$.#{]", "suy"));
+  var $R6 = (0, import_lib3.$R)(new RegExp("\\p{ID_Continue}|[\\u200C\\u200D$.#{=]", "suy"));
   var $R7 = (0, import_lib3.$R)(new RegExp("[&=]", "suy"));
   var $R8 = (0, import_lib3.$R)(new RegExp("(?=['\"`])", "suy"));
   var $R9 = (0, import_lib3.$R)(new RegExp("(?=[\\/?])", "suy"));
@@ -7608,14 +7774,16 @@ ${js}`
   var $R87 = (0, import_lib3.$R)(new RegExp("[^{}<>\\r\\n]+", "suy"));
   var $R88 = (0, import_lib3.$R)(new RegExp("[+-]?", "suy"));
   var $R89 = (0, import_lib3.$R)(new RegExp("(?=if|unless)", "suy"));
-  var $R90 = (0, import_lib3.$R)(new RegExp("#![^\\r\\n]*", "suy"));
-  var $R91 = (0, import_lib3.$R)(new RegExp("[\\t ]*", "suy"));
-  var $R92 = (0, import_lib3.$R)(new RegExp("[\\s]*", "suy"));
-  var $R93 = (0, import_lib3.$R)(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
-  var $R94 = (0, import_lib3.$R)(new RegExp("\\/\\/\\/[^\\r\\n]*", "suy"));
-  var $R95 = (0, import_lib3.$R)(new RegExp("(?=[ \\t\\r\\n\\/#]|$)", "suy"));
-  var $R96 = (0, import_lib3.$R)(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
-  var $R97 = (0, import_lib3.$R)(new RegExp("[^]*", "suy"));
+  var $R90 = (0, import_lib3.$R)(new RegExp("[|&<!=\\-\u21D2\u2192]", "suy"));
+  var $R91 = (0, import_lib3.$R)(new RegExp("(extends|not|is)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
+  var $R92 = (0, import_lib3.$R)(new RegExp("#![^\\r\\n]*", "suy"));
+  var $R93 = (0, import_lib3.$R)(new RegExp("[\\t ]*", "suy"));
+  var $R94 = (0, import_lib3.$R)(new RegExp("[\\s]*", "suy"));
+  var $R95 = (0, import_lib3.$R)(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
+  var $R96 = (0, import_lib3.$R)(new RegExp("\\/\\/\\/[^\\r\\n]*", "suy"));
+  var $R97 = (0, import_lib3.$R)(new RegExp("(?=[ \\t\\r\\n\\/#]|$)", "suy"));
+  var $R98 = (0, import_lib3.$R)(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
+  var $R99 = (0, import_lib3.$R)(new RegExp("[^]*", "suy"));
   var Program$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Reset, Init, (0, import_lib3.$E)(EOS), TopLevelStatements, __), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
     var reset = $1;
     var init = $2;
@@ -7802,6 +7970,9 @@ ${js}`
     var close = $5;
     if (skipImplicitArguments(args))
       return $skip;
+    let last = args[args.length - 1];
+    if (last?.token === "," && last.implicit)
+      args = args.slice(0, -1);
     return {
       type: "Call",
       args,
@@ -7834,7 +8005,7 @@ ${js}`
   function ExplicitArguments(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "ExplicitArguments", ExplicitArguments$0);
   }
-  var ApplicationStart$0 = (0, import_lib3.$S)(IndentedApplicationAllowed, (0, import_lib3.$Y)((0, import_lib3.$S)(IndentedFurther, (0, import_lib3.$N)(IdentifierBinaryOp), (0, import_lib3.$N)(AccessStart))));
+  var ApplicationStart$0 = (0, import_lib3.$S)(IndentedApplicationAllowed, (0, import_lib3.$Y)((0, import_lib3.$S)(IndentedFurther, (0, import_lib3.$N)(IdentifierBinaryOp))), (0, import_lib3.$N)(IndentedTrailingMemberExpression));
   var ApplicationStart$1 = (0, import_lib3.$S)((0, import_lib3.$N)(EOS), (0, import_lib3.$Y)((0, import_lib3.$S)(_, (0, import_lib3.$C)(BracedApplicationAllowed, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($L1, 'ApplicationStart "{"'))), (0, import_lib3.$N)(ForbiddenImplicitCalls))));
   var ApplicationStart$$ = [ApplicationStart$0, ApplicationStart$1];
   function ApplicationStart(ctx, state2) {
@@ -7875,20 +8046,20 @@ ${js}`
   function ArgumentsWithTrailingMemberExpressions(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "ArgumentsWithTrailingMemberExpressions", ArgumentsWithTrailingMemberExpressions$0);
   }
-  var TrailingMemberExpressions$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$Q)(MemberExpressionRest), (0, import_lib3.$Q)((0, import_lib3.$S)(IndentedAtLeast, (0, import_lib3.$Y)((0, import_lib3.$S)((0, import_lib3.$E)((0, import_lib3.$EXPECT)($L6, 'TrailingMemberExpressions "?"')), (0, import_lib3.$EXPECT)($L7, 'TrailingMemberExpressions "."'), (0, import_lib3.$N)((0, import_lib3.$EXPECT)($R3, "TrailingMemberExpressions /[0-9]/")))), MemberExpressionRest))), function($skip, $loc, $0, $1, $2) {
-    return $1.concat($2.map(([ws, , memberExpressionRest]) => {
-      if (Array.isArray(memberExpressionRest)) {
-        return [ws, ...memberExpressionRest];
-      }
-      return {
-        ...memberExpressionRest,
-        children: [ws, ...memberExpressionRest.children]
-      };
-    }));
+  var TrailingMemberExpressions$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$Q)(MemberExpressionRest), (0, import_lib3.$Q)(IndentedTrailingMemberExpression)), function($skip, $loc, $0, $1, $2) {
+    return [...$1, ...$2];
   });
   function TrailingMemberExpressions(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "TrailingMemberExpressions", TrailingMemberExpressions$0);
   }
+  var IndentedTrailingMemberExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(IndentedAtLeast, (0, import_lib3.$Y)((0, import_lib3.$S)((0, import_lib3.$E)((0, import_lib3.$EXPECT)($L6, 'IndentedTrailingMemberExpression "?"')), (0, import_lib3.$EXPECT)($L7, 'IndentedTrailingMemberExpression "."'), (0, import_lib3.$N)((0, import_lib3.$EXPECT)($R3, "IndentedTrailingMemberExpression /[0-9]/")))), MemberExpressionRest), function($skip, $loc, $0, $1, $2, $3) {
+    var ws = $1;
+    var rest = $3;
+    return prepend(ws, rest);
+  });
+  function IndentedTrailingMemberExpression(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "IndentedTrailingMemberExpression", IndentedTrailingMemberExpression$0);
+  }
   var AllowedTrailingMemberExpressions$0 = (0, import_lib3.$T)((0, import_lib3.$S)(TrailingMemberPropertyAllowed, TrailingMemberExpressions), function(value) {
     return value[1];
   });
@@ -8156,7 +8327,7 @@ ${js}`
       children: [{ $loc: $1.$loc, token: "satisfies" }, $2, $3]
     };
   });
-  var NWTypePostfix$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(As, (0, import_lib3.$E)(ExclamationPoint), Type), function($skip, $loc, $0, $1, $2, $3) {
+  var NWTypePostfix$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(As, (0, import_lib3.$E)(ExclamationPoint), (0, import_lib3.$C)(Type, (0, import_lib3.$S)(__, Const))), function($skip, $loc, $0, $1, $2, $3) {
     var as = $1;
     var ex = $2;
     var type = $3;
@@ -8510,7 +8681,7 @@ ${js}`
   function ParenthesizedExpression(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "ParenthesizedExpression", ParenthesizedExpression$0);
   }
-  var Placeholder$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Dot, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($R6, "Placeholder /\\p{ID_Continue}|[\\u200C\\u200D$.#{]/")), (0, import_lib3.$E)(PlaceholderTypeSuffix)), function($skip, $loc, $0, $1, $2, $3) {
+  var Placeholder$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Dot, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($R6, "Placeholder /\\p{ID_Continue}|[\\u200C\\u200D$.#{=]/")), (0, import_lib3.$E)(PlaceholderTypeSuffix)), function($skip, $loc, $0, $1, $2, $3) {
     var dot = $1;
     var typeSuffix = $3;
     return {
@@ -9463,18 +9634,18 @@ ${js}`
     var params = $3;
     var close = $4;
     let tt, before = [], rest, after = [], errors = [];
-    function append(p) {
+    function append2(p) {
       (rest ? after : before).push(p);
     }
     for (const param of params) {
       switch (param.type) {
         case "ThisType":
           if (tt) {
-            append({
+            append2({
               type: "Error",
               message: "Only one typed this parameter is allowed"
             });
-            append(param);
+            append2(param);
           } else {
             tt = trimFirstSpace(param);
             if (before.length || rest) {
@@ -9492,17 +9663,17 @@ ${js}`
           break;
         case "FunctionRestParameter":
           if (rest) {
-            append({
+            append2({
               type: "Error",
               message: "Only one rest parameter is allowed"
             });
-            append(param);
+            append2(param);
           } else {
             rest = param;
           }
           break;
         default:
-          append(param);
+          append2(param);
       }
     }
     const names = before.flatMap((p) => p.names);
@@ -11007,15 +11178,10 @@ ${js}`
     if (!length)
       return $skip;
     return list.map((e, i) => {
-      if (i === 0 && i === length - 1) {
-        return { ...e, children: [indent, ...e.children, delimiter] };
-      }
-      if (i === 0) {
-        return { ...e, children: [indent, ...e.children] };
-      }
-      if (i === length - 1) {
-        return { ...e, children: [...e.children, delimiter] };
-      }
+      if (i === 0)
+        e = prepend(indent, e);
+      if (i === length - 1)
+        e = append(e, delimiter);
       return e;
     });
   });
@@ -11045,19 +11211,13 @@ ${js}`
   var ElementList$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$N)(EOS), ArrayElementExpression, (0, import_lib3.$Q)(ElementListRest)), function($skip, $loc, $0, $1, $2, $3) {
     var first = $2;
     var rest = $3;
-    if (rest.length) {
-      return [{
-        ...first,
-        children: [...first.children, rest[0][0]]
-      }].concat(rest.map(([_2, e], i) => {
-        const delim = rest[i + 1]?.[0];
-        return {
-          ...e,
-          children: [...e.children, delim]
-        };
-      }));
-    }
-    return [first];
+    if (!rest.length)
+      return [first];
+    return [
+      append(first, rest[0][0])
+    ].concat(
+      rest.map(([_2, e], i) => append(e, rest[i + 1]?.[0]))
+    );
   });
   var ElementList$$ = [ElementList$0, ElementList$1];
   function ElementList(ctx, state2) {
@@ -11118,9 +11278,10 @@ ${js}`
     if (!content.length)
       return $skip;
     content = content.flat();
-    const { children } = content[content.length - 1];
-    if (children.at(-1).implicit)
-      children.pop();
+    const last = content[content.length - 1];
+    if (last.children?.at(-1)?.implicit) {
+      last.children = last.children.slice(0, -1);
+    }
     return {
       type: "ArrayExpression",
       children: [...open, ...content, close]
@@ -11140,9 +11301,10 @@ ${js}`
       // replace first space with bracket
       ...content[1].flat()
     ];
-    const { children } = content[content.length - 1];
-    if (children.at(-1).implicit)
-      children.pop();
+    const last = content[content.length - 1];
+    if (last.children?.at(-1)?.implicit) {
+      last.children = last.children.slice(0, -1);
+    }
     return {
       type: "ArrayExpression",
       children: [open, ...content, close]
@@ -11154,7 +11316,7 @@ ${js}`
   var NestedArrayBullet$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Nested, ArrayBullet), function($skip, $loc, $0, $1, $2) {
     var indent = $1;
     var list = $2;
-    return list.map((e, i) => i === 0 ? { ...e, children: [indent, ...e.children] } : e);
+    return list.map((e, i) => i === 0 ? prepend(indent, e) : e);
   });
   function NestedArrayBullet(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "NestedArrayBullet", NestedArrayBullet$0);
@@ -11165,15 +11327,13 @@ ${js}`
     if (!content)
       return $skip;
     let [list, delimiter] = content;
-    if (list.type === "ArrayExpression")
-      list = [list];
     if (!list.length)
       return $skip;
     list = list.slice();
-    list[0] = { ...list[0], children: [bullet, ...list[0].children] };
+    list[0] = prepend(bullet, list[0]);
     if (delimiter) {
       const last = list.length - 1;
-      list[last] = { ...list[last], children: [...list[last].children, delimiter] };
+      list[last] = append(list[last], delimiter);
     }
     return list;
   });
@@ -12443,8 +12603,10 @@ ${js}`
   var Statement$2 = (0, import_lib3.$T)((0, import_lib3.$S)(IfStatement, (0, import_lib3.$N)(ShouldExpressionize)), function(value) {
     return value[0];
   });
-  var Statement$3 = (0, import_lib3.$T)((0, import_lib3.$S)(IterationStatement, (0, import_lib3.$N)(ShouldExpressionize)), function(value) {
-    return value[0];
+  var Statement$3 = (0, import_lib3.$TS)((0, import_lib3.$S)(IterationStatement, (0, import_lib3.$N)(ShouldExpressionize)), function($skip, $loc, $0, $1, $2) {
+    if ($1.generator)
+      return $skip;
+    return $1;
   });
   var Statement$4 = (0, import_lib3.$T)((0, import_lib3.$S)(SwitchStatement, (0, import_lib3.$N)(ShouldExpressionize)), function(value) {
     return value[0];
@@ -12515,11 +12677,22 @@ ${js}`
     var colon = $1;
     var id = $2;
     var w = $3;
-    return [id, colon, w];
+    return {
+      type: "Label",
+      name: id.name,
+      children: [id, colon, w]
+    };
   });
   function Label(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "Label", Label$0);
   }
+  var LabelIdentifier$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$E)(Colon), Identifier), function(value) {
+    var id = value[1];
+    return id;
+  });
+  function LabelIdentifier(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "LabelIdentifier", LabelIdentifier$0);
+  }
   var LabelledItem$0 = Statement;
   var LabelledItem$1 = FunctionDeclaration;
   var LabelledItem$$ = [LabelledItem$0, LabelledItem$1];
@@ -12616,7 +12789,8 @@ ${js}`
       children: [statement],
       block: statement.block,
       statement,
-      async
+      async,
+      generator: statement.generator
     };
   });
   function IterationExpression(ctx, state2) {
@@ -12635,8 +12809,9 @@ ${js}`
   function LoopStatement(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "LoopStatement", LoopStatement$0);
   }
-  var LoopClause$0 = (0, import_lib3.$TV)(Loop, function($skip, $loc, $0, $1) {
-    var kind = $0;
+  var LoopClause$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loop, (0, import_lib3.$E)((0, import_lib3.$S)((0, import_lib3.$E)(_), Star))), function($skip, $loc, $0, $1, $2) {
+    var kind = $1;
+    var generator = $2;
     const expression = {
       type: "Literal",
       children: ["true"],
@@ -12651,33 +12826,41 @@ ${js}`
       type: "IterationStatement",
       subtype: kind.token,
       children: [kind, condition],
-      condition
+      condition,
+      generator
     };
   });
   function LoopClause(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "LoopClause", LoopClause$0);
   }
-  var DoWhileStatement$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Do, NoPostfixBracedOrEmptyBlock, __, WhileClause), function($skip, $loc, $0, $1, $2, $3, $4) {
-    var block = $2;
-    var clause = $4;
+  var DoWhileStatement$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Do, (0, import_lib3.$E)((0, import_lib3.$S)((0, import_lib3.$E)(_), Star)), NoPostfixBracedOrEmptyBlock, __, WhileClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var d = $1;
+    var generator = $2;
+    var block = $3;
+    var ws = $4;
+    var clause = $5;
     return {
       ...clause,
       type: "IterationStatement",
       subtype: "do-while",
-      children: $0,
-      block
+      children: [d, block, ws, clause],
+      block,
+      generator
     };
   });
   function DoWhileStatement(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "DoWhileStatement", DoWhileStatement$0);
   }
-  var DoStatement$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Do, NoPostfixBracedOrEmptyBlock), function($skip, $loc, $0, $1, $2) {
-    var block = $2;
+  var DoStatement$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Do, (0, import_lib3.$E)((0, import_lib3.$S)((0, import_lib3.$E)(_), Star)), NoPostfixBracedOrEmptyBlock), function($skip, $loc, $0, $1, $2, $3) {
+    var d = $1;
+    var generator = $2;
+    var block = $3;
     block = trimFirstSpace(block);
     return {
       type: "DoStatement",
       children: [block],
-      block
+      block,
+      generator
     };
   });
   function DoStatement(ctx, state2) {
@@ -12712,10 +12895,11 @@ ${js}`
   function WhileStatement(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "WhileStatement", WhileStatement$0);
   }
-  var WhileClause$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$C)(While, Until), (0, import_lib3.$E)(_), Condition), function($skip, $loc, $0, $1, $2, $3) {
+  var WhileClause$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$C)(While, Until), (0, import_lib3.$E)((0, import_lib3.$S)((0, import_lib3.$E)(_), Star)), (0, import_lib3.$E)(_), Condition), function($skip, $loc, $0, $1, $2, $3, $4) {
     var kind = $1;
-    var ws = $2;
-    var condition = $3;
+    var generator = $2;
+    var ws = $3;
+    var condition = $4;
     if (kind.negated) {
       kind = { ...kind, token: "while" };
       condition = negateCondition(condition);
@@ -12725,6 +12909,7 @@ ${js}`
       subtype: kind.token,
       children: [kind, ws, condition],
       condition,
+      generator,
       negated: kind.negated
     };
   });
@@ -12744,16 +12929,18 @@ ${js}`
   function ForStatement(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "ForStatement", ForStatement$0);
   }
-  var ForClause$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(For, __, ForStatementControl), function($skip, $loc, $0, $1, $2, $3) {
-    var c = $3;
+  var ForClause$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(For, (0, import_lib3.$E)((0, import_lib3.$S)((0, import_lib3.$E)(_), Star)), __, ForStatementControl), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var generator = $2;
+    var c = $4;
     const { children, declaration } = c;
     return {
       type: "ForStatement",
-      children: [$1, ...$2, ...children],
+      children: [$1, ...$3, ...children],
       declaration,
       block: null,
       blockPrefix: c.blockPrefix,
-      hoistDec: c.hoistDec
+      hoistDec: c.hoistDec,
+      generator
     };
   });
   function ForClause(ctx, state2) {
@@ -13520,11 +13707,21 @@ ${js}`
   function ExpressionStatement(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "ExpressionStatement", ExpressionStatement$$);
   }
-  var KeywordStatement$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Break, (0, import_lib3.$E)((0, import_lib3.$S)(_, (0, import_lib3.$E)(Colon), Identifier))), function($skip, $loc, $0, $1, $2) {
+  var KeywordStatement$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Break, (0, import_lib3.$E)((0, import_lib3.$S)(_, LabelIdentifier)), (0, import_lib3.$E)((0, import_lib3.$S)(_, With, MaybeNestedExtendedExpression))), function($skip, $loc, $0, $1, $2, $3) {
+    const children = [$1];
+    if ($2)
+      children.push($2);
+    if ($3)
+      children.push({
+        type: "Error",
+        subtype: "Warning",
+        message: "'break with' outside of loop that returns a value"
+      });
     return {
       type: "BreakStatement",
-      children: $2 ? [$1, $2[0], $2[2]] : [$1]
-      // omit colon
+      label: $2?.[1],
+      with: $3?.[2],
+      children
     };
   });
   var KeywordStatement$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(Continue, _, Switch), function($skip, $loc, $0, $1, $2, $3) {
@@ -13534,11 +13731,21 @@ ${js}`
       children: []
     };
   });
-  var KeywordStatement$2 = (0, import_lib3.$TS)((0, import_lib3.$S)(Continue, (0, import_lib3.$E)((0, import_lib3.$S)(_, (0, import_lib3.$E)(Colon), Identifier))), function($skip, $loc, $0, $1, $2) {
+  var KeywordStatement$2 = (0, import_lib3.$TS)((0, import_lib3.$S)(Continue, (0, import_lib3.$E)((0, import_lib3.$S)(_, LabelIdentifier)), (0, import_lib3.$E)((0, import_lib3.$S)(_, With, MaybeNestedExtendedExpression))), function($skip, $loc, $0, $1, $2, $3) {
+    const children = [$1];
+    if ($2)
+      children.push($2);
+    if ($3)
+      children.push({
+        type: "Error",
+        subtype: "Warning",
+        message: "'continue with' outside of loop that returns a value"
+      });
     return {
       type: "ContinueStatement",
-      children: $2 ? [$1, $2[0], $2[2]] : [$1]
-      // omit colon
+      label: $2?.[1],
+      with: $3?.[2],
+      children
     };
   });
   var KeywordStatement$3 = DebuggerStatement;
@@ -15966,9 +16173,42 @@ ${js}`
   function JSXText(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "JSXText", JSXText$0);
   }
-  var JSXChildExpression$0 = (0, import_lib3.$S)((0, import_lib3.$E)(Whitespace), (0, import_lib3.$E)((0, import_lib3.$S)(DotDotDot, (0, import_lib3.$E)(Whitespace))), PostfixedExpression);
+  var JSXChildExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(Whitespace), LexicalDeclaration), function($skip, $loc, $0, $1, $2) {
+    var d = $2;
+    let names = d.names.concat(
+      d.thisAssignments.map((a) => a[1][1])
+    );
+    names.sort();
+    names = names.filter((name, i) => i === 0 || name !== names[i - 1]);
+    d = {
+      ...d,
+      hoistDec: {
+        type: "Declaration",
+        children: [
+          "let ",
+          names.map((n, i) => i === 0 ? [n] : [",", n]).flat()
+        ]
+      },
+      children: d.children.slice(1)
+      // drop LetOrConst
+    };
+    if (d.thisAssignments?.length) {
+      d.children.push(...d.splices, ",", ...d.thisAssignments.map(
+        (a, i) => a[a.length - 1] === ";" ? [
+          ...a.slice(0, -1),
+          i === d.thisAssignments.length - 1 ? "" : ","
+        ] : a
+      ));
+    } else if (d.splices?.length) {
+      d.children.push(...d.splices);
+    }
+    d.children.push(",void 0");
+    return d;
+  });
+  var JSXChildExpression$1 = (0, import_lib3.$S)((0, import_lib3.$E)(Whitespace), (0, import_lib3.$E)((0, import_lib3.$S)(DotDotDot, (0, import_lib3.$E)(Whitespace))), PostfixedExpression);
+  var JSXChildExpression$$ = [JSXChildExpression$0, JSXChildExpression$1];
   function JSXChildExpression(ctx, state2) {
-    return (0, import_lib3.$EVENT)(ctx, state2, "JSXChildExpression", JSXChildExpression$0);
+    return (0, import_lib3.$EVENT_C)(ctx, state2, "JSXChildExpression", JSXChildExpression$$);
   }
   var IndentedJSXChildExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$E)(NestedJSXChildExpression), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
     if (!$2)
@@ -16465,14 +16705,16 @@ ${js}`
   function TypeSuffix(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeSuffix", TypeSuffix$$);
   }
-  var MaybeNestedType$0 = NestedInterfaceBlock;
-  var MaybeNestedType$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$E)((0, import_lib3.$S)(Nested, Type)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
+  var MaybeNestedType$0 = NestedTypeBulletedTuple;
+  var MaybeNestedType$1 = NestedInterfaceBlock;
+  var MaybeNestedType$2 = NestedTypeBinaryChain;
+  var MaybeNestedType$3 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$E)((0, import_lib3.$S)(Nested, Type)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
     if (!$2)
       return $skip;
     return $2;
   });
-  var MaybeNestedType$2 = Type;
-  var MaybeNestedType$$ = [MaybeNestedType$0, MaybeNestedType$1, MaybeNestedType$2];
+  var MaybeNestedType$4 = Type;
+  var MaybeNestedType$$ = [MaybeNestedType$0, MaybeNestedType$1, MaybeNestedType$2, MaybeNestedType$3, MaybeNestedType$4];
   function MaybeNestedType(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "MaybeNestedType", MaybeNestedType$$);
   }
@@ -16488,9 +16730,11 @@ ${js}`
   function ReturnTypeSuffix(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "ReturnTypeSuffix", ReturnTypeSuffix$0);
   }
-  var ReturnType$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)((0, import_lib3.$S)(__, (0, import_lib3.$EXPECT)($L232, 'ReturnType "asserts"'), NonIdContinue)), TypePredicate), function($skip, $loc, $0, $1, $2) {
+  var ReturnType$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)((0, import_lib3.$S)(__, (0, import_lib3.$EXPECT)($L232, 'ReturnType "asserts"'), NonIdContinue)), ForbidIndentedApplication, (0, import_lib3.$E)(TypePredicate), RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3, $4) {
     var asserts = $1;
-    var t = $2;
+    var t = $3;
+    if (!t)
+      return $skip;
     if (asserts) {
       t = {
         type: "AssertsType",
@@ -16509,7 +16753,7 @@ ${js}`
   function ReturnType(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "ReturnType", ReturnType$0);
   }
-  var TypePredicate$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(MaybeNestedType, (0, import_lib3.$E)((0, import_lib3.$S)(__, (0, import_lib3.$EXPECT)($L174, 'TypePredicate "is"'), NonIdContinue, Type))), function($skip, $loc, $0, $1, $2) {
+  var TypePredicate$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(MaybeNestedType, (0, import_lib3.$E)((0, import_lib3.$S)(__, Is, Type))), function($skip, $loc, $0, $1, $2) {
     var lhs = $1;
     var rhs = $2;
     if (!rhs)
@@ -16524,11 +16768,11 @@ ${js}`
   function TypePredicate(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "TypePredicate", TypePredicate$0);
   }
-  var Type$0 = TypeConditional;
+  var Type$0 = TypeWithPostfix;
   function Type(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "Type", Type$0);
   }
-  var TypeBinary$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)((0, import_lib3.$S)(__, TypeBinaryOp, __)), TypeUnary, (0, import_lib3.$Q)((0, import_lib3.$S)(__, TypeBinaryOp, __, TypeUnary))), function($skip, $loc, $0, $1, $2, $3) {
+  var TypeBinary$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)((0, import_lib3.$S)(NotDedented, TypeBinaryOp, __)), TypeUnary, (0, import_lib3.$Q)((0, import_lib3.$S)(NotDedented, TypeBinaryOp, __, TypeUnary))), function($skip, $loc, $0, $1, $2, $3) {
     var optionalPrefix = $1;
     var t = $2;
     var ops = $3;
@@ -16543,6 +16787,25 @@ ${js}`
   function TypeBinary(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "TypeBinary", TypeBinary$0);
   }
+  var NestedTypeBinaryChain$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$Q)(NestedTypeBinary), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
+    if (!$2.length)
+      return $skip;
+    return $2;
+  });
+  function NestedTypeBinaryChain(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "NestedTypeBinaryChain", NestedTypeBinaryChain$0);
+  }
+  var NestedTypeBinary$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Nested, TypeBinaryOp, PushExtraIndent1, (0, import_lib3.$E)(TypeUnary), PopIndent), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var indent = $1;
+    var op = $2;
+    var t = $4;
+    if (!t)
+      return $skip;
+    return [indent, op, t];
+  });
+  function NestedTypeBinary(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "NestedTypeBinary", NestedTypeBinary$0);
+  }
   var TypeUnary$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$Q)((0, import_lib3.$S)(__, TypeUnaryOp)), TypePrimary, (0, import_lib3.$Q)(TypeUnarySuffix)), function($skip, $loc, $0, $1, $2, $3) {
     var prefix = $1;
     var t = $2;
@@ -16612,7 +16875,7 @@ ${js}`
     };
   });
   var TypePrimary$2 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), TypeTuple), function($skip, $loc, $0, $1, $2) {
-    return { ...$2, children: [$1, ...$2.children] };
+    return prepend($1, $2);
   });
   var TypePrimary$3 = InterfaceBlock;
   var TypePrimary$4 = (0, import_lib3.$S)((0, import_lib3.$E)(_), TypeFunction);
@@ -16641,7 +16904,7 @@ ${js}`
       args: void 0
     };
   });
-  var TypePrimary$9 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), IdentifierName, (0, import_lib3.$Q)((0, import_lib3.$S)(Dot, IdentifierName)), (0, import_lib3.$E)(TypeArguments)), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var TypePrimary$9 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), Identifier, (0, import_lib3.$Q)((0, import_lib3.$S)(Dot, IdentifierName)), (0, import_lib3.$E)((0, import_lib3.$C)(TypeArguments, ImplicitTypeArguments))), function($skip, $loc, $0, $1, $2, $3, $4) {
     var args = $4;
     return {
       type: "IdentifierType",
@@ -16650,10 +16913,13 @@ ${js}`
       args
     };
   });
-  var TypePrimary$10 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), OpenParen, (0, import_lib3.$C)(Type, (0, import_lib3.$S)(EOS, Type)), __, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var TypePrimary$10 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), OpenParen, AllowAll, (0, import_lib3.$E)((0, import_lib3.$C)(Type, (0, import_lib3.$S)(EOS, Type))), RestoreAll, __, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+    if (!$4)
+      return $skip;
     return {
       type: "ParenthesizedType",
-      children: $0
+      children: [$1, $2, $4, $6, $7]
+      // omit AllowAll/RestoreAll
     };
   });
   var TypePrimary$$ = [TypePrimary$0, TypePrimary$1, TypePrimary$2, TypePrimary$3, TypePrimary$4, TypePrimary$5, TypePrimary$6, TypePrimary$7, TypePrimary$8, TypePrimary$9, TypePrimary$10];
@@ -16666,18 +16932,58 @@ ${js}`
   function ImportType(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "ImportType", ImportType$$);
   }
-  var TypeTuple$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(OpenBracket, (0, import_lib3.$C)(NestedTypeList, (0, import_lib3.$E)(TypeList)), __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var TypeTuple$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(OpenBracket, AllowAll, (0, import_lib3.$E)((0, import_lib3.$S)(TypeTupleContent, __, CloseBracket)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4) {
+    if (!$3)
+      return $skip;
     return {
       type: "TypeTuple",
-      children: $0
+      children: [$1, ...$3]
     };
   });
   function TypeTuple(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "TypeTuple", TypeTuple$0);
   }
-  var TypeList$0 = (0, import_lib3.$S)(TypeElement, (0, import_lib3.$Q)((0, import_lib3.$S)(__, Comma, TypeElement)));
-  function TypeList(ctx, state2) {
-    return (0, import_lib3.$EVENT)(ctx, state2, "TypeList", TypeList$0);
+  var TypeTupleContent$0 = (0, import_lib3.$S)(NestedTypeElementList, (0, import_lib3.$Y)((0, import_lib3.$S)(__, CloseBracket)));
+  var TypeTupleContent$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(TypeElementListWithIndentedApplicationForbidden, ArrayElementDelimiter, (0, import_lib3.$E)(NestedTypeElementList), (0, import_lib3.$Y)((0, import_lib3.$S)(__, CloseBracket))), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var list = $1;
+    var delimiter = $2;
+    var nested = $3;
+    if (!nested)
+      return list;
+    return [...list, delimiter, ...nested];
+  });
+  var TypeTupleContent$2 = (0, import_lib3.$TV)((0, import_lib3.$Q)((0, import_lib3.$S)(__, TypeElementListWithIndentedApplicationForbidden, ArrayElementDelimiter)), function($skip, $loc, $0, $1) {
+    return $1.flat();
+  });
+  var TypeTupleContent$$ = [TypeTupleContent$0, TypeTupleContent$1, TypeTupleContent$2];
+  function TypeTupleContent(ctx, state2) {
+    return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeTupleContent", TypeTupleContent$$);
+  }
+  var TypeElementListWithIndentedApplicationForbidden$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(ForbidIndentedApplication, (0, import_lib3.$E)(TypeElementList), RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3) {
+    if ($2)
+      return $2;
+    return $skip;
+  });
+  function TypeElementListWithIndentedApplicationForbidden(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "TypeElementListWithIndentedApplicationForbidden", TypeElementListWithIndentedApplicationForbidden$0);
+  }
+  var TypeElementList$0 = (0, import_lib3.$T)((0, import_lib3.$S)(TypeBulletedTuple), function(value) {
+    return [value[0]];
+  });
+  var TypeElementList$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$N)(EOS), TypeElement, (0, import_lib3.$Q)((0, import_lib3.$S)((0, import_lib3.$S)((0, import_lib3.$E)(_), Comma, (0, import_lib3.$N)(EOS)), TypeElement))), function($skip, $loc, $0, $1, $2, $3) {
+    var first = $2;
+    var rest = $3;
+    if (!rest.length)
+      return [first];
+    return [
+      append(first, rest[0][0])
+    ].concat(
+      rest.map(([_2, e], i) => append(e, rest[i + 1]?.[0]))
+    );
+  });
+  var TypeElementList$$ = [TypeElementList$0, TypeElementList$1];
+  function TypeElementList(ctx, state2) {
+    return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeElementList", TypeElementList$$);
   }
   var TypeElement$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(__, (0, import_lib3.$E)((0, import_lib3.$S)(DotDotDot, __)), IdentifierName, (0, import_lib3.$E)((0, import_lib3.$S)((0, import_lib3.$E)(_), DotDotDot)), (0, import_lib3.$S)(__, (0, import_lib3.$E)((0, import_lib3.$S)(QuestionMark, (0, import_lib3.$E)(_))), Colon, __), Type), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
     var ws = $1;
@@ -16711,21 +17017,129 @@ ${js}`
   function TypeElement(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeElement", TypeElement$$);
   }
-  var NestedTypeList$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$Q)(NestedType), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
+  var NestedTypeElementList$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$Q)(NestedTypeElement), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
     var types = $2;
     if (types.length)
       return types;
     return $skip;
   });
-  function NestedTypeList(ctx, state2) {
-    return (0, import_lib3.$EVENT)(ctx, state2, "NestedTypeList", NestedTypeList$0);
+  function NestedTypeElementList(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "NestedTypeElementList", NestedTypeElementList$0);
   }
-  var NestedType$0 = (0, import_lib3.$S)(Nested, TypeElement, ArrayElementDelimiter);
-  function NestedType(ctx, state2) {
-    return (0, import_lib3.$EVENT)(ctx, state2, "NestedType", NestedType$0);
+  var NestedTypeElement$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Nested, TypeElementList, ArrayElementDelimiter), function($skip, $loc, $0, $1, $2, $3) {
+    var indent = $1;
+    var list = $2;
+    var delimiter = $3;
+    const { length } = list;
+    if (!length)
+      return $skip;
+    return list.map((e, i) => {
+      if (i === 0)
+        e = prepend(indent, e);
+      if (i === length - 1)
+        e = append(e, delimiter);
+      return e;
+    });
+  });
+  function NestedTypeElement(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "NestedTypeElement", NestedTypeElement$0);
+  }
+  var NestedTypeBulletedTuple$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$S)(InsertSpace, InsertOpenBracket), PushIndent, (0, import_lib3.$Q)(NestedTypeBullet), InsertCloseBracket, PopIndent), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var open = $1;
+    var content = $3;
+    var close = $4;
+    if (!content.length)
+      return $skip;
+    content = content.flat();
+    const last = content[content.length - 1];
+    let children = Array.isArray(last) ? last : last?.children;
+    if (children?.at(-1).implicit) {
+      children = children.slice(0, -1);
+      if (Array.isArray(last)) {
+        content[content.length - 1] = children;
+      } else {
+        content[content.length - 1] = { ...last, children };
+      }
+    }
+    return {
+      type: "TypeTuple",
+      children: [...open, ...content, close]
+    };
+  });
+  function NestedTypeBulletedTuple(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "NestedTypeBulletedTuple", NestedTypeBulletedTuple$0);
+  }
+  var TypeBulletedTuple$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(InsertOpenBracket, (0, import_lib3.$E)((0, import_lib3.$S)(TypeBullet, (0, import_lib3.$Q)(NestedTypeBullet))), InsertCloseBracket), function($skip, $loc, $0, $1, $2, $3) {
+    var open = $1;
+    var content = $2;
+    var close = $3;
+    if (!content)
+      return $skip;
+    content = [
+      ...trimFirstSpace(content[0]),
+      // replace first space with bracket
+      ...content[1].flat()
+    ];
+    const last = content[content.length - 1];
+    let children = Array.isArray(last) ? last : last?.children;
+    if (children?.at(-1).implicit) {
+      children = children.slice(0, -1);
+      if (Array.isArray(last)) {
+        content[content.length - 1] = children;
+      } else {
+        content[content.length - 1] = { ...last, children };
+      }
+    }
+    return {
+      type: "TypeTuple",
+      children: [open, ...content, close]
+    };
+  });
+  function TypeBulletedTuple(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "TypeBulletedTuple", TypeBulletedTuple$0);
+  }
+  var NestedTypeBullet$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Nested, TypeBullet), function($skip, $loc, $0, $1, $2) {
+    var indent = $1;
+    var list = $2;
+    return list.map((e, i) => i === 0 ? prepend(indent, e) : e);
+  });
+  function NestedTypeBullet(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "NestedTypeBullet", NestedTypeBullet$0);
+  }
+  var TypeBullet$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(BulletIndent, (0, import_lib3.$E)((0, import_lib3.$S)(TypeElementList, ArrayBulletDelimiter)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
+    var bullet = $1;
+    var content = $2;
+    if (!content)
+      return $skip;
+    let [list, delimiter] = content;
+    if (!list.length)
+      return $skip;
+    list = list.slice();
+    list[0] = prepend(bullet, list[0]);
+    if (delimiter) {
+      const last = list.length - 1;
+      list[last] = append(list[last], delimiter);
+    }
+    return list;
+  });
+  function TypeBullet(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "TypeBullet", TypeBullet$0);
+  }
+  var TypeWithPostfix$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(TypeConditional, (0, import_lib3.$E)((0, import_lib3.$S)((0, import_lib3.$E)((0, import_lib3.$C)(_, IndentedFurther)), TypeIfClause))), function($skip, $loc, $0, $1, $2) {
+    var t = $1;
+    var postfix = $2;
+    if (!postfix)
+      return t;
+    return prepend(
+      postfix[0],
+      expressionizeTypeIf([...postfix[1], $1, void 0])
+    );
+  });
+  function TypeWithPostfix(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "TypeWithPostfix", TypeWithPostfix$0);
   }
   var TypeConditional$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), (0, import_lib3.$EXPECT)($R89, "TypeConditional /(?=if|unless)/"), TypeIfThenElse), function($skip, $loc, $0, $1, $2, $3) {
-    return [$1, expressionizeTypeIf($3)];
+    return prepend($1, expressionizeTypeIf($3));
   });
   var TypeConditional$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(TypeCondition, NotDedented, QuestionMark, __, Type, __, Colon, __, Type), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
     if ($1.negated)
@@ -16737,7 +17151,7 @@ ${js}`
   function TypeConditional(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeConditional", TypeConditional$$);
   }
-  var TypeCondition$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(TypeBinary, (0, import_lib3.$E)(IndentedFurther), (0, import_lib3.$C)(ExtendsToken, NotExtendsToken), Type), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var TypeCondition$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(TypeBinary, (0, import_lib3.$E)(IndentedFurther), (0, import_lib3.$C)(ExtendsToken, NotExtendsToken), TypeConditional), function($skip, $loc, $0, $1, $2, $3, $4) {
     return {
       type: "TypeCondition",
       negated: $3.negated,
@@ -16747,13 +17161,27 @@ ${js}`
   function TypeCondition(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "TypeCondition", TypeCondition$0);
   }
-  var TypeIfThenElse$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), (0, import_lib3.$C)(If, Unless), (0, import_lib3.$S)(OpenParen, TypeCondition, CloseParen), TypeBlock, (0, import_lib3.$E)(TypeElse)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-    return [$1, $2, $3[1], $4, $5];
+  var TypeIfThenElse$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(TypeIfClause, TypeBlock, (0, import_lib3.$E)(TypeElse)), function($skip, $loc, $0, $1, $2, $3) {
+    return [...$1, $2, $3];
   });
-  var TypeIfThenElse$1 = (0, import_lib3.$S)((0, import_lib3.$E)(_), (0, import_lib3.$C)(If, Unless), TypeCondition, TypeBlock, (0, import_lib3.$E)(TypeElse));
-  var TypeIfThenElse$$ = [TypeIfThenElse$0, TypeIfThenElse$1];
   function TypeIfThenElse(ctx, state2) {
-    return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeIfThenElse", TypeIfThenElse$$);
+    return (0, import_lib3.$EVENT)(ctx, state2, "TypeIfThenElse", TypeIfThenElse$0);
+  }
+  var TypeIfClause$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$C)(If, Unless), OpenParen, AllowAll, (0, import_lib3.$E)(TypeCondition), RestoreAll, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var condition = $4;
+    if (!condition)
+      return $skip;
+    return [$1, condition];
+  });
+  var TypeIfClause$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$C)(If, Unless), ForbidIndentedApplication, (0, import_lib3.$E)(TypeCondition), RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var condition = $3;
+    if (!condition)
+      return $skip;
+    return [$1, condition];
+  });
+  var TypeIfClause$$ = [TypeIfClause$0, TypeIfClause$1];
+  function TypeIfClause(ctx, state2) {
+    return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeIfClause", TypeIfClause$$);
   }
   var TypeElse$0 = (0, import_lib3.$S)(NotDedented, Else, TypeBlock);
   function TypeElse(ctx, state2) {
@@ -16853,12 +17281,18 @@ ${js}`
   function TypeBinaryOp(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeBinaryOp", TypeBinaryOp$$);
   }
-  var TypeFunction$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)((0, import_lib3.$S)((0, import_lib3.$E)((0, import_lib3.$S)(Abstract, (0, import_lib3.$E)(_))), New, (0, import_lib3.$E)(_))), Parameters, __, TypeArrowFunction, (0, import_lib3.$E)(ReturnType)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-    var type = $5;
-    if (type) {
-      return $0;
+  var TypeFunction$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)((0, import_lib3.$S)(Abstract, (0, import_lib3.$E)(_))), (0, import_lib3.$E)((0, import_lib3.$S)(New, (0, import_lib3.$E)(_))), Parameters, __, TypeArrowFunction, (0, import_lib3.$E)(ReturnType)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var type = $6;
+    const ret = [...$0];
+    if ($1 && !$2) {
+      ret[1] = {
+        type: "Error",
+        message: "abstract function types must be constructors (abstract new)"
+      };
     }
-    return [...$0, "void"];
+    if (!type)
+      ret.push("void");
+    return ret;
   });
   function TypeFunction(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "TypeFunction", TypeFunction$0);
@@ -16869,8 +17303,9 @@ ${js}`
   function TypeArrowFunction(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "TypeArrowFunction", TypeArrowFunction$0);
   }
-  var TypeArguments$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(OpenAngleBracket, (0, import_lib3.$P)(TypeArgument), __, CloseAngleBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var TypeArguments$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(OpenAngleBracket, (0, import_lib3.$P)((0, import_lib3.$S)(__, TypeArgumentDelimited)), __, CloseAngleBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
     var args = $2;
+    args = args.map(([ws, arg]) => [ws, ...arg]);
     return {
       type: "TypeArguments",
       ts: true,
@@ -16881,7 +17316,91 @@ ${js}`
   function TypeArguments(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "TypeArguments", TypeArguments$0);
   }
-  var TypeArgument$0 = (0, import_lib3.$S)(__, Type, TypeArgumentDelimiter);
+  var ImplicitTypeArguments$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(TypeApplicationStart, InsertOpenAngleBracket, (0, import_lib3.$E)(Trimmed_), TypeArgumentList, InsertCloseAngleBracket), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var open = $2;
+    var ws = $3;
+    var args = $4;
+    var close = $5;
+    let last = args[args.length - 1];
+    if (last?.token === ",")
+      args = args.slice(0, -1);
+    return [open, ws, args, close];
+  });
+  function ImplicitTypeArguments(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "ImplicitTypeArguments", ImplicitTypeArguments$0);
+  }
+  var TypeApplicationStart$0 = (0, import_lib3.$S)(IndentedApplicationAllowed, (0, import_lib3.$Y)((0, import_lib3.$S)(IndentedFurther, (0, import_lib3.$N)(ForbiddenImplicitTypeCalls))));
+  var TypeApplicationStart$1 = (0, import_lib3.$S)((0, import_lib3.$N)(EOS), (0, import_lib3.$Y)((0, import_lib3.$S)(_, (0, import_lib3.$N)(ForbiddenImplicitTypeCalls))));
+  var TypeApplicationStart$$ = [TypeApplicationStart$0, TypeApplicationStart$1];
+  function TypeApplicationStart(ctx, state2) {
+    return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeApplicationStart", TypeApplicationStart$$);
+  }
+  var ForbiddenImplicitTypeCalls$0 = ReservedBinary;
+  var ForbiddenImplicitTypeCalls$1 = (0, import_lib3.$R$0)((0, import_lib3.$EXPECT)($R90, "ForbiddenImplicitTypeCalls /[|&<!=\\-\u21D2\u2192]/"));
+  var ForbiddenImplicitTypeCalls$2 = (0, import_lib3.$R$0)((0, import_lib3.$EXPECT)($R91, "ForbiddenImplicitTypeCalls /(extends|not|is)(?!\\p{ID_Continue}|[\\u200C\\u200D$])/"));
+  var ForbiddenImplicitTypeCalls$$ = [ForbiddenImplicitTypeCalls$0, ForbiddenImplicitTypeCalls$1, ForbiddenImplicitTypeCalls$2];
+  function ForbiddenImplicitTypeCalls(ctx, state2) {
+    return (0, import_lib3.$EVENT_C)(ctx, state2, "ForbiddenImplicitTypeCalls", ForbiddenImplicitTypeCalls$$);
+  }
+  var TypeArgumentList$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$N)(EOS), TypeArgument, (0, import_lib3.$Q)((0, import_lib3.$S)(CommaDelimiter, (0, import_lib3.$N)(EOS), (0, import_lib3.$E)(_), TypeArgument)), (0, import_lib3.$P)((0, import_lib3.$S)(CommaDelimiter, (0, import_lib3.$C)(NestedTypeBulletedTuple, NestedInterfaceBlock, NestedTypeArgumentList)))), function($skip, $loc, $0, $1, $2, $3, $4) {
+    return [
+      $2,
+      ...$3.flatMap(([comma, eos, ws, arg]) => [comma, prepend(ws, arg)]),
+      ...$4.flatMap(
+        ([comma, args]) => Array.isArray(args) ? [comma, ...args] : [comma, args]
+      )
+    ];
+  });
+  var TypeArgumentList$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$C)(NestedTypeBulletedTuple, NestedInterfaceBlock), (0, import_lib3.$Q)((0, import_lib3.$S)(CommaDelimiter, (0, import_lib3.$C)(NestedTypeBulletedTuple, NestedInterfaceBlock, NestedTypeArgumentList)))), function($skip, $loc, $0, $1, $2) {
+    return [
+      trimFirstSpace($1),
+      ...$2.flatMap(
+        ([comma, args]) => Array.isArray(args) ? [comma, ...args] : [comma, args]
+      )
+    ];
+  });
+  var TypeArgumentList$2 = NestedTypeArgumentList;
+  var TypeArgumentList$3 = (0, import_lib3.$TS)((0, import_lib3.$S)(TypeArgument, (0, import_lib3.$Q)((0, import_lib3.$S)(CommaDelimiter, (0, import_lib3.$E)(_), TypeArgument))), function($skip, $loc, $0, $1, $2) {
+    return [
+      $1,
+      ...$2.flatMap(([comma, ws, arg]) => [comma, prepend(ws, arg)])
+    ];
+  });
+  var TypeArgumentList$$ = [TypeArgumentList$0, TypeArgumentList$1, TypeArgumentList$2, TypeArgumentList$3];
+  function TypeArgumentList(ctx, state2) {
+    return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeArgumentList", TypeArgumentList$$);
+  }
+  var NestedTypeArgumentList$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$Q)(NestedTypeArgument), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
+    var args = $2;
+    if (!args.length)
+      return $skip;
+    return args.flat();
+  });
+  function NestedTypeArgumentList(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "NestedTypeArgumentList", NestedTypeArgumentList$0);
+  }
+  var NestedTypeArgument$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Nested, SingleLineTypeArgumentList, TypeArgumentDelimiter), function($skip, $loc, $0, $1, $2, $3) {
+    var indent = $1;
+    var args = $2;
+    var comma = $3;
+    let [arg0, ...rest] = args;
+    arg0 = prepend(indent, arg0);
+    return [arg0, ...rest, comma];
+  });
+  function NestedTypeArgument(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "NestedTypeArgument", NestedTypeArgument$0);
+  }
+  var SingleLineTypeArgumentList$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$S)((0, import_lib3.$E)(_), TypeArgument), (0, import_lib3.$Q)((0, import_lib3.$S)((0, import_lib3.$S)((0, import_lib3.$E)(_), Comma), (0, import_lib3.$S)((0, import_lib3.$E)(_), TypeArgument)))), function($skip, $loc, $0, $1, $2) {
+    return [$1, ...$2.flat()];
+  });
+  function SingleLineTypeArgumentList(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "SingleLineTypeArgumentList", SingleLineTypeArgumentList$0);
+  }
+  var TypeArgumentDelimited$0 = (0, import_lib3.$S)(TypeArgument, TypeArgumentDelimiter);
+  function TypeArgumentDelimited(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "TypeArgumentDelimited", TypeArgumentDelimited$0);
+  }
+  var TypeArgument$0 = Type;
   function TypeArgument(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "TypeArgument", TypeArgument$0);
   }
@@ -16928,15 +17447,15 @@ ${js}`
   function ThisType(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "ThisType", ThisType$0);
   }
-  var Shebang$0 = (0, import_lib3.$S)((0, import_lib3.$R$0)((0, import_lib3.$EXPECT)($R90, "Shebang /#![^\\r\\n]*/")), EOL);
+  var Shebang$0 = (0, import_lib3.$S)((0, import_lib3.$R$0)((0, import_lib3.$EXPECT)($R92, "Shebang /#![^\\r\\n]*/")), EOL);
   function Shebang(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "Shebang", Shebang$0);
   }
-  var CivetPrologue$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($R91, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, SimpleStatementDelimiter, (0, import_lib3.$EXPECT)($R20, "CivetPrologue /[ \\t]*/"), (0, import_lib3.$C)(EOL, (0, import_lib3.$Y)(RestOfLine))), function(value) {
+  var CivetPrologue$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($R93, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, SimpleStatementDelimiter, (0, import_lib3.$EXPECT)($R20, "CivetPrologue /[ \\t]*/"), (0, import_lib3.$C)(EOL, (0, import_lib3.$Y)(RestOfLine))), function(value) {
     var content = value[2];
     return content;
   });
-  var CivetPrologue$1 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($R91, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, SimpleStatementDelimiter, (0, import_lib3.$EXPECT)($R20, "CivetPrologue /[ \\t]*/"), (0, import_lib3.$C)(EOL, (0, import_lib3.$Y)(RestOfLine))), function(value) {
+  var CivetPrologue$1 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($R93, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, SimpleStatementDelimiter, (0, import_lib3.$EXPECT)($R20, "CivetPrologue /[ \\t]*/"), (0, import_lib3.$C)(EOL, (0, import_lib3.$Y)(RestOfLine))), function(value) {
     var content = value[2];
     return content;
   });
@@ -16944,7 +17463,7 @@ ${js}`
   function CivetPrologue(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "CivetPrologue", CivetPrologue$$);
   }
-  var CivetPrologueContent$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L238, 'CivetPrologueContent "civet"'), NonIdContinue, (0, import_lib3.$Q)(CivetOption), (0, import_lib3.$EXPECT)($R92, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var CivetPrologueContent$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L238, 'CivetPrologueContent "civet"'), NonIdContinue, (0, import_lib3.$Q)(CivetOption), (0, import_lib3.$EXPECT)($R94, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
     var options = $3;
     return {
       type: "CivetPrologue",
@@ -16955,7 +17474,7 @@ ${js}`
   function CivetPrologueContent(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "CivetPrologueContent", CivetPrologueContent$0);
   }
-  var CivetOption$0 = (0, import_lib3.$TR)((0, import_lib3.$EXPECT)($R93, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+  var CivetOption$0 = (0, import_lib3.$TR)((0, import_lib3.$EXPECT)($R95, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
     const optionName = $2.replace(/-+([a-z]?)/g, (_2, l) => {
       if (l)
         return l.toUpperCase();
@@ -16972,11 +17491,11 @@ ${js}`
   function CivetOption(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "CivetOption", CivetOption$0);
   }
-  var UnknownPrologue$0 = (0, import_lib3.$S)((0, import_lib3.$R$0)((0, import_lib3.$EXPECT)($R91, "UnknownPrologue /[\\t ]*/")), StringLiteral, (0, import_lib3.$TEXT)(SimpleStatementDelimiter), EOS);
+  var UnknownPrologue$0 = (0, import_lib3.$S)((0, import_lib3.$R$0)((0, import_lib3.$EXPECT)($R93, "UnknownPrologue /[\\t ]*/")), StringLiteral, (0, import_lib3.$TEXT)(SimpleStatementDelimiter), EOS);
   function UnknownPrologue(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "UnknownPrologue", UnknownPrologue$0);
   }
-  var TripleSlashDirective$0 = (0, import_lib3.$S)((0, import_lib3.$R$0)((0, import_lib3.$EXPECT)($R94, "TripleSlashDirective /\\/\\/\\/[^\\r\\n]*/")), (0, import_lib3.$E)(EOS));
+  var TripleSlashDirective$0 = (0, import_lib3.$S)((0, import_lib3.$R$0)((0, import_lib3.$EXPECT)($R96, "TripleSlashDirective /\\/\\/\\/[^\\r\\n]*/")), (0, import_lib3.$E)(EOS));
   function TripleSlashDirective(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "TripleSlashDirective", TripleSlashDirective$0);
   }
@@ -16992,13 +17511,13 @@ ${js}`
   function PrologueString(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "PrologueString", PrologueString$$);
   }
-  var EOS$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($R95, "EOS /(?=[ \\t\\r\\n\\/#]|$)/"), (0, import_lib3.$P)(RestOfLine)), function(value) {
+  var EOS$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($R97, "EOS /(?=[ \\t\\r\\n\\/#]|$)/"), (0, import_lib3.$P)(RestOfLine)), function(value) {
     return value[1];
   });
   function EOS(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "EOS", EOS$0);
   }
-  var EOL$0 = (0, import_lib3.$TR)((0, import_lib3.$EXPECT)($R96, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+  var EOL$0 = (0, import_lib3.$TR)((0, import_lib3.$EXPECT)($R98, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
     return { $loc, token: $0 };
   });
   function EOL(ctx, state2) {
@@ -17064,6 +17583,18 @@ ${js}`
   function InsertCloseBracket(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "InsertCloseBracket", InsertCloseBracket$0);
   }
+  var InsertOpenAngleBracket$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L0, 'InsertOpenAngleBracket ""'), function($skip, $loc, $0, $1) {
+    return { $loc, token: "<" };
+  });
+  function InsertOpenAngleBracket(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "InsertOpenAngleBracket", InsertOpenAngleBracket$0);
+  }
+  var InsertCloseAngleBracket$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L0, 'InsertCloseAngleBracket ""'), function($skip, $loc, $0, $1) {
+    return { $loc, token: ">" };
+  });
+  function InsertCloseAngleBracket(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "InsertCloseAngleBracket", InsertCloseAngleBracket$0);
+  }
   var InsertComma$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L0, 'InsertComma ""'), function($skip, $loc, $0, $1) {
     return { $loc, token: ",", implicit: true };
   });
@@ -17396,7 +17927,7 @@ ${js}`
   function Prologue(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "Prologue", Prologue$0);
   }
-  var ProloguePrefix$0 = (0, import_lib3.$S)(Prologue, (0, import_lib3.$R$0)((0, import_lib3.$EXPECT)($R97, "ProloguePrefix /[^]*/")));
+  var ProloguePrefix$0 = (0, import_lib3.$S)(Prologue, (0, import_lib3.$R$0)((0, import_lib3.$EXPECT)($R99, "ProloguePrefix /[^]*/")));
   function ProloguePrefix(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "ProloguePrefix", ProloguePrefix$0);
   }
@@ -17486,6 +18017,20 @@ ${js}`
   function Dedented(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "Dedented", Dedented$0);
   }
+  var PushExtraIndent1$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L0, 'PushExtraIndent1 ""'), function($skip, $loc, $0, $1) {
+    const indent = {
+      token: "",
+      $loc,
+      level: state.currentIndent.level + 1
+    };
+    if (config.verbose)
+      console.log("pushing bonus indent", indent);
+    state.indentLevels.push(indent);
+    return indent;
+  });
+  function PushExtraIndent1(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "PushExtraIndent1", PushExtraIndent1$0);
+  }
   var parser = function() {
     const { fail, validate, reset } = (0, import_lib3.Validator)();
     let ctx = { expectation: "", fail };
@@ -17945,6 +18490,7 @@ ${js}`
     "PopIndent",
     "TrackIndented",
     "BulletIndent",
+    "PushExtraIndent1",
     // JSX
     "PushJSXOpeningElement",
     "PushJSXOpeningFragment",