@danielx/civet 0.7.36 → 0.8.1

package/dist/browser.js

@@ -70,7 +70,7 @@ var Civet = (() => {
         $N: () => $N2,
         $P: () => $P2,
         $Q: () => $Q2,
-        $R: () => $R99,
+        $R: () => $R100,
         $R$0: () => $R$02,
         $S: () => $S2,
         $T: () => $T2,
@@ -107,7 +107,7 @@ var Civet = (() => {
           return;
         };
       }
-      function $R99(regExp) {
+      function $R100(regExp) {
         return function(_ctx, state2) {
           const { input, pos } = state2;
           regExp.lastIndex = state2.pos;
@@ -543,6 +543,7 @@ ${body}`;
     getPrecedence: () => getPrecedence,
     getTrimmingSpace: () => getTrimmingSpace,
     hasAwait: () => hasAwait,
+    hasExportDeclaration: () => hasExportDeclaration,
     hasImportDeclaration: () => hasImportDeclaration,
     hasYield: () => hasYield,
     insertTrimmingSpace: () => insertTrimmingSpace,
@@ -993,6 +994,9 @@ ${body}`;
   function hasImportDeclaration(exp) {
     return gatherRecursiveWithinFunction(exp, ($3) => $3.type === "ImportDeclaration").length > 0;
   }
+  function hasExportDeclaration(exp) {
+    return gatherRecursiveWithinFunction(exp, ($4) => $4.type === "ExportDeclaration").length > 0;
+  }
   function deepCopy(node) {
     if (node == null)
       return node;
@@ -1031,6 +1035,7 @@ ${body}`;
   }
   var skipParens = /* @__PURE__ */ new Set([
     "AmpersandRef",
+    "ArrayExpression",
     "CallExpression",
     "Identifier",
     "JSXElement",
@@ -1044,6 +1049,10 @@ ${body}`;
     // wrapIIFE
   ]);
   function makeLeftHandSideExpression(expression) {
+    while (expression && Array.isArray(expression) && len(expression, 1)) {
+      const [item] = expression;
+      expression = item;
+    }
     if (isASTNodeObject(expression)) {
       if (expression.parenthesized) {
         return expression;
@@ -1051,7 +1060,7 @@ ${body}`;
       if (skipParens.has(expression.type)) {
         return expression;
       }
-      if (expression.type === "MemberExpression" && !startsWithPredicate(expression, ($4) => $4.type === "ObjectExpression")) {
+      if (expression.type === "MemberExpression" && !startsWithPredicate(expression, ($5) => $5.type === "ObjectExpression")) {
         return expression;
       }
     }
@@ -1154,17 +1163,24 @@ ${body}`;
     return ["(", type, ")"];
   }
   function wrapIIFE(expressions, asyncFlag, generator) {
-    let prefix;
+    let awaitPrefix;
     const async = [];
     if (asyncFlag) {
       async.push("async ");
     } else if (hasAwait(expressions)) {
       async.push("async ");
-      prefix = {
+      awaitPrefix = {
         type: "Await",
         children: ["await "]
       };
     }
+    let yieldWrap = false;
+    if (!generator) {
+      if (hasYield(expressions)) {
+        generator = "*";
+        yieldWrap = true;
+      }
+    }
     const block = makeNode({
       type: "BlockStatement",
       expressions,
@@ -1219,12 +1235,27 @@ ${body}`;
         children[children.length - 1] = (ref4 = parameters.children)[ref4.length - 1] = "(arguments)";
       }
     }
-    const exp = makeNode({
+    let exp = makeNode({
       type: "CallExpression",
       children
     });
-    if (prefix) {
-      return makeLeftHandSideExpression([prefix, exp]);
+    if (yieldWrap) {
+      exp = makeLeftHandSideExpression(makeNode({
+        type: "YieldExpression",
+        star: "*",
+        expression: exp,
+        children: [
+          {
+            type: "Yield",
+            children: ["yield"]
+          },
+          "*",
+          " ",
+          exp
+        ]
+      }));
+    } else if (awaitPrefix) {
+      exp = makeLeftHandSideExpression([awaitPrefix, exp]);
     }
     return exp;
   }
@@ -2409,7 +2440,12 @@ ${body}`;
     if (isStatement(body)) {
       braceBlock(block);
       fn.ampersandBlock = false;
-      delete fn.body;
+    }
+    if (gatherRecursiveWithinFunction(
+      block,
+      (a4) => a4 === ref
+    ).length > 1) {
+      fn.ampersandBlock = false;
     }
     return fn;
   }
@@ -2772,7 +2808,7 @@ ${body}`;
             a = makeAsConst(a);
             b = makeAsConst(b);
           }
-          let children;
+          let children, type;
           if (op.type === "PatternTest") {
             children = [processPatternTest(a, b)];
           } else if (op.type === "ChainOp") {
@@ -2781,28 +2817,31 @@ ${body}`;
               children = ["(", ...children, ")"];
             }
           } else if (op.call) {
-            wsOp = insertTrimmingSpace(wsOp, "");
+            wsOp = trimFirstSpace(wsOp);
             if (op.reversed) {
-              wsB = insertTrimmingSpace(wsB, "");
+              wsB = trimFirstSpace(wsB);
               children = [wsOp, op.call, "(", wsB, b, ", ", a, ")", op.suffix];
             } else {
               children = [wsOp, op.call, "(", a, ",", wsB, b, ")", op.suffix];
             }
+            type = "CallExpression";
           } else if (op.method) {
-            wsOp = insertTrimmingSpace(wsOp, "");
-            wsB = insertTrimmingSpace(wsB, "");
+            wsOp = trimFirstSpace(wsOp);
+            wsB = trimFirstSpace(wsB);
             if (op.reversed) {
-              if (end !== i + 2)
+              if (!(b.type === "CallExpression")) {
                 b = makeLeftHandSideExpression(b);
+              }
               b = dotNumericLiteral(b);
               children = [wsB, b, wsOp, ".", op.method, "(", a, ")"];
             } else {
-              if (start !== i - 2 || a.type === "NumericLiteral") {
+              if (!(a.type === "CallExpression")) {
                 a = makeLeftHandSideExpression(a);
               }
               a = dotNumericLiteral(a);
               children = [a, wsOp, ".", op.method, "(", wsB, b, ")"];
             }
+            type = "CallExpression";
           } else if (op.token) {
             children = [a, wsOp, op, wsB, b];
             if (op.negated)
@@ -2816,6 +2855,7 @@ ${body}`;
             children.push(error);
           }
           expandedOps.splice(start, end - start + 1, {
+            type,
             children
           });
           i = start + 2;
@@ -4821,8 +4861,9 @@ ${body}`;
           let line = "?";
           let column = "?";
           let offset;
-          if (options && typeof options === "object" && "sourceMap" in options) {
-            const { sourceMap } = options;
+          let ref;
+          if (ref = options.sourceMap) {
+            const sourceMap = ref;
             line = sourceMap.data.srcLine + 1;
             column = sourceMap.data.srcColumn + 1;
             offset = sourceMap.data.srcOffset;
@@ -6835,12 +6876,10 @@ ${js}`
     NestedTopLevelStatements,
     TopLevelSingleLineStatements,
     TopLevelStatement,
-    ExtendedCommaExpression,
-    ExtendedExpression,
-    SingleLineExtendedExpression,
-    NonPipelineExtendedExpression,
-    NonAssignmentExtendedExpression,
-    NestedNonAssignmentExtendedExpression,
+    Expression,
+    SingleLineExpression,
+    NonPipelineExpression,
+    NestedExpressionizedStatement,
     ExpressionizedStatementWithTrailingCallExpressions,
     ExpressionizedStatement,
     StatementExpression,
@@ -7215,11 +7254,11 @@ ${js}`
     Break,
     Continue,
     Debugger,
-    MaybeNestedNonPipelineExtendedExpression,
+    MaybeNestedNonPipelineExpression,
     MaybeNestedPostfixedExpression,
-    MaybeNestedExtendedExpression,
-    NestedExtendedExpression,
-    MaybeParenNestedExtendedExpression,
+    MaybeNestedExpression,
+    NestedExpression,
+    MaybeParenNestedExpression,
     ImportDeclaration,
     ImpliedImport,
     ImportClause,
@@ -7510,6 +7549,7 @@ ${js}`
     TypeIndex,
     TypeSuffix,
     MaybeNestedType,
+    MaybeNestedTypePrimary,
     ReturnTypeSuffix,
     ReturnType,
     TypePredicate,
@@ -7966,14 +8006,15 @@ ${js}`
   var $R88 = (0, import_lib3.$R)(new RegExp("(?=if|unless)", "suy"));
   var $R89 = (0, import_lib3.$R)(new RegExp("[|&<!=\\-\u21D2\u2192]", "suy"));
   var $R90 = (0, import_lib3.$R)(new RegExp("(extends|not|is)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
-  var $R91 = (0, import_lib3.$R)(new RegExp("#![^\\r\\n]*", "suy"));
-  var $R92 = (0, import_lib3.$R)(new RegExp("[\\t ]*", "suy"));
-  var $R93 = (0, import_lib3.$R)(new RegExp("[\\s]*", "suy"));
-  var $R94 = (0, import_lib3.$R)(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([\\p{ID_Continue}.,+-]*))?", "suy"));
-  var $R95 = (0, import_lib3.$R)(new RegExp("\\/\\/\\/[^\\r\\n]*", "suy"));
-  var $R96 = (0, import_lib3.$R)(new RegExp("(?=[ \\t\\r\\n\\/#]|$)", "suy"));
-  var $R97 = (0, import_lib3.$R)(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
-  var $R98 = (0, import_lib3.$R)(new RegExp("[^]*", "suy"));
+  var $R91 = (0, import_lib3.$R)(new RegExp("const|in|out", "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*([\\p{ID_Continue}.,+-]*))?", "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;
@@ -8043,39 +8084,19 @@ ${js}`
   function TopLevelStatement(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "TopLevelStatement", TopLevelStatement$0);
   }
-  var ExtendedCommaExpression$0 = NonAssignmentExtendedExpression;
-  var ExtendedCommaExpression$1 = CommaExpression;
-  var ExtendedCommaExpression$$ = [ExtendedCommaExpression$0, ExtendedCommaExpression$1];
-  function ExtendedCommaExpression(ctx, state2) {
-    return (0, import_lib3.$EVENT_C)(ctx, state2, "ExtendedCommaExpression", ExtendedCommaExpression$$);
-  }
-  var ExtendedExpression$0 = NonAssignmentExtendedExpression;
-  var ExtendedExpression$1 = AssignmentExpression;
-  var ExtendedExpression$$ = [ExtendedExpression$0, ExtendedExpression$1];
-  function ExtendedExpression(ctx, state2) {
-    return (0, import_lib3.$EVENT_C)(ctx, state2, "ExtendedExpression", ExtendedExpression$$);
-  }
-  var SingleLineExtendedExpression$0 = NonAssignmentExtendedExpression;
-  var SingleLineExtendedExpression$1 = SingleLineAssignmentExpression;
-  var SingleLineExtendedExpression$$ = [SingleLineExtendedExpression$0, SingleLineExtendedExpression$1];
-  function SingleLineExtendedExpression(ctx, state2) {
-    return (0, import_lib3.$EVENT_C)(ctx, state2, "SingleLineExtendedExpression", SingleLineExtendedExpression$$);
-  }
-  var NonPipelineExtendedExpression$0 = NonAssignmentExtendedExpression;
-  var NonPipelineExtendedExpression$1 = NonPipelineAssignmentExpression;
-  var NonPipelineExtendedExpression$$ = [NonPipelineExtendedExpression$0, NonPipelineExtendedExpression$1];
-  function NonPipelineExtendedExpression(ctx, state2) {
-    return (0, import_lib3.$EVENT_C)(ctx, state2, "NonPipelineExtendedExpression", NonPipelineExtendedExpression$$);
-  }
-  var NonAssignmentExtendedExpression$0 = NestedNonAssignmentExtendedExpression;
-  var NonAssignmentExtendedExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), ExpressionizedStatementWithTrailingCallExpressions), function($skip, $loc, $0, $1, $2) {
-    return prepend($1, $2);
-  });
-  var NonAssignmentExtendedExpression$$ = [NonAssignmentExtendedExpression$0, NonAssignmentExtendedExpression$1];
-  function NonAssignmentExtendedExpression(ctx, state2) {
-    return (0, import_lib3.$EVENT_C)(ctx, state2, "NonAssignmentExtendedExpression", NonAssignmentExtendedExpression$$);
+  var Expression$0 = AssignmentExpression;
+  function Expression(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "Expression", Expression$0);
+  }
+  var SingleLineExpression$0 = SingleLineAssignmentExpression;
+  function SingleLineExpression(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "SingleLineExpression", SingleLineExpression$0);
   }
-  var NestedNonAssignmentExtendedExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$Y)(EOS), PushIndent, (0, import_lib3.$E)((0, import_lib3.$S)(Nested, ExpressionizedStatementWithTrailingCallExpressions)), PopIndent, (0, import_lib3.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var NonPipelineExpression$0 = NonPipelineAssignmentExpression;
+  function NonPipelineExpression(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "NonPipelineExpression", NonPipelineExpression$0);
+  }
+  var NestedExpressionizedStatement$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$Y)(EOS), PushIndent, (0, import_lib3.$E)((0, import_lib3.$S)(Nested, ExpressionizedStatementWithTrailingCallExpressions)), PopIndent, (0, import_lib3.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
     var expression = $3;
     var trailing = $5;
     if (!expression)
@@ -8087,8 +8108,8 @@ ${js}`
       children: [expression, ...trailing.flat()]
     };
   });
-  function NestedNonAssignmentExtendedExpression(ctx, state2) {
-    return (0, import_lib3.$EVENT)(ctx, state2, "NestedNonAssignmentExtendedExpression", NestedNonAssignmentExtendedExpression$0);
+  function NestedExpressionizedStatement(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "NestedExpressionizedStatement", NestedExpressionizedStatement$0);
   }
   var ExpressionizedStatementWithTrailingCallExpressions$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(ExpressionizedStatement, (0, import_lib3.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2) {
     if (!$2)
@@ -8172,11 +8193,11 @@ ${js}`
   function ImplicitArguments(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "ImplicitArguments", ImplicitArguments$0);
   }
-  var ExplicitArguments$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(OpenParen, (0, import_lib3.$E)((0, import_lib3.$S)(ArgumentList, (0, import_lib3.$E)((0, import_lib3.$S)(__, Comma)))), __, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var ExplicitArguments$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(OpenParen, AllowAll, (0, import_lib3.$E)((0, import_lib3.$S)(ArgumentList, (0, import_lib3.$E)((0, import_lib3.$S)(__, Comma)))), __, RestoreAll, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
     var open = $1;
-    var args = $2;
-    var ws = $3;
-    var close = $4;
+    var args = $3;
+    var ws = $4;
+    var close = $6;
     if (args) {
       if (args[1]) {
         args = [...args[0], args[1]];
@@ -8300,8 +8321,8 @@ ${js}`
   function ArgumentList(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "ArgumentList", ArgumentList$$);
   }
-  var NestedArgumentList$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, AllowPipeline, (0, import_lib3.$Q)(NestedArgument), RestorePipeline, PopIndent), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-    var args = $3;
+  var NestedArgumentList$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, AllowPipeline, AllowTrailingMemberProperty, (0, import_lib3.$Q)(NestedArgument), RestoreTrailingMemberProperty, RestorePipeline, PopIndent), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+    var args = $4;
     if (!args.length)
       return $skip;
     return args.flat();
@@ -8332,7 +8353,7 @@ ${js}`
   function WArgumentPart(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "WArgumentPart", WArgumentPart$0);
   }
-  var ArgumentPart$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(DotDotDot, ExtendedExpression), function($skip, $loc, $0, $1, $2) {
+  var ArgumentPart$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(DotDotDot, Expression), function($skip, $loc, $0, $1, $2) {
     var spread = $1;
     var expression = $2;
     return {
@@ -8342,7 +8363,7 @@ ${js}`
       spread
     };
   });
-  var ArgumentPart$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(ExtendedExpression, (0, import_lib3.$E)(DotDotDot)), function($skip, $loc, $0, $1, $2) {
+  var ArgumentPart$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(Expression, (0, import_lib3.$E)(DotDotDot)), function($skip, $loc, $0, $1, $2) {
     var expression = $1;
     var spread = $2;
     return {
@@ -8465,7 +8486,7 @@ ${js}`
   var UnaryBody$1 = ParenthesizedAssignment;
   var UnaryBody$2 = ExpressionizedStatementWithTrailingCallExpressions;
   var UnaryBody$3 = UpdateExpression;
-  var UnaryBody$4 = NestedNonAssignmentExtendedExpression;
+  var UnaryBody$4 = NestedExpressionizedStatement;
   var UnaryBody$$ = [UnaryBody$0, UnaryBody$1, UnaryBody$2, UnaryBody$3, UnaryBody$4];
   function UnaryBody(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "UnaryBody", UnaryBody$$);
@@ -8482,14 +8503,14 @@ ${js}`
   }
   var CoffeeDoBody$0 = ArrowFunction;
   var CoffeeDoBody$1 = (0, import_lib3.$S)(LeftHandSideExpression, (0, import_lib3.$N)((0, import_lib3.$S)(__, AssignmentOpSymbol)));
-  var CoffeeDoBody$2 = ExtendedExpression;
+  var CoffeeDoBody$2 = Expression;
   var CoffeeDoBody$$ = [CoffeeDoBody$0, CoffeeDoBody$1, CoffeeDoBody$2];
   function CoffeeDoBody(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "CoffeeDoBody", CoffeeDoBody$$);
   }
   var UnaryWithoutParenthesizedAssignmentBody$0 = UpdateExpression;
   var UnaryWithoutParenthesizedAssignmentBody$1 = ExpressionizedStatementWithTrailingCallExpressions;
-  var UnaryWithoutParenthesizedAssignmentBody$2 = NestedNonAssignmentExtendedExpression;
+  var UnaryWithoutParenthesizedAssignmentBody$2 = NestedExpressionizedStatement;
   var UnaryWithoutParenthesizedAssignmentBody$$ = [UnaryWithoutParenthesizedAssignmentBody$0, UnaryWithoutParenthesizedAssignmentBody$1, UnaryWithoutParenthesizedAssignmentBody$2];
   function UnaryWithoutParenthesizedAssignmentBody(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "UnaryWithoutParenthesizedAssignmentBody", UnaryWithoutParenthesizedAssignmentBody$$);
@@ -8629,7 +8650,7 @@ ${js}`
   function NonPipelineAssignmentExpressionTail(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "NonPipelineAssignmentExpressionTail", NonPipelineAssignmentExpressionTail$$);
   }
-  var ActualAssignment$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$P)((0, import_lib3.$S)(NotDedented, UpdateExpression, WAssignmentOp)), MaybeNestedExtendedExpression), function($skip, $loc, $0, $1, $2) {
+  var ActualAssignment$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$P)((0, import_lib3.$S)(NotDedented, UpdateExpression, WAssignmentOp)), MaybeNestedExpression), function($skip, $loc, $0, $1, $2) {
     $1 = $1.map((x) => [x[0], x[1], ...x[2]]);
     $0 = [$1, $2];
     return {
@@ -8646,7 +8667,7 @@ ${js}`
   function ActualAssignment(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "ActualAssignment", ActualAssignment$0);
   }
-  var NonPipelineActualAssignment$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$P)((0, import_lib3.$S)(NotDedented, UpdateExpression, WAssignmentOp)), MaybeNestedNonPipelineExtendedExpression), function($skip, $loc, $0, $1, $2) {
+  var NonPipelineActualAssignment$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$P)((0, import_lib3.$S)(NotDedented, UpdateExpression, WAssignmentOp)), MaybeNestedNonPipelineExpression), function($skip, $loc, $0, $1, $2) {
     $1 = $1.map((x) => [x[0], x[1], ...x[2]]);
     $0 = [$1, $2];
     return {
@@ -8663,7 +8684,7 @@ ${js}`
   function NonPipelineActualAssignment(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "NonPipelineActualAssignment", NonPipelineActualAssignment$0);
   }
-  var YieldExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Yield, (0, import_lib3.$E)((0, import_lib3.$S)((0, import_lib3.$E)((0, import_lib3.$S)((0, import_lib3.$E)(_), Star)), MaybeParenNestedExtendedExpression))), function($skip, $loc, $0, $1, $2) {
+  var YieldExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Yield, (0, import_lib3.$E)((0, import_lib3.$S)((0, import_lib3.$E)((0, import_lib3.$S)((0, import_lib3.$E)(_), Star)), MaybeParenNestedExpression))), function($skip, $loc, $0, $1, $2) {
     if ($2) {
       const [star, expression] = $2;
       return {
@@ -8737,7 +8758,7 @@ ${js}`
   function TrailingPostfix(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "TrailingPostfix", TrailingPostfix$0);
   }
-  var FatArrowBody$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$N)(EOS), (0, import_lib3.$N)((0, import_lib3.$S)((0, import_lib3.$E)(_), ExpressionizedStatement)), NonPipelineExtendedExpression, (0, import_lib3.$N)(TrailingDeclaration), (0, import_lib3.$N)(TrailingPipe), (0, import_lib3.$N)(TrailingPostfix), (0, import_lib3.$N)(SemicolonDelimiter)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+  var FatArrowBody$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$N)(EOS), (0, import_lib3.$N)((0, import_lib3.$S)((0, import_lib3.$E)(_), ExpressionizedStatement)), NonPipelineExpression, (0, import_lib3.$N)(TrailingDeclaration), (0, import_lib3.$N)(TrailingPipe), (0, import_lib3.$N)(TrailingPostfix), (0, import_lib3.$N)(SemicolonDelimiter)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
     var exp = $3;
     if (exp.type === "ObjectExpression") {
       exp = makeLeftHandSideExpression(exp);
@@ -8766,15 +8787,15 @@ ${js}`
     return (0, import_lib3.$EVENT)(ctx, state2, "ConditionalExpression", ConditionalExpression$0);
   }
   var TernaryRest$0 = NestedTernaryRest;
-  var TernaryRest$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$N)(CoffeeBinaryExistentialEnabled), (0, import_lib3.$Y)((0, import_lib3.$EXPECT)($R5, "TernaryRest /[ \\t]/")), _, QuestionMark, MaybeNestedExtendedExpression, __, Colon, MaybeNestedExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
+  var TernaryRest$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$N)(CoffeeBinaryExistentialEnabled), (0, import_lib3.$Y)((0, import_lib3.$EXPECT)($R5, "TernaryRest /[ \\t]/")), _, QuestionMark, MaybeNestedExpression, __, Colon, MaybeNestedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
     return $0.slice(2);
   });
   var TernaryRest$$ = [TernaryRest$0, TernaryRest$1];
   function TernaryRest(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "TernaryRest", TernaryRest$$);
   }
-  var NestedTernaryRest$0 = (0, import_lib3.$S)(Nested, QuestionMark, MaybeNestedExtendedExpression, Nested, Colon, MaybeNestedExtendedExpression);
-  var NestedTernaryRest$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$E)((0, import_lib3.$S)(Nested, QuestionMark, MaybeNestedExtendedExpression, Nested, Colon, MaybeNestedExtendedExpression)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
+  var NestedTernaryRest$0 = (0, import_lib3.$S)(Nested, QuestionMark, MaybeNestedExpression, Nested, Colon, MaybeNestedExpression);
+  var NestedTernaryRest$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$E)((0, import_lib3.$S)(Nested, QuestionMark, MaybeNestedExpression, Nested, Colon, MaybeNestedExpression)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
     if ($2)
       return $2;
     return $skip;
@@ -8831,7 +8852,7 @@ ${js}`
   function PipelineExpressionBodySameLine(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "PipelineExpressionBodySameLine", PipelineExpressionBodySameLine$0);
   }
-  var PipelineHeadItem$0 = NonPipelineExtendedExpression;
+  var PipelineHeadItem$0 = NonPipelineExpression;
   var PipelineHeadItem$1 = ParenthesizedExpression;
   var PipelineHeadItem$$ = [PipelineHeadItem$0, PipelineHeadItem$1];
   function PipelineHeadItem(ctx, state2) {
@@ -8935,8 +8956,10 @@ ${js}`
   function Placeholder(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "Placeholder", Placeholder$$);
   }
-  var PlaceholderTypeSuffix$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$Y)((0, import_lib3.$S)((0, import_lib3.$E)(QuestionMark), Colon)), TypeSuffix), function(value) {
-    return value[1];
+  var PlaceholderTypeSuffix$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$E)(QuestionMark), Colon, MaybeNestedTypePrimary), function(value) {
+    var optional = value[0];
+    var t = value[2];
+    return { "type": "TypeSuffix", "ts": true, "optional": optional, "t": t, "children": value };
   });
   function PlaceholderTypeSuffix(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "PlaceholderTypeSuffix", PlaceholderTypeSuffix$0);
@@ -9256,7 +9279,7 @@ ${js}`
         };
     }
   });
-  var FieldDefinition$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(InsertReadonly, ClassElementName, (0, import_lib3.$E)(TypeSuffix), __, ConstAssignment, MaybeNestedExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+  var FieldDefinition$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(InsertReadonly, ClassElementName, (0, import_lib3.$E)(TypeSuffix), __, ConstAssignment, MaybeNestedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
     var r = $1;
     var ca = $5;
     r.children[0].$loc = {
@@ -9559,7 +9582,7 @@ ${js}`
   function MemberBracketContent(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "MemberBracketContent", MemberBracketContent$0);
   }
-  var SliceParameters$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(ExtendedExpression, __, (0, import_lib3.$C)(DotDotDot, DotDot), (0, import_lib3.$E)(ExtendedExpression)), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var SliceParameters$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Expression, __, (0, import_lib3.$C)(DotDotDot, DotDot), (0, import_lib3.$E)(Expression)), function($skip, $loc, $0, $1, $2, $3, $4) {
     var start = $1;
     var ws = $2;
     var sep = $3;
@@ -9583,7 +9606,7 @@ ${js}`
       children
     };
   });
-  var SliceParameters$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, __, (0, import_lib3.$C)(DotDotDot, DotDot), ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var SliceParameters$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, __, (0, import_lib3.$C)(DotDotDot, DotDot), Expression), function($skip, $loc, $0, $1, $2, $3, $4) {
     var l = $1;
     var ws = $2;
     var sep = $3;
@@ -11289,7 +11312,7 @@ ${js}`
   function _ArrayLiteral(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "_ArrayLiteral", _ArrayLiteral$$);
   }
-  var RangeExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(ExtendedExpression, __, (0, import_lib3.$C)(DotDotDot, DotDot), ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var RangeExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Expression, __, (0, import_lib3.$C)(DotDotDot, DotDot), Expression), function($skip, $loc, $0, $1, $2, $3, $4) {
     var s = $1;
     var ws = $2;
     var range = $3;
@@ -11353,7 +11376,7 @@ ${js}`
       end: e
     };
   });
-  var RangeExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(ExtendedExpression, __, DotDot, (0, import_lib3.$Y)((0, import_lib3.$S)(__, CloseBracket))), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var RangeExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(Expression, __, DotDot, (0, import_lib3.$Y)((0, import_lib3.$S)(__, CloseBracket))), function($skip, $loc, $0, $1, $2, $3, $4) {
     var s = $1;
     var ws = $2;
     return {
@@ -11461,7 +11484,7 @@ ${js}`
   var ArrayElementExpression$1 = (0, import_lib3.$T)((0, import_lib3.$S)(ImplicitObjectLiteral, (0, import_lib3.$Y)(ArrayElementDelimiter)), function(value) {
     return value[0];
   });
-  var ArrayElementExpression$2 = (0, import_lib3.$TS)((0, import_lib3.$S)(ExtendedExpression, (0, import_lib3.$E)(_), DotDotDot, (0, import_lib3.$Y)(ArrayElementDelimiter)), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var ArrayElementExpression$2 = (0, import_lib3.$TS)((0, import_lib3.$S)(Expression, (0, import_lib3.$E)(_), DotDotDot, (0, import_lib3.$Y)(ArrayElementDelimiter)), function($skip, $loc, $0, $1, $2, $3, $4) {
     var exp = $1;
     var ws = $2;
     var dots = $3;
@@ -11831,7 +11854,7 @@ ${js}`
       return $skip;
     return prepend(ws, def);
   });
-  var PropertyDefinition$3 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), DotDotDot, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3) {
+  var PropertyDefinition$3 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), DotDotDot, Expression), function($skip, $loc, $0, $1, $2, $3) {
     var ws = $1;
     var dots = $2;
     var exp = $3;
@@ -11927,7 +11950,7 @@ ${js}`
   function NamedProperty(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "NamedProperty", NamedProperty$0);
   }
-  var SnugNamedProperty$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(PropertyName, Colon, MaybeNestedExtendedExpression, (0, import_lib3.$E)((0, import_lib3.$S)((0, import_lib3.$S)((0, import_lib3.$E)(_), PostfixStatement), (0, import_lib3.$Y)((0, import_lib3.$S)(Nested, NamedProperty))))), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var SnugNamedProperty$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(PropertyName, Colon, MaybeNestedExpression, (0, import_lib3.$E)((0, import_lib3.$S)((0, import_lib3.$S)((0, import_lib3.$E)(_), PostfixStatement), (0, import_lib3.$Y)((0, import_lib3.$S)(Nested, NamedProperty))))), function($skip, $loc, $0, $1, $2, $3, $4) {
     var name = $1;
     var colon = $2;
     var expression = $3;
@@ -12789,7 +12812,7 @@ ${js}`
   function PostfixedNoCommaStatement(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "PostfixedNoCommaStatement", PostfixedNoCommaStatement$0);
   }
-  var PostfixedExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(ExtendedExpression, (0, import_lib3.$E)((0, import_lib3.$S)((0, import_lib3.$E)(_), PostfixStatement))), function($skip, $loc, $0, $1, $2) {
+  var PostfixedExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Expression, (0, import_lib3.$E)((0, import_lib3.$S)((0, import_lib3.$E)(_), PostfixStatement))), function($skip, $loc, $0, $1, $2) {
     var expression = $1;
     var post = $2;
     if (post)
@@ -13649,7 +13672,15 @@ ${js}`
     return (0, import_lib3.$EVENT)(ctx, state2, "CatchClause", CatchClause$0);
   }
   var CatchBind$0 = (0, import_lib3.$S)((0, import_lib3.$E)(_), OpenParen, __, CatchParameter, __, CloseParen);
-  var CatchBind$1 = (0, import_lib3.$S)(_, InsertOpenParen, (0, import_lib3.$N)(EOS), CatchParameter, InsertCloseParen);
+  var CatchBind$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(_, InsertOpenParen, (0, import_lib3.$N)(EOS), ForbidIndentedApplication, (0, import_lib3.$E)(CatchParameter), RestoreIndentedApplication, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+    var ws = $1;
+    var open = $2;
+    var param = $5;
+    var close = $7;
+    if (!param)
+      return $skip;
+    return [ws, open, param, close];
+  });
   var CatchBind$$ = [CatchBind$0, CatchBind$1];
   function CatchBind(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "CatchBind", CatchBind$$);
@@ -13695,7 +13726,7 @@ ${js}`
       expression
     };
   });
-  var Condition$3 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, InsertOpenParen, (0, import_lib3.$E)((0, import_lib3.$S)(Nested, ExtendedExpression)), InsertCloseParen, PopIndent), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var Condition$3 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, InsertOpenParen, (0, import_lib3.$E)((0, import_lib3.$S)(Nested, Expression)), InsertCloseParen, PopIndent), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
     var open = $2;
     var expression = $3;
     var close = $4;
@@ -13724,7 +13755,7 @@ ${js}`
   function Condition(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "Condition", Condition$$);
   }
-  var BoundedCondition$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(InsertOpenParen, ExtendedExpression, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3) {
+  var BoundedCondition$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(InsertOpenParen, Expression, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3) {
     var open = $1;
     var expression = $2;
     var close = $3;
@@ -13753,7 +13784,7 @@ ${js}`
   function DeclarationCondition(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "DeclarationCondition", DeclarationCondition$0);
   }
-  var ExpressionWithIndentedApplicationForbidden$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(ForbidIndentedApplication, ForbidNewlineBinaryOp, (0, import_lib3.$E)(ExtendedExpression), RestoreNewlineBinaryOp, RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var ExpressionWithIndentedApplicationForbidden$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(ForbidIndentedApplication, ForbidNewlineBinaryOp, (0, import_lib3.$E)(Expression), RestoreNewlineBinaryOp, RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
     var exp = $3;
     if (exp)
       return exp;
@@ -13771,7 +13802,7 @@ ${js}`
   function SingleLineExpressionWithIndentedApplicationForbidden(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "SingleLineExpressionWithIndentedApplicationForbidden", SingleLineExpressionWithIndentedApplicationForbidden$0);
   }
-  var ExpressionWithObjectApplicationForbidden$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(ForbidBracedApplication, ForbidIndentedApplication, ForbidNewlineBinaryOp, (0, import_lib3.$E)(ExtendedExpression), RestoreNewlineBinaryOp, RestoreBracedApplication, RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+  var ExpressionWithObjectApplicationForbidden$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(ForbidBracedApplication, ForbidIndentedApplication, ForbidNewlineBinaryOp, (0, import_lib3.$E)(Expression), RestoreNewlineBinaryOp, RestoreBracedApplication, RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
     var exp = $4;
     if (exp)
       return exp;
@@ -14007,7 +14038,7 @@ ${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)(_, LabelIdentifier)), (0, import_lib3.$E)((0, import_lib3.$S)(_, With, MaybeNestedExtendedExpression))), function($skip, $loc, $0, $1, $2, $3) {
+  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, MaybeNestedExpression))), function($skip, $loc, $0, $1, $2, $3) {
     const children = [$1];
     if ($2)
       children.push($2);
@@ -14031,7 +14062,7 @@ ${js}`
       children: []
     };
   });
-  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) {
+  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, MaybeNestedExpression))), function($skip, $loc, $0, $1, $2, $3) {
     const children = [$1];
     if ($2)
       children.push($2);
@@ -14049,7 +14080,7 @@ ${js}`
     };
   });
   var KeywordStatement$3 = DebuggerStatement;
-  var KeywordStatement$4 = (0, import_lib3.$T)((0, import_lib3.$S)(Return, (0, import_lib3.$N)((0, import_lib3.$C)((0, import_lib3.$EXPECT)($L16, 'KeywordStatement ":"'), (0, import_lib3.$EXPECT)($L7, 'KeywordStatement "."'), AfterReturnShorthand)), (0, import_lib3.$E)(MaybeParenNestedExtendedExpression)), function(value) {
+  var KeywordStatement$4 = (0, import_lib3.$T)((0, import_lib3.$S)(Return, (0, import_lib3.$N)((0, import_lib3.$C)((0, import_lib3.$EXPECT)($L16, 'KeywordStatement ":"'), (0, import_lib3.$EXPECT)($L7, 'KeywordStatement "."'), AfterReturnShorthand)), (0, import_lib3.$E)(MaybeParenNestedExpression)), function(value) {
     var expression = value[2];
     return { "type": "ReturnStatement", "expression": expression, "children": value };
   });
@@ -14064,7 +14095,7 @@ ${js}`
   function DebuggerStatement(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "DebuggerStatement", DebuggerStatement$0);
   }
-  var ThrowStatement$0 = (0, import_lib3.$T)((0, import_lib3.$S)(Throw, MaybeParenNestedExtendedExpression), function(value) {
+  var ThrowStatement$0 = (0, import_lib3.$T)((0, import_lib3.$S)(Throw, MaybeParenNestedExpression), function(value) {
     return { "type": "ThrowStatement", "children": value };
   });
   function ThrowStatement(ctx, state2) {
@@ -14088,16 +14119,16 @@ ${js}`
   function Debugger(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "Debugger", Debugger$0);
   }
-  var MaybeNestedNonPipelineExtendedExpression$0 = NestedBulletedArray;
-  var MaybeNestedNonPipelineExtendedExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$E)((0, import_lib3.$S)(Nested, NonPipelineExtendedExpression)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
+  var MaybeNestedNonPipelineExpression$0 = NestedBulletedArray;
+  var MaybeNestedNonPipelineExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$E)((0, import_lib3.$S)(Nested, NonPipelineExpression)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
     if ($3)
       return $3;
     return $skip;
   });
-  var MaybeNestedNonPipelineExtendedExpression$2 = NonPipelineExtendedExpression;
-  var MaybeNestedNonPipelineExtendedExpression$$ = [MaybeNestedNonPipelineExtendedExpression$0, MaybeNestedNonPipelineExtendedExpression$1, MaybeNestedNonPipelineExtendedExpression$2];
-  function MaybeNestedNonPipelineExtendedExpression(ctx, state2) {
-    return (0, import_lib3.$EVENT_C)(ctx, state2, "MaybeNestedNonPipelineExtendedExpression", MaybeNestedNonPipelineExtendedExpression$$);
+  var MaybeNestedNonPipelineExpression$2 = NonPipelineExpression;
+  var MaybeNestedNonPipelineExpression$$ = [MaybeNestedNonPipelineExpression$0, MaybeNestedNonPipelineExpression$1, MaybeNestedNonPipelineExpression$2];
+  function MaybeNestedNonPipelineExpression(ctx, state2) {
+    return (0, import_lib3.$EVENT_C)(ctx, state2, "MaybeNestedNonPipelineExpression", MaybeNestedNonPipelineExpression$$);
   }
   var MaybeNestedPostfixedExpression$0 = NestedBulletedArray;
   var MaybeNestedPostfixedExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$E)((0, import_lib3.$S)(Nested, PostfixedExpression)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
@@ -14110,42 +14141,42 @@ ${js}`
   function MaybeNestedPostfixedExpression(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "MaybeNestedPostfixedExpression", MaybeNestedPostfixedExpression$$);
   }
-  var MaybeNestedExtendedExpression$0 = NestedBulletedArray;
-  var MaybeNestedExtendedExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$E)((0, import_lib3.$S)(Nested, ExtendedExpression)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
+  var MaybeNestedExpression$0 = NestedBulletedArray;
+  var MaybeNestedExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$E)((0, import_lib3.$S)(Nested, Expression)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
     if ($3)
       return $3;
     return $skip;
   });
-  var MaybeNestedExtendedExpression$2 = ExtendedExpression;
-  var MaybeNestedExtendedExpression$$ = [MaybeNestedExtendedExpression$0, MaybeNestedExtendedExpression$1, MaybeNestedExtendedExpression$2];
-  function MaybeNestedExtendedExpression(ctx, state2) {
-    return (0, import_lib3.$EVENT_C)(ctx, state2, "MaybeNestedExtendedExpression", MaybeNestedExtendedExpression$$);
+  var MaybeNestedExpression$2 = Expression;
+  var MaybeNestedExpression$$ = [MaybeNestedExpression$0, MaybeNestedExpression$1, MaybeNestedExpression$2];
+  function MaybeNestedExpression(ctx, state2) {
+    return (0, import_lib3.$EVENT_C)(ctx, state2, "MaybeNestedExpression", MaybeNestedExpression$$);
   }
-  var NestedExtendedExpression$0 = NestedBulletedArray;
-  var NestedExtendedExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$E)((0, import_lib3.$S)(Nested, ExtendedExpression)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
+  var NestedExpression$0 = NestedBulletedArray;
+  var NestedExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$E)((0, import_lib3.$S)(Nested, Expression)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
     if ($3)
       return $3;
     return $skip;
   });
-  var NestedExtendedExpression$$ = [NestedExtendedExpression$0, NestedExtendedExpression$1];
-  function NestedExtendedExpression(ctx, state2) {
-    return (0, import_lib3.$EVENT_C)(ctx, state2, "NestedExtendedExpression", NestedExtendedExpression$$);
+  var NestedExpression$$ = [NestedExpression$0, NestedExpression$1];
+  function NestedExpression(ctx, state2) {
+    return (0, import_lib3.$EVENT_C)(ctx, state2, "NestedExpression", NestedExpression$$);
   }
-  var MaybeParenNestedExtendedExpression$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$N)(EOS), ExtendedExpression), function(value) {
+  var MaybeParenNestedExpression$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$N)(EOS), Expression), function(value) {
     return value[1];
   });
-  var MaybeParenNestedExtendedExpression$1 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$Y)(EOS), (0, import_lib3.$C)(ArrayLiteral, ObjectLiteral)), function(value) {
+  var MaybeParenNestedExpression$1 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$Y)(EOS), (0, import_lib3.$C)(ArrayLiteral, ObjectLiteral)), function(value) {
     return value[1];
   });
-  var MaybeParenNestedExtendedExpression$2 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$Y)(EOS), InsertSpace, InsertOpenParen, PushIndent, (0, import_lib3.$S)(Nested, ExtendedExpression), PopIndent, InsertNewline, InsertIndent, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+  var MaybeParenNestedExpression$2 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$Y)(EOS), InsertSpace, InsertOpenParen, PushIndent, (0, import_lib3.$S)(Nested, Expression), PopIndent, InsertNewline, InsertIndent, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
     var exp = $5;
     if (!exp)
       return $skip;
     return $0.slice(1);
   });
-  var MaybeParenNestedExtendedExpression$$ = [MaybeParenNestedExtendedExpression$0, MaybeParenNestedExtendedExpression$1, MaybeParenNestedExtendedExpression$2];
-  function MaybeParenNestedExtendedExpression(ctx, state2) {
-    return (0, import_lib3.$EVENT_C)(ctx, state2, "MaybeParenNestedExtendedExpression", MaybeParenNestedExtendedExpression$$);
+  var MaybeParenNestedExpression$$ = [MaybeParenNestedExpression$0, MaybeParenNestedExpression$1, MaybeParenNestedExpression$2];
+  function MaybeParenNestedExpression(ctx, state2) {
+    return (0, import_lib3.$EVENT_C)(ctx, state2, "MaybeParenNestedExpression", MaybeParenNestedExpression$$);
   }
   var ImportDeclaration$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Import, _, Identifier, (0, import_lib3.$E)(_), Equals, __, (0, import_lib3.$EXPECT)($L123, 'ImportDeclaration "require"'), NonIdContinue, Arguments), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
     const imp = [
@@ -14442,7 +14473,7 @@ ${js}`
   function ImportedBinding(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "ImportedBinding", ImportedBinding$0);
   }
-  var ExportDeclaration$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Export, (0, import_lib3.$E)(_), Equals, MaybeNestedExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var ExportDeclaration$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Export, (0, import_lib3.$E)(_), Equals, MaybeNestedExpression), function($skip, $loc, $0, $1, $2, $3, $4) {
     const exp = [
       { ...$1, ts: true },
       { ...$1, token: "module.exports", js: true }
@@ -14479,7 +14510,7 @@ ${js}`
       }
     ];
   });
-  var ExportDeclaration$2 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(Decorators), Export, __, Default, __, (0, import_lib3.$C)(HoistableDeclaration, ClassDeclaration, InterfaceDeclaration, MaybeNestedExtendedExpression)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+  var ExportDeclaration$2 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(Decorators), Export, __, Default, __, (0, import_lib3.$C)(HoistableDeclaration, ClassDeclaration, InterfaceDeclaration, MaybeNestedExpression)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
     var declaration = $6;
     return { type: "ExportDeclaration", declaration, ts: declaration.ts, children: $0 };
   });
@@ -14659,7 +14690,7 @@ ${js}`
   function LexicalBinding(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "LexicalBinding", LexicalBinding$$);
   }
-  var Initializer$0 = (0, import_lib3.$T)((0, import_lib3.$S)(__, Equals, MaybeNestedExtendedExpression), function(value) {
+  var Initializer$0 = (0, import_lib3.$T)((0, import_lib3.$S)(__, Equals, MaybeNestedExpression), function(value) {
     var expression = value[2];
     return { "type": "Initializer", "expression": expression, "children": value };
   });
@@ -16990,7 +17021,7 @@ ${js}`
   function NestedEnumPropertyLine(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "NestedEnumPropertyLine", NestedEnumPropertyLine$0);
   }
-  var EnumProperty$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Identifier, (0, import_lib3.$E)((0, import_lib3.$S)(__, Equals, MaybeNestedExtendedExpression)), ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3) {
+  var EnumProperty$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Identifier, (0, import_lib3.$E)((0, import_lib3.$S)(__, Equals, MaybeNestedExpression)), ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3) {
     var name = $1;
     var initializer = $2;
     return {
@@ -17055,6 +17086,19 @@ ${js}`
   function MaybeNestedType(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "MaybeNestedType", MaybeNestedType$$);
   }
+  var MaybeNestedTypePrimary$0 = NestedTypeBulletedTuple;
+  var MaybeNestedTypePrimary$1 = NestedInterfaceBlock;
+  var MaybeNestedTypePrimary$2 = NestedTypeBinaryChain;
+  var MaybeNestedTypePrimary$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 MaybeNestedTypePrimary$4 = TypePrimary;
+  var MaybeNestedTypePrimary$$ = [MaybeNestedTypePrimary$0, MaybeNestedTypePrimary$1, MaybeNestedTypePrimary$2, MaybeNestedTypePrimary$3, MaybeNestedTypePrimary$4];
+  function MaybeNestedTypePrimary(ctx, state2) {
+    return (0, import_lib3.$EVENT_C)(ctx, state2, "MaybeNestedTypePrimary", MaybeNestedTypePrimary$$);
+  }
   var ReturnTypeSuffix$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), (0, import_lib3.$E)(QuestionMark), (0, import_lib3.$E)(_), Colon, ReturnType), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
     var optional = $2;
     var t = $5;
@@ -17762,7 +17806,7 @@ ${js}`
   function TypeParameters(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "TypeParameters", TypeParameters$0);
   }
-  var TypeParameter$0 = (0, import_lib3.$S)(__, (0, import_lib3.$E)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L173, 'TypeParameter "const"'), (0, import_lib3.$E)(_))), Identifier, (0, import_lib3.$E)(TypeConstraint), (0, import_lib3.$E)(TypeInitializer), TypeParameterDelimiter);
+  var TypeParameter$0 = (0, import_lib3.$S)(__, (0, import_lib3.$Q)((0, import_lib3.$S)((0, import_lib3.$R$0)((0, import_lib3.$EXPECT)($R91, "TypeParameter /const|in|out/")), _)), Identifier, (0, import_lib3.$E)(TypeConstraint), (0, import_lib3.$E)(TypeInitializer), TypeParameterDelimiter);
   function TypeParameter(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "TypeParameter", TypeParameter$0);
   }
@@ -17789,15 +17833,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)($R91, "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)($R92, "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)($R92, "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;
   });
@@ -17805,7 +17849,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)($R93, "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",
@@ -17816,7 +17860,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)($R94, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([\\p{ID_Continue}.,+-]*))?/"), 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*([\\p{ID_Continue}.,+-]*))?/"), 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();
@@ -17838,11 +17882,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)($R92, "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)($R95, "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);
   }
@@ -17858,13 +17902,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)($R96, "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)($R97, "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) {
@@ -18264,7 +18308,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)($R98, "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);
   }