@danielx/civet 0.8.15 → 0.8.17

package/dist/browser.js

@@ -66,7 +66,7 @@ var Civet = (() => {
         $EVENT: () => $EVENT2,
         $EVENT_C: () => $EVENT_C2,
         $EXPECT: () => $EXPECT2,
-        $L: () => $L246,
+        $L: () => $L247,
         $N: () => $N2,
         $P: () => $P2,
         $Q: () => $Q2,
@@ -91,7 +91,7 @@ var Civet = (() => {
           return result;
         };
       }
-      function $L246(str) {
+      function $L247(str) {
         return function(_ctx, state2) {
           const { input, pos } = state2, { length } = str, end = pos + length;
           if (input.substring(pos, end) === str) {
@@ -545,6 +545,7 @@ ${body}`;
     hasAwait: () => hasAwait,
     hasExportDeclaration: () => hasExportDeclaration,
     hasImportDeclaration: () => hasImportDeclaration,
+    hasTrailingComment: () => hasTrailingComment,
     hasYield: () => hasYield,
     insertTrimmingSpace: () => insertTrimmingSpace,
     isComma: () => isComma,
@@ -770,6 +771,8 @@ ${body}`;
     if (!(node != null)) {
       return false;
     }
+    let ref3;
+    let ref4;
     switch (node.type) {
       case "ReturnStatement":
       case "ThrowStatement":
@@ -778,13 +781,30 @@ ${body}`;
         return true;
       }
       case "IfStatement": {
-        return isExit(node.then) && isExit(node.else?.block);
+        return (
+          // `insertReturn` for IfStatement adds a return to children
+          // when there's no else block
+          (ref3 = node.children)[ref3.length - 1]?.type === "ReturnStatement" || (ref4 = node.children)[ref4.length - 1]?.[1]?.type === "ReturnStatement" || isExit(node.then) && isExit(node.else?.block)
+        );
+      }
+      case "PatternMatchingStatement": {
+        return isExit(node.children[0][1]);
+      }
+      case "SwitchStatement": {
+        return (
+          // Ensure exhaustive by requiring an else/default clause
+          node.caseBlock.clauses.some(($) => $.type === "DefaultClause") && // Every clause should exit
+          node.caseBlock.clauses.every(isExit)
+        );
+      }
+      case "TryStatement": {
+        return node.blocks.every(isExit);
       }
       case "BlockStatement": {
         return node.expressions.some((s) => isExit(s[1]));
       }
       case "IterationStatement": {
-        return isLoopStatement(node) && gatherRecursiveWithinFunction(node.block, ($) => $.type === "BreakStatement").length === 0;
+        return isLoopStatement(node) && gatherRecursiveWithinFunction(node.block, ($1) => $1.type === "BreakStatement").length === 0;
       }
       default: {
         return false;
@@ -811,6 +831,22 @@ ${body}`;
       return children;
     }
   }
+  function hasTrailingComment(node) {
+    if (!(node != null)) {
+      return false;
+    }
+    if (node.type === "Comment") {
+      return true;
+    }
+    if (Array.isArray(node)) {
+      return hasTrailingComment(node[node.length - 1]);
+    }
+    if ("children" in node) {
+      let ref5;
+      return hasTrailingComment((ref5 = node.children)[ref5.length - 1]);
+    }
+    return false;
+  }
   function insertTrimmingSpace(target, c) {
     if (!(target != null)) {
       return target;
@@ -939,7 +975,7 @@ ${body}`;
       case "false":
         return false;
     }
-    let ref3;
+    let ref6;
     switch (literal.subtype) {
       case "StringLiteral": {
         assert.equal(
@@ -955,8 +991,8 @@ ${body}`;
           return BigInt(raw.slice(0, -1));
         } else if (raw.match(/[\.eE]/)) {
           return parseFloat(raw);
-        } else if ((ref3 = raw.match(/^[+-]?0(.)/)) && Array.isArray(ref3) && len(ref3, 2)) {
-          const [, base] = ref3;
+        } else if ((ref6 = raw.match(/^[+-]?0(.)/)) && Array.isArray(ref6) && len(ref6, 2)) {
+          const [, base] = ref6;
           switch (base.toLowerCase()) {
             case "x":
               return parseInt(raw.replace(/0[xX]/, ""), 16);
@@ -1036,16 +1072,16 @@ ${body}`;
     return startsWithPredicate(node.children, predicate);
   }
   function hasAwait(exp) {
-    return gatherRecursiveWithinFunction(exp, ($1) => $1.type === "Await").length > 0;
+    return gatherRecursiveWithinFunction(exp, ($2) => $2.type === "Await").length > 0;
   }
   function hasYield(exp) {
-    return gatherRecursiveWithinFunction(exp, ($2) => $2.type === "Yield").length > 0;
+    return gatherRecursiveWithinFunction(exp, ($3) => $3.type === "Yield").length > 0;
   }
   function hasImportDeclaration(exp) {
-    return gatherRecursiveWithinFunction(exp, ($3) => $3.type === "ImportDeclaration").length > 0;
+    return gatherRecursiveWithinFunction(exp, ($4) => $4.type === "ImportDeclaration").length > 0;
   }
   function hasExportDeclaration(exp) {
-    return gatherRecursiveWithinFunction(exp, ($4) => $4.type === "ExportDeclaration").length > 0;
+    return gatherRecursiveWithinFunction(exp, ($5) => $5.type === "ExportDeclaration").length > 0;
   }
   function deepCopy(root) {
     const copied = /* @__PURE__ */ new Map();
@@ -1168,7 +1204,6 @@ ${body}`;
     "JSXElement",
     "JSXFragment",
     "Literal",
-    "NewExpression",
     "ParenthesizedExpression",
     "Ref",
     "Placeholder",
@@ -1190,7 +1225,10 @@ ${body}`;
       if (skipParens.has(expression.type)) {
         return expression;
       }
-      if (expression.type === "MemberExpression" && !startsWithPredicate(expression, ($5) => $5.type === "ObjectExpression")) {
+      if (expression.type === "NewExpression" && expression.expression.children.some(($6) => $6?.type === "Call")) {
+        return expression;
+      }
+      if (expression.type === "MemberExpression" && !startsWithPredicate(expression, ($7) => $7.type === "ObjectExpression")) {
         return expression;
       }
     }
@@ -1205,7 +1243,7 @@ ${body}`;
     });
   }
   function checkValidLHS(node) {
-    let ref4;
+    let ref7;
     switch (node?.type) {
       case "UnaryExpression": {
         node.children.unshift({
@@ -1215,7 +1253,7 @@ ${body}`;
         return true;
       }
       case "CallExpression": {
-        const lastType = (ref4 = node.children)[ref4.length - 1]?.type;
+        const lastType = (ref7 = node.children)[ref7.length - 1]?.type;
         switch (lastType) {
           case "PropertyAccess":
           case "SliceExpression":
@@ -1263,8 +1301,8 @@ ${body}`;
       node.parent = parent;
     }
     if (depth && isParent(node)) {
-      for (let ref5 = node.children, i9 = 0, len9 = ref5.length; i9 < len9; i9++) {
-        const child = ref5[i9];
+      for (let ref8 = node.children, i9 = 0, len9 = ref8.length; i9 < len9; i9++) {
+        const child = ref8[i9];
         updateParentPointers(child, node, depth - 1);
       }
     }
@@ -1312,11 +1350,11 @@ ${body}`;
     const wrap = suffix.type === "ReturnTypeAnnotation";
     spliceChild(suffix, suffix.t, 1, suffix.t = [
       getTrimmingSpace(suffix.t),
-      wrap && "(",
+      wrap ? "(" : void 0,
       // TODO: avoid parens if unnecessary
       "undefined | ",
-      parenthesizeType(insertTrimmingSpace(suffix.t, "")),
-      wrap && ")"
+      parenthesizeType(trimFirstSpace(suffix.t)),
+      wrap ? ")" : void 0
     ]);
   }
   var typeNeedsNoParens = /* @__PURE__ */ new Set([
@@ -1330,7 +1368,11 @@ ${body}`;
     if (typeNeedsNoParens.has(type.type)) {
       return type;
     }
-    return ["(", type, ")"];
+    return makeNode({
+      type: "TypeParenthesized",
+      ts: true,
+      children: ["(", type, ")"]
+    });
   }
   function wrapIIFE(expressions, asyncFlag, generator) {
     let awaitPrefix;
@@ -1401,8 +1443,8 @@ ${body}`;
         children.splice(1, 0, ".bind(this)");
       }
       if (gatherRecursiveWithinFunction(block, (a2) => typeof a2 === "object" && a2 != null && "token" in a2 && a2.token === "arguments").length) {
-        let ref6;
-        children[children.length - 1] = (ref6 = parameters.children)[ref6.length - 1] = "(arguments)";
+        let ref9;
+        children[children.length - 1] = (ref9 = parameters.children)[ref9.length - 1] = "(arguments)";
       }
     }
     let exp = makeNode({
@@ -1429,13 +1471,16 @@ ${body}`;
     }
     return exp;
   }
-  function wrapWithReturn(expression) {
+  function wrapWithReturn(expression, parent = expression?.parent, semi = false) {
     const children = expression ? ["return ", expression] : ["return"];
+    if (semi) {
+      children.unshift(";");
+    }
     return makeNode({
       type: "ReturnStatement",
       children,
       expression,
-      parent: expression?.parent
+      parent
     });
   }
   function flatJoin(array, separator) {
@@ -1677,9 +1722,11 @@ ${body}`;
       if (l) {
         if (arrayElementHasTrailingComma(after[l - 1]))
           l++;
+        const elements2 = trimFirstSpace(after);
         blockPrefix = {
           type: "PostRestBindingElements",
-          children: ["[", trimFirstSpace(after), "] = ", restIdentifier, ".splice(-", l.toString(), ")"],
+          elements: elements2,
+          children: ["[", elements2, "] = ", restIdentifier, ".splice(-", l.toString(), ")"],
           names: after.flatMap((p) => p.names)
         };
       }
@@ -1717,13 +1764,14 @@ ${body}`;
           return;
         }
         if (opts?.injectParamProps && n.type === "Parameter" && n.accessModifier) {
-          n.names.forEach((id) => ({
-            push: thisAssignments2.push({
+          for (let ref1 = n.names, i2 = 0, len1 = ref1.length; i2 < len1; i2++) {
+            const id = ref1[i2];
+            thisAssignments2.push({
               type: "AssignmentExpression",
               children: [`this.${id} = `, id],
               js: true
-            })
-          }));
+            });
+          }
           return;
         }
         const { blockPrefix } = n;
@@ -1735,8 +1783,8 @@ ${body}`;
     return [splices, thisAssignments];
   }
   function arrayElementHasTrailingComma(elementNode) {
-    let ref1;
-    const lastChild = (ref1 = elementNode.children)[ref1.length - 1];
+    let ref2;
+    const lastChild = (ref2 = elementNode.children)[ref2.length - 1];
     return lastChild && lastChild[lastChild.length - 1]?.token === ",";
   }
   function gatherBindingPatternTypeSuffix(pattern) {
@@ -1748,8 +1796,8 @@ ${body}`;
       case "ArrayBindingPattern": {
         {
           const results = [];
-          for (let ref2 = pattern.elements, i2 = 0, len1 = ref2.length; i2 < len1; i2++) {
-            const elem = ref2[i2];
+          for (let ref3 = pattern.elements, i3 = 0, len22 = ref3.length; i3 < len22; i3++) {
+            const elem = ref3[i3];
             let { typeSuffix } = elem;
             typeSuffix ??= elem.binding?.typeSuffix;
             if (typeSuffix) {
@@ -1787,8 +1835,8 @@ ${body}`;
         {
           let restType;
           const results1 = [];
-          for (let ref3 = pattern.properties, i3 = 0, len22 = ref3.length; i3 < len22; i3++) {
-            const prop = ref3[i3];
+          for (let ref4 = pattern.properties, i4 = 0, len3 = ref4.length; i4 < len3; i4++) {
+            const prop = ref4[i4];
             let { typeSuffix } = prop;
             typeSuffix ??= prop.value?.typeSuffix;
             if (typeSuffix) {
@@ -1955,8 +2003,14 @@ ${body}`;
         // [indent, statement]
         preludeVar,
         moduloRef,
-        ts(": (a: number, b: number) => number"),
-        " = (a, b) => (a % b + b) % b"
+        " = ",
+        ts("("),
+        "(a",
+        ts(": number"),
+        ", b",
+        ts(": number"),
+        ") => (a % b + b) % b",
+        ts(") as ((a: number, b: number) => number) & ((a: bigint, b: bigint) => bigint)")
       ], ";\n"]);
     },
     Falsy(FalsyRef) {
@@ -2029,7 +2083,7 @@ ${body}`;
     AutoPromise(ref) {
       state.prelude.push([
         "",
-        ts(["type ", ref, "<T> = T extends Promise<unknown> ? T : Promise<T>"]),
+        ts(["type ", ref, "<T> = Promise<Awaited<T>>"]),
         ";\n"
       ]);
     },
@@ -2521,7 +2575,7 @@ ${js}`
     if (!Array.isArray(args)) {
       throw new Error("getTypeArguments could not find relevant array");
     }
-    return args.filter((a) => typeof a === "object" && a != null && "type" in a && a.type === "TypeArgument");
+    return args.filter((a1) => typeof a1 === "object" && a1 != null && "type" in a1 && a1.type === "TypeArgument");
   }
   function isVoidType(t) {
     return typeof t === "object" && t != null && "type" in t && t.type === "TypeLiteral" && "t" in t && typeof t.t === "object" && t.t != null && "type" in t.t && t.t.type === "VoidType";
@@ -2698,14 +2752,10 @@ ${js}`
     let ref1;
     if (!((ref1 = block.children)[ref1.length - 2]?.type === "ReturnStatement")) {
       let ref2;
-      const indent = getIndent((ref2 = block.expressions)[ref2.length - 1]) || ";";
+      const indent = getIndent((ref2 = block.expressions)[ref2.length - 1]);
       block.expressions.push([
-        [indent],
-        {
-          type: "ReturnStatement",
-          expression: ref,
-          children: ["return ", ref]
-        }
+        indent,
+        wrapWithReturn(ref, block, !indent)
       ]);
     }
     return true;
@@ -2717,34 +2767,103 @@ ${js}`
         const index = children.indexOf(pattern.elements);
         if (index < 0)
           throw new Error("failed to find elements in ArrayBindingPattern");
-        children[index] = pattern.elements.map((el) => {
-          const [ws, e, delim] = el.children;
-          return { ...el, children: [ws, patternAsValue(e), delim] };
-        });
-        return { ...pattern, children };
+        const elements = children[index] = pattern.elements.map(patternAsValue);
+        return { ...pattern, elements, children };
       }
       case "ObjectBindingPattern": {
         const children = [...pattern.children];
         const index = children.indexOf(pattern.properties);
         if (index < 0)
           throw new Error("failed to find properties in ArrayBindingPattern");
-        children[index] = pattern.properties.map(patternAsValue);
-        return { ...pattern, children };
+        const properties = children[index] = pattern.properties.map(patternAsValue);
+        return { ...pattern, properties, children };
       }
-      case "Identifier":
       case "BindingProperty": {
-        const children = [
-          // { name: value } = ... declares value, not name
-          pattern.value ?? pattern.name,
-          pattern.delim
-        ];
-        if (isWhitespaceOrEmpty(pattern.children[0])) {
-          children.unshift(pattern.children[0]);
+        let children;
+        if (pattern.value?.type === "Identifier") {
+          children = [pattern.value, pattern.delim];
+          if (isWhitespaceOrEmpty(pattern.children[0])) {
+            children.unshift(pattern.children[0]);
+          }
+        } else {
+          children = [...pattern.children];
+          if (pattern.initializer != null) {
+            const index = children.indexOf(pattern.initializer);
+            assert.notEqual(index, -1, "failed to find initializer in BindingElement");
+            children.splice(index, 1);
+          }
+          if (pattern.value != null) {
+            children = children.map(($2) => $2 === pattern.value ? patternAsValue(pattern.value) : $2);
+          }
         }
         return { ...pattern, children };
       }
-      default:
+      case "AtBindingProperty": {
+        const children = [...pattern.children];
+        if (pattern.initializer != null) {
+          const index = children.indexOf(pattern.initializer);
+          assert.notEqual(index, -1, "failed to find initializer in AtBindingProperty");
+          children.splice(index, 1);
+        }
+        return { ...pattern, children };
+      }
+      case "BindingElement": {
+        const children = [...pattern.children];
+        if (pattern.initializer != null) {
+          const index2 = children.indexOf(pattern.initializer);
+          assert.notEqual(index2, -1, "failed to find initializer in BindingElement");
+          children.splice(index2, 1);
+        }
+        const index = children.indexOf(pattern.binding);
+        assert.notEqual(index, -1, "failed to find binding in BindingElement");
+        children[index] = patternAsValue(pattern.binding);
+        return { ...pattern, children };
+      }
+      default: {
         return pattern;
+      }
+    }
+  }
+  function patternBindings(pattern) {
+    const bindings = [];
+    recurse(pattern);
+    return bindings;
+    function recurse(pattern2) {
+      switch (pattern2.type) {
+        case "ArrayBindingPattern": {
+          for (let ref3 = pattern2.elements, i2 = 0, len1 = ref3.length; i2 < len1; i2++) {
+            const element = ref3[i2];
+            recurse(element);
+          }
+          ;
+          break;
+        }
+        case "ObjectBindingPattern": {
+          for (let ref4 = pattern2.properties, i3 = 0, len22 = ref4.length; i3 < len22; i3++) {
+            const property = ref4[i3];
+            recurse(property);
+          }
+          ;
+          break;
+        }
+        case "BindingElement": {
+          recurse(pattern2.binding);
+          break;
+        }
+        case "BindingProperty": {
+          recurse(pattern2.value ?? pattern2.name);
+          break;
+        }
+        case "Binding": {
+          recurse(pattern2.pattern);
+          break;
+        }
+        case "Identifier":
+        case "AtBinding": {
+          bindings.push(pattern2);
+          break;
+        }
+      }
     }
   }
   function assignResults(node, collect) {
@@ -2753,8 +2872,8 @@ ${js}`
     switch (node.type) {
       case "BlockStatement":
         if (node.expressions.length) {
-          let ref3;
-          assignResults((ref3 = node.expressions)[ref3.length - 1], collect);
+          let ref5;
+          assignResults((ref5 = node.expressions)[ref5.length - 1], collect);
         } else {
           node.expressions.push(["", collect("void 0"), ";"]);
         }
@@ -2789,7 +2908,7 @@ ${js}`
     if (exp.type === "LabelledStatement") {
       exp = exp.statement;
     }
-    let ref4;
+    let ref6;
     switch (exp.type) {
       case "BreakStatement":
       case "ContinueStatement":
@@ -2800,14 +2919,14 @@ ${js}`
         return;
       }
       case "Declaration": {
-        let ref5;
+        let ref7;
         if (exp.bindings?.length) {
-          ref5 = patternAsValue((ref4 = exp.bindings)[ref4.length - 1].pattern);
+          ref7 = patternAsValue((ref6 = exp.bindings)[ref6.length - 1].pattern);
         } else {
-          ref5 = "void 0";
+          ref7 = "void 0";
         }
         ;
-        const value = ref5;
+        const value = ref7;
         exp.children.push([
           "",
           [";", collect(value)]
@@ -2855,11 +2974,17 @@ ${js}`
         return;
       }
       case "SwitchStatement": {
-        assignResults(exp.children[2], collect);
+        for (let ref8 = exp.caseBlock.clauses, i4 = 0, len3 = ref8.length; i4 < len3; i4++) {
+          const clause = ref8[i4];
+          assignResults(clause, collect);
+        }
         return;
       }
       case "TryStatement": {
-        exp.blocks.forEach((block) => assignResults(block, collect));
+        for (let ref9 = exp.blocks, i5 = 0, len4 = ref9.length; i5 < len4; i5++) {
+          const block = ref9[i5];
+          assignResults(block, collect);
+        }
         return;
       }
     }
@@ -2880,20 +3005,28 @@ ${js}`
           const last = node.expressions[node.expressions.length - 1];
           insertReturn(last);
         } else {
-          if (node.parent.type === "CatchClause") {
-            node.expressions.push(["return"]);
+          let m1;
+          if (m1 = node.parent?.type, m1 === "CatchClause" || m1 === "WhenClause") {
+            node.expressions.push(["", wrapWithReturn(void 0, node)]);
           }
         }
         return;
       }
       case "WhenClause": {
         if (node.break) {
-          node.children.splice(node.children.indexOf(node.break), 1);
+          const breakIndex = node.children.indexOf(node.break);
+          assert.notEqual(breakIndex, -1, "Could not find break in when clause");
+          node.children.splice(breakIndex, 1);
+          node.break = void 0;
         }
-        if (node.block.expressions.length) {
-          insertReturn(node.block);
-        } else {
-          node.block.expressions.push(wrapWithReturn());
+        insertReturn(node.block);
+        if (!isExit(node.block)) {
+          const comment = hasTrailingComment(node.block.expressions);
+          let ref10;
+          node.block.expressions.push([
+            comment ? (ref10 = node.block.expressions)[ref10.length - 1][0] || "\n" : "",
+            wrapWithReturn(void 0, node, !comment)
+          ]);
         }
         return;
       }
@@ -2918,7 +3051,7 @@ ${js}`
     if (exp.type === "LabelledStatement") {
       exp = exp.statement;
     }
-    let ref6;
+    let ref11;
     switch (exp.type) {
       case "BreakStatement":
       case "ContinueStatement":
@@ -2929,27 +3062,30 @@ ${js}`
         return;
       }
       case "Declaration": {
-        let ref7;
+        let ref12;
         if (exp.bindings?.length) {
-          ref7 = [" ", patternAsValue((ref6 = exp.bindings)[ref6.length - 1].pattern)];
+          ref12 = [" ", patternAsValue((ref11 = exp.bindings)[ref11.length - 1].pattern)];
         } else {
-          ref7 = [];
+          ref12 = [];
         }
         ;
-        const value = ref7;
+        const value = ref12;
         const parent = outer.parent;
         const index = findChildIndex(parent?.expressions, outer);
         assert.notEqual(index, -1, "Could not find declaration in parent");
-        parent.expressions.splice(index + 1, 0, ["", {
-          type: "ReturnStatement",
-          expression: value,
-          children: [
-            !(parent.expressions[index][2] === ";") ? ";" : void 0,
-            "return",
-            value
-          ],
-          parent: exp
-        }]);
+        parent.expressions.splice(index + 1, 0, [
+          "",
+          {
+            type: "ReturnStatement",
+            expression: value,
+            children: [
+              !(parent.expressions[index][2] === ";") ? ";" : void 0,
+              "return",
+              value
+            ],
+            parent: exp
+          }
+        ]);
         braceBlock(parent);
         return;
       }
@@ -2960,12 +3096,7 @@ ${js}`
           assert.notEqual(index, -1, "Could not find function declaration in parent");
           parent.expressions.splice(index + 1, 0, [
             "",
-            {
-              type: "ReturnStatement",
-              expression: exp.id,
-              children: [";return ", exp.id],
-              parent: exp
-            }
+            wrapWithReturn(exp.id, exp, true)
           ]);
           braceBlock(parent);
           return;
@@ -2988,12 +3119,11 @@ ${js}`
         if (exp.else)
           insertReturn(exp.else.block);
         else
-          exp.children.push(["", {
-            type: "ReturnStatement",
-            // NOTE: add a prefixed semi-colon because the if block may not be braced
-            children: [";return"],
-            parent: exp
-          }]);
+          exp.children.push([
+            "",
+            // NOTE: add a prefixed semicolon because the if block may not be braced
+            wrapWithReturn(void 0, exp, true)
+          ]);
         return;
       }
       case "PatternMatchingStatement": {
@@ -3001,30 +3131,30 @@ ${js}`
         return;
       }
       case "SwitchStatement": {
-        insertSwitchReturns(exp);
+        for (let ref13 = exp.caseBlock.clauses, i6 = 0, len5 = ref13.length; i6 < len5; i6++) {
+          const clause = ref13[i6];
+          insertReturn(clause);
+        }
         return;
       }
       case "TryStatement": {
-        exp.blocks.forEach((block) => insertReturn(block));
+        for (let ref14 = exp.blocks, i7 = 0, len6 = ref14.length; i7 < len6; i7++) {
+          const block = ref14[i7];
+          insertReturn(block);
+        }
         return;
       }
     }
     if (node[node.length - 1]?.type === "SemicolonDelimiter") {
       return;
     }
-    const returnStatement = wrapWithReturn(node[1]);
-    node.splice(1, 1, returnStatement);
-  }
-  function insertSwitchReturns(exp) {
-    exp.caseBlock.clauses.forEach((clause) => {
-      return insertReturn(clause);
-    });
+    node[1] = wrapWithReturn(node[1]);
   }
   function processBreakContinueWith(statement) {
     let changed = false;
     for (const control of gatherRecursiveWithinFunction(
       statement.block,
-      ($2) => $2.type === "BreakStatement" || $2.type === "ContinueStatement"
+      ($3) => $3.type === "BreakStatement" || $3.type === "ContinueStatement"
     )) {
       let controlName2 = function() {
         switch (control.type) {
@@ -3039,8 +3169,8 @@ ${js}`
       var controlName = controlName2;
       if (control.with) {
         if (control.label) {
-          let m1;
-          if (!(m1 = statement.parent, typeof m1 === "object" && m1 != null && "type" in m1 && m1.type === "LabelledStatement" && "label" in m1 && typeof m1.label === "object" && m1.label != null && "name" in m1.label && m1.label.name === control.label.name)) {
+          let m2;
+          if (!(m2 = statement.parent, typeof m2 === "object" && m2 != null && "type" in m2 && m2.type === "LabelledStatement" && "label" in m2 && typeof m2.label === "object" && m2.label != null && "name" in m2.label && m2.label.name === control.label.name)) {
             continue;
           }
         } else {
@@ -3059,7 +3189,7 @@ ${js}`
           )
         );
         updateParentPointers(control.with, control);
-        const i = control.children.findIndex(($3) => $3?.type === "Error");
+        const i = control.children.findIndex(($4) => $4?.type === "Error");
         if (i >= 0) {
           control.children.splice(i, 1);
         }
@@ -3101,7 +3231,7 @@ ${js}`
     }
     const resultsRef = statement.resultsRef = makeRef("results");
     const declaration = iterationDeclaration(statement);
-    const { ancestor, child } = findAncestor(statement, ($4) => $4.type === "BlockStatement");
+    const { ancestor, child } = findAncestor(statement, ($5) => $5.type === "BlockStatement");
     assert.notNull(ancestor, `Could not find block containing ${statement.type}`);
     const index = findChildIndex(ancestor.expressions, child);
     assert.notEqual(index, -1, `Could not find ${statement.type} in containing block`);
@@ -3154,6 +3284,9 @@ ${js}`
           case "product": {
             return "1";
           }
+          case "join": {
+            return '""';
+          }
           default: {
             return "0";
           }
@@ -3198,7 +3331,8 @@ ${js}`
             case "count": {
               return ["if (", node, ") ++", resultsRef];
             }
-            case "sum": {
+            case "sum":
+            case "join": {
               return [resultsRef, " += ", node];
             }
             case "product": {
@@ -3223,9 +3357,9 @@ ${js}`
     }
     const reduction = statement.type === "ForStatement" && statement.reduction;
     function fillBlock(expression) {
-      let ref8;
-      let m2;
-      if (m2 = (ref8 = block.expressions)[ref8.length - 1], Array.isArray(m2) && m2.length >= 2 && typeof m2[1] === "object" && m2[1] != null && "type" in m2[1] && m2[1].type === "EmptyStatement" && "implicit" in m2[1] && m2[1].implicit === true) {
+      let ref15;
+      let m3;
+      if (m3 = (ref15 = block.expressions)[ref15.length - 1], Array.isArray(m3) && m3.length >= 2 && typeof m3[1] === "object" && m3[1] != null && "type" in m3[1] && m3[1].type === "EmptyStatement" && "implicit" in m3[1] && m3[1].implicit === true) {
         block.expressions.pop();
       }
       block.expressions.push(expression);
@@ -3255,7 +3389,29 @@ ${js}`
       }
     }
     if (statement.type === "ForStatement" && statement.declaration?.type === "ForDeclaration") {
-      fillBlock(["", patternAsValue(statement.declaration.binding)]);
+      if (reduction) {
+        const bindings = patternBindings(statement.declaration.binding.pattern);
+        if (bindings.length) {
+          fillBlock(["", bindings[0]]);
+          for (const binding of bindings.slice(1)) {
+            binding.children.unshift({
+              type: "Error",
+              subtype: "Warning",
+              message: "Ignored binding in reduction loop with implicit body"
+            });
+          }
+        } else {
+          fillBlock([
+            "",
+            {
+              type: "Error",
+              message: "Empty binding pattern in reduction loop with implicit body"
+            }
+          ]);
+        }
+      } else {
+        fillBlock(["", patternAsValue(statement.declaration.binding.pattern)]);
+      }
       block.empty = false;
     }
     return false;
@@ -3283,28 +3439,33 @@ ${js}`
       injectParamProps: isConstructor
     });
     if (isConstructor) {
-      const { ancestor } = findAncestor(f, ($5) => $5.type === "ClassExpression");
+      const { ancestor } = findAncestor(f, ($6) => $6.type === "ClassExpression");
       if (ancestor != null) {
-        const fields = new Set(gatherRecursiveWithinFunction(ancestor, ($6) => $6.type === "FieldDefinition").map(($7) => $7.id).filter((a1) => typeof a1 === "object" && a1 != null && "type" in a1 && a1.type === "Identifier").map(($8) => $8.name));
+        const fields = new Set(gatherRecursiveWithinFunction(ancestor, ($7) => $7.type === "FieldDefinition").map(($8) => $8.id).filter((a2) => typeof a2 === "object" && a2 != null && "type" in a2 && a2.type === "Identifier").map(($9) => $9.name));
         const classExpressions = ancestor.body.expressions;
         let index = findChildIndex(classExpressions, f);
         assert.notEqual(index, -1, "Could not find constructor in class");
-        let m3;
-        while (m3 = classExpressions[index - 1]?.[1], typeof m3 === "object" && m3 != null && "type" in m3 && m3.type === "MethodDefinition" && "name" in m3 && m3.name === "constructor") {
+        let m4;
+        while (m4 = classExpressions[index - 1]?.[1], typeof m4 === "object" && m4 != null && "type" in m4 && m4.type === "MethodDefinition" && "name" in m4 && m4.name === "constructor") {
           index--;
         }
         const fStatement = classExpressions[index];
-        for (let ref9 = gatherRecursive(parameters, ($9) => $9.type === "Parameter"), i2 = 0, len1 = ref9.length; i2 < len1; i2++) {
-          const parameter = ref9[i2];
-          if (!parameter.typeSuffix) {
+        for (let ref16 = gatherRecursive(parameters, ($10) => $10.type === "Parameter"), i8 = 0, len7 = ref16.length; i8 < len7; i8++) {
+          const parameter = ref16[i8];
+          const { accessModifier } = parameter;
+          if (!(accessModifier || parameter.typeSuffix)) {
             continue;
           }
-          for (let ref10 = gatherRecursive(parameter, ($10) => $10.type === "AtBinding"), i3 = 0, len22 = ref10.length; i3 < len22; i3++) {
-            const binding = ref10[i3];
+          for (let ref17 = gatherRecursive(parameter, ($11) => $11.type === "AtBinding"), i9 = 0, len8 = ref17.length; i9 < len8; i9++) {
+            const binding = ref17[i9];
             const typeSuffix = binding.parent?.typeSuffix;
-            if (!typeSuffix) {
+            if (!(accessModifier || typeSuffix)) {
               continue;
             }
+            if (parameter.accessModifier) {
+              replaceNode(parameter.accessModifier, void 0);
+              parameter.accessModifier = void 0;
+            }
             const id = binding.ref.id;
             if (fields.has(id)) {
               continue;
@@ -3313,7 +3474,7 @@ ${js}`
               type: "FieldDefinition",
               id,
               typeSuffix,
-              children: [id, typeSuffix]
+              children: [accessModifier, id, typeSuffix]
             }, ";"]);
             fStatement[0] = "";
           }
@@ -3337,10 +3498,10 @@ ${js}`
     if (isConstructor) {
       const superCalls = gatherNodes(
         expressions,
-        (a2) => typeof a2 === "object" && a2 != null && "type" in a2 && a2.type === "CallExpression" && "children" in a2 && Array.isArray(a2.children) && a2.children.length >= 1 && typeof a2.children[0] === "object" && a2.children[0] != null && "token" in a2.children[0] && a2.children[0].token === "super"
+        (a3) => typeof a3 === "object" && a3 != null && "type" in a3 && a3.type === "CallExpression" && "children" in a3 && Array.isArray(a3.children) && a3.children.length >= 1 && typeof a3.children[0] === "object" && a3.children[0] != null && "token" in a3.children[0] && a3.children[0].token === "super"
       );
       if (superCalls.length) {
-        const { child } = findAncestor(superCalls[0], (a3) => a3 === block);
+        const { child } = findAncestor(superCalls[0], (a4) => a4 === block);
         const index = findChildIndex(expressions, child);
         if (index < 0) {
           throw new Error("Could not find super call within top-level expressions");
@@ -3355,21 +3516,33 @@ ${js}`
   function processSignature(f) {
     const { block, signature } = f;
     if (!f.async?.length && hasAwait(block)) {
-      f.async.push("async ");
-      signature.modifier.async = true;
-    }
-    if (!f.generator?.length && hasYield(block)) {
-      if (f.type === "ArrowFunction") {
-        gatherRecursiveWithinFunction(block, ($11) => $11.type === "YieldExpression").forEach((y) => {
-          const i = y.children.findIndex(($12) => $12.type === "Yield");
-          return y.children.splice(i + 1, 0, {
+      if (f.async != null) {
+        f.async.push("async ");
+        signature.modifier.async = true;
+      } else {
+        for (let ref18 = gatherRecursiveWithinFunction(block, ($12) => $12.type === "Await"), i10 = 0, len9 = ref18.length; i10 < len9; i10++) {
+          const a = ref18[i10];
+          const i = findChildIndex(a.parent, a);
+          a.parent.children.splice(i + 1, 0, {
             type: "Error",
-            message: "Can't use yield inside of => arrow function"
+            message: `await invalid in ${signature.modifier.get ? "getter" : signature.modifier.set ? "setter" : signature.name}`
           });
-        });
-      } else {
+        }
+      }
+    }
+    if (!f.generator?.length && hasYield(block)) {
+      if (f.generator != null) {
         f.generator.push("*");
         signature.modifier.generator = true;
+      } else {
+        for (let ref19 = gatherRecursiveWithinFunction(block, ($13) => $13.type === "YieldExpression"), i11 = 0, len10 = ref19.length; i11 < len10; i11++) {
+          const y = ref19[i11];
+          const i = y.children.findIndex(($14) => $14.type === "Yield");
+          y.children.splice(i + 1, 0, {
+            type: "Error",
+            message: `yield invalid in ${f.type === "ArrowFunction" ? "=> arrow function" : signature.modifier.get ? "getter" : signature.modifier.set ? "setter" : signature.name}`
+          });
+        }
       }
     }
     if (signature.modifier.async && !signature.modifier.generator && signature.returnType && !isPromiseType(signature.returnType.t)) {
@@ -3377,21 +3550,15 @@ ${js}`
     }
   }
   function processFunctions(statements, config2) {
-    for (let ref11 = gatherRecursiveAll(statements, ($13) => $13.type === "FunctionExpression" || $13.type === "ArrowFunction"), i4 = 0, len3 = ref11.length; i4 < len3; i4++) {
-      const f = ref11[i4];
-      if (f.type === "FunctionExpression") {
+    for (let ref20 = gatherRecursiveAll(statements, ($15) => $15.type === "FunctionExpression" || $15.type === "ArrowFunction" || $15.type === "MethodDefinition"), i12 = 0, len11 = ref20.length; i12 < len11; i12++) {
+      const f = ref20[i12];
+      if (f.type === "FunctionExpression" || f.type === "MethodDefinition") {
         implicitFunctionBlock(f);
       }
       processSignature(f);
       processParams(f);
       processReturn(f, config2.implicitReturns);
     }
-    for (let ref12 = gatherRecursiveAll(statements, ($14) => $14.type === "MethodDefinition"), i5 = 0, len4 = ref12.length; i5 < len4; i5++) {
-      const f = ref12[i5];
-      implicitFunctionBlock(f);
-      processParams(f);
-      processReturn(f, config2.implicitReturns);
-    }
   }
   function expressionizeIteration(exp) {
     let { async, generator, block, children, statement } = exp;
@@ -3440,9 +3607,9 @@ ${js}`
     }
     let done;
     if (!async) {
-      let ref13;
-      if ((ref13 = blockContainingStatement(exp)) && typeof ref13 === "object" && "block" in ref13 && "index" in ref13) {
-        const { block: parentBlock, index } = ref13;
+      let ref21;
+      if ((ref21 = blockContainingStatement(exp)) && typeof ref21 === "object" && "block" in ref21 && "index" in ref21) {
+        const { block: parentBlock, index } = ref21;
         statements[0][0] = parentBlock.expressions[index][0];
         parentBlock.expressions.splice(index, index + 1 - index, ...statements);
         updateParentPointers(parentBlock);
@@ -3459,8 +3626,8 @@ ${js}`
     }
   }
   function processIterationExpressions(statements) {
-    for (let ref14 = gatherRecursiveAll(statements, ($15) => $15.type === "IterationExpression"), i6 = 0, len5 = ref14.length; i6 < len5; i6++) {
-      const s = ref14[i6];
+    for (let ref22 = gatherRecursiveAll(statements, ($16) => $16.type === "IterationExpression"), i13 = 0, len12 = ref22.length; i13 < len12; i13++) {
+      const s = ref22[i13];
       expressionizeIteration(s);
     }
   }
@@ -3486,21 +3653,21 @@ ${js}`
         ...parameters,
         children: (() => {
           const results1 = [];
-          for (let ref15 = parameters.children, i7 = 0, len6 = ref15.length; i7 < len6; i7++) {
-            let parameter = ref15[i7];
+          for (let ref23 = parameters.children, i14 = 0, len13 = ref23.length; i14 < len13; i14++) {
+            let parameter = ref23[i14];
             if (typeof parameter === "object" && parameter != null && "type" in parameter && parameter.type === "Parameter") {
-              let ref16;
-              if (ref16 = parameter.initializer) {
-                const initializer = ref16;
+              let ref24;
+              if (ref24 = parameter.initializer) {
+                const initializer = ref24;
                 args.push(initializer.expression, parameter.delim);
                 parameter = {
                   ...parameter,
                   initializer: void 0,
-                  children: parameter.children.filter((a4) => a4 !== initializer)
+                  children: parameter.children.filter((a5) => a5 !== initializer)
                 };
               } else {
                 args.push(parameter.children.filter(
-                  (a5) => a5 !== parameter.typeSuffix
+                  (a6) => a6 !== parameter.typeSuffix
                 ));
               }
             }
@@ -3512,7 +3679,7 @@ ${js}`
       expression = {
         ...expression,
         parameters: newParameters,
-        children: expression.children.map(($16) => $16 === parameters ? newParameters : $16)
+        children: expression.children.map(($17) => $17 === parameters ? newParameters : $17)
       };
     }
     return {
@@ -3534,7 +3701,7 @@ ${js}`
       ref = makeRef("$");
       inplacePrepend(ref, body);
     }
-    if (startsWithPredicate(body, ($17) => $17.type === "ObjectExpression")) {
+    if (startsWithPredicate(body, ($18) => $18.type === "ObjectExpression")) {
       body = makeLeftHandSideExpression(body);
     }
     const parameters = makeNode({
@@ -3573,7 +3740,7 @@ ${js}`
     }
     if (gatherRecursiveWithinFunction(
       block,
-      (a6) => a6 === ref
+      (a7) => a7 === ref
     ).length > 1) {
       fn.ampersandBlock = false;
     }
@@ -4140,7 +4307,7 @@ ${js}`
   // source/parser/pattern-matching.civet
   function processPatternTest(lhs, patterns) {
     const { ref, refAssignmentComma } = maybeRefAssignment(lhs, "m");
-    const conditionExpression = flatJoin(patterns.map(($) => getPatternConditions($, ref)).map(($1) => flatJoin($1, " && ")), " || ");
+    const conditionExpression = flatJoin(patterns.map(($1) => getPatternConditions($1, ref)).map(($2) => flatJoin($2, " && ")), " || ");
     return makeLeftHandSideExpression(makeNode({
       type: "PatternTest",
       children: [
@@ -4150,7 +4317,7 @@ ${js}`
     }));
   }
   function processPatternMatching(statements) {
-    gatherRecursiveAll(statements, ($2) => $2.type === "SwitchStatement").forEach((s) => {
+    gatherRecursiveAll(statements, ($3) => $3.type === "SwitchStatement").forEach((s) => {
       const { caseBlock } = s;
       const { clauses } = caseBlock;
       for (let i1 = 0, len3 = clauses.length; i1 < len3; i1++) {
@@ -4164,7 +4331,7 @@ ${js}`
       }
       let errors = false;
       let isPattern = false;
-      if (clauses.some(($3) => $3.type === "PatternClause")) {
+      if (clauses.some(($4) => $4.type === "PatternClause")) {
         isPattern = true;
         for (let i2 = 0, len1 = clauses.length; i2 < len1; i2++) {
           const c = clauses[i2];
@@ -4202,7 +4369,7 @@ ${js}`
         }
         let { patterns, block } = c;
         let pattern = patterns[0];
-        const conditionExpression = flatJoin(patterns.map(($4) => getPatternConditions($4, ref)).map(($5) => flatJoin($5, " && ")), " || ");
+        const conditionExpression = flatJoin(patterns.map(($5) => getPatternConditions($5, ref)).map(($6) => flatJoin($6, " && ")), " || ");
         const condition2 = makeNode({
           type: "ParenthesizedExpression",
           children: ["(", ...refAssignmentComma, conditionExpression, ")"],
@@ -4395,38 +4562,59 @@ ${js}`
       }
     }
     let [splices, thisAssignments] = gatherBindingCode(pattern);
-    const patternBindings = nonMatcherBindings(pattern);
+    const patternBindings2 = nonMatcherBindings(pattern);
     splices = splices.map((s) => [", ", nonMatcherBindings(s)]);
-    thisAssignments = thisAssignments.map(($6) => ["", $6, ";"]);
-    const duplicateDeclarations = aggregateDuplicateBindings([patternBindings, splices]);
+    thisAssignments = thisAssignments.map(($7) => ["", $7, ";"]);
+    const duplicateDeclarations = aggregateDuplicateBindings([patternBindings2, splices]);
     return [
       ["", {
         type: "Declaration",
-        children: [decl, patternBindings, suffix, " = ", ref, ...splices],
+        children: [decl, patternBindings2, suffix, " = ", ref, ...splices],
         names: [],
         bindings: []
         // avoid implicit return of any bindings
       }, ";"],
       ...thisAssignments,
-      ...duplicateDeclarations.map(($7) => ["", $7, ";"])
+      ...duplicateDeclarations.map(($8) => ["", $8, ";"])
     ];
   }
   function elideMatchersFromArrayBindings(elements) {
-    return elements.map((el) => {
-      if (el.type === "BindingRestElement") {
-        return ["", el, void 0];
-      }
-      const { children: [ws, e, delim] } = el;
-      switch (e.type) {
-        case "Literal":
-        case "RegularExpressionLiteral":
-        case "StringLiteral":
-        case "PinPattern":
-          return delim;
-        default:
-          return [ws, nonMatcherBindings(e), delim];
+    const results = [];
+    for (let i5 = 0, len4 = elements.length; i5 < len4; i5++) {
+      const element = elements[i5];
+      switch (element.type) {
+        case "BindingRestElement":
+        case "ElisionElement": {
+          results.push(element);
+          break;
+        }
+        case "BindingElement": {
+          switch (element.binding.type) {
+            case "Literal":
+            case "RegularExpressionLiteral":
+            case "StringLiteral":
+            case "PinPattern": {
+              results.push(element.delim);
+              break;
+            }
+            default: {
+              const binding = nonMatcherBindings(element.binding);
+              results.push(makeNode({
+                ...element,
+                binding,
+                children: element.children.map((c) => {
+                  return c === element.binding ? binding : c;
+                })
+              }));
+            }
+          }
+          ;
+          break;
+        }
       }
-    });
+    }
+    ;
+    return results;
   }
   function elideMatchersFromPropertyBindings(properties) {
     return properties.map((p) => {
@@ -4434,6 +4622,10 @@ ${js}`
         case "BindingProperty": {
           const { children, name, value } = p;
           const [ws] = children;
+          const shouldElide = name.type === "NumericLiteral" && !value?.name || name.type === "ComputedPropertyName" && value?.subtype === "NumericLiteral";
+          if (shouldElide) {
+            return;
+          }
           switch (value && value.type) {
             case "ArrayBindingPattern":
             case "ObjectBindingPattern": {
@@ -4465,32 +4657,22 @@ ${js}`
   }
   function nonMatcherBindings(pattern) {
     switch (pattern.type) {
-      case "ArrayBindingPattern": {
+      case "ArrayBindingPattern":
+      case "PostRestBindingElements": {
         const elements = elideMatchersFromArrayBindings(pattern.elements);
-        return {
+        return makeNode({
           ...pattern,
           elements,
-          children: pattern.children.map(($8) => $8 === pattern.elements ? elements : $8)
-        };
-      }
-      case "PostRestBindingElements": {
-        const els = elideMatchersFromArrayBindings(pattern.children[1]);
-        return {
-          ...pattern,
-          children: [
-            pattern.children[0],
-            els,
-            ...pattern.children.slice(2)
-          ]
-        };
+          children: pattern.children.map(($9) => $9 === pattern.elements ? elements : $9)
+        });
       }
       case "ObjectBindingPattern": {
         const properties = elideMatchersFromPropertyBindings(pattern.properties);
-        return {
+        return makeNode({
           ...pattern,
           properties,
-          children: pattern.children.map(($9) => $9 === pattern.properties ? properties : $9)
-        };
+          children: pattern.children.map(($10) => $10 === pattern.properties ? properties : $10)
+        });
       }
       default: {
         return pattern;
@@ -4498,32 +4680,26 @@ ${js}`
     }
   }
   function aggregateDuplicateBindings(bindings) {
-    const props = gatherRecursiveAll(bindings, ($10) => $10.type === "BindingProperty");
-    const arrayBindings = gatherRecursiveAll(bindings, ($11) => $11.type === "ArrayBindingPattern");
-    for (let i5 = 0, len4 = arrayBindings.length; i5 < len4; i5++) {
-      const { elements } = arrayBindings[i5];
-      for (let i6 = 0, len5 = elements.length; i6 < len5; i6++) {
-        const element = elements[i6];
-        if (Array.isArray(element)) {
-          const [, e] = element;
-          if (e.type === "Identifier") {
-            props.push(e);
-          } else if (e.type === "BindingRestElement") {
-            props.push(e);
-          }
-        }
-      }
-    }
+    const props = gatherRecursiveAll(
+      bindings,
+      ($) => $.type === "BindingProperty" || // Don't deduplicate ...rest properties; user should do so manually
+      // because ...rest can be named arbitrarily
+      //$.type is "BindingRestProperty"
+      $.type === "Identifier" && $.parent?.type === "BindingElement" || $.type === "BindingRestElement"
+    );
     const declarations = [];
     const propsGroupedByName = /* @__PURE__ */ new Map();
-    for (let i7 = 0, len6 = props.length; i7 < len6; i7++) {
-      const p = props[i7];
+    for (let i6 = 0, len5 = props.length; i6 < len5; i6++) {
+      const p = props[i6];
       const { name, value } = p;
       let m1;
       if (m1 = value?.type, m1 === "ArrayBindingPattern" || m1 === "ObjectBindingPattern") {
         continue;
       }
       const key = value?.name || name?.name || name;
+      if (key?.type === "NumericLiteral" || key?.type === "ComputedPropertyName") {
+        continue;
+      }
       if (propsGroupedByName.has(key)) {
         propsGroupedByName.get(key).push(p);
       } else {
@@ -4539,8 +4715,8 @@ ${js}`
         pos: 0,
         input: key
       })) {
-        for (let i8 = 0, len7 = shared.length; i8 < len7; i8++) {
-          const p = shared[i8];
+        for (let i7 = 0, len6 = shared.length; i7 < len6; i7++) {
+          const p = shared[i7];
           aliasBinding(p, makeRef(`_${key}`, key));
         }
         return;
@@ -5241,7 +5417,6 @@ ${js}`
 
   // source/parser/pipe.civet
   function constructInvocation(fn, arg) {
-    const fnArr = [fn.leadingComment, fn.expr, fn.trailingComment];
     let expr = fn.expr;
     while (expr.type === "ParenthesizedExpression") {
       expr = expr.expression;
@@ -5258,22 +5433,46 @@ ${js}`
       });
     }
     expr = fn.expr;
-    const lhs = makeLeftHandSideExpression(expr);
+    let lhs = expr;
+    if (!(lhs.type === "NewExpression")) {
+      lhs = makeLeftHandSideExpression(lhs);
+    }
     let comment = skipIfOnlyWS(fn.trailingComment);
     if (comment)
-      lhs.children.splice(2, 0, comment);
+      lhs.children.push(comment);
     comment = skipIfOnlyWS(fn.leadingComment);
     if (comment)
       lhs.children.splice(1, 0, comment);
     switch (arg.type) {
-      case "CommaExpression":
+      case "CommaExpression": {
         arg = makeLeftHandSideExpression(arg);
         break;
+      }
     }
-    return {
-      type: "CallExpression",
-      children: [lhs, "(", arg, ")"]
+    const args = [arg];
+    const call = {
+      type: "Call",
+      args,
+      children: ["(", args, ")"]
     };
+    if (lhs.type === "NewExpression") {
+      let { expression } = lhs;
+      expression = {
+        ...expression,
+        type: "CallExpression",
+        children: [...expression.children, call]
+      };
+      return {
+        ...lhs,
+        expression,
+        children: lhs.children.map(($) => $ === lhs.expression ? expression : $)
+      };
+    } else {
+      return {
+        type: "CallExpression",
+        children: [lhs, call]
+      };
+    }
   }
   function constructPipeStep(fn, arg, returning) {
     if (!returning) {
@@ -5320,21 +5519,24 @@ ${js}`
       let i = 0, l = body.length;
       const children = [ws];
       let usingRef = null;
-      for (i = 0; i < l; i++) {
-        const step = body[i];
+      for (let i1 = 0, len3 = body.length; i1 < len3; i1++) {
+        const i2 = i1;
+        const step = body[i1];
         const [leadingComment, pipe, trailingComment, expr] = step;
         const returns = pipe.token === "||>";
         let ref, result, returning = returns ? arg : null;
         if (pipe.token === "|>=") {
           let initRef;
-          if (i === 0) {
+          if (i2 === 0) {
             checkValidLHS(arg);
             outer:
               switch (arg.type) {
-                case "MemberExpression":
-                  if (arg.children.length <= 2)
+                case "MemberExpression": {
+                  if (arg.children.length <= 2) {
                     break;
-                case "CallExpression":
+                  }
+                }
+                case "CallExpression": {
                   const access = arg.children.pop();
                   usingRef = makeRef();
                   initRef = {
@@ -5346,6 +5548,7 @@ ${js}`
                     children: [usingRef, access]
                   };
                   break;
+                }
               }
             const lhs = [[
               [initRef],
@@ -5374,7 +5577,7 @@ ${js}`
             });
           }
         } else {
-          if (i === 0)
+          if (i2 === 0)
             s.children = children;
         }
         if (returns && (ref = needsRef(arg))) {
@@ -5399,7 +5602,7 @@ ${js}`
           returning
         );
         if (result.type === "ReturnStatement") {
-          if (i < l - 1) {
+          if (i2 < l - 1) {
             result.children.push({
               type: "Error",
               message: "Can't continue a pipeline after returning"
@@ -5427,7 +5630,7 @@ ${js}`
         };
       }
       children.push(arg);
-      if (!children.some(($) => $?.type === "ReturnStatement") && children.some(($1) => $1 === ",")) {
+      if (!children.some(($1) => $1?.type === "ReturnStatement") && children.some(($2) => $2 === ",")) {
         const { parent } = s;
         const parenthesizedExpression = makeLeftHandSideExpression({ ...s });
         Object.assign(s, parenthesizedExpression, {
@@ -5713,7 +5916,8 @@ ${js}`
         blockPrefix.push(["", {
           type: "Declaration",
           children: [declaration, " = ", trimFirstSpace(expRef2), "[", counterRef, "]"],
-          names: assignmentNames
+          names: assignmentNames,
+          implicitLift: true
         }, ";"]);
         declaration = {
           type: "Declaration",
@@ -6566,11 +6770,11 @@ ${js}`
       if (glob?.type === "PropertyGlob") {
         let prefix = children.slice(0, i);
         const parts = [];
-        let refAssignmentComma;
-        if (prefix.length > 1) {
-          const ref = makeRef();
-          ({ refAssignmentComma } = makeRefAssignment(ref, prefix));
-          prefix = [ref];
+        let ref;
+        if (prefix.length > 1 && glob.object.properties.length > 1) {
+          ref = makeRef();
+          const { refAssignment } = makeRefAssignment(ref, prefix);
+          prefix = [makeLeftHandSideExpression(refAssignment)];
         }
         prefix = prefix.concat(glob.dot);
         for (const part of glob.object.properties) {
@@ -6602,6 +6806,9 @@ ${js}`
           }
           if (!suppressPrefix) {
             value = prefix.concat(trimFirstSpace(value));
+            if (ref != null) {
+              prefix = [ref].concat(glob.dot);
+            }
           }
           if (wValue)
             value.unshift(wValue);
@@ -6612,7 +6819,8 @@ ${js}`
               dots: part.dots,
               delim: part.delim,
               names: part.names,
-              children: part.children.slice(0, 2).concat(value, part.delim)
+              children: part.children.slice(0, 2).concat(value, part.delim),
+              usesRef: Boolean(ref)
             });
           } else {
             parts.push({
@@ -6629,12 +6837,13 @@ ${js}`
                 value,
                 part.delim
                 // comma delimiter
-              ]
+              ],
+              usesRef: Boolean(ref)
             });
           }
         }
         let ref2;
-        let object = {
+        const object = {
           type: "ObjectExpression",
           children: [
             glob.object.children[0],
@@ -6645,13 +6854,6 @@ ${js}`
           ],
           properties: parts
         };
-        if (refAssignmentComma) {
-          object = makeNode({
-            type: "ParenthesizedExpression",
-            children: ["(", ...refAssignmentComma, object, ")"],
-            expression: object
-          });
-        }
         if (i === children.length - 1)
           return object;
         return processCallMemberExpression({
@@ -6803,19 +7005,19 @@ ${js}`
   }
   function convertMethodToFunction(method) {
     const { signature, block } = method;
-    let { modifier, optional } = signature;
-    if (optional)
+    const { async, modifier, optional } = signature;
+    if (optional) {
       return;
-    if (modifier) {
-      if (modifier.get || modifier.set) {
-        return;
-      } else if (modifier.async) {
-        modifier = [modifier.children[0][0], " function ", ...modifier.children.slice(1)];
-      } else {
-        modifier = ["function ", ...modifier.children || []];
+    }
+    if (modifier?.get || modifier?.set) {
+      return;
+    }
+    const func = ["function "];
+    if (async != null) {
+      func.unshift(async);
+      if (async.length && !async[async.length - 1]?.length) {
+        async.push(" ");
       }
-    } else {
-      modifier = "function ";
     }
     return {
       ...signature,
@@ -6823,7 +7025,7 @@ ${js}`
       signature,
       type: "FunctionExpression",
       children: [
-        [modifier, ...signature.children.slice(1)],
+        [...func, ...signature.children.slice(1)],
         block
       ],
       block
@@ -6861,40 +7063,54 @@ ${js}`
     };
   }
   function convertObjectToJSXAttributes(obj) {
-    const { properties } = obj;
     const parts = [];
     const rest = [];
-    for (let i = 0; i < properties.length; i++) {
+    let i4 = 0;
+    for (const part of obj.properties) {
+      const i = i4++;
+      if (part.usesRef) {
+        rest.push(part);
+        continue;
+      }
       if (i > 0)
         parts.push(" ");
-      const part = properties[i];
       switch (part.type) {
-        case "Identifier":
+        case "Identifier": {
           parts.push([part.name, "={", part.name, "}"]);
           break;
-        case "Property":
+        }
+        case "Property": {
           if (part.name.type === "ComputedPropertyName") {
             rest.push(part);
           } else {
             parts.push([part.name, "={", trimFirstSpace(part.value), "}"]);
           }
+          ;
           break;
-        case "SpreadProperty":
+        }
+        case "SpreadProperty": {
           parts.push(["{", part.dots, part.value, "}"]);
           break;
-        case "MethodDefinition":
+        }
+        case "MethodDefinition": {
           const func = convertMethodToFunction(part);
           if (func) {
             parts.push([part.name, "={", convertMethodToFunction(part), "}"]);
           } else {
             rest.push(part);
           }
+          ;
           break;
-        default:
+        }
+        default: {
           throw new Error(`invalid object literal type in JSX attribute: ${part.type}`);
+        }
       }
     }
     if (rest.length) {
+      if (parts.length && parts[parts.length - 1] !== " ") {
+        parts.push(" ");
+      }
       parts.push(["{...{", ...rest, "}}"]);
     }
     return parts;
@@ -6923,7 +7139,8 @@ ${js}`
       block = {
         type: "BlockStatement",
         expressions,
-        children: ["{ ", expressions, " }"]
+        children: ["{ ", expressions, " }"],
+        bare: false
       };
     }
     if (autoReturn) {
@@ -6955,7 +7172,7 @@ ${js}`
     tail.push(...splices.map((s) => [", ", s]), ...thisAssignments.map((a) => [", ", a]));
   }
   function processAssignments(statements) {
-    for (let ref7 = gatherRecursiveAll(statements, ($4) => $4.type === "AssignmentExpression" || $4.type === "UpdateExpression"), i4 = 0, len3 = ref7.length; i4 < len3; i4++) {
+    for (let ref7 = gatherRecursiveAll(statements, ($4) => $4.type === "AssignmentExpression" || $4.type === "UpdateExpression"), i5 = 0, len3 = ref7.length; i5 < len3; i5++) {
       let extractAssignment2 = function(lhs) {
         let expr = lhs;
         while (expr.type === "ParenthesizedExpression") {
@@ -6976,7 +7193,7 @@ ${js}`
         return;
       };
       var extractAssignment = extractAssignment2;
-      const exp = ref7[i4];
+      const exp = ref7[i5];
       checkValidLHS(exp.assigned);
       const pre = [], post = [];
       let ref8;
@@ -6985,8 +7202,8 @@ ${js}`
           if (!exp.lhs) {
             continue;
           }
-          for (let ref9 = exp.lhs, i5 = 0, len4 = ref9.length; i5 < len4; i5++) {
-            const lhsPart = ref9[i5];
+          for (let ref9 = exp.lhs, i6 = 0, len4 = ref9.length; i6 < len4; i6++) {
+            const lhsPart = ref9[i6];
             let ref10;
             if (ref10 = extractAssignment2(lhsPart[1])) {
               const newLhs = ref10;
@@ -7030,8 +7247,8 @@ ${js}`
         }
       }
     }
-    for (let ref11 = gatherRecursiveAll(statements, ($6) => $6.type === "AssignmentExpression"), i6 = 0, len5 = ref11.length; i6 < len5; i6++) {
-      const exp = ref11[i6];
+    for (let ref11 = gatherRecursiveAll(statements, ($6) => $6.type === "AssignmentExpression"), i7 = 0, len5 = ref11.length; i7 < len5; i7++) {
+      const exp = ref11[i7];
       if (!(exp.names === null)) {
         continue;
       }
@@ -7268,101 +7485,149 @@ ${js}`
     }
   }
   function processTypes(node) {
-    return gatherRecursiveAll(node, (n) => n.type === "TypeUnary").forEach((unary) => {
-      if (!unary.suffix.length) {
-        return;
-      }
-      let ref16;
-      let m4;
-      if (m4 = (ref16 = unary.suffix)[ref16.length - 1], typeof m4 === "object" && m4 != null && "token" in m4 && m4.token === "?") {
-        const { token } = m4;
-        let last;
-        let count = 0;
-        let ref17;
-        while (unary.suffix.length && (ref17 = unary.suffix)[ref17.length - 1]?.token === "?") {
-          last = unary.suffix.pop();
-          count++;
-        }
-        let ref18;
-        while (unary.suffix.length && (ref18 = unary.suffix)[ref18.length - 1]?.type === "NonNullAssertion") {
-          unary.suffix.pop();
-        }
-        let ref19;
-        if (unary.suffix.length || unary.prefix.length)
-          ref19 = unary;
-        else
-          ref19 = unary.t;
-        const t = ref19;
-        if (unary.parent?.type === "TypeElement" && !unary.parent.name) {
-          if (count === 1) {
-            unary.suffix.push(last);
-            return;
+    const results1 = [];
+    for (let ref16 = gatherRecursiveAll(node, ($11) => $11.type === "TypeUnary"), i8 = 0, len6 = ref16.length; i8 < len6; i8++) {
+      const unary = ref16[i8];
+      let suffixIndex = unary.suffix.length - 1;
+      const results2 = [];
+      while (suffixIndex >= 0) {
+        const suffix = unary.suffix[suffixIndex];
+        if (typeof suffix === "object" && suffix != null && "token" in suffix && suffix.token === "?") {
+          const { token } = suffix;
+          let count = 0;
+          let m4;
+          while (m4 = unary.suffix[suffixIndex], typeof m4 === "object" && m4 != null && "token" in m4 && m4.token === "?") {
+            unary.suffix.splice(suffixIndex--, 1);
+            count++;
           }
-          replaceNode(unary, [
-            getTrimmingSpace(unary),
-            "(",
-            parenthesizeType(trimFirstSpace(t)),
-            " | null)",
-            last
-          ]);
-        } else {
-          replaceNode(unary, {
-            type: "TypeParenthesized",
+          let m5;
+          while (m5 = unary.suffix[suffixIndex], typeof m5 === "object" && m5 != null && "type" in m5 && m5.type === "NonNullAssertion") {
+            unary.suffix.splice(suffixIndex--, 1);
+          }
+          const { parent, prefix } = unary;
+          unary.prefix = [];
+          unary.children = unary.children.filter((a1) => a1 !== prefix);
+          const outer = unary.suffix.splice(suffixIndex + 1, Infinity);
+          const space = getTrimmingSpace(unary);
+          let replace;
+          if (unary.parent?.type === "TypeElement" && !unary.parent.name) {
+            if (count === 1) {
+              unary.suffix.splice(suffixIndex + 1, 0, suffix);
+              continue;
+            }
+            inplaceInsertTrimmingSpace(unary, "");
+            const t = parenthesizeType(unary.suffix.length ? unary : unary.t);
+            replace = [
+              space,
+              "(",
+              t,
+              " | null)",
+              suffix
+            ];
+          } else {
+            inplaceInsertTrimmingSpace(unary, "");
+            const t = parenthesizeType(unary.suffix.length ? unary : unary.t);
+            replace = makeNode({
+              type: "TypeParenthesized",
+              ts: true,
+              children: [
+                space,
+                "(",
+                t,
+                count === 1 ? " | undefined" : " | undefined | null",
+                ")"
+              ]
+            });
+          }
+          if (prefix.length || outer.length) {
+            replace = makeNode({
+              type: "TypeUnary",
+              ts: true,
+              t: replace,
+              prefix,
+              suffix: outer,
+              children: [prefix, replace, outer]
+            });
+          }
+          results2.push(replaceNode(unary, replace, parent));
+        } else if (typeof suffix === "object" && suffix != null && "type" in suffix && suffix.type === "NonNullAssertion") {
+          const { type } = suffix;
+          let m6;
+          while (m6 = unary.suffix[suffixIndex], typeof m6 === "object" && m6 != null && "type" in m6 && m6.type === "NonNullAssertion") {
+            unary.suffix.splice(suffixIndex--, 1);
+          }
+          let m7;
+          while (m7 = unary.suffix[suffixIndex], typeof m7 === "object" && m7 != null && "token" in m7 && m7.token === "?") {
+            unary.suffix.splice(suffixIndex--, 1);
+          }
+          const { parent, prefix } = unary;
+          unary.prefix = [];
+          unary.children = unary.children.filter((a2) => a2 !== prefix);
+          const outer = unary.suffix.splice(suffixIndex + 1, Infinity);
+          const space = getTrimmingSpace(unary);
+          inplaceInsertTrimmingSpace(unary, "");
+          let ref17;
+          if (unary.suffix.length)
+            ref17 = unary;
+          else
+            ref17 = unary.t;
+          const t = ref17;
+          const arg = makeNode({
+            type: "TypeArgument",
+            ts: true,
+            t,
+            children: [t]
+          });
+          const argArray = [arg];
+          const args = makeNode({
+            type: "TypeArguments",
             ts: true,
+            args: argArray,
+            children: ["<", argArray, ">"]
+          });
+          let replace = makeNode({
+            type: "TypeIdentifier",
+            raw: "NonNullable",
+            args,
             children: [
-              getTrimmingSpace(unary),
-              "(",
-              parenthesizeType(trimFirstSpace(t)),
-              count === 1 ? " | undefined" : " | undefined | null",
-              ")"
+              space,
+              "NonNullable",
+              args
             ]
           });
+          if (prefix.length || outer.length) {
+            replace = makeNode({
+              type: "TypeUnary",
+              ts: true,
+              t: replace,
+              prefix,
+              suffix: outer,
+              children: [prefix, replace, outer]
+            });
+          }
+          results2.push(replaceNode(unary, replace, parent));
+        } else {
+          results2.push(suffixIndex--);
         }
-      } else if (typeof m4 === "object" && m4 != null && "type" in m4 && m4.type === "NonNullAssertion") {
-        const { type } = m4;
-        let ref20;
-        while (unary.suffix.length && (ref20 = unary.suffix)[ref20.length - 1]?.type === "NonNullAssertion") {
-          unary.suffix.pop();
-        }
-        let ref21;
-        while (unary.suffix.length && (ref21 = unary.suffix)[ref21.length - 1]?.token === "?") {
-          unary.suffix.pop();
-        }
-        const t = trimFirstSpace(
-          unary.suffix.length || unary.prefix.length ? unary : unary.t
-        );
-        const args = {
-          type: "TypeArguments",
-          ts: true,
-          types: [t],
-          children: ["<", t, ">"]
-        };
-        replaceNode(unary, {
-          type: "TypeIdentifier",
-          raw: "NonNullable",
-          args,
-          children: [
-            getTrimmingSpace(unary),
-            "NonNullable",
-            args
-          ]
-        });
       }
-    });
+      results1.push(results2);
+    }
+    ;
+    return results1;
   }
   function processStatementExpressions(statements) {
-    for (let ref22 = gatherRecursiveAll(statements, ($11) => $11.type === "StatementExpression"), i7 = 0, len6 = ref22.length; i7 < len6; i7++) {
-      const exp = ref22[i7];
+    for (let ref18 = gatherRecursiveAll(statements, ($12) => $12.type === "StatementExpression"), i9 = 0, len7 = ref18.length; i9 < len7; i9++) {
+      const exp = ref18[i9];
       const { maybe, statement } = exp;
       if ((maybe || statement.type === "ThrowStatement") && blockContainingStatement(exp)) {
         replaceNode(exp, statement);
         continue;
       }
-      let ref23;
+      let ref19;
       switch (statement.type) {
         case "IfStatement": {
-          if (ref23 = expressionizeIfStatement(statement)) {
-            const expression = ref23;
+          if (ref19 = expressionizeIfStatement(statement)) {
+            const expression = ref19;
             replaceNode(statement, expression, exp);
           } else {
             replaceNode(statement, wrapIIFE([["", statement]]), exp);
@@ -7420,13 +7685,13 @@ ${js}`
     });
   }
   function processFinallyClauses(statements) {
-    for (let ref24 = gatherRecursiveAll(statements, ($) => $.type === "FinallyClause" && $.parent?.type !== "TryStatement"), i8 = 0, len7 = ref24.length; i8 < len7; i8++) {
-      let f = ref24[i8];
-      let ref25;
-      if (!((ref25 = blockContainingStatement(f)) && typeof ref25 === "object" && "block" in ref25 && "index" in ref25)) {
+    for (let ref20 = gatherRecursiveAll(statements, ($) => $.type === "FinallyClause" && $.parent?.type !== "TryStatement"), i10 = 0, len8 = ref20.length; i10 < len8; i10++) {
+      let f = ref20[i10];
+      let ref21;
+      if (!((ref21 = blockContainingStatement(f)) && typeof ref21 === "object" && "block" in ref21 && "index" in ref21)) {
         throw new Error("finally clause must be inside try statement or block");
       }
-      const { block, index } = ref25;
+      const { block, index } = ref21;
       const indent = block.expressions[index][0];
       const expressions = block.expressions.slice(index + 1);
       const t = makeNode({
@@ -7463,7 +7728,7 @@ ${js}`
     if (config2.iife || config2.repl) {
       rootIIFE = wrapIIFE(root.expressions, root.topLevelAwait);
       const newExpressions = [["", rootIIFE]];
-      root.children = root.children.map(($12) => $12 === root.expressions ? newExpressions : $12);
+      root.children = root.children.map(($13) => $13 === root.expressions ? newExpressions : $13);
       root.expressions = newExpressions;
     }
     addParentPointers(root);
@@ -7504,10 +7769,10 @@ ${js}`
     await processComptime(statements);
   }
   function processRepl(root, rootIIFE) {
-    const topBlock = gatherRecursive(rootIIFE, ($13) => $13.type === "BlockStatement")[0];
+    const topBlock = gatherRecursive(rootIIFE, ($14) => $14.type === "BlockStatement")[0];
     let i = 0;
-    for (let ref26 = gatherRecursiveWithinFunction(topBlock, ($14) => $14.type === "Declaration"), i9 = 0, len8 = ref26.length; i9 < len8; i9++) {
-      const decl = ref26[i9];
+    for (let ref22 = gatherRecursiveWithinFunction(topBlock, ($15) => $15.type === "Declaration"), i11 = 0, len9 = ref22.length; i11 < len9; i11++) {
+      const decl = ref22[i11];
       if (!decl.names?.length) {
         continue;
       }
@@ -7520,8 +7785,8 @@ ${js}`
         root.expressions.splice(i++, 0, ["", `var ${decl.names.join(",")}`, ";"]);
       }
     }
-    for (let ref27 = gatherRecursive(topBlock, ($15) => $15.type === "FunctionExpression"), i10 = 0, len9 = ref27.length; i10 < len9; i10++) {
-      const func = ref27[i10];
+    for (let ref23 = gatherRecursive(topBlock, ($16) => $16.type === "FunctionExpression"), i12 = 0, len10 = ref23.length; i12 < len10; i12++) {
+      const func = ref23[i12];
       if (func.name && func.parent?.type === "BlockStatement") {
         if (func.parent === topBlock) {
           replaceNode(func, void 0);
@@ -7533,17 +7798,17 @@ ${js}`
         }
       }
     }
-    for (let ref28 = gatherRecursiveWithinFunction(topBlock, ($16) => $16.type === "ClassExpression"), i11 = 0, len10 = ref28.length; i11 < len10; i11++) {
-      const classExp = ref28[i11];
-      let m5;
-      if (classExp.name && classExp.parent === topBlock || (m5 = classExp.parent, typeof m5 === "object" && m5 != null && "type" in m5 && m5.type === "ReturnStatement" && "parent" in m5 && m5.parent === topBlock)) {
+    for (let ref24 = gatherRecursiveWithinFunction(topBlock, ($17) => $17.type === "ClassExpression"), i13 = 0, len11 = ref24.length; i13 < len11; i13++) {
+      const classExp = ref24[i13];
+      let m8;
+      if (classExp.name && classExp.parent === topBlock || (m8 = classExp.parent, typeof m8 === "object" && m8 != null && "type" in m8 && m8.type === "ReturnStatement" && "parent" in m8 && m8.parent === topBlock)) {
         classExp.children.unshift(classExp.name, "=");
         root.expressions.splice(i++, 0, ["", `var ${classExp.name}`, ";"]);
       }
     }
   }
   function populateRefs(statements) {
-    const refNodes = gatherRecursive(statements, ($17) => $17.type === "Ref");
+    const refNodes = gatherRecursive(statements, ($18) => $18.type === "Ref");
     if (refNodes.length) {
       const ids = gatherRecursive(statements, (s) => s.type === "Identifier");
       const names = new Set(ids.flatMap(({ names: names2 }) => names2 || []));
@@ -7566,8 +7831,8 @@ ${js}`
   function processPlaceholders(statements) {
     const placeholderMap = /* @__PURE__ */ new Map();
     const liftedIfs = /* @__PURE__ */ new Set();
-    for (let ref29 = gatherRecursiveAll(statements, ($18) => $18.type === "Placeholder"), i12 = 0, len11 = ref29.length; i12 < len11; i12++) {
-      const exp = ref29[i12];
+    for (let ref25 = gatherRecursiveAll(statements, ($19) => $19.type === "Placeholder"), i14 = 0, len12 = ref25.length; i14 < len12; i14++) {
+      const exp = ref25[i14];
       let ancestor;
       if (exp.subtype === ".") {
         ({ ancestor } = findAncestor(
@@ -7575,8 +7840,8 @@ ${js}`
           ($) => $.type === "Call" && !$.parent?.implicit
         ));
         ancestor = ancestor?.parent;
-        let m6;
-        while (ancestor?.parent != null && (m6 = ancestor.parent.type, m6 === "UnaryExpression" || m6 === "NewExpression" || m6 === "AwaitExpression" || m6 === "ThrowStatement" || m6 === "StatementExpression")) {
+        let m9;
+        while (ancestor?.parent != null && (m9 = ancestor.parent.type, m9 === "UnaryExpression" || m9 === "NewExpression" || m9 === "AwaitExpression" || m9 === "ThrowStatement" || m9 === "StatementExpression")) {
           ancestor = ancestor.parent;
         }
         if (!ancestor) {
@@ -7588,15 +7853,21 @@ ${js}`
         }
       } else {
         let child;
+        let implicitLift;
         ({ ancestor, child } = findAncestor(exp, (ancestor2, child2) => {
+          const prevImplicitLift = implicitLift;
+          ({ implicitLift } = ancestor2);
+          if (prevImplicitLift) {
+            return;
+          }
           const { type } = ancestor2;
           if (type === "IfStatement") {
             liftedIfs.add(ancestor2);
           }
-          let m7;
-          let m8;
+          let m10;
+          let m11;
           return type === "Call" && !ancestor2.parent?.implicit || // Block, except for if/else blocks when condition already lifted
-          type === "BlockStatement" && !((m7 = ancestor2.parent, typeof m7 === "object" && m7 != null && "type" in m7 && m7.type === "IfStatement") && liftedIfs.has(ancestor2.parent)) && !((m8 = ancestor2.parent, typeof m8 === "object" && m8 != null && "type" in m8 && m8.type === "ElseClause" && "parent" in m8 && typeof m8.parent === "object" && m8.parent != null && "type" in m8.parent && m8.parent.type === "IfStatement") && liftedIfs.has(ancestor2.parent.parent)) || type === "PipelineExpression" || // Declaration
+          type === "BlockStatement" && !((m10 = ancestor2.parent, typeof m10 === "object" && m10 != null && "type" in m10 && m10.type === "IfStatement") && liftedIfs.has(ancestor2.parent)) && !((m11 = ancestor2.parent, typeof m11 === "object" && m11 != null && "type" in m11 && m11.type === "ElseClause" && "parent" in m11 && typeof m11.parent === "object" && m11.parent != null && "type" in m11.parent && m11.parent.type === "IfStatement") && liftedIfs.has(ancestor2.parent.parent)) || type === "PipelineExpression" || // Declaration
           type === "Initializer" || // Right-hand side of assignment
           type === "AssignmentExpression" && findChildIndex(ancestor2, child2) === ancestor2.children.indexOf(ancestor2.expression) || type === "ReturnStatement" || type === "YieldExpression";
         }));
@@ -7670,11 +7941,11 @@ ${js}`
     for (const [ancestor, placeholders] of placeholderMap) {
       let ref = makeRef("$");
       let typeSuffix;
-      for (let i13 = 0, len12 = placeholders.length; i13 < len12; i13++) {
-        const placeholder = placeholders[i13];
+      for (let i15 = 0, len13 = placeholders.length; i15 < len13; i15++) {
+        const placeholder = placeholders[i15];
         typeSuffix ??= placeholder.typeSuffix;
-        let ref30;
-        replaceNode((ref30 = placeholder.children)[ref30.length - 1], ref);
+        let ref26;
+        (ref26 = placeholder.children)[ref26.length - 1] = ref;
       }
       const { parent } = ancestor;
       const body = maybeUnwrap(ancestor);
@@ -7695,16 +7966,16 @@ ${js}`
         }
         case "PipelineExpression": {
           const i = findChildIndex(parent, ancestor);
-          let ref31;
+          let ref27;
           if (i === 1) {
-            ref31 = ancestor === parent.children[i];
+            ref27 = ancestor === parent.children[i];
           } else if (i === 2) {
-            ref31 = ancestor === parent.children[i][findChildIndex(parent.children[i], ancestor)][3];
+            ref27 = ancestor === parent.children[i][findChildIndex(parent.children[i], ancestor)][3];
           } else {
-            ref31 = void 0;
+            ref27 = void 0;
           }
           ;
-          outer = ref31;
+          outer = ref27;
           break;
         }
         case "AssignmentExpression":
@@ -7719,9 +7990,9 @@ ${js}`
         fnExp = makeLeftHandSideExpression(fnExp);
       }
       replaceNode(ancestor, fnExp, parent);
-      let ref32;
-      if (ref32 = getTrimmingSpace(body)) {
-        const ws = ref32;
+      let ref28;
+      if (ref28 = getTrimmingSpace(body)) {
+        const ws = ref28;
         inplaceInsertTrimmingSpace(body, "");
         inplacePrepend(ws, fnExp);
       }
@@ -7766,8 +8037,8 @@ ${js}`
         }
       ];
     }
-    let ref33;
-    if (Array.isArray(rest.delim) && (ref33 = rest.delim)[ref33.length - 1]?.token === ",") {
+    let ref29;
+    if (Array.isArray(rest.delim) && (ref29 = rest.delim)[ref29.length - 1]?.token === ",") {
       rest.delim = rest.delim.slice(0, -1);
       rest.children = [...rest.children.slice(0, -1), rest.delim];
     }
@@ -7864,11 +8135,7 @@ ${js}`
     ApplicationStart,
     ForbiddenImplicitCalls,
     ReservedBinary,
-    ArgumentsWithTrailingMemberExpressions,
-    TrailingMemberExpressions,
-    IndentedTrailingMemberExpressions,
-    NestedTrailingMemberExpression,
-    AllowedTrailingMemberExpressions,
+    ArgumentsWithTrailingCallExpressions,
     TrailingCallExpressions,
     IndentedTrailingCallExpressions,
     NestedTrailingCallExpression,
@@ -7968,6 +8235,7 @@ ${js}`
     LeftHandSideExpression,
     CallExpression,
     CallExpressionRest,
+    ExplicitCallExpressionRest,
     OptionalShorthand,
     OptionalDot,
     NonNullAssertion,
@@ -7983,6 +8251,7 @@ ${js}`
     ImplicitAccessStart,
     PropertyAccessModifier,
     PropertyAccess,
+    ExplicitPropertyGlob,
     PropertyGlob,
     PropertyBind,
     SuperProperty,
@@ -8250,8 +8519,8 @@ ${js}`
     Debugger,
     MaybeNestedNonPipelineExpression,
     MaybeNestedPostfixedExpression,
+    NestedPostfixedExpressionNoTrailing,
     MaybeNestedExpression,
-    NestedExpression,
     MaybeParenNestedExpression,
     ImportDeclaration,
     ImpliedImport,
@@ -8805,125 +9074,126 @@ ${js}`
   var $L124 = (0, import_lib2.$L)("product");
   var $L125 = (0, import_lib2.$L)("min");
   var $L126 = (0, import_lib2.$L)("max");
-  var $L127 = (0, import_lib2.$L)("break");
-  var $L128 = (0, import_lib2.$L)("continue");
-  var $L129 = (0, import_lib2.$L)("debugger");
-  var $L130 = (0, import_lib2.$L)("require");
-  var $L131 = (0, import_lib2.$L)("with");
-  var $L132 = (0, import_lib2.$L)("assert");
-  var $L133 = (0, import_lib2.$L)(":=");
-  var $L134 = (0, import_lib2.$L)("\u2254");
-  var $L135 = (0, import_lib2.$L)(".=");
-  var $L136 = (0, import_lib2.$L)("::=");
-  var $L137 = (0, import_lib2.$L)("/*");
-  var $L138 = (0, import_lib2.$L)("*/");
-  var $L139 = (0, import_lib2.$L)("\\");
-  var $L140 = (0, import_lib2.$L)(")");
-  var $L141 = (0, import_lib2.$L)("abstract");
-  var $L142 = (0, import_lib2.$L)("as");
-  var $L143 = (0, import_lib2.$L)("@");
-  var $L144 = (0, import_lib2.$L)("@@");
-  var $L145 = (0, import_lib2.$L)("async");
-  var $L146 = (0, import_lib2.$L)("await");
-  var $L147 = (0, import_lib2.$L)("`");
-  var $L148 = (0, import_lib2.$L)("by");
-  var $L149 = (0, import_lib2.$L)("case");
-  var $L150 = (0, import_lib2.$L)("catch");
-  var $L151 = (0, import_lib2.$L)("class");
-  var $L152 = (0, import_lib2.$L)("#{");
-  var $L153 = (0, import_lib2.$L)("comptime");
-  var $L154 = (0, import_lib2.$L)("declare");
-  var $L155 = (0, import_lib2.$L)("default");
-  var $L156 = (0, import_lib2.$L)("delete");
-  var $L157 = (0, import_lib2.$L)("do");
-  var $L158 = (0, import_lib2.$L)("..");
-  var $L159 = (0, import_lib2.$L)("\u2025");
-  var $L160 = (0, import_lib2.$L)("...");
-  var $L161 = (0, import_lib2.$L)("\u2026");
-  var $L162 = (0, import_lib2.$L)("::");
-  var $L163 = (0, import_lib2.$L)('"');
-  var $L164 = (0, import_lib2.$L)("each");
-  var $L165 = (0, import_lib2.$L)("else");
-  var $L166 = (0, import_lib2.$L)("!");
-  var $L167 = (0, import_lib2.$L)("export");
-  var $L168 = (0, import_lib2.$L)("extends");
-  var $L169 = (0, import_lib2.$L)("finally");
-  var $L170 = (0, import_lib2.$L)("for");
-  var $L171 = (0, import_lib2.$L)("from");
-  var $L172 = (0, import_lib2.$L)("function");
-  var $L173 = (0, import_lib2.$L)("get");
-  var $L174 = (0, import_lib2.$L)("set");
-  var $L175 = (0, import_lib2.$L)("#");
-  var $L176 = (0, import_lib2.$L)("if");
-  var $L177 = (0, import_lib2.$L)("in");
-  var $L178 = (0, import_lib2.$L)("infer");
-  var $L179 = (0, import_lib2.$L)("let");
-  var $L180 = (0, import_lib2.$L)("const");
-  var $L181 = (0, import_lib2.$L)("is");
-  var $L182 = (0, import_lib2.$L)("var");
-  var $L183 = (0, import_lib2.$L)("like");
-  var $L184 = (0, import_lib2.$L)("loop");
-  var $L185 = (0, import_lib2.$L)("new");
-  var $L186 = (0, import_lib2.$L)("not");
-  var $L187 = (0, import_lib2.$L)("of");
-  var $L188 = (0, import_lib2.$L)("[");
-  var $L189 = (0, import_lib2.$L)("operator");
-  var $L190 = (0, import_lib2.$L)("override");
-  var $L191 = (0, import_lib2.$L)("own");
-  var $L192 = (0, import_lib2.$L)("public");
-  var $L193 = (0, import_lib2.$L)("private");
-  var $L194 = (0, import_lib2.$L)("protected");
-  var $L195 = (0, import_lib2.$L)("||>");
-  var $L196 = (0, import_lib2.$L)("|\u25B7");
-  var $L197 = (0, import_lib2.$L)("|>=");
-  var $L198 = (0, import_lib2.$L)("\u25B7=");
-  var $L199 = (0, import_lib2.$L)("|>");
-  var $L200 = (0, import_lib2.$L)("\u25B7");
-  var $L201 = (0, import_lib2.$L)("readonly");
-  var $L202 = (0, import_lib2.$L)("return");
-  var $L203 = (0, import_lib2.$L)("satisfies");
-  var $L204 = (0, import_lib2.$L)("'");
-  var $L205 = (0, import_lib2.$L)("static");
-  var $L206 = (0, import_lib2.$L)("${");
-  var $L207 = (0, import_lib2.$L)("super");
-  var $L208 = (0, import_lib2.$L)("switch");
-  var $L209 = (0, import_lib2.$L)("target");
-  var $L210 = (0, import_lib2.$L)("then");
-  var $L211 = (0, import_lib2.$L)("this");
-  var $L212 = (0, import_lib2.$L)("throw");
-  var $L213 = (0, import_lib2.$L)('"""');
-  var $L214 = (0, import_lib2.$L)("'''");
-  var $L215 = (0, import_lib2.$L)("///");
-  var $L216 = (0, import_lib2.$L)("```");
-  var $L217 = (0, import_lib2.$L)("try");
-  var $L218 = (0, import_lib2.$L)("typeof");
-  var $L219 = (0, import_lib2.$L)("undefined");
-  var $L220 = (0, import_lib2.$L)("unless");
-  var $L221 = (0, import_lib2.$L)("until");
-  var $L222 = (0, import_lib2.$L)("using");
-  var $L223 = (0, import_lib2.$L)("void");
-  var $L224 = (0, import_lib2.$L)("when");
-  var $L225 = (0, import_lib2.$L)("while");
-  var $L226 = (0, import_lib2.$L)("yield");
-  var $L227 = (0, import_lib2.$L)("/>");
-  var $L228 = (0, import_lib2.$L)("</");
-  var $L229 = (0, import_lib2.$L)("<>");
-  var $L230 = (0, import_lib2.$L)("</>");
-  var $L231 = (0, import_lib2.$L)("<!--");
-  var $L232 = (0, import_lib2.$L)("-->");
-  var $L233 = (0, import_lib2.$L)("type");
-  var $L234 = (0, import_lib2.$L)("enum");
-  var $L235 = (0, import_lib2.$L)("interface");
-  var $L236 = (0, import_lib2.$L)("global");
-  var $L237 = (0, import_lib2.$L)("module");
-  var $L238 = (0, import_lib2.$L)("namespace");
-  var $L239 = (0, import_lib2.$L)("asserts");
-  var $L240 = (0, import_lib2.$L)("keyof");
-  var $L241 = (0, import_lib2.$L)("???");
-  var $L242 = (0, import_lib2.$L)("unique");
-  var $L243 = (0, import_lib2.$L)("symbol");
-  var $L244 = (0, import_lib2.$L)("[]");
-  var $L245 = (0, import_lib2.$L)("civet");
+  var $L127 = (0, import_lib2.$L)("join");
+  var $L128 = (0, import_lib2.$L)("break");
+  var $L129 = (0, import_lib2.$L)("continue");
+  var $L130 = (0, import_lib2.$L)("debugger");
+  var $L131 = (0, import_lib2.$L)("require");
+  var $L132 = (0, import_lib2.$L)("with");
+  var $L133 = (0, import_lib2.$L)("assert");
+  var $L134 = (0, import_lib2.$L)(":=");
+  var $L135 = (0, import_lib2.$L)("\u2254");
+  var $L136 = (0, import_lib2.$L)(".=");
+  var $L137 = (0, import_lib2.$L)("::=");
+  var $L138 = (0, import_lib2.$L)("/*");
+  var $L139 = (0, import_lib2.$L)("*/");
+  var $L140 = (0, import_lib2.$L)("\\");
+  var $L141 = (0, import_lib2.$L)(")");
+  var $L142 = (0, import_lib2.$L)("abstract");
+  var $L143 = (0, import_lib2.$L)("as");
+  var $L144 = (0, import_lib2.$L)("@");
+  var $L145 = (0, import_lib2.$L)("@@");
+  var $L146 = (0, import_lib2.$L)("async");
+  var $L147 = (0, import_lib2.$L)("await");
+  var $L148 = (0, import_lib2.$L)("`");
+  var $L149 = (0, import_lib2.$L)("by");
+  var $L150 = (0, import_lib2.$L)("case");
+  var $L151 = (0, import_lib2.$L)("catch");
+  var $L152 = (0, import_lib2.$L)("class");
+  var $L153 = (0, import_lib2.$L)("#{");
+  var $L154 = (0, import_lib2.$L)("comptime");
+  var $L155 = (0, import_lib2.$L)("declare");
+  var $L156 = (0, import_lib2.$L)("default");
+  var $L157 = (0, import_lib2.$L)("delete");
+  var $L158 = (0, import_lib2.$L)("do");
+  var $L159 = (0, import_lib2.$L)("..");
+  var $L160 = (0, import_lib2.$L)("\u2025");
+  var $L161 = (0, import_lib2.$L)("...");
+  var $L162 = (0, import_lib2.$L)("\u2026");
+  var $L163 = (0, import_lib2.$L)("::");
+  var $L164 = (0, import_lib2.$L)('"');
+  var $L165 = (0, import_lib2.$L)("each");
+  var $L166 = (0, import_lib2.$L)("else");
+  var $L167 = (0, import_lib2.$L)("!");
+  var $L168 = (0, import_lib2.$L)("export");
+  var $L169 = (0, import_lib2.$L)("extends");
+  var $L170 = (0, import_lib2.$L)("finally");
+  var $L171 = (0, import_lib2.$L)("for");
+  var $L172 = (0, import_lib2.$L)("from");
+  var $L173 = (0, import_lib2.$L)("function");
+  var $L174 = (0, import_lib2.$L)("get");
+  var $L175 = (0, import_lib2.$L)("set");
+  var $L176 = (0, import_lib2.$L)("#");
+  var $L177 = (0, import_lib2.$L)("if");
+  var $L178 = (0, import_lib2.$L)("in");
+  var $L179 = (0, import_lib2.$L)("infer");
+  var $L180 = (0, import_lib2.$L)("let");
+  var $L181 = (0, import_lib2.$L)("const");
+  var $L182 = (0, import_lib2.$L)("is");
+  var $L183 = (0, import_lib2.$L)("var");
+  var $L184 = (0, import_lib2.$L)("like");
+  var $L185 = (0, import_lib2.$L)("loop");
+  var $L186 = (0, import_lib2.$L)("new");
+  var $L187 = (0, import_lib2.$L)("not");
+  var $L188 = (0, import_lib2.$L)("of");
+  var $L189 = (0, import_lib2.$L)("[");
+  var $L190 = (0, import_lib2.$L)("operator");
+  var $L191 = (0, import_lib2.$L)("override");
+  var $L192 = (0, import_lib2.$L)("own");
+  var $L193 = (0, import_lib2.$L)("public");
+  var $L194 = (0, import_lib2.$L)("private");
+  var $L195 = (0, import_lib2.$L)("protected");
+  var $L196 = (0, import_lib2.$L)("||>");
+  var $L197 = (0, import_lib2.$L)("|\u25B7");
+  var $L198 = (0, import_lib2.$L)("|>=");
+  var $L199 = (0, import_lib2.$L)("\u25B7=");
+  var $L200 = (0, import_lib2.$L)("|>");
+  var $L201 = (0, import_lib2.$L)("\u25B7");
+  var $L202 = (0, import_lib2.$L)("readonly");
+  var $L203 = (0, import_lib2.$L)("return");
+  var $L204 = (0, import_lib2.$L)("satisfies");
+  var $L205 = (0, import_lib2.$L)("'");
+  var $L206 = (0, import_lib2.$L)("static");
+  var $L207 = (0, import_lib2.$L)("${");
+  var $L208 = (0, import_lib2.$L)("super");
+  var $L209 = (0, import_lib2.$L)("switch");
+  var $L210 = (0, import_lib2.$L)("target");
+  var $L211 = (0, import_lib2.$L)("then");
+  var $L212 = (0, import_lib2.$L)("this");
+  var $L213 = (0, import_lib2.$L)("throw");
+  var $L214 = (0, import_lib2.$L)('"""');
+  var $L215 = (0, import_lib2.$L)("'''");
+  var $L216 = (0, import_lib2.$L)("///");
+  var $L217 = (0, import_lib2.$L)("```");
+  var $L218 = (0, import_lib2.$L)("try");
+  var $L219 = (0, import_lib2.$L)("typeof");
+  var $L220 = (0, import_lib2.$L)("undefined");
+  var $L221 = (0, import_lib2.$L)("unless");
+  var $L222 = (0, import_lib2.$L)("until");
+  var $L223 = (0, import_lib2.$L)("using");
+  var $L224 = (0, import_lib2.$L)("void");
+  var $L225 = (0, import_lib2.$L)("when");
+  var $L226 = (0, import_lib2.$L)("while");
+  var $L227 = (0, import_lib2.$L)("yield");
+  var $L228 = (0, import_lib2.$L)("/>");
+  var $L229 = (0, import_lib2.$L)("</");
+  var $L230 = (0, import_lib2.$L)("<>");
+  var $L231 = (0, import_lib2.$L)("</>");
+  var $L232 = (0, import_lib2.$L)("<!--");
+  var $L233 = (0, import_lib2.$L)("-->");
+  var $L234 = (0, import_lib2.$L)("type");
+  var $L235 = (0, import_lib2.$L)("enum");
+  var $L236 = (0, import_lib2.$L)("interface");
+  var $L237 = (0, import_lib2.$L)("global");
+  var $L238 = (0, import_lib2.$L)("module");
+  var $L239 = (0, import_lib2.$L)("namespace");
+  var $L240 = (0, import_lib2.$L)("asserts");
+  var $L241 = (0, import_lib2.$L)("keyof");
+  var $L242 = (0, import_lib2.$L)("???");
+  var $L243 = (0, import_lib2.$L)("unique");
+  var $L244 = (0, import_lib2.$L)("symbol");
+  var $L245 = (0, import_lib2.$L)("[]");
+  var $L246 = (0, import_lib2.$L)("civet");
   var $R0 = (0, import_lib2.$R)(new RegExp("(?=async|debugger|if|unless|comptime|do|for|loop|until|while|switch|throw|try)", "suy"));
   var $R1 = (0, import_lib2.$R)(new RegExp("&(?=\\s)", "suy"));
   var $R2 = (0, import_lib2.$R)(new RegExp("(as|of|by|satisfies|then|when|implements|xor|xnor)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
@@ -9222,7 +9492,7 @@ ${js}`
   function ExplicitArguments(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "ExplicitArguments", ExplicitArguments$0);
   }
-  var ApplicationStart$0 = (0, import_lib2.$S)(IndentedApplicationAllowed, (0, import_lib2.$Y)((0, import_lib2.$S)(IndentedFurther, (0, import_lib2.$N)(IdentifierBinaryOp), (0, import_lib2.$N)(ReservedBinary))), (0, import_lib2.$N)(IndentedTrailingMemberExpressions));
+  var ApplicationStart$0 = (0, import_lib2.$S)(IndentedApplicationAllowed, (0, import_lib2.$Y)((0, import_lib2.$S)(IndentedFurther, (0, import_lib2.$N)(IdentifierBinaryOp), (0, import_lib2.$N)(ReservedBinary))), (0, import_lib2.$N)(IndentedTrailingCallExpressions));
   var ApplicationStart$1 = (0, import_lib2.$S)((0, import_lib2.$N)(EOS), (0, import_lib2.$Y)((0, import_lib2.$S)(_, (0, import_lib2.$C)(BracedApplicationAllowed, (0, import_lib2.$N)((0, import_lib2.$EXPECT)($L1, 'ApplicationStart "{"'))), (0, import_lib2.$N)(ForbiddenImplicitCalls))));
   var ApplicationStart$$ = [ApplicationStart$0, ApplicationStart$1];
   function ApplicationStart(ctx, state2) {
@@ -9255,52 +9525,16 @@ ${js}`
   function ReservedBinary(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "ReservedBinary", ReservedBinary$0);
   }
-  var ArgumentsWithTrailingMemberExpressions$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Arguments, AllowedTrailingMemberExpressions), function($skip, $loc, $0, $1, $2) {
+  var ArgumentsWithTrailingCallExpressions$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Arguments, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2) {
     var args = $1;
     var trailing = $2;
-    return [args, ...trailing];
-  });
-  function ArgumentsWithTrailingMemberExpressions(ctx, state2) {
-    return (0, import_lib2.$EVENT)(ctx, state2, "ArgumentsWithTrailingMemberExpressions", ArgumentsWithTrailingMemberExpressions$0);
-  }
-  var TrailingMemberExpressions$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$Q)(MemberExpressionRest), (0, import_lib2.$E)(IndentedTrailingMemberExpressions)), function($skip, $loc, $0, $1, $2) {
-    if (!$2)
-      return $1;
-    return [...$1, ...$2];
-  });
-  function TrailingMemberExpressions(ctx, state2) {
-    return (0, import_lib2.$EVENT)(ctx, state2, "TrailingMemberExpressions", TrailingMemberExpressions$0);
-  }
-  var IndentedTrailingMemberExpressions$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$Q)(NestedTrailingMemberExpression), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
-    if (!$2.length)
-      return $skip;
-    return $2.flat();
-  });
-  var IndentedTrailingMemberExpressions$1 = (0, import_lib2.$TV)((0, import_lib2.$P)(NestedTrailingMemberExpression), function($skip, $loc, $0, $1) {
-    return $1.flat();
+    return [args, ...trailing ?? []];
   });
-  var IndentedTrailingMemberExpressions$$ = [IndentedTrailingMemberExpressions$0, IndentedTrailingMemberExpressions$1];
-  function IndentedTrailingMemberExpressions(ctx, state2) {
-    return (0, import_lib2.$EVENT_C)(ctx, state2, "IndentedTrailingMemberExpressions", IndentedTrailingMemberExpressions$$);
+  function ArgumentsWithTrailingCallExpressions(ctx, state2) {
+    return (0, import_lib2.$EVENT)(ctx, state2, "ArgumentsWithTrailingCallExpressions", ArgumentsWithTrailingCallExpressions$0);
   }
-  var NestedTrailingMemberExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Nested, (0, import_lib2.$Y)((0, import_lib2.$S)((0, import_lib2.$E)((0, import_lib2.$EXPECT)($L6, 'NestedTrailingMemberExpression "?"')), (0, import_lib2.$EXPECT)($L7, 'NestedTrailingMemberExpression "."'), (0, import_lib2.$N)((0, import_lib2.$EXPECT)($R3, "NestedTrailingMemberExpression /[0-9]/")))), (0, import_lib2.$P)(MemberExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
-    var ws = $1;
-    var rests = $3;
-    const [first, ...rest] = rests;
-    return [prepend(ws, first), ...rest];
-  });
-  function NestedTrailingMemberExpression(ctx, state2) {
-    return (0, import_lib2.$EVENT)(ctx, state2, "NestedTrailingMemberExpression", NestedTrailingMemberExpression$0);
-  }
-  var AllowedTrailingMemberExpressions$0 = (0, import_lib2.$T)((0, import_lib2.$S)(TrailingMemberPropertyAllowed, TrailingMemberExpressions), function(value) {
-    return value[1];
-  });
-  var AllowedTrailingMemberExpressions$1 = (0, import_lib2.$Q)(MemberExpressionRest);
-  var AllowedTrailingMemberExpressions$$ = [AllowedTrailingMemberExpressions$0, AllowedTrailingMemberExpressions$1];
-  function AllowedTrailingMemberExpressions(ctx, state2) {
-    return (0, import_lib2.$EVENT_C)(ctx, state2, "AllowedTrailingMemberExpressions", AllowedTrailingMemberExpressions$$);
-  }
-  var TrailingCallExpressions$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$Q)(CallExpressionRest), (0, import_lib2.$E)(IndentedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2) {
+  var TrailingCallExpressions$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$Q)(ExplicitCallExpressionRest), (0, import_lib2.$E)(IndentedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2) {
+    $1 = $1.flat();
     if (!$1.length && !$2)
       return $skip;
     if (!$2)
@@ -9395,10 +9629,10 @@ ${js}`
   function NestedArgumentList(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "NestedArgumentList", NestedArgumentList$0);
   }
-  var NestedArgument$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Nested, (0, import_lib2.$N)(Bullet), SingleLineArgumentExpressions, ParameterElementDelimiter), function($skip, $loc, $0, $1, $2, $3, $4) {
-    var indent = $1;
-    var args = $3;
-    var comma = $4;
+  var NestedArgument$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(NestedImplicitPropertyDefinition), Nested, (0, import_lib2.$N)(Bullet), SingleLineArgumentExpressions, ParameterElementDelimiter), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var indent = $2;
+    var args = $4;
+    var comma = $5;
     let [arg0, ...rest] = args;
     arg0 = prepend(indent, arg0);
     return [arg0, ...rest, comma];
@@ -10519,7 +10753,7 @@ ${js}`
   function LeftHandSideExpression(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "LeftHandSideExpression", LeftHandSideExpression$$);
   }
-  var CallExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Super, ArgumentsWithTrailingMemberExpressions, (0, import_lib2.$Q)(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
+  var CallExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Super, ArgumentsWithTrailingCallExpressions, (0, import_lib2.$Q)(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
     var rest = $3;
     return processCallMemberExpression({
       type: "CallExpression",
@@ -10537,7 +10771,7 @@ ${js}`
     var imports = $5;
     return dynamizeImportDeclarationExpression([i, iws, imports, fws, from]);
   });
-  var CallExpression$3 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L15, 'CallExpression "import"'), ArgumentsWithTrailingMemberExpressions, (0, import_lib2.$Q)(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
+  var CallExpression$3 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L15, 'CallExpression "import"'), ArgumentsWithTrailingCallExpressions, (0, import_lib2.$Q)(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
     var rest = $3;
     return processCallMemberExpression({
       type: "CallExpression",
@@ -10572,7 +10806,7 @@ ${js}`
     }
     return literal;
   });
-  var CallExpressionRest$3 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(OptionalShorthand), ArgumentsWithTrailingMemberExpressions), function($skip, $loc, $0, $1, $2) {
+  var CallExpressionRest$3 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(OptionalShorthand), ArgumentsWithTrailingCallExpressions), function($skip, $loc, $0, $1, $2) {
     var optional = $1;
     var argsWithTrailing = $2;
     if (!optional)
@@ -10588,6 +10822,32 @@ ${js}`
   function CallExpressionRest(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "CallExpressionRest", CallExpressionRest$$);
   }
+  var ExplicitCallExpressionRest$0 = MemberExpressionRest;
+  var ExplicitCallExpressionRest$1 = (0, import_lib2.$T)((0, import_lib2.$S)(TypeArguments, (0, import_lib2.$N)((0, import_lib2.$C)(IdentifierName, NumericLiteral))), function(value) {
+    return value[0];
+  });
+  var ExplicitCallExpressionRest$2 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R8, "ExplicitCallExpressionRest /(?=['\"`])/"), (0, import_lib2.$C)(TemplateLiteral, StringLiteral)), function($skip, $loc, $0, $1, $2) {
+    var literal = $2;
+    if (literal.type === "StringLiteral") {
+      literal = "`" + literal.token.slice(1, -1).replace(/(`|\$\{)/g, "\\$1") + "`";
+    }
+    return literal;
+  });
+  var ExplicitCallExpressionRest$3 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(OptionalShorthand), ExplicitArguments), function($skip, $loc, $0, $1, $2) {
+    var optional = $1;
+    var call = $2;
+    if (!optional)
+      return call;
+    return {
+      ...call,
+      children: [optional, ...call.children],
+      optional
+    };
+  });
+  var ExplicitCallExpressionRest$$ = [ExplicitCallExpressionRest$0, ExplicitCallExpressionRest$1, ExplicitCallExpressionRest$2, ExplicitCallExpressionRest$3];
+  function ExplicitCallExpressionRest(ctx, state2) {
+    return (0, import_lib2.$EVENT_C)(ctx, state2, "ExplicitCallExpressionRest", ExplicitCallExpressionRest$$);
+  }
   var OptionalShorthand$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R9, "OptionalShorthand /(?=[\\/?])/"), (0, import_lib2.$Q)(InlineComment), QuestionMark, OptionalDot), function($skip, $loc, $0, $1, $2, $3, $4) {
     var comments = $2;
     var q = $3;
@@ -10939,6 +11199,12 @@ ${js}`
   function PropertyAccess(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "PropertyAccess", PropertyAccess$$);
   }
+  var ExplicitPropertyGlob$0 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$Y)(ExplicitAccessStart), PropertyGlob), function(value) {
+    return value[1];
+  });
+  function ExplicitPropertyGlob(ctx, state2) {
+    return (0, import_lib2.$EVENT)(ctx, state2, "ExplicitPropertyGlob", ExplicitPropertyGlob$0);
+  }
   var PropertyGlob$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$S)((0, import_lib2.$E)(PropertyAccessModifier), OptionalDot), (0, import_lib2.$Q)(InlineComment), BracedObjectLiteral), function($skip, $loc, $0, $1, $2, $3) {
     var dot = $1;
     var object = $3;
@@ -11219,7 +11485,8 @@ ${js}`
     return {
       type: "AtBinding",
       children: [ref],
-      ref
+      ref,
+      names: []
     };
   });
   var NWBindingIdentifier$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(Hash, AtIdentifierRef), function($skip, $loc, $0, $1, $2) {
@@ -11228,7 +11495,8 @@ ${js}`
     return {
       type: "AtBinding",
       children: [ref],
-      ref
+      ref,
+      names: []
     };
   });
   var NWBindingIdentifier$2 = Identifier;
@@ -11551,19 +11819,13 @@ ${js}`
     var binding = $2;
     var typeSuffix = $3;
     var initializer = $4;
-    if (binding.children) {
-      binding = {
-        ...binding,
-        initializer,
-        children: [...binding.children, initializer]
-      };
-    }
     return {
       type: "BindingElement",
       names: binding.names,
       typeSuffix,
       binding,
-      children: [ws, binding]
+      children: [ws, binding, initializer],
+      initializer
     };
   });
   var BindingElement$2 = (0, import_lib2.$TV)((0, import_lib2.$Y)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$EXPECT)($L17, 'BindingElement ","'))), function($skip, $loc, $0, $1) {
@@ -12267,11 +12529,9 @@ ${js}`
     const expressions = [...stmts];
     if (last)
       expressions.push(last);
-    const maybeComment = expressions.at(-1)?.[2]?.children?.[2]?.at(-1);
-    const hasTrailingComment = maybeComment?.type === "Comment" && maybeComment.token.startsWith("//");
     const children = [expressions];
-    if (hasTrailingComment)
-      children.push("\n");
+    if (hasTrailingComment(expressions))
+      children.push(["\n"]);
     return {
       type: "BlockStatement",
       expressions,
@@ -13352,52 +13612,23 @@ ${js}`
       abstract: true,
       signature,
       parameters: signature.parameters,
+      async: signature.async,
+      generator: signature.generator,
       ts: true
     };
   });
-  var MethodDefinition$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(MethodSignature, (0, import_lib2.$N)((0, import_lib2.$C)(PropertyAccess, UnaryPostfix, NonNullAssertion)), (0, import_lib2.$E)(BracedBlock)), function($skip, $loc, $0, $1, $2, $3) {
+  var MethodDefinition$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(MethodSignature, (0, import_lib2.$N)((0, import_lib2.$C)(PropertyAccess, ExplicitPropertyGlob, UnaryPostfix, NonNullAssertion)), (0, import_lib2.$E)(BracedBlock)), function($skip, $loc, $0, $1, $2, $3) {
     var signature = $1;
     var block = $3;
-    let children = $0;
-    let generatorPos = 0;
-    let { modifier } = signature;
-    if (hasAwait(block)) {
-      generatorPos++;
-      children = children.slice();
-      if (modifier?.get || modifier?.set) {
-        children.push({
-          type: "Error",
-          message: "Getters and setters cannot be async"
-        });
-      } else if (modifier?.async) {
-      } else {
-        children.unshift("async ");
-        modifier = { ...modifier, async: true };
-        signature = { ...signature, modifier };
-      }
-    }
-    if (hasYield(block)) {
-      if (children === $0)
-        children = children.slice();
-      if (modifier?.get || modifier?.set) {
-        children.push({
-          type: "Error",
-          message: "Getters and setters cannot be generators"
-        });
-      } else if (modifier?.generator) {
-      } else {
-        children.splice(generatorPos, 0, "*");
-        modifier = { ...modifier, generator: true };
-        signature = { ...signature, modifier };
-      }
-    }
     return {
       type: "MethodDefinition",
-      children,
+      children: $0,
       name: signature.name,
       signature,
       block,
-      parameters: signature.parameters
+      parameters: signature.parameters,
+      async: signature.async,
+      generator: signature.generator
     };
   });
   var MethodDefinition$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(GetOrSet, (0, import_lib2.$E)(_), ForbidIndentedApplication, (0, import_lib2.$E)((0, import_lib2.$S)(MemberBase, (0, import_lib2.$Q)(CallExpressionRest), (0, import_lib2.$E)(ReturnTypeSuffix))), RestoreIndentedApplication, (0, import_lib2.$E)(BracedBlock)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
@@ -13480,36 +13711,38 @@ ${js}`
   }
   var MethodModifier$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(GetOrSet, (0, import_lib2.$E)(_), (0, import_lib2.$Y)(ClassElementName)), function($skip, $loc, $0, $1, $2, $3) {
     var kind = $1;
+    var ws = $2;
     return {
-      type: "MethodModifier",
-      async: false,
-      generator: false,
-      get: kind.token === "get",
-      set: kind.token === "set",
-      children: $0
-    };
-  });
-  var MethodModifier$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$S)(Async, __), (0, import_lib2.$E)((0, import_lib2.$S)(Star, __))), function($skip, $loc, $0, $1, $2) {
-    return {
-      type: "MethodModifier",
-      async: true,
-      get: false,
-      set: false,
-      generator: !!$2,
-      children: $0
+      // no async or generator, because getters and setters can't be
+      modifier: {
+        async: false,
+        generator: false,
+        get: kind.token === "get",
+        set: kind.token === "set"
+      },
+      children: [kind, ws]
     };
   });
-  var MethodModifier$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(Star, __), function($skip, $loc, $0, $1, $2) {
+  var MethodModifier$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)((0, import_lib2.$S)(Async, __)), (0, import_lib2.$E)((0, import_lib2.$S)(Star, __))), function($skip, $loc, $0, $1, $2) {
+    var async = $1;
+    var generator = $2;
+    if (!async)
+      async = [];
+    if (!generator)
+      generator = [];
     return {
-      type: "MethodModifier",
-      async: false,
-      get: false,
-      set: false,
-      generator: true,
-      children: $0
+      async,
+      generator,
+      modifier: {
+        async: !!async.length,
+        get: false,
+        set: false,
+        generator: !!generator.length
+      },
+      children: [async, generator]
     };
   });
-  var MethodModifier$$ = [MethodModifier$0, MethodModifier$1, MethodModifier$2];
+  var MethodModifier$$ = [MethodModifier$0, MethodModifier$1];
   function MethodModifier(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "MethodModifier", MethodModifier$$);
   }
@@ -13524,10 +13757,12 @@ ${js}`
       parameters
     };
   });
-  var MethodSignature$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(MethodModifier), ClassElementName, (0, import_lib2.$E)(_), (0, import_lib2.$E)(QuestionMark), (0, import_lib2.$E)(_), NonEmptyParameters, (0, import_lib2.$E)(ReturnTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+  var MethodSignature$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(MethodModifier, ClassElementName, (0, import_lib2.$E)(_), (0, import_lib2.$E)(QuestionMark), (0, import_lib2.$E)(_), NonEmptyParameters, (0, import_lib2.$E)(ReturnTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
     var modifier = $1;
     var name = $2;
+    var ws1 = $3;
     var optional = $4;
+    var ws2 = $5;
     var parameters = $6;
     var returnType = $7;
     if (name.name) {
@@ -13536,14 +13771,15 @@ ${js}`
       name = name.token.match(/^(?:"|')/) ? name.token.slice(1, -1) : name.token;
     }
     if (optional)
-      $0[3] = optional = { ...optional, ts: true };
-    modifier = modifier || {};
+      optional = { ...optional, ts: true };
     return {
       type: "MethodSignature",
-      children: $0,
+      children: [...modifier.children, name, ws1, optional, ws2, parameters, returnType],
+      async: modifier.async,
+      generator: modifier.generator,
       name,
       optional,
-      modifier,
+      modifier: modifier.modifier,
       // get/set/async/generator
       returnType,
       parameters
@@ -14575,7 +14811,7 @@ ${js}`
   function ForStatementControlWithReduction(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "ForStatementControlWithReduction", ForStatementControlWithReduction$$);
   }
-  var ForReduction$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L120, 'ForReduction "some"'), (0, import_lib2.$EXPECT)($L121, 'ForReduction "every"'), (0, import_lib2.$EXPECT)($L122, 'ForReduction "count"'), (0, import_lib2.$EXPECT)($L123, 'ForReduction "sum"'), (0, import_lib2.$EXPECT)($L124, 'ForReduction "product"'), (0, import_lib2.$EXPECT)($L125, 'ForReduction "min"'), (0, import_lib2.$EXPECT)($L126, 'ForReduction "max"')), NonIdContinue, __), function($skip, $loc, $0, $1, $2, $3) {
+  var ForReduction$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L120, 'ForReduction "some"'), (0, import_lib2.$EXPECT)($L121, 'ForReduction "every"'), (0, import_lib2.$EXPECT)($L122, 'ForReduction "count"'), (0, import_lib2.$EXPECT)($L123, 'ForReduction "sum"'), (0, import_lib2.$EXPECT)($L124, 'ForReduction "product"'), (0, import_lib2.$EXPECT)($L125, 'ForReduction "min"'), (0, import_lib2.$EXPECT)($L126, 'ForReduction "max"'), (0, import_lib2.$EXPECT)($L127, 'ForReduction "join"')), NonIdContinue, __), function($skip, $loc, $0, $1, $2, $3) {
     var subtype = $1;
     var ws = $3;
     return {
@@ -15149,7 +15385,7 @@ ${js}`
       expression
     };
   });
-  var Condition$3 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, InsertOpenParen, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, Expression)), InsertCloseParen, PopIndent), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var Condition$3 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, InsertOpenParen, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, PostfixedExpression)), InsertCloseParen, PopIndent), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
     var open = $2;
     var expression = $3;
     var close = $4;
@@ -15178,7 +15414,7 @@ ${js}`
   function Condition(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "Condition", Condition$$);
   }
-  var BoundedCondition$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(InsertOpenParen, Expression, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3) {
+  var BoundedCondition$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(InsertOpenParen, PostfixedExpression, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3) {
     var open = $1;
     var expression = $2;
     var close = $3;
@@ -15525,67 +15761,84 @@ ${js}`
   function ThrowStatement(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "ThrowStatement", ThrowStatement$0);
   }
-  var Break$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L127, 'Break "break"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Break$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L128, 'Break "break"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Break(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Break", Break$0);
   }
-  var Continue$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L128, 'Continue "continue"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Continue$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L129, 'Continue "continue"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Continue(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Continue", Continue$0);
   }
-  var Debugger$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L129, 'Debugger "debugger"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Debugger$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L130, 'Debugger "debugger"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Debugger(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Debugger", Debugger$0);
   }
   var MaybeNestedNonPipelineExpression$0 = NestedBulletedArray;
-  var MaybeNestedNonPipelineExpression$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, NonPipelineExpression)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
-    if ($3)
-      return $3;
-    return $skip;
+  var MaybeNestedNonPipelineExpression$1 = NestedImplicitObjectLiteral;
+  var MaybeNestedNonPipelineExpression$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, NonPipelineExpression)), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var expression = $2;
+    var trailing = $4;
+    if (!expression)
+      return $skip;
+    if (!trailing)
+      return expression;
+    return [expression, trailing];
   });
-  var MaybeNestedNonPipelineExpression$2 = NonPipelineExpression;
-  var MaybeNestedNonPipelineExpression$$ = [MaybeNestedNonPipelineExpression$0, MaybeNestedNonPipelineExpression$1, MaybeNestedNonPipelineExpression$2];
+  var MaybeNestedNonPipelineExpression$3 = NonPipelineExpression;
+  var MaybeNestedNonPipelineExpression$$ = [MaybeNestedNonPipelineExpression$0, MaybeNestedNonPipelineExpression$1, MaybeNestedNonPipelineExpression$2, MaybeNestedNonPipelineExpression$3];
   function MaybeNestedNonPipelineExpression(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "MaybeNestedNonPipelineExpression", MaybeNestedNonPipelineExpression$$);
   }
   var MaybeNestedPostfixedExpression$0 = NestedBulletedArray;
-  var MaybeNestedPostfixedExpression$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, PostfixedExpression)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
-    if ($3)
-      return $3;
-    return $skip;
+  var MaybeNestedPostfixedExpression$1 = NestedImplicitObjectLiteral;
+  var MaybeNestedPostfixedExpression$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, PostfixedExpression)), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var expression = $2;
+    var trailing = $4;
+    if (!expression)
+      return $skip;
+    if (!trailing)
+      return expression;
+    return [expression, trailing];
   });
-  var MaybeNestedPostfixedExpression$2 = PostfixedExpression;
-  var MaybeNestedPostfixedExpression$$ = [MaybeNestedPostfixedExpression$0, MaybeNestedPostfixedExpression$1, MaybeNestedPostfixedExpression$2];
+  var MaybeNestedPostfixedExpression$3 = PostfixedExpression;
+  var MaybeNestedPostfixedExpression$$ = [MaybeNestedPostfixedExpression$0, MaybeNestedPostfixedExpression$1, MaybeNestedPostfixedExpression$2, MaybeNestedPostfixedExpression$3];
   function MaybeNestedPostfixedExpression(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "MaybeNestedPostfixedExpression", MaybeNestedPostfixedExpression$$);
   }
+  var NestedPostfixedExpressionNoTrailing$0 = NestedBulletedArray;
+  var NestedPostfixedExpressionNoTrailing$1 = NestedImplicitObjectLiteral;
+  var NestedPostfixedExpressionNoTrailing$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, PostfixedExpression)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
+    var expression = $2;
+    if (!expression)
+      return $skip;
+    return expression;
+  });
+  var NestedPostfixedExpressionNoTrailing$$ = [NestedPostfixedExpressionNoTrailing$0, NestedPostfixedExpressionNoTrailing$1, NestedPostfixedExpressionNoTrailing$2];
+  function NestedPostfixedExpressionNoTrailing(ctx, state2) {
+    return (0, import_lib2.$EVENT_C)(ctx, state2, "NestedPostfixedExpressionNoTrailing", NestedPostfixedExpressionNoTrailing$$);
+  }
   var MaybeNestedExpression$0 = NestedBulletedArray;
-  var MaybeNestedExpression$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, Expression)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
-    if ($3)
-      return $3;
-    return $skip;
+  var MaybeNestedExpression$1 = NestedImplicitObjectLiteral;
+  var MaybeNestedExpression$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, Expression)), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var expression = $2;
+    var trailing = $4;
+    if (!expression)
+      return $skip;
+    if (!trailing)
+      return expression;
+    return [expression, trailing];
   });
-  var MaybeNestedExpression$2 = Expression;
-  var MaybeNestedExpression$$ = [MaybeNestedExpression$0, MaybeNestedExpression$1, MaybeNestedExpression$2];
+  var MaybeNestedExpression$3 = Expression;
+  var MaybeNestedExpression$$ = [MaybeNestedExpression$0, MaybeNestedExpression$1, MaybeNestedExpression$2, MaybeNestedExpression$3];
   function MaybeNestedExpression(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "MaybeNestedExpression", MaybeNestedExpression$$);
   }
-  var NestedExpression$0 = NestedBulletedArray;
-  var NestedExpression$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, Expression)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
-    if ($3)
-      return $3;
-    return $skip;
-  });
-  var NestedExpression$$ = [NestedExpression$0, NestedExpression$1];
-  function NestedExpression(ctx, state2) {
-    return (0, import_lib2.$EVENT_C)(ctx, state2, "NestedExpression", NestedExpression$$);
-  }
   var MaybeParenNestedExpression$0 = (0, import_lib2.$T)((0, import_lib2.$Y)((0, import_lib2.$S)((0, import_lib2.$E)(_), PostfixStatement, NoBlock)), function(value) {
     return "";
   });
@@ -15595,7 +15848,7 @@ ${js}`
   var MaybeParenNestedExpression$2 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$Y)(EOS), (0, import_lib2.$C)(ArrayLiteral, ObjectLiteral)), function(value) {
     return value[1];
   });
-  var MaybeParenNestedExpression$3 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$Y)(EOS), InsertSpace, InsertOpenParen, PushIndent, (0, import_lib2.$S)(Nested, Expression), PopIndent, InsertNewline, InsertIndent, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+  var MaybeParenNestedExpression$3 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$Y)(EOS), InsertSpace, InsertOpenParen, PushIndent, (0, import_lib2.$S)(Nested, Expression), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions), InsertNewline, InsertIndent, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9, $10) {
     var exp = $5;
     if (!exp)
       return $skip;
@@ -15605,7 +15858,7 @@ ${js}`
   function MaybeParenNestedExpression(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "MaybeParenNestedExpression", MaybeParenNestedExpression$$);
   }
-  var ImportDeclaration$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Import, _, Identifier, (0, import_lib2.$E)(_), Equals, __, (0, import_lib2.$EXPECT)($L130, 'ImportDeclaration "require"'), NonIdContinue, Arguments), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+  var ImportDeclaration$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Import, _, Identifier, (0, import_lib2.$E)(_), Equals, __, (0, import_lib2.$EXPECT)($L131, 'ImportDeclaration "require"'), NonIdContinue, Arguments), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
     const imp = [
       { ...$1, ts: true },
       { ...$1, token: "const", js: true }
@@ -15795,7 +16048,7 @@ ${js}`
   function ImpliedFrom(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "ImpliedFrom", ImpliedFrom$0);
   }
-  var ImportAssertion$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$C)((0, import_lib2.$EXPECT)($L131, 'ImportAssertion "with"'), (0, import_lib2.$EXPECT)($L132, 'ImportAssertion "assert"')), NonIdContinue, (0, import_lib2.$E)(_), ObjectLiteral), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var ImportAssertion$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$C)((0, import_lib2.$EXPECT)($L132, 'ImportAssertion "with"'), (0, import_lib2.$EXPECT)($L133, 'ImportAssertion "assert"')), NonIdContinue, (0, import_lib2.$E)(_), ObjectLiteral), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
     var keyword = $2;
     var object = $5;
     return {
@@ -16121,19 +16374,19 @@ ${js}`
   function LexicalDeclaration(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "LexicalDeclaration", LexicalDeclaration$$);
   }
-  var ConstAssignment$0 = (0, import_lib2.$TV)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L133, 'ConstAssignment ":="'), (0, import_lib2.$EXPECT)($L134, 'ConstAssignment "\u2254"')), function($skip, $loc, $0, $1) {
+  var ConstAssignment$0 = (0, import_lib2.$TV)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L134, 'ConstAssignment ":="'), (0, import_lib2.$EXPECT)($L135, 'ConstAssignment "\u2254"')), function($skip, $loc, $0, $1) {
     return { $loc, token: "=", decl: "const " };
   });
   function ConstAssignment(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "ConstAssignment", ConstAssignment$0);
   }
-  var LetAssignment$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L135, 'LetAssignment ".="'), function($skip, $loc, $0, $1) {
+  var LetAssignment$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L136, 'LetAssignment ".="'), function($skip, $loc, $0, $1) {
     return { $loc, token: "=", decl: "let " };
   });
   function LetAssignment(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "LetAssignment", LetAssignment$0);
   }
-  var TypeAssignment$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L136, 'TypeAssignment "::="'), function($skip, $loc, $0, $1) {
+  var TypeAssignment$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L137, 'TypeAssignment "::="'), function($skip, $loc, $0, $1) {
     return { $loc, token: "=" };
   });
   function TypeAssignment(ctx, state2) {
@@ -16556,7 +16809,7 @@ ${js}`
   function MultiLineComment(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "MultiLineComment", MultiLineComment$$);
   }
-  var JSMultiLineComment$0 = (0, import_lib2.$TV)((0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L137, 'JSMultiLineComment "/*"'), (0, import_lib2.$Q)((0, import_lib2.$S)((0, import_lib2.$N)((0, import_lib2.$EXPECT)($L138, 'JSMultiLineComment "*/"')), (0, import_lib2.$EXPECT)($R68, "JSMultiLineComment /./"))), (0, import_lib2.$EXPECT)($L138, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
+  var JSMultiLineComment$0 = (0, import_lib2.$TV)((0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L138, 'JSMultiLineComment "/*"'), (0, import_lib2.$Q)((0, import_lib2.$S)((0, import_lib2.$N)((0, import_lib2.$EXPECT)($L139, 'JSMultiLineComment "*/"')), (0, import_lib2.$EXPECT)($R68, "JSMultiLineComment /./"))), (0, import_lib2.$EXPECT)($L139, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
     return { type: "Comment", $loc, token: $1 };
   });
   function JSMultiLineComment(ctx, state2) {
@@ -16602,7 +16855,7 @@ ${js}`
   var NonNewlineWhitespace$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R23, "NonNewlineWhitespace /[ \\t]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
     return { $loc, token: $0 };
   });
-  var NonNewlineWhitespace$1 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L139, 'NonNewlineWhitespace "\\\\\\\\"'), CoffeeLineContinuationEnabled, EOL), function(value) {
+  var NonNewlineWhitespace$1 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L140, 'NonNewlineWhitespace "\\\\\\\\"'), CoffeeLineContinuationEnabled, EOL), function(value) {
     return " ";
   });
   var NonNewlineWhitespace$$ = [NonNewlineWhitespace$0, NonNewlineWhitespace$1];
@@ -16653,7 +16906,7 @@ ${js}`
   function StatementDelimiter(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "StatementDelimiter", StatementDelimiter$$);
   }
-  var ClosingDelimiter$0 = (0, import_lib2.$Y)((0, import_lib2.$S)(__, (0, import_lib2.$C)((0, import_lib2.$EXPECT)($L37, 'ClosingDelimiter "}"'), (0, import_lib2.$EXPECT)($L140, 'ClosingDelimiter ")"'), (0, import_lib2.$EXPECT)($L46, 'ClosingDelimiter "]"'))));
+  var ClosingDelimiter$0 = (0, import_lib2.$Y)((0, import_lib2.$S)(__, (0, import_lib2.$C)((0, import_lib2.$EXPECT)($L37, 'ClosingDelimiter "}"'), (0, import_lib2.$EXPECT)($L141, 'ClosingDelimiter ")"'), (0, import_lib2.$EXPECT)($L46, 'ClosingDelimiter "]"'))));
   function ClosingDelimiter(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "ClosingDelimiter", ClosingDelimiter$0);
   }
@@ -16676,7 +16929,7 @@ ${js}`
   function Loc(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Loc", Loc$0);
   }
-  var Abstract$0 = (0, import_lib2.$TV)((0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L141, 'Abstract "abstract"'), NonIdContinue, (0, import_lib2.$E)((0, import_lib2.$EXPECT)($L18, 'Abstract " "')))), function($skip, $loc, $0, $1) {
+  var Abstract$0 = (0, import_lib2.$TV)((0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L142, 'Abstract "abstract"'), NonIdContinue, (0, import_lib2.$E)((0, import_lib2.$EXPECT)($L18, 'Abstract " "')))), function($skip, $loc, $0, $1) {
     return { $loc, token: $1, ts: true };
   });
   function Abstract(ctx, state2) {
@@ -16688,43 +16941,43 @@ ${js}`
   function Ampersand(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Ampersand", Ampersand$0);
   }
-  var As$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L142, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var As$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L143, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function As(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "As", As$0);
   }
-  var At$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L143, 'At "@"'), function($skip, $loc, $0, $1) {
+  var At$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L144, 'At "@"'), function($skip, $loc, $0, $1) {
     return { $loc, token: $1 };
   });
   function At(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "At", At$0);
   }
-  var AtAt$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L144, 'AtAt "@@"'), function($skip, $loc, $0, $1) {
+  var AtAt$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L145, 'AtAt "@@"'), function($skip, $loc, $0, $1) {
     return { $loc, token: "@" };
   });
   function AtAt(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "AtAt", AtAt$0);
   }
-  var Async$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L145, 'Async "async"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Async$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L146, 'Async "async"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1, type: "Async" };
   });
   function Async(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Async", Async$0);
   }
-  var Await$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L146, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Await$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L147, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1, type: "Await" };
   });
   function Await(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Await", Await$0);
   }
-  var Backtick$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L147, 'Backtick "`"'), function($skip, $loc, $0, $1) {
+  var Backtick$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L148, 'Backtick "`"'), function($skip, $loc, $0, $1) {
     return { $loc, token: $1 };
   });
   function Backtick(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Backtick", Backtick$0);
   }
-  var By$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L148, 'By "by"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var By$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L149, 'By "by"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function By(ctx, state2) {
@@ -16736,19 +16989,19 @@ ${js}`
   function Caret(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Caret", Caret$0);
   }
-  var Case$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L149, 'Case "case"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Case$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L150, 'Case "case"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Case(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Case", Case$0);
   }
-  var Catch$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L150, 'Catch "catch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Catch$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L151, 'Catch "catch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Catch(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Catch", Catch$0);
   }
-  var Class$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L151, 'Class "class"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Class$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L152, 'Class "class"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Class(ctx, state2) {
@@ -16772,13 +17025,13 @@ ${js}`
   function CloseBracket(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "CloseBracket", CloseBracket$0);
   }
-  var CloseParen$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L140, 'CloseParen ")"'), function($skip, $loc, $0, $1) {
+  var CloseParen$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L141, 'CloseParen ")"'), function($skip, $loc, $0, $1) {
     return { $loc, token: $1 };
   });
   function CloseParen(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "CloseParen", CloseParen$0);
   }
-  var CoffeeSubstitutionStart$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L152, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
+  var CoffeeSubstitutionStart$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L153, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
     return { $loc, token: "${" };
   });
   function CoffeeSubstitutionStart(ctx, state2) {
@@ -16796,37 +17049,37 @@ ${js}`
   function Comma(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Comma", Comma$0);
   }
-  var Comptime$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L153, 'Comptime "comptime"'), NonIdContinue, (0, import_lib2.$N)((0, import_lib2.$EXPECT)($L16, 'Comptime ":"'))), function($skip, $loc, $0, $1, $2, $3) {
+  var Comptime$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L154, 'Comptime "comptime"'), NonIdContinue, (0, import_lib2.$N)((0, import_lib2.$EXPECT)($L16, 'Comptime ":"'))), function($skip, $loc, $0, $1, $2, $3) {
     return { $loc, token: $1 };
   });
   function Comptime(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Comptime", Comptime$0);
   }
-  var ConstructorShorthand$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L143, 'ConstructorShorthand "@"'), function($skip, $loc, $0, $1) {
+  var ConstructorShorthand$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L144, 'ConstructorShorthand "@"'), function($skip, $loc, $0, $1) {
     return { $loc, token: "constructor" };
   });
   function ConstructorShorthand(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "ConstructorShorthand", ConstructorShorthand$0);
   }
-  var Declare$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L154, 'Declare "declare"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Declare$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L155, 'Declare "declare"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Declare(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Declare", Declare$0);
   }
-  var Default$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L155, 'Default "default"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Default$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L156, 'Default "default"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Default(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Default", Default$0);
   }
-  var Delete$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L156, 'Delete "delete"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Delete$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L157, 'Delete "delete"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Delete(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Delete", Delete$0);
   }
-  var Do$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L157, 'Do "do"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Do$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L158, 'Do "do"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Do(ctx, state2) {
@@ -16846,20 +17099,20 @@ ${js}`
   function Dot(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "Dot", Dot$$);
   }
-  var DotDot$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L158, 'DotDot ".."'), (0, import_lib2.$N)((0, import_lib2.$EXPECT)($L7, 'DotDot "."'))), function($skip, $loc, $0, $1, $2) {
+  var DotDot$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L159, 'DotDot ".."'), (0, import_lib2.$N)((0, import_lib2.$EXPECT)($L7, 'DotDot "."'))), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
-  var DotDot$1 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L159, 'DotDot "\u2025"'), function($skip, $loc, $0, $1) {
+  var DotDot$1 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L160, 'DotDot "\u2025"'), function($skip, $loc, $0, $1) {
     return { $loc, token: ".." };
   });
   var DotDot$$ = [DotDot$0, DotDot$1];
   function DotDot(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "DotDot", DotDot$$);
   }
-  var DotDotDot$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L160, 'DotDotDot "..."'), function($skip, $loc, $0, $1) {
+  var DotDotDot$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L161, 'DotDotDot "..."'), function($skip, $loc, $0, $1) {
     return { $loc, token: $1 };
   });
-  var DotDotDot$1 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L161, 'DotDotDot "\u2026"'), function($skip, $loc, $0, $1) {
+  var DotDotDot$1 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L162, 'DotDotDot "\u2026"'), function($skip, $loc, $0, $1) {
     return { $loc, token: "..." };
   });
   var DotDotDot$$ = [DotDotDot$0, DotDotDot$1];
@@ -16872,31 +17125,31 @@ ${js}`
   function InsertDotDotDot(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "InsertDotDotDot", InsertDotDotDot$0);
   }
-  var DoubleColon$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L162, 'DoubleColon "::"'), function($skip, $loc, $0, $1) {
+  var DoubleColon$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L163, 'DoubleColon "::"'), function($skip, $loc, $0, $1) {
     return { $loc, token: $1 };
   });
   function DoubleColon(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "DoubleColon", DoubleColon$0);
   }
-  var DoubleColonAsColon$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L162, 'DoubleColonAsColon "::"'), function($skip, $loc, $0, $1) {
+  var DoubleColonAsColon$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L163, 'DoubleColonAsColon "::"'), function($skip, $loc, $0, $1) {
     return { $loc, token: ":" };
   });
   function DoubleColonAsColon(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "DoubleColonAsColon", DoubleColonAsColon$0);
   }
-  var DoubleQuote$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L163, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
+  var DoubleQuote$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L164, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
     return { $loc, token: $1 };
   });
   function DoubleQuote(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "DoubleQuote", DoubleQuote$0);
   }
-  var Each$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L164, 'Each "each"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Each$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L165, 'Each "each"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Each(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Each", Each$0);
   }
-  var Else$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L165, 'Else "else"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Else$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L166, 'Else "else"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Else(ctx, state2) {
@@ -16908,61 +17161,61 @@ ${js}`
   function Equals(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Equals", Equals$0);
   }
-  var ExclamationPoint$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L166, 'ExclamationPoint "!"'), function($skip, $loc, $0, $1) {
+  var ExclamationPoint$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L167, 'ExclamationPoint "!"'), function($skip, $loc, $0, $1) {
     return { $loc, token: $1 };
   });
   function ExclamationPoint(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "ExclamationPoint", ExclamationPoint$0);
   }
-  var Export$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L167, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Export$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L168, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Export(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Export", Export$0);
   }
-  var Extends$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L168, 'Extends "extends"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Extends$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L169, 'Extends "extends"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Extends(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Extends", Extends$0);
   }
-  var Finally$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L169, 'Finally "finally"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Finally$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L170, 'Finally "finally"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Finally(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Finally", Finally$0);
   }
-  var For$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L170, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var For$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L171, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function For(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "For", For$0);
   }
-  var From$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L171, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var From$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L172, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function From(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "From", From$0);
   }
-  var Function$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L172, 'Function "function"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Function$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L173, 'Function "function"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Function2(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Function", Function$0);
   }
-  var GetOrSet$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L173, 'GetOrSet "get"'), (0, import_lib2.$EXPECT)($L174, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var GetOrSet$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L174, 'GetOrSet "get"'), (0, import_lib2.$EXPECT)($L175, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1, type: "GetOrSet" };
   });
   function GetOrSet(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "GetOrSet", GetOrSet$0);
   }
-  var Hash$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L175, 'Hash "#"'), function($skip, $loc, $0, $1) {
+  var Hash$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L176, 'Hash "#"'), function($skip, $loc, $0, $1) {
     return { $loc, token: $1 };
   });
   function Hash(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Hash", Hash$0);
   }
-  var If$0 = (0, import_lib2.$TV)((0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L176, 'If "if"'), NonIdContinue, (0, import_lib2.$E)((0, import_lib2.$EXPECT)($L18, 'If " "')))), function($skip, $loc, $0, $1) {
+  var If$0 = (0, import_lib2.$TV)((0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L177, 'If "if"'), NonIdContinue, (0, import_lib2.$E)((0, import_lib2.$EXPECT)($L18, 'If " "')))), function($skip, $loc, $0, $1) {
     return { $loc, token: $1 };
   });
   function If(ctx, state2) {
@@ -16974,67 +17227,67 @@ ${js}`
   function Import(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Import", Import$0);
   }
-  var In$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L177, 'In "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var In$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L178, 'In "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function In(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "In", In$0);
   }
-  var Infer$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L178, 'Infer "infer"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Infer$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L179, 'Infer "infer"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Infer(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Infer", Infer$0);
   }
-  var LetOrConst$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L179, 'LetOrConst "let"'), (0, import_lib2.$EXPECT)($L180, 'LetOrConst "const"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var LetOrConst$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L180, 'LetOrConst "let"'), (0, import_lib2.$EXPECT)($L181, 'LetOrConst "const"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function LetOrConst(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "LetOrConst", LetOrConst$0);
   }
-  var Const$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L180, 'Const "const"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Const$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L181, 'Const "const"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Const(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Const", Const$0);
   }
-  var Is$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L181, 'Is "is"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Is$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L182, 'Is "is"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Is(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Is", Is$0);
   }
-  var LetOrConstOrVar$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L179, 'LetOrConstOrVar "let"'), (0, import_lib2.$EXPECT)($L180, 'LetOrConstOrVar "const"'), (0, import_lib2.$EXPECT)($L182, 'LetOrConstOrVar "var"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var LetOrConstOrVar$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L180, 'LetOrConstOrVar "let"'), (0, import_lib2.$EXPECT)($L181, 'LetOrConstOrVar "const"'), (0, import_lib2.$EXPECT)($L183, 'LetOrConstOrVar "var"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function LetOrConstOrVar(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "LetOrConstOrVar", LetOrConstOrVar$0);
   }
-  var Like$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L183, 'Like "like"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Like$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L184, 'Like "like"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Like(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Like", Like$0);
   }
-  var Loop$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L184, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Loop$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L185, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: "while" };
   });
   function Loop(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Loop", Loop$0);
   }
-  var New$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L185, 'New "new"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var New$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L186, 'New "new"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function New(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "New", New$0);
   }
-  var Not$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L186, 'Not "not"'), NonIdContinue, (0, import_lib2.$N)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$EXPECT)($L16, 'Not ":"')))), function($skip, $loc, $0, $1, $2, $3) {
+  var Not$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L187, 'Not "not"'), NonIdContinue, (0, import_lib2.$N)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$EXPECT)($L16, 'Not ":"')))), function($skip, $loc, $0, $1, $2, $3) {
     return { $loc, token: "!" };
   });
   function Not(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Not", Not$0);
   }
-  var Of$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L187, 'Of "of"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Of$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L188, 'Of "of"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Of(ctx, state2) {
@@ -17052,7 +17305,7 @@ ${js}`
   function OpenBrace(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "OpenBrace", OpenBrace$0);
   }
-  var OpenBracket$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L188, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
+  var OpenBracket$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L189, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
     return { $loc, token: $1 };
   });
   function OpenBracket(ctx, state2) {
@@ -17064,49 +17317,49 @@ ${js}`
   function OpenParen(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "OpenParen", OpenParen$0);
   }
-  var Operator$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L189, 'Operator "operator"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Operator$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L190, 'Operator "operator"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Operator(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Operator", Operator$0);
   }
-  var Override$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L190, 'Override "override"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Override$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L191, 'Override "override"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1, ts: true };
   });
   function Override(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Override", Override$0);
   }
-  var Own$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L191, 'Own "own"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Own$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L192, 'Own "own"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Own(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Own", Own$0);
   }
-  var Public$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L192, 'Public "public"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Public$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L193, 'Public "public"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Public(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Public", Public$0);
   }
-  var Private$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L193, 'Private "private"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Private$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L194, 'Private "private"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Private(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Private", Private$0);
   }
-  var Protected$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L194, 'Protected "protected"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Protected$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L195, 'Protected "protected"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Protected(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Protected", Protected$0);
   }
-  var Pipe$0 = (0, import_lib2.$TV)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L195, 'Pipe "||>"'), (0, import_lib2.$EXPECT)($L196, 'Pipe "|\u25B7"')), function($skip, $loc, $0, $1) {
+  var Pipe$0 = (0, import_lib2.$TV)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L196, 'Pipe "||>"'), (0, import_lib2.$EXPECT)($L197, 'Pipe "|\u25B7"')), function($skip, $loc, $0, $1) {
     return { $loc, token: "||>" };
   });
-  var Pipe$1 = (0, import_lib2.$TV)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L197, 'Pipe "|>="'), (0, import_lib2.$EXPECT)($L198, 'Pipe "\u25B7="')), function($skip, $loc, $0, $1) {
+  var Pipe$1 = (0, import_lib2.$TV)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L198, 'Pipe "|>="'), (0, import_lib2.$EXPECT)($L199, 'Pipe "\u25B7="')), function($skip, $loc, $0, $1) {
     return { $loc, token: "|>=" };
   });
-  var Pipe$2 = (0, import_lib2.$TV)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L199, 'Pipe "|>"'), (0, import_lib2.$EXPECT)($L200, 'Pipe "\u25B7"')), function($skip, $loc, $0, $1) {
+  var Pipe$2 = (0, import_lib2.$TV)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L200, 'Pipe "|>"'), (0, import_lib2.$EXPECT)($L201, 'Pipe "\u25B7"')), function($skip, $loc, $0, $1) {
     return { $loc, token: "|>" };
   });
   var Pipe$$ = [Pipe$0, Pipe$1, Pipe$2];
@@ -17119,19 +17372,19 @@ ${js}`
   function QuestionMark(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "QuestionMark", QuestionMark$0);
   }
-  var Readonly$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L201, 'Readonly "readonly"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Readonly$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L202, 'Readonly "readonly"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1, ts: true };
   });
   function Readonly(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Readonly", Readonly$0);
   }
-  var Return$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L202, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Return$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L203, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Return(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Return", Return$0);
   }
-  var Satisfies$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L203, 'Satisfies "satisfies"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Satisfies$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L204, 'Satisfies "satisfies"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Satisfies(ctx, state2) {
@@ -17143,7 +17396,7 @@ ${js}`
   function Semicolon(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Semicolon", Semicolon$0);
   }
-  var SingleQuote$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L204, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
+  var SingleQuote$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L205, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
     return { $loc, token: $1 };
   });
   function SingleQuote(ctx, state2) {
@@ -17155,149 +17408,149 @@ ${js}`
   function Star(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Star", Star$0);
   }
-  var Static$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L205, 'Static "static"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Static$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L206, 'Static "static"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
-  var Static$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L143, 'Static "@"'), (0, import_lib2.$N)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L4, 'Static "("'), (0, import_lib2.$EXPECT)($L143, 'Static "@"')))), function($skip, $loc, $0, $1, $2) {
+  var Static$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L144, 'Static "@"'), (0, import_lib2.$N)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L4, 'Static "("'), (0, import_lib2.$EXPECT)($L144, 'Static "@"')))), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: "static " };
   });
   var Static$$ = [Static$0, Static$1];
   function Static(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "Static", Static$$);
   }
-  var SubstitutionStart$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L206, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
+  var SubstitutionStart$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L207, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
     return { $loc, token: $1 };
   });
   function SubstitutionStart(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "SubstitutionStart", SubstitutionStart$0);
   }
-  var Super$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L207, 'Super "super"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Super$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L208, 'Super "super"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Super(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Super", Super$0);
   }
-  var Switch$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L208, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Switch$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L209, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Switch(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Switch", Switch$0);
   }
-  var Target$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L209, 'Target "target"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Target$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L210, 'Target "target"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Target(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Target", Target$0);
   }
-  var Then$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(__, (0, import_lib2.$EXPECT)($L210, 'Then "then"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
+  var Then$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(__, (0, import_lib2.$EXPECT)($L211, 'Then "then"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
     return { $loc, token: "" };
   });
   function Then(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Then", Then$0);
   }
-  var This$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L211, 'This "this"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var This$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L212, 'This "this"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function This(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "This", This$0);
   }
-  var Throw$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L212, 'Throw "throw"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Throw$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L213, 'Throw "throw"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Throw(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Throw", Throw$0);
   }
-  var TripleDoubleQuote$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L213, 'TripleDoubleQuote "\\\\\\"\\\\\\"\\\\\\""'), function($skip, $loc, $0, $1) {
+  var TripleDoubleQuote$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L214, 'TripleDoubleQuote "\\\\\\"\\\\\\"\\\\\\""'), function($skip, $loc, $0, $1) {
     return { $loc, token: "`" };
   });
   function TripleDoubleQuote(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "TripleDoubleQuote", TripleDoubleQuote$0);
   }
-  var TripleSingleQuote$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L214, `TripleSingleQuote "'''"`), function($skip, $loc, $0, $1) {
+  var TripleSingleQuote$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L215, `TripleSingleQuote "'''"`), function($skip, $loc, $0, $1) {
     return { $loc, token: "`" };
   });
   function TripleSingleQuote(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "TripleSingleQuote", TripleSingleQuote$0);
   }
-  var TripleSlash$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L215, 'TripleSlash "///"'), function($skip, $loc, $0, $1) {
+  var TripleSlash$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L216, 'TripleSlash "///"'), function($skip, $loc, $0, $1) {
     return { $loc, token: "/" };
   });
   function TripleSlash(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "TripleSlash", TripleSlash$0);
   }
-  var TripleTick$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L216, 'TripleTick "```"'), function($skip, $loc, $0, $1) {
+  var TripleTick$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L217, 'TripleTick "```"'), function($skip, $loc, $0, $1) {
     return { $loc, token: "`" };
   });
   function TripleTick(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "TripleTick", TripleTick$0);
   }
-  var Try$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L217, 'Try "try"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Try$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L218, 'Try "try"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Try(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Try", Try$0);
   }
-  var Typeof$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L218, 'Typeof "typeof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Typeof$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L219, 'Typeof "typeof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Typeof(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Typeof", Typeof$0);
   }
-  var Undefined$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L219, 'Undefined "undefined"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Undefined$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L220, 'Undefined "undefined"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Undefined(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Undefined", Undefined$0);
   }
-  var Unless$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L220, 'Unless "unless"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Unless$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L221, 'Unless "unless"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1, negated: true };
   });
   function Unless(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Unless", Unless$0);
   }
-  var Until$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L221, 'Until "until"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Until$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L222, 'Until "until"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1, negated: true };
   });
   function Until(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Until", Until$0);
   }
-  var Using$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L222, 'Using "using"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Using$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L223, 'Using "using"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Using(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Using", Using$0);
   }
-  var Var$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L182, 'Var "var"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Var$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L183, 'Var "var"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Var(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Var", Var$0);
   }
-  var Void$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L223, 'Void "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Void$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L224, 'Void "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Void(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Void", Void$0);
   }
-  var When$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L224, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var When$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L225, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: "case" };
   });
   function When(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "When", When$0);
   }
-  var While$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L225, 'While "while"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var While$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L226, 'While "while"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function While(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "While", While$0);
   }
-  var With$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L131, 'With "with"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var With$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L132, 'With "with"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function With(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "With", With$0);
   }
-  var Yield$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L226, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Yield$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L227, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1, type: "Yield" };
   });
   function Yield(ctx, state2) {
@@ -17376,7 +17629,7 @@ ${js}`
   function JSXElement(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "JSXElement", JSXElement$$);
   }
-  var JSXSelfClosingElement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L19, 'JSXSelfClosingElement "<"'), JSXElementName, (0, import_lib2.$E)(TypeArguments), (0, import_lib2.$E)(JSXAttributes), (0, import_lib2.$E)(Whitespace), (0, import_lib2.$EXPECT)($L227, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+  var JSXSelfClosingElement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L19, 'JSXSelfClosingElement "<"'), JSXElementName, (0, import_lib2.$E)(TypeArguments), (0, import_lib2.$E)(JSXAttributes), (0, import_lib2.$E)(Whitespace), (0, import_lib2.$EXPECT)($L228, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
     return { type: "JSXElement", children: $0, tag: $2 };
   });
   function JSXSelfClosingElement(ctx, state2) {
@@ -17410,7 +17663,7 @@ ${js}`
   function JSXOptionalClosingElement(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "JSXOptionalClosingElement", JSXOptionalClosingElement$$);
   }
-  var JSXClosingElement$0 = (0, import_lib2.$S)((0, import_lib2.$EXPECT)($L228, 'JSXClosingElement "</"'), (0, import_lib2.$E)(Whitespace), JSXElementName, (0, import_lib2.$E)(Whitespace), (0, import_lib2.$EXPECT)($L45, 'JSXClosingElement ">"'));
+  var JSXClosingElement$0 = (0, import_lib2.$S)((0, import_lib2.$EXPECT)($L229, 'JSXClosingElement "</"'), (0, import_lib2.$E)(Whitespace), JSXElementName, (0, import_lib2.$E)(Whitespace), (0, import_lib2.$EXPECT)($L45, 'JSXClosingElement ">"'));
   function JSXClosingElement(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "JSXClosingElement", JSXClosingElement$0);
   }
@@ -17431,7 +17684,7 @@ ${js}`
     ];
     return { type: "JSXFragment", children: parts, jsxChildren: children.jsxChildren };
   });
-  var JSXFragment$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(CoffeeJSXEnabled, (0, import_lib2.$EXPECT)($L229, 'JSXFragment "<>"'), (0, import_lib2.$E)(JSXChildren), (0, import_lib2.$E)(Whitespace), JSXClosingFragment), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var JSXFragment$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(CoffeeJSXEnabled, (0, import_lib2.$EXPECT)($L230, 'JSXFragment "<>"'), (0, import_lib2.$E)(JSXChildren), (0, import_lib2.$E)(Whitespace), JSXClosingFragment), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
     var children = $3;
     $0 = $0.slice(1);
     return {
@@ -17444,7 +17697,7 @@ ${js}`
   function JSXFragment(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "JSXFragment", JSXFragment$$);
   }
-  var PushJSXOpeningFragment$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L229, 'PushJSXOpeningFragment "<>"'), function($skip, $loc, $0, $1) {
+  var PushJSXOpeningFragment$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L230, 'PushJSXOpeningFragment "<>"'), function($skip, $loc, $0, $1) {
     state.JSXTagStack.push("");
     return $1;
   });
@@ -17461,11 +17714,11 @@ ${js}`
   function JSXOptionalClosingFragment(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "JSXOptionalClosingFragment", JSXOptionalClosingFragment$$);
   }
-  var JSXClosingFragment$0 = (0, import_lib2.$EXPECT)($L230, 'JSXClosingFragment "</>"');
+  var JSXClosingFragment$0 = (0, import_lib2.$EXPECT)($L231, 'JSXClosingFragment "</>"');
   function JSXClosingFragment(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "JSXClosingFragment", JSXClosingFragment$0);
   }
-  var JSXElementName$0 = (0, import_lib2.$TV)((0, import_lib2.$Y)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L175, 'JSXElementName "#"'), Dot), JSXShorthandString)), function($skip, $loc, $0, $1) {
+  var JSXElementName$0 = (0, import_lib2.$TV)((0, import_lib2.$Y)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L176, 'JSXElementName "#"'), Dot), JSXShorthandString)), function($skip, $loc, $0, $1) {
     return config.defaultElement;
   });
   var JSXElementName$1 = (0, import_lib2.$TEXT)((0, import_lib2.$S)(JSXIdentifierName, (0, import_lib2.$C)((0, import_lib2.$S)(Colon, JSXIdentifierName), (0, import_lib2.$Q)((0, import_lib2.$S)(Dot, JSXIdentifierName)))));
@@ -17646,7 +17899,7 @@ ${js}`
     }
     return $skip;
   });
-  var JSXAttribute$5 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L175, 'JSXAttribute "#"'), JSXShorthandString), function($skip, $loc, $0, $1, $2) {
+  var JSXAttribute$5 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L176, 'JSXAttribute "#"'), JSXShorthandString), function($skip, $loc, $0, $1, $2) {
     return [" ", "id=", $2];
   });
   var JSXAttribute$6 = (0, import_lib2.$TS)((0, import_lib2.$S)(Dot, JSXShorthandString), function($skip, $loc, $0, $1, $2) {
@@ -17687,17 +17940,13 @@ ${js}`
   function JSXAttributeName(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "JSXAttributeName", JSXAttributeName$$);
   }
-  var JSXAttributeInitializer$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(CoffeeJSXEnabled), (0, import_lib2.$E)(Whitespace), Equals, (0, import_lib2.$Y)((0, import_lib2.$S)((0, import_lib2.$Q)(NonNewlineWhitespace), EOL)), InsertInlineOpenBrace, PushIndent, (0, import_lib2.$E)(PostfixedExpression), PopIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+  var JSXAttributeInitializer$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(CoffeeJSXEnabled), (0, import_lib2.$E)(Whitespace), Equals, (0, import_lib2.$Y)((0, import_lib2.$S)((0, import_lib2.$Q)(NonNewlineWhitespace), EOL)), InsertInlineOpenBrace, NestedPostfixedExpressionNoTrailing, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
     var ws1 = $2;
     var equals = $3;
-    var ws2 = $4;
     var open = $5;
-    var indent = $6;
-    var expression = $7;
-    var close = $9;
-    if (!expression)
-      return $skip;
-    return [ws1, equals, ws2, open, indent, expression, close];
+    var expression = $6;
+    var close = $7;
+    return [ws1, equals, open, trimFirstSpace(expression), close];
   });
   var JSXAttributeInitializer$1 = (0, import_lib2.$S)((0, import_lib2.$E)(Whitespace), Equals, (0, import_lib2.$E)(Whitespace), JSXAttributeValue);
   var JSXAttributeInitializer$$ = [JSXAttributeInitializer$0, JSXAttributeInitializer$1];
@@ -17991,7 +18240,7 @@ ${js}`
   function JSXChildGeneral(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "JSXChildGeneral", JSXChildGeneral$$);
   }
-  var JSXComment$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L231, 'JSXComment "<!--"'), JSXCommentContent, (0, import_lib2.$EXPECT)($L232, 'JSXComment "-->"')), function($skip, $loc, $0, $1, $2, $3) {
+  var JSXComment$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L232, 'JSXComment "<!--"'), JSXCommentContent, (0, import_lib2.$EXPECT)($L233, 'JSXComment "-->"')), function($skip, $loc, $0, $1, $2, $3) {
     return ["{/*", $2, "*/}"];
   });
   function JSXComment(ctx, state2) {
@@ -18279,37 +18528,37 @@ ${js}`
   function InterfaceExtendsTarget(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "InterfaceExtendsTarget", InterfaceExtendsTarget$0);
   }
-  var TypeKeyword$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L233, 'TypeKeyword "type"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var TypeKeyword$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L234, 'TypeKeyword "type"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function TypeKeyword(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "TypeKeyword", TypeKeyword$0);
   }
-  var Enum$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L234, 'Enum "enum"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Enum$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L235, 'Enum "enum"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Enum(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Enum", Enum$0);
   }
-  var Interface$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L235, 'Interface "interface"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Interface$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L236, 'Interface "interface"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Interface(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Interface", Interface$0);
   }
-  var Global$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L236, 'Global "global"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Global$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L237, 'Global "global"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Global(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Global", Global$0);
   }
-  var Module$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L237, 'Module "module"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Module$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L238, 'Module "module"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Module(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Module", Module$0);
   }
-  var Namespace$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L238, 'Namespace "namespace"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Namespace$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L239, 'Namespace "namespace"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Namespace(ctx, state2) {
@@ -18623,7 +18872,7 @@ ${js}`
   function ReturnTypeSuffix(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "ReturnTypeSuffix", ReturnTypeSuffix$0);
   }
-  var ReturnType$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)((0, import_lib2.$S)(__, (0, import_lib2.$EXPECT)($L239, 'ReturnType "asserts"'), NonIdContinue)), ForbidIndentedApplication, (0, import_lib2.$E)(TypePredicate), RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var ReturnType$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)((0, import_lib2.$S)(__, (0, import_lib2.$EXPECT)($L240, 'ReturnType "asserts"'), NonIdContinue)), ForbidIndentedApplication, (0, import_lib2.$E)(TypePredicate), RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3, $4) {
     var asserts = $1;
     var t = $3;
     if (!t)
@@ -18724,8 +18973,8 @@ ${js}`
   function TypeUnarySuffix(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "TypeUnarySuffix", TypeUnarySuffix$$);
   }
-  var TypeUnaryOp$0 = (0, import_lib2.$S)((0, import_lib2.$EXPECT)($L240, 'TypeUnaryOp "keyof"'), NonIdContinue);
-  var TypeUnaryOp$1 = (0, import_lib2.$S)((0, import_lib2.$EXPECT)($L201, 'TypeUnaryOp "readonly"'), NonIdContinue);
+  var TypeUnaryOp$0 = (0, import_lib2.$S)((0, import_lib2.$EXPECT)($L241, 'TypeUnaryOp "keyof"'), NonIdContinue);
+  var TypeUnaryOp$1 = (0, import_lib2.$S)((0, import_lib2.$EXPECT)($L202, 'TypeUnaryOp "readonly"'), NonIdContinue);
   var TypeUnaryOp$$ = [TypeUnaryOp$0, TypeUnaryOp$1];
   function TypeUnaryOp(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "TypeUnaryOp", TypeUnaryOp$$);
@@ -18755,7 +19004,7 @@ ${js}`
   function TypeIndexedAccess(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "TypeIndexedAccess", TypeIndexedAccess$$);
   }
-  var UnknownAlias$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L241, 'UnknownAlias "???"'), function($skip, $loc, $0, $1) {
+  var UnknownAlias$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L242, 'UnknownAlias "???"'), function($skip, $loc, $0, $1) {
     return { $loc, token: "unknown" };
   });
   function UnknownAlias(ctx, state2) {
@@ -19148,13 +19397,13 @@ ${js}`
       return num;
     return $0;
   });
-  var TypeLiteral$3 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L223, 'TypeLiteral "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var TypeLiteral$3 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L224, 'TypeLiteral "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { type: "VoidType", $loc, token: $1 };
   });
-  var TypeLiteral$4 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L242, 'TypeLiteral "unique"'), _, (0, import_lib2.$EXPECT)($L243, 'TypeLiteral "symbol"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var TypeLiteral$4 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L243, 'TypeLiteral "unique"'), _, (0, import_lib2.$EXPECT)($L244, 'TypeLiteral "symbol"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4) {
     return { type: "UniqueSymbolType", children: $0 };
   });
-  var TypeLiteral$5 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L244, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
+  var TypeLiteral$5 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L245, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
     return { $loc, token: "[]" };
   });
   var TypeLiteral$$ = [TypeLiteral$0, TypeLiteral$1, TypeLiteral$2, TypeLiteral$3, TypeLiteral$4, TypeLiteral$5];
@@ -19173,7 +19422,7 @@ ${js}`
   var InlineInterfacePropertyDelimiter$1 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$Y)((0, import_lib2.$S)(SameLineOrIndentedFurther, InlineBasicInterfaceProperty)), InsertComma), function(value) {
     return value[1];
   });
-  var InlineInterfacePropertyDelimiter$2 = (0, import_lib2.$Y)((0, import_lib2.$S)(__, (0, import_lib2.$C)((0, import_lib2.$EXPECT)($L16, 'InlineInterfacePropertyDelimiter ":"'), (0, import_lib2.$EXPECT)($L140, 'InlineInterfacePropertyDelimiter ")"'), (0, import_lib2.$EXPECT)($L46, 'InlineInterfacePropertyDelimiter "]"'), (0, import_lib2.$EXPECT)($L37, 'InlineInterfacePropertyDelimiter "}"'))));
+  var InlineInterfacePropertyDelimiter$2 = (0, import_lib2.$Y)((0, import_lib2.$S)(__, (0, import_lib2.$C)((0, import_lib2.$EXPECT)($L16, 'InlineInterfacePropertyDelimiter ":"'), (0, import_lib2.$EXPECT)($L141, 'InlineInterfacePropertyDelimiter ")"'), (0, import_lib2.$EXPECT)($L46, 'InlineInterfacePropertyDelimiter "]"'), (0, import_lib2.$EXPECT)($L37, 'InlineInterfacePropertyDelimiter "}"'))));
   var InlineInterfacePropertyDelimiter$3 = (0, import_lib2.$Y)(EOS);
   var InlineInterfacePropertyDelimiter$$ = [InlineInterfacePropertyDelimiter$0, InlineInterfacePropertyDelimiter$1, InlineInterfacePropertyDelimiter$2, InlineInterfacePropertyDelimiter$3];
   function InlineInterfacePropertyDelimiter(ctx, state2) {
@@ -19239,14 +19488,17 @@ ${js}`
     return (0, import_lib2.$EVENT)(ctx, state2, "TypeFunctionArrow", TypeFunctionArrow$0);
   }
   var TypeArguments$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenAngleBracket, (0, import_lib2.$P)((0, import_lib2.$S)(__, TypeArgumentDelimited)), __, CloseAngleBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var open = $1;
     var args = $2;
-    args = args.flatMap(([ws, [arg, delim]]) => [prepend(ws, arg), delim]);
+    var ws = $3;
+    var close = $4;
+    args = args.flatMap(([ws2, [arg, delim]]) => [prepend(ws2, arg), delim]);
     args.pop();
     return {
       type: "TypeArguments",
       ts: true,
       args,
-      children: $0
+      children: [open, args, ws, close]
     };
   });
   function TypeArguments(ctx, state2) {
@@ -19412,7 +19664,7 @@ ${js}`
   function CivetPrologue(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "CivetPrologue", CivetPrologue$$);
   }
-  var CivetPrologueContent$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L245, 'CivetPrologueContent "civet"'), NonIdContinue, (0, import_lib2.$Q)(CivetOption), (0, import_lib2.$EXPECT)($R96, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var CivetPrologueContent$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L246, 'CivetPrologueContent "civet"'), NonIdContinue, (0, import_lib2.$Q)(CivetOption), (0, import_lib2.$EXPECT)($R96, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
     var options = $3;
     return {
       type: "CivetPrologue",