@makano/rew 1.3.1 → 1.3.3

package/lib/civet/main.js

@@ -58,7 +58,7 @@ var require_machine = __commonJS({
       $EVENT: () => $EVENT2,
       $EVENT_C: () => $EVENT_C2,
       $EXPECT: () => $EXPECT2,
-      $L: () => $L229,
+      $L: () => $L231,
       $N: () => $N2,
       $P: () => $P2,
       $Q: () => $Q2,
@@ -83,7 +83,7 @@ var require_machine = __commonJS({
         return result;
       };
     }
-    function $L229(str) {
+    function $L231(str) {
       return function(_ctx, state2) {
         const { input, pos } = state2, { length } = str, end = pos + length;
         if (input.substring(pos, end) === str) {
@@ -438,11 +438,11 @@ ${input.slice(result.pos)}
             hint = JSON.stringify(hint);
           else
             hint = "EOF";
-//           const error = new ParseError2("Failed to parse", `Expected:
-// 	${expectations.join("\n	")}
-// Found: ${hint}
-// `, filename2, line, column, maxFailPos);
-          throw new SyntaxError(`Unexpected Token at ${filename2}:${line}:${column}.\nFound: ${hint}\nExpected: ${expectations.join("\n	")}`);
+          const error = new ParseError2("Failed to parse", `Expected:
+	${expectations.join("\n	")}
+Found: ${hint}
+`, filename2, line, column, maxFailPos);
+          throw error;
         }
         if (result) {
           throw new Error(`
@@ -515,6 +515,7 @@ __export(lib_exports, {
   blockWithPrefix: () => blockWithPrefix,
   convertNamedImportsToObject: () => convertNamedImportsToObject,
   convertObjectToJSXAttributes: () => convertObjectToJSXAttributes,
+  convertWithClause: () => convertWithClause,
   dedentBlockString: () => dedentBlockString,
   dedentBlockSubstitutions: () => dedentBlockSubstitutions,
   deepCopy: () => deepCopy,
@@ -566,6 +567,7 @@ __export(lib_exports, {
   replaceNode: () => replaceNode,
   replaceNodes: () => replaceNodes,
   skipImplicitArguments: () => skipImplicitArguments,
+  trimFirstSpace: () => trimFirstSpace,
   typeOfJSX: () => typeOfJSX,
   wrapIIFE: () => wrapIIFE
 });
@@ -1708,8 +1710,11 @@ function isEmptyBareBlock(node) {
   return bare && (Array.isArray(expressions) && len(expressions, 0) || Array.isArray(expressions) && len(expressions, 1) && Array.isArray(expressions[0]) && expressions[0].length >= 2 && typeof expressions[0][1] === "object" && expressions[0][1] != null && "type" in expressions[0][1] && expressions[0][1].type === "EmptyStatement");
 }
 function isFunction(node) {
-  const { type } = node;
-  return type === "FunctionExpression" || type === "ArrowFunction" || type === "MethodDefinition" || !!node.async;
+  if (node && typeof node === "object" && "type" in node) {
+    const { type } = node;
+    return type === "FunctionExpression" || type === "ArrowFunction" || type === "MethodDefinition";
+  }
+  return false;
 }
 var statementTypes = /* @__PURE__ */ new Set([
   "BlockStatement",
@@ -1808,10 +1813,15 @@ function insertTrimmingSpace(target, c) {
       ...target,
       token: target.token.replace(/^ ?/, c)
     };
+  } else if (typeof target === "string") {
+    return target.replace(/^ ?/, c);
   } else {
     return target;
   }
 }
+function trimFirstSpace(target) {
+  return insertTrimmingSpace(target, "");
+}
 function inplaceInsertTrimmingSpace(target, c) {
   if (!(target != null)) {
     return target;
@@ -2232,7 +2242,11 @@ function gatherNodes(node, predicate) {
       });
     }
     default: {
-      return gatherNodes(node.children, predicate);
+      return gatherNodes(
+        //@ts-ignore
+        node.children,
+        predicate
+      );
     }
   }
 }
@@ -2243,12 +2257,18 @@ function gatherRecursive(node, predicate, skipPredicate) {
   if (Array.isArray(node)) {
     return node.flatMap(($) => gatherRecursive($, predicate, skipPredicate));
   }
-  if (skipPredicate?.(node))
+  if (skipPredicate?.(node)) {
     return [];
+  }
   if (predicate(node)) {
     return [node];
   }
-  return gatherRecursive(node.children, predicate, skipPredicate);
+  return gatherRecursive(
+    //@ts-ignore
+    node.children,
+    predicate,
+    skipPredicate
+  );
 }
 function gatherRecursiveAll(node, predicate) {
   if (node == null || typeof node === "string") {
@@ -2257,7 +2277,11 @@ function gatherRecursiveAll(node, predicate) {
   if (Array.isArray(node)) {
     return node.flatMap((n) => gatherRecursiveAll(n, predicate));
   }
-  const nodes = gatherRecursiveAll(node.children, predicate);
+  const nodes = gatherRecursiveAll(
+    //@ts-ignore
+    node.children,
+    predicate
+  );
   if (predicate(node)) {
     nodes.push(node);
   }
@@ -2670,15 +2694,6 @@ var declareHelper = {
       ";\n"
     ]]);
   },
-  returnSymbol(ref) {
-    state.prelude.push(["", [
-      // [indent, statement]
-      preludeVar,
-      ref,
-      ` = Symbol("return")';
-`
-    ]]);
-  },
   concatAssign(ref) {
     state.prelude.push(["", [
       // [indent, statement]
@@ -3625,6 +3640,39 @@ function dynamizeImportDeclarationExpression($0) {
     ]
   });
 }
+function convertWithClause(withClause, extendsClause) {
+  let extendsToken, extendsTarget, ws;
+  if (extendsClause) {
+    [extendsToken, ws, extendsTarget] = extendsClause;
+  } else {
+    extendsToken = {
+      type: "Extends",
+      children: [" extends"]
+    };
+    ws = "";
+    extendsTarget = "Object";
+  }
+  const wrapped = withClause.targets.reduce(
+    (extendsTarget2, [wsNext, withTarget]) => {
+      const args = [extendsTarget2];
+      const exp = {
+        type: "CallExpression",
+        children: [
+          makeLeftHandSideExpression(withTarget),
+          {
+            type: "Call",
+            args,
+            children: ["(", trimFirstSpace(ws), args, ")"]
+          }
+        ]
+      };
+      ws = wsNext;
+      return exp;
+    },
+    extendsTarget
+  );
+  return [extendsToken, insertTrimmingSpace(ws, " "), wrapped];
+}
 
 // source/parser/unary.civet
 function processUnaryExpression(pre, exp, post) {
@@ -4712,7 +4760,7 @@ function getIndentOfBlockString(str, tab) {
       minLevel = level;
     }
   }
-  if (minLevel == Infinity) {
+  if (minLevel === Infinity) {
     minLevel = 0;
   }
   return minLevel;
@@ -4758,7 +4806,7 @@ function dedentBlockSubstitutions($0, tab) {
   if (/^[ \t]*\r?\n/.test(stringPart)) {
     ref1 = getIndentOfBlockString(stringPart, tab);
   } else {
-    ref1 = false;
+    ref1 = void 0;
   }
   ;
   const dedent = ref1;
@@ -4784,21 +4832,39 @@ function dedentBlockSubstitutions($0, tab) {
   };
 }
 function processCoffeeInterpolation(s, parts, e, $loc) {
-  if (parts.length === 0 || parts.length === 1 && parts[0].token != null) {
+  if (parts.length === 0) {
     return {
       type: "StringLiteral",
-      token: parts.length ? `"${modifyString(parts[0].token)}"` : '""',
+      token: '""',
       $loc
     };
   }
-  parts.forEach((part) => {
-    if (part.token) {
-      const str = part.token.replace(/(`|\$\{)/g, "\\$1");
-      return part.token = modifyString(str);
+  if (parts.length === 1) {
+    let ref2;
+    if ((ref2 = parts[0]) && typeof ref2 === "object" && "token" in ref2) {
+      const { token } = ref2;
+      return {
+        type: "StringLiteral",
+        token: `"${modifyString(token)}"`,
+        $loc
+      };
     }
-    ;
-    return;
-  });
+  }
+  const results2 = [];
+  for (let i4 = 0, len3 = parts.length; i4 < len3; i4++) {
+    const part = parts[i4];
+    if ("token" in part) {
+      const token = modifyString(part.token.replace(/(`|\$\{)/g, "\\$1"));
+      results2.push({
+        ...part,
+        token
+      });
+    } else {
+      results2.push(part);
+    }
+  }
+  ;
+  parts = results2;
   s.token = e.token = "`";
   return {
     type: "TemplateLiteral",
@@ -5565,6 +5631,7 @@ function processAssignments(statements) {
           }
         }
       }
+      const refsToDeclare = /* @__PURE__ */ new Set();
       i = len3 - 1;
       while (i >= 0) {
         const lastAssignment = $1[i];
@@ -5598,6 +5665,7 @@ function processAssignments(statements) {
             }
           } else if (m2 = lhs.type, m2 === "ObjectBindingPattern" || m2 === "ArrayBindingPattern") {
             processBindingPatternLHS(lhs, tail);
+            gatherRecursiveAll(lhs, ($5) => $5.type === "Ref").forEach(refsToDeclare.add.bind(refsToDeclare));
           }
         }
         i--;
@@ -5628,6 +5696,17 @@ function processAssignments(statements) {
         }
         i--;
       }
+      if (refsToDeclare.size) {
+        if (exp.hoistDec) {
+          exp.hoistDec.children.push([...refsToDeclare].map(($6) => [",", $6]));
+        } else {
+          exp.hoistDec = {
+            type: "Declaration",
+            children: ["let ", [...refsToDeclare].map((r, i2) => i2 ? [",", r] : r)],
+            names: []
+          };
+        }
+      }
       exp.names = $1.flatMap(([, l]) => l.names || []);
       if (tail.length) {
         const index = exp.children.indexOf($2);
@@ -5764,7 +5843,7 @@ function processTypes(node) {
   });
 }
 function processStatementExpressions(statements) {
-  gatherRecursiveAll(statements, ($5) => $5.type === "StatementExpression").forEach((_exp) => {
+  gatherRecursiveAll(statements, ($7) => $7.type === "StatementExpression").forEach((_exp) => {
     const exp = _exp;
     const { statement } = exp;
     let ref11;
@@ -5894,11 +5973,11 @@ function populateRefs(statements) {
 function processPlaceholders(statements) {
   const placeholderMap = /* @__PURE__ */ new Map();
   const liftedIfs = /* @__PURE__ */ new Set();
-  gatherRecursiveAll(statements, ($6) => $6.type === "Placeholder").forEach((_exp) => {
+  gatherRecursiveAll(statements, ($8) => $8.type === "Placeholder").forEach((_exp) => {
     const exp = _exp;
     let ancestor;
     if (exp.subtype === ".") {
-      ({ ancestor } = findAncestor(exp, ($7) => $7.type === "Call"));
+      ({ ancestor } = findAncestor(exp, ($9) => $9.type === "Call"));
       ancestor = ancestor?.parent;
       while (ancestor?.parent?.type === "UnaryExpression" || ancestor?.parent?.type === "NewExpression") {
         ancestor = ancestor.parent;
@@ -6293,6 +6372,7 @@ var grammar = {
   ClassBinding,
   ClassHeritage,
   ExtendsClause,
+  WithClause,
   ExtendsToken,
   ExtendsShorthand,
   NotExtendsToken,
@@ -6570,7 +6650,10 @@ var grammar = {
   Break,
   Continue,
   Debugger,
-  MaybeNestedExpression,
+  MaybeNestedNonPipelineExtendedExpression,
+  MaybeNestedPostfixedExpression,
+  MaybeNestedExtendedExpression,
+  MaybeParenNestedExtendedExpression,
   ImportDeclaration,
   ImpliedImport,
   ImportClause,
@@ -6759,6 +6842,7 @@ var grammar = {
   Void,
   When,
   While,
+  With,
   Yield,
   JSXImplicitFragment,
   JSXTag,
@@ -6826,6 +6910,7 @@ var grammar = {
   Module,
   Namespace,
   InterfaceBlock,
+  NestedInterfaceBlock,
   NestedInterfaceProperties,
   NestedInterfaceProperty,
   InterfaceProperty,
@@ -6847,7 +6932,7 @@ var grammar = {
   TypeIndexSignature,
   TypeIndex,
   TypeSuffix,
-  MaybeIndentedType,
+  MaybeNestedType,
   ReturnTypeSuffix,
   ReturnType,
   TypePredicate,
@@ -6967,15 +7052,15 @@ var $L13 = (0, import_lib3.$L)("=>");
 var $L14 = (0, import_lib3.$L)("\u21D2");
 var $L15 = (0, import_lib3.$L)("import");
 var $L16 = (0, import_lib3.$L)(":");
-var $L17 = (0, import_lib3.$L)(" ");
-var $L18 = (0, import_lib3.$L)("<");
-var $L19 = (0, import_lib3.$L)("implements");
-var $L20 = (0, import_lib3.$L)("<:");
-var $L21 = (0, import_lib3.$L)("^");
-var $L22 = (0, import_lib3.$L)("-");
-var $L23 = (0, import_lib3.$L)("import.meta");
-var $L24 = (0, import_lib3.$L)("return.value");
-var $L25 = (0, import_lib3.$L)(",");
+var $L17 = (0, import_lib3.$L)(",");
+var $L18 = (0, import_lib3.$L)(" ");
+var $L19 = (0, import_lib3.$L)("<");
+var $L20 = (0, import_lib3.$L)("implements");
+var $L21 = (0, import_lib3.$L)("<:");
+var $L22 = (0, import_lib3.$L)("^");
+var $L23 = (0, import_lib3.$L)("-");
+var $L24 = (0, import_lib3.$L)("import.meta");
+var $L25 = (0, import_lib3.$L)("return.value");
 var $L26 = (0, import_lib3.$L)("tighter");
 var $L27 = (0, import_lib3.$L)("looser");
 var $L28 = (0, import_lib3.$L)("same");
@@ -7014,8 +7099,8 @@ var $L60 = (0, import_lib3.$L)("??=");
 var $L61 = (0, import_lib3.$L)("?=");
 var $L62 = (0, import_lib3.$L)("and=");
 var $L63 = (0, import_lib3.$L)("or=");
-var $L64 = (0, import_lib3.$L)("**");
-var $L65 = (0, import_lib3.$L)("*");
+var $L64 = (0, import_lib3.$L)("*");
+var $L65 = (0, import_lib3.$L)("**");
 var $L66 = (0, import_lib3.$L)("/");
 var $L67 = (0, import_lib3.$L)("%%");
 var $L68 = (0, import_lib3.$L)("%");
@@ -7177,8 +7262,10 @@ var $L223 = (0, import_lib3.$L)("namespace");
 var $L224 = (0, import_lib3.$L)("asserts");
 var $L225 = (0, import_lib3.$L)("keyof");
 var $L226 = (0, import_lib3.$L)("???");
-var $L227 = (0, import_lib3.$L)("[]");
-var $L228 = (0, import_lib3.$L)("civet");
+var $L227 = (0, import_lib3.$L)("unique");
+var $L228 = (0, import_lib3.$L)("symbol");
+var $L229 = (0, import_lib3.$L)("[]");
+var $L230 = (0, import_lib3.$L)("civet");
 var $R0 = (0, import_lib3.$R)(new RegExp("(?=async|debugger|if|unless|comptime|do|for|loop|until|while|switch|throw|try)", "suy"));
 var $R1 = (0, import_lib3.$R)(new RegExp("&(?=\\s)", "suy"));
 var $R2 = (0, import_lib3.$R)(new RegExp("(as|of|satisfies|then|when|implements|xor|xnor)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
@@ -7199,7 +7286,7 @@ var $R16 = (0, import_lib3.$R)(new RegExp("(?=\\p{ID_Start}|[_$])", "suy"));
 var $R17 = (0, import_lib3.$R)(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$])*", "suy"));
 var $R18 = (0, import_lib3.$R)(new RegExp("(?=\\[)", "suy"));
 var $R19 = (0, import_lib3.$R)(new RegExp("[!+-]?", "suy"));
-var $R20 = (0, import_lib3.$R)(new RegExp("(?=\\p{ID_Start}|[_$^\xAB\xBB\u22D9\u2264\u2265\u2208\u220B\u2209\u220C\u2263\u2261\u2262\u2260=\u2016\u2047&|*\\/!?%<>\u29FA+-])", "suy"));
+var $R20 = (0, import_lib3.$R)(new RegExp("(?=\\p{ID_Start}|[_$^\xAB\xBB\u22D9\u2264\u2265\u2208\u220B\u2209\u220C\u2263\u2261\u2262\u2260=\u2A76\u2A75\u2016\u2047&|*\\/!?%<>\u29FA+-])", "suy"));
 var $R21 = (0, import_lib3.$R)(new RegExp("!\\^\\^?", "suy"));
 var $R22 = (0, import_lib3.$R)(new RegExp("(?!\\+\\+|--)[!~+-](?!\\s)", "suy"));
 var $R23 = (0, import_lib3.$R)(new RegExp("[:.]", "suy"));
@@ -7592,23 +7679,28 @@ var ArgumentList$$ = [ArgumentList$0, ArgumentList$1, ArgumentList$2, ArgumentLi
 function ArgumentList(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "ArgumentList", ArgumentList$$);
 }
-var NonPipelineArgumentList$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(NonPipelineArgumentPart, (0, import_lib3.$Q)((0, import_lib3.$S)(CommaDelimiter, (0, import_lib3.$N)(EOS), (0, import_lib3.$E)(_), NonPipelineArgumentPart)), (0, import_lib3.$P)((0, import_lib3.$S)(CommaDelimiter, (0, import_lib3.$C)(NestedImplicitObjectLiteral, NestedArgumentList)))), function($skip, $loc, $0, $1, $2, $3) {
+var NonPipelineArgumentList$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$N)(EOS), NonPipelineArgumentPart, (0, import_lib3.$Q)((0, import_lib3.$S)(CommaDelimiter, (0, import_lib3.$N)(EOS), (0, import_lib3.$E)(_), NonPipelineArgumentPart)), (0, import_lib3.$P)((0, import_lib3.$S)(CommaDelimiter, (0, import_lib3.$C)(NestedImplicitObjectLiteral, NestedArgumentList)))), function($skip, $loc, $0, $1, $2, $3, $4) {
   return [
-    $1,
-    ...$2.flatMap(([comma, eos, ws, arg]) => [comma, prepend(ws, arg)]),
-    ...$3.flatMap(
+    $2,
+    ...$3.flatMap(([comma, eos, ws, arg]) => [comma, prepend(ws, arg)]),
+    ...$4.flatMap(
       ([comma, args]) => Array.isArray(args) ? [comma, ...args] : [comma, args]
     )
   ];
 });
-var NonPipelineArgumentList$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(NestedImplicitObjectLiteral), function($skip, $loc, $0, $1) {
-  return [insertTrimmingSpace($1, "")];
+var NonPipelineArgumentList$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(NestedImplicitObjectLiteral, (0, import_lib3.$Q)((0, import_lib3.$S)(CommaDelimiter, (0, import_lib3.$C)(NestedImplicitObjectLiteral, NestedArgumentList)))), function($skip, $loc, $0, $1, $2) {
+  return [
+    insertTrimmingSpace($1, ""),
+    ...$2.flatMap(
+      ([comma, args]) => Array.isArray(args) ? [comma, ...args] : [comma, args]
+    )
+  ];
 });
 var NonPipelineArgumentList$2 = NestedArgumentList;
-var NonPipelineArgumentList$3 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), NonPipelineArgumentPart, (0, import_lib3.$Q)((0, import_lib3.$S)(CommaDelimiter, (0, import_lib3.$E)(_), NonPipelineArgumentPart))), function($skip, $loc, $0, $1, $2, $3) {
+var NonPipelineArgumentList$3 = (0, import_lib3.$TS)((0, import_lib3.$S)(NonPipelineArgumentPart, (0, import_lib3.$Q)((0, import_lib3.$S)(CommaDelimiter, (0, import_lib3.$E)(_), NonPipelineArgumentPart))), function($skip, $loc, $0, $1, $2) {
   return [
-    prepend($1, $2),
-    ...$3.flatMap(([comma, ws, arg]) => [comma, prepend(ws, arg)])
+    $1,
+    ...$2.flatMap(([comma, ws, arg]) => [comma, prepend(ws, arg)])
   ];
 });
 var NonPipelineArgumentList$$ = [NonPipelineArgumentList$0, NonPipelineArgumentList$1, NonPipelineArgumentList$2, NonPipelineArgumentList$3];
@@ -7671,7 +7763,7 @@ var BinaryOpExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(UnaryExpress
 function BinaryOpExpression(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "BinaryOpExpression", BinaryOpExpression$0);
 }
-var BinaryOpRHS$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$C)((0, import_lib3.$E)(_), IndentedFurther, Nested), IsLike, (0, import_lib3.$E)(_), PatternExpressionList), function($skip, $loc, $0, $1, $2, $3, $4) {
+var BinaryOpRHS$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(NotDedented, IsLike, (0, import_lib3.$E)(_), PatternExpressionList), function($skip, $loc, $0, $1, $2, $3, $4) {
   var ws1 = $1;
   var op = $2;
   var ws2 = $3;
@@ -7695,7 +7787,7 @@ var BinaryOpRHS$$ = [BinaryOpRHS$0, BinaryOpRHS$1, BinaryOpRHS$2, BinaryOpRHS$3]
 function BinaryOpRHS(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "BinaryOpRHS", BinaryOpRHS$$);
 }
-var IsLike$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Is, (0, import_lib3.$E)(_), (0, import_lib3.$E)((0, import_lib3.$S)(Not, (0, import_lib3.$E)(_))), Like), function($skip, $loc, $0, $1, $2, $3, $4) {
+var IsLike$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Is, (0, import_lib3.$E)(_), (0, import_lib3.$E)((0, import_lib3.$S)(OmittedNegation, (0, import_lib3.$E)(_))), Like), function($skip, $loc, $0, $1, $2, $3, $4) {
   var not = $3;
   return {
     type: "PatternTest",
@@ -7707,18 +7799,18 @@ var IsLike$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Is, (0, import_lib3.$E)(
 function IsLike(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "IsLike", IsLike$0);
 }
-var WRHS$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$E)((0, import_lib3.$S)(Nested, RHS)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
+var WRHS$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$E)((0, import_lib3.$S)((0, import_lib3.$S)(Nested, (0, import_lib3.$E)(_)), RHS)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
   var wrhs = $2;
   if (!wrhs)
     return $skip;
   return wrhs;
 });
-var WRHS$1 = (0, import_lib3.$S)((0, import_lib3.$C)(_, (0, import_lib3.$S)(EOS, __)), RHS);
+var WRHS$1 = (0, import_lib3.$S)((0, import_lib3.$C)((0, import_lib3.$S)(EOS, __), _), RHS);
 var WRHS$$ = [WRHS$0, WRHS$1];
 function WRHS(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "WRHS", WRHS$$);
 }
-var SingleLineBinaryOpRHS$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), BinaryOp, (0, import_lib3.$C)(_, (0, import_lib3.$S)(EOS, __)), RHS), function($skip, $loc, $0, $1, $2, $3, $4) {
+var SingleLineBinaryOpRHS$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), BinaryOp, (0, import_lib3.$C)((0, import_lib3.$S)(EOS, __), _), RHS), function($skip, $loc, $0, $1, $2, $3, $4) {
   var ws1 = $1;
   var op = $2;
   var ws2 = $3;
@@ -7908,7 +8000,7 @@ var NonPipelineAssignmentExpressionTail$$ = [NonPipelineAssignmentExpressionTail
 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)), ExtendedExpression), 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)), MaybeNestedExtendedExpression), function($skip, $loc, $0, $1, $2) {
   $1 = $1.map((x) => [x[0], x[1], ...x[2]]);
   $0 = [$1, $2];
   return {
@@ -7925,7 +8017,7 @@ var ActualAssignment$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib
 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)), NonPipelineExtendedExpression), 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)), MaybeNestedNonPipelineExtendedExpression), function($skip, $loc, $0, $1, $2) {
   $1 = $1.map((x) => [x[0], x[1], ...x[2]]);
   $0 = [$1, $2];
   return {
@@ -7942,7 +8034,7 @@ var NonPipelineActualAssignment$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0,
 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)), MaybeNestedExpression))), 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)), MaybeParenNestedExtendedExpression))), function($skip, $loc, $0, $1, $2) {
   if ($2) {
     const [star, expression] = $2;
     return {
@@ -8041,20 +8133,22 @@ function ConditionalExpression(ctx, state2) {
   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, ExtendedExpression, __, Colon, ExtendedExpression), 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, MaybeNestedExtendedExpression, __, Colon, MaybeNestedExtendedExpression), 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.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$E)((0, import_lib3.$S)(Nested, QuestionMark, ExtendedExpression, Nested, Colon, ExtendedExpression)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
+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) {
   if ($2)
     return $2;
   return $skip;
 });
+var NestedTernaryRest$$ = [NestedTernaryRest$0, NestedTernaryRest$1];
 function NestedTernaryRest(ctx, state2) {
-  return (0, import_lib3.$EVENT)(ctx, state2, "NestedTernaryRest", NestedTernaryRest$0);
+  return (0, import_lib3.$EVENT_C)(ctx, state2, "NestedTernaryRest", NestedTernaryRest$$);
 }
 var ShortCircuitExpression$0 = BinaryOpExpression;
 function ShortCircuitExpression(ctx, state2) {
@@ -8228,8 +8322,24 @@ var ClassBinding$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$N)
 function ClassBinding(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "ClassBinding", ClassBinding$0);
 }
-var ClassHeritage$0 = (0, import_lib3.$S)(ExtendsClause, (0, import_lib3.$E)(ImplementsClause));
-var ClassHeritage$1 = ImplementsClause;
+var ClassHeritage$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(ExtendsClause, (0, import_lib3.$E)(WithClause), (0, import_lib3.$E)(ImplementsClause)), function($skip, $loc, $0, $1, $2, $3) {
+  var extendsClause = $1;
+  var withClause = $2;
+  var implementsClause = $3;
+  if (withClause) {
+    extendsClause = convertWithClause(withClause, extendsClause);
+  }
+  return [extendsClause, implementsClause];
+});
+var ClassHeritage$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(WithClause), (0, import_lib3.$E)(ImplementsClause)), function($skip, $loc, $0, $1, $2) {
+  var withClause = $1;
+  var implementsClause = $2;
+  if (withClause)
+    return [convertWithClause(withClause), implementsClause];
+  if (implementsClause)
+    return implementsClause;
+  return $skip;
+});
 var ClassHeritage$$ = [ClassHeritage$0, ClassHeritage$1];
 function ClassHeritage(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "ClassHeritage", ClassHeritage$$);
@@ -8238,7 +8348,20 @@ var ExtendsClause$0 = (0, import_lib3.$S)(ExtendsToken, __, ExtendsTarget);
 function ExtendsClause(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "ExtendsClause", ExtendsClause$0);
 }
-var ExtendsToken$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, (0, import_lib3.$E)(_), ExtendsShorthand, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L17, 'ExtendsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
+var WithClause$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(__, With, __, ExtendsTarget, (0, import_lib3.$Q)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L17, 'WithClause ","'), __, ExtendsTarget))), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var ws = $3;
+  var t = $4;
+  var rest = $5;
+  return {
+    type: "WithClause",
+    children: $0,
+    targets: [[ws, t], ...rest.map(([_comma, ws2, target]) => [ws2, target])]
+  };
+});
+function WithClause(ctx, state2) {
+  return (0, import_lib3.$EVENT)(ctx, state2, "WithClause", WithClause$0);
+}
+var ExtendsToken$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, (0, import_lib3.$E)(_), ExtendsShorthand, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L18, 'ExtendsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
   var l = $1;
   var ws = $2;
   var t = $3;
@@ -8260,13 +8383,13 @@ var ExtendsToken$$ = [ExtendsToken$0, ExtendsToken$1];
 function ExtendsToken(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "ExtendsToken", ExtendsToken$$);
 }
-var ExtendsShorthand$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L18, 'ExtendsShorthand "<"'), function($skip, $loc, $0, $1) {
+var ExtendsShorthand$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L19, 'ExtendsShorthand "<"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "extends " };
 });
 function ExtendsShorthand(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "ExtendsShorthand", ExtendsShorthand$0);
 }
-var NotExtendsToken$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, (0, import_lib3.$E)(_), OmittedNegation, ExtendsShorthand, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L17, 'NotExtendsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+var NotExtendsToken$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, (0, import_lib3.$E)(_), OmittedNegation, ExtendsShorthand, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L18, 'NotExtendsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   var l = $1;
   var ws1 = $2;
   var ws2 = $3;
@@ -8292,7 +8415,7 @@ function NotExtendsToken(ctx, state2) {
 var OmittedNegation$0 = (0, import_lib3.$T)((0, import_lib3.$S)(ExclamationPoint), function(value) {
   return "";
 });
-var OmittedNegation$1 = (0, import_lib3.$T)((0, import_lib3.$S)(Not, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L17, 'OmittedNegation " "')), (0, import_lib3.$E)(_)), function(value) {
+var OmittedNegation$1 = (0, import_lib3.$T)((0, import_lib3.$S)(Not, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L18, 'OmittedNegation " "')), (0, import_lib3.$E)(_)), function(value) {
   return value[2];
 });
 var OmittedNegation$$ = [OmittedNegation$0, OmittedNegation$1];
@@ -8315,7 +8438,7 @@ var ImplementsClause$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(ImplementsToke
 function ImplementsClause(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "ImplementsClause", ImplementsClause$0);
 }
-var ImplementsToken$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, __, ImplementsShorthand, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L17, 'ImplementsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
+var ImplementsToken$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, __, ImplementsShorthand, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L18, 'ImplementsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
   var l = $1;
   var ws = $2;
   var token = $3;
@@ -8325,7 +8448,7 @@ var ImplementsToken$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, __, Implem
   }
   return { children };
 });
-var ImplementsToken$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(__, (0, import_lib3.$EXPECT)($L19, 'ImplementsToken "implements"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
+var ImplementsToken$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(__, (0, import_lib3.$EXPECT)($L20, 'ImplementsToken "implements"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
   $2 = { $loc, token: $2 };
   return [$1, $2];
 });
@@ -8333,7 +8456,7 @@ var ImplementsToken$$ = [ImplementsToken$0, ImplementsToken$1];
 function ImplementsToken(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "ImplementsToken", ImplementsToken$$);
 }
-var ImplementsShorthand$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L20, 'ImplementsShorthand "<:"'), function($skip, $loc, $0, $1) {
+var ImplementsShorthand$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L21, 'ImplementsShorthand "<:"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "implements " };
 });
 function ImplementsShorthand(ctx, state2) {
@@ -8481,7 +8604,7 @@ var FieldDefinition$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(CoffeeClassesEn
       };
   }
 });
-var FieldDefinition$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(InsertReadonly, ClassElementName, (0, import_lib3.$E)(TypeSuffix), __, ConstAssignment, ExtendedExpression), 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, MaybeNestedExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
   var r = $1;
   var ca = $5;
   r.children[0].$loc = {
@@ -8682,7 +8805,7 @@ var OptionalDot$$ = [OptionalDot$0, OptionalDot$1];
 function OptionalDot(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "OptionalDot", OptionalDot$$);
 }
-var NonNullAssertion$0 = (0, import_lib3.$T)((0, import_lib3.$S)(ExclamationPoint, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($L21, 'NonNullAssertion "^"'))), function(value) {
+var NonNullAssertion$0 = (0, import_lib3.$T)((0, import_lib3.$S)(ExclamationPoint, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($L22, 'NonNullAssertion "^"'))), function(value) {
   return { "type": "NonNullAssertion", "ts": true, "children": [value[0]] };
 });
 function NonNullAssertion(ctx, state2) {
@@ -8890,7 +9013,7 @@ var PropertyAccess$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(AccessStart, (0,
     ]
   };
 });
-var PropertyAccess$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(AccessStart, (0, import_lib3.$EXPECT)($L22, 'PropertyAccess "-"'), IntegerLiteral), function($skip, $loc, $0, $1, $2, $3) {
+var PropertyAccess$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(AccessStart, (0, import_lib3.$EXPECT)($L23, 'PropertyAccess "-"'), IntegerLiteral), function($skip, $loc, $0, $1, $2, $3) {
   var dot = $1;
   var neg = $2;
   var num = $3;
@@ -8997,7 +9120,7 @@ function SuperProperty(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "SuperProperty", SuperProperty$$);
 }
 var MetaProperty$0 = (0, import_lib3.$S)(New, Dot, Target);
-var MetaProperty$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L23, 'MetaProperty "import.meta"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var MetaProperty$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L24, 'MetaProperty "import.meta"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 var MetaProperty$2 = ReturnValue;
@@ -9005,7 +9128,7 @@ var MetaProperty$$ = [MetaProperty$0, MetaProperty$1, MetaProperty$2];
 function MetaProperty(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "MetaProperty", MetaProperty$$);
 }
-var ReturnValue$0 = (0, import_lib3.$TV)((0, import_lib3.$C)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L24, 'ReturnValue "return.value"'), NonIdContinue), (0, import_lib3.$S)(Return, (0, import_lib3.$Y)(AfterReturnShorthand))), function($skip, $loc, $0, $1) {
+var ReturnValue$0 = (0, import_lib3.$TV)((0, import_lib3.$C)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L25, 'ReturnValue "return.value"'), NonIdContinue), (0, import_lib3.$S)(Return, (0, import_lib3.$Y)(AfterReturnShorthand))), function($skip, $loc, $0, $1) {
   return { type: "ReturnValue", children: [$1[0]] };
 });
 function ReturnValue(ctx, state2) {
@@ -9534,7 +9657,7 @@ var BindingElement$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.
     children: [ws, binding]
   };
 });
-var BindingElement$2 = (0, import_lib3.$TV)((0, import_lib3.$Y)((0, import_lib3.$S)((0, import_lib3.$E)(_), (0, import_lib3.$EXPECT)($L25, 'BindingElement ","'))), function($skip, $loc, $0, $1) {
+var BindingElement$2 = (0, import_lib3.$TV)((0, import_lib3.$Y)((0, import_lib3.$S)((0, import_lib3.$E)(_), (0, import_lib3.$EXPECT)($L17, 'BindingElement ","'))), function($skip, $loc, $0, $1) {
   return {
     children: [{
       type: "ElisionElement",
@@ -9651,10 +9774,10 @@ var FunctionExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(FunctionSign
     block
   };
 });
-var FunctionExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(OpenParen, BinaryOp, CloseParen), function($skip, $loc, $0, $1, $2, $3) {
-  var open = $1;
-  var op = $2;
-  var close = $3;
+var FunctionExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$N)(ArrowFunction), OpenParen, BinaryOp, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var open = $2;
+  var op = $3;
+  var close = $4;
   if (op.special && op.call && !op.negated)
     return op.call;
   const refA = makeRef("a"), refB = makeRef("b"), body = processBinaryOpExpression([refA, [
@@ -10969,7 +11092,7 @@ var NamedProperty$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(PropertyName, (0,
 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, ExtendedExpression, (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, 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 name = $1;
   var colon = $2;
   var expression = $3;
@@ -11373,11 +11496,12 @@ var NotDedentedBinaryOp$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_
     ws.push(...$2);
   return [ws, $3];
 });
-var NotDedentedBinaryOp$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(Nested, (0, import_lib3.$E)(_), (0, import_lib3.$N)(Identifier), BinaryOp), function($skip, $loc, $0, $1, $2, $3, $4) {
+var NotDedentedBinaryOp$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(Nested, (0, import_lib3.$E)(_), (0, import_lib3.$N)(Identifier), (0, import_lib3.$C)((0, import_lib3.$N)((0, import_lib3.$EXPECT)($L64, 'NotDedentedBinaryOp "*"')), (0, import_lib3.$N)(ImportDeclaration)), BinaryOp), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var op = $5;
   const ws = [...$1];
   if ($2)
     ws.push(...$2);
-  return [ws, $4];
+  return [ws, op];
 });
 var NotDedentedBinaryOp$$ = [NotDedentedBinaryOp$0, NotDedentedBinaryOp$1];
 function NotDedentedBinaryOp(ctx, state2) {
@@ -11392,7 +11516,7 @@ var IdentifierBinaryOp$0 = (0, import_lib3.$TV)(Identifier, function($skip, $loc
 function IdentifierBinaryOp(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "IdentifierBinaryOp", IdentifierBinaryOp$0);
 }
-var BinaryOp$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($R20, "BinaryOp /(?=\\p{ID_Start}|[_$^\xAB\xBB\u22D9\u2264\u2265\u2208\u220B\u2209\u220C\u2263\u2261\u2262\u2260=\u2016\u2047&|*\\/!?%<>\u29FA+-])/"), _BinaryOp), function(value) {
+var BinaryOp$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($R20, "BinaryOp /(?=\\p{ID_Start}|[_$^\xAB\xBB\u22D9\u2264\u2265\u2208\u220B\u2209\u220C\u2263\u2261\u2262\u2260=\u2A76\u2A75\u2016\u2047&|*\\/!?%<>\u29FA+-])/"), _BinaryOp), function(value) {
   var op = value[1];
   return op;
 });
@@ -11431,8 +11555,8 @@ var _BinaryOp$$ = [_BinaryOp$0, _BinaryOp$1, _BinaryOp$2];
 function _BinaryOp(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "_BinaryOp", _BinaryOp$$);
 }
-var BinaryOpSymbol$0 = (0, import_lib3.$EXPECT)($L64, 'BinaryOpSymbol "**"');
-var BinaryOpSymbol$1 = (0, import_lib3.$EXPECT)($L65, 'BinaryOpSymbol "*"');
+var BinaryOpSymbol$0 = (0, import_lib3.$EXPECT)($L65, 'BinaryOpSymbol "**"');
+var BinaryOpSymbol$1 = (0, import_lib3.$EXPECT)($L64, 'BinaryOpSymbol "*"');
 var BinaryOpSymbol$2 = (0, import_lib3.$EXPECT)($L66, 'BinaryOpSymbol "/"');
 var BinaryOpSymbol$3 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L67, 'BinaryOpSymbol "%%"'), function($skip, $loc, $0, $1) {
   return {
@@ -11448,7 +11572,7 @@ var BinaryOpSymbol$5 = (0, import_lib3.$TV)((0, import_lib3.$C)((0, import_lib3.
   };
 });
 var BinaryOpSymbol$6 = (0, import_lib3.$EXPECT)($L69, 'BinaryOpSymbol "+"');
-var BinaryOpSymbol$7 = (0, import_lib3.$EXPECT)($L22, 'BinaryOpSymbol "-"');
+var BinaryOpSymbol$7 = (0, import_lib3.$EXPECT)($L23, 'BinaryOpSymbol "-"');
 var BinaryOpSymbol$8 = (0, import_lib3.$EXPECT)($L70, 'BinaryOpSymbol "<="');
 var BinaryOpSymbol$9 = (0, import_lib3.$T)((0, import_lib3.$EXPECT)($L71, 'BinaryOpSymbol "\u2264"'), function(value) {
   return "<=";
@@ -11478,7 +11602,7 @@ var BinaryOpSymbol$14 = (0, import_lib3.$EXPECT)($L76, 'BinaryOpSymbol "<<"');
 var BinaryOpSymbol$15 = (0, import_lib3.$T)((0, import_lib3.$EXPECT)($L77, 'BinaryOpSymbol "\xAB"'), function(value) {
   return "<<";
 });
-var BinaryOpSymbol$16 = (0, import_lib3.$EXPECT)($L18, 'BinaryOpSymbol "<"');
+var BinaryOpSymbol$16 = (0, import_lib3.$EXPECT)($L19, 'BinaryOpSymbol "<"');
 var BinaryOpSymbol$17 = (0, import_lib3.$EXPECT)($L78, 'BinaryOpSymbol ">>>"');
 var BinaryOpSymbol$18 = (0, import_lib3.$T)((0, import_lib3.$EXPECT)($L79, 'BinaryOpSymbol "\u22D9"'), function(value) {
   return ">>>";
@@ -11617,7 +11741,7 @@ var BinaryOpSymbol$47 = (0, import_lib3.$TS)((0, import_lib3.$S)(Is), function($
 });
 var BinaryOpSymbol$48 = In;
 var BinaryOpSymbol$49 = (0, import_lib3.$EXPECT)($L108, 'BinaryOpSymbol "&"');
-var BinaryOpSymbol$50 = (0, import_lib3.$EXPECT)($L21, 'BinaryOpSymbol "^"');
+var BinaryOpSymbol$50 = (0, import_lib3.$EXPECT)($L22, 'BinaryOpSymbol "^"');
 var BinaryOpSymbol$51 = (0, import_lib3.$EXPECT)($L109, 'BinaryOpSymbol "|"');
 var BinaryOpSymbol$$ = [BinaryOpSymbol$0, BinaryOpSymbol$1, BinaryOpSymbol$2, BinaryOpSymbol$3, BinaryOpSymbol$4, BinaryOpSymbol$5, BinaryOpSymbol$6, BinaryOpSymbol$7, BinaryOpSymbol$8, BinaryOpSymbol$9, BinaryOpSymbol$10, BinaryOpSymbol$11, BinaryOpSymbol$12, BinaryOpSymbol$13, BinaryOpSymbol$14, BinaryOpSymbol$15, BinaryOpSymbol$16, BinaryOpSymbol$17, BinaryOpSymbol$18, BinaryOpSymbol$19, BinaryOpSymbol$20, BinaryOpSymbol$21, BinaryOpSymbol$22, BinaryOpSymbol$23, BinaryOpSymbol$24, BinaryOpSymbol$25, BinaryOpSymbol$26, BinaryOpSymbol$27, BinaryOpSymbol$28, BinaryOpSymbol$29, BinaryOpSymbol$30, BinaryOpSymbol$31, BinaryOpSymbol$32, BinaryOpSymbol$33, BinaryOpSymbol$34, BinaryOpSymbol$35, BinaryOpSymbol$36, BinaryOpSymbol$37, BinaryOpSymbol$38, BinaryOpSymbol$39, BinaryOpSymbol$40, BinaryOpSymbol$41, BinaryOpSymbol$42, BinaryOpSymbol$43, BinaryOpSymbol$44, BinaryOpSymbol$45, BinaryOpSymbol$46, BinaryOpSymbol$47, BinaryOpSymbol$48, BinaryOpSymbol$49, BinaryOpSymbol$50, BinaryOpSymbol$51];
 function BinaryOpSymbol(ctx, state2) {
@@ -11710,7 +11834,7 @@ var UnaryOp$2 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$C)(Del
     return [op, [" "]];
   return [op, ws];
 });
-var UnaryOp$3 = (0, import_lib3.$T)((0, import_lib3.$S)(Not, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($R23, "UnaryOp /[:.]/")), (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L17, 'UnaryOp " "')), (0, import_lib3.$E)(_)), function(value) {
+var UnaryOp$3 = (0, import_lib3.$T)((0, import_lib3.$S)(Not, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($R23, "UnaryOp /[:.]/")), (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L18, 'UnaryOp " "')), (0, import_lib3.$E)(_)), function(value) {
   return [value[0], value[3]];
 });
 var UnaryOp$$ = [UnaryOp$0, UnaryOp$1, UnaryOp$2, UnaryOp$3];
@@ -12858,7 +12982,7 @@ var KeywordStatement$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(Continue, (0,
   };
 });
 var KeywordStatement$2 = DebuggerStatement;
-var KeywordStatement$3 = (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)(MaybeNestedExpression)), function(value) {
+var KeywordStatement$3 = (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 expression = value[2];
   return { "type": "ReturnStatement", "expression": expression, "children": value };
 });
@@ -12873,7 +12997,7 @@ var DebuggerStatement$0 = (0, import_lib3.$T)((0, import_lib3.$S)(Debugger), fun
 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, ExtendedExpression), function(value) {
+var ThrowStatement$0 = (0, import_lib3.$T)((0, import_lib3.$S)(Throw, MaybeParenNestedExtendedExpression), function(value) {
   return { "type": "ThrowStatement", "children": value };
 });
 function ThrowStatement(ctx, state2) {
@@ -12897,16 +13021,51 @@ var Debugger$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPEC
 function Debugger(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "Debugger", Debugger$0);
 }
-var MaybeNestedExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$N)(EOS), ExtendedExpression), function($skip, $loc, $0, $1, $2) {
-  return $2;
+var MaybeNestedNonPipelineExtendedExpression$0 = (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) {
+  if ($3)
+    return $3;
+  return $skip;
 });
-var MaybeNestedExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$Y)(EOS), ObjectLiteral), function($skip, $loc, $0, $1, $2) {
-  return $2;
+var MaybeNestedNonPipelineExtendedExpression$1 = NonPipelineExtendedExpression;
+var MaybeNestedNonPipelineExtendedExpression$$ = [MaybeNestedNonPipelineExtendedExpression$0, MaybeNestedNonPipelineExtendedExpression$1];
+function MaybeNestedNonPipelineExtendedExpression(ctx, state2) {
+  return (0, import_lib3.$EVENT_C)(ctx, state2, "MaybeNestedNonPipelineExtendedExpression", MaybeNestedNonPipelineExtendedExpression$$);
+}
+var MaybeNestedPostfixedExpression$0 = (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) {
+  if ($3)
+    return $3;
+  return $skip;
+});
+var MaybeNestedPostfixedExpression$1 = PostfixedExpression;
+var MaybeNestedPostfixedExpression$$ = [MaybeNestedPostfixedExpression$0, MaybeNestedPostfixedExpression$1];
+function MaybeNestedPostfixedExpression(ctx, state2) {
+  return (0, import_lib3.$EVENT_C)(ctx, state2, "MaybeNestedPostfixedExpression", MaybeNestedPostfixedExpression$$);
+}
+var MaybeNestedExtendedExpression$0 = (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) {
+  if ($3)
+    return $3;
+  return $skip;
+});
+var MaybeNestedExtendedExpression$1 = ExtendedExpression;
+var MaybeNestedExtendedExpression$$ = [MaybeNestedExtendedExpression$0, MaybeNestedExtendedExpression$1];
+function MaybeNestedExtendedExpression(ctx, state2) {
+  return (0, import_lib3.$EVENT_C)(ctx, state2, "MaybeNestedExtendedExpression", MaybeNestedExtendedExpression$$);
+}
+var MaybeParenNestedExtendedExpression$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$N)(EOS), ExtendedExpression), function(value) {
+  return value[1];
+});
+var MaybeParenNestedExtendedExpression$1 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$Y)(EOS), 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 exp = $5;
+  if (!exp)
+    return $skip;
+  return $0.slice(1);
 });
-var MaybeNestedExpression$2 = (0, import_lib3.$S)((0, import_lib3.$Y)(EOS), InsertSpace, InsertOpenParen, PushIndent, Nested, ExtendedExpression, PopIndent, InsertNewline, InsertIndent, InsertCloseParen);
-var MaybeNestedExpression$$ = [MaybeNestedExpression$0, MaybeNestedExpression$1, MaybeNestedExpression$2];
-function MaybeNestedExpression(ctx, state2) {
-  return (0, import_lib3.$EVENT_C)(ctx, state2, "MaybeNestedExpression", MaybeNestedExpression$$);
+var MaybeParenNestedExtendedExpression$$ = [MaybeParenNestedExtendedExpression$0, MaybeParenNestedExtendedExpression$1, MaybeParenNestedExtendedExpression$2];
+function MaybeParenNestedExtendedExpression(ctx, state2) {
+  return (0, import_lib3.$EVENT_C)(ctx, state2, "MaybeParenNestedExtendedExpression", MaybeParenNestedExtendedExpression$$);
 }
 var ImportDeclaration$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Import, _, Identifier, (0, import_lib3.$E)(_), Equals, __, (0, import_lib3.$EXPECT)($L115, 'ImportDeclaration "require"'), NonIdContinue, Arguments), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
   const imp = [
@@ -13098,7 +13257,7 @@ function OperatorImportSpecifier(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "OperatorImportSpecifier", OperatorImportSpecifier$$);
 }
 var ImportAsToken$0 = (0, import_lib3.$S)(__, As);
-var ImportAsToken$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, __, Colon, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L17, 'ImportAsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
+var ImportAsToken$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, __, Colon, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L18, 'ImportAsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
   var l = $1;
   var ws = $2;
   var c = $3;
@@ -13159,7 +13318,7 @@ var ImportedBinding$0 = BindingIdentifier;
 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, ExtendedExpression), 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, MaybeNestedExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4) {
   const exp = [
     { ...$1, ts: true },
     { ...$1, token: "module.exports", js: true }
@@ -13196,7 +13355,7 @@ var ExportDeclaration$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_li
     }
   ];
 });
-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, ExtendedExpression)), 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, MaybeNestedExtendedExpression)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
   var declaration = $6;
   return { type: "ExportDeclaration", declaration, ts: declaration.ts, children: $0 };
 });
@@ -13310,24 +13469,26 @@ var LexicalDeclaration$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(LetOrConst,
     thisAssignments: bindings.flatMap((b) => b.thisAssignments)
   };
 });
-var LexicalDeclaration$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(InsertConst, (0, import_lib3.$C)(BindingPattern, BindingIdentifier), (0, import_lib3.$E)(TypeSuffix), __, ConstAssignment, PostfixedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
-  return processAssignmentDeclaration(...$0);
-});
-var LexicalDeclaration$2 = (0, import_lib3.$TS)((0, import_lib3.$S)(InsertLet, (0, import_lib3.$C)(BindingPattern, BindingIdentifier), (0, import_lib3.$E)(TypeSuffix), __, LetAssignment, PostfixedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
-  return processAssignmentDeclaration(...$0);
+var LexicalDeclaration$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, (0, import_lib3.$C)(BindingPattern, BindingIdentifier), (0, import_lib3.$E)(TypeSuffix), __, (0, import_lib3.$C)(ConstAssignment, LetAssignment), MaybeNestedPostfixedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+  var loc = $1;
+  var assign = $5;
+  return processAssignmentDeclaration(
+    { $loc: loc, token: assign.decl },
+    ...$0.slice(1)
+  );
 });
-var LexicalDeclaration$$ = [LexicalDeclaration$0, LexicalDeclaration$1, LexicalDeclaration$2];
+var LexicalDeclaration$$ = [LexicalDeclaration$0, LexicalDeclaration$1];
 function LexicalDeclaration(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "LexicalDeclaration", LexicalDeclaration$$);
 }
 var ConstAssignment$0 = (0, import_lib3.$TV)((0, import_lib3.$C)((0, import_lib3.$EXPECT)($L118, 'ConstAssignment ":="'), (0, import_lib3.$EXPECT)($L119, 'ConstAssignment "\u2254"')), function($skip, $loc, $0, $1) {
-  return { $loc, token: "=" };
+  return { $loc, token: "=", decl: "const " };
 });
 function ConstAssignment(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "ConstAssignment", ConstAssignment$0);
 }
 var LetAssignment$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L120, 'LetAssignment ".="'), function($skip, $loc, $0, $1) {
-  return { $loc, token: "=" };
+  return { $loc, token: "=", decl: "let " };
 });
 function LetAssignment(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "LetAssignment", LetAssignment$0);
@@ -13373,7 +13534,7 @@ var LexicalBinding$$ = [LexicalBinding$0, LexicalBinding$1];
 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, ExtendedExpression), function(value) {
+var Initializer$0 = (0, import_lib3.$T)((0, import_lib3.$S)(__, Equals, MaybeNestedExtendedExpression), function(value) {
   var expression = value[2];
   return { "type": "Initializer", "expression": expression, "children": value };
 });
@@ -13869,7 +14030,7 @@ var Loc$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L0, 'Loc ""'), functi
 function Loc(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "Loc", Loc$0);
 }
-var Abstract$0 = (0, import_lib3.$TV)((0, import_lib3.$TEXT)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L126, 'Abstract "abstract"'), NonIdContinue, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L17, 'Abstract " "')))), function($skip, $loc, $0, $1) {
+var Abstract$0 = (0, import_lib3.$TV)((0, import_lib3.$TEXT)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L126, 'Abstract "abstract"'), NonIdContinue, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L18, 'Abstract " "')))), function($skip, $loc, $0, $1) {
   return { $loc, token: $1, ts: true };
 });
 function Abstract(ctx, state2) {
@@ -13923,7 +14084,7 @@ var By$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L1
 function By(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "By", By$0);
 }
-var Caret$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L21, 'Caret "^"'), function($skip, $loc, $0, $1) {
+var Caret$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L22, 'Caret "^"'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function Caret(ctx, state2) {
@@ -13983,7 +14144,7 @@ var Colon$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)(
 function Colon(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "Colon", Colon$0);
 }
-var Comma$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L25, 'Comma ","'), function($skip, $loc, $0, $1) {
+var Comma$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L17, 'Comma ","'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function Comma(ctx, state2) {
@@ -14143,7 +14304,7 @@ var Hash$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L160, 'Hash "#"'), f
 function Hash(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "Hash", Hash$0);
 }
-var If$0 = (0, import_lib3.$TV)((0, import_lib3.$TEXT)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L161, 'If "if"'), NonIdContinue, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L17, 'If " "')))), function($skip, $loc, $0, $1) {
+var If$0 = (0, import_lib3.$TV)((0, import_lib3.$TEXT)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L161, 'If "if"'), NonIdContinue, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L18, 'If " "')))), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function If(ctx, state2) {
@@ -14221,7 +14382,7 @@ var Of$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L1
 function Of(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "Of", Of$0);
 }
-var OpenAngleBracket$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L18, 'OpenAngleBracket "<"'), function($skip, $loc, $0, $1) {
+var OpenAngleBracket$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L19, 'OpenAngleBracket "<"'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function OpenAngleBracket(ctx, state2) {
@@ -14330,7 +14491,7 @@ var SingleQuote$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L188, `Single
 function SingleQuote(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "SingleQuote", SingleQuote$0);
 }
-var Star$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L65, 'Star "*"'), function($skip, $loc, $0, $1) {
+var Star$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L64, 'Star "*"'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function Star(ctx, state2) {
@@ -14472,6 +14633,12 @@ var While$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)(
 function While(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "While", While$0);
 }
+var With$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L116, 'With "with"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  return { $loc, token: $1 };
+});
+function With(ctx, state2) {
+  return (0, import_lib3.$EVENT)(ctx, state2, "With", With$0);
+}
 var Yield$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L211, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1, type: "Yield" };
 });
@@ -14551,7 +14718,7 @@ var JSXElement$$ = [JSXElement$0, JSXElement$1, JSXElement$2];
 function JSXElement(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "JSXElement", JSXElement$$);
 }
-var JSXSelfClosingElement$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L18, 'JSXSelfClosingElement "<"'), JSXElementName, (0, import_lib3.$E)(TypeArguments), (0, import_lib3.$E)(JSXAttributes), (0, import_lib3.$E)(Whitespace), (0, import_lib3.$EXPECT)($L212, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+var JSXSelfClosingElement$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L19, 'JSXSelfClosingElement "<"'), JSXElementName, (0, import_lib3.$E)(TypeArguments), (0, import_lib3.$E)(JSXAttributes), (0, import_lib3.$E)(Whitespace), (0, import_lib3.$EXPECT)($L212, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
   return { type: "JSXElement", children: $0, tag: $2 };
 });
 function JSXSelfClosingElement(ctx, state2) {
@@ -14570,7 +14737,7 @@ var PopJSXStack$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L0, 'PopJSXSt
 function PopJSXStack(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "PopJSXStack", PopJSXStack$0);
 }
-var JSXOpeningElement$0 = (0, import_lib3.$S)((0, import_lib3.$EXPECT)($L18, 'JSXOpeningElement "<"'), JSXElementName, (0, import_lib3.$E)(TypeArguments), (0, import_lib3.$E)(JSXAttributes), (0, import_lib3.$E)(Whitespace), (0, import_lib3.$EXPECT)($L44, 'JSXOpeningElement ">"'));
+var JSXOpeningElement$0 = (0, import_lib3.$S)((0, import_lib3.$EXPECT)($L19, 'JSXOpeningElement "<"'), JSXElementName, (0, import_lib3.$E)(TypeArguments), (0, import_lib3.$E)(JSXAttributes), (0, import_lib3.$E)(Whitespace), (0, import_lib3.$EXPECT)($L44, 'JSXOpeningElement ">"'));
 function JSXOpeningElement(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "JSXOpeningElement", JSXOpeningElement$0);
 }
@@ -15226,7 +15393,7 @@ var TypeDeclarationRest$$ = [TypeDeclarationRest$0, TypeDeclarationRest$1, TypeD
 function TypeDeclarationRest(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeDeclarationRest", TypeDeclarationRest$$);
 }
-var TypeAliasDeclaration$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(TypeKeyword, (0, import_lib3.$E)(_), IdentifierName, (0, import_lib3.$E)(TypeParameters), OptionalEquals, (0, import_lib3.$C)(MaybeIndentedType, (0, import_lib3.$S)(__, Type))), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+var TypeAliasDeclaration$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(TypeKeyword, (0, import_lib3.$E)(_), IdentifierName, (0, import_lib3.$E)(TypeParameters), OptionalEquals, (0, import_lib3.$C)(MaybeNestedType, (0, import_lib3.$S)(__, Type))), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
   var id = $3;
   return {
     type: "TypeDeclaration",
@@ -15235,7 +15402,7 @@ var TypeAliasDeclaration$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(TypeKeywor
     ts: true
   };
 });
-var TypeAliasDeclaration$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(InsertType, IdentifierName, (0, import_lib3.$E)(TypeParameters), __, TypeAssignment, (0, import_lib3.$C)(MaybeIndentedType, (0, import_lib3.$S)(__, Type))), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+var TypeAliasDeclaration$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(InsertType, IdentifierName, (0, import_lib3.$E)(TypeParameters), __, TypeAssignment, (0, import_lib3.$C)(MaybeNestedType, (0, import_lib3.$S)(__, Type))), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
   var id = $2;
   return {
     type: "TypeDeclaration",
@@ -15340,11 +15507,15 @@ function Namespace(ctx, state2) {
 }
 var InterfaceBlock$0 = (0, import_lib3.$S)(__, OpenBrace, NestedInterfaceProperties, __, CloseBrace);
 var InterfaceBlock$1 = (0, import_lib3.$S)(__, OpenBrace, (0, import_lib3.$Q)((0, import_lib3.$S)(__, InterfaceProperty)), __, CloseBrace);
-var InterfaceBlock$2 = (0, import_lib3.$S)(InsertOpenBrace, NestedInterfaceProperties, InsertNewline, InsertIndent, InsertCloseBrace);
+var InterfaceBlock$2 = NestedInterfaceBlock;
 var InterfaceBlock$$ = [InterfaceBlock$0, InterfaceBlock$1, InterfaceBlock$2];
 function InterfaceBlock(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "InterfaceBlock", InterfaceBlock$$);
 }
+var NestedInterfaceBlock$0 = (0, import_lib3.$S)(InsertOpenBrace, NestedInterfaceProperties, InsertNewline, InsertIndent, InsertCloseBrace);
+function NestedInterfaceBlock(ctx, state2) {
+  return (0, import_lib3.$EVENT)(ctx, state2, "NestedInterfaceBlock", NestedInterfaceBlock$0);
+}
 var NestedInterfaceProperties$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$Q)(NestedInterfaceProperty), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
   var props = $2;
   if (props.length)
@@ -15531,7 +15702,7 @@ var NestedEnumPropertyLine$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, impo
 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, ExtendedExpression)), 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, MaybeNestedExtendedExpression)), ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3) {
   var name = $1;
   var initializer = $2;
   return {
@@ -15558,7 +15729,7 @@ var TypeIndex$$ = [TypeIndex$0, TypeIndex$1];
 function TypeIndex(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeIndex", TypeIndex$$);
 }
-var TypeSuffix$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$E)(_), (0, import_lib3.$E)(QuestionMark), (0, import_lib3.$E)(_), Colon, MaybeIndentedType), function(value) {
+var TypeSuffix$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$E)(_), (0, import_lib3.$E)(QuestionMark), (0, import_lib3.$E)(_), Colon, MaybeNestedType), function(value) {
   var optional = value[1];
   var t = value[4];
   return { "type": "TypeSuffix", "ts": true, "optional": optional, "t": t, "children": value };
@@ -15567,7 +15738,7 @@ var TypeSuffix$1 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$E)(_
   var optional = value[1];
   return { "type": "TypeSuffix", "ts": true, "optional": optional, "children": value };
 });
-var TypeSuffix$2 = (0, import_lib3.$TS)((0, import_lib3.$S)(NonNullAssertion, (0, import_lib3.$E)(_), (0, import_lib3.$E)((0, import_lib3.$S)(Colon, MaybeIndentedType))), function($skip, $loc, $0, $1, $2, $3) {
+var TypeSuffix$2 = (0, import_lib3.$TS)((0, import_lib3.$S)(NonNullAssertion, (0, import_lib3.$E)(_), (0, import_lib3.$E)((0, import_lib3.$S)(Colon, MaybeNestedType))), function($skip, $loc, $0, $1, $2, $3) {
   var nonnull = $1;
   var ct = $3;
   const [colon, t] = ct ?? [];
@@ -15583,18 +15754,16 @@ var TypeSuffix$$ = [TypeSuffix$0, TypeSuffix$1, TypeSuffix$2];
 function TypeSuffix(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeSuffix", TypeSuffix$$);
 }
-var MaybeIndentedType$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$N)((0, import_lib3.$S)(__, OpenBrace)), InterfaceBlock), function(value) {
-  return value[1];
-});
-var MaybeIndentedType$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 = 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) {
   if (!$2)
     return $skip;
   return $2;
 });
-var MaybeIndentedType$2 = Type;
-var MaybeIndentedType$$ = [MaybeIndentedType$0, MaybeIndentedType$1, MaybeIndentedType$2];
-function MaybeIndentedType(ctx, state2) {
-  return (0, import_lib3.$EVENT_C)(ctx, state2, "MaybeIndentedType", MaybeIndentedType$$);
+var MaybeNestedType$2 = Type;
+var MaybeNestedType$$ = [MaybeNestedType$0, MaybeNestedType$1, MaybeNestedType$2];
+function MaybeNestedType(ctx, state2) {
+  return (0, import_lib3.$EVENT_C)(ctx, state2, "MaybeNestedType", MaybeNestedType$$);
 }
 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;
@@ -15847,9 +16016,9 @@ function NestedType(ctx, state2) {
 var TypeConditional$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), (0, import_lib3.$EXPECT)($R85, "TypeConditional /(?=if|unless)/"), TypeIfThenElse), function($skip, $loc, $0, $1, $2, $3) {
   return [$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) {
+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)
-    return [$1, $2, $3, $7, $5, $6, $4];
+    return [$1, $2, $3, $4, $9, $6, $7, $8, $5];
   return $0;
 });
 var TypeConditional$2 = TypeBinary;
@@ -15885,12 +16054,13 @@ var TypeBlock$0 = (0, import_lib3.$T)((0, import_lib3.$S)(Then, Type), function(
 var TypeBlock$1 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$N)(EOS), Type), function(value) {
   return value[1];
 });
-var TypeBlock$2 = (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 TypeBlock$2 = NestedInterfaceBlock;
+var TypeBlock$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 TypeBlock$$ = [TypeBlock$0, TypeBlock$1, TypeBlock$2];
+var TypeBlock$$ = [TypeBlock$0, TypeBlock$1, TypeBlock$2, TypeBlock$3];
 function TypeBlock(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeBlock", TypeBlock$$);
 }
@@ -15934,10 +16104,13 @@ var TypeLiteral$2 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EX
 var TypeLiteral$3 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L208, 'TypeLiteral "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { type: "VoidType", $loc, token: $1 };
 });
-var TypeLiteral$4 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L227, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
+var TypeLiteral$4 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L227, 'TypeLiteral "unique"'), _, (0, import_lib3.$EXPECT)($L228, 'TypeLiteral "symbol"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4) {
+  return { type: "UniqueSymbolType", children: $0 };
+});
+var TypeLiteral$5 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L229, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "[]" };
 });
-var TypeLiteral$$ = [TypeLiteral$0, TypeLiteral$1, TypeLiteral$2, TypeLiteral$3, TypeLiteral$4];
+var TypeLiteral$$ = [TypeLiteral$0, TypeLiteral$1, TypeLiteral$2, TypeLiteral$3, TypeLiteral$4, TypeLiteral$5];
 function TypeLiteral(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeLiteral", TypeLiteral$$);
 }
@@ -16060,7 +16233,7 @@ var CivetPrologue$$ = [CivetPrologue$0, CivetPrologue$1];
 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)($L228, 'CivetPrologueContent "civet"'), NonIdContinue, (0, import_lib3.$Q)(CivetOption), (0, import_lib3.$EXPECT)($R89, "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)($L230, 'CivetPrologueContent "civet"'), NonIdContinue, (0, import_lib3.$Q)(CivetOption), (0, import_lib3.$EXPECT)($R89, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
   var options = $3;
   return {
     type: "CivetPrologue",